@perk-net/perk-pushplus-sdk 1.0.0 → 1.1.0

package/dist/index.global.js

@@ -23,6 +23,7 @@ var PerkPushPlus = (function (exports) {
     Template2["JENKINS"] = "jenkins";
     Template2["ROUTE"] = "route";
     Template2["PAY"] = "pay";
+    Template2["FORM"] = "form";
     return Template2;
   })(Template || {});
   var SendStatus = /* @__PURE__ */ ((SendStatus2) => {
@@ -186,6 +187,25 @@ var PerkPushPlus = (function (exports) {
   };
 
   // src/http.ts
+  async function callExecuteRaw(requester, options) {
+    if (typeof requester.executeRaw === "function") {
+      return requester.executeRaw(options);
+    }
+    const { method, url, headers, body } = options;
+    let text = null;
+    if (body != null) {
+      if (typeof Blob !== "undefined" && body instanceof Blob) {
+        text = await body.text();
+      } else if (body instanceof Uint8Array) {
+        text = new TextDecoder("utf-8").decode(body);
+      } else if (body instanceof ArrayBuffer) {
+        text = new TextDecoder("utf-8").decode(new Uint8Array(body));
+      } else {
+        text = String(body);
+      }
+    }
+    return requester.execute({ method, url, headers, body: text });
+  }
   var FetchHttpRequester = class {
     constructor(config, fetchImpl) {
       this.readTimeoutMs = config.readTimeoutMs;
@@ -201,7 +221,29 @@ var PerkPushPlus = (function (exports) {
     }
     async execute(options) {
       var _a, _b;
-      const { method, url, headers, body } = options;
+      return this.doExecute({
+        method: options.method,
+        url: options.url,
+        headers: options.headers,
+        body: (_a = options.body) != null ? _a : null,
+        bodyForLog: (_b = options.body) != null ? _b : null,
+        defaultContentType: "application/json;charset=UTF-8"
+      });
+    }
+    async executeRaw(options) {
+      var _a;
+      return this.doExecute({
+        method: options.method,
+        url: options.url,
+        headers: options.headers,
+        body: (_a = options.body) != null ? _a : null,
+        bodyForLog: null,
+        defaultContentType: "application/octet-stream"
+      });
+    }
+    async doExecute(args) {
+      var _a, _b;
+      const { method, url, headers, body, bodyForLog, defaultContentType } = args;
       const finalHeaders = {};
       let hasContentType = false;
       if (headers) {
@@ -211,14 +253,19 @@ var PerkPushPlus = (function (exports) {
           if (k.toLowerCase() === "content-type") hasContentType = true;
         }
       }
-      if (body != null && !hasContentType) {
-        finalHeaders["Content-Type"] = "application/json;charset=UTF-8";
+      if (body != null && !hasContentType && defaultContentType) {
+        finalHeaders["Content-Type"] = defaultContentType;
       }
       if (typeof window === "undefined" && !finalHeaders["User-Agent"] && !finalHeaders["user-agent"]) {
         finalHeaders["User-Agent"] = this.userAgent;
       }
       if (this.logRequest) {
-        console.debug("[pushplus] >>>", method, url, "body=", body);
+        if (bodyForLog != null) {
+          console.debug("[pushplus] >>>", method, url, "body=", bodyForLog);
+        } else {
+          const len = bodyLength(body);
+          console.debug("[pushplus] >>>", method, url, "bodyBytes=", len);
+        }
       }
       const controller = new AbortController();
       const timer = this.readTimeoutMs > 0 ? setTimeout(() => controller.abort(), this.readTimeoutMs) : null;
@@ -250,6 +297,14 @@ var PerkPushPlus = (function (exports) {
       }
     }
   };
+  function bodyLength(body) {
+    if (body == null) return 0;
+    if (typeof body === "string") return body.length;
+    if (body instanceof Uint8Array) return body.byteLength;
+    if (body instanceof ArrayBuffer) return body.byteLength;
+    if (typeof Blob !== "undefined" && body instanceof Blob) return body.size;
+    return -1;
+  }
   function isSuccessfulHttpStatus(status) {
     return status >= 200 && status < 300;
   }
@@ -521,6 +576,168 @@ var PerkPushPlus = (function (exports) {
     }
   };
 
+  // src/api/image-api.ts
+  var ImageApi = class extends OpenAbstractApi {
+    constructor(config, http, mgr) {
+      super(config, http, mgr);
+    }
+    /** 1. 获取上传凭证。 */
+    getUploadToken() {
+      return this.executeOpen("GET", "/api/open/userImage/uploadToken");
+    }
+    /**
+     * 2. 上传图片到七牛云。
+     *
+     * 使用「获取上传凭证」返回的 `uploadUrl` 与 `uploadToken`，
+     * 按七牛云表单上传规范以 `multipart/form-data` 提交。该请求
+     * **不会** 携带 PushPlus 的 `access-key` 头。
+     */
+    async upload(token, file, options) {
+      if (token == null) {
+        throw new PushPlusError("\u4E0A\u4F20\u51ED\u8BC1 token \u4E0D\u80FD\u4E3A null");
+      }
+      if (!token.uploadToken) {
+        throw new PushPlusError("\u4E0A\u4F20\u51ED\u8BC1 uploadToken \u4E0D\u80FD\u4E3A\u7A7A");
+      }
+      const uploadUrl = token.uploadUrl || token.uploadHost;
+      if (!uploadUrl) {
+        throw new PushPlusError("\u4E0A\u4F20\u51ED\u8BC1\u672A\u8FD4\u56DE uploadUrl/uploadHost");
+      }
+      return this.uploadToQiniu(uploadUrl, token.uploadToken, file, options);
+    }
+    /**
+     * 2. 上传图片到七牛云（低层方法）。直接指定上传地址与 token。
+     */
+    async uploadToQiniu(uploadUrl, uploadToken, file, options) {
+      var _a, _b;
+      if (!uploadUrl) {
+        throw new PushPlusError("uploadUrl \u4E0D\u80FD\u4E3A\u7A7A");
+      }
+      if (!uploadToken) {
+        throw new PushPlusError("uploadToken \u4E0D\u80FD\u4E3A\u7A7A");
+      }
+      const bytes = await toUint8Array(file);
+      if (bytes.byteLength === 0) {
+        throw new PushPlusError("\u4E0A\u4F20\u6587\u4EF6\u5185\u5BB9\u4E0D\u80FD\u4E3A\u7A7A");
+      }
+      const fileName = options.fileName || "file";
+      const contentType = options.contentType || guessContentTypeByName(fileName) || "application/octet-stream";
+      const boundary = "----PushPlusBoundary" + randomBoundarySuffix();
+      const body = buildMultipartBody(boundary, uploadToken, fileName, contentType, bytes);
+      const resp = await callExecuteRaw(this.http, {
+        method: "POST",
+        url: uploadUrl,
+        headers: { "Content-Type": `multipart/form-data; boundary=${boundary}` },
+        body
+      });
+      if (!isSuccessfulHttpStatus(resp.statusCode)) {
+        throw new PushPlusError(
+          `\u4E0A\u4F20\u56FE\u7247\u5230\u4E03\u725B\u4E91\u5931\u8D25: status=${resp.statusCode}, body=${resp.body}`,
+          resp.statusCode
+        );
+      }
+      let result;
+      try {
+        result = JSON.parse(resp.body);
+      } catch (e) {
+        throw new PushPlusError(
+          `\u89E3\u6790\u4E03\u725B\u4E91\u54CD\u5E94\u5931\u8D25: ${e.message}, payload=${resp.body}`,
+          -1,
+          { cause: e }
+        );
+      }
+      if (result == null || typeof result !== "object") {
+        throw new PushPlusError(`\u4E03\u725B\u4E91\u8FD4\u56DE\u975E JSON \u5BF9\u8C61: ${resp.body}`);
+      }
+      if (result.errno !== 0) {
+        throw new PushPlusError(
+          `\u4E03\u725B\u4E91\u4E0A\u4F20\u5931\u8D25: errno=${result.errno}, msg=${(_a = result.msg) != null ? _a : ""}`,
+          (_b = result.errno) != null ? _b : -1
+        );
+      }
+      return result;
+    }
+    /**
+     * 便捷方法：自动获取上传凭证后上传字节数组 / Blob / ArrayBuffer。
+     *
+     * @example
+     * ```ts
+     * await client.image.uploadBytes(buffer, { fileName: 'a.png' });
+     * await client.image.uploadBytes(blob, { fileName: 'b.jpg', contentType: 'image/jpeg' });
+     * ```
+     */
+    async uploadBytes(file, options) {
+      const token = await this.getUploadToken();
+      return this.upload(token, file, options);
+    }
+    /** 3. 图片列表。 */
+    list(query) {
+      return this.executeOpen(
+        "POST",
+        "/api/open/userImage/list",
+        query != null ? query : {}
+      );
+    }
+    /**
+     * 4. 主动删除图片；未删除的图片默认 30 天后由系统自动清理。
+     */
+    async delete(id) {
+      await this.executeOpen(
+        "DELETE",
+        this.appendQuery("/api/open/userImage/delete", { id })
+      );
+    }
+  };
+  async function toUint8Array(file) {
+    if (file == null) {
+      throw new PushPlusError("\u4E0A\u4F20\u6587\u4EF6\u4E0D\u80FD\u4E3A null");
+    }
+    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 buildMultipartBody(boundary, uploadToken, fileName, contentType, fileBytes) {
+    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}`
+    );
+    const tail = enc.encode(`${crlf}--${boundary}--${crlf}`);
+    const out = new Uint8Array(head.byteLength + fileBytes.byteLength + tail.byteLength);
+    out.set(head, 0);
+    out.set(fileBytes, head.byteLength);
+    out.set(tail, head.byteLength + fileBytes.byteLength);
+    return out;
+  }
+  function escapeFileName(name) {
+    return name.replace(/"/g, "_").replace(/\r/g, " ").replace(/\n/g, " ");
+  }
+  function guessContentTypeByName(name) {
+    const lower = name.toLowerCase();
+    if (lower.endsWith(".png")) return "image/png";
+    if (lower.endsWith(".jpg") || lower.endsWith(".jpeg")) return "image/jpeg";
+    if (lower.endsWith(".gif")) return "image/gif";
+    if (lower.endsWith(".webp")) return "image/webp";
+    if (lower.endsWith(".bmp")) return "image/bmp";
+    if (lower.endsWith(".svg")) return "image/svg+xml";
+    return null;
+  }
+  function randomBoundarySuffix() {
+    let s = "";
+    for (let i = 0; i < 32; i++) {
+      s += Math.floor(Math.random() * 16).toString(16);
+    }
+    return s;
+  }
+
   // src/api/message-api.ts
   var MessageApi = class extends AbstractApi {
     constructor(config, http, rateLimitGuard) {
@@ -920,7 +1137,7 @@ var PerkPushPlus = (function (exports) {
       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.0.0`
+      userAgent: (_j = cfg.userAgent) != null ? _j : `@perk-net/perk-pushplus-sdk/1.1.0`
     };
   }
 
@@ -1014,6 +1231,7 @@ var PerkPushPlus = (function (exports) {
       this.clawBot = new ClawBotApi(this.config, this.httpRequester, this.accessKeyManager);
       this.setting = new SettingApi(this.config, this.httpRequester, this.accessKeyManager);
       this.pre = new PreApi(this.config, this.httpRequester, this.accessKeyManager);
+      this.image = new ImageApi(this.config, this.httpRequester, this.accessKeyManager);
     }
     /** 与 Java SDK 风格一致的 Builder 入口。 */
     static builder() {
@@ -1160,6 +1378,10 @@ var PerkPushPlus = (function (exports) {
       this.req.pre = v;
       return this;
     }
+    pushId(v) {
+      this.req.pushId = v;
+      return this;
+    }
     build() {
       return { ...this.req };
     }
@@ -1209,6 +1431,10 @@ var PerkPushPlus = (function (exports) {
       this.req.pre = v;
       return this;
     }
+    pushId(v) {
+      this.req.pushId = v;
+      return this;
+    }
     /** 追加一个 channel。 */
     channel(ch) {
       this.channelList.push(typeof ch === "string" ? ch : ch);
@@ -1252,6 +1478,7 @@ var PerkPushPlus = (function (exports) {
   exports.ErrorCode = ErrorCode;
   exports.FetchHttpRequester = FetchHttpRequester;
   exports.FriendApi = FriendApi;
+  exports.ImageApi = ImageApi;
   exports.MessageApi = MessageApi;
   exports.MessageTokenApi = MessageTokenApi;
   exports.OpenAbstractApi = OpenAbstractApi;
@@ -1274,6 +1501,7 @@ var PerkPushPlus = (function (exports) {
   exports.WebhookType = WebhookType;
   exports.WebhookTypeDescription = WebhookTypeDescription;
   exports.batchSendRequest = batchSendRequest;
+  exports.callExecuteRaw = callExecuteRaw;
   exports.errorCodeFromValue = errorCodeFromValue;
   exports.isRateLimitedCode = isRateLimitedCode;
   exports.isSuccessfulHttpStatus = isSuccessfulHttpStatus;