@abtnode/core 1.7.8 → 1.7.9

package/lib/api/team.js

@@ -104,6 +104,19 @@ class TeamAPI extends EventEmitter {
     return state.getUser(user.did);
   }
 
+  async getOwner({ teamDid }) {
+    const owner = await this.teamManager.getOwner(teamDid);
+
+    if (!owner) {
+      return null;
+    }
+
+    const state = await this.getUserState(teamDid);
+
+    const full = await state.getUser(owner.did);
+    return full || owner;
+  }
+
   async updateUser({ teamDid, user }) {
     const state = await this.getUserState(teamDid);
 

package/lib/blocklet/manager/disk.js

@@ -114,6 +114,7 @@ const {
   shouldUpdateBlockletStatus,
   getBlockletMeta,
   validateBlockletMeta,
+  validateOwner,
 } = util;
 
 const preDownloadLock = new Lock('pre-download-lock');
@@ -256,7 +257,7 @@ class BlockletManager extends BaseBlockletManager {
     }
 
     const blocklet = await states.blocklet.getBlocklet(meta.did);
-    const isRunning = blocklet?.status === BlockletStatus.running;
+    const isRunning = blocklet ? blocklet.status === BlockletStatus.running : false;
 
     return { meta, isFree, isInstalled: !!blocklet, isRunning };
   }
@@ -1147,9 +1148,14 @@ class BlockletManager extends BaseBlockletManager {
     return blocklet;
   }
 
-  async setInitialized({ did }) {
+  async setInitialized({ did, owner }) {
+    if (!validateOwner(owner)) {
+      throw new Error('Blocklet owner is invalid');
+    }
+
     const blocklet = await states.blocklet.getBlocklet(did);
-    await states.blockletExtras.setSettings(blocklet.meta.did, { initialized: true });
+    await states.blockletExtras.setSettings(blocklet.meta.did, { initialized: true, owner });
+    logger.info('Blocklet initialized', { did, owner });
 
     this.emit(BlockletEvents.updated, { meta: { did: blocklet.meta.did } });
 

package/lib/blocklet/migration.js

@@ -21,6 +21,7 @@ async function runScripts({
   printSuccess,
   printError,
 }) {
+  // 获取所有待执行的脚本
   let scripts = [];
   try {
     scripts = await getScripts(scriptsDir);
@@ -37,13 +38,17 @@ async function runScripts({
   }
 
   printInfo('pending scripts', pendingScripts);
+  // 执行脚本前需要对数据库文件做一次备份
   try {
     await doBackup({ dbDir, backupDir, printInfo, printSuccess, printError });
   } catch (err) {
     printError(`Failed to backup state db due to ${err.message}, abort!`);
+    // 备份失败时，需要移除备份目录
+    fs.removeSync(backupDir);
     throw err;
   }
 
+  // 按照顺序依次执行 migration 脚本
   for (let i = 0; i < pendingScripts.length; i++) {
     const { script: scriptPath } = pendingScripts[i];
     try {
@@ -59,7 +64,10 @@ async function runScripts({
 
       try {
         await doRestore({ dbDir, backupDir, printInfo, printSuccess, printError });
+        // 恢复备份成功时，需要移除备份目录
+        fs.removeSync(backupDir);
       } catch (restoreErr) {
+        // 如果恢复备份失败，则保留备份目录，恢复数据
         printError(`Failed to restore state db due to: ${restoreErr.message}`);
       }
 

package/lib/event.js

@@ -125,6 +125,14 @@ module.exports = ({
       await teamAPI.refreshBlockletInterfacePermissions(blocklet.meta);
     } catch (error) {
       logger.error('upgrade blocklet routing rules error', { event: name, error });
+      notificationState.create({
+        title: 'Blocklet URL Mapping Error',
+        // eslint-disable-next-line max-len
+        description: `Failed to upgrade URL mapping for blocklet ${blocklet.meta.name}@${blocklet.meta.version}, due to: ${error.message}`,
+        entityType: 'blocklet',
+        entityId: blocklet.meta.did,
+        severity: 'error',
+      });
     }
 
     try {

package/lib/index.js

@@ -265,6 +265,7 @@ function ABTNode(options) {
     getUsers: teamAPI.getUsers.bind(teamAPI),
     getUsersCount: teamAPI.getUsersCount.bind(teamAPI),
     getUser: teamAPI.getUser.bind(teamAPI),
+    getOwner: teamAPI.getOwner.bind(teamAPI),
     getNodeUsers: () => teamAPI.getUsers({ teamDid: options.nodeDid }),
     getNodeUser: (user) => teamAPI.getUser({ teamDid: options.nodeDid, user }),
     addUser: teamAPI.addUser.bind(teamAPI),

package/lib/router/helper.js

@@ -863,88 +863,6 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     return changes.some(Boolean);
   };
 
-  /**
-   * Add system routing rules for blocklet in dashboard site
-   *
-   * @returns {boolean} if routing changed
-   * TODO: do we still need this?
-   */
-  const _ensureBlockletRulesForDashboardSite = async (blocklet, sites, nodeInfo, context = {}) => {
-    // blocklet level duplication detection
-    const findRulesByInterface = (site, value) =>
-      site.rules.filter((x) => x.isProtected && x.to.did === blocklet.meta.did && get(x, 'to.interfaceName') === value);
-
-    const ipSite = sites.find((x) => x.domain === DOMAIN_FOR_IP_SITE);
-    if (!ipSite) {
-      logger.warn(`Routing rule for dashboard not found, abort on ensure rules for blocklet ${blocklet.meta.did}`);
-      return false;
-    }
-
-    // If we have rule for legacy path prefix, just return
-    const pathPrefixLegacy = normalizePathPrefix(`/${nodeInfo.routing.adminPath}/${blocklet.meta.name}`);
-    if (hasRuleByPrefix(ipSite, pathPrefixLegacy)) {
-      return false;
-    }
-
-    const removedRuleIds = [];
-    const changes = await Promise.all(
-      blocklet.meta.interfaces.map(async (x) => {
-        let changed = false; // if state db was mutated
-        let pathPrefix = '';
-        if (x.prefix === BLOCKLET_DYNAMIC_PATH_PREFIX) {
-          // pathPrefix for dynamic path: `/{adminPath}/{blockletName}/{interfaceName}`
-          pathPrefix = normalizePathPrefix(`/${pathPrefixLegacy}/${x.name}`);
-        } else {
-          // pathPrefix for fixed path: `/{interfacePrefix}`
-          pathPrefix = normalizePathPrefix(x.prefix);
-        }
-
-        // Remove if we have rule with same interface
-        const exists = findRulesByInterface(ipSite, x.name);
-        if (exists.length) {
-          // Note: we need to keep a list of removed rules since we might remove multiple rules in the loop
-          exists.forEach((e) => removedRuleIds.push(e.id));
-          await states.site.update(
-            { _id: ipSite.id },
-            { $set: { rules: ipSite.rules.filter((r) => removedRuleIds.includes(r.id) === false) } }
-          );
-          changed = true;
-        } else if (hasRuleByPrefix(ipSite, pathPrefix)) {
-          // Skip same pathPrefix rules
-          return changed;
-        }
-
-        // 不在 dashboard site 中添加 path 和 prefix 都是根路径(/) 的路由
-        if (x.path === '/' && x.prefix === '/') {
-          return changed;
-        }
-
-        await routerManager.addRoutingRule(
-          {
-            id: ipSite.id,
-            rule: {
-              from: { pathPrefix },
-              to: {
-                type: ROUTING_RULE_TYPES.BLOCKLET,
-                port: findInterfacePortByName(blocklet, x.name),
-                did: blocklet.meta.did, // root blocklet did
-                interfaceName: x.name, // root blocklet interface
-              },
-              isProtected: true,
-            },
-            skipCheckDynamicBlacklist: true,
-          },
-          context
-        );
-        changed = true;
-
-        return changed;
-      })
-    );
-
-    return changes.some(Boolean);
-  };
-
   const _removeBlockletSites = async (blocklet, nodeInfo, context = {}) => {
     let changed = false;
 
@@ -980,14 +898,6 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
       _ensureBlockletSites(blocklet, sites, nodeInfo, context),
     ];
 
-    if (nodeInfo.mode === NODE_MODES.DEBUG || ['e2e', 'test'].includes(process.env.NODE_ENV)) {
-      logger.info('Add blocklet endpoint in dashboard site', {
-        nodeMode: nodeInfo.mode,
-        NODE_ENV: process.env.NODE_ENV,
-      });
-      tasks.push(_ensureBlockletRulesForDashboardSite(blocklet, sites, nodeInfo, context));
-    }
-
     const changes = await Promise.all(tasks);
 
     return changes.some(Boolean);

package/lib/team/manager.js

@@ -267,6 +267,19 @@ class TeamManager extends EventEmitter {
     }
   }
 
+  async getOwner(did) {
+    let owner;
+    if (this.isNodeTeam(did)) {
+      const nodeInfo = await this.states.node.read();
+      owner = get(nodeInfo, 'nodeOwner');
+    } else {
+      const settings = await this.states.blockletExtras.getSettings(did);
+      owner = get(settings, 'owner');
+    }
+
+    return owner;
+  }
+
   // =======
   // Private
   // =======

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.8",
+  "version": "1.7.9",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,29 +19,29 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.7.8",
-    "@abtnode/constant": "1.7.8",
-    "@abtnode/cron": "1.7.8",
-    "@abtnode/db": "1.7.8",
-    "@abtnode/logger": "1.7.8",
-    "@abtnode/queue": "1.7.8",
-    "@abtnode/rbac": "1.7.8",
-    "@abtnode/router-provider": "1.7.8",
-    "@abtnode/static-server": "1.7.8",
-    "@abtnode/timemachine": "1.7.8",
-    "@abtnode/util": "1.7.8",
-    "@arcblock/did": "^1.16.3",
+    "@abtnode/certificate-manager": "1.7.9",
+    "@abtnode/constant": "1.7.9",
+    "@abtnode/cron": "1.7.9",
+    "@abtnode/db": "1.7.9",
+    "@abtnode/logger": "1.7.9",
+    "@abtnode/queue": "1.7.9",
+    "@abtnode/rbac": "1.7.9",
+    "@abtnode/router-provider": "1.7.9",
+    "@abtnode/static-server": "1.7.9",
+    "@abtnode/timemachine": "1.7.9",
+    "@abtnode/util": "1.7.9",
+    "@arcblock/did": "^1.16.4",
     "@arcblock/did-motif": "^1.1.5",
-    "@arcblock/event-hub": "1.16.3",
+    "@arcblock/event-hub": "1.16.4",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.16.3",
-    "@blocklet/meta": "1.7.8",
+    "@arcblock/vc": "^1.16.4",
+    "@blocklet/meta": "1.7.9",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.16.3",
-    "@ocap/util": "^1.16.3",
-    "@ocap/wallet": "^1.16.3",
+    "@ocap/mcrypto": "^1.16.4",
+    "@ocap/util": "^1.16.4",
+    "@ocap/wallet": "^1.16.4",
     "@slack/webhook": "^5.0.3",
     "ajv": "^7.0.3",
     "axios": "^0.26.1",
@@ -78,5 +78,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "ae75dd20b4750a31dc53c88b75ed1d95c8f15397"
+  "gitHead": "285f4fedd41fcb8e1814ce5d8250ac10616e67e0"
 }