@abtnode/core 1.8.69-beta-b0bb2d67 → 1.8.69-beta-76f8a46f

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

@@ -171,7 +171,7 @@ class SpacesBackup {
      * @type {import('@abtnode/client').NodeState}
      */
     const node = await states.node.read();
-    const nodeDid = node.did;
+    const serverDid = node.did;
 
     const spaceClient = new SpaceClient({
       endpoint: this.spaceEndpoint,
@@ -186,7 +186,8 @@ class SpacesBackup {
         appDescription: getAppDescription(this.blocklet),
         userDid: this.input.userDid,
         referrer: this.input.referrer,
-        nodeDid,
+        serverDid,
+        signerDid: this.securityContext.signer.address,
 
         source: join(this.backupDir, '/'),
         debug: true,
@@ -221,22 +222,21 @@ class SpacesBackup {
 
     const { wallet, permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
 
-    // FIXME: @wangshijun migrated apps can not be restored, need to change core/webapp/api/routes/auth/verify-app-ownership.js
     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 delegation =
-      permanentWallet.address !== wallet.address
-        ? 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,
-          })
-        : '';
+    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,

package/lib/index.js

@@ -32,6 +32,7 @@ const pm2Events = require('./blocklet/manager/pm2-events');
 const { createStateReadyQueue, createStateReadyHandler } = require('./util/ready');
 const { createDataArchive } = require('./util/blocklet');
 const { toStatus, fromStatus, ensureDataDirs, getQueueConcurrencyByMem, getStateCrons } = require('./util');
+const getMetaFromUrl = require('./util/get-meta-from-url');
 
 /**
  * @param {object} options
@@ -219,14 +220,12 @@ function ABTNode(options) {
     deleteBlocklet: blockletManager.delete.bind(blockletManager),
     deleteComponent: blockletManager.deleteComponent.bind(blockletManager),
     cancelDownloadBlocklet: blockletManager.cancelDownload.bind(blockletManager),
-    upgradeBlocklet: blockletManager.upgrade.bind(blockletManager),
     configBlocklet: blockletManager.config.bind(blockletManager),
     devBlocklet: blockletManager.dev.bind(blockletManager),
-    checkComponentsForUpdates: blockletManager.checkChildrenForUpdates.bind(blockletManager),
-    upgradeComponents: blockletManager.updateChildren.bind(blockletManager),
-    getLatestBlockletVersion: blockletManager.getLatestBlockletVersion.bind(blockletManager),
-    getBlockletMetaFromUrl: blockletManager.getMetaFromUrl.bind(blockletManager),
-    getBlockletByBundle: blockletManager.getBlockletByBundle.bind(blockletManager),
+    checkComponentsForUpdates: blockletManager.checkComponentsForUpdates.bind(blockletManager),
+    upgradeComponents: blockletManager.upgradeComponents.bind(blockletManager),
+    getBlockletMetaFromUrl: getMetaFromUrl.bind(blockletManager),
+    getBlockletForLauncher: blockletManager.getBlockletForLauncher.bind(blockletManager),
     resetBlocklet: blockletManager.reset.bind(blockletManager),
     deleteBlockletProcess: blockletManager.deleteProcess.bind(blockletManager),
     configPublicToStore: blockletManager.configPublicToStore.bind(blockletManager),
@@ -236,6 +235,7 @@ function ABTNode(options) {
     updateComponentMountPoint: blockletManager.updateComponentMountPoint.bind(blockletManager),
     backupToSpaces: blockletManager.backupToSpaces.bind(blockletManager),
     restoreFromSpaces: blockletManager.restoreFromSpaces.bind(blockletManager),
+    migrateApplicationToStructV2: blockletManager.migrateApplicationToStructV2.bind(blockletManager),
 
     // For diagnose purpose
     syncBlockletStatus: blockletManager.status.bind(blockletManager),
@@ -252,7 +252,7 @@ function ABTNode(options) {
 
     // Store
     getBlockletMeta: StoreUtil.getBlockletMeta,
-    getRegistryMeta: StoreUtil.getRegistryMeta,
+    getStoreMeta: StoreUtil.getStoreMeta,
 
     // Node State
     getNodeInfo: nodeAPI.getInfo.bind(nodeAPI),

package/lib/router/helper.js

@@ -65,6 +65,7 @@ const { getFromCache: getAccessibleExternalNodeIp } = require('../util/get-acces
 const Router = require('./index');
 const states = require('../states');
 const { getBlockletDomainGroupName, getDidFromDomainGroupName } = require('../util/router');
+const { getBlockletKnownAs } = require('../util/blocklet');
 
 /**
  * replace 888-888-888-888 with accessible ip for domain
@@ -791,7 +792,8 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
     updateBlockletDocument({
       wallet,
-      blockletAppDid: blocklet.appDid,
+      appPid: blocklet.appPid,
+      alsoKnownAs: getBlockletKnownAs(blocklet),
       daemonDidDomain: getServerDidDomain(nodeInfo),
       didRegistryUrl: nodeInfo.didRegistry,
       domain: nodeInfo.didDomain,
@@ -806,12 +808,8 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     if (!existSite) {
       const domainAliases = [];
 
-      const didDomain = getDidDomainForBlocklet({
-        blockletAppDid: blocklet.appDid,
-        didDomain: nodeInfo.didDomain,
-      });
-
-      const ipEchoDnsDomain = getIpDnsDomainForBlocklet(blocklet, webInterface, nodeInfo.did);
+      const didDomain = getDidDomainForBlocklet({ appPid: blocklet.appPid, didDomain: nodeInfo.didDomain });
+      const ipEchoDnsDomain = getIpDnsDomainForBlocklet(blocklet);
 
       // let didDomain in front of ipEchoDnsDomain
       domainAliases.push({ value: didDomain, isProtected: true }, { value: ipEchoDnsDomain, isProtected: true });

package/lib/states/blocklet-extras.js

@@ -14,6 +14,50 @@ const { validateAddMeta, validateExpiredInfo } = require('../validators/blocklet
 
 const noop = (k) => (v) => v[k];
 
+// type Settings = {
+//   whoCanAccess: string;
+//   initialized: boolean;
+//   owner: {
+//     did: string;
+//     pk: string;
+//   };
+//   storeList: Array<getStoreMeta & {
+//     protected: boolean,
+//     url: string,
+//   }>; // 在 blocklet dashboard 添加组件时的商店列表
+//   navigations: any;
+//   trustedPassports: any;
+//   enablePassportIssuance: boolean;
+//   children: Array<any>; // deleted children
+//   publicToStore: boolean;
+//   navigation: Array[{
+//     title: string;
+//     child: DID | Name;
+//   }]; // deprecated
+// };
+
+// type Configs = {
+//   [componentDid: string]: Config;
+// };
+
+// type Children = Array<{
+//   did: string, // application index
+//   configs: Configs,
+//   children: Children
+// }>;
+
+// type ExtraState = {
+//   did: string; // application index
+//   meta: {
+//     did: string; // application index
+//     name: string; // application index
+//   };
+//   controller: BlockletController;
+//   settings: Settings;
+//   configs: Configs;
+//   children: Children
+// };
+
 class BlockletExtrasState extends BaseState {
   constructor(baseDir, config = {}) {
     super(baseDir, { filename: 'blocklet_extras.db', ...config });

package/lib/states/blocklet.js

@@ -17,18 +17,21 @@ const {
   BLOCKLET_DEFAULT_PORT_NAME,
   BLOCKLET_INTERFACE_TYPE_SERVICE,
 } = require('@blocklet/constant');
+const { APP_STRUCT_VERSION } = require('@abtnode/constant');
 
 const logger = require('@abtnode/logger')('state-blocklet');
 
 const BaseState = require('./base');
 const { checkDuplicateComponents, ensureMeta } = require('../util/blocklet');
-const { validateBlockletMeta } = require('../util');
+const { validateBlockletMeta } = require('../util/blocklet');
 
 const lock = new Lock('blocklet-port-assign-lock');
 
 const isHex = (str) => /^0x[0-9a-f]+$/i.test(str);
 const getMaxPort = (ports = {}) => Math.max(Object.values(ports).map(Number));
-const getConditions = (did) => [{ 'meta.did': did }, { appDid: did }, { appPid: did }];
+
+// structV1Did is just for migration purpose and should be removed in the future
+const getConditions = (did) => [{ 'meta.did': did }, { appDid: did }, { appPid: did }, { structV1Did: did }];
 
 const getExternalPortsFromMeta = (meta) =>
   (meta.interfaces || []).map((x) => x.port && x.port.external).filter(Boolean);
@@ -88,6 +91,48 @@ const fixChildren = (children) => {
   });
 };
 
+// type Application = {
+//   appDid: DID,
+//   appPid: DID,
+//   meta: Meta,
+//   source: BlockletSource,
+//   deployedFrom: string,
+//   mode: BLOCKLET_MODES;
+//   status: BlockletStatus,
+//   children: Component,
+//   ports: Ports;
+//   mountPoint: string; // deprecated
+//   migratedFrom: Array<{ appSk: string, appDid: DID, at: Date }>,
+//   externalSk: boolean,
+//   structV1Did: DID, // just for migration purpose and should be removed in the future
+// };
+
+// type Component = {
+//   mountPoint: string;
+//   meta: Meta,
+//   bundleSource: ComponentSource,
+//   source: BlockletSource,
+//   deployedFrom: string,
+//   mode: BLOCKLET_MODES;
+//   status: BlockletStatus,
+//   children: Component,
+//   ports: Ports;
+//   dependents: Array<{
+//     did: DID, // blocklet did
+//     required: boolean,
+//     version: SemverRange,
+//   }>;
+//   dependencies: Array<{
+//     id: string, // format: <did1/did2/did3>
+//     required: boolean,
+//   }>;
+//   dynamic: boolean; // deprecated
+// };
+
+// type Ports = {
+//   [name: string]: Number; // name is in meta.interfaces[].port
+// };
+
 class BlockletState extends BaseState {
   /**
    * Creates an instance of BlockletState
@@ -211,7 +256,9 @@ class BlockletState extends BaseState {
     children: rawChildren = [],
     appPid = null, // the permanent appDid, which will not change after initial set
     migratedFrom = [], // the complete migrate history
-    externalSk = false, // whether sk is managed by some party beside server, such as did-wallet
+    // whether sk is managed by some party beside server, such as did-wallet
+    // externalSk is always true in struct V2 blocklet
+    externalSk = true,
   } = {}) {
     return this.getBlocklet(meta.did).then(
       (exist) =>
@@ -253,6 +300,7 @@ class BlockletState extends BaseState {
               children,
               migratedFrom,
               externalSk,
+              structVersion: APP_STRUCT_VERSION,
             };
 
             // add to db
@@ -273,6 +321,7 @@ class BlockletState extends BaseState {
     );
   }
 
+  // FIXME: 这个接口比较危险，可能会修改一些本不应该修改的字段，后续需要考虑改进
   updateBlocklet(did, updates) {
     return this.getBlocklet(did).then(
       (doc) =>
@@ -612,7 +661,6 @@ class BlockletState extends BaseState {
         source,
         deployedFrom,
         mode,
-        dynamic: true,
         status: BlockletStatus.added,
         children: child.children,
       });
@@ -628,6 +676,10 @@ class BlockletState extends BaseState {
       children: newChildren,
     });
   }
+
+  async updateStructV1Did(did, v1Did) {
+    return this.updateBlocklet(did, { structV1Did: v1Did });
+  }
 }
 
 BlockletState.BlockletStatus = BlockletStatus;

package/lib/states/node.js

@@ -302,6 +302,7 @@ class NodeState extends BaseState {
     }));
   }
 
+  // deprecated
   async increaseCustomBlockletNumber() {
     const { _id, customBlockletNumber = 0 } = await this.read();
     const num = customBlockletNumber + 1;

package/lib/states/site.js

@@ -5,17 +5,26 @@ const BaseState = require('./base');
 const { getBlockletDomainGroupName } = require('../util/router');
 const { validateUpdateDomainAliases } = require('../validators/router');
 
+// type Site = {
+//   id: string;
+//   domain: string;
+//   domainAliases: Array<{value: string, isProtected: boolean}>;
+//   isProtected: boolean;
+//   rules: Array<Rule>;
+//   corsAllowedOrigins: Array<string>;
+// };
+
 class SiteState extends BaseState {
   constructor(baseDir, config = {}) {
     super(baseDir, { filename: 'routing_rule.db', ...config });
   }
 
-  async add(rule) {
-    const result = await this.insert(rule);
+  async add(site) {
+    const result = await this.insert(site);
 
-    const tmpRule = SiteState.renameIdFiledName(result);
-    logger.info('rule created', { rule: tmpRule });
-    return tmpRule;
+    const tmpSite = SiteState.renameIdFiledName(result);
+    logger.info('site created', { site: tmpSite });
+    return tmpSite;
   }
 
   async addRuleToSite(id, rule) {
@@ -83,7 +92,7 @@ class SiteState extends BaseState {
 
   async getBlockletDomains(did) {
     const site = await this.findOneByBlocklet(did);
-    return site.domainAliases.map((x) => x.value).filter(Boolean);
+    return (site?.domainAliases || []).map((x) => x.value).filter(Boolean);
   }
 
   async updateDomainAliasList(id, domainAliases) {

package/lib/team/manager.js

@@ -12,6 +12,7 @@ const logger = require('@abtnode/logger')('@abtnode/core:team:manager');
 const { ROLES, RBAC_CONFIG } = require('@abtnode/constant');
 const { BlockletEvents } = require('@blocklet/constant');
 const Lock = require('@abtnode/util/lib/lock');
+const sleep = require('@abtnode/util/lib/sleep');
 const UserState = require('../states/user');
 const SessionState = require('../states/session');
 
@@ -363,6 +364,10 @@ class TeamManager extends EventEmitter {
         if (this.cache[did].session) {
           await closeDatabase(this.cache[did].session.db);
         }
+
+        // NOTICE: wait for nedb to finish closeDatabase
+        const timeout = process.env.NODE_ENV !== 'test' ? 2000 : 200;
+        await sleep(timeout);
       } catch (error) {
         logger.error('Failed to close database', { did, error });
       }