poe-svelte-ui-lib 1.74.0 → 1.74.2

package/dist/protocols/cbor/encoder.d.ts

@@ -16,6 +16,7 @@ export declare class CborEncoder {
     encodeFloat16(value: number): this;
     encodeString(value: string): this;
     encodeBytes(value: Uint8Array | number[]): this;
+    encodeRaw(value: Uint8Array): this;
     encodeArrayStart(count: number | null): this;
     encodeMapStart(count: number | null): this;
     encodeBreak(): this;

package/dist/protocols/cbor/encoder.js

@@ -211,6 +211,11 @@ export class CborEncoder {
         this.writeBytes(bytes);
         return this;
     }
+    /* Добавить заранее проверенный CBOR item без повторного кодирования. */
+    encodeRaw(value) {
+        this.writeBytes(Array.from(value));
+        return this;
+    }
     /* Начать кодирование массива - count элементов или null для неопределённой длины */
     encodeArrayStart(count) {
         if (count === null)

package/dist/protocols/index.js

@@ -14,7 +14,7 @@ export { crc16Kermit, crc8Rohc } from "./crc.js";
 export { BROADCAST_BUS_ID, makeCmd, splitCmd, EXTERNAL_BUS_ID, packetObjectCrc, encodePacket, decodePacket, objectsFor, createPacketStreamParser, } from "./packet.js";
 /* Графики отладки: кадр OK! DebPlot (SC_PLOT прошивки) — значения из CBOR-карты, график на группу, серии в порядке устройства */
 export { createPlotGroups, debPlotValues, DEB_PLOT_ARGUMENT } from "./plotGroups.js";
-/* System Console over UART: CBOR [SrcID, HdrArg, Value, FHS, CRC16], plus stream parsing */
+/* System Console over UART: single-record poe_cbor_pkt with debug-only FHS */
 export { encodeXPoeDebugFrame, createXPoeDebugParser, xPoeDebugCmd, xPoeDebugValueFromText } from "./xPoeDebug.js";
 /* Отображение Value xPOE-Debug в таблице/модалке и копирование Value/HEX */
 export { formatXPoeDebugValue, formatXPoeDebugValueForTable, formatXPoeDebugModal, bindXPoeDebugCopyButtons } from "./xPoeDebugView.js";

package/dist/protocols/packet.d.ts

@@ -19,7 +19,8 @@ export declare const splitCmd: (cmd: number) => {
     argument: number;
     reply: boolean;
 };
-export declare const packetObjectCrc: (trgBusID: number, srcBusID: number, cmd: number, payload: Uint8Array) => number;
+export declare const packetObjectCrc: (encodedRecordPrefix: Uint8Array) => number;
+export declare const encodePacketBytesPayload: (bytes: Uint8Array) => Uint8Array;
 export declare const encodePacket: (objects: PacketObject[]) => Uint8Array;
 export type PacketParse = {
     status: "complete";

package/dist/protocols/packet.js

@@ -1,7 +1,6 @@
 /* $lib/protocols/packet.ts */
-/* Пакет poe_cbor_pkt (README poe_cbor прошивки, ProdFactory-ESP/STM): indefinite ARRAY объектов [[TrgBusID, SrcBusID, Cmd, Payload, CRC16], …],
-   объектов в пакете сколько угодно (в том числе одному адресату), порядок сохраняется; у каждого свой CRC-16/KERMIT по TrgBusID|SrcBusID|Cmd
-   (по 2 байта big-endian) и Payload — не зависит от того, как числа записаны в CBOR. Общая точка сборки и разбора для терминала (CAN, RS485) и облака */
+/* Общий пакет poe_cbor_pkt: indefinite ARRAY записей [TrgBusID, SrcBusID, Cmd, Payload, CRC16].
+   Payload — ровно один CBOR item. CRC-16/KERMIT считается по сырым CBOR-байтам записи от её заголовка до конца Payload. */
 import { CborDecoder } from "./cbor/decoder.js";
 import { CborEncoder } from "./cbor/encoder.js";
 import { CborEndOfDataError } from "./cbor/types.js";
@@ -17,22 +16,31 @@ export const splitCmd = (cmd) => ({
     argument: (cmd >> 1) & 0x1fff,
     reply: (cmd & 1) === 1,
 });
-/* CRC объекта: TrgBusID | SrcBusID | Cmd по 2 байта big-endian, затем Payload */
-export const packetObjectCrc = (trgBusID, srcBusID, cmd, payload) => {
-    const head = [trgBusID >> 8, trgBusID, srcBusID >> 8, srcBusID, cmd >> 8, cmd].map((byte) => byte & 0xff);
-    return crc16Kermit(crc16Kermit(0, head), payload);
+export const packetObjectCrc = (encodedRecordPrefix) => crc16Kermit(0, encodedRecordPrefix);
+/* Кодирует сырые байты как один CBOR byte string для Payload. */
+export const encodePacketBytesPayload = (bytes) => {
+    const encoder = new CborEncoder();
+    encoder.encodeBytes(bytes);
+    return encoder.getResult();
 };
 /* Пакет из одного или нескольких объектов — те же байты, что CBOR_PACK/CBOR_PktEncFinish прошивки */
 export const encodePacket = (objects) => {
     const encoder = new CborEncoder();
     encoder.encodeArrayStart(null);
     for (const { trgBusID, srcBusID, cmd, payload } of objects) {
+        const recordStart = encoder.getResult().length;
         encoder.encodeArrayStart(5);
         encoder.encodeUnsigned(trgBusID);
         encoder.encodeUnsigned(srcBusID);
         encoder.encodeUnsigned(cmd);
-        encoder.encodeBytes(payload);
-        encoder.encodeUnsigned(packetObjectCrc(trgBusID, srcBusID, cmd, payload));
+        const prefixStart = encoder.getResult().length;
+        /* Payload is already CBOR-encoded; reject malformed or concatenated values. */
+        const payloadDecoder = new CborDecoder(payload);
+        if (!payloadDecoder.skipValue() || payloadDecoder.offset !== payload.length)
+            throw new Error("Payload должен содержать ровно один CBOR item");
+        encoder.encodeRaw(payload);
+        const prefix = encoder.getResult().slice(recordStart, prefixStart + payload.length);
+        encoder.encodeUnsigned(packetObjectCrc(prefix));
     }
     encoder.encodeBreak();
     return encoder.getResult();
@@ -52,13 +60,27 @@ const readValue = (bytes, offset) => {
 };
 const toNumber = (value) => (typeof value === "number" && Number.isInteger(value) && value >= 0 && value <= 0xffff ? value : null);
 /* Объект пакета; не по формату (не 5 элементов, не те типы) — null, как CBOR_PktDecNext прошивки его пропускает */
-const toObject = (value) => {
+const toObject = (value, rawRecord) => {
     if (!Array.isArray(value) || value.length !== 5)
         return null;
-    const [trgBusID, srcBusID, cmd, payload, crc] = [toNumber(value[0]), toNumber(value[1]), toNumber(value[2]), value[3], toNumber(value[4])];
-    if (trgBusID === null || srcBusID === null || cmd === null || !(payload instanceof Uint8Array) || crc === null)
+    const [trgBusID, srcBusID, cmd, crc] = [toNumber(value[0]), toNumber(value[1]), toNumber(value[2]), toNumber(value[4])];
+    if (trgBusID === null || srcBusID === null || cmd === null || crc === null)
+        return null;
+    const info = rawRecord[0] & 0x1f;
+    const headerLength = info < 24 ? 1 : info === 24 ? 2 : info === 25 ? 3 : info === 26 ? 5 : info === 27 ? 9 : 0;
+    if ((rawRecord[0] >> 5) !== 4 || headerLength === 0)
+        return null;
+    const fields = new CborDecoder(rawRecord.subarray(headerLength));
+    for (let i = 0; i < 3; i++)
+        if (!fields.skipValue())
+            return null;
+    const payloadStart = headerLength + fields.offset;
+    if (!fields.skipValue())
         return null;
-    return { trgBusID, srcBusID, cmd, payload, crc, crcOk: packetObjectCrc(trgBusID, srcBusID, cmd, payload) === crc, ...splitCmd(cmd) };
+    const payloadEnd = headerLength + fields.offset;
+    const prefix = rawRecord.subarray(0, payloadEnd);
+    const payloadBytes = rawRecord.subarray(payloadStart, payloadEnd);
+    return { trgBusID, srcBusID, cmd, payload: payloadBytes, crc, crcOk: packetObjectCrc(prefix) === crc, ...splitCmd(cmd) };
 };
 /* Разбор пакета с начала буфера — и для целого кадра (CAN), и для потока (RS485: «incomplete» — ждать ещё байт, «garbage» — сдвинуться на байт) */
 export const decodePacket = (bytes) => {
@@ -93,7 +115,7 @@ export const decodePacket = (bytes) => {
             if (!value)
                 return { status: "incomplete" };
             offset += value.length;
-            const object = toObject(value.value);
+            const object = toObject(value.value, bytes.subarray(offset - value.length, offset));
             if (object)
                 objects.push(object);
         }

package/dist/protocols/xPoeDebug.d.ts

@@ -1,5 +1,6 @@
 export type XPoeDebugItem = {
     type: "frame";
+    trgId: number;
     srcId: number;
     cmd: number;
     header: string;
@@ -14,7 +15,7 @@ export type XPoeDebugItem = {
     text: string;
 };
 export declare const xPoeDebugCmd: (header: string, argument: string) => number;
-export declare const encodeXPoeDebugFrame: (header: string, argument: string, value: Uint8Array, srcId?: number, freeHeap?: number | null) => Uint8Array;
+export declare const encodeXPoeDebugFrame: (header: string, argument: string, value: Uint8Array, srcId?: number, freeHeap?: number | null, trgId?: number) => Uint8Array;
 export declare const createXPoeDebugParser: () => {
     push(chunk: Uint8Array): XPoeDebugItem[];
     reset(): void;

package/dist/protocols/xPoeDebug.js

@@ -1,5 +1,4 @@
-/* System Console: CBOR array [SrcID, HdrArg, Value, FHS, CRC16]. CRC-16/KERMIT covers the encoded
-   first four array items, including the array header. UART is a stream; the definite array is self-delimiting. */
+/* Debug is a one-record poe_cbor_pkt. Its record adds FHS to the common bus fields. */
 import { CborDecoder } from "./cbor/decoder.js";
 import { CborEndOfDataError } from "./cbor/types.js";
 import { crc16Kermit } from "./crc.js";
@@ -8,7 +7,8 @@ import { DEFAULT_ARGUMENT_CODES, HEADER_CODES, nameByCode } from "./dictionary.j
 import { makeCmd, splitCmd } from "./packet.js";
 const MAX_TEXT_TAIL = 4096;
 const MAX_FRAME = 8192;
-const ARRAY5 = 0x85;
+const PACKET_START = 0x9f;
+const RECORD6 = 0x86;
 const decoder = new TextDecoder();
 const encodeUInt = (input) => {
     const value = BigInt(input);
@@ -19,7 +19,7 @@ const encodeUInt = (input) => {
     if (value <= 0xffffn)
         return [0x19, Number(value >> 8n), Number(value & 0xffn)];
     if (value <= 0xffffffffn)
-        return [0x1a, Number(value >> 24n), Number(value >> 16n & 0xffn), Number(value >> 8n & 0xffn), Number(value & 0xffn)];
+        return [0x1a, Number(value >> 24n), Number((value >> 16n) & 0xffn), Number((value >> 8n) & 0xffn), Number(value & 0xffn)];
     throw new Error("xPOE-Debug integer is out of range");
 };
 export const xPoeDebugCmd = (header, argument) => {
@@ -30,47 +30,67 @@ export const xPoeDebugCmd = (header, argument) => {
     return makeCmd(hdr, arg);
 };
 /* Команда терминала: CRC считается по тем CBOR-байтам, которые реально отправляются. */
-export const encodeXPoeDebugFrame = (header, argument, value, srcId = 0, freeHeap = null) => {
+export const encodeXPoeDebugFrame = (header, argument, value, srcId = 0, freeHeap = null, trgId = 0) => {
     const cmd = xPoeDebugCmd(header, argument);
-    if (!Number.isInteger(srcId) || srcId < 0 || srcId > 0xffff || !Number.isInteger(cmd) || cmd < 0 || cmd > 0xffff)
-        throw new Error("SrcID и HdrArg должны быть uint16");
+    if (![srcId, trgId, cmd].every((n) => Number.isInteger(n) && n >= 0 && n <= 0xffff))
+        throw new Error("TrgBusID, SrcBusID и Cmd должны быть uint16");
     const valueParser = new CborDecoder(value);
     if (!valueParser.skipValue() || valueParser.offset !== value.length)
         throw new Error("Value должен содержать ровно один CBOR item");
-    const prefix = new Uint8Array([ARRAY5, ...encodeUInt(srcId), ...encodeUInt(cmd), ...value, ...(freeHeap === null ? [0xf6] : encodeUInt(freeHeap))]);
-    const crc = crc16Kermit(0, prefix);
-    return new Uint8Array([...prefix, ...encodeUInt(crc)]);
+    const recordPrefix = new Uint8Array([RECORD6, ...encodeUInt(trgId), ...encodeUInt(srcId), ...encodeUInt(cmd), ...value, ...(freeHeap === null ? [0xf6] : encodeUInt(freeHeap))]);
+    const crc = crc16Kermit(0, recordPrefix);
+    return new Uint8Array([PACKET_START, ...recordPrefix, ...encodeUInt(crc), 0xff]);
 };
-const textItems = (bytes) => decoder.decode(bytes).split("\n").map((line) => line.trim()).filter((line) => line && ![...line].some((char) => char.charCodeAt(0) < 0x20 && char !== "\t")).map((text) => ({ type: "raw", text }));
-const readUInt = (value) => typeof value === "number" && Number.isInteger(value) && value >= 0 && value <= 0xffff ? value : null;
-/* Декодирует одну definite array из начала буфера; null означает неполный или невалидный кадр. */
+const textItems = (bytes) => decoder
+    .decode(bytes)
+    .split("\n")
+    .map((line) => line.trim())
+    .filter((line) => line && ![...line].some((char) => char.charCodeAt(0) < 0x20 && char !== "\t"))
+    .map((text) => ({ type: "raw", text }));
+const readUInt = (value) => (typeof value === "number" && Number.isInteger(value) && value >= 0 && value <= 0xffff ? value : null);
+/* Декодирует пакет из одной записи с FHS; null означает неполный или невалидный кадр. */
 const frameItem = (buffer) => {
-    if (buffer[0] !== ARRAY5)
+    if (buffer[0] !== PACKET_START || buffer[1] !== RECORD6)
         return { status: "garbage" };
     try {
         const cbor = new CborDecoder(buffer);
-        cbor.decode(); /* Проверка структуры и границы всего массива */
+        const packet = cbor.decode(); /* Проверка структуры и границы всего пакета */
+        if (!Array.isArray(packet) || packet.length !== 1 || !Array.isArray(packet[0]) || packet[0].length !== 6)
+            return { status: "garbage" };
         const length = cbor.offset;
-        const fields = new CborDecoder(buffer.subarray(1, length));
+        const fields = new CborDecoder(buffer.subarray(2, length));
+        const trgId = readUInt(fields.decode());
         const srcId = readUInt(fields.decode());
         const cmd = readUInt(fields.decode());
-        if (srcId === null || cmd === null)
+        if (trgId === null || srcId === null || cmd === null)
             return { status: "garbage" };
-        const valueStart = 1 + fields.offset;
+        const valueStart = 2 + fields.offset;
         if (!fields.skipValue())
             return { status: "garbage" };
-        const valueEnd = 1 + fields.offset;
+        const valueEnd = 2 + fields.offset;
         const freeHeapValue = fields.decode();
-        const crcStart = 1 + fields.offset;
+        const crcStart = 2 + fields.offset;
         const crc = readUInt(fields.decode());
-        if (fields.offset !== length - 1 || crc === null || (freeHeapValue !== null && (typeof freeHeapValue !== "number" || !Number.isInteger(freeHeapValue) || freeHeapValue < 0)))
+        if (fields.offset !== length - 3 || crc === null || (freeHeapValue !== null && (typeof freeHeapValue !== "number" || !Number.isInteger(freeHeapValue) || freeHeapValue < 0)))
             return { status: "garbage" };
         const valueBytes = buffer.slice(valueStart, valueEnd);
         const { header, argument } = splitCmd(cmd);
         return {
             status: "complete",
             length,
-            item: { type: "frame", srcId, cmd, header: Object.entries(HEADER_CODES).find(([, code]) => code === header)?.[0] ?? String(header), argument: nameByCode(DEFAULT_ARGUMENT_CODES, argument), value: Array.from(valueBytes, (byte) => byte.toString(16).padStart(2, "0").toUpperCase()).join(""), valueBytes, crc: crc.toString(16).toUpperCase().padStart(4, "0"), crcOk: crc16Kermit(0, buffer.subarray(0, crcStart)) === crc, freeHeap: typeof freeHeapValue === "number" ? String(freeHeapValue) : "" },
+            item: {
+                type: "frame",
+                trgId,
+                srcId,
+                cmd,
+                header: Object.entries(HEADER_CODES).find(([, code]) => code === header)?.[0] ?? String(header),
+                argument: nameByCode(DEFAULT_ARGUMENT_CODES, argument),
+                value: Array.from(valueBytes, (byte) => byte.toString(16).padStart(2, "0").toUpperCase()).join(""),
+                valueBytes,
+                crc: crc.toString(16).toUpperCase().padStart(4, "0"),
+                crcOk: crc16Kermit(0, buffer.subarray(1, crcStart)) === crc,
+                freeHeap: typeof freeHeapValue === "number" ? String(freeHeapValue) : "",
+            },
         };
     }
     catch (error) {
@@ -92,7 +112,7 @@ export const createXPoeDebugParser = () => {
             buffer = concat(buffer, chunk);
             const items = [];
             while (buffer.length) {
-                const start = buffer.indexOf(ARRAY5);
+                const start = buffer.indexOf(PACKET_START);
                 if (start < 0) {
                     const cut = buffer.length > MAX_TEXT_TAIL ? buffer.length : buffer.lastIndexOf(0x0a);
                     if (cut >= 0) {
@@ -124,7 +144,9 @@ export const createXPoeDebugParser = () => {
             }
             return items;
         },
-        reset() { buffer = new Uint8Array(); },
+        reset() {
+            buffer = new Uint8Array();
+        },
     };
 };
 /* Value form input: ready CBOR hex passes through; JSON is converted to CBOR. */

package/dist/protocols/xPoeDebugView.js

@@ -52,6 +52,17 @@ export function formatXPoeDebugValueForTable(rawValue, isCbor = true) {
 const COPY_ICON = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" aria-hidden="true"><g fill="none" stroke="currentColor" stroke-width="1.5"><path d="M6 11c0-2.828 0-4.243.879-5.121C7.757 5 9.172 5 12 5h3c2.828 0 4.243 0 5.121.879C21 6.757 21 8.172 21 11v5c0 2.828 0 4.243-.879 5.121C19.243 22 17.828 22 15 22h-3c-2.828 0-4.243 0-5.121-.879C6 20.243 6 18.828 6 16z"/><path d="M6 19a3 3 0 0 1-3-3v-6c0-3.771 0-5.657 1.172-6.828S7.229 2 11 2h4a3 3 0 0 1 3 3"/></g></svg>`;
 const COPIED_ICON = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" aria-hidden="true"><path d="m5 12 4 4L19 6" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>`;
 let copyBindings = 0;
+let copyObserver = null;
+const removeXPoeDebugModalFooters = () => {
+    document.querySelectorAll("[data-modal]").forEach((modal) => {
+        if (!modal.querySelector("[data-xpoe-debug-modal]"))
+            return;
+        const footer = modal.lastElementChild;
+        if (!footer || modal.children.length < 3)
+            return;
+        footer.remove();
+    });
+};
 const handleCopyClick = (event) => {
     if (!(event.target instanceof Element))
         return;
@@ -79,15 +90,22 @@ const handleCopyClick = (event) => {
 };
 /* Делегированный обработчик кнопок модального окна; возвращённую функцию вызывают при уничтожении страницы. */
 export function bindXPoeDebugCopyButtons() {
-    if (copyBindings++ === 0)
+    if (copyBindings++ === 0) {
         document.addEventListener("click", handleCopyClick);
+        removeXPoeDebugModalFooters();
+        copyObserver = new MutationObserver(removeXPoeDebugModalFooters);
+        copyObserver.observe(document.documentElement, { childList: true, subtree: true });
+    }
     let isBound = true;
     return () => {
         if (!isBound)
             return;
         isBound = false;
-        if (--copyBindings === 0)
+        if (--copyBindings === 0) {
             document.removeEventListener("click", handleCopyClick);
+            copyObserver?.disconnect();
+            copyObserver = null;
+        }
     };
 }
 /* Две прокручиваемые секции модалки; HEX-раздел появляется, если форматтер таблицы добавил исходные байты. */
@@ -103,5 +121,5 @@ export function formatXPoeDebugModal(text) {
     const buttonClass = "flex size-7 cursor-pointer items-center justify-center rounded-lg border-none bg-transparent text-(--faint-color) transition-colors duration-150 hover:bg-(--container-color) hover:text-(--font-color)";
     const textStyle = "display:block;min-width:0;max-width:100%;margin:0;white-space:pre-wrap;overflow-wrap:anywhere;word-break:break-word;font:inherit";
     const pane = (title, target, value) => `<section style="${sectionStyle}"><div style="${headingStyle}"><span>${title}</span><button type="button" class="${buttonClass}" data-xpoe-copy="${target}" aria-label="Копировать ${title}" style="${buttonStyle}">${COPY_ICON}</button></div><pre style="${textStyle}">${value}</pre></section>`;
-    return `<style>[data-modal]:has([data-xpoe-debug-modal])>div:last-child{display:none!important}</style><div data-xpoe-debug-modal style="${modalStyle}">${pane("Value", "value", decoded)}${hexIndex < 0 ? "" : pane("HEX", "hex", hex)}</div>`;
+    return `<div data-xpoe-debug-modal style="${modalStyle}">${pane("Value", "value", decoded)}${hexIndex < 0 ? "" : pane("HEX", "hex", hex)}</div>`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poe-svelte-ui-lib",
-  "version": "1.74.0",
+  "version": "1.74.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Oleg-Perevyshin/ElementsUI.git"