@blocklet/sdk 1.16.54-beta-20251021-070951-25e3083c → 1.16.54-beta-20251024-030947-6f2889bf

package/lib/service/blocklet.d.ts

@@ -1,5 +1,6 @@
 import Client from '@blocklet/server-js';
 import { LOGIN_PROVIDER } from '@blocklet/constant';
+import { AxiosHeaders } from 'axios';
 type PartialDeep<T> = {
     [K in keyof T]?: T[K] extends object ? PartialDeep<T[K]> : T[K];
 };
@@ -14,7 +15,9 @@ declare class BlockletService {
     constructor(httpEndpoint?: string);
 }
 interface BlockletService {
-    login: (params: object) => Promise<{
+    login: (params: object, options?: {
+        headers: AxiosHeaders;
+    }) => Promise<{
         user: Object;
         token: string;
         refreshToken: string;

package/lib/service/blocklet.js

@@ -230,9 +230,11 @@ class BlockletService {
             const fn = client[api];
             this[api] = apiFnMap[api] ? apiFnMap[api](fn) : apiFallback(fn);
         });
-        this.login = async (data) => {
+        this.login = async (data, options) => {
             try {
-                const { data: resData } = await service_api_1.default.post('/api/user/login', data);
+                const { data: resData } = await service_api_1.default.post('/api/user/login', data, {
+                    headers: options?.headers,
+                });
                 if (resData?.user) {
                     fixAvatar(resData.user);
                 }

package/lib/service/signature.d.ts

@@ -1,3 +1,6 @@
+import { SerializedWallet } from '@ocap/wallet';
+import { DIDTypeArg } from '@arcblock/did';
+import { EncodingType } from '@ocap/util';
 export interface RemoteSignResponse {
     signature: string;
     publicKey?: string;
@@ -10,12 +13,15 @@ export interface RemoteSignETHResponse {
     signature: string;
     publicKey?: string;
 }
-export interface RemoteFromAppDidResponse {
-    address: string;
-    publicKey: string;
-    type: any;
+export interface RemoteSignOptions {
+    keyType?: 'sk' | 'psk';
+    type?: DIDTypeArg;
+    doSign?: boolean;
+    version?: string;
+    encoding?: EncodingType;
+    hashBeforeSign?: boolean;
 }
-export declare function remoteSign(payload: unknown): Promise<RemoteSignResponse>;
+export declare function remoteSign(payload: unknown, options?: RemoteSignOptions): Promise<RemoteSignResponse>;
 export declare function remoteSignJWT(payload: unknown, options?: any): Promise<RemoteSignJWTResponse>;
-export declare function remoteSignETH(data: string, hashBeforeSign?: boolean): Promise<RemoteSignETHResponse>;
-export declare function remoteDeriveWallet(sub: string, type?: any, index?: number): Promise<RemoteFromAppDidResponse>;
+export declare function remoteSignETH(data: string, options?: RemoteSignOptions): Promise<RemoteSignETHResponse>;
+export declare function remoteDeriveWallet(sub: string, type?: any, index?: number, options?: RemoteSignOptions): Promise<SerializedWallet>;

package/lib/service/signature.js

@@ -9,8 +9,12 @@ exports.remoteSignETH = remoteSignETH;
 exports.remoteDeriveWallet = remoteDeriveWallet;
 const axios_1 = __importDefault(require("axios"));
 const env_1 = require("@blocklet/env");
+const debug_1 = __importDefault(require("debug"));
+const omit_1 = __importDefault(require("lodash/omit"));
+const error_1 = require("@blocklet/error");
 const constants_1 = require("../util/constants");
 const parse_docker_endpoint_1 = require("../util/parse-docker-endpoint");
+const debug = (0, debug_1.default)('@blocklet/sdk:remote-sign');
 const { serverVersion } = env_1.blockletEnv;
 const signClient = axios_1.default.create({
     proxy: false,
@@ -42,6 +46,21 @@ const normalizePayload = (payload) => {
     }
     return payload;
 };
+const getPayloadInfo = (payload) => {
+    if (payload !== undefined) {
+        if (typeof payload === 'string') {
+            return { payloadPreview: payload.substring(0, 100), payloadType: 'string' };
+        }
+        if (Buffer.isBuffer(payload)) {
+            return { payloadPreview: `Buffer(${payload.length} bytes)`, payloadType: 'Buffer' };
+        }
+        if (typeof payload === 'object') {
+            const preview = JSON.stringify(payload).substring(0, 100);
+            return { payloadPreview: preview, payloadType: 'object' };
+        }
+    }
+    return {};
+};
 /**
  * Generic remote signing API caller
  * @param endpoint - API endpoint (e.g., '/api/sign', '/api/sign/jwt')
@@ -50,29 +69,44 @@ const normalizePayload = (payload) => {
  */
 async function callRemoteSignAPI(endpoint, requestBody) {
     const { apiKey } = ensureRemoteContext();
+    const startTime = Date.now();
+    // Prepare payload preview for logging (avoid logging sensitive data)
+    const payloadInfo = getPayloadInfo(requestBody.payload);
+    debug(`Remote Sign API call started: ${endpoint}`, {
+        ...payloadInfo,
+        body: (0, omit_1.default)(requestBody, 'payload'),
+    });
     try {
         const { data } = await signClient.post(endpoint, {
             ...requestBody,
             apiKey,
         });
+        const duration = Date.now() - startTime;
+        debug(`Remote Sign API call succeeded: ${endpoint} in ${duration}`, {
+            responseKeys: Object.keys(data),
+        });
         return data;
     }
     catch (error) {
-        const err = error;
-        const message = err?.response?.data?.error || err?.message || 'unknown error';
+        const duration = Date.now() - startTime;
+        const message = (0, error_1.formatError)(error);
+        debug(`Remote Sign API call failed: ${endpoint} in ${duration}`, {
+            message,
+        });
         throw new Error(`Remote signing API request failed: ${message}`);
     }
 }
-function remoteSign(payload) {
+function remoteSign(payload, options) {
     const normalized = normalizePayload(payload);
-    return callRemoteSignAPI('/api/sign', { payload: normalized });
+    return callRemoteSignAPI('/api/sign', { payload: normalized, options });
 }
 function remoteSignJWT(payload, options) {
     return callRemoteSignAPI('/api/sign/jwt', { payload, options });
 }
-function remoteSignETH(data, hashBeforeSign) {
-    return callRemoteSignAPI('/api/sign/eth', { data, hashBeforeSign });
+function remoteSignETH(data, options) {
+    const { hashBeforeSign, ...restOptions } = options || {};
+    return callRemoteSignAPI('/api/sign/eth', { data, hashBeforeSign, options: restOptions });
 }
-function remoteDeriveWallet(sub, type, index) {
-    return callRemoteSignAPI('/api/sign/derive', { sub, type, index });
+function remoteDeriveWallet(sub, type, index, options) {
+    return callRemoteSignAPI('/api/sign/derive', { sub, type, index, options });
 }

package/lib/util/app-info.d.ts

@@ -17,9 +17,9 @@ export declare function getBlockletInfoSimple(getBlocklet?: () => Promise<ABTNod
     federated: import("@blocklet/server-js").FederatedConfig;
     appPid: string;
     blocklet: import("@blocklet/server-js").BlockletState;
+    version: string;
     description: string;
     name: string;
-    version: string;
 } | {
     version: any;
     name: string;

package/lib/util/jest-setup.js

@@ -11,6 +11,7 @@ const path_1 = __importDefault(require("path"));
 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() {
     try {
         const dir = process.cwd();
@@ -29,13 +30,17 @@ function setupJest() {
         process.env.BLOCKLET_COMPONENT_DID = meta.did;
         process.env.BLOCKLET_DATA_DIR = path_1.default.join(tmpDir, wallet.address);
         process.env.BLOCKLET_LOG_DIR = path_1.default.join(tmpDir, wallet.address);
-        process.env.BLOCKLET_APP_SK = wallet.secretKey;
-        process.env.BLOCKLET_APP_PSK = wallet.secretKey;
+        // process.env.BLOCKLET_APP_SK = wallet.secretKey;
+        // process.env.BLOCKLET_APP_PSK = wallet.secretKey;
+        process.env.BLOCKLET_APP_PK = wallet.publicKey;
+        process.env.BLOCKLET_APP_PPK = wallet.publicKey;
         process.env.BLOCKLET_APP_ID = wallet.address;
         process.env.BLOCKLET_APP_PID = wallet.address;
         process.env.BLOCKLET_APP_IDS = wallet.address;
         process.env.BLOCKLET_APP_NAME = meta.title;
         process.env.BLOCKLET_APP_DESCRIPTION = meta.description;
+        process.env.BLOCKLET_APP_EK = (0, did_ext_1.fromAppDid)(meta.did, process.env.ABT_NODE_PK, undefined, 1).secretKey;
+        process.env.BLOCKLET_APP_ASK = (0, did_ext_1.fromAppDid)(meta.did, process.env.ABT_NODE_PK, undefined, 1).secretKey;
         process.env.BLOCKLET_APP_URL = 'http://192.168.0.10:3030';
         process.env.BLOCKLET_MOUNT_POINTS = JSON.stringify([
             {

package/lib/wallet.d.ts

@@ -1,5 +1,5 @@
 import { WalletObject } from '@ocap/wallet';
-import { DIDTypeShortcut } from '@arcblock/did';
+import { DIDTypeShortcut, DIDTypeArg } from '@arcblock/did';
 import { LRUCache } from 'lru-cache';
 export declare const cacheWallet: LRUCache<string, WalletObject<string>, unknown>;
 /**
@@ -11,20 +11,22 @@ export declare const getPkWallet: (type?: DIDTypeShortcut, appPk?: string) => Wa
  * Create a remote wallet with sign and signJWT methods that call blocklet-service
  * @param publicKey - The public key to create the wallet from
  * @param type - The wallet type
+ * @param keyType - Key type to use ('sk' or 'psk')
  * @returns Wallet object with remote sign and signJWT methods
  */
-export declare const createRemoteWallet: (publicKey: string, type?: any) => WalletObject;
+export declare const createRemoteWallet: (publicKey: string, type?: any, keyType?: "sk" | "psk") => WalletObject;
 /**
  * @param {string} [type=process.env.CHAIN_TYPE] can only be 'eth|ethereum' or 'default|arcblock'
  * @param {string} [appSk=process.env.BLOCKLET_APP_SK] must be hex
+ * @param {string} [keyType='sk'] key type to use ('sk' or 'psk')
  * @return {WalletObject}  {WalletObject}
  */
 export declare const getWallet: {
-    (type?: DIDTypeShortcut, appSk?: string): WalletObject;
+    (type?: DIDTypeShortcut, appSk?: string, keyType?: "sk" | "psk"): WalletObject;
     getPermanentWallet: () => WalletObject<string>;
     getEthereumWallet: (permanent?: boolean) => WalletObject<string>;
     getPkWallet: (type?: DIDTypeShortcut, appPk?: string) => WalletObject;
-    deriveWallet: (sub: string, type?: DIDTypeShortcut, index?: number) => Promise<WalletObject>;
+    deriveWallet: (sub: string, type?: DIDTypeArg, index?: number) => Promise<WalletObject>;
     getAccessWallet: () => WalletObject<string>;
 };
 /**
@@ -34,7 +36,7 @@ export declare const getWallet: {
  * @param index - Index for deriving wallet (default: 0)
  * @returns Wallet object with sign and signJWT methods
  */
-export declare const deriveWallet: (sub: string, type?: DIDTypeShortcut, index?: number) => Promise<WalletObject>;
+export declare const deriveWallet: (sub: string, type?: DIDTypeArg, index?: number) => 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

@@ -33,9 +33,10 @@ exports.getPkWallet = getPkWallet;
  * Create a remote wallet with sign and signJWT methods that call blocklet-service
  * @param publicKey - The public key to create the wallet from
  * @param type - The wallet type
+ * @param keyType - Key type to use ('sk' or 'psk')
  * @returns Wallet object with remote sign and signJWT methods
  */
-const createRemoteWallet = (publicKey, type) => {
+const createRemoteWallet = (publicKey, type, keyType = 'sk') => {
     if (!publicKey) {
         throw new Error('Missing publicKey for creating remote wallet');
     }
@@ -43,9 +44,10 @@ const createRemoteWallet = (publicKey, type) => {
     const baseWallet = (0, wallet_1.fromPublicKey)(publicKey, type);
     const remoteWallet = Object.create(baseWallet);
     // Add remote sign method
-    remoteWallet.sign = async (payload) => {
+    // Support full wallet.sign signature: sign(data, encoding?, hashBeforeSign?)
+    remoteWallet.sign = async (payload, encoding, hashBeforeSign) => {
         try {
-            const { signature } = await (0, signature_1.remoteSign)(payload);
+            const { signature } = await (0, signature_1.remoteSign)(payload, { keyType, encoding, hashBeforeSign });
             if (!signature) {
                 throw new Error('Empty signature returned from blocklet-service');
             }
@@ -59,7 +61,7 @@ const createRemoteWallet = (publicKey, type) => {
     // Match the signature: signJWT(payload?, doSign?, version?)
     remoteWallet.signJWT = async (payload, doSign, version) => {
         try {
-            const { token } = await (0, signature_1.remoteSignJWT)(payload, { doSign, version });
+            const { token } = await (0, signature_1.remoteSignJWT)(payload, { doSign, version, keyType });
             if (!token) {
                 throw new Error('Empty JWT token returned from blocklet-service');
             }
@@ -72,7 +74,7 @@ const createRemoteWallet = (publicKey, type) => {
     // Add remote signETH method
     remoteWallet.signETH = async (data, hashBeforeSign) => {
         try {
-            const { signature } = await (0, signature_1.remoteSignETH)(data, hashBeforeSign);
+            const { signature } = await (0, signature_1.remoteSignETH)(data, { hashBeforeSign, keyType });
             if (!signature) {
                 throw new Error('Empty signature returned from blocklet-service');
             }
@@ -88,13 +90,14 @@ exports.createRemoteWallet = createRemoteWallet;
 /**
  * @param {string} [type=process.env.CHAIN_TYPE] can only be 'eth|ethereum' or 'default|arcblock'
  * @param {string} [appSk=process.env.BLOCKLET_APP_SK] must be hex
+ * @param {string} [keyType='sk'] key type to use ('sk' or 'psk')
  * @return {WalletObject}  {WalletObject}
  */
-const getWallet = (type, appSk = process.env.BLOCKLET_APP_SK) => {
+const getWallet = (type, appSk = process.env.BLOCKLET_APP_SK, keyType = 'sk') => {
     // BLOCKLET_WALLET_TYPE is for backward compatibility
     // eslint-disable-next-line no-param-reassign
     type = type || process.env.CHAIN_TYPE || process.env.BLOCKLET_WALLET_TYPE;
-    const cacheKey = [type, appSk || REMOTE_CACHE_PLACEHOLDER].join('_');
+    const cacheKey = [type, appSk || REMOTE_CACHE_PLACEHOLDER, keyType].join('_');
     const cache = exports.cacheWallet.get(cacheKey);
     if (cache)
         return cache;
@@ -102,8 +105,12 @@ const getWallet = (type, appSk = process.env.BLOCKLET_APP_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) {
-        const appPk = process.env.BLOCKLET_APP_PK;
-        const currentWallet = (0, exports.createRemoteWallet)(appPk, walletType);
+        // Select public key based on keyType
+        const 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()}`);
+        }
+        const currentWallet = (0, exports.createRemoteWallet)(appPk, walletType, keyType);
         exports.cacheWallet.set(cacheKey, currentWallet);
         return currentWallet;
     }
@@ -127,22 +134,22 @@ const deriveWallet = async (sub, type, index) => {
         return (0, did_ext_1.fromAppDid)(sub, appSk, type, index);
     }
     // No secret key available, use remote fromAppDid
-    const { address, publicKey, type: walletType } = await (0, signature_1.remoteDeriveWallet)(sub, type, index);
-    if (!address || !publicKey) {
-        throw new Error('Invalid response from remote fromAppDid: missing address or publicKey');
+    const walletJSON = await (0, signature_1.remoteDeriveWallet)(sub, type, index);
+    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');
     }
-    // Create remote wallet with the returned public key
-    return (0, exports.createRemoteWallet)(publicKey, walletType);
+    return wallet;
 };
 exports.deriveWallet = deriveWallet;
 // BLOCKLET_WALLET_TYPE is for backward compatibility
-const getPermanentWallet = () => (0, exports.getWallet)(process.env.CHAIN_TYPE || process.env.BLOCKLET_WALLET_TYPE, process.env.BLOCKLET_APP_PSK);
+const getPermanentWallet = () => (0, exports.getWallet)(process.env.CHAIN_TYPE || process.env.BLOCKLET_WALLET_TYPE, process.env.BLOCKLET_APP_PSK, 'psk');
 exports.getPermanentWallet = getPermanentWallet;
-const getEthereumWallet = (permanent = false) => (0, exports.getWallet)('ethereum', permanent ? process.env.BLOCKLET_APP_PSK : process.env.BLOCKLET_APP_SK);
+const getEthereumWallet = (permanent = false) => (0, exports.getWallet)('ethereum', permanent ? process.env.BLOCKLET_APP_PSK : process.env.BLOCKLET_APP_SK, permanent ? 'psk' : 'sk');
 exports.getEthereumWallet = getEthereumWallet;
 const getAccessWallet = () => (0, exports.getWallet)(process.env.CHAIN_TYPE || process.env.BLOCKLET_WALLET_TYPE, 
 // Compatible with previous version where APP_ASK does not exist
-process.env.BLOCKLET_APP_ASK || process.env.BLOCKLET_APP_SK);
+process.env.BLOCKLET_APP_ASK || process.env.BLOCKLET_APP_SK, 'sk');
 exports.getAccessWallet = getAccessWallet;
 // Expose helper methods as properties of getWallet
 exports.getWallet.getPermanentWallet = exports.getPermanentWallet;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.54-beta-20251021-070951-25e3083c",
+  "version": "1.16.54-beta-20251024-030947-6f2889bf",
   "description": "graphql client to read/write data on abt node",
   "homepage": "https://www.arcblock.io/docs/blocklet-sdk-nodejs",
   "main": "lib/index.js",
@@ -28,26 +28,26 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.54-beta-20251021-070951-25e3083c",
-    "@abtnode/db-cache": "1.16.54-beta-20251021-070951-25e3083c",
-    "@abtnode/util": "1.16.54-beta-20251021-070951-25e3083c",
-    "@arcblock/did": "^1.26.2",
-    "@arcblock/did-connect-js": "^1.26.2",
-    "@arcblock/did-ext": "^1.26.2",
-    "@arcblock/jwt": "^1.26.2",
-    "@arcblock/ws": "^1.26.2",
-    "@blocklet/constant": "1.16.54-beta-20251021-070951-25e3083c",
-    "@blocklet/env": "1.16.54-beta-20251021-070951-25e3083c",
+    "@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",
+    "@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/error": "^0.2.5",
-    "@blocklet/meta": "1.16.54-beta-20251021-070951-25e3083c",
-    "@blocklet/server-js": "1.16.54-beta-20251021-070951-25e3083c",
+    "@blocklet/meta": "1.16.54-beta-20251024-030947-6f2889bf",
+    "@blocklet/server-js": "1.16.54-beta-20251024-030947-6f2889bf",
     "@blocklet/theme": "^3.1.51",
     "@did-connect/authenticator": "^2.2.8",
     "@did-connect/handler": "^2.2.8",
     "@nedb/core": "^2.1.5",
-    "@ocap/mcrypto": "^1.26.2",
-    "@ocap/util": "^1.26.2",
-    "@ocap/wallet": "^1.26.2",
+    "@ocap/mcrypto": "^1.26.3",
+    "@ocap/util": "^1.26.3",
+    "@ocap/wallet": "^1.26.3",
     "axios": "^1.7.9",
     "cheerio": "1.0.0-rc.12",
     "debug": "^4.4.1",
@@ -87,5 +87,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "db517e9013dbad744e38883f56e4eba1fa1615c1"
+  "gitHead": "73e5a3a80b82a2a7c62d42fdc08207b28e67633e"
 }