@satorijs/adapter-dingtalk 2.0.3 → 2.0.5

package/lib/bot.d.ts

@@ -21,7 +21,7 @@ export declare namespace DingtalkBot {
         secret: string;
         protocol: string;
         appkey: string;
-        agentId: number;
+        agentId?: number;
         api: Quester.Config;
         oldApi: Quester.Config;
     }

package/lib/http.d.ts

@@ -1,7 +1,8 @@
-import { Adapter, Context, Logger } from '@satorijs/satori';
+import { Adapter, Context } from '@satorijs/satori';
 import { DingtalkBot } from './bot';
 export declare class HttpServer<C extends Context = Context> extends Adapter<C, DingtalkBot<C>> {
     static inject: string[];
-    logger: Logger;
+    private logger;
+    constructor(ctx: C, bot: DingtalkBot<C>);
     connect(bot: DingtalkBot<C>): Promise<void>;
 }

package/lib/index.js

@@ -61,10 +61,12 @@ async function decodeMessage(bot, body) {
   session.guildId = body.chatbotCorpId;
   if (body.conversationType === "1") {
     session.channelId = session.userId;
+    session.isDirect = true;
   } else {
     const atUsers = body.atUsers.filter((v) => v.dingtalkId !== body.chatbotUserId).map((v) => import_satori.h.at(v.staffId));
-    session.elements = [import_satori.h.at(body.robotCode), ...atUsers, ...session.elements];
+    session.elements = [import_satori.h.at(body.robotCode), ...atUsers];
     session.channelId = body.conversationId;
+    session.isDirect = false;
   }
   if (body.conversationTitle) {
     session.event.channel.name = body.conversationTitle;
@@ -104,7 +106,11 @@ __name(decodeMessage, "decodeMessage");
 
 // satori/adapters/dingtalk/src/http.ts
 var _HttpServer = class _HttpServer extends import_satori2.Adapter {
-  logger = new import_satori2.Logger("dingtalk");
+  logger;
+  constructor(ctx, bot) {
+    super(ctx);
+    this.logger = ctx.logger("dingtalk");
+  }
   async connect(bot) {
     await bot.refreshToken();
     await bot.getLogin();
@@ -279,7 +285,7 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
     this.bot.online();
     this.socket.addEventListener("message", async ({ data }) => {
       const parsed = JSON.parse(data.toString());
-      this.ctx.logger("dingtalk").debug(parsed);
+      this.bot.logger.debug(parsed);
       if (parsed.type === "SYSTEM") {
         if (parsed.headers.topic === "ping") {
           this.socket.send(JSON.stringify({
@@ -290,11 +296,11 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
           }));
         }
       } else if (parsed.type === "CALLBACK") {
-        this.ctx.logger("dingtalk").debug(JSON.parse(parsed.data));
+        this.bot.logger.debug(JSON.parse(parsed.data));
         const session = await decodeMessage(this.bot, JSON.parse(parsed.data));
         if (session)
           this.bot.dispatch(session);
-        this.ctx.logger("dingtalk").debug(session);
+        this.bot.logger.debug(session);
       }
     });
   }
@@ -360,15 +366,13 @@ __name(_Internal, "Internal");
 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";
+    super(ctx, config, "dingtalk");
     this.selfId = config.appkey;
     this.http = ctx.http.extend(config.api);
     this.oldHttp = ctx.http.extend(config.oldApi);
@@ -380,10 +384,27 @@ var _DingtalkBot = class _DingtalkBot extends import_satori6.Bot {
     }
   }
   async getLogin() {
-    const { appList } = await this.internal.oapiMicroappList();
-    const self = appList.find((v) => v.agentId === this.config.agentId);
-    this.user.name = self.name;
-    this.user.avatar = self.appIcon;
+    try {
+      const { appList } = await this.internal.listAllInnerApps();
+      const self2 = appList.find((v) => v.agentId === this.config.agentId);
+      if (self2) {
+        this.user.name = self2.name;
+        this.user.avatar = self2.icon;
+        return this.toJSON();
+      }
+    } catch (e) {
+      this.logger.warn(e);
+    }
+    const data = await this.internal.oapiMicroappList();
+    if (!data.appList) {
+      this.logger.error("getLogin failed: %o", data);
+      return this.toJSON();
+    }
+    const self = data.appList.find((v) => v.agentId === this.config.agentId);
+    if (self) {
+      this.user.name = self.name;
+      this.user.avatar = self.appIcon;
+    }
     return this.toJSON();
   }
   stop() {
@@ -396,7 +417,7 @@ var _DingtalkBot = class _DingtalkBot extends import_satori6.Bot {
       appKey: this.config.appkey,
       appSecret: this.config.secret
     });
-    logger.debug("gettoken result: %o", data);
+    this.logger.debug("gettoken result: %o", data);
     this.token = data.accessToken;
     this.http = this.http.extend({
       headers: {
@@ -438,7 +459,7 @@ var DingtalkBot = _DingtalkBot;
     }),
     import_satori6.Schema.object({
       secret: import_satori6.Schema.string().required().description("机器人密钥。"),
-      agentId: import_satori6.Schema.number().required().description("AgentId"),
+      agentId: import_satori6.Schema.number().description("AgentId"),
       appkey: import_satori6.Schema.string().required(),
       api: import_satori6.Quester.createConfig("https://api.dingtalk.com/v1.0/"),
       oldApi: import_satori6.Quester.createConfig("https://oapi.dingtalk.com/")