socketon 1.31.2-rc → 1.51.17

package/lib/WAM/encode.js

@@ -1,155 +1,154 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeWAM = void 0;
-const constants_1 = require("./constants");
+//=======================================================//
+import { FLAG_BYTE, FLAG_EVENT, FLAG_EXTENDED, FLAG_FIELD, FLAG_GLOBAL, WEB_EVENTS, WEB_GLOBALS } from "./constants.js";
+import { BinaryInfo } from "./BinaryInfo.js";
+//=======================================================//
 const getHeaderBitLength = (key) => (key < 256 ? 2 : 3);
-const encodeWAM = (binaryInfo) => {
-    binaryInfo.buffer = [];
-    encodeWAMHeader(binaryInfo);
-    encodeEvents(binaryInfo);
-    console.log(binaryInfo.buffer);
-    const totalSize = binaryInfo.buffer
-        .map((a) => a.length)
-        .reduce((a, b) => a + b);
-    const buffer = Buffer.alloc(totalSize);
-    let offset = 0;
-    binaryInfo.buffer.forEach((buffer_) => {
-        buffer_.copy(buffer, offset);
-        offset += buffer_.length;
-    });
-    return buffer;
+export const encodeWAM = (binaryInfo) => {
+  binaryInfo.buffer = [];
+  encodeWAMHeader(binaryInfo);
+  encodeEvents(binaryInfo);
+  const totalSize = binaryInfo.buffer.map(a => a.length).reduce((a, b) => a + b);
+  const buffer = Buffer.alloc(totalSize);
+  let offset = 0;
+  for (const buffer_ of binaryInfo.buffer) {
+    buffer_.copy(buffer, offset);
+    offset += buffer_.length;
+  }
+  return buffer;
 };
-exports.encodeWAM = encodeWAM;
+//=======================================================//
 function encodeWAMHeader(binaryInfo) {
-    const headerBuffer = Buffer.alloc(8); // starting buffer
-    headerBuffer.write('WAM', 0, 'utf8');
-    headerBuffer.writeUInt8(binaryInfo.protocolVersion, 3);
-    headerBuffer.writeUInt8(1, 4); //random flag
-    headerBuffer.writeUInt16BE(binaryInfo.sequence, 5);
-    headerBuffer.writeUInt8(0, 7); // regular channel
-    binaryInfo.buffer.push(headerBuffer);
+  const headerBuffer = Buffer.alloc(8);
+  headerBuffer.write("WAM", 0, "utf8");
+  headerBuffer.writeUInt8(binaryInfo.protocolVersion, 3);
+  headerBuffer.writeUInt8(1, 4);
+  headerBuffer.writeUInt16BE(binaryInfo.sequence, 5);
+  headerBuffer.writeUInt8(0, 7);
+  binaryInfo.buffer.push(headerBuffer);
 }
+//=======================================================//
 function encodeGlobalAttributes(binaryInfo, globals) {
-    for (const [key, _value] of Object.entries(globals)) {
-        const id = constants_1.WEB_GLOBALS.find(a => (a === null || a === void 0 ? void 0 : a.name) === key).id;
-        let value = _value;
-        if (typeof value === 'boolean') {
-            value = value ? 1 : 0;
-        }
-        binaryInfo.buffer.push(serializeData(id, value, constants_1.FLAG_GLOBAL));
+  for (const [key, _value] of Object.entries(globals)) {
+    const id = WEB_GLOBALS.find(a => a?.name === key).id;
+    let value = _value;
+    if (typeof value === "boolean") {
+      value = value ? 1 : 0;
     }
+    binaryInfo.buffer.push(serializeData(id, value, FLAG_GLOBAL));
+  }
 }
+//=======================================================//
 function encodeEvents(binaryInfo) {
-    for (const [name, { props, globals },] of binaryInfo.events.map((a) => Object.entries(a)[0])) {
-        encodeGlobalAttributes(binaryInfo, globals);
-        const event = constants_1.WEB_EVENTS.find((a) => a.name === name);
-        const props_ = Object.entries(props);
-        let extended = false;
-        for (const [, value] of props_) {
-            extended || (extended = value !== null);
-        }
-        const eventFlag = extended ? constants_1.FLAG_EVENT : constants_1.FLAG_EVENT | constants_1.FLAG_EXTENDED;
-        binaryInfo.buffer.push(serializeData(event.id, -event.weight, eventFlag));
-        for (let i = 0; i < props_.length; i++) {
-            const [key, _value] = props_[i];
-            const id = (event.props)[key][0];
-            extended = i < (props_.length - 1);
-            let value = _value;
-            if (typeof value === 'boolean') {
-                value = value ? 1 : 0;
-            }
-            const fieldFlag = extended ? constants_1.FLAG_EVENT : constants_1.FLAG_FIELD | constants_1.FLAG_EXTENDED;
-            binaryInfo.buffer.push(serializeData(id, value, fieldFlag));
-        }
+  for (const [name, { props, globals }] of binaryInfo.events.map(a => Object.entries(a)[0])) {
+    encodeGlobalAttributes(binaryInfo, globals);
+    const event = WEB_EVENTS.find(a => a.name === name);
+    const props_ = Object.entries(props);
+    let extended = false;
+    for (const [, value] of props_) {
+      extended || (extended = value !== null);
+    }
+    const eventFlag = extended ? FLAG_EVENT : FLAG_EVENT | FLAG_EXTENDED;
+    binaryInfo.buffer.push(serializeData(event.id, -event.weight, eventFlag));
+    for (let i = 0; i < props_.length; i++) {
+      const [key, _value] = props_[i];
+      const id = event.props[key]?.[0];
+      extended = i < props_.length - 1;
+      let value = _value;
+      if (typeof value === "boolean") {
+        value = value ? 1 : 0;
+      }
+      const fieldFlag = extended ? FLAG_EVENT : FLAG_FIELD | FLAG_EXTENDED;
+      binaryInfo.buffer.push(serializeData(id, value, fieldFlag));
     }
+  }
 }
+//=======================================================//
 function serializeData(key, value, flag) {
-    const bufferLength = getHeaderBitLength(key);
-    let buffer;
-    let offset = 0;
-    if (value === null) {
-        if (flag === constants_1.FLAG_GLOBAL) {
-            buffer = Buffer.alloc(bufferLength);
-            offset = serializeHeader(buffer, offset, key, flag);
-            return buffer;
-        }
+  const bufferLength = getHeaderBitLength(key);
+  let buffer;
+  let offset = 0;
+  if (value === null) {
+    if (flag === FLAG_GLOBAL) {
+      buffer = Buffer.alloc(bufferLength);
+      offset = serializeHeader(buffer, offset, key, flag);
+      return buffer;
     }
-    else if (typeof value === 'number' && Number.isInteger(value)) {
-        // is number
-        if (value === 0 || value === 1) {
-            buffer = Buffer.alloc(bufferLength);
-            offset = serializeHeader(buffer, offset, key, flag | ((value + 1) << 4));
-            return buffer;
-        }
-        else if (-128 <= value && value < 128) {
-            buffer = Buffer.alloc(bufferLength + 1);
-            offset = serializeHeader(buffer, offset, key, flag | (3 << 4));
-            buffer.writeInt8(value, offset);
-            return buffer;
-        }
-        else if (-32768 <= value && value < 32768) {
-            buffer = Buffer.alloc(bufferLength + 2);
-            offset = serializeHeader(buffer, offset, key, flag | (4 << 4));
-            buffer.writeInt16LE(value, offset);
-            return buffer;
-        }
-        else if (-2147483648 <= value && value < 2147483648) {
-            buffer = Buffer.alloc(bufferLength + 4);
-            offset = serializeHeader(buffer, offset, key, flag | (5 << 4));
-            buffer.writeInt32LE(value, offset);
-            return buffer;
-        }
-        else {
-            buffer = Buffer.alloc(bufferLength + 8);
-            offset = serializeHeader(buffer, offset, key, flag | (7 << 4));
-            buffer.writeDoubleLE(value, offset);
-            return buffer;
-        }
+  }
+  else if (typeof value === "number" && Number.isInteger(value)) {
+    if (value === 0 || value === 1) {
+      buffer = Buffer.alloc(bufferLength);
+      offset = serializeHeader(buffer, offset, key, flag | ((value + 1) << 4));
+      return buffer;
     }
-    else if (typeof value === 'number') {
-        // is float
-        buffer = Buffer.alloc(bufferLength + 8);
-        offset = serializeHeader(buffer, offset, key, flag | (7 << 4));
-        buffer.writeDoubleLE(value, offset);
-        return buffer;
+    else if (-128 <= value && value < 128) {
+      buffer = Buffer.alloc(bufferLength + 1);
+      offset = serializeHeader(buffer, offset, key, flag | (3 << 4));
+      buffer.writeInt8(value, offset);
+      return buffer;
     }
-    else if (typeof value === 'string') {
-        // is string
-        const utf8Bytes = Buffer.byteLength(value, 'utf8');
-        if (utf8Bytes < 256) {
-            buffer = Buffer.alloc(bufferLength + 1 + utf8Bytes);
-            offset = serializeHeader(buffer, offset, key, flag | (8 << 4));
-            buffer.writeUint8(utf8Bytes, offset++);
-        }
-        else if (utf8Bytes < 65536) {
-            buffer = Buffer.alloc(bufferLength + 2 + utf8Bytes);
-            offset = serializeHeader(buffer, offset, key, flag | (9 << 4));
-            buffer.writeUInt16LE(utf8Bytes, offset);
-            offset += 2;
-        }
-        else {
-            buffer = Buffer.alloc(bufferLength + 4 + utf8Bytes);
-            offset = serializeHeader(buffer, offset, key, flag | (10 << 4));
-            buffer.writeUInt32LE(utf8Bytes, offset);
-            offset += 4;
-        }
-        buffer.write(value, offset, 'utf8');
-        return buffer;
+    else if (-32768 <= value && value < 32768) {
+      buffer = Buffer.alloc(bufferLength + 2);
+      offset = serializeHeader(buffer, offset, key, flag | (4 << 4));
+      buffer.writeInt16LE(value, offset);
+      return buffer;
     }
-    throw 'missing';
-}
-function serializeHeader(buffer, offset, key, flag) {
-    if (key < 256) {
-        buffer.writeUInt8(flag, offset);
-        offset += 1;
-        buffer.writeUInt8(key, offset);
-        offset += 1;
+    else if (-2147483648 <= value && value < 2147483648) {
+      buffer = Buffer.alloc(bufferLength + 4);
+      offset = serializeHeader(buffer, offset, key, flag | (5 << 4));
+      buffer.writeInt32LE(value, offset);
+      return buffer;
+    }
+    else {
+      buffer = Buffer.alloc(bufferLength + 8);
+      offset = serializeHeader(buffer, offset, key, flag | (7 << 4));
+      buffer.writeDoubleLE(value, offset);
+      return buffer;
+    }
+  }
+  else if (typeof value === "number") {
+    buffer = Buffer.alloc(bufferLength + 8);
+    offset = serializeHeader(buffer, offset, key, flag | (7 << 4));
+    buffer.writeDoubleLE(value, offset);
+    return buffer;
+  }
+  else if (typeof value === "string") {
+    const utf8Bytes = Buffer.byteLength(value, "utf8");
+    if (utf8Bytes < 256) {
+      buffer = Buffer.alloc(bufferLength + 1 + utf8Bytes);
+      offset = serializeHeader(buffer, offset, key, flag | (8 << 4));
+      buffer.writeUint8(utf8Bytes, offset++);
+    }
+    else if (utf8Bytes < 65536) {
+      buffer = Buffer.alloc(bufferLength + 2 + utf8Bytes);
+      offset = serializeHeader(buffer, offset, key, flag | (9 << 4));
+      buffer.writeUInt16LE(utf8Bytes, offset);
+      offset += 2;
     }
     else {
-        buffer.writeUInt8(flag | constants_1.FLAG_BYTE, offset);
-        offset += 1;
-        buffer.writeUInt16LE(key, offset);
-        offset += 2;
+      buffer = Buffer.alloc(bufferLength + 4 + utf8Bytes);
+      offset = serializeHeader(buffer, offset, key, flag | (10 << 4));
+      buffer.writeUInt32LE(utf8Bytes, offset);
+      offset += 4;
     }
-    return offset;
+    buffer.write(value, offset, "utf8");
+    return buffer;
+  }
+  throw "missing";
+}
+//=======================================================//
+function serializeHeader(buffer, offset, key, flag) {
+  if (key < 256) {
+    buffer.writeUInt8(flag, offset);
+    offset += 1;
+    buffer.writeUInt8(key, offset);
+    offset += 1;
+  }
+  else {
+    buffer.writeUInt8(flag | FLAG_BYTE, offset);
+    offset += 1;
+    buffer.writeUInt16LE(key, offset);
+    offset += 2;
+  }
+  return offset;
 }
+//=======================================================//

package/lib/WAM/index.js

@@ -1,19 +1,5 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./constants"), exports);
-__exportStar(require("./encode"), exports);
-__exportStar(require("./BinaryInfo"), exports);
+//=======================================================//
+export * from "./BinaryInfo.js";
+export * from "./constants.js";
+export * from "./encode.js";
+//=======================================================//

package/lib/WAUSync/Protocols/USyncContactProtocol.js

@@ -1,32 +1,30 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.USyncContactProtocol = void 0;
-const WABinary_1 = require("../../WABinary");
-class USyncContactProtocol {
-    constructor() {
-        this.name = 'contact';
-    }
-    getQueryElement() {
-        return {
-            tag: 'contact',
-            attrs: {},
-        };
-    }
-    getUserElement(user) {
-        //TODO: Implement type / username fields (not yet supported)
-        return {
-            tag: 'contact',
-            attrs: {},
-            content: user.phone,
-        };
-    }
-    parser(node) {
-        var _a;
-        if (node.tag === 'contact') {
-            (0, WABinary_1.assertNodeErrorFree)(node);
-            return ((_a = node === null || node === void 0 ? void 0 : node.attrs) === null || _a === void 0 ? void 0 : _a.type) === 'in';
-        }
-        return false;
+//=======================================================//
+import { assertNodeErrorFree } from "../../WABinary/index.js";
+import { USyncUser } from "../USyncUser.js";
+//=======================================================//
+export class USyncContactProtocol {
+  constructor() {
+    this.name = "contact";
+  }
+  getQueryElement() {
+    return {
+      tag: "contact",
+      attrs: {}
+    };
+  }
+  getUserElement(user) {
+    return {
+      tag: "contact",
+      attrs: {},
+      content: user.phone
+    };
+  }
+  parser(node) {
+    if (node.tag === "contact") {
+      assertNodeErrorFree(node);
+      return node?.attrs?.type === "in";
     }
+    return false;
+  }
 }
-exports.USyncContactProtocol = USyncContactProtocol;
+//=======================================================//

package/lib/WAUSync/Protocols/USyncDeviceProtocol.js

@@ -1,57 +1,53 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.USyncDeviceProtocol = void 0;
-const WABinary_1 = require("../../WABinary");
-class USyncDeviceProtocol {
-    constructor() {
-        this.name = 'devices';
-    }
-    getQueryElement() {
-        return {
-            tag: 'devices',
-            attrs: {
-                version: '2',
-            },
-        };
-    }
-    getUserElement( /* user: USyncUser */) {
-        //TODO: Implement device phashing, ts and expectedTs
-        //TODO: if all are not present, return null <- current behavior
-        //TODO: otherwise return a node w tag 'devices' w those as attrs
-        return null;
-    }
-    parser(node) {
-        const deviceList = [];
-        let keyIndex = undefined;
-        if (node.tag === 'devices') {
-            (0, WABinary_1.assertNodeErrorFree)(node);
-            const deviceListNode = (0, WABinary_1.getBinaryNodeChild)(node, 'device-list');
-            const keyIndexNode = (0, WABinary_1.getBinaryNodeChild)(node, 'key-index-list');
-            if (Array.isArray(deviceListNode === null || deviceListNode === void 0 ? void 0 : deviceListNode.content)) {
-                for (const { tag, attrs } of deviceListNode.content) {
-                    const id = +attrs.id;
-                    const keyIndex = +attrs['key-index'];
-                    if (tag === 'device') {
-                        deviceList.push({
-                            id,
-                            keyIndex,
-                            isHosted: !!(attrs['is_hosted'] && attrs['is_hosted'] === 'true')
-                        });
-                    }
-                }
-            }
-            if ((keyIndexNode === null || keyIndexNode === void 0 ? void 0 : keyIndexNode.tag) === 'key-index-list') {
-                keyIndex = {
-                    timestamp: +keyIndexNode.attrs['ts'],
-                    signedKeyIndex: keyIndexNode === null || keyIndexNode === void 0 ? void 0 : keyIndexNode.content,
-                    expectedTimestamp: keyIndexNode.attrs['expected_ts'] ? +keyIndexNode.attrs['expected_ts'] : undefined
-                };
-            }
+//=======================================================//
+import { assertNodeErrorFree, getBinaryNodeChild } from "../../WABinary/index.js";
+//=======================================================//
+export class USyncDeviceProtocol {
+  constructor() {
+    this.name = "devices";
+  }
+  getQueryElement() {
+    return {
+      tag: "devices",
+      attrs: {
+        version: "2"
+      }
+    };
+  }
+  getUserElement() {
+    return null;
+  }
+  parser(node) {
+    const deviceList = [];
+    let keyIndex = undefined;
+    if (node.tag === "devices") {
+      assertNodeErrorFree(node);
+      const deviceListNode = getBinaryNodeChild(node, "device-list");
+      const keyIndexNode = getBinaryNodeChild(node, "key-index-list");
+      if (Array.isArray(deviceListNode?.content)) {
+        for (const { tag, attrs } of deviceListNode.content) {
+          const id = +attrs.id;
+          const keyIndex = +attrs["key-index"];
+          if (tag === "device") {
+            deviceList.push({
+              id,
+              keyIndex,
+              isHosted: !!(attrs["is_hosted"] && attrs["is_hosted"] === "true")
+            });
+          }
         }
-        return {
-            deviceList,
-            keyIndex
+      }
+      if (keyIndexNode?.tag === "key-index-list") {
+        keyIndex = {
+          timestamp: +keyIndexNode.attrs["ts"],
+          signedKeyIndex: keyIndexNode?.content,
+          expectedTimestamp: keyIndexNode.attrs["expected_ts"] ? +keyIndexNode.attrs["expected_ts"] : undefined
         };
+      }
     }
+    return {
+      deviceList,
+      keyIndex
+    };
+  }
 }
-exports.USyncDeviceProtocol = USyncDeviceProtocol;
+//=======================================================//

package/lib/WAUSync/Protocols/USyncDisappearingModeProtocol.js

@@ -1,30 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.USyncDisappearingModeProtocol = void 0;
-const WABinary_1 = require("../../WABinary");
-class USyncDisappearingModeProtocol {
-    constructor() {
-        this.name = 'disappearing_mode';
-    }
-    getQueryElement() {
-        return {
-            tag: 'disappearing_mode',
-            attrs: {},
-        };
-    }
-    getUserElement() {
-        return null;
-    }
-    parser(node) {
-        if (node.tag === 'status') {
-            (0, WABinary_1.assertNodeErrorFree)(node);
-            const duration = +(node === null || node === void 0 ? void 0 : node.attrs.duration);
-            const setAt = new Date(+((node === null || node === void 0 ? void 0 : node.attrs.t) || 0) * 1000);
-            return {
-                duration,
-                setAt,
-            };
-        }
+//=======================================================//
+import { assertNodeErrorFree } from "../../WABinary/index.js";
+//=======================================================//
+export class USyncDisappearingModeProtocol {
+  constructor() {
+    this.name = "disappearing_mode";
+  }
+  getQueryElement() {
+    return {
+      tag: "disappearing_mode",
+      attrs: {}
+    };
+  }
+  getUserElement() {
+    return null;
+  }
+  parser(node) {
+    if (node.tag === "disappearing_mode") {
+      assertNodeErrorFree(node);
+      const duration = +node?.attrs.duration;
+      const setAt = new Date(+(node?.attrs.t || 0) * 1000);
+      return {
+        duration,
+        setAt
+      };
     }
+  }
 }
-exports.USyncDisappearingModeProtocol = USyncDisappearingModeProtocol;
+//=======================================================//

package/lib/WAUSync/Protocols/USyncStatusProtocol.js

@@ -1,42 +1,39 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.USyncStatusProtocol = void 0;
-const WABinary_1 = require("../../WABinary");
-class USyncStatusProtocol {
-    constructor() {
-        this.name = 'status';
-    }
-    getQueryElement() {
-        return {
-            tag: 'status',
-            attrs: {},
-        };
-    }
-    getUserElement() {
-        return null;
-    }
-    parser(node) {
-        var _a, _b, _c;
-        if (node.tag === 'status') {
-            (0, WABinary_1.assertNodeErrorFree)(node);
-            let status = (_b = (_a = node === null || node === void 0 ? void 0 : node.content) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : null;
-            const setAt = new Date(+((node === null || node === void 0 ? void 0 : node.attrs.t) || 0) * 1000);
-            if (!status) {
-                if (+((_c = node.attrs) === null || _c === void 0 ? void 0 : _c.code) === 401) {
-                    status = '';
-                }
-                else {
-                    status = null;
-                }
-            }
-            else if (typeof status === 'string' && status.length === 0) {
-                status = null;
-            }
-            return {
-                status,
-                setAt,
-            };
+//=======================================================//
+import { assertNodeErrorFree } from "../../WABinary/index.js";
+export class USyncStatusProtocol {
+  constructor() {
+    this.name = "status";
+  }
+  getQueryElement() {
+    return {
+      tag: "status",
+      attrs: {}
+    };
+  }
+  getUserElement() {
+    return null;
+  }
+  parser(node) {
+    if (node.tag === "status") {
+      assertNodeErrorFree(node);
+      let status = node?.content?.toString() ?? null;
+      const setAt = new Date(+(node?.attrs.t || 0) * 1000);
+      if (!status) {
+        if (node.attrs?.code && +node.attrs.code === 401) {
+          status = "";
+        }
+        else {
+          status = null;
         }
+      }
+      else if (typeof status === "string" && status.length === 0) {
+        status = null;
+      }
+      return {
+        status,
+        setAt
+      };
     }
+  }
 }
-exports.USyncStatusProtocol = USyncStatusProtocol;
+//=======================================================//