@abtnode/core 1.16.2 → 1.16.3

package/lib/blocklet/manager/helper/migrate-application-to-struct-v2.js

@@ -5,6 +5,7 @@ const pRetry = require('p-retry');
 const Client = require('@ocap/client');
 const urlFriendly = require('@blocklet/meta/lib/url-friendly').default;
 const { slugify } = require('transliteration');
+const Lock = require('@abtnode/util/lib/lock');
 
 const logger = require('@abtnode/logger')('@abtnode/core:migrate-application-to-struct-v2');
 
@@ -41,6 +42,8 @@ const sortMoveListBySrc = (list) => {
   return list.sort((a, b) => (a.src.length > b.src.length ? -1 : 1));
 };
 
+const lock = new Lock('migrate-application-to-struct-v2');
+
 const validateDataMoveList = (list) => {
   const srcList = list.map((x) => x.src);
   const distList = list.map((x) => x.dist);
@@ -179,7 +182,12 @@ const migrateAppOnChain = async (blocklet, oldSk, newSk) => {
     }
   }
 
-  await ensureAccountOnMainChain(blocklet, newWallet);
+  // should not throw error because signAccountMigrateTx is already happened
+  try {
+    await ensureAccountOnMainChain(blocklet, newWallet);
+  } catch (error) {
+    logger.error('ensureAccountOnMainChain failed', { error });
+  }
 };
 
 const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}, manager, states }) => {
@@ -381,6 +389,18 @@ const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}
   );
   siteData.domainAliases.push({ value: getIpDnsDomainForBlocklet(blockletData), isProtected: true });
 
+  await lock.acquire();
+  // check if blocklet already migrated
+  try {
+    const checkBlocklet = await manager.getBlocklet(did, { throwOnNotExist: true, ensureIntegrity: false });
+    if (checkBlocklet.structVersion) {
+      throw new Error('Blocklet already migrated in a few seconds', pick(oldBlocklet, ['structVersion', 'externalSk']));
+    }
+  } catch (error) {
+    lock.release();
+    throw error;
+  }
+
   // update state
   let newBlocklet;
   try {
@@ -443,28 +463,35 @@ const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}
       retries: 3,
       onFailedAttempt: console.error,
     });
+    lock.release();
   } catch (error) {
     logger.error('Migrate application state failed: ', { did, error });
 
-    await states.blocklet.remove({ _id: backupBlocklet._id });
-    await states.blocklet.remove({ 'meta.did': blockletData.meta.did });
-    await states.blocklet.insert(backupBlocklet);
-    await states.blockletExtras.remove({ _id: backupExtra._id });
-    await states.blockletExtras.insert(backupExtra);
-    await states.site.remove({ _id: backupSite._id });
-    await states.site.insert(backupSite);
-
-    logger.info('Rollback application state');
+    try {
+      await states.blocklet.remove({ _id: backupBlocklet._id });
+      await states.blocklet.remove({ 'meta.did': blockletData.meta.did });
+      await states.blocklet.insert(backupBlocklet);
+      await states.blockletExtras.remove({ _id: backupExtra._id });
+      await states.blockletExtras.insert(backupExtra);
+      await states.site.remove({ _id: backupSite._id });
+      await states.site.insert(backupSite);
+
+      logger.info('Rollback application state');
+
+      // rollback data
+      fs.ensureDirSync(dataDirSrc);
+      for (let i = currentMoveIndex; i >= 0; i--) {
+        const { src, dist } = sortedDataMoveList[i];
+        fs.moveSync(dist, src);
+      }
+      fs.removeSync(dataDirDist);
 
-    // rollback data
-    fs.ensureDirSync(dataDirSrc);
-    for (let i = currentMoveIndex; i >= 0; i--) {
-      const { src, dist } = sortedDataMoveList[i];
-      fs.moveSync(dist, src);
+      logger.info('Rollback application data');
+    } catch (err) {
+      logger.error('Rollback application failed', { error, err });
     }
-    fs.removeSync(dataDirDist);
 
-    logger.info('Rollback application data');
+    lock.release();
 
     throw error;
   }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.2",
+  "version": "1.16.3",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.2",
-    "@abtnode/certificate-manager": "1.16.2",
-    "@abtnode/constant": "1.16.2",
-    "@abtnode/cron": "1.16.2",
-    "@abtnode/db": "1.16.2",
-    "@abtnode/logger": "1.16.2",
-    "@abtnode/queue": "1.16.2",
-    "@abtnode/rbac": "1.16.2",
-    "@abtnode/router-provider": "1.16.2",
-    "@abtnode/static-server": "1.16.2",
-    "@abtnode/timemachine": "1.16.2",
-    "@abtnode/util": "1.16.2",
+    "@abtnode/auth": "1.16.3",
+    "@abtnode/certificate-manager": "1.16.3",
+    "@abtnode/constant": "1.16.3",
+    "@abtnode/cron": "1.16.3",
+    "@abtnode/db": "1.16.3",
+    "@abtnode/logger": "1.16.3",
+    "@abtnode/queue": "1.16.3",
+    "@abtnode/rbac": "1.16.3",
+    "@abtnode/router-provider": "1.16.3",
+    "@abtnode/static-server": "1.16.3",
+    "@abtnode/timemachine": "1.16.3",
+    "@abtnode/util": "1.16.3",
     "@arcblock/did": "1.18.65",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.18.65",
@@ -38,9 +38,9 @@
     "@arcblock/jwt": "^1.18.65",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.18.65",
-    "@blocklet/constant": "1.16.2",
-    "@blocklet/meta": "1.16.2",
-    "@blocklet/sdk": "1.16.2",
+    "@blocklet/constant": "1.16.3",
+    "@blocklet/meta": "1.16.3",
+    "@blocklet/sdk": "1.16.3",
     "@did-space/client": "^0.2.45",
     "@fidm/x509": "^1.2.1",
     "@ocap/client": "1.18.65",
@@ -93,5 +93,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "a5047fb5b8673d33dfce92cee06687a42d3ac07a"
+  "gitHead": "a21d48225c6f89963796871f404a2318a335701d"
 }