@abtnode/router-provider 1.8.29 → 1.8.30

package/lib/nginx/index.js

@@ -10,6 +10,7 @@ const getPort = require('get-port');
 const uniqBy = require('lodash/uniqBy');
 const isEmpty = require('lodash/isEmpty');
 const cloneDeep = require('lodash/cloneDeep');
+const formatBackSlash = require('@abtnode/util/lib/format-back-slash');
 const {
   DOMAIN_FOR_DEFAULT_SITE,
   ROUTING_RULE_TYPES,
@@ -28,7 +29,6 @@ const BaseProvider = require('../base');
 const {
   addTestServer,
   formatError,
-  formatNginxPath,
   getNginxLoadModuleDirectives,
   parseNginxConfigArgs,
   getNginxStatus,
@@ -136,8 +136,8 @@ class NginxProvider extends BaseProvider {
 
   getConfTemplate() {
     return getMainTemplate({
-      logDir: this.getRelativeConfigDir(formatNginxPath(this.logDir)),
-      tmpDir: this.getRelativeConfigDir(formatNginxPath(this.tmpDir)),
+      logDir: this.getRelativeConfigDir(formatBackSlash(this.logDir)),
+      tmpDir: this.getRelativeConfigDir(formatBackSlash(this.tmpDir)),
       workerProcess: this.getWorkerProcess(),
       nginxLoadModules: getNginxLoadModuleDirectives(REQUIRED_MODULES, this.readNginxConfigParams()).join(os.EOL),
     });
@@ -315,7 +315,7 @@ class NginxProvider extends BaseProvider {
    */
   _exec(param = '') {
     logger.info('exec', { param });
-    let command = `${this.binPath} -c ${this.configPath} -p ${formatNginxPath(this.configDir)}`; // eslint-disable-line no-param-reassign
+    let command = `${this.binPath} -c ${this.configPath} -p ${formatBackSlash(this.configDir)}`; // eslint-disable-line no-param-reassign
     if (param) {
       command = `${command} -s ${param}`;
     }

package/lib/nginx/util.js

@@ -9,6 +9,7 @@ const shelljs = require('shelljs');
 const findProcess = require('find-process');
 const moment = require('moment');
 const { MAX_UPLOAD_FILE_SIZE } = require('@abtnode/constant');
+const formatBackSlash = require('@abtnode/util/lib/format-back-slash');
 
 const logger = require('@abtnode/logger')('router:nginx:util');
 
@@ -274,15 +275,12 @@ const getUpstreamName = (port) => `server_${port}`;
 
 const joinNginxPath = (...args) => {
   const result = path.join(...args);
-  return result.replaceAll(path.sep, '/');
+  return formatBackSlash(result);
 };
 
-const formatNginxPath = (filepath) => filepath.replaceAll(path.sep, '/');
-
 module.exports = {
   addTestServer,
   formatError,
-  formatNginxPath,
   getMainTemplate,
   getNginxLoadModuleDirectives,
   getMissingModules,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.8.29",
+  "version": "1.8.30",
   "description": "Routing engine implementations for abt node",
   "author": "polunzh <polunzh@gmail.com>",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
@@ -32,10 +32,10 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/constant": "1.8.29",
-    "@abtnode/logger": "1.8.29",
-    "@abtnode/router-templates": "1.8.29",
-    "@abtnode/util": "1.8.29",
+    "@abtnode/constant": "1.8.30",
+    "@abtnode/logger": "1.8.30",
+    "@abtnode/router-templates": "1.8.30",
+    "@abtnode/util": "1.8.30",
     "axios": "^0.27.2",
     "debug": "^4.3.4",
     "find-process": "^1.4.7",
@@ -62,5 +62,5 @@
     "fs-extra": "^10.1.0",
     "needle": "^3.1.0"
   },
-  "gitHead": "ee52d838f0cf97e551d53a6509cb0da7e5f31978"
+  "gitHead": "cb294f4ee7382c6ef7692b6c2c33ad080fced13e"
 }