@onekeyfe/hd-core 1.2.2-alpha.120 → 1.2.2-alpha.122

package/dist/index.js

@@ -43705,6 +43705,18 @@ class TransportManager {
         this.defaultMessages = DataManager.getProtobufMessages();
         this.currentMessages = this.defaultMessages;
         this.protocolV1MessageSchema = 'v1CurrentSchema';
+        this.webUsbInit = false;
+    }
+    static ensureInitialized() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const env = DataManager.getSettings('env');
+            if (env !== 'webusb' && env !== 'desktop-webusb')
+                return;
+            if (this.webUsbInit)
+                return;
+            yield this.transport.init(WebUsbLogger, DevicePool.emitter);
+            this.webUsbInit = true;
+        });
     }
     static configure() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -43733,7 +43745,7 @@ class TransportManager {
                     yield this.transport.init(WebBleLogger, DevicePool.emitter);
                 }
                 else if (env === 'webusb' || env === 'desktop-webusb') {
-                    yield this.transport.init(WebUsbLogger, DevicePool.emitter);
+                    yield this.ensureInitialized();
                 }
                 else {
                     yield this.transport.init(HttpLogger);
@@ -43816,6 +43828,7 @@ class TransportManager {
     }
 }
 TransportManager.reactNativeInit = false;
+TransportManager.webUsbInit = false;
 TransportManager.protocolV1MessageSchema = 'v1CurrentSchema';
 TransportManager.plugin = null;
 
@@ -46495,6 +46508,7 @@ class Device extends events.exports {
                 }
                 else if (!acquired) {
                     if (mainId && (deviceConnector === null || deviceConnector === void 0 ? void 0 : deviceConnector.disconnect)) {
+                        Log$h.debug('interruptionFromUser: disconnecting device without acquire, mainId:', mainId);
                         yield deviceConnector.disconnect(mainId);
                     }
                     if (this.connectionAttempt === attempt)
@@ -47263,6 +47277,48 @@ class PreInitialize extends BaseMethod {
 }
 
 const Log$e = getLogger(exports.LoggerNames.DevicePool);
+const getDescriptorKeys = (descriptor) => [descriptor.path, descriptor.id].filter((key) => typeof key === 'string' && key.length > 0);
+const isOwnedByActiveWebUsbRequest = (descriptor, requestQueue) => {
+    if (!requestQueue)
+        return false;
+    return getDescriptorKeys(descriptor).some(key => requestQueue.getRequestTasksIdByConnectId(key).length > 0);
+};
+const getUsbHandle = (descriptor) => descriptor === null || descriptor === void 0 ? void 0 : descriptor.device;
+const getOwningRequestDevice = (descriptor, requestQueue) => {
+    var _a, _b;
+    if (!requestQueue)
+        return undefined;
+    const usbHandle = getUsbHandle(descriptor);
+    if (usbHandle === undefined)
+        return undefined;
+    for (const key of getDescriptorKeys(descriptor)) {
+        for (const requestId of requestQueue.getRequestTasksIdByConnectId(key)) {
+            const device = (_a = requestQueue.getTask(requestId)) === null || _a === void 0 ? void 0 : _a.method.device;
+            if ((device === null || device === void 0 ? void 0 : device.features) &&
+                (device.mainId === key || ((_b = device.originalDescriptor) === null || _b === void 0 ? void 0 : _b.path) === key) &&
+                getUsbHandle(device.originalDescriptor) === usbHandle) {
+                return device;
+            }
+        }
+    }
+    return undefined;
+};
+const toSearchDeviceFromDescriptor = (descriptor) => {
+    const connectId = descriptor.path || descriptor.id || null;
+    return {
+        connectId,
+        uuid: '',
+        serialNo: null,
+        deviceId: null,
+        deviceType: hdShared.EDeviceType.Unknown,
+        name: descriptor.name || connectId || '',
+        commType: descriptor.commType,
+    };
+};
+const toSearchDevice = (device) => {
+    const message = device.toMessageObject();
+    return message ? message : null;
+};
 class SearchDevices extends BaseMethod {
     init() {
         this.useDevice = false;
@@ -47270,20 +47326,32 @@ class SearchDevices extends BaseMethod {
         this.skipForceUpdateCheck = true;
     }
     run() {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
-            yield TransportManager.configure();
-            const deviceDiff = yield ((_a = this.connector) === null || _a === void 0 ? void 0 : _a.enumerate());
-            const devicesDescriptor = (_b = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _b !== void 0 ? _b : [];
             const env = DataManager.getSettings('env');
+            const isWebUsb = env === 'webusb' || env === 'desktop-webusb';
+            const requestQueue = (_a = this.context) === null || _a === void 0 ? void 0 : _a.requestQueue;
+            const hasActiveWebUsbRequest = isWebUsb && ((_b = requestQueue === null || requestQueue === void 0 ? void 0 : requestQueue.getRequestTasksId().length) !== null && _b !== void 0 ? _b : 0) > 0;
+            if (isWebUsb) {
+                try {
+                    yield TransportManager.ensureInitialized();
+                }
+                catch (error) {
+                    Log$e.debug('WebUSB bring-up unavailable', error);
+                }
+            }
+            if (!hasActiveWebUsbRequest)
+                yield TransportManager.configure();
+            const deviceDiff = yield ((_c = this.connector) === null || _c === void 0 ? void 0 : _c.enumerate());
+            const devicesDescriptor = (_d = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _d !== void 0 ? _d : [];
             if (DataManager.isBleConnect(env)) {
                 const devices = [];
                 const seenIds = new Set();
                 for (const device of devicesDescriptor) {
-                    const lowerId = (_c = device.id) === null || _c === void 0 ? void 0 : _c.toLowerCase();
+                    const lowerId = (_e = device.id) === null || _e === void 0 ? void 0 : _e.toLowerCase();
                     if (!seenIds.has(lowerId)) {
                         seenIds.add(lowerId);
-                        const rawBleName = (_e = (_d = device.name) !== null && _d !== void 0 ? _d : device.localName) !== null && _e !== void 0 ? _e : '';
+                        const rawBleName = (_g = (_f = device.name) !== null && _f !== void 0 ? _f : device.localName) !== null && _g !== void 0 ? _g : '';
                         const bleName = hdShared.canonicalizePro2BleAdvertisementName(rawBleName);
                         devices.push(Object.assign(Object.assign({}, device), { connectId: device.id, serialNo: null, uuid: '', deviceId: null, name: bleName || device.name, deviceType: getDeviceTypeByBleName(bleName) }));
                     }
@@ -47292,22 +47360,34 @@ class SearchDevices extends BaseMethod {
             }
             const deviceList = [];
             for (const descriptor of devicesDescriptor) {
-                try {
-                    const result = yield DevicePool.getDevices([descriptor], descriptor.path, {
-                        connectProtocol: undefined,
-                        forceProtocolDetection: true,
-                        refreshRuntimeState: true,
-                    });
-                    deviceList.push(...result.deviceList);
+                if (hasActiveWebUsbRequest && isOwnedByActiveWebUsbRequest(descriptor, requestQueue)) {
+                    const cached = DevicePool.getDeviceByPath(descriptor.path);
+                    const known = (cached === null || cached === void 0 ? void 0 : cached.features) ? cached : getOwningRequestDevice(descriptor, requestQueue);
+                    const message = known ? toSearchDevice(known) : null;
+                    deviceList.push(message !== null && message !== void 0 ? message : toSearchDeviceFromDescriptor(descriptor));
                 }
-                catch (error) {
-                    const errorCode = error && typeof error === 'object' && 'errorCode' in error
-                        ? error.errorCode
-                        : undefined;
-                    Log$e.debug('Skip unavailable device during search', Object.assign({ path: descriptor.path }, (errorCode !== undefined ? { errorCode } : {})));
+                else {
+                    try {
+                        const result = yield DevicePool.getDevices([descriptor], descriptor.path, {
+                            connectProtocol: undefined,
+                            forceProtocolDetection: true,
+                            refreshRuntimeState: true,
+                        });
+                        for (const device of result.deviceList) {
+                            const message = toSearchDevice(device);
+                            if (message)
+                                deviceList.push(message);
+                        }
+                    }
+                    catch (error) {
+                        const errorCode = error && typeof error === 'object' && 'errorCode' in error
+                            ? error.errorCode
+                            : undefined;
+                        Log$e.debug('Skip unavailable device during search', Object.assign({ path: descriptor.path }, (errorCode !== undefined ? { errorCode } : {})));
+                    }
                 }
             }
-            return deviceList.map(device => device.toMessageObject());
+            return deviceList;
         });
     }
 }
@@ -55964,7 +56044,7 @@ class AllNetworkGetAddressBase extends BaseMethod {
             this.protocolV2ResumedSeedDomains.add('cardano');
         }
     }
-    callMethod(methodName, params, rootFingerprint) {
+    callMethod(methodName, params, rootFingerprint, postMessage = this.postMessage) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const method = findMethod({
@@ -55973,7 +56053,7 @@ class AllNetworkGetAddressBase extends BaseMethod {
                 payload: Object.assign({ connectId: this.payload.connectId, deviceId: this.payload.deviceId, method: methodName }, params),
             });
             method.connector = this.connector;
-            method.postMessage = this.postMessage;
+            method.postMessage = postMessage;
             if (this.context) {
                 (_a = method.setContext) === null || _a === void 0 ? void 0 : _a.call(method, this.context);
             }
@@ -56088,7 +56168,9 @@ class AllNetworkGetAddressBase extends BaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             this.loadingCleanupInBackground = false;
             try {
-                if (this.device.isProtocolV2() && this.device.getCurrentDeviceType() === hdShared.EDeviceType.Pro2) {
+                if (this.device.isProtocolV2() &&
+                    (this.device.getCurrentDeviceType() === hdShared.EDeviceType.Pro2 ||
+                        this.device.getCurrentDeviceType() === hdShared.EDeviceType.Neo)) {
                     const protocolInfo = yield this.device.ensureProtocolV2RuntimeContext();
                     if (supportsProtocolV2Message(protocolInfo, 60461)) {
                         const { commands } = this.device;
@@ -56184,11 +56266,53 @@ function handleSkippableHardwareError(e, device, method) {
 }
 
 class AllNetworkGetAddress extends AllNetworkGetAddressBase {
+    checkAborted() {
+        var _a;
+        if ((_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.aborted) {
+            throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
+        }
+    }
+    callAddressGroup(methodName, params, rootFingerprint) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const methodCallParams = { bundle: params.map(param => (Object.assign({}, param.params))) };
+            if (!this.device.isProtocolV2() || params.length === 1) {
+                return this.callMethod(methodName, methodCallParams, rootFingerprint);
+            }
+            const postedAddressCounts = new Map();
+            let runningIndividually = false;
+            const postMessage = message => {
+                var _a;
+                if (message.type === UI_REQUEST.PREVIOUS_ADDRESS_RESULT) {
+                    const { path, address } = message.payload.data;
+                    const key = JSON.stringify([path, address]);
+                    const count = (_a = postedAddressCounts.get(key)) !== null && _a !== void 0 ? _a : 0;
+                    if (runningIndividually && count > 0) {
+                        postedAddressCounts.set(key, count - 1);
+                        return;
+                    }
+                    if (!runningIndividually)
+                        postedAddressCounts.set(key, count + 1);
+                }
+                this.postMessage(message);
+            };
+            if (params.every(param => param._originRequestParams.showOnOneKey === false)) {
+                const response = yield this.callMethod(methodName, methodCallParams, rootFingerprint, postMessage);
+                if (response.some(item => item.success))
+                    return response;
+            }
+            runningIndividually = true;
+            const responses = [];
+            for (const param of params) {
+                this.checkAborted();
+                const response = yield this.callMethod(methodName, { bundle: [Object.assign({}, param.params)] }, rootFingerprint, postMessage);
+                responses.push(...response);
+            }
+            return responses;
+        });
+    }
     getAllNetworkAddress(rootFingerprint) {
-        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const responses = [];
-            const resultMap = {};
             const { bundle } = this.payload;
             const methodParams = bundle.map((param, index) => this.generateMethodName({
                 network: param.network,
@@ -56204,38 +56328,12 @@ class AllNetworkGetAddress extends AllNetworkGetAddressBase {
             }, new Map());
             let processed = 0;
             for (const [methodName, params] of methodGroups.entries()) {
-                const methodCallParams = {
-                    bundle: params.map(param => (Object.assign({}, param.params))),
-                };
-                if ((_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.aborted) {
-                    throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
-                }
-                const isProtocolV2 = this.device.isProtocolV2();
-                const runIndividually = isProtocolV2 &&
-                    params.length > 1 &&
-                    params.some(param => param._originRequestParams.showOnOneKey !== false);
-                let response = [];
-                if (!runIndividually) {
-                    response = yield this.callMethod(methodName, methodCallParams, rootFingerprint);
-                }
-                if (isProtocolV2 &&
-                    params.length > 1 &&
-                    (runIndividually || response.every(item => !item.success))) {
-                    response = [];
-                    for (const param of params) {
-                        if ((_b = this.abortController) === null || _b === void 0 ? void 0 : _b.signal.aborted) {
-                            throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
-                        }
-                        const itemResponse = yield this.callMethod(methodName, { bundle: [Object.assign({}, param.params)] }, rootFingerprint);
-                        response.push(...itemResponse);
-                    }
-                }
-                if ((_c = this.abortController) === null || _c === void 0 ? void 0 : _c.signal.aborted) {
-                    throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
-                }
+                this.checkAborted();
+                const response = yield this.callAddressGroup(methodName, params, rootFingerprint);
+                this.checkAborted();
                 for (let index = 0; index < params.length; index++) {
                     const { _originRequestParams, _originalIndex } = params[index];
-                    resultMap[`${_originalIndex}`] = Object.assign(Object.assign({}, _originRequestParams), response[index]);
+                    responses[_originalIndex] = Object.assign(Object.assign({}, _originRequestParams), response[index]);
                 }
                 processed += params.length;
                 if (bundle.length > 1) {
@@ -56243,11 +56341,8 @@ class AllNetworkGetAddress extends AllNetworkGetAddressBase {
                     this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, { progress }));
                 }
             }
-            for (let i = 0; i < bundle.length; i++) {
-                responses.push(resultMap[i]);
-            }
             this.abortController = null;
-            return Promise.resolve(responses);
+            return responses;
         });
     }
 }
@@ -65880,7 +65975,7 @@ const createUiProgressMessageFilter = (intervalMs = DEFAULT_UI_PROGRESS_INTERVAL
 
 const Log = getLogger(exports.LoggerNames.Core);
 const PRE_INITIALIZE_TTL_MS = 60 * 1000;
-const PRE_PENDING_CALL_TIMEOUT_MS = 15 * 1000;
+const PRE_PENDING_CALL_TIMEOUT_MS = 5 * 1000;
 const PRO2_USB_SIGNING_COOLDOWN_MS = 1000;
 const preWarmInflight = new Map();
 const preWarmDoneAt = new Map();
@@ -65960,6 +66055,7 @@ const callAPI = (context, message) => __awaiter(void 0, void 0, void 0, function
             }
         };
         (_a = method.setContext) === null || _a === void 0 ? void 0 : _a.call(method, context);
+        method.context = context;
         method.requestContext = createRequestContext(method.responseID, method.name, {
             sdkInstanceId: context.sdkInstanceId,
             connectId: method.connectId,
@@ -65977,7 +66073,11 @@ const callAPI = (context, message) => __awaiter(void 0, void 0, void 0, function
     if (!method.useDevice) {
         updateMethodRequestContext(method, { status: 'running' });
         try {
-            const response = yield method.run();
+            const env = DataManager.getSettings('env');
+            const response = method.name === 'searchDevices' &&
+                (DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env))
+                ? yield context.methodSynchronize(() => method.run(), 'webusb-discovery')
+                : yield method.run();
             completeMethodRequestContext(method);
             return createResponseMessage(method.responseID, true, response);
         }
@@ -66048,20 +66148,28 @@ const waitForPendingPromise = (connectId, getPrePendingCallPromise, removePrePen
     if (pendingPromise) {
         Log.debug('pre pending call promise before call method, wait for it');
         let timer;
+        let timedOut = false;
+        let completed = false;
         try {
             yield Promise.race([
                 pendingPromise,
-                new Promise((_, reject) => {
+                new Promise(resolve => {
                     timer = setTimeout(() => {
-                        reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceBusy, 'Previous device cancellation is still draining'));
+                        timedOut = true;
+                        resolve();
                     }, PRE_PENDING_CALL_TIMEOUT_MS);
                 }),
             ]);
-            removePrePendingCallPromise === null || removePrePendingCallPromise === void 0 ? void 0 : removePrePendingCallPromise(connectId, pendingPromise);
+            completed = !timedOut;
         }
         finally {
             if (timer)
                 clearTimeout(timer);
+            if (timedOut || completed)
+                removePrePendingCallPromise === null || removePrePendingCallPromise === void 0 ? void 0 : removePrePendingCallPromise(connectId, pendingPromise);
+        }
+        if (timedOut) {
+            Log.warn('pre pending call promise timed out before call method', { connectId });
         }
         Log.debug('pre pending call promise before call method done');
     }
@@ -66109,7 +66217,22 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
             context.registerCallbackTask(method.connectId, preWarmCallbackTask);
         }
         const pollingId = pollingManager.start(connectId);
-        device = yield ensureConnected(context, method, connectId, pollingId, method.abortSignal);
+        const env = DataManager.getSettings('env');
+        const connect = () => ensureConnected(context, method, connectId, pollingId, method.abortSignal);
+        if (DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env)) {
+            const connectPromise = context.methodSynchronize(() => __awaiter(void 0, void 0, void 0, function* () {
+                var _k;
+                if ((_k = method.abortSignal) === null || _k === void 0 ? void 0 : _k.aborted) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled);
+                }
+                return connect();
+            }), 'webusb-discovery');
+            connectPromise.catch(() => undefined);
+            device = yield requestQueue.waitForTask(task, () => connectPromise);
+        }
+        else {
+            device = yield connect();
+        }
         if ((_e = method.abortSignal) === null || _e === void 0 ? void 0 : _e.aborted) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled);
         }
@@ -66174,12 +66297,12 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
             return waitForPendingPromise((_a = method.connectId) !== null && _a !== void 0 ? _a : '', getPrePendingCallPromise, removePrePendingCallPromise);
         });
         const inner = () => __awaiter(void 0, void 0, void 0, function* () {
-            var _k, _l;
+            var _l, _m;
             method.assertProtocolSupported(device.getProtocol(), device.getCurrentFirmwareType());
             protocolV2Operation = device.isProtocolV2();
             const versionRange = device.getCurrentMethodVersionRange(type => method.getVersionRange()[type]);
-            const currentFirmwareVersion = (_k = device.getCurrentFirmwareVersionString()) !== null && _k !== void 0 ? _k : '0.0.0';
-            const currentBleVersion = (_l = device.getCurrentBLEFirmwareVersionString()) !== null && _l !== void 0 ? _l : '0.0.0';
+            const currentFirmwareVersion = (_l = device.getCurrentFirmwareVersionString()) !== null && _l !== void 0 ? _l : '0.0.0';
+            const currentBleVersion = (_m = device.getCurrentBLEFirmwareVersionString()) !== null && _m !== void 0 ? _m : '0.0.0';
             const deviceFirmwareType = device.getCurrentFirmwareType();
             let newVersionStatus;
             if (device.features && !device.isProtocolV2()) {
@@ -66257,7 +66380,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                         }
                     },
                     prepare: () => __awaiter(void 0, void 0, void 0, function* () {
-                        var _m, _o, _p, _q, _r, _s;
+                        var _o, _p, _q, _r, _s, _t;
                         if (method.deviceId && method.checkDeviceId && !deviceIdCheckedDuringUnlockPreflight) {
                             const isSameDeviceID = yield checkLiveDeviceId(device, method.deviceId);
                             if (!isSameDeviceID) {
@@ -66277,7 +66400,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                                     require: support.require,
                                 });
                             }
-                            const passphraseStateSafety = yield device.checkPassphraseStateSafety((_m = method.payload) === null || _m === void 0 ? void 0 : _m.passphraseState, (_o = method.payload) === null || _o === void 0 ? void 0 : _o.useEmptyPassphrase, (_p = method.payload) === null || _p === void 0 ? void 0 : _p.skipPassphraseCheck, resolveDeriveCardano(method), (_q = method.protocolV2UnlockContext) === null || _q === void 0 ? void 0 : _q.preflightMainPinSelected);
+                            const passphraseStateSafety = yield device.checkPassphraseStateSafety((_o = method.payload) === null || _o === void 0 ? void 0 : _o.passphraseState, (_p = method.payload) === null || _p === void 0 ? void 0 : _p.useEmptyPassphrase, (_q = method.payload) === null || _q === void 0 ? void 0 : _q.skipPassphraseCheck, resolveDeriveCardano(method), (_r = method.protocolV2UnlockContext) === null || _r === void 0 ? void 0 : _r.preflightMainPinSelected);
                             checkPassphraseEnableState(method, device.features);
                             if (!passphraseStateSafety) {
                                 DevicePool.clearDeviceCache(method.payload.connectId);
@@ -66295,7 +66418,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                                 ? e
                                 : hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'open safety check failed.');
                         }
-                        (_s = (_r = method.device) === null || _r === void 0 ? void 0 : _r.commands) === null || _s === void 0 ? void 0 : _s.checkDisposed();
+                        (_t = (_s = method.device) === null || _s === void 0 ? void 0 : _s.commands) === null || _t === void 0 ? void 0 : _t.checkDisposed();
                     }),
                 });
                 messageResponse = createResponseMessage(method.responseID, true, response);
@@ -66650,10 +66773,11 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
     const POLL_INTERVAL_TIME = (method.payload && method.payload.pollIntervalTime) || 1000;
     const TIME_OUT = (method.payload && method.payload.timeout) || 10000;
     let timer = null;
+    let lastInitializeError;
     Log.debug(`EnsureConnected function start, MAX_RETRY_COUNT=${MAX_RETRY_COUNT}, POLL_INTERVAL_TIME=${POLL_INTERVAL_TIME}  `);
     const poll = (time = POLL_INTERVAL_TIME) => __awaiter(void 0, void 0, void 0, function* () {
         return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
-            var _t;
+            var _u;
             const abort = () => {
                 if (abortSignal && abortSignal.aborted) {
                     if (timer) {
@@ -66682,8 +66806,10 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
             Log.debug('EnsureConnected function try count: ', tryCount, ' poll interval time: ', time);
             try {
                 yield initDeviceList(method);
+                lastInitializeError = undefined;
             }
             catch (error) {
+                lastInitializeError = error;
                 Log.debug('device list error: ', error);
                 if ([
                     hdShared.HardwareErrorCode.BridgeNotInstalled,
@@ -66696,6 +66822,7 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
                 }
                 if (error.errorCode === hdShared.HardwareErrorCode.TransportNotConfigured) {
                     yield TransportManager.configure();
+                    lastInitializeError = undefined;
                 }
             }
             if (abort()) {
@@ -66778,13 +66905,16 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
                     clearTimeout(timer);
                 }
                 Log.debug('EnsureConnected get to max try count, will return: ', tryCount);
-                if (DataManager.isBrowserWebUsb(env) && !((_t = method.payload) === null || _t === void 0 ? void 0 : _t.skipWebDevicePrompt)) {
+                const preserveWebUsbInitError = DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env);
+                const needsPermissionPrompt = DataManager.isBrowserWebUsb(env) && !((_u = method.payload) === null || _u === void 0 ? void 0 : _u.skipWebDevicePrompt);
+                const fallbackError = needsPermissionPrompt
+                    ? hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WebDeviceNotFoundOrNeedsPermission)
+                    : hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound);
+                const errorToReject = preserveWebUsbInitError && lastInitializeError ? lastInitializeError : fallbackError;
+                if (needsPermissionPrompt && errorToReject === fallbackError) {
                     postMessage(createUiMessage(UI_REQUEST.WEB_DEVICE_PROMPT_ACCESS_PERMISSION));
-                    reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WebDeviceNotFoundOrNeedsPermission));
-                }
-                else {
-                    reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound));
                 }
+                reject(errorToReject);
                 return;
             }
             if (abort()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.2-alpha.120",
+  "version": "1.2.2-alpha.122",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.2-alpha.120",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.120",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.122",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.122",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "buffer": "^6.0.3",
@@ -46,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "26958fa2be6aa34a07f42403fb7022d2785e70b9"
+  "gitHead": "37770cd3ae109751f082715228b6155487b7da56"
 }