@abtnode/router-provider 1.16.45-beta-20250609-111118-0d252ebe → 1.16.45-beta-20250612-231219-481217be

package/lib/index.js

@@ -6,6 +6,7 @@ const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
 const logger = require('@abtnode/logger')(`${require('../package.json').name}:provider:index`);
 /* eslint-disable import/order */
 const debug = require('debug')(`${require('../package.json').name}:provider:index`);
+const sleep = require('@abtnode/util/lib/sleep');
 
 const Nginx = require('./nginx');
 const Default = require('./default');
@@ -97,12 +98,21 @@ const checkDockerInstalled = async () => {
 
 const clearDockerContainer = async () => {
   try {
-    // 判断 docker 是否执行了任何容器
-    const list = await promiseSpawn('docker ps -a -q --filter "name=^blocklet-"');
-    if (!list) {
-      return;
+    let attempts = 0;
+    const maxAttempts = 10;
+
+    while (attempts < maxAttempts) {
+      const list = await promiseSpawn('docker ps -a -q --filter "name=^blocklet-"');
+      if (!list) {
+        return;
+      }
+
+      await promiseSpawn('docker rm -f $(docker ps -a -q --filter "name=^blocklet-")');
+      await sleep(1000);
+      attempts++;
     }
-    await promiseSpawn('docker rm -f $(docker ps -a -q --filter "name=^blocklet-")');
+
+    logger.error('Failed to remove all containers');
   } catch (e) {
     logger.error(e);
   }

package/lib/nginx/index.js

@@ -331,7 +331,13 @@ class NginxProvider extends BaseProvider {
     const command = `${this.binPath} -t -c ${this.configPath} -p ${this.configDir}`; // eslint-disable-line no-param-reassign
     const result = shelljs.exec(command, { silent: true });
     if (result.code !== 0) {
-      logger.error(`exec ${command} error`, { errorMessage: result.stderr, code: result.code });
+      logger.error(`exec ${command} error`, {
+        binPath: this.binPath,
+        configPath: this.configPath,
+        configDir: this.configDir,
+        errorMessage: result.stderr,
+        code: result.code,
+      });
       throw new Error(`${formatError(result.stderr)}`);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.16.45-beta-20250609-111118-0d252ebe",
+  "version": "1.16.45-beta-20250612-231219-481217be",
   "description": "Routing engine implementations for abt node",
   "author": "polunzh <polunzh@gmail.com>",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
@@ -32,11 +32,11 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/constant": "1.16.45-beta-20250609-111118-0d252ebe",
-    "@abtnode/db-cache": "1.16.45-beta-20250609-111118-0d252ebe",
-    "@abtnode/logger": "1.16.45-beta-20250609-111118-0d252ebe",
-    "@abtnode/router-templates": "1.16.45-beta-20250609-111118-0d252ebe",
-    "@abtnode/util": "1.16.45-beta-20250609-111118-0d252ebe",
+    "@abtnode/constant": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/db-cache": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/logger": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/router-templates": "1.16.45-beta-20250612-231219-481217be",
+    "@abtnode/util": "1.16.45-beta-20250612-231219-481217be",
     "@arcblock/http-proxy": "^1.19.1",
     "@arcblock/is-valid-domain": "^1.0.5",
     "@ocap/util": "^1.20.14",
@@ -62,5 +62,5 @@
     "bluebird": "^3.7.2",
     "fs-extra": "^11.2.0"
   },
-  "gitHead": "3ea8ca1f5debfddd15b172c9dd9f4d4eaf22db0e"
+  "gitHead": "01a3fb21f16a515e2565d12797baeda5fdf585b0"
 }