@vex-chat/libvex 1.0.0-rc.2 → 1.0.2

package/dist/Client.d.ts

@@ -1,6 +1,7 @@
 import type { IChannel, IDevice, IEmoji, IFileResponse, IFileSQL, IInvite, IPermission, IServer, ISessionSQL } from "@vex-chat/types";
 import { AxiosError } from "axios";
-import { EventEmitter } from "events";
+import { EventEmitter } from "eventemitter3";
+import type { IClientAdapters } from "./transport/types.js";
 import type { IStorage } from "./IStorage.js";
 /**
  * IMessage is a chat message.
@@ -128,7 +129,7 @@ export type { IChannel } from "@vex-chat/types";
  */
 export type { IServer } from "@vex-chat/types";
 /**
- * Ifile is an uploaded encrypted file.
+ * IFile is an uploaded encrypted file.
  *
  * Common fields:
  * - `fileID`: file identifier
@@ -176,7 +177,7 @@ export interface IMe {
     /** Returns metadata for the currently authenticated device. */
     device: () => IDevice;
     /** Uploads and sets a new avatar image for the current user. */
-    setAvatar: (avatar: Buffer) => Promise<void>;
+    setAvatar: (avatar: Uint8Array) => Promise<void>;
 }
 /**
  * @ignore
@@ -292,7 +293,7 @@ export interface IDevices {
  */
 export interface IFiles {
     /** Uploads and encrypts a file. */
-    create: (file: Buffer) => Promise<[IFileSQL, string]>;
+    create: (file: Uint8Array) => Promise<[IFileSQL, string]>;
     /** Downloads and decrypts a file using a file ID and key. */
     retrieve: (fileID: string, key: string) => Promise<IFileResponse | null>;
 }
@@ -301,7 +302,7 @@ export interface IFiles {
  */
 export interface IEmojis {
     /** Uploads a custom emoji to a server. */
-    create: (emoji: Buffer, name: string, serverID: string) => Promise<IEmoji | null>;
+    create: (emoji: Uint8Array, name: string, serverID: string) => Promise<IEmoji | null>;
     /** Lists emojis available on a server. */
     retrieveList: (serverID: string) => Promise<IEmoji[]>;
     /** Fetches one emoji's metadata by ID. */
@@ -340,6 +341,8 @@ export interface IClientOptions {
     unsafeHttp?: boolean;
     /** Whether local message history should be persisted by default storage. */
     saveHistory?: boolean;
+    /** Platform-specific adapters (WebSocket + Logger). When omitted, defaults to Node.js ws. */
+    adapters?: IClientAdapters;
 }
 export declare interface Client {
     /**
@@ -518,17 +521,17 @@ export declare interface Client {
  */
 export declare class Client extends EventEmitter {
     /**
-     * Loads a key file from disk.
+     * Encrypts a secret key with a password.
      *
      * Pass-through utility from `@vex-chat/crypto`.
      */
-    static loadKeyFile: (path: string, password: string) => string;
+    static encryptKeyData: (password: string, keyToSave: string, iterationOverride?: number) => Uint8Array;
     /**
-     * Saves a key file to disk.
+     * Decrypts a secret key from encrypted data produced by encryptKeyData().
      *
      * Pass-through utility from `@vex-chat/crypto`.
      */
-    static saveKeyFile: (path: string, password: string, keyToSave: string, iterationOverride?: number) => void;
+    static decryptKeyData: (keyData: Uint8Array, password: string) => string;
     /**
      * Creates and initializes a client in one step.
      *
@@ -641,6 +644,7 @@ export declare class Client extends EventEmitter {
     private dbPath;
     private conn;
     private host;
+    private adapters;
     private firstMailFetch;
     private signKeys;
     private idKeys;

package/dist/Client.js

@@ -4,25 +4,30 @@ import { xConcat, xConstants, xDH, xEncode, xHMAC, xKDF, XKeyConvert, xMakeNonce
 import { MailType } from "@vex-chat/types";
 import ax, { AxiosError } from "axios";
 import { isBrowser, isNode } from "browser-or-node";
-import btoa from "btoa";
-import chalk from "chalk";
-import { EventEmitter } from "events";
+// btoa is native in browsers and Node 16+
+import pc from "picocolors";
+import { EventEmitter } from "eventemitter3";
 import { Packr } from "msgpackr";
 // useRecords:false emits standard msgpack (no nonstandard record extension).
 // moreTypes:false keeps the extension set to what every other decoder understands.
-// Packr.pack() returns Node Buffer, which axios sends correctly (plain Uint8Array
-// would have its pool buffer sent in full — see axios issue #4068).
-const msgpack = new Packr({ useRecords: false, moreTypes: false });
+const _packr = new Packr({ useRecords: false, moreTypes: false });
+// Packr.encode() returns a subarray of its internal pool buffer.
+// In browsers, XMLHttpRequest.send() sends the full underlying ArrayBuffer,
+// not just the slice — corrupting the payload (axios issue #4068).
+// Wrap encode to always return a fresh copy.
+const msgpack = {
+    encode: (value) => {
+        const packed = _packr.encode(value);
+        return new Uint8Array(packed.buffer.slice(packed.byteOffset, packed.byteOffset + packed.byteLength));
+    },
+    decode: _packr.decode.bind(_packr),
+};
 import objectHash from "object-hash";
-import * as os from "node:os";
-import { performance } from "node:perf_hooks";
 import nacl from "tweetnacl";
 import * as uuid from "uuid";
-import winston from "winston";
-import WebSocket from "ws";
-import { Storage } from "./Storage.js";
+// Storage (Kysely/better-sqlite3) loaded lazily — only when no external storage is provided.
 import { capitalize } from "./utils/capitalize.js";
-import { createLogger } from "./utils/createLogger.js";
+// createLogger (winston) loaded lazily — only in Node when no adapter logger is provided.
 import { formatBytes } from "./utils/formatBytes.js";
 import { sqlSessionToCrypto } from "./utils/sqlSessionToCrypto.js";
 import { uuidToUint8 } from "./utils/uint8uuid.js";
@@ -78,17 +83,17 @@ const protocolMsgRegex = /��\w+:\w+��/g;
  */
 export class Client extends EventEmitter {
     /**
-     * Loads a key file from disk.
+     * Encrypts a secret key with a password.
      *
      * Pass-through utility from `@vex-chat/crypto`.
      */
-    static loadKeyFile = XUtils.loadKeyFile;
+    static encryptKeyData = XUtils.encryptKeyData;
     /**
-     * Saves a key file to disk.
+     * Decrypts a secret key from encrypted data produced by encryptKeyData().
      *
      * Pass-through utility from `@vex-chat/crypto`.
      */
-    static saveKeyFile = XUtils.saveKeyFile;
+    static decryptKeyData = XUtils.decryptKeyData;
     /**
      * Creates and initializes a client in one step.
      *
@@ -102,7 +107,36 @@ export class Client extends EventEmitter {
      * ```
      */
     static create = async (privateKey, options, storage) => {
-        const client = new Client(privateKey, options, storage);
+        let opts = options;
+        if (!opts?.adapters) {
+            const { default: WebSocket } = await import("ws");
+            const { createLogger: makeLog } = await import("./utils/createLogger.js");
+            opts = {
+                ...opts,
+                adapters: {
+                    logger: makeLog("libvex", opts?.logLevel),
+                    WebSocket: WebSocket,
+                },
+            };
+        }
+        // Lazily create Node Storage only on the Node path (no adapters).
+        // When adapters are provided (browser/RN), the caller must supply storage
+        // via PlatformPreset.createStorage() — there is no Node fallback.
+        let resolvedStorage = storage;
+        if (!resolvedStorage) {
+            if (opts?.adapters) {
+                throw new Error("No storage provided. When using adapters (browser/RN), pass storage from your PlatformPreset.");
+            }
+            const { createNodeStorage } = await import("./storage/node.js");
+            const dbFileName = opts?.inMemoryDb
+                ? ":memory:"
+                : XUtils.encodeHex(nacl.sign.keyPair.fromSecretKey(XUtils.decodeHex(privateKey || "")).publicKey) + ".sqlite";
+            const dbPath = opts?.dbFolder
+                ? opts.dbFolder + "/" + dbFileName
+                : dbFileName;
+            resolvedStorage = createNodeStorage(dbPath, privateKey || XUtils.encodeHex(nacl.sign.keyPair().secretKey));
+        }
+        const client = new Client(privateKey, opts, resolvedStorage);
         await client.init();
         return client;
     };
@@ -397,6 +431,7 @@ export class Client extends EventEmitter {
     dbPath;
     conn;
     host;
+    adapters;
     firstMailFetch = true;
     // these are created from one set of sign keys
     signKeys;
@@ -420,7 +455,12 @@ export class Client extends EventEmitter {
     prefixes;
     constructor(privateKey, options, storage) {
         super();
-        this.log = createLogger("client", options?.logLevel);
+        this.log = options?.adapters?.logger ?? {
+            info() { },
+            warn() { },
+            error() { },
+            debug() { },
+        };
         this.prefixes = options?.unsafeHttp
             ? { HTTP: "http://", WS: "ws://" }
             : { HTTP: "https://", WS: "wss://" };
@@ -438,17 +478,20 @@ export class Client extends EventEmitter {
         this.dbPath = options?.dbFolder
             ? options?.dbFolder + "/" + dbFileName
             : dbFileName;
-        this.database = storage
-            ? storage
-            : new Storage(this.dbPath, XUtils.encodeHex(this.signKeys.secretKey), options);
+        if (!storage) {
+            throw new Error("No storage provided. Use Client.create() which resolves storage automatically.");
+        }
+        this.database = storage;
         this.database.on("error", (error) => {
             this.log.error(error.toString());
             this.close(true);
         });
-        // we want to initialize this later with login()
-        this.conn = new WebSocket("ws://localhost:1234");
-        // silence the error for connecting to junk ws
-        // tslint:disable-next-line: no-empty
+        if (!options?.adapters) {
+            throw new Error("No adapters provided. Use Client.create() which resolves adapters automatically.");
+        }
+        this.adapters = options.adapters;
+        // Placeholder connection — replaced by initSocket() during connect()
+        this.conn = new this.adapters.WebSocket("ws://localhost:1234");
         this.conn.onerror = () => { };
         this.log.info("Client debug information: " +
             JSON.stringify({
@@ -523,7 +566,7 @@ export class Client extends EventEmitter {
             }), {
                 headers: { "Content-Type": "application/msgpack" },
             });
-            const { user, token } = msgpack.decode(Buffer.from(res.data));
+            const { user, token } = msgpack.decode(new Uint8Array(res.data));
             const cookies = res.headers["set-cookie"];
             if (cookies) {
                 for (const cookie of cookies) {
@@ -561,7 +604,7 @@ export class Client extends EventEmitter {
             withCredentials: true,
             responseType: "arraybuffer",
         });
-        const whoami = msgpack.decode(Buffer.from(res.data));
+        const whoami = msgpack.decode(new Uint8Array(res.data));
         return whoami;
     }
     /**
@@ -624,11 +667,13 @@ export class Client extends EventEmitter {
                 preKeySignature: XUtils.encodeHex(this.xKeyRing.preKeys.signature),
                 preKeyIndex: this.xKeyRing.preKeys.index,
                 password,
-                deviceName: `${os.platform()}`,
+                deviceName: typeof navigator !== "undefined"
+                    ? navigator.userAgent.slice(0, 64)
+                    : "node",
             };
             try {
                 const res = await ax.post(this.getHost() + "/register", msgpack.encode(regMsg), { headers: { "Content-Type": "application/msgpack" } });
-                this.setUser(msgpack.decode(Buffer.from(res.data)));
+                this.setUser(msgpack.decode(new Uint8Array(res.data)));
                 return [this.getUser(), null];
             }
             catch (err) {
@@ -652,11 +697,11 @@ export class Client extends EventEmitter {
     }
     async redeemInvite(inviteID) {
         const res = await ax.patch(this.getHost() + "/invite/" + inviteID);
-        return msgpack.decode(Buffer.from(res.data));
+        return msgpack.decode(new Uint8Array(res.data));
     }
     async retrieveInvites(serverID) {
         const res = await ax.get(this.getHost() + "/server/" + serverID + "/invites");
-        return msgpack.decode(Buffer.from(res.data));
+        return msgpack.decode(new Uint8Array(res.data));
     }
     async createInvite(serverID, duration) {
         const payload = {
@@ -664,11 +709,11 @@ export class Client extends EventEmitter {
             duration,
         };
         const res = await ax.post(this.getHost() + "/server/" + serverID + "/invites", payload);
-        return msgpack.decode(Buffer.from(res.data));
+        return msgpack.decode(new Uint8Array(res.data));
     }
     async retrieveEmojiList(serverID) {
         const res = await ax.get(this.getHost() + "/server/" + serverID + "/emoji");
-        return msgpack.decode(Buffer.from(res.data));
+        return msgpack.decode(new Uint8Array(res.data));
     }
     async retrieveEmojiByID(emojiID) {
         const res = await ax.get(this.getHost() + "/emoji/" + emojiID + "/details");
@@ -676,7 +721,7 @@ export class Client extends EventEmitter {
         if (!res.data) {
             return null;
         }
-        return msgpack.decode(Buffer.from(res.data));
+        return msgpack.decode(new Uint8Array(res.data));
     }
     async leaveServer(serverID) {
         const permissionList = await this.permissions.retrieve();
@@ -730,7 +775,7 @@ export class Client extends EventEmitter {
                         this.emit("fileProgress", progress);
                     },
                 });
-                return msgpack.decode(Buffer.from(res.data));
+                return msgpack.decode(new Uint8Array(res.data));
             }
             catch (err) {
                 return null;
@@ -742,7 +787,7 @@ export class Client extends EventEmitter {
         };
         try {
             const res = await ax.post(this.getHost() + "/emoji/" + serverID + "/json", msgpack.encode(payload), { headers: { "Content-Type": "application/msgpack" } });
-            return msgpack.decode(Buffer.from(res.data));
+            return msgpack.decode(new Uint8Array(res.data));
         }
         catch (err) {
             return null;
@@ -755,7 +800,7 @@ export class Client extends EventEmitter {
                 this.host +
                 "/device/" +
                 XUtils.encodeHex(this.signKeys.publicKey));
-            device = msgpack.decode(Buffer.from(res.data));
+            device = msgpack.decode(new Uint8Array(res.data));
         }
         catch (err) {
             this.log.error(err.toString());
@@ -803,7 +848,9 @@ export class Client extends EventEmitter {
             preKey: XUtils.encodeHex(this.xKeyRing.preKeys.keyPair.publicKey),
             preKeySignature: XUtils.encodeHex(this.xKeyRing.preKeys.signature),
             preKeyIndex: this.xKeyRing.preKeys.index,
-            deviceName: `${os.platform()}`,
+            deviceName: typeof navigator !== "undefined"
+                ? navigator.userAgent.slice(0, 64)
+                : "node",
         };
         try {
             const res = await ax.post(this.prefixes.HTTP +
@@ -811,7 +858,7 @@ export class Client extends EventEmitter {
                 "/user/" +
                 userDetails.userID +
                 "/devices", msgpack.encode(devMsg), { headers: { "Content-Type": "application/msgpack" } });
-            return msgpack.decode(Buffer.from(res.data));
+            return msgpack.decode(new Uint8Array(res.data));
         }
         catch (err) {
             throw err;
@@ -822,7 +869,7 @@ export class Client extends EventEmitter {
             const res = await ax.get(this.getHost() + "/token/" + type, {
                 responseType: "arraybuffer",
             });
-            return msgpack.decode(Buffer.from(res.data));
+            return msgpack.decode(new Uint8Array(res.data));
         }
         catch (err) {
             this.log.warn(err.toString());
@@ -874,7 +921,7 @@ export class Client extends EventEmitter {
             "/server/" +
             serverID +
             "/permissions");
-        return msgpack.decode(Buffer.from(res.data));
+        return msgpack.decode(new Uint8Array(res.data));
     }
     /**
      * Gets all permissions for the logged in user.
@@ -883,7 +930,7 @@ export class Client extends EventEmitter {
      */
     async getPermissions() {
         const res = await ax.get(this.getHost() + "/user/" + this.getUser().userID + "/permissions");
-        return msgpack.decode(Buffer.from(res.data));
+        return msgpack.decode(new Uint8Array(res.data));
     }
     async deletePermission(permissionID) {
         await ax.delete(this.getHost() + "/permission/" + permissionID);
@@ -891,7 +938,7 @@ export class Client extends EventEmitter {
     async retrieveFile(fileID, key) {
         try {
             const detailsRes = await ax.get(this.getHost() + "/file/" + fileID + "/details");
-            const details = msgpack.decode(Buffer.from(detailsRes.data));
+            const details = msgpack.decode(new Uint8Array(detailsRes.data));
             const res = await ax.get(this.getHost() + "/file/" + fileID, {
                 onDownloadProgress: (progressEvent) => {
                     const percentCompleted = Math.round((progressEvent.loaded * 100) /
@@ -908,11 +955,11 @@ export class Client extends EventEmitter {
                 },
             });
             const fileData = res.data;
-            const decrypted = nacl.secretbox.open(Uint8Array.from(Buffer.from(fileData)), XUtils.decodeHex(details.nonce), XUtils.decodeHex(key));
+            const decrypted = nacl.secretbox.open(new Uint8Array(fileData), XUtils.decodeHex(details.nonce), XUtils.decodeHex(key));
             if (decrypted) {
                 const resp = {
                     details,
-                    data: Buffer.from(decrypted),
+                    data: new Uint8Array(decrypted),
                 };
                 return resp;
             }
@@ -930,7 +977,7 @@ export class Client extends EventEmitter {
      */
     async init() {
         if (this.hasInit) {
-            return new Error("You should only call init() once.");
+            throw new Error("You should only call init() once.");
         }
         this.hasInit = true;
         await this.populateKeyRing();
@@ -951,11 +998,11 @@ export class Client extends EventEmitter {
     }
     // returns the file details and the encryption key
     async createFile(file) {
-        this.log.info("Creating file, size: " + formatBytes(Buffer.byteLength(file)));
+        this.log.info("Creating file, size: " + formatBytes(file.byteLength));
         const nonce = xMakeNonce();
         const key = nacl.box.keyPair();
         const box = nacl.secretbox(Uint8Array.from(file), nonce, key.secretKey);
-        this.log.info("Encrypted size: " + formatBytes(Buffer.byteLength(box)));
+        this.log.info("Encrypted size: " + formatBytes(box.byteLength));
         if (typeof FormData !== "undefined") {
             const fpayload = new FormData();
             fpayload.set("owner", this.getDevice().deviceID);
@@ -977,7 +1024,7 @@ export class Client extends EventEmitter {
                     this.emit("fileProgress", progress);
                 },
             });
-            const fcreatedFile = msgpack.decode(Buffer.from(fres.data));
+            const fcreatedFile = msgpack.decode(new Uint8Array(fres.data));
             return [fcreatedFile, XUtils.encodeHex(key.secretKey)];
         }
         const payload = {
@@ -986,12 +1033,12 @@ export class Client extends EventEmitter {
             file: XUtils.encodeBase64(box),
         };
         const res = await ax.post(this.getHost() + "/file/json", msgpack.encode(payload), { headers: { "Content-Type": "application/msgpack" } });
-        const createdFile = msgpack.decode(Buffer.from(res.data));
+        const createdFile = msgpack.decode(new Uint8Array(res.data));
         return [createdFile, XUtils.encodeHex(key.secretKey)];
     }
     async getUserList(channelID) {
         const res = await ax.post(this.getHost() + "/userList/" + channelID);
-        return msgpack.decode(Buffer.from(res.data));
+        return msgpack.decode(new Uint8Array(res.data));
     }
     async markSessionVerified(sessionID) {
         return this.database.markSessionVerified(sessionID);
@@ -1040,7 +1087,7 @@ export class Client extends EventEmitter {
                     const { status } = result;
                     if (status === "rejected") {
                         this.log.warn("Message failed.");
-                        this.log.warn(result);
+                        this.log.warn(JSON.stringify(result));
                     }
                 }
             });
@@ -1073,14 +1120,14 @@ export class Client extends EventEmitter {
                 const { status } = result;
                 if (status === "rejected") {
                     this.log.warn("Message failed.");
-                    this.log.warn(result);
+                    this.log.warn(JSON.stringify(result));
                 }
             }
         });
     }
     async createServer(name) {
-        const res = await ax.post(this.getHost() + "/server/" + btoa(name));
-        return msgpack.decode(Buffer.from(res.data));
+        const res = await ax.post(this.getHost() + "/server/" + globalThis.btoa(name));
+        return msgpack.decode(new Uint8Array(res.data));
     }
     async forward(message) {
         const copy = { ...message };
@@ -1109,7 +1156,7 @@ export class Client extends EventEmitter {
                 const { status } = result;
                 if (status === "rejected") {
                     this.log.warn("Message failed.");
-                    this.log.warn(result);
+                    this.log.warn(JSON.stringify(result));
                 }
             }
         });
@@ -1204,12 +1251,12 @@ export class Client extends EventEmitter {
     }
     async getServerList() {
         const res = await ax.get(this.getHost() + "/user/" + this.getUser().userID + "/servers");
-        return msgpack.decode(Buffer.from(res.data));
+        return msgpack.decode(new Uint8Array(res.data));
     }
     async createChannel(name, serverID) {
         const body = { name };
         const res = await ax.post(this.getHost() + "/server/" + serverID + "/channels", msgpack.encode(body), { headers: { "Content-Type": "application/msgpack" } });
-        return msgpack.decode(Buffer.from(res.data));
+        return msgpack.decode(new Uint8Array(res.data));
     }
     async getDeviceByID(deviceID) {
         if (this.deviceRecords[deviceID]) {
@@ -1225,7 +1272,7 @@ export class Client extends EventEmitter {
         try {
             const res = await ax.get(this.getHost() + "/device/" + deviceID);
             this.log.info("Retrieved device from server.");
-            const fetchedDevice = msgpack.decode(Buffer.from(res.data));
+            const fetchedDevice = msgpack.decode(new Uint8Array(res.data));
             this.deviceRecords[deviceID] = fetchedDevice;
             await this.database.saveDevice(fetchedDevice);
             return fetchedDevice;
@@ -1248,7 +1295,7 @@ export class Client extends EventEmitter {
     async getMultiUserDeviceList(userIDs) {
         try {
             const res = await ax.post(this.getHost() + "/deviceList", msgpack.encode(userIDs), { headers: { "Content-Type": "application/msgpack" } });
-            const devices = msgpack.decode(Buffer.from(res.data));
+            const devices = msgpack.decode(new Uint8Array(res.data));
             for (const device of devices) {
                 this.deviceRecords[device.deviceID] = device;
             }
@@ -1261,7 +1308,7 @@ export class Client extends EventEmitter {
     async getUserDeviceList(userID) {
         try {
             const res = await ax.get(this.getHost() + "/user/" + userID + "/devices");
-            const devices = msgpack.decode(Buffer.from(res.data));
+            const devices = msgpack.decode(new Uint8Array(res.data));
             for (const device of devices) {
                 this.deviceRecords[device.deviceID] = device;
             }
@@ -1274,7 +1321,7 @@ export class Client extends EventEmitter {
     async getServerByID(serverID) {
         try {
             const res = await ax.get(this.getHost() + "/server/" + serverID);
-            return msgpack.decode(Buffer.from(res.data));
+            return msgpack.decode(new Uint8Array(res.data));
         }
         catch (err) {
             return null;
@@ -1283,7 +1330,7 @@ export class Client extends EventEmitter {
     async getChannelByID(channelID) {
         try {
             const res = await ax.get(this.getHost() + "/channel/" + channelID);
-            return msgpack.decode(Buffer.from(res.data));
+            return msgpack.decode(new Uint8Array(res.data));
         }
         catch (err) {
             return null;
@@ -1291,7 +1338,7 @@ export class Client extends EventEmitter {
     }
     async getChannelList(serverID) {
         const res = await ax.get(this.getHost() + "/server/" + serverID + "/channels");
-        return msgpack.decode(Buffer.from(res.data));
+        return msgpack.decode(new Uint8Array(res.data));
     }
     /* Get the currently logged in user. You cannot call this until
     after the auth event is emitted. */
@@ -1319,7 +1366,7 @@ export class Client extends EventEmitter {
         }
         try {
             const res = await ax.get(this.getHost() + "/user/" + userIdentifier);
-            const userRecord = msgpack.decode(Buffer.from(res.data));
+            const userRecord = msgpack.decode(new Uint8Array(res.data));
             this.userRecords[userIdentifier] = userRecord;
             return [userRecord, null];
         }
@@ -1804,13 +1851,23 @@ export class Client extends EventEmitter {
             if (!this.token) {
                 throw new Error("No token found, did you call login()?");
             }
-            this.conn = new WebSocket(this.prefixes.WS + this.host + "/socket", { headers: { Cookie: "auth=" + this.token } });
+            const wsUrl = this.prefixes.WS + this.host + "/socket";
+            // Pass cookie as option — Node ws forwards it as an upgrade header.
+            // Browser/RN WebSocket ignores the options object entirely,
+            // so the cookie never reaches the server on those platforms.
+            this.conn = new this.adapters.WebSocket(wsUrl, {
+                headers: { Cookie: "auth=" + this.token },
+            });
             this.conn.on("open", () => {
                 this.log.info("Connection opened.");
                 this.pingInterval = setInterval(this.ping.bind(this), 15000);
             });
             this.conn.on("close", () => {
                 this.log.info("Connection closed.");
+                if (this.pingInterval) {
+                    clearInterval(this.pingInterval);
+                    this.pingInterval = null;
+                }
                 if (!this.manuallyClosing) {
                     this.emit("disconnect");
                 }
@@ -1820,8 +1877,8 @@ export class Client extends EventEmitter {
             });
             this.conn.on("message", async (message) => {
                 const [header, msg] = XUtils.unpackMessage(message);
-                this.log.debug(chalk.red.bold("INH ") + XUtils.encodeHex(header));
-                this.log.debug(chalk.red.bold("IN ") + JSON.stringify(msg, null, 4));
+                this.log.debug(pc.red(pc.bold("INH ") + XUtils.encodeHex(header)));
+                this.log.debug(pc.red(pc.bold("IN ") + JSON.stringify(msg, null, 4)));
                 switch (msg.type) {
                     case "ping":
                         this.pong(msg.transmissionID);
@@ -1899,7 +1956,7 @@ export class Client extends EventEmitter {
                 this.getDevice().deviceID +
                 "/mail");
             const inbox = msgpack
-                .decode(Buffer.from(res.data))
+                .decode(new Uint8Array(res.data))
                 .sort((a, b) => b[2].getTime() - a[2].getTime());
             for (const mailDetails of inbox) {
                 const [mailHeader, mailBody, timestamp] = mailDetails;
@@ -1925,21 +1982,21 @@ export class Client extends EventEmitter {
             await sleep(i);
             i *= 2;
         }
-        this.log.debug(chalk.red.bold("OUTH ") +
-            XUtils.encodeHex(header || XUtils.emptyHeader()));
-        this.log.debug(chalk.red.bold("OUT ") + JSON.stringify(msg, null, 4));
+        this.log.debug(pc.red(pc.bold("OUTH ") +
+            XUtils.encodeHex(header || XUtils.emptyHeader())));
+        this.log.debug(pc.red(pc.bold("OUT ") + JSON.stringify(msg, null, 4)));
         this.conn.send(XUtils.packMessage(msg, header));
     }
     async retrieveKeyBundle(deviceID) {
         const res = await ax.post(this.getHost() + "/device/" + deviceID + "/keyBundle");
-        return msgpack.decode(Buffer.from(res.data));
+        return msgpack.decode(new Uint8Array(res.data));
     }
     async getOTKCount() {
         const res = await ax.get(this.getHost() +
             "/device/" +
             this.getDevice().deviceID +
             "/otk/count");
-        return msgpack.decode(Buffer.from(res.data)).count;
+        return msgpack.decode(new Uint8Array(res.data)).count;
     }
     async submitOTK(amount) {
         const otks = [];