feat: 7.3.3.50

# Conflicts:
#	Dockerfile
#	server.patch

.github/workflows/docker-image.yml

@@ -21,4 +21,5 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
         repository: xbeeant/oo-unlimit
-        tags: latest
+        tags: latest, 7.3.3.50
+

.gitpod.yml

@@ -0,0 +1,8 @@
+# This configuration file was automatically generated by Gitpod.
+# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
+# and commit this file to your remote git repository to share the goodness with others.
+
+tasks:
+  - init: make
+
+

Dockerfile

@@ -1,5 +1,5 @@
-ARG product_version=7.1.1
-ARG build_number=23
+ARG product_version=7.3.3
+ARG build_number=50
 ARG oo_root='/var/www/onlyoffice/documentserver'
 
 ## Setup
@@ -13,6 +13,7 @@ ENV BUILD_NUMBER=${build_number}
 
 ARG build_deps="git make g++ nodejs npm"
 RUN apt-get update && apt-get install -y ${build_deps}
+#RUN npm config set registry https://registry.npm.taobao.org
 RUN npm install -g pkg grunt grunt-cli
 
 WORKDIR /build
@@ -26,19 +27,32 @@ ARG tag=v${PRODUCT_VERSION}.${BUILD_NUMBER}
 RUN git clone --quiet --branch $tag --depth 1 https://github.com/ONLYOFFICE/build_tools.git /build/build_tools
 RUN git clone --quiet --branch $tag --depth 1 https://github.com/ONLYOFFICE/server.git      /build/server
 
-COPY server.patch /build/server.patch
-RUN cd /build/server   && git apply /build/server.patch
-
-# Clone old version of sdk and webapp to get an old version of the mobile editor
-
-ARG tag=v6.3.1.79 # Working mobile editor
-RUN git clone --quiet --branch $tag --depth 1 https://github.com/ONLYOFFICE/sdkjs.git       /build/sdkjs
-RUN git clone --quiet --branch $tag --depth 1 https://github.com/ONLYOFFICE/web-apps.git    /build/web-apps
-COPY web-apps.patch /build/
-RUN cd /build/web-apps && git apply /build/web-apps.patch
+# Working mobile editor
+RUN git clone --quiet --depth 1 https://github.com/ONLYOFFICE/sdkjs.git       /build/sdkjs
+RUN git clone --quiet --depth 1 https://github.com/ONLYOFFICE/web-apps.git    /build/web-apps
 
 ## Build
-FROM clone-stage as build-stage
+FROM clone-stage as path-stage
+
+# patch
+COPY web-apps.patch /build/web-apps.patch
+RUN cd /build/web-apps   && git apply /build/web-apps.patch
+
+
+COPY server.patch /build/server.patch
+RUN cd /build/server   && git apply --ignore-space-change --ignore-whitespace /build/server.patch
+
+
+
+#COPY convertermaster.js /build/server/FileConverter/sources/convertermaster.js
+#COPY license.js /build/server/Common/sources/license.js
+#COPY Makefile /build/server/Makefile
+#COPY server.js /build/server/DocService/sources/server.js
+#COPY constants.js /build/server/Common/srouces/constants.js
+#COPY tenantManager.js /build/server/Common/srouces/tenantManager.js
+
+## Build
+FROM path-stage as build-stage
 
 # build server with license checks patched
 WORKDIR /build/server

server.patch

@@ -1,96 +1,80 @@
 diff --git a/Common/sources/constants.js b/Common/sources/constants.js
-index 0663ead..490582a 100644
+index 65d4c6f..39a7e56 100644
 --- a/Common/sources/constants.js
 +++ b/Common/sources/constants.js
-@@ -75,7 +75,7 @@ exports.LICENSE_RESULT = {
-   ExpiredLimited: 11
- };
- 
--exports.LICENSE_CONNECTIONS = 20;
-+exports.LICENSE_CONNECTIONS = 9999;
- exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
- 
- exports.AVS_OFFICESTUDIO_FILE_UNKNOWN =  0x0000;
+@@ -83,7 +83,7 @@ exports.LICENSE_RESULT = {
+   UsersViewCountOS: 15
+ };
+ 
+-exports.LICENSE_CONNECTIONS = 20;
++exports.LICENSE_CONNECTIONS = 9999;
+ exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
+ 
+ exports.AVS_OFFICESTUDIO_FILE_UNKNOWN =  0x0000;
 diff --git a/Common/sources/license.js b/Common/sources/license.js
-index c273afe..8786f62 100644
+index 1b617c6..8fa7b53 100644
 --- a/Common/sources/license.js
 +++ b/Common/sources/license.js
-@@ -45,20 +45,20 @@ exports.readLicense = function*() {
- 		count: 1,
- 		type: c_LR.Success,
- 		light: false,
--		packageType: constants.PACKAGE_TYPE_OS,
-+		packageType: constants.PACKAGE_TYPE_I,
- 		mode: constants.LICENSE_MODE.None,
--		branding: false,
-+		branding: true,
- 		connections: constants.LICENSE_CONNECTIONS,
--		customization: false,
--		usersCount: 0,
-+		customization: true,
-+		usersCount: constants.LICENSE_CONNECTIONS,
- 		usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
--		hasLicense: false,
--		plugins: false,
-+		hasLicense: true,
-+		plugins: true,
- 		buildDate: oBuildDate,
- 		startDate: startDate,
--		endDate: null,
--		customerId: ""
-+		customerId: "",
-+		endDate: new Date("2099-01-01T23:59:59.000Z")
- 	}, null];
- };
- 
--exports.packageType = constants.PACKAGE_TYPE_OS;
-+exports.packageType = constants.PACKAGE_TYPE_I;
-diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js
-index b654c9c..31bdf2d 100644
---- a/DocService/sources/DocsCoServer.js
-+++ b/DocService/sources/DocsCoServer.js
-@@ -165,7 +165,7 @@ let connections = []; // Активные соединения
- let lockDocumentsTimerId = {};//to drop connection that can't unlockDocument
- let pubsub;
- let queue;
--let licenseInfo = {type: constants.LICENSE_RESULT.Error, light: false, branding: false, customization: false, plugins: false};
-+let licenseInfo = license.readLicense().next().value[0];
- let licenseOriginal = null;
- let shutdownFlag = false;
- let expDocumentsStep = gc.getCronStep(cfgExpDocumentsCron);
-@@ -3328,7 +3328,7 @@ exports.install = function(server, callbackFunction) {
-   });
- };
- exports.setLicenseInfo = function(data, original ) {
--  licenseInfo = data;
-+  logger.debug('Not updating license info', data);
-   licenseOriginal = original;
- };
- exports.getLicenseInfo = function() {
+@@ -45,24 +45,24 @@ exports.readLicense = function*() {
+ 		count: 1,
+ 		type: c_LR.Success,
+ 		light: false,
+-		packageType: constants.PACKAGE_TYPE_OS,
++        packageType: constants.PACKAGE_TYPE_I,
+ 		mode: constants.LICENSE_MODE.None,
+-		branding: false,
++        branding: true,
+ 		connections: constants.LICENSE_CONNECTIONS,
+ 		connectionsView: constants.LICENSE_CONNECTIONS,
+-		customization: false,
+-		advancedApi: false,
+-		usersCount: 0,
+-		usersViewCount: 0,
++        customization: true,
++        advancedApi: true,
++        usersCount: constants.LICENSE_CONNECTIONS,
++        usersViewCount: constants.LICENSE_CONNECTIONS,
+ 		usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
+-		hasLicense: false,
+-		plugins: false,
++        hasLicense: true,
++        plugins: true,
+ 		buildDate: oBuildDate,
+ 		startDate: startDate,
+-		endDate: null,
++        endDate: new Date("2099-01-01T23:59:59.000Z"),
+ 		customerId: "",
+-		alias: ""
++        alias: "community"
+ 	}, null];
+ };
+ 
+-exports.packageType = constants.PACKAGE_TYPE_OS;
++exports.packageType = constants.PACKAGE_TYPE_I;
 diff --git a/DocService/sources/server.js b/DocService/sources/server.js
-index ccc232b..7c4e80d 100644
+index 5c744f6..edfb423 100644
 --- a/DocService/sources/server.js
 +++ b/DocService/sources/server.js
-@@ -147,7 +147,6 @@ try {
- } catch (e) {
- 	logger.warn('Failed to subscribe to plugin folder updates. When changing the list of plugins, you must restart the server. https://nodejs.org/docs/latest/api/fs.html#fs_availability');
- }
--fs.watchFile(configCommon.get('license').get('license_file'), updateLicense);
- setInterval(updateLicense, 86400000);
+@@ -110,7 +110,6 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque
+ 
+ if (!tenantManager.isMultitenantMode()) {
+ 	updateLicense();
+-	fs.watchFile(cfgLicenseFile, updateLicense);
+ 	setInterval(updateLicense, 86400000);
+ }
  
- // Если захочется использовать 'development' и 'production',
 diff --git a/FileConverter/sources/convertermaster.js b/FileConverter/sources/convertermaster.js
-index 2c4526f..ec07464 100644
+index 2a0b366..96468f9 100644
 --- a/FileConverter/sources/convertermaster.js
 +++ b/FileConverter/sources/convertermaster.js
-@@ -85,7 +85,6 @@ if (cluster.isMaster) {
- 
-   updateLicense();
- 
--  fs.watchFile(configCommon.get('license').get('license_file'), updateLicense);
-   setInterval(updateLicense, 86400000);
- } else {
-   const converter = require('./converter');
+@@ -93,7 +93,6 @@ if (cluster.isMaster) {
+   updateLicense();
+ 
+   if (!tenantManager.isMultitenantMode()) {
+-    fs.watchFile(cfgLicenseFile, updateLicense);
+     setInterval(updateLicense, 86400000);
+   }
+ } else {
 diff --git a/Makefile b/Makefile
 index e8e1308..23f7e2e 100644
 --- a/Makefile