grammy 1.4.2 → 1.4.3

package/README.md

@@ -12,7 +12,7 @@ _<h2 align="center"> [:mag: Documentation](https://grammy.dev) | [:page_with_cur
 
 [![Bot API](https://img.shields.io/badge/Bot%20API-5.4-blue?logo=telegram&style=flat-square)](https://core.telegram.org/bots/api)
 [![npm](https://img.shields.io/npm/v/grammy?logo=npm&style=flat-square)](https://www.npmjs.org/package/grammy) <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-40-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-43-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <!-- deno-fmt-ignore-end -->
@@ -100,7 +100,7 @@ Here are some more resources to support you:
 
 ## Deno Support
 
-All grammY packages published by [@grammyjs](https://github.com/grammyjs) run natively in Deno. We are compiling every codebase to still run on Node.
+All grammY packages published by [@grammyjs](https://github.com/grammyjs) run natively on Deno. We are compiling every codebase to still run on Node.
 
 However, given that most bot developers are still using Node, all documentation is written Node-first. We may migrate it if Deno overtakes Node. If you are already on Deno today, we expect you to know what you're doing. You mainly have to adjust the imports to URL imports, and import from [`https://deno.land/x/grammy/mod.ts`](https://deno.land/x/grammy).
 
@@ -126,7 +126,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://edjopato.de/"><img src="https://avatars.githubusercontent.com/u/7953011?v=4?s=100" width="100px;" alt=""/><br /><sub><b>EdJoPaTo</b></sub></a><br /><a href="#plugin-EdJoPaTo" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/grammyjs/grammY/commits?author=EdJoPaTo" title="Documentation">📖</a> <a href="#ideas-EdJoPaTo" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3AEdJoPaTo" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/grammyjs/grammY/issues?q=author%3AEdJoPaTo" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=EdJoPaTo" title="Code">💻</a> <a href="#question-EdJoPaTo" title="Answering Questions">💬</a></td>
     <td align="center"><a href="https://github.com/Amir-Zouerami"><img src="https://avatars.githubusercontent.com/u/53701884?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Amir Zouerami</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=Amir-Zouerami" title="Documentation">📖</a> <a href="#plugin-Amir-Zouerami" title="Plugin/utility libraries">🔌</a></td>
-    <td align="center"><a href="https://github.com/rojserbest"><img src="https://avatars.githubusercontent.com/u/49933115?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roj</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=rojserbest" title="Documentation">📖</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Arojserbest" title="Reviewed Pull Requests">👀</a> <a href="#infra-rojserbest" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://github.com/rojserbest"><img src="https://avatars.githubusercontent.com/u/49933115?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roj</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=rojserbest" title="Documentation">📖</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Arojserbest" title="Reviewed Pull Requests">👀</a> <a href="#infra-rojserbest" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#translation-rojserbest" title="Translation">🌍</a> <a href="https://github.com/grammyjs/grammY/commits?author=rojserbest" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/jokasimr"><img src="https://avatars.githubusercontent.com/u/20954731?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jokasimr</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Ajokasimr" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/CikiMomogi"><img src="https://avatars.githubusercontent.com/u/74030149?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ciki Momogi</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=CikiMomogi" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/AndreoliBR"><img src="https://avatars.githubusercontent.com/u/15970011?v=4?s=100" width="100px;" alt=""/><br /><sub><b>AndreoliBR</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3AAndreoliBR" title="Reviewed Pull Requests">👀</a></td>
@@ -142,7 +142,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/deptyped"><img src="https://avatars.githubusercontent.com/u/26162440?v=4?s=100" width="100px;" alt=""/><br /><sub><b>deptyped</b></sub></a><br /><a href="#example-deptyped" title="Examples">💡</a> <a href="https://github.com/grammyjs/grammY/commits?author=deptyped" title="Documentation">📖</a> <a href="#tutorial-deptyped" title="Tutorials">✅</a> <a href="#question-deptyped" title="Answering Questions">💬</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://github.com/dzek69"><img src="https://avatars.githubusercontent.com/u/4936805?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jacek Nowacki</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=dzek69" title="Documentation">📖</a> <a href="https://github.com/grammyjs/grammY/commits?author=dzek69" title="Code">💻</a> <a href="https://github.com/grammyjs/grammY/issues?q=author%3Adzek69" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Adzek69" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/dzek69"><img src="https://avatars.githubusercontent.com/u/4936805?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jacek Nowacki</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=dzek69" title="Documentation">📖</a> <a href="https://github.com/grammyjs/grammY/commits?author=dzek69" title="Code">💻</a> <a href="https://github.com/grammyjs/grammY/issues?q=author%3Adzek69" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Adzek69" title="Reviewed Pull Requests">👀</a> <a href="#ideas-dzek69" title="Ideas, Planning, & Feedback">🤔</a></td>
     <td align="center"><a href="https://blog.outv.im"><img src="https://avatars.githubusercontent.com/u/19144373?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Outvi V</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=outloudvi" title="Code">💻</a></td>
     <td align="center"><a href="https://bandism.net/"><img src="https://avatars.githubusercontent.com/u/22633385?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ikko Ashimine</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=eltociear" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/amberlionk"><img src="https://avatars.githubusercontent.com/u/29119723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yevhen Denesiuk</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Aamberlionk" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/grammyjs/grammY/issues?q=author%3Aamberlionk" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=amberlionk" title="Code">💻</a></td>
@@ -154,17 +154,22 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/chimit"><img src="https://avatars.githubusercontent.com/u/839349?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chimit</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=chimit" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/CalsiBotDev"><img src="https://avatars.githubusercontent.com/u/55633371?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Calsi</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=CalsiBotDev" title="Documentation">📖</a></td>
     <td align="center"><a href="https://zohren.xyz"><img src="https://avatars.githubusercontent.com/u/15788906?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jonas Zohren</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Ajfowl" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=jfowl" title="Code">💻</a></td>
-    <td align="center"><a href="https://zhemu.buzz/"><img src="https://avatars.githubusercontent.com/u/56839018?v=4?s=100" width="100px;" alt=""/><br /><sub><b>linbuxiao</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=linbuxiao" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/JiquanWang99"><img src="https://avatars.githubusercontent.com/u/63894579?v=4?s=100" width="100px;" alt=""/><br /><sub><b>JiquanWang99</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=JiquanWang99" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://zhemu.buzz/"><img src="https://avatars.githubusercontent.com/u/56839018?v=4?s=100" width="100px;" alt=""/><br /><sub><b>linbuxiao</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=linbuxiao" title="Documentation">📖</a> <a href="#translation-linbuxiao" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/JiquanWang99"><img src="https://avatars.githubusercontent.com/u/63894579?v=4?s=100" width="100px;" alt=""/><br /><sub><b>JiquanWang99</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=JiquanWang99" title="Documentation">📖</a> <a href="#translation-JiquanWang99" title="Translation">🌍</a></td>
     <td align="center"><a href="http://bor691.ir/"><img src="https://avatars.githubusercontent.com/u/4184939?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Borhan Hafez</b></sub></a><br /><a href="#plugin-zumoshi" title="Plugin/utility libraries">🔌</a></td>
-    <td align="center"><a href="https://blog.limx.dev/"><img src="https://avatars.githubusercontent.com/u/6434137?v=4?s=100" width="100px;" alt=""/><br /><sub><b>WingLim</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=WingLim" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://blog.limx.dev/"><img src="https://avatars.githubusercontent.com/u/6434137?v=4?s=100" width="100px;" alt=""/><br /><sub><b>WingLim</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=WingLim" title="Documentation">📖</a> <a href="#translation-WingLim" title="Translation">🌍</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://github.com/taotie111"><img src="https://avatars.githubusercontent.com/u/44166322?v=4?s=100" width="100px;" alt=""/><br /><sub><b>taotie111</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=taotie111" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/taotie111"><img src="https://avatars.githubusercontent.com/u/44166322?v=4?s=100" width="100px;" alt=""/><br /><sub><b>taotie111</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=taotie111" title="Documentation">📖</a> <a href="#translation-taotie111" title="Translation">🌍</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/merlin-brandes-42328717a/"><img src="https://avatars.githubusercontent.com/u/14237330?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Merlin</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=FatalMerlin" title="Documentation">📖</a></td>
     <td align="center"><a href="https://darve.sh"><img src="https://avatars.githubusercontent.com/u/22394081?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Darvesh</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Adarvesh" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=darvesh" title="Code">💻</a></td>
     <td align="center"><a href="http://telegram.me/dcdunkan"><img src="https://avatars.githubusercontent.com/u/70066170?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dcdunkan</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Adcdunkan" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=dcdunkan" title="Code">💻</a></td>
-    <td align="center"><a href="https://xuann.wang/"><img src="https://avatars.githubusercontent.com/u/44045911?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kid</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=kidonng" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://xuann.wang/"><img src="https://avatars.githubusercontent.com/u/44045911?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kid</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=kidonng" title="Documentation">📖</a> <a href="#translation-kidonng" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://slava.fomin.io/"><img src="https://avatars.githubusercontent.com/u/1702725?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Slava Fomin II</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Aslavafomin" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=slavafomin" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://kikobeats.com/"><img src="https://avatars.githubusercontent.com/u/2096101?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kiko Beats</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=Kikobeats" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="http://///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////kraftwerk28.pp.ua"><img src="https://avatars.githubusercontent.com/u/31807671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vsevolod</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=kraftwerk28" title="Code">💻</a> <a href="#ideas-kraftwerk28" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Akraftwerk28" title="Reviewed Pull Requests">👀</a></td>
   </tr>
 </table>
 

package/out/convenience/frameworks.node.d.ts

@@ -0,0 +1,39 @@
+import type { IncomingMessage, ServerResponse } from "http";
+export declare const adapters: {
+    http: (req: IncomingMessage, res: ServerResponse) => {
+        update: Promise<any>;
+        end: () => void;
+        respond: (json: string) => void;
+    };
+    https: (req: IncomingMessage, res: ServerResponse) => {
+        update: Promise<any>;
+        end: () => void;
+        respond: (json: string) => void;
+    };
+    express: (req: any, res: any) => {
+        update: Promise<any>;
+        end: () => any;
+        respond: (json: string) => void;
+    };
+    koa: (ctx: any) => {
+        update: Promise<any>;
+        end: () => void;
+        respond: (json: string) => void;
+    };
+    fastify: (req: any, reply: any) => {
+        update: Promise<any>;
+        end: () => any;
+        respond: (json: string) => any;
+    };
+    worktop: (req: any, res: any) => {
+        update: Promise<any>;
+        end: () => any;
+        respond: (json: string) => any;
+    };
+    "aws-lambda": (event: any, _context: any, callback: any) => {
+        update: any;
+        end: () => any;
+        respond: (json: string) => any;
+    };
+};
+export declare const defaultAdapter = "express";

package/out/convenience/frameworks.node.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultAdapter = exports.adapters = void 0;
+/** Node.js native 'http' and 'https' modules */
+const http = (req, res) => ({
+    update: new Promise((resolve, reject) => {
+        const chunks = [];
+        req.on("data", (chunk) => chunks.push(chunk)).once("end", () => {
+            const raw = Buffer.concat(chunks).toString("utf-8");
+            resolve(JSON.parse(raw));
+        }).once("error", reject);
+    }),
+    end: () => res.end(),
+    respond: (json) => res.writeHead(200, { "Content-Type": "application/json" }).end(json),
+});
+/** express web framework */
+const express = (req, res) => ({
+    update: Promise.resolve(req.body),
+    end: () => res.end(),
+    respond: (json) => {
+        res.set("Content-Type", "application/json");
+        res.send(json);
+    },
+});
+/** koa web framework */
+const koa = (ctx) => ({
+    update: Promise.resolve(ctx.request.body),
+    end: () => {
+        ctx.body = "";
+    },
+    respond: (json) => {
+        ctx.set("Content-Type", "application/json");
+        ctx.response.body = json;
+    },
+});
+/** fastify web framework */
+const fastify = (req, reply) => ({
+    update: Promise.resolve(req.body),
+    end: () => reply.status(200).send(),
+    respond: (json) => reply.send(json),
+});
+/** worktop CloudFlare workers framework */
+const worktop = (req, res) => ({
+    update: Promise.resolve(req.body.json()),
+    end: () => res.end(),
+    respond: (json) => res.send(200, json),
+});
+/** AWS lambda serverless functions */
+const awsLambda = (event, _context, callback) => ({
+    update: JSON.parse(event.body),
+    end: () => callback(null, { statusCode: 200 }),
+    respond: (json) => callback(null, { statusCode: 200, body: json }),
+});
+// please open a PR if you want to add another
+exports.adapters = {
+    http,
+    https: http,
+    express,
+    koa,
+    fastify,
+    worktop,
+    "aws-lambda": awsLambda,
+};
+exports.defaultAdapter = "express";

package/out/convenience/webhook.d.ts

@@ -1,10 +1,81 @@
+/// <reference types="node" />
 import { Bot } from "../bot.js";
+import { Update } from "../platform.node.js";
 import { Context } from "../context.js";
+declare const adapters: {
+    callback: FrameworkAdapter;
+    http: (req: import("http").IncomingMessage, res: import("http").ServerResponse) => {
+        update: Promise<any>;
+        end: () => void;
+        respond: (json: string) => void;
+    };
+    https: (req: import("http").IncomingMessage, res: import("http").ServerResponse) => {
+        update: Promise<any>;
+        end: () => void;
+        respond: (json: string) => void;
+    };
+    express: (req: any, res: any) => {
+        update: Promise<any>;
+        end: () => any;
+        respond: (json: string) => void;
+    };
+    koa: (ctx: any) => {
+        update: Promise<any>;
+        end: () => void;
+        respond: (json: string) => void;
+    };
+    fastify: (req: any, reply: any) => {
+        update: Promise<any>;
+        end: () => any;
+        respond: (json: string) => any;
+    };
+    worktop: (req: any, res: any) => {
+        update: Promise<any>;
+        end: () => any;
+        respond: (json: string) => any;
+    };
+    "aws-lambda": (event: any, _context: any, callback: any) => {
+        update: any;
+        end: () => any;
+        respond: (json: string) => any;
+    };
+};
 /**
  * HTTP Web frameworks for which grammY provides compatible callback out of the
  * box.
  */
-declare type SupportedFrameworks = "express" | "http" | "https" | "koa" | "oak" | "fastify" | "worktop" | "callback" | "aws-lambda";
+declare type SupportedFrameworks = keyof typeof adapters;
+/**
+ * Abstraction over a request-response cycle, provding access to the update, as
+ * well as a mechanism for responding to the request and to end it.
+ */
+interface ReqResHandler {
+    /**
+     * The update object sent from Telegram, usually resolves the request's JSON
+     * body
+     */
+    update: Promise<Update>;
+    /**
+     * Ends the request immediately without body, called after every request
+     * unless a webhook reply was performed
+     */
+    end?: () => void;
+    /**
+     * Sends the specified JSON as a payload in the body, used for webhook
+     * replies
+     */
+    respond: (json: string) => unknown;
+    /**
+     * Some frameworks (e.g. Deno's std/http `listenAndServe`) assume
+     * that handler returns something
+     */
+    handlerReturn?: any;
+}
+/**
+ * Middleware for a web framework. Creates a request-response handler for a
+ * request. The handler will be used to integrate with the compatible framework.
+ */
+export declare type FrameworkAdapter = (...args: any[]) => ReqResHandler;
 /**
  * Creates a callback function that you can pass to a web framework (such as
  * express) if you want to run your bot via webhooks. Use it like this:
@@ -24,5 +95,5 @@ declare type SupportedFrameworks = "express" | "http" | "https" | "koa" | "oak"
  * @param onTimeout An optional strategy to handle timeouts (default: 'throw')
  * @param timeoutMilliseconds An optional number of timeout milliseconds (default: 10_000)
  */
-export declare function webhookCallback<C extends Context = Context>(bot: Bot<C>, framework?: SupportedFrameworks, onTimeout?: "throw" | "return" | ((...args: any[]) => unknown), timeoutMilliseconds?: number): (...args: any[]) => Promise<void>;
+export declare function webhookCallback<C extends Context = Context>(bot: Bot<C>, adapter?: SupportedFrameworks | FrameworkAdapter, onTimeout?: "throw" | "return" | ((...args: any[]) => unknown), timeoutMilliseconds?: number): (...args: any[]) => Promise<any>;
 export {};

package/out/convenience/webhook.js

@@ -2,60 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webhookCallback = void 0;
 const platform_node_js_1 = require("../platform.node.js");
+const frameworks_node_js_1 = require("./frameworks.node.js");
 const debugErr = (0, platform_node_js_1.debug)("grammy:error");
-const standard = (req, res) => ({
-    update: Promise.resolve(req.body),
-    end: () => res.end(),
-    respond: (json) => {
-        res.set("Content-Type", "application/json");
-        res.send(json);
-    },
+const callbackAdapter = (update, callback) => ({
+    update: Promise.resolve(update),
+    respond: callback,
 });
-// Integrations with popular frameworks
-const frameworkAdapters = {
-    express: standard,
-    http: standard,
-    https: standard,
-    koa: (ctx) => ({
-        update: Promise.resolve(ctx.request.body),
-        end: () => (ctx.body = ""),
-        respond: (json) => {
-            ctx.set("Content-Type", "application/json");
-            ctx.response.body = json;
-        },
-    }),
-    oak: (ctx) => ({
-        update: ctx.request.body({ type: "json" }).value,
-        end: () => (ctx.response.status = 200),
-        respond: (json) => {
-            ctx.response.type = "json";
-            ctx.response.body = json;
-        },
-    }),
-    fastify: (req, reply) => ({
-        update: Promise.resolve(req.body),
-        end: () => reply.send({}),
-        respond: (json) => reply.send(json),
-    }),
-    worktop: (req, res) => ({
-        update: Promise.resolve(req.body.json()),
-        end: () => res.end(),
-        respond: (json) => res.send(200, json),
-    }),
-    callback: (update, callback) => ({
-        update: update,
-        respond: callback,
-    }),
-    "aws-lambda": (event, _context, callback) => ({
-        update: JSON.parse(event.body),
-        end: () => callback(null, { statusCode: 200 }),
-        respond: (json) => callback(null, {
-            statusCode: 200,
-            body: json,
-        }),
-    }),
-    // please open a PR if you want to add another
-};
+const adapters = { ...frameworks_node_js_1.adapters, callback: callbackAdapter };
 /**
  * Creates a callback function that you can pass to a web framework (such as
  * express) if you want to run your bot via webhooks. Use it like this:
@@ -75,21 +28,14 @@ const frameworkAdapters = {
  * @param onTimeout An optional strategy to handle timeouts (default: 'throw')
  * @param timeoutMilliseconds An optional number of timeout milliseconds (default: 10_000)
  */
-function webhookCallback(bot, framework = "express", onTimeout = "throw", timeoutMilliseconds = 10000) {
-    var _a;
-    const server = (_a = frameworkAdapters[framework]) !== null && _a !== void 0 ? _a : standard;
+function webhookCallback(bot, adapter = frameworks_node_js_1.defaultAdapter, onTimeout = "throw", timeoutMilliseconds = 10000) {
     let firstUpdate = true;
     let initialized = false;
     let initCall;
+    const server = typeof adapter === "string"
+        ? adapters[adapter]
+        : adapter;
     return async (...args) => {
-        const { update, respond, end } = server(...args);
-        let usedWebhookReply = false;
-        const webhookReplyEnvelope = {
-            send: async (json) => {
-                usedWebhookReply = true;
-                await respond(json);
-            },
-        };
         if (!initialized) {
             if (firstUpdate) {
                 initCall = bot.init();
@@ -98,11 +44,20 @@ function webhookCallback(bot, framework = "express", onTimeout = "throw", timeou
             await initCall;
             initialized = true;
         }
+        const { update, respond, end, handlerReturn } = server(...args);
+        let usedWebhookReply = false;
+        const webhookReplyEnvelope = {
+            async send(json) {
+                usedWebhookReply = true;
+                await respond(json);
+            },
+        };
         await timeoutIfNecessary(bot.handleUpdate(await update, webhookReplyEnvelope), typeof onTimeout === "function"
             ? () => onTimeout(...args)
             : onTimeout, timeoutMilliseconds);
         if (end !== undefined && !usedWebhookReply)
             end();
+        return handlerReturn;
     };
 }
 exports.webhookCallback = webhookCallback;

package/out/core/client.js

@@ -11,7 +11,7 @@ function concatTransformer(prev, trans) {
 }
 class ApiClient {
     constructor(token, options = {}, webhookReplyEnvelope = {}) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         Object.defineProperty(this, "token", {
             enumerable: true,
             configurable: true,
@@ -57,7 +57,6 @@ class ApiClient {
                     this.hasUsedWebhookReply = true;
                     const config = (0, payload_js_1.createJsonPayload)({ ...payload, method });
                     await this.webhookReplyEnvelope.send(config.body);
-                    // deno-lint-ignore no-explicit-any
                     return { ok: true, result: true };
                 }
                 else {
@@ -86,12 +85,16 @@ class ApiClient {
                 }
             }
         });
+        const apiRoot = (_a = options.apiRoot) !== null && _a !== void 0 ? _a : "https://api.telegram.org";
         this.options = {
-            apiRoot: (_a = options.apiRoot) !== null && _a !== void 0 ? _a : "https://api.telegram.org",
+            apiRoot,
             buildUrl: (_b = options.buildUrl) !== null && _b !== void 0 ? _b : ((root, token, method) => `${root}/bot${token}/${method}`),
-            baseFetchConfig: (_c = options.baseFetchConfig) !== null && _c !== void 0 ? _c : platform_node_js_1.baseFetchConfig,
-            canUseWebhookReply: (_d = options.canUseWebhookReply) !== null && _d !== void 0 ? _d : (() => false),
-            sensitiveLogs: (_e = options.sensitiveLogs) !== null && _e !== void 0 ? _e : false,
+            baseFetchConfig: {
+                ...(0, platform_node_js_1.baseFetchConfig)(apiRoot),
+                ...options.baseFetchConfig,
+            },
+            canUseWebhookReply: (_c = options.canUseWebhookReply) !== null && _c !== void 0 ? _c : (() => false),
+            sensitiveLogs: (_d = options.sensitiveLogs) !== null && _d !== void 0 ? _d : false,
         };
         if (this.options.apiRoot.endsWith("/")) {
             throw new Error(`Remove the trailing '/' from the 'apiRoot' option (use '${this.options.apiRoot.substr(0, this.options.apiRoot.length - 1)}' instead of '${this.options.apiRoot}')`);

package/out/core/payload.js

@@ -154,8 +154,7 @@ function valuePart(key, value) {
 }
 /** Turns an InputFile into a generator of `Uint8Array`s */
 async function* filePart(id, origin, input) {
-    var _a;
-    const filename = (_a = input.filename) !== null && _a !== void 0 ? _a : `${origin}.${getExt(origin)}`;
+    const filename = input.filename || `${origin}.${getExt(origin)}`;
     if (filename.includes("\r") || filename.includes("\n")) {
         throw new Error(`File paths cannot contain carriage-return (\\r) \
 or newline (\\n) characters! Filename for property '${origin}' was:
@@ -164,14 +163,11 @@ ${filename}
 """`);
     }
     yield enc.encode(`content-disposition:form-data;name="${id}";filename=${filename}\r\n\r\n`);
-    const fileData = input[platform_node_js_1.inputFileData];
-    // handle buffers, file paths, and streams:
-    if (fileData instanceof Uint8Array)
-        yield fileData;
-    else if (typeof fileData === "string")
-        yield* await (0, platform_node_js_1.streamFile)(fileData);
+    const data = await input[platform_node_js_1.toRaw]();
+    if (data instanceof Uint8Array)
+        yield data;
     else
-        yield* fileData;
+        yield* data;
 }
 /** Returns the default file extension for an API property name */
 function getExt(key) {

package/out/platform.node.d.ts

@@ -1,16 +1,23 @@
 /// <reference types="node" />
 import { InputFileProxy } from "@grammyjs/types";
-import { Agent } from "https";
+import { Agent as HttpAgent } from "http";
+import { Agent as HttpsAgent } from "https";
 import { Readable } from "stream";
 import type { ReadStream } from "fs";
 import { URL } from "url";
 export * from "@grammyjs/types";
-export { debug } from "debug";
+import { debug as d } from "debug";
+export { d as debug };
 export declare const itrToStream: (itr: AsyncIterable<Uint8Array>) => Readable;
-export { createReadStream as streamFile } from "fs";
-export declare const baseFetchConfig: {
+export declare function baseFetchConfig(apiRoot: string): {
     compress: boolean;
-    agent: Agent;
+    agent: HttpsAgent;
+} | {
+    agent: HttpAgent;
+    compress?: undefined;
+} | {
+    compress?: undefined;
+    agent?: undefined;
 };
 /** Something that looks like a URL. */
 interface URLLike {
@@ -20,7 +27,7 @@ interface URLLike {
      */
     url: string;
 }
-export declare const inputFileData: unique symbol;
+export declare const toRaw: unique symbol;
 /**
  * An `InputFile` wraps a number of different sources for [sending
  * files](https://grammy.dev/guide/files.html#uploading-your-own-file).
@@ -45,8 +52,9 @@ export declare class InputFile {
      * @param file A path to a local file or a `Buffer` or a `fs.ReadStream` that specifies the file data
      * @param filename Optional name of the file
      */
-    constructor(file: string | URL | URLLike | Uint8Array | ReadStream | AsyncIterable<Uint8Array>, filename?: string);
-    get [inputFileData](): string | Uint8Array | AsyncIterable<Uint8Array> | ReadStream;
+    constructor(file: string | URL | URLLike | Uint8Array | ReadStream | Iterable<Uint8Array> | AsyncIterable<Uint8Array>, filename?: string);
+    private guessFilename;
+    [toRaw](): Uint8Array | Iterable<Uint8Array> | AsyncIterable<Uint8Array>;
 }
 declare type GrammyTypes = InputFileProxy<InputFile>;
 /** Wrapper type to bundle all methods of the Telegram API */

package/out/platform.node.js

@@ -10,31 +10,38 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InputFile = exports.inputFileData = exports.baseFetchConfig = exports.streamFile = exports.itrToStream = exports.debug = void 0;
+exports.InputFile = exports.toRaw = exports.baseFetchConfig = exports.itrToStream = exports.debug = void 0;
+const http_1 = require("http");
 const https_1 = require("https");
 const path_1 = require("path");
 const stream_1 = require("stream");
 const url_1 = require("url");
+const fs_1 = require("fs");
 // === Export all API types
 __exportStar(require("@grammyjs/types"), exports);
 // === Export debug
-var debug_1 = require("debug");
+const debug_1 = require("debug");
 Object.defineProperty(exports, "debug", { enumerable: true, get: function () { return debug_1.debug; } });
+const debug = (0, debug_1.debug)("grammy:warn");
 // === Export system-specific operations
 // Turn an AsyncIterable<Uint8Array> into a stream
 const itrToStream = (itr) => stream_1.Readable.from(itr, { objectMode: false });
 exports.itrToStream = itrToStream;
-// Turn a file path into an AsyncIterable<Uint8Array>
-var fs_1 = require("fs");
-Object.defineProperty(exports, "streamFile", { enumerable: true, get: function () { return fs_1.createReadStream; } });
 // === Base configuration for `fetch` calls
-exports.baseFetchConfig = {
-    compress: true,
-    agent: new https_1.Agent({ keepAlive: true }),
-};
+function baseFetchConfig(apiRoot) {
+    if (apiRoot.startsWith("https:")) {
+        return { compress: true, agent: new https_1.Agent({ keepAlive: true }) };
+    }
+    else if (apiRoot.startsWith("http:")) {
+        return { agent: new http_1.Agent({ keepAlive: true }) };
+    }
+    else
+        return {};
+}
+exports.baseFetchConfig = baseFetchConfig;
 // === InputFile handling and File augmenting
 // Accessor for file data in `InputFile` instances
-exports.inputFileData = Symbol("InputFile data");
+exports.toRaw = Symbol("InputFile data");
 /**
  * An `InputFile` wraps a number of different sources for [sending
  * files](https://grammy.dev/guide/files.html#uploading-your-own-file).
@@ -76,31 +83,50 @@ class InputFile {
             value: void 0
         });
         this.fileData = file;
-        if (filename === undefined && typeof file === "string") {
-            filename = (0, path_1.basename)(file);
-        }
+        filename !== null && filename !== void 0 ? filename : (filename = this.guessFilename(file));
         this.filename = filename;
+        if (typeof file === "string" &&
+            (file.startsWith("http:") || file.startsWith("https:"))) {
+            debug(`InputFile received the local file path '${file}' that looks like a URL. Is this a mistake?`);
+        }
+    }
+    guessFilename(file) {
+        if (typeof file === "string")
+            return (0, path_1.basename)(file);
+        if (typeof file !== "object")
+            return undefined;
+        if ("url" in file)
+            return (0, path_1.basename)(file.url);
+        if (!(file instanceof url_1.URL))
+            return undefined;
+        return (0, path_1.basename)(file.pathname) || (0, path_1.basename)(file.hostname);
     }
-    get [exports.inputFileData]() {
+    [exports.toRaw]() {
         if (this.consumed) {
             throw new Error("Cannot reuse InputFile data source!");
         }
-        let data = this.fileData;
-        if (typeof data === "object" && ("url" in data || data instanceof url_1.URL)) {
-            data = fetchFile(data instanceof url_1.URL ? data : data.url);
-        }
-        else if (typeof data !== "string" && (!(data instanceof Uint8Array))) {
-            this.consumed = false;
+        const data = this.fileData;
+        // Handle local files
+        if (typeof data === "string")
+            return (0, fs_1.createReadStream)(data);
+        // Handle URLs and URLLike objects
+        if (data instanceof url_1.URL) {
+            return data.protocol === "file" // node-fetch does not support file URLs
+                ? (0, fs_1.createReadStream)(data.pathname)
+                : fetchFile(data);
         }
+        if ("url" in data)
+            return fetchFile(data.url);
+        // Mark streams and iterators as consumed
+        if (!(data instanceof Uint8Array))
+            this.consumed = true;
+        // Return buffers and byte streams as-is
         return data;
     }
 }
 exports.InputFile = InputFile;
 async function* fetchFile(url) {
     const { body } = await (0, shim_node_js_1.fetch)(url);
-    if (body === null) {
-        throw new Error(`Download failed, no response body from '${url}'`);
-    }
     for await (const chunk of body) {
         if (typeof chunk === "string") {
             throw new Error(`Could not transfer file, received string data instead of bytes from '${url}'`);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "grammy",
-    "description": "grammY core package ported to Node.js",
-    "version": "1.4.2",
+    "description": "The Telegram Bot Framework.",
+    "version": "1.4.3",
     "author": "KnorpelSenf",
     "license": "MIT",
     "engines": {
@@ -18,18 +18,21 @@
         "lint": "deno lint --config deno.json",
         "fmt": "deno fmt --config deno.json",
         "test": "deno test ./test/",
-        "backport": "deno2node tsconfig.json"
+        "bundle": "cd bundling && ./bundle-all.sh",
+        "backport": "deno2node tsconfig.json",
+        "contribs": "all-contributors"
     },
     "dependencies": {
         "@grammyjs/types": "^2.3.1",
         "abort-controller": "^3.0.0",
-        "debug": "^4.3.2",
+        "debug": "^4.3.3",
         "node-fetch": "^2.6.5"
     },
     "devDependencies": {
         "@types/debug": "^4.1.7",
-        "@types/node": "^12.20.33",
+        "@types/node": "^12.20.36",
         "@types/node-fetch": "^2.5.12",
+        "all-contributors-cli": "^6.20.0",
         "deno2node": "^1.0.0"
     },
     "files": [
@@ -40,6 +43,10 @@
     "keywords": [
         "telegram",
         "bot",
-        "api"
+        "api",
+        "client",
+        "framework",
+        "library",
+        "grammy"
     ]
 }