@blocklet/sdk 1.16.54-beta-20251017-133309-7d40faa6 → 1.16.54-beta-20251023-041534-36eec6b9

package/lib/wallet.js

@@ -1,55 +1,162 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAccessWallet = exports.getEthereumWallet = exports.getPermanentWallet = exports.deriveWallet = exports.getWallet = exports.createRemoteWallet = exports.getPkWallet = exports.cacheWallet = void 0;
 const wallet_1 = require("@ocap/wallet");
 const mcrypto_1 = require("@ocap/mcrypto");
 const did_1 = require("@arcblock/did");
 const lru_cache_1 = require("lru-cache");
+const did_ext_1 = require("@arcblock/did-ext");
+const signature_1 = require("./service/signature");
 // NOTICE: 1 个应用的 sdk 运行时最多 4 个钱包
 // 此处 cache 只是优化性能的手段，即使 miss 也不会造成任何错误，最终决定设置 size 为 4
-const cacheWallet = new lru_cache_1.LRUCache({ max: 4, ttl: 60 * 1000 });
+exports.cacheWallet = new lru_cache_1.LRUCache({ max: 4, ttl: 60 * 1000 });
+const REMOTE_CACHE_PLACEHOLDER = 'REMOTE_SIGN';
 /**
- * @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
- * @return {WalletObject}  {WalletObject}
+ * Create a wallet from public key
+ * Internal helper function used by both createRemoteWallet and getWallet.getPkWallet
  */
-const getWallet = (type, appSk = process.env.BLOCKLET_APP_SK) => {
+const getPkWallet = (type, appPk = process.env.BLOCKLET_APP_PK) => {
     let t;
-    let 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].join('_');
-    const cache = cacheWallet.get(cacheKey);
-    if (cache)
-        return cache;
     if ((0, did_1.isEthereumType)((0, did_1.DidType)(type))) {
-        sk = appSk.slice(0, 66);
         t = (0, wallet_1.WalletType)(type);
     }
     else {
-        sk = appSk;
         t = (0, wallet_1.WalletType)({ role: mcrypto_1.types.RoleType.ROLE_APPLICATION, pk: mcrypto_1.types.KeyType.ED25519, hash: mcrypto_1.types.HashType.SHA3 });
     }
-    const currentWallet = (0, wallet_1.fromSecretKey)(sk, t);
-    cacheWallet.set(cacheKey, currentWallet);
-    return currentWallet;
+    return (0, wallet_1.fromPublicKey)(appPk, t);
 };
-// BLOCKLET_WALLET_TYPE is for backward compatibility
-getWallet.getPermanentWallet = () => getWallet(process.env.CHAIN_TYPE || process.env.BLOCKLET_WALLET_TYPE, process.env.BLOCKLET_APP_PSK);
-getWallet.getEthereumWallet = (permanent = false) => getWallet('ethereum', permanent ? process.env.BLOCKLET_APP_PSK : process.env.BLOCKLET_APP_SK);
-getWallet.getPkWallet = (type, appPk = process.env.BLOCKLET_APP_PK) => {
-    let t;
-    let sk;
+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, keyType = 'sk') => {
+    if (!publicKey) {
+        throw new Error('Missing publicKey for creating remote wallet');
+    }
+    // Create base wallet from public key
+    const baseWallet = (0, wallet_1.fromPublicKey)(publicKey, type);
+    const remoteWallet = Object.create(baseWallet);
+    // Add remote sign method
+    // 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 });
+            if (!signature) {
+                throw new Error('Empty signature returned from blocklet-service');
+            }
+            return signature;
+        }
+        catch (error) {
+            throw new Error(`Remote signing failed: ${error.message || 'unknown error'}. Ensure blocklet-service signing API is available.`);
+        }
+    };
+    // Add remote signJWT method
+    // 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 });
+            if (!token) {
+                throw new Error('Empty JWT token returned from blocklet-service');
+            }
+            return token;
+        }
+        catch (error) {
+            throw new Error(`Remote JWT signing failed: ${error.message || 'unknown error'}. Ensure blocklet-service signing API is available.`);
+        }
+    };
+    // Add remote signETH method
+    remoteWallet.signETH = async (data, hashBeforeSign) => {
+        try {
+            const { signature } = await (0, signature_1.remoteSignETH)(data, { hashBeforeSign, keyType });
+            if (!signature) {
+                throw new Error('Empty signature returned from blocklet-service');
+            }
+            return signature;
+        }
+        catch (error) {
+            throw new Error(`Remote ETH signing failed: ${error.message || 'unknown error'}. Ensure blocklet-service signing API is available.`);
+        }
+    };
+    return remoteWallet;
+};
+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, 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;
-    if ((0, did_1.isEthereumType)((0, did_1.DidType)(type))) {
-        sk = appPk.slice(0, 66);
-        t = (0, wallet_1.WalletType)(type);
+    const cacheKey = [type, appSk || REMOTE_CACHE_PLACEHOLDER, keyType].join('_');
+    const cache = exports.cacheWallet.get(cacheKey);
+    if (cache)
+        return cache;
+    const walletType = (0, did_1.isEthereumType)((0, did_1.DidType)(type))
+        ? (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;
+        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;
     }
-    else {
-        sk = appPk;
-        t = (0, wallet_1.WalletType)({ role: mcrypto_1.types.RoleType.ROLE_APPLICATION, pk: mcrypto_1.types.KeyType.ED25519, hash: mcrypto_1.types.HashType.SHA3 });
+    const sk = (0, did_1.isEthereumType)((0, did_1.DidType)(type)) ? appSk.slice(0, 66) : appSk;
+    const currentWallet = (0, wallet_1.fromSecretKey)(sk, walletType);
+    exports.cacheWallet.set(cacheKey, currentWallet);
+    return currentWallet;
+};
+exports.getWallet = getWallet;
+/**
+ * Create wallet from app DID with automatic fallback to remote signing
+ * @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)
+ * @returns Wallet object with sign and signJWT methods
+ */
+const deriveWallet = async (sub, type, index) => {
+    const appSk = 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 wallet = (0, wallet_1.fromJSON)(walletJSON);
+    if (!(0, wallet_1.isValid)(wallet, true)) {
+        throw new Error('Invalid response from remote fromAppDid: wallet is invalid');
     }
-    return (0, wallet_1.fromPublicKey)(sk, t);
+    return wallet;
 };
-module.exports = getWallet;
+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, 'psk');
+exports.getPermanentWallet = getPermanentWallet;
+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, 'sk');
+exports.getAccessWallet = getAccessWallet;
+// Expose helper methods as properties of getWallet
+exports.getWallet.getPermanentWallet = exports.getPermanentWallet;
+exports.getWallet.getEthereumWallet = exports.getEthereumWallet;
+exports.getWallet.getPkWallet = exports.getPkWallet;
+exports.getWallet.deriveWallet = exports.deriveWallet;
+exports.getWallet.getAccessWallet = exports.getAccessWallet;
+exports.getWallet.getPermanentWallet = exports.getPermanentWallet;
+exports.getWallet.getEthereumWallet = exports.getEthereumWallet;
+exports.getWallet.getPkWallet = exports.getPkWallet;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.54-beta-20251017-133309-7d40faa6",
+  "version": "1.16.54-beta-20251023-041534-36eec6b9",
   "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": "jest --forceExit --detectOpenHandles",
-    "coverage": "npm run test -- --coverage",
+    "test": "bun test",
+    "coverage": "bun test --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,25 +28,26 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@abtnode/db-cache": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@abtnode/util": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@arcblock/did": "1.25.6",
-    "@arcblock/did-connect-js": "1.25.6",
-    "@arcblock/jwt": "1.25.6",
-    "@arcblock/ws": "1.25.6",
-    "@blocklet/constant": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@blocklet/env": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@abtnode/constant": "1.16.54-beta-20251023-041534-36eec6b9",
+    "@abtnode/db-cache": "1.16.54-beta-20251023-041534-36eec6b9",
+    "@abtnode/util": "1.16.54-beta-20251023-041534-36eec6b9",
+    "@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-20251023-041534-36eec6b9",
+    "@blocklet/env": "1.16.54-beta-20251023-041534-36eec6b9",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.54-beta-20251017-133309-7d40faa6",
-    "@blocklet/server-js": "1.16.54-beta-20251017-133309-7d40faa6",
+    "@blocklet/meta": "1.16.54-beta-20251023-041534-36eec6b9",
+    "@blocklet/server-js": "1.16.54-beta-20251023-041534-36eec6b9",
     "@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.25.6",
-    "@ocap/util": "1.25.6",
-    "@ocap/wallet": "1.25.6",
+    "@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",
@@ -86,5 +87,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "78c11632ed47a75502a20c257568fc9e1655ca05"
+  "gitHead": "a642bc21c7c0f4aaccae2758d6b1d836d078bc1b"
 }