Mirrors/trezor-suite
2
0
Fork 0
mirror of https://github.com/trezor/trezor-suite.git synced 2026-03-06 23:39:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore(protocol): accept Buffer in decode function

Browse Source
This commit is contained in:
Szymon Lesisz
2024-07-29 16:23:06 +02:00
committed by martin
parent 2d6744abab
commit 858837bb2a
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/protocol/src/protocol-bridge/decode.ts
View File

@@ -14,12 +14,11 @@ const readHeader = (buffer: Buffer) => {
};
export const decode: TransportProtocolDecode = bytes => {
const buffer = Buffer.from(bytes);
const { messageType, length } = readHeader(buffer);
const { messageType, length } = readHeader(bytes);
return {
messageType,
length,
payload: buffer.subarray(HEADER_SIZE),
payload: bytes.subarray(HEADER_SIZE),
};
};

6
packages/protocol/src/protocol-v1/decode.ts
View File

@@ -21,7 +21,6 @@ const readHeaderChunked = (buffer: Buffer) => {
};
// Parses first raw input that comes from Trezor and returns some information about the whole message.
// [compatibility]: accept Buffer just like decode does. But this would require changes in lower levels
export const decode: TransportProtocolDecode = bytes => {
// note: the occasionally appearing error "Attempt to access memory outside buffer bounds" comes from here in certain cases
// when usb.transferIn (read) did not receive any data but resolved with success. bytes has byteLength 0 in this case.
@@ -29,8 +28,7 @@ export const decode: TransportProtocolDecode = bytes => {
console.error('protocol-v1: decode: received empty buffer');
}
const buffer = Buffer.from(bytes);
const { magic, sharp1, sharp2, messageType, length } = readHeaderChunked(buffer);
const { magic, sharp1, sharp2, messageType, length } = readHeaderChunked(bytes);
if (
magic !== MESSAGE_MAGIC_HEADER_BYTE ||
@@ -44,6 +42,6 @@ export const decode: TransportProtocolDecode = bytes => {
return {
length,
messageType,
payload: buffer.subarray(HEADER_SIZE),
payload: bytes.subarray(HEADER_SIZE),
};
};

2
packages/protocol/src/types.ts
View File

@@ -1,4 +1,4 @@
export type TransportProtocolDecode = (bytes: ArrayBuffer) => {
export type TransportProtocolDecode = (bytes: Buffer) => {
length: number;
messageType: number | string;
payload: Buffer;

4
packages/transport-bridge/src/core.ts
View File

@@ -61,9 +61,7 @@ export const createApi = (apiArg: 'usb' | 'udp' | AbstractApi, logger?: Log) =>
data: string;
signal: AbortSignal;
}) => {
const { messageType, payload } = protocolBridge.decode(
new Uint8Array(Buffer.from(data, 'hex')),
);
const { messageType, payload } = protocolBridge.decode(Buffer.from(data, 'hex'));
const encodedMessage = protocolV1.encode(payload, { messageType });
const chunks = createChunks(