@onekeyfe/hd-core 1.2.0-alpha.1 → 1.2.0-alpha.11

package/src/api/ClearSessionCache.ts

@@ -0,0 +1,28 @@
+import { BaseMethod } from './BaseMethod';
+import { deviceWalletSessionStore } from '../device/DeviceWalletSessionStore';
+
+import type { ClearSessionCacheParams } from '../types/api/sessionCache';
+
+export default class ClearSessionCache extends BaseMethod<ClearSessionCacheParams> {
+  init() {
+    this.useDevice = false;
+    this.useDevicePassphraseState = false;
+    this.skipForceUpdateCheck = true;
+    this.params = {
+      deviceId: this.payload.deviceId,
+      passphraseState: this.payload.passphraseState,
+    };
+  }
+
+  run() {
+    const { deviceId, passphraseState } = this.params;
+    if (!deviceId) {
+      deviceWalletSessionStore.clear();
+    } else if (!passphraseState) {
+      deviceWalletSessionStore.deleteDevice(deviceId);
+    } else {
+      deviceWalletSessionStore.delete(deviceId, passphraseState);
+    }
+    return Promise.resolve({ cleared: true as const });
+  }
+}

package/src/api/FileRead.ts

@@ -1,5 +1,5 @@
 import {
-  PROTOCOL_V2_BLE_FILE_CHUNK_SIZE,
+  PROTOCOL_V2_BLE_FILE_READ_CHUNK_SIZE,
   PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE,
 } from '@onekeyfe/hd-transport';
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
@@ -27,7 +27,7 @@ const MIN_FILE_READ_CHUNK_SIZE = 64;
 function getProtocolV2FileReadChunkLimit() {
   const env = DataManager.getSettings('env');
   if (env && DataManager.isBleConnect(env)) {
-    return PROTOCOL_V2_BLE_FILE_CHUNK_SIZE;
+    return PROTOCOL_V2_BLE_FILE_READ_CHUNK_SIZE;
   }
   return PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
 }
@@ -69,6 +69,19 @@ function toUint8Array(value: unknown): Uint8Array {
   return new Uint8Array(0);
 }
 
+function getDeviceTransferProgress(bytesBeforeChunk: number, bytesAfterChunk: number, totalBytes: number) {
+  if (!Number.isFinite(totalBytes) || totalBytes <= 0) {
+    return 100;
+  }
+  if (bytesBeforeChunk <= 0 && bytesAfterChunk < totalBytes) {
+    return 0;
+  }
+  if (bytesAfterChunk >= totalBytes) {
+    return 100;
+  }
+  return Math.min(Math.max(Math.ceil((bytesAfterChunk / totalBytes) * 100), 1), 99);
+}
+
 export default class FileRead extends BaseMethod<FileReadParams> {
   init() {
     // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
@@ -124,7 +137,7 @@ export default class FileRead extends BaseMethod<FileReadParams> {
       const offset = startOffset + read;
       const progress =
         this.params.uiPercentage ??
-        Math.min(Math.ceil(((read + readLen) / Math.max(totalLength, 1)) * 100), 99);
+        getDeviceTransferProgress(read, read + readLen, totalLength);
       const res = await this.device.commands.typedCall('FilesystemFileRead', 'FilesystemFile', {
         file: {
           path: this.params.path,

package/src/api/FileWrite.ts

@@ -84,6 +84,23 @@ function getConfirmedProgress(
   return 100;
 }
 
+function getDeviceTransferProgress(
+  bytesBeforeChunk: number,
+  bytesAfterChunk: number,
+  totalBytes: number
+) {
+  if (!Number.isFinite(totalBytes) || totalBytes <= 0) {
+    return 100;
+  }
+  if (bytesBeforeChunk <= 0 && bytesAfterChunk < totalBytes) {
+    return 0;
+  }
+  if (bytesAfterChunk >= totalBytes) {
+    return 100;
+  }
+  return Math.min(Math.max(Math.ceil((bytesAfterChunk / totalBytes) * 100), 1), 99);
+}
+
 export default class FileWrite extends BaseMethod<FileWriteParams> {
   init() {
     // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
@@ -108,6 +125,7 @@ export default class FileWrite extends BaseMethod<FileWriteParams> {
   }
 
   async run() {
+    this.throwIfAborted();
     const data = await dataToUint8Array(this.params.data);
     const dataLength = data.byteLength;
     const offsetValue = Number(this.params.offset ?? 0);
@@ -141,13 +159,14 @@ export default class FileWrite extends BaseMethod<FileWriteParams> {
       this.params.timeoutMs === undefined ? undefined : Number(this.params.timeoutMs);
 
     while (written < dataLength) {
+      this.throwIfAborted();
       const chunkEnd = Math.min(written + chunkSize, dataLength);
       const chunk = data.slice(written, chunkEnd);
       const offset = startOffset + written;
       const isFirstChunk = chunkIndex === 0;
       const progress =
         this.params.uiPercentage ??
-        Math.min(Math.ceil(((written + chunk.byteLength) / dataLength) * 100), 99);
+        getDeviceTransferProgress(offset, offset + chunk.byteLength, totalSize);
 
       const res = await this.device.commands.typedCall(
         'FilesystemFileWrite',
@@ -168,6 +187,8 @@ export default class FileWrite extends BaseMethod<FileWriteParams> {
         }
       );
 
+      this.throwIfAborted();
+
       lastMessage = res.message;
       const processedByte = Number(res.message?.processed_byte);
       if (Number.isFinite(processedByte) && processedByte > offset) {