@onekeyfe/hardware-cli 1.2.0-alpha.1 → 1.2.0-alpha.100

package/dist/deviceSelection.d.ts

@@ -0,0 +1,3 @@
+export declare function selectSearchDevice<T extends {
+    connectId?: string | null;
+}>(devices: T[], preferredConnectId?: string): T | undefined;

package/dist/deviceSelection.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.selectSearchDevice = void 0;
+function selectSearchDevice(devices, preferredConnectId) {
+    if (preferredConnectId) {
+        return (devices.find(device => device.connectId === preferredConnectId) ??
+            { connectId: preferredConnectId });
+    }
+    return devices[0];
+}
+exports.selectSearchDevice = selectSearchDevice;

package/dist/deviceStateCommands.d.ts

@@ -0,0 +1,19 @@
+import type { CoreApi, DeviceStateScope } from '@onekeyfe/hd-core';
+type DeviceStateSdk = Pick<CoreApi, 'searchDevices' | 'getDeviceState' | 'getFeatures'>;
+/**
+ * Unified state entry for the new CLI. Resolve the user-facing connectId through
+ * discovery so V1 serial IDs map to the process-local USB path.
+ */
+export declare const getCanonicalDeviceState: (sdk: DeviceStateSdk, connectId: string | undefined, scope: DeviceStateScope) => Promise<import("@onekeyfe/hd-core").Unsuccessful | {
+    success: true;
+    payload: import("@onekeyfe/hd-core").DeviceState;
+}>;
+/**
+ * Legacy CLI only: retain getFeatures for V1 and reuse the discovery projection for V2.
+ * Public SDK.getFeatures remains V1-only.
+ */
+export declare const getCompatibleFeatures: (sdk: DeviceStateSdk, connectId?: string) => Promise<import("@onekeyfe/hd-core").Unsuccessful | {
+    success: true;
+    payload: import("@onekeyfe/hd-core").Features;
+}>;
+export {};

package/dist/deviceStateCommands.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCompatibleFeatures = exports.getCanonicalDeviceState = void 0;
+const createDeviceNotFoundResult = (connectId) => ({
+    success: false,
+    payload: {
+        code: 'DEVICE_NOT_FOUND',
+        error: connectId ? `Device not found: ${connectId}` : 'No device found',
+    },
+});
+const resolveSearchDevice = async (sdk, connectId) => {
+    const searchResult = await sdk.searchDevices();
+    if (!searchResult.success)
+        return searchResult;
+    const devices = searchResult.payload;
+    const device = connectId ? devices.find(item => item.connectId === connectId) : devices[0];
+    if (!device?.connectId)
+        return createDeviceNotFoundResult(connectId);
+    return { success: true, payload: device };
+};
+/**
+ * Unified state entry for the new CLI. Resolve the user-facing connectId through
+ * discovery so V1 serial IDs map to the process-local USB path.
+ */
+const getCanonicalDeviceState = async (sdk, connectId, scope) => {
+    const deviceResult = await resolveSearchDevice(sdk, connectId);
+    if (!deviceResult.success)
+        return deviceResult;
+    if (scope === 'runtime' && deviceResult.payload.state) {
+        return { success: true, payload: deviceResult.payload.state };
+    }
+    const resolvedConnectId = deviceResult.payload.connectId ?? undefined;
+    if (!resolvedConnectId)
+        return createDeviceNotFoundResult();
+    return sdk.getDeviceState(resolvedConnectId, { scope });
+};
+exports.getCanonicalDeviceState = getCanonicalDeviceState;
+/**
+ * Legacy CLI only: retain getFeatures for V1 and reuse the discovery projection for V2.
+ * Public SDK.getFeatures remains V1-only.
+ */
+const getCompatibleFeatures = async (sdk, connectId) => {
+    const deviceResult = await resolveSearchDevice(sdk, connectId);
+    if (!deviceResult.success)
+        return deviceResult;
+    const device = deviceResult.payload;
+    const protocol = device.state?.protocol ?? device.features?.protocol;
+    if (protocol === 'V2') {
+        if (!device.features) {
+            return {
+                success: false,
+                payload: {
+                    code: 'DEVICE_FEATURES_UNAVAILABLE',
+                    error: 'Protocol V2 compatibility features are unavailable',
+                },
+            };
+        }
+        return { success: true, payload: device.features };
+    }
+    return sdk.getFeatures(device.connectId ?? '');
+};
+exports.getCompatibleFeatures = getCompatibleFeatures;

package/dist/pinentry.d.ts

@@ -20,5 +20,6 @@ export declare function findPinentry(): string | null;
 export interface PinentryResult {
     value: string;
     passphraseOnDevice: boolean;
+    attachPinOnDevice?: boolean;
 }
 export declare function promptPassphraseViaPinentry(): Promise<PinentryResult>;

package/dist/sdk.d.ts

@@ -5,15 +5,25 @@
  * Passphrase flow aligns with app-monorepo CLI:
  *   - Standard wallet: --use-empty-passphrase, auto-respond
  *   - Hidden wallet: interactive 1/2/3 selection (standard / pinentry / on-device)
- *   - Session caching: passphraseState + sessionId stored in OS keychain,
- *     preloaded via preloadSessionCache on next invocation
+ *   - Legacy session caching: existing OS keychain entries may still be preloaded,
+ *     but public SDK responses never expose new device session ids
  */
 import HardwareSDK from '@onekeyfe/hd-common-connect-sdk';
+import type { PinentryResult } from './pinentry';
 export interface SDKOptions {
     connectId?: string;
     passphraseState?: string;
     useEmptyPassphrase?: boolean;
+    debug?: boolean;
+    transport?: 'usb' | 'ble';
 }
+/**
+ * Prompt user to select wallet type (aligns with app-monorepo flow):
+ *   1. Standard wallet (no passphrase)
+ *   2. Hidden wallet — enter passphrase via pinentry (secure OS dialog)
+ *   3. Hidden wallet — enter passphrase on device screen
+ */
+export declare function resolvePassphraseByChoice(choice: '1' | '2' | '3' | '4'): Promise<PinentryResult>;
 export declare function createSDK(opts: SDKOptions): Promise<typeof HardwareSDK>;
 /**
  * Release the SDK and clear the singleton. Must be called before the CLI

package/dist/sdk.js

@@ -6,8 +6,8 @@
  * Passphrase flow aligns with app-monorepo CLI:
  *   - Standard wallet: --use-empty-passphrase, auto-respond
  *   - Hidden wallet: interactive 1/2/3 selection (standard / pinentry / on-device)
- *   - Session caching: passphraseState + sessionId stored in OS keychain,
- *     preloaded via preloadSessionCache on next invocation
+ *   - Legacy session caching: existing OS keychain entries may still be preloaded,
+ *     but public SDK responses never expose new device session ids
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -36,11 +36,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.disposeSDK = exports.createSDK = void 0;
+exports.disposeSDK = exports.createSDK = exports.resolvePassphraseByChoice = void 0;
 const readline = __importStar(require("node:readline"));
 const hd_common_connect_sdk_1 = __importDefault(require("@onekeyfe/hd-common-connect-sdk"));
 const hd_core_1 = require("@onekeyfe/hd-core");
 const pinentry_1 = require("./pinentry");
+const nobleBlePlugin_1 = require("./transports/nobleBlePlugin");
 /**
  * Current per-invocation CLI options. Event handlers read from this object
  * so that invoking createSDK() with different opts never results in stale
@@ -75,8 +76,15 @@ function resolvePassphraseByChoice(choice) {
         return Promise.resolve({ value: '', passphraseOnDevice: false });
     if (choice === '2')
         return (0, pinentry_1.promptPassphraseViaPinentry)();
+    if (choice === '4')
+        return Promise.resolve({
+            value: '',
+            passphraseOnDevice: false,
+            attachPinOnDevice: true,
+        });
     return Promise.resolve({ value: '', passphraseOnDevice: true });
 }
+exports.resolvePassphraseByChoice = resolvePassphraseByChoice;
 function promptPassphraseMode() {
     if (!process.stdin.isTTY) {
         return Promise.resolve({ value: '', passphraseOnDevice: true });
@@ -93,16 +101,17 @@ function promptPassphraseMode() {
                 '  1. Standard wallet (no passphrase)',
                 '  2. Hidden wallet — enter passphrase on this computer (pinentry)',
                 '  3. Hidden wallet — enter passphrase on device screen',
+                '  4. Attach PIN wallet — enter Attach PIN on device screen',
                 '',
             ].join('\n'));
             rl.question('Enter selection [1/2/3]: ', answer => {
                 const n = answer.trim();
-                if (n === '1' || n === '2' || n === '3') {
+                if (n === '1' || n === '2' || n === '3' || n === '4') {
                     rl.close();
                     resolvePassphraseByChoice(n).then(resolve);
                     return;
                 }
-                process.stderr.write('Invalid selection. Enter 1, 2, or 3.\n');
+                process.stderr.write('Invalid selection. Enter 1, 2, 3, or 4.\n');
                 prompt();
             });
         };
@@ -146,6 +155,7 @@ function registerEventHandlers(sdk) {
                     payload: {
                         value: result.value,
                         passphraseOnDevice: result.passphraseOnDevice,
+                        attachPinOnDevice: result.attachPinOnDevice,
                         save: false,
                     },
                 });
@@ -167,12 +177,12 @@ function registerEventHandlers(sdk) {
             process.stderr.write('[onekey-hw] Please confirm the action on your device...\n');
         }
     });
-    sdk.on(hd_core_1.DEVICE.CONNECT, (device) => {
+    sdk.on(hd_core_1.DEVICE.CONNECT, ({ device }) => {
         const name = device?.label || device?.name;
         if (name)
             process.stderr.write(`[onekey-hw] Device connected: ${name}\n`);
     });
-    sdk.on(hd_core_1.DEVICE.DISCONNECT, (device) => {
+    sdk.on(hd_core_1.DEVICE.DISCONNECT, ({ device }) => {
         const name = device?.label || device?.name;
         if (name)
             process.stderr.write(`[onekey-hw] Device disconnected: ${name}\n`);
@@ -182,12 +192,13 @@ function registerEventHandlers(sdk) {
 // SDK Factory
 // ---------------------------------------------------------------------------
 async function initSDK() {
+    const transport = currentOpts.transport ?? 'usb';
     const settings = {
-        debug: false,
+        debug: currentOpts.debug ?? false,
         fetchConfig: true,
-        env: 'node-usb',
+        env: transport === 'ble' ? 'lowlevel' : 'node-usb',
     };
-    await hd_common_connect_sdk_1.default.init(settings);
+    await hd_common_connect_sdk_1.default.init(settings, undefined, transport === 'ble' ? (0, nobleBlePlugin_1.createNobleBlePlugin)() : undefined);
     // Defensive: strip any stale listeners (e.g. left over from a previous
     // dispose/init cycle in a long-running process) before wiring ours.
     // Mirrors app-monorepo's cleanupHardwareSDKInstance() which removes
@@ -220,7 +231,7 @@ async function disposeSDK() {
         return;
     try {
         const sdk = await sdkReadyPromise;
-        sdk.dispose();
+        await Promise.resolve(sdk.dispose());
     }
     catch {
         // ignore errors during cleanup

package/dist/session.d.ts

@@ -1,21 +1,14 @@
 /**
  * Passphrase session management for hd-cli.
  *
- * Aligns with app-monorepo's CLI pattern:
- *   Login:   getPassphraseState → passphraseState + sessionId → keychain
- *   Command: keychain → preloadSessionCache → SDK call (no passphrase prompt)
- *   Stale:   error 112 → clear keychain → re-prompt → retry
- *   Logout:  keychain delete
+ * Existing keychain entries remain readable for compatibility, but the public
+ * SDK no longer exposes new device session ids for persistence.
  */
 /**
  * Load passphraseState + sessionId from keychain and call preloadSessionCache.
  * Non-fatal: returns the loaded passphraseState or undefined.
  */
 export declare function preloadSessionFromKeychain(deviceId: string): Promise<string | undefined>;
-/**
- * Save passphraseState + sessionId to keychain for next CLI invocation.
- */
-export declare function saveSessionToKeychain(deviceId: string, passphraseState: string, sessionId: string): Promise<void>;
 /**
  * Clear cached session from keychain.
  */

package/dist/session.js

@@ -2,14 +2,11 @@
 /**
  * Passphrase session management for hd-cli.
  *
- * Aligns with app-monorepo's CLI pattern:
- *   Login:   getPassphraseState → passphraseState + sessionId → keychain
- *   Command: keychain → preloadSessionCache → SDK call (no passphrase prompt)
- *   Stale:   error 112 → clear keychain → re-prompt → retry
- *   Logout:  keychain delete
+ * Existing keychain entries remain readable for compatibility, but the public
+ * SDK no longer exposes new device session ids for persistence.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearSessionFromKeychain = exports.saveSessionToKeychain = exports.preloadSessionFromKeychain = void 0;
+exports.clearSessionFromKeychain = exports.preloadSessionFromKeychain = void 0;
 const hd_core_1 = require("@onekeyfe/hd-core");
 const storage_1 = require("./storage");
 // Keychain key format: scoped by deviceId for multi-device support
@@ -50,22 +47,6 @@ async function preloadSessionFromKeychain(deviceId) {
     return undefined;
 }
 exports.preloadSessionFromKeychain = preloadSessionFromKeychain;
-/**
- * Save passphraseState + sessionId to keychain for next CLI invocation.
- */
-async function saveSessionToKeychain(deviceId, passphraseState, sessionId) {
-    try {
-        const storage = getStorage();
-        await Promise.all([
-            storage.set(psKey(deviceId), Buffer.from(passphraseState, 'utf-8')),
-            storage.set(sidKey(deviceId), Buffer.from(sessionId, 'utf-8')),
-        ]);
-    }
-    catch {
-        // Non-fatal — session still works in-memory for this invocation
-    }
-}
-exports.saveSessionToKeychain = saveSessionToKeychain;
 /**
  * Clear cached session from keychain.
  */

package/dist/transports/nobleBlePlugin.d.ts

@@ -0,0 +1,2 @@
+import type { LowlevelTransportSharedPlugin } from '@onekeyfe/hd-transport';
+export declare function createNobleBlePlugin(): LowlevelTransportSharedPlugin;