@abtnode/router-provider 1.8.4 → 1.8.7

package/lib/default/index.js

@@ -151,6 +151,11 @@ class DefaultProvider extends BaseProvider {
     fs.writeFileSync(`${this.wwwDir}/404.html`, get404Template(nodeInfo));
     fs.writeFileSync(`${this.wwwDir}/502.html`, get502Template(nodeInfo));
     fs.writeFileSync(`${this.wwwDir}/5xx.html`, get5xxTemplate(nodeInfo));
+    // 将 @abtnode/router-templates/lib/styles (font 相关样式) 复制到 www/router-template-styles 中
+    fs.copySync(
+      `${path.dirname(require.resolve('@abtnode/router-templates/package.json'))}/lib/styles`,
+      `${this.wwwDir}/router-template-styles`
+    );
   }
 
   getLogFilesForToday() {

package/lib/nginx/index.js

@@ -643,6 +643,11 @@ class NginxProvider extends BaseProvider {
     fs.writeFileSync(`${this.wwwDir}/404.html`, get404Template(nodeInfo));
     fs.writeFileSync(`${this.wwwDir}/502.html`, get502Template(nodeInfo));
     fs.writeFileSync(`${this.wwwDir}/5xx.html`, get5xxTemplate(nodeInfo));
+    // 将 @abtnode/router-templates/lib/styles (font 相关样式) 复制到 www/router-template-styles 中
+    fs.copySync(
+      `${path.dirname(require.resolve('@abtnode/router-templates/package.json'))}/lib/styles`,
+      `${this.wwwDir}/router-template-styles`
+    );
   }
 
   _copyConfigFiles() {
@@ -904,62 +909,71 @@ NginxProvider.check = async ({ configDir = '' } = {}) => {
     `test_nginx_provider-${Date.now()}-${Math.ceil(Math.random() * 10000)}`,
     CONFIG_FOLDER_NAME
   );
-  fs.mkdirSync(tmpDir, { recursive: true });
+  try {
+    fs.mkdirSync(tmpDir, { recursive: true });
+
+    const provider = new NginxProvider({ configDir: tmpDir, isTest: true });
+    provider.initialize();
 
-  const provider = new NginxProvider({ configDir: tmpDir, isTest: true });
-  provider.initialize();
+    logger.info('check:addTestServer', { configPath: provider.configPath });
+    await addTestServer({
+      configPath: provider.configPath,
+      port: await getPort(),
+      upstreamPort: await getPort(),
+    });
+
+    const missingModules = getMissingModules(provider.readNginxConfigParams());
 
-  logger.info('check:addTestServer', { configPath: provider.configPath });
-  await addTestServer({
-    configPath: provider.configPath,
-    port: await getPort(),
-    upstreamPort: await getPort(),
-  });
+    if (missingModules.length > 0) {
+      result.available = false;
+      result.error = `Blocklet Server depends on some modules of Nginx that are not compiled: ${missingModules.join(
+        ', '
+      )}`;
+      return result;
+    }
 
-  const missingModules = getMissingModules(provider.readNginxConfigParams());
+    await provider.start();
+    await provider.stop();
 
-  if (missingModules.length > 0) {
+    return result;
+  } catch (error) {
     result.available = false;
-    result.error = `Blocklet Server depends on some modules of Nginx that are not compiled: ${missingModules.join(
-      ', '
-    )}`;
+    result.error = error.message;
+    logger.error('check nginx failed', { error });
     return result;
+  } finally {
+    fs.rmSync(tmpDir, { recursive: true, force: true });
   }
+};
+
+const hasPortPermission = async (port) => {
+  const configDir = path.join(
+    os.tmpdir(),
+    `test_nginx_provider-${Date.now()}-${Math.ceil(Math.random() * 10000)}`,
+    CONFIG_FOLDER_NAME
+  );
+  try {
+    fs.mkdirSync(configDir, { recursive: true });
 
-  await provider.start();
-  await provider.stop();
+    const provider = new NginxProvider({ configDir, isTest: true });
+    provider.initialize();
 
-  fs.rmSync(tmpDir, { recursive: true });
+    await addTestServer({ configPath: provider.configPath, port });
+    await provider.start();
+    await provider.stop();
 
-  return result;
+    return true;
+  } catch (err) {
+    return false;
+  } finally {
+    fs.rmSync(configDir, { recursive: true, force: true });
+  }
 };
 
 NginxProvider.getStatus = getNginxStatus;
 NginxProvider.exists = () => !!shelljs.which('nginx');
 
-NginxProvider.getUsablePorts = async () =>
-  getUsablePorts('nginx', async (port) => {
-    try {
-      const configDir = path.join(
-        os.tmpdir(),
-        `test_nginx_provider-${Date.now()}-${Math.ceil(Math.random() * 10000)}`,
-        CONFIG_FOLDER_NAME
-      );
-      fs.mkdirSync(configDir, { recursive: true });
-
-      const provider = new NginxProvider({ configDir, isTest: true });
-      provider.initialize();
-
-      await addTestServer({ configPath: provider.configPath, port });
-      await provider.start();
-      await provider.stop();
-
-      fs.rmSync(configDir, { recursive: true });
-
-      return true;
-    } catch (err) {
-      return false;
-    }
-  });
+NginxProvider.getUsablePorts = async () => getUsablePorts('nginx', hasPortPermission);
+NginxProvider.hasPortPermission = hasPortPermission;
 
 module.exports = NginxProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.8.4",
+  "version": "1.8.7",
   "description": "Routing engine implementations for abt node",
   "author": "polunzh <polunzh@gmail.com>",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
@@ -32,35 +32,35 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/constant": "1.8.4",
-    "@abtnode/logger": "1.8.4",
-    "@abtnode/router-templates": "1.8.4",
-    "@abtnode/util": "1.8.4",
+    "@abtnode/constant": "1.8.7",
+    "@abtnode/logger": "1.8.7",
+    "@abtnode/router-templates": "1.8.7",
+    "@abtnode/util": "1.8.7",
     "axios": "^0.27.2",
-    "debug": "^4.3.3",
-    "find-process": "^1.4.3",
-    "fkill": "^7.0.1",
-    "fs-extra": "^10.0.1",
+    "debug": "^4.3.4",
+    "find-process": "^1.4.7",
+    "fkill": "^7.2.1",
+    "fs-extra": "^10.1.0",
     "get-port": "^5.1.1",
     "http-proxy": "^1.18.1",
     "is-valid-domain": "^0.1.6",
     "lodash": "^4.17.21",
-    "lru-cache": "^7.4.0",
-    "moment": "^2.29.1",
-    "nginx-conf": "^1.5.0",
+    "lru-cache": "^7.13.2",
+    "moment": "^2.29.4",
+    "nginx-conf": "^1.7.0",
     "object-hash": "^3.0.0",
     "port-used": "^2.0.8",
     "promise-retry": "^2.0.1",
-    "shelljs": "^0.8.4",
-    "tar": "^6.1.0",
+    "shelljs": "^0.8.5",
+    "tar": "^6.1.11",
     "url-join": "^4.0.1",
     "uuid": "^8.3.2",
     "valid-url": "^1.0.9"
   },
   "devDependencies": {
     "bluebird": "^3.7.2",
-    "fs-extra": "^10.0.1",
-    "needle": "^3.0.0"
+    "fs-extra": "^10.1.0",
+    "needle": "^3.1.0"
   },
-  "gitHead": "c42fb1bb84c5eef0f753fd5397d8007c7a6eee19"
+  "gitHead": "9807ea28b3ae634f5806c875774ac3b7e38502a1"
 }