@onekeyfe/hd-core 1.2.2-alpha.6 → 1.2.2-alpha.8

package/dist/index.js

@@ -41981,7 +41981,7 @@ function getProtocolV2WalletSession(device, options) {
                 standardWalletSelected = true;
             }
         });
-        const selectStandardWallet = () => __awaiter(this, void 0, void 0, function* () {
+        const selectStandardWallet = (forceMainPin = false) => __awaiter(this, void 0, void 0, function* () {
             var _q;
             if (((_q = device.features) === null || _q === void 0 ? void 0 : _q.passphraseProtection) === true) {
                 yield selectMainPin();
@@ -41992,7 +41992,8 @@ function getProtocolV2WalletSession(device, options) {
                 standardWalletSelected = true;
             }
             else if (!standardWalletSelected) {
-                yield selectMainPin(true);
+                yield selectMainPin(forceMainPin);
+                standardWalletSelected = true;
             }
         });
         if (readCurrentAttachPinSession) {
@@ -42091,7 +42092,7 @@ function getProtocolV2WalletSession(device, options) {
             }
             if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
                 (_h = device.clearStandardInternalState) === null || _h === void 0 ? void 0 : _h.call(device);
-                yield selectStandardWallet();
+                yield selectStandardWallet(true);
                 response = yield getDeviceSession(device, sessionGetRequest());
             }
             else {
@@ -52094,11 +52095,15 @@ function isProtocolV2ResponseTimeout(error) {
         code === 'response-timeout' ||
         /(?:BLE|Lowlevel|Protocol V2) response timeout/i.test((_b = candidate.message) !== null && _b !== void 0 ? _b : ''));
 }
-function getProtocolV2FileChunkLimit() {
+function getProtocolV2FileChunkLimit(bleChunkSizeLimit) {
     const env = DataManager.getSettings('env');
-    return env && DataManager.isBleConnect(env)
-        ? hdTransport.PROTOCOL_V2_BLE_FILE_CHUNK_SIZE
-        : hdTransport.PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
+    if (env && DataManager.isBleConnect(env)) {
+        const configuredLimit = Number(bleChunkSizeLimit);
+        return Number.isFinite(configuredLimit) && configuredLimit > 0
+            ? Math.floor(configuredLimit)
+            : hdTransport.PROTOCOL_V2_BLE_FILE_CHUNK_SIZE;
+    }
+    return hdTransport.PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
 }
 function dataToUint8Array(data) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -52153,7 +52158,7 @@ function writeProtocolV2File(options) {
         if (totalSize < startOffset + dataLength) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `FilesystemFileWrite totalSize ${totalSize} is smaller than offset + data length ${startOffset + dataLength}`);
         }
-        const defaultChunkSizeLimit = getProtocolV2FileChunkLimit();
+        const defaultChunkSizeLimit = getProtocolV2FileChunkLimit(options.bleChunkSizeLimit);
         const configuredChunkSizeLimit = Number(options.chunkSizeLimit);
         const chunkSizeLimit = Number.isFinite(configuredChunkSizeLimit) && configuredChunkSizeLimit > 0
             ? Math.floor(configuredChunkSizeLimit)
@@ -52504,6 +52509,13 @@ const isProtocolV2InstallResponseTimeout = (error) => {
     return (code === 'response-timeout' ||
         /\bresponse timeout\b/i.test(getProtocolV2UnknownErrorText(error)));
 };
+const getProtocolV2ErrorCode = (error) => {
+    if (!error || typeof error !== 'object')
+        return undefined;
+    const { errorCode, code } = error;
+    const causeCode = errorCode !== null && errorCode !== void 0 ? errorCode : code;
+    return typeof causeCode === 'number' || typeof causeCode === 'string' ? causeCode : undefined;
+};
 const isProtocolV2TerminalInstallStatusError = (error) => {
     var _a;
     return hdShared.isBleStaleBondHardwareError(error) ||
@@ -53796,6 +53808,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             this.postTipMessage(exports.FirmwareUpdateTipMessage.StartTransferData);
             this.protocolV2LastTransferProgress = undefined;
             this.protocolV2LastTransferProgressAt = 0;
+            const transferStartedAt = Date.now();
             let processedSize = 0;
             for (const resource of resourcesToSync) {
                 const writePath = resource.devicePath;
@@ -53804,6 +53817,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     filePath: writePath,
                     processedSize,
                     totalSize,
+                    transferStartedAt,
                 });
                 yield this.verifyProtocolV2StagedFile(writePath, resource.source.size);
                 if (isProtocolV2BootResourcePackagePath(resource.devicePath)) {
@@ -53818,6 +53832,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     filePath,
                     processedSize,
                     totalSize,
+                    transferStartedAt,
                 });
                 yield this.verifyProtocolV2StagedFile(filePath, item.source.size);
                 stagedInstallTargets.push({
@@ -53826,7 +53841,13 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 });
             }
             if (totalSize > 0) {
-                this.postProgressMessage(100, 'transferData');
+                const elapsedMs = Math.max(Date.now() - transferStartedAt, 0);
+                this.postProgressMessage(100, 'transferData', {
+                    transferredBytes: totalSize,
+                    totalBytes: totalSize,
+                    rateBytesPerSecond: elapsedMs > 0 ? Math.round((totalSize / elapsedMs) * 1000) : undefined,
+                    elapsedMs,
+                });
             }
             if (stagedInstallTargets.length === 0) {
                 return;
@@ -53846,16 +53867,17 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             }
         });
     }
-    protocolV2SourceUpdateProcess({ source, filePath, processedSize, totalSize, }) {
+    protocolV2SourceUpdateProcess({ source, filePath, processedSize, totalSize, transferStartedAt = Date.now(), }) {
         return __awaiter(this, void 0, void 0, function* () {
             let lastError;
             for (let attempt = 1; attempt <= PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT; attempt += 1) {
+                this.throwIfAborted();
                 try {
-                    const transferStartedAt = Date.now();
                     yield writeFirmwareByteSource({
                         source,
                         chunkSize: this.getProtocolV2FirmwareChunkSize('write', filePath),
                         write: ({ data, sourceOffset, length, first }) => __awaiter(this, void 0, void 0, function* () {
+                            this.throwIfAborted();
                             const chunkEnd = sourceOffset + length;
                             const deviceProgress = getProtocolV2DeviceTransferProgress(processedSize + sourceOffset, processedSize + chunkEnd, totalSize);
                             const response = yield this.fileWriteChunk(filePath, source.size, sourceOffset, data, first, deviceProgress);
@@ -53878,7 +53900,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                                 this.postProgressMessage(progress, 'transferData', {
                                     transferredBytes,
                                     totalBytes: totalSize,
-                                    rateBytesPerSecond: elapsedMs > 0 ? Math.round((chunkEnd / elapsedMs) * 1000) : undefined,
+                                    rateBytesPerSecond: elapsedMs > 0 ? Math.round((transferredBytes / elapsedMs) * 1000) : undefined,
                                     elapsedMs,
                                 });
                             }
@@ -53888,16 +53910,19 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     return processedSize + source.size;
                 }
                 catch (error) {
+                    this.throwIfAborted();
                     if (hdShared.isBleStaleBondHardwareError(error)) {
                         throw error;
                     }
                     lastError = error;
                     if (attempt < PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT) {
                         yield this.recoverProtocolV2FileTransfer();
+                        this.throwIfAborted();
                     }
                 }
             }
-            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.EmmcFileWriteFirmwareError, `transfer data error: ${getProtocolV2UnknownErrorText(lastError)}`);
+            const causeCode = getProtocolV2ErrorCode(lastError);
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.EmmcFileWriteFirmwareError, `transfer data error: ${getProtocolV2UnknownErrorText(lastError)}`, causeCode === undefined ? undefined : { causeCode });
         });
     }
     getProtocolV2InstallItemStagingPath(item) {
@@ -54244,7 +54269,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             return;
                         }
                         if (!hasCurrentInstallEvidence) {
-                            this.device.setCancelableAction(() => this.device.getCommands().cancelDevice());
+                            this.device.setCancelableAction(() => Promise.resolve());
                         }
                         if (requireCurrentInstallStatus &&
                             !hasCurrentInstallEvidence &&
@@ -54590,7 +54615,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             this.protocolV2InstallTerminalSuccessObserved = false;
             const commands = this.device.getCommands();
             yield commands.typedCall('DeviceFirmwareUpdateStage', 'Success', { targets });
-            this.device.setCancelableAction(() => this.device.getCommands().cancelDevice());
+            this.device.setCancelableAction(() => Promise.resolve());
             const interaction = this.device.createProtocolV2UiPhaseMetadata('button', 'start');
             this.postMessage(createUiMessage(UI_REQUEST.REQUEST_BUTTON, Object.assign({ device: this.device.toMessageObject(), source: 'method-lifecycle', reason: 'firmware-update', completion: 'operation-completed', deviceOnly: true, operation: this.name }, (interaction ? { interaction } : {}))));
             try {
@@ -54824,7 +54849,9 @@ const ARCHIVE_ENTRY_SIZE = 296;
 const ARCHIVE_ENTRY_NAME_MAX_LENGTH = 255;
 const ARCHIVE_COMPRESS_LZ4_BLOCKED = 1;
 const ARCHIVE_ALIGNMENT = 4;
-const LZ4_BLOCK_SIZE_LOG2 = 12;
+const LZ4_PREFERRED_BLOCK_SIZE_LOG2 = 14;
+const LZ4_FALLBACK_BLOCK_SIZE_LOG2 = 13;
+const LZ4_COMPRESSED_BLOCK_SIZE_MAX = 1 << 14;
 function supportsPro2HostAssetPackage(firmwareVersion) {
     return Boolean(firmwareVersion &&
         semver__default["default"].valid(firmwareVersion) &&
@@ -54846,7 +54873,7 @@ const LZ4_MAX_OFFSET = 0xffff;
 const LZ4_LENGTH_MASK = 15;
 const LZ4_HASH_LOG = 16;
 const LZ4_HASH_MULTIPLIER = 2654435761;
-const LZ4_SKIP_TRIGGER = 6;
+const LZ4_MAX_SEARCH_DEPTH = 64;
 function writeExtendedLength(output, offset, length) {
     let remaining = length;
     let nextOffset = offset;
@@ -54899,7 +54926,7 @@ function emitLastLiterals(output, outputOffset, input, anchor, literalLength) {
     }
     return copyBytes(output, nextOffset, input, anchor, literalLength);
 }
-function compressRawLz4Block(input, hashTable) {
+function compressRawLz4Block(input, hashTable, matchChain) {
     const output = new Uint8Array(input.byteLength + Math.floor(input.byteLength / 255) + 16);
     const inputView = new DataView(input.buffer, input.byteOffset, input.byteLength);
     const matchFindLimit = input.byteLength - LZ4_MATCH_FIND_LIMIT;
@@ -54907,52 +54934,82 @@ function compressRawLz4Block(input, hashTable) {
     let anchor = 0;
     let inputOffset = 0;
     let outputOffset = 0;
-    let searchMatchCount = 1 << LZ4_SKIP_TRIGGER;
     hashTable.fill(0);
     while (inputOffset < matchFindLimit) {
         const sequence = inputView.getUint32(inputOffset, true);
         const hash = Math.imul(sequence, LZ4_HASH_MULTIPLIER) >>> (32 - LZ4_HASH_LOG);
-        const candidate = hashTable[hash] - 1;
+        let candidate = hashTable[hash] - 1;
+        matchChain[inputOffset] = candidate;
         hashTable[hash] = inputOffset + 1;
-        const hasMatch = !(candidate < 0 ||
-            inputOffset - candidate > LZ4_MAX_OFFSET ||
-            inputView.getUint32(candidate, true) !== sequence);
-        if (!hasMatch) {
-            inputOffset += searchMatchCount >> LZ4_SKIP_TRIGGER;
-            searchMatchCount += 1;
+        let bestCandidate = -1;
+        let bestMatchEnd = inputOffset;
+        let searchDepth = 0;
+        while (candidate >= 0 &&
+            inputOffset - candidate <= LZ4_MAX_OFFSET &&
+            searchDepth < LZ4_MAX_SEARCH_DEPTH) {
+            if (inputView.getUint32(candidate, true) === sequence) {
+                let matchEnd = inputOffset + LZ4_MIN_MATCH;
+                let reference = candidate + LZ4_MIN_MATCH;
+                while (matchEnd < matchExtendLimit && input[matchEnd] === input[reference]) {
+                    matchEnd += 1;
+                    reference += 1;
+                }
+                if (matchEnd > bestMatchEnd) {
+                    bestCandidate = candidate;
+                    bestMatchEnd = matchEnd;
+                }
+            }
+            candidate = matchChain[candidate];
+            searchDepth += 1;
+        }
+        if (bestCandidate < 0) {
+            inputOffset += 1;
         }
         else {
-            searchMatchCount = 1 << LZ4_SKIP_TRIGGER;
-            let matchEnd = inputOffset + LZ4_MIN_MATCH;
-            let reference = candidate + LZ4_MIN_MATCH;
-            while (matchEnd < matchExtendLimit && input[matchEnd] === input[reference]) {
-                matchEnd += 1;
-                reference += 1;
-            }
-            outputOffset = emitSequence(output, outputOffset, input, anchor, inputOffset - anchor, inputOffset - candidate, matchEnd - inputOffset - LZ4_MIN_MATCH);
-            inputOffset = matchEnd;
+            const matchStart = inputOffset;
+            outputOffset = emitSequence(output, outputOffset, input, anchor, inputOffset - anchor, inputOffset - bestCandidate, bestMatchEnd - inputOffset - LZ4_MIN_MATCH);
+            inputOffset = bestMatchEnd;
             anchor = inputOffset;
+            for (let skippedOffset = matchStart + 1; skippedOffset < inputOffset && skippedOffset < matchFindLimit; skippedOffset += 1) {
+                const skippedSequence = inputView.getUint32(skippedOffset, true);
+                const skippedHash = Math.imul(skippedSequence, LZ4_HASH_MULTIPLIER) >>> (32 - LZ4_HASH_LOG);
+                matchChain[skippedOffset] = hashTable[skippedHash] - 1;
+                hashTable[skippedHash] = skippedOffset + 1;
+            }
         }
     }
     outputOffset = emitLastLiterals(output, outputOffset, input, anchor, input.byteLength - anchor);
     return output.slice(0, outputOffset);
 }
-function encodeLz4Blocked(data) {
-    const blockSize = 1 << LZ4_BLOCK_SIZE_LOG2;
+function encodeLz4BlockedWithBlockSize(data, blockSizeLog2) {
+    const blockSize = 1 << blockSizeLog2;
     const blockCount = Math.ceil(data.byteLength / blockSize);
     const hashTable = new Uint32Array(1 << LZ4_HASH_LOG);
+    const matchChain = new Int32Array(blockSize);
     const blocks = [];
     const header = new Uint8Array(8 + blockCount * 4);
     const headerView = new DataView(header.buffer);
     headerView.setUint16(0, blockCount, true);
-    headerView.setUint16(2, LZ4_BLOCK_SIZE_LOG2, true);
+    headerView.setUint16(2, blockSizeLog2, true);
     for (let index = 0; index < blockCount; index += 1) {
-        const block = compressRawLz4Block(data.subarray(index * blockSize, Math.min((index + 1) * blockSize, data.byteLength)), hashTable);
+        const block = compressRawLz4Block(data.subarray(index * blockSize, Math.min((index + 1) * blockSize, data.byteLength)), hashTable, matchChain);
+        if (block.byteLength > LZ4_COMPRESSED_BLOCK_SIZE_MAX)
+            return undefined;
         headerView.setUint32(8 + index * 4, block.byteLength, true);
         blocks.push(block);
     }
     return concatBytes([header, ...blocks]);
 }
+function encodeLz4Blocked(data) {
+    const preferred = encodeLz4BlockedWithBlockSize(data, LZ4_PREFERRED_BLOCK_SIZE_LOG2);
+    if (preferred)
+        return preferred;
+    const fallback = encodeLz4BlockedWithBlockSize(data, LZ4_FALLBACK_BLOCK_SIZE_LOG2);
+    if (!fallback) {
+        throw new Error('Pro2 host asset package LZ4 block exceeds the firmware buffer limit.');
+    }
+    return fallback;
+}
 const CRC32_TABLE = (() => {
     const table = new Uint32Array(256);
     for (let index = 0; index < table.length; index += 1) {
@@ -55039,6 +55096,7 @@ const SAFE_FILE_NAME = /^[A-Za-z0-9_-]+(?:\.bin)?$/;
 const DEVICE_SETTINGS_SET_MESSAGE_TYPE = 60412;
 const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE$2 = 60805;
 const FILESYSTEM_DIR_MAKE_MESSAGE_TYPE = 60809;
+const WALLPAPER_PACKAGE_BLE_CHUNK_SIZE = 1960;
 const Log$4 = getLogger(exports.LoggerNames.Method);
 function normalizeFileName(fileName, data) {
     if (fileName !== undefined && (!fileName || !SAFE_FILE_NAME.test(fileName))) {
@@ -55110,7 +55168,7 @@ class DeviceUploadWallpaper extends BaseMethod {
             this.directoryReady = true;
         });
     }
-    upload(path, data) {
+    upload(path, data, bleChunkSizeLimit) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.uploaded)
                 return;
@@ -55120,6 +55178,7 @@ class DeviceUploadWallpaper extends BaseMethod {
                 data,
                 totalSize: data.byteLength,
                 chunkSize: this.params.chunkSize,
+                bleChunkSizeLimit,
                 maxChunkRetries: 3,
                 overwrite: true,
                 append: false,
@@ -55147,7 +55206,7 @@ class DeviceUploadWallpaper extends BaseMethod {
                 : encoded.data;
             if (useHostAssetPackage)
                 this.path = WALLPAPER_PACKAGE_PATH;
-            yield this.upload(this.path, data);
+            yield this.upload(this.path, data, useHostAssetPackage ? WALLPAPER_PACKAGE_BLE_CHUNK_SIZE : undefined);
             const response = yield this.device.commands.typedCall('DeviceSettingsSet', 'Success', {
                 settings: { wallpaper_path: this.path },
             });
@@ -66366,18 +66425,19 @@ function connectDeviceForBle(method, device, abortSignal, retryCount = 0) {
                 !device.commands ||
                 device.commands.disposed;
             if (shouldAcquire) {
+                const connectProtocol = resolveBleConnectProtocol(method);
                 const useAcquireGuards = DataManager.getSettings('env') === 'desktop-web-ble';
                 if (useAcquireGuards && (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted)) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled);
                 }
                 if (!useAcquireGuards) {
-                    yield device.acquire(method.payload.connectProtocol, {
+                    yield device.acquire(connectProtocol, {
                         forceProtocolDetection: method.payload.forceProtocolDetection,
                     });
                 }
                 else {
                     try {
-                        yield raceBleAcquire(device.acquire(method.payload.connectProtocol, {
+                        yield raceBleAcquire(device.acquire(connectProtocol, {
                             forceProtocolDetection: method.payload.forceProtocolDetection,
                         }), abortSignal);
                     }
@@ -66429,6 +66489,13 @@ function connectDeviceForBle(method, device, abortSignal, retryCount = 0) {
         }
     });
 }
+function resolveBleConnectProtocol(method) {
+    if (method.payload.connectProtocol === 'V1' || method.payload.connectProtocol === 'V2') {
+        return method.payload.connectProtocol;
+    }
+    const supportedProtocols = method.getSupportedProtocols();
+    return supportedProtocols.length === 1 && supportedProtocols[0] === 'V2' ? 'V2' : undefined;
+}
 const ensureConnected = (_context, method, connectId, pollingId, abortSignal) => __awaiter(void 0, void 0, void 0, function* () {
     let tryCount = 0;
     const MAX_RETRY_COUNT = method.payload && typeof method.payload.retryCount === 'number' ? method.payload.retryCount : 5;
@@ -66584,7 +66651,7 @@ const cancel = (context, connectId) => {
             requestQueue.cancelCallbackTasks(connectId);
             const requestIds = requestQueue.getRequestTasksId();
             Log.debug(`Cancel Api connect requestQueues: length:${requestIds.length} requestIds:${requestIds.join(',')}`);
-            requestQueue.abortRequestsByConnectId(connectId);
+            requestQueue.abortAllRequests();
             const canceledDevices = [];
             const interruptDevice = (device, deviceConnectId) => {
                 if (!device || canceledDevices.includes(device)) {

package/dist/protocols/protocol-v2/walletSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"walletSession.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/walletSession.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAuBlD,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,0DAGjE;AAED,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,qCAGjE;AAED,wBAAsB,qCAAqC,CAAC,MAAM,EAAE,MAAM,oBAgBzE;AA8JD,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IACR,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,2BAA2B,CAAC,EAAE,OAAO,CAAC;IAEtC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;;;;;;GAuXF;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,EACd,uBAAuB,EAAE,MAAM,EAC/B,aAAa,CAAC,EAAE,OAAO;;;;;;GAOxB"}
+{"version":3,"file":"walletSession.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/walletSession.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAuBlD,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,0DAGjE;AAED,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,qCAGjE;AAED,wBAAsB,qCAAqC,CAAC,MAAM,EAAE,MAAM,oBAgBzE;AA8JD,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IACR,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,2BAA2B,CAAC,EAAE,OAAO,CAAC;IAEtC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;;;;;;GAyXF;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,EACd,uBAAuB,EAAE,MAAM,EAC/B,aAAa,CAAC,EAAE,OAAO;;;;;;GAOxB"}

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

@@ -1 +1 @@
-{"version":3,"file":"pro2HostAssetPackage.d.ts","sourceRoot":"","sources":["../../src/utils/pro2HostAssetPackage.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,mCAAmC,UAAU,CAAC;AAwB3D,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,CAAC;CAClB,CAAC;AAQF,wBAAgB,4BAA4B,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAMzF;AA2QD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,yBAAyB,EAAE,GAAG,UAAU,CA4B1F"}
+{"version":3,"file":"pro2HostAssetPackage.d.ts","sourceRoot":"","sources":["../../src/utils/pro2HostAssetPackage.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,mCAAmC,UAAU,CAAC;AA0B3D,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,CAAC;CAClB,CAAC;AAQF,wBAAgB,4BAA4B,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAMzF;AAuTD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,yBAAyB,EAAE,GAAG,UAAU,CA4B1F"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.2-alpha.6",
+  "version": "1.2.2-alpha.8",
   "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.6",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.6",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.8",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.8",
     "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": "538d5371d9369747beabf68c5dc7a617531bace2"
+  "gitHead": "7a5d129ea1db0b3eb230e309ab29ed3e9e7f141e"
 }

package/src/api/FirmwareUpdateV4.ts

@@ -383,6 +383,13 @@ const isProtocolV2InstallResponseTimeout = (error: unknown) => {
   );
 };
 
+const getProtocolV2ErrorCode = (error: unknown): number | string | undefined => {
+  if (!error || typeof error !== 'object') return undefined;
+  const { errorCode, code } = error as { errorCode?: unknown; code?: unknown };
+  const causeCode = errorCode ?? code;
+  return typeof causeCode === 'number' || typeof causeCode === 'string' ? causeCode : undefined;
+};
+
 const isProtocolV2TerminalInstallStatusError = (error: unknown) =>
   isBleStaleBondHardwareError(error) ||
   (error instanceof HardwareError &&
@@ -2114,6 +2121,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     this.postTipMessage(FirmwareUpdateTipMessage.StartTransferData);
     this.protocolV2LastTransferProgress = undefined;
     this.protocolV2LastTransferProgressAt = 0;
+    const transferStartedAt = Date.now();
     let processedSize = 0;
     for (const resource of resourcesToSync) {
       // The bootloader keeps its live resource package mounted. FatFs rejects
@@ -2124,6 +2132,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         filePath: writePath,
         processedSize,
         totalSize,
+        transferStartedAt,
       });
       await this.verifyProtocolV2StagedFile(writePath, resource.source.size);
       if (isProtocolV2BootResourcePackagePath(resource.devicePath)) {
@@ -2139,6 +2148,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         filePath,
         processedSize,
         totalSize,
+        transferStartedAt,
       });
       await this.verifyProtocolV2StagedFile(filePath, item.source.size);
       stagedInstallTargets.push({
@@ -2148,7 +2158,13 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     }
 
     if (totalSize > 0) {
-      this.postProgressMessage(100, 'transferData');
+      const elapsedMs = Math.max(Date.now() - transferStartedAt, 0);
+      this.postProgressMessage(100, 'transferData', {
+        transferredBytes: totalSize,
+        totalBytes: totalSize,
+        rateBytesPerSecond: elapsedMs > 0 ? Math.round((totalSize / elapsedMs) * 1000) : undefined,
+        elapsedMs,
+      });
     }
     if (stagedInstallTargets.length === 0) {
       return;
@@ -2173,20 +2189,23 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     filePath,
     processedSize,
     totalSize,
+    transferStartedAt = Date.now(),
   }: {
     source: FirmwareByteSource;
     filePath: string;
     processedSize: number;
     totalSize: number;
+    transferStartedAt?: number;
   }) {
     let lastError: unknown;
     for (let attempt = 1; attempt <= PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT; attempt += 1) {
+      this.throwIfAborted();
       try {
-        const transferStartedAt = Date.now();
         await writeFirmwareByteSource({
           source,
           chunkSize: this.getProtocolV2FirmwareChunkSize('write', filePath),
           write: async ({ data, sourceOffset, length, first }) => {
+            this.throwIfAborted();
             const chunkEnd = sourceOffset + length;
             const deviceProgress = getProtocolV2DeviceTransferProgress(
               processedSize + sourceOffset,
@@ -2225,7 +2244,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
                 transferredBytes,
                 totalBytes: totalSize,
                 rateBytesPerSecond:
-                  elapsedMs > 0 ? Math.round((chunkEnd / elapsedMs) * 1000) : undefined,
+                  elapsedMs > 0 ? Math.round((transferredBytes / elapsedMs) * 1000) : undefined,
                 elapsedMs,
               });
             }
@@ -2234,18 +2253,22 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         });
         return processedSize + source.size;
       } catch (error) {
+        this.throwIfAborted();
         if (isBleStaleBondHardwareError(error)) {
           throw error;
         }
         lastError = error;
         if (attempt < PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT) {
           await this.recoverProtocolV2FileTransfer();
+          this.throwIfAborted();
         }
       }
     }
+    const causeCode = getProtocolV2ErrorCode(lastError);
     throw ERRORS.TypedError(
       HardwareErrorCode.EmmcFileWriteFirmwareError,
-      `transfer data error: ${getProtocolV2UnknownErrorText(lastError)}`
+      `transfer data error: ${getProtocolV2UnknownErrorText(lastError)}`,
+      causeCode === undefined ? undefined : { causeCode }
     );
   }
 
@@ -2705,7 +2728,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           if (!hasCurrentInstallEvidence) {
             // A successful status poll clears DeviceCommands' cancel action. Keep cancellation
             // available while UpdateRequest is still waiting for confirmation on the device.
-            this.device.setCancelableAction(() => this.device.getCommands().cancelDevice());
+            // Bootloader does not register the protocol Cancel message. Keep the
+            // operation locally cancellable; interruptionFromUser() disposes the link.
+            this.device.setCancelableAction(() => Promise.resolve());
           }
 
           if (
@@ -3174,7 +3199,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     this.protocolV2InstallTerminalSuccessObserved = false;
     const commands = this.device.getCommands();
     await commands.typedCall('DeviceFirmwareUpdateStage', 'Success', { targets });
-    this.device.setCancelableAction(() => this.device.getCommands().cancelDevice());
+    // Bootloader does not register the protocol Cancel message. Keep the
+    // operation locally cancellable; interruptionFromUser() disposes the link.
+    this.device.setCancelableAction(() => Promise.resolve());
     const interaction = this.device.createProtocolV2UiPhaseMetadata('button', 'start');
     this.postMessage(
       createUiMessage(UI_REQUEST.REQUEST_BUTTON, {

package/src/api/helpers/protocolV2FileWrite.ts

@@ -36,6 +36,8 @@ export type ProtocolV2FileWriteOptions = {
   chunkSize?: number;
   chunkLen?: number;
   chunkSizeLimit?: number;
+  /** BLE-only limit for a caller whose fixed short path has a verified larger frame budget. */
+  bleChunkSizeLimit?: number;
   overwrite?: boolean;
   append?: boolean;
   uiPercentage?: number;
@@ -114,11 +116,15 @@ export function isProtocolV2ResponseTimeout(error: unknown) {
   );
 }
 
-function getProtocolV2FileChunkLimit() {
+function getProtocolV2FileChunkLimit(bleChunkSizeLimit?: number) {
   const env = DataManager.getSettings('env');
-  return env && DataManager.isBleConnect(env)
-    ? PROTOCOL_V2_BLE_FILE_CHUNK_SIZE
-    : PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
+  if (env && DataManager.isBleConnect(env)) {
+    const configuredLimit = Number(bleChunkSizeLimit);
+    return Number.isFinite(configuredLimit) && configuredLimit > 0
+      ? Math.floor(configuredLimit)
+      : PROTOCOL_V2_BLE_FILE_CHUNK_SIZE;
+  }
+  return PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
 }
 
 async function dataToUint8Array(data: ProtocolV2FileWriteData): Promise<Uint8Array> {
@@ -178,7 +184,7 @@ export async function writeProtocolV2File(options: ProtocolV2FileWriteOptions) {
     );
   }
 
-  const defaultChunkSizeLimit = getProtocolV2FileChunkLimit();
+  const defaultChunkSizeLimit = getProtocolV2FileChunkLimit(options.bleChunkSizeLimit);
   const configuredChunkSizeLimit = Number(options.chunkSizeLimit);
   const chunkSizeLimit =
     Number.isFinite(configuredChunkSizeLimit) && configuredChunkSizeLimit > 0

package/src/api/protocol-v2/DeviceUploadWallpaper.ts

@@ -49,6 +49,7 @@ const SAFE_FILE_NAME = /^[A-Za-z0-9_-]+(?:\.bin)?$/;
 const DEVICE_SETTINGS_SET_MESSAGE_TYPE = 60412;
 const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
 const FILESYSTEM_DIR_MAKE_MESSAGE_TYPE = 60809;
+const WALLPAPER_PACKAGE_BLE_CHUNK_SIZE = 1960;
 const Log = getLogger(LoggerNames.Method);
 
 function normalizeFileName(fileName: string | undefined, data: Uint8Array): string {
@@ -130,7 +131,7 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
     this.directoryReady = true;
   }
 
-  private async upload(path: string, data: Uint8Array) {
+  private async upload(path: string, data: Uint8Array, bleChunkSizeLimit?: number) {
     if (this.uploaded) return;
 
     await writeProtocolV2File({
@@ -139,6 +140,7 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
       data,
       totalSize: data.byteLength,
       chunkSize: this.params.chunkSize,
+      bleChunkSizeLimit,
       maxChunkRetries: 3,
       overwrite: true,
       append: false,
@@ -164,7 +166,11 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
       ? buildPro2HostAssetPackage([{ name: WALLPAPER_PACKAGE_ENTRY, data: encoded.data }])
       : encoded.data;
     if (useHostAssetPackage) this.path = WALLPAPER_PACKAGE_PATH;
-    await this.upload(this.path, data);
+    await this.upload(
+      this.path,
+      data,
+      useHostAssetPackage ? WALLPAPER_PACKAGE_BLE_CHUNK_SIZE : undefined
+    );
     const response = await this.device.commands.typedCall('DeviceSettingsSet', 'Success', {
       settings: { wallpaper_path: this.path },
     });