gramio 0.0.46 → 0.0.48

package/README.md

@@ -2,7 +2,7 @@
 
 <div align="center">
 
-[![Bot API](https://img.shields.io/badge/Bot%20API-7.7-blue?logo=telegram&style=flat&labelColor=000&color=3b82f6)](https://core.telegram.org/bots/api)
+[![Bot API](https://img.shields.io/badge/Bot%20API-7.9-blue?logo=telegram&style=flat&labelColor=000&color=3b82f6)](https://core.telegram.org/bots/api)
 [![npm](https://img.shields.io/npm/v/gramio?logo=npm&style=flat&labelColor=000&color=3b82f6)](https://www.npmjs.org/package/@gramio/core)
 [![JSR](https://jsr.io/badges/@gramio/core)](https://jsr.io/@gramio/core)
 [![JSR Score](https://jsr.io/badges/@gramio/core/score)](https://jsr.io/@gramio/core)
@@ -15,11 +15,10 @@ TypeScript/JavaScript Telegram Bot API Framework for create your bots with conve
 
 🛡️ **Type-safe** - Written in TypeScript with love ❤️
 
-🌐 **Multi-runtime** - Works on [Node.js](https://nodejs.org/), [Bun](https://bun.sh/) and [Deno](https://deno.com/)\*
+🌐 **Multi-runtime** - Works on [Node.js](https://nodejs.org/), [Bun](https://bun.sh/) and [Deno](https://deno.com/)
 
 ⚙️ **Code-generated** - Many parts are code-generated (for example, [code-generated and auto-published Telegram Bot API types](https://github.com/gramiojs/types))
 
-**Deno\*** [windows-specific issue with undici](https://github.com/denoland/deno/issues/19532)
 
 ## [Get started](https://gramio.dev/get-started)
 

package/dist/bot.d.ts

@@ -17,8 +17,13 @@ import { Updates } from "./updates";
  * ```
  */
 export declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDefinitions = DeriveDefinitions> {
+    _: {
+        /** @internal. Remap generic */
+        derives: Derives;
+    };
     /** @internal. Remap generic */
     __Derives: Derives;
+    private filters;
     /** Options provided to instance */
     readonly options: BotOptions;
     /** Bot data (filled in when calling bot.init/bot.start) */

package/dist/bot.js

@@ -46,7 +46,6 @@ const files_1 = require("@gramio/files");
 const format_1 = require("@gramio/format");
 const debug_1 = __importDefault(require("debug"));
 const inspectable_1 = require("inspectable");
-const undici_1 = require("undici");
 const errors_1 = require("./errors");
 const plugin_1 = require("./plugin");
 const updates_1 = require("./updates");
@@ -81,8 +80,15 @@ let Bot = (() => {
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
+        _ = {
+            /** @internal. Remap generic */
+            derives: {},
+        };
         /** @internal. Remap generic */
         __Derives;
+        filters = {
+            context: (name) => (context) => context.is(name),
+        };
         /** Options provided to instance */
         options;
         /** Bot data (filled in when calling bot.init/bot.start) */
@@ -101,7 +107,10 @@ let Bot = (() => {
          * [Documentation](https://gramio.dev/bot-api.html)
          */
         api = new Proxy({}, {
-            get: (_target, method) => (args) => this._callApi(method, args),
+            get: (_target, method) => 
+            // @ts-expect-error
+            // biome-ignore lint/suspicious/noAssignInExpressions: <explanation>
+            (_target[method] ??= (args) => this._callApi(method, args)),
         });
         lazyloadPlugins = [];
         dependencies = [];
@@ -174,8 +183,19 @@ let Bot = (() => {
         async _callApi(method, params = {}) {
             const debug$api$method = debug$api.extend(method);
             const url = `${this.options.api.baseURL}${this.options.token}/${method}`;
+            // Omit<
+            // 	NonNullable<Parameters<typeof fetch>[1]>,
+            // 	"headers"
+            // > & {
+            // 	headers: Headers;
+            // }
+            // idk why it cause https://github.com/gramiojs/gramio/actions/runs/10388006206/job/28762703484
+            // also in logs types differs
             const reqOptions = {
                 method: "POST",
+                ...this.options.api.fetchOptions,
+                // @ts-ignore types node/bun and global missmatch
+                headers: new Headers(this.options.api.fetchOptions?.headers),
             };
             const context = await this.runHooks("preRequest", 
             // TODO: fix type error
@@ -193,14 +213,12 @@ let Bot = (() => {
                 reqOptions.body = formData;
             }
             else {
-                reqOptions.headers = {
-                    "Content-Type": "application/json",
-                };
+                reqOptions.headers.set("Content-Type", "application/json");
                 reqOptions.body = JSON.stringify(params);
             }
             debug$api$method("options: %j", reqOptions);
-            const response = await (0, undici_1.request)(url, reqOptions);
-            const data = (await response.body.json());
+            const response = await fetch(url, reqOptions);
+            const data = (await response.json());
             debug$api$method("response: %j", data);
             if (!data.ok) {
                 const err = new errors_1.TelegramError(data, method, params);
@@ -234,8 +252,8 @@ let Bot = (() => {
             const fileId = typeof attachment === "string" ? attachment : getFileId(attachment);
             const file = await this.api.getFile({ file_id: fileId });
             const url = `${this.options.api.baseURL.replace("/bot", "/file/bot")}${this.options.token}/${file.file_path}`;
-            const res = await (0, undici_1.request)(url);
-            const buffer = await res.body.arrayBuffer();
+            const res = await fetch(url);
+            const buffer = await res.arrayBuffer();
             if (path) {
                 await promises_1.default.writeFile(path, node_buffer_1.Buffer.from(buffer));
                 return path;
@@ -427,6 +445,16 @@ let Bot = (() => {
                 this.hooks.onResponseError.push(methodsOrHandler);
             return this;
         }
+        // onExperimental(
+        // 	// filter: Filters,
+        // 	filter: (
+        // 		f: Filters<
+        // 			Context<typeof this> & Derives["global"],
+        // 			[{ equal: { prop: number }; addition: { some: () => 2 } }]
+        // 		>,
+        // 	) => Filters,
+        // 	handler: Handler<Context<typeof this> & Derives["global"]>,
+        // ) {}
         /** Register handler to one or many Updates */
         on(updateName, handler) {
             this.updates.composer.on(updateName, handler);

package/dist/filters.d.ts

@@ -0,0 +1,20 @@
+import type { Context, ContextType, MaybeArray, UpdateName } from "@gramio/contexts";
+import type { Bot } from "./bot";
+export interface AdditionDefinitions {
+    equal: any;
+    addition: Record<string, any>;
+}
+type ReturnIfNonNever<T> = [T] extends [never] ? {} : T;
+export type Filters<BotType extends Bot = Bot, Base = Context<BotType>, ConditionalAdditions extends AdditionDefinitions[] = []> = {
+    _s: Base;
+    _ad: ConditionalAdditions;
+    __filters: ((context: Context<BotType>) => boolean)[];
+    context<T extends UpdateName>(updateName: MaybeArray<T>): Filters<BotType, ContextType<BotType, T>, ConditionalAdditions>;
+    is2(): Filters<BotType, 2, ConditionalAdditions>;
+} & ReturnIfNonNever<{
+    [K in keyof ConditionalAdditions & number]: ConditionalAdditions[K] extends {
+        equal: infer E;
+        addition: infer T;
+    } ? Base extends E ? T : {} : {};
+}[number]>;
+export {};

package/dist/filters.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// type filter = Filters<
+// 	Context<Bot> & {prop: 2},
+// 	[{ equal: { prop: 2 }; addition: { some: 2 } }]
+// >;
+// const a = {} as filter;
+// // a.s;
+// type S = [{ equal: { prop: 2 }; addition: { some: 2 } }];
+// type C = {[K in keyof S & number]: S[K]};
+// type SA = {
+// 	[K in keyof S & number]: S[K] extends {
+// 		equal: infer E;
+// 		addition: infer T;
+// 	} ? Context<Bot> & {prop: 2} extends E ? T : {} : {}}[number];
+// type A = Context<Bot> & {prop: 2} extends SA ? true : false;
+// export const filters: Filters = {
+// 	__filters: [],
+// 	context(updateName) {
+// 		this.__filters.push((context) => context.is(updateName));
+// 		return this;
+// 	},
+// };

package/dist/types.d.ts

@@ -15,6 +15,8 @@ export interface BotOptions {
     };
     /** Options to configure how to send requests to the Telegram Bot API */
     api: {
+        /** Configure {@link fetch} parameters */
+        fetchOptions?: Parameters<typeof fetch>[1];
         /** URL which will be used to send requests to. @default "https://api.telegram.org/bot" */
         baseURL: string;
         /**
@@ -232,6 +234,7 @@ export declare namespace Hooks {
 export type ErrorDefinitions = Record<string, Error>;
 /** Map of derives */
 export type DeriveDefinitions = Record<UpdateName | "global", {}>;
+export type FilterDefinitions = Record<string, (...args: any[]) => (context: Context<Bot>) => boolean>;
 /** Type of Bot that accepts any generics */
 export type AnyBot = Bot<any, any>;
 /** Type of Bot that accepts any generics */

package/dist/webhook/adapters.d.ts

@@ -1,5 +1,4 @@
 import type { TelegramUpdate } from "@gramio/types";
-import { Response } from "undici";
 import type { MaybePromise } from "../types";
 export interface FrameworkHandler {
     update: MaybePromise<TelegramUpdate>;
@@ -12,7 +11,7 @@ export declare const frameworks: {
     elysia: ({ body, headers }: any) => {
         update: any;
         header: any;
-        unauthorized: () => Response;
+        unauthorized: () => import("bun-types/fetch").Response;
     };
     fastify: (request: any, reply: any) => {
         update: any;
@@ -42,13 +41,13 @@ export declare const frameworks: {
     "std/http": (req: any) => {
         update: any;
         header: any;
-        response: () => Response;
-        unauthorized: () => Response;
+        response: () => import("bun-types/fetch").Response;
+        unauthorized: () => import("bun-types/fetch").Response;
     };
     "Bun.serve": (req: any) => {
         update: any;
         header: any;
-        response: () => Response;
-        unauthorized: () => Response;
+        response: () => import("bun-types/fetch").Response;
+        unauthorized: () => import("bun-types/fetch").Response;
     };
 };

package/dist/webhook/adapters.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.frameworks = void 0;
-const undici_1 = require("undici");
 const SECRET_TOKEN_HEADER = "X-Telegram-Bot-Api-Secret-Token";
 const WRONG_TOKEN_ERROR = "secret token is invalid";
 exports.frameworks = {
     elysia: ({ body, headers }) => ({
         update: body,
         header: headers[SECRET_TOKEN_HEADER],
-        unauthorized: () => new undici_1.Response(WRONG_TOKEN_ERROR, { status: 401 }),
+        unauthorized: () => new Response(WRONG_TOKEN_ERROR, { status: 401 }),
     }),
     fastify: (request, reply) => ({
         update: request.body,
@@ -47,13 +46,13 @@ exports.frameworks = {
     "std/http": (req) => ({
         update: req.json(),
         header: req.headers.get(SECRET_TOKEN_HEADER),
-        response: () => new undici_1.Response("ok!"),
-        unauthorized: () => new undici_1.Response(WRONG_TOKEN_ERROR, { status: 401 }),
+        response: () => new Response("ok!"),
+        unauthorized: () => new Response(WRONG_TOKEN_ERROR, { status: 401 }),
     }),
     "Bun.serve": (req) => ({
         update: req.json(),
         header: req.headers.get(SECRET_TOKEN_HEADER),
-        response: () => new undici_1.Response("ok!"),
-        unauthorized: () => new undici_1.Response(WRONG_TOKEN_ERROR, { status: 401 }),
+        response: () => new Response("ok!"),
+        unauthorized: () => new Response(WRONG_TOKEN_ERROR, { status: 401 }),
     }),
 };

package/package.json

@@ -1,54 +1,48 @@
 {
-  "name": "gramio",
-  "type": "commonjs",
-  "version": "0.0.46",
-  "description": "Powerful Telegram Bot API framework",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "keywords": [
-    "telegram",
-    "telegram-bot",
-    "telegram-bot-api",
-    "bot",
-    "framework",
-    "types",
-    "client",
-    "webhook",
-    "long-polling"
-  ],
-  "scripts": {
-    "type": "tsc --noEmit",
-    "lint": "bunx @biomejs/biome check ./src",
-    "lint:fix": "bun lint --apply",
-    "prepublishOnly": "tsc",
-    "jsr": "bun scripts/release-jsr.ts",
-    "try-deno": "deno publish --unstable-sloppy-imports --dry-run --allow-slow-types --allow-dirty"
-  },
-  "author": "kravets",
-  "license": "ISC",
-  "devDependencies": {
-    "@biomejs/biome": "1.7.3",
-    "@types/bun": "^1.1.6",
-    "@types/debug": "^4.1.12",
-    "@types/node": "^20.14.10",
-    "typescript": "^5.5.3"
-  },
-  "dependencies": {
-    "@gramio/callback-data": "^0.0.3",
-    "@gramio/contexts": "^0.0.20",
-    "@gramio/files": "^0.0.11",
-    "@gramio/format": "^0.1.3",
-    "@gramio/keyboards": "^0.3.3",
-    "@gramio/types": "^7.7.1",
-    "debug": "^4.3.5",
-    "inspectable": "^3.0.2",
-    "middleware-io": "^2.8.1",
-    "undici": "^6.19.2"
-  },
-  "overrides": {
-    "@gramio/types": "^7.7.1"
-  },
-  "files": [
-    "dist"
-  ]
-}
+	"name": "gramio",
+	"type": "commonjs",
+	"version": "0.0.48",
+	"description": "Powerful, extensible and really type-safe Telegram Bot API framework",
+	"main": "./dist/index.js",
+	"types": "./dist/index.d.ts",
+	"keywords": [
+		"telegram",
+		"telegram-bot",
+		"telegram-bot-api",
+		"bot",
+		"framework",
+		"types",
+		"client",
+		"webhook",
+		"long-polling"
+	],
+	"scripts": {
+		"type": "tsc --noEmit",
+		"lint": "bunx @biomejs/biome check ./src",
+		"lint:fix": "bun lint --apply",
+		"prepublishOnly": "tsc",
+		"jsr": "bun scripts/release-jsr.ts",
+		"try-deno": "deno publish --unstable-sloppy-imports --dry-run --allow-slow-types --allow-dirty"
+	},
+	"author": "kravets",
+	"license": "ISC",
+	"devDependencies": {
+		"@biomejs/biome": "1.8.3",
+		"@types/bun": "^1.1.6",
+		"@types/debug": "^4.1.12",
+		"pkgroll": "^2.4.2",
+		"typescript": "^5.5.4"
+	},
+	"dependencies": {
+		"@gramio/callback-data": "^0.0.3",
+		"@gramio/contexts": "^0.0.22",
+		"@gramio/files": "^0.0.12",
+		"@gramio/format": "^0.1.3",
+		"@gramio/keyboards": "^0.3.3",
+		"@gramio/types": "^7.9.0",
+		"debug": "^4.3.6",
+		"inspectable": "^3.0.2",
+		"middleware-io": "^2.8.1"
+	},
+	"files": ["dist"]
+}