@onekeyfe/hd-core 0.3.23-alpha.0 → 0.3.23
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/api/GetPassphraseState.d.ts.map +1 -1
- package/dist/core/index.d.ts +1 -2
- package/dist/core/index.d.ts.map +1 -1
- package/dist/data-manager/TransportManager.d.ts +2 -3
- package/dist/data-manager/TransportManager.d.ts.map +1 -1
- package/dist/device/Device.d.ts.map +1 -1
- package/dist/index.d.ts +4 -5
- package/dist/index.js +19 -36
- package/dist/types/api/init.d.ts +1 -2
- package/dist/types/api/init.d.ts.map +1 -1
- package/dist/types/settings.d.ts +1 -1
- package/dist/types/settings.d.ts.map +1 -1
- package/dist/utils/deviceFeaturesUtils.d.ts +3 -1
- package/dist/utils/deviceFeaturesUtils.d.ts.map +1 -1
- package/dist/utils/logger.d.ts +0 -2
- package/dist/utils/logger.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/api/GetPassphraseState.ts +3 -10
- package/src/core/index.ts +5 -9
- package/src/data-manager/TransportManager.ts +2 -17
- package/src/device/Device.ts +5 -12
- package/src/types/api/init.ts +1 -3
- package/src/types/settings.ts +1 -1
- package/src/utils/deviceFeaturesUtils.ts +19 -1
- package/src/utils/logger.ts +0 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetPassphraseState.d.ts","sourceRoot":"","sources":["../../src/api/GetPassphraseState.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,UAAU;IACxD,IAAI;IAKE,GAAG;
|
|
1
|
+
{"version":3,"file":"GetPassphraseState.d.ts","sourceRoot":"","sources":["../../src/api/GetPassphraseState.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,UAAU;IACxD,IAAI;IAKE,GAAG;CAeV"}
|
package/dist/core/index.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import EventEmitter from 'events';
|
|
3
|
-
import { LowlevelTransportSharedPlugin } from '@onekeyfe/hd-transport';
|
|
4
3
|
import { CoreMessage } from '../events';
|
|
5
4
|
import type { ConnectSettings } from '../types';
|
|
6
5
|
import DeviceConnector from '../device/DeviceConnector';
|
|
@@ -12,5 +11,5 @@ export default class Core extends EventEmitter {
|
|
|
12
11
|
}
|
|
13
12
|
export declare const initCore: () => Core;
|
|
14
13
|
export declare const initConnector: () => DeviceConnector;
|
|
15
|
-
export declare const init: (settings: ConnectSettings, Transport: any
|
|
14
|
+
export declare const init: (settings: ConnectSettings, Transport: any) => Promise<Core | undefined>;
|
|
16
15
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/core/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAqBlC,OAAO,EAEL,WAAW,EAWZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AA4BxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBAgRjD,CAAC;AAuMF,eAAO,MAAM,MAAM,0CAkBlB,CAAC;AAoJF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IA8CxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aAAoB,eAAe,aAAa,GAAG,8BAmBnE,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Transport } from '@onekeyfe/hd-transport';
|
|
2
2
|
import { MessageVersion } from './DataManager';
|
|
3
3
|
import { Features } from '../types';
|
|
4
4
|
export default class TransportManager {
|
|
@@ -7,11 +7,10 @@ export default class TransportManager {
|
|
|
7
7
|
static currentMessages: JSON | Record<string, any>;
|
|
8
8
|
static reactNativeInit: boolean;
|
|
9
9
|
static messageVersion: MessageVersion;
|
|
10
|
-
static plugin: LowlevelTransportSharedPlugin | null;
|
|
11
10
|
static load(): void;
|
|
12
11
|
static configure(): Promise<void>;
|
|
13
12
|
static reconfigure(features?: Features | undefined): Promise<void>;
|
|
14
|
-
static setTransport(TransportConstructor: any
|
|
13
|
+
static setTransport(TransportConstructor: any): void;
|
|
15
14
|
static getTransport(): Transport;
|
|
16
15
|
static getDefaultMessages(): JSON | Record<string, any>;
|
|
17
16
|
static getCurrentMessages(): JSON | Record<string, any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransportManager.d.ts","sourceRoot":"","sources":["../../src/data-manager/TransportManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"TransportManager.d.ts","sourceRoot":"","sources":["../../src/data-manager/TransportManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAoB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAK5D,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAWpC,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC;IAE5B,MAAM,CAAC,eAAe,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEnD,MAAM,CAAC,eAAe,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEnD,MAAM,CAAC,eAAe,UAAS;IAE/B,MAAM,CAAC,cAAc,EAAE,cAAc,CAAY;IAEjD,MAAM,CAAC,IAAI;WAOE,SAAS;WAyBT,WAAW,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS;IAsBxD,MAAM,CAAC,YAAY,CAAC,oBAAoB,EAAE,GAAG;IAY7C,MAAM,CAAC,YAAY;IAInB,MAAM,CAAC,kBAAkB;IAIzB,MAAM,CAAC,kBAAkB;IAIzB,MAAM,CAAC,iBAAiB;CAGzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Device.d.ts","sourceRoot":"","sources":["../../src/device/Device.ts"],"names":[],"mappings":";AAAA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,gBAAgB,IAAI,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAEL,QAAQ,EAIT,MAAM,qBAAqB,CAAC;AAW7B,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAE5E,OAAO,KAAK,EAAE,MAAM,IAAI,WAAW,EAAE,QAAQ,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AACzF,OAAO,EAAE,MAAM,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAEtF,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAKrC,oBAAY,WAAW,GAAG;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,oBAAY,UAAU,GAAG;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,GAAG,WAAW,CAAC;AAShB,MAAM,WAAW,YAAY;IAC3B,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,oBAAoB,GAAG,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC;IAChG,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;IACtD,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IACnD,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,wBAAwB,EAAE,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC;CAC5F;AAED,MAAM,WAAW,MAAM;IACrB,EAAE,CAAC,CAAC,SAAS,MAAM,YAAY,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"Device.d.ts","sourceRoot":"","sources":["../../src/device/Device.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import EventEmitter$1, { EventEmitter } from 'events';
|
|
2
2
|
import * as _onekeyfe_hd_transport from '@onekeyfe/hd-transport';
|
|
3
|
-
import { Messages,
|
|
3
|
+
import { Messages, Success as Success$1, RecoveryDeviceType, SafetyCheckLevel, ResourceType, CipheredKeyValue as CipheredKeyValue$1, EthereumPublicKey, EthereumMessageSignature, Address, MultisigRedeemScriptType, InputScriptType, PublicKey, MessageSignature, PrevInput, TxOutputBinType, TxInput, TxOutputType, TxInputType, StarcoinAddress as StarcoinAddress$1, StarcoinPublicKey as StarcoinPublicKey$1, StarcoinMessageSignature, StarcoinSignedTx, NEMAddress as NEMAddress$1, NEMSignedTx, SolanaAddress as SolanaAddress$1, SolanaSignedTx as SolanaSignedTx$1, StellarAddress as StellarAddress$1, StellarSignedTx, TronAddress as TronAddress$1, UintType, TronResourceCode, TronSignedTx, TronMessageSignature, ConfluxAddress as ConfluxAddress$1, ConfluxMessageSignature, NearAddress as NearAddress$1, NearSignedTx, AptosAddress as AptosAddress$1, AptosMessageSignature as AptosMessageSignature$1, AptosSignedTx as AptosSignedTx$1, AlgorandAddress, AlgorandSignedTx, CosmosAddress as CosmosAddress$1, CosmosSignedTx as CosmosSignedTx$1, SuiAddress as SuiAddress$1, CardanoAddressParametersType, CardanoMessageSignature, FilecoinAddress as FilecoinAddress$1, FilecoinSignedTx as FilecoinSignedTx$1, PolkadotAddress as PolkadotAddress$1, PolkadotSignedTx as PolkadotSignedTx$1, KaspaAddress as KaspaAddress$1, OneKeyDeviceInfo, Transport, ChangeOutputScriptType } from '@onekeyfe/hd-transport';
|
|
4
4
|
export { Messages as PROTO } from '@onekeyfe/hd-transport';
|
|
5
5
|
import { Deferred } from '@onekeyfe/hd-shared';
|
|
6
6
|
|
|
@@ -159,7 +159,7 @@ declare type ConnectSettings = {
|
|
|
159
159
|
priority: number;
|
|
160
160
|
trustedHost: boolean;
|
|
161
161
|
supportedBrowser?: boolean;
|
|
162
|
-
env: 'node' | 'web' | 'webextension' | 'electron' | 'react-native' | 'webusb'
|
|
162
|
+
env: 'node' | 'web' | 'webextension' | 'electron' | 'react-native' | 'webusb';
|
|
163
163
|
timestamp: number;
|
|
164
164
|
isFrame?: boolean;
|
|
165
165
|
preRelease?: boolean;
|
|
@@ -223,7 +223,7 @@ declare type RemoteConfigResponse = {
|
|
|
223
223
|
bridge: AssetsMap['bridge'];
|
|
224
224
|
} & DeviceTypeMap;
|
|
225
225
|
|
|
226
|
-
declare function init$1(settings: Partial<ConnectSettings>, lowLevelApi?: LowLevelCoreApi
|
|
226
|
+
declare function init$1(settings: Partial<ConnectSettings>, lowLevelApi?: LowLevelCoreApi): Promise<boolean>;
|
|
227
227
|
declare function updateSettings(settings: Partial<ConnectSettings>): Promise<boolean>;
|
|
228
228
|
|
|
229
229
|
declare function getLogs(): Response<string[]>;
|
|
@@ -2237,7 +2237,7 @@ declare class Core extends EventEmitter$1 {
|
|
|
2237
2237
|
handleMessage(message: CoreMessage): Promise<any>;
|
|
2238
2238
|
dispose(): void;
|
|
2239
2239
|
}
|
|
2240
|
-
declare const init: (settings: ConnectSettings, Transport: any
|
|
2240
|
+
declare const init: (settings: ConnectSettings, Transport: any) => Promise<Core | undefined>;
|
|
2241
2241
|
|
|
2242
2242
|
declare const httpRequest: (url: string, type: string) => any;
|
|
2243
2243
|
declare const getTimeStamp: () => number;
|
|
@@ -2330,7 +2330,6 @@ declare enum LoggerNames {
|
|
|
2330
2330
|
HdCommonConnectSdk = "@onekey/common-connect-sdk",
|
|
2331
2331
|
HdBleSdk = "@onekey/hd-ble-sdk",
|
|
2332
2332
|
HdTransportHttp = "@onekey/hd-transport-http",
|
|
2333
|
-
HdTransportLowLevel = "@onekey/hd-transport-lowlevel",
|
|
2334
2333
|
HdBleTransport = "@onekey/hd-ble-transport",
|
|
2335
2334
|
Connect = "@onekey/connect",
|
|
2336
2335
|
Iframe = "IFrame",
|
package/dist/index.js
CHANGED
|
@@ -22497,7 +22497,6 @@ exports.LoggerNames = void 0;
|
|
|
22497
22497
|
LoggerNames["HdCommonConnectSdk"] = "@onekey/common-connect-sdk";
|
|
22498
22498
|
LoggerNames["HdBleSdk"] = "@onekey/hd-ble-sdk";
|
|
22499
22499
|
LoggerNames["HdTransportHttp"] = "@onekey/hd-transport-http";
|
|
22500
|
-
LoggerNames["HdTransportLowLevel"] = "@onekey/hd-transport-lowlevel";
|
|
22501
22500
|
LoggerNames["HdBleTransport"] = "@onekey/hd-ble-transport";
|
|
22502
22501
|
LoggerNames["Connect"] = "@onekey/connect";
|
|
22503
22502
|
LoggerNames["Iframe"] = "IFrame";
|
|
@@ -22515,7 +22514,6 @@ const LoggerMap = {
|
|
|
22515
22514
|
[exports.LoggerNames.HdBleSdk]: initLog(exports.LoggerNames.HdBleSdk),
|
|
22516
22515
|
[exports.LoggerNames.HdTransportHttp]: initLog(exports.LoggerNames.HdTransportHttp),
|
|
22517
22516
|
[exports.LoggerNames.HdBleTransport]: initLog(exports.LoggerNames.HdBleTransport),
|
|
22518
|
-
[exports.LoggerNames.HdTransportLowLevel]: initLog(exports.LoggerNames.HdTransportLowLevel),
|
|
22519
22517
|
[exports.LoggerNames.Connect]: initLog(exports.LoggerNames.Connect),
|
|
22520
22518
|
[exports.LoggerNames.Iframe]: initLog(exports.LoggerNames.Iframe),
|
|
22521
22519
|
[exports.LoggerNames.SendMessage]: initLog(exports.LoggerNames.SendMessage),
|
|
@@ -23139,6 +23137,16 @@ const supportNewPassphrase = (features) => {
|
|
|
23139
23137
|
const currentVersion = getDeviceFirmwareVersion(features).join('.');
|
|
23140
23138
|
return { support: semver__default["default"].gte(currentVersion, '2.4.0'), require: '2.4.0' };
|
|
23141
23139
|
};
|
|
23140
|
+
const getPassphraseStateWithRefreshDeviceInfo = (device) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23141
|
+
const { features, commands } = device;
|
|
23142
|
+
const locked = (features === null || features === void 0 ? void 0 : features.unlocked) === false;
|
|
23143
|
+
const passphraseState = yield getPassphraseState(features, commands);
|
|
23144
|
+
const isModeT = getDeviceType(features) === 'touch' || getDeviceType(features) === 'pro';
|
|
23145
|
+
if (isModeT && locked) {
|
|
23146
|
+
yield device.getFeatures();
|
|
23147
|
+
}
|
|
23148
|
+
return passphraseState;
|
|
23149
|
+
});
|
|
23142
23150
|
const getPassphraseState = (features, commands) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23143
23151
|
if (!features)
|
|
23144
23152
|
return false;
|
|
@@ -23507,7 +23515,6 @@ DevicePool.emitter = new events.exports();
|
|
|
23507
23515
|
const Log$7 = getLogger(exports.LoggerNames.Transport);
|
|
23508
23516
|
const BleLogger = getLogger(exports.LoggerNames.HdBleTransport);
|
|
23509
23517
|
const HttpLogger = getLogger(exports.LoggerNames.HdTransportHttp);
|
|
23510
|
-
const LowLevelLogger = getLogger(exports.LoggerNames.HdTransportLowLevel);
|
|
23511
23518
|
class TransportManager {
|
|
23512
23519
|
static load() {
|
|
23513
23520
|
Log$7.debug('transport manager load');
|
|
@@ -23529,12 +23536,6 @@ class TransportManager {
|
|
|
23529
23536
|
Log$7.debug('React Native Do Not Initializing transports');
|
|
23530
23537
|
}
|
|
23531
23538
|
}
|
|
23532
|
-
else if (env === 'lowlevel') {
|
|
23533
|
-
if (!this.plugin) {
|
|
23534
|
-
throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured, 'Lowlevel transport mast have plugin');
|
|
23535
|
-
}
|
|
23536
|
-
yield this.transport.init(LowLevelLogger, DevicePool.emitter, this.plugin);
|
|
23537
|
-
}
|
|
23538
23539
|
else {
|
|
23539
23540
|
yield this.transport.init(HttpLogger);
|
|
23540
23541
|
}
|
|
@@ -23568,7 +23569,7 @@ class TransportManager {
|
|
|
23568
23569
|
}
|
|
23569
23570
|
});
|
|
23570
23571
|
}
|
|
23571
|
-
static setTransport(TransportConstructor
|
|
23572
|
+
static setTransport(TransportConstructor) {
|
|
23572
23573
|
const env = DataManager.getSettings('env');
|
|
23573
23574
|
if (env === 'react-native') {
|
|
23574
23575
|
this.transport = new TransportConstructor({ scanTimeout: 3000 });
|
|
@@ -23576,10 +23577,6 @@ class TransportManager {
|
|
|
23576
23577
|
else {
|
|
23577
23578
|
this.transport = new TransportConstructor();
|
|
23578
23579
|
}
|
|
23579
|
-
if (plugin) {
|
|
23580
|
-
this.plugin = plugin;
|
|
23581
|
-
Log$7.debug('set transport plugin: ', this.plugin);
|
|
23582
|
-
}
|
|
23583
23580
|
Log$7.debug('set transport: ', this.transport);
|
|
23584
23581
|
}
|
|
23585
23582
|
static getTransport() {
|
|
@@ -23597,7 +23594,6 @@ class TransportManager {
|
|
|
23597
23594
|
}
|
|
23598
23595
|
TransportManager.reactNativeInit = false;
|
|
23599
23596
|
TransportManager.messageVersion = 'latest';
|
|
23600
|
-
TransportManager.plugin = null;
|
|
23601
23597
|
|
|
23602
23598
|
const assertType = (res, resType) => {
|
|
23603
23599
|
const splitResTypes = Array.isArray(resType) ? resType : resType.split('|');
|
|
@@ -24247,7 +24243,7 @@ class Device extends events.exports {
|
|
|
24247
24243
|
hasUsePassphrase() {
|
|
24248
24244
|
var _a;
|
|
24249
24245
|
const isModeT = getDeviceType(this.features) === 'touch' || getDeviceType(this.features) === 'pro';
|
|
24250
|
-
const preCheckTouch = isModeT && ((_a = this.features) === null || _a === void 0 ? void 0 : _a.unlocked) ===
|
|
24246
|
+
const preCheckTouch = isModeT && ((_a = this.features) === null || _a === void 0 ? void 0 : _a.unlocked) === false;
|
|
24251
24247
|
return this.features && (!!this.features.passphrase_protection || preCheckTouch);
|
|
24252
24248
|
}
|
|
24253
24249
|
checkDeviceId(deviceId) {
|
|
@@ -24257,16 +24253,10 @@ class Device extends events.exports {
|
|
|
24257
24253
|
return false;
|
|
24258
24254
|
}
|
|
24259
24255
|
checkPassphraseState() {
|
|
24260
|
-
var _a;
|
|
24261
24256
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24262
24257
|
if (!this.features)
|
|
24263
24258
|
return false;
|
|
24264
|
-
const
|
|
24265
|
-
const isModeT = getDeviceType(this.features) === 'touch' || getDeviceType(this.features) === 'pro';
|
|
24266
|
-
const newState = yield getPassphraseState(this.features, this.commands);
|
|
24267
|
-
if (isModeT && locked) {
|
|
24268
|
-
yield this.getFeatures();
|
|
24269
|
-
}
|
|
24259
|
+
const newState = yield getPassphraseStateWithRefreshDeviceInfo(this);
|
|
24270
24260
|
if (this.passphraseState && this.passphraseState !== newState) {
|
|
24271
24261
|
this.clearInternalState();
|
|
24272
24262
|
return newState;
|
|
@@ -24434,18 +24424,11 @@ class GetPassphraseState extends BaseMethod {
|
|
|
24434
24424
|
this.useDevicePassphraseState = false;
|
|
24435
24425
|
}
|
|
24436
24426
|
run() {
|
|
24437
|
-
var _a, _b;
|
|
24438
24427
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24439
24428
|
if (!this.device.features)
|
|
24440
24429
|
return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed));
|
|
24441
|
-
|
|
24442
|
-
const
|
|
24443
|
-
const passphraseState = yield getPassphraseState(this.device.features, this.device.commands);
|
|
24444
|
-
const isModeT = getDeviceType(features) === 'touch' || getDeviceType(features) === 'pro';
|
|
24445
|
-
if (isModeT && locked) {
|
|
24446
|
-
const { message } = yield this.device.commands.typedCall('GetFeatures', 'Features', {});
|
|
24447
|
-
features = message;
|
|
24448
|
-
}
|
|
24430
|
+
const passphraseState = yield getPassphraseStateWithRefreshDeviceInfo(this.device);
|
|
24431
|
+
const { features } = this.device;
|
|
24449
24432
|
if (features && features.passphrase_protection === true) {
|
|
24450
24433
|
if (passphraseState && features.device_id) {
|
|
24451
24434
|
this.device.tryFixInternalState(passphraseState, features.device_id, features.session_id);
|
|
@@ -32020,14 +32003,14 @@ const initConnector = () => {
|
|
|
32020
32003
|
DevicePool.emitter.on(DEVICE.DISCONNECT, onDeviceDisconnectHandler);
|
|
32021
32004
|
return _connector;
|
|
32022
32005
|
};
|
|
32023
|
-
const initTransport = (Transport
|
|
32024
|
-
TransportManager.setTransport(Transport
|
|
32006
|
+
const initTransport = (Transport) => {
|
|
32007
|
+
TransportManager.setTransport(Transport);
|
|
32025
32008
|
};
|
|
32026
|
-
const init = (settings, Transport
|
|
32009
|
+
const init = (settings, Transport) => __awaiter(void 0, void 0, void 0, function* () {
|
|
32027
32010
|
try {
|
|
32028
32011
|
try {
|
|
32029
32012
|
yield DataManager.load(settings);
|
|
32030
|
-
initTransport(Transport
|
|
32013
|
+
initTransport(Transport);
|
|
32031
32014
|
}
|
|
32032
32015
|
catch (_b) {
|
|
32033
32016
|
Log.error('DataManager.load error');
|
package/dist/types/api/init.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import type { LowlevelTransportSharedPlugin } from '@onekeyfe/hd-transport';
|
|
2
1
|
import { LowLevelCoreApi } from '../../lowLevelInject';
|
|
3
2
|
import type { ConnectSettings } from '../settings';
|
|
4
|
-
export declare function init(settings: Partial<ConnectSettings>, lowLevelApi?: LowLevelCoreApi
|
|
3
|
+
export declare function init(settings: Partial<ConnectSettings>, lowLevelApi?: LowLevelCoreApi): Promise<boolean>;
|
|
5
4
|
export declare function updateSettings(settings: Partial<ConnectSettings>): Promise<boolean>;
|
|
6
5
|
//# sourceMappingURL=init.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/types/api/init.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/types/api/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,CAAC,OAAO,UAAU,IAAI,CAC1B,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC,EAClC,WAAW,CAAC,EAAE,eAAe,GAC5B,OAAO,CAAC,OAAO,CAAC,CAAC;AAEpB,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC"}
|
package/dist/types/settings.d.ts
CHANGED
|
@@ -12,7 +12,7 @@ export declare type ConnectSettings = {
|
|
|
12
12
|
priority: number;
|
|
13
13
|
trustedHost: boolean;
|
|
14
14
|
supportedBrowser?: boolean;
|
|
15
|
-
env: 'node' | 'web' | 'webextension' | 'electron' | 'react-native' | 'webusb'
|
|
15
|
+
env: 'node' | 'web' | 'webextension' | 'electron' | 'react-native' | 'webusb';
|
|
16
16
|
timestamp: number;
|
|
17
17
|
isFrame?: boolean;
|
|
18
18
|
preRelease?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/types/settings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,oBAAY,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,GAAG,EAAE,MAAM,GAAG,KAAK,GAAG,cAAc,GAAG,UAAU,GAAG,cAAc,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/types/settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { DeviceCommands } from '../device/DeviceCommands';
|
|
2
2
|
import type { Features, IDeviceModel, IDeviceType, IVersionArray, SupportFeatureType } from '../types';
|
|
3
3
|
import { MessageVersion } from '../data-manager/DataManager';
|
|
4
|
+
import { Device } from '../device/Device';
|
|
4
5
|
export declare const getDeviceModel: (features?: import("packages/hd-transport/dist").Features | undefined) => IDeviceModel;
|
|
5
6
|
export declare const getDeviceType: (features?: import("packages/hd-transport/dist").Features | undefined) => IDeviceType;
|
|
6
7
|
export declare const getDeviceTypeOnBootloader: (features?: import("packages/hd-transport/dist").Features | undefined) => IDeviceType;
|
|
@@ -17,7 +18,8 @@ export declare const getSupportMessageVersion: (features: Features | undefined)
|
|
|
17
18
|
};
|
|
18
19
|
export declare const supportInputPinOnSoftware: (features: Features) => SupportFeatureType;
|
|
19
20
|
export declare const supportNewPassphrase: (features?: import("packages/hd-transport/dist").Features | undefined) => SupportFeatureType;
|
|
20
|
-
export declare const
|
|
21
|
+
export declare const getPassphraseStateWithRefreshDeviceInfo: (device: Device) => Promise<string | false>;
|
|
22
|
+
export declare const getPassphraseState: (features: Features | undefined, commands: DeviceCommands) => Promise<string | false>;
|
|
21
23
|
export declare const supportBatchPublicKey: (features?: import("packages/hd-transport/dist").Features | undefined) => boolean;
|
|
22
24
|
export declare const supportModifyHomescreen: (features?: import("packages/hd-transport/dist").Features | undefined) => SupportFeatureType;
|
|
23
25
|
export declare const getFirmwareUpdateField: (features: Features, updateType: 'firmware' | 'ble') => 'firmware' | 'ble' | 'firmware-v4';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,aAAa,EACb,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAElB,OAAoB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,aAAa,EACb,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAElB,OAAoB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE1E,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,eAAO,MAAM,cAAc,4EAA0B,YAcpD,CAAC;AAEF,eAAO,MAAM,aAAa,4EAA0B,WAUnD,CAAC;AAEF,eAAO,MAAM,yBAAyB,4EAA0B,WACvC,CAAC;AAE1B,eAAO,MAAM,sBAAsB,iCAAoB,WAAW,GAAG,IAKpE,CAAC;AAEF,eAAO,MAAM,uBAAuB,qCAAwB,WAQ3D,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,WAM/C,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,QAAQ,WAOhD,CAAC;AAKF,eAAO,MAAM,wBAAwB,aAAc,QAAQ,GAAG,SAAS,kBAOtE,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAQhF,CAAC;AAEF,eAAO,MAAM,0BAA0B,aAAc,QAAQ,kBAW5D,CAAC;AAEF,eAAO,MAAM,wBAAwB,aACzB,QAAQ,GAAG,SAAS,KAC7B;IAAE,QAAQ,EAAE,IAAI,CAAC;IAAC,cAAc,EAAE,cAAc,CAAA;CAiClD,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,QAAQ,KAAG,kBAU9D,CAAC;AAEF,eAAO,MAAM,oBAAoB,4EAA0B,kBAW1D,CAAC;AAEF,eAAO,MAAM,uCAAuC,WAAkB,MAAM,4BAY3E,CAAC;AAEF,eAAO,MAAM,kBAAkB,aACnB,QAAQ,GAAG,SAAS,YACpB,cAAc,4BAgBzB,CAAC;AAEF,eAAO,MAAM,qBAAqB,4EAA0B,OAU3D,CAAC;AAEF,eAAO,MAAM,uBAAuB,4EAA0B,kBAU7D,CAAC;AAKF,eAAO,MAAM,sBAAsB,aACvB,QAAQ,cACN,UAAU,GAAG,KAAK,KAC7B,UAAU,GAAG,KAAK,GAAG,aAgBvB,CAAC"}
|
package/dist/utils/logger.d.ts
CHANGED
|
@@ -32,7 +32,6 @@ export declare enum LoggerNames {
|
|
|
32
32
|
HdCommonConnectSdk = "@onekey/common-connect-sdk",
|
|
33
33
|
HdBleSdk = "@onekey/hd-ble-sdk",
|
|
34
34
|
HdTransportHttp = "@onekey/hd-transport-http",
|
|
35
|
-
HdTransportLowLevel = "@onekey/hd-transport-lowlevel",
|
|
36
35
|
HdBleTransport = "@onekey/hd-ble-transport",
|
|
37
36
|
Connect = "@onekey/connect",
|
|
38
37
|
Iframe = "IFrame",
|
|
@@ -50,7 +49,6 @@ export declare const LoggerMap: {
|
|
|
50
49
|
"@onekey/hd-ble-sdk": Log;
|
|
51
50
|
"@onekey/hd-transport-http": Log;
|
|
52
51
|
"@onekey/hd-ble-transport": Log;
|
|
53
|
-
"@onekey/hd-transport-lowlevel": Log;
|
|
54
52
|
"@onekey/connect": Log;
|
|
55
53
|
IFrame: Log;
|
|
56
54
|
"[SendMessage]": Log;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,aAAK,UAAU,GAAG;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAMF,cAAM,GAAG;IACP,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,EAAE,UAAU,EAAE,CAAC;gBAEX,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAM5C,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAYxD,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASlB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASpB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASnB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;CAQrB;AAID,eAAO,MAAM,OAAO,WAAY,MAAM,uCAIrC,CAAC;AAEF,eAAO,MAAM,SAAS,yCAIrB,CAAC;AAEF,eAAO,MAAM,iBAAiB,WAAY,MAAM,WAAW,OAAO,SAIjE,CAAC;AAEF,eAAO,MAAM,MAAM,oBAOlB,CAAC;AAEF,eAAO,MAAM,oBAAoB,4BAA6B,WAAW,KAAK,IAAI,SAEjF,CAAC;AAuCF,oBAAY,WAAW;IACrB,IAAI,SAAS;IACb,SAAS,cAAc;IACvB,MAAM,WAAW;IACjB,cAAc,mBAAmB;IACjC,eAAe,oBAAoB;IACnC,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,kBAAkB,+BAA+B;IACjD,QAAQ,uBAAuB;IAC/B,eAAe,8BAA8B;IAC7C,
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,aAAK,UAAU,GAAG;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAMF,cAAM,GAAG;IACP,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,EAAE,UAAU,EAAE,CAAC;gBAEX,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAM5C,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAYxD,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASlB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASpB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IASnB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;CAQrB;AAID,eAAO,MAAM,OAAO,WAAY,MAAM,uCAIrC,CAAC;AAEF,eAAO,MAAM,SAAS,yCAIrB,CAAC;AAEF,eAAO,MAAM,iBAAiB,WAAY,MAAM,WAAW,OAAO,SAIjE,CAAC;AAEF,eAAO,MAAM,MAAM,oBAOlB,CAAC;AAEF,eAAO,MAAM,oBAAoB,4BAA6B,WAAW,KAAK,IAAI,SAEjF,CAAC;AAuCF,oBAAY,WAAW;IACrB,IAAI,SAAS;IACb,SAAS,cAAc;IACvB,MAAM,WAAW;IACjB,cAAc,mBAAmB;IACjC,eAAe,oBAAoB;IACnC,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,kBAAkB,+BAA+B;IACjD,QAAQ,uBAAuB;IAC/B,eAAe,8BAA8B;IAC7C,cAAc,6BAA6B;IAC3C,OAAO,oBAAoB;IAC3B,MAAM,WAAW;IACjB,WAAW,kBAAkB;IAC7B,MAAM,aAAa;CACpB;AAED,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;CAgBrB,CAAC;AAEF,eAAO,MAAM,SAAS,QAAS,WAAW,QAAmB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@onekeyfe/hd-core",
|
|
3
|
-
"version": "0.3.23
|
|
3
|
+
"version": "0.3.23",
|
|
4
4
|
"description": "> TODO: description",
|
|
5
5
|
"author": "OneKey",
|
|
6
6
|
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
|
|
@@ -25,8 +25,8 @@
|
|
|
25
25
|
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@onekeyfe/hd-shared": "^0.3.23
|
|
29
|
-
"@onekeyfe/hd-transport": "^0.3.23
|
|
28
|
+
"@onekeyfe/hd-shared": "^0.3.23",
|
|
29
|
+
"@onekeyfe/hd-transport": "^0.3.23",
|
|
30
30
|
"axios": "^0.27.2",
|
|
31
31
|
"bignumber.js": "^9.0.2",
|
|
32
32
|
"bytebuffer": "^5.0.1",
|
|
@@ -44,5 +44,5 @@
|
|
|
44
44
|
"@types/semver": "^7.3.9",
|
|
45
45
|
"ripple-keypairs": "^1.1.4"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "65bc552c4643acf7504a260c99727fb7c662775b"
|
|
48
48
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
|
|
2
2
|
import { UI_REQUEST } from '../constants/ui-request';
|
|
3
|
-
import {
|
|
3
|
+
import { getPassphraseStateWithRefreshDeviceInfo } from '../utils/deviceFeaturesUtils';
|
|
4
4
|
import { BaseMethod } from './BaseMethod';
|
|
5
5
|
|
|
6
6
|
export default class GetPassphraseState extends BaseMethod {
|
|
@@ -13,15 +13,8 @@ export default class GetPassphraseState extends BaseMethod {
|
|
|
13
13
|
if (!this.device.features)
|
|
14
14
|
return Promise.reject(ERRORS.TypedError(HardwareErrorCode.DeviceInitializeFailed));
|
|
15
15
|
|
|
16
|
-
|
|
17
|
-
const
|
|
18
|
-
const passphraseState = await getPassphraseState(this.device.features, this.device.commands);
|
|
19
|
-
const isModeT = getDeviceType(features) === 'touch' || getDeviceType(features) === 'pro';
|
|
20
|
-
|
|
21
|
-
if (isModeT && locked) {
|
|
22
|
-
const { message } = await this.device.commands.typedCall('GetFeatures', 'Features', {});
|
|
23
|
-
features = message;
|
|
24
|
-
}
|
|
16
|
+
const passphraseState = await getPassphraseStateWithRefreshDeviceInfo(this.device);
|
|
17
|
+
const { features } = this.device;
|
|
25
18
|
|
|
26
19
|
if (features && features.passphrase_protection === true) {
|
|
27
20
|
if (passphraseState && features.device_id) {
|
package/src/core/index.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import semver from 'semver';
|
|
2
2
|
import EventEmitter from 'events';
|
|
3
|
-
import { Features,
|
|
3
|
+
import { Features, OneKeyDeviceInfo } from '@onekeyfe/hd-transport';
|
|
4
4
|
import {
|
|
5
5
|
createDeferred,
|
|
6
6
|
Deferred,
|
|
@@ -765,19 +765,15 @@ export const initConnector = () => {
|
|
|
765
765
|
return _connector;
|
|
766
766
|
};
|
|
767
767
|
|
|
768
|
-
const initTransport = (Transport: any
|
|
769
|
-
TransportManager.setTransport(Transport
|
|
768
|
+
const initTransport = (Transport: any) => {
|
|
769
|
+
TransportManager.setTransport(Transport);
|
|
770
770
|
};
|
|
771
771
|
|
|
772
|
-
export const init = async (
|
|
773
|
-
settings: ConnectSettings,
|
|
774
|
-
Transport: any,
|
|
775
|
-
plugin?: LowlevelTransportSharedPlugin
|
|
776
|
-
) => {
|
|
772
|
+
export const init = async (settings: ConnectSettings, Transport: any) => {
|
|
777
773
|
try {
|
|
778
774
|
try {
|
|
779
775
|
await DataManager.load(settings);
|
|
780
|
-
initTransport(Transport
|
|
776
|
+
initTransport(Transport);
|
|
781
777
|
} catch {
|
|
782
778
|
Log.error('DataManager.load error');
|
|
783
779
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Transport } from '@onekeyfe/hd-transport';
|
|
2
2
|
import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
|
|
3
3
|
import DataManager, { MessageVersion } from './DataManager';
|
|
4
4
|
import { getLogger, LoggerNames } from '../utils';
|
|
@@ -10,7 +10,6 @@ import { Features } from '../types';
|
|
|
10
10
|
const Log = getLogger(LoggerNames.Transport);
|
|
11
11
|
const BleLogger = getLogger(LoggerNames.HdBleTransport);
|
|
12
12
|
const HttpLogger = getLogger(LoggerNames.HdTransportHttp);
|
|
13
|
-
const LowLevelLogger = getLogger(LoggerNames.HdTransportLowLevel);
|
|
14
13
|
|
|
15
14
|
/**
|
|
16
15
|
* transport 在同一个环境中只会存在一个
|
|
@@ -28,8 +27,6 @@ export default class TransportManager {
|
|
|
28
27
|
|
|
29
28
|
static messageVersion: MessageVersion = 'latest';
|
|
30
29
|
|
|
31
|
-
static plugin: LowlevelTransportSharedPlugin | null = null;
|
|
32
|
-
|
|
33
30
|
static load() {
|
|
34
31
|
Log.debug('transport manager load');
|
|
35
32
|
this.defaultMessages = DataManager.getProtobufMessages();
|
|
@@ -48,14 +45,6 @@ export default class TransportManager {
|
|
|
48
45
|
} else {
|
|
49
46
|
Log.debug('React Native Do Not Initializing transports');
|
|
50
47
|
}
|
|
51
|
-
} else if (env === 'lowlevel') {
|
|
52
|
-
if (!this.plugin) {
|
|
53
|
-
throw ERRORS.TypedError(
|
|
54
|
-
HardwareErrorCode.TransportNotConfigured,
|
|
55
|
-
'Lowlevel transport mast have plugin'
|
|
56
|
-
);
|
|
57
|
-
}
|
|
58
|
-
await this.transport.init(LowLevelLogger, DevicePool.emitter, this.plugin);
|
|
59
48
|
} else {
|
|
60
49
|
await this.transport.init(HttpLogger);
|
|
61
50
|
}
|
|
@@ -92,7 +81,7 @@ export default class TransportManager {
|
|
|
92
81
|
}
|
|
93
82
|
}
|
|
94
83
|
|
|
95
|
-
static setTransport(TransportConstructor: any
|
|
84
|
+
static setTransport(TransportConstructor: any) {
|
|
96
85
|
const env = DataManager.getSettings('env');
|
|
97
86
|
if (env === 'react-native') {
|
|
98
87
|
/** Actually initializes the ReactNativeTransport */
|
|
@@ -101,10 +90,6 @@ export default class TransportManager {
|
|
|
101
90
|
/** Actually initializes the HttpTransport */
|
|
102
91
|
this.transport = new TransportConstructor() as unknown as Transport;
|
|
103
92
|
}
|
|
104
|
-
if (plugin) {
|
|
105
|
-
this.plugin = plugin;
|
|
106
|
-
Log.debug('set transport plugin: ', this.plugin);
|
|
107
|
-
}
|
|
108
93
|
Log.debug('set transport: ', this.transport);
|
|
109
94
|
}
|
|
110
95
|
|
package/src/device/Device.ts
CHANGED
|
@@ -14,7 +14,7 @@ import {
|
|
|
14
14
|
getDeviceType,
|
|
15
15
|
getDeviceTypeOnBootloader,
|
|
16
16
|
getDeviceUUID,
|
|
17
|
-
|
|
17
|
+
getPassphraseStateWithRefreshDeviceInfo,
|
|
18
18
|
} from '../utils/deviceFeaturesUtils';
|
|
19
19
|
|
|
20
20
|
import type DeviceConnector from './DeviceConnector';
|
|
@@ -57,7 +57,9 @@ export interface DeviceEvents {
|
|
|
57
57
|
|
|
58
58
|
export interface Device {
|
|
59
59
|
on<K extends keyof DeviceEvents>(type: K, listener: (...event: DeviceEvents[K]) => void): this;
|
|
60
|
+
|
|
60
61
|
off<K extends keyof DeviceEvents>(type: K, listener: (...event: DeviceEvents[K]) => void): this;
|
|
62
|
+
|
|
61
63
|
emit<K extends keyof DeviceEvents>(type: K, ...args: DeviceEvents[K]): boolean;
|
|
62
64
|
}
|
|
63
65
|
|
|
@@ -572,7 +574,7 @@ export class Device extends EventEmitter {
|
|
|
572
574
|
hasUsePassphrase() {
|
|
573
575
|
const isModeT =
|
|
574
576
|
getDeviceType(this.features) === 'touch' || getDeviceType(this.features) === 'pro';
|
|
575
|
-
const preCheckTouch = isModeT && this.features?.unlocked ===
|
|
577
|
+
const preCheckTouch = isModeT && this.features?.unlocked === false;
|
|
576
578
|
|
|
577
579
|
return this.features && (!!this.features.passphrase_protection || preCheckTouch);
|
|
578
580
|
}
|
|
@@ -586,16 +588,7 @@ export class Device extends EventEmitter {
|
|
|
586
588
|
|
|
587
589
|
async checkPassphraseState() {
|
|
588
590
|
if (!this.features) return false;
|
|
589
|
-
const
|
|
590
|
-
const isModeT =
|
|
591
|
-
getDeviceType(this.features) === 'touch' || getDeviceType(this.features) === 'pro';
|
|
592
|
-
|
|
593
|
-
const newState = await getPassphraseState(this.features, this.commands);
|
|
594
|
-
|
|
595
|
-
// if Touch/Pro was locked before, refresh the passphrase state
|
|
596
|
-
if (isModeT && locked) {
|
|
597
|
-
await this.getFeatures();
|
|
598
|
-
}
|
|
591
|
+
const newState = await getPassphraseStateWithRefreshDeviceInfo(this);
|
|
599
592
|
|
|
600
593
|
// When exists passphraseState, check passphraseState
|
|
601
594
|
if (this.passphraseState && this.passphraseState !== newState) {
|
package/src/types/api/init.ts
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import type { LowlevelTransportSharedPlugin } from '@onekeyfe/hd-transport';
|
|
2
1
|
import { LowLevelCoreApi } from '../../lowLevelInject';
|
|
3
2
|
import type { ConnectSettings } from '../settings';
|
|
4
3
|
|
|
5
4
|
export declare function init(
|
|
6
5
|
settings: Partial<ConnectSettings>,
|
|
7
|
-
lowLevelApi?: LowLevelCoreApi
|
|
8
|
-
pulgin?: LowlevelTransportSharedPlugin
|
|
6
|
+
lowLevelApi?: LowLevelCoreApi
|
|
9
7
|
): Promise<boolean>;
|
|
10
8
|
|
|
11
9
|
export declare function updateSettings(settings: Partial<ConnectSettings>): Promise<boolean>;
|
package/src/types/settings.ts
CHANGED
|
@@ -14,7 +14,7 @@ export type ConnectSettings = {
|
|
|
14
14
|
priority: number;
|
|
15
15
|
trustedHost: boolean;
|
|
16
16
|
supportedBrowser?: boolean;
|
|
17
|
-
env: 'node' | 'web' | 'webextension' | 'electron' | 'react-native' | 'webusb'
|
|
17
|
+
env: 'node' | 'web' | 'webextension' | 'electron' | 'react-native' | 'webusb';
|
|
18
18
|
timestamp: number;
|
|
19
19
|
isFrame?: boolean;
|
|
20
20
|
preRelease?: boolean;
|
|
@@ -12,6 +12,7 @@ import type {
|
|
|
12
12
|
import { DeviceTypeToModels } from '../types';
|
|
13
13
|
import DataManager, { MessageVersion } from '../data-manager/DataManager';
|
|
14
14
|
import { PROTOBUF_MESSAGE_CONFIG } from '../data-manager/MessagesConfig';
|
|
15
|
+
import { Device } from '../device/Device';
|
|
15
16
|
|
|
16
17
|
export const getDeviceModel = (features?: Features): IDeviceModel => {
|
|
17
18
|
if (!features || typeof features !== 'object') {
|
|
@@ -178,7 +179,24 @@ export const supportNewPassphrase = (features?: Features): SupportFeatureType =>
|
|
|
178
179
|
return { support: semver.gte(currentVersion, '2.4.0'), require: '2.4.0' };
|
|
179
180
|
};
|
|
180
181
|
|
|
181
|
-
export const
|
|
182
|
+
export const getPassphraseStateWithRefreshDeviceInfo = async (device: Device) => {
|
|
183
|
+
const { features, commands } = device;
|
|
184
|
+
const locked = features?.unlocked === false;
|
|
185
|
+
const passphraseState = await getPassphraseState(features, commands);
|
|
186
|
+
const isModeT = getDeviceType(features) === 'touch' || getDeviceType(features) === 'pro';
|
|
187
|
+
|
|
188
|
+
// if Touch/Pro was locked before, refresh the device state
|
|
189
|
+
if (isModeT && locked) {
|
|
190
|
+
await device.getFeatures();
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
return passphraseState;
|
|
194
|
+
};
|
|
195
|
+
|
|
196
|
+
export const getPassphraseState = async (
|
|
197
|
+
features: Features | undefined,
|
|
198
|
+
commands: DeviceCommands
|
|
199
|
+
) => {
|
|
182
200
|
if (!features) return false;
|
|
183
201
|
const { message, type } = await commands.typedCall('GetAddress', 'Address', {
|
|
184
202
|
address_n: [toHardened(44), toHardened(1), toHardened(0), 0, 0],
|
package/src/utils/logger.ts
CHANGED
|
@@ -155,7 +155,6 @@ export enum LoggerNames {
|
|
|
155
155
|
HdCommonConnectSdk = '@onekey/common-connect-sdk',
|
|
156
156
|
HdBleSdk = '@onekey/hd-ble-sdk',
|
|
157
157
|
HdTransportHttp = '@onekey/hd-transport-http',
|
|
158
|
-
HdTransportLowLevel = '@onekey/hd-transport-lowlevel',
|
|
159
158
|
HdBleTransport = '@onekey/hd-ble-transport',
|
|
160
159
|
Connect = '@onekey/connect',
|
|
161
160
|
Iframe = 'IFrame',
|
|
@@ -174,7 +173,6 @@ export const LoggerMap = {
|
|
|
174
173
|
[LoggerNames.HdBleSdk]: initLog(LoggerNames.HdBleSdk),
|
|
175
174
|
[LoggerNames.HdTransportHttp]: initLog(LoggerNames.HdTransportHttp),
|
|
176
175
|
[LoggerNames.HdBleTransport]: initLog(LoggerNames.HdBleTransport),
|
|
177
|
-
[LoggerNames.HdTransportLowLevel]: initLog(LoggerNames.HdTransportLowLevel),
|
|
178
176
|
[LoggerNames.Connect]: initLog(LoggerNames.Connect),
|
|
179
177
|
[LoggerNames.Iframe]: initLog(LoggerNames.Iframe),
|
|
180
178
|
[LoggerNames.SendMessage]: initLog(LoggerNames.SendMessage),
|