@abtnode/core 1.8.66-beta-7f4224af → 1.8.66-beta-b56e3b54

package/lib/blocklet/manager/disk.js

@@ -243,7 +243,7 @@ class BlockletManager extends BaseBlockletManager {
    *  title: string;
    *  description: string;
    *  storeUrl: string;
-   *  blockletSecretKey: string;
+   *  appSk: string;
    *  sync: boolean = false; // download synchronously, not use queue
    *  delay: number; // push download task to queue after a delay
    *  downloadTokenList: Array<{did: string, token: string}>;
@@ -280,28 +280,31 @@ class BlockletManager extends BaseBlockletManager {
       context.startImmediately = !!params.startImmediately;
     }
 
+    const { appSk } = params;
+
     if (type === BLOCKLET_INSTALL_TYPE.URL) {
       const { url, controller, sync, delay } = params;
-      return this._installFromUrl({ url, controller, sync, delay }, context);
+      return this._installFromUrl({ url, controller, sync, delay, appSk }, context);
     }
 
     if (type === BLOCKLET_INSTALL_TYPE.UPLOAD) {
       const { file, did, diffVersion, deleteSet } = params;
-      return this._installFromUpload({ file, did, diffVersion, deleteSet, context });
+      return this._installFromUpload({ file, did, diffVersion, deleteSet, appSk }, context);
     }
 
     if (type === BLOCKLET_INSTALL_TYPE.STORE) {
       const { did, controller, sync, delay, storeUrl } = params;
-      return this._installFromStore({ did, controller, sync, delay, storeUrl }, context);
+      return this._installFromStore({ did, controller, sync, delay, storeUrl, appSk }, context);
     }
 
     if (type === BLOCKLET_INSTALL_TYPE.CREATE) {
-      return this._installFromCreate({ title: params.title, description: params.description }, context);
+      const { title, description } = params;
+      return this._installFromCreate({ title, description, appSk }, context);
     }
 
     if (type === BLOCKLET_INSTALL_TYPE.RESTORE) {
-      const { url, blockletSecretKey } = params;
-      return this._installFromBackup({ url, blockletSecretKey }, context);
+      const { url } = params;
+      return this._installFromBackup({ url, appSk }, context);
     }
 
     // should not be here
@@ -624,7 +627,7 @@ class BlockletManager extends BaseBlockletManager {
     // FIXME: 需要改成队列执行，本次失败，下次还需要重试，页面刷新后也能知道最新的状态
     await this._installFromBackup({
       url: `file://${spacesRestore.blockletRestoreDir}`,
-      blockletSecretKey: spacesRestore.blockletWallet.secretKey,
+      appSk: spacesRestore.blockletWallet.secretKey,
       moveDir: true,
     });
   }
@@ -997,7 +1000,7 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   // eslint-disable-next-line no-unused-vars
-  async config({ did, configs: newConfigs, skipHook }, context) {
+  async config({ did, configs: newConfigs, skipHook, skipDidDocument }, context) {
     if (!Array.isArray(newConfigs)) {
       throw new Error('configs list is not an array');
     }
@@ -1057,7 +1060,7 @@ class BlockletManager extends BaseBlockletManager {
       [BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK, BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_WALLET_TYPE].includes(item.key)
     );
 
-    if (isSkOrWalletTypeChanged) {
+    if (isSkOrWalletTypeChanged && !skipDidDocument) {
       await this._updateDidDocument(blocklet);
     }
 
@@ -1672,13 +1675,13 @@ class BlockletManager extends BaseBlockletManager {
    *  /blocklet.json
    *  /blocklet_extras.json
    * @see Blocklet 端到端备份方案的设计与实现（一期） https://team.arcblock.io/comment/discussions/e62084d5-fafa-489e-91d5-defcd6e93223
-   * @param {{ url: string, blockletSecretKey: string, moveDir: boolean}} [{ url }={}]
+   * @param {{ url: string, appSk: string, moveDir: boolean}} [{ url }={}]
    * @param {Record<string, string>} [context={}]
    * @return {Promise<any>}
    * @memberof BlockletManager
    */
-  async _installFromBackup({ url, blockletSecretKey, moveDir } = {}, context = {}) {
-    return installFromBackup({ url, blockletSecretKey, moveDir, context, manager: this, states });
+  async _installFromBackup({ url, appSk, moveDir } = {}, context = {}) {
+    return installFromBackup({ url, appSk, moveDir, context, manager: this, states });
   }
 
   async ensureBlocklet(did, opts = {}) {
@@ -2077,17 +2080,18 @@ class BlockletManager extends BaseBlockletManager {
    *
    * @param {{
    *  did: string;
-   *  registry: string;
    *  sync: boolean;
    *  delay: number;
    *  controller: Controller;
+   *  appSk: string;
+   *  storeUrl: string;
    * }} params
    * @param {*} context
    * @return {*}
    * @memberof BlockletManager
    */
   async _installFromStore(params, context) {
-    const { did, storeUrl, sync, delay, controller } = params;
+    const { did, storeUrl, sync, delay, controller, appSk } = params;
 
     logger.debug('start install blocklet', { did });
     if (!isValidDid(did)) {
@@ -2131,6 +2135,7 @@ class BlockletManager extends BaseBlockletManager {
       sync,
       delay,
       controller,
+      appSk,
       context,
     });
   }
@@ -2147,13 +2152,14 @@ class BlockletManager extends BaseBlockletManager {
    *  sync: boolean;
    *  delay: number;
    *  controller: Controller;
+   *  appSk: string;
    * }} params
    * @param {{}} context
    * @return {*}
    * @memberof BlockletManager
    */
   async _installFromUrl(params, context) {
-    const { url, sync, delay, controller } = params;
+    const { url, sync, delay, controller, appSk } = params;
 
     logger.debug('start install blocklet', { url });
 
@@ -2178,7 +2184,7 @@ class BlockletManager extends BaseBlockletManager {
         return this.upgrade({ did: blockletDid, storeUrl: registryUrl, sync, delay }, context);
       }
 
-      return this._installFromStore({ did: bundleDid, storeUrl: registryUrl, controller, sync, delay }, context);
+      return this._installFromStore({ did: bundleDid, storeUrl: registryUrl, controller, sync, delay, appSk }, context);
     }
 
     const meta = ensureMeta(bundleMeta, { name: blockletName, did: blockletDid });
@@ -2204,6 +2210,7 @@ class BlockletManager extends BaseBlockletManager {
       sync,
       delay,
       controller,
+      appSk,
       context,
     });
   }
@@ -2308,7 +2315,7 @@ class BlockletManager extends BaseBlockletManager {
     );
   }
 
-  async _installFromCreate({ title, description }, context = {}) {
+  async _installFromCreate({ title, description, appSk }, context = {}) {
     logger.debug('create blocklet', { title, description });
 
     await joi.string().label('title').max(20).required().validateAsync(title);
@@ -2336,11 +2343,9 @@ class BlockletManager extends BaseBlockletManager {
     };
     const meta = validateMeta(rawMeta);
 
-    await states.blocklet.addBlocklet({
-      meta,
-      source: BlockletSource.custom,
-    });
+    await states.blocklet.addBlocklet({ meta, source: BlockletSource.custom });
     await this._setConfigsFromMeta(did);
+    await this._setAppSk(did, appSk);
 
     // check duplicate appSk
     await checkDuplicateAppSk({ did, states });
@@ -2380,7 +2385,7 @@ class BlockletManager extends BaseBlockletManager {
     return { cwd, tarFile };
   }
 
-  async _installFromUpload({ file, did, diffVersion, deleteSet, context }) {
+  async _installFromUpload({ file, did, diffVersion, deleteSet, appSk }, context) {
     logger.info('install blocklet', { from: 'upload file' });
     const { tarFile } = await this._downloadFromUpload(file);
 
@@ -2478,6 +2483,7 @@ class BlockletManager extends BaseBlockletManager {
     const oldState = { extraState: oldExtraState };
     try {
       await this._setConfigsFromMeta(meta.did);
+      await this._setAppSk(appSk);
       await validateBlocklet(blocklet);
 
       // check duplicate appSk
@@ -2774,6 +2780,7 @@ class BlockletManager extends BaseBlockletManager {
    *  meta: {}; // blocklet meta
    *  source: number; // example: BlockletSource.registry,
    *  deployedFrom: string;
+   *  appSk: string;
    *  context: {}
    *  sync: boolean = false;
    *  delay: number;
@@ -2783,7 +2790,7 @@ class BlockletManager extends BaseBlockletManager {
    * @memberof BlockletManager
    */
   async _install(params) {
-    const { meta, source, deployedFrom, context, sync, delay, controller } = params;
+    const { meta, source, deployedFrom, context, sync, delay, controller, appSk } = params;
 
     validateBlockletMeta(meta, { ensureDist: true });
 
@@ -2811,6 +2818,7 @@ class BlockletManager extends BaseBlockletManager {
       await states.blockletExtras.addMeta({ did, meta: { did, name }, controller });
 
       await this._setConfigsFromMeta(did);
+      await this._setAppSk(did, appSk);
 
       // check duplicate appSk
       await checkDuplicateAppSk({ did, states });
@@ -3408,6 +3416,24 @@ class BlockletManager extends BaseBlockletManager {
     }
   }
 
+  async _setAppSk(did, appSk, context) {
+    if (process.env.NODE_ENV === 'production' && !appSk) {
+      throw new Error(`appSk for blocklet ${did} is required`);
+    }
+
+    if (appSk) {
+      await this.config(
+        {
+          did,
+          configs: [{ key: 'BLOCKLET_APP_SK', value: appSk, secure: true }],
+          skipHook: true,
+          skipDidDocument: true,
+        },
+        context
+      );
+    }
+  }
+
   async _findNextCustomBlockletName(leftTimes = 10) {
     if (leftTimes <= 0) {
       throw new Error('Generate custom blocklet did too many times');

package/lib/blocklet/manager/helper/install-from-backup.js

@@ -19,7 +19,7 @@ const { validateBlocklet, checkDuplicateAppSk, getAppDirs } = require('../../../
  * }} param0
  * @returns
  */
-module.exports = async ({ url, blockletSecretKey, moveDir, context = {}, states, manager } = {}) => {
+module.exports = async ({ url, appSk, moveDir, context = {}, states, manager } = {}) => {
   // TODO: support more url schema feature (http, did-spaces)
   if (!url.startsWith('file://')) {
     throw new Error('url must starts with file://');
@@ -71,17 +71,17 @@ module.exports = async ({ url, blockletSecretKey, moveDir, context = {}, states,
     throw new Error('blocklet is already exist');
   }
 
-  if (blockletSecretKey) {
+  if (appSk) {
     extra.configs = extra.configs || [];
     const skConfig = extra.configs.find((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK);
     if (skConfig) {
-      skConfig.value = blockletSecretKey;
+      skConfig.value = appSk;
       skConfig.secure = true;
       skConfig.shared = false;
     } else {
       extra.configs.push({
         key: BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK,
-        value: blockletSecretKey,
+        value: appSk,
         secure: true,
         shared: false,
       });

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

@@ -150,10 +150,10 @@ class SpacesBackup {
     const { errorCount } = await spaceClient.send(
       new SyncFolderPushCommand({
         source: join(this.blockletBackupDir, '/'),
-        target: join('.did-objects', this.blocklet.appDid),
+        target: join('.did-objects', this.blocklet.appDid, '/'),
         debug: true,
         concurrency: 32,
-        retryCount: 100,
+        retryCount: 10,
         filter: (object) => {
           return object.name !== '.DS_Store';
         },

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

@@ -1,4 +1,4 @@
-const { existsSync, remove } = require('fs-extra');
+const { existsSync, remove, ensureDirSync } = require('fs-extra');
 const { join } = require('path');
 const fg = require('fast-glob');
 const { BaseRestore } = require('./base');
@@ -10,8 +10,11 @@ class BlockletsRestore extends BaseRestore {
   async import() {
     const blockletsDir = join(this.blockletRestoreDir, this.filename);
 
+    // blockletsDir 可以不存在, 因为还原的 blocklet 可能所有的组件都是来自 store 的
     if (!existsSync(blockletsDir)) {
-      throw new Error(`dir not found: ${blockletsDir}`);
+      // FIXME: 如果文件夹不存在，需要创建文件夹，因为 installFromBackup 未做容错处理
+      ensureDirSync(blockletsDir);
+      return;
     }
 
     const paths = await fg('**/*.zip', {

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

@@ -1,7 +1,7 @@
 /**
  * @typedef {{
  *  endpoint: string;
- *  blockletSecretKey: string;
+ *  appSk: string;
  * }} SpaceRestoreInput
  */
 
@@ -98,7 +98,7 @@ class SpacesRestore {
 
   async getBlockletWallet() {
     // @FIXME: blocklet 钱包类型如何得知呢？
-    const wallet = fromSecretKey(this.input.blockletSecretKey, WalletType({ role: types.RoleType.ROLE_APPLICATION }));
+    const wallet = fromSecretKey(this.input.appSk, WalletType({ role: types.RoleType.ROLE_APPLICATION }));
 
     return wallet;
   }
@@ -115,10 +115,10 @@ class SpacesRestore {
     const { errorCount } = await spaceClient.send(
       new SyncFolderPullCommand({
         source: join('.did-objects', this.blockletWallet.address, '/'),
-        target: this.blockletRestoreDir,
+        target: join(this.blockletRestoreDir, '/'),
         debug: true,
         concurrency: 32,
-        retryCount: 100,
+        retryCount: 10,
       })
     );
 

package/lib/event.js

@@ -81,7 +81,7 @@ module.exports = ({
     }
   };
 
-  const handleBlockletAdd = async (name, { blocklet, context }) => {
+  const handleBlockletInstall = async (name, { blocklet, context }) => {
     try {
       const changed = await ensureBlockletRouting(blocklet, context);
       if (changed) {
@@ -173,7 +173,7 @@ module.exports = ({
     const blocklet = payload.blocklet || payload;
 
     if ([BlockletEvents.installed].includes(eventName)) {
-      await handleBlockletAdd(eventName, payload);
+      await handleBlockletInstall(eventName, payload);
 
       try {
         await node.createAuditLog({

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.66-beta-7f4224af",
+  "version": "1.8.66-beta-b56e3b54",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,33 +19,33 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.66-beta-7f4224af",
-    "@abtnode/certificate-manager": "1.8.66-beta-7f4224af",
-    "@abtnode/constant": "1.8.66-beta-7f4224af",
-    "@abtnode/cron": "1.8.66-beta-7f4224af",
-    "@abtnode/db": "1.8.66-beta-7f4224af",
-    "@abtnode/logger": "1.8.66-beta-7f4224af",
-    "@abtnode/queue": "1.8.66-beta-7f4224af",
-    "@abtnode/rbac": "1.8.66-beta-7f4224af",
-    "@abtnode/router-provider": "1.8.66-beta-7f4224af",
-    "@abtnode/static-server": "1.8.66-beta-7f4224af",
-    "@abtnode/timemachine": "1.8.66-beta-7f4224af",
-    "@abtnode/util": "1.8.66-beta-7f4224af",
-    "@arcblock/did": "1.18.47",
+    "@abtnode/auth": "1.8.66-beta-b56e3b54",
+    "@abtnode/certificate-manager": "1.8.66-beta-b56e3b54",
+    "@abtnode/constant": "1.8.66-beta-b56e3b54",
+    "@abtnode/cron": "1.8.66-beta-b56e3b54",
+    "@abtnode/db": "1.8.66-beta-b56e3b54",
+    "@abtnode/logger": "1.8.66-beta-b56e3b54",
+    "@abtnode/queue": "1.8.66-beta-b56e3b54",
+    "@abtnode/rbac": "1.8.66-beta-b56e3b54",
+    "@abtnode/router-provider": "1.8.66-beta-b56e3b54",
+    "@abtnode/static-server": "1.8.66-beta-b56e3b54",
+    "@abtnode/timemachine": "1.8.66-beta-b56e3b54",
+    "@abtnode/util": "1.8.66-beta-b56e3b54",
+    "@arcblock/did": "1.18.52",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.18.47",
-    "@arcblock/event-hub": "1.18.47",
-    "@arcblock/jwt": "^1.18.47",
+    "@arcblock/did-util": "1.18.52",
+    "@arcblock/event-hub": "1.18.52",
+    "@arcblock/jwt": "^1.18.52",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.18.47",
-    "@blocklet/constant": "1.8.66-beta-7f4224af",
-    "@blocklet/meta": "1.8.66-beta-7f4224af",
-    "@blocklet/sdk": "1.8.66-beta-7f4224af",
-    "@did-space/client": "^0.1.73",
+    "@arcblock/vc": "1.18.52",
+    "@blocklet/constant": "1.8.66-beta-b56e3b54",
+    "@blocklet/meta": "1.8.66-beta-b56e3b54",
+    "@blocklet/sdk": "1.8.66-beta-b56e3b54",
+    "@did-space/client": "^0.1.76",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.47",
-    "@ocap/util": "1.18.47",
-    "@ocap/wallet": "1.18.47",
+    "@ocap/mcrypto": "1.18.52",
+    "@ocap/util": "1.18.52",
+    "@ocap/wallet": "1.18.52",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -72,7 +72,6 @@
     "pm2": "^5.2.0",
     "semver": "^7.3.8",
     "shelljs": "^0.8.5",
-    "slugify": "^1.6.5",
     "ssri": "^8.0.1",
     "stream-throttle": "^0.1.3",
     "stream-to-promise": "^3.0.0",
@@ -90,5 +89,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "72d418f63ecb76b1d5d62edbcc5f336cb62bf308"
+  "gitHead": "4d95b431526128c14cd04c0741cac423afce8f48"
 }