Merge pull request #11 from adrcunha/patch-3

Trigger debug output in handlers.ts according to --debug
This commit is contained in:
David Ventura
2024-04-28 00:51:31 +02:00
committed by GitHub
+17 -7
View File
@@ -5,10 +5,12 @@ import { create_P2pRdy, SendListWifi, SendUsrChk, DevSerial } from "./impl.js";
import { Session } from "./session.js"; import { Session } from "./session.js";
import { u16_swap, u32_swap } from "./utils.js"; import { u16_swap, u32_swap } from "./utils.js";
export const notImpl = (_: Session, dv: DataView) => { export const notImpl = (session: Session, dv: DataView) => {
const raw = dv.readU16(); const raw = dv.readU16();
const cmd = CommandsByValue[raw]; const cmd = CommandsByValue[raw];
console.log(`^^ ${cmd} (${raw.toString(16)}) and it's not implemented yet`); if (session.options.debug) {
console.log(`^^ ${cmd} (${raw.toString(16)}) and it's not implemented yet`);
}
}; };
export const noop = (_: Session, __: DataView) => {}; export const noop = (_: Session, __: DataView) => {};
@@ -51,8 +53,10 @@ export const createResponseForControlCommand = (session: Session, dv: DataView):
if (payload_len > rotate_chr) { if (payload_len > rotate_chr) {
// 20 = 16 (header) + 4 (??) // 20 = 16 (header) + 4 (??)
XqBytesDec(dv.add(20), payload_len - 4, rotate_chr); XqBytesDec(dv.add(20), payload_len - 4, rotate_chr);
console.log("Decrypted"); if (session.options.debug) {
console.log(hexdump(dv)); console.log("Decrypted");
console.log(hexdump(dv));
}
} }
if (cmd_id == ControlCommands.ConnectUserAck) { if (cmd_id == ControlCommands.ConnectUserAck) {
@@ -96,10 +100,14 @@ export const createResponseForControlCommand = (session: Session, dv: DataView):
if (cmd_id == ControlCommands.ListWifiAck) { if (cmd_id == ControlCommands.ListWifiAck) {
let startat = 0x10; let startat = 0x10;
let msg_len = 91; let msg_len = 91;
console.log("payload len", payload_len); if (session.options.debug) {
console.log("payload len", payload_len);
}
let msg_count = (payload_len - 9) / msg_len; let msg_count = (payload_len - 9) / msg_len;
let remote_msg_count = dv.add(startat).readU32LE(); let remote_msg_count = dv.add(startat).readU32LE();
console.log("should get messages:", msg_count, "in payload: ", remote_msg_count); if (session.options.debug) {
console.log("should get messages:", msg_count, "in payload: ", remote_msg_count);
}
startat += 4; startat += 4;
let items = []; let items = [];
for (let i = 0; i < msg_count; i++) { for (let i = 0; i < msg_count; i++) {
@@ -115,7 +123,9 @@ export const createResponseForControlCommand = (session: Session, dv: DataView):
}; };
console.log(`Wifi Item: ${JSON.stringify(wifiListItem, null, 2)}`); console.log(`Wifi Item: ${JSON.stringify(wifiListItem, null, 2)}`);
startat += msg_len; startat += msg_len;
console.log("ended at", startat); if (session.options.debug) {
console.log("ended at", startat);
}
items.push(wifiListItem); items.push(wifiListItem);
} }
} }