@onekeyfe/hd-core 0.1.0 → 0.1.3

package/dist/index.js

@@ -615,6 +615,7 @@ const ERROR_CODES = {
     Device_UnexpectedMode: '',
     Device_CallInProgress: '',
     Device_InitializeFailed: '',
+    Device_Interrupted: 'The device is performing other operations',
     Not_Use_Onekey_Device: 'Please use onekey device',
     Runtime: '',
     Init_NotInitialized: 'Init_NotInitialized',
@@ -658,7 +659,7 @@ const colors = {
     Transport: 'color: #ffb6c1; background: #000;',
 };
 const MAX_ENTRIES = 100;
-class Log$5 {
+class Log$6 {
     constructor(prefix, enabled) {
         this.prefix = prefix;
         this.enabled = enabled;
@@ -708,7 +709,7 @@ class Log$5 {
 }
 const _logs = {};
 const initLog = (prefix, enabled) => {
-    const instance = new Log$5(prefix, !!enabled);
+    const instance = new Log$6(prefix, !!enabled);
     _logs[prefix] = instance;
     return instance;
 };
@@ -9754,6 +9755,21 @@ var MessagesJSON = {
 	nested: nested
 };
 
+const getReleaseStatus = (releases, currentVersion) => {
+    const newVersions = releases.filter(r => semver__default["default"].gt(r.version.join('.'), currentVersion));
+    if (newVersions.length === 0) {
+        return 'valid';
+    }
+    if (newVersions.some(r => r.required)) {
+        return 'required';
+    }
+    return 'outdated';
+};
+const getReleaseChangelog = (releases, currentVersion) => {
+    const newVersions = releases.filter(r => semver__default["default"].gt(r.version.join('.'), currentVersion));
+    return newVersions.map(r => r.changelog);
+};
+
 var _a;
 class DataManager {
     static load(settings) {
@@ -9821,17 +9837,26 @@ DataManager.getFirmwareStatus = (features) => {
         return 'unknown';
     }
     const targetDeviceConfigList = (_c = (_b = _a.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b.firmware) !== null && _c !== void 0 ? _c : [];
-    const latestFirmware = targetDeviceConfigList[targetDeviceConfigList.length - 1];
-    if (!latestFirmware)
-        return 'valid';
-    const latestVersion = latestFirmware.version.join('.');
     const currentVersion = deviceFirmwareVersion.join('.');
-    if (semver__default["default"].gt(latestVersion, currentVersion)) {
-        if (latestFirmware.required)
-            return 'required';
-        return 'outdated';
+    return getReleaseStatus(targetDeviceConfigList, currentVersion);
+};
+DataManager.getFirmwareChangelog = (features) => {
+    var _b, _c;
+    const deviceType = getDeviceType(features);
+    const deviceFirmwareVersion = getDeviceFirmwareVersion(features);
+    if (features.firmware_present === false ||
+        (deviceType === 'classic' && features.bootloader_mode)) {
+        return [];
     }
-    return 'valid';
+    const targetDeviceConfigList = (_c = (_b = _a.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b.firmware) !== null && _c !== void 0 ? _c : [];
+    const currentVersion = deviceFirmwareVersion.join('.');
+    return getReleaseChangelog(targetDeviceConfigList, currentVersion);
+};
+DataManager.getFirmwareLeatestRelease = (features) => {
+    var _b, _c;
+    const deviceType = getDeviceType(features);
+    const targetDeviceConfigList = (_c = (_b = _a.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b.firmware) !== null && _c !== void 0 ? _c : [];
+    return targetDeviceConfigList[targetDeviceConfigList.length - 1];
 };
 DataManager.getBLEFirmwareStatus = (features) => {
     var _b, _c;
@@ -9841,17 +9866,25 @@ DataManager.getBLEFirmwareStatus = (features) => {
         return 'none';
     }
     const targetDeviceConfigList = (_c = (_b = _a.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b.ble) !== null && _c !== void 0 ? _c : [];
-    const latestBLEFirmware = targetDeviceConfigList[targetDeviceConfigList.length - 1];
-    if (!latestBLEFirmware)
-        return 'valid';
-    const latestVersion = latestBLEFirmware.version.join('.');
     const currentVersion = deviceBLEFirmwareVersion.join('.');
-    if (semver__default["default"].gt(latestVersion, currentVersion)) {
-        if (latestBLEFirmware.required)
-            return 'required';
-        return 'outdated';
+    return getReleaseStatus(targetDeviceConfigList, currentVersion);
+};
+DataManager.getBleFirmwareChangelog = (features) => {
+    var _b, _c;
+    const deviceType = getDeviceType(features);
+    const deviceBLEFirmwareVersion = getDeviceBLEFirmwareVersion(features);
+    if (!deviceBLEFirmwareVersion) {
+        return [];
     }
-    return 'valid';
+    const targetDeviceConfigList = (_c = (_b = _a.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b.ble) !== null && _c !== void 0 ? _c : [];
+    const currentVersion = deviceBLEFirmwareVersion.join('.');
+    return getReleaseChangelog(targetDeviceConfigList, currentVersion);
+};
+DataManager.getBleFirmwareLeatestRelease = (features) => {
+    var _b, _c;
+    const deviceType = getDeviceType(features);
+    const targetDeviceConfigList = (_c = (_b = _a.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b.ble) !== null && _c !== void 0 ? _c : [];
+    return targetDeviceConfigList[targetDeviceConfigList.length - 1];
 };
 DataManager.getTransportStatus = (localVersion) => {
     var _b, _c;
@@ -9862,7 +9895,7 @@ DataManager.getTransportStatus = (localVersion) => {
     return isLatest ? 'valid' : 'outdated';
 };
 
-const Log$4 = initLog('Transport');
+const Log$5 = initLog('Transport');
 class TransportManager {
     static load() {
         console.log('transport manager load');
@@ -9873,25 +9906,25 @@ class TransportManager {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const env = DataManager.getSettings('env');
-                Log$4.debug('Initializing transports');
+                Log$5.debug('Initializing transports');
                 if (env === 'react-native') {
                     if (!this.reactNativeInit) {
                         yield this.transport.init();
                         this.reactNativeInit = true;
                     }
                     else {
-                        Log$4.debug('React Native Do Not Initializing transports');
+                        Log$5.debug('React Native Do Not Initializing transports');
                     }
                 }
                 else {
                     yield this.transport.init();
                 }
-                Log$4.debug('Configuring transports');
+                Log$5.debug('Configuring transports');
                 yield this.transport.configure(JSON.stringify(this.defaultMessages));
-                Log$4.debug('Configuring transports done');
+                Log$5.debug('Configuring transports done');
             }
             catch (error) {
-                Log$4.debug('Initializing transports error: ', error);
+                Log$5.debug('Initializing transports error: ', error);
             }
         });
     }
@@ -9978,6 +10011,7 @@ const IFRAME = {
     INIT: 'iframe-init',
     INIT_BRIDGE: 'iframe-init-bridge',
     CALL: 'iframe-call',
+    CANCEL: 'iframe-cancel',
 };
 const createIFrameMessage = (type, payload) => ({
     event: UI_EVENT,
@@ -10034,7 +10068,7 @@ const assertType = (res, resType) => {
         throw TypedError('Runtime', `assertType: Response of unexpected type: ${res.type}. Should be ${resType}`);
     }
 };
-const Log$3 = initLog('DeviceCommands');
+const Log$4 = initLog('DeviceCommands');
 class DeviceCommands {
     constructor(device, mainId) {
         this.device = device;
@@ -10043,8 +10077,13 @@ class DeviceCommands {
         this.disposed = false;
     }
     dispose() {
+        var _a, _b;
         this.disposed = true;
+        if (this._cancelableRequest) {
+            this._cancelableRequest();
+        }
         this._cancelableRequest = undefined;
+        (_b = (_a = this.transport).cancel) === null || _b === void 0 ? void 0 : _b.call(_a);
     }
     call(type, msg = {}) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -10053,11 +10092,11 @@ class DeviceCommands {
                 const promise = this.transport.call(this.mainId, type, msg);
                 this.callPromise = promise;
                 const res = yield promise;
-                Log$3.debug('[DeviceCommands] [call] Received', res.type);
+                Log$4.debug('[DeviceCommands] [call] Received', res.type);
                 return res;
             }
             catch (error) {
-                Log$3.debug('[DeviceCommands] [call] Received error', error);
+                Log$4.debug('[DeviceCommands] [call] Received error', error);
                 throw error;
             }
         });
@@ -10250,7 +10289,7 @@ const parseRunOptions = (options) => {
         options = {};
     return options;
 };
-const Log$2 = initLog('Device');
+const Log$3 = initLog('Device');
 class Device extends events.exports {
     constructor(descriptor) {
         super();
@@ -10261,7 +10300,6 @@ class Device extends events.exports {
         this.unavailableCapabilities = {};
         this.instance = 0;
         this.internalState = [];
-        this.loaded = false;
         this.needReloadDevice = false;
         this.keepSession = false;
         this.originalDescriptor = descriptor;
@@ -10330,11 +10368,11 @@ class Device extends events.exports {
                 if (env === 'react-native') {
                     const res = yield ((_a = this.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.originalDescriptor.id));
                     this.mainId = (_b = res.uuid) !== null && _b !== void 0 ? _b : '';
-                    Log$2.debug('Expected uuid:', this.mainId);
+                    Log$3.debug('Expected uuid:', this.mainId);
                 }
                 else {
                     this.mainId = yield ((_c = this.deviceConnector) === null || _c === void 0 ? void 0 : _c.acquire(this.originalDescriptor.path, this.originalDescriptor.session));
-                    Log$2.debug('Expected session id:', this.mainId);
+                    Log$3.debug('Expected session id:', this.mainId);
                 }
                 this.updateDescriptor({ [mainIdKey]: this.mainId });
                 if (this.commands) {
@@ -10375,7 +10413,7 @@ class Device extends events.exports {
                     this.updateDescriptor({ session: null });
                 }
                 catch (err) {
-                    Log$2.error('[Device] release error: ', err);
+                    Log$3.error('[Device] release error: ', err);
                 }
                 finally {
                     this.needReloadDevice = true;
@@ -10428,11 +10466,19 @@ class Device extends events.exports {
             this.originalDescriptor.session = upcomingSession;
         }
     }
+    updateFromCache(device) {
+        this.mainId = device.mainId;
+        this.commands = device.commands;
+        this.updateDescriptor(device.originalDescriptor);
+        if (device.features) {
+            this._updateFeatures(device.features);
+        }
+    }
     run(fn, options) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.runPromise) {
-                Log$2.error('[Device] run error:', 'Device is running');
-                throw TypedError('Device_CallInProgress');
+                this.interruption();
+                Log$3.debug('[Device] run error:', 'Device is running, but will cancel previous operate');
             }
             options = parseRunOptions(options);
             this.runPromise = create(this._runInner.bind(this, fn, options));
@@ -10459,24 +10505,26 @@ class Device extends events.exports {
             if (fn) {
                 yield fn();
             }
-            if (this.loaded && this.features) {
-                yield this.getFeatures();
-            }
             if ((!this.keepSession && typeof options.keepSession !== 'boolean') ||
                 options.keepSession === false) {
                 this.keepSession = false;
                 yield this.release();
-                Log$2.debug('release device, mainId: ', this.mainId);
+                Log$3.debug('release device, mainId: ', this.mainId);
             }
             if (this.runPromise) {
                 this.runPromise.resolve();
             }
             this.runPromise = null;
-            if (!this.loaded) {
-                this.loaded = true;
-            }
         });
     }
+    interruption() {
+        if (this.commands) {
+            this.commands.dispose();
+        }
+        if (this.runPromise) {
+            this.runPromise.reject(TypedError('Device_Interrupted'));
+        }
+    }
     getMode() {
         var _a, _b, _c;
         if ((_a = this.features) === null || _a === void 0 ? void 0 : _a.bootloader_mode)
@@ -10541,6 +10589,8 @@ class Device extends events.exports {
     }
 }
 
+const cacheDeviceMap = new Map();
+const Log$2 = initLog('DeviceList');
 class DeviceList extends events.exports {
     constructor() {
         super(...arguments);
@@ -10558,7 +10608,7 @@ class DeviceList extends events.exports {
             try {
                 for (var descriptorList_1 = __asyncValues(descriptorList), descriptorList_1_1; descriptorList_1_1 = yield descriptorList_1.next(), !descriptorList_1_1.done;) {
                     const descriptor = descriptorList_1_1.value;
-                    const device = Device.fromDescriptor(descriptor);
+                    let device = Device.fromDescriptor(descriptor);
                     device.deviceConnector = this.connector;
                     yield device.connect();
                     yield device.initialize();
@@ -10566,7 +10616,14 @@ class DeviceList extends events.exports {
                     deviceList.push(device);
                     if (device.features) {
                         const uuid = getDeviceUUID(device.features);
+                        if (cacheDeviceMap.has(uuid)) {
+                            const cache = cacheDeviceMap.get(uuid);
+                            cache === null || cache === void 0 ? void 0 : cache.updateFromCache(device);
+                            device = cache;
+                            Log$2.debug('use cache device: ', uuid);
+                        }
                         this.devices[uuid] = device;
+                        cacheDeviceMap.set(uuid, device);
                     }
                 }
             }
@@ -11562,7 +11619,13 @@ class CheckFirmwareRelease extends BaseMethod {
     run() {
         if (this.device.features) {
             const firmwareStatus = DataManager.getFirmwareStatus(this.device.features);
-            return Promise.resolve(firmwareStatus);
+            const changelog = DataManager.getFirmwareChangelog(this.device.features);
+            const release = DataManager.getFirmwareLeatestRelease(this.device.features);
+            return Promise.resolve({
+                status: firmwareStatus,
+                changelog,
+                release,
+            });
         }
         return Promise.resolve(null);
     }
@@ -11575,7 +11638,13 @@ class CheckBLEFirmwareRelease extends BaseMethod {
     run() {
         if (this.device.features) {
             const firmwareStatus = DataManager.getBLEFirmwareStatus(this.device.features);
-            return Promise.resolve(firmwareStatus);
+            const changelog = DataManager.getBleFirmwareChangelog(this.device.features);
+            const release = DataManager.getBleFirmwareLeatestRelease(this.device.features);
+            return Promise.resolve({
+                status: firmwareStatus,
+                changelog,
+                release,
+            });
         }
         return Promise.resolve(null);
     }
@@ -13155,6 +13224,7 @@ let _deviceList;
 let _connector;
 let _uiPromises = [];
 let _callPromise;
+const deviceCacheMap = new Map();
 const callAPI = (message) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     if (!message.id || !message.payload || message.type !== IFRAME.CALL) {
@@ -13315,10 +13385,32 @@ function initDeviceForBle(method) {
     if (!method.connectId) {
         return initDevice(method);
     }
-    const device = Device.fromDescriptor({ id: method.connectId });
+    let device;
+    if (deviceCacheMap.has(method.connectId)) {
+        device = deviceCacheMap.get(method.connectId);
+    }
+    else {
+        device = Device.fromDescriptor({ id: method.connectId });
+        deviceCacheMap.set(method.connectId, device);
+    }
     device.deviceConnector = _connector;
     return device;
 }
+const cancel = (connectId) => {
+    const env = DataManager.getSettings('env');
+    if (connectId) {
+        let device;
+        if (env === 'react-native') {
+            device = initDeviceForBle({ connectId });
+        }
+        else {
+            device = initDevice({ connectId });
+        }
+        device === null || device === void 0 ? void 0 : device.interruption();
+    }
+    cleanup();
+    closePopup();
+};
 const cleanup = () => {
     _uiPromises = [];
     Log.debug('Cleanup...');
@@ -13381,6 +13473,10 @@ class Core extends events.exports {
                     const response = yield callAPI(message);
                     return response;
                 }
+                case IFRAME.CANCEL: {
+                    cancel(message.payload.connectId);
+                    break;
+                }
             }
             return Promise.resolve(message);
         });

package/dist/types/api/checkBLEFirmwareRelease.d.ts

@@ -1,4 +1,14 @@
 import type { Response } from '../params';
-import type { IDeviceFirmwareStatus } from '../device';
-export declare function checkBLEFirmwareRelease(connectId?: string): Response<IDeviceFirmwareStatus>;
+import type { IDeviceBLEFirmwareStatus } from '../device';
+import { IBLEFirmwareReleaseInfo } from '../settings';
+declare type BleFirmwareRelease = {
+    status: IDeviceBLEFirmwareStatus;
+    changelog: {
+        'zh-CN': string;
+        'en-US': string;
+    }[];
+    release: IBLEFirmwareReleaseInfo;
+};
+export declare function checkBLEFirmwareRelease(connectId?: string): Response<BleFirmwareRelease>;
+export {};
 //# sourceMappingURL=checkBLEFirmwareRelease.d.ts.map

package/dist/types/api/checkBLEFirmwareRelease.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkBLEFirmwareRelease.d.ts","sourceRoot":"","sources":["../../../src/types/api/checkBLEFirmwareRelease.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAEvD,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAC7C,SAAS,CAAC,EAAE,MAAM,GACjB,QAAQ,CAAC,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"checkBLEFirmwareRelease.d.ts","sourceRoot":"","sources":["../../../src/types/api/checkBLEFirmwareRelease.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD,aAAK,kBAAkB,GAAG;IACxB,MAAM,EAAE,wBAAwB,CAAC;IACjC,SAAS,EAAE;QACT,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,OAAO,EAAE,uBAAuB,CAAC;CAClC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAAC"}

package/dist/types/api/checkFirmwareRelease.d.ts

@@ -1,4 +1,14 @@
 import type { Response } from '../params';
 import type { IDeviceFirmwareStatus } from '../device';
-export declare function checkFirmwareRelease(connectId?: string): Response<IDeviceFirmwareStatus>;
+import { IFirmwareReleaseInfo } from '../settings';
+declare type FirmwareRelease = {
+    status: IDeviceFirmwareStatus;
+    changelog: {
+        'en-US': string;
+        'zh-CN': string;
+    }[];
+    release: IFirmwareReleaseInfo;
+};
+export declare function checkFirmwareRelease(connectId?: string): Response<FirmwareRelease>;
+export {};
 //# sourceMappingURL=checkFirmwareRelease.d.ts.map

package/dist/types/api/checkFirmwareRelease.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkFirmwareRelease.d.ts","sourceRoot":"","sources":["../../../src/types/api/checkFirmwareRelease.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAEvD,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"checkFirmwareRelease.d.ts","sourceRoot":"","sources":["../../../src/types/api/checkFirmwareRelease.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,aAAK,eAAe,GAAG;IACrB,MAAM,EAAE,qBAAqB,CAAC;IAC9B,SAAS,EAAE;QACT,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,OAAO,EAAE,oBAAoB,CAAC;CAC/B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC"}

package/dist/types/api/index.d.ts

@@ -49,7 +49,7 @@ export declare type CoreApi = {
     dispose: () => void;
     call: (params: any) => Promise<any>;
     uiResponse: typeof uiResponse;
-    cancel: (params?: string) => void;
+    cancel: (connectId?: string) => void;
     searchDevices: typeof searchDevices;
     getFeatures: typeof getFeatures;
     checkFirmwareRelease: typeof checkFirmwareRelease;

package/dist/types/api/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/api/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/api/index.ts"],"names":[],"mappings":"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"}

package/dist/utils/release.d.ts

@@ -0,0 +1,4 @@
+import { IBLEFirmwareReleaseInfo, IDeviceFirmwareStatus, IFirmwareReleaseInfo } from '../types';
+export declare const getReleaseStatus: (releases: (IFirmwareReleaseInfo | IBLEFirmwareReleaseInfo)[], currentVersion: string) => IDeviceFirmwareStatus;
+export declare const getReleaseChangelog: (releases: (IFirmwareReleaseInfo | IBLEFirmwareReleaseInfo)[], currentVersion: string) => IFirmwareReleaseInfo['changelog'][];
+//# sourceMappingURL=release.d.ts.map

package/dist/utils/release.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../../src/utils/release.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhG,eAAO,MAAM,gBAAgB,aACjB,CAAC,oBAAoB,GAAG,uBAAuB,CAAC,EAAE,kBAC5C,MAAM,KACrB,qBASF,CAAC;AAEF,eAAO,MAAM,mBAAmB,aACpB,CAAC,oBAAoB,GAAG,uBAAuB,CAAC,EAAE,kBAC5C,MAAM,KACrB,oBAAoB,CAAC,WAAW,CAAC,EAGnC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,7 +25,7 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-transport": "^0.1.0",
+    "@onekeyfe/hd-transport": "^0.1.3",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "parse-uri": "^1.0.7",
@@ -35,5 +35,5 @@
     "@types/parse-uri": "^1.0.0",
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "d50dc424865150391b7249d1010ee75dc2074a7e"
+  "gitHead": "64411d3cac440d142574f8aa30c9d60204d47c2c"
 }

package/src/api/CheckBLEFirmwareRelease.ts

@@ -11,7 +11,13 @@ export default class CheckBLEFirmwareRelease extends BaseMethod {
   run() {
     if (this.device.features) {
       const firmwareStatus = DataManager.getBLEFirmwareStatus(this.device.features);
-      return Promise.resolve(firmwareStatus);
+      const changelog = DataManager.getBleFirmwareChangelog(this.device.features);
+      const release = DataManager.getBleFirmwareLeatestRelease(this.device.features);
+      return Promise.resolve({
+        status: firmwareStatus,
+        changelog,
+        release,
+      });
     }
     return Promise.resolve(null);
   }

package/src/api/CheckFirmwareRelease.ts

@@ -8,7 +8,13 @@ export default class CheckFirmwareRelease extends BaseMethod {
   run() {
     if (this.device.features) {
       const firmwareStatus = DataManager.getFirmwareStatus(this.device.features);
-      return Promise.resolve(firmwareStatus);
+      const changelog = DataManager.getFirmwareChangelog(this.device.features);
+      const release = DataManager.getFirmwareLeatestRelease(this.device.features);
+      return Promise.resolve({
+        status: firmwareStatus,
+        changelog,
+        release,
+      });
     }
     return Promise.resolve(null);
   }

package/src/constants/errors.ts

@@ -11,6 +11,7 @@ export const ERROR_CODES = {
   Device_UnexpectedMode: '',
   Device_CallInProgress: '',
   Device_InitializeFailed: '',
+  Device_Interrupted: 'The device is performing other operations',
   Not_Use_Onekey_Device: 'Please use onekey device',
 
   // runtime error

package/src/core/index.ts

@@ -41,6 +41,8 @@ let _uiPromises: UiPromise<UiPromiseResponse['type']>[] = []; // Waiting for ui
 let _callPromise: Deferred<any> | undefined;
 const callApiQueue = [];
 
+const deviceCacheMap = new Map<string, Device>();
+
 export const callAPI = async (message: CoreMessage) => {
   if (!message.id || !message.payload || message.type !== IFRAME.CALL) {
     return Promise.reject(
@@ -250,11 +252,32 @@ function initDeviceForBle(method: BaseMethod) {
     return initDevice(method);
   }
 
-  const device = Device.fromDescriptor({ id: method.connectId } as OneKeyDeviceInfo);
+  let device: Device;
+  if (deviceCacheMap.has(method.connectId)) {
+    device = deviceCacheMap.get(method.connectId) as Device;
+  } else {
+    device = Device.fromDescriptor({ id: method.connectId } as OneKeyDeviceInfo);
+    deviceCacheMap.set(method.connectId, device);
+  }
   device.deviceConnector = _connector;
   return device;
 }
 
+export const cancel = (connectId?: string) => {
+  const env = DataManager.getSettings('env');
+  if (connectId) {
+    let device;
+    if (env === 'react-native') {
+      device = initDeviceForBle({ connectId } as BaseMethod);
+    } else {
+      device = initDevice({ connectId } as BaseMethod);
+    }
+    device?.interruption();
+  }
+  cleanup();
+  closePopup();
+};
+
 const cleanup = () => {
   _uiPromises = [];
   Log.debug('Cleanup...');
@@ -346,6 +369,10 @@ export default class Core extends EventEmitter {
         const response = await callAPI(message);
         return response;
       }
+      case IFRAME.CANCEL: {
+        cancel(message.payload.connectId);
+        break;
+      }
       default:
         break;
     }