From 10403a49cafb64392919eb53cb807a846d44db6c Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Sat, 7 Dec 2024 11:19:20 -0600 Subject: [PATCH] npm run format:write --- packages/acn/src/models.ts | 16 ++++++------- packages/acn/src/pdu/rlp.ts | 2 +- packages/acn/src/pdu/sdt.ts | 46 ++++++++++++++++++++++--------------- packages/acn/src/utils.ts | 14 +++++------ 4 files changed, 44 insertions(+), 34 deletions(-) diff --git a/packages/acn/src/models.ts b/packages/acn/src/models.ts index 0eae7e9..80fd115 100644 --- a/packages/acn/src/models.ts +++ b/packages/acn/src/models.ts @@ -1,6 +1,6 @@ export enum Protocols { - SDT = 1 -}; + SDT = 1, +} export type UDPPreamble = { preambleSize: number; @@ -114,12 +114,12 @@ export type SDTAckData = { export type SessionDataTransportPDU = { vector: SessionDataTransportVectors; // TODO(jwetzell): cleanup these types - data: SDTJoinData | SDTJoinAcceptData | SDTJoinRefuseData | SDTWrapperData | SDTAckData | SDTLeavingData| Uint8Array; + data: SDTJoinData | SDTJoinAcceptData | SDTJoinRefuseData | SDTWrapperData | SDTAckData | SDTLeavingData | Uint8Array; }; export type SDTClientBlock = { - memberID: number - clientProtocol: number - association: number - data: SessionDataTransportPDU | Uint8Array -} + memberID: number; + clientProtocol: number; + association: number; + data: SessionDataTransportPDU | Uint8Array; +}; diff --git a/packages/acn/src/pdu/rlp.ts b/packages/acn/src/pdu/rlp.ts index 3190f4d..4e0b569 100644 --- a/packages/acn/src/pdu/rlp.ts +++ b/packages/acn/src/pdu/rlp.ts @@ -54,7 +54,7 @@ function decode(bytes: Uint8Array): RootLayerPDU { if (vector === Protocols.SDT) { data = pdu.sdt.decode(data); - } + } return { vector, diff --git a/packages/acn/src/pdu/sdt.ts b/packages/acn/src/pdu/sdt.ts index 72eefec..32c6a9b 100644 --- a/packages/acn/src/pdu/sdt.ts +++ b/packages/acn/src/pdu/sdt.ts @@ -1,4 +1,15 @@ -import { Protocols, SDTAckData, SDTJoinAcceptData, SDTJoinData, SDTJoinRefuseData, SDTLeavingData, SDTWrapperData, SessionDataTransportPDU, SessionDataTransportVectors, TransportLayerAddress } from '../models'; +import { + Protocols, + SDTAckData, + SDTJoinAcceptData, + SDTJoinData, + SDTJoinRefuseData, + SDTLeavingData, + SDTWrapperData, + SessionDataTransportPDU, + SessionDataTransportVectors, + TransportLayerAddress, +} from '../models'; import { toHex } from '../utils'; // TODO(jwetzell): work out flag inheritance, will need previous PDU @@ -50,8 +61,8 @@ export function decode(bytes: Uint8Array): SessionDataTransportPDU { } function decodeClientBlock(bytes: Uint8Array) { - if(bytes.byteLength === 0){ - return undefined + if (bytes.byteLength === 0) { + return undefined; } const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength); @@ -88,34 +99,33 @@ function decodeClientBlock(bytes: Uint8Array) { const memberID = view.getUint16(vectorOffset); - - const headerOffset = vectorOffset + 2 - const clientProtocol = view.getUint32(headerOffset) - const association = view.getUint16(headerOffset+4) - + const headerOffset = vectorOffset + 2; + const clientProtocol = view.getUint32(headerOffset); + const association = view.getUint16(headerOffset + 4); const dataOffset = headerOffset + 6; // NOTE(jwetzell): flags/lengthH + lengthL + lengthX + vector + header const dataLength = length - (1 + 1 + (lengthFlag ? 1 : 0) + 2 + 6); - let data: SessionDataTransportPDU | Uint8Array = bytes.subarray(dataOffset, dataOffset + dataLength) + let data: SessionDataTransportPDU | Uint8Array = bytes.subarray(dataOffset, dataOffset + dataLength); - - if(clientProtocol === Protocols.SDT){ - data = decode(data) + if (clientProtocol === Protocols.SDT) { + data = decode(data); } else { - console.error(`SDT client block contains unknown protocol: ${clientProtocol}`) + console.error(`SDT client block contains unknown protocol: ${clientProtocol}`); } return { memberID, clientProtocol, association, - data - } + data, + }; } - -function decodeData(vector: SessionDataTransportVectors, bytes: Uint8Array): SDTJoinData | SDTJoinAcceptData | SDTJoinRefuseData | SDTWrapperData | SDTAckData | SDTLeavingData | Uint8Array { - const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength) +function decodeData( + vector: SessionDataTransportVectors, + bytes: Uint8Array +): SDTJoinData | SDTJoinAcceptData | SDTJoinRefuseData | SDTWrapperData | SDTAckData | SDTLeavingData | Uint8Array { + const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength); switch (vector) { case SessionDataTransportVectors.JOIN: { const destinationAddress: TransportLayerAddress = { diff --git a/packages/acn/src/utils.ts b/packages/acn/src/utils.ts index cd0b88d..5747042 100644 --- a/packages/acn/src/utils.ts +++ b/packages/acn/src/utils.ts @@ -1,7 +1,7 @@ -export function toHex(bytes: Uint8Array): string{ - let hex = ''; - bytes.forEach((byte)=>{ - hex += byte.toString(16).padStart(2,'0') - }) - return hex; -} \ No newline at end of file +export function toHex(bytes: Uint8Array): string { + let hex = ''; + bytes.forEach((byte) => { + hex += byte.toString(16).padStart(2, '0'); + }); + return hex; +}