mirror of
https://github.com/ONLYOFFICE/server.git
synced 2026-04-07 14:04:35 +08:00
[feature] Update dependencies; Migrate to esm; Create build
This commit is contained in:
@ -31,32 +31,29 @@
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
var os = require('os');
|
||||
var path = require('path');
|
||||
var fs = require('fs');
|
||||
var url = require('url');
|
||||
var co = require('co');
|
||||
var config = require('config');
|
||||
var spawnAsync = require('@expo/spawn-async');
|
||||
const bytes = require('bytes');
|
||||
let lcid;
|
||||
import('lcid').then(module => {
|
||||
lcid = module.default;
|
||||
})
|
||||
const ms = require('ms');
|
||||
import os from 'os';
|
||||
import path from 'path';
|
||||
import fs from 'fs';
|
||||
import url from 'url';
|
||||
import co from 'co';
|
||||
import config from 'config';
|
||||
import spawnAsync from '@expo/spawn-async';
|
||||
import bytes from 'bytes';
|
||||
import ms from 'ms';
|
||||
import lcid from 'lcid';
|
||||
|
||||
var commonDefines = require('./../../Common/sources/commondefines');
|
||||
var storage = require('./../../Common/sources/storage/storage-base');
|
||||
var utils = require('./../../Common/sources/utils');
|
||||
var constants = require('./../../Common/sources/constants');
|
||||
var baseConnector = require('../../DocService/sources/databaseConnectors/baseConnector');
|
||||
const wopiClient = require('./../../DocService/sources/wopiClient');
|
||||
const taskResult = require('./../../DocService/sources/taskresult');
|
||||
var statsDClient = require('./../../Common/sources/statsdclient');
|
||||
var queueService = require('./../../Common/sources/taskqueueRabbitMQ');
|
||||
const formatChecker = require('./../../Common/sources/formatchecker');
|
||||
const operationContext = require('./../../Common/sources/operationContext');
|
||||
const tenantManager = require('./../../Common/sources/tenantManager');
|
||||
import * as commonDefines from './../../Common/sources/commondefines.js';
|
||||
import * as storage from './../../Common/sources/storage/storage-base.js';
|
||||
import * as utils from './../../Common/sources/utils.js';
|
||||
import * as constants from './../../Common/sources/constants.js';
|
||||
import * as baseConnector from '../../DocService/sources/databaseConnectors/baseConnector.js';
|
||||
import * as wopiClient from './../../DocService/sources/wopiClient.js';
|
||||
import * as taskResult from './../../DocService/sources/taskresult.js';
|
||||
import * as statsDClient from './../../Common/sources/statsdclient.js';
|
||||
import queueService from './../../Common/sources/taskqueueRabbitMQ.js';
|
||||
import * as formatChecker from './../../Common/sources/formatchecker.js';
|
||||
import * as operationContext from './../../Common/sources/operationContext.js';
|
||||
import * as tenantManager from './../../Common/sources/tenantManager.js';
|
||||
|
||||
const cfgMaxDownloadBytes = config.get('FileConverter.converter.maxDownloadBytes');
|
||||
const cfgDownloadTimeout = config.get('FileConverter.converter.downloadTimeout');
|
||||
@ -1250,4 +1247,15 @@ function run() {
|
||||
}
|
||||
});
|
||||
}
|
||||
exports.run = run;
|
||||
export {
|
||||
TaskQueueDataConvert,
|
||||
getTempDir,
|
||||
changeFormatToExtendedPdf,
|
||||
writeProcessOutputToLog,
|
||||
ackTask,
|
||||
receiveTaskSetTimeout,
|
||||
receiveTask,
|
||||
createErrorResponse,
|
||||
simulateErrorResponse,
|
||||
run
|
||||
};
|
||||
|
||||
@ -32,21 +32,21 @@
|
||||
|
||||
'use strict';
|
||||
|
||||
const cluster = require('cluster');
|
||||
const logger = require('./../../Common/sources/logger');
|
||||
const operationContext = require('./../../Common/sources/operationContext');
|
||||
import cluster from 'cluster';
|
||||
import * as logger from './../../Common/sources/logger.js';
|
||||
import * as operationContext from './../../Common/sources/operationContext.js';
|
||||
import fs from 'fs';
|
||||
import co from 'co';
|
||||
import os from 'os';
|
||||
import config from 'config';
|
||||
import * as license from './../../Common/sources/license.js';
|
||||
import * as converter from './converter.js';
|
||||
|
||||
if (cluster.isMaster) {
|
||||
const fs = require('fs');
|
||||
const co = require('co');
|
||||
const os = require('os');
|
||||
const config = require('config');
|
||||
const license = require('./../../Common/sources/license');
|
||||
|
||||
const cfgLicenseFile = config.get('license.license_file');
|
||||
const cfgMaxProcessCount = config.get('FileConverter.converter.maxprocesscount');
|
||||
|
||||
var workersCount = 0;
|
||||
let workersCount = 0;
|
||||
const readLicense = async function () {
|
||||
const numCPUs = os.cpus().length;
|
||||
const availableParallelism = os.availableParallelism?.();
|
||||
@ -57,7 +57,7 @@ if (cluster.isMaster) {
|
||||
//todo send license to workers for multi-tenancy
|
||||
};
|
||||
const updateWorkers = () => {
|
||||
var i;
|
||||
let i;
|
||||
const arrKeyWorkers = Object.keys(cluster.workers);
|
||||
if (arrKeyWorkers.length < workersCount) {
|
||||
for (i = arrKeyWorkers.length; i < workersCount; ++i) {
|
||||
@ -93,7 +93,6 @@ if (cluster.isMaster) {
|
||||
fs.watchFile(cfgLicenseFile, updateLicense);
|
||||
setInterval(updateLicense, 86400000);
|
||||
} else {
|
||||
const converter = require('./converter');
|
||||
converter.run();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user