@codebam/cf-workers-telegram-bot 5.4.0 → 5.8.0

package/dist/main/src/bot_api.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="@cloudflare/workers-types" />
 import Handler from "./handler";
-import { Commands, Config, Update, Webhook } from "./types";
+import { Commands, Config, Update } from "./types";
 export default class BotApi {
     commands: Commands;
     webhook: Config["webhook"];
     handler: Handler;
     update: (update: Update) => Promise<Response>;
-    constructor(commands: Commands, webhook: Webhook, handler: Handler);
+    constructor(config: Partial<Config>);
 }

package/dist/main/src/bot_api.js

@@ -3,9 +3,9 @@ export default class BotApi {
     webhook;
     handler;
     update;
-    constructor(commands, webhook, handler) {
-        this.commands = commands;
-        this.webhook = webhook;
-        this.handler = handler;
+    constructor(config) {
+        this.commands = config.commands;
+        this.webhook = config.webhook;
+        this.handler = config.handler;
     }
 }

package/dist/main/src/handler.js

@@ -31,15 +31,12 @@ export default class Handler {
     // handles the request
     handle = async (request) => this.getAccessKeys(this.configs).then((access_keys) => Object.keys(this.responses).includes(request.method)
         ? this.responses[request.method](request, ((key) => {
-            if (access_keys[key]) {
-                return new access_keys[key].api({
-                    ...new Config(),
-                    ...access_keys[key],
-                    url: new URL(new URL(request.url).origin),
-                    handler: this,
-                });
-            }
-            return this.responses.default();
+            return new access_keys[key].api({
+                ...new Config(),
+                ...access_keys[key],
+                url: new URL(new URL(request.url).origin),
+                handler: this,
+            });
         })(new URL(request.url).pathname.substring(1)))
         : this.responses.default());
 }

package/dist/main/src/telegram_api.js

@@ -2,7 +2,7 @@ import BotApi from "./bot_api";
 import { addSearchParams, log } from "./libs";
 export default class TelegramApi extends BotApi {
     constructor(commands, webhook, handler) {
-        super(commands, webhook, handler);
+        super({ commands, webhook, handler });
     }
     inlineQueryUpdate = async (update) => this.executeInlineCommand(update);
     messageUpdate = async (update) => typeof update.message?.text === "string"

package/dist/main/src/telegram_bot.js

@@ -123,20 +123,20 @@ export default class TelegramBot extends TelegramApi {
     _average = (numbers) => parseFloat((numbers.reduce((prev, cur) => prev + cur, 0) / numbers.length || 0).toFixed(2));
     // bot command: /recursion
     recursion = async (update) => this.sendMessage(update.message?.chat.id ?? 0, "/recursion");
-    // .then((response) => responseToJSON(response))
-    // .then((result: { ok: boolean; result: { text: string } }) =>
-    //   this.handler.postResponse(
-    //     new Request("", {
-    //       method: "POST",
-    //       body: JSON.stringify({
-    //         message: {
-    //           text: result.result.text,
-    //           chat: { id: update.message.chat.id },
-    //         },
-    //       }),
-    //     }),
-    //     this
-    //   )
+    // .then((response) => response.json())
+    // .then((result) =>
+    // 	this.handler.postResponse(
+    // 		new Request("", {
+    // 			method: "POST",
+    // 			body: JSON.stringify({
+    // 				message: {
+    // 					text: (result as { result: { text: string } }).result.text,
+    // 					chat: { id: update.message?.chat.id },
+    // 				},
+    // 			}),
+    // 		}),
+    // 		this
+    // 	)
     // );
     // bot command: /roll
     roll = async (update, args) => ((outcome, message) => update.inline_query

package/dist/main/src/telegram_webhook.js

@@ -14,7 +14,6 @@ export default class TelegramWebhook extends Webhook {
     get = async () => fetch_json(new URL(`${this.api.origin}${this.api.pathname}/getWebhookInfo`));
     delete = async () => fetch_json(new URL(`${this.api.origin}${this.api.pathname}/deleteWebhook`));
     commands = {
-        ...this.commands,
         set: this.set,
         get: this.get,
         delete: this.delete,

package/dist/main/src/types.d.ts

@@ -10,12 +10,12 @@ export type Commands = Record<string, Command>;
 export type Kv = Record<string, KVNamespace> | undefined;
 export declare class Config {
     bot_name: string;
-    api: any;
+    api: typeof BotApi;
     webhook: Webhook;
     commands: Record<string, Command>;
-    kv: Kv | undefined;
+    kv: Kv;
     url: URL;
-    handler: Handler | undefined;
+    handler: Handler;
     constructor(config?: Partial<Config>);
 }
 export declare const localhost: URL;

package/dist/main/src/types.js

@@ -1,8 +1,9 @@
+import BotApi from "./bot_api";
+import Handler from "./handler";
 import Webhook from "./webhook";
 export { Webhook };
 export class Config {
     bot_name;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     api;
     webhook;
     commands;
@@ -11,12 +12,12 @@ export class Config {
     handler;
     constructor(config = {}) {
         this.bot_name = config.bot_name || "";
-        this.api = config.api || {};
+        this.api = config.api || BotApi;
         this.webhook = config.webhook || new Webhook(localhost, "", localhost);
         this.commands = config.commands || {};
         this.kv = config.kv;
         this.url = config.url || new URL(localhost);
-        this.handler = config.handler;
+        this.handler = config.handler || new Handler([]);
     }
 }
 export const localhost = new URL("http://localhost");

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@codebam/cf-workers-telegram-bot",
-	"version": "5.4.0",
+	"version": "5.8.0",
 	"description": "serverless telegram bot on cf workers",
 	"main": "./dist/main/src/main.js",
 	"module": "./dist/main/src/main.js",
@@ -29,14 +29,14 @@
 		"url": "https://github.com/codebam/cf-workers-telegram-bot.git"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230807.0",
-		"@typescript-eslint/eslint-plugin": "^6.3.0",
-		"@typescript-eslint/parser": "^6.3.0",
-		"eslint": "^8.47.0",
+		"@cloudflare/workers-types": "^4.20230914.0",
+		"@typescript-eslint/eslint-plugin": "^6.7.2",
+		"@typescript-eslint/parser": "^6.7.2",
+		"eslint": "^8.49.0",
 		"eslint-config-prettier": "^9.0.0",
 		"lerna": "^7.1.5",
-		"prettier": "^3.0.1",
-		"typescript": "^5.1.6"
+		"prettier": "^3.0.2",
+		"typescript": "^5.2.2"
 	},
-	"gitHead": "57bc0ace0c6d210423af08b17dcd02693e12b8e5"
+	"gitHead": "4101ac66eb6a0f94d2fb939863286b334f79cbbc"
 }