violetics 7.0.0-alpha → 7.0.2-alpha

package/lib/WABinary/decode.js

@@ -1,43 +1,19 @@
-"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeBinaryNode = exports.decodeDecompressedBinaryNode = exports.decompressingIfRequired = void 0;
-const zlib_1 = require("zlib");
-const constants = __importStar(require("./constants"));
-const jid_utils_1 = require("./jid-utils");
-const decompressingIfRequired = (buffer) => {
+import { promisify } from 'util';
+import { inflate } from 'zlib';
+import * as constants from './constants.js';
+import { jidEncode, WAJIDDomains } from './jid-utils.js';
+const inflatePromise = promisify(inflate);
+export const decompressingIfRequired = async (buffer) => {
     if (2 & buffer.readUInt8()) {
-        buffer = (0, zlib_1.inflateSync)(buffer.slice(1));
+        buffer = await inflatePromise(buffer.slice(1));
     }
-    else { // nodes with no compression have a 0x00 prefix, we remove that
+    else {
+        // nodes with no compression have a 0x00 prefix, we remove that
         buffer = buffer.slice(1);
     }
     return buffer;
 };
-exports.decompressingIfRequired = decompressingIfRequired;
-const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) => {
+export const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) => {
     const { DOUBLE_BYTE_TOKENS, SINGLE_BYTE_TOKENS, TAGS } = opts;
     const checkEOS = (length) => {
         if (indexRef.index + length > buffer.length) {
@@ -144,18 +120,21 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
         throw new Error('invalid jid pair: ' + i + ', ' + j);
     };
     const readAdJid = () => {
-        const domainType = readByte();
+        const rawDomainType = readByte();
+        const domainType = Number(rawDomainType);
         const device = readByte();
         const user = readString(readByte());
-        let server = 's.whatsapp.net';
-        if (domainType === 1) {
+        let server = 's.whatsapp.net'; // default whatsapp server
+        if (domainType === WAJIDDomains.LID) {
             server = 'lid';
-        } else if (domainType === 128) {
+        }
+        else if (domainType === WAJIDDomains.HOSTED) {
             server = 'hosted';
-        } else if (domainType === 129) {
+        }
+        else if (domainType === WAJIDDomains.HOSTED_LID) {
             server = 'hosted.lid';
         }
-        return (0, jid_utils_1.jidEncode)(user, server, device);
+        return jidEncode(user, server, device);
     };
     const readFbJid = () => {
         const user = readString(readByte());
@@ -171,7 +150,8 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
         const beforeServer = indexRef.index;
         try {
             server = readString(readByte());
-        } catch (err) {
+        }
+        catch (err) {
             indexRef.index = beforeServer;
         }
         return `${integrator}-${user}:${device}@${server}`;
@@ -213,7 +193,7 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
         const items = [];
         const size = readListSize(tag);
         for (let i = 0; i < size; i++) {
-            items.push((0, exports.decodeDecompressedBinaryNode)(buffer, opts, indexRef));
+            items.push(decodeDecompressedBinaryNode(buffer, opts, indexRef));
         }
         return items;
     };
@@ -275,9 +255,7 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
         content: data
     };
 };
-exports.decodeDecompressedBinaryNode = decodeDecompressedBinaryNode;
-const decodeBinaryNode = (buff) => {
-    const decompBuff = (0, exports.decompressingIfRequired)(buff);
-    return (0, exports.decodeDecompressedBinaryNode)(decompBuff, constants);
-};
-exports.decodeBinaryNode = decodeBinaryNode;
+export const decodeBinaryNode = async (buff) => {
+    const decompBuff = await decompressingIfRequired(buff);
+    return decodeDecompressedBinaryNode(decompBuff, constants);
+};

package/lib/WABinary/encode.js

@@ -1,265 +1,219 @@
-"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v })
-}) : function(o, v) {
-    o["default"] = v
-})
-
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod
-    var result = {}
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k)
-    __setModuleDefault(result, mod)
-    return result
-}
-
-Object.defineProperty(exports, "__esModule", { value: true })
-
-const constants = __importStar(require("./constants"))
-const jid_utils_1 = require("./jid-utils")
-
-const encodeBinaryNode = (node, opts = constants, buffer = [0]) => {
-    const encoded = encodeBinaryNodeInner(node, opts, buffer)
-    return Buffer.from(encoded)
-}
-
+import * as constants from './constants.js';
+import { jidDecode } from './jid-utils.js';
+export const encodeBinaryNode = (node, opts = constants, buffer = [0]) => {
+    const encoded = encodeBinaryNodeInner(node, opts, buffer);
+    return Buffer.from(encoded);
+};
 const encodeBinaryNodeInner = ({ tag, attrs, content }, opts, buffer) => {
-    const { TAGS, TOKEN_MAP } = opts
-    const pushByte = (value) => buffer.push(value & 0xff)
+    const { TAGS, TOKEN_MAP } = opts;
+    const pushByte = (value) => buffer.push(value & 0xff);
     const pushInt = (value, n, littleEndian = false) => {
         for (let i = 0; i < n; i++) {
-            const curShift = littleEndian ? i : n - 1 - i
-            buffer.push((value >> (curShift * 8)) & 0xff)
+            const curShift = littleEndian ? i : n - 1 - i;
+            buffer.push((value >> (curShift * 8)) & 0xff);
         }
-    }
-    
+    };
     const pushBytes = (bytes) => {
         for (const b of bytes) {
-            buffer.push(b)
+            buffer.push(b);
         }
-    }
-    
+    };
     const pushInt16 = (value) => {
-        pushBytes([(value >> 8) & 0xff, value & 0xff])
-    }
-    
-    const pushInt20 = (value) => (pushBytes([(value >> 16) & 0x0f, (value >> 8) & 0xff, value & 0xff]))
+        pushBytes([(value >> 8) & 0xff, value & 0xff]);
+    };
+    const pushInt20 = (value) => pushBytes([(value >> 16) & 0x0f, (value >> 8) & 0xff, value & 0xff]);
     const writeByteLength = (length) => {
         if (length >= 4294967296) {
-            throw new Error('string too large to encode: ' + length)
+            throw new Error('string too large to encode: ' + length);
         }
         if (length >= 1 << 20) {
-            pushByte(TAGS.BINARY_32)
-            pushInt(length, 4) // 32 bit integer
+            pushByte(TAGS.BINARY_32);
+            pushInt(length, 4); // 32 bit integer
         }
         else if (length >= 256) {
-            pushByte(TAGS.BINARY_20)
-            pushInt20(length)
+            pushByte(TAGS.BINARY_20);
+            pushInt20(length);
         }
         else {
-            pushByte(TAGS.BINARY_8)
-            pushByte(length)
+            pushByte(TAGS.BINARY_8);
+            pushByte(length);
         }
-    }
-    
+    };
     const writeStringRaw = (str) => {
-        const bytes = Buffer.from(str, 'utf-8')
-        writeByteLength(bytes.length)
-        pushBytes(bytes)
-    }
-    
+        const bytes = Buffer.from(str, 'utf-8');
+        writeByteLength(bytes.length);
+        pushBytes(bytes);
+    };
     const writeJid = ({ domainType, device, user, server }) => {
         if (typeof device !== 'undefined') {
-            pushByte(TAGS.AD_JID)
-            pushByte(domainType || 0)
-            pushByte(device || 0)
-            writeString(user)
+            pushByte(TAGS.AD_JID);
+            pushByte(domainType || 0);
+            pushByte(device || 0);
+            writeString(user);
         }
         else {
-            pushByte(TAGS.JID_PAIR)
+            pushByte(TAGS.JID_PAIR);
             if (user.length) {
-                writeString(user)
+                writeString(user);
             }
             else {
-                pushByte(TAGS.LIST_EMPTY)
+                pushByte(TAGS.LIST_EMPTY);
             }
-            writeString(server)
+            writeString(server);
         }
-    }
-    
+    };
     const packNibble = (char) => {
         switch (char) {
             case '-':
-                return 10
+                return 10;
             case '.':
-                return 11
+                return 11;
             case '\0':
-                return 15
+                return 15;
             default:
                 if (char >= '0' && char <= '9') {
-                    return char.charCodeAt(0) - '0'.charCodeAt(0)
+                    return char.charCodeAt(0) - '0'.charCodeAt(0);
                 }
-                throw new Error(`invalid byte for nibble "${char}"`)
+                throw new Error(`invalid byte for nibble "${char}"`);
         }
-    }
-    
+    };
     const packHex = (char) => {
         if (char >= '0' && char <= '9') {
-            return char.charCodeAt(0) - '0'.charCodeAt(0)
+            return char.charCodeAt(0) - '0'.charCodeAt(0);
         }
         if (char >= 'A' && char <= 'F') {
-            return 10 + char.charCodeAt(0) - 'A'.charCodeAt(0)
+            return 10 + char.charCodeAt(0) - 'A'.charCodeAt(0);
         }
         if (char >= 'a' && char <= 'f') {
-            return 10 + char.charCodeAt(0) - 'a'.charCodeAt(0)
+            return 10 + char.charCodeAt(0) - 'a'.charCodeAt(0);
         }
         if (char === '\0') {
-            return 15
+            return 15;
         }
-        throw new Error(`Invalid hex char "${char}"`)
-    }
-    
+        throw new Error(`Invalid hex char "${char}"`);
+    };
     const writePackedBytes = (str, type) => {
         if (str.length > TAGS.PACKED_MAX) {
-            throw new Error('Too many bytes to pack')
+            throw new Error('Too many bytes to pack');
         }
-        pushByte(type === 'nibble' ? TAGS.NIBBLE_8 : TAGS.HEX_8)
-        let roundedLength = Math.ceil(str.length / 2.0)
+        pushByte(type === 'nibble' ? TAGS.NIBBLE_8 : TAGS.HEX_8);
+        let roundedLength = Math.ceil(str.length / 2.0);
         if (str.length % 2 !== 0) {
-            roundedLength |= 128
+            roundedLength |= 128;
         }
-        pushByte(roundedLength)
-        const packFunction = type === 'nibble' ? packNibble : packHex
+        pushByte(roundedLength);
+        const packFunction = type === 'nibble' ? packNibble : packHex;
         const packBytePair = (v1, v2) => {
-            const result = (packFunction(v1) << 4) | packFunction(v2)
-            return result
-        }
-        const strLengthHalf = Math.floor(str.length / 2)
+            const result = (packFunction(v1) << 4) | packFunction(v2);
+            return result;
+        };
+        const strLengthHalf = Math.floor(str.length / 2);
         for (let i = 0; i < strLengthHalf; i++) {
-            pushByte(packBytePair(str[2 * i], str[2 * i + 1]))
+            pushByte(packBytePair(str[2 * i], str[2 * i + 1]));
         }
         if (str.length % 2 !== 0) {
-            pushByte(packBytePair(str[str.length - 1], '\x00'))
+            pushByte(packBytePair(str[str.length - 1], '\x00'));
         }
-    }
-    
+    };
     const isNibble = (str) => {
         if (!str || str.length > TAGS.PACKED_MAX) {
-            return false
+            return false;
         }
         for (const char of str) {
-            const isInNibbleRange = char >= '0' && char <= '9'
+            const isInNibbleRange = char >= '0' && char <= '9';
             if (!isInNibbleRange && char !== '-' && char !== '.') {
-                return false
+                return false;
             }
         }
-        return true
-    }
-    
+        return true;
+    };
     const isHex = (str) => {
         if (!str || str.length > TAGS.PACKED_MAX) {
-            return false
+            return false;
         }
         for (const char of str) {
-            const isInNibbleRange = char >= '0' && char <= '9'
+            const isInNibbleRange = char >= '0' && char <= '9';
             if (!isInNibbleRange && !(char >= 'A' && char <= 'F')) {
-                return false
+                return false;
             }
         }
-        return true
-    }
-    
+        return true;
+    };
     const writeString = (str) => {
-    	if (str === undefined || str === null) {
-            pushByte(TAGS.LIST_EMPTY)
-            return
+        if (str === undefined || str === null) {
+            pushByte(TAGS.LIST_EMPTY);
+            return;
         }
-        const tokenIndex = TOKEN_MAP[str]
+        if (str === '') {
+            writeStringRaw(str);
+            return;
+        }
+        const tokenIndex = TOKEN_MAP[str];
         if (tokenIndex) {
             if (typeof tokenIndex.dict === 'number') {
-                pushByte(TAGS.DICTIONARY_0 + tokenIndex.dict)
+                pushByte(TAGS.DICTIONARY_0 + tokenIndex.dict);
             }
-            pushByte(tokenIndex.index)
+            pushByte(tokenIndex.index);
         }
         else if (isNibble(str)) {
-            writePackedBytes(str, 'nibble')
+            writePackedBytes(str, 'nibble');
         }
         else if (isHex(str)) {
-            writePackedBytes(str, 'hex')
+            writePackedBytes(str, 'hex');
         }
-        else if (str) {
-            const decodedJid = (0, jid_utils_1.jidDecode)(str)
+        else {
+            const decodedJid = jidDecode(str);
             if (decodedJid) {
-                writeJid(decodedJid)
+                writeJid(decodedJid);
             }
             else {
-                writeStringRaw(str)
+                writeStringRaw(str);
             }
         }
-    }
-    
+    };
     const writeListStart = (listSize) => {
         if (listSize === 0) {
-            pushByte(TAGS.LIST_EMPTY)
+            pushByte(TAGS.LIST_EMPTY);
         }
         else if (listSize < 256) {
-            pushBytes([TAGS.LIST_8, listSize])
+            pushBytes([TAGS.LIST_8, listSize]);
         }
         else {
-            pushByte(TAGS.LIST_16)
-            pushInt16(listSize)
+            pushByte(TAGS.LIST_16);
+            pushInt16(listSize);
         }
-    }
-    
+    };
     if (!tag) {
-        throw new Error('Invalid node: tag cannot be undefined')
+        throw new Error('Invalid node: tag cannot be undefined');
     }
-    
-    const validAttributes = Object.keys(attrs).filter(k => (typeof attrs[k] !== 'undefined' && attrs[k] !== null))
-    writeListStart(2 * validAttributes.length + 1 + (typeof content !== 'undefined' ? 1 : 0))
-    writeString(tag)
+    const validAttributes = Object.keys(attrs || {}).filter(k => typeof attrs[k] !== 'undefined' && attrs[k] !== null);
+    writeListStart(2 * validAttributes.length + 1 + (typeof content !== 'undefined' ? 1 : 0));
+    writeString(tag);
     for (const key of validAttributes) {
         if (typeof attrs[key] === 'string') {
-            writeString(key)
-            writeString(attrs[key])
+            writeString(key);
+            writeString(attrs[key]);
         }
     }
     if (typeof content === 'string') {
-        writeString(content)
+        writeString(content);
     }
     else if (Buffer.isBuffer(content) || content instanceof Uint8Array) {
-        writeByteLength(content.length)
-        pushBytes(content)
+        writeByteLength(content.length);
+        pushBytes(content);
     }
     else if (Array.isArray(content)) {
-    	const validContent = content.filter(item => item && (item.tag || Buffer.isBuffer(item) || item instanceof Uint8Array || typeof item === 'string'))
-        writeListStart(validContent.length)
+        const validContent = content.filter(item => item && (item.tag || Buffer.isBuffer(item) || item instanceof Uint8Array || typeof item === 'string'));
+        writeListStart(validContent.length);
         for (const item of validContent) {
-            encodeBinaryNodeInner(item, opts, buffer)
+            encodeBinaryNodeInner(item, opts, buffer);
         }
     }
     else if (typeof content === 'undefined') {
         // do nothing
     }
     else {
-        throw new Error(`invalid children for header "${tag}": ${content} (${typeof content})`)
+        throw new Error(`invalid children for header "${tag}": ${content} (${typeof content})`);
     }
-    return buffer
-}
-
-module.exports = {
-  encodeBinaryNode 
-}
+    return buffer;
+};