@abtnode/core 1.16.11-next-3d2b39f7 → 1.16.11-next-09bc31f8

package/lib/blocklet/manager/disk.js

@@ -1446,7 +1446,7 @@ class BlockletManager extends BaseBlockletManager {
     await forEachComponentV2(
       blocklet,
       async (component) => {
-        if (!forceSync || !isInProgress(component.status)) {
+        if (!forceSync && !util.shouldUpdateBlockletStatus(component.status)) {
           return;
         }
 
@@ -1457,10 +1457,24 @@ class BlockletManager extends BaseBlockletManager {
         try {
           const status = await getProcessState(component.env.processId);
           if (component.status !== status) {
+            component.status = status;
             await states.blocklet.setBlockletStatus(did, status, { componentDids: [component.meta.did] });
           }
         } catch {
-          // do nothing
+          if (
+            ![
+              BlockletStatus.added,
+              BlockletStatus.waiting,
+              BlockletStatus.downloading,
+              BlockletStatus.installing,
+              BlockletStatus.installed,
+              BlockletStatus.upgrading,
+            ].includes(component.status)
+          ) {
+            const status = BlockletStatus.stopped;
+            component.status = status;
+            await states.blocklet.setBlockletStatus(did, status, { componentDids: [component.meta.did] });
+          }
         }
       },
       { parallel: true }
@@ -1535,6 +1549,7 @@ class BlockletManager extends BaseBlockletManager {
         name: 'sync-blocklet-status',
         time: '*/60 * * * * *', // 60s
         fn: this._syncBlockletStatus.bind(this),
+        options: { runOnInit: false },
       },
       {
         name: 'sync-blocklet-list',

package/lib/index.js

@@ -266,6 +266,7 @@ function ABTNode(options) {
     migrateApplicationToStructV2: blockletManager.migrateApplicationToStructV2.bind(blockletManager),
 
     // For diagnose purpose
+    syncBlockletStatus: blockletManager.status.bind(blockletManager),
     ensureBlockletIntegrity: blockletManager.ensureBlocklet.bind(blockletManager),
 
     getBlocklets: blockletManager.list.bind(blockletManager),

package/lib/monitor/blocklet-runtime-monitor.js

@@ -130,7 +130,10 @@ class BlockletRuntimeMonitor extends EventEmitter {
             appCpu += runtimeInfo.cpuUsage || 0;
             appMem += runtimeInfo.memoryUsage || 0;
           } catch (err) {
-            this.logger.error('failed to get blocklet runtime info', { processId, error: err });
+            // component status in db may not sync with pm2 when server has just started
+            if (err.code !== 'BLOCKLET_PROCESS_404') {
+              this.logger.error('failed to get blocklet runtime info', { processId, error: err });
+            }
           }
         } else {
           delete this.data[blockletDid][componentId];

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.11-next-3d2b39f7",
+  "version": "1.16.11-next-09bc31f8",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.11-next-3d2b39f7",
-    "@abtnode/certificate-manager": "1.16.11-next-3d2b39f7",
-    "@abtnode/constant": "1.16.11-next-3d2b39f7",
-    "@abtnode/cron": "1.16.11-next-3d2b39f7",
-    "@abtnode/logger": "1.16.11-next-3d2b39f7",
-    "@abtnode/models": "1.16.11-next-3d2b39f7",
-    "@abtnode/queue": "1.16.11-next-3d2b39f7",
-    "@abtnode/rbac": "1.16.11-next-3d2b39f7",
-    "@abtnode/router-provider": "1.16.11-next-3d2b39f7",
-    "@abtnode/static-server": "1.16.11-next-3d2b39f7",
-    "@abtnode/timemachine": "1.16.11-next-3d2b39f7",
-    "@abtnode/util": "1.16.11-next-3d2b39f7",
+    "@abtnode/auth": "1.16.11-next-09bc31f8",
+    "@abtnode/certificate-manager": "1.16.11-next-09bc31f8",
+    "@abtnode/constant": "1.16.11-next-09bc31f8",
+    "@abtnode/cron": "1.16.11-next-09bc31f8",
+    "@abtnode/logger": "1.16.11-next-09bc31f8",
+    "@abtnode/models": "1.16.11-next-09bc31f8",
+    "@abtnode/queue": "1.16.11-next-09bc31f8",
+    "@abtnode/rbac": "1.16.11-next-09bc31f8",
+    "@abtnode/router-provider": "1.16.11-next-09bc31f8",
+    "@abtnode/static-server": "1.16.11-next-09bc31f8",
+    "@abtnode/timemachine": "1.16.11-next-09bc31f8",
+    "@abtnode/util": "1.16.11-next-09bc31f8",
     "@arcblock/did": "1.18.80",
     "@arcblock/did-auth": "1.18.80",
     "@arcblock/did-ext": "^1.18.80",
@@ -41,9 +41,9 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.80",
     "@arcblock/vc": "1.18.80",
-    "@blocklet/constant": "1.16.11-next-3d2b39f7",
-    "@blocklet/meta": "1.16.11-next-3d2b39f7",
-    "@blocklet/sdk": "1.16.11-next-3d2b39f7",
+    "@blocklet/constant": "1.16.11-next-09bc31f8",
+    "@blocklet/meta": "1.16.11-next-09bc31f8",
+    "@blocklet/sdk": "1.16.11-next-09bc31f8",
     "@did-space/client": "^0.2.112",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.80",
@@ -96,5 +96,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "d0142bd2d1e49b94dcb5542d78e294a7b2258faa"
+  "gitHead": "c51355ac77d07dc27e2fb6c44ce2a45432a9469b"
 }