@satorijs/adapter-lark 3.6.1 → 3.7.0

package/lib/index.cjs

@@ -116,6 +116,15 @@ async function adaptSession(bot, body) {
       adaptSender(body.event.sender, session);
       await adaptMessage(bot, body.event, session);
       break;
+    case "application.bot.menu_v6":
+      if (body.event.event_key.startsWith("command:")) {
+        session.type = "interaction/command";
+        session.content = body.event.event_key.slice(8);
+        session.channelId = body.event.operator.operator_id.open_id;
+        session.userId = body.event.operator.operator_id.open_id;
+        session.isDirect = true;
+      }
+      break;
     case "card.action.trigger":
       if (body.event.action.value?._satori_type === "command") {
         session.type = "interaction/command";
@@ -138,11 +147,16 @@ async function adaptSession(bot, body) {
         for (const [key, value] of Object.entries(options)) {
           content += ` --${key} ${value}`;
         }
+        if (body.event.action.input_value) {
+          content += ` ${body.event.action.input_value}`;
+        }
         session.content = content;
         session.messageId = body.event.context.open_message_id;
         session.channelId = body.event.context.open_chat_id;
         session.guildId = body.event.context.open_chat_id;
         session.userId = body.event.operator.open_id;
+        const chat = await bot.internal.getImChat(session.channelId);
+        session.isDirect = chat.chat_mode === "p2p";
       }
       break;
   }
@@ -388,23 +402,27 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
   quote;
   textContent = "";
   richContent = [];
-  cardElements;
+  card;
+  noteElements;
   actionElements = [];
   async post(data) {
     try {
       let resp;
-      if (this.quote) {
-        resp = await this.bot.internal.replyImMessage(this.quote, data);
+      if (this.quote?.id) {
+        resp = await this.bot.internal.replyImMessage(this.quote.id, {
+          ...data,
+          reply_in_thread: this.quote.replyInThread
+        });
       } else {
         data.receive_id = this.channelId;
-        resp = await this.bot.internal?.createImMessage(data, {
+        resp = await this.bot.internal.createImMessage(data, {
           receive_id_type: extractIdType(this.channelId)
         });
       }
       const session = this.bot.session();
-      session.messageId = resp.data.message_id;
-      session.timestamp = Number(resp.data.create_time) * 1e3;
-      session.userId = resp.data.sender.id;
+      session.messageId = resp.message_id;
+      session.timestamp = Number(resp.create_time) * 1e3;
+      session.userId = resp.sender.id;
       session.channelId = this.channelId;
       session.guildId = this.guildId;
       session.app.emit(session, "send", session);
@@ -419,25 +437,30 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
       this.errors.push(e);
     }
   }
-  flushText(flushAction = false) {
-    if ((this.textContent || flushAction) && this.actionElements.length) {
-      this.cardElements?.push({ tag: "action", actions: this.actionElements });
+  flushText(button = false) {
+    if ((this.textContent || !button) && this.actionElements.length) {
+      this.card.elements.push({ tag: "action", actions: this.actionElements, layout: "flow" });
       this.actionElements = [];
     }
     if (this.textContent) {
       this.richContent.push([{ tag: "md", text: this.textContent }]);
-      this.cardElements?.push({ tag: "markdown", content: this.textContent });
+      if (this.noteElements) {
+        this.noteElements.push({ tag: "plain_text", content: this.textContent });
+      } else if (this.card) {
+        this.card.elements.push({ tag: "markdown", content: this.textContent });
+      }
       this.textContent = "";
     }
   }
   async flush() {
     this.flushText();
-    if (!this.cardElements && !this.richContent.length) return;
-    if (this.cardElements) {
+    if (!this.card && !this.richContent.length) return;
+    if (this.card) {
+      this.bot.logger.debug("card", JSON.stringify(this.card.elements));
       await this.post({
         msg_type: "interactive",
         content: JSON.stringify({
-          elements: this.cardElements
+          elements: this.card.elements
         })
       });
     } else {
@@ -453,14 +476,14 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
     this.quote = void 0;
     this.textContent = "";
     this.richContent = [];
-    this.cardElements = void 0;
+    this.card = void 0;
   }
   async createImage(url) {
     const { filename, type, data } = await this.bot.assetsQuester.file(url);
     const payload = new FormData();
     payload.append("image", new Blob([data], { type }), filename);
     payload.append("image_type", "message");
-    const { data: { image_key } } = await this.bot.internal.createImImage(payload);
+    const { image_key } = await this.bot.internal.createImImage(payload);
     return image_key;
   }
   async sendFile(_type, attrs) {
@@ -484,12 +507,31 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
         payload.append("file_type", "stream");
       }
     }
-    const { data: { file_key } } = await this.bot.internal.createImFile(payload);
+    const { file_key } = await this.bot.internal.createImFile(payload);
     await this.post({
       msg_type: _type === "video" ? "media" : _type,
       content: JSON.stringify({ file_key })
     });
   }
+  createBehavior(attrs) {
+    const behaviors = [];
+    if (attrs.type === "link") {
+      behaviors.push({
+        type: "open_url",
+        default_url: attrs.href
+      });
+    } else if (attrs.type === "input") {
+      behaviors.push({
+        type: "callback",
+        value: {
+          _satori_type: "command",
+          content: attrs.text
+        }
+      });
+    } else if (attrs.type === "action") {
+    }
+    return behaviors.length ? behaviors : void 0;
+  }
   async visit(element) {
     const { type, attrs, children } = element;
     if (type === "text") {
@@ -512,7 +554,7 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
     } else if (type === "sharp") {
     } else if (type === "quote") {
       await this.flush();
-      this.quote = attrs.id;
+      this.quote = attrs;
     } else if (type === "img" || type === "image") {
       const image_key = await this.createImage(attrs.src || attrs.url);
       this.textContent += `![${attrs.alt ?? "图片"}](${image_key})`;
@@ -527,25 +569,41 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
     } else if (type === "hr") {
       this.flushText();
       this.richContent.push([{ tag: "hr" }]);
-      this.cardElements?.push({ tag: "hr" });
-    } else if (type === "button") {
+      this.card?.elements.push({ tag: "hr" });
+    } else if (type === "form") {
       this.flushText();
-      const behaviors = [];
-      if (attrs.type === "link") {
-        behaviors.push({
-          type: "open_url",
-          default_url: attrs.href
-        });
-      } else if (attrs.type === "input") {
-        behaviors.push({
-          type: "callback",
-          value: {
-            _satori_type: "command",
-            content: attrs.text
-          }
+      const length = this.card?.elements.length;
+      await this.render(children);
+      if (this.card?.elements.length > length) {
+        const elements = this.card?.elements.slice(length);
+        this.card.elements.push({
+          tag: "form",
+          name: attrs.name || "Form",
+          elements
         });
-      } else if (attrs.type === "action") {
       }
+    } else if (type === "input") {
+      this.flushText();
+      this.card?.elements.push({
+        tag: "action",
+        actions: [{
+          tag: "input",
+          name: attrs.name,
+          width: attrs.width,
+          label: attrs.label && {
+            tag: "plain_text",
+            content: attrs.label
+          },
+          placeholder: attrs.placeholder && {
+            tag: "plain_text",
+            content: attrs.placeholder
+          },
+          behaviors: this.createBehavior(attrs)
+        }]
+      });
+    } else if (type === "button") {
+      this.card ??= { elements: [] };
+      this.flushText(true);
       await this.render(children);
       this.actionElements.push({
         tag: "button",
@@ -553,13 +611,14 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
           tag: "plain_text",
           content: this.textContent
         },
-        behaviors
+        disabled: attrs.disabled,
+        behaviors: this.createBehavior(attrs)
       });
       this.textContent = "";
     } else if (type === "button-group") {
-      this.flushText(true);
+      this.flushText();
       await this.render(children);
-      this.flushText(true);
+      this.flushText();
     } else if (type.startsWith("lark:") || type.startsWith("feishu:")) {
       const tag = type.slice(type.split(":", 1)[0].length + 1);
       if (tag === "share-chat") {
@@ -588,18 +647,51 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
         this.textContent = "";
       } else if (tag === "card") {
         await this.flush();
-        this.cardElements = [];
+        this.card = {
+          elements: [],
+          header: attrs.title && {
+            template: attrs.color,
+            ud_icon: attrs.icon && {
+              tag: "standard_icon",
+              token: attrs.icon
+            },
+            title: {
+              tag: "plain_text",
+              content: attrs.title
+            },
+            subtitle: attrs.subtitle && {
+              tag: "plain_text",
+              content: attrs.subtitle
+            }
+          }
+        };
         await this.render(children, true);
       } else if (tag === "div") {
         this.flushText();
         await this.render(children);
-        this.cardElements?.push({
+        this.card?.elements.push({
           tag: "markdown",
           text_align: attrs.align,
           text_size: attrs.size,
           content: this.textContent
         });
         this.textContent = "";
+      } else if (tag === "note") {
+        this.flushText();
+        this.noteElements = [];
+        await this.render(children);
+        this.flushText();
+        this.card?.elements.push({
+          tag: "note",
+          elements: this.noteElements
+        });
+        this.noteElements = void 0;
+      } else if (tag === "icon") {
+        this.flushText();
+        this.noteElements?.push({
+          tag: "standard_icon",
+          token: attrs.token
+        });
       }
     } else {
       await this.render(children);
@@ -622,16 +714,14 @@ var Internal = class _Internal {
   static {
     __name(this, "Internal");
   }
-  processReponse(response) {
-    const { code, msg } = response;
-    if (code === 0) {
-      return response;
-    } else {
-      this.bot.logger.debug("response: %o", response);
-      throw new Error(`HTTP response with non-zero status (${code}) with message "${msg}"`);
-    }
+  assertResponse(response) {
+    if (!response.data.code) return;
+    this.bot.logger.debug("response: %o", response.data);
+    const error = new import_core4.HTTP.Error(`request failed`);
+    error.response = response;
+    throw error;
   }
-  static define(routes) {
+  static define(routes, extractData = true) {
     for (const path in routes) {
       for (const key in routes[path]) {
         const method = key;
@@ -655,7 +745,9 @@ var Internal = class _Internal {
             } else if (args.length > 1) {
               throw new Error(`too many arguments for ${path}, received ${raw}`);
             }
-            return this.processReponse((await this.bot.http(method, url, config)).data);
+            const response = await this.bot.http(method, url, config);
+            this.assertResponse(response.data);
+            return extractData ? response.data.data : response.data;
           };
         }
       }
@@ -665,9 +757,6 @@ var Internal = class _Internal {
 
 // src/types/api.ts
 Internal.define({
-  "/event/v1/outbound_ip": {
-    GET: "listEventOutboundIp"
-  },
   "/auth/v3/tenant_access_token/internal": {
     POST: "tenantAccessTokenInternalAuth"
   },
@@ -680,15 +769,20 @@ Internal.define({
   "/auth/v3/tenant_access_token": {
     POST: "tenantAccessTokenAuth"
   },
+  "/auth/v3/app_ticket/resend": {
+    POST: "appTicketResendAuth"
+  }
+}, false);
+Internal.define({
+  "/event/v1/outbound_ip": {
+    GET: "listEventOutboundIp"
+  },
   "/authen/v1/oidc/access_token": {
     POST: "createAuthenOidcAccessToken"
   },
   "/authen/v1/oidc/refresh_access_token": {
     POST: "createAuthenOidcRefreshAccessToken"
   },
-  "/auth/v3/app_ticket/resend": {
-    POST: "appTicketResendAuth"
-  },
   "/authen/v1/user_info": {
     GET: "getAuthenUserInfo"
   },
@@ -3215,39 +3309,39 @@ var LarkBot = class extends import_core5.Bot {
   }
   async getMessage(channelId, messageId, recursive = true) {
     const data = await this.internal.getImMessage(messageId);
-    const message = await decodeMessage(this, data.data.items[0], recursive);
+    const message = await decodeMessage(this, data.items[0], recursive);
     const im = await this.internal.getImChat(channelId);
-    message.channel.type = im.data.chat_mode === "p2p" ? import_core5.Universal.Channel.Type.DIRECT : import_core5.Universal.Channel.Type.TEXT;
+    message.channel.type = im.chat_mode === "p2p" ? import_core5.Universal.Channel.Type.DIRECT : import_core5.Universal.Channel.Type.TEXT;
     return message;
   }
   async getMessageList(channelId, before) {
-    const { data: messages } = await this.internal.listImMessage({ container_id_type: "chat", container_id: channelId, page_token: before });
+    const messages = await this.internal.listImMessage({ container_id_type: "chat", container_id: channelId, page_token: before });
     const data = await Promise.all(messages.items.reverse().map((data2) => decodeMessage(this, data2)));
     return { data, next: data[0]?.id };
   }
   async getUser(userId, guildId) {
     const data = await this.internal.getContactUser(userId);
-    return decodeUser(data.data.user);
+    return decodeUser(data.user);
   }
   async getChannel(channelId) {
-    const { data } = await this.internal.getImChat(channelId);
-    return decodeChannel(channelId, data);
+    const chat = await this.internal.getImChat(channelId);
+    return decodeChannel(channelId, chat);
   }
   async getChannelList(guildId) {
     return { data: [await this.getChannel(guildId)] };
   }
   async getGuild(guildId) {
-    const { data } = await this.internal.getImChat(guildId);
-    return decodeGuild(data);
+    const chat = await this.internal.getImChat(guildId);
+    return decodeGuild(chat);
   }
   async getGuildList(after) {
-    const { data: guilds } = await this.internal.listImChat({ page_token: after });
-    return { data: guilds.items.map(decodeGuild), next: guilds.page_token };
+    const chats = await this.internal.listImChat({ page_token: after });
+    return { data: chats.items.map(decodeGuild), next: chats.page_token };
   }
   async getGuildMemberList(guildId, after) {
-    const { data: users } = await this.internal.getImChatMembers(guildId, { page_token: after });
-    const data = users.items.map((v) => ({ user: { id: v.member_id, name: v.name }, name: v.name }));
-    return { data, next: users.page_token };
+    const members = await this.internal.getImChatMembers(guildId, { page_token: after });
+    const data = members.items.map((v) => ({ user: { id: v.member_id, name: v.name }, name: v.name }));
+    return { data, next: members.page_token };
   }
 };
 ((LarkBot2) => {