@abtnode/core 1.7.12 → 1.7.15

package/lib/blocklet/manager/disk.js

@@ -491,12 +491,12 @@ class BlockletManager extends BaseBlockletManager {
     }
   }
 
-  async reset({ did }, context = {}) {
-    logger.info('reset blocklet', { did });
+  async reset({ did, childDid }, context = {}) {
+    logger.info('reset blocklet', { did, childDid });
 
     const blocklet = await this.ensureBlocklet(did);
 
-    if (isInProgress(blocklet.status)) {
+    if (isInProgress(blocklet.status || blocklet.status === BlockletStatus.running)) {
       throw new Error('Cannot reset when blocklet is in progress');
     }
 
@@ -506,27 +506,43 @@ class BlockletManager extends BaseBlockletManager {
       // do nothing
     }
 
-    // Cleanup disk storage
-    const { name } = blocklet.meta;
-    const dataDir = path.join(this.dataDirs.data, name);
-    const logsDir = path.join(this.dataDirs.logs, name);
-    const cacheDir = path.join(this.dataDirs.cache, name);
-    fs.removeSync(cacheDir);
-    fs.removeSync(dataDir);
-    fs.removeSync(logsDir);
+    if (!childDid) {
+      // Cleanup disk storage
+      const { cacheDir, logsDir, dataDir } = blocklet.env;
+      fs.removeSync(cacheDir);
+      fs.removeSync(dataDir);
+      fs.removeSync(logsDir);
 
-    // Reset config in db
-    await this._delExtras(did);
-    await this._setConfigs(did);
-    await this.updateBlockletEnvironment(did);
-    await this.resetSiteByDid(did, context);
+      // Reset config in db
+      await states.blockletExtras.remove({ did: blocklet.meta.did });
+      await this._setConfigs(did);
+      await this.updateBlockletEnvironment(did);
+      await this.resetSiteByDid(did, context);
+    } else {
+      const child = blocklet.children.find((x) => x.meta.did === childDid);
 
-    logger.info('blocklet reset', { did });
+      if (!child) {
+        throw new Error('Child does not exist');
+      }
+
+      // Cleanup disk storage
+      const { cacheDir, logsDir, dataDir } = child.env;
+      fs.removeSync(cacheDir);
+      fs.removeSync(dataDir);
+      fs.removeSync(logsDir);
+
+      // Reset config in db
+      await states.blockletExtras.delChildConfigs(blocklet.meta.did, child.meta.did);
+      await this._setConfigs(blocklet.meta.did, child.meta.did);
+      await this.updateBlockletEnvironment(did);
+    }
+
+    logger.info('blocklet reset', { did, childDid });
     return blocklet;
   }
 
-  async deleteComponent({ did, rootDid }, context) {
-    logger.info('delete blocklet component', { did, rootDid });
+  async deleteComponent({ did, rootDid, keepData, keepState }, context) {
+    logger.info('delete blocklet component', { did, rootDid, keepData });
 
     const blocklet = await this.ensureBlocklet(rootDid);
     const doc = await states.blocklet.getBlocklet(rootDid);
@@ -538,22 +554,36 @@ class BlockletManager extends BaseBlockletManager {
     }
 
     doc.children = doc.children.filter((x) => x.meta.did !== did);
-    const children = (await this._getDynamicChildrenFromSettings(rootDid)).filter((x) => x.meta.did !== did);
-    children.push({
-      meta: pick(child.meta, ['did', 'name', 'bundleDid', 'bundleName', 'version', 'title', 'description']),
-      mountPoint: child.mountPoint,
-      status: BlockletStatus.deleted,
-      deletedAt: new Date(),
-    });
+    const children = (await this._getDynamicChildrenFromSettings(blocklet.meta.did)).filter((x) => x.meta.did !== did);
+    if (keepState !== false) {
+      children.push({
+        meta: pick(child.meta, ['did', 'name', 'bundleDid', 'bundleName', 'version', 'title', 'description']),
+        mountPoint: child.mountPoint,
+        status: BlockletStatus.deleted,
+        deletedAt: new Date(),
+      });
+    }
 
     await states.blocklet.updateBlocklet(rootDid, doc);
-    states.blockletExtras.setSettings(rootDid, { children });
+    states.blockletExtras.setSettings(blocklet.meta.did, { children });
+
+    // delete navigation
+    const navigation = await states.blockletExtras.getSettings(blocklet.meta.did, 'navigation', []);
+    await states.blockletExtras.setSettings(
+      blocklet.meta.did,
+      'navigation',
+      navigation.filter((x) => x.child !== blocklet.meta.name)
+    );
 
     // delete storage
     const childBlocklet = blocklet.children.find((x) => x.meta.did === did);
-    const { cacheDir, logsDir } = childBlocklet.env;
+    const { cacheDir, logsDir, dataDir } = childBlocklet.env;
     fs.removeSync(cacheDir);
     fs.removeSync(logsDir);
+    if (keepData === false) {
+      fs.removeSync(dataDir);
+      await states.blockletExtras.delChildConfigs(blocklet.meta.did, child.meta.did);
+    }
 
     const newBlocklet = await this.ensureBlocklet(rootDid);
     this.emit(BlockletEvents.upgraded, { blocklet: newBlocklet, context }); // trigger router refresh
@@ -887,13 +917,13 @@ class BlockletManager extends BaseBlockletManager {
     const blocklet = await states.blocklet.getBlocklet(did);
     const newStaticChildren = await parseChildrenFromMeta(blocklet.meta);
 
-    const oldDynamicChildren = await this._getDynamicChildrenFromSettings(did, { skipDeleted: true });
-    const noneSourceUrlChildren = oldDynamicChildren.filter((x) => !x.sourceUrl);
+    const oldDynamicChildren = await this._getDynamicChildrenFromSettings(blocklet.meta.did, { skipDeleted: true });
+    const noneBundleSourceChildren = oldDynamicChildren.filter((x) => !x.bundleSource);
     const dynamicConfig = oldDynamicChildren
-      .filter((x) => x.sourceUrl)
-      .map((x) => ({ resolved: x.sourceUrl, name: x.meta.name, mountPoint: x.mountPoint }));
+      .filter((x) => x.bundleSource)
+      .map((x) => ({ source: x.bundleSource, name: x.meta.name, title: x.meta.title, mountPoint: x.mountPoint }));
     const newDynamicChildren = [
-      ...noneSourceUrlChildren,
+      ...noneBundleSourceChildren,
       ...(await parseChildrenFromMeta(dynamicConfig, { dynamic: true })),
     ];
 
@@ -934,7 +964,7 @@ class BlockletManager extends BaseBlockletManager {
       did = sessionData.did;
       const { staticChildren = [], dynamicChildren = [] } = sessionData;
       children = [...staticChildren, ...dynamicChildren.map((x) => ({ ...x, dynamic: true }))];
-      oldBlocklet = await states.blocklet.getBlocklet(did);
+      oldBlocklet = await this._getBlockletForInstallation(did);
     }
 
     // get old blocklet
@@ -1041,6 +1071,7 @@ class BlockletManager extends BaseBlockletManager {
     }
 
     const children = await this._getChildren(meta);
+    await validateBlocklet({ meta, children });
     const added = await states.blocklet.addBlocklet({
       meta,
       source: BlockletSource.local,
@@ -1101,7 +1132,9 @@ class BlockletManager extends BaseBlockletManager {
         dynamic: true,
       },
     ]);
+    await validateBlocklet(children[0]);
     await states.blocklet.addChildren(rootDid, children);
+    await this._upsertDynamicNavigation(existRoot.meta.did, children[0]);
 
     logger.info('add blocklet component for dev', { did, version, meta });
 
@@ -1395,7 +1428,7 @@ class BlockletManager extends BaseBlockletManager {
     try {
       // install blocklet
       if (postAction === 'install') {
-        await this.onInstall({ blocklet, context });
+        await this.onInstall({ blocklet, context, oldBlocklet });
         return;
       }
 
@@ -1410,7 +1443,7 @@ class BlockletManager extends BaseBlockletManager {
     }
   }
 
-  async onInstall({ blocklet, context }) {
+  async onInstall({ blocklet, context, oldBlocklet }) {
     const { meta } = blocklet;
     const { did, version } = meta;
     logger.info('do install blocklet', { did, version });
@@ -1422,6 +1455,7 @@ class BlockletManager extends BaseBlockletManager {
       const installedBlocklet = await this._installBlocklet({
         did,
         context,
+        oldBlocklet,
       });
 
       if (context.startImmediately) {
@@ -1612,7 +1646,7 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   async _installComponentFromUrl({ rootDid, mountPoint, url, context, title, name: inputName, did: inputDid }) {
-    const blocklet = await states.blocklet.getBlocklet(rootDid);
+    const blocklet = await this._getBlockletForInstallation(rootDid);
     if (!blocklet) {
       throw new Error('Root blocklet does not exist');
     }
@@ -1638,7 +1672,7 @@ class BlockletManager extends BaseBlockletManager {
     if (!inputName && !inputDid) {
       const found = findAvailableDid(meta, [
         ...blocklet.children.map((x) => x.meta),
-        ...(await states.blockletExtras.getSettings(rootDid, 'children', [])).map((x) => x.meta),
+        ...(await states.blockletExtras.getSettings(blocklet.meta.did, 'children', [])).map((x) => x.meta),
       ]);
       name = found.name;
       did = found.did;
@@ -1648,7 +1682,7 @@ class BlockletManager extends BaseBlockletManager {
       {
         meta: ensureMeta(meta, { did, name }),
         mountPoint,
-        sourceUrl: url,
+        bundleSource: { url },
         dynamic: true,
       },
     ]);
@@ -1657,6 +1691,7 @@ class BlockletManager extends BaseBlockletManager {
 
     // add component to db
     await states.blocklet.addChildren(rootDid, newChildren);
+    await this._upsertDynamicNavigation(blocklet.meta.did, newChildren[0]);
 
     return this.updateChildren(
       {
@@ -1743,7 +1778,7 @@ class BlockletManager extends BaseBlockletManager {
 
     // diff deploy
     if (did && diffVersion) {
-      const oldBlocklet = await states.blocklet.getBlocklet(did);
+      const oldBlocklet = await this._getBlockletForInstallation(did);
       if (!oldBlocklet) {
         throw new Error(`Blocklet ${did} not found when diff deploying`);
       }
@@ -1779,7 +1814,7 @@ class BlockletManager extends BaseBlockletManager {
 
     // full deploy
     const { meta } = await this._resolveDownload(cwd, tarFile);
-    const oldBlocklet = await states.blocklet.getBlocklet(meta.did);
+    const oldBlocklet = await this._getBlockletForInstallation(meta.did);
 
     // full deploy - upgrade
     if (oldBlocklet) {
@@ -1805,6 +1840,7 @@ class BlockletManager extends BaseBlockletManager {
     }
 
     // full deploy - install
+    const oldExtraState = await states.blockletExtras.findOne({ did: meta.did });
     const children = await this._getChildren(meta);
     const blocklet = await states.blocklet.addBlocklet({
       meta,
@@ -1826,6 +1862,7 @@ class BlockletManager extends BaseBlockletManager {
     return this._installBlocklet({
       did: meta.did,
       context,
+      oldBlocklet: { extraState: oldExtraState },
     });
   }
 
@@ -1834,7 +1871,7 @@ class BlockletManager extends BaseBlockletManager {
     // download
     const { cwd, tarFile } = await this._downloadFromUpload(file);
 
-    const oldBlocklet = await states.blocklet.getBlocklet(rootDid);
+    const oldBlocklet = await this._getBlockletForInstallation(rootDid);
     if (!oldBlocklet) {
       throw new Error('Root blocklet does not exist');
     }
@@ -1883,7 +1920,7 @@ class BlockletManager extends BaseBlockletManager {
       mountPoint,
       source: BlockletSource.upload,
       deployedFrom: `Upload by ${context.user.fullName}`,
-      sourceUrl: '',
+      bundleSource: null,
       dynamic: true,
     };
     const index = newBlocklet.children.findIndex((child) => child.meta.did === meta.did);
@@ -1892,6 +1929,7 @@ class BlockletManager extends BaseBlockletManager {
     } else {
       newBlocklet.children.push(newChild);
     }
+    await this._upsertDynamicNavigation(newBlocklet.meta.did, newChild);
 
     await validateBlocklet(newBlocklet);
 
@@ -2046,6 +2084,8 @@ class BlockletManager extends BaseBlockletManager {
 
     const { name, did, version } = meta;
 
+    const oldExtraState = await states.blockletExtras.findOne({ did: meta.did });
+
     const children = await this._getChildren(meta);
     try {
       const blocklet = await states.blocklet.addBlocklet({
@@ -2067,7 +2107,10 @@ class BlockletManager extends BaseBlockletManager {
       // download
       const downloadParams = {
         blocklet: { ...blocklet1 },
-        oldBlocklet: { children: children.filter((x) => x.dynamic) }, // let downloader skip re-downloading dynamic blocklet
+        oldBlocklet: {
+          children: children.filter((x) => x.dynamic), // let downloader skip re-downloading dynamic blocklet
+          extraState: oldExtraState,
+        },
         context,
         postAction: 'install',
       };
@@ -2089,8 +2132,7 @@ class BlockletManager extends BaseBlockletManager {
       ticket.on('failed', async (err) => {
         logger.error('failed to install blocklet', { name, did, version, error: err });
         try {
-          await this._delExtras(did);
-          await states.blocklet.deleteBlocklet(did);
+          await this._rollback('install', did, { extraState: oldExtraState });
         } catch (e) {
           logger.error('failed to remove blocklet on install error', { did: meta.did, error: e });
         }
@@ -2116,7 +2158,7 @@ class BlockletManager extends BaseBlockletManager {
       });
 
       try {
-        await this._rollback('install', did);
+        await this._rollback('install', did, { extraState: oldExtraState });
       } catch (e) {
         logger.error('failed to remove blocklet on install error', { did: meta.did, error: e });
       }
@@ -2130,7 +2172,7 @@ class BlockletManager extends BaseBlockletManager {
 
     const { name, version, did } = meta;
 
-    const oldBlocklet = await states.blocklet.getBlocklet(did);
+    const oldBlocklet = await this._getBlockletForInstallation(did);
 
     // NOTE: 目前的版本移除了降级通道，所以不需要考虑降级通道的情况
     const action = semver.gt(oldBlocklet.meta.version, version) ? 'downgrade' : 'upgrade';
@@ -2248,9 +2290,10 @@ class BlockletManager extends BaseBlockletManager {
       if (fs.existsSync(installDir)) {
         fs.removeSync(installDir);
         logger.info('cleanup blocklet upgrade dir', { name, version, installDir });
-      } else {
-        fs.mkdirSync(installDir, { recursive: true });
       }
+
+      fs.mkdirSync(installDir, { recursive: true });
+
       await fs.move(downloadDir, installDir, { overwrite: true });
     } catch (error) {
       fs.removeSync(downloadDir);
@@ -2303,6 +2346,7 @@ class BlockletManager extends BaseBlockletManager {
 
       await ensureBlockletExpanded(meta, downloadDir);
 
+      // move to installDir
       const bundleDir = getBundleDir(this.installDir, meta);
       logger.info('Move downloadDir to installDir', { downloadDir, bundleDir });
       await fs.move(downloadDir, bundleDir, { overwrite: true });
@@ -2319,7 +2363,7 @@ class BlockletManager extends BaseBlockletManager {
    * @param {string} opt.did
    * @param {object} opt.context
    */
-  async _installBlocklet({ did, context }) {
+  async _installBlocklet({ did, oldBlocklet, context }) {
     try {
       let blocklet = await this.ensureBlocklet(did);
       const { meta, source, deployedFrom } = blocklet;
@@ -2388,7 +2432,7 @@ class BlockletManager extends BaseBlockletManager {
       const { name, version } = meta;
       logger.error('failed to install blocklet', { name, did, version, error: err });
       try {
-        await this._rollback('install', did);
+        await this._rollback('install', did, oldBlocklet);
         this.emit(BlockletEvents.installFailed, { meta: { did } });
         states.notification.create({
           title: 'Blocklet Install Failed',
@@ -2544,7 +2588,7 @@ class BlockletManager extends BaseBlockletManager {
     const { did } = blocklet.meta;
     const dynamicChildren = blocklet.children
       .filter((x) => x.dynamic)
-      .map((x) => pick(x, ['meta', 'mountPoint', 'sourceUrl', 'source']));
+      .map((x) => pick(x, ['meta', 'mountPoint', 'bundleSource', 'source']));
 
     // deleted blocklet
     let deletes = await states.blockletExtras.getSettings(did, 'children', []);
@@ -2822,14 +2866,27 @@ class BlockletManager extends BaseBlockletManager {
    */
   async _rollback(action, did, oldBlocklet) {
     if (action === 'install') {
-      // remove blocklet
+      const extraState = oldBlocklet?.extraState;
+
+      // rollback blocklet extra state
+      if (extraState) {
+        await states.blockletExtras.update({ did }, extraState);
+      } else {
+        await states.blockletExtras.remove({ did });
+      }
+
+      // remove blocklet state
       return this._deleteBlocklet({ did, keepData: true });
     }
 
     if (['upgrade', 'downgrade'].includes(action)) {
-      // rollback blocklet
-      const result = await states.blocklet.updateBlocklet(did, oldBlocklet);
-      await this._setConfigs(did);
+      const { extraState, ...blocklet } = oldBlocklet;
+      // rollback blocklet state
+      const result = await states.blocklet.updateBlocklet(did, blocklet);
+
+      // rollback blocklet extra state
+      await states.blockletExtras.update({ did: blocklet.meta.did }, extraState);
+
       logger.info('blocklet rollback successfully', { did });
       this.emit(BlockletEvents.updated, result);
       return result;
@@ -2851,14 +2908,14 @@ class BlockletManager extends BaseBlockletManager {
     if (keepData === false) {
       fs.removeSync(dataDir);
       fs.removeSync(logsDir);
-      await this._delExtras(did);
+      await states.blockletExtras.remove({ did: blocklet.meta.did });
     } else {
       if (keepLogsDir === false) {
         fs.removeSync(logsDir);
       }
 
       if (keepConfigs === false) {
-        await this._delExtras(did);
+        await states.blockletExtras.remove({ did: blocklet.meta.did });
       }
     }
 
@@ -2880,21 +2937,18 @@ class BlockletManager extends BaseBlockletManager {
     return blocklet;
   }
 
-  async _setConfigs(did) {
+  async _setConfigs(did, childDid) {
     const blocklet = await states.blocklet.getBlocklet(did);
     const { meta } = blocklet;
-    await states.blockletExtras.setConfigs(did, get(meta, 'environments', []));
-    for (const child of blocklet.children) {
-      await states.blockletExtras.setChildConfigs(did, child.meta.did, get(child.meta, 'environments'));
-    }
-  }
 
-  async _delExtras(did) {
-    const blocklet = await states.blocklet.getBlocklet(did);
-    await states.blockletExtras.delConfigs(did);
-    await states.blockletExtras.delSettings(did);
-    for (const child of blocklet.children) {
-      await states.blockletExtras.delChildConfigs(did, child.meta.did);
+    if (!childDid) {
+      await states.blockletExtras.setConfigs(blocklet.meta.did, get(meta, 'environments', []));
+      for (const child of blocklet.children) {
+        await states.blockletExtras.setChildConfigs(blocklet.meta.did, child.meta.did, get(child.meta, 'environments'));
+      }
+    } else {
+      const child = blocklet.children.find((x) => x.meta.did === childDid);
+      await states.blockletExtras.setChildConfigs(blocklet.meta.did, child.meta.did, get(child.meta, 'environments'));
     }
   }
 
@@ -2911,6 +2965,30 @@ class BlockletManager extends BaseBlockletManager {
     }
     return { did, name };
   }
+
+  async _upsertDynamicNavigation(did, child) {
+    const navigation = await states.blockletExtras.getSettings(did, 'navigation', []);
+    const item = { title: child.meta.title, child: child.meta.name };
+    const index = navigation.findIndex((x) => x.child === item.child);
+    if (index > -1) {
+      navigation.splice(index, 1, item);
+    } else {
+      navigation.push(item);
+    }
+    await states.blockletExtras.setSettings(did, { navigation });
+  }
+
+  async _getBlockletForInstallation(did) {
+    const blocklet = await states.blocklet.getBlocklet(did);
+    if (!blocklet) {
+      return null;
+    }
+
+    const extraState = await states.blockletExtras.findOne({ did: blocklet.meta.did });
+    blocklet.extraState = extraState;
+
+    return blocklet;
+  }
 }
 
 module.exports = BlockletManager;

package/lib/blocklet/registry.js

@@ -123,7 +123,7 @@ class BlockletRegistry {
 
       if (res.status === 304 && this.blocklets.length > 0) {
         logger.debug('use cached data', { etag: res.headers.etag, registryUrl });
-        return this.blocklets;
+        return this.blocklets.filter((x) => isRequirementsSatisfied(x.requirements, false));
       }
 
       if (res.status === 304) {
@@ -144,7 +144,7 @@ class BlockletRegistry {
       const blocklets = res.data.filter((x) => BlockletGroup[x.group]);
       logger.debug('blocklets loaded', { url, blocklets: blocklets.map((x) => ({ did: x.did, name: x.name })) });
       this.cacheId = res.headers.etag;
-      this.blocklets = blocklets;
+      this.blocklets = blocklets.filter((x) => isRequirementsSatisfied(x.requirements, false));
     } catch (error) {
       logger.error('refresh blocklet registry failed', { error, registryUrl });
       this.cacheId = '';

package/lib/index.js

@@ -249,6 +249,7 @@ function ABTNode(options) {
     selectBlockletStore: nodeAPI.selectRegistry.bind(nodeAPI),
     cleanupDirtyUpgradeState: states.node.cleanupDirtyUpgradeState.bind(states.node),
     addNodeOwner: states.node.addNodeOwner.bind(states.node),
+    updateNodeOwner: states.node.updateNodeOwner.bind(states.node),
     updateNodeRouting,
     isInitialized,
     resetNode: (params, context) =>
@@ -426,7 +427,7 @@ function ABTNode(options) {
           action,
           args: {},
           context: formatContext({
-            user: { fullName: 'CLI', role: 'self', did: options.nodeDid },
+            user: { fullName: 'CLI', role: 'admin', did: options.nodeDid },
             headers: { 'user-agent': 'CLI' },
           }),
           result: null,

package/lib/migrations/1.7.15-blocklet-bundle-source.js

@@ -0,0 +1,42 @@
+/* eslint-disable no-continue */
+/* eslint-disable no-await-in-loop */
+/* eslint-disable no-underscore-dangle */
+
+module.exports = async ({ states, printInfo }) => {
+  printInfo('Try to update blocklet server to 1.7.15...');
+
+  const blocklets = await states.blocklet.getBlocklets();
+
+  for (const blocklet of blocklets) {
+    (blocklet.children || []).forEach((child) => {
+      const { sourceUrl } = child;
+      delete child.sourceUrl;
+      if (sourceUrl && !child.bundleSource) {
+        child.bundleSource = {
+          url: sourceUrl,
+        };
+      }
+    });
+
+    await states.blocklet.updateBlocklet(blocklet.meta.did, { children: blocklet.children });
+    printInfo(`Blocklet children in blocklet.db updated: ${blocklet.meta.did}`);
+  }
+
+  const blockletExtras = await states.blockletExtras.find({});
+
+  for (const extra of blockletExtras) {
+    const children = await states.blockletExtras.getSettings(extra.did, 'children', []);
+    (children || []).forEach((child) => {
+      const { sourceUrl } = child;
+      delete child.sourceUrl;
+      if (sourceUrl && !child.bundleSource) {
+        child.bundleSource = {
+          url: sourceUrl,
+        };
+      }
+    });
+
+    await states.blockletExtras.setSettings(extra.did, { children });
+    printInfo(`Blocklet dynamic component in blocklet_extra.db updated: ${extra.did}`);
+  }
+};

package/lib/router/helper.js

@@ -311,8 +311,8 @@ const ensureWellknownRule = async (sites) => {
   for (const site of tempSites) {
     // 不向 default site & ip site & wellknown site 添加 wellknown rule
     if (![DOMAIN_FOR_INTERNAL_SITE, DOMAIN_FOR_IP_SITE, DOMAIN_FOR_DEFAULT_SITE].includes(site.domain)) {
+      // add /.well-known for blocklet
       const isExists = site.rules.find((x) => x.from.pathPrefix === WELLKNOWN_PATH_PREFIX);
-
       if (!isExists) {
         site.rules.push({
           from: { pathPrefix: WELLKNOWN_PATH_PREFIX },
@@ -326,31 +326,21 @@ const ensureWellknownRule = async (sites) => {
       }
 
       // add /.well-known/service for blocklet
-      const rules = cloneDeep(site.rules);
-      rules.forEach((rule) => {
-        if (
-          rule.to.type !== ROUTING_RULE_TYPES.BLOCKLET || // is not blocklet
-          (rule.to.did !== rule.to.realDid && rule.from.pathPrefix !== '/') // is a component endpoint in sub path
-        ) {
-          return;
+      const blockletRules = site.rules.filter((x) => x.to.type === ROUTING_RULE_TYPES.BLOCKLET);
+      if (blockletRules.length) {
+        // get pathPrefix for blocklet-service
+        const rootBlockletRule = blockletRules.find((x) => x.to.did === x.to.realDid);
+        const pathPrefix = joinUrl(rootBlockletRule?.from?.pathPrefix || '/', WELLKNOWN_SERVICE_PATH_PREFIX);
+
+        // requests for /.well-known/service will stay in blocklet-service and never proxy back to blocklet
+        // so any rule is ok to be cloned
+        if (!site.rules.some((x) => x.from.pathPrefix === pathPrefix)) {
+          const rule = cloneDeep(rootBlockletRule || blockletRules[0]);
+          rule.from.pathPrefix = pathPrefix;
+          rule.isProtected = true;
+          site.rules.push(rule);
         }
-
-        // already exists
-        if (rule.from.pathPrefix.endsWith(WELLKNOWN_SERVICE_PATH_PREFIX)) {
-          return;
-        }
-
-        const pathPrefix = joinUrl(rule.from.pathPrefix, WELLKNOWN_SERVICE_PATH_PREFIX);
-
-        // already exists
-        if (site.rules.some((x) => x.from.pathPrefix === pathPrefix)) {
-          return;
-        }
-
-        rule.from.pathPrefix = pathPrefix;
-        rule.isProtected = true;
-        site.rules.push(rule);
-      });
+      }
     }
   }
 

package/lib/states/README.md

@@ -17,9 +17,11 @@ All Blocklet Server states are managed by files in this folder.
   - `scripts`: for hook of component lifecycle
   - `engine`, `timeout`, `group`, `main`: related to process startup
   - `dist`: bundle source
+  - `theme`: app theme
+  - `navigation`: app navigation`
 - `source`: type of bundle source
-- `deployedFrom`: information of bundle source
-- `sourceUrl`: url of bundle source
+- `bundleSource`: download infomation of bundle srouce
+- `deployedFrom`: extra information of bundle source
 - `appDid`: app instance id _app only_
 - `status`, `startedAt`, `installedAt`, `stoppedAt` app status
 - `deletedAt` _component only_

package/lib/states/audit-log.js

@@ -1,6 +1,7 @@
 /* eslint-disable no-async-promise-executor */
 const pick = require('lodash/pick');
 const get = require('lodash/get');
+const joinUrl = require('url-join');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
 const { BLOCKLET_SITE_GROUP_SUFFIX } = require('@abtnode/constant');
 const logger = require('@abtnode/logger')('@abtnode/core:states:audit-log');
@@ -10,8 +11,8 @@ const BaseState = require('./base');
 const { parse } = require('../util/ua');
 const { lookup } = require('../util/ip');
 
-const getServerInfo = (info) => `[${info.name}](${info.routing.adminPath}/settings/about)`;
-const getBlockletInfo = (blocklet, info) => `[${getDisplayName(blocklet)} v${blocklet.meta.version}](${info.routing.adminPath}/blocklets/${blocklet.meta.did})`; // prettier-ignore
+const getServerInfo = (info) => `[${info.name}](${joinUrl(info.routing.adminPath, '/settings/about')})`;
+const getBlockletInfo = (blocklet, info) => `[${getDisplayName(blocklet)} v${blocklet.meta.version}](${joinUrl(info.routing.adminPath, '/blocklets/', blocklet.meta.did, '/overview')})`; // prettier-ignore
 const expandTeam = async (teamDid, info, node) => {
   if (!teamDid) {
     return '';
@@ -64,10 +65,10 @@ const expandUser = async (teamDid, userDid, passportId, info, node) => {
   const passport = user.passports.find((x) => x.id === passportId);
 
   if (teamDid === info.did) {
-    return [`[${user.fullName}](${info.routing.adminPath}/team/members)`, passport ? passport.name : ''];
+    return [`[${user.fullName}](${joinUrl(info.routing.adminPath, '/team/members')})`, passport ? passport.name : ''];
   }
 
-  return [`[${user.fullName}](${info.routing.adminPath}/blocklets/${teamDid}/members)`, passport ? passport.name : ''];
+  return [`[${user.fullName}](${joinUrl(info.routing.adminPath, '/blocklets/', teamDid, '/members')})`, passport ? passport.name : '']; // prettier-ignore
 };
 
 /**
@@ -93,7 +94,7 @@ const getLogContent = async (action, args, context, result, info, node) => {
     case 'installBlocklet':
       return `installed blocklet ${getBlockletInfo(result, info)} from ${result.deployedFrom}`;
     case 'startBlocklet':
-      return `started blocklet ${getBlockletInfo(result, info)}`;
+      return `started blocklet ${getBlockletInfo(result, info)} ${args.reason || ''}`;
     case 'restartBlocklet':
       return `restarted blocklet ${getBlockletInfo(result, info)}`;
     case 'reloadBlocklet':
@@ -131,6 +132,12 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `joined team ${team} by ${args.reason}`;
     case 'updateUser':
       return `${args.reason} and received **${args.passport.name}** passport from ${team}`;
+    case 'switchProfile':
+      return `switched profile to ${args.profile.fullName} for ${team}`;
+    case 'switchPassport':
+      return `switched passport to ${args.passport.role} for ${team}`;
+    case 'login':
+      return `${user} logged in to ${team} with passport ${args.passport.name}`;
     case 'configWhoCanAccess':
       return `updated access control policy to **${args.value}** for ${team} when ${args.reason}`;
     case 'configPassportIssuance':
@@ -181,7 +188,7 @@ const getLogContent = async (action, args, context, result, info, node) => {
     case 'updateNodeInfo':
       return `updated basic server settings: \n${Object.keys(args).map(x => `- ${x}: ${args[x]}`).join('\n')}`; // prettier-ignore
     case 'upgradeNodeVersion':
-      return `triggered server upgrade to ${info.nextVersion}`;
+      return `upgrade server to ${info.nextVersion}`;
     case 'startServer':
       return 'server was started';
     case 'stopServer':
@@ -240,6 +247,9 @@ const getLogCategory = (action) => {
     // teams: members/passports
     case 'addUser':
     case 'updateUser':
+    case 'switchProfile':
+    case 'switchPassport':
+    case 'login':
     case 'configWhoCanAccess':
     case 'processPassportIssuance':
     case 'configPassportIssuance':
@@ -329,7 +339,7 @@ class AuditLogState extends BaseState {
     }
    * @return {object} new doc
    */
-  create({ action, args, context, result }, node) {
+  create({ action, args = {}, context = {}, result = {} }, node) {
     return new Promise(async (resolve) => {
       // Do not store secure configs in audit log
       if (Array.isArray(args.configs)) {

package/lib/states/blocklet.js

@@ -522,7 +522,7 @@ class BlockletState extends BaseState {
 
     const newChildren = [...oldChildren];
     for (const child of children) {
-      const { meta, mountPoint, sourceUrl = '', source = '', deployedFrom = '', mode } = child;
+      const { meta, mountPoint, bundleSource = null, source = '', deployedFrom = '', mode } = child;
 
       if (!mountPoint) {
         throw new Error(`mountPoint is required when adding component ${getDisplayName(child, true)}`);
@@ -537,7 +537,7 @@ class BlockletState extends BaseState {
       newChildren.push({
         mountPoint,
         meta,
-        sourceUrl,
+        bundleSource,
         source,
         deployedFrom,
         mode,

package/lib/states/node.js

@@ -97,6 +97,7 @@ class NodeState extends BaseState {
           didDomain,
           enablePassportIssuance = true,
           trustedPassports = [],
+          webWalletUrl,
         } = this.options;
 
         if (nodeOwner && !validateOwner(nodeOwner)) {
@@ -134,6 +135,7 @@ class NodeState extends BaseState {
                 enablePassportIssuance,
                 trustedPassports,
                 customBlockletNumber: 0,
+                webWalletUrl,
               },
               async (e, data) => {
                 if (e) {
@@ -197,34 +199,48 @@ class NodeState extends BaseState {
     });
   }
 
-  addNodeOwner(owner) {
-    if (owner && !validateOwner(owner)) {
+  async addOwner(owner, doc) {
+    const initialized = this.isInitialized({ nodeOwner: owner });
+
+    if (this.notification && typeof this.notification.setDefaultReceiver === 'function') {
+      this.notification.setDefaultReceiver(owner.did);
+    }
+
+    const updateResult = await this.update(doc._id, {
+      $set: { nodeOwner: owner, initialized, initializedAt: initialized ? new Date() : null },
+    });
+
+    this.emit(EVENTS.NODE_ADDED_OWNER, updateResult);
+
+    return updateResult;
+  }
+
+  async addNodeOwner(owner) {
+    if (!validateOwner(owner)) {
       throw new Error('Node owner is invalid');
     }
 
-    return this.read().then(async (doc) => {
-      if (doc.nodeOwner) {
-        if (isEqual(owner, doc.nodeOwner)) {
-          return doc;
-        }
+    const doc = await this.read();
 
-        throw new Error('Cannot set owner because owner already exists');
+    if (doc.nodeOwner) {
+      if (isEqual(owner, doc.nodeOwner)) {
+        return doc;
       }
 
-      const initialized = this.isInitialized({ nodeOwner: owner });
+      throw new Error('Cannot set owner because owner already exists');
+    }
 
-      if (this.notification && typeof this.notification.setDefaultReceiver === 'function') {
-        this.notification.setDefaultReceiver(owner.did);
-      }
+    return this.addOwner(owner, doc);
+  }
 
-      const updateResult = await this.update(doc._id, {
-        $set: { nodeOwner: owner, initialized, initializedAt: initialized ? new Date() : null },
-      });
+  async updateNodeOwner(owner) {
+    if (!validateOwner(owner)) {
+      throw new Error('Node owner is invalid');
+    }
 
-      this.emit(EVENTS.NODE_ADDED_OWNER, updateResult);
+    const doc = await this.read();
 
-      return updateResult;
-    });
+    return this.addOwner(owner, doc);
   }
 
   async enterMode(mode) {

package/lib/util/blocklet.js

@@ -10,6 +10,8 @@ const streamToPromise = require('stream-to-promise');
 const { Throttle } = require('stream-throttle');
 const ssri = require('ssri');
 const diff = require('deep-diff');
+const any = require('promise.any');
+const joinUrl = require('url-join');
 
 const { toHex } = require('@ocap/util');
 const logger = require('@abtnode/logger')('@abtnode/core:util:blocklet');
@@ -20,7 +22,7 @@ const CustomError = require('@abtnode/util/lib/custom-error');
 const getFolderSize = require('@abtnode/util/lib/get-folder-size');
 const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const hashFiles = require('@abtnode/util/lib/hash-files');
-const { BLOCKLET_MAX_MEM_LIMIT_IN_MB } = require('@abtnode/constant');
+const { BLOCKLET_MAX_MEM_LIMIT_IN_MB, BLOCKLET_STORE_API_BLOCKLET_PREFIX } = require('@abtnode/constant');
 
 const {
   BlockletStatus,
@@ -411,12 +413,24 @@ const getBlockletMetaFromUrl = async (url) => {
 
     meta.dist.tarball = tarball;
   } catch (err) {
-    throw new Error(`Invalid blocklet meta: dist.tarball is not a valid url ${err.message}`);
+    const msg = `Invalid blocklet meta: dist.tarball is not a valid url ${err.message}`;
+    logger.error(msg);
+    throw new Error(msg);
   }
 
   return meta;
 };
 
+const getBlockletMetaFromUrls = async (urls) => {
+  try {
+    const meta = await any(urls.map(getBlockletMetaFromUrl));
+    return meta;
+  } catch (err) {
+    logger.error('failed get blocklet meta', { urls });
+    throw new Error('Failed get blocklet meta');
+  }
+};
+
 /**
  * Start all precesses of a blocklet
  * @param {*} blocklet should contain env props
@@ -649,6 +663,36 @@ const parseChildren = (children, parentMeta = {}, { dynamic } = {}) => {
   return children;
 };
 
+/**
+ * @param {*} config defined in childrenSchema in blocklet meta schema
+ */
+const getSourceUrlsFromConfig = (config) => {
+  if (config.source) {
+    if (config.source.url) {
+      return [config.source.url].flat();
+    }
+
+    const { store, version, name } = config.source;
+    return [store]
+      .flat()
+      .map((x) =>
+        joinUrl(
+          x,
+          BLOCKLET_STORE_API_BLOCKLET_PREFIX,
+          toBlockletDid(name),
+          !version || version === 'latest' ? '' : version,
+          'blocklet.json'
+        )
+      );
+  }
+
+  if (config.resolved) {
+    return [config.resolved];
+  }
+
+  throw new Error('Invalid child config');
+};
+
 /**
  * this function has side effect on children
  */
@@ -667,7 +711,15 @@ const parseChildrenFromMeta = async (src, { dynamic } = {}) => {
       throw new Error(`MountPoint does not found in child ${config.name}`);
     }
 
-    const m = await getBlockletMetaFromUrl(config.resolved);
+    const urls = getSourceUrlsFromConfig(config);
+
+    let m;
+    try {
+      m = await getBlockletMetaFromUrls(urls);
+    } catch {
+      throw new Error('Failed get component meta');
+    }
+
     validateBlockletMeta(m, { ensureDist: true });
 
     const webInterface = findWebInterface(m);
@@ -691,7 +743,7 @@ const parseChildrenFromMeta = async (src, { dynamic } = {}) => {
     const child = {
       mountPoint,
       meta,
-      sourceUrl: config.resolved,
+      bundleSource: config.source || { url: config.resolved },
     };
 
     children.push(child);
@@ -1234,4 +1286,5 @@ module.exports = {
   verifyPurchase,
   findAvailableDid,
   ensureMeta,
+  getSourceUrlsFromConfig,
 };

package/lib/util/default-node-config.js

@@ -1,4 +1,4 @@
-const { NODE_REGISTER_URL, BLOCKLET_STORE_URL, BLOCKLET_STORE_URL_DEV, WEB_WALLET_URL } = require('@abtnode/constant');
+const { NODE_REGISTER_URL, BLOCKLET_STORE_URL, BLOCKLET_STORE_URL_DEV } = require('@abtnode/constant');
 const canPackageReadWrite = require('@abtnode/util/lib/can-pkg-rw');
 
 const getDefaultAutoUpgrade = () => {
@@ -36,7 +36,6 @@ const defaultNodeConfigs = {
     ],
   },
   registerUrl: { getDefaultValue: () => NODE_REGISTER_URL },
-  webWalletUrl: { getDefaultValue: () => WEB_WALLET_URL },
 };
 
 const lib = {

package/lib/util/index.js

@@ -358,15 +358,11 @@ const getBlockletMetaByUrl = async (url) => {
   }
 
   if (protocol.startsWith('http')) {
-    try {
-      const { data: meta } = await request({ url, method: 'GET', timeout: 1000 * 20 });
-      if (Object.prototype.toString.call(meta) !== '[object Object]') {
-        throw new Error('Url is not valid');
-      }
-      return meta;
-    } catch (err) {
-      throw new Error(`Failed to get blocklet meta from ${url}: ${err.message}`);
+    const { data: meta } = await request({ url, method: 'GET', timeout: 1000 * 20 });
+    if (Object.prototype.toString.call(meta) !== '[object Object]') {
+      throw new Error('Url is not valid');
     }
+    return meta;
   }
 
   throw new Error(`Invalid url protocol: ${protocol.replace(/:$/, '')}`);

package/lib/util/requirement.js

@@ -28,7 +28,9 @@ const isSatisfied = (requirements, throwOnUnsatisfied = true) => {
       throw new Error(`Your blocklet is not supported on architecture ${actualCpu}`);
     }
     if (isVersionSatisfied === false) {
-      throw new Error(`Your blocklet is not supported on server version v${actualVersion}`);
+      throw new Error(
+        `Expected server version for the blocklet is ${expectedVersion}, but your server version is ${actualVersion}, please upgrade or downgrade your server to continue.`
+      );
     }
   }
 

package/lib/util/upgrade.js

@@ -38,7 +38,7 @@ const checkNewVersion = async (params, context) => {
           entityType: 'node',
           severity: 'info',
           sticky: true,
-          action: '/settings/basic',
+          action: '/settings/about',
         });
 
         return latestVersion;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.12",
+  "version": "1.7.15",
   "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.12",
-    "@abtnode/constant": "1.7.12",
-    "@abtnode/cron": "1.7.12",
-    "@abtnode/db": "1.7.12",
-    "@abtnode/logger": "1.7.12",
-    "@abtnode/queue": "1.7.12",
-    "@abtnode/rbac": "1.7.12",
-    "@abtnode/router-provider": "1.7.12",
-    "@abtnode/static-server": "1.7.12",
-    "@abtnode/timemachine": "1.7.12",
-    "@abtnode/util": "1.7.12",
-    "@arcblock/did": "^1.16.6",
+    "@abtnode/certificate-manager": "1.7.15",
+    "@abtnode/constant": "1.7.15",
+    "@abtnode/cron": "1.7.15",
+    "@abtnode/db": "1.7.15",
+    "@abtnode/logger": "1.7.15",
+    "@abtnode/queue": "1.7.15",
+    "@abtnode/rbac": "1.7.15",
+    "@abtnode/router-provider": "1.7.15",
+    "@abtnode/static-server": "1.7.15",
+    "@abtnode/timemachine": "1.7.15",
+    "@abtnode/util": "1.7.15",
+    "@arcblock/did": "^1.16.8",
     "@arcblock/did-motif": "^1.1.5",
-    "@arcblock/event-hub": "1.16.6",
+    "@arcblock/event-hub": "1.16.8",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.16.6",
-    "@blocklet/meta": "1.7.12",
+    "@arcblock/vc": "^1.16.8",
+    "@blocklet/meta": "1.7.15",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.16.6",
-    "@ocap/util": "^1.16.6",
-    "@ocap/wallet": "^1.16.6",
+    "@ocap/mcrypto": "^1.16.8",
+    "@ocap/util": "^1.16.8",
+    "@ocap/wallet": "^1.16.8",
     "@slack/webhook": "^5.0.3",
     "axios": "^0.26.1",
     "axon": "^2.0.3",
@@ -59,6 +59,7 @@
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
     "pm2": "^5.1.2",
+    "promise.any": "^2.0.4",
     "semver": "^7.3.2",
     "shelljs": "^0.8.4",
     "slugify": "^1.4.6",
@@ -78,5 +79,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "afc78b9cb92448676149262fb02432bc256a5524"
+  "gitHead": "d95421b38c281ed41fa7490a707f149aa737f3d3"
 }