@onekeyfe/hd-core 1.2.0-alpha.171 → 1.2.0-alpha.173

package/dist/index.js

@@ -42476,18 +42476,6 @@ const PRO2_WALLPAPER_WIDTH = 604;
 const PRO2_WALLPAPER_HEIGHT = 1024;
 const COLOR_FORMAT_RGB565 = 0x12;
 const COLOR_FORMAT_RGB565A8 = 0x14;
-const COLOR_FORMAT_I8 = 0x0a;
-const IMAGE_FLAG_COMPRESSED = 0x0008;
-const IMAGE_COMPRESSION_LZ4 = 0x00000002;
-const I8_PALETTE_SIZE = 256 * 4;
-const I8_RED_LEVELS = 6;
-const I8_GREEN_LEVELS = 7;
-const I8_BLUE_LEVELS = 6;
-const LZ4_MIN_MATCH = 4;
-const LZ4_LAST_LITERALS = 5;
-const LZ4_MATCH_FIND_LIMIT = 12;
-const LZ4_HASH_BITS = 16;
-const LZ4_HASH_MULTIPLIER = -1640531535;
 const RED_THRESHOLD = [
     1, 7, 3, 5, 0, 8, 2, 6, 7, 1, 5, 3, 8, 0, 6, 2, 3, 5, 0, 8, 2, 6, 1, 7, 5, 3, 8, 0, 6, 2, 7, 1, 0,
     8, 2, 6, 1, 7, 3, 5, 8, 0, 6, 2, 7, 1, 5, 3, 2, 6, 1, 7, 3, 5, 0, 8, 6, 2, 7, 1, 5, 3, 8, 0,
@@ -42509,149 +42497,6 @@ function asBytes(rgba) {
 function align(value, boundary) {
     return Math.ceil(value / boundary) * boundary;
 }
-function writeLz4Length(output, offset, length) {
-    let cursor = offset;
-    let remaining = length;
-    while (remaining >= 0xff) {
-        output[cursor] = 0xff;
-        cursor += 1;
-        remaining -= 0xff;
-    }
-    output[cursor] = remaining;
-    return cursor + 1;
-}
-function readUint32LittleEndian(data, offset) {
-    return (data[offset] | (data[offset + 1] << 8) | (data[offset + 2] << 16) | (data[offset + 3] << 24));
-}
-function getLz4Hash(sequence) {
-    return (Math.imul(sequence, LZ4_HASH_MULTIPLIER) >>> (32 - LZ4_HASH_BITS)) & 0xffff;
-}
-function compressLz4Block(input) {
-    const output = new Uint8Array(input.byteLength + Math.floor(input.byteLength / 0xff) + 16);
-    const hashTable = new Int32Array(1 << LZ4_HASH_BITS);
-    hashTable.fill(-1);
-    let anchor = 0;
-    let inputOffset = 0;
-    let outputOffset = 0;
-    const matchFindEnd = input.byteLength - LZ4_MATCH_FIND_LIMIT;
-    const matchCopyEnd = input.byteLength - LZ4_LAST_LITERALS;
-    while (inputOffset <= matchFindEnd) {
-        const sequence = readUint32LittleEndian(input, inputOffset);
-        const hash = getLz4Hash(sequence);
-        const reference = hashTable[hash];
-        hashTable[hash] = inputOffset;
-        const matchOffset = inputOffset - reference;
-        const hasMatch = reference >= 0 &&
-            matchOffset <= 0xffff &&
-            readUint32LittleEndian(input, reference) === sequence;
-        if (hasMatch) {
-            let matchLength = LZ4_MIN_MATCH;
-            while (inputOffset + matchLength < matchCopyEnd &&
-                input[reference + matchLength] === input[inputOffset + matchLength]) {
-                matchLength += 1;
-            }
-            const literalLength = inputOffset - anchor;
-            const encodedMatchLength = matchLength - LZ4_MIN_MATCH;
-            const tokenOffset = outputOffset;
-            outputOffset += 1;
-            output[tokenOffset] =
-                (Math.min(literalLength, 0x0f) << 4) | Math.min(encodedMatchLength, 0x0f);
-            if (literalLength >= 0x0f) {
-                outputOffset = writeLz4Length(output, outputOffset, literalLength - 0x0f);
-            }
-            output.set(input.subarray(anchor, inputOffset), outputOffset);
-            outputOffset += literalLength;
-            output[outputOffset] = matchOffset & 0xff;
-            output[outputOffset + 1] = matchOffset >> 8;
-            outputOffset += 2;
-            if (encodedMatchLength >= 0x0f) {
-                outputOffset = writeLz4Length(output, outputOffset, encodedMatchLength - 0x0f);
-            }
-            const matchStart = inputOffset;
-            inputOffset += matchLength;
-            anchor = inputOffset;
-            for (let cursor = Math.max(matchStart + 1, inputOffset - 2); cursor < inputOffset; cursor += 1) {
-                if (cursor <= matchFindEnd) {
-                    hashTable[getLz4Hash(readUint32LittleEndian(input, cursor))] = cursor;
-                }
-            }
-        }
-        else {
-            inputOffset += 1;
-        }
-    }
-    const literalLength = input.byteLength - anchor;
-    const tokenOffset = outputOffset;
-    outputOffset += 1;
-    output[tokenOffset] = Math.min(literalLength, 0x0f) << 4;
-    if (literalLength >= 0x0f) {
-        outputOffset = writeLz4Length(output, outputOffset, literalLength - 0x0f);
-    }
-    output.set(input.subarray(anchor), outputOffset);
-    outputOffset += literalLength;
-    return output.slice(0, outputOffset);
-}
-function quantizeChannel(value, levels) {
-    return Math.floor((value * (levels - 1) + 0x7f) / 0xff);
-}
-function expandChannel(value, levels) {
-    return Math.floor((value * 0xff + Math.floor((levels - 1) / 2)) / (levels - 1));
-}
-function encodePro2I8Lz4(options) {
-    const { width, height } = options;
-    if (!Number.isInteger(width) || width <= 0 || width > 0xffff) {
-        throw invalidParameter$2('Wallpaper width must be an integer between 1 and 65535.');
-    }
-    if (!Number.isInteger(height) || height <= 0 || height > 0xffff) {
-        throw invalidParameter$2('Wallpaper height must be an integer between 1 and 65535.');
-    }
-    const rgba = asBytes(options.rgba);
-    const expectedLength = width * height * 4;
-    if (rgba.byteLength !== expectedLength) {
-        throw invalidParameter$2(`Wallpaper RGBA data length must be ${expectedLength} bytes, received ${rgba.byteLength}.`);
-    }
-    const stride = width;
-    const rawData = new Uint8Array(I8_PALETTE_SIZE + stride * height);
-    for (let red = 0; red < I8_RED_LEVELS; red += 1) {
-        for (let green = 0; green < I8_GREEN_LEVELS; green += 1) {
-            for (let blue = 0; blue < I8_BLUE_LEVELS; blue += 1) {
-                const paletteIndex = (red * I8_GREEN_LEVELS + green) * I8_BLUE_LEVELS + blue;
-                const paletteOffset = paletteIndex * 4;
-                rawData[paletteOffset] = expandChannel(blue, I8_BLUE_LEVELS);
-                rawData[paletteOffset + 1] = expandChannel(green, I8_GREEN_LEVELS);
-                rawData[paletteOffset + 2] = expandChannel(red, I8_RED_LEVELS);
-                rawData[paletteOffset + 3] = 0xff;
-            }
-        }
-    }
-    for (let pixel = 0; pixel < width * height; pixel += 1) {
-        const sourceOffset = pixel * 4;
-        const alpha = rgba[sourceOffset + 3];
-        const red = Math.round((rgba[sourceOffset] * alpha) / 0xff);
-        const green = Math.round((rgba[sourceOffset + 1] * alpha) / 0xff);
-        const blue = Math.round((rgba[sourceOffset + 2] * alpha) / 0xff);
-        const paletteIndex = (quantizeChannel(red, I8_RED_LEVELS) * I8_GREEN_LEVELS +
-            quantizeChannel(green, I8_GREEN_LEVELS)) *
-            I8_BLUE_LEVELS +
-            quantizeChannel(blue, I8_BLUE_LEVELS);
-        rawData[I8_PALETTE_SIZE + pixel] = paletteIndex;
-    }
-    const compressed = compressLz4Block(rawData);
-    const data = new Uint8Array(24 + compressed.byteLength);
-    const view = new DataView(data.buffer);
-    data[0] = 0x19;
-    data[1] = COLOR_FORMAT_I8;
-    view.setUint16(2, IMAGE_FLAG_COMPRESSED, true);
-    view.setUint16(4, width, true);
-    view.setUint16(6, height, true);
-    view.setUint16(8, stride, true);
-    view.setUint16(10, 0, true);
-    view.setUint32(12, IMAGE_COMPRESSION_LZ4, true);
-    view.setUint32(16, compressed.byteLength, true);
-    view.setUint32(20, rawData.byteLength, true);
-    data.set(compressed, 24);
-    return { data, colorFormat: 'I8' };
-}
 function encodePro2Image(options) {
     var _a;
     const { width, height } = options;
@@ -42719,9 +42564,6 @@ function encodePro2Image(options) {
     return { data, colorFormat };
 }
 function encodePro2Wallpaper(options) {
-    if (options.encoding === 'i8-lz4') {
-        return encodePro2I8Lz4(options);
-    }
     return encodePro2Image(options);
 }
 
@@ -53483,7 +53325,11 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             }
             seenTargetIds.add(targetId);
         }
-        const completedTargets = matchingTargets.filter(target => isProtocolV2TargetStatusFinished(target.status));
+        const completedTargets = matchingTargets.filter(target => {
+            const targetId = normalizeProtocolV2TargetId(target.target_id);
+            return (isProtocolV2TargetStatusFinished(target.status) &&
+                (!liveTargetIds || (targetId !== undefined && liveTargetIds.has(targetId))));
+        });
         const completedTargetIds = new Set();
         completedTargets.forEach(target => {
             const targetId = normalizeProtocolV2TargetId(target.target_id);
@@ -53592,26 +53438,17 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     }
                     const currentDeviceInfo = deviceInfo;
                     try {
-                        const statusResponse = yield this.device.getCommands().typedCall('DeviceFirmwareUpdateStatusGet', ['DeviceFirmwareUpdateStatus', 'Success'], {
+                        const statusResponse = yield this.device.getCommands().typedCall('DeviceFirmwareUpdateStatusGet', 'DeviceFirmwareUpdateStatus', {
                             fields: {
                                 status: true,
                                 payload_version: true,
                                 path: true,
                             },
                         }, { timeoutMs: PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT });
-                        if (statusResponse.type === 'Success') {
-                            if (this.isBleReconnect()) {
-                                Log$7.log('[FirmwareUpdateV4] BLE firmware install completed by terminal Success response');
-                                this.recordProtocolV2AuthoritativeInstallCompletion(expectedTargetIds);
-                                this.postProgressMessage(100, 'installingFirmware');
-                                return;
-                            }
+                        if (this.protocolV2InstallRequestConfirmed) {
                             installEvidenceObserved = true;
-                            lastError = new Error('Protocol V2 firmware install acknowledged; waiting for target status');
                         }
-                        const statusTargets = statusResponse.type === 'DeviceFirmwareUpdateStatus'
-                            ? ((_a = statusResponse.message.records) !== null && _a !== void 0 ? _a : [])
-                            : [];
+                        const statusTargets = ((_a = statusResponse.message.records) !== null && _a !== void 0 ? _a : []);
                         this.collectProtocolV2LiveTargetIds(statusTargets, expectedTargetIds, liveTargetIds);
                         if (liveTargetIds.size > 0) {
                             currentInstallStatusObserved = true;
@@ -53650,9 +53487,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             }
                         }
                         if (statusTargets.length === 0) {
-                            if (statusResponse.type !== 'Success') {
-                                lastError = new Error('Protocol V2 firmware update is waiting for user confirmation or target status');
-                            }
+                            lastError = new Error('Protocol V2 firmware update is waiting for user confirmation or target status');
                         }
                         else {
                             const missingTargetIds = this.getProtocolV2MissingTargetIds(statusTargets, expectedTargetIds);
@@ -53947,7 +53782,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     acquireProtocolV2BleDevice(skipProtocolProbe = false) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const connector = this.device.deviceConnector;
             const expectedId = this.device.originalDescriptor.id;
@@ -53955,14 +53789,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 yield (connector === null || connector === void 0 ? void 0 : connector.acquire(expectedId, null, true, PROTOCOL_V2_CONNECT_PROTOCOL));
                 return;
             }
-            const deviceDiff = yield (connector === null || connector === void 0 ? void 0 : connector.enumerate());
-            const reconnectDescriptor = (_a = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) === null || _a === void 0 ? void 0 : _a.find(descriptor => descriptor.id === expectedId);
-            if (!reconnectDescriptor) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound);
-            }
-            yield (connector === null || connector === void 0 ? void 0 : connector.acquire(reconnectDescriptor.id, null, true, PROTOCOL_V2_CONNECT_PROTOCOL, undefined, undefined, skipProtocolProbe));
+            yield (connector === null || connector === void 0 ? void 0 : connector.acquire(expectedId, null, true, PROTOCOL_V2_CONNECT_PROTOCOL, undefined, undefined, skipProtocolProbe));
             this.device.commands.disposed = false;
-            this.device.getCommands().mainId = reconnectDescriptor.id;
+            this.device.getCommands().mainId = expectedId;
         });
     }
     protocolV2StartFirmwareUpdate({ targets, }) {
@@ -53977,7 +53806,18 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             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 } : {}))));
             if (this.isBleReconnect()) {
                 try {
-                    yield commands.call('DeviceFirmwareUpdateRequest', {}, { returnAfterWrite: true });
+                    yield commands.call('DeviceFirmwareUpdateRequest', {}, {
+                        returnAfterWrite: true,
+                        expectedTypes: ['Success'],
+                        onResponseAfterWrite: response => {
+                            if (response.type !== 'Success')
+                                return;
+                            this.protocolV2InstallRequestConfirmed = true;
+                            this.device.clearCancelableAction();
+                            this.postProgressMessage(1, 'installingFirmware');
+                            Log$7.log('[FirmwareUpdateV4] BLE firmware install confirmed by device response');
+                        },
+                    });
                     Log$7.log('[FirmwareUpdateV4] BLE firmware install request written; continue with status polling');
                 }
                 catch (error) {
@@ -54493,15 +54333,10 @@ class DeviceUploadWallpaper extends BaseMethod {
         return ['V2'];
     }
     init() {
-        const { jpegBase64, fileName, chunkSize, encoding } = this.payload;
+        const { jpegBase64, fileName, chunkSize } = this.payload;
         if (chunkSize !== undefined && (!Number.isInteger(chunkSize) || chunkSize <= 0)) {
             throw invalidParameter$1('Parameter [chunkSize] must be a positive integer.');
         }
-        if (encoding !== undefined && encoding !== 'rgb565' && encoding !== 'i8-lz4') {
-            throw invalidParameter$1('Parameter [encoding] must be either rgb565 or i8-lz4.');
-        }
-        const env = DataManager.getSettings('env');
-        const resolvedEncoding = encoding !== null && encoding !== void 0 ? encoding : (env && DataManager.isBleConnect(env) ? 'i8-lz4' : 'rgb565');
         const decoded = decodeJpegBase64ToRgba({
             jpegBase64,
             parameterName: 'jpegBase64',
@@ -54512,10 +54347,9 @@ class DeviceUploadWallpaper extends BaseMethod {
             width: PRO2_WALLPAPER_WIDTH,
             height: PRO2_WALLPAPER_HEIGHT,
             rgba: decoded.data,
-            encoding: resolvedEncoding,
         });
         this.path = `${WALLPAPER_DIRECTORY}/${normalizeFileName(fileName, this.encoded.data)}`;
-        this.params = { jpegBase64, fileName, chunkSize, encoding: resolvedEncoding };
+        this.params = { jpegBase64, fileName, chunkSize };
         this.unlockPolicy = 'unlock-before-run';
         this.protocolV2PreUnlockPinType = hdTransport.DeviceSessionPinType.Any;
         this.skipForceUpdateCheck = true;
@@ -65357,6 +65191,8 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
     if ((_g = method.payload) === null || _g === void 0 ? void 0 : _g.onlyConnectBleDevice) {
         preWarmCallbackTask === null || preWarmCallbackTask === void 0 ? void 0 : preWarmCallbackTask.resolve();
         Log.debug('Call API - only connect ble device: ', device === null || device === void 0 ? void 0 : device.mainId);
+        completeMethodRequestContext(method);
+        requestQueue.releaseTask(method.responseID);
         return createResponseMessage(method.responseID, true, null);
     }
     Log.debug('Call API - setDevice: ', device.mainId);
@@ -65732,7 +65568,31 @@ function isMissingDetectedProtocolV2Error(method, error) {
         typeof typedError.message === 'string' &&
         typedError.message.includes('Device protocol has not been detected'));
 }
-function connectDeviceForBle(method, device, retryCount = 0) {
+const BLE_ACQUIRE_DEADLINE_MS = 60 * 1000;
+function raceBleAcquire(acquirePromise, abortSignal) {
+    return new Promise((resolve, reject) => {
+        let settled = false;
+        const settle = (fn) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(deadline);
+            abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.removeEventListener('abort', onAbort);
+            fn();
+        };
+        const onAbort = () => settle(() => reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled)));
+        const deadline = setTimeout(() => settle(() => reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, `BLE acquire exceeded ${BLE_ACQUIRE_DEADLINE_MS}ms deadline`))), BLE_ACQUIRE_DEADLINE_MS);
+        acquirePromise.then(value => settle(() => resolve(value)), error => settle(() => reject(error)));
+        if (abortSignal) {
+            if (abortSignal.aborted) {
+                onAbort();
+                return;
+            }
+            abortSignal.addEventListener('abort', onAbort);
+        }
+    });
+}
+function connectDeviceForBle(method, device, abortSignal, retryCount = 0) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -65747,9 +65607,31 @@ function connectDeviceForBle(method, device, retryCount = 0) {
                 !device.commands ||
                 device.commands.disposed;
             if (shouldAcquire) {
-                yield device.acquire(method.payload.connectProtocol, {
-                    forceProtocolDetection: method.payload.forceProtocolDetection,
-                });
+                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, {
+                        forceProtocolDetection: method.payload.forceProtocolDetection,
+                    });
+                }
+                else {
+                    try {
+                        yield raceBleAcquire(device.acquire(method.payload.connectProtocol, {
+                            forceProtocolDetection: method.payload.forceProtocolDetection,
+                        }), abortSignal);
+                    }
+                    catch (err) {
+                        if (err.errorCode === hdShared.HardwareErrorCode.BleTimeoutError &&
+                            device.mainId &&
+                            device.deviceConnector) {
+                            yield device.deviceConnector.disconnect(device.mainId).catch(() => undefined);
+                            device.markTransportDisconnected();
+                        }
+                        throw err;
+                    }
+                }
             }
             if ((_a = method.payload) === null || _a === void 0 ? void 0 : _a.onlyConnectBleDevice) {
                 if (shouldAcquire) {
@@ -65780,7 +65662,7 @@ function connectDeviceForBle(method, device, retryCount = 0) {
                 const nextRetry = retryCount + 1;
                 Log.debug(`Bluetooth connection will retry, retry count: ${nextRetry}`);
                 yield wait(3000);
-                yield connectDeviceForBle(method, device, nextRetry);
+                yield connectDeviceForBle(method, device, abortSignal, nextRetry);
             }
             else {
                 throw err;
@@ -65865,7 +65747,7 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
                         if (tryCount === 1) {
                             device.beginConnectionAttempt();
                         }
-                        yield connectDeviceForBle(method, device);
+                        yield connectDeviceForBle(method, device, abortSignal);
                     }
                     resolve(device);
                     return;

package/dist/utils/pro2Wallpaper.d.ts

@@ -1,7 +1,6 @@
 export declare const PRO2_WALLPAPER_WIDTH = 604;
 export declare const PRO2_WALLPAPER_HEIGHT = 1024;
-export type Pro2WallpaperColorFormat = 'RGB565' | 'RGB565A8' | 'I8';
-export type Pro2WallpaperEncoding = 'rgb565' | 'i8-lz4';
+export type Pro2WallpaperColorFormat = 'RGB565' | 'RGB565A8';
 export type Pro2ImageAlphaMode = 'preserve' | 'black-background';
 export declare function encodePro2Image(options: {
     width: number;
@@ -16,7 +15,6 @@ export declare function encodePro2Wallpaper(options: {
     width: number;
     height: number;
     rgba: Uint8Array | ArrayBuffer;
-    encoding?: Pro2WallpaperEncoding;
 }): {
     data: Uint8Array;
     colorFormat: Pro2WallpaperColorFormat;

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

@@ -1 +1 @@
-{"version":3,"file":"pro2Wallpaper.d.ts","sourceRoot":"","sources":["../../src/utils/pro2Wallpaper.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAE1C,MAAM,MAAM,wBAAwB,GAAG,QAAQ,GAAG,UAAU,GAAG,IAAI,CAAC;AAEpE,MAAM,MAAM,qBAAqB,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG,kBAAkB,CAAC;AA4NjE,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;IAC/B,SAAS,CAAC,EAAE,kBAAkB,CAAC;CAChC,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,wBAAwB,CAAA;CAAE,CA4E9D;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAC3C,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;IAC/B,QAAQ,CAAC,EAAE,qBAAqB,CAAC;CAClC,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,wBAAwB,CAAA;CAAE,CAK9D"}
+{"version":3,"file":"pro2Wallpaper.d.ts","sourceRoot":"","sources":["../../src/utils/pro2Wallpaper.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAE1C,MAAM,MAAM,wBAAwB,GAAG,QAAQ,GAAG,UAAU,CAAC;AAE7D,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG,kBAAkB,CAAC;AA8BjE,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;IAC/B,SAAS,CAAC,EAAE,kBAAkB,CAAC;CAChC,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,wBAAwB,CAAA;CAAE,CA4E9D;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAC3C,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;CAChC,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,wBAAwB,CAAA;CAAE,CAE9D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.171",
+  "version": "1.2.0-alpha.173",
   "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.0-alpha.171",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.171",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.173",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.173",
     "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": "68de201cc95fe521936c74f828addb3fb5251c67"
+  "gitHead": "b2fa03ff17b01696a15318c2e27c923d9ba3deb0"
 }

package/src/api/FirmwareUpdateV4.ts

@@ -2316,9 +2316,13 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       }
       seenTargetIds.add(targetId);
     }
-    const completedTargets = matchingTargets.filter(target =>
-      isProtocolV2TargetStatusFinished(target.status)
-    );
+    const completedTargets = matchingTargets.filter(target => {
+      const targetId = normalizeProtocolV2TargetId(target.target_id);
+      return (
+        isProtocolV2TargetStatusFinished(target.status) &&
+        (!liveTargetIds || (targetId !== undefined && liveTargetIds.has(targetId)))
+      );
+    });
     const completedTargetIds = new Set<number>();
     completedTargets.forEach(target => {
       const targetId = normalizeProtocolV2TargetId(target.target_id);
@@ -2465,7 +2469,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         try {
           const statusResponse = await this.device.getCommands().typedCall(
             'DeviceFirmwareUpdateStatusGet',
-            ['DeviceFirmwareUpdateStatus', 'Success'],
+            'DeviceFirmwareUpdateStatus',
             {
               fields: {
                 status: true,
@@ -2475,24 +2479,11 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
             },
             { timeoutMs: PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT }
           );
-          if (statusResponse.type === 'Success') {
-            if (this.isBleReconnect()) {
-              Log.log(
-                '[FirmwareUpdateV4] BLE firmware install completed by terminal Success response'
-              );
-              this.recordProtocolV2AuthoritativeInstallCompletion(expectedTargetIds);
-              this.postProgressMessage(100, 'installingFirmware');
-              return;
-            }
+          if (this.protocolV2InstallRequestConfirmed) {
             installEvidenceObserved = true;
-            lastError = new Error(
-              'Protocol V2 firmware install acknowledged; waiting for target status'
-            );
           }
-          const statusTargets =
-            statusResponse.type === 'DeviceFirmwareUpdateStatus'
-              ? ((statusResponse.message.records ?? []) as ProtocolV2FirmwareUpdateStatusTarget[])
-              : [];
+          const statusTargets = (statusResponse.message.records ??
+            []) as ProtocolV2FirmwareUpdateStatusTarget[];
           this.collectProtocolV2LiveTargetIds(statusTargets, expectedTargetIds, liveTargetIds);
           if (liveTargetIds.size > 0) {
             currentInstallStatusObserved = true;
@@ -2552,11 +2543,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           }
 
           if (statusTargets.length === 0) {
-            if (statusResponse.type !== 'Success') {
-              lastError = new Error(
-                'Protocol V2 firmware update is waiting for user confirmation or target status'
-              );
-            }
+            lastError = new Error(
+              'Protocol V2 firmware update is waiting for user confirmation or target status'
+            );
           } else {
             const missingTargetIds = this.getProtocolV2MissingTargetIds(
               statusTargets,
@@ -2952,15 +2941,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       await connector?.acquire(expectedId, null, true, PROTOCOL_V2_CONNECT_PROTOCOL);
       return;
     }
-    const deviceDiff = await connector?.enumerate();
-    const reconnectDescriptor = deviceDiff?.descriptors?.find(
-      descriptor => descriptor.id === expectedId
-    );
-    if (!reconnectDescriptor) {
-      throw ERRORS.TypedError(HardwareErrorCode.DeviceNotFound);
-    }
     await connector?.acquire(
-      reconnectDescriptor.id,
+      expectedId,
       null,
       true,
       PROTOCOL_V2_CONNECT_PROTOCOL,
@@ -2969,7 +2951,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       skipProtocolProbe
     );
     this.device.commands.disposed = false;
-    this.device.getCommands().mainId = reconnectDescriptor.id;
+    this.device.getCommands().mainId = expectedId;
   }
 
   private async protocolV2StartFirmwareUpdate({
@@ -2998,7 +2980,21 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
     if (this.isBleReconnect()) {
       try {
-        await commands.call('DeviceFirmwareUpdateRequest', {}, { returnAfterWrite: true });
+        await commands.call(
+          'DeviceFirmwareUpdateRequest',
+          {},
+          {
+            returnAfterWrite: true,
+            expectedTypes: ['Success'],
+            onResponseAfterWrite: response => {
+              if (response.type !== 'Success') return;
+              this.protocolV2InstallRequestConfirmed = true;
+              this.device.clearCancelableAction();
+              this.postProgressMessage(1, 'installingFirmware');
+              Log.log('[FirmwareUpdateV4] BLE firmware install confirmed by device response');
+            },
+          }
+        );
         Log.log(
           '[FirmwareUpdateV4] BLE firmware install request written; continue with status polling'
         );

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

@@ -7,7 +7,6 @@ import { BaseMethod } from '../BaseMethod';
 import { decodeJpegBase64ToRgba } from '../helpers/base64Data';
 import { invalidParameter } from '../helpers/filesystemValidation';
 import { writeProtocolV2File } from '../helpers/protocolV2FileWrite';
-import { DataManager } from '../../data-manager';
 import { UI_REQUEST, createUiMessage } from '../../events/ui-request';
 import { supportsProtocolV2Message } from '../../protocols/protocol-v2/features';
 import { LoggerNames, getLogger } from '../../utils';
@@ -15,7 +14,6 @@ import {
   PRO2_WALLPAPER_HEIGHT,
   PRO2_WALLPAPER_WIDTH,
   type Pro2WallpaperColorFormat,
-  type Pro2WallpaperEncoding,
   encodePro2Wallpaper,
 } from '../../utils/pro2Wallpaper';
 
@@ -23,7 +21,6 @@ export type DeviceUploadWallpaperParams = {
   jpegBase64: string;
   fileName?: string;
   chunkSize?: number;
-  encoding?: Pro2WallpaperEncoding;
 };
 
 export type DeviceUploadWallpaperResponse = {
@@ -64,16 +61,10 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
   private path = '';
 
   init() {
-    const { jpegBase64, fileName, chunkSize, encoding } = this.payload;
+    const { jpegBase64, fileName, chunkSize } = this.payload;
     if (chunkSize !== undefined && (!Number.isInteger(chunkSize) || chunkSize <= 0)) {
       throw invalidParameter('Parameter [chunkSize] must be a positive integer.');
     }
-    if (encoding !== undefined && encoding !== 'rgb565' && encoding !== 'i8-lz4') {
-      throw invalidParameter('Parameter [encoding] must be either rgb565 or i8-lz4.');
-    }
-    const env = DataManager.getSettings('env');
-    const resolvedEncoding: Pro2WallpaperEncoding =
-      encoding ?? (env && DataManager.isBleConnect(env) ? 'i8-lz4' : 'rgb565');
 
     const decoded = decodeJpegBase64ToRgba({
       jpegBase64,
@@ -85,10 +76,9 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
       width: PRO2_WALLPAPER_WIDTH,
       height: PRO2_WALLPAPER_HEIGHT,
       rgba: decoded.data,
-      encoding: resolvedEncoding,
     });
     this.path = `${WALLPAPER_DIRECTORY}/${normalizeFileName(fileName, this.encoded.data)}`;
-    this.params = { jpegBase64, fileName, chunkSize, encoding: resolvedEncoding };
+    this.params = { jpegBase64, fileName, chunkSize };
     this.unlockPolicy = 'unlock-before-run';
     // File writes and wallpaper apply require an unlocked device. Either PIN
     // may authorize this device-management action.