@abtnode/core 1.16.11-next-8a4df821 → 1.16.11-next-ca5f18b5

package/lib/blocklet/manager/disk.js

@@ -73,6 +73,7 @@ const {
   BLOCKLET_CONTROLLER_STATUS,
   SUSPENDED_REASON,
 } = require('@blocklet/constant');
+const isUndefined = require('lodash/isUndefined');
 const { consumeServerlessNFT, consumeLauncherSession } = require('../../util/launcher');
 const util = require('../../util');
 const {
@@ -1630,14 +1631,20 @@ class BlockletManager extends BaseBlockletManager {
 
   /**
    * @description
-   * @param {import('@abtnode/client').RequestAddBlockletSpaceGatewayInput} { did, spaceGateway }
+   * @param {import('@abtnode/client').RequestAddBlockletSpaceGatewayInput} { did, spaceGatewayDid }
    * @return {Promise<void>}
    * @memberof BlockletManager
    */
-  async deleteBlockletSpaceGateway({ did, url }) {
+  async deleteBlockletSpaceGateway({ did, spaceGatewayDid }) {
     const spaceGateways = await this.getBlockletSpaceGateways({ did });
 
-    const latestSpaceGateways = spaceGateways.filter((s) => s?.url !== url);
+    const latestSpaceGateways = spaceGateways.filter((s) => {
+      if (spaceGatewayDid) {
+        return s?.did !== spaceGatewayDid;
+      }
+      // note: 兼容性处理，所有没有 did 的 spaceGateway 统一会被删除
+      return !isUndefined(s?.did);
+    });
 
     await states.blockletExtras.setSettings(did, { spaceGateways: latestSpaceGateways });
   }

package/lib/validators/space-gateway.js

@@ -1,6 +1,8 @@
 const { Joi } = require('@arcblock/validator');
 
 const validateAddSpaceGateway = Joi.object({
+  // 表示 space did
+  did: Joi.DID(),
   url: Joi.string()
     .uri({ scheme: ['http', 'https'] })
     .required(),
@@ -13,6 +15,7 @@ const validateAddSpaceGateway = Joi.object({
 });
 
 const validateUpdateSpaceGateway = Joi.object({
+  did: Joi.DID(),
   url: Joi.string()
     .uri({ scheme: ['http', 'https'] })
     .required(),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.11-next-8a4df821",
+  "version": "1.16.11-next-ca5f18b5",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.11-next-8a4df821",
-    "@abtnode/certificate-manager": "1.16.11-next-8a4df821",
-    "@abtnode/constant": "1.16.11-next-8a4df821",
-    "@abtnode/cron": "1.16.11-next-8a4df821",
-    "@abtnode/logger": "1.16.11-next-8a4df821",
-    "@abtnode/models": "1.16.11-next-8a4df821",
-    "@abtnode/queue": "1.16.11-next-8a4df821",
-    "@abtnode/rbac": "1.16.11-next-8a4df821",
-    "@abtnode/router-provider": "1.16.11-next-8a4df821",
-    "@abtnode/static-server": "1.16.11-next-8a4df821",
-    "@abtnode/timemachine": "1.16.11-next-8a4df821",
-    "@abtnode/util": "1.16.11-next-8a4df821",
+    "@abtnode/auth": "1.16.11-next-ca5f18b5",
+    "@abtnode/certificate-manager": "1.16.11-next-ca5f18b5",
+    "@abtnode/constant": "1.16.11-next-ca5f18b5",
+    "@abtnode/cron": "1.16.11-next-ca5f18b5",
+    "@abtnode/logger": "1.16.11-next-ca5f18b5",
+    "@abtnode/models": "1.16.11-next-ca5f18b5",
+    "@abtnode/queue": "1.16.11-next-ca5f18b5",
+    "@abtnode/rbac": "1.16.11-next-ca5f18b5",
+    "@abtnode/router-provider": "1.16.11-next-ca5f18b5",
+    "@abtnode/static-server": "1.16.11-next-ca5f18b5",
+    "@abtnode/timemachine": "1.16.11-next-ca5f18b5",
+    "@abtnode/util": "1.16.11-next-ca5f18b5",
     "@arcblock/did": "1.18.80",
     "@arcblock/did-auth": "1.18.80",
     "@arcblock/did-ext": "^1.18.80",
@@ -41,9 +41,9 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.80",
     "@arcblock/vc": "1.18.80",
-    "@blocklet/constant": "1.16.11-next-8a4df821",
-    "@blocklet/meta": "1.16.11-next-8a4df821",
-    "@blocklet/sdk": "1.16.11-next-8a4df821",
+    "@blocklet/constant": "1.16.11-next-ca5f18b5",
+    "@blocklet/meta": "1.16.11-next-ca5f18b5",
+    "@blocklet/sdk": "1.16.11-next-ca5f18b5",
     "@did-space/client": "^0.2.113",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.80",
@@ -96,5 +96,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "194300e66d207fd7d5e40f5e97fc58c4bdd9ffd7"
+  "gitHead": "d797d0177d585b66d17876c99c994fda4d812f37"
 }