@wenyan-md/core 1.0.9 → 1.0.10

package/dist/publish.js

@@ -1,24 +1,24 @@
-import { JSDOM as W } from "jsdom";
-import { FormData as L } from "formdata-node";
-import { createReadStream as N } from "fs";
-import { stat as x } from "fs/promises";
-import b, { basename as j } from "path";
-var I = (t, e, r) => {
+import { JSDOM as P } from "jsdom";
+import { createReadStream as W } from "fs";
+import { stat as B } from "fs/promises";
+import b, { basename as L } from "path";
+import { FormData as N, Blob as j } from "formdata-node";
+var F = (t, e, r) => {
   if (!e.has(t))
     throw TypeError("Cannot " + r);
-}, c = (t, e, r) => (I(t, e, "read from private field"), r ? r.call(t) : e.get(t)), p = (t, e, r) => {
+}, c = (t, e, r) => (F(t, e, "read from private field"), r ? r.call(t) : e.get(t)), p = (t, e, r) => {
   if (e.has(t))
     throw TypeError("Cannot add the same private member more than once");
   e instanceof WeakSet ? e.add(t) : e.set(t, r);
-}, w = (t, e, r, a) => (I(t, e, "write to private field"), e.set(t, r), r), z = (t) => typeof t == "object" && t != null && !Array.isArray(t), h = (t) => typeof t == "function", R = (t) => z(t) && h(t[Symbol.asyncIterator]), v = 65536;
-async function* q(t) {
-  if (t.byteLength <= v) {
+}, y = (t, e, r, a) => (F(t, e, "write to private field"), e.set(t, r), r), I = (t) => typeof t == "object" && t != null && !Array.isArray(t), h = (t) => typeof t == "function", R = (t) => I(t) && h(t[Symbol.asyncIterator]), T = 65536;
+async function* z(t) {
+  if (t.byteLength <= T) {
     yield t;
     return;
   }
   let e = 0;
   for (; e < t.byteLength; ) {
-    const r = Math.min(t.byteLength - e, v), a = t.buffer.slice(e, e + r);
+    const r = Math.min(t.byteLength - e, T), a = t.buffer.slice(e, e + r);
     e += a.byteLength, yield new Uint8Array(a);
   }
 }
@@ -31,51 +31,51 @@ async function* C(t) {
     yield a;
   }
 }
-async function* $(t) {
+async function* x(t) {
   for await (const e of t)
-    yield* q(e);
+    yield* z(e);
 }
-var U = (t) => {
+var D = (t) => {
   if (R(t))
-    return $(t);
+    return x(t);
   if (h(t.getReader))
-    return $(C(t));
+    return x(C(t));
   throw new TypeError(
     "Unsupported data source: Expected either ReadableStream or async iterable."
   );
 };
-async function* D(t) {
+async function* U(t) {
   let e = 0;
   for (; e !== t.size; ) {
     const a = await t.slice(
       e,
-      Math.min(t.size, e + v)
+      Math.min(t.size, e + T)
     ).arrayBuffer();
     e += a.byteLength, yield new Uint8Array(a);
   }
 }
 async function* S(t, e = !1) {
   for (const r of t)
-    ArrayBuffer.isView(r) ? e ? yield* q(r) : yield r : h(r.stream) ? yield* U(r.stream()) : yield* D(r);
+    ArrayBuffer.isView(r) ? e ? yield* z(r) : yield r : h(r.stream) ? yield* D(r.stream()) : yield* U(r);
 }
 function* H(t, e, r = 0, a) {
   a ??= e;
   let n = r < 0 ? Math.max(e + r, 0) : Math.min(r, e), i = a < 0 ? Math.max(e + a, 0) : Math.min(a, e);
   const s = Math.max(i - n, 0);
   let o = 0;
-  for (const d of t) {
+  for (const l of t) {
     if (o >= s)
       break;
-    const l = ArrayBuffer.isView(d) ? d.byteLength : d.size;
-    if (n && l <= n)
-      n -= l, i -= l;
+    const f = ArrayBuffer.isView(l) ? l.byteLength : l.size;
+    if (n && f <= n)
+      n -= f, i -= f;
     else {
-      let f;
-      ArrayBuffer.isView(d) ? (f = d.subarray(n, Math.min(l, i)), o += f.byteLength) : (f = d.slice(n, Math.min(l, i)), o += f.size), i -= l, n = 0, yield f;
+      let d;
+      ArrayBuffer.isView(l) ? (d = l.subarray(n, Math.min(f, i)), o += d.byteLength) : (d = l.slice(n, Math.min(f, i)), o += d.size), i -= f, n = 0, yield d;
     }
   }
 }
-var u, _, g, O = class A {
+var u, _, g, O = class v {
   /**
    * Returns a new [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob) object.
    * The content of the blob consists of the concatenation of the values given in the parameter array.
@@ -102,10 +102,10 @@ var u, _, g, O = class A {
       ArrayBuffer.isView(i) ? s = new Uint8Array(i.buffer.slice(
         i.byteOffset,
         i.byteOffset + i.byteLength
-      )) : i instanceof ArrayBuffer ? s = new Uint8Array(i.slice(0)) : i instanceof A ? s = i : s = a.encode(String(i)), w(this, g, c(this, g) + (ArrayBuffer.isView(s) ? s.byteLength : s.size)), c(this, u).push(s);
+      )) : i instanceof ArrayBuffer ? s = new Uint8Array(i.slice(0)) : i instanceof v ? s = i : s = a.encode(String(i)), y(this, g, c(this, g) + (ArrayBuffer.isView(s) ? s.byteLength : s.size)), c(this, u).push(s);
     }
     const n = r.type === void 0 ? "" : String(r.type);
-    w(this, _, /^[\x20-\x7E]*$/.test(n) ? n : "");
+    y(this, _, /^[\x20-\x7E]*$/.test(n) ? n : "");
   }
   static [Symbol.hasInstance](e) {
     return !!(e && typeof e == "object" && h(e.constructor) && (h(e.stream) || h(e.arrayBuffer)) && /^(Blob|File)$/.test(e[Symbol.toStringTag]));
@@ -130,7 +130,7 @@ var u, _, g, O = class A {
    * @param contentType The content type to assign to the new Blob; this will be the value of its type property. The default value is an empty string.
    */
   slice(e, r, a) {
-    return new A(H(c(this, u), this.size, e, r), {
+    return new v(H(c(this, u), this.size, e, r), {
       type: a
     });
   }
@@ -178,8 +178,8 @@ var u, _, g, O = class A {
 u = /* @__PURE__ */ new WeakMap();
 _ = /* @__PURE__ */ new WeakMap();
 g = /* @__PURE__ */ new WeakMap();
-var T = O;
-Object.defineProperties(T.prototype, {
+var A = O;
+Object.defineProperties(A.prototype, {
   type: { enumerable: !0 },
   size: { enumerable: !0 },
   slice: { enumerable: !0 },
@@ -187,7 +187,7 @@ Object.defineProperties(T.prototype, {
   text: { enumerable: !0 },
   arrayBuffer: { enumerable: !0 }
 });
-var M, k, V = class extends T {
+var k, M, V = class extends A {
   /**
    * Creates a new File instance.
    *
@@ -196,22 +196,22 @@ var M, k, V = class extends T {
    * @param options An options object containing optional attributes for the file.
    */
   constructor(t, e, r = {}) {
-    if (super(t, r), p(this, M, void 0), p(this, k, 0), arguments.length < 2)
+    if (super(t, r), p(this, k, void 0), p(this, M, 0), arguments.length < 2)
       throw new TypeError(
         `Failed to construct 'File': 2 arguments required, but only ${arguments.length} present.`
       );
-    w(this, M, String(e));
+    y(this, k, String(e));
     const a = r.lastModified === void 0 ? Date.now() : Number(r.lastModified);
-    Number.isNaN(a) || w(this, k, a);
+    Number.isNaN(a) || y(this, M, a);
   }
   static [Symbol.hasInstance](t) {
-    return t instanceof T && t[Symbol.toStringTag] === "File" && typeof t.name == "string";
+    return t instanceof A && t[Symbol.toStringTag] === "File" && typeof t.name == "string";
   }
   /**
    * Name of the file referenced by the File object.
    */
   get name() {
-    return c(this, M);
+    return c(this, k);
   }
   /* c8 ignore next 3 */
   get webkitRelativePath() {
@@ -221,36 +221,36 @@ var M, k, V = class extends T {
    * The last modified date of the file as the number of milliseconds since the Unix epoch (January 1, 1970 at midnight). Files without a known last modified date return the current date.
    */
   get lastModified() {
-    return c(this, k);
+    return c(this, M);
   }
   get [Symbol.toStringTag]() {
     return "File";
   }
 };
-M = /* @__PURE__ */ new WeakMap();
 k = /* @__PURE__ */ new WeakMap();
-var m, y, J = class P {
+M = /* @__PURE__ */ new WeakMap();
+var m, w, J = class q {
   constructor(e) {
-    p(this, m, void 0), p(this, y, void 0), w(this, m, e.path), w(this, y, e.start || 0), this.name = j(c(this, m)), this.size = e.size, this.lastModified = e.lastModified;
+    p(this, m, void 0), p(this, w, void 0), y(this, m, e.path), y(this, w, e.start || 0), this.name = L(c(this, m)), this.size = e.size, this.lastModified = e.lastModified;
   }
   slice(e, r) {
-    return new P({
+    return new q({
       path: c(this, m),
       lastModified: this.lastModified,
-      start: c(this, y) + e,
+      start: c(this, w) + e,
       size: r - e
     });
   }
   async *stream() {
-    const { mtimeMs: e } = await x(c(this, m));
+    const { mtimeMs: e } = await B(c(this, m));
     if (e > this.lastModified)
       throw new DOMException(
         "The requested file could not be read, typically due to permission problems that have occurred after a reference to a file was acquired.",
         "NotReadableError"
       );
-    this.size && (yield* N(c(this, m), {
-      start: c(this, y),
-      end: c(this, y) + this.size - 1
+    this.size && (yield* W(c(this, m), {
+      start: c(this, w),
+      end: c(this, w) + this.size - 1
     }));
   }
   get [Symbol.toStringTag]() {
@@ -258,11 +258,11 @@ var m, y, J = class P {
   }
 };
 m = /* @__PURE__ */ new WeakMap();
-y = /* @__PURE__ */ new WeakMap();
+w = /* @__PURE__ */ new WeakMap();
 var G = J;
 function K(t, { mtimeMs: e, size: r }, a, n = {}) {
   let i;
-  z(a) ? [n, i] = [a, void 0] : i = a;
+  I(a) ? [n, i] = [a, void 0] : i = a;
   const s = new G({ path: t, size: r, lastModified: e });
   return i || (i = s.name), new V([s], i, {
     ...n,
@@ -270,90 +270,101 @@ function K(t, { mtimeMs: e, size: r }, a, n = {}) {
   });
 }
 async function X(t, e, r) {
-  const a = await x(t);
+  const a = await B(t);
   return K(t, a, e, r);
 }
 /*! Based on fetch-blob. MIT License. Jimmy Wärting <https://jimmy.warting.se/opensource> & David Frank */
 const Z = "https://api.weixin.qq.com/cgi-bin/token", Q = "https://api.weixin.qq.com/cgi-bin/draft/add", Y = "https://api.weixin.qq.com/cgi-bin/material/add_material", ee = process.env.WECHAT_APP_ID || "", te = process.env.WECHAT_APP_SECRET || "";
 async function re() {
-  try {
-    const e = await (await fetch(`${Z}?grant_type=client_credential&appid=${ee}&secret=${te}`)).json();
-    if (e.access_token)
-      return e;
-    throw e.errcode ? new Error(`获取 Access Token 失败，错误码：${e.errcode}，${e.errmsg}`) : new Error(`获取 Access Token 失败: ${e}`);
-  } catch (t) {
-    throw t;
+  const t = await fetch(`${Z}?grant_type=client_credential&appid=${ee}&secret=${te}`);
+  if (!t.ok) {
+    const e = await t.text();
+    throw new Error(`获取AccessToken失败: ${t.status} ${e}`);
   }
+  return await t.json();
 }
-async function F(t, e, r, a) {
-  const n = new L();
+async function ae(t, e, r, a) {
+  const n = new N();
   n.append("media", e, r);
   const i = await fetch(`${Y}?access_token=${a}&type=${t}`, {
     method: "POST",
     body: n
   });
   if (!i.ok) {
-    const d = await i.text();
-    throw new Error(`上传失败: ${i.status} ${d}`);
+    const o = await i.text();
+    throw new Error(`上传素材失败: ${i.status} ${o}`);
   }
   const s = await i.json();
-  if (s.errcode)
-    throw new Error(`上传失败，错误码：${s.errcode}，错误信息：${s.errmsg}`);
-  const o = s.url.replace("http://", "https://");
-  return s.url = o, s;
+  return s.url && s.url.startsWith("http://") && (s.url = s.url.replace("http://", "https://")), s;
 }
-async function E(t, e, r) {
+async function ie(t, e, r, a) {
+  const n = await fetch(`${Q}?access_token=${a}`, {
+    method: "POST",
+    body: JSON.stringify({
+      articles: [
+        {
+          title: t,
+          content: e,
+          thumb_media_id: r
+        }
+      ]
+    })
+  });
+  if (!n.ok) {
+    const i = await n.text();
+    throw new Error(`发布失败: ${n.status} ${i}`);
+  }
+  return await n.json();
+}
+async function $(t, e, r) {
+  let a, n;
   if (t.startsWith("http")) {
-    const a = await fetch(t);
-    if (!a.ok || !a.body)
+    const s = await fetch(t);
+    if (!s.ok || !s.body)
       throw new Error(`Failed to download image from URL: ${t}`);
-    const n = b.basename(t.split("?")[0]), i = b.extname(n), s = r ?? (i === "" ? `${n}.jpg` : n), o = await a.arrayBuffer();
-    return await F("image", new Blob([o]), s, e);
+    const o = b.basename(t.split("?")[0]), l = b.extname(o);
+    n = r ?? (l === "" ? `${o}.jpg` : o);
+    const f = await s.arrayBuffer();
+    a = new j([f]);
   } else {
-    const a = t, n = b.basename(a), i = b.extname(n), s = r ?? (i === "" ? `${n}.jpg` : n), o = await X(a);
-    return await F("image", o, s, e);
+    const s = b.basename(t), o = b.extname(s);
+    n = r ?? (o === "" ? `${s}.jpg` : s), a = await X(t);
   }
+  const i = await ae("image", a, n, e);
+  if (i.errcode)
+    throw new Error(`上传失败，错误码：${i.errcode}，错误信息：${i.errmsg}`);
+  return i;
 }
-async function ae(t, e) {
+async function se(t, e) {
   if (!t.includes("<img"))
     return { html: t, firstImageId: "" };
-  const r = new W(t), a = r.window.document, i = Array.from(a.querySelectorAll("img")).map(async (l) => {
-    const f = l.getAttribute("src");
-    if (f) {
-      if (f.startsWith("https://mmbiz.qpic.cn"))
-        return f;
+  const r = new P(t), a = r.window.document, i = Array.from(a.querySelectorAll("img")).map(async (f) => {
+    const d = f.getAttribute("src");
+    if (d) {
+      if (d.startsWith("https://mmbiz.qpic.cn"))
+        return d;
       {
-        const B = await E(f, e);
-        return l.setAttribute("src", B.url), B.media_id;
+        const E = await $(d, e);
+        return f.setAttribute("src", E.url), E.media_id;
       }
     }
     return null;
   }), o = (await Promise.all(i)).filter(Boolean)[0] || "";
   return { html: r.serialize(), firstImageId: o };
 }
-async function le(t, e, r) {
-  try {
-    const a = await re(), n = e.replace(/\n<li/g, "<li").replace(/<\/li>\n/g, "</li>"), { html: i, firstImageId: s } = await ae(n, a.access_token);
-    let o = "";
-    if (r ? o = (await E(r, a.access_token, "cover.jpg")).media_id : s.startsWith("https://mmbiz.qpic.cn") ? o = (await E(s, a.access_token, "cover.jpg")).media_id : o = s, !o)
-      throw new Error("你必须指定一张封面图或者在正文中至少出现一张图片。");
-    const l = await (await fetch(`${Q}?access_token=${a.access_token}`, {
-      method: "POST",
-      body: JSON.stringify({
-        articles: [{
-          title: t,
-          content: i,
-          thumb_media_id: o
-        }]
-      })
-    })).json();
-    if (l.media_id)
-      return l;
-    throw l.errcode ? new Error(`上传到公众号草稿失败，错误码：${l.errcode}，${l.errmsg}`) : new Error(`上传到公众号草稿失败: ${l}`);
-  } catch (a) {
-    throw a;
-  }
+async function de(t, e, r) {
+  const a = await re();
+  if (!a.access_token)
+    throw a.errcode ? new Error(`获取 Access Token 失败，错误码：${a.errcode}，${a.errmsg}`) : new Error(`获取 Access Token 失败: ${a}`);
+  const n = e.replace(/\n<li/g, "<li").replace(/<\/li>\n/g, "</li>"), { html: i, firstImageId: s } = await se(n, a.access_token);
+  let o = "";
+  if (r ? o = (await $(r, a.access_token, "cover.jpg")).media_id : s.startsWith("https://mmbiz.qpic.cn") ? o = (await $(s, a.access_token, "cover.jpg")).media_id : o = s, !o)
+    throw new Error("你必须指定一张封面图或者在正文中至少出现一张图片。");
+  const l = await ie(t, i, o, a.access_token);
+  if (l.media_id)
+    return l;
+  throw l.errcode ? new Error(`上传到公众号草稿失败，错误码：${l.errcode}，${l.errmsg}`) : new Error(`上传到公众号草稿失败: ${l}`);
 }
 export {
-  le as publishToDraft
+  de as publishToDraft
 };

package/dist/types/wechatApi.d.ts

@@ -0,0 +1,8 @@
+import { File, Blob } from "formdata-node";
+export type UploadResponse = {
+    media_id: string;
+    url: string;
+};
+export declare function fetchAccessToken(): Promise<any>;
+export declare function uploadMaterial(type: string, fileData: Blob | File, fileName: string, accessToken: string): Promise<any>;
+export declare function publishArticle(title: string, content: string, thumbMediaId: string, accessToken: string): Promise<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenyan-md/core",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Core library for Wenyan markdown rendering & publishing",
   "author": "Lei <caol64@gmail.com> (https://github.com/caol64)",
   "license": "Apache-2.0",
@@ -74,6 +74,7 @@
     "build:all": "pnpm build && pnpm build:browser && pnpm build:styles && pnpm build:math",
     "test:main": "pnpm build && vitest run main.test.js",
     "test:wrapper": "pnpm build && vitest run wrapper.test.js",
-    "test:publish": "pnpm build && vitest run publish.test.js"
+    "test:publish": "pnpm build && vitest run test/publish.test.js",
+    "test:realPublish": "pnpm build && vitest run test/realPublish.test.js"
   }
 }