chatly-sdk 0.0.8 → 2.0.0

package/dist/index.js

@@ -9,6 +9,8 @@ function bufferToBase64(buffer) {
   return buffer.toString("base64");
 }
 function base64ToBuffer(data) {
+  if (Buffer.isBuffer(data)) return data;
+  if (!data) return Buffer.alloc(0);
   return Buffer.from(data, "base64");
 }
 
@@ -45,6 +47,11 @@ function deriveSharedSecret(local, remotePublicKey) {
   const derivedKey = pbkdf2Sync(sharedSecret, salt, PBKDF2_ITERATIONS, KEY_LENGTH, "sha256");
   return derivedKey;
 }
+function deriveLegacySharedSecret(local, remotePublicKey) {
+  const ecdh = createECDH2(SUPPORTED_CURVE);
+  ecdh.setPrivateKey(base64ToBuffer(local.privateKey));
+  return ecdh.computeSecret(base64ToBuffer(remotePublicKey));
+}
 function encryptMessage(plaintext, secret) {
   const iv = randomBytes2(IV_LENGTH);
   const cipher = createCipheriv(ALGORITHM, secret, iv);
@@ -95,12 +102,78 @@ function generateUUID() {
   });
 }
 
+// src/utils/logger.ts
+var LogLevel = /* @__PURE__ */ ((LogLevel3) => {
+  LogLevel3[LogLevel3["DEBUG"] = 0] = "DEBUG";
+  LogLevel3[LogLevel3["INFO"] = 1] = "INFO";
+  LogLevel3[LogLevel3["WARN"] = 2] = "WARN";
+  LogLevel3[LogLevel3["ERROR"] = 3] = "ERROR";
+  LogLevel3[LogLevel3["NONE"] = 4] = "NONE";
+  return LogLevel3;
+})(LogLevel || {});
+var Logger = class {
+  config;
+  constructor(config = {}) {
+    this.config = {
+      level: config.level ?? 1 /* INFO */,
+      prefix: config.prefix ?? "[ChatSDK]",
+      timestamp: config.timestamp ?? true
+    };
+  }
+  shouldLog(level) {
+    return level >= this.config.level;
+  }
+  formatMessage(level, message, data) {
+    const parts = [];
+    if (this.config.timestamp) {
+      parts.push((/* @__PURE__ */ new Date()).toISOString());
+    }
+    parts.push(this.config.prefix);
+    parts.push(`[${level}]`);
+    parts.push(message);
+    let formatted = parts.join(" ");
+    if (data !== void 0) {
+      formatted += " " + JSON.stringify(data, null, 2);
+    }
+    return formatted;
+  }
+  debug(message, data) {
+    if (this.shouldLog(0 /* DEBUG */)) {
+      console.debug(this.formatMessage("DEBUG", message, data));
+    }
+  }
+  info(message, data) {
+    if (this.shouldLog(1 /* INFO */)) {
+      console.info(this.formatMessage("INFO", message, data));
+    }
+  }
+  warn(message, data) {
+    if (this.shouldLog(2 /* WARN */)) {
+      console.warn(this.formatMessage("WARN", message, data));
+    }
+  }
+  error(message, error) {
+    if (this.shouldLog(3 /* ERROR */)) {
+      const errorData = error instanceof Error ? { message: error.message, stack: error.stack } : error;
+      console.error(this.formatMessage("ERROR", message, errorData));
+    }
+  }
+  setLevel(level) {
+    this.config.level = level;
+  }
+  getLevel() {
+    return this.config.level;
+  }
+};
+var logger = new Logger();
+
 // src/chat/ChatSession.ts
 var ChatSession = class {
-  constructor(id, userA, userB) {
+  constructor(id, userA, userB, storageProvider) {
     this.id = id;
     this.userA = userA;
     this.userB = userB;
+    this.storageProvider = storageProvider;
   }
   sharedSecret = null;
   ephemeralKeyPair = null;
@@ -124,6 +197,12 @@ var ChatSession = class {
       publicKey: user.publicKey,
       privateKey: user.privateKey
     };
+    logger.debug(`[ChatSession] Initializing for user ${user.id}`, {
+      hasLocalPriv: !!user.privateKey,
+      privType: typeof user.privateKey,
+      hasRemotePub: !!otherUser.publicKey,
+      pubType: typeof otherUser.publicKey
+    });
     this.sharedSecret = deriveSharedSecret(localKeyPair, otherUser.publicKey);
   }
   /**
@@ -158,14 +237,27 @@ var ChatSession = class {
       throw new Error("Failed to initialize session");
     }
     const { ciphertext, iv } = encryptMessage(plaintext, this.sharedSecret);
-    const { ciphertext: encryptedMediaData } = encryptMessage(
-      media.data,
+    const { ciphertext: encryptedMediaData, iv: mediaIv } = encryptMessage(
+      media.data || "",
       this.sharedSecret
     );
     const encryptedMedia = {
       ...media,
-      data: encryptedMediaData
+      data: encryptedMediaData,
+      iv: mediaIv
     };
+    if (this.storageProvider) {
+      const filename = `${this.id}/${generateUUID()}-${media.metadata.filename}`;
+      const uploadResult = await this.storageProvider.upload(
+        encryptedMediaData,
+        filename,
+        media.metadata.mimeType
+      );
+      encryptedMedia.storage = this.storageProvider.name;
+      encryptedMedia.storageKey = uploadResult.storageKey;
+      encryptedMedia.url = uploadResult.url;
+      encryptedMedia.data = void 0;
+    }
     return {
       id: generateUUID(),
       senderId,
@@ -187,7 +279,29 @@ var ChatSession = class {
     if (!this.sharedSecret) {
       throw new Error("Failed to initialize session");
     }
-    return decryptMessage(message.ciphertext, message.iv, this.sharedSecret);
+    try {
+      return decryptMessage(message.ciphertext, message.iv, this.sharedSecret);
+    } catch (error) {
+      const legacySecret = this.deriveLegacySecret(user);
+      try {
+        return decryptMessage(message.ciphertext, message.iv, legacySecret);
+      } catch (innerError) {
+        throw error;
+      }
+    }
+  }
+  deriveLegacySecret(user) {
+    const otherUser = user.id === this.userA.id ? this.userB : this.userA;
+    logger.debug(`[ChatSession] Deriving legacy secret for user ${user.id}`, {
+      hasPriv: !!user.privateKey,
+      privType: typeof user.privateKey,
+      remotePubType: typeof otherUser.publicKey
+    });
+    const localKeyPair = {
+      publicKey: user.publicKey,
+      privateKey: user.privateKey
+    };
+    return deriveLegacySharedSecret(localKeyPair, otherUser.publicKey);
   }
   /**
    * Decrypt a media message in this session
@@ -203,11 +317,32 @@ var ChatSession = class {
       throw new Error("Failed to initialize session");
     }
     const text = decryptMessage(message.ciphertext, message.iv, this.sharedSecret);
-    const decryptedMediaData = decryptMessage(
-      message.media.data,
-      message.iv,
-      this.sharedSecret
-    );
+    let encryptedMediaData = message.media.data;
+    if (!encryptedMediaData && message.media.storageKey && this.storageProvider) {
+      encryptedMediaData = await this.storageProvider.download(message.media.storageKey);
+    }
+    if (!message.media.iv && !encryptedMediaData) {
+      throw new Error("Media data or IV missing");
+    }
+    let decryptedMediaData;
+    try {
+      decryptedMediaData = decryptMessage(
+        encryptedMediaData || "",
+        message.media.iv || message.iv,
+        this.sharedSecret
+      );
+    } catch (error) {
+      const legacySecret = this.deriveLegacySecret(user);
+      try {
+        decryptedMediaData = decryptMessage(
+          encryptedMediaData || "",
+          message.media.iv || message.iv,
+          legacySecret
+        );
+      } catch (innerError) {
+        throw error;
+      }
+    }
     const decryptedMedia = {
       ...message.media,
       data: decryptedMediaData
@@ -231,8 +366,9 @@ function deriveGroupKey(groupId) {
 
 // src/chat/GroupSession.ts
 var GroupSession = class {
-  constructor(group) {
+  constructor(group, storageProvider) {
     this.group = group;
+    this.storageProvider = storageProvider;
   }
   groupKey = null;
   /**
@@ -274,14 +410,27 @@ var GroupSession = class {
       throw new Error("Failed to initialize group session");
     }
     const { ciphertext, iv } = encryptMessage(plaintext, this.groupKey);
-    const { ciphertext: encryptedMediaData } = encryptMessage(
-      media.data,
+    const { ciphertext: encryptedMediaData, iv: mediaIv } = encryptMessage(
+      media.data || "",
       this.groupKey
     );
     const encryptedMedia = {
       ...media,
-      data: encryptedMediaData
+      data: encryptedMediaData,
+      iv: mediaIv
     };
+    if (this.storageProvider) {
+      const filename = `groups/${this.group.id}/${generateUUID()}-${media.metadata.filename}`;
+      const uploadResult = await this.storageProvider.upload(
+        encryptedMediaData,
+        filename,
+        media.metadata.mimeType
+      );
+      encryptedMedia.storage = this.storageProvider.name;
+      encryptedMedia.storageKey = uploadResult.storageKey;
+      encryptedMedia.url = uploadResult.url;
+      encryptedMedia.data = void 0;
+    }
     return {
       id: generateUUID(),
       senderId,
@@ -319,9 +468,17 @@ var GroupSession = class {
       throw new Error("Failed to initialize group session");
     }
     const text = decryptMessage(message.ciphertext, message.iv, this.groupKey);
+    let encryptedMediaData = message.media.data;
+    if (!encryptedMediaData && message.media.storageKey && this.storageProvider) {
+      encryptedMediaData = await this.storageProvider.download(message.media.storageKey);
+    }
+    if (!message.media.iv && !encryptedMediaData) {
+      throw new Error("Media data or IV missing");
+    }
     const decryptedMediaData = decryptMessage(
-      message.media.data,
-      message.iv,
+      encryptedMediaData || "",
+      message.media.iv || message.iv,
+      // Fallback to message IV for backward compatibility
       this.groupKey
     );
     const decryptedMedia = {
@@ -332,71 +489,6 @@ var GroupSession = class {
   }
 };
 
-// src/utils/logger.ts
-var LogLevel = /* @__PURE__ */ ((LogLevel3) => {
-  LogLevel3[LogLevel3["DEBUG"] = 0] = "DEBUG";
-  LogLevel3[LogLevel3["INFO"] = 1] = "INFO";
-  LogLevel3[LogLevel3["WARN"] = 2] = "WARN";
-  LogLevel3[LogLevel3["ERROR"] = 3] = "ERROR";
-  LogLevel3[LogLevel3["NONE"] = 4] = "NONE";
-  return LogLevel3;
-})(LogLevel || {});
-var Logger = class {
-  config;
-  constructor(config = {}) {
-    this.config = {
-      level: config.level ?? 1 /* INFO */,
-      prefix: config.prefix ?? "[ChatSDK]",
-      timestamp: config.timestamp ?? true
-    };
-  }
-  shouldLog(level) {
-    return level >= this.config.level;
-  }
-  formatMessage(level, message, data) {
-    const parts = [];
-    if (this.config.timestamp) {
-      parts.push((/* @__PURE__ */ new Date()).toISOString());
-    }
-    parts.push(this.config.prefix);
-    parts.push(`[${level}]`);
-    parts.push(message);
-    let formatted = parts.join(" ");
-    if (data !== void 0) {
-      formatted += " " + JSON.stringify(data, null, 2);
-    }
-    return formatted;
-  }
-  debug(message, data) {
-    if (this.shouldLog(0 /* DEBUG */)) {
-      console.debug(this.formatMessage("DEBUG", message, data));
-    }
-  }
-  info(message, data) {
-    if (this.shouldLog(1 /* INFO */)) {
-      console.info(this.formatMessage("INFO", message, data));
-    }
-  }
-  warn(message, data) {
-    if (this.shouldLog(2 /* WARN */)) {
-      console.warn(this.formatMessage("WARN", message, data));
-    }
-  }
-  error(message, error) {
-    if (this.shouldLog(3 /* ERROR */)) {
-      const errorData = error instanceof Error ? { message: error.message, stack: error.stack } : error;
-      console.error(this.formatMessage("ERROR", message, errorData));
-    }
-  }
-  setLevel(level) {
-    this.config.level = level;
-  }
-  getLevel() {
-    return this.config.level;
-  }
-};
-var logger = new Logger();
-
 // src/utils/errors.ts
 var SDKError = class extends Error {
   constructor(message, code, retryable = false, details) {
@@ -719,6 +811,9 @@ var InMemoryMessageStore = class {
     this.messages.push(message);
     return message;
   }
+  async findById(id) {
+    return this.messages.find((msg) => msg.id === id);
+  }
   async listByUser(userId) {
     return this.messages.filter(
       (msg) => msg.senderId === userId || msg.receiverId === userId
@@ -727,6 +822,9 @@ var InMemoryMessageStore = class {
   async listByGroup(groupId) {
     return this.messages.filter((msg) => msg.groupId === groupId);
   }
+  async delete(id) {
+    this.messages = this.messages.filter((msg) => msg.id !== id);
+  }
 };
 
 // src/stores/memory/groupStore.ts
@@ -767,7 +865,7 @@ var InMemoryTransport = class {
     if (this.stateHandler) {
       this.stateHandler(this.connectionState);
     }
-    await new Promise((resolve) => setTimeout(resolve, 100));
+    await new Promise((resolve2) => setTimeout(resolve2, 100));
     this.connectionState = "connected" /* CONNECTED */;
     if (this.stateHandler) {
       this.stateHandler(this.connectionState);
@@ -837,7 +935,7 @@ var WebSocketClient = class {
     }
     this.updateState("connecting" /* CONNECTING */);
     logger.info("Connecting to WebSocket", { url: this.url, userId: this.currentUserId });
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       try {
         const wsUrl = this.currentUserId ? `${this.url}?userId=${this.currentUserId}` : this.url;
         this.ws = new WebSocket(wsUrl);
@@ -855,7 +953,7 @@ var WebSocketClient = class {
           this.updateState("connected" /* CONNECTED */);
           logger.info("WebSocket connected");
           this.startHeartbeat();
-          resolve();
+          resolve2();
         };
         this.ws.onmessage = (event) => {
           try {
@@ -1070,7 +1168,7 @@ var FILE_SIZE_LIMITS = {
 
 // src/utils/mediaUtils.ts
 async function encodeFileToBase64(file) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     const reader = new FileReader();
     reader.onload = () => {
       const result = reader.result;
@@ -1083,7 +1181,7 @@ async function encodeFileToBase64(file) {
         reject(new Error("Failed to extract base64 data"));
         return;
       }
-      resolve(base64);
+      resolve2(base64);
     };
     reader.onerror = () => reject(new Error("Failed to read file"));
     reader.readAsDataURL(file);
@@ -1145,12 +1243,12 @@ async function createMediaMetadata(file, filename) {
   return metadata;
 }
 function getImageDimensions(file) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     const img = new Image();
     const url = URL.createObjectURL(file);
     img.onload = () => {
       URL.revokeObjectURL(url);
-      resolve({ width: img.width, height: img.height });
+      resolve2({ width: img.width, height: img.height });
     };
     img.onerror = () => {
       URL.revokeObjectURL(url);
@@ -1160,7 +1258,7 @@ function getImageDimensions(file) {
   });
 }
 async function generateThumbnail(file) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     const img = new Image();
     const url = URL.createObjectURL(file);
     img.onload = () => {
@@ -1194,7 +1292,7 @@ async function generateThumbnail(file) {
         reject(new Error("Failed to generate thumbnail"));
         return;
       }
-      resolve(thumbnail);
+      resolve2(thumbnail);
     };
     img.onerror = () => {
       URL.revokeObjectURL(url);
@@ -1220,6 +1318,102 @@ function formatFileSize(bytes) {
   return `${(bytes / 1024 / 1024).toFixed(1)} MB`;
 }
 
+// src/storage/localStorage.ts
+import { promises as fs } from "fs";
+import * as path from "path";
+var LocalStorageProvider = class {
+  name = "local";
+  storageDir;
+  constructor(storageDir = "./storage") {
+    this.storageDir = path.resolve(storageDir);
+    fs.mkdir(this.storageDir, { recursive: true }).catch(() => {
+    });
+  }
+  async upload(data, filename, mimeType) {
+    const buffer = typeof data === "string" ? Buffer.from(data, "base64") : data;
+    const filePath = path.join(this.storageDir, filename);
+    await fs.mkdir(path.dirname(filePath), { recursive: true });
+    await fs.writeFile(filePath, buffer);
+    return {
+      storageKey: filename,
+      url: `file://${filePath}`
+    };
+  }
+  async download(storageKey) {
+    const filePath = path.join(this.storageDir, storageKey);
+    const buffer = await fs.readFile(filePath);
+    return buffer.toString("base64");
+  }
+  async delete(storageKey) {
+    const filePath = path.join(this.storageDir, storageKey);
+    try {
+      await fs.unlink(filePath);
+    } catch (error) {
+      if (error.code !== "ENOENT") {
+        throw error;
+      }
+    }
+  }
+};
+
+// src/storage/s3Storage.ts
+import { S3Client, PutObjectCommand, GetObjectCommand, DeleteObjectCommand } from "@aws-sdk/client-s3";
+var S3StorageProvider = class {
+  name = "s3";
+  client;
+  bucket;
+  constructor(config) {
+    const s3Config = {
+      region: config.region,
+      forcePathStyle: config.forcePathStyle
+    };
+    if (config.credentials) {
+      s3Config.credentials = config.credentials;
+    }
+    if (config.endpoint) {
+      s3Config.endpoint = config.endpoint;
+    }
+    this.client = new S3Client(s3Config);
+    this.bucket = config.bucket;
+  }
+  async upload(data, filename, mimeType) {
+    const body = typeof data === "string" ? Buffer.from(data, "base64") : data;
+    await this.client.send(
+      new PutObjectCommand({
+        Bucket: this.bucket,
+        Key: filename,
+        Body: body,
+        ContentType: mimeType
+      })
+    );
+    return {
+      storageKey: filename,
+      url: `https://${this.bucket}.s3.amazonaws.com/${filename}`
+    };
+  }
+  async download(storageKey) {
+    const response = await this.client.send(
+      new GetObjectCommand({
+        Bucket: this.bucket,
+        Key: storageKey
+      })
+    );
+    if (!response.Body) {
+      throw new Error("S3 download failed: empty body");
+    }
+    const bytes = await response.Body.transformToByteArray();
+    return Buffer.from(bytes).toString("base64");
+  }
+  async delete(storageKey) {
+    await this.client.send(
+      new DeleteObjectCommand({
+        Bucket: this.bucket,
+        Key: storageKey
+      })
+    );
+  }
+};
+
 // src/index.ts
 var ChatSDK = class extends EventEmitter {
   config;
@@ -1363,7 +1557,7 @@ var ChatSDK = class extends EventEmitter {
     const ids = [userA.id, userB.id].sort();
     const sessionId = `${ids[0]}-${ids[1]}`;
     try {
-      const session = new ChatSession(sessionId, userA, userB);
+      const session = new ChatSession(sessionId, userA, userB, this.config.storageProvider);
       await session.initialize();
       logger.info("Chat session created", { sessionId, users: [userA.id, userB.id] });
       this.emit(EVENTS.SESSION_CREATED, session);
@@ -1392,7 +1586,7 @@ var ChatSDK = class extends EventEmitter {
     };
     try {
       await this.config.groupStore.create(group);
-      const session = new GroupSession(group);
+      const session = new GroupSession(group, this.config.storageProvider);
       await session.initialize();
       logger.info("Group created", { groupId: group.id, name: group.name, memberCount: members.length });
       this.emit(EVENTS.GROUP_CREATED, session);
@@ -1417,7 +1611,7 @@ var ChatSDK = class extends EventEmitter {
       if (!group) {
         throw new SessionError(`Group not found: ${id}`, { groupId: id });
       }
-      const session = new GroupSession(group);
+      const session = new GroupSession(group, this.config.storageProvider);
       await session.initialize();
       logger.debug("Group loaded", { groupId: id });
       return session;
@@ -1549,7 +1743,7 @@ var ChatSDK = class extends EventEmitter {
         }
         const ids = [user.id, otherUser.id].sort();
         const sessionId = `${ids[0]}-${ids[1]}`;
-        const session = new ChatSession(sessionId, user, otherUser);
+        const session = new ChatSession(sessionId, user, otherUser, this.config.storageProvider);
         await session.initializeForUser(user);
         return await session.decrypt(message, user);
       }
@@ -1573,7 +1767,7 @@ var ChatSDK = class extends EventEmitter {
         if (!group) {
           throw new SessionError(`Group not found: ${message.groupId}`, { groupId: message.groupId });
         }
-        const session = new GroupSession(group);
+        const session = new GroupSession(group, this.config.storageProvider);
         await session.initialize();
         return await session.decryptMedia(message);
       } else {
@@ -1587,7 +1781,7 @@ var ChatSDK = class extends EventEmitter {
         }
         const ids = [user.id, otherUser.id].sort();
         const sessionId = `${ids[0]}-${ids[1]}`;
-        const session = new ChatSession(sessionId, user, otherUser);
+        const session = new ChatSession(sessionId, user, otherUser, this.config.storageProvider);
         await session.initializeForUser(user);
         return await session.decryptMedia(message, user);
       }
@@ -1759,6 +1953,7 @@ export {
   InMemoryTransport,
   InMemoryUserStore,
   KEY_LENGTH3 as KEY_LENGTH,
+  LocalStorageProvider,
   LogLevel,
   Logger,
   MAX_QUEUE_SIZE,
@@ -1772,6 +1967,7 @@ export {
   RECONNECT_BASE_DELAY,
   RECONNECT_MAX_ATTEMPTS,
   RECONNECT_MAX_DELAY,
+  S3StorageProvider,
   SALT_LENGTH2 as SALT_LENGTH,
   SDKError,
   SUPPORTED_CURVE2 as SUPPORTED_CURVE,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatly-sdk",
-  "version": "0.0.8",
+  "version": "2.0.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,6 +30,7 @@
   "license": "MIT",
   "description": "Production-ready end-to-end encrypted chat SDK with WhatsApp-style features",
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.958.0",
     "buffer": "^6.0.3",
     "events": "^3.3.0"
   },