@onekeyfe/hd-core 1.2.0-alpha.57 → 1.2.0-alpha.59

package/src/api/solana/SolSignTransaction.ts

@@ -47,7 +47,7 @@ export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[
   getVersionRange() {
     if (this.existsVersionedTx()) {
       return {
-        pro2: {
+        model_pro2: {
           min: '0.0.0',
         },
         model_mini: {
@@ -60,7 +60,7 @@ export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[
     }
 
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       classic: {

package/src/api/sui/SuiGetAddress.ts

@@ -52,7 +52,7 @@ export default class SuiGetAddress extends BaseMethod<HardwareSuiGetAddress[]> {
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       model_mini: {

package/src/api/sui/SuiGetPublicKey.ts

@@ -44,7 +44,7 @@ export default class SuiGetPublicKey extends BaseMethod<any> {
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       model_mini: {

package/src/api/sui/SuiSignMessage.ts

@@ -34,7 +34,7 @@ export default class SuiSignMessage extends BaseMethod<HardwareSuiSignMessage> {
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       model_mini: {

package/src/api/sui/SuiSignTransaction.ts

@@ -43,7 +43,7 @@ export default class SuiSignTransaction extends BaseMethod<SuiSignTx> {
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       model_mini: {

package/src/api/ton/TonGetAddress.ts

@@ -61,7 +61,7 @@ export default class TonGetAddress extends BaseMethod<HardwareTonGetAddress[]> {
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       model_touch: {

package/src/api/ton/TonSignMessage.ts

@@ -89,7 +89,7 @@ export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       model_touch: {

package/src/api/ton/TonSignProof.ts

@@ -48,7 +48,7 @@ export default class TonSignProof extends BaseMethod<HardwareTonSignProof> {
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       model_touch: {

package/src/api/tron/TronSignMessage.ts

@@ -46,7 +46,7 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       model_mini: {
@@ -57,7 +57,7 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
 
   getMessageV2VersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       pro: {

package/src/api/tron/TronSignTransaction.ts

@@ -152,7 +152,7 @@ export default class TronSignTransaction extends BaseMethod<TronSignTx> {
 
   getVersionRange() {
     return {
-      pro2: {
+      model_pro2: {
         min: '0.0.0',
       },
       model_mini: {

package/src/api/utils.ts

@@ -3,47 +3,13 @@ import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import * as ApiMethods from './index';
 
 import type { BaseMethod } from './BaseMethod';
-import type { CoreMethodExtension } from './methodExtension';
 import type { IFrameCallMessage } from '../events';
 
 type MethodConstructor = new (message: IFrameCallMessage & { id?: number }) => BaseMethod<any>;
 
 const publicMethodRegistry = ApiMethods as unknown as Record<string, MethodConstructor>;
 
-export type FindMethodOptions = {
-  extensions?: readonly CoreMethodExtension[];
-  allowDestructiveOperations?: boolean;
-};
-
-const findExtensionMethod = (
-  method: string,
-  extensions: readonly CoreMethodExtension[]
-): { constructor: MethodConstructor; destructive: boolean } | undefined => {
-  let match: { constructor: MethodConstructor; destructive: boolean } | undefined;
-
-  for (const extension of extensions) {
-    const constructor = extension.methods[method];
-    if (constructor) {
-      if (match) {
-        throw ERRORS.TypedError(
-          HardwareErrorCode.CallMethodInvalidParameter,
-          `Method ${method} is registered by multiple extensions`
-        );
-      }
-      match = {
-        constructor,
-        destructive: extension.destructiveMethods?.includes(method) === true,
-      };
-    }
-  }
-
-  return match;
-};
-
-export function findMethod(
-  message: IFrameCallMessage & { id?: number },
-  options: FindMethodOptions = {}
-): BaseMethod<any> {
+export function findMethod(message: IFrameCallMessage & { id?: number }): BaseMethod<any> {
   const { method } = message.payload;
   if (typeof method !== 'string') {
     throw ERRORS.TypedError(HardwareErrorCode.CallMethodInvalidParameter, 'Method is not set');
@@ -54,17 +20,6 @@ export function findMethod(
     return new MethodConstructor(message);
   }
 
-  const extensionMethod = findExtensionMethod(method, options.extensions ?? []);
-  if (extensionMethod) {
-    if (extensionMethod.destructive && options.allowDestructiveOperations !== true) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.CallMethodInvalidParameter,
-        `Destructive method ${method} requires allowDestructiveOperations`
-      );
-    }
-    return new extensionMethod.constructor(message);
-  }
-
   throw ERRORS.TypedError(
     HardwareErrorCode.CallMethodInvalidParameter,
     `Method ${method} is not set`

package/src/core/index.ts

@@ -1,5 +1,5 @@
 import semver from 'semver';
-import { EventEmitter } from 'events';
+import EventEmitter from 'events';
 import { DeviceSessionPinType, TRANSPORT_EVENT } from '@onekeyfe/hd-transport';
 import {
   ERRORS,
@@ -75,7 +75,6 @@ import type {
   TransportDeviceDisconnectEvent,
 } from '@onekeyfe/hd-transport';
 import type { BaseMethod } from '../api/BaseMethod';
-import type { CoreMethodExtension } from '../api/methodExtension';
 
 const Log = getLogger(LoggerNames.Core);
 const PRE_INITIALIZE_TTL_MS = 60 * 1000;
@@ -87,11 +86,6 @@ const preWarmDoneAt = new Map<string, number>();
 
 export type CoreContext = ReturnType<Core['getCoreContext']>;
 
-export type CoreOptions = {
-  methodExtensions?: readonly CoreMethodExtension[];
-  allowDestructiveOperations?: boolean;
-};
-
 function hasDeriveCardano(method: BaseMethod): boolean {
   if (
     method.name.startsWith('allNetworkGetAddress') &&
@@ -162,10 +156,7 @@ export const callAPI = async (context: CoreContext, message: CoreMessage) => {
   // find api method
   let method!: BaseMethod;
   try {
-    method = findMethod(message as IFrameCallMessage, {
-      extensions: context.methodExtensions,
-      allowDestructiveOperations: context.allowDestructiveOperations,
-    });
+    method = findMethod(message as IFrameCallMessage);
     method.connector = _connector;
     const shouldPostMessage = createUiProgressMessageFilter();
     method.postMessage = event => {
@@ -661,6 +652,12 @@ const onCallDevice = async (
         requestQueue.resolveRequest(method.responseID, messageResponse);
         completeMethodRequestContext(method);
       } catch (error) {
+        // Device.run may release the request before transport callbacks finish after a timeout.
+        // Ignore the stale callback because the caller already received the connection error.
+        if (!requestQueue.getTask(method.responseID)) {
+          Log.debug(`Call API - Ignore late inner method result`, error);
+          return;
+        }
         Log.debug(`Call API - Inner Method Run Error`, error);
         messageResponse = createResponseMessage(method.responseID, false, { error });
         requestQueue.resolveRequest(method.responseID, messageResponse);
@@ -1486,11 +1483,8 @@ export default class Core extends EventEmitter {
 
   private methodSynchronize = getSynchronize();
 
-  private readonly options: CoreOptions;
-
-  constructor(options: CoreOptions = {}) {
+  constructor() {
     super();
-    this.options = options;
     this.tracingContext = createSdkTracingContext();
     this.sdkInstanceId = this.tracingContext.sdkInstanceId;
     Log.debug(`[Core] Created SDK instance: ${this.sdkInstanceId}`);
@@ -1499,8 +1493,6 @@ export default class Core extends EventEmitter {
   private getCoreContext() {
     return {
       sdkInstanceId: this.sdkInstanceId,
-      methodExtensions: this.options.methodExtensions ?? [],
-      allowDestructiveOperations: this.options.allowDestructiveOperations === true,
       tracingContext: this.tracingContext,
       requestQueue: this.requestQueue,
       methodSynchronize: this.methodSynchronize,
@@ -1631,8 +1623,8 @@ export default class Core extends EventEmitter {
   }
 }
 
-export const initCore = (options?: CoreOptions) => {
-  const core = new Core(options);
+export const initCore = () => {
+  const core = new Core();
   _core = core;
   return core;
 };
@@ -1658,26 +1650,22 @@ const initTransport = (Transport: any, plugin?: LowlevelTransportSharedPlugin) =
 export const init = async (
   settings: ConnectSettings,
   Transport: any,
-  plugin?: LowlevelTransportSharedPlugin,
-  options?: CoreOptions
+  plugin?: LowlevelTransportSharedPlugin
 ) => {
   try {
-    try {
-      await DataManager.load(settings);
-      initTransport(Transport, plugin);
-    } catch {
-      Log.error('DataManager.load error');
-    }
+    await DataManager.load(settings);
+    initTransport(Transport, plugin);
     enableLog(DataManager.getSettings('debug'));
     if (DataManager.getSettings('env') !== 'react-native') {
       setLoggerPostMessage(postMessage);
     }
-    initCore(options);
+    initCore();
     initConnector();
 
     return _core;
   } catch (error) {
     Log.error('core init', error);
+    throw error;
   }
 };
 

package/src/data-manager/DataManager.ts

@@ -26,6 +26,7 @@ import type {
   Features,
   IDeviceBLEFirmwareStatus,
   IDeviceFirmwareStatus,
+  IProtocolV2Resources,
   ITransportStatus,
   IVersionArray,
   RemoteConfigResponse,
@@ -68,7 +69,7 @@ function getFirmwareTypeFromField(firmwareField: IFirmwareField): EFirmwareType
 
 export default class DataManager {
   static deviceMap: DeviceTypeMap & {
-    [k: string]: DeviceTypeMap[keyof DeviceTypeMap] | undefined;
+    [k: string]: NonNullable<DeviceTypeMap[keyof DeviceTypeMap]> | undefined;
   } = {
     [EDeviceType.Classic]: {
       firmware: [],
@@ -94,6 +95,10 @@ export default class DataManager {
       firmware: [],
       ble: [],
     },
+    [EDeviceType.Neo]: {
+      firmware: [],
+      ble: [],
+    },
     [EDeviceType.ClassicPure]: {
       firmware: [],
       ble: [],
@@ -112,6 +117,8 @@ export default class DataManager {
 
   static lastCheckTimestamp = 0;
 
+  static protocolV2ResourcesConfigError: Error | undefined;
+
   static getFirmwareStatus = (
     features: Features,
     firmwareType: EFirmwareType
@@ -356,7 +363,7 @@ export default class DataManager {
 
   private static enrichFirmwareReleaseInfo(
     deviceData: DeviceTypeMap[keyof DeviceTypeMap] | undefined
-  ): DeviceTypeMap[keyof DeviceTypeMap] {
+  ): NonNullable<DeviceTypeMap[keyof DeviceTypeMap]> {
     // Safety check: return default structure if input is undefined/null
     if (!deviceData || typeof deviceData !== 'object') {
       return {
@@ -400,6 +407,7 @@ export default class DataManager {
 
   static async load(settings: ConnectSettings): Promise<boolean> {
     this.settings = settings;
+    this.protocolV2ResourcesConfigError = undefined;
     if (!settings.fetchConfig) {
       return false;
     }
@@ -446,9 +454,27 @@ export default class DataManager {
 
     // 3. Apply config if available
     if (data) {
-      const pro2Resources = parseProtocolV2Resources(
-        (data.pro2 as { resources?: unknown } | undefined)?.resources
-      );
+      let pro2Resources: IProtocolV2Resources | undefined;
+      let neoResources: IProtocolV2Resources | undefined;
+      this.protocolV2ResourcesConfigError = undefined;
+      try {
+        pro2Resources = parseProtocolV2Resources(
+          (data.pro2 as { resources?: unknown } | undefined)?.resources
+        );
+        neoResources = parseProtocolV2Resources(
+          (data.neo as { resources?: unknown } | undefined)?.resources
+        );
+      } catch (error) {
+        // Firmware resource metadata is not required for base communication. If the
+        // remote config is temporarily incomplete, disable this resource update only.
+        this.protocolV2ResourcesConfigError =
+          error instanceof Error ? error : new Error(String(error));
+        Log.warn('[DataConfig] Ignoring invalid Pro2 resources config:', error);
+      }
+      const enrichedPro2Config = this.enrichFirmwareReleaseInfo(data.pro2);
+      const enrichedNeoConfig = this.enrichFirmwareReleaseInfo(data.neo);
+      const { resources: _unvalidatedResources, ...pro2Config } = enrichedPro2Config;
+      const { resources: _unvalidatedNeoResources, ...neoConfig } = enrichedNeoConfig;
       Log.log(`[DataConfig] Config loaded successfully via [${fetchMethod}]`);
       this.deviceMap = {
         [EDeviceType.Classic]: this.enrichFirmwareReleaseInfo(data.classic),
@@ -458,9 +484,13 @@ export default class DataManager {
         [EDeviceType.Touch]: this.enrichFirmwareReleaseInfo(data.touch),
         [EDeviceType.Pro]: this.enrichFirmwareReleaseInfo(data.pro),
         [EDeviceType.Pro2]: {
-          ...this.enrichFirmwareReleaseInfo(data.pro2),
+          ...pro2Config,
           ...(pro2Resources ? { resources: pro2Resources } : undefined),
         },
+        [EDeviceType.Neo]: {
+          ...neoConfig,
+          ...(neoResources ? { resources: neoResources } : undefined),
+        },
       };
       this.assets = {
         bridge: data.bridge,
@@ -494,7 +524,9 @@ export default class DataManager {
   }
 
   /** Force a fresh remote config before an update is allowed to mutate the device. */
-  static async forceReloadData(): Promise<void> {
+  static async forceReloadData({
+    requireResources = false,
+  }: { requireResources?: boolean } = {}): Promise<void> {
     if (!this.settings) {
       throw new Error('Remote config settings are not initialized');
     }
@@ -505,15 +537,23 @@ export default class DataManager {
         'Unable to refresh the latest remote config'
       );
     }
+    if (requireResources && this.protocolV2ResourcesConfigError) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.FirmwareUpdateDownloadFailed,
+        `Invalid Pro2 resources config: ${this.protocolV2ResourcesConfigError.message}`
+      );
+    }
     this.lastCheckTimestamp = getTimeStamp();
   }
 
-  static getProtocolV2Resources() {
-    return this.deviceMap[EDeviceType.Pro2]?.resources?.stable;
+  static getProtocolV2Resources(deviceType: EDeviceType.Pro2 | EDeviceType.Neo = EDeviceType.Pro2) {
+    return this.deviceMap[deviceType]?.resources?.stable;
   }
 
-  static getProtocolV2BootResources() {
-    return this.deviceMap[EDeviceType.Pro2]?.resources?.boot;
+  static getProtocolV2BootResources(
+    deviceType: EDeviceType.Pro2 | EDeviceType.Neo = EDeviceType.Pro2
+  ) {
+    return this.deviceMap[deviceType]?.resources?.boot;
   }
 
   static getProtobufMessages(schema: ProtobufMessageSchema = 'v1CurrentSchema'): JSON {

package/src/data-manager/TransportManager.ts

@@ -121,6 +121,12 @@ export default class TransportManager {
   }
 
   static setTransport(TransportConstructor: any, plugin?: LowlevelTransportSharedPlugin) {
+    if (typeof TransportConstructor !== 'function') {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.TransportNotConfigured,
+        'Transport constructor is not available'
+      );
+    }
     const env = DataManager.getSettings('env');
     if (env === 'react-native') {
       /** Actually initializes the ReactNativeTransport */

package/src/device/Device.ts

@@ -696,6 +696,7 @@ export class Device extends EventEmitter {
     // Most-specific model first; must match getMethodVersionRange in deviceInfoUtils,
     // otherwise e.g. Classic1s resolves the looser model_mini range before model_classic1s.
     const modelFallbacks: IDeviceModel[] = [
+      'model_pro2',
       'model_classic1s',
       'model_classic',
       'model_mini',
@@ -715,7 +716,8 @@ export class Device extends EventEmitter {
     if (
       deviceType === EDeviceType.Touch ||
       deviceType === EDeviceType.Pro ||
-      deviceType === EDeviceType.Pro2
+      deviceType === EDeviceType.Pro2 ||
+      deviceType === EDeviceType.Neo
     ) {
       return { support: true };
     }
@@ -732,7 +734,8 @@ export class Device extends EventEmitter {
     if (
       deviceType === EDeviceType.Touch ||
       deviceType === EDeviceType.Pro ||
-      deviceType === EDeviceType.Pro2
+      deviceType === EDeviceType.Pro2 ||
+      deviceType === EDeviceType.Neo
     ) {
       return { support: false };
     }
@@ -1167,10 +1170,14 @@ export class Device extends EventEmitter {
     const protocolV2DeviceType = runtimeDeviceInfo
       ? resolveProtocolV2DeviceIdentity(runtimeDeviceInfo.hw?.Device_type).deviceType
       : this.getCurrentDeviceType();
-    if (runtimeMode === 'romloader' && protocolV2DeviceType !== EDeviceType.Pro2) {
+    if (
+      runtimeMode === 'romloader' &&
+      protocolV2DeviceType !== EDeviceType.Pro2 &&
+      protocolV2DeviceType !== EDeviceType.Neo
+    ) {
       throw ERRORS.TypedError(
         HardwareErrorCode.DeviceInitializeFailed,
-        'Protocol V2 romloader mode is only supported for Pro2.'
+        'Protocol V2 romloader mode is only supported for Pro2 and Neo.'
       );
     }
     const deviceStatusSupported = supportsProtocolV2Message(
@@ -1569,7 +1576,8 @@ export class Device extends EventEmitter {
     if (!this.state) return undefined;
     return (
       this.isProtocolV2() &&
-      this.getCurrentDeviceType() === EDeviceType.Pro2 &&
+      (this.getCurrentDeviceType() === EDeviceType.Pro2 ||
+        this.getCurrentDeviceType() === EDeviceType.Neo) &&
       this.state.status.mode === 'romloader'
     );
   }
@@ -1615,7 +1623,8 @@ export class Device extends EventEmitter {
     const isModeT =
       deviceType === EDeviceType.Touch ||
       deviceType === EDeviceType.Pro ||
-      deviceType === EDeviceType.Pro2;
+      deviceType === EDeviceType.Pro2 ||
+      deviceType === EDeviceType.Neo;
     const unlocked = this.state?.status.unlocked;
     const preCheckTouch = isModeT && unlocked === false;
     const passphraseProtection = this.getCurrentPassphraseProtection();

package/src/device/DeviceCommands.ts

@@ -54,9 +54,19 @@ const DEVICE_SESSION_CALLS = new Set([
   'DeviceSessionAskPin',
   'DeviceSessionAskPassphrase',
 ]);
+const DEVICE_CONTROL_CALLS = new Set([
+  'DeviceReboot',
+  'DeviceSettingsGet',
+  'DeviceSettingsSet',
+  'DeviceSettingsPageShow',
+  'DeviceCertificateWrite',
+  'DeviceCertificateRead',
+  'DeviceCertificateSign',
+  'DeviceMiscUsbMscControl',
+]);
 
-// Protocol V2 subcodes are domain-scoped, so cross-domain cancellation fallback
-// must use explicit firmware cancellation messages instead of a global number map.
+// Older Protocol V2 firmware may omit the cancellation subcode, so retain a
+// narrow message fallback for compatibility.
 const isProtocolV2ActionCancelledMessage = (message: string) =>
   /^(?:cancel(?:led|ed)(?: on device)?|confirm dismissed|user cancel(?:led|ed)(?:\s+.*)?)$/i.test(
     message
@@ -499,6 +509,10 @@ export class DeviceCommands {
         const normalizedMessage = message?.trim() ?? '';
         const isProtocolV2ActionCancelledFailure =
           this.device.isProtocolV2() && isProtocolV2ActionCancelledMessage(normalizedMessage);
+        const isProtocolV2DeviceBusyFailure =
+          this.device.isProtocolV2() &&
+          DEVICE_CONTROL_CALLS.has(callType) &&
+          subcode === DeviceErrorCode.DeviceError_Busy;
         const isLegacyProtocolV2LockedFailure =
           this.device.isProtocolV2() && /^device (?:is )?locked$/i.test(normalizedMessage);
         if (
@@ -556,8 +570,15 @@ export class DeviceCommands {
             subcode,
             firmwareMessage: message,
           });
+        } else if (isProtocolV2DeviceBusyFailure) {
+          error = ERRORS.TypedError(HardwareErrorCode.DeviceBusy, message, {
+            failureCode: code,
+            subcode,
+            firmwareMessage: message,
+          });
         } else if (
-          subcode === DeviceErrorCode.DeviceError_ActionCancelled ||
+          (DEVICE_CONTROL_CALLS.has(callType) &&
+            subcode === DeviceErrorCode.DeviceError_ActionCancelled) ||
           isProtocolV2ActionCancelledFailure
         ) {
           error = ERRORS.TypedError(HardwareErrorCode.ActionCancelled, message, {

package/src/device/DeviceConnector.ts

@@ -14,7 +14,7 @@ import type { OneKeyDeviceInfo as DeviceDescriptor, Transport } from '@onekeyfe/
 const Log = getLogger(LoggerNames.DeviceConnector);
 
 export default class DeviceConnector {
-  transport: Transport;
+  transport?: Transport;
 
   listenTimestamp = 0;
 
@@ -30,9 +30,21 @@ export default class DeviceConnector {
     DevicePool.setConnector(this);
   }
 
+  private getActiveTransport(): Transport {
+    const transport = this.transport ?? TransportManager.getTransport();
+    if (!transport) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.TransportNotConfigured,
+        'Device connector was created before transport initialization'
+      );
+    }
+    this.transport = transport;
+    return transport;
+  }
+
   async enumerate() {
     try {
-      const descriptors = await this.transport.enumerate();
+      const descriptors = await this.getActiveTransport().enumerate();
       this.upcoming = descriptors;
       this._reportDevicesChange();
       return { descriptors } as DeviceDescriptorDiff;
@@ -50,11 +62,10 @@ export default class DeviceConnector {
     let descriptors: DeviceDescriptor[];
 
     try {
+      const transport = this.getActiveTransport();
       Log.debug('Start listening', current);
       this.listenTimestamp = new Date().getTime();
-      descriptors = waitForEvent
-        ? await this.transport.listen(current)
-        : await this.transport.enumerate();
+      descriptors = waitForEvent ? await transport.listen(current) : await transport.enumerate();
       if (!this.listening) return; // do not continue if stop() was called
 
       this.upcoming = descriptors;
@@ -88,16 +99,17 @@ export default class DeviceConnector {
     Log.debug('acquire', path, session, expectedProtocol, protocolHint);
     const env = DataManager.getSettings('env');
     try {
+      const transport = this.getActiveTransport();
       let res;
       if (DataManager.isBleConnect(env)) {
-        res = await this.transport.acquire({
+        res = await transport.acquire({
           uuid: path,
           forceCleanRunPromise,
           expectedProtocol,
           protocolHint,
         });
       } else {
-        res = await this.transport.acquire({
+        res = await transport.acquire({
           path,
           previous: session ?? null,
           expectedProtocol,
@@ -105,7 +117,13 @@ export default class DeviceConnector {
         });
       }
       if (expectedProtocol) {
-        const detectedProtocol = this.transport.getProtocolType(path);
+        // The acquire response is the stable snapshot from this active probe. A delayed
+        // disconnect from an older generation may clear caches, so do not rely on cache alone.
+        const acquiredProtocol =
+          typeof res === 'object' && res !== null
+            ? (res as DeviceDescriptor).protocolType
+            : undefined;
+        const detectedProtocol = acquiredProtocol ?? transport.getProtocolType(path);
         if (detectedProtocol !== expectedProtocol) {
           throw ERRORS.TypedError(
             HardwareErrorCode.RuntimeError,
@@ -122,7 +140,7 @@ export default class DeviceConnector {
 
   async release(session: string, onclose: boolean) {
     try {
-      const res = await this.transport.release(session, onclose);
+      const res = await this.getActiveTransport().release(session, onclose);
       return res;
     } catch (error) {
       safeThrowError(error);
@@ -131,8 +149,9 @@ export default class DeviceConnector {
 
   async disconnect(session: string | undefined | null) {
     try {
-      if (this.transport.disconnect && !!session) {
-        await this.transport.disconnect(session);
+      const transport = this.getActiveTransport();
+      if (transport.disconnect && !!session) {
+        await transport.disconnect(session);
       }
     } catch (error) {
       safeThrowError(error);
@@ -140,10 +159,11 @@ export default class DeviceConnector {
   }
 
   promptDeviceAccess(): Promise<USBDevice | BluetoothDevice | null> {
-    if (!this.transport.promptDeviceAccess) {
+    const transport = this.getActiveTransport();
+    if (!transport.promptDeviceAccess) {
       return Promise.resolve(null);
     }
-    return this.transport.promptDeviceAccess();
+    return transport.promptDeviceAccess();
   }
 
   _reportDevicesChange() {