@abtnode/core 1.8.14 → 1.8.15

package/lib/blocklet/manager/disk.js

@@ -217,7 +217,7 @@ class BlockletManager extends BaseBlockletManager {
    * @param {{
    *  url: string;
    *  sync: boolean = false;
-   *  downloadToken: string;
+   *  downloadTokenList: Array<{did: string, token: string};
    * }} params
    * @param {{
    *  [key: string]: any
@@ -228,20 +228,16 @@ class BlockletManager extends BaseBlockletManager {
   async install(params, context = {}) {
     logger.debug('install blocklet', { params, context });
 
-    if (params.downloadToken) {
-      const info = await states.node.read();
+    const info = await states.node.read();
 
-      context.headers = Object.assign(context?.headers || {}, {
-        'x-server-did': info.did,
-        'x-download-token': params.downloadToken,
-        // FIXME: 先保证兼容性,后续删除
-        'x-server-publick-key': info.pk,
-        'x-server-public-key': info.pk,
-        'x-server-signature': sign(info.did, info.sk, {
-          exp: (Date.now() + 5 * 60 * 1000) / 1000,
-        }),
-      });
-    }
+    context.headers = Object.assign(context?.headers || {}, {
+      'x-server-did': info.did,
+      'x-server-public-key': info.pk,
+      'x-server-signature': sign(info.did, info.sk, {
+        exp: (Date.now() + 5 * 60 * 1000) / 1000,
+      }),
+    });
+    context.downloadTokenList = params.downloadTokenList || [];
 
     const source = getSourceFromInstallParams(params);
     if (typeof context.startImmediately === 'undefined') {
@@ -289,7 +285,7 @@ class BlockletManager extends BaseBlockletManager {
    * @param {ConfigEntry} configs pre configs
    */
   async installComponent(
-    { rootDid, mountPoint, url, file, did, diffVersion, deleteSet, title, name, configs, downloadToken },
+    { rootDid, mountPoint, url, file, did, diffVersion, deleteSet, title, name, configs, downloadTokenList },
     context = {}
   ) {
     logger.debug('start install component', { rootDid, mountPoint, url });
@@ -308,7 +304,7 @@ class BlockletManager extends BaseBlockletManager {
         did,
         name,
         configs,
-        downloadToken,
+        downloadTokenList,
       });
     }
 
@@ -1889,7 +1885,7 @@ class BlockletManager extends BaseBlockletManager {
     name: inputName,
     did: inputDid,
     configs,
-    downloadToken,
+    downloadTokenList,
   }) {
     const blocklet = await this._getBlockletForInstallation(rootDid);
     if (!blocklet) {
@@ -1909,14 +1905,12 @@ class BlockletManager extends BaseBlockletManager {
         ...context,
         headers: {
           'x-server-did': info.did,
-          'x-download-token': downloadToken,
-          // FIXME: 先保证兼容性,后续删除
-          'x-server-publick-key': info.pk,
           'x-server-public-key': info.pk,
           'x-server-signature': sign(info.did, info.sk, {
             exp: (Date.now() + 5 * 60 * 1000) / 1000,
           }),
         },
+        downloadTokenList: downloadTokenList || [],
       };
     }
 
@@ -2482,14 +2476,12 @@ class BlockletManager extends BaseBlockletManager {
         ...context,
         headers: {
           'x-server-did': info.did,
-          'x-download-token': blocklet?.tokens?.paidBlockletDownloadToken,
-          // FIXME: 先保证兼容性,后续删除
-          'x-server-publick-key': info.pk,
           'x-server-public-key': info.pk,
           'x-server-signature': sign(info.did, info.sk, {
             exp: (Date.now() + 5 * 60 * 1000) / 1000,
           }),
         },
+        downloadTokenList: blocklet?.tokens?.downloadTokenList || [],
       };
     }
 
@@ -2726,10 +2718,10 @@ class BlockletManager extends BaseBlockletManager {
       // Update dynamic component meta in blocklet settings
       await this._ensureDynamicChildrenInSettings(blocklet);
 
-      if (context?.headers?.['x-download-token']) {
+      if (context?.downloadTokenList?.length) {
         await states.blocklet.updateBlocklet(did, {
           tokens: {
-            paidBlockletDownloadToken: context.headers['x-download-token'],
+            downloadTokenList: context.downloadTokenList,
           },
         });
       }
@@ -2968,7 +2960,13 @@ class BlockletManager extends BaseBlockletManager {
       }
       ctrlStore[rootDid].set(did, cancelCtrl);
 
-      await downloadFile(url, path.join(cwd, tarballName), { cancelCtrl }, context);
+      const headers = context.headers ? cloneDeep(context.headers) : {};
+      const exist = (context.downloadTokenList || []).find((x) => x.did === did);
+      if (exist) {
+        headers['x-download-token'] = exist.token;
+      }
+
+      await downloadFile(url, path.join(cwd, tarballName), { cancelCtrl }, { ...context, headers });
 
       if (ctrlStore[rootDid]) {
         ctrlStore[rootDid].delete(did);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.14",
+  "version": "1.8.15",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,17 +19,17 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.8.14",
-    "@abtnode/constant": "1.8.14",
-    "@abtnode/cron": "1.8.14",
-    "@abtnode/db": "1.8.14",
-    "@abtnode/logger": "1.8.14",
-    "@abtnode/queue": "1.8.14",
-    "@abtnode/rbac": "1.8.14",
-    "@abtnode/router-provider": "1.8.14",
-    "@abtnode/static-server": "1.8.14",
-    "@abtnode/timemachine": "1.8.14",
-    "@abtnode/util": "1.8.14",
+    "@abtnode/certificate-manager": "1.8.15",
+    "@abtnode/constant": "1.8.15",
+    "@abtnode/cron": "1.8.15",
+    "@abtnode/db": "1.8.15",
+    "@abtnode/logger": "1.8.15",
+    "@abtnode/queue": "1.8.15",
+    "@abtnode/rbac": "1.8.15",
+    "@abtnode/router-provider": "1.8.15",
+    "@abtnode/static-server": "1.8.15",
+    "@abtnode/timemachine": "1.8.15",
+    "@abtnode/util": "1.8.15",
     "@arcblock/did": "1.17.17",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.17.17",
@@ -37,8 +37,8 @@
     "@arcblock/jwt": "^1.17.17",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.17.17",
-    "@blocklet/meta": "1.8.14",
-    "@blocklet/sdk": "1.8.14",
+    "@blocklet/meta": "1.8.15",
+    "@blocklet/sdk": "1.8.15",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.3.4",
     "@nedb/multi": "^1.3.4",
@@ -81,5 +81,5 @@
     "express": "^4.18.1",
     "jest": "^27.5.1"
   },
-  "gitHead": "4b0cee41fd03d09301e2c35af46dd9e513473ef8"
+  "gitHead": "57106db1b559b906734df5b8eac7ce87cae72980"
 }