@onekeyfe/hwk-ledger-adapter 1.2.8-alpha.127 → 1.2.8-alpha.128
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +23 -5
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +23 -5
- package/dist/index.mjs.map +1 -1
- package/package.json +3 -3
package/dist/index.js
CHANGED
|
@@ -929,6 +929,12 @@ function isLostConnectionError(err) {
|
|
|
929
929
|
return isDeviceDisconnectedError(err) || isDeviceNotAdvertisingError(err) || isTimeoutError(err) || isConnectionLevelError(err);
|
|
930
930
|
}
|
|
931
931
|
var BTC_HIGH_INDEX_THRESHOLD = 100;
|
|
932
|
+
var APP_MANAGEMENT_METHODS = /* @__PURE__ */ new Set([
|
|
933
|
+
"installApp",
|
|
934
|
+
"listInstalledApps",
|
|
935
|
+
"listInstalledNames",
|
|
936
|
+
"listAvailableApps"
|
|
937
|
+
]);
|
|
932
938
|
function btcAccountIndexFromPath(path) {
|
|
933
939
|
const segments = path.replace(/^m\//, "").split("/");
|
|
934
940
|
if (segments.length < 3) return null;
|
|
@@ -2437,7 +2443,7 @@ var _LedgerAdapter = class _LedgerAdapter {
|
|
|
2437
2443
|
(connection) => connection.transport === "usb"
|
|
2438
2444
|
);
|
|
2439
2445
|
const usbTarget = knownUsb?.transport === "usb" ? knownUsb.connectId : usbDevices.find((device) => device.connectId === targetConnectId)?.connectId;
|
|
2440
|
-
if (usbDevices.length > 0 && (usbTarget || !targetConnectId || allowUsbEphemeralFallback)) {
|
|
2446
|
+
if (usbDevices.length > 0 && (usbTarget || !targetConnectId || allowUsbEphemeralFallback || context?.takesPluggedUsb)) {
|
|
2441
2447
|
return this._connectFirstOrSelect(
|
|
2442
2448
|
usbDevices,
|
|
2443
2449
|
usbTarget,
|
|
@@ -2902,7 +2908,8 @@ var _LedgerAdapter = class _LedgerAdapter {
|
|
|
2902
2908
|
/** Actual work done under the job queue — connection, fingerprint, call, and recovery. */
|
|
2903
2909
|
async _runConnectorCall(connectId, method, params, signal, fingerprint, permissionDeviceId, commonParams, installContext, operationId, lockedRetryBudget = _LedgerAdapter.MAX_BUSINESS_RETRY_BUDGET) {
|
|
2904
2910
|
_LedgerAdapter._throwIfAborted(signal);
|
|
2905
|
-
|
|
2911
|
+
const resolvesAppManagementTransport = APP_MANAGEMENT_METHODS.has(method) && this.connector.availableTransports?.includes("usb") && this.connector.availableTransports.includes("ble");
|
|
2912
|
+
if (!operationId && !resolvesAppManagementTransport) {
|
|
2906
2913
|
await this._ensureDevicePermission(
|
|
2907
2914
|
connectId,
|
|
2908
2915
|
permissionDeviceId ?? fingerprint?.deviceId,
|
|
@@ -2935,7 +2942,8 @@ var _LedgerAdapter = class _LedgerAdapter {
|
|
|
2935
2942
|
);
|
|
2936
2943
|
const connectionAttempt = {
|
|
2937
2944
|
...commonParams,
|
|
2938
|
-
deferBindingSave: checksWallet
|
|
2945
|
+
deferBindingSave: checksWallet,
|
|
2946
|
+
...APP_MANAGEMENT_METHODS.has(method) ? { takesPluggedUsb: true } : {}
|
|
2939
2947
|
};
|
|
2940
2948
|
const bundleConnection = installContext?.connection;
|
|
2941
2949
|
if (bundleConnection && this._sessions.get(bundleConnection.connectId) !== bundleConnection.sessionId) {
|
|
@@ -2975,6 +2983,16 @@ var _LedgerAdapter = class _LedgerAdapter {
|
|
|
2975
2983
|
_tag: ERROR_TAG.DeviceSessionNotFound
|
|
2976
2984
|
});
|
|
2977
2985
|
}
|
|
2986
|
+
if (!operationId && resolvesAppManagementTransport) {
|
|
2987
|
+
const transport = this._sessionTransports.get(sessionId);
|
|
2988
|
+
await this._ensureDevicePermission(
|
|
2989
|
+
resolvedConnectId,
|
|
2990
|
+
permissionDeviceId ?? fingerprint?.deviceId,
|
|
2991
|
+
signal,
|
|
2992
|
+
transport && (isLedgerBleConnectionType(transport) ? "ble" : "hid")
|
|
2993
|
+
);
|
|
2994
|
+
_LedgerAdapter._throwIfAborted(signal);
|
|
2995
|
+
}
|
|
2978
2996
|
try {
|
|
2979
2997
|
const isBleSession = this._sessionTransports.get(sessionId) === "ble";
|
|
2980
2998
|
if (!operationId && connectionAttempt.pendingBinding) {
|
|
@@ -3207,11 +3225,11 @@ var _LedgerAdapter = class _LedgerAdapter {
|
|
|
3207
3225
|
* Ensure OS-level Bluetooth/USB permission; times out after 60s if the host never
|
|
3208
3226
|
* replies. Without connectId the request is environment-level, else device-level.
|
|
3209
3227
|
*/
|
|
3210
|
-
async _ensureDevicePermission(connectId, deviceId, signal) {
|
|
3228
|
+
async _ensureDevicePermission(connectId, deviceId, signal, transportOverride) {
|
|
3211
3229
|
if (signal?.aborted) {
|
|
3212
3230
|
_LedgerAdapter._throwIfAborted(signal);
|
|
3213
3231
|
}
|
|
3214
|
-
const transportType = this.activeTransport ?? "hid";
|
|
3232
|
+
const transportType = transportOverride ?? this.activeTransport ?? "hid";
|
|
3215
3233
|
const operationId = this._activeOperationId();
|
|
3216
3234
|
const waitPromise = this._uiRegistry.wait(
|
|
3217
3235
|
import_hwk_adapter_core4.UI_REQUEST.REQUEST_DEVICE_PERMISSION,
|