@abtnode/core 1.16.3 → 1.16.4-beta-f058f4e8

package/lib/blocklet/manager/disk.js

@@ -237,6 +237,7 @@ class BlockletManager extends BaseBlockletManager {
    *  description: string;
    *  storeUrl: string;
    *  appSk: string;
+   *  skSource: 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}>;
@@ -1839,7 +1840,7 @@ class BlockletManager extends BaseBlockletManager {
     return children;
   }
 
-  async _addBlocklet({ component, mode = BLOCKLET_MODES.PRODUCTION, name, did, title, description }) {
+  async _addBlocklet({ component, mode = BLOCKLET_MODES.PRODUCTION, name, did, title, description, skSource = '' }) {
     const meta = {
       name,
       did,
@@ -1898,6 +1899,7 @@ class BlockletManager extends BaseBlockletManager {
       source: BlockletSource.custom,
       children,
       mode,
+      externalSkSource: skSource,
     };
 
     if (containerSourceUrl) {

package/lib/blocklet/manager/helper/install-application-from-general.js

@@ -20,6 +20,7 @@ const { getBlockletMetaFromUrl, ensureMeta, validateStore, validateInServerless
 const installApplicationFromGeneral = async ({
   type,
   appSk,
+  skSource,
   sync,
   delay,
   controller,
@@ -104,7 +105,7 @@ const installApplicationFromGeneral = async ({
   }
 
   // create app
-  const blocklet = await manager._addBlocklet({ component, name, did, title, description });
+  const blocklet = await manager._addBlocklet({ component, name, did, title, description, skSource });
   logger.info('blocklet added to database', { did: blocklet.meta.did });
 
   // create config

package/lib/router/helper.js

@@ -270,39 +270,50 @@ const ensureWellknownRule = async (sites) => {
         // 这里默认 pathPrefix 最短的是自己 ( 通常自己在 /, 其他 blocklet 在 /xxxx )
         // 挂载其他 blocklet 的使用方式不推荐, 将来可能会被废弃
         .sort((a, b) => (a.from.pathPrefix.length > b.from.pathPrefix.length ? 1 : -1));
-      if (blockletRules.length) {
-        // get pathPrefix for blocklet-service
-        const rootBlockletRule = blockletRules.find((x) => x.to.did === x.to.componentId);
-
-        const servicePathPrefix = joinUrl(
-          // rootBlockletRule?.from?.pathPrefix is for backwards compatibility
-          // rootBlockletRule?.from?.groupPathPrefix 在旧的场景中可能不为 '/' (blocklet 只能挂载在 relative prefix 下)
-          rootBlockletRule?.from?.groupPathPrefix || 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 === servicePathPrefix)) {
-          const rule = cloneDeep(rootBlockletRule || blockletRules[0]);
-          rule.from.pathPrefix = servicePathPrefix;
-          rule.to.target = servicePathPrefix;
-          rule.isProtected = true;
-          rule.dynamic = true; // mark as dynamic to avoid redundant generated rules
-          site.rules.push(rule);
-        }
+      const rootRule = blockletRules[0];
 
-        // Cache user avatar in nginx
-        const avatarPathPrefix = joinUrl(servicePathPrefix, USER_AVATAR_PATH_PREFIX);
-        if (!site.rules.some((x) => x.from.pathPrefix === avatarPathPrefix)) {
-          const rule = cloneDeep(rootBlockletRule || blockletRules[0]);
-          rule.from.pathPrefix = avatarPathPrefix;
-          rule.to.cacheGroup = 'blockletProxy';
-          rule.to.target = avatarPathPrefix;
-          rule.isProtected = true;
-          rule.dynamic = true; // mark as dynamic to avoid redundant generated rules
-          site.rules.push(rule);
-        }
+      // Serve blocklet service always
+      const servicePathPrefix = joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX);
+      if (!site.rules.some((x) => x.from.pathPrefix === servicePathPrefix)) {
+        site.rules.push({
+          id: rootRule?.id || '',
+          groupId: rootRule?.groupId || '',
+          from: {
+            pathPrefix: servicePathPrefix,
+            groupPathPrefix: '/',
+          },
+          to: {
+            type: 'blocklet',
+            did: site.blockletDid,
+            componentId: site.blockletDid,
+            target: servicePathPrefix,
+          },
+          isProtected: true,
+          dynamic: true,
+        });
+      }
+
+      // Cache user avatar from gateway
+      const avatarPathPrefix = joinUrl(servicePathPrefix, USER_AVATAR_PATH_PREFIX);
+      if (!site.rules.some((x) => x.from.pathPrefix === avatarPathPrefix)) {
+        site.rules.push({
+          id: rootRule?.id || '',
+          groupId: rootRule?.groupId || '',
+          from: {
+            pathPrefix: avatarPathPrefix,
+            groupPathPrefix: '/',
+          },
+          to: {
+            type: 'blocklet',
+            did: site.blockletDid,
+            componentId: site.blockletDid,
+            cacheGroup: 'blockletProxy',
+            target: avatarPathPrefix,
+          },
+          isProtected: true,
+          dynamic: true,
+        });
       }
     }
   }

package/lib/router/index.js

@@ -1,5 +1,6 @@
 const get = require('lodash/get');
 const pick = require('lodash/pick');
+const isEqual = require('lodash/isEqual');
 const cloneDeep = require('lodash/cloneDeep');
 const {
   DOMAIN_FOR_DEFAULT_SITE,
@@ -188,9 +189,6 @@ Router.formatSites = (sites = []) => {
     if (Array.isArray(site.rules) && site.rules.length > 0) {
       const rules = cloneDeep(site.rules);
 
-      let hasRootPathBlockletRule = false;
-      let tmpBlockletRule;
-
       rules.forEach((rule) => {
         if ([ROUTING_RULE_TYPES.BLOCKLET].includes(rule.to.type) === false) {
           return;
@@ -205,11 +203,6 @@ Router.formatSites = (sites = []) => {
         }
 
         if (daemonRule) {
-          if (rule.from.pathPrefix === '/') {
-            hasRootPathBlockletRule = true;
-          }
-          tmpBlockletRule = rule;
-
           // Serve meta js: both prefix and suffix do not contain trailing slash
           // NOTICE: 这里隐含了一个约定
           //   如果安装的 blockletA 和 blockletB 都需要 __blocklet__.js
@@ -242,38 +235,43 @@ Router.formatSites = (sites = []) => {
               cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
             },
           });
+        }
+      });
 
+      if (daemonRule) {
+        const rootFrom = {
+          pathPrefix: '/',
+          groupPathPrefix: '/',
+          pathSuffix: '/__blocklet__.js',
+        };
+        // ensure /__blocklet__.js should be proxy to daemon
+        if (!site.rules.find((x) => isEqual(x.from, rootFrom))) {
+          site.rules.push({
+            from: rootFrom,
+            to: {
+              type: ROUTING_RULE_TYPES.DAEMON,
+              port: daemonRule.to.port,
+              cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
+              did: site.blockletDid,
+            },
+          });
+        }
+
+        // ensure /.blocklet/proxy should be proxy to daemon
+        if (!site.rules.find((x) => x.from.pathPrefix === BLOCKLET_PROXY_PATH_PREFIX)) {
           site.rules.push({
             from: {
               pathPrefix: BLOCKLET_PROXY_PATH_PREFIX,
             },
             to: {
               port: daemonRule.to.port,
-              did: rule.to.did,
               type: ROUTING_RULE_TYPES.DAEMON,
               target: BLOCKLET_PROXY_PATH_PREFIX,
               cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletProxy' : '',
+              did: site.blockletDid,
             },
           });
         }
-      });
-
-      // ensure /__blocklet__.js should be proxy to daemon
-      if (daemonRule && !hasRootPathBlockletRule && tmpBlockletRule) {
-        site.rules.push({
-          from: {
-            pathPrefix: '/',
-            groupPathPrefix: '/',
-            pathSuffix: '/__blocklet__.js',
-          },
-          to: {
-            type: ROUTING_RULE_TYPES.DAEMON,
-            port: daemonRule.to.port,
-            did: tmpBlockletRule.to.did,
-            componentId: tmpBlockletRule.to.did,
-            cacheGroup: site.mode === BLOCKLET_MODES.PRODUCTION ? 'blockletJs' : '',
-          },
-        });
       }
     }
   });

package/lib/states/blocklet.js

@@ -259,6 +259,7 @@ class BlockletState extends BaseState {
     // whether sk is managed by some party beside server, such as did-wallet
     // externalSk is always true in struct V2 blocklet
     externalSk = true,
+    externalSkSource = '',
   } = {}) {
     return this.getBlocklet(meta.did).then(
       (exist) =>
@@ -300,6 +301,7 @@ class BlockletState extends BaseState {
               children,
               migratedFrom,
               externalSk,
+              externalSkSource,
               structVersion: APP_STRUCT_VERSION,
             };
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.3",
+  "version": "1.16.4-beta-f058f4e8",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,34 +19,34 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.3",
-    "@abtnode/certificate-manager": "1.16.3",
-    "@abtnode/constant": "1.16.3",
-    "@abtnode/cron": "1.16.3",
-    "@abtnode/db": "1.16.3",
-    "@abtnode/logger": "1.16.3",
-    "@abtnode/queue": "1.16.3",
-    "@abtnode/rbac": "1.16.3",
-    "@abtnode/router-provider": "1.16.3",
-    "@abtnode/static-server": "1.16.3",
-    "@abtnode/timemachine": "1.16.3",
-    "@abtnode/util": "1.16.3",
-    "@arcblock/did": "1.18.65",
+    "@abtnode/auth": "1.16.4-beta-f058f4e8",
+    "@abtnode/certificate-manager": "1.16.4-beta-f058f4e8",
+    "@abtnode/constant": "1.16.4-beta-f058f4e8",
+    "@abtnode/cron": "1.16.4-beta-f058f4e8",
+    "@abtnode/db": "1.16.4-beta-f058f4e8",
+    "@abtnode/logger": "1.16.4-beta-f058f4e8",
+    "@abtnode/queue": "1.16.4-beta-f058f4e8",
+    "@abtnode/rbac": "1.16.4-beta-f058f4e8",
+    "@abtnode/router-provider": "1.16.4-beta-f058f4e8",
+    "@abtnode/static-server": "1.16.4-beta-f058f4e8",
+    "@abtnode/timemachine": "1.16.4-beta-f058f4e8",
+    "@abtnode/util": "1.16.4-beta-f058f4e8",
+    "@arcblock/did": "1.18.67",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.18.65",
-    "@arcblock/event-hub": "1.18.65",
-    "@arcblock/jwt": "^1.18.65",
+    "@arcblock/did-util": "1.18.67",
+    "@arcblock/event-hub": "1.18.67",
+    "@arcblock/jwt": "^1.18.67",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.18.65",
-    "@blocklet/constant": "1.16.3",
-    "@blocklet/meta": "1.16.3",
-    "@blocklet/sdk": "1.16.3",
-    "@did-space/client": "^0.2.45",
+    "@arcblock/vc": "1.18.67",
+    "@blocklet/constant": "1.16.4-beta-f058f4e8",
+    "@blocklet/meta": "1.16.4-beta-f058f4e8",
+    "@blocklet/sdk": "1.16.4-beta-f058f4e8",
+    "@did-space/client": "^0.2.67",
     "@fidm/x509": "^1.2.1",
-    "@ocap/client": "1.18.65",
-    "@ocap/mcrypto": "1.18.65",
-    "@ocap/util": "1.18.65",
-    "@ocap/wallet": "1.18.65",
+    "@ocap/client": "1.18.67",
+    "@ocap/mcrypto": "1.18.67",
+    "@ocap/util": "1.18.67",
+    "@ocap/wallet": "1.18.67",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -93,5 +93,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "a21d48225c6f89963796871f404a2318a335701d"
+  "gitHead": "e15364f5d5125950c2a6fb8d964b12f1b8799ac0"
 }