@satorijs/adapter-dingtalk 1.0.0 → 1.0.2

package/lib/api/contact.d.ts

@@ -13,7 +13,7 @@ export interface GetOrgAuthInfoResponse {
     authLevel: number;
 }
 export interface BatchApproveUnionApplyParams {
-    /** 申请的合作伙伴组织CorpId，参考[基础概念-CorpId](https://open.dingtalk.com/document/org/basic-concepts)。 */
+    /** 申请的合作伙伴组织 CorpId，参考[基础概念-CorpId](https://open.dingtalk.com/document/org/basic-concepts)。 */
     branchCorpId?: string;
     /** 合作伙伴组织在上下游组织内的名称。 */
     unionRootName?: string;

package/lib/bot.d.ts

@@ -7,8 +7,8 @@ export declare class DingtalkBot extends Bot<DingtalkBot.Config> {
     static MessageEncoder: typeof DingtalkMessageEncoder;
     oldHttp: Quester;
     http: Quester;
-    refreshTokenTimer: NodeJS.Timeout;
     internal: Internal;
+    refreshTokenTimer: NodeJS.Timeout;
     constructor(ctx: Context, config: DingtalkBot.Config);
     initialize(): Promise<void>;
     stop(): Promise<void>;

package/lib/index.js

@@ -4,6 +4,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
@@ -26,6 +27,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 
 // satori/adapters/dingtalk/src/index.ts
 var src_exports = {};
@@ -98,9 +103,9 @@ __name(decodeMessage, "decodeMessage");
 
 // satori/adapters/dingtalk/src/http.ts
 var _HttpServer = class _HttpServer extends import_satori2.Adapter.Server {
+  logger = new import_satori2.Logger("dingtalk");
   constructor(ctx, bot) {
     super();
-    this.logger = new import_satori2.Logger("dingtalk");
   }
   async start(bot) {
     await bot.refreshToken();
@@ -136,15 +141,11 @@ var import_form_data = __toESM(require("form-data"));
 var escape = /* @__PURE__ */ __name((val) => val.replace(/(?<!\u200b)[\*_~`]/g, "​$&").replace(/([\\`*_{}[\]\-(#!>])/g, "\\$&").replace(/([\-\*]|\d\.) /g, "​$&").replace(/^(\s{4})/gm, "​&nbsp;&nbsp;&nbsp;&nbsp;"), "escape");
 var unescape = /* @__PURE__ */ __name((val) => val.replace(/\u200b([\*_~`])/g, "$1"), "unescape");
 var _DingtalkMessageEncoder = class _DingtalkMessageEncoder extends import_satori3.MessageEncoder {
-  constructor() {
-    super(...arguments);
-    this.buffer = "";
-    /**
-     * Markdown: https://open.dingtalk.com/document/isvapp/robot-message-types-and-data-format
-     */
-    this.hasRichContent = true;
-    this.listType = null;
-  }
+  buffer = "";
+  /**
+   * Markdown: https://open.dingtalk.com/document/isvapp/robot-message-types-and-data-format
+   */
+  hasRichContent = true;
   async flush() {
     if (this.buffer.length && !this.hasRichContent) {
       await this.sendMessage("sampleText", {
@@ -198,6 +199,7 @@ var _DingtalkMessageEncoder = class _DingtalkMessageEncoder extends import_sator
     });
     return media_id;
   }
+  listType = null;
   async visit(element) {
     const { type, attrs, children } = element;
     if (type === "text") {
@@ -209,9 +211,14 @@ var _DingtalkMessageEncoder = class _DingtalkMessageEncoder extends import_sator
       await this.render(children);
     } else if (type === "at") {
       this.buffer += `@${attrs.id}`;
-    } else if (type === "p") {
+    } else if (type === "br") {
       this.buffer += "\n";
+    } else if (type === "p") {
+      if (!this.buffer.endsWith("\n"))
+        this.buffer += "\n";
       await this.render(children);
+      if (!this.buffer.endsWith("\n"))
+        this.buffer += "\n";
       this.buffer += "\n";
     } else if (type === "b" || type === "strong") {
       this.buffer += ` **`;
@@ -357,8 +364,13 @@ var Internal = _Internal;
 // satori/adapters/dingtalk/src/bot.ts
 var logger = new import_satori6.Logger("dingtalk");
 var _DingtalkBot = class _DingtalkBot extends import_satori6.Bot {
+  oldHttp;
+  http;
+  internal;
+  refreshTokenTimer;
   constructor(ctx, config) {
     super(ctx, config);
+    this.platform = "dingtalk";
     this.http = ctx.http.extend(config.api);
     this.oldHttp = ctx.http.extend(config.oldApi);
     this.internal = new Internal(this);
@@ -378,6 +390,7 @@ var _DingtalkBot = class _DingtalkBot extends import_satori6.Bot {
   stop() {
     clearTimeout(this.refreshTokenTimer);
   }
+  token;
   async refreshToken() {
     const data = await this.internal.getAccessToken({
       appKey: this.config.appkey,
@@ -416,7 +429,7 @@ var _DingtalkBot = class _DingtalkBot extends import_satori6.Bot {
   }
 };
 __name(_DingtalkBot, "DingtalkBot");
-_DingtalkBot.MessageEncoder = DingtalkMessageEncoder;
+__publicField(_DingtalkBot, "MessageEncoder", DingtalkMessageEncoder);
 var DingtalkBot = _DingtalkBot;
 ((DingtalkBot2) => {
   DingtalkBot2.Config = import_satori6.Schema.intersect([
@@ -433,7 +446,6 @@ var DingtalkBot = _DingtalkBot;
     WsClient.Config
   ]);
 })(DingtalkBot || (DingtalkBot = {}));
-DingtalkBot.prototype.platform = "dingtalk";
 
 // satori/adapters/dingtalk/src/api/oauth2.ts
 Internal.define({