@imessaging/telegram-mtproto 0.8.8 → 0.8.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imessaging/telegram-mtproto",
-  "version": "0.8.8",
+  "version": "0.8.10",
   "description": "Telegram MTProto user-account transport for imessaging",
   "keywords": [
     "messaging",
@@ -31,7 +31,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@imessaging/core": "^0.8.8",
+    "@imessaging/core": "^0.8.9",
     "big-integer": "^1.6.52"
   },
   "peerDependencies": {

package/src/telegram-mtproto-transport.ts

@@ -7,6 +7,8 @@ import type {
   DraftTransport,
   MessageDraft,
   OutgoingObserverTransport,
+  OutgoingReadReceipt,
+  OutgoingReadReceiptTransport,
   ButtonPress,
   ButtonPressTransport,
   IncomingAttachment,
@@ -19,6 +21,7 @@ import type {
   EditResult,
   MessageReaction,
   MessageRecipient,
+  OutboundButton,
   OutboundMessage,
   ReactionTransport,
   ResolvedPeer,
@@ -34,6 +37,7 @@ import { peerToChat, unmarkPeerId } from "./incoming";
 import bigInt from "big-integer";
 import { Api, TelegramClient } from "telegram";
 import { CustomFile } from "telegram/client/uploads";
+import { Button } from "telegram/tl/custom/button";
 import { CallbackQuery } from "telegram/events/CallbackQuery";
 import { NewMessage } from "telegram/events/NewMessage";
 import { EditedMessage } from "telegram/events/EditedMessage";
@@ -110,6 +114,17 @@ function inputPeerChatId(peer: Api.TypeInputPeer): string {
   throw new Error(`Unsupported input peer: ${peer.className}`);
 }
 
+function toGramJsButtons(buttons?: OutboundButton[][]) {
+  if (!buttons || buttons.length === 0) return undefined;
+  return buttons.map((row) =>
+    row.map((button) => {
+      if (button.url) return Button.url(button.text, button.url);
+      if (button.callbackData) return Button.inline(button.text, Buffer.from(button.callbackData));
+      return Button.text(button.text);
+    }),
+  );
+}
+
 export class TelegramMtprotoTransport
   implements
     ContactTransport,
@@ -119,6 +134,7 @@ export class TelegramMtprotoTransport
     ButtonPressTransport,
     IncomingMessageTransport,
     OutgoingObserverTransport,
+    OutgoingReadReceiptTransport,
     PhoneLookupTransport,
     ReactionTransport,
     ReadReceiptTransport,
@@ -137,6 +153,10 @@ export class TelegramMtprotoTransport
   private outgoingListener: ((event: unknown) => void) | null = null;
   private readonly outgoingEdits = new OutgoingDispatcher();
   private outgoingEditListener: ((event: unknown) => void) | null = null;
+  private readonly outgoingReads = new Set<
+    (receipt: OutgoingReadReceipt) => void | Promise<void>
+  >();
+  private outgoingReadListener: ((event: unknown) => void) | null = null;
   /**
    * Что отправил и поправил сам транспорт: «чат:сообщение» → когда. Своё приходит тем же обновлением
    * out=true, что и отправленное человеком с телефона, и без этой памяти их не различить.
@@ -426,6 +446,46 @@ export class TelegramMtprotoTransport
     };
   }
 
+  /** Прочтение собеседником наших исходящих сообщений. */
+  onOutgoingRead(handler: (receipt: OutgoingReadReceipt) => void | Promise<void>): () => void {
+    this.outgoingReads.add(handler);
+    if (this.outgoingReadListener === null) {
+      this.outgoingReadListener = (event: unknown): void => {
+        if (event instanceof Api.UpdateReadHistoryOutbox) {
+          try {
+            const { chatId } = peerToChat(event.peer);
+            const receipt: OutgoingReadReceipt = {
+              chatId,
+              maxMessageId: event.maxId.toString(),
+              readAt: new Date(),
+            };
+            for (const fn of this.outgoingReads) void fn(receipt);
+          } catch {
+            // неизвестный пир
+          }
+        } else if (event instanceof Api.UpdateReadChannelOutbox) {
+          try {
+            const receipt: OutgoingReadReceipt = {
+              chatId: `-100${event.channelId.toString()}`,
+              maxMessageId: event.maxId.toString(),
+              readAt: new Date(),
+            };
+            for (const fn of this.outgoingReads) void fn(receipt);
+          } catch {
+            // неизвестный канал
+          }
+        }
+      };
+      this.client.addEventHandler(this.outgoingReadListener);
+    }
+    return () => {
+      this.outgoingReads.delete(handler);
+      if (this.outgoingReads.size > 0 || this.outgoingReadListener === null) return;
+      this.client.removeEventHandler(this.outgoingReadListener, undefined as never);
+      this.outgoingReadListener = null;
+    };
+  }
+
   private async dispatchOwn(
     dispatcher: OutgoingDispatcher,
     own: Map<string, number>,
@@ -809,6 +869,7 @@ export class TelegramMtprotoTransport
         parseMode,
         formattingEntities,
         replyTo: message.replyToMessageId ?? message.threadId,
+        buttons: toGramJsButtons(message.buttons),
       });
       this.rememberOwn(this.ownSent, peer, sent.id);
       for (const document of message.documents ?? []) {
@@ -975,13 +1036,12 @@ export class TelegramMtprotoTransport
       const text = ft ? ft.text : message.text;
       const parseMode = ft ? undefined : message.parseMode?.toLowerCase();
       const formattingEntities = ft ? toTelegramEntities(ft) : undefined;
-      // Кнопки здесь не передаются — ровно как и при отправке этим транспортом: inline-клавиатуру
-      // MTProto-аккаунт не рисует. Передать их сюда значило бы обещать разметку, которой не будет.
       await this.client.editMessage(peer, {
         message: messageId,
         text,
         parseMode,
         formattingEntities,
+        buttons: toGramJsButtons(message.buttons),
       });
       this.lastActivityAt = new Date();
       return {