catto.js 0.9.0 → 0.9.1

package/Server.js

@@ -181,10 +181,20 @@ class Server extends EventEmitter {
     }
     return context.__output;
   }
-  static injectCJS(app) {
+  static injectCJS(app, nows) {
     app.engine("cjs", Server.renderCJS.bind(null, app)).set("view engine", "cjs").get("/_cattojs/cjs_client.js", (req, res) => {
       res.sendFile(path.join(__dirname, "cjs_client.js"));
     });
+    if (!nows && !app.ws) {
+      expressWs(app);
+      app._cjs_sdynamic = [];
+      app.ws("/_cattojs/cjs_sdynamic", (ws, req) => {
+        app._cjs_sdynamic.push(ws);
+        ws.on("close", () => {
+          app._cjs_sdynamic = app._cjs_sdynamic.filter(client => client !== ws);
+        });
+      });
+    }
   }
   static fa(text) {
     return (req,res) => {

package/TelegramBot.js

@@ -1,6 +1,6 @@
 var events = require("events");
 var crypto = require("crypto");
-var Telegram = require("node-telegram-bot-api");
+var { Telegraf } = require("telegraf");
 var TelegramMessage = require("./TelegramMessage");
 var TelegramInteraction = require("./TelegramInteraction");
 var TelegramUser = require("./TelegramUser");
@@ -11,19 +11,13 @@ module.exports = class extends EventEmitter {
   constructor(options, client) {
     super();
     this.options = Object.assign({
-      "speed": 300,
       "token": "",
       "debug": !1
     }, options || {});
     if (client) {
       this.client = client;
     } else {
-      this.client = new Telegram(this.options.token, {
-        "polling": {
-          "interval": this.options.speed,
-          "autoStart": !1
-        }
-      });
+      this.client = new Telegraf(this.options.token);
     }
     this.commands = new Map();
     this.slashCommands = new Map();
@@ -84,8 +78,8 @@ module.exports = class extends EventEmitter {
     this.menubtn = { target, label, link };
     return this;
   }
-  async run() {
-    await this.client.startPolling();
+  run() {
+    this.client.launch();
     var commands = [];
     for (var cmd of this.slashCommands.values()) {
       commands.push({
@@ -93,10 +87,10 @@ module.exports = class extends EventEmitter {
         "description": cmd.description
       });
     }
-    this.client.setMyCommands(commands);
+    this.client.telegram.setMyCommands(commands);
     if (this.menubtn.target == "web") {
-      this.client.setChatMenuButton({
-        "menu_button": JSON.stringify({
+      this.client.telegram.setChatMenuButton({
+        "menuButton": JSON.stringify({
           "type": "web_app",
           "text": this.menubtn.label,
           "web_app": {
@@ -105,8 +99,8 @@ module.exports = class extends EventEmitter {
         })
       });
     } else {
-      this.client.setChatMenuButton({
-        "menu_button": JSON.stringify({
+      this.client.telegram.setChatMenuButton({
+        "menuButton": JSON.stringify({
           "type": "commands"
         })
       });
@@ -128,8 +122,8 @@ module.exports = class extends EventEmitter {
     var checkHash = crypto.createHmac("sha256", secretKey).update(dcs).digest("hex");
     return (checkHash === hash ? new TelegramUser(JSON.parse(dcs.split("\n").find(a => a.startsWith("user=")).split("=")[1]), this) : null);
   }
-  async stop() {
-    await this.client.stopPolling();
+  stop() {
+    this.client.bot("SIGINT");
     return this;
   }
 };

package/TelegramChannel.js

@@ -9,11 +9,11 @@ module.exports = class {
     return this.data.id;
   }
   async type() {
-    await this.bot.client.sendChatAction(this.id, "typing");
+    await this.bot.client.telegram.sendChatAction(this.id, "typing");
   }
   async startTyping() {
     if (this.typingLoop === null) {
-      await this.bot.client.sendChatAction(this.id, "typing");
+      await this.type();
       this.typingLoop = setInterval(() => this.type(), 4e3);
     }
   }
@@ -30,7 +30,7 @@ module.exports = class {
     if (data instanceof TelegramMessageBuilder) {
       data = data.data;
     }
-    await this.bot.client.sendMessage(this.id, data.content, {
+    await this.bot.client.telegram.sendMessage(this.id, data.content, {
       "reply_parameters": data.replyParameters ? {
         "message_id": data.replyParameters.message.id,
         "chat_id": (data.replyParameters.channel ? data.replyParameters.channel.id : this.id),

package/TelegramInteraction.js

@@ -3,20 +3,19 @@ module.exports = class {
   constructor(data, bot) {
     this._data = data;
     this.bot = bot;
-    this.message = new TelegramMessage(this._data.message, bot);
+    this.message = new TelegramMessage(this._data.callbackQuery.message, bot);
   }
   get id() {
-    return this._data.id;
+    return this._data.callbackQuery.id;
   }
   get data() {
-    return this._data.data;
+    return this._data.callbackQuery.data;
   }
   async notify(text) {
-    await this.bot.client.answerCallbackQuery(this.id, { text });
+    await this.bot.client.telegram.answerCbQuery(this.id, text);
   }
   async modal(text) {
-    await this.bot.client.answerCallbackQuery(this.id, {
-      text,
+    await this.bot.client.telegram.answerCbQuery(this.id, text, {
       "show_alert": !0
     });
   }

package/TelegramMessage.js

@@ -1,5 +1,6 @@
 var TelegramChannel = require("./TelegramChannel");
 var TelegramUser = require("./TelegramUser");
+var TelegramMessageBuilder = require("./TelegramMessageBuilder");
 module.exports = class {
   constructor(data, bot) {
     this.data = data;
@@ -10,10 +11,10 @@ module.exports = class {
     this.bot.users.set(this.user.id, this.user);
   }
   get id() {
-    return this.data.message_id;
+    return this.data.message.message_id;
   }
   get content() {
-    return this.data.text;
+    return this.data.message.text;
   }
   reply(data) {
     if (typeof data !== "object") {
@@ -21,6 +22,12 @@ module.exports = class {
         "content": data
       };
     }
+    if (data instanceof TelegramMessageBuilder) {
+      data.data.replyParameters = {
+        "message": this
+      };
+      return this.channel.send(data);
+    }
     return this.channel.send(Object.assign({
       "replyParameters": {
         "message": this

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "catto.js",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Universal module for everything.",
   "main": "index.js",
   "scripts": {
@@ -49,17 +49,9 @@
     "express": "^4.19.2",
     "express-session": "^1.18.0",
     "express-ws": "^5.0.2",
-    "node-telegram-bot-api": "^0.66.0",
-    "request": "^2.88.2",
+    "node-fetch": "^2.7.0",
     "session-file-store": "^1.5.0",
-    "tweetnacl": "^1.0.3",
-    "uri-js-replace": "^1.0.0",
-    "tough-cookie": "next"
-  },
-  "overrides": {
-    "uri-js": {
-      "uri-js-replace": "^1.0.0"
-    },
-    "tough-cookie": "next"
+    "telegraf": "^4.16.3",
+    "tweetnacl": "^1.0.3"
   }
 }

package/request.js

@@ -1,20 +1,29 @@
 /** @module request */
 
-var request = require("request");
+var { default: fetch, Headers, Request, Response } = require("node-fetch");
+
+if (!globalThis.fetch) {
+  globalThis.fetch = fetch;
+  globalThis.Headers = Headers;
+  globalThis.Request = Request;
+  globalThis.Response = Response;
+}
 
 function wrap(method, options) {
+  var options2 = Object.assign({}, options);
+  var url = options2.url;
+  delete options2.url;
   return new Promise((res, rej) => {
-    request[method](options, (error, response, body) => {
-      if (error) {
-        return rej(error);
-      }
-      try {
-        body = JSON.parse(body);
-      } catch(e) {}
-      res({
-        response, body
+    request[method](url, options2).then(response => {
+      response.text().then(body => {
+        try {
+          body = JSON.parse(body);
+        } catch {}
+        res({
+          response, body
+        });
       });
-    });
+    }).catch(rej);
   });
 }