@blocklet/sdk 1.16.42 → 1.16.43-beta-20250419-231352-c78ac93d

package/lib/connect/shared.js

@@ -12,6 +12,16 @@ const get_1 = __importDefault(require("lodash/get"));
 const wallet_2 = __importDefault(require("../wallet"));
 const login_1 = require("../util/login");
 const app_info_1 = require("../util/app-info");
+// 为了避免循环依赖，暂时将 @abtnode/auth 中必要的方法复制过来
+function isMaster(site) {
+    return site?.isMaster !== false;
+}
+// 为了避免循环依赖，暂时将 @abtnode/auth 中必要的方法复制过来
+function getFederatedMaster(blocklet) {
+    const { sites } = blocklet?.settings?.federated || {};
+    const masterSite = (sites || []).find((item) => isMaster(item));
+    return masterSite || null;
+}
 // wraps value in closure or returns closure
 const closure = (value) => (typeof value === 'function' ? value : () => value);
 const getDelegator = () => {
@@ -118,8 +128,8 @@ const getAuthenticatorProps = (options = {}) => ({
                 console.error(error);
                 throw new Error('failed to get blocklet');
             }
-            const pk = (0, get_1.default)(blocklet, 'settings.federated.sites[0].pk');
-            if (pk) {
+            const masterSite = getFederatedMaster(blocklet);
+            if (masterSite?.pk) {
                 // NOTE: 这里的 type 参数必须保持跟生成 blocklet 时使用的是一致的
                 const type = {
                     role: mcrypto_1.types.RoleType.ROLE_APPLICATION,
@@ -127,7 +137,7 @@ const getAuthenticatorProps = (options = {}) => ({
                     hash: mcrypto_1.types.HashType.SHA3,
                     address: mcrypto_1.types.EncodingType.BASE58,
                 };
-                const delegator = (0, wallet_1.fromPublicKey)(pk, type);
+                const delegator = (0, wallet_1.fromPublicKey)(masterSite.pk, type);
                 return delegator;
             }
             throw new Error('federated login master-site pk not found');

package/lib/service/auth.js

@@ -13,6 +13,7 @@ const util_1 = require("@ocap/util");
 const constant_2 = require("@blocklet/constant");
 const util_2 = require("@blocklet/meta/lib/util");
 const security_1 = require("@blocklet/meta/lib/security");
+const error_1 = require("@blocklet/error");
 const check_blocklet_env_1 = __importDefault(require("../util/check-blocklet-env"));
 const version_1 = require("../version");
 const wallet_1 = __importDefault(require("../wallet"));
@@ -170,7 +171,7 @@ class AuthService {
             }
             catch (err) {
                 console.error(err.response ? err.response.data : err);
-                throw new Error(err.response ? err.response.data : err.message);
+                throw new Error((0, error_1.formatError)(err));
             }
         };
         this.refreshSession = async (data) => {
@@ -190,7 +191,7 @@ class AuthService {
             }
             catch (err) {
                 console.error(err.response ? err.response.data : err);
-                throw new Error(err.response ? err.response.data : err.message);
+                throw new Error((0, error_1.formatError)(err));
             }
         };
         this.getTrustedDomains = async () => {
@@ -200,7 +201,7 @@ class AuthService {
             }
             catch (err) {
                 console.error(err.response ? err.response.data : err);
-                throw new Error(err.response ? err.response.data : err.message);
+                throw new Error((0, error_1.formatError)(err));
             }
         };
         this.getComponent = async (did) => {
@@ -226,7 +227,7 @@ class AuthService {
                 return res;
             }
             catch (err) {
-                throw new Error(err.response ? err.response.data : err.message);
+                throw new Error((0, error_1.formatError)(err));
             }
         };
         this.updateUserAddress = async (args, options) => {
@@ -243,7 +244,7 @@ class AuthService {
                 return res;
             }
             catch (err) {
-                throw new Error(err.response ? err.response.data : err.message);
+                throw new Error((0, error_1.formatError)(err));
             }
         };
         // eslint-disable-next-line no-constructor-return

package/lib/util/send-notification.js

@@ -44,6 +44,7 @@ const constant_1 = __importDefault(require("@abtnode/constant"));
 const channel_1 = require("@blocklet/meta/lib/channel");
 const did_1 = require("@arcblock/did");
 const ufo_1 = require("ufo");
+const error_1 = require("@blocklet/error");
 const index_1 = require("../validators/index");
 const constants_1 = require("./constants");
 const version_1 = require("../version");
@@ -98,7 +99,7 @@ const sendToUser = async (receiver, notification, { appDid, appSk, type }, optio
     }
     catch (err) {
         console.error(err.response ? err.response.data : err);
-        throw new Error(err.response ? err.response.data : err.message);
+        throw new Error((0, error_1.formatError)(err));
     }
 };
 exports.sendToUser = sendToUser;
@@ -137,7 +138,7 @@ const sendToAppChannel = async (channel, event, notification, { appDid, appSk },
     }
     catch (err) {
         console.error(err.response ? err.response.data : err);
-        throw new Error(err.response ? err.response.data : err.message);
+        throw new Error((0, error_1.formatError)(err));
     }
 };
 exports.sendToAppChannel = sendToAppChannel;
@@ -168,7 +169,7 @@ const sendToRelay = async (topic, event, data, { appDid, appSk }, port = process
     }
     catch (err) {
         console.error(err.response ? err.response.data : err);
-        throw new Error(err.response ? err.response.data : err.message);
+        throw new Error((0, error_1.formatError)(err));
     }
 };
 exports.sendToRelay = sendToRelay;
@@ -192,7 +193,7 @@ const sendToEventBus = async (event, { appDid, appSk }, port = process.env.ABT_N
     }
     catch (err) {
         console.error(err.response ? err.response.data : err);
-        throw new Error(err.response ? err.response.data : err.message);
+        throw new Error((0, error_1.formatError)(err));
     }
 };
 exports.sendToEventBus = sendToEventBus;

package/lib/version.d.ts

@@ -1,4 +1,4 @@
-declare const version = "1.16.42";
+declare const version = "1.16.43";
 export { version };
 declare const _default: {
     version: string;

package/lib/version.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-const version = '1.16.42';
+const version = '1.16.43';
 exports.version = version;
 exports.default = { version };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.42",
+  "version": "1.16.43-beta-20250419-231352-c78ac93d",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,22 +27,23 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/client": "1.16.42",
-    "@abtnode/constant": "1.16.42",
-    "@abtnode/util": "1.16.42",
-    "@arcblock/did": "1.20.0",
-    "@arcblock/did-auth": "1.20.0",
-    "@arcblock/jwt": "1.20.0",
-    "@arcblock/ws": "1.20.0",
-    "@blocklet/constant": "1.16.42",
-    "@blocklet/env": "1.16.42",
-    "@blocklet/meta": "1.16.42",
+    "@abtnode/client": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@abtnode/constant": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@abtnode/util": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@arcblock/did": "1.20.1",
+    "@arcblock/did-auth": "1.20.1",
+    "@arcblock/jwt": "1.20.1",
+    "@arcblock/ws": "1.20.1",
+    "@blocklet/constant": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@blocklet/env": "1.16.43-beta-20250419-231352-c78ac93d",
+    "@blocklet/error": "^0.2.4",
+    "@blocklet/meta": "1.16.43-beta-20250419-231352-c78ac93d",
     "@did-connect/authenticator": "^2.2.7",
     "@did-connect/handler": "^2.2.7",
     "@nedb/core": "^2.1.5",
-    "@ocap/mcrypto": "1.20.0",
-    "@ocap/util": "1.20.0",
-    "@ocap/wallet": "1.20.0",
+    "@ocap/mcrypto": "1.20.1",
+    "@ocap/util": "1.20.1",
+    "@ocap/wallet": "1.20.1",
     "axios": "^1.7.9",
     "cheerio": "1.0.0-rc.12",
     "debug": "^4.3.7",
@@ -82,5 +83,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "04e4adf8f2c1d6289850c66159c0a68ea946d5e6"
+  "gitHead": "207acad34e8ccf318cd7539c1ac717cee7951b53"
 }