@blocklet/sdk 1.16.54-beta-20251024-030947-6f2889bf → 1.16.54-beta-20251028-073105-3ed10cef

package/lib/config.d.ts

@@ -11,15 +11,18 @@ declare const Events: {
 };
 declare let logger: {
     info: {
+        (...data: any[]): void;
         (...data: any[]): void;
         (message?: any, ...optionalParams: any[]): void;
     };
     debug: (...args: any[]) => void;
     warn: {
+        (...data: any[]): void;
         (...data: any[]): void;
         (message?: any, ...optionalParams: any[]): void;
     };
     error: {
+        (...data: any[]): void;
         (...data: any[]): void;
         (message?: any, ...optionalParams: any[]): void;
     };
@@ -94,15 +97,18 @@ TComponent, events, Events, getBlockletJs, _handleComponentUpdateOld, _handleApp
 declare const _default: {
     logger: {
         info: {
+            (...data: any[]): void;
             (...data: any[]): void;
             (message?: any, ...optionalParams: any[]): void;
         };
         debug: (...args: any[]) => void;
         warn: {
+            (...data: any[]): void;
             (...data: any[]): void;
             (message?: any, ...optionalParams: any[]): void;
         };
         error: {
+            (...data: any[]): void;
             (...data: any[]): void;
             (message?: any, ...optionalParams: any[]): void;
         };

package/lib/service/blocklet.js

@@ -77,9 +77,10 @@ class BlockletClient extends server_js_1.default {
     }
     async _getAuthHeaders() {
         const headers = await super._getAuthHeaders();
-        // BLOCKLET_DID is always same as BLOCKLET_APP_PID in structV2 application
-        headers['x-access-blocklet'] = process.env.BLOCKLET_DID;
-        headers['x-access-component'] = process.env.BLOCKLET_COMPONENT_DID;
+        // Use BLOCKLET_APP_PID to match the DID used for deriving BLOCKLET_APP_ASK
+        // BLOCKLET_APP_ASK is derived from root.appPid, so we must use BLOCKLET_APP_PID here
+        headers['x-access-blocklet'] = process.env.BLOCKLET_APP_PID;
+        headers['x-component-did'] = process.env.BLOCKLET_COMPONENT_DID;
         return headers;
     }
 }

package/lib/util/test-setup.d.ts

@@ -0,0 +1 @@
+export default function testSetup(): void;

package/lib/util/{jest-setup.js → test-setup.js}

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = setupJest;
-// Setup blocklet environments for jest
+exports.default = testSetup;
+// Setup blocklet environments
 const os_1 = __importDefault(require("os"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -12,7 +12,7 @@ const parse_1 = require("@blocklet/meta/lib/parse");
 const mcrypto_1 = require("@ocap/mcrypto");
 const wallet_1 = require("@ocap/wallet");
 const did_ext_1 = require("@arcblock/did-ext");
-function setupJest() {
+function testSetup() {
     try {
         const dir = process.cwd();
         const wallet = (0, wallet_1.fromRandom)({ role: mcrypto_1.types.RoleType.ROLE_APPLICATION });
@@ -56,6 +56,6 @@ function setupJest() {
         ]);
     }
     catch (err) {
-        console.error('Failed to setup blocklet environment for jest', err);
+        console.error('Failed to setup blocklet environment for test', err);
     }
 }

package/lib/util/test-teardown.d.ts

@@ -0,0 +1 @@
+export default function testTeardown(): void;

package/lib/util/{jest-teardown.js → test-teardown.js}

@@ -3,13 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = setupJest;
-// Setup blocklet environments for jest
+exports.default = testTeardown;
+// Setup blocklet environments for test
 const os_1 = __importDefault(require("os"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const parse_1 = require("@blocklet/meta/lib/parse");
-function setupJest() {
+function testTeardown() {
     try {
         const dir = process.cwd();
         const meta = (0, parse_1.parse)(dir, { ensureComponentStore: false });
@@ -19,6 +19,6 @@ function setupJest() {
         }
     }
     catch (err) {
-        console.error('Failed to tear blocklet environment for jest', err);
+        console.error('Failed to tear blocklet environment for test', err);
     }
 }

package/lib/util/verify-sign.js

@@ -15,7 +15,7 @@ const semver_1 = __importDefault(require("semver"));
 const qs_1 = __importDefault(require("qs"));
 const wallet_1 = require("../wallet");
 const { getPkWallet } = wallet_1.getWallet;
-const verify = async (data, sig, { type, appSk, appPk, } = {}) => {
+const verify = async (data, sig, { type, appSk = process.env.BLOCKLET_APP_ASK || process.env.BLOCKLET_APP_SK, appPk, } = {}) => {
     try {
         if (!sig) {
             throw new Error('empty sig');
@@ -35,8 +35,9 @@ const verify = async (data, sig, { type, appSk, appPk, } = {}) => {
     }
 };
 exports.verify = verify;
+const sign = async (data, { type, appSk = process.env.BLOCKLET_APP_ASK || process.env.BLOCKLET_APP_SK } = {}
 // eslint-disable-next-line require-await
-const sign = async (data, { type, appSk } = {}) => {
+) => {
     const wallet = (0, wallet_1.getWallet)(type, appSk);
     return wallet.sign((0, json_stable_stringify_1.default)(data || {}));
 };

package/lib/wallet.d.ts

@@ -26,7 +26,7 @@ export declare const getWallet: {
     getPermanentWallet: () => WalletObject<string>;
     getEthereumWallet: (permanent?: boolean) => WalletObject<string>;
     getPkWallet: (type?: DIDTypeShortcut, appPk?: string) => WalletObject;
-    deriveWallet: (sub: string, type?: DIDTypeArg, index?: number) => Promise<WalletObject>;
+    deriveWallet: (sub: string, type?: DIDTypeArg, index?: number, keyType?: "sk" | "psk") => Promise<WalletObject>;
     getAccessWallet: () => WalletObject<string>;
 };
 /**
@@ -34,9 +34,10 @@ export declare const getWallet: {
  * @param sub - Subject identifier (e.g., 'email|user@example.com')
  * @param type - DID type shortcut (e.g., 'ethereum')
  * @param index - Index for deriving wallet (default: 0)
+ * @param keyType - Key type to use ('sk' or 'psk', default: 'sk')
  * @returns Wallet object with sign and signJWT methods
  */
-export declare const deriveWallet: (sub: string, type?: DIDTypeArg, index?: number) => Promise<WalletObject>;
+export declare const deriveWallet: (sub: string, type?: DIDTypeArg, index?: number, keyType?: "sk" | "psk") => Promise<WalletObject>;
 export declare const getPermanentWallet: () => WalletObject<string>;
 export declare const getEthereumWallet: (permanent?: boolean) => WalletObject<string>;
 export declare const getAccessWallet: () => WalletObject<string>;

package/lib/wallet.js

@@ -47,7 +47,7 @@ const createRemoteWallet = (publicKey, type, keyType = 'sk') => {
     // Support full wallet.sign signature: sign(data, encoding?, hashBeforeSign?)
     remoteWallet.sign = async (payload, encoding, hashBeforeSign) => {
         try {
-            const { signature } = await (0, signature_1.remoteSign)(payload, { keyType, encoding, hashBeforeSign });
+            const { signature } = await (0, signature_1.remoteSign)(payload, { keyType, encoding, hashBeforeSign, type });
             if (!signature) {
                 throw new Error('Empty signature returned from blocklet-service');
             }
@@ -61,7 +61,7 @@ const createRemoteWallet = (publicKey, type, keyType = 'sk') => {
     // Match the signature: signJWT(payload?, doSign?, version?)
     remoteWallet.signJWT = async (payload, doSign, version) => {
         try {
-            const { token } = await (0, signature_1.remoteSignJWT)(payload, { doSign, version, keyType });
+            const { token } = await (0, signature_1.remoteSignJWT)(payload, { doSign, version, keyType, type });
             if (!token) {
                 throw new Error('Empty JWT token returned from blocklet-service');
             }
@@ -74,7 +74,7 @@ const createRemoteWallet = (publicKey, type, keyType = 'sk') => {
     // Add remote signETH method
     remoteWallet.signETH = async (data, hashBeforeSign) => {
         try {
-            const { signature } = await (0, signature_1.remoteSignETH)(data, { hashBeforeSign, keyType });
+            const { signature } = await (0, signature_1.remoteSignETH)(data, { hashBeforeSign, keyType, type: 'ethereum' });
             if (!signature) {
                 throw new Error('Empty signature returned from blocklet-service');
             }
@@ -105,8 +105,13 @@ const getWallet = (type, appSk = process.env.BLOCKLET_APP_SK, keyType = 'sk') =>
         ? (0, wallet_1.WalletType)(type)
         : (0, wallet_1.WalletType)({ role: mcrypto_1.types.RoleType.ROLE_APPLICATION, pk: mcrypto_1.types.KeyType.ED25519, hash: mcrypto_1.types.HashType.SHA3 });
     if (!appSk) {
-        // Select public key based on keyType
-        const appPk = keyType === 'psk' ? process.env.BLOCKLET_APP_PPK : process.env.BLOCKLET_APP_PK;
+        let appPk;
+        if ((0, did_1.isEthereumType)((0, did_1.DidType)(type))) {
+            appPk = keyType === 'psk' ? process.env.BLOCKLET_APP_PPK_ETH : process.env.BLOCKLET_APP_PK_ETH;
+        }
+        else {
+            appPk = keyType === 'psk' ? process.env.BLOCKLET_APP_PPK : process.env.BLOCKLET_APP_PK;
+        }
         if (!appPk) {
             throw new Error(`Missing public key for ${keyType.toUpperCase()} wallet: BLOCKLET_APP_P${keyType.toUpperCase()}`);
         }
@@ -125,16 +130,17 @@ exports.getWallet = getWallet;
  * @param sub - Subject identifier (e.g., 'email|user@example.com')
  * @param type - DID type shortcut (e.g., 'ethereum')
  * @param index - Index for deriving wallet (default: 0)
+ * @param keyType - Key type to use ('sk' or 'psk', default: 'sk')
  * @returns Wallet object with sign and signJWT methods
  */
-const deriveWallet = async (sub, type, index) => {
-    const appSk = process.env.BLOCKLET_APP_SK;
+const deriveWallet = async (sub, type, index, keyType = 'sk') => {
+    const appSk = keyType === 'psk' ? process.env.BLOCKLET_APP_PSK : process.env.BLOCKLET_APP_SK;
     // If we have a secret key, use local fromAppDid
     if (appSk) {
         return (0, did_ext_1.fromAppDid)(sub, appSk, type, index);
     }
     // No secret key available, use remote fromAppDid
-    const walletJSON = await (0, signature_1.remoteDeriveWallet)(sub, type, index);
+    const walletJSON = await (0, signature_1.remoteDeriveWallet)(sub, type, index, { keyType });
     const wallet = (0, wallet_1.fromJSON)(walletJSON);
     if (!(0, wallet_1.isValid)(wallet, true)) {
         throw new Error('Invalid response from remote fromAppDid: wallet is invalid');

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.54-beta-20251024-030947-6f2889bf",
+  "version": "1.16.54-beta-20251028-073105-3ed10cef",
   "description": "graphql client to read/write data on abt node",
   "homepage": "https://www.arcblock.io/docs/blocklet-sdk-nodejs",
   "main": "lib/index.js",
@@ -16,8 +16,8 @@
     "verify": "npm run lint:fix && npm run test && npm run build",
     "lint": "eslint src tests service",
     "lint:fix": "npm run lint -- --fix",
-    "test": "bun test",
-    "coverage": "bun test --coverage",
+    "test": "bun test --bail --timeout 30000",
+    "coverage": "bun test --bail --timeout 30000 --coverage",
     "clean": "rm -fr lib",
     "prebuild": "npm run clean && npm run types",
     "types": "rm -rf ./src/types && node tools/version.js && ts-node tools/types.js && rm -f ./src/types/index.ts && prettier --write ./src/types/notification.ts",
@@ -28,19 +28,19 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@abtnode/db-cache": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@abtnode/util": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@abtnode/constant": "1.16.54-beta-20251028-073105-3ed10cef",
+    "@abtnode/db-cache": "1.16.54-beta-20251028-073105-3ed10cef",
+    "@abtnode/util": "1.16.54-beta-20251028-073105-3ed10cef",
     "@arcblock/did": "^1.26.3",
     "@arcblock/did-connect-js": "^1.26.3",
     "@arcblock/did-ext": "^1.26.3",
     "@arcblock/jwt": "^1.26.3",
     "@arcblock/ws": "^1.26.3",
-    "@blocklet/constant": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@blocklet/env": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@blocklet/constant": "1.16.54-beta-20251028-073105-3ed10cef",
+    "@blocklet/env": "1.16.54-beta-20251028-073105-3ed10cef",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.54-beta-20251024-030947-6f2889bf",
-    "@blocklet/server-js": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@blocklet/meta": "1.16.54-beta-20251028-073105-3ed10cef",
+    "@blocklet/server-js": "1.16.54-beta-20251028-073105-3ed10cef",
     "@blocklet/theme": "^3.1.51",
     "@did-connect/authenticator": "^2.2.8",
     "@did-connect/handler": "^2.2.8",
@@ -70,7 +70,6 @@
   "devDependencies": {
     "@arcblock/eslint-config-ts": "^0.3.3",
     "@types/express": "^5.0.0",
-    "@types/jest": "^29.5.13",
     "@types/json-stable-stringify": "^1.0.36",
     "@types/lodash": "^4.17.20",
     "@types/node": "^22.7.5",
@@ -79,13 +78,11 @@
     "axios-mock-adapter": "^2.1.0",
     "detect-port": "^1.5.1",
     "eslint": "^8.57.0",
-    "jest": "^29.7.0",
     "joi-to-typescript": "^4.14.0",
     "json-stable-stringify": "^1.0.1",
     "prettier": "^3.3.2",
-    "ts-jest": "^29.2.5",
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "73e5a3a80b82a2a7c62d42fdc08207b28e67633e"
+  "gitHead": "3002dd309759dd23c921b098b9edbef08838b734"
 }

package/lib/util/jest-setup.d.ts

@@ -1 +0,0 @@
-export default function setupJest(): void;

package/lib/util/jest-teardown.d.ts

@@ -1 +0,0 @@
-export default function setupJest(): void;