@abtnode/core 1.8.69-beta-650a290b → 1.16.0-beta-b16cb035

package/lib/blocklet/manager/disk.js

@@ -16,7 +16,13 @@ const getBlockletInfo = require('@blocklet/meta/lib/info');
 const sleep = require('@abtnode/util/lib/sleep');
 
 const logger = require('@abtnode/logger')('@abtnode/core:blocklet:manager');
-const { WHO_CAN_ACCESS, WHO_CAN_ACCESS_PREFIX_ROLES, BLOCKLET_INSTALL_TYPE, NODE_MODES } = require('@abtnode/constant');
+const {
+  WHO_CAN_ACCESS,
+  WHO_CAN_ACCESS_PREFIX_ROLES,
+  BLOCKLET_INSTALL_TYPE,
+  NODE_MODES,
+  APP_STRUCT_VERSION,
+} = require('@abtnode/constant');
 
 const getBlockletEngine = require('@blocklet/meta/lib/engine');
 const {
@@ -564,34 +570,19 @@ class BlockletManager extends BaseBlockletManager {
    * @memberof BlockletManager
    */
   // eslint-disable-next-line no-unused-vars
-  async backupToSpaces({ appPid }, context) {
-    // add to queue
-    // const ticket = this.backupQueue.push({
-    //   entity: 'blocklet',
-    //   action: 'backup-to-space',
-    //   appPid,
-    //   context,
-    // });
-
-    // ticket.on('failed', async (err) => {
-    //   logger.error('backup failed', { entity: 'blocklet', appPid, error: err });
-    //   this.emit('blocklet.backup.failed', { appPid, err });
-    //   this._createNotification(appPid, {
-    //     title: 'Blocklet Backup Failed',
-    //     description: `Blocklet backup failed with error: ${err.message || 'queue exception'}`,
-    //     entityType: 'blocklet',
-    //     entityId: appPid,
-    //     severity: 'error',
-    //   });
-    // });
+  async backupToSpaces({ appDid }, context) {
+    const blocklet = await states.blocklet.getBlocklet(appDid);
+    if (blocklet.structVersion !== APP_STRUCT_VERSION) {
+      throw new Error('Only new version app can be backup to spaces, please migrate this app first');
+    }
 
     const userDid = context.user.did;
     const { referrer } = context;
 
-    const spacesBackup = new SpacesBackup({ appPid, event: this, userDid, referrer });
-    this.emit(BlockletEvents.backupProgress, { appPid, message: 'Start backup...', progress: 10, completed: false });
+    const spacesBackup = new SpacesBackup({ appDid, event: this, userDid, referrer });
+    this.emit(BlockletEvents.backupProgress, { appDid, message: 'Start backup...', progress: 10, completed: false });
     await spacesBackup.backup();
-    this.emit(BlockletEvents.backupProgress, { appPid, completed: true, progress: 100 });
+    this.emit(BlockletEvents.backupProgress, { appDid, completed: true, progress: 100 });
   }
 
   /**
@@ -605,9 +596,8 @@ class BlockletManager extends BaseBlockletManager {
     this.emit(BlockletEvents.restoreProgress, { appDid: input.appDid, message: 'Start restore...', completed: false });
 
     const userDid = context.user.did;
-    const { referrer } = context;
 
-    const spacesRestore = new SpacesRestore({ ...input, event: this, userDid, referrer });
+    const spacesRestore = new SpacesRestore({ ...input, event: this, userDid, referrer: context.referrer });
     const params = await spacesRestore.restore();
 
     this.emit(BlockletEvents.restoreProgress, { appDid: input.appDid, message: 'Installing blocklet...' });

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

@@ -441,6 +441,10 @@ const migrateApplicationToStructV2 = async ({ did, appSk: newAppSk, context = {}
 
   // 通过 event 触发 ensureBlockletRouting
   manager.emit(BlockletEvents.installed, { blocklet: newBlocklet, context });
+  manager.emit(BlockletEvents.removed, {
+    blocklet: { meta: { did: oldBlocklet.meta.did } },
+    context: { skipAll: true },
+  });
 };
 
 module.exports = { migrateApplicationToStructV2, sortMoveListBySrc };

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

@@ -1,6 +1,6 @@
 /**
  * @typedef {{
- *  appPid: string
+ *  appDid: string
  *  event: import('events').EventEmitter,
  *  userDid: string,
  *  referrer: string,
@@ -20,7 +20,6 @@ const { SpaceClient, BackupBlockletCommand } = require('@did-space/client');
 const { ensureDirSync } = require('fs-extra');
 const { isEmpty } = require('lodash');
 const { join, basename } = require('path');
-const { signV2 } = require('@arcblock/jwt');
 const { Hasher } = require('@ocap/mcrypto');
 const { toBuffer } = require('@ocap/util');
 const { getAppName, getAppDescription } = require('@blocklet/meta/lib/util');
@@ -109,8 +108,8 @@ class SpacesBackup {
    * @memberof SpacesBackup
    */
   verify(input) {
-    if (isEmpty(input?.appPid) || !isValid(input?.appPid)) {
-      throw new Error(`input.appPid(${input?.appPid}) is not a valid did`);
+    if (isEmpty(input?.appDid) || !isValid(input?.appDid)) {
+      throw new Error(`input.appDid(${input?.appDid}) is not a valid did`);
     }
   }
 
@@ -126,13 +125,13 @@ class SpacesBackup {
   }
 
   async initialize() {
-    this.blocklet = await states.blocklet.getBlocklet(this.input.appPid);
+    this.blocklet = await states.blocklet.getBlocklet(this.input.appDid);
     if (isEmpty(this.blocklet)) {
       throw new Error('blocklet cannot be empty');
     }
 
     this.serverDir = process.env.ABT_NODE_DATA_DIR;
-    this.backupDir = join(this.serverDir, 'tmp/backup', this.blocklet.appPid);
+    this.backupDir = join(this.serverDir, 'tmp/backup', this.blocklet.appDid);
     ensureDirSync(this.backupDir);
 
     this.spaceEndpoint = this.blocklet.environments.find(
@@ -147,7 +146,7 @@ class SpacesBackup {
 
   async export() {
     this.input.event.emit(BlockletEvents.backupProgress, {
-      appPid: this.input.appPid,
+      appDid: this.input.appDid,
       message: 'Preparing data for backup...',
       progress: 15,
       completed: false,
@@ -159,7 +158,7 @@ class SpacesBackup {
       })
     );
     this.input.event.emit(BlockletEvents.backupProgress, {
-      appPid: this.input.appPid,
+      appDid: this.input.appDid,
       message: 'Data ready, start backup...',
       progress: 20,
       completed: false,
@@ -181,7 +180,7 @@ class SpacesBackup {
 
     const { errorCount, message } = await spaceClient.send(
       new BackupBlockletCommand({
-        appDid: this.blocklet.appPid,
+        appDid: this.blocklet.appDid,
         appName: getAppName(this.blocklet),
         appDescription: getAppDescription(this.blocklet),
         userDid: this.input.userDid,
@@ -198,10 +197,10 @@ class SpacesBackup {
           return object.name !== '.DS_Store';
         },
         onProgress: (data) => {
-          logger.info('backup progress', { appDid: this.input.appPid, data });
+          logger.info('backup progress', { appDid: this.input.appDid, data });
           const percent = (data.completed * 100) / data.total;
           this.input.event.emit(BlockletEvents.backupProgress, {
-            appPid: this.input.appPid,
+            appDid: this.input.appDid,
             message: `Uploaded file ${basename(data.key)} (${data.completed}/${data.total})`,
             // 0.8 是因为上传文件到 spaces 占进度的 80%，+ 20 是因为需要累加之前的进度
             progress: +Math.ceil(percent * 0.8).toFixed(2) + 20,
@@ -217,30 +216,19 @@ class SpacesBackup {
   }
 
   async getSecurityContext() {
-    const blocklet = await states.blocklet.getBlocklet(this.input.appPid);
+    const blocklet = await states.blocklet.getBlocklet(this.input.appDid);
     const nodeInfo = await states.node.read();
 
-    const { wallet, permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+    const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
 
     const { secretKey, address } = wallet; // we encrypt using latest wallet, not the permanent wallet
     const password = toBuffer(Hasher.SHA3.hash256(Buffer.concat([secretKey, address].map(toBuffer))));
     const encrypt = (v) => security.encrypt(v, address, password);
     const decrypt = (v) => security.decrypt(v, address, password);
-    const isRotated = permanentWallet.address !== wallet.address;
-
-    const delegation = isRotated
-      ? signV2(permanentWallet.address, permanentWallet.secretKey, {
-          from: permanentWallet.address,
-          to: wallet.address,
-          userPk: permanentWallet.publicKey,
-          permissions: [{ role: 'DIDSpaceAgent', spaces: ['*'] }],
-          exp: Math.floor(new Date().getTime() / 1000) + 60 * 60,
-        })
-      : '';
 
     return {
       signer: wallet,
-      delegation,
+      delegation: '',
       encrypt,
       decrypt,
     };

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

@@ -1,6 +1,8 @@
 const { removeSync, outputJsonSync, readJSONSync } = require('fs-extra');
 const { join } = require('path');
+const { APP_STRUCT_VERSION } = require('@abtnode/constant');
 const security = require('@abtnode/util/lib/security');
+
 const { BaseRestore } = require('./base');
 
 class BlockletRestore extends BaseRestore {
@@ -42,7 +44,12 @@ class BlockletRestore extends BaseRestore {
   }
 
   getImportParams() {
-    return { salt: this.getBlocklet().appDid };
+    const blocklet = this.getBlocklet();
+    if (blocklet.structVersion !== APP_STRUCT_VERSION) {
+      throw new Error('Only new version backup can be restored to this server');
+    }
+
+    return { salt: blocklet.appDid };
   }
 }
 

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

@@ -1,9 +1,9 @@
 /**
  * @typedef {{
- *  appDid: string; // --> appPid
+ *  appDid: string; // --> appDid
  *  endpoint: string;
  *  password: Buffer; // derived from (appSk, appDid)
- *  delegation: string; // from appPid --> serverDid for downloading
+ *  delegation: string; // from appDid --> serverDid for downloading
  *  wallet: import('@ocap/wallet').WalletObject; // server wallet
  *  event: import('events').EventEmitter,
  *  userDid: string,

package/lib/event.js

@@ -107,6 +107,10 @@ module.exports = ({
   };
 
   const handleBlockletRemove = async (name, { blocklet, context }) => {
+    if (context?.skipAll) {
+      return;
+    }
+
     try {
       const changed = await removeBlockletRouting(blocklet, context);
 

package/lib/util/blocklet.js

@@ -309,7 +309,7 @@ const getAppSystemEnvironments = (blocklet, nodeInfo) => {
   }
 
   return {
-    BLOCKLET_DID: did,
+    BLOCKLET_DID: did, // BLOCKLET_DID is always same as BLOCKLET_APP_PID in structV2 application
     BLOCKLET_APP_SK: appSk,
     BLOCKLET_APP_ID: appId,
     BLOCKLET_APP_PSK: appPsk, // permanent sk even the blocklet has been migrated

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.69-beta-650a290b",
+  "version": "1.16.0-beta-b16cb035",
   "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.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",
+    "@abtnode/auth": "1.16.0-beta-b16cb035",
+    "@abtnode/certificate-manager": "1.16.0-beta-b16cb035",
+    "@abtnode/constant": "1.16.0-beta-b16cb035",
+    "@abtnode/cron": "1.16.0-beta-b16cb035",
+    "@abtnode/db": "1.16.0-beta-b16cb035",
+    "@abtnode/logger": "1.16.0-beta-b16cb035",
+    "@abtnode/queue": "1.16.0-beta-b16cb035",
+    "@abtnode/rbac": "1.16.0-beta-b16cb035",
+    "@abtnode/router-provider": "1.16.0-beta-b16cb035",
+    "@abtnode/static-server": "1.16.0-beta-b16cb035",
+    "@abtnode/timemachine": "1.16.0-beta-b16cb035",
+    "@abtnode/util": "1.16.0-beta-b16cb035",
     "@arcblock/did": "1.18.59",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.18.59",
@@ -38,9 +38,9 @@
     "@arcblock/jwt": "^1.18.59",
     "@arcblock/pm2-events": "^0.0.5",
     "@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",
+    "@blocklet/constant": "1.16.0-beta-b16cb035",
+    "@blocklet/meta": "1.16.0-beta-b16cb035",
+    "@blocklet/sdk": "1.16.0-beta-b16cb035",
     "@did-space/client": "^0.2.33",
     "@fidm/x509": "^1.2.1",
     "@ocap/client": "1.18.59",
@@ -91,5 +91,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "a33c9ce6a52b8d522d13860e85809dcbba236712"
+  "gitHead": "138bd91aee5a35b28c2de4e1e924c44932efaf3a"
 }