@onekeyfe/hd-core 1.2.2-alpha.5 → 1.2.2-alpha.7

package/dist/index.js

@@ -39947,36 +39947,57 @@ var nested = {
 			"placeholder"
 		]
 	},
-	ViewData: {
+	ViewContentPreview: {
 		fields: {
+			content_key: {
+				rule: "required",
+				type: "uint32",
+				id: 1
+			},
 			preview: {
 				rule: "required",
 				type: "bytes",
-				id: 1
+				id: 2
 			},
 			total_bytes: {
-				rule: "required",
 				type: "uint32",
-				id: 2
+				id: 3
 			}
 		}
 	},
-	ViewDataPage: {
+	ViewContentEntry: {
 		fields: {
-			chunk: {
+			entry_key: {
 				rule: "required",
-				type: "bytes",
+				type: "uint32",
 				id: 1
 			},
+			value: {
+				rule: "required",
+				type: "bytes",
+				id: 2
+			}
+		}
+	},
+	ViewContentPage: {
+		fields: {
 			page_index: {
 				rule: "required",
 				type: "uint32",
-				id: 2
+				id: 1
 			},
 			page_count: {
 				rule: "required",
 				type: "uint32",
+				id: 2
+			},
+			chunk: {
+				type: "bytes",
 				id: 3
+			},
+			entry: {
+				type: "ViewContentEntry",
+				id: 4
 			}
 		}
 	},
@@ -40035,8 +40056,8 @@ var nested = {
 				type: "string",
 				id: 9
 			},
-			data: {
-				type: "ViewData",
+			content: {
+				type: "ViewContentPreview",
 				id: 10
 			},
 			custom_field: {
@@ -40060,6 +40081,10 @@ var nested = {
 			text_arg: {
 				type: "string",
 				id: 3
+			},
+			cancellable: {
+				type: "bool",
+				id: 4
 			}
 		}
 	},
@@ -40098,6 +40123,10 @@ var nested = {
 			chain_id: {
 				type: "uint32",
 				id: 8
+			},
+			content: {
+				type: "ViewContentPreview",
+				id: 9
 			}
 		}
 	},
@@ -41818,7 +41847,14 @@ const selectDeviceSession = (device, expectedPassphraseState, deriveCardano, onS
             interaction: attachPinInteraction,
         });
         onStatusRefreshed === null || onStatusRefreshed === void 0 ? void 0 : onStatusRefreshed();
-        return getDeviceSession(device, buildDeviceSessionGetRequest());
+        if (deriveCardano === true) {
+            yield askDevicePassphrase(device, { passphrase: '', on_device: false }, true, onStatusRefreshed);
+            if (device.features) {
+                device.features.unlockedAttachPin = true;
+            }
+        }
+        const attachPinSession = yield getDeviceSession(device, buildDeviceSessionGetRequest());
+        return Object.assign(attachPinSession, { viaAttachPin: true });
     }
     if (hasHostPassphrase) {
         yield askDevicePassphrase(device, {
@@ -41833,10 +41869,16 @@ const selectDeviceSession = (device, expectedPassphraseState, deriveCardano, onS
     return getDeviceSession(device, buildDeviceSessionGetRequest());
 });
 function getProtocolV2WalletSession(device, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     return __awaiter(this, void 0, void 0, function* () {
         const forceWalletSelection = (options === null || options === void 0 ? void 0 : options.forceWalletSelection) === true || (options === null || options === void 0 ? void 0 : options.initSession) === true;
         const readCurrentAttachPinSession = (options === null || options === void 0 ? void 0 : options.readCurrentAttachPinSession) === true;
+        const sessionIsAttachPinWallet = (session) => {
+            var _a;
+            return readCurrentAttachPinSession ||
+                (session === null || session === void 0 ? void 0 : session.viaAttachPin) === true ||
+                ((_a = device.features) === null || _a === void 0 ? void 0 : _a.unlockedAttachPin) === true;
+        };
         if (forceWalletSelection) {
             if (options.onlyMainPin) {
                 (_a = device.clearStandardInternalState) === null || _a === void 0 ? void 0 : _a.call(device);
@@ -41881,8 +41923,20 @@ function getProtocolV2WalletSession(device, options) {
                 device.clearInternalState();
             }
         };
+        const sessionGetRequest = ({ sessionId, expectedPassphraseState: passphraseState, } = {}) => buildDeviceSessionGetRequest({
+            sessionId,
+            expectedPassphraseState: passphraseState,
+        });
+        const askEmptyPassphraseAndGet = ({ deriveCardano, keepAttachPin, } = {}) => __awaiter(this, void 0, void 0, function* () {
+            yield askDevicePassphrase(device, { passphrase: '', on_device: false }, deriveCardano, markWalletStatusRefreshed);
+            if (keepAttachPin && device.features) {
+                device.features.unlockedAttachPin = true;
+            }
+            const session = yield getDeviceSession(device, buildDeviceSessionGetRequest());
+            return keepAttachPin ? Object.assign(session, { viaAttachPin: true }) : session;
+        });
         const rejectMismatchedAttachPinWallet = () => __awaiter(this, void 0, void 0, function* () {
-            var _l;
+            var _m;
             const features = yield refreshProtocolV2DeviceStatus(device);
             markWalletStatusRefreshed();
             if (features.unlockedAttachPin !== true) {
@@ -41891,10 +41945,10 @@ function getProtocolV2WalletSession(device, options) {
             try {
                 yield device.lockDevice();
             }
-            catch (_m) {
+            catch (_o) {
             }
             if (options === null || options === void 0 ? void 0 : options.rejectAttachPinForMainWallet) {
-                (_l = device.clearStandardInternalState) === null || _l === void 0 ? void 0 : _l.call(device);
+                (_m = device.clearStandardInternalState) === null || _m === void 0 ? void 0 : _m.call(device);
                 device.clearInternalState();
             }
             else {
@@ -41902,6 +41956,16 @@ function getProtocolV2WalletSession(device, options) {
             }
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckUnlockTypeError);
         });
+        const lockAttachPinBeforePassphraseSelection = () => __awaiter(this, void 0, void 0, function* () {
+            var _p;
+            if (readCurrentAttachPinSession || (options === null || options === void 0 ? void 0 : options.onlyMainPin)) {
+                return;
+            }
+            if (((_p = device.features) === null || _p === void 0 ? void 0 : _p.unlockedAttachPin) !== true) {
+                return;
+            }
+            yield rejectMismatchedAttachPinWallet();
+        });
         if ((options === null || options === void 0 ? void 0 : options.onlyMainPin) && options.rejectAttachPinForMainWallet) {
             yield rejectMismatchedAttachPinWallet();
         }
@@ -41918,8 +41982,8 @@ function getProtocolV2WalletSession(device, options) {
             }
         });
         const selectStandardWallet = () => __awaiter(this, void 0, void 0, function* () {
-            var _o;
-            if (((_o = device.features) === null || _o === void 0 ? void 0 : _o.passphraseProtection) === true) {
+            var _q;
+            if (((_q = device.features) === null || _q === void 0 ? void 0 : _q.passphraseProtection) === true) {
                 yield selectMainPin();
                 yield askDevicePassphrase(device, {
                     passphrase: '',
@@ -41941,7 +42005,7 @@ function getProtocolV2WalletSession(device, options) {
                 device.clearInternalState();
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckUnlockTypeError);
             }
-            response = yield getDeviceSession(device, buildDeviceSessionGetRequest());
+            response = yield getDeviceSession(device, sessionGetRequest());
         }
         else if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
             expectedPassphraseState = cachedStandardSession === null || cachedStandardSession === void 0 ? void 0 : cachedStandardSession.passphraseState;
@@ -41950,7 +42014,7 @@ function getProtocolV2WalletSession(device, options) {
                     if (options === null || options === void 0 ? void 0 : options.selectMainWalletBeforeRestore) {
                         yield selectMainPin();
                     }
-                    response = yield getDeviceSession(device, buildDeviceSessionGetRequest({
+                    response = yield getDeviceSession(device, sessionGetRequest({
                         sessionId: cachedStandardSession.sessionId,
                         expectedPassphraseState,
                     }));
@@ -41966,12 +42030,12 @@ function getProtocolV2WalletSession(device, options) {
             }
             if (!response) {
                 yield selectStandardWallet();
-                response = yield getDeviceSession(device, buildDeviceSessionGetRequest());
+                response = yield getDeviceSession(device, sessionGetRequest());
             }
         }
         else if (cachedSessionId && expectedPassphraseState) {
             try {
-                response = yield getDeviceSession(device, buildDeviceSessionGetRequest({
+                response = yield getDeviceSession(device, sessionGetRequest({
                     sessionId: cachedSessionId,
                     expectedPassphraseState,
                 }));
@@ -41987,7 +42051,7 @@ function getProtocolV2WalletSession(device, options) {
         }
         else if (expectedPassphraseState) {
             try {
-                response = yield getDeviceSession(device, buildDeviceSessionGetRequest({
+                response = yield getDeviceSession(device, sessionGetRequest({
                     expectedPassphraseState,
                 }));
             }
@@ -42002,6 +42066,7 @@ function getProtocolV2WalletSession(device, options) {
                 device.clearInternalState();
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WalletSessionInvalid);
             }
+            yield lockAttachPinBeforePassphraseSelection();
             response = yield selectDeviceSession(device, expectedPassphraseState, options === null || options === void 0 ? void 0 : options.deriveCardano, markWalletStatusRefreshed);
         }
         let { message } = response;
@@ -42027,10 +42092,11 @@ 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();
-                response = yield getDeviceSession(device, buildDeviceSessionGetRequest());
+                response = yield getDeviceSession(device, sessionGetRequest());
             }
             else {
                 device.clearInternalState();
+                yield lockAttachPinBeforePassphraseSelection();
                 response = yield selectDeviceSession(device, expectedPassphraseState, options === null || options === void 0 ? void 0 : options.deriveCardano, markWalletStatusRefreshed);
             }
             message = response.message;
@@ -42058,11 +42124,19 @@ function getProtocolV2WalletSession(device, options) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WalletSessionInvalid);
             }
             resumed = false;
-            if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
-                yield selectStandardWallet();
+            const previousAddress = message.btc_test_address;
+            if (sessionIsAttachPinWallet(response)) {
+                response = yield askEmptyPassphraseAndGet({ deriveCardano: true, keepAttachPin: true });
+            }
+            else if (((_k = device.features) === null || _k === void 0 ? void 0 : _k.passphraseProtection) === false) {
                 response = yield getDeviceSession(device, buildDeviceSessionGetRequest());
             }
+            else if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
+                yield selectMainPin();
+                response = yield askEmptyPassphraseAndGet({ deriveCardano: true });
+            }
             else {
+                yield lockAttachPinBeforePassphraseSelection();
                 response = yield selectDeviceSession(device, expectedPassphraseState, true, markWalletStatusRefreshed);
             }
             message = response.message;
@@ -42071,13 +42145,22 @@ function getProtocolV2WalletSession(device, options) {
             }
             catch (error) {
                 if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
-                    (_k = device.clearStandardInternalState) === null || _k === void 0 ? void 0 : _k.call(device);
+                    (_l = device.clearStandardInternalState) === null || _l === void 0 ? void 0 : _l.call(device);
                 }
                 else {
                     device.clearInternalState();
                 }
                 throw error;
             }
+            if (previousAddress && previousAddress !== message.btc_test_address) {
+                yield rejectMismatchedAttachPinWallet();
+                clearCurrentWalletSession();
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError);
+            }
+            if (!deviceSessionHasCardano(message)) {
+                clearCurrentWalletSession();
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WalletSessionInvalid);
+            }
         }
         const internalStateArgs = [
             true,
@@ -42093,7 +42176,7 @@ function getProtocolV2WalletSession(device, options) {
             device.updateInternalState(...internalStateArgs);
         }
         let unlockedAttachPin;
-        if (readCurrentAttachPinSession) {
+        if (readCurrentAttachPinSession || sessionIsAttachPinWallet(response)) {
             unlockedAttachPin = true;
         }
         else if (mainPinAuthenticated) {
@@ -52011,11 +52094,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* () {
@@ -52070,7 +52157,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)
@@ -52421,6 +52508,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) ||
@@ -53713,6 +53807,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;
@@ -53721,6 +53816,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     filePath: writePath,
                     processedSize,
                     totalSize,
+                    transferStartedAt,
                 });
                 yield this.verifyProtocolV2StagedFile(writePath, resource.source.size);
                 if (isProtocolV2BootResourcePackagePath(resource.devicePath)) {
@@ -53735,6 +53831,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     filePath,
                     processedSize,
                     totalSize,
+                    transferStartedAt,
                 });
                 yield this.verifyProtocolV2StagedFile(filePath, item.source.size);
                 stagedInstallTargets.push({
@@ -53743,7 +53840,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;
@@ -53763,16 +53866,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);
@@ -53795,7 +53899,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,
                                 });
                             }
@@ -53805,16 +53909,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) {
@@ -54161,7 +54268,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             return;
                         }
                         if (!hasCurrentInstallEvidence) {
-                            this.device.setCancelableAction(() => this.device.getCommands().cancelDevice());
+                            this.device.setCancelableAction(() => Promise.resolve());
                         }
                         if (requireCurrentInstallStatus &&
                             !hasCurrentInstallEvidence &&
@@ -54507,7 +54614,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 {
@@ -54741,7 +54848,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) &&
@@ -54763,7 +54872,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;
@@ -54816,7 +54925,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;
@@ -54824,52 +54933,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) {
@@ -54956,6 +55095,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))) {
@@ -55027,7 +55167,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;
@@ -55037,6 +55177,7 @@ class DeviceUploadWallpaper extends BaseMethod {
                 data,
                 totalSize: data.byteLength,
                 chunkSize: this.params.chunkSize,
+                bleChunkSizeLimit,
                 maxChunkRetries: 3,
                 overwrite: true,
                 append: false,
@@ -55064,7 +55205,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 },
             });
@@ -66283,18 +66424,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);
                     }
@@ -66346,6 +66488,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;
@@ -66501,7 +66650,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)) {