Улучшения

Author: BoryaGames

src/core.js

@@ -4,7 +4,7 @@ var { EventEmitter } = require("events");
 var util = require("./util.js");
 var { Opcode } = require("./enums.js");
 var { InvalidPhoneError, AppOldError, FailedToLoginError, InvalidPayloadError, InvalidQRDataError, QRExpiredError } = require("./errors.js");
-var { Dialog, Chat, Channel, User, Me } = require("./types.js");
+var { Dialog, Chat, Channel, User, Me, Message } = require("./types.js");
 var chalk = require("chalk");
 var WebSocket = require("ws");
 var UserAgent = require("user-agents");
@@ -241,6 +241,47 @@ class BaseClient extends EventEmitter {
     }
     this._log("info", `Sync completed: dialogs=${this.dialogs.length} chats=${this.chats.length} channels=${this.channels.length}`);
   }
+  async _handlePacket(packet) {
+    var { payload } = packet;
+    if (packet.opcode == Opcode.NOTIF_MESSAGE) {
+      var msg = new Message(payload);
+      if (msg.chatId && msg.id) {
+        this._send(Opcode.NOTIF_MESSAGE, {
+          "chatId": msg.chatId,
+          "messageId": msg.id.toString()
+        }, 1);
+        this._log("debug", `Sent NOTIF_MESSAGE_RECEIVED for chat_id=${msg.chatId} message_id=${msg.id}`);
+      }
+      if (payload.status == "EDITED") {
+        this.emit("messageEdit", msg);
+      } else if (payload.status == "REMOVED") {
+        this.emit("messageDelete", msg);
+      } else {
+        this.emit("message", msg);
+      }
+    }
+  }
+  sendMessage(chatId, data) {
+    if (typeof data === "string") {
+      data = {
+        "text": data
+      };
+    }
+    if (typeof data.notify === "undefined") {
+      data.notify = true;
+    }
+    this._log("info", `Sending message to chat_id=${chatId} notify=${data.notify}`);
+    this._send(Opcode.MSG_SEND, {
+      chatId,
+      "message": {
+        "text": data.text,
+        "cid": -Date.now(),
+        "elements": [],
+        "attaches": []
+      },
+      "notify": data.notify
+    });
+  }
 }
 
 class MaxClient extends BaseClient {
@@ -269,6 +310,9 @@ class MaxClient extends BaseClient {
         setTimeout(() => this.start(), this.reconnectDelay * 1000);
       }
     });
+    this._connection.on("message", data => {
+      this._handlePacket(JSON.parse(data.toString("utf-8")));
+    });
     return new Promise(res => {
       this._connection.on("open", () => {
         this.isConnected = true;

src/index.d.ts

@@ -241,7 +241,41 @@ declare namespace NodeMax {
     })
     names: Name[]
   }
-  class Message {}
+  class Message {
+    constructor(data: {
+      public chatId: int | null
+      public sender: int | null
+      elements: {
+        type: "EMPHASIZED" | "STRIKETHROUGH" | "STRONG" | "UNDERLINE"
+        length: int
+        from: int | null
+      }[]
+      reactionInfo: {
+        totalCount: int
+        counters: {
+          count: int
+          reaction: string
+        }[]
+        yourReaction: string | null
+      }
+      public options: int | null
+      public id: int
+      public time: int
+      link: {
+        public chatId: int
+        message: {}
+        public type: string
+      }
+      public text: string
+      public status: "EDITED" | "REMOVED" | null
+      public type: "SERVICE" | "SYSTEM" | "TEXT"
+      attaches: {}[]
+    })
+    elements: Element[]
+    reactionInfo: ReactionInfo
+    link: MessageLink
+    attaches: {}[]
+  }
   class Name {
     constructor(data: {
       public name: string
@@ -250,6 +284,38 @@ declare namespace NodeMax {
       public type: string
     })
   }
+  class Element {
+    constructor(data: {
+      public type: "EMPHASIZED" | "STRIKETHROUGH" | "STRONG" | "UNDERLINE"
+      public length: int
+      public from: int | null
+    })
+  }
+  class MessageLink {
+    constructor(data: {
+      public chatId: int
+      message: {}
+      public type: string
+    })
+    message: Message
+  }
+  class ReactionInfo {
+    constructor(data: {
+      public totalCount: int
+      counters: {
+        count: int
+        reaction: string
+      }[]
+      public yourReaction: string | null
+    })
+    counters: ReactionCounter[]
+  }
+  class ReactionCounter {
+    constructor(data: {
+      public count: int
+      public reaction: string
+    })
+  }
 }
 
 export = NodeMax;

src/index.js

@@ -1,6 +1,6 @@
 const { MaxClient, SocketMaxClient } = require("./core.js");
 const { InvalidPhoneError, AppOldError, FailedToLoginError, InvalidPayloadError, InvalidQRDataError, QRExpiredError } = require("./errors.js");
 const { Opcode } = require("./enums.js");
-const { Dialog, Chat, Channel, User, Me } = require("./types.js");
+const { Dialog, Chat, Channel, User, Me, Message, Name, Element, MessageLink, ReactionInfo, ReactionCounter } = require("./types.js");
 
-module.exports = { MaxClient, SocketMaxClient, InvalidPhoneError, AppOldError, FailedToLoginError, InvalidPayloadError, InvalidQRDataError, QRExpiredError, Opcode, Dialog, Chat, Channel, User, Me };
+module.exports = { MaxClient, SocketMaxClient, InvalidPhoneError, AppOldError, FailedToLoginError, InvalidPayloadError, InvalidQRDataError, QRExpiredError, Opcode, Dialog, Chat, Channel, User, Me, Message, Name, Element, MessageLink, ReactionInfo, ReactionCounter };

src/types.js

@@ -56,8 +56,28 @@ class Me {
   }
 }
 
-// TODO
-class Message {}
+class Message {
+  constructor(data) {
+    if (data.id) {
+      data = {
+        "message": data
+      };
+    }
+    this.chatId = data.chatId;
+    this.sender = data.message.sender;
+    this.elements = (data.elements || []).map(element => new Element(element));
+    this.options = data.message.options;
+    this.id = data.message.id;
+    this.time = data.message.time;
+    this.text = data.message.text;
+    this.type = data.message.type;
+    // TODO
+    this.attaches = [];
+    this.status = data.message.status;
+    this.link = (data.message.link ? new MessageLink(data.message.link) : null);
+    this.reactionInfo = (data.message.reactionInfo ? new ReactionInfo(data.message.reactionInfo) : null);
+  }
+}
 
 class Name {
   constructor(data) {
@@ -68,4 +88,35 @@ class Name {
   }
 }
 
-module.exports = { Dialog, Chat, Channel, User, Me, Message, Name };
+class Element {
+  constructor(data) {
+    this.type = data.type;
+    this.length = data.length;
+    this.from = data.from;
+  }
+}
+
+class MessageLink {
+  constructor(data) {
+    this.chatId = data.chatId;
+    this.message = (data.message ? new Message(data.message) : null);
+    this.type = data.type;
+  }
+}
+
+class ReactionInfo {
+  constructor(data) {
+    this.totalCount = data.totalCount;
+    this.counters = (data.counters || []).map(counter => new ReactionCounter(counter));
+    this.yourReaction = data.yourReaction;
+  }
+}
+
+class ReactionCounter {
+  constructor(data) {
+    this.count = data.count;
+    this.reaction = data.reaction;
+  }
+}
+
+module.exports = { Dialog, Chat, Channel, User, Me, Message, Name, Element, MessageLink, ReactionInfo, ReactionCounter };