@blocklet/sdk 1.16.37-beta-20250102-115729-ae7f327e → 1.16.37-beta-20250106-134442-ea92021c

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2018-2020 ArcBlock
+Copyright 2018-2025 ArcBlock
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/connect/authenticator.js

@@ -11,6 +11,7 @@ class BlockletAuthenticator extends authenticator_1.Authenticator {
     constructor(options = {}) {
         (0, check_blocklet_env_1.default)();
         super({
+            // @ts-ignore
             wallet: (0, wallet_1.default)(),
             ...(0, shared_1.getAuthenticatorProps)(options),
         });

package/lib/middlewares/component.d.ts

@@ -1,7 +1,7 @@
 import type { NextFunction, Request, Response } from 'express';
-declare const verifySig: (req: Request, res: Response, next: NextFunction) => void | Response<any, Record<string, any>>;
+declare const verifySig: (req: Request, res: Response, next: NextFunction) => Promise<void | Response<any, Record<string, any>>>;
 export { verifySig };
 declare const _default: {
-    verifySig: (req: Request, res: Response, next: NextFunction) => void | Response<any, Record<string, any>>;
+    verifySig: (req: Request, res: Response, next: NextFunction) => Promise<void | Response<any, Record<string, any>>>;
 };
 export default _default;

package/lib/middlewares/component.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifySig = void 0;
 const config_1 = require("../config");
 const verify_sign_1 = require("../util/verify-sign");
-const verifySig = (req, res, next) => {
+const verifySig = async (req, res, next) => {
     try {
         const { data, sig } = (0, verify_sign_1.getVerifyData)(req, 'component');
         if (!sig) {
             return res.status(400).json({ error: 'Bad Request' });
         }
-        const verified = (0, verify_sign_1.verify)(data, sig);
+        const verified = await (0, verify_sign_1.verify)(data, sig);
         if (!verified) {
             config_1.logger.error('verify component sig failed', { data, sig });
             return res.status(401).json({ error: 'verify sig failed' });

package/lib/middlewares/index.d.ts

@@ -20,7 +20,7 @@ declare const _default: {
         user?: import("../util/login").SessionUser;
     }, res: import("express").Response, next: import("express").NextFunction) => Promise<void>;
     component: {
-        verifySig: (req: import("express").Request, res: import("express").Response, next: import("express").NextFunction) => void | import("express").Response<any, Record<string, any>>;
+        verifySig: (req: import("express").Request, res: import("express").Response, next: import("express").NextFunction) => Promise<void | import("express").Response<any, Record<string, any>>>;
     };
     fallback: (file: string, options?: {
         root?: string | undefined;

package/lib/middlewares/session.js

@@ -21,12 +21,12 @@ const sessionMiddleware = (options = {}) => {
             }
             // authenticate by component call
             if (!result && componentCall) {
-                result = (0, verify_session_1.verifyComponentCall)({ req, strictMode });
+                result = await (0, verify_session_1.verifyComponentCall)({ req, strictMode });
             }
             // authenticate by signed tmp token: which expires in 5 minutes
             if (!result && signedToken) {
                 const token = req.query.__jwt || '';
-                result = (0, verify_session_1.verifySignedToken)({ token, strictMode });
+                result = await (0, verify_session_1.verifySignedToken)({ token, strictMode });
             }
         }
         catch (err) {

package/lib/security/index.d.ts

@@ -1,7 +1,7 @@
 declare const encrypt: (message: string, password?: string, salt?: string) => string;
 declare const decrypt: (message: string, password?: string, salt?: string) => string;
 declare const signResponse: (data: any) => any;
-declare const verifyResponse: (data: any) => boolean;
+declare const verifyResponse: (data: any) => Promise<boolean>;
 export { encrypt };
 export { decrypt };
 export { signResponse, verifyResponse };
@@ -9,6 +9,6 @@ declare const _default: {
     encrypt: (message: string, password?: string, salt?: string) => string;
     decrypt: (message: string, password?: string, salt?: string) => string;
     signResponse: (data: any) => any;
-    verifyResponse: (data: any) => boolean;
+    verifyResponse: (data: any) => Promise<boolean>;
 };
 export default _default;

package/lib/service/auth.js

@@ -8,26 +8,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const pickBy_1 = __importDefault(require("lodash/pickBy"));
 const ufo_1 = require("ufo");
 const client_1 = __importDefault(require("@abtnode/client"));
-const semver_1 = __importDefault(require("semver"));
-const mcrypto_1 = require("@ocap/mcrypto");
-const wallet_1 = require("@ocap/wallet");
-const env_1 = require("@blocklet/env");
 const constant_1 = __importDefault(require("@abtnode/constant"));
+const util_1 = require("@ocap/util");
 const constant_2 = require("@blocklet/constant");
-const util_1 = require("@blocklet/meta/lib/util");
+const util_2 = require("@blocklet/meta/lib/util");
 const check_blocklet_env_1 = __importDefault(require("../util/check-blocklet-env"));
 const version_1 = require("../version");
-const wallet_2 = __importDefault(require("../wallet"));
+const wallet_1 = __importDefault(require("../wallet"));
 const service_api_1 = __importDefault(require("../util/service-api"));
 const parse_docker_endpoint_1 = require("../util/parse-docker-endpoint");
 const { WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_URL_PREFIX, USER_AVATAR_PATH_PREFIX } = constant_1.default;
 const VERSION = version_1.version; // version of notification sdk
 const isNotNullOrUndefined = (x) => ![null, undefined].includes(x);
-// BLOCKLET_WALLET_TYPE is for backward compatibility
-const chainType = process.env.CHAIN_TYPE || process.env.BLOCKLET_WALLET_TYPE;
-const type = chainType !== 'ethereum' && chainType !== 'eth'
-    ? (0, wallet_1.WalletType)({ role: mcrypto_1.types.RoleType.ROLE_APPLICATION, pk: mcrypto_1.types.KeyType.ED25519, hash: mcrypto_1.types.HashType.SHA3 })
-    : 'eth';
 const fixAvatar = (user) => {
     const avatar = user?.avatar;
     if (avatar && avatar.startsWith(USER_AVATAR_URL_PREFIX)) {
@@ -35,18 +27,16 @@ const fixAvatar = (user) => {
     }
     return user;
 };
-const toBuffer = (str) => (str.startsWith('0x') ? Buffer.from(str.slice(2), 'hex') : str);
 class AuthClient extends client_1.default {
     constructor(httpEndpoint) {
         (0, check_blocklet_env_1.default)();
         super(httpEndpoint || `http://${(0, parse_docker_endpoint_1.getServerHost)()}:${process.env.ABT_NODE_PORT}/api/gql`.trim(), `BlockletSDK/${VERSION}`);
-        const wallet = (0, wallet_2.default)();
-        const useNewSigner = !env_1.serverVersion || semver_1.default.gte(env_1.serverVersion, '1.16.7');
+        const wallet = (0, wallet_1.default)();
         this.setAuthAccessKey({
             accessKeyId: wallet.address,
             // for backward compatibility
-            accessKeySecret: useNewSigner ? toBuffer(wallet.secretKey) : wallet.secretKey,
-            type: useNewSigner ? 'sha256' : type,
+            accessKeySecret: (0, util_1.toBuffer)(wallet.secretKey),
+            type: 'sha256',
         });
     }
     _getAuthHeaders() {
@@ -200,7 +190,7 @@ class AuthService {
         };
         this.getComponent = async (did) => {
             const { blocklet } = await this.getBlocklet();
-            return (0, util_1.findComponentByIdV2)(blocklet, did);
+            return (0, util_2.findComponentByIdV2)(blocklet, did);
         };
         // eslint-disable-next-line no-constructor-return
         return new Proxy(this, {

package/lib/service/notification.js

@@ -174,7 +174,7 @@ const initClient = () => {
         });
         [...Object.keys(constant_1.BlockletInternalEvents), ...Object.keys(constant_1.TeamEvents)].forEach((key) => {
             const event = constant_1.BlockletInternalEvents[key] || constant_1.TeamEvents[key];
-            componentChannel.on(event, ({ status, response } = {}) => {
+            componentChannel.on(event, async ({ status, response } = {}) => {
                 debug('componentChannel.on', { event, status, response });
                 if (status === 'ok') {
                     const { data, sender, time } = response;
@@ -183,7 +183,7 @@ const initClient = () => {
                     }
                     // verify sender is server
                     const tolerance = 600;
-                    if (!Jwt.verify(sender.token, process.env.ABT_NODE_PK, { tolerance })) {
+                    if (!(await Jwt.verify(sender.token, process.env.ABT_NODE_PK, { tolerance }))) {
                         const message = `verify sender failed in internal events. event: ${event}, sender: ${JSON.stringify(sender)}`;
                         emitError({ message });
                         console.error(message);

package/lib/util/verify-session.d.ts

@@ -7,8 +7,8 @@ export declare function verifyLoginToken({ token, strictMode }: {
 export declare function verifyComponentCall({ req, strictMode }: {
     req: any;
     strictMode: any;
-}): SessionUser | null;
+}): Promise<SessionUser | null>;
 export declare function verifySignedToken({ token, strictMode }: {
     token: any;
     strictMode: any;
-}): SessionUser | null;
+}): Promise<SessionUser | null>;

package/lib/util/verify-session.js

@@ -46,11 +46,11 @@ function verifyLoginToken({ token, strictMode }) {
         });
     });
 }
-function verifyComponentCall({ req, strictMode }) {
+async function verifyComponentCall({ req, strictMode }) {
     const { sig, data } = (0, verify_sign_1.getVerifyData)(req);
     if (!sig)
         return null;
-    if ((0, verify_sign_1.verify)(data, sig) === false) {
+    if ((await (0, verify_sign_1.verify)(data, sig)) === false) {
         if (strictMode) {
             throw new Error('Unauthorized: Invalid signature');
         }
@@ -67,10 +67,10 @@ function verifyComponentCall({ req, strictMode }) {
         method: 'componentCall',
     };
 }
-function verifySignedToken({ token, strictMode }) {
+async function verifySignedToken({ token, strictMode }) {
     if (!token)
         return null;
-    if ((0, jwt_1.verify)(token, (0, exports.getSessionSecret)()) === false) {
+    if (!(await (0, jwt_1.verify)(token, (0, exports.getSessionSecret)()))) {
         if (strictMode) {
             throw new Error('Unauthorized: Invalid signed token');
         }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.37-beta-20250102-115729-ae7f327e",
+  "version": "1.16.37-beta-20250106-134442-ea92021c",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,21 +27,22 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/client": "1.16.37-beta-20250102-115729-ae7f327e",
-    "@abtnode/constant": "1.16.37-beta-20250102-115729-ae7f327e",
-    "@abtnode/util": "1.16.37-beta-20250102-115729-ae7f327e",
-    "@arcblock/did": "1.18.166",
-    "@arcblock/did-auth": "1.18.166",
-    "@arcblock/jwt": "1.18.166",
-    "@arcblock/ws": "1.18.166",
-    "@blocklet/constant": "1.16.37-beta-20250102-115729-ae7f327e",
-    "@blocklet/env": "1.16.37-beta-20250102-115729-ae7f327e",
-    "@blocklet/meta": "1.16.37-beta-20250102-115729-ae7f327e",
+    "@abtnode/client": "1.16.37-beta-20250106-134442-ea92021c",
+    "@abtnode/constant": "1.16.37-beta-20250106-134442-ea92021c",
+    "@abtnode/util": "1.16.37-beta-20250106-134442-ea92021c",
+    "@arcblock/did": "1.19.1",
+    "@arcblock/did-auth": "1.19.1",
+    "@arcblock/jwt": "1.19.1",
+    "@arcblock/ws": "1.19.1",
+    "@blocklet/constant": "1.16.37-beta-20250106-134442-ea92021c",
+    "@blocklet/env": "1.16.37-beta-20250106-134442-ea92021c",
+    "@blocklet/meta": "1.16.37-beta-20250106-134442-ea92021c",
     "@did-connect/authenticator": "^2.2.4",
     "@did-connect/handler": "^2.2.4",
     "@nedb/core": "^2.1.5",
-    "@ocap/mcrypto": "1.18.166",
-    "@ocap/wallet": "1.18.166",
+    "@ocap/mcrypto": "1.19.1",
+    "@ocap/util": "1.19.1",
+    "@ocap/wallet": "1.19.1",
     "axios": "^1.7.9",
     "cheerio": "1.0.0-rc.12",
     "debug": "^4.3.7",
@@ -81,5 +82,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "3f2d744095b2056010fdd1635841857a65f12232"
+  "gitHead": "3ca08cceb016a318c7c00ec1f1bef4db19a3c723"
 }