fix: load Protocol V2 resource archives

apps/cli/package.json

@@ -44,9 +44,9 @@
   },
   "dependencies": {
     "@napi-rs/keyring": "^1.3.0",
-    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.77",
-    "@onekeyfe/hd-core": "1.2.0-alpha.77",
-    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.77",
+    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.79",
+    "@onekeyfe/hd-core": "1.2.0-alpha.79",
+    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.79",
     "proper-lockfile": "^4.1.2"
   }
 }

apps/web-embed/postbuild.sh

@@ -21,4 +21,3 @@ echo "Syncing web-build to iOS assets..."
 rsync -r -c -v ./web-build/ ../mobile/ios/OneKeyWallet/web-embed/
 
 echo "Postbuild completed successfully."
-

package.json

@@ -158,21 +158,21 @@
     "@onekeyfe/cross-inpage-provider-injected": "2.2.73",
     "@onekeyfe/cross-inpage-provider-types": "2.2.73",
     "@onekeyfe/extension-bridge-hosted": "2.2.73",
-    "@onekeyfe/hd-ble-sdk": "1.2.0-alpha.77",
-    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.77",
-    "@onekeyfe/hd-core": "1.2.0-alpha.77",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.77",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.77",
-    "@onekeyfe/hd-transport-electron": "1.2.0-alpha.77",
-    "@onekeyfe/hd-web-sdk": "1.2.0-alpha.77",
-    "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.77",
-    "@onekeyfe/hwk-ledger-adapter": "1.2.0-alpha.77",
-    "@onekeyfe/hwk-ledger-connector-ble": "1.2.0-alpha.77",
-    "@onekeyfe/hwk-ledger-connector-webhid": "1.2.0-alpha.77",
-    "@onekeyfe/hwk-trezor-adapter": "1.2.0-alpha.77",
-    "@onekeyfe/hwk-trezor-connector-electron-ble": "1.2.0-alpha.77",
-    "@onekeyfe/hwk-trezor-connector-rn-ble": "1.2.0-alpha.77",
-    "@onekeyfe/hwk-trezor-connector-webusb": "1.2.0-alpha.77",
+    "@onekeyfe/hd-ble-sdk": "1.2.0-alpha.79",
+    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.79",
+    "@onekeyfe/hd-core": "1.2.0-alpha.79",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.79",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.79",
+    "@onekeyfe/hd-transport-electron": "1.2.0-alpha.79",
+    "@onekeyfe/hd-web-sdk": "1.2.0-alpha.79",
+    "@onekeyfe/hwk-adapter-core": "1.2.0-alpha.79",
+    "@onekeyfe/hwk-ledger-adapter": "1.2.0-alpha.79",
+    "@onekeyfe/hwk-ledger-connector-ble": "1.2.0-alpha.79",
+    "@onekeyfe/hwk-ledger-connector-webhid": "1.2.0-alpha.79",
+    "@onekeyfe/hwk-trezor-adapter": "1.2.0-alpha.79",
+    "@onekeyfe/hwk-trezor-connector-electron-ble": "1.2.0-alpha.79",
+    "@onekeyfe/hwk-trezor-connector-rn-ble": "1.2.0-alpha.79",
+    "@onekeyfe/hwk-trezor-connector-webusb": "1.2.0-alpha.79",
     "@onekeyfe/onekey-cross-webview": "2.2.73",
     "@polkadot/extension-inject": "0.54.1",
     "@polkadot/types": "14.3.1",
@@ -416,11 +416,11 @@
     "@reown/appkit-ethers5-react-native": "https://github.com/OneKeyHQ/app-modules#9d96daccc13625e5b3c8b236f9357956b049b884",
     "@reown/appkit-scaffold-react-native": "https://github.com/OneKeyHQ/app-modules#ef39e1c6682f8b50dc019a851f6e2211392d353a",
     "@reown/appkit-scaffold-utils-react-native": "https://github.com/OneKeyHQ/app-modules#aa31ef69e5058bb822c40f0a706ee9bdd191b005",
-    "@onekeyfe/hd-core": "1.2.0-alpha.77",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.77",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.77",
-    "@onekeyfe/hd-transport-http": "1.2.0-alpha.77",
-    "@onekeyfe/hd-transport-web-device": "1.2.0-alpha.77",
+    "@onekeyfe/hd-core": "1.2.0-alpha.79",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.79",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.79",
+    "@onekeyfe/hd-transport-http": "1.2.0-alpha.79",
+    "@onekeyfe/hd-transport-web-device": "1.2.0-alpha.79",
     "promise": "^8.3.0",
     "metro": "0.83.2",
     "metro-babel-transformer": "0.83.2",

packages/kit-bg/src/services/ServiceFirmwareUpdate/FirmwarePreparedExecution.ts

@@ -14,6 +14,7 @@ import type {
   CoreApi,
   FirmwareUpdatePreparedPlan,
   FirmwareUpdateV4Target,
+  ProtocolV2PreparedResourceFile,
 } from '@onekeyfe/hd-core';
 import type { EFirmwareType } from '@onekeyfe/hd-shared';
 
@@ -283,20 +284,23 @@ export const executePreparedFirmwareUpdateV4 = ({
   firmwareType,
   targetsToUpdate,
   forcedUpdateRes,
+  resourceFiles,
 }: {
   sdk: CoreApi;
   connectId: string | undefined;
   platform: IFirmwarePlatform;
   firmwareType: EFirmwareType | undefined;
   targetsToUpdate: FirmwareUpdateV4Target[];
   forcedUpdateRes: boolean;
+  resourceFiles?: ProtocolV2PreparedResourceFile[];
 } & IFirmwareExecutionArtifacts) =>
   sdk.firmwareUpdateV4(connectId, {
     platform,
     firmwareType,
     targetsToUpdate,
     ...getBridgeFirmwareV4BinaryParams(bridgeBinaries),
     ...(!preparedArtifacts ? { forcedUpdateRes } : {}),
+    ...(resourceFiles ? { resourceFiles } : {}),
     ...(preparedArtifacts
       ? {
           preparedPlan: preparedArtifacts.preparedPlan,

packages/kit-bg/src/services/ServiceFirmwareUpdate/FirmwareUpdateDetectMap.ts

@@ -26,6 +26,18 @@ export class FirmwareUpdateDetectMap {
 
   firstDetectTimeSpan = timerUtils.getTimeDurationMs({ minute: 1 });
 
+  getNextDetectDelay({ connectId }: { connectId: string }) {
+    const now = Date.now();
+    const firstDetectDelay =
+      this.firstDetectTimeSpan - (now - this.firstDetectAt);
+    const lastDetectAt = this.detectMapCache[connectId]?.lastDetectAt;
+    const repeatedDetectDelay = lastDetectAt
+      ? this.detectTimeSpan - (now - lastDetectAt)
+      : 0;
+
+    return Math.max(0, firstDetectDelay, repeatedDetectDelay);
+  }
+
   shouldDetect({ connectId }: { connectId: string }) {
     const now = Date.now();