@ih8e/express-cli 0.1.5 → 0.1.6

package/README.md

@@ -12,7 +12,7 @@
 
 ## Требования
 
-- **Node.js ≥ 22** (используется глобальный `WebSocket`).
+- **Node.js ≥ 20**.
 - Аккаунт eXpress и мобильное приложение для входа по QR.
 
 ## Установка

package/dist/index.js

@@ -26748,8 +26748,9 @@ var ApiClient = class {
           const retryRes = await fetch(url, { ...options, headers: newHeaders });
           return this.handleResponse(retryRes);
         }
+        throw new Error("Token expired and refresh failed. Please re-authenticate with `express auth qr`.");
       }
-      throw new Error("Token expired and refresh failed. Please re-authenticate with `express auth qr`.");
+      throw new Error(`API error 401: ${res.statusText}${text ? ` \u2014 ${text.slice(0, 200)}` : ""}`);
     }
     return this.handleResponse(res);
   }
@@ -27725,50 +27726,99 @@ function createChatsCommand() {
 init_esm_shims();
 import { Command as Command8 } from "commander";
 
-// src/api/messaging.ts
+// src/api/messaging-ws.ts
+init_esm_shims();
+import WebSocket2 from "ws";
+import { randomBytes as randomBytes3, randomUUID as randomUUID4, createHash } from "crypto";
+import { readFile } from "fs/promises";
+import { basename } from "path";
+import nacl4 from "tweetnacl";
+import sodium2 from "libsodium-wrappers-sumo";
+import sharp from "sharp";
+
+// src/api/file-service.ts
 init_esm_shims();
-var MessagingApi = class {
+var UPLOAD_PART_SIZE = 6291507;
+var IMAGE_MIME_TYPES = {
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif",
+  ".webp": "image/webp"
+};
+function detectImageMimeType(fileName) {
+  const ext = fileName.includes(".") ? "." + fileName.split(".").pop().toLowerCase() : "";
+  return IMAGE_MIME_TYPES[ext] ?? null;
+}
+var FileServiceApi = class {
   constructor(client) {
     this.client = client;
   }
   client;
-  async sendMessage(params) {
-    const payload = {
-      group_chat_id: params.groupChatId,
-      notification: {
-        status: "ok",
-        body: params.body,
-        ...params.metadata && { metadata: params.metadata },
-        ...params.mentions && { mentions: params.mentions },
-        ...params.stealthMode && {
-          opts: { stealth_mode: true }
-        }
-      }
-    };
-    return this.client.post("/api/v4/botx/notifications/direct", payload);
-  }
-  async sendFile(params) {
-    const payload = {
-      group_chat_id: params.groupChatId,
-      notification: {
-        status: "ok",
-        body: params.caption ?? ""
+  /** Uploads an already-encrypted content blob plus an already-encrypted JPEG preview via the resumable protocol. */
+  async uploadWithPreview(init, content, preview) {
+    const resumableId = await this.initUpload(
+      init,
+      `content=${content.length};preview=${preview.data.length},${preview.mimeType}`
+    );
+    await this.uploadPart(resumableId, "content", content);
+    const finalRes = await this.uploadPart(resumableId, "preview", preview.data);
+    const body = await finalRes.json();
+    return body.result;
+  }
+  async initUpload(init, shapes) {
+    const res = await this.client.rawRequest("/api/v2/file_service/resumable", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "upload-part-size": String(UPLOAD_PART_SIZE),
+        "upload-shapes": shapes
       },
-      file: {
-        file_name: params.fileName,
-        data: params.fileData
-      }
-    };
-    return this.client.post("/api/v4/botx/notifications/direct", payload);
+      body: JSON.stringify(init)
+    });
+    if (!res.ok) {
+      throw new Error(`file upload init failed: ${res.status} ${await res.text()}`);
+    }
+    const resumableId = res.headers.get("upload-resumable-id");
+    if (!resumableId) throw new Error("file upload init: missing upload-resumable-id header");
+    return resumableId;
+  }
+  async uploadPart(resumableId, shape, data) {
+    const res = await this.client.rawRequest(`/api/v2/file_service/resumable/${resumableId}`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/octet-stream",
+        "upload-shape": shape,
+        "upload-part-size": String(UPLOAD_PART_SIZE),
+        "upload-range": `bytes=0-${data.length - 1}`
+      },
+      body: data
+    });
+    if (!res.ok) {
+      throw new Error(`file upload part (${shape}) failed: ${res.status} ${await res.text()}`);
+    }
+    return res;
   }
 };
 
-// src/api/messaging-ws.ts
+// src/api/file-crypto.ts
 init_esm_shims();
-import WebSocket2 from "ws";
-import { randomBytes as randomBytes3, randomUUID as randomUUID4 } from "crypto";
-import nacl4 from "tweetnacl";
 import sodium from "libsodium-wrappers-sumo";
+var FILE_CHUNK_SIZE = 2097152;
+async function encryptFileStream(data, key) {
+  await sodium.ready;
+  const { state, header } = sodium.crypto_secretstream_xchacha20poly1305_init_push(key);
+  const parts = [header];
+  for (let offset = 0; offset < data.length; offset += FILE_CHUNK_SIZE) {
+    const chunk = data.subarray(offset, offset + FILE_CHUNK_SIZE);
+    const isLast = offset + FILE_CHUNK_SIZE >= data.length;
+    const tag = isLast ? sodium.crypto_secretstream_xchacha20poly1305_TAG_FINAL : sodium.crypto_secretstream_xchacha20poly1305_TAG_MESSAGE;
+    parts.push(sodium.crypto_secretstream_xchacha20poly1305_push(state, chunk, null, tag));
+  }
+  return Buffer.concat(parts);
+}
+
+// src/api/messaging-ws.ts
 init_store();
 function buildTextPayload(text, fromHuid, chatId) {
   return JSON.stringify({
@@ -27784,12 +27834,49 @@ function buildTextPayload(text, fromHuid, chatId) {
     body: text
   });
 }
+function buildImagePayload(params) {
+  return JSON.stringify({
+    type: "image",
+    msg_id: randomUUID4(),
+    from: params.fromHuid,
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    group_chat_id: params.chatId,
+    lat: 0,
+    lng: 0,
+    stealth_forwarding: false,
+    payload: {
+      file: params.contentPath,
+      file_name: params.fileName,
+      file_size: params.fileSize,
+      file_hash: params.fileHash,
+      file_mime_type: params.mimeType,
+      chunk_size: FILE_CHUNK_SIZE,
+      file_encryption_algo: "stream",
+      file_preview: params.previewPath,
+      file_preview_width: params.previewWidth,
+      file_preview_height: params.previewHeight,
+      blur_preview_file: params.blurPreviewDataUri,
+      file_id: params.fileId
+    },
+    body: params.caption
+  });
+}
 function payloadAad(chatId, syncId) {
   return new Uint8Array(Buffer.from(`${chatId}:${syncId}`));
 }
+function wrapKeyForRecipients(symmetricKey, publicKeys, ctsKey) {
+  return publicKeys.map((kdcKey) => {
+    const recipientPubKey = new Uint8Array(Buffer.from(kdcKey.body, "base64"));
+    const nonce = randomBytes3(nacl4.box.nonceLength);
+    const ciphertext = nacl4.box(symmetricKey, nonce, recipientPubKey, ctsKey.privateKey);
+    if (!ciphertext) throw new Error(`Failed to encrypt key for ${kdcKey.id}`);
+    const combined = Buffer.concat([nonce, Buffer.from(ciphertext)]);
+    return { key_id: kdcKey.id, key: combined.toString("base64"), algo: "xsalsa20:xchacha20_aead_ietf" };
+  });
+}
 async function sendMessageViaWebSocket(params) {
   const { client, chatId, body, timeoutMs = 2e4 } = params;
-  await sodium.ready;
+  await sodium2.ready;
   const apigwKeys = loadApigwKeys();
   if (!apigwKeys) throw new Error("No apigw keys. Run 'express auth login' first.");
   const config = loadConfig();
@@ -27805,27 +27892,11 @@ async function sendMessageViaWebSocket(params) {
   const publicKeys = kdcKeys.filter((k) => k.kind === "cts");
   const symmetricKey = randomBytes3(32);
   const syncId = randomUUID4();
-  const encryptedKeys = publicKeys.map((kdcKey) => {
-    const recipientPubKey = new Uint8Array(Buffer.from(kdcKey.body, "base64"));
-    const nonce = randomBytes3(nacl4.box.nonceLength);
-    const ciphertext2 = nacl4.box(
-      symmetricKey,
-      nonce,
-      recipientPubKey,
-      ctsKey.privateKey
-    );
-    if (!ciphertext2) throw new Error(`Failed to encrypt key for ${kdcKey.id}`);
-    const combined = Buffer.concat([nonce, Buffer.from(ciphertext2)]);
-    return {
-      key_id: kdcKey.id,
-      key: combined.toString("base64"),
-      algo: "xsalsa20:xchacha20_aead_ietf"
-    };
-  });
+  const encryptedKeys = wrapKeyForRecipients(symmetricKey, publicKeys, ctsKey);
   const selfHuid = (await new UserApi(client).getSelfProfile()).user_huid;
   const plaintext = new Uint8Array(Buffer.from(buildTextPayload(body, selfHuid, chatId)));
-  const msgNonce = randomBytes3(sodium.crypto_aead_xchacha20poly1305_ietf_NPUBBYTES);
-  const ciphertext = sodium.crypto_aead_xchacha20poly1305_ietf_encrypt(
+  const msgNonce = randomBytes3(sodium2.crypto_aead_xchacha20poly1305_ietf_NPUBBYTES);
+  const ciphertext = sodium2.crypto_aead_xchacha20poly1305_ietf_encrypt(
     plaintext,
     payloadAad(chatId, syncId),
     null,
@@ -27856,6 +27927,114 @@ async function sendMessageViaWebSocket(params) {
     timeoutMs
   });
 }
+async function buildPreview(imageBytes) {
+  const data = await sharp(imageBytes).resize({ width: 300, height: 300, fit: "inside", withoutEnlargement: true }).jpeg({ quality: 90 }).toBuffer();
+  const blurData = data;
+  const { width, height } = await sharp(data).metadata();
+  return { data, width: width ?? 0, height: height ?? 0, blurData };
+}
+async function sendImageViaWebSocket(params) {
+  const { client, chatId, filePath, caption = "", timeoutMs = 3e4 } = params;
+  const fileName = basename(filePath);
+  const mimeType = detectImageMimeType(fileName);
+  if (!mimeType) {
+    throw new Error(
+      `Unsupported file type for '${fileName}'. Only images are currently supported: .png, .jpg, .jpeg, .gif, .webp`
+    );
+  }
+  await sodium2.ready;
+  const apigwKeys = loadApigwKeys();
+  if (!apigwKeys) throw new Error("No apigw keys. Run 'express auth login' first.");
+  const config = loadConfig();
+  const host = new URL(getBaseUrl(config)).hostname;
+  const webOrigin = getWebOrigin(config);
+  const ctsToken = getAuthToken();
+  const ctsKey = apigwKeys.ctsKey ?? apigwKeys.encryptionKey;
+  const encKeyId = ctsKey.keyId;
+  const participantKeyIds = await getChatKeyIds(host, webOrigin, ctsToken, encKeyId, chatId);
+  const kdcKeys = await client.get(
+    `/api/v1/kdc/keys/?ids=${participantKeyIds.join(",")}`
+  ) ?? [];
+  const publicKeys = kdcKeys.filter((k) => k.kind === "cts");
+  const originalBytes = await readFile(filePath);
+  const fileHash = createHash("sha256").update(originalBytes).digest("base64");
+  const preview = await buildPreview(originalBytes);
+  const blurPreviewDataUri = `data:image/jpeg;base64,${preview.blurData.toString("base64")}`;
+  const fileKey = randomBytes3(32);
+  const fileKeys = wrapKeyForRecipients(fileKey, publicKeys, ctsKey);
+  const syncId = randomUUID4();
+  const encryptedContent = await encryptFileStream(originalBytes, fileKey);
+  const encryptedPreview = await encryptFileStream(preview.data, fileKey);
+  const uploaded = await new FileServiceApi(client).uploadWithPreview(
+    {
+      subject: "groupchat_file",
+      subject_id: chatId,
+      visible: true,
+      file_name: fileName,
+      mime_type: mimeType,
+      meta: {
+        sync_id: syncId,
+        kind: "media",
+        chunk_size: FILE_CHUNK_SIZE,
+        file_encryption_algo: "stream",
+        sender_key_id: encKeyId,
+        keys: fileKeys,
+        file_hash: fileHash
+      }
+    },
+    encryptedContent,
+    { data: encryptedPreview, mimeType: "image/jpeg" }
+  );
+  const selfHuid = (await new UserApi(client).getSelfProfile()).user_huid;
+  const plaintext = new Uint8Array(Buffer.from(buildImagePayload({
+    fromHuid: selfHuid,
+    chatId,
+    caption,
+    fileName,
+    fileSize: originalBytes.length,
+    fileHash,
+    mimeType,
+    contentPath: uploaded.content,
+    previewPath: uploaded.content_shapes.preview ?? "",
+    previewWidth: preview.width,
+    previewHeight: preview.height,
+    blurPreviewDataUri,
+    fileId: uploaded.id
+  })));
+  const msgKey = randomBytes3(32);
+  const encryptedKeys = wrapKeyForRecipients(msgKey, publicKeys, ctsKey);
+  const msgNonce = randomBytes3(sodium2.crypto_aead_xchacha20poly1305_ietf_NPUBBYTES);
+  const ciphertext = sodium2.crypto_aead_xchacha20poly1305_ietf_encrypt(
+    plaintext,
+    payloadAad(chatId, syncId),
+    null,
+    new Uint8Array(msgNonce),
+    new Uint8Array(msgKey)
+  );
+  const encryptedPayload = Buffer.concat([msgNonce, Buffer.from(ciphertext)]).toString("base64");
+  const signingKey = apigwKeys.signingKey;
+  const signBytes = signEd25519(
+    signingKey.privateKey,
+    new Uint8Array(Buffer.from(encryptedPayload, "utf8"))
+  );
+  const signature = {
+    sign: Buffer.from(signBytes).toString("base64"),
+    sign_key_id: signingKey.keyId,
+    sign_algo: "ed25519"
+  };
+  return sendMessageNew({
+    host,
+    webOrigin,
+    ctsToken,
+    encKeyId,
+    chatId,
+    syncId,
+    encryptedKeys,
+    encryptedPayload,
+    signature,
+    timeoutMs
+  });
+}
 async function getChatKeyIds(host, webOrigin, ctsToken, encKeyId, chatId) {
   const wsUrl = `wss://${host}/socket/user/websocket?vsn=1.0.0&auto_join=true&key_id=${encKeyId}&version=6&background=false&voex_unencrypted=true&instance_id=${randomUUID4()}`;
   return new Promise((resolve, reject) => {
@@ -28024,7 +28203,6 @@ Be more specific.`);
 }
 
 // src/cli/send.ts
-import { readFileSync } from "fs";
 function createSendCommand() {
   const cmd = new Command8("send");
   cmd.description("Send messages and files");
@@ -28039,33 +28217,11 @@ function createSendCommand() {
       process.exit(1);
     }
   });
-  cmd.command("file <chat-id> <file-path>").description("Send a file to a chat").option("--caption <caption>", "File caption").option("--host <host>", "eXpress host").option("-o, --output <format>", "Output format", "json").action(async (chatId, filePath, opts) => {
+  cmd.command("file <chat-id-or-name> <file-path>").description("Send a file to a chat (chat ID or partial name). Currently images only: .png, .jpg, .jpeg, .gif, .webp").option("--caption <caption>", "File caption").option("--host <host>", "eXpress host").option("-o, --output <format>", "Output format", "json").action(async (chatIdOrName, filePath, opts) => {
     try {
-      const data = readFileSync(filePath);
-      const fileName = filePath.split("/").pop() ?? "file";
-      const mimeMap = {
-        ".png": "image/png",
-        ".jpg": "image/jpeg",
-        ".jpeg": "image/jpeg",
-        ".gif": "image/gif",
-        ".pdf": "application/pdf",
-        ".txt": "text/plain",
-        ".json": "application/json",
-        ".csv": "text/csv",
-        ".zip": "application/zip"
-      };
-      const ext = fileName.includes(".") ? "." + fileName.split(".").pop().toLowerCase() : "";
-      const mime = mimeMap[ext] ?? "application/octet-stream";
-      const base64 = data.toString("base64");
-      const dataUri = `data:${mime};base64,${base64}`;
       const client = new ApiClient(opts.host ? { host: opts.host } : void 0);
-      const api = new MessagingApi(client);
-      const result = await api.sendFile({
-        groupChatId: chatId,
-        fileName,
-        fileData: dataUri,
-        caption: opts.caption
-      });
+      const chatId = await resolveChatId(client, chatIdOrName);
+      const result = await sendImageViaWebSocket({ client, chatId, filePath, caption: opts.caption });
       console.log(formatOutput(result, opts.output));
     } catch (err) {
       console.error(`Error: ${err.message}`);
@@ -28191,7 +28347,7 @@ init_store();
 // src/api/decrypt.ts
 init_esm_shims();
 import nacl5 from "tweetnacl";
-import sodium2 from "libsodium-wrappers-sumo";
+import sodium3 from "libsodium-wrappers-sumo";
 function decryptMessage(msg, ctsPrivateKey, myKeyId, keyMap, apigwKeys) {
   const encKey = msg.key;
   if (encKey.key_id !== myKeyId) {
@@ -28205,10 +28361,10 @@ function decryptMessage(msg, ctsPrivateKey, myKeyId, keyMap, apigwKeys) {
   const symmetricKey = nacl5.box.open(ciphertext, nonce, senderPubKey, ctsPrivateKey);
   if (!symmetricKey) throw new Error("nacl.box.open failed \u2014 wrong key pair");
   const payloadRaw = Uint8Array.from(Buffer.from(msg.payload, "base64"));
-  const msgNonce = payloadRaw.slice(0, sodium2.crypto_aead_xchacha20poly1305_ietf_NPUBBYTES);
-  const msgCiphertext = payloadRaw.slice(sodium2.crypto_aead_xchacha20poly1305_ietf_NPUBBYTES);
+  const msgNonce = payloadRaw.slice(0, sodium3.crypto_aead_xchacha20poly1305_ietf_NPUBBYTES);
+  const msgCiphertext = payloadRaw.slice(sodium3.crypto_aead_xchacha20poly1305_ietf_NPUBBYTES);
   const aad = new Uint8Array(Buffer.from(`${msg.group_chat_id}:${msg.sync_id}`));
-  const plaintext = sodium2.crypto_aead_xchacha20poly1305_ietf_decrypt(null, msgCiphertext, aad, msgNonce, symmetricKey);
+  const plaintext = sodium3.crypto_aead_xchacha20poly1305_ietf_decrypt(null, msgCiphertext, aad, msgNonce, symmetricKey);
   return JSON.parse(new TextDecoder().decode(plaintext));
 }
 function toDecrypted(msg, payload) {
@@ -28239,7 +28395,7 @@ function getSenderPublicKey(msg, keyMap, apigwKeys) {
   return null;
 }
 async function decryptMessages(events, apigwKeys, client = new ApiClient()) {
-  await sodium2.ready;
+  await sodium3.ready;
   const ctsKey = apigwKeys.ctsKey ?? apigwKeys.encryptionKey;
   const messages = events.filter((e) => e.event_type === "message_new" && e.payload && e.key);
   if (messages.length === 0) return [];
@@ -38587,7 +38743,7 @@ init_esm_shims();
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z as z2 } from "zod";
-import { writeFileSync as writeFileSync3, readFileSync as readFileSync3, unlinkSync } from "fs";
+import { writeFileSync as writeFileSync3, readFileSync as readFileSync2, unlinkSync } from "fs";
 import { tmpdir } from "os";
 import { join } from "path";
 init_store();
@@ -38828,7 +38984,7 @@ Scan with the eXpress mobile app.
     if (!material || !poll) {
       let saved = null;
       try {
-        saved = JSON.parse(readFileSync3(QR_MATERIAL_FILE, "utf8"));
+        saved = JSON.parse(readFileSync2(QR_MATERIAL_FILE, "utf8"));
       } catch {
       }
       if (!saved) return ok("No pending QR session. Call auth_qr_start first.");
@@ -38885,7 +39041,7 @@ function createMcpCommand() {
 // src/cli/root.ts
 function createRootCommand() {
   const program2 = new Command15();
-  program2.name("express-cli").description("CLI client for eXpress Chat").version("0.1.5");
+  program2.name("express-cli").description("CLI client for eXpress Chat").version("0.1.6");
   program2.addCommand(createAuthCommand());
   program2.addCommand(createApiCommand());
   program2.addCommand(createConfigCommand());