@vex-chat/libvex 6.6.1 → 6.6.2

package/dist/Client.js

@@ -5,10 +5,10 @@
  */
 import { enterCryptoProfileScope, getCryptoProfile, leaveCryptoProfileScope, setCryptoProfile, xBoxKeyPairAsync, xBoxKeyPairFromSecretAsync, xConcat, xConstants, xDHAsync, xEcdhKeyPairFromEcdsaKeyPairAsync, xEncode, xHMAC, xKDF, XKeyConvert, xMakeNonce, xMnemonic, xRandomBytes, xSecretboxAsync, xSecretboxOpenAsync, xSignAsync, xSignKeyPair, xSignKeyPairAsync, xSignKeyPairFromSecret, xSignKeyPairFromSecretAsync, XUtils, } from "@vex-chat/crypto";
 import { MailType, MailWSSchema, PermissionSchema, WSMessageSchema, } from "@vex-chat/types";
-import axios, { isAxiosError } from "axios";
 import { EventEmitter } from "eventemitter3";
 import * as uuid from "uuid";
 import { z } from "zod/v4";
+import { createFetchHttpClient, isHttpError, } from "./http.js";
 import { clampLocalMessageRetentionDays, formatVexRetentionEnvelope, stripVexRetentionEnvelope, } from "./retention.js";
 import { WebSocketAdapter, WebSocketNotOpenError, } from "./transport/websocket.js";
 import { decodeFipsInitialExtraV1, encodeFipsInitialExtraV1, fipsP256AdFromIdentityPubs, fipsP256PreKeySignPayload, isFipsInitialExtraV1, } from "./utils/fipsMailExtra.js";
@@ -195,10 +195,22 @@ function spireErrorBodyMessage(data, max = 8_000) {
     return t.length > max ? t.slice(0, max) + "…" : t;
 }
 import { msgpack } from "./codec.js";
-import { ActionTokenCodec, AuthResponseCodec, ChannelArrayCodec, ChannelCodec, ConnectResponseCodec, decodeAxios, DeviceArrayCodec, DeviceChallengeCodec, DeviceCodec, DeviceRegistrationResultCodec, EmojiArrayCodec, EmojiCodec, FileSQLCodec, InviteArrayCodec, InviteCodec, KeyBundleCodec, OtkCountCodec, PasskeyArrayCodec, PasskeyAuthFinishResponseCodec, PasskeyCodec, PasskeyOptionsCodec, PendingDeviceRequestArrayCodec, PendingDeviceRequestCodec, PermissionArrayCodec, PermissionCodec, RegisterPendingApprovalCodec, RegisterResponseCodec, ServerArrayCodec, ServerChannelBootstrapCodec, ServerCodec, UserArrayCodec, UserCodec, WhoamiCodec, } from "./codecs.js";
+import { ActionTokenCodec, AuthResponseCodec, ChannelArrayCodec, ChannelCodec, ConnectResponseCodec, decodeHttpResponse, DeviceArrayCodec, DeviceChallengeCodec, DeviceCodec, DeviceRegistrationResultCodec, EmojiArrayCodec, EmojiCodec, FileSQLCodec, InviteArrayCodec, InviteCodec, KeyBundleCodec, OtkCountCodec, PasskeyArrayCodec, PasskeyAuthFinishResponseCodec, PasskeyCodec, PasskeyOptionsCodec, PendingDeviceRequestArrayCodec, PendingDeviceRequestCodec, PermissionArrayCodec, PermissionCodec, RegisterPendingApprovalCodec, RegisterResponseCodec, ServerArrayCodec, ServerChannelBootstrapCodec, ServerCodec, UserArrayCodec, UserCodec, WhoamiCodec, } from "./codecs.js";
 import { sqlSessionToCrypto } from "./utils/sqlSessionToCrypto.js";
 import { uuidToUint8 } from "./utils/uint8uuid.js";
 const _protocolMsgRegex = /��\w+:\w+��/g;
+const NotificationSubscriptionSchema = z.object({
+    channel: z.literal("expo"),
+    createdAt: z.string(),
+    deviceID: z.string(),
+    enabled: z.boolean(),
+    events: z.array(z.string()),
+    platform: z.string().nullable(),
+    subscriptionID: z.string(),
+    token: z.string(),
+    updatedAt: z.string(),
+    userID: z.string(),
+});
 function compareInboxEntries(a, b) {
     const timeCmp = a[2].localeCompare(b[2]);
     if (timeCmp !== 0) {
@@ -585,7 +597,7 @@ export class Client {
     forwarded = new Set();
     host;
     http;
-    /** Cancels in-flight axios work on `close()` so `postAuth`/`getMail` cannot hang forever. */
+    /** Cancels in-flight HTTP work on `close()` so `postAuth`/`getMail` cannot hang forever. */
     httpAbortController = new AbortController();
     idKeys;
     isAlive = true;
@@ -593,11 +605,6 @@ export class Client {
     localRetentionPurgeTimer = null;
     mailInterval;
     manuallyClosing = false;
-    /**
-     * Node-only: per-client HTTP(S) agents (see `init()` + `storage/node/http-agents`).
-     * Dropped on `close()` so idle keep-alive sockets do not keep the process alive.
-     */
-    nodeHttpAgents;
     /* Retrieves the userID with the user identifier.
     user identifier is checked for userID, then signkey,
     and finally falls back to username. */
@@ -658,7 +665,7 @@ export class Client {
         this.database.on("error", (_error) => {
             void this.close(true);
         });
-        this.http = axios.create({
+        this.http = createFetchHttpClient({
             responseType: "arraybuffer",
             signal: this.httpAbortController.signal,
         });
@@ -830,27 +837,6 @@ export class Client {
             return undefined;
         }
     }
-    /**
-     * True when running under Node (has `process.versions`).
-     * Uses indirect lookup so the bare `process` global never appears in
-     * source that the platform-guard plugin scans.
-     */
-    static isNodeRuntime() {
-        try {
-            const g = Object.getOwnPropertyDescriptor(globalThis, "\u0070rocess");
-            if (!g)
-                return false;
-            const proc = typeof g.get === "function" ? g.get() : g.value;
-            if (typeof proc !== "object" || proc === null) {
-                return false;
-            }
-            return ("versions" in proc &&
-                typeof proc.versions === "object");
-        }
-        catch {
-            return false;
-        }
-    }
     /**
      * Closes the client — disconnects the WebSocket, shuts down storage,
      * and emits `closed` unless `muteEvent` is `true`.
@@ -867,11 +853,6 @@ export class Client {
         this.httpAbortController.abort();
         this.socket.close();
         await this.database.close();
-        if (this.nodeHttpAgents) {
-            this.nodeHttpAgents.http.destroy();
-            this.nodeHttpAgents.https.destroy();
-            delete this.nodeHttpAgents;
-        }
         if (this.pingInterval) {
             clearInterval(this.pingInterval);
         }
@@ -909,7 +890,7 @@ export class Client {
         }
         const signedAsync = await xSignAsync(Uint8Array.from(uuid.parse(connectToken.key)), this.signKeys.secretKey);
         const res = await this.http.post(this.getHost() + "/device/" + this.device.deviceID + "/connect", msgpack.encode({ signed: signedAsync }), { headers: { "Content-Type": "application/msgpack" } });
-        const { deviceToken } = decodeAxios(ConnectResponseCodec, res.data);
+        const { deviceToken } = decodeHttpResponse(ConnectResponseCodec, res.data);
         this.http.defaults.headers.common["X-Device-Token"] = deviceToken;
         this.autoReconnectEnabled = true;
         this.initSocket();
@@ -978,14 +959,14 @@ export class Client {
             }), {
                 headers: { "Content-Type": "application/msgpack" },
             });
-            const { token, user } = decodeAxios(AuthResponseCodec, res.data);
+            const { token, user } = decodeHttpResponse(AuthResponseCodec, res.data);
             this.setUser(user);
             this.token = token;
             this.http.defaults.headers.common.Authorization = `Bearer ${token}`;
             return { ok: true };
         }
         catch (err) {
-            if (isAxiosError(err) && err.response) {
+            if (isHttpError(err) && err.response) {
                 return {
                     error: spireErrorBodyMessage(err.response.data),
                     ok: false,
@@ -1014,10 +995,10 @@ export class Client {
                 deviceID: id,
                 signKey: signKeyHex,
             }), { headers: { "Content-Type": "application/msgpack" } });
-            const { challenge, challengeID } = decodeAxios(DeviceChallengeCodec, challengeRes.data);
+            const { challenge, challengeID } = decodeHttpResponse(DeviceChallengeCodec, challengeRes.data);
             const signed = XUtils.encodeHex(await xSignAsync(XUtils.decodeHex(challenge), this.signKeys.secretKey));
             const verifyRes = await this.http.post(this.getHost() + "/auth/device/verify", msgpack.encode({ challengeID, signed }), { headers: { "Content-Type": "application/msgpack" } });
-            const { token, user } = decodeAxios(AuthResponseCodec, verifyRes.data);
+            const { token, user } = decodeHttpResponse(AuthResponseCodec, verifyRes.data);
             this.setUser(user);
             this.token = token;
             this.http.defaults.headers.common.Authorization = `Bearer ${token}`;
@@ -1128,7 +1109,7 @@ export class Client {
                 let didDecodeRegisterResponse = false;
                 let pendingApproval = null;
                 try {
-                    const { device, token, user } = decodeAxios(RegisterResponseCodec, res.data);
+                    const { device, token, user } = decodeHttpResponse(RegisterResponseCodec, res.data);
                     this.device = device;
                     this.setUser(user);
                     this.token = token;
@@ -1140,7 +1121,7 @@ export class Client {
                 }
                 if (!didDecodeRegisterResponse) {
                     try {
-                        pendingApproval = decodeAxios(RegisterPendingApprovalCodec, res.data);
+                        pendingApproval = decodeHttpResponse(RegisterPendingApprovalCodec, res.data);
                     }
                     catch {
                         // fall through to legacy decode path
@@ -1158,7 +1139,7 @@ export class Client {
                             }),
                         ];
                     }
-                    const legacyUser = decodeAxios(UserCodec, res.data);
+                    const legacyUser = decodeHttpResponse(UserCodec, res.data);
                     this.setUser(legacyUser);
                     // Legacy servers require /auth after /register to get a JWT.
                     const loginResult = await this.login(resolvedUsername, resolvedPassword);
@@ -1173,7 +1154,7 @@ export class Client {
                 return [this.getUser(), null];
             }
             catch (err) {
-                if (isAxiosError(err) && err.response) {
+                if (isHttpError(err) && err.response) {
                     return [
                         null,
                         new Error(spireErrorBodyMessage(err.response.data)),
@@ -1213,7 +1194,7 @@ export class Client {
             "/device/" +
             this.getDevice().deviceID +
             "/notifications/subscriptions", input, { responseType: "json" });
-        return response.data;
+        return NotificationSubscriptionSchema.parse(response.data);
     }
     /**
      * Triggers an immediate inbox sync by fetching `/mail` once.
@@ -1254,7 +1235,7 @@ export class Client {
      */
     async whoami() {
         const res = await this.http.post(this.getHost() + "/whoami");
-        const whoami = decodeAxios(WhoamiCodec, res.data);
+        const whoami = decodeHttpResponse(WhoamiCodec, res.data);
         return whoami;
     }
     async abortPendingDeviceRegistration(args) {
@@ -1299,16 +1280,16 @@ export class Client {
             "/devices/requests/" +
             requestID +
             "/approve", msgpack.encode({ signed }), { headers: { "Content-Type": "application/msgpack" } });
-        return decodeAxios(DeviceCodec, response.data);
+        return decodeHttpResponse(DeviceCodec, response.data);
     }
     async beginPasskeyAuthentication(username) {
         const response = await this.http.post(this.getHost() + "/auth/passkey/begin", msgpack.encode({ username }), { headers: { "Content-Type": "application/msgpack" } });
-        return decodeAxios(PasskeyOptionsCodec, response.data);
+        return decodeHttpResponse(PasskeyOptionsCodec, response.data);
     }
     async beginPasskeyRegistration(name) {
         const userID = this.getUser().userID;
         const response = await this.http.post(this.getHost() + "/user/" + userID + "/passkeys/register/begin", msgpack.encode({ name }), { headers: { "Content-Type": "application/msgpack" } });
-        return decodeAxios(PasskeyOptionsCodec, response.data);
+        return decodeHttpResponse(PasskeyOptionsCodec, response.data);
     }
     censorPreKey(preKey) {
         if (!preKey.index) {
@@ -1324,7 +1305,7 @@ export class Client {
     async createChannel(name, serverID) {
         const body = { name };
         const res = await this.http.post(this.getHost() + "/server/" + serverID + "/channels", msgpack.encode(body), { headers: { "Content-Type": "application/msgpack" } });
-        return decodeAxios(ChannelCodec, res.data);
+        return decodeHttpResponse(ChannelCodec, res.data);
     }
     // returns the file details and the encryption key
     async createFile(file) {
@@ -1355,7 +1336,7 @@ export class Client {
                         this.emitter.emit("fileProgress", progress);
                     },
                 });
-                const fcreatedFile = decodeAxios(FileSQLCodec, fres.data);
+                const fcreatedFile = decodeHttpResponse(FileSQLCodec, fres.data);
                 return [fcreatedFile, XUtils.encodeHex(fileKey)];
             }
             const payload = {
@@ -1364,7 +1345,7 @@ export class Client {
                 owner: this.getDevice().deviceID,
             };
             const res = await this.http.post(this.getHost() + "/file/json", msgpack.encode(payload), { headers: { "Content-Type": "application/msgpack" } });
-            const createdFile = decodeAxios(FileSQLCodec, res.data);
+            const createdFile = decodeHttpResponse(FileSQLCodec, res.data);
             return [createdFile, XUtils.encodeHex(fileKey)];
         });
     }
@@ -1374,7 +1355,7 @@ export class Client {
             serverID,
         };
         const res = await this.http.post(this.getHost() + "/server/" + serverID + "/invites", msgpack.encode(payload), { headers: { "Content-Type": "application/msgpack" } });
-        return decodeAxios(InviteCodec, res.data);
+        return decodeHttpResponse(InviteCodec, res.data);
     }
     async createPreKey() {
         const preKeyPair = await xBoxKeyPairAsync();
@@ -1388,7 +1369,7 @@ export class Client {
     }
     async createServer(name) {
         const res = await this.http.post(this.getHost() + "/server/" + globalThis.btoa(name));
-        return decodeAxios(ServerCodec, res.data);
+        return decodeHttpResponse(ServerCodec, res.data);
     }
     async createSession(device, user, message, group, 
     /* this is passed through if the first message is
@@ -1584,7 +1565,7 @@ export class Client {
         await this.http.delete(this.getHost() + "/server/" + serverID);
     }
     deviceListFailureDetail(err) {
-        if (!isAxiosError(err)) {
+        if (!isHttpError(err)) {
             return "";
         }
         const st = err.response?.status;
@@ -1607,7 +1588,7 @@ export class Client {
             "/server/" +
             serverID +
             "/permissions");
-        return decodeAxios(PermissionArrayCodec, res.data);
+        return decodeHttpResponse(PermissionArrayCodec, res.data);
     }
     async fetchUser(userIdentifier) {
         // Usernames are case-insensitive at the protocol level, so
@@ -1631,19 +1612,19 @@ export class Client {
         }
         try {
             const res = await this.http.get(this.getHost() + "/user/" + cacheKey);
-            const userRecord = decodeAxios(UserCodec, res.data);
+            const userRecord = decodeHttpResponse(UserCodec, res.data);
             this.userRecords[cacheKey] = userRecord;
             this.notFoundUsers.delete(cacheKey);
             return [userRecord, null];
         }
         catch (err) {
-            if (isAxiosError(err) && err.response?.status === 404) {
+            if (isHttpError(err) && err.response?.status === 404) {
                 // Definitive: user doesn't exist — cache and don't retry
                 this.notFoundUsers.set(cacheKey, Date.now());
                 return [null, err];
             }
             // Transient (5xx, network error) — don't cache, caller can retry
-            return [null, isAxiosError(err) ? err : null];
+            return [null, isHttpError(err) ? err : null];
         }
     }
     async fetchUserDeviceListOnce(userID) {
@@ -1651,7 +1632,7 @@ export class Client {
             return [];
         }
         const res = await this.http.get(this.getHost() + "/user/" + userID + "/devices");
-        const devices = decodeAxios(DeviceArrayCodec, res.data);
+        const devices = decodeHttpResponse(DeviceArrayCodec, res.data);
         for (const device of devices) {
             this.deviceRecords[device.deviceID] = device;
         }
@@ -1698,7 +1679,7 @@ export class Client {
      */
     async finishPasskeyAuthentication(args) {
         const response = await this.http.post(this.getHost() + "/auth/passkey/finish", msgpack.encode(args), { headers: { "Content-Type": "application/msgpack" } });
-        const decoded = decodeAxios(PasskeyAuthFinishResponseCodec, response.data);
+        const decoded = decodeHttpResponse(PasskeyAuthFinishResponseCodec, response.data);
         this.setUser(decoded.user);
         this.token = decoded.token;
         this.http.defaults.headers.common.Authorization = `Bearer ${decoded.token}`;
@@ -1707,7 +1688,7 @@ export class Client {
     async finishPasskeyRegistration(args) {
         const userID = this.getUser().userID;
         const response = await this.http.post(this.getHost() + "/user/" + userID + "/passkeys/register/finish", msgpack.encode(args), { headers: { "Content-Type": "application/msgpack" } });
-        return decodeAxios(PasskeyCodec, response.data);
+        return decodeHttpResponse(PasskeyCodec, response.data);
     }
     async forward(message) {
         if (this.isManualCloseInFlight()) {
@@ -1741,7 +1722,7 @@ export class Client {
     async getChannelByID(channelID) {
         try {
             const res = await this.http.get(this.getHost() + "/channel/" + channelID);
-            return decodeAxios(ChannelCodec, res.data);
+            return decodeHttpResponse(ChannelCodec, res.data);
         }
         catch (_err) {
             return null;
@@ -1749,7 +1730,7 @@ export class Client {
     }
     async getChannelList(serverID) {
         const res = await this.http.get(this.getHost() + "/server/" + serverID + "/channels");
-        return decodeAxios(ChannelArrayCodec, res.data);
+        return decodeHttpResponse(ChannelArrayCodec, res.data);
     }
     getDevice() {
         if (!this.device) {
@@ -1768,7 +1749,7 @@ export class Client {
         }
         try {
             const res = await this.http.get(this.getHost() + "/device/" + deviceID);
-            const fetchedDevice = decodeAxios(DeviceCodec, res.data);
+            const fetchedDevice = decodeHttpResponse(DeviceCodec, res.data);
             this.deviceRecords[deviceID] = fetchedDevice;
             await this.database.saveDevice(fetchedDevice);
             return fetchedDevice;
@@ -1785,10 +1766,10 @@ export class Client {
                 this.getUser().userID +
                 "/devices/requests/" +
                 requestID);
-            return decodeAxios(PendingDeviceRequestCodec, response.data);
+            return decodeHttpResponse(PendingDeviceRequestCodec, response.data);
         }
         catch (err) {
-            if (isAxiosError(err) && err.response?.status === 404) {
+            if (isHttpError(err) && err.response?.status === 404) {
                 return null;
             }
             throw err;
@@ -1885,7 +1866,7 @@ export class Client {
     async getMultiUserDeviceList(userIDs) {
         try {
             const res = await this.http.post(this.getHost() + "/deviceList", msgpack.encode(userIDs), { headers: { "Content-Type": "application/msgpack" } });
-            const devices = decodeAxios(DeviceArrayCodec, res.data);
+            const devices = decodeHttpResponse(DeviceArrayCodec, res.data);
             for (const device of devices) {
                 this.deviceRecords[device.deviceID] = device;
             }
@@ -1900,7 +1881,7 @@ export class Client {
             "/device/" +
             this.getDevice().deviceID +
             "/otk/count");
-        return decodeAxios(OtkCountCodec, res.data).count;
+        return decodeHttpResponse(OtkCountCodec, res.data).count;
     }
     /**
      * Gets all permissions for the logged in user.
@@ -1909,12 +1890,12 @@ export class Client {
      */
     async getPermissions() {
         const res = await this.http.get(this.getHost() + "/user/" + this.getUser().userID + "/permissions");
-        return decodeAxios(PermissionArrayCodec, res.data);
+        return decodeHttpResponse(PermissionArrayCodec, res.data);
     }
     async getServerByID(serverID) {
         try {
             const res = await this.http.get(this.getHost() + "/server/" + serverID);
-            return decodeAxios(ServerCodec, res.data);
+            return decodeHttpResponse(ServerCodec, res.data);
         }
         catch (_err) {
             return null;
@@ -1925,11 +1906,11 @@ export class Client {
             "/user/" +
             this.getUser().userID +
             "/servers/bootstrap");
-        return decodeAxios(ServerChannelBootstrapCodec, res.data);
+        return decodeHttpResponse(ServerChannelBootstrapCodec, res.data);
     }
     async getServerList() {
         const res = await this.http.get(this.getHost() + "/user/" + this.getUser().userID + "/servers");
-        return decodeAxios(ServerArrayCodec, res.data);
+        return decodeHttpResponse(ServerArrayCodec, res.data);
     }
     async getSessionByPubkey(publicKey) {
         const strPubKey = XUtils.encodeHex(publicKey);
@@ -1950,7 +1931,7 @@ export class Client {
             const res = await this.http.get(this.getHost() + "/token/" + type, {
                 responseType: "arraybuffer",
             });
-            return decodeAxios(ActionTokenCodec, res.data);
+            return decodeHttpResponse(ActionTokenCodec, res.data);
         }
         catch {
             return null;
@@ -1980,7 +1961,7 @@ export class Client {
     }
     async getUserList(channelID) {
         const res = await this.http.post(this.getHost() + "/userList/" + channelID);
-        return decodeAxios(UserArrayCodec, res.data);
+        return decodeHttpResponse(UserArrayCodec, res.data);
     }
     async handleNotify(msg) {
         switch (msg.event) {
@@ -2044,12 +2025,6 @@ export class Client {
             throw new Error("You should only call init() once.");
         }
         this.hasInit = true;
-        if (Client.isNodeRuntime()) {
-            const { attachNodeAgentsToAxios, createNodeHttpAgents } = await import("./storage/node/http-agents.js");
-            const agents = createNodeHttpAgents();
-            this.nodeHttpAgents = agents;
-            attachNodeAgentsToAxios(this.http, agents);
-        }
         await this.populateKeyRing();
         this.emitter.on("message", this.onInternalMessage);
         void this.runLocalRetentionPurge();
@@ -2182,7 +2157,7 @@ export class Client {
             "/user/" +
             this.getUser().userID +
             "/devices/requests");
-        return decodeAxios(PendingDeviceRequestArrayCodec, response.data);
+        return decodeHttpResponse(PendingDeviceRequestArrayCodec, response.data);
     }
     /**
      * Lists every device the current account owns.
@@ -2193,12 +2168,12 @@ export class Client {
     async listDevices() {
         const userID = this.getUser().userID;
         const res = await this.http.get(this.getHost() + "/user/" + userID + "/devices");
-        return decodeAxios(DeviceArrayCodec, res.data);
+        return decodeHttpResponse(DeviceArrayCodec, res.data);
     }
     async listPasskeys() {
         const userID = this.getUser().userID;
         const response = await this.http.get(this.getHost() + "/user/" + userID + "/passkeys");
-        return decodeAxios(PasskeyArrayCodec, response.data);
+        return decodeHttpResponse(PasskeyArrayCodec, response.data);
     }
     async markSessionVerified(sessionID) {
         return this.database.markSessionVerified(sessionID);
@@ -2249,7 +2224,7 @@ export class Client {
             "/passkey/devices/requests/" +
             requestID +
             "/approve");
-        return decodeAxios(DeviceCodec, response.data);
+        return decodeHttpResponse(DeviceCodec, response.data);
     }
     async passkeyDeleteDevice(deviceID) {
         const userID = this.getUser().userID;
@@ -2258,7 +2233,7 @@ export class Client {
     async passkeyListDevices() {
         const userID = this.getUser().userID;
         const response = await this.http.get(this.getHost() + "/user/" + userID + "/passkey/devices");
-        return decodeAxios(DeviceArrayCodec, response.data);
+        return decodeHttpResponse(DeviceArrayCodec, response.data);
     }
     async passkeyRejectDeviceRequest(requestID) {
         const userID = this.getUser().userID;
@@ -2310,10 +2285,10 @@ export class Client {
                 "/user/devices/requests/" +
                 args.requestID +
                 "/poll", msgpack.encode({ signed }), { headers: { "Content-Type": "application/msgpack" } });
-            return decodeAxios(PendingDeviceRequestCodec, response.data);
+            return decodeHttpResponse(PendingDeviceRequestCodec, response.data);
         }
         catch (err) {
-            if (isAxiosError(err) && err.response?.status === 404) {
+            if (isHttpError(err) && err.response?.status === 404) {
                 return null;
             }
             throw err;
@@ -2930,7 +2905,7 @@ export class Client {
     }
     async redeemInvite(inviteID) {
         const res = await this.http.patch(this.getHost() + "/invite/" + inviteID);
-        return decodeAxios(PermissionCodec, res.data);
+        return decodeHttpResponse(PermissionCodec, res.data);
     }
     registerDecryptFailure(mail) {
         const count = (this.decryptFailureCounts.get(mail.mailID) ?? 0) + 1;
@@ -2969,7 +2944,7 @@ export class Client {
             "/user/" +
             userDetails.userID +
             "/devices", msgpack.encode(devMsg), { headers: { "Content-Type": "application/msgpack" } });
-        return decodeAxios(DeviceRegistrationResultCodec, res.data);
+        return decodeHttpResponse(DeviceRegistrationResultCodec, res.data);
     }
     async rejectDeviceRequest(requestID) {
         await this.http.post(this.prefixes.HTTP +
@@ -2996,22 +2971,18 @@ export class Client {
     }
     async retrieveEmojiByID(emojiID) {
         const res = await this.http.get(this.getHost() + "/emoji/" + emojiID + "/details");
-        if (!res.data) {
-            return null;
-        }
-        return decodeAxios(EmojiCodec, res.data);
+        return decodeHttpResponse(EmojiCodec, res.data);
     }
     async retrieveEmojiList(serverID) {
         const res = await this.http.get(this.getHost() + "/server/" + serverID + "/emoji");
-        return decodeAxios(EmojiArrayCodec, res.data);
+        return decodeHttpResponse(EmojiArrayCodec, res.data);
     }
     async retrieveFile(fileID, key) {
         const detailsRes = await this.http.get(this.getHost() + "/file/" + fileID + "/details");
-        const details = decodeAxios(FileSQLCodec, detailsRes.data);
+        const details = decodeHttpResponse(FileSQLCodec, detailsRes.data);
         const res = await this.http.get(this.getHost() + "/file/" + fileID, {
             onDownloadProgress: (progressEvent) => {
-                const percentCompleted = Math.round((progressEvent.loaded * 100) /
-                    (progressEvent.total ?? 1));
+                const percentCompleted = Math.round((progressEvent.loaded * 100) / (progressEvent.total ?? 1));
                 const { loaded, total = 0 } = progressEvent;
                 const progress = {
                     direction: "download",
@@ -3035,11 +3006,11 @@ export class Client {
     }
     async retrieveInvites(serverID) {
         const res = await this.http.get(this.getHost() + "/server/" + serverID + "/invites");
-        return decodeAxios(InviteArrayCodec, res.data);
+        return decodeHttpResponse(InviteArrayCodec, res.data);
     }
     async retrieveKeyBundle(deviceID) {
         const res = await this.http.post(this.getHost() + "/device/" + deviceID + "/keyBundle");
-        return decodeAxios(KeyBundleCodec, res.data);
+        return decodeHttpResponse(KeyBundleCodec, res.data);
     }
     async retrieveOrCreateDevice() {
         let device;
@@ -3048,10 +3019,10 @@ export class Client {
                 this.host +
                 "/device/" +
                 XUtils.encodeHex(this.signKeys.publicKey));
-            device = decodeAxios(DeviceCodec, res.data);
+            device = decodeHttpResponse(DeviceCodec, res.data);
         }
         catch (err) {
-            if (isAxiosError(err) && err.response?.status === 404) {
+            if (isHttpError(err) && err.response?.status === 404) {
                 await this.database.purgeKeyData();
                 await this.populateKeyRing();
                 const newDevice = await this.registerDevice();
@@ -3634,7 +3605,7 @@ export class Client {
                         this.emitter.emit("fileProgress", progress);
                     },
                 });
-                return decodeAxios(EmojiCodec, res.data);
+                return decodeHttpResponse(EmojiCodec, res.data);
             }
             catch (_err) {
                 return null;
@@ -3646,7 +3617,7 @@ export class Client {
         };
         try {
             const res = await this.http.post(this.getHost() + "/emoji/" + serverID + "/json", msgpack.encode(payload), { headers: { "Content-Type": "application/msgpack" } });
-            return decodeAxios(EmojiCodec, res.data);
+            return decodeHttpResponse(EmojiCodec, res.data);
         }
         catch (_err) {
             return null;