@onekeyfe/hd-transport-lowlevel 1.1.34-alpha.3 → 1.1.34-alpha.4

package/dist/index.d.ts

@@ -1,53 +1,26 @@
-import * as transport from '@onekeyfe/hd-transport';
-import transport__default, { ProtocolType, LowlevelTransportSharedPlugin, LowLevelDevice, TransportCallOptions } from '@onekeyfe/hd-transport';
+import * as _onekeyfe_hd_transport from '@onekeyfe/hd-transport';
+import _onekeyfe_hd_transport__default, { LowlevelTransportSharedPlugin } from '@onekeyfe/hd-transport';
 import EventEmitter from 'events';
 
 type LowLevelAcquireInput = {
     uuid: string;
-    expectedProtocol?: ProtocolType;
 };
 
 declare class LowlevelTransport {
-    _messages: ReturnType<typeof transport__default.parseConfigure> | undefined;
-    _messagesV2: ReturnType<typeof transport__default.parseConfigure> | undefined;
+    _messages: ReturnType<typeof _onekeyfe_hd_transport__default.parseConfigure> | undefined;
     configured: boolean;
     Log?: any;
     emitter?: EventEmitter;
     plugin: LowlevelTransportSharedPlugin;
-    private deviceProtocol;
-    private deviceProtocolHints;
-    private protocolV2Assemblers;
-    private protocolV2Generations;
-    private connectedDevices;
-    private protocolV2Links;
-    getProtocolType(path: string): ProtocolType | undefined;
     init(logger: any, emitter: EventEmitter, plugin: LowlevelTransportSharedPlugin): void;
     configure(signedData: any): void;
-    configureProtocolV2(signedData: any): void;
     listen(): void;
-    enumerate(): Promise<LowLevelDevice[]>;
+    enumerate(): Promise<_onekeyfe_hd_transport.LowLevelDevice[]>;
     acquire(input: LowLevelAcquireInput): Promise<{
         uuid: string;
-        protocolType: ProtocolType;
     }>;
     release(uuid: string): Promise<boolean>;
-    call(uuid: string, name: string, data: Record<string, unknown>, options?: TransportCallOptions): Promise<transport.MessageFromOneKey>;
-    private callProtocolV1;
-    private createProtocolTimeoutError;
-    private createProtocolMismatchError;
-    private createProtocolDetectionError;
-    private clearProbeProtocol;
-    private detectProtocol;
-    private resetConnectionAfterProbe;
-    private probeProtocolV1;
-    private probeProtocolV2;
-    private receiveHex;
-    private readProtocolV1Message;
-    private readProtocolV2Frame;
-    private writeProtocolV2Frame;
-    private callProtocolV2;
-    private createProtocolV2Adapter;
-    private advanceProtocolV2Generation;
+    call(uuid: string, name: string, data: Record<string, unknown>): Promise<_onekeyfe_hd_transport.MessageFromOneKey>;
     cancel(): void;
 }
 

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,SAWN,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,YAAY,EACZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAqBpD,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,WAAW,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAErE,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,MAAM,EAAE,6BAA6B,CAAuC;IAE5E,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,oBAAoB,CAAoD;IAEhF,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,eAAe,CA6BpB;IAEH,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIvD,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,6BAA6B;IAO9E,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAOnC,MAAM;IAIA,SAAS;IAWT,OAAO,CAAC,KAAK,EAAE,oBAAoB;;;;IA6BnC,OAAO,CAAC,IAAI,EAAE,MAAM;IAgBpB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YAsBlB,cAAc;IAoC5B,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;YAsDd,yBAAyB;YAiCzB,eAAe;YAgBf,eAAe;YA6Bf,UAAU;YAUV,qBAAqB;YAmBrB,mBAAmB;YAqBnB,oBAAoB;YAOpB,cAAc;IA6B5B,OAAO,CAAC,uBAAuB;IAkC/B,OAAO,CAAC,2BAA2B;IAMnC,MAAM;CAGP"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,SAA8B,MAAM,wBAAwB,CAAC;AAEpE,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAIpD,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,MAAM,EAAE,6BAA6B,CAAuC;IAE5E,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,6BAA6B;IAO9E,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAIN,SAAS;IAIH,OAAO,CAAC,KAAK,EAAE,oBAAoB;;;IAanC,OAAO,CAAC,IAAI,EAAE,MAAM;IAUpB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAuCpE,MAAM;CAGP"}

package/dist/index.js

@@ -37,62 +37,11 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-const { check, ProtocolV1, parseConfigure } = transport__default["default"];
-const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
-const PROTOCOL_V2_PROBE_TIMEOUT_MS = 5000;
-const LOWLEVEL_PROTOCOL_TIMEOUT_MS = 30000;
-const LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH = 64;
-function inferProtocolHintFromDeviceName(name) {
-    return /\bpro\s*2\b/i.test(name !== null && name !== void 0 ? name : '') ? 'V2' : undefined;
-}
-function isProtocolV1TransportChunk(data) {
-    return data.length >= 9 && data[0] === 0x3f && data[1] === 0x23 && data[2] === 0x23;
-}
-function readProtocolV1PayloadLength(data) {
-    return data[5] * 0x1000000 + data[6] * 0x10000 + data[7] * 0x100 + data[8];
-}
+const { check, buildBuffers, receiveOne, parseConfigure } = transport__default["default"];
 class LowlevelTransport {
     constructor() {
         this.configured = false;
         this.plugin = {};
-        this.deviceProtocol = new Map();
-        this.deviceProtocolHints = new Map();
-        this.protocolV2Assemblers = new Map();
-        this.protocolV2Generations = new Map();
-        this.connectedDevices = new Set();
-        this.protocolV2Links = new transport.ProtocolV2LinkManager({
-            getSchemas: () => {
-                if (!this._messages || !this._messagesV2) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
-                }
-                return {
-                    protocolV1: this._messages,
-                    protocolV2: this._messagesV2,
-                };
-            },
-            classifyError: () => 'link-fatal',
-            onLinkInvalidated: (uuid, reason) => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b, _c;
-                (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
-                (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug(`[LowlevelTransport] Protocol V2 link invalidated: ${uuid}`, reason);
-                if (reason.startsWith('Protocol V2 link-fatal error:')) {
-                    this.deviceProtocol.delete(uuid);
-                    this.advanceProtocolV2Generation(uuid);
-                    try {
-                        yield this.plugin.disconnect(uuid);
-                    }
-                    catch (error) {
-                        (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug(`[LowlevelTransport] disconnect tainted Protocol V2 link failed: ${uuid}`, error);
-                    }
-                    finally {
-                        this.connectedDevices.delete(uuid);
-                    }
-                }
-            }),
-        });
-    }
-    getProtocolType(path) {
-        return this.deviceProtocol.get(path);
     }
     init(logger, emitter, plugin) {
         this.Log = logger;
@@ -105,58 +54,28 @@ class LowlevelTransport {
         this.configured = true;
         this._messages = messages;
     }
-    configureProtocolV2(signedData) {
-        this._messagesV2 = parseConfigure(signedData);
-        this.protocolV2Links
-            .invalidateAllLinks('Protocol V2 schema reconfigured')
-            .catch(error => { var _a; return (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('Protocol V2 schema link cleanup failed:', error); });
-    }
     listen() {
     }
     enumerate() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const devices = yield this.plugin.enumerate();
-            return devices.map((device) => {
-                const protocolHint = inferProtocolHintFromDeviceName(device.name);
-                if (protocolHint) {
-                    this.deviceProtocolHints.set(device.id, protocolHint);
-                }
-                return device;
-            });
-        });
+        return this.plugin.enumerate();
     }
     acquire(input) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const alreadyConnected = this.connectedDevices.has(input.uuid);
             try {
                 yield this.plugin.connect(input.uuid);
-                if (!alreadyConnected) {
-                    this.connectedDevices.add(input.uuid);
-                    this.advanceProtocolV2Generation(input.uuid);
-                }
+                return { uuid: input.uuid };
             }
             catch (error) {
-                this.connectedDevices.delete(input.uuid);
                 this.Log.debug('lowlelvel transport connect error: ', error);
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.LowlevelTrasnportConnectError, (_a = error.message) !== null && _a !== void 0 ? _a : error);
             }
-            this.protocolV2Assemblers.set(input.uuid, new transport.ProtocolV2FrameAssembler());
-            const protocolHint = input.expectedProtocol
-                ? undefined
-                : this.deviceProtocolHints.get(input.uuid);
-            const protocolType = yield this.detectProtocol(input.uuid, input.expectedProtocol, protocolHint);
-            return { uuid: input.uuid, protocolType };
         });
     }
     release(uuid) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.protocolV2Links.invalidateLink(uuid, 'Lowlevel transport released');
                 yield this.plugin.disconnect(uuid);
-                this.connectedDevices.delete(uuid);
-                this.deviceProtocol.delete(uuid);
-                this.protocolV2Assemblers.delete(uuid);
                 return true;
             }
             catch (error) {
@@ -165,31 +84,22 @@ class LowlevelTransport {
             }
         });
     }
-    call(uuid, name, data, options) {
+    call(uuid, name, data) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this._messages === null || !this._messages) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
-            const protocol = this.getProtocolType(uuid);
-            if (!protocol) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol has not been detected for ${uuid}`);
+            const messages = this._messages;
+            if (transport.LogBlockCommand.has(name)) {
+                this.Log.debug('lowlevel-transport', 'call-', ' name: ', name);
             }
-            this.Log.debug('transport call', { name, protocol });
-            if (protocol === 'V2') {
-                return this.callProtocolV2(uuid, name, data, options);
+            else {
+                this.Log.debug('lowlevel-transport', 'call-', ' name: ', name, ' data: ', data);
             }
-            return this.callProtocolV1(uuid, name, data, options);
-        });
-    }
-    callProtocolV1(uuid, name, data, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this._messages) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
-            }
-            const messages = this._messages;
-            const buffers = ProtocolV1.encodeTransportPackets(messages, name, data);
+            const buffers = buildBuffers(messages, name, data);
             for (const o of buffers) {
                 const outData = o.toString('hex');
+                this.Log.debug('send hex strting: ', outData);
                 try {
                     yield this.plugin.send(uuid, outData);
                 }
@@ -199,261 +109,20 @@ class LowlevelTransport {
                 }
             }
             try {
-                const response = yield this.readProtocolV1Message(uuid, options === null || options === void 0 ? void 0 : options.timeoutMs);
-                const jsonData = ProtocolV1.decodeMessage(messages, response);
-                return check.call(jsonData);
-            }
-            catch (e) {
-                if (name === 'Initialize' && (options === null || options === void 0 ? void 0 : options.timeoutMs) === PROTOCOL_PROBE_TIMEOUT_MS) {
-                    this.Log.debug('[LowlevelTransport] Protocol V1 Initialize probe call failed:', e);
-                }
-                else {
-                    this.Log.error('lowlevel call error: ', e);
-                }
-                throw e;
-            }
-        });
-    }
-    createProtocolTimeoutError(name, timeout) {
-        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, `Lowlevel response timeout after ${timeout}ms for ${name}`);
-    }
-    createProtocolMismatchError(expected) {
-        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`);
-    }
-    createProtocolDetectionError() {
-        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, 'Unable to detect BLE protocol: device did not respond to Protocol V1 Initialize or Protocol V2 Ping');
-    }
-    clearProbeProtocol(uuid, protocol) {
-        if (this.deviceProtocol.get(uuid) === protocol) {
-            this.deviceProtocol.delete(uuid);
-        }
-    }
-    detectProtocol(uuid, expectedProtocol, protocolHint) {
-        var _a, _b, _c, _d, _e, _f;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (expectedProtocol === 'V2') {
-                this.deviceProtocol.set(uuid, 'V2');
-                (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V2 (expected)`);
-                return 'V2';
-            }
-            if (expectedProtocol === 'V1') {
-                if (yield this.probeProtocolV1(uuid)) {
-                    this.deviceProtocol.set(uuid, 'V1');
-                    (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V1 (expected)`);
-                    return 'V1';
-                }
-                throw this.createProtocolMismatchError(expectedProtocol);
-            }
-            if (protocolHint === 'V2' && (yield this.probeProtocolV2(uuid))) {
-                this.deviceProtocol.set(uuid, 'V2');
-                (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V2 (hint)`);
-                return 'V2';
-            }
-            const cachedProtocol = this.deviceProtocol.get(uuid);
-            if (cachedProtocol === 'V2' && (yield this.probeProtocolV2(uuid))) {
-                this.deviceProtocol.set(uuid, 'V2');
-                (_d = this.Log) === null || _d === void 0 ? void 0 : _d.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V2 (cached)`);
-                return 'V2';
-            }
-            const protocolV1Detected = yield this.probeProtocolV1(uuid);
-            if (protocolV1Detected) {
-                this.deviceProtocol.set(uuid, 'V1');
-                (_e = this.Log) === null || _e === void 0 ? void 0 : _e.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V1`);
-                return 'V1';
-            }
-            yield this.resetConnectionAfterProbe(uuid, 'V1');
-            if (yield this.probeProtocolV2(uuid)) {
-                this.deviceProtocol.set(uuid, 'V2');
-                (_f = this.Log) === null || _f === void 0 ? void 0 : _f.debug(`[LowlevelTransport] detectProtocol: uuid=${uuid} -> V2`);
-                return 'V2';
-            }
-            this.deviceProtocol.delete(uuid);
-            throw this.createProtocolDetectionError();
-        });
-    }
-    resetConnectionAfterProbe(uuid, protocol) {
-        var _a, _b, _c, _d;
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.protocolV2Links.invalidateLink(uuid, `Reset connection after Protocol ${protocol} probe`);
-            (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
-            try {
-                this.connectedDevices.delete(uuid);
-                yield this.plugin.disconnect(uuid);
-            }
-            catch (error) {
-                (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug(`[LowlevelTransport] disconnect after Protocol ${protocol} probe failed:`, error);
-            }
-            try {
-                yield this.plugin.connect(uuid);
-                this.connectedDevices.add(uuid);
-                this.advanceProtocolV2Generation(uuid);
-            }
-            catch (error) {
-                (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug(`[LowlevelTransport] reconnect after Protocol ${protocol} probe failed:`, error);
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.LowlevelTrasnportConnectError, (_d = error.message) !== null && _d !== void 0 ? _d : error);
-            }
-        });
-    }
-    probeProtocolV1(uuid) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this._messages) {
-                return false;
-            }
-            try {
-                this.deviceProtocol.set(uuid, 'V1');
-                yield this.callProtocolV1(uuid, 'Initialize', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT_MS });
-                return true;
-            }
-            catch (error) {
-                this.clearProbeProtocol(uuid, 'V1');
-                (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[LowlevelTransport] Protocol V1 Initialize probe failed:', error);
-                return false;
-            }
-        });
-    }
-    probeProtocolV2(uuid) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this._messages || !this._messagesV2) {
-                return false;
-            }
-            this.deviceProtocol.set(uuid, 'V2');
-            (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
-            try {
-                const detected = yield transport.probeProtocolV2({
-                    call: (name, data, options) => this.callProtocolV2(uuid, name, data, options),
-                    timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT_MS,
-                    logger: this.Log,
-                    logPrefix: 'ProtocolV2 Lowlevel-BLE',
-                    onProbeFailed: () => __awaiter(this, void 0, void 0, function* () {
-                        var _b;
-                        (_b = this.protocolV2Assemblers.get(uuid)) === null || _b === void 0 ? void 0 : _b.reset();
-                        yield this.resetConnectionAfterProbe(uuid, 'V2');
-                    }),
-                });
-                if (!detected) {
-                    this.clearProbeProtocol(uuid, 'V2');
+                const response = yield this.plugin.receive();
+                if (typeof response !== 'string') {
+                    throw new Error('Returning data is not string');
                 }
-                return detected;
-            }
-            catch (error) {
-                this.clearProbeProtocol(uuid, 'V2');
-                throw error;
-            }
-        });
-    }
-    receiveHex(uuid, timeoutMs, commandName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const response = yield transport.withProtocolTimeout(this.plugin.receive(uuid), timeoutMs, () => this.createProtocolTimeoutError(commandName, timeoutMs !== null && timeoutMs !== void 0 ? timeoutMs : 0));
-            if (typeof response !== 'string') {
-                throw new Error('Returning data is not string');
-            }
-            return response;
-        });
-    }
-    readProtocolV1Message(uuid, timeoutMs) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const first = yield this.receiveHex(uuid, timeoutMs, 'ProtocolV1');
-            const firstData = transport.hexToBytes(first);
-            if (!isProtocolV1TransportChunk(firstData)) {
-                return first;
-            }
-            const payloadLength = readProtocolV1PayloadLength(firstData);
-            let buffer = firstData.slice(3);
-            const expectedLength = transport.PROTOCOL_V1_MESSAGE_HEADER_SIZE + payloadLength;
-            while (buffer.length < expectedLength) {
-                const next = yield this.receiveHex(uuid, timeoutMs, 'ProtocolV1');
-                buffer = transport.concatUint8Arrays([buffer, transport.hexToBytes(next)]);
-            }
-            return transport.bytesToHex(buffer.slice(0, expectedLength));
-        });
-    }
-    readProtocolV2Frame(uuid, timeoutMs, commandName = 'ProtocolV2') {
-        return __awaiter(this, void 0, void 0, function* () {
-            let assembler = this.protocolV2Assemblers.get(uuid);
-            if (!assembler) {
-                assembler = new transport.ProtocolV2FrameAssembler();
-                this.protocolV2Assemblers.set(uuid, assembler);
-            }
-            const queuedFrame = assembler.push(new Uint8Array(0));
-            if (queuedFrame)
-                return queuedFrame;
-            let frame;
-            while (!frame) {
-                const response = yield this.receiveHex(uuid, timeoutMs, commandName);
-                const chunk = transport.hexToBytes(response);
-                if (chunk.length > 0) {
-                    frame = assembler.push(chunk);
-                }
-            }
-            return frame;
-        });
-    }
-    writeProtocolV2Frame(uuid, frame) {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (let offset = 0; offset < frame.length; offset += LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH) {
-                const chunk = frame.slice(offset, offset + LOWLEVEL_PROTOCOL_V2_PACKET_LENGTH);
-                yield this.plugin.send(uuid, transport.bytesToHex(chunk));
-            }
-        });
-    }
-    callProtocolV2(uuid, name, data, options) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this._messages || !this._messagesV2) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
-            }
-            const timeoutMs = (_a = options === null || options === void 0 ? void 0 : options.timeoutMs) !== null && _a !== void 0 ? _a : LOWLEVEL_PROTOCOL_TIMEOUT_MS;
-            try {
-                return yield this.protocolV2Links.call(uuid, () => this.createProtocolV2Adapter(uuid), name, data, Object.assign(Object.assign({}, options), { timeoutMs }));
+                this.Log.debug('receive data: ', response);
+                const jsonData = receiveOne(messages, response);
+                return check.call(jsonData);
             }
             catch (e) {
-                this.Log.error('lowlevel Protocol V2 call error: ', e);
+                this.Log.error('lowlevel call error: ', e);
                 throw e;
             }
         });
     }
-    createProtocolV2Adapter(uuid) {
-        var _a;
-        const generation = (_a = this.protocolV2Generations.get(uuid)) !== null && _a !== void 0 ? _a : 0;
-        const assertCurrentGeneration = () => {
-            if (this.protocolV2Generations.get(uuid) !== generation) {
-                throw new Error(`Protocol V2 connection generation changed for ${uuid}`);
-            }
-        };
-        return {
-            router: transport.PROTOCOL_V2_CHANNEL_BLE_UART,
-            maxFrameBytes: transport.PROTOCOL_V2_BLE_FRAME_MAX_BYTES,
-            generation,
-            prepareCall: () => {
-                var _a;
-                assertCurrentGeneration();
-                (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
-            },
-            writeFrame: (frame) => {
-                assertCurrentGeneration();
-                return this.writeProtocolV2Frame(uuid, frame);
-            },
-            readFrame: (context) => {
-                assertCurrentGeneration();
-                return this.readProtocolV2Frame(uuid, context.timeoutMs, context.messageName);
-            },
-            reset: () => {
-                var _a;
-                (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
-            },
-            logger: this.Log,
-            logPrefix: 'ProtocolV2 Lowlevel-BLE',
-            createTimeoutError: (messageName, timeout) => this.createProtocolTimeoutError(messageName, timeout),
-        };
-    }
-    advanceProtocolV2Generation(uuid) {
-        var _a;
-        const nextGeneration = ((_a = this.protocolV2Generations.get(uuid)) !== null && _a !== void 0 ? _a : 0) + 1;
-        this.protocolV2Generations.set(uuid, nextGeneration);
-        return nextGeneration;
-    }
     cancel() {
         this.Log.debug('lowlevel-transport', 'cancel');
     }

package/dist/types.d.ts

@@ -1,6 +1,4 @@
-import type { ProtocolType } from '@onekeyfe/hd-transport';
 export type LowLevelAcquireInput = {
     uuid: string;
-    expectedProtocol?: ProtocolType;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,YAAY,CAAC;CACjC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;CACd,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-lowlevel",
-  "version": "1.1.34-alpha.3",
+  "version": "1.1.34-alpha.4",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -19,8 +19,8 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.1.34-alpha.3",
-    "@onekeyfe/hd-transport": "1.1.34-alpha.3"
+    "@onekeyfe/hd-shared": "1.1.34-alpha.4",
+    "@onekeyfe/hd-transport": "1.1.34-alpha.4"
   },
-  "gitHead": "3688bc8495eeb2ffd5616270d13fa29e8967623a"
+  "gitHead": "d546bc55410990351d34009230aefea77725d0d6"
 }