@abtnode/core 1.8.69-beta-76f8a46f → 1.8.69-beta-650a290b

package/lib/blocklet/manager/disk.js

@@ -357,7 +357,7 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   async diff({ did, hashFiles, rootDid }) {
-    return diff({ did, hashFiles, rootDid, states });
+    return diff({ did, hashFiles, rootDid, states, manager: this });
   }
 
   /**

package/lib/blocklet/manager/helper/install-component-from-dev.js

@@ -34,7 +34,11 @@ const installComponentFromDev = async ({ folder, meta, rootDid, mountPoint, mana
     await manager.deleteComponent({ did, rootDid });
   }
 
-  const defaultPath = formatName(meta.name);
+  let defaultPath = formatName(meta.name);
+  if (!existRoot.children.map((x) => x.mountPoint).includes('/')) {
+    defaultPath = '';
+  }
+
   const component = {
     meta: ensureMeta(meta),
     mountPoint: mountPoint || `/${defaultPath}`,

package/lib/blocklet/manager/helper/install-component-from-upload.js

@@ -118,7 +118,7 @@ const installComponentFromUpload = async ({
   return manager.getBlocklet(newBlocklet.meta.did);
 };
 
-const diff = async ({ did, hashFiles: clientFiles, rootDid: inputRootDid, states }) => {
+const diff = async ({ did, hashFiles: clientFiles, rootDid: inputRootDid, states, manager }) => {
   if (!did) {
     throw new Error('did is empty');
   }
@@ -154,7 +154,7 @@ const diff = async ({ did, hashFiles: clientFiles, rootDid: inputRootDid, states
   }
 
   const { version } = state.meta;
-  const bundleDir = getBundleDir(this.installDir, state.meta);
+  const bundleDir = getBundleDir(manager.installDir, state.meta);
   const { addSet, changeSet, deleteSet } = await getDiffFiles(clientFiles, bundleDir);
 
   logger.info('Diff files', {

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

@@ -1,10 +1,12 @@
 const path = require('path');
 const fs = require('fs-extra');
 const pick = require('lodash/pick');
+const pRetry = require('p-retry');
+const Client = require('@ocap/client');
 
 const logger = require('@abtnode/logger')('@abtnode/core:migrate-application-to-struct-v2');
 
-const { forEachBlockletSync, getSharedConfigObj } = require('@blocklet/meta/lib/util');
+const { forEachBlockletSync, getSharedConfigObj, getChainInfo } = require('@blocklet/meta/lib/util');
 const { SLOT_FOR_IP_DNS_SITE } = require('@abtnode/constant');
 
 const {
@@ -25,7 +27,9 @@ const {
   BLOCKLET_UPLOADS_DIR,
 } = require('@blocklet/constant');
 const { update: updateMetaFile } = require('@blocklet/meta/lib/file');
+const getBlockletWallet = require('@blocklet/meta/lib/wallet');
 const { cloneDeep } = require('lodash');
+
 const { isInProgress } = require('../../../util');
 const { getBlockletDomainGroupName } = require('../../../util/router');
 const { getIpDnsDomainForBlocklet } = require('../../../util/get-domain-for-blocklet');
@@ -87,23 +91,79 @@ const fillBlockletData = (data, app, id) => {
 
 const appSystemFiles = ['logo.svg', 'rbac.db', 'session.db', 'user.db', '.assets', BLOCKLET_UPLOADS_DIR];
 
+const migrateAppOnChain = async (blocklet, oldSk, newSk) => {
+  logger.info('Preparing for on-chain migration', { did: blocklet.meta.did });
+  if (!oldSk) {
+    logger.info('on-chain migration aborted because oldSk is empty', { did: blocklet.meta.did });
+    return;
+  }
+
+  if (!newSk) {
+    logger.info('on-chain migration aborted because newSk is empty', { did: blocklet.meta.did });
+    return;
+  }
+
+  // ensure chain host
+  const chainInfo = getChainInfo(blocklet.configObj);
+  if (chainInfo.host === 'none') {
+    logger.info('on-chain migration aborted because CHAIN_HOST is empty', { did: blocklet.meta.did });
+    return;
+  }
+
+  logger.info('on-chain migration for chain ', { did: blocklet.meta.did, host: chainInfo.host });
+
+  // ensure account changed
+  const type = blocklet.configObj.BLOCKLET_WALLET_TYPE;
+  const oldWallet = getBlockletWallet(oldSk, undefined, type);
+  const newWallet = getBlockletWallet(newSk, undefined, type);
+  if (oldWallet.address === newWallet.address) {
+    logger.info('on-chain migration aborted because newSk same with oldSk', { did: blocklet.meta.did });
+    return;
+  }
+
+  // ensure old account exist on chain
+  const client = new Client(chainInfo.host);
+  const oldResult = await client.getAccountState({ address: oldWallet.address });
+  if (!oldResult.state) {
+    logger.info('on-chain migration aborted because oldSk not declared on chain', { did: blocklet.meta.did });
+    return;
+  }
+
+  // ensure new account not exist on chain
+  const newResult = await client.getAccountState({ address: newWallet.address });
+  if (newResult.state) {
+    logger.info('on-chain migration aborted because newSk declared on chain', { did: blocklet.meta.did });
+    return;
+  }
+
+  logger.info('on-chain migration for wallets', { oldAddress: oldWallet.address, newAddress: newWallet.address });
+
+  // migrate old account to new account
+  const tx = await client.signAccountMigrateTx({
+    tx: {
+      itx: {
+        address: newWallet.address,
+        pk: newWallet.publicKey,
+      },
+    },
+    wallet: oldWallet,
+  });
+  const hash = await client.sendAccountMigrateTx({ tx, wallet: oldWallet });
+  logger.info('on-chain migration done', { did: blocklet.meta.did, hash });
+};
+
 const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}, manager, states }) => {
   logger.info('Preparing data for migration', { did });
 
   if (!newAppSk) {
-    throw new Error('appSk is required');
+    throw new Error('New key pair is required when migrate application');
   }
 
   const oldBlocklet = await manager.getBlocklet(did, { throwOnNotExist: true, ensureIntegrity: true });
-
-  if (oldBlocklet.structVersion || oldBlocklet.externalSk) {
+  if (oldBlocklet.structVersion) {
     throw new Error('Blocklet already migrated', pick(oldBlocklet, ['structVersion', 'externalSk']));
   }
 
-  if (oldBlocklet.migratedFrom?.length) {
-    throw new Error('Blocklet already migrated');
-  }
-
   if (isInProgress(oldBlocklet.status) || oldBlocklet.status === BlockletStatus.running) {
     throw new Error('Please stop blocklet before migration');
   }
@@ -115,25 +175,26 @@ const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}
   const backupExtra = cloneDeep(extraData);
   const backupSite = await states.site.findOne({ _id: siteData.id });
 
-  const permanentAppDid = oldBlocklet.appDid;
-  const permanentAppSk = oldBlocklet.environmentObj.BLOCKLET_APP_SK;
+  const { appPid } = oldBlocklet;
 
   // change index of extraData
-  extraData.did = permanentAppDid;
+  extraData.did = appPid;
   if (extraData.meta) {
-    extraData.meta.did = permanentAppDid;
-    extraData.meta.name = permanentAppDid;
+    extraData.meta.did = appPid;
+    extraData.meta.name = appPid;
   }
   // fork root component's configs to container
-  // FIXME: the configs in container should be managed in dashboard ?
-  // set permanent appSk first and then migrate to new appSk
-  extraData.configs = (extraData.configs || []).filter((x) => x.name !== BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK);
+  // FIXME: @linchen the configs in container should be managed in dashboard ?
+  extraData.configs = (extraData.configs || []).filter((x) => x.key !== BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK);
+
+  // If appSk not configured before, then set derived appSk as permanent appSk
   extraData.configs.push({
     key: BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK,
-    value: permanentAppSk,
+    value: oldBlocklet.environmentObj.BLOCKLET_APP_SK,
     secure: true,
     shared: false,
   });
+
   // clean children configs
   extraData.children = [];
   // clean dirty data in settings
@@ -145,14 +206,16 @@ const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}
   // delete system generated rules in siteData
   siteData.rules = siteData.rules.filter((rule) => !rule.isProtected && rule.to.did !== oldBlocklet.meta.did);
   // change index of siteData
-  siteData.domain = getBlockletDomainGroupName(permanentAppDid);
+  siteData.domain = getBlockletDomainGroupName(appPid);
 
   const blockletData = {
+    appPid,
     children: [],
+    migratedFrom: Array.isArray(oldBlocklet.migratedFrom) ? cloneDeep(oldBlocklet.migratedFrom) : [],
   };
 
   const dataDirSrc = path.join(oldBlocklet.env.dataDir);
-  const dataDirDist = path.join(manager.dataDirs.data, permanentAppDid);
+  const dataDirDist = path.join(manager.dataDirs.data, appPid);
   if (fs.existsSync(dataDirDist)) {
     throw new Error(`blocklet data dir already exist: ${dataDirDist}`);
   }
@@ -176,13 +239,13 @@ const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}
 
     // If old root component is a container, just skip it
     if (level === 0 && component.meta.group === BlockletGroup.gateway) {
-      fillBlockletData(blockletData, component, permanentAppDid);
+      fillBlockletData(blockletData, component, appPid);
       return;
     }
 
     // If old root component is a blocklet, make it to be level one component
     if (level === 0 && component.meta.group !== BlockletGroup.gateway) {
-      fillBlockletData(blockletData, component, permanentAppDid);
+      fillBlockletData(blockletData, component, appPid);
 
       // add root component to blockletData
       const { source, deployedFrom } = component;
@@ -291,14 +354,14 @@ const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}
   // update state
   let newBlocklet;
   try {
-    logger.info('Start migrate application state', { did, appDid: permanentAppDid });
+    logger.info('Start migrate application state', { did, appPid });
     // delete old db in db proxy
     await manager.teamManager.deleteTeam(oldBlocklet.meta.did);
 
     // re create blocklet
-    await states.blocklet.remove({ appDid: permanentAppDid });
+    await states.blocklet.remove({ appPid });
     await states.blocklet.addBlocklet(blockletData);
-    await states.blocklet.updateStructV1Did(permanentAppDid, oldBlocklet.meta.did);
+    await states.blocklet.updateStructV1Did(appPid, oldBlocklet.meta.did);
 
     // fake install bundle
     const bundleDir = getBundleDir(manager.installDir, blockletData.meta);
@@ -317,11 +380,11 @@ const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}
     await states.blockletExtras.update({ did: oldBlocklet.meta.did }, extraData);
 
     // update environment, generate appDid and appPid
-    await manager._updateBlockletEnvironment(permanentAppDid);
+    await manager._updateBlockletEnvironment(appPid);
 
     // rotate to newAppSk
     await manager.config({
-      did: permanentAppDid,
+      did: appPid,
       configs: [{ key: 'BLOCKLET_APP_SK', value: newAppSk, secure: true }],
       skipHook: true,
       skipDidDocument: true,
@@ -333,7 +396,7 @@ const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}
       { $set: { domain: siteData.domain, domainAliases: siteData.domainAliases, rules: siteData.rules } }
     );
 
-    newBlocklet = await manager.getBlocklet(permanentAppDid);
+    newBlocklet = await manager.getBlocklet(appPid);
 
     logger.info('Start migrate application data', { sortedDataMoveList });
 
@@ -344,6 +407,12 @@ const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}
       fs.moveSync(src, dist);
       currentMoveIndex = i;
     }
+
+    // migrate on-chain account
+    await pRetry(() => migrateAppOnChain(oldBlocklet, oldBlocklet.environmentObj.BLOCKLET_APP_SK, newAppSk), {
+      retries: 3,
+      onFailedAttempt: console.error,
+    });
   } catch (error) {
     logger.error('Migrate application state failed: ', { did, error });
 

package/lib/blocklet/storage/restore/blocklets.js

@@ -10,9 +10,7 @@ class BlockletsRestore extends BaseRestore {
   async import() {
     const blockletsDir = join(this.restoreDir, this.filename);
 
-    // blockletsDir 可以不存在, 因为还原的 blocklet 可能所有的组件都是来自 store 的
     if (!existsSync(blockletsDir)) {
-      // FIXME: 如果文件夹不存在，需要创建文件夹，因为 installFromBackup 未做容错处理
       ensureDirSync(blockletsDir);
       return;
     }
@@ -23,10 +21,7 @@ class BlockletsRestore extends BaseRestore {
       absolute: true,
     });
 
-    /**
-     * @type {{source: string, target: string}}
-     */
-    const zipConfigs = paths.map((path) => {
+    const configs = paths.map((path) => {
       return {
         source: path,
         target: path.replace(/.zip$/, ''),
@@ -34,9 +29,12 @@ class BlockletsRestore extends BaseRestore {
     });
 
     await Promise.all(
-      zipConfigs.map(async (zipConfig) => {
-        await zipToDir(zipConfig.source, zipConfig.target);
-        await remove(zipConfig.source);
+      configs.map(async ({ source, target }) => {
+        if (!existsSync(target)) {
+          ensureDirSync(target);
+        }
+        await zipToDir(source, target);
+        await remove(source);
       })
     );
   }

package/lib/blocklet/storage/restore/spaces.js

@@ -1,10 +1,10 @@
 /**
  * @typedef {{
- *  appDid: string;
+ *  appDid: string; // --> appPid
  *  endpoint: string;
- *  password: Buffer;
- *  delegation: string;
- *  wallet: import('@ocap/wallet').WalletObject;
+ *  password: Buffer; // derived from (appSk, appDid)
+ *  delegation: string; // from appPid --> serverDid for downloading
+ *  wallet: import('@ocap/wallet').WalletObject; // server wallet
  *  event: import('events').EventEmitter,
  *  userDid: string,
  *  referrer: string,
@@ -15,7 +15,7 @@ const validUrl = require('valid-url');
 const merge = require('lodash/merge');
 const { BlockletEvents } = require('@blocklet/constant');
 const { SpaceClient, RestoreBlockletCommand } = require('@did-space/client');
-const { ensureDirSync, existsSync, rmdirSync } = require('fs-extra');
+const { ensureDirSync, existsSync, rmSync } = require('fs-extra');
 const { join, basename } = require('path');
 
 const logger = require('@abtnode/logger')('@abtnode/core:storage:restore');
@@ -83,7 +83,7 @@ class SpacesRestore {
     this.serverDir = process.env.ABT_NODE_DATA_DIR;
     this.restoreDir = join(this.serverDir, 'tmp/restore', this.input.appDid);
     if (existsSync(this.restoreDir)) {
-      rmdirSync(this.restoreDir, { recursive: true });
+      rmSync(this.restoreDir, { recursive: true });
     }
     ensureDirSync(this.restoreDir);
 

package/lib/util/blocklet.js

@@ -623,6 +623,11 @@ const deleteBlockletProcess = async (blocklet, { preDelete = noop, skippedProces
   await forEachBlocklet(
     blocklet,
     async (b, { ancestors }) => {
+      // NOTICE: 如果不判断 group, 在 github action 中测试 disk.spec.js 时会报错, 但是在 mac 中跑测试不会报错
+      if (b.meta?.group === BlockletGroup.gateway) {
+        return;
+      }
+
       if (skippedProcessIds.includes(b.env.processId)) {
         logger.info(`skip delete process ${b.env.processId}`);
         return;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.69-beta-76f8a46f",
+  "version": "1.8.69-beta-650a290b",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,33 +19,34 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.69-beta-76f8a46f",
-    "@abtnode/certificate-manager": "1.8.69-beta-76f8a46f",
-    "@abtnode/constant": "1.8.69-beta-76f8a46f",
-    "@abtnode/cron": "1.8.69-beta-76f8a46f",
-    "@abtnode/db": "1.8.69-beta-76f8a46f",
-    "@abtnode/logger": "1.8.69-beta-76f8a46f",
-    "@abtnode/queue": "1.8.69-beta-76f8a46f",
-    "@abtnode/rbac": "1.8.69-beta-76f8a46f",
-    "@abtnode/router-provider": "1.8.69-beta-76f8a46f",
-    "@abtnode/static-server": "1.8.69-beta-76f8a46f",
-    "@abtnode/timemachine": "1.8.69-beta-76f8a46f",
-    "@abtnode/util": "1.8.69-beta-76f8a46f",
-    "@arcblock/did": "1.18.58",
+    "@abtnode/auth": "1.8.69-beta-650a290b",
+    "@abtnode/certificate-manager": "1.8.69-beta-650a290b",
+    "@abtnode/constant": "1.8.69-beta-650a290b",
+    "@abtnode/cron": "1.8.69-beta-650a290b",
+    "@abtnode/db": "1.8.69-beta-650a290b",
+    "@abtnode/logger": "1.8.69-beta-650a290b",
+    "@abtnode/queue": "1.8.69-beta-650a290b",
+    "@abtnode/rbac": "1.8.69-beta-650a290b",
+    "@abtnode/router-provider": "1.8.69-beta-650a290b",
+    "@abtnode/static-server": "1.8.69-beta-650a290b",
+    "@abtnode/timemachine": "1.8.69-beta-650a290b",
+    "@abtnode/util": "1.8.69-beta-650a290b",
+    "@arcblock/did": "1.18.59",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.18.58",
-    "@arcblock/event-hub": "1.18.58",
-    "@arcblock/jwt": "^1.18.58",
+    "@arcblock/did-util": "1.18.59",
+    "@arcblock/event-hub": "1.18.59",
+    "@arcblock/jwt": "^1.18.59",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.18.58",
-    "@blocklet/constant": "1.8.69-beta-76f8a46f",
-    "@blocklet/meta": "1.8.69-beta-76f8a46f",
-    "@blocklet/sdk": "1.8.69-beta-76f8a46f",
+    "@arcblock/vc": "1.18.59",
+    "@blocklet/constant": "1.8.69-beta-650a290b",
+    "@blocklet/meta": "1.8.69-beta-650a290b",
+    "@blocklet/sdk": "1.8.69-beta-650a290b",
     "@did-space/client": "^0.2.33",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.58",
-    "@ocap/util": "1.18.58",
-    "@ocap/wallet": "1.18.58",
+    "@ocap/client": "1.18.59",
+    "@ocap/mcrypto": "1.18.59",
+    "@ocap/util": "1.18.59",
+    "@ocap/wallet": "1.18.59",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -69,6 +70,7 @@
     "lru-cache": "^6.0.0",
     "node-stream-zip": "^1.15.0",
     "p-limit": "^3.1.0",
+    "p-retry": "4.6.1",
     "pm2": "^5.2.0",
     "semver": "^7.3.8",
     "shelljs": "^0.8.5",
@@ -89,5 +91,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "07415e674443b85648ea80b734f7a3690abfc15e"
+  "gitHead": "a33c9ce6a52b8d522d13860e85809dcbba236712"
 }