@abtnode/core 1.16.11-next-3e55bc95 → 1.16.11-next-48aec895

package/lib/blocklet/manager/disk.js

@@ -659,9 +659,20 @@ class BlockletManager extends BaseBlockletManager {
    * @param {import('@abtnode/client').RequestRestoreBlockletInput} input
    * @memberof BlockletManager
    */
-  // eslint-disable-next-line no-unused-vars
-  restoreBlocklet(input, context) {
+  async restoreBlocklet(input, context) {
     const { from, ...param } = input;
+
+    if (input.overwrite) {
+      try {
+        const blocklet = await this.getBlocklet(input.appPid);
+        if (blocklet) {
+          await this.delete({ did: input.appPid, keepData: false, keepLogsDir: false, keepConfigs: false }, context);
+        }
+      } catch (error) {
+        logger.error('Failed to delete blocklet', { error, did: input.appPid });
+      }
+    }
+
     if (from === 'spaces') {
       return this._restoreFromSpaces(param, context);
     }
@@ -1461,9 +1472,11 @@ class BlockletManager extends BaseBlockletManager {
 
         try {
           const status = await getProcessState(component.env.processId);
+          const oldStatus = component.status;
           if (component.status !== status) {
             component.status = status;
             addToUpdates(component.meta.did, status);
+            logger.info('will sync status from pm2', { did, status, oldStatus, componentDid: component.meta.did });
           }
         } catch {
           if (
@@ -1488,6 +1501,7 @@ class BlockletManager extends BaseBlockletManager {
     // iterate updates
     if (updates.size > 0) {
       for (const [status, dids] of updates) {
+        logger.info('sync status from pm2', { did, status, componentDids: dids });
         await states.blocklet.setBlockletStatus(did, status, { componentDids: dids });
       }
     }
@@ -2493,6 +2507,8 @@ class BlockletManager extends BaseBlockletManager {
 
       // update state
       await states.blocklet.upgradeBlocklet({ meta, source, deployedFrom, children });
+      // ensure component status is upgrading
+      await states.blocklet.setBlockletStatus(did, BlockletStatus.upgrading, { componentDids });
       await this._setConfigsFromMeta(did);
 
       // should ensure blocklet integrity
@@ -2533,14 +2549,14 @@ class BlockletManager extends BaseBlockletManager {
 
       logger.info('updated blocklet for upgrading', { did, version, source, name });
 
-      const status =
-        oldBlocklet.status === BlockletStatus.installed ? BlockletStatus.installed : BlockletStatus.stopped;
-      await states.blocklet.setBlockletStatus(did, status, { componentDids });
-
-      // start new process
       if (oldBlocklet.status === BlockletStatus.running) {
+        // start new process
         await this.start({ did, componentDids }, context);
         logger.info('started blocklet for upgrading', { did, version });
+      } else {
+        const status =
+          oldBlocklet.status === BlockletStatus.installed ? BlockletStatus.installed : BlockletStatus.stopped;
+        await states.blocklet.setBlockletStatus(did, status, { componentDids });
       }
 
       blocklet = await this.getBlocklet(did, context);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.11-next-3e55bc95",
+  "version": "1.16.11-next-48aec895",
   "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-3e55bc95",
-    "@abtnode/certificate-manager": "1.16.11-next-3e55bc95",
-    "@abtnode/constant": "1.16.11-next-3e55bc95",
-    "@abtnode/cron": "1.16.11-next-3e55bc95",
-    "@abtnode/logger": "1.16.11-next-3e55bc95",
-    "@abtnode/models": "1.16.11-next-3e55bc95",
-    "@abtnode/queue": "1.16.11-next-3e55bc95",
-    "@abtnode/rbac": "1.16.11-next-3e55bc95",
-    "@abtnode/router-provider": "1.16.11-next-3e55bc95",
-    "@abtnode/static-server": "1.16.11-next-3e55bc95",
-    "@abtnode/timemachine": "1.16.11-next-3e55bc95",
-    "@abtnode/util": "1.16.11-next-3e55bc95",
+    "@abtnode/auth": "1.16.11-next-48aec895",
+    "@abtnode/certificate-manager": "1.16.11-next-48aec895",
+    "@abtnode/constant": "1.16.11-next-48aec895",
+    "@abtnode/cron": "1.16.11-next-48aec895",
+    "@abtnode/logger": "1.16.11-next-48aec895",
+    "@abtnode/models": "1.16.11-next-48aec895",
+    "@abtnode/queue": "1.16.11-next-48aec895",
+    "@abtnode/rbac": "1.16.11-next-48aec895",
+    "@abtnode/router-provider": "1.16.11-next-48aec895",
+    "@abtnode/static-server": "1.16.11-next-48aec895",
+    "@abtnode/timemachine": "1.16.11-next-48aec895",
+    "@abtnode/util": "1.16.11-next-48aec895",
     "@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-3e55bc95",
-    "@blocklet/meta": "1.16.11-next-3e55bc95",
-    "@blocklet/sdk": "1.16.11-next-3e55bc95",
+    "@blocklet/constant": "1.16.11-next-48aec895",
+    "@blocklet/meta": "1.16.11-next-48aec895",
+    "@blocklet/sdk": "1.16.11-next-48aec895",
     "@did-space/client": "^0.2.113",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.80",
@@ -96,5 +96,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "cf0251c2d85c617b03151495b5944061ceb373e5"
+  "gitHead": "81aed0ba08844b437507865581dd3f8ffd0aa04f"
 }