upgrade `log4js`

packages/core/package.json

@@ -18,15 +18,15 @@
   },
   "dependencies": {
     "spawn-sync": "^2.0.0",
-    "@docmirror/mitmproxy": "workspace:*",
     "fix-path": "^3.0.0",
     "iconv-lite": "^0.6.3",
     "lodash": "^4.17.20",
-    "log4js": "^6.3.0",
+    "log4js": "^6.9.1",
     "node-powershell": "^4.0.0",
     "winreg": "^1.2.5"
   },
   "devDependencies": {
+    "@docmirror/mitmproxy": "workspace:*",
     "chai": "^4.3.4",
     "mocha": "^8.2.1"
   }

packages/core/src/utils/util.log.js

@@ -1,17 +1,4 @@
-const path = require('path')
+const log4js = require('./util.logger')
-const log4js = require('log4js')
-const config = require('../config/index')
 
-const level = process.env.NODE_ENV === 'development' ? 'debug' : 'info'
-
-function getDefaultConfigBasePath () {
-  return config.server.setting.userBasePath
-}
-
-const filename = path.join(getDefaultConfigBasePath(), '/logs/core.log')
-log4js.configure({
-  appenders: { std: { type: 'stdout' }, file: { type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename } },
-  categories: { default: { appenders: ['file', 'std'], level } },
-})
 const logger = log4js.getLogger('core')
 module.exports = logger

packages/core/src/utils/util.logger.js

@@ -0,0 +1,30 @@
+const path = require('path')
+const log4js = require('log4js')
+const config = require('../config/index')
+
+const level = process.env.NODE_ENV === 'development' ? 'debug' : 'info'
+
+function getDefaultConfigBasePath () {
+  return config.server.setting.userBasePath
+}
+
+const coreLogFilename = path.join(getDefaultConfigBasePath(), '/logs/core.log')
+const guiLogFilename = path.join(getDefaultConfigBasePath(), '/logs/gui.log')
+const serverLogFilename = path.join(getDefaultConfigBasePath(), '/logs/server.log')
+
+log4js.configure({
+  appenders: { 
+    std: { type: 'stdout' }, 
+    core: { type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename: coreLogFilename },
+    gui: {  type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename: guiLogFilename },
+    server: { level: 'debug', type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename: serverLogFilename }
+  },
+  categories: {
+    default: { appenders: ['std'], level },
+    core: { appenders: ['core', 'std'], level },
+    gui: { appenders: ['gui', 'std'], level },
+    server: { appenders: ['server', 'std'], level }
+  },
+})
+
+module.exports = log4js

packages/gui/package.json

@@ -32,7 +32,6 @@
     "electron-updater": "^4.3.5",
     "json5": "^2.2.3",
     "lodash": "^4.17.20",
-    "log4js": "^6.3.0",
     "request-progress": "^3.0.0",
     "sass": "^1.81.0",
     "sass-loader": "^16.0.3",

packages/gui/src/utils/util.log.js

@@ -1,17 +1,5 @@
-const path = require('path')
+const log4js = require('@docmirror/dev-sidecar/src/utils/util.logger')
-const DevSidecar = require('@docmirror/dev-sidecar')
-const log4js = require('log4js')
 
-const level = process.env.NODE_ENV === 'development' ? 'debug' : 'info'
-
-const getDefaultConfigBasePath = function () {
-  return DevSidecar.api.config.get().server.setting.userBasePath
-}
-
-const filename = path.join(getDefaultConfigBasePath(), '/logs/gui.log')
-log4js.configure({
-  appenders: { std: { type: 'stdout' }, file: { type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename } },
-  categories: { default: { appenders: ['file', 'std'], level } },
-})
 const logger = log4js.getLogger('gui')
+
 module.exports = logger

packages/mitmproxy/package.json

@@ -11,6 +11,7 @@
   "main": "src/index.js",
   "scripts": {},
   "dependencies": {
+    "@docmirror/dev-sidecar": "workspace:*",
     "agentkeepalive": "^4.5.0",
     "axios": "^1.7.7",
     "baidu-aip-sdk": "^4.16.16",
@@ -20,7 +21,6 @@
     "is-browser": "^2.1.0",
     "json5": "^2.2.3",
     "lodash": "^4.17.20",
-    "log4js": "^6.3.0",
     "lru-cache": "^6.0.0",
     "mkdirp": "^0.5.1",
     "node-forge": "^1.3.1",

packages/mitmproxy/src/utils/util.log.js

@@ -1,13 +1,5 @@
-const path = require('path')
+const log4js = require('@docmirror/dev-sidecar/src/utils/util.logger')
-const log4js = require('log4js')
-const proxyConfig = require('../lib/proxy/common/config')
 
-const level = process.env.NODE_ENV === 'development' ? 'debug' : 'info'
-
-const filename = path.join(proxyConfig.getDefaultCABasePath(), '/logs/server.log')
-log4js.configure({
-  appenders: { std: { type: 'stdout', level: 'debug' }, file: { level: 'debug', type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename } },
-  categories: { default: { appenders: ['file', 'std'], level } },
-})
 const logger = log4js.getLogger('server')
+
 module.exports = logger