zapo-js 0.1.1 → 0.2.0

package/dist/store/providers/memory/sender-key.store.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SenderKeyMemoryStore = void 0;
+const jid_1 = require("../../../protocol/jid");
 const coercion_1 = require("../../../util/coercion");
 const collections_1 = require("../../../util/collections");
-const signal_address_1 = require("../../../util/signal-address");
 const DEFAULT_SENDER_KEY_STORE_LIMITS = Object.freeze({
     senderKeys: 8192,
     senderDistributions: 8192
@@ -48,12 +48,13 @@ class SenderKeyMemoryStore {
         const record = this.senderKeys.get(this.makeKey(groupId, sender));
         return record ?? null;
     }
-    async getDeviceSenderKeyDistribution(groupId, sender) {
-        const record = this.senderDistributions.get(this.makeKey(groupId, sender));
-        return record ?? null;
-    }
     async getDeviceSenderKeyDistributions(groupId, senders) {
-        return senders.map((sender) => this.senderDistributions.get(this.makeKey(groupId, sender)) ?? null);
+        const records = new Array(senders.length);
+        for (let index = 0; index < senders.length; index += 1) {
+            records[index] =
+                this.senderDistributions.get(this.makeKey(groupId, senders[index])) ?? null;
+        }
+        return records;
     }
     async deleteDeviceSenderKey(target, groupId) {
         let deleted = 0;
@@ -63,8 +64,10 @@ class SenderKeyMemoryStore {
     }
     async markForgetSenderKey(groupId, participants) {
         let deleted = 0;
-        for (const participant of participants) {
-            deleted += await this.deleteDeviceSenderKey(participant, groupId);
+        for (let index = 0; index < participants.length; index += 1) {
+            const participant = participants[index];
+            deleted += this.deleteMatching(this.senderKeys, participant, groupId);
+            deleted += this.deleteMatching(this.senderDistributions, participant, groupId);
         }
         return deleted;
     }
@@ -74,10 +77,10 @@ class SenderKeyMemoryStore {
     }
     deleteMatching(map, target, groupId) {
         let deleted = 0;
-        const targetAddressKey = (0, signal_address_1.signalAddressKey)(target);
+        const targetAddressKey = (0, jid_1.signalAddressKey)(target);
         for (const [key, record] of map.entries()) {
             const sameGroup = groupId ? record.groupId === groupId : true;
-            const sameAddress = (0, signal_address_1.signalAddressKey)(record.sender) === targetAddressKey;
+            const sameAddress = (0, jid_1.signalAddressKey)(record.sender) === targetAddressKey;
             if (sameGroup && sameAddress) {
                 map.delete(key);
                 deleted += 1;
@@ -86,7 +89,7 @@ class SenderKeyMemoryStore {
         return deleted;
     }
     makeKey(groupId, sender) {
-        return `${groupId}|${(0, signal_address_1.signalAddressKey)(sender)}`;
+        return `${groupId}|${(0, jid_1.signalAddressKey)(sender)}`;
     }
 }
 exports.SenderKeyMemoryStore = SenderKeyMemoryStore;

package/dist/store/providers/memory/signal.store.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WaSignalMemoryStore = void 0;
+const jid_1 = require("../../../protocol/jid");
 const coercion_1 = require("../../../util/coercion");
 const collections_1 = require("../../../util/collections");
-const signal_address_1 = require("../../../util/signal-address");
 const DEFAULT_SIGNAL_STORE_LIMITS = Object.freeze({
     preKeys: 4096,
     sessions: 8192,
@@ -61,12 +61,15 @@ class WaSignalMemoryStore {
             throw new Error(`invalid prekey count: ${count}`);
         }
         const available = [];
-        const sortedIds = [...this.preKeys.keys()].sort((left, right) => left - right);
-        for (let index = 0; index < sortedIds.length; index += 1) {
-            const keyId = sortedIds[index];
-            if (this.uploadedPreKeys.has(keyId)) {
-                continue;
+        const availableKeyIds = [];
+        for (const keyId of this.preKeys.keys()) {
+            if (!this.uploadedPreKeys.has(keyId)) {
+                availableKeyIds.push(keyId);
             }
+        }
+        availableKeyIds.sort((left, right) => left - right);
+        for (let index = 0; index < availableKeyIds.length; index += 1) {
+            const keyId = availableKeyIds[index];
             const record = this.preKeys.get(keyId);
             if (!record) {
                 continue;
@@ -89,7 +92,11 @@ class WaSignalMemoryStore {
         return this.preKeys.get(keyId) ?? null;
     }
     async getPreKeysById(keyIds) {
-        return keyIds.map((keyId) => this.preKeys.get(keyId) ?? null);
+        const result = new Array(keyIds.length);
+        for (let i = 0; i < keyIds.length; i += 1) {
+            result[i] = this.preKeys.get(keyIds[i]) ?? null;
+        }
+        return result;
     }
     async consumePreKeyById(keyId) {
         const record = this.preKeys.get(keyId) ?? null;
@@ -120,30 +127,62 @@ class WaSignalMemoryStore {
     async getServerHasPreKeys() {
         return this.serverHasPreKeys;
     }
+    async getSignalMeta() {
+        return {
+            serverHasPreKeys: this.serverHasPreKeys,
+            signedPreKeyRotationTs: this.signedPreKeyRotationTs,
+            registrationInfo: this.registrationInfo,
+            signedPreKey: this.signedPreKey
+        };
+    }
     async hasSession(address) {
-        return this.signalSessions.has((0, signal_address_1.signalAddressKey)(address));
+        return this.signalSessions.has((0, jid_1.signalAddressKey)(address));
     }
     async hasSessions(addresses) {
-        return addresses.map((address) => this.signalSessions.has((0, signal_address_1.signalAddressKey)(address)));
+        const result = new Array(addresses.length);
+        for (let i = 0; i < addresses.length; i += 1) {
+            result[i] = this.signalSessions.has((0, jid_1.signalAddressKey)(addresses[i]));
+        }
+        return result;
     }
     async getSession(address) {
-        return this.signalSessions.get((0, signal_address_1.signalAddressKey)(address)) ?? null;
+        return this.signalSessions.get((0, jid_1.signalAddressKey)(address)) ?? null;
+    }
+    async getSessionsBatch(addresses) {
+        const result = new Array(addresses.length);
+        for (let i = 0; i < addresses.length; i += 1) {
+            result[i] = this.signalSessions.get((0, jid_1.signalAddressKey)(addresses[i])) ?? null;
+        }
+        return result;
     }
     async setSession(address, session) {
-        (0, collections_1.setBoundedMapEntry)(this.signalSessions, (0, signal_address_1.signalAddressKey)(address), session, this.maxSessions);
+        (0, collections_1.setBoundedMapEntry)(this.signalSessions, (0, jid_1.signalAddressKey)(address), session, this.maxSessions);
+    }
+    async setSessionsBatch(entries) {
+        for (let index = 0; index < entries.length; index += 1) {
+            const entry = entries[index];
+            (0, collections_1.setBoundedMapEntry)(this.signalSessions, (0, jid_1.signalAddressKey)(entry.address), entry.session, this.maxSessions);
+        }
     }
     async deleteSession(address) {
-        this.signalSessions.delete((0, signal_address_1.signalAddressKey)(address));
+        this.signalSessions.delete((0, jid_1.signalAddressKey)(address));
     }
     async getRemoteIdentity(address) {
-        return this.remoteIdentities.get((0, signal_address_1.signalAddressKey)(address)) ?? null;
+        return this.remoteIdentities.get((0, jid_1.signalAddressKey)(address)) ?? null;
+    }
+    async getRemoteIdentities(addresses) {
+        const result = new Array(addresses.length);
+        for (let i = 0; i < addresses.length; i += 1) {
+            result[i] = this.remoteIdentities.get((0, jid_1.signalAddressKey)(addresses[i])) ?? null;
+        }
+        return result;
     }
     async setRemoteIdentity(address, identityKey) {
-        (0, collections_1.setBoundedMapEntry)(this.remoteIdentities, (0, signal_address_1.signalAddressKey)(address), identityKey, this.maxRemoteIdentities);
+        (0, collections_1.setBoundedMapEntry)(this.remoteIdentities, (0, jid_1.signalAddressKey)(address), identityKey, this.maxRemoteIdentities);
     }
     async setRemoteIdentities(entries) {
         for (const entry of entries) {
-            (0, collections_1.setBoundedMapEntry)(this.remoteIdentities, (0, signal_address_1.signalAddressKey)(entry.address), entry.identityKey, this.maxRemoteIdentities);
+            (0, collections_1.setBoundedMapEntry)(this.remoteIdentities, (0, jid_1.signalAddressKey)(entry.address), entry.identityKey, this.maxRemoteIdentities);
         }
     }
     async clear() {
@@ -158,17 +197,7 @@ class WaSignalMemoryStore {
         this.nextPreKeyId = 1;
     }
     addUploadedPreKey(keyId) {
-        if (this.uploadedPreKeys.has(keyId)) {
-            this.uploadedPreKeys.delete(keyId);
-        }
         this.uploadedPreKeys.add(keyId);
-        while (this.uploadedPreKeys.size > this.maxPreKeys) {
-            const oldest = this.uploadedPreKeys.values().next().value;
-            if (oldest === undefined) {
-                break;
-            }
-            this.uploadedPreKeys.delete(oldest);
-        }
     }
 }
 exports.WaSignalMemoryStore = WaSignalMemoryStore;

package/dist/store/providers/memory/thread.store.js

@@ -14,6 +14,11 @@ class WaThreadMemoryStore {
     async upsert(record) {
         (0, collections_1.setBoundedMapEntry)(this.threads, record.jid, record, this.maxThreads);
     }
+    async upsertBatch(records) {
+        for (const record of records) {
+            (0, collections_1.setBoundedMapEntry)(this.threads, record.jid, record, this.maxThreads);
+        }
+    }
     async getByJid(jid) {
         return this.threads.get(jid) ?? null;
     }

package/dist/transport/WaComms.js

@@ -6,8 +6,8 @@ const BoundedTaskQueue_1 = require("../infra/perf/BoundedTaskQueue");
 const constants_1 = require("../protocol/constants");
 const WaNoiseSession_1 = require("./noise/WaNoiseSession");
 const WaWebSocket_1 = require("./WaWebSocket");
-const base64_1 = require("../util/base64");
 const bytes_1 = require("../util/bytes");
+const bytes_2 = require("../util/bytes");
 const primitives_1 = require("../util/primitives");
 const WA_FRAME_HANDLER_QUEUE_MAX_SIZE = 4096;
 const WA_FRAME_HANDLER_MAX_CONCURRENCY = 8;
@@ -30,6 +30,8 @@ class WaComms {
             url: this.config.url,
             urls: this.config.urls,
             protocols: this.config.protocols,
+            dispatcher: this.config.dispatcher,
+            agent: this.config.agent,
             timeoutIntervalMs: this.config.timeoutIntervalMs
         }, logger);
         this.socket.setHandlers({
@@ -80,7 +82,7 @@ class WaComms {
         if (!routingInfo || routingInfo.byteLength === 0) {
             return config;
         }
-        const edValue = (0, base64_1.bytesToBase64UrlSafe)(routingInfo);
+        const edValue = (0, bytes_1.bytesToBase64UrlSafe)(routingInfo);
         const appendEd = (url) => {
             try {
                 const parsed = new URL(url);
@@ -147,9 +149,7 @@ class WaComms {
     startHandlingRequests() {
         this.handlingRequests = true;
         this.logger.debug('comms request handling enabled');
-        this.frameProcessingQueue = this.frameProcessingQueue
-            .catch(() => undefined)
-            .then(async () => this.flushPendingFrames());
+        this.frameProcessingQueue = this.frameProcessingQueue.then(() => this.flushPendingFrames(), () => this.flushPendingFrames());
     }
     async stopComms() {
         this.logger.info('comms stop requested');
@@ -275,9 +275,7 @@ class WaComms {
         });
     }
     onSocketMessage(payload) {
-        this.frameProcessingQueue = this.frameProcessingQueue
-            .catch(() => undefined)
-            .then(async () => this.processSocketPayload(payload));
+        this.frameProcessingQueue = this.frameProcessingQueue.then(() => this.processSocketPayload(payload), () => this.processSocketPayload(payload));
     }
     async processSocketPayload(payload) {
         if (!this.noiseSession) {
@@ -342,7 +340,7 @@ class WaComms {
             this.noiseSession = null;
             throw error;
         }
-        const buffered = await session.pushWireChunk(bytes_1.EMPTY_BYTES);
+        const buffered = await session.pushWireChunk(bytes_2.EMPTY_BYTES);
         this.routeDecodedFrames(buffered);
         this.resumeHandshakeFailures = 0;
         this.lastServerStaticKey = session.getServerStaticKey();
@@ -404,7 +402,9 @@ class WaComms {
             this.schedulePendingFramesOverflowClose();
             return false;
         }
-        this.pendingFrames.push(...frames);
+        for (let i = 0; i < frames.length; i += 1) {
+            this.pendingFrames.push(frames[i]);
+        }
         this.pendingFramesByteLength = nextBytes;
         return true;
     }
@@ -426,20 +426,19 @@ class WaComms {
     }
     scheduleDecodedFrame(frame) {
         void this.frameHandlerQueue
-            .enqueue(async () => this.onDecodedFrame(frame))
+            .enqueue(() => this.onDecodedFrame(frame))
             .catch((error) => {
-            const normalized = (0, primitives_1.toError)(error);
-            this.logger.error('failed to enqueue decoded frame handler', {
-                message: normalized.message
-            });
-            if (!(error instanceof BoundedTaskQueue_1.BoundedTaskQueueFullError)) {
+            if (error instanceof BoundedTaskQueue_1.BoundedTaskQueueFullError) {
+                this.logger.warn('frame handler queue is full, resuming socket to preserve bounds', {
+                    pending: this.frameHandlerQueue.pending(),
+                    inFlight: this.frameHandlerQueue.inFlight()
+                });
+                void this.closeSocketAndResume();
                 return;
             }
-            this.logger.warn('frame handler queue is full, processing frame inline', {
-                pending: this.frameHandlerQueue.pending(),
-                inFlight: this.frameHandlerQueue.inFlight()
+            this.logger.error('failed to enqueue decoded frame handler', {
+                message: (0, primitives_1.toError)(error).message
             });
-            void this.onDecodedFrame(frame);
         });
     }
     scheduleReconnect() {
@@ -463,12 +462,16 @@ class WaComms {
         this.reconnectTimer = null;
     }
     removeWaiter(reject) {
-        const index = this.waiters.findIndex((entry) => entry.reject === reject);
-        if (index === -1) {
+        for (let index = 0; index < this.waiters.length; index += 1) {
+            const waiter = this.waiters[index];
+            if (waiter.reject !== reject) {
+                continue;
+            }
+            clearTimeout(waiter.timer);
+            this.waiters[index] = this.waiters[this.waiters.length - 1];
+            this.waiters.pop();
             return;
         }
-        const [waiter] = this.waiters.splice(index, 1);
-        clearTimeout(waiter.timer);
     }
     withStickyRoutingCookie(headers) {
         const out = headers ? { ...headers } : {};
@@ -521,11 +524,12 @@ class WaComms {
         }
     }
     drainWaiters(drain) {
-        const waiters = this.waiters.splice(0, this.waiters.length);
-        for (const waiter of waiters) {
+        for (let index = this.waiters.length - 1; index >= 0; index -= 1) {
+            const waiter = this.waiters[index];
             clearTimeout(waiter.timer);
             drain(waiter);
         }
+        this.waiters.length = 0;
     }
 }
 exports.WaComms = WaComms;

package/dist/transport/WaWebSocket.js

@@ -1,10 +1,82 @@
 "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 () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WaWebSocket = void 0;
 const ConsoleLogger_1 = require("../infra/log/ConsoleLogger");
 const constants_1 = require("../protocol/constants");
 const bytes_1 = require("../util/bytes");
 const primitives_1 = require("../util/primitives");
+const WS_OPTIONAL_MODULE = 'ws';
+function asOptionalNodeWsConstructor(loaded) {
+    if (loaded && typeof loaded === 'object') {
+        const direct = loaded.WebSocket;
+        if (typeof direct === 'function') {
+            return direct;
+        }
+        const fallback = loaded.default;
+        if (typeof fallback === 'function') {
+            return fallback;
+        }
+    }
+    if (typeof loaded === 'function') {
+        return loaded;
+    }
+    return null;
+}
+async function loadOptionalNodeWsConstructor() {
+    try {
+        const loaded = await Promise.resolve(`${WS_OPTIONAL_MODULE}`).then(s => __importStar(require(s)));
+        const constructor = asOptionalNodeWsConstructor(loaded);
+        if (constructor) {
+            return constructor;
+        }
+        throw new Error('invalid ws module export');
+    }
+    catch (error) {
+        const normalized = (0, primitives_1.toError)(error);
+        const code = normalized.code;
+        const message = normalized.message ?? '';
+        const isModuleNotFound = (code === 'ERR_MODULE_NOT_FOUND' || code === 'MODULE_NOT_FOUND') &&
+            (message.includes(`'${WS_OPTIONAL_MODULE}'`) ||
+                message.includes(`"${WS_OPTIONAL_MODULE}"`));
+        if (isModuleNotFound) {
+            throw new Error('optional dependency "ws" is not installed. Install with: npm i ws');
+        }
+        throw normalized;
+    }
+}
 function resolveWebSocketConstructor() {
     const ctor = globalThis
         .WebSocket;
@@ -16,12 +88,13 @@ function resolveWebSocketConstructor() {
 function resolveSocketUrls(config) {
     const preferredUrls = config.urls;
     if (preferredUrls && preferredUrls.length > 0) {
-        return Object.freeze(Array.from(new Set(preferredUrls)));
+        const unique = [];
+        for (const url of preferredUrls)
+            if (unique.indexOf(url) === -1)
+                unique.push(url);
+        return Object.freeze(unique);
     }
-    if (config.url) {
-        return Object.freeze([config.url]);
-    }
-    return constants_1.WA_DEFAULTS.CHAT_SOCKET_URLS;
+    return config.url ? Object.freeze([config.url]) : constants_1.WA_DEFAULTS.CHAT_SOCKET_URLS;
 }
 function resolveSocketRuntime() {
     const maybeNodeProcess = globalThis.process;
@@ -44,6 +117,7 @@ class WaWebSocket {
         this.handlers = {};
         this.socket = null;
         this.closeWaiter = null;
+        this.nodeWsCtorPromise = null;
     }
     setHandlers(handlers) {
         this.handlers = handlers;
@@ -55,12 +129,6 @@ class WaWebSocket {
         return (this.socket?.readyState === constants_1.WA_READY_STATES.CONNECTING ||
             this.connectingSockets.size > 0);
     }
-    getReadyState() {
-        if (this.connectingSockets.size > 0) {
-            return constants_1.WA_READY_STATES.CONNECTING;
-        }
-        return this.socket?.readyState ?? constants_1.WA_READY_STATES.CLOSED;
-    }
     async open() {
         if (this.isOpen()) {
             this.logger.trace('socket open skipped: already open');
@@ -147,7 +215,7 @@ class WaWebSocket {
         socket.send(data);
     }
     async openSingle(url) {
-        const pending = this.createPendingSocket(url);
+        const pending = await this.createPendingSocket(url);
         return new Promise((resolve, reject) => {
             this.bindPendingSocket(pending, {
                 onOpen: () => {
@@ -169,7 +237,20 @@ class WaWebSocket {
         });
     }
     async openConcurrently(urls) {
-        const pendingSockets = urls.map((url) => this.createPendingSocket(url));
+        const setupResults = await Promise.allSettled(urls.map((url) => this.createPendingSocket(url)));
+        const pendingSockets = [];
+        let setupError = null;
+        for (const result of setupResults) {
+            if (result.status === 'fulfilled') {
+                pendingSockets.push(result.value);
+                continue;
+            }
+            setupError = setupError ?? (0, primitives_1.toError)(result.reason);
+        }
+        if (setupError) {
+            this.releasePendingSocketsAfterSetupFailure(pendingSockets);
+            throw setupError;
+        }
         return new Promise((resolve, reject) => {
             let done = false;
             let failedCount = 0;
@@ -213,6 +294,14 @@ class WaWebSocket {
             }
         });
     }
+    releasePendingSocketsAfterSetupFailure(entries) {
+        for (const entry of entries) {
+            if (!this.settlePendingSocket(entry)) {
+                continue;
+            }
+            this.closeSocketSafe(entry.socket, 1000, 'connect_setup_failed');
+        }
+    }
     bindRuntimeHandlers(socket) {
         socket.onmessage = (event) => {
             void this.handleMessage(event.data);
@@ -260,8 +349,8 @@ class WaWebSocket {
         }
         return null;
     }
-    createPendingSocket(url) {
-        const socket = this.createRawSocket(url);
+    async createPendingSocket(url) {
+        const socket = await this.createRawSocket(url);
         socket.binaryType = 'arraybuffer';
         this.connectingSockets.add(socket);
         return {
@@ -354,12 +443,53 @@ class WaWebSocket {
             // no-op
         }
     }
-    createRawSocket(url) {
+    async createRawSocket(url) {
         const headers = this.config.headers;
-        if (this.socketRuntime === 'node' && headers && Object.keys(headers).length > 0) {
-            return new this.webSocketCtor(url, this.config.protocols, { headers });
+        const dispatcher = this.config.dispatcher;
+        const agent = this.config.agent;
+        let hasHeaders = false;
+        if (headers) {
+            for (const key in headers) {
+                if (Object.prototype.hasOwnProperty.call(headers, key)) {
+                    hasHeaders = true;
+                    break;
+                }
+            }
+        }
+        if (this.socketRuntime === 'node' && agent) {
+            const nodeWsCtor = await this.resolveNodeWsConstructor();
+            return new nodeWsCtor(url, this.config.protocols, {
+                headers,
+                agent
+            });
+        }
+        if (this.socketRuntime === 'node' && (hasHeaders || dispatcher || agent)) {
+            const globalWebSocketCtor = globalThis.WebSocket;
+            if (globalWebSocketCtor && this.webSocketCtor === globalWebSocketCtor) {
+                const init = {
+                    protocols: this.config.protocols,
+                    headers,
+                    dispatcher,
+                    agent
+                };
+                return new this.webSocketCtor(url, init);
+            }
+            return new this.webSocketCtor(url, this.config.protocols, {
+                headers,
+                dispatcher,
+                agent
+            });
         }
         return new this.webSocketCtor(url, this.config.protocols);
     }
+    async resolveNodeWsConstructor() {
+        if (!this.nodeWsCtorPromise) {
+            this.nodeWsCtorPromise = loadOptionalNodeWsConstructor().catch((error) => {
+                this.nodeWsCtorPromise = null;
+                throw error;
+            });
+        }
+        return this.nodeWsCtorPromise;
+    }
 }
 exports.WaWebSocket = WaWebSocket;

package/dist/transport/binary/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WAP_DECODE_CONSTANTS = exports.WAP_ENCODE_CONSTANTS = exports.DICTIONARY_TOKEN_MAPS = exports.SINGLE_BYTE_TOKEN_MAP = exports.HEX_ALPHABET = exports.NIBBLE_ALPHABET = exports.NIBBLE_8 = exports.BINARY_32 = exports.BINARY_20 = exports.BINARY_8 = exports.HEX_8 = exports.JID_PAIR = exports.LIST_16 = exports.LIST_8 = exports.JID_U = exports.JID_FB = exports.JID_INTEROP = exports.DICTIONARY_3 = exports.DICTIONARY_0 = exports.STREAM_END = exports.LIST_EMPTY = void 0;
+exports.DICTIONARY_TOKEN_MAPS = exports.SINGLE_BYTE_TOKEN_MAP = exports.HEX_ALPHABET = exports.NIBBLE_ALPHABET = exports.NIBBLE_8 = exports.BINARY_32 = exports.BINARY_20 = exports.BINARY_8 = exports.HEX_8 = exports.JID_PAIR = exports.LIST_16 = exports.LIST_8 = exports.JID_U = exports.JID_FB = exports.JID_INTEROP = exports.DICTIONARY_3 = exports.DICTIONARY_0 = exports.STREAM_END = exports.LIST_EMPTY = void 0;
 const tokens_1 = require("../binary/tokens");
 exports.LIST_EMPTY = 0;
 exports.STREAM_END = 2;
@@ -67,33 +67,3 @@ exports.DICTIONARY_TOKEN_MAPS = tokens_1.DICTIONARIES.map((dictionary) => {
     }
     return map;
 });
-exports.WAP_ENCODE_CONSTANTS = Object.freeze({
-    LIST_EMPTY: exports.LIST_EMPTY,
-    LIST_8: exports.LIST_8,
-    LIST_16: exports.LIST_16,
-    JID_PAIR: exports.JID_PAIR,
-    HEX_8: exports.HEX_8,
-    BINARY_8: exports.BINARY_8,
-    BINARY_20: exports.BINARY_20,
-    BINARY_32: exports.BINARY_32,
-    NIBBLE_8: exports.NIBBLE_8,
-    DICTIONARY_0: exports.DICTIONARY_0,
-    DICTIONARY_3: exports.DICTIONARY_3
-});
-exports.WAP_DECODE_CONSTANTS = Object.freeze({
-    LIST_EMPTY: exports.LIST_EMPTY,
-    LIST_8: exports.LIST_8,
-    LIST_16: exports.LIST_16,
-    JID_PAIR: exports.JID_PAIR,
-    JID_FB: exports.JID_FB,
-    JID_INTEROP: exports.JID_INTEROP,
-    JID_U: exports.JID_U,
-    HEX_8: exports.HEX_8,
-    BINARY_8: exports.BINARY_8,
-    BINARY_20: exports.BINARY_20,
-    BINARY_32: exports.BINARY_32,
-    NIBBLE_8: exports.NIBBLE_8,
-    DICTIONARY_0: exports.DICTIONARY_0,
-    DICTIONARY_3: exports.DICTIONARY_3,
-    STREAM_END: exports.STREAM_END
-});

package/dist/transport/binary/decoder.js

@@ -63,22 +63,22 @@ function parsePacked(reader, alphabet) {
     const odd = (lengthByte & 0x80) !== 0;
     const byteCount = lengthByte & 0x7f;
     const outLength = byteCount * 2 - (odd ? 1 : 0);
-    const chars = new Array(outLength);
+    const buf = new Uint8Array(outLength);
     let outIndex = 0;
     for (let i = 0; i < byteCount; i += 1) {
         const packed = reader.readUint8();
         const high = (packed >>> 4) & 0x0f;
         const low = packed & 0x0f;
         if (outIndex < outLength) {
-            chars[outIndex] = alphabet[high];
+            buf[outIndex] = alphabet[high].charCodeAt(0);
             outIndex += 1;
         }
         if (outIndex < outLength) {
-            chars[outIndex] = alphabet[low];
+            buf[outIndex] = alphabet[low].charCodeAt(0);
             outIndex += 1;
         }
     }
-    return chars.join('');
+    return bytes_1.TEXT_DECODER.decode(buf);
 }
 function readBinary(reader, token) {
     if (token === constants_2.BINARY_8) {
@@ -242,10 +242,10 @@ function decodeNodeInternal(reader) {
             }
         }
     }
-    if (content === null || content === undefined) {
-        return { tag: tagValue, attrs };
-    }
-    return { tag: tagValue, attrs, content };
+    const node = content === null || content === undefined
+        ? { tag: tagValue, attrs }
+        : { tag: tagValue, attrs, content };
+    return node;
 }
 function decodeBinaryNode(data) {
     const reader = new ByteReader(data);