wechat-to-anything 0.5.4 → 0.5.6

package/cli/cdn.mjs

@@ -72,7 +72,109 @@ export async function downloadMediaToFile(encryptQueryParam, aesKeyBase64, ext =
   return { filePath, buffer: buf };
 }
 
-// ─── 上传 ───────────────────────────────────────────────────────────
+// ─── 图片上传（含缩略图，HD 质量）─────────────────────────────────
+
+/**
+ * 上传图片到 CDN，同时生成并上传缩略图（微信需要缩略图才显示高清）
+ * @returns {{ downloadParam, thumbDownloadParam, aeskey, fileSize, fileSizeCiphertext }}
+ */
+export async function uploadImageWithThumb(filePath, toUserId, token) {
+  const { buildHeaders, BASE_URL } = await import("./weixin.mjs");
+  const { execSync } = await import("child_process");
+
+  const plaintext = await readFile(filePath);
+  const rawsize = plaintext.length;
+  const rawfilemd5 = createHash("md5").update(plaintext).digest("hex");
+  const filesize = aesEcbPaddedSize(rawsize);
+  const filekey = randomBytes(16).toString("hex");
+  const aeskey = randomBytes(16);
+
+  // 生成缩略图
+  const thumbPath = `/tmp/wxta_thumb_${Date.now()}.jpg`;
+  try {
+    execSync(`sips --resampleWidth 120 "${filePath}" --out "${thumbPath}" 2>/dev/null`);
+  } catch {
+    // sips 失败时用原图当缩略图
+    await writeFile(thumbPath, plaintext);
+  }
+  const thumb = await readFile(thumbPath);
+
+  // 获取缩略图尺寸
+  let thumbWidth = 120, thumbHeight = 120;
+  try {
+    const sipsOut = execSync(`sips -g pixelWidth -g pixelHeight "${thumbPath}" 2>/dev/null`).toString();
+    const wm = sipsOut.match(/pixelWidth:\s*(\d+)/);
+    const hm = sipsOut.match(/pixelHeight:\s*(\d+)/);
+    if (wm) thumbWidth = parseInt(wm[1]);
+    if (hm) thumbHeight = parseInt(hm[1]);
+  } catch {}
+
+  // 1. getUploadUrl（带缩略图信息）
+  const uploadBody = JSON.stringify({
+    filekey,
+    media_type: 1, // IMAGE
+    to_user_id: toUserId,
+    rawsize,
+    rawfilemd5,
+    filesize,
+    thumb_rawsize: thumb.length,
+    thumb_rawfilemd5: createHash("md5").update(thumb).digest("hex"),
+    thumb_filesize: aesEcbPaddedSize(thumb.length),
+    no_need_thumb: false,
+    aeskey: aeskey.toString("hex"),
+    base_info: {},
+  });
+
+  const uploadRes = await fetch(`${BASE_URL}/ilink/bot/getuploadurl`, {
+    method: "POST",
+    headers: buildHeaders(token, uploadBody),
+    body: uploadBody,
+  });
+  if (!uploadRes.ok) throw new Error(`getUploadUrl failed: ${uploadRes.status}`);
+  const uploadJson = await uploadRes.json();
+  if (!uploadJson.upload_param) throw new Error(`getUploadUrl: no upload_param`);
+
+  // 2. 上传原图
+  const origCipher = encryptAesEcb(plaintext, aeskey);
+  const origUrl = `${CDN_BASE_URL}/upload?encrypted_query_param=${encodeURIComponent(uploadJson.upload_param)}&filekey=${encodeURIComponent(filekey)}`;
+  const origRes = await fetch(origUrl, {
+    method: "POST",
+    headers: { "Content-Type": "application/octet-stream" },
+    body: new Uint8Array(origCipher),
+  });
+  if (origRes.status !== 200) throw new Error(`CDN upload orig failed: ${origRes.status}`);
+  const downloadParam = origRes.headers.get("x-encrypted-query-param") || origRes.headers.get("x-encrypted-param");
+  if (!downloadParam) throw new Error("CDN upload: missing download param");
+
+  // 3. 上传缩略图
+  let thumbDownloadParam = null;
+  if (uploadJson.thumb_upload_param) {
+    const thumbCipher = encryptAesEcb(thumb, aeskey);
+    const thumbUrl = `${CDN_BASE_URL}/upload?encrypted_query_param=${encodeURIComponent(uploadJson.thumb_upload_param)}&filekey=${encodeURIComponent(filekey)}`;
+    const thumbRes = await fetch(thumbUrl, {
+      method: "POST",
+      headers: { "Content-Type": "application/octet-stream" },
+      body: new Uint8Array(thumbCipher),
+    });
+    if (thumbRes.status === 200) {
+      thumbDownloadParam = thumbRes.headers.get("x-encrypted-query-param") || thumbRes.headers.get("x-encrypted-param");
+    }
+  }
+
+  return {
+    downloadParam,
+    thumbDownloadParam,
+    aeskey: aeskey.toString("hex"),
+    fileSize: rawsize,
+    fileSizeCiphertext: filesize,
+    thumbSizeCiphertext: aesEcbPaddedSize(thumb.length),
+    thumbWidth,
+    thumbHeight,
+    filekey,
+  };
+}
+
+// ─── 通用上传 ───────────────────────────────────────────────────────
 
 /**
  * 上传文件到微信 CDN

package/cli/weixin.mjs

@@ -187,29 +187,53 @@ export async function sendMessage(token, to, text, contextToken) {
 }
 
 /**
- * 发送图片消息（下载 → CDN 上传 → 发送）
+ * 发送图片消息（下载 → 生成缩略图 → CDN 上传原图+缩略图 → 发送 HD）
  */
 export async function sendImageByUrl(token, to, contextToken, imageUrl) {
-  const { writeFile: wf } = await import("node:fs/promises");
+  const { writeFile: wf, readFile: rf } = await import("node:fs/promises");
 
   // 获取图片数据
-  let buf;
-  if (imageUrl.startsWith("data:")) {
-    const b64 = imageUrl.split(",")[1];
-    buf = Buffer.from(b64, "base64");
+  let tmpPath;
+  if (imageUrl.startsWith("/")) {
+    // 本地文件路径，直接使用
+    tmpPath = imageUrl;
   } else {
-    const resp = await fetch(imageUrl);
-    if (!resp.ok) throw new Error(`图片下载失败: ${resp.status}`);
-    buf = Buffer.from(await resp.arrayBuffer());
+    let buf;
+    if (imageUrl.startsWith("data:")) {
+      const b64 = imageUrl.split(",")[1];
+      buf = Buffer.from(b64, "base64");
+    } else {
+      const resp = await fetch(imageUrl);
+      if (!resp.ok) throw new Error(`图片下载失败: ${resp.status}`);
+      buf = Buffer.from(await resp.arrayBuffer());
+    }
+    tmpPath = "/tmp/wxta_image_send.jpg";
+    await wf(tmpPath, buf);
   }
-  const tmpPath = "/tmp/wxta_image_send.jpg";
-  await wf(tmpPath, buf);
 
-  // CDN 上传 (mediaType=1 = IMAGE)
-  const { uploadToCdn } = await import("./cdn.mjs");
-  const cdn = await uploadToCdn(tmpPath, to, token, 1);
+  // CDN 上传（含缩略图，确保高清显示）
+  const { uploadImageWithThumb } = await import("./cdn.mjs");
+  const cdn = await uploadImageWithThumb(tmpPath, to, token);
   const aesKeyB64 = Buffer.from(cdn.aeskey).toString("base64");
 
+  // 构造 image_item
+  const imageItem = {
+    media: {
+      encrypt_query_param: cdn.downloadParam,
+      aes_key: aesKeyB64,
+    },
+    mid_size: cdn.fileSizeCiphertext,
+  };
+  if (cdn.thumbDownloadParam) {
+    imageItem.thumb_media = {
+      encrypt_query_param: cdn.thumbDownloadParam,
+      aes_key: aesKeyB64,
+    };
+    imageItem.thumb_size = cdn.thumbSizeCiphertext;
+    imageItem.thumb_width = cdn.thumbWidth;
+    imageItem.thumb_height = cdn.thumbHeight;
+  }
+
   // 发送
   await apiPost(
     "ilink/bot/sendmessage",
@@ -220,15 +244,7 @@ export async function sendImageByUrl(token, to, contextToken, imageUrl) {
         client_id: crypto.randomUUID(),
         message_type: 2,
         message_state: 2,
-        item_list: [{
-          type: 2, // IMAGE
-          image_item: {
-            media: {
-              encrypt_query_param: cdn.downloadParam,
-              aes_key: aesKeyB64,
-            },
-          },
-        }],
+        item_list: [{ type: 2, image_item: imageItem }],
         context_token: contextToken,
       },
       base_info: {},

package/examples/image-test.mjs

@@ -7,7 +7,7 @@ const token = creds.token;
 const to = creds.userId;
 
 // 测试图片 URL（可替换为任意图片地址）
-const imageUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/4/47/PNG_transparency_demonstration_1.png/280px-PNG_transparency_demonstration_1.png";
+const imageUrl = "https://upload.wikimedia.org/wikipedia/commons/4/47/PNG_transparency_demonstration_1.png";
 
 // 获取 contextToken
 const { getUpdates, buildHeaders, BASE_URL } = await import("../cli/weixin.mjs");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechat-to-anything",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "一条命令，把微信变成任何 AI Agent 的入口",
   "type": "module",
   "bin": {