@antzsoft/chat-core 1.2.4 → 1.2.5

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { Y as ResolvedCompressionConfig, o as LoginCredentials, c as AuthResponse, W as RegisterData, d as AuthTokens, a7 as User, a as AppConfig, a0 as SendMessagePayload, l as CursorPaginatedResponse, M as Message, P as PaginatedResponse, x as MessageReceiptsResponse, i as ConversationListParams, h as Conversation, H as Participant, k as ConversationUnreadCount, a3 as UnreadSummary, a8 as UserPreferences, Z as ResolvedConfig, I as PersistStorage, R as PresignedUrlRequest, S as PresignedUrlResponse, F as FileResponse, C as CompletedPart, n as FileType, A as AntzChatConfig, a6 as UploadableFile, B as BatchUploadResult } from './storage-Bp6fk9aM.cjs';
-export { b as Attachment, e as CompressedFile, f as CompressionAlgorithm, g as CompressionConfig, j as ConversationType, m as FileSizeLimits, L as LastReaction, p as MessageAckEvent, q as MessageContent, r as MessageDeletedEvent, s as MessageDeletedForMeEvent, t as MessageDeliveredEvent, u as MessageMetadata, v as MessageReaction, w as MessageReceiptEntry, y as MessageReplyReference, z as MessageUpdatedEvent, D as MessagesDeliveredEvent, E as MultipartPartUrl, G as MultipartUploadInfo, N as NewMessageEvent, O as OptimisticAttachment, J as PlatformCompressFn, K as PlatformUploadFn, Q as PlatformUploadPartFn, T as QuietHours, U as ReactionUpdatedEvent, V as ReadReceiptEvent, X as ReplyAttachmentSnapshot, _ as ResolvedFileSizeLimits, $ as SendMessageAttachment, a1 as SystemMessageMetadata, a2 as TypingIndicatorEvent, a4 as UploadConfig, a5 as UploadProgress, a9 as UserStatusEvent, aa as resolveConfig, ab as storageApi, ac as uploadBatch } from './storage-Bp6fk9aM.cjs';
+import { R as ResolvedCompressionConfig, L as LoginCredentials, A as AuthResponse, a as RegisterData, b as AuthTokens, U as User, c as AppConfig, S as SendMessagePayload, C as CursorPaginatedResponse, M as Message, P as PaginatedResponse, d as MessageReceiptsResponse, e as ConversationListParams, f as Conversation, g as Participant, h as ConversationUnreadCount, i as UnreadSummary, j as UserPreferences, k as ResolvedConfig, l as PersistStorage, m as PresignedUrlRequest, n as PresignedUrlResponse, F as FileResponse, o as CompletedPart, p as FileType, q as AntzChatConfig, r as UploadableFile, B as BatchUploadResult } from './storage-CctLCOnZ.cjs';
+export { s as Attachment, t as CompressedFile, u as CompressionAlgorithm, v as CompressionConfig, w as ConversationType, x as FileSizeLimits, y as LastReaction, z as MessageAckEvent, D as MessageContent, E as MessageDeletedEvent, G as MessageDeletedForMeEvent, H as MessageDeliveredEvent, I as MessageMetadata, J as MessageReaction, K as MessageReceiptEntry, N as MessageReplyReference, O as MessageUpdatedEvent, Q as MessagesDeliveredEvent, T as MultipartPartUrl, V as MultipartUploadInfo, W as NewMessageEvent, X as OptimisticAttachment, Y as PlatformCompressFn, Z as PlatformUploadFn, _ as PlatformUploadPartFn, $ as QuietHours, a0 as ReactionUpdatedEvent, a1 as ReadReceiptEvent, a2 as ReplyAttachmentSnapshot, a3 as ResolvedFileSizeLimits, a4 as SendMessageAttachment, a5 as SystemMessageMetadata, a6 as TypingIndicatorEvent, a7 as UploadConfig, a8 as UploadProgress, a9 as UserStatusEvent, aa as resolveConfig, ab as storageApi, ac as uploadBatch } from './storage-CctLCOnZ.cjs';
 import { AxiosInstance } from 'axios';
 import { Socket } from 'socket.io-client';
 import * as zustand_middleware from 'zustand/middleware';
@@ -286,6 +286,35 @@ interface TransitSession {
     enabled: boolean;
 }
 declare function setTransitSession(session: TransitSession): void;
+declare function getSessionKey(): CryptoKey | Uint8Array | null;
+declare function getSessionId(): string | null;
+
+interface TransitEnvelope {
+    v: 1;
+    iv: string;
+    tag: string;
+    ct: string;
+}
+type AnySessionKey = CryptoKey | Uint8Array;
+declare function encryptPayload(data: unknown, sessionKey: AnySessionKey): Promise<TransitEnvelope>;
+declare function decryptPayload(envelope: TransitEnvelope, sessionKey: AnySessionKey): Promise<unknown>;
+declare function isTransitEnvelope(v: unknown): v is TransitEnvelope;
+
+interface ServerPublicKeys {
+    x25519: string;
+    p256: string;
+    enabled: boolean;
+}
+declare function fetchServerKeys(apiUrl: string): Promise<ServerPublicKeys>;
+declare function generateEphemeralKey(algo: TransitAlgo, serverKeys: ServerPublicKeys): Promise<{
+    ephemeralPubB64: string;
+    deriveSessionKey: (sessionId: string) => Promise<unknown>;
+}>;
+declare function createRestTransitSession(apiUrl: string): Promise<{
+    sessionId: string;
+    sessionKey: CryptoKey | Uint8Array;
+} | null>;
+declare function performHandshake(algo: TransitAlgo, serverKeys: ServerPublicKeys, socketHandshakeAuth: Record<string, unknown>): Promise<(sessionId: string) => Promise<unknown>>;
 
 interface AuthState {
     user: User | null;
@@ -566,4 +595,4 @@ declare class AntzChatClient {
     uploadIcon(conversationId: string, file: UploadableFile): Promise<Conversation>;
 }
 
-export { AntzChatClient, AntzChatConfig, AppConfig, AuthResponse, AuthTokens, BatchUploadResult, CompletedPart, Conversation, ConversationListParams, ConversationUnreadCount, type CreateDirectData, type CreateGroupData, CursorPaginatedResponse, FileResponse, FileType, type LastReadEntry, type ListMessagesParams, LoginCredentials, Message, MessageReceiptsResponse, type MobileDeviceToken, PaginatedResponse, Participant, PersistStorage, PresignedUrlRequest, PresignedUrlResponse, RegisterData, type RegisterDeviceTokenPayload, ResolvedCompressionConfig, ResolvedConfig, type SearchParams, type SendData, SendMessagePayload, type SocketStatus, type StatusListener, type TokenStore, UnreadSummary, type UpdateConversationData, type UpdateProfilePayload, UploadableFile, User, UserPreferences, type WebPushDeviceToken, appConfigApi, authApi, connectSocket, conversationsApi, createAuthStore, devicesApi, disconnectSocket, getApiClient, getAuthStore, getCompressionStrategy, getSocket, getSocketStatus, initApiClient, initAuthStore, messagesApi, normalizeConversation, onSocketStatus, reconnectSocket, refreshSocketAuth, resetAuthStore, resolveSystemMessageText, setApiClientInstance, setTransitSession, socketEmit, tryGetSocket, useChatStore, usersApi };
+export { AntzChatClient, AntzChatConfig, AppConfig, AuthResponse, AuthTokens, BatchUploadResult, CompletedPart, Conversation, ConversationListParams, ConversationUnreadCount, type CreateDirectData, type CreateGroupData, CursorPaginatedResponse, FileResponse, FileType, type LastReadEntry, type ListMessagesParams, LoginCredentials, Message, MessageReceiptsResponse, type MobileDeviceToken, PaginatedResponse, Participant, PersistStorage, PresignedUrlRequest, PresignedUrlResponse, RegisterData, type RegisterDeviceTokenPayload, ResolvedCompressionConfig, ResolvedConfig, type SearchParams, type SendData, SendMessagePayload, type SocketStatus, type StatusListener, type TokenStore, UnreadSummary, type UpdateConversationData, type UpdateProfilePayload, UploadableFile, User, UserPreferences, type WebPushDeviceToken, appConfigApi, authApi, connectSocket, conversationsApi, createAuthStore, createRestTransitSession, decryptPayload, devicesApi, disconnectSocket, encryptPayload, fetchServerKeys, generateEphemeralKey, getApiClient, getAuthStore, getCompressionStrategy, getSessionId, getSessionKey, getSocket, getSocketStatus, initApiClient, initAuthStore, isTransitEnvelope, messagesApi, normalizeConversation, onSocketStatus, performHandshake, reconnectSocket, refreshSocketAuth, resetAuthStore, resolveSystemMessageText, setApiClientInstance, setTransitSession, socketEmit, tryGetSocket, useChatStore, usersApi };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { Y as ResolvedCompressionConfig, o as LoginCredentials, c as AuthResponse, W as RegisterData, d as AuthTokens, a7 as User, a as AppConfig, a0 as SendMessagePayload, l as CursorPaginatedResponse, M as Message, P as PaginatedResponse, x as MessageReceiptsResponse, i as ConversationListParams, h as Conversation, H as Participant, k as ConversationUnreadCount, a3 as UnreadSummary, a8 as UserPreferences, Z as ResolvedConfig, I as PersistStorage, R as PresignedUrlRequest, S as PresignedUrlResponse, F as FileResponse, C as CompletedPart, n as FileType, A as AntzChatConfig, a6 as UploadableFile, B as BatchUploadResult } from './storage-Bp6fk9aM.js';
-export { b as Attachment, e as CompressedFile, f as CompressionAlgorithm, g as CompressionConfig, j as ConversationType, m as FileSizeLimits, L as LastReaction, p as MessageAckEvent, q as MessageContent, r as MessageDeletedEvent, s as MessageDeletedForMeEvent, t as MessageDeliveredEvent, u as MessageMetadata, v as MessageReaction, w as MessageReceiptEntry, y as MessageReplyReference, z as MessageUpdatedEvent, D as MessagesDeliveredEvent, E as MultipartPartUrl, G as MultipartUploadInfo, N as NewMessageEvent, O as OptimisticAttachment, J as PlatformCompressFn, K as PlatformUploadFn, Q as PlatformUploadPartFn, T as QuietHours, U as ReactionUpdatedEvent, V as ReadReceiptEvent, X as ReplyAttachmentSnapshot, _ as ResolvedFileSizeLimits, $ as SendMessageAttachment, a1 as SystemMessageMetadata, a2 as TypingIndicatorEvent, a4 as UploadConfig, a5 as UploadProgress, a9 as UserStatusEvent, aa as resolveConfig, ab as storageApi, ac as uploadBatch } from './storage-Bp6fk9aM.js';
+import { R as ResolvedCompressionConfig, L as LoginCredentials, A as AuthResponse, a as RegisterData, b as AuthTokens, U as User, c as AppConfig, S as SendMessagePayload, C as CursorPaginatedResponse, M as Message, P as PaginatedResponse, d as MessageReceiptsResponse, e as ConversationListParams, f as Conversation, g as Participant, h as ConversationUnreadCount, i as UnreadSummary, j as UserPreferences, k as ResolvedConfig, l as PersistStorage, m as PresignedUrlRequest, n as PresignedUrlResponse, F as FileResponse, o as CompletedPart, p as FileType, q as AntzChatConfig, r as UploadableFile, B as BatchUploadResult } from './storage-CctLCOnZ.js';
+export { s as Attachment, t as CompressedFile, u as CompressionAlgorithm, v as CompressionConfig, w as ConversationType, x as FileSizeLimits, y as LastReaction, z as MessageAckEvent, D as MessageContent, E as MessageDeletedEvent, G as MessageDeletedForMeEvent, H as MessageDeliveredEvent, I as MessageMetadata, J as MessageReaction, K as MessageReceiptEntry, N as MessageReplyReference, O as MessageUpdatedEvent, Q as MessagesDeliveredEvent, T as MultipartPartUrl, V as MultipartUploadInfo, W as NewMessageEvent, X as OptimisticAttachment, Y as PlatformCompressFn, Z as PlatformUploadFn, _ as PlatformUploadPartFn, $ as QuietHours, a0 as ReactionUpdatedEvent, a1 as ReadReceiptEvent, a2 as ReplyAttachmentSnapshot, a3 as ResolvedFileSizeLimits, a4 as SendMessageAttachment, a5 as SystemMessageMetadata, a6 as TypingIndicatorEvent, a7 as UploadConfig, a8 as UploadProgress, a9 as UserStatusEvent, aa as resolveConfig, ab as storageApi, ac as uploadBatch } from './storage-CctLCOnZ.js';
 import { AxiosInstance } from 'axios';
 import { Socket } from 'socket.io-client';
 import * as zustand_middleware from 'zustand/middleware';
@@ -286,6 +286,35 @@ interface TransitSession {
     enabled: boolean;
 }
 declare function setTransitSession(session: TransitSession): void;
+declare function getSessionKey(): CryptoKey | Uint8Array | null;
+declare function getSessionId(): string | null;
+
+interface TransitEnvelope {
+    v: 1;
+    iv: string;
+    tag: string;
+    ct: string;
+}
+type AnySessionKey = CryptoKey | Uint8Array;
+declare function encryptPayload(data: unknown, sessionKey: AnySessionKey): Promise<TransitEnvelope>;
+declare function decryptPayload(envelope: TransitEnvelope, sessionKey: AnySessionKey): Promise<unknown>;
+declare function isTransitEnvelope(v: unknown): v is TransitEnvelope;
+
+interface ServerPublicKeys {
+    x25519: string;
+    p256: string;
+    enabled: boolean;
+}
+declare function fetchServerKeys(apiUrl: string): Promise<ServerPublicKeys>;
+declare function generateEphemeralKey(algo: TransitAlgo, serverKeys: ServerPublicKeys): Promise<{
+    ephemeralPubB64: string;
+    deriveSessionKey: (sessionId: string) => Promise<unknown>;
+}>;
+declare function createRestTransitSession(apiUrl: string): Promise<{
+    sessionId: string;
+    sessionKey: CryptoKey | Uint8Array;
+} | null>;
+declare function performHandshake(algo: TransitAlgo, serverKeys: ServerPublicKeys, socketHandshakeAuth: Record<string, unknown>): Promise<(sessionId: string) => Promise<unknown>>;
 
 interface AuthState {
     user: User | null;
@@ -566,4 +595,4 @@ declare class AntzChatClient {
     uploadIcon(conversationId: string, file: UploadableFile): Promise<Conversation>;
 }
 
-export { AntzChatClient, AntzChatConfig, AppConfig, AuthResponse, AuthTokens, BatchUploadResult, CompletedPart, Conversation, ConversationListParams, ConversationUnreadCount, type CreateDirectData, type CreateGroupData, CursorPaginatedResponse, FileResponse, FileType, type LastReadEntry, type ListMessagesParams, LoginCredentials, Message, MessageReceiptsResponse, type MobileDeviceToken, PaginatedResponse, Participant, PersistStorage, PresignedUrlRequest, PresignedUrlResponse, RegisterData, type RegisterDeviceTokenPayload, ResolvedCompressionConfig, ResolvedConfig, type SearchParams, type SendData, SendMessagePayload, type SocketStatus, type StatusListener, type TokenStore, UnreadSummary, type UpdateConversationData, type UpdateProfilePayload, UploadableFile, User, UserPreferences, type WebPushDeviceToken, appConfigApi, authApi, connectSocket, conversationsApi, createAuthStore, devicesApi, disconnectSocket, getApiClient, getAuthStore, getCompressionStrategy, getSocket, getSocketStatus, initApiClient, initAuthStore, messagesApi, normalizeConversation, onSocketStatus, reconnectSocket, refreshSocketAuth, resetAuthStore, resolveSystemMessageText, setApiClientInstance, setTransitSession, socketEmit, tryGetSocket, useChatStore, usersApi };
+export { AntzChatClient, AntzChatConfig, AppConfig, AuthResponse, AuthTokens, BatchUploadResult, CompletedPart, Conversation, ConversationListParams, ConversationUnreadCount, type CreateDirectData, type CreateGroupData, CursorPaginatedResponse, FileResponse, FileType, type LastReadEntry, type ListMessagesParams, LoginCredentials, Message, MessageReceiptsResponse, type MobileDeviceToken, PaginatedResponse, Participant, PersistStorage, PresignedUrlRequest, PresignedUrlResponse, RegisterData, type RegisterDeviceTokenPayload, ResolvedCompressionConfig, ResolvedConfig, type SearchParams, type SendData, SendMessagePayload, type SocketStatus, type StatusListener, type TokenStore, UnreadSummary, type UpdateConversationData, type UpdateProfilePayload, UploadableFile, User, UserPreferences, type WebPushDeviceToken, appConfigApi, authApi, connectSocket, conversationsApi, createAuthStore, createRestTransitSession, decryptPayload, devicesApi, disconnectSocket, encryptPayload, fetchServerKeys, generateEphemeralKey, getApiClient, getAuthStore, getCompressionStrategy, getSessionId, getSessionKey, getSocket, getSocketStatus, initApiClient, initAuthStore, isTransitEnvelope, messagesApi, normalizeConversation, onSocketStatus, performHandshake, reconnectSocket, refreshSocketAuth, resetAuthStore, resolveSystemMessageText, setApiClientInstance, setTransitSession, socketEmit, tryGetSocket, useChatStore, usersApi };

package/dist/index.js

@@ -1,19 +1,28 @@
 import {
   clearTransitSession,
   configureTransit,
+  createRestTransitSession,
   decryptPayload,
+  detectTransitAlgo,
   encryptPayload,
+  fetchServerKeys,
+  generateEphemeralKey,
   getApiClient,
   getCompressionStrategy,
+  getSessionId,
   getSessionKey,
+  getTransitHandshakePromise,
+  getTransitSession,
   initApiClient,
   isTransitEnabled,
   isTransitEnvelope,
+  performHandshake,
+  resetAlgoCache,
   setApiClientInstance,
   setTransitSession,
   storageApi,
   uploadBatch
-} from "./chunk-6NMA64BX.js";
+} from "./chunk-ZNA6B2R5.js";
 import {
   useChatStore
 } from "./chunk-EOL5B7GS.js";
@@ -378,7 +387,8 @@ function normalizeLastMessage(lastMsg) {
     isEdited: false,
     sentAt: lastMsg.sentAt ?? "",
     createdAt: lastMsg.sentAt ?? "",
-    ...lastMsg.senderName && { senderName: lastMsg.senderName }
+    ...lastMsg.senderName && { senderName: lastMsg.senderName },
+    ...lastMsg.attachmentType && { attachmentType: lastMsg.attachmentType }
   };
 }
 function normalizeConversation(conv) {
@@ -568,122 +578,6 @@ var usersApi = {
 
 // src/socket/socket.ts
 import { io } from "socket.io-client";
-
-// src/crypto/detect.ts
-var _cached = null;
-async function detectTransitAlgo() {
-  if (_cached) return _cached;
-  try {
-    await globalThis.crypto.subtle.generateKey(
-      { name: "X25519" },
-      false,
-      ["deriveKey"]
-    );
-    _cached = "x25519";
-  } catch {
-    _cached = "p256";
-  }
-  return _cached;
-}
-function resetAlgoCache() {
-  _cached = null;
-}
-
-// src/crypto/handshake.ts
-function hasWebCrypto() {
-  return typeof globalThis.crypto?.subtle !== "undefined";
-}
-async function fetchServerKeys(apiUrl) {
-  const res = await fetch(`${apiUrl}/crypto/pubkey`);
-  if (!res.ok) throw new Error(`[AntzChat] Failed to fetch server public key: ${res.status}`);
-  const body = await res.json();
-  return body?.data ?? body;
-}
-async function performHandshake(algo, serverKeys, socketHandshakeAuth) {
-  if (hasWebCrypto()) {
-    return performWebCryptoHandshake(algo, serverKeys, socketHandshakeAuth);
-  }
-  return performNobleHandshake(serverKeys, socketHandshakeAuth);
-}
-async function performWebCryptoHandshake(algo, serverKeys, socketHandshakeAuth) {
-  const ephemeral = await globalThis.crypto.subtle.generateKey(
-    algo === "x25519" ? { name: "X25519" } : { name: "ECDH", namedCurve: "P-256" },
-    false,
-    ["deriveBits"]
-  );
-  const pubRaw = await globalThis.crypto.subtle.exportKey("raw", ephemeral.publicKey);
-  socketHandshakeAuth["transitEphemeralPub"] = bufToB64(pubRaw);
-  socketHandshakeAuth["transitAlgo"] = algo;
-  const ephemeralPriv = ephemeral.privateKey;
-  return (sessionId) => deriveWebCryptoSessionKey(ephemeralPriv, algo, serverKeys, sessionId);
-}
-async function deriveWebCryptoSessionKey(ephemeralPriv, algo, serverKeys, sessionId) {
-  const serverPubRaw = b64ToBuf(algo === "x25519" ? serverKeys.x25519 : serverKeys.p256);
-  const keyAlgoParams = algo === "x25519" ? { name: "X25519" } : { name: "ECDH", namedCurve: "P-256" };
-  const serverPubKey = await globalThis.crypto.subtle.importKey("raw", serverPubRaw, keyAlgoParams, false, []);
-  const sharedBits = await globalThis.crypto.subtle.deriveBits(
-    { name: algo === "x25519" ? "X25519" : "ECDH", public: serverPubKey },
-    ephemeralPriv,
-    256
-  );
-  const hkdfKey = await globalThis.crypto.subtle.importKey("raw", sharedBits, "HKDF", false, ["deriveKey"]);
-  const salt = new TextEncoder().encode(sessionId);
-  const info = new TextEncoder().encode("antz-transit-v1");
-  return globalThis.crypto.subtle.deriveKey(
-    { name: "HKDF", hash: "SHA-256", salt, info },
-    hkdfKey,
-    { name: "AES-GCM", length: 256 },
-    false,
-    ["encrypt", "decrypt"]
-  );
-}
-async function performNobleHandshake(serverKeys, socketHandshakeAuth) {
-  const { x25519 } = await import("@noble/curves/ed25519");
-  const { hkdf } = await import("@noble/hashes/hkdf");
-  const { sha256 } = await import("@noble/hashes/sha256");
-  const { randomBytes } = await import("@noble/hashes/utils");
-  const ephemeralPriv = randomBytes(32);
-  const ephemeralPub = x25519.getPublicKey(ephemeralPriv);
-  const serverPubBytes = base64ToUint8(serverKeys.x25519);
-  socketHandshakeAuth["transitEphemeralPub"] = uint8ToBase64(ephemeralPub);
-  socketHandshakeAuth["transitAlgo"] = "x25519";
-  return (sessionId) => {
-    const sharedSecret = x25519.getSharedSecret(ephemeralPriv, serverPubBytes);
-    const salt = new TextEncoder().encode(sessionId);
-    const info = new TextEncoder().encode("antz-transit-v1");
-    const sessionKey = hkdf(sha256, sharedSecret, salt, info, 32);
-    return Promise.resolve(sessionKey);
-  };
-}
-function bufToB64(buf) {
-  const bytes = new Uint8Array(buf);
-  let str = "";
-  bytes.forEach((b) => {
-    str += String.fromCharCode(b);
-  });
-  return btoa(str);
-}
-function b64ToBuf(b64) {
-  const bin = atob(b64);
-  const buf = new Uint8Array(bin.length);
-  for (let i = 0; i < bin.length; i++) buf[i] = bin.charCodeAt(i);
-  return buf.buffer;
-}
-function uint8ToBase64(bytes) {
-  let str = "";
-  bytes.forEach((b) => {
-    str += String.fromCharCode(b);
-  });
-  return btoa(str);
-}
-function base64ToUint8(b64) {
-  const bin = atob(b64);
-  const buf = new Uint8Array(bin.length);
-  for (let i = 0; i < bin.length; i++) buf[i] = bin.charCodeAt(i);
-  return buf;
-}
-
-// src/socket/socket.ts
 var _socket = null;
 var _socketProxy = null;
 var _connectingPromise = null;
@@ -780,17 +674,35 @@ async function _doConnect(config, getToken) {
   };
   let boundDeriveSessionKey = null;
   if (config.transitEncryption) {
-    try {
-      const serverKeys = await fetchServerKeys(config.apiUrl);
-      if (!serverKeys.enabled) {
-        throw new Error(
-          "[AntzChat] Transit encryption mismatch: SDK has transitEncryption=true but server has TRANSIT_ENCRYPTION_ENABLED=false. Align the config on both sides."
-        );
+    const inFlight = getTransitHandshakePromise();
+    if (inFlight) await inFlight;
+    const existingSession = getTransitSession();
+    let httpsSession = null;
+    if (existingSession?.enabled && existingSession.sessionId) {
+      httpsSession = { sessionId: existingSession.sessionId, sessionKey: existingSession.sessionKey };
+    } else {
+      httpsSession = await createRestTransitSession(config.apiUrl);
+      if (httpsSession) {
+        const algo = globalThis.crypto?.subtle ? await detectTransitAlgo() : "x25519";
+        setTransitSession({ sessionKey: httpsSession.sessionKey, algo, sessionId: httpsSession.sessionId, enabled: true });
+      }
+    }
+    if (httpsSession) {
+      socketHandshakeAuth["transitSessionId"] = httpsSession.sessionId;
+      boundDeriveSessionKey = null;
+    } else {
+      try {
+        const serverKeys = await fetchServerKeys(config.apiUrl);
+        if (!serverKeys.enabled) {
+          throw new Error(
+            "[AntzChat] Transit encryption mismatch: SDK has transitEncryption=true but server has TRANSIT_ENCRYPTION_ENABLED=false. Align the config on both sides."
+          );
+        }
+        const algo = globalThis.crypto?.subtle ? await detectTransitAlgo() : "x25519";
+        boundDeriveSessionKey = await performHandshake(algo, serverKeys, socketHandshakeAuth);
+      } catch (err) {
+        throw err;
       }
-      const algo = globalThis.crypto?.subtle ? await detectTransitAlgo() : "x25519";
-      boundDeriveSessionKey = await performHandshake(algo, serverKeys, socketHandshakeAuth);
-    } catch (err) {
-      throw err;
     }
   } else {
     try {
@@ -948,11 +860,7 @@ async function drainSendQueue(conversationId) {
       entry.reject(new Error("[AntzChat] Message dropped: queued too long"));
       continue;
     }
-    try {
-      entry.resolve(await entry.run());
-    } catch (e) {
-      entry.reject(e);
-    }
+    entry.run().then(entry.resolve).catch(entry.reject);
   }
   sendQueues.delete(conversationId);
   sendQueueRunning.delete(conversationId);
@@ -996,11 +904,13 @@ async function withAck(event, payload) {
   }
   if (!socket) return Promise.reject(new Error(`[AntzChat] Socket not connected (event: ${event})`));
   return new Promise((resolve, reject) => {
-    const timer = setTimeout(() => reject(new Error(`Socket ack timeout: ${event}`)), ACK_TIMEOUT);
+    let timer;
     secureEmit(socket, event, payload, (response) => {
       clearTimeout(timer);
       resolve(response);
-    });
+    }).then(() => {
+      timer = setTimeout(() => reject(new Error(`Socket ack timeout: ${event}`)), ACK_TIMEOUT);
+    }).catch(reject);
   });
 }
 function fireAndForget(event, payload) {
@@ -1050,7 +960,7 @@ var socketEmit = {
     const socket = tryGetSocket();
     if (!socket) return Promise.resolve([]);
     return new Promise((resolve, reject) => {
-      const timer = setTimeout(() => reject(new Error("get_online_users timeout")), ACK_TIMEOUT);
+      let timer;
       secureEmit(socket, "get_online_users", { userIds }, (response) => {
         clearTimeout(timer);
         if (response && typeof response === "object" && "onlineStatus" in response) {
@@ -1061,7 +971,9 @@ var socketEmit = {
         } else {
           resolve([]);
         }
-      });
+      }).then(() => {
+        timer = setTimeout(() => reject(new Error("get_online_users timeout")), ACK_TIMEOUT);
+      }).catch(reject);
     });
   },
   getTypingUsers(conversationId) {
@@ -1125,18 +1037,27 @@ export {
   connectSocket,
   conversationsApi,
   createAuthStore,
+  createRestTransitSession,
+  decryptPayload,
   devicesApi,
   disconnectSocket,
+  encryptPayload,
+  fetchServerKeys,
+  generateEphemeralKey,
   getApiClient,
   getAuthStore,
   getCompressionStrategy,
+  getSessionId,
+  getSessionKey,
   getSocket,
   getSocketStatus,
   initApiClient,
   initAuthStore,
+  isTransitEnvelope,
   messagesApi,
   normalizeConversation,
   onSocketStatus,
+  performHandshake,
   reconnectSocket,
   refreshSocketAuth,
   resetAuthStore,