@robdobsn/raftjs 1.1.1 → 1.3.1

package/dist/web/RaftChannelBLEFactory.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createBLEChannel = createBLEChannel;
+const tslib_1 = require("tslib");
+/**
+ * @description
+ * This file is used to create a new instance of the RaftChannelBLE class.
+ * RaftChannelBLE exists in 2 files: RaftChannelBLE.native.ts and RaftChannelBLE.web.ts
+ * each of these files contains the same class but with different implementations (native and web).
+ * The import statement at the top of the file will import the correct implementation based on the platform
+ * (depending on the build configuration).
+ */
+const RaftChannelBLE_1 = tslib_1.__importDefault(require("./RaftChannelBLE"));
+function createBLEChannel() {
+    return RaftChannelBLE_1.default;
+}
+//# sourceMappingURL=RaftChannelBLEFactory.js.map

package/dist/web/RaftChannelBLEFactory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RaftChannelBLEFactory.js","sourceRoot":"","sources":["../../src/RaftChannelBLEFactory.ts"],"names":[],"mappings":";;AAUA,4CAEC;;AAZD;;;;;;;GAOG;AACH,8EAA8C;AAE9C,SAAgB,gBAAgB;IAC9B,OAAO,wBAAc,CAAC;AACxB,CAAC"}

package/dist/web/RaftChannelWebSerial.d.ts

@@ -0,0 +1,37 @@
+import RaftChannel from "./RaftChannel";
+import RaftMsgHandler from "./RaftMsgHandler";
+import { RaftConnEventFn } from "./RaftConnEvents";
+import { ConnectorOptions } from "./RaftSystemType";
+export default class RaftChannelWebSerial implements RaftChannel {
+    private _raftMsgHandler;
+    private _port;
+    private _reader?;
+    private _isConnected;
+    private _connPaused;
+    private _serialBuffer;
+    private _escapeSeqCode;
+    private _OVERASCII_ESCAPE_1;
+    private _OVERASCII_ESCAPE_2;
+    private _OVERASCII_ESCAPE_3;
+    private _OVERASCII_MOD_CODE;
+    private _onConnEvent;
+    private _requestedBatchAckSize;
+    private _requestedFileBlockSize;
+    fhBatchAckSize(): number;
+    fhFileBlockSize(): number;
+    isConnected(): boolean;
+    setMsgHandler(raftMsgHandler: RaftMsgHandler): void;
+    requiresSubscription(): boolean;
+    ricRestCmdBeforeDisconnect(): string | null;
+    setOnConnEvent(connEventFn: RaftConnEventFn): void;
+    getConnectedLocator(): string | object;
+    connect(locator: string | object, _connectorOptions: ConnectorOptions): Promise<boolean>;
+    disconnect(): Promise<void>;
+    pauseConnection(pause: boolean): void;
+    private _overasciiDecodeByte;
+    private _overasciiEncode;
+    _onMsgRx(msg: Uint8Array | null): void;
+    sendTxMsg(msg: Uint8Array, sendWithResponse: boolean): Promise<boolean>;
+    sendTxMsgNoAwait(msg: Uint8Array, sendWithResponse: boolean): Promise<boolean>;
+    _readLoop(): Promise<void>;
+}

package/dist/web/RaftChannelWebSerial.js

@@ -0,0 +1,320 @@
+"use strict";
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+// RaftChannelWebSerial
+// Part of RaftJS
+//
+// Rob Dobson & Chris Greening 2020-2024
+// (C) 2020-2024 All rights reserved
+//
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const RaftLog_1 = tslib_1.__importDefault(require("./RaftLog"));
+const RaftConnEvents_1 = require("./RaftConnEvents");
+const text_encoding_1 = require("text-encoding");
+class RaftChannelWebSerial {
+    constructor() {
+        // Message handler
+        this._raftMsgHandler = null;
+        this._port = null;
+        // Last message tx time
+        // private _msgTxTimeLast = Date.now();
+        // private _msgTxMinTimeBetweenMs = 15;
+        // Is connected
+        this._isConnected = false;
+        this._connPaused = false;
+        this._serialBuffer = [];
+        this._escapeSeqCode = 0;
+        this._OVERASCII_ESCAPE_1 = 0x85;
+        this._OVERASCII_ESCAPE_2 = 0x8E;
+        this._OVERASCII_ESCAPE_3 = 0x8F;
+        this._OVERASCII_MOD_CODE = 0x20;
+        // Conn event fn
+        this._onConnEvent = null;
+        // File Handler parameters
+        this._requestedBatchAckSize = 1;
+        this._requestedFileBlockSize = 1200;
+    }
+    fhBatchAckSize() { return this._requestedBatchAckSize; }
+    fhFileBlockSize() { return this._requestedFileBlockSize; }
+    // isConnected
+    isConnected() {
+        return this._isConnected;
+    }
+    // Set message handler
+    setMsgHandler(raftMsgHandler) {
+        this._raftMsgHandler = raftMsgHandler;
+    }
+    // Serial interface will require subscription, but don't start it by default
+    requiresSubscription() {
+        return false;
+    }
+    // RICREST command before disconnect
+    ricRestCmdBeforeDisconnect() {
+        return null;
+    }
+    // Set onConnEvent handler
+    setOnConnEvent(connEventFn) {
+        this._onConnEvent = connEventFn;
+    }
+    // Get connected locator
+    getConnectedLocator() {
+        return this._port || "";
+    }
+    // Connect to a device
+    async connect(locator, _connectorOptions) {
+        console.log("_connectorOptions", _connectorOptions);
+        // Debug
+        RaftLog_1.default.debug("RaftChannelWebSerial.connect " + locator.toString());
+        // Check already connected
+        if (await this.isConnected()) {
+            return true;
+        }
+        try {
+            if (('serial' in navigator) && (!this._port || locator != "reusePort")) {
+                const port = await navigator.serial.requestPort();
+                this._port = port;
+            }
+            // Connect
+            if (!this._port)
+                return false;
+            try {
+                RaftLog_1.default.info("opening port");
+                await this._port.open({ baudRate: 115200 });
+            }
+            catch (err) {
+                if (err.name == "InvalidStateError") {
+                    RaftLog_1.default.debug(`Opening port failed - already open ${err}`);
+                }
+                else {
+                    RaftLog_1.default.error(`Opening port failed: ${err}`);
+                    throw err;
+                }
+            }
+            this._isConnected = true;
+            // start read loop
+            this._readLoop();
+            this._port.addEventListener('disconnect', (event) => {
+                RaftLog_1.default.debug("WebSerial disconnect " + JSON.stringify(event));
+                if (this._onConnEvent)
+                    this._onConnEvent(RaftConnEvents_1.RaftConnEvent.CONN_DISCONNECTED);
+            });
+            // TODO: handle errors
+        }
+        catch (err) {
+            RaftLog_1.default.error("RaftChannelWebSerial.connect fail. Error: " + JSON.stringify(err));
+            return false;
+        }
+        return true;
+    }
+    // Disconnect
+    async disconnect() {
+        // Not connected
+        this._isConnected = false;
+        RaftLog_1.default.debug(`RaftChannelWebSerial.disconnect attempting to close webserial`);
+        while (this._reader) {
+            await new Promise((resolve) => setTimeout(resolve, 100));
+        }
+        // Disconnect webserial
+        try {
+            if (this._port)
+                await this._port.close();
+        }
+        catch (err) {
+            console.debug(`Error closing port ${err}`);
+        }
+        if (this._onConnEvent)
+            this._onConnEvent(RaftConnEvents_1.RaftConnEvent.CONN_DISCONNECTED);
+        RaftLog_1.default.debug("WebSerial port closed");
+        return;
+    }
+    pauseConnection(pause) {
+        this._connPaused = pause;
+    }
+    _overasciiDecodeByte(ch) {
+        // Check if in escape sequence
+        if (this._escapeSeqCode != 0) {
+            const prevEscCode = this._escapeSeqCode;
+            this._escapeSeqCode = 0;
+            if (prevEscCode == 1) {
+                return (ch ^ this._OVERASCII_MOD_CODE) & 0x7f;
+            }
+            else if (prevEscCode == 2) {
+                return ch ^ this._OVERASCII_MOD_CODE;
+            }
+            return ch;
+        }
+        else if (ch == this._OVERASCII_ESCAPE_1) {
+            this._escapeSeqCode = 1;
+            return -1;
+        }
+        else if (ch == this._OVERASCII_ESCAPE_2) {
+            this._escapeSeqCode = 2;
+            return -1;
+        }
+        else if (ch == this._OVERASCII_ESCAPE_3) {
+            this._escapeSeqCode = 3;
+            return -1;
+        }
+        else {
+            return ch & 0x7f;
+        }
+    }
+    _overasciiEncode(inData) {
+        /*
+        Encode frame
+        Values 0x00-0x0F map to ESCAPE_CODE_1, VALUE_XOR_20H_AND_MSB_SET
+        Values 0x10-0x7f map to VALUE_WITH_MSB_SET
+        Values 0x80-0x8F map to ESCAPE_CODE_2, VALUE_XOR_20H
+        Values 0x90-0xff map to ESCAPE_CODE_3, VALUE
+        Value ESCAPE_CODE_1 maps to ESCAPE_CODE_1 + VALUE
+        Args:
+          inData: data to encode (bytes)
+        Returns:
+          encoded frame (bytes)
+        */
+        // Iterate over frame
+        const encodedFrame = [];
+        for (let i = 0; i < inData.length; i++) {
+            if (inData[i] <= 0x0f) {
+                encodedFrame.push(this._OVERASCII_ESCAPE_1);
+                encodedFrame.push((inData[i] ^ this._OVERASCII_MOD_CODE) | 0x80);
+            }
+            else if ((inData[i] >= 0x10) && (inData[i] <= 0x7f)) {
+                encodedFrame.push(inData[i] | 0x80);
+            }
+            else if ((inData[i] >= 0x80) && (inData[i] <= 0x8f)) {
+                encodedFrame.push(this._OVERASCII_ESCAPE_2);
+                encodedFrame.push(inData[i] ^ this._OVERASCII_MOD_CODE);
+            }
+            else {
+                encodedFrame.push(this._OVERASCII_ESCAPE_3);
+                encodedFrame.push(inData[i]);
+            }
+        }
+        return new Uint8Array(encodedFrame);
+    }
+    // Handle notifications
+    _onMsgRx(msg) {
+        if (msg === null)
+            return;
+        // Debug
+        //const decoder = new TextDecoder();
+        //RaftLog.debug(`RaftChannelWebSerial._onMsgRx ${decoder.decode(msg)}`);
+        const overasciiBuffer = [];
+        for (let i = 0; i < msg.length; i++) {
+            if (msg[i] > 127) {
+                const ch = this._overasciiDecodeByte(msg[i]);
+                if (ch != -1) {
+                    overasciiBuffer.push(ch);
+                }
+            }
+            else {
+                this._serialBuffer.push(msg[i]);
+            }
+        }
+        if (this._raftMsgHandler)
+            this._raftMsgHandler.handleNewRxMsg(new Uint8Array(overasciiBuffer));
+        // any output over the non overascii channel will be delimited by a new line character
+        // scan for this, and log any lines as they occur before removing them from the buffer
+        if (this._serialBuffer.includes(0x0a)) {
+            const decoder = new text_encoding_1.TextDecoder();
+            RaftLog_1.default.debug(decoder.decode(new Uint8Array(this._serialBuffer.slice(0, this._serialBuffer.indexOf(0x0a)))));
+            this._serialBuffer.splice(0, this._serialBuffer.indexOf(0x0a) + 1);
+        }
+    }
+    // Send a message
+    async sendTxMsg(msg, sendWithResponse) {
+        // Check connected
+        if (!this._isConnected || !this._port)
+            return false;
+        // Debug
+        const decoder = new text_encoding_1.TextDecoder();
+        RaftLog_1.default.verbose(`RaftChannelWebSerial.sendTxMsg ${msg.toString()} ${decoder.decode(msg)} sendWithResp ${sendWithResponse.toString()}`);
+        try {
+            if (this._port.writable != null) {
+                const writer = this._port.writable.getWriter();
+                await writer.write(this._overasciiEncode(msg));
+                writer.releaseLock();
+            }
+        }
+        catch (err) {
+            RaftLog_1.default.warn("sendMsg error: " + JSON.stringify(err));
+            return false;
+        }
+        return true;
+    }
+    async sendTxMsgNoAwait(msg, sendWithResponse) {
+        // Check connected
+        if (!this._isConnected || !this._port)
+            return false;
+        // Debug
+        RaftLog_1.default.verbose(`RaftChannelWebSerial.sendTxMsgNoAwait ${msg.toString()} sendWithResp ${sendWithResponse.toString()}`);
+        try {
+            if (this._port.writable != null) {
+                const writer = this._port.writable.getWriter();
+                writer.write(msg).then(() => { writer.releaseLock(); });
+            }
+        }
+        catch (err) {
+            RaftLog_1.default.error("sendMsg error: " + JSON.stringify(err));
+        }
+        return true;
+    }
+    async _readLoop() {
+        RaftLog_1.default.debug("Starting read loop");
+        if (!this._port)
+            return;
+        let retries = 10;
+        try {
+            if (!this._port.readable) {
+                RaftLog_1.default.error("RaftChannelWebSerial _readLoop port is not readble");
+                return;
+            }
+            this._reader = this._port.readable.getReader();
+            while (this._port.readable && this._isConnected) {
+                if (this._connPaused) {
+                    if (this._reader) {
+                        this._reader.releaseLock();
+                        this._reader = undefined;
+                    }
+                    await new Promise(resolve => setTimeout(resolve, 100));
+                    continue;
+                }
+                try {
+                    if (!this._reader)
+                        this._reader = this._port.readable.getReader();
+                    const { value, done } = await this._reader.read();
+                    if (done) {
+                        this._reader.releaseLock();
+                        break;
+                    }
+                    if (!value || value.length === 0) {
+                        continue;
+                    }
+                    this._onMsgRx(new Uint8Array(value));
+                }
+                catch (err) {
+                    RaftLog_1.default.error("read loop issue: " + JSON.stringify(err));
+                    retries -= 1;
+                    if (!retries)
+                        break;
+                    await new Promise(resolve => setTimeout(resolve, 100));
+                    this._reader = this._port.readable.getReader();
+                }
+            }
+            if (this._reader)
+                this._reader.releaseLock();
+            this._reader = undefined;
+        }
+        catch (err) {
+            RaftLog_1.default.error("Read loop got disconnected. err: " + JSON.stringify(err));
+        }
+        // Disconnected!
+        this._isConnected = false;
+        RaftLog_1.default.debug("Finished read loop");
+    }
+}
+exports.default = RaftChannelWebSerial;
+//# sourceMappingURL=RaftChannelWebSerial.js.map

package/dist/web/RaftChannelWebSerial.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RaftChannelWebSerial.js","sourceRoot":"","sources":["../../src/RaftChannelWebSerial.ts"],"names":[],"mappings":"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"}

package/dist/web/RaftChannelWebSocket.d.ts

@@ -0,0 +1,28 @@
+import RaftChannel from "./RaftChannel";
+import RaftMsgHandler from "./RaftMsgHandler";
+import { RaftConnEventFn } from "./RaftConnEvents";
+import { ConnectorOptions } from "./RaftSystemType";
+export default class RaftChannelWebSocket implements RaftChannel {
+    private _raftMsgHandler;
+    private _webSocket;
+    private _isConnected;
+    private _onConnEvent;
+    private _requestedBatchAckSize;
+    private _requestedFileBlockSize;
+    fhBatchAckSize(): number;
+    fhFileBlockSize(): number;
+    isConnected(): boolean;
+    setMsgHandler(raftMsgHandler: RaftMsgHandler): void;
+    requiresSubscription(): boolean;
+    ricRestCmdBeforeDisconnect(): string | null;
+    setOnConnEvent(connEventFn: RaftConnEventFn): void;
+    getConnectedLocator(): string | object;
+    connect(locator: string | object, connectorOptions: ConnectorOptions): Promise<boolean>;
+    disconnect(): Promise<void>;
+    pauseConnection(pause: boolean): void;
+    _onMsgRx(msg: Uint8Array | null): void;
+    sendTxMsg(msg: Uint8Array, sendWithResponse: boolean): Promise<boolean>;
+    sendTxMsgNoAwait(msg: Uint8Array, sendWithResponse: boolean): Promise<boolean>;
+    _wsConnect(locator: string | object): Promise<boolean>;
+    private _webSocketOpen;
+}

package/dist/web/RaftChannelWebSocket.js

@@ -0,0 +1,197 @@
+"use strict";
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+// RaftChannelWebSockets
+// Part of RaftJS
+//
+// Rob Dobson & Chris Greening 2020-2024
+// (C) 2020-2024 All rights reserved
+//
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const isomorphic_ws_1 = tslib_1.__importDefault(require("isomorphic-ws"));
+const RaftLog_1 = tslib_1.__importDefault(require("./RaftLog"));
+const RaftUtils_1 = tslib_1.__importDefault(require("./RaftUtils"));
+const RaftConnEvents_1 = require("./RaftConnEvents");
+class RaftChannelWebSocket {
+    constructor() {
+        // Message handler
+        this._raftMsgHandler = null;
+        // Websocket we are connected to
+        this._webSocket = null;
+        // Last message tx time
+        // private _msgTxTimeLast = Date.now();
+        // private _msgTxMinTimeBetweenMs = 15;
+        // Is connected
+        this._isConnected = false;
+        // Conn event fn
+        this._onConnEvent = null;
+        // File Handler parameters
+        this._requestedBatchAckSize = 10;
+        this._requestedFileBlockSize = 500;
+    }
+    fhBatchAckSize() { return this._requestedBatchAckSize; }
+    fhFileBlockSize() { return this._requestedFileBlockSize; }
+    // isConnected
+    isConnected() {
+        return this._isConnected;
+    }
+    // Set message handler
+    setMsgHandler(raftMsgHandler) {
+        this._raftMsgHandler = raftMsgHandler;
+    }
+    // WebSocket interfaces require subscription to published messages
+    requiresSubscription() {
+        return true;
+    }
+    // RICREST command before disconnect
+    ricRestCmdBeforeDisconnect() {
+        return null;
+    }
+    // Set onConnEvent handler
+    setOnConnEvent(connEventFn) {
+        this._onConnEvent = connEventFn;
+    }
+    // Get connected locator
+    getConnectedLocator() {
+        return this._webSocket;
+    }
+    // Connect to a device
+    async connect(locator, connectorOptions) {
+        // Debug
+        RaftLog_1.default.debug("RaftChannelWebSocket.connect " + locator.toString());
+        // Get ws suffix
+        const wsSuffix = connectorOptions ? (connectorOptions.wsSuffix ? connectorOptions.wsSuffix : "ws") : "ws";
+        // Connect
+        const connOk = await this._wsConnect("ws://" + locator + "/" + wsSuffix);
+        return connOk;
+    }
+    // Disconnect
+    async disconnect() {
+        var _a;
+        // Not connected
+        this._isConnected = false;
+        // Disconnect websocket
+        (_a = this._webSocket) === null || _a === void 0 ? void 0 : _a.close(1000);
+        // Debug
+        RaftLog_1.default.debug(`RaftChannelWebSocket.disconnect attempting to close websocket`);
+    }
+    pauseConnection(pause) { RaftLog_1.default.verbose(`pauseConnection ${pause} - no effect for this channel type`); return; }
+    // Handle notifications
+    _onMsgRx(msg) {
+        // Debug
+        if (msg !== null) {
+            RaftLog_1.default.verbose(`RaftChannelWebSocket._onMsgRx ${RaftUtils_1.default.bufferToHex(msg)}`);
+        }
+        // Handle message
+        if (msg !== null && this._raftMsgHandler) {
+            this._raftMsgHandler.handleNewRxMsg(msg);
+        }
+    }
+    // Send a message
+    async sendTxMsg(msg, sendWithResponse) {
+        var _a;
+        // Check connected
+        if (!this._isConnected)
+            return false;
+        // Debug
+        RaftLog_1.default.verbose(`RaftChannelWebSocket.sendTxMsg ${msg.toString()} sendWithResp ${sendWithResponse.toString()}`);
+        // Send over websocket
+        try {
+            await ((_a = this._webSocket) === null || _a === void 0 ? void 0 : _a.send(msg));
+        }
+        catch (error) {
+            RaftLog_1.default.warn(`RaftChannelWebSocket.sendTxMsg - send failed ${error}`);
+            return false;
+        }
+        return true;
+    }
+    async sendTxMsgNoAwait(msg, sendWithResponse) {
+        var _a;
+        // Check connected
+        if (!this._isConnected)
+            return false;
+        // Debug
+        RaftLog_1.default.verbose(`RaftChannelWebSocket.sendTxMsgNoAwait ${msg.toString()} sendWithResp ${sendWithResponse.toString()}`);
+        // Send over websocket
+        (_a = this._webSocket) === null || _a === void 0 ? void 0 : _a.send(msg);
+        return true;
+    }
+    async _wsConnect(locator) {
+        // Check already connected
+        if (await this.isConnected()) {
+            return true;
+        }
+        // Form websocket address
+        const wsURL = locator.toString();
+        // Connect to websocket
+        // try {
+        //     this._webSocket = await this._webSocketOpen(wsURL);
+        // } catch (error: any) {
+        //     RaftLog.debug(`Unable to create WebSocket ${error.toString()}`);
+        //     return false;
+        // }
+        this._webSocket = null;
+        return new Promise((resolve, reject) => {
+            this._webSocketOpen(wsURL).then((ws) => {
+                this._webSocket = ws;
+                RaftLog_1.default.debug(`_wsConnect - opened connection`);
+                // Handle messages
+                this._webSocket.onmessage = (evt) => {
+                    // RaftLog.debug("WebSocket rx");
+                    if (evt.data instanceof ArrayBuffer) {
+                        const msg = new Uint8Array(evt.data);
+                        this._onMsgRx(msg);
+                    }
+                };
+                // Handle close event
+                this._webSocket.onclose = (evt) => {
+                    RaftLog_1.default.info(`_wsConnect - closed code ${evt.code} wasClean ${evt.wasClean} reason ${evt.reason}`);
+                    this._webSocket = null;
+                    this._isConnected = false;
+                    // Event handler
+                    if (this._onConnEvent) {
+                        this._onConnEvent(RaftConnEvents_1.RaftConnEvent.CONN_DISCONNECTED);
+                    }
+                };
+                // Resolve the promise - success
+                resolve(true);
+            }).catch((err) => {
+                if (err instanceof Error) {
+                    RaftLog_1.default.verbose(`WS open failed ${err.toString()}`);
+                }
+                // Resolve - failed
+                reject(false);
+            });
+        });
+    }
+    async _webSocketOpen(url) {
+        return new Promise((resolve, reject) => {
+            // Debug
+            // RaftLog.debug('Attempting WebSocket connection');
+            // Open the socket
+            try {
+                const webSocket = new isomorphic_ws_1.default(url);
+                // Open socket
+                webSocket.binaryType = "arraybuffer";
+                webSocket.onopen = (_evt) => {
+                    RaftLog_1.default.debug(`RaftChannelWebSocket._webSocketOpen - onopen ${_evt.toString()}`);
+                    // // We're connected
+                    this._isConnected = true;
+                    resolve(webSocket);
+                };
+                webSocket.onerror = function (evt) {
+                    RaftLog_1.default.warn(`RaftChannelWebSocket._webSocketOpen - onerror: ${evt.message}`);
+                    reject(evt);
+                };
+            }
+            catch (error) {
+                RaftLog_1.default.warn(`RaftChannelWebSocket._webSocketOpen - open failed ${error}`);
+                reject(error);
+            }
+        });
+    }
+}
+exports.default = RaftChannelWebSocket;
+//# sourceMappingURL=RaftChannelWebSocket.js.map

package/dist/web/RaftChannelWebSocket.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RaftChannelWebSocket.js","sourceRoot":"","sources":["../../src/RaftChannelWebSocket.ts"],"names":[],"mappings":"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"}