@perk-net/perk-pushplus-sdk 1.2.0 → 1.2.1

package/README.md

@@ -90,7 +90,7 @@ await client.send({
   template: Template.MARKDOWN,
 });
 
-// push 表单：template=form 时需传 pushId（表单编码）
+// push 表单 / 文档 / 表格：template 为 form/doc/excel 时需传 pushId（对应编码）
 await client.send(
   sendRequest()
     .title('表单通知')
@@ -99,6 +99,22 @@ await client.send(
     .pushId('表单编码')
     .build(),
 );
+await client.send(
+  sendRequest()
+    .title('本周工作同步')
+    .content('请查收')
+    .template(Template.DOC)
+    .pushId('文档编码')
+    .build(),
+);
+await client.send(
+  sendRequest()
+    .title('销售日报')
+    .content('请查收')
+    .template(Template.EXCEL)
+    .pushId('表格编码')
+    .build(),
+);
 ```
 
 ### 3. 多渠道发送
@@ -151,10 +167,18 @@ const qr = await client.topic.qrCode(123, 86400, -1);
 
 // 群组用户
 await client.topicUser.editRemark(456, '老张');
+await client.topicUser.addBlacklist(10);
+const topicBlacklist = await client.topicUser.blacklistList({
+  current: 1,
+  pageSize: 20,
+  params: { topicId: 1 },
+});
 
 // 好友
 const myQr = await client.friend.getQrCode({ content: 'welcome' });
 const friends = await client.friend.list({ current: 1, pageSize: 20 });
+await client.friend.addBlacklist(friends.list[0].friendId);
+const friendBlacklist = await client.friend.blacklistList({ current: 1, pageSize: 20 });
 
 // webhook 渠道
 import { WebhookType } from '@perk-net/perk-pushplus-sdk';
@@ -195,20 +219,38 @@ await client.form.save({
 });
 const published = await client.form.publish(form.id!);
 console.log(published.fillUrl);
+await client.send({
+  title: published.title,
+  content: '请花1分钟完成填写',
+  template: Template.FORM,
+  pushId: published.formCode,
+});
 
 // push 文档
-const doc = await client.doc.create('本周工作同步');
-await client.doc.saveContent(doc.docCode!, '<h1>本周工作同步</h1><p>需求评审。</p>');
+import { readFile } from 'node:fs/promises';
+const doc = await client.doc.importWord(await readFile('本周工作同步.docx'), '本周工作同步.docx');
 await client.doc.updateShare(doc.docCode!, 1, 0);
 await client.doc.publish(doc.docCode!);
+await client.send({
+  title: doc.title,
+  content: '请查收',
+  template: Template.DOC,
+  pushId: doc.docCode,
+});
 
 // push 表格
-const sheet = await client.excel.create('销售日报');
+const sheet = await client.excel.importExcel(await readFile('销售日报.xlsx'), '销售日报.xlsx');
 await client.excel.writeCells(sheet.docCode!, 'A1', [
   ['日期', '销售额'],
   ['2026-08-13', 12800],
 ], 'Sheet1');
 await client.excel.publish(sheet.docCode!);
+await client.send({
+  title: sheet.title,
+  content: '请查收',
+  template: Template.EXCEL,
+  pushId: sheet.docCode,
+});
 ```
 
 ### 图片服务

package/dist/index.cjs

@@ -375,6 +375,26 @@ var AbstractApi = class {
     }
     return parseApiResponse(resp);
   }
+  /**
+   * 执行带二进制请求体的请求并返回原始 ApiResponse（不进行 code 校验）。
+   * 用于 multipart 上传等场景。
+   */
+  async executeRaw(method, path, headers, body) {
+    const url = this.resolveUrl(path);
+    const resp = await callExecuteRaw(this.http, {
+      method,
+      url,
+      headers: headers != null ? headers : void 0,
+      body
+    });
+    if (!isSuccessfulHttpStatus(resp.statusCode)) {
+      throw new PushPlusError(
+        `PushPlus \u63A5\u53E3 HTTP \u8C03\u7528\u5931\u8D25: status=${resp.statusCode}, body=${resp.body}`,
+        resp.statusCode
+      );
+    }
+    return parseApiResponse(resp);
+  }
   /** 执行请求并直接返回 data；非 200 抛出异常。 */
   async executeForData(method, path, headers, body) {
     var _a;
@@ -505,6 +525,39 @@ var _OpenAbstractApi = class _OpenAbstractApi extends AbstractApi {
       (_b = resp.code) != null ? _b : -1
     );
   }
+  /** 以 multipart 上传文件（自动携带 access-key；code=401 时刷新后重试一次）。 */
+  executeOpenMultipart(path, multipart) {
+    return this.executeOpenRaw("POST", path, multipart.body, {
+      "Content-Type": multipart.contentType
+    });
+  }
+  /**
+   * 执行带二进制 body 的开放接口请求；当返回 code=401 时自动刷新 key 并重试一次。
+   */
+  async executeOpenRaw(method, path, body, extraHeaders) {
+    var _a, _b;
+    const headers = { ...await this.headersWithAccessKey(), ...extraHeaders != null ? extraHeaders : {} };
+    const resp = await this.executeRaw(method, path, headers, body);
+    if (isApiSuccess(resp)) {
+      return resp.data;
+    }
+    if (resp.code === _OpenAbstractApi.CODE_ACCESS_KEY_INVALID) {
+      this.accessKeyManager.invalidate();
+      const retryHeaders = { ...await this.headersWithAccessKey(), ...extraHeaders != null ? extraHeaders : {} };
+      const retry = await this.executeRaw(method, path, retryHeaders, body);
+      if (isApiSuccess(retry)) {
+        return retry.data;
+      }
+      throw new PushPlusError(
+        `PushPlus \u5F00\u653E\u63A5\u53E3\u4E1A\u52A1\u5931\u8D25(\u91CD\u8BD5\u540E): code=${retry.code}, msg=${retry.msg}`,
+        (_a = retry.code) != null ? _a : -1
+      );
+    }
+    throw new PushPlusError(
+      `PushPlus \u5F00\u653E\u63A5\u53E3\u4E1A\u52A1\u5931\u8D25: code=${resp.code}, msg=${resp.msg}`,
+      (_b = resp.code) != null ? _b : -1
+    );
+  }
 };
 _OpenAbstractApi.HEADER_ACCESS_KEY = "access-key";
 /** PushPlus AccessKey 失效相关的业务码（用于触发自动重试）。 */
@@ -567,6 +620,50 @@ var ClawBotApi = class extends OpenAbstractApi {
   }
 };
 
+// src/multipart.ts
+function buildFileMultipart(fileName, contentType, fileBytes) {
+  if (fileBytes == null || fileBytes.byteLength === 0) {
+    throw new PushPlusError("\u4E0A\u4F20\u6587\u4EF6\u5185\u5BB9\u4E0D\u80FD\u4E3A\u7A7A");
+  }
+  const safeName = fileName && fileName.trim() ? fileName : "file";
+  const mime = contentType && contentType.trim() ? contentType : "application/octet-stream";
+  const boundary = "----PushPlusBoundary" + randomBoundarySuffix();
+  const crlf = "\r\n";
+  const enc = new TextEncoder();
+  const head = enc.encode(
+    `--${boundary}${crlf}Content-Disposition: form-data; name="file"; filename="${escapeFileName(safeName)}"${crlf}Content-Type: ${mime}${crlf}${crlf}`
+  );
+  const tail = enc.encode(`${crlf}--${boundary}--${crlf}`);
+  const body = new Uint8Array(head.byteLength + fileBytes.byteLength + tail.byteLength);
+  body.set(head, 0);
+  body.set(fileBytes, head.byteLength);
+  body.set(tail, head.byteLength + fileBytes.byteLength);
+  return { contentType: `multipart/form-data; boundary=${boundary}`, body };
+}
+async function toFileBytes(file) {
+  if (file instanceof Uint8Array) {
+    return file;
+  }
+  if (file instanceof ArrayBuffer) {
+    return new Uint8Array(file);
+  }
+  if (typeof Blob !== "undefined" && file instanceof Blob) {
+    const ab = await file.arrayBuffer();
+    return new Uint8Array(ab);
+  }
+  throw new PushPlusError(`\u4E0D\u652F\u6301\u7684\u4E0A\u4F20\u6587\u4EF6\u7C7B\u578B: ${Object.prototype.toString.call(file)}`);
+}
+function escapeFileName(name) {
+  return name.replace(/"/g, "_").replace(/\r/g, " ").replace(/\n/g, " ");
+}
+function randomBoundarySuffix() {
+  let s = "";
+  for (let i = 0; i < 32; i++) {
+    s += Math.floor(Math.random() * 16).toString(16);
+  }
+  return s;
+}
+
 // src/api/doc-api.ts
 var DocApi = class extends OpenAbstractApi {
   constructor(config, http, mgr) {
@@ -584,6 +681,19 @@ var DocApi = class extends OpenAbstractApi {
   create(title) {
     return this.executeOpen("POST", "/push/api/open/doc/create", { title });
   }
+  /**
+   * 导入 Word（.docx）创建文档。
+   *
+   * 标题默认取文件名；创建后默认关闭分享，需再调用 publish 才会同步到分享页。
+   */
+  async importWord(file, fileName = "document.docx") {
+    const bytes = await toFileBytes(file);
+    const name = fileName && fileName.trim() ? fileName : "document.docx";
+    return this.executeOpenMultipart(
+      "/push/api/open/doc/import",
+      buildFileMultipart(name, guessDocxContentType(name), bytes)
+    );
+  }
   /** 获取文档元信息与 HTML 草稿正文。 */
   content(docCode) {
     return this.executeOpen(
@@ -625,6 +735,9 @@ var DocApi = class extends OpenAbstractApi {
     return this.executeOpen("POST", "/push/api/open/doc/updateShare", body);
   }
 };
+function guessDocxContentType(name) {
+  return name.toLowerCase().endsWith(".docx") ? "application/vnd.openxmlformats-officedocument.wordprocessingml.document" : "application/octet-stream";
+}
 
 // src/api/excel-api.ts
 var ExcelApi = class extends OpenAbstractApi {
@@ -643,6 +756,19 @@ var ExcelApi = class extends OpenAbstractApi {
   create(title) {
     return this.executeOpen("POST", "/push/api/open/excel/create", { title });
   }
+  /**
+   * 导入 Excel（.xlsx / .xls）创建表格。
+   *
+   * 标题默认取文件名；创建后默认关闭分享，需再调用 publish 才会同步到分享页。
+   */
+  async importExcel(file, fileName = "workbook.xlsx") {
+    const bytes = await toFileBytes(file);
+    const name = fileName && fileName.trim() ? fileName : "workbook.xlsx";
+    return this.executeOpenMultipart(
+      "/push/api/open/excel/import",
+      buildFileMultipart(name, guessExcelContentType(name), bytes)
+    );
+  }
   /** 获取表格元信息与整表 JSON 草稿。 */
   content(docCode) {
     return this.executeOpen(
@@ -713,6 +839,16 @@ function stringifyJsonContent(content) {
     throw new PushPlusError(`\u5E8F\u5217\u5316\u8868\u683C\u5185\u5BB9\u5931\u8D25: ${e.message}`, -1, { cause: e });
   }
 }
+function guessExcelContentType(name) {
+  const lower = name.toLowerCase();
+  if (lower.endsWith(".xlsx")) {
+    return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+  }
+  if (lower.endsWith(".xls")) {
+    return "application/vnd.ms-excel";
+  }
+  return "application/octet-stream";
+}
 
 // src/api/form-api.ts
 var FormApi = class extends OpenAbstractApi {
@@ -808,6 +944,40 @@ var FriendApi = class extends OpenAbstractApi {
   async editRemark(id, remark) {
     await this.executeOpen("POST", "/api/open/friend/editRemark", { id, remark });
   }
+  /**
+   * 5. 将好友加入黑名单。
+   *
+   * 加入后将解除双方好友关系，对方无法再添加你。不能将自己加入黑名单，仅可将已有好友加入黑名单。
+   *
+   * @param friendId 好友 id（好友列表中的 friendId 字段）
+   */
+  async addBlacklist(friendId) {
+    await this.executeOpen(
+      "POST",
+      this.appendQuery("/api/open/friend/addBlacklist", { friendId })
+    );
+  }
+  /** 6. 好友黑名单列表。 */
+  blacklistList(query) {
+    return this.executeOpen(
+      "POST",
+      "/api/open/friend/blacklistList",
+      query != null ? query : {}
+    );
+  }
+  /**
+   * 7. 解除好友黑名单。
+   *
+   * 解除后不会自动恢复好友关系，需重新扫码添加。
+   *
+   * @param id 黑名单记录 ID（黑名单列表中的 id 字段）
+   */
+  async removeBlacklist(id) {
+    await this.executeOpen(
+      "POST",
+      this.appendQuery("/api/open/friend/removeBlacklist", { id })
+    );
+  }
 };
 
 // src/api/image-api.ts
@@ -856,7 +1026,7 @@ var ImageApi = class extends OpenAbstractApi {
     }
     const fileName = options.fileName || "file";
     const contentType = options.contentType || guessContentTypeByName(fileName) || "application/octet-stream";
-    const boundary = "----PushPlusBoundary" + randomBoundarySuffix();
+    const boundary = "----PushPlusBoundary" + randomBoundarySuffix2();
     const body = buildMultipartBody(boundary, uploadToken, fileName, contentType, bytes);
     const resp = await callExecuteRaw(this.http, {
       method: "POST",
@@ -942,7 +1112,7 @@ function buildMultipartBody(boundary, uploadToken, fileName, contentType, fileBy
   const crlf = "\r\n";
   const enc = new TextEncoder();
   const head = enc.encode(
-    `--${boundary}${crlf}Content-Disposition: form-data; name="token"${crlf}${crlf}${uploadToken}${crlf}--${boundary}${crlf}Content-Disposition: form-data; name="file"; filename="${escapeFileName(fileName)}"${crlf}Content-Type: ${contentType}${crlf}${crlf}`
+    `--${boundary}${crlf}Content-Disposition: form-data; name="token"${crlf}${crlf}${uploadToken}${crlf}--${boundary}${crlf}Content-Disposition: form-data; name="file"; filename="${escapeFileName2(fileName)}"${crlf}Content-Type: ${contentType}${crlf}${crlf}`
   );
   const tail = enc.encode(`${crlf}--${boundary}--${crlf}`);
   const out = new Uint8Array(head.byteLength + fileBytes.byteLength + tail.byteLength);
@@ -951,7 +1121,7 @@ function buildMultipartBody(boundary, uploadToken, fileName, contentType, fileBy
   out.set(tail, head.byteLength + fileBytes.byteLength);
   return out;
 }
-function escapeFileName(name) {
+function escapeFileName2(name) {
   return name.replace(/"/g, "_").replace(/\r/g, " ").replace(/\n/g, " ");
 }
 function guessContentTypeByName(name) {
@@ -964,7 +1134,7 @@ function guessContentTypeByName(name) {
   if (lower.endsWith(".svg")) return "image/svg+xml";
   return null;
 }
-function randomBoundarySuffix() {
+function randomBoundarySuffix2() {
   let s = "";
   for (let i = 0; i < 32; i++) {
     s += Math.floor(Math.random() * 16).toString(16);
@@ -1307,6 +1477,42 @@ var TopicUserApi = class extends OpenAbstractApi {
   async editRemark(id, remark) {
     await this.executeOpen("POST", "/api/open/topicUser/editRemark", { id, remark });
   }
+  /**
+   * 4. 将订阅人加入黑名单。
+   *
+   * 加入后将移出群组，对方无法再加入该群组。积分群组不支持黑名单。不能将自己加入黑名单。
+   *
+   * @param topicRelationId 用户编号（订阅人列表中的 id 字段）
+   */
+  async addBlacklist(topicRelationId) {
+    const path = this.appendQuery("/api/open/topicUser/addBlacklist", { topicRelationId });
+    await this.executeOpen("POST", path);
+  }
+  /**
+   * 5. 订阅人黑名单列表。
+   *
+   * `query.params.topicId` 必填。
+   */
+  blacklistList(query) {
+    return this.executeOpen(
+      "POST",
+      "/api/open/topicUser/blacklistList",
+      query
+    );
+  }
+  /**
+   * 6. 解除订阅人黑名单。
+   *
+   * 解除后不会自动恢复群组订阅，对方可重新加入该群组。
+   *
+   * @param id 黑名单记录 ID（黑名单列表中的 id 字段）
+   */
+  async removeBlacklist(id) {
+    await this.executeOpen(
+      "POST",
+      this.appendQuery("/api/open/topicUser/removeBlacklist", { id })
+    );
+  }
 };
 
 // src/api/user-api.ts
@@ -1371,7 +1577,7 @@ function resolveConfig(input) {
     logRequest: (_g = cfg.logRequest) != null ? _g : false,
     rateLimitGuardEnabled: (_h = cfg.rateLimitGuardEnabled) != null ? _h : true,
     rateLimitCooldownMs: (_i = cfg.rateLimitCooldownMs) != null ? _i : 0,
-    userAgent: (_j = cfg.userAgent) != null ? _j : `@perk-net/perk-pushplus-sdk/1.2.0`
+    userAgent: (_j = cfg.userAgent) != null ? _j : `@perk-net/perk-pushplus-sdk/1.2.1`
   };
 }