@sovovs/bycli 2.1.47 → 2.1.48

package/cli-manifest.json

@@ -29044,6 +29044,62 @@
     "sourceFile": "weixin/create-draft.js",
     "navigateBefore": false
   },
+  {
+    "site": "weixin",
+    "name": "create-newspic",
+    "description": "通过微信公众号官方 API 创建贴图草稿（不会公开发布）",
+    "access": "write",
+    "example": "bycli weixin create-newspic --title \"相册标题\" --images \"./01.jpg,http://example.com/02.png\" --content \"说明文字\" --appid wx123 --appsecret secret",
+    "strategy": "local",
+    "browser": false,
+    "args": [
+      {
+        "name": "title",
+        "type": "str",
+        "required": true,
+        "help": "贴图标题（最长 32 字）"
+      },
+      {
+        "name": "images",
+        "type": "str",
+        "required": true,
+        "help": "1–20 张本地或 HTTP(S) 图片，使用逗号分隔"
+      },
+      {
+        "name": "content",
+        "type": "str",
+        "required": false,
+        "valueRequired": true,
+        "help": "可选的纯文本贴图说明"
+      },
+      {
+        "name": "appid",
+        "type": "str",
+        "required": true,
+        "help": "公众号 AppID"
+      },
+      {
+        "name": "appsecret",
+        "type": "str",
+        "required": true,
+        "help": "公众号 AppSecret；请勿提交到 shell 历史或日志"
+      },
+      {
+        "name": "allow-private-image-hosts",
+        "type": "boolean",
+        "default": false,
+        "required": false,
+        "help": "允许下载 localhost/内网 HTTP(S) 图片；云元数据地址始终禁止"
+      }
+    ],
+    "columns": [
+      "status",
+      "detail"
+    ],
+    "type": "js",
+    "modulePath": "weixin/create-newspic.js",
+    "sourceFile": "weixin/create-newspic.js"
+  },
   {
     "site": "weixin",
     "name": "download",

package/clis/weixin/_wechat/api-draft.js

@@ -12,7 +12,7 @@ function apiError(context, payload) {
   return new CommandExecutionError(`${context} failed (${code}): ${message}`);
 }
 
-async function readJsonResponse(response, context) {
+export async function readJsonResponse(response, context) {
   let payload;
   try {
     payload = await response.json();
@@ -24,7 +24,7 @@ async function readJsonResponse(response, context) {
   return payload;
 }
 
-async function getAccessToken(appid, appsecret, fetchImpl) {
+export async function getAccessToken(appid, appsecret, fetchImpl) {
   const url = new URL(`${API_BASE}/token`);
   url.searchParams.set('grant_type', 'client_credential');
   url.searchParams.set('appid', appid);
@@ -43,7 +43,7 @@ function mimeType(filePath) {
   return 'image/jpeg';
 }
 
-async function uploadImage(filePath, token, fetchImpl) {
+export async function uploadImage(filePath, token, fetchImpl) {
   const data = await nodeFs.readFile(filePath);
   const form = new FormData();
   form.append('media', new Blob([data], { type: mimeType(filePath) }), nodePath.basename(filePath));

package/clis/weixin/_wechat/api-newspic.js

@@ -0,0 +1,180 @@
+import * as nodePath from 'node:path';
+import { access, stat } from 'node:fs/promises';
+import { constants as fsConstants } from 'node:fs';
+import { ArgumentError, CommandExecutionError } from '@sovovs/bycli/errors';
+import { downloadRemoteImage } from './remote-image.js';
+import { getAccessToken, readJsonResponse, uploadImage } from './api-draft.js';
+
+const API_BASE = 'https://api.weixin.qq.com/cgi-bin';
+const MIN_IMAGES = 1;
+const MAX_IMAGES = 20;
+const SUPPORTED_IMAGE_EXTENSIONS = new Set(['.jpg', '.jpeg', '.png', '.gif', '.webp']);
+
+function isRemoteImageSource(source) {
+  return /^https?:\/\//iu.test(String(source || ''));
+}
+
+function validateImageCount(images) {
+  if (!Array.isArray(images) || images.length < MIN_IMAGES || images.length > MAX_IMAGES) {
+    throw new ArgumentError('newspic requires 1–20 images');
+  }
+}
+
+async function resolveLocalImage(source, baseDir) {
+  const imagePath = nodePath.resolve(baseDir, source);
+  if (!SUPPORTED_IMAGE_EXTENSIONS.has(nodePath.extname(imagePath).toLowerCase())) {
+    throw new ArgumentError(`newspic image must be a jpg, jpeg, png, gif, or webp file: ${source}`);
+  }
+  try {
+    await access(imagePath, fsConstants.R_OK);
+    const info = await stat(imagePath);
+    if (!info.isFile() || info.size <= 0) throw new Error('not a non-empty file');
+  } catch {
+    throw new ArgumentError(`newspic image must be a readable non-empty file: ${imagePath}`);
+  }
+  return imagePath;
+}
+
+export async function stageNewspicImages(images, {
+  baseDir = process.cwd(),
+  allowPrivateHosts = false,
+  fetchImpl = globalThis.fetch,
+  lookupImpl,
+  downloadImpl = downloadRemoteImage,
+} = {}) {
+  validateImageCount(images);
+  const downloads = [];
+  const paths = [];
+  let cleaned = false;
+  const cleanup = async () => {
+    if (cleaned) return;
+    cleaned = true;
+    const results = await Promise.allSettled(downloads.map(download => download.cleanup()));
+    const failure = results.find(result => result.status === 'rejected');
+    if (failure) {
+      throw new CommandExecutionError(`Failed to clean up a temporary Weixin image: ${failure.reason?.message ?? failure.reason}`);
+    }
+  };
+  try {
+    for (const rawSource of images) {
+      const source = String(rawSource ?? '').trim();
+      if (!source) throw new ArgumentError('newspic image source must not be empty');
+      if (isRemoteImageSource(source)) {
+        const downloaded = await downloadImpl(source, {
+          allowPrivateHosts,
+          fetchImpl,
+          ...(lookupImpl ? { lookupImpl } : {}),
+        });
+        downloads.push(downloaded);
+        paths.push(downloaded.path);
+      } else {
+        paths.push(await resolveLocalImage(source, baseDir));
+      }
+    }
+    return { paths, cleanup };
+  } catch (error) {
+    try {
+      await cleanup();
+    } catch (cleanupError) {
+      throw new CommandExecutionError(`${error?.message ?? error}; ${cleanupError.message}`);
+    }
+    throw error;
+  }
+}
+
+async function deleteMaterial(mediaId, token, fetchImpl) {
+  const url = new URL(`${API_BASE}/material/del_material`);
+  url.searchParams.set('access_token', token);
+  const response = await fetchImpl(url.toString(), {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json; charset=utf-8' },
+    body: JSON.stringify({ media_id: mediaId }),
+  });
+  await readJsonResponse(response, '删除图片素材');
+}
+
+export async function createNewspicDraftViaApi({
+  appid,
+  appsecret,
+  title,
+  content = '',
+  images,
+  baseDir = process.cwd(),
+  fetchImpl = globalThis.fetch,
+  imageFetchImpl = globalThis.fetch,
+  lookupImpl,
+  downloadImpl = downloadRemoteImage,
+  allowPrivateImageHosts = false,
+} = {}) {
+  if (!String(appid ?? '').trim() || !String(appsecret ?? '').trim()) {
+    throw new CommandExecutionError('newspic API requires both appid and appsecret');
+  }
+  if (typeof fetchImpl !== 'function') throw new CommandExecutionError('newspic API requires fetch support');
+  validateImageCount(images);
+
+  const staged = await stageNewspicImages(images, {
+    baseDir,
+    allowPrivateHosts: allowPrivateImageHosts,
+    fetchImpl: imageFetchImpl,
+    downloadImpl,
+    ...(lookupImpl ? { lookupImpl } : {}),
+  });
+  let token;
+  const imageMediaIds = [];
+  let draftResult;
+  try {
+    token = await getAccessToken(String(appid).trim(), String(appsecret).trim(), fetchImpl);
+    for (const imagePath of staged.paths) {
+      const uploaded = await uploadImage(imagePath, token, fetchImpl);
+      imageMediaIds.push(uploaded.media_id);
+    }
+
+    const url = new URL(`${API_BASE}/draft/add`);
+    url.searchParams.set('access_token', token);
+    const body = {
+      articles: [{
+        article_type: 'newspic',
+        title: String(title ?? ''),
+        content: String(content ?? ''),
+        need_open_comment: 0,
+        only_fans_can_comment: 0,
+        image_info: {
+          image_list: imageMediaIds.map(imageMediaId => ({ image_media_id: imageMediaId })),
+        },
+      }],
+    };
+    const response = await fetchImpl(url.toString(), {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json; charset=utf-8' },
+      body: JSON.stringify(body),
+    });
+    const payload = await readJsonResponse(response, '创建贴图草稿');
+    if (!payload.media_id) throw new CommandExecutionError('创建贴图草稿 failed: response did not contain media_id');
+    draftResult = { mediaId: payload.media_id, imageMediaIds };
+  } catch (error) {
+    const cleanupProblems = [];
+    if (token && imageMediaIds.length > 0) {
+      const results = await Promise.allSettled(imageMediaIds.map(mediaId => deleteMaterial(mediaId, token, fetchImpl)));
+      const failedMediaIds = imageMediaIds.filter((_mediaId, index) => results[index].status === 'rejected');
+      if (failedMediaIds.length > 0) {
+        cleanupProblems.push(`failed to delete permanent materials: ${failedMediaIds.join(', ')}`);
+      }
+    }
+    try {
+      await staged.cleanup();
+    } catch (cleanupError) {
+      cleanupProblems.push(cleanupError.message);
+    }
+    if (cleanupProblems.length > 0) {
+      throw new CommandExecutionError(`${error?.message ?? error}; cleanup incomplete: ${cleanupProblems.join('; ')}`);
+    }
+    throw error;
+  }
+
+  try {
+    await staged.cleanup();
+  } catch (cleanupError) {
+    return { ...draftResult, cleanupWarning: cleanupError.message };
+  }
+  return draftResult;
+}

package/clis/weixin/create-newspic.js

@@ -0,0 +1,61 @@
+import { cli, Strategy } from '@sovovs/bycli/registry';
+import { ArgumentError } from '@sovovs/bycli/errors';
+import { createNewspicDraftViaApi } from './_wechat/api-newspic.js';
+
+const MAX_TITLE_LENGTH = 32;
+
+function codePointLength(value) {
+  return [...value].length;
+}
+
+function requiredText(value, name) {
+  const text = String(value ?? '').trim();
+  if (!text) throw new ArgumentError(`${name} must not be empty`);
+  return text;
+}
+
+function parseImages(value) {
+  const images = requiredText(value, 'images').split(',').map(item => item.trim());
+  if (images.some(image => !image)) throw new ArgumentError('images must not contain empty entries');
+  if (images.length < 1 || images.length > 20) throw new ArgumentError('newspic requires 1–20 images');
+  return images;
+}
+
+export const createNewspicCommand = cli({
+  site: 'weixin',
+  name: 'create-newspic',
+  access: 'write',
+  description: '通过微信公众号官方 API 创建贴图草稿（不会公开发布）',
+  example: 'bycli weixin create-newspic --title "相册标题" --images "./01.jpg,http://example.com/02.png" --content "说明文字" --appid wx123 --appsecret secret',
+  strategy: Strategy.LOCAL,
+  browser: false,
+  args: [
+    { name: 'title', required: true, help: '贴图标题（最长 32 字）' },
+    { name: 'images', required: true, help: '1–20 张本地或 HTTP(S) 图片，使用逗号分隔' },
+    { name: 'content', valueRequired: true, help: '可选的纯文本贴图说明' },
+    { name: 'appid', required: true, help: '公众号 AppID' },
+    { name: 'appsecret', required: true, help: '公众号 AppSecret；请勿提交到 shell 历史或日志' },
+    { name: 'allow-private-image-hosts', type: 'boolean', default: false, help: '允许下载 localhost/内网 HTTP(S) 图片；云元数据地址始终禁止' },
+  ],
+  columns: ['status', 'detail'],
+
+  func: async (kwargs) => {
+    const title = requiredText(kwargs.title, 'title');
+    if (codePointLength(title) > MAX_TITLE_LENGTH) {
+      throw new ArgumentError(`title must be at most ${MAX_TITLE_LENGTH} characters`);
+    }
+    const images = parseImages(kwargs.images);
+    const result = await createNewspicDraftViaApi({
+      appid: requiredText(kwargs.appid, 'appid'),
+      appsecret: requiredText(kwargs.appsecret, 'appsecret'),
+      title,
+      content: kwargs.content == null ? '' : String(kwargs.content),
+      images,
+      allowPrivateImageHosts: kwargs['allow-private-image-hosts'] === true,
+    });
+    return [{
+      status: 'newspic draft created',
+      detail: `"${title}" (media_id: ${result.mediaId}, images: ${images.length})${result.cleanupWarning ? `; warning: ${result.cleanupWarning}` : ''}`,
+    }];
+  },
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sovovs/bycli",
-  "version": "2.1.47",
+  "version": "2.1.48",
   "publishConfig": {
     "access": "public"
   },