grammy 1.7.0 → 1.7.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.7-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-50-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-54-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <!-- deno-fmt-ignore-end -->
@@ -111,7 +111,7 @@ You may also be interested in [why we support Deno](https://grammy.dev/resources
 ## Browser Support
 
 The grammY core package in this repository is avaiable as a JavaScript bundle from the CDN at `get.grammy.dev`.
-Currently, we transpile all stable versions (all releases since v1.0) as well as the current `main` branch to ES3, ES5, ES6, and ESNext.
+Currently, we transpile all stable versions (all releases since v1.0) as well as the current `main` branch to ES6 and ESNext.
 
 You can download them from the URL `https://get.grammy.dev/[ES version lowercased]@[grammY version including v-prefix].js`.
 For example, the most recent source on `main` in ES6 is available from <https://get.grammy.dev/es6@dev.js>.
@@ -176,7 +176,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <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> <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="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> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Adarvesh" title="Reviewed Pull Requests">👀</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> <a href="#plugin-dcdunkan" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Adcdunkan" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/grammyjs/grammY/commits?author=dcdunkan" 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>
@@ -193,6 +193,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/abdollahzadehAli"><img src="https://avatars.githubusercontent.com/u/96317431?v=4?s=100" width="100px;" alt=""/><br /><sub><b>abdollahzadehAli</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=abdollahzadehAli" title="Documentation">📖</a> <a href="#example-abdollahzadehAli" title="Examples">💡</a></td>
+    <td align="center"><a href="https://github.com/MrSaeedNasiri"><img src="https://avatars.githubusercontent.com/u/17780289?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saeed Nasiri</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=MrSaeedNasiri" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/Scrip7"><img src="https://avatars.githubusercontent.com/u/37535505?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hesoyam</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=Scrip7" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://yrz.am"><img src="https://avatars.githubusercontent.com/u/96742416?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yrzam</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Ayrzam" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/drmikecrowe"><img src="https://avatars.githubusercontent.com/u/90312?v=4?s=100" width="100px;" alt=""/><br /><sub><b>drmikecrowe</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Adrmikecrowe" title="Reviewed Pull Requests">👀</a></td>
   </tr>
 </table>
 

package/out/bot.d.ts

@@ -35,13 +35,14 @@ export interface PollingOptions {
      */
     drop_pending_updates?: boolean;
     /**
-     * Synchronous callback that is useful for logging. It will be executed once
-     * the setup of the bot has completed, and immediately before the first
-     * updates are being fetched. The bot information `bot.botInfo` will be
-     * available when the function is run. For convenience, the callback
-     * function receives the value of `bot.botInfo` as an argument.
+     * A callback function that is useful for logging (or setting up middleware
+     * if you did not do this before). It will be executed after the setup of
+     * the bot has completed, and immediately before the first updates are being
+     * fetched. The bot information `bot.botInfo` will be available when the
+     * function is run. For convenience, the callback function receives the
+     * value of `bot.botInfo` as an argument.
      */
-    onStart?: (botInfo: UserFromGetMe) => void;
+    onStart?: (botInfo: UserFromGetMe) => void | Promise<void>;
 }
 export { BotError };
 /**
@@ -50,7 +51,7 @@ export { BotError };
  */
 export declare type ErrorHandler<C extends Context = Context> = (error: BotError<C>) => unknown;
 /**
- * Options to pass the bot when creating it.
+ * Options to pass to the bot when creating it.
  */
 export interface BotConfig<C extends Context> {
     /**
@@ -113,6 +114,7 @@ export declare class Bot<C extends Context = Context, A extends Api = Api> exten
      */
     readonly api: A;
     private me;
+    private mePromise;
     private readonly clientConfig;
     private readonly ContextConstructor;
     /**

package/out/bot.js

@@ -50,85 +50,25 @@ class Bot extends composer_js_1.Composer {
     constructor(token, config) {
         var _a;
         super();
-        Object.defineProperty(this, "token", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: token
-        });
-        Object.defineProperty(this, "pollingRunning", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
-        Object.defineProperty(this, "pollingAbortController", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "lastTriedUpdateId", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 0
-        });
-        /**
-         * Gives you full access to the Telegram Bot API.
-         * ```ts
-         * // This is how to call the Bot API methods:
-         * bot.api.sendMessage(chat_id, 'Hello, grammY!')
-         * ```
-         *
-         * Use this only outside of your middleware. If you have access to `ctx`,
-         * then using `ctx.api` instead of `bot.api` is preferred.
-         */
-        Object.defineProperty(this, "api", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "me", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "clientConfig", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "ContextConstructor", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+        this.token = token;
+        this.pollingRunning = false;
+        this.lastTriedUpdateId = 0;
         /**
          * Holds the bot's error handler that is invoked whenever middleware throws
          * (rejects). If you set your own error handler via `bot.catch`, all that
          * happens is that this variable is assigned.
          */
-        Object.defineProperty(this, "errorHandler", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: async (err) => {
-                var _a, _b;
-                console.error("Error in middleware while handling update", (_b = (_a = err.ctx) === null || _a === void 0 ? void 0 : _a.update) === null || _b === void 0 ? void 0 : _b.update_id, err.error);
-                console.error("No error handler was set!");
-                console.error("Set your own error handler with `bot.catch = ...`");
-                if (this.pollingRunning) {
-                    console.error("Stopping bot");
-                    await this.stop();
-                }
-                throw err;
+        this.errorHandler = async (err) => {
+            var _a, _b;
+            console.error("Error in middleware while handling update", (_b = (_a = err.ctx) === null || _a === void 0 ? void 0 : _a.update) === null || _b === void 0 ? void 0 : _b.update_id, err.error);
+            console.error("No error handler was set!");
+            console.error("Set your own error handler with `bot.catch = ...`");
+            if (this.pollingRunning) {
+                console.error("Stopping bot");
+                await this.stop();
             }
-        });
+            throw err;
+        };
         if (!token)
             throw new Error("Empty token!");
         this.me = config === null || config === void 0 ? void 0 : config.botInfo;
@@ -175,9 +115,17 @@ class Bot extends composer_js_1.Composer {
      * manually.
      */
     async init() {
+        var _a;
         if (!this.isInited()) {
             debug("Initializing bot");
-            const me = await this.api.getMe();
+            (_a = this.mePromise) !== null && _a !== void 0 ? _a : (this.mePromise = withRetries(() => this.api.getMe()));
+            let me;
+            try {
+                me = await this.mePromise;
+            }
+            finally {
+                this.mePromise = undefined;
+            }
             if (this.me === undefined)
                 this.me = me;
             else
@@ -285,7 +233,7 @@ a known bot info object.");
         var _a;
         // Perform setup
         if (!this.isInited())
-            await withRetries(() => this.init());
+            await this.init();
         if (this.pollingRunning) {
             debug("Simple long polling already running!");
             return;
@@ -293,6 +241,8 @@ a known bot info object.");
         await withRetries(() => this.api.deleteWebhook({
             drop_pending_updates: options === null || options === void 0 ? void 0 : options.drop_pending_updates,
         }));
+        // All async ops of setup complete, run callback
+        await ((_a = options === null || options === void 0 ? void 0 : options.onStart) === null || _a === void 0 ? void 0 : _a.call(options, this.botInfo));
         // Prevent common misuse that causes memory leak
         this.use = () => {
             throw new Error(`It looks like you are registering more listeners \
@@ -309,7 +259,6 @@ you can circumvent this protection against memory leaks.`);
         };
         // Start polling
         debug("Starting simple long polling");
-        (_a = options === null || options === void 0 ? void 0 : options.onStart) === null || _a === void 0 ? void 0 : _a.call(options, this.botInfo);
         await this.loop(options);
         debug("Middleware is done running");
     }
@@ -445,11 +394,10 @@ exports.Bot = Bot;
  * @param task Async task to perform
  */
 async function withRetries(task) {
-    let success = false;
-    while (!success) {
+    let result = { ok: false };
+    while (!result.ok) {
         try {
-            await task();
-            success = true;
+            result = { ok: true, value: await task() };
         }
         catch (error) {
             debugErr(error);
@@ -468,6 +416,7 @@ async function withRetries(task) {
             throw error;
         }
     }
+    return result.value;
 }
 /**
  * Returns a new promise that resolves after the specified number of seconds.

package/out/composer.js

@@ -11,18 +11,8 @@ const filter_js_1 = require("./filter.js");
 class BotError extends Error {
     constructor(error, ctx) {
         super(generateBotErrorMessage(error));
-        Object.defineProperty(this, "error", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: error
-        });
-        Object.defineProperty(this, "ctx", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: ctx
-        });
+        this.error = error;
+        this.ctx = ctx;
         this.name = "BotError";
         if (error instanceof Error)
             this.stack = error.stack;
@@ -109,12 +99,6 @@ class Composer {
      * @param middleware The middleware to compose
      */
     constructor(...middleware) {
-        Object.defineProperty(this, "handler", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.handler = middleware.length === 0
             ? pass
             : middleware.map(flatten).reduce(concat);

package/out/context.d.ts

@@ -10,7 +10,7 @@ declare type RenamedUpdate = AliasProps<Omit<Update, "update_id">>;
 /**
  * When your bot receives a message, Telegram sends an update object to your
  * bot. The update contains information about the chat, the user, and of course
- * the message itself. There a numerous other updates, too:
+ * the message itself. There are numerous other updates, too:
  * https://core.telegram.org/bots/api#update
  *
  * When grammY receives an update, it wraps this update into a context object

package/out/context.js

@@ -4,7 +4,7 @@ exports.Context = void 0;
 /**
  * When your bot receives a message, Telegram sends an update object to your
  * bot. The update contains information about the chat, the user, and of course
- * the message itself. There a numerous other updates, too:
+ * the message itself. There are numerous other updates, too:
  * https://core.telegram.org/bots/api#update
  *
  * When grammY receives an update, it wraps this update into a context object
@@ -53,34 +53,9 @@ class Context {
      * Information about the bot itself.
      */
     me) {
-        Object.defineProperty(this, "update", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: update
-        });
-        Object.defineProperty(this, "api", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: api
-        });
-        Object.defineProperty(this, "me", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: me
-        });
-        /**
-         * Used by some middleware to store information about how a certain string
-         * or regular expression was matched.
-         */
-        Object.defineProperty(this, "match", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+        this.update = update;
+        this.api = api;
+        this.me = me;
     }
     // UPDATE SHORTCUTS
     /** Alias for `ctx.update.message` */

package/out/convenience/keyboard.js

@@ -34,12 +34,7 @@ class Keyboard {
          * The nested array that holds the custom keyboard. It will be extended every time
          * you call one of the provided methods.
          */
-        Object.defineProperty(this, "keyboard", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: [[]]
-        });
+        this.keyboard = [[]];
     }
     /**
      * Allows you to add your own `KeyboardButton` objects if you already have
@@ -141,12 +136,7 @@ class InlineKeyboard {
          * The nested array that holds the inline keyboard. It will be extended
          * every time you call one of the provided methods.
          */
-        Object.defineProperty(this, "inline_keyboard", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: [[]]
-        });
+        this.inline_keyboard = [[]];
     }
     /**
      * Allows you to add your own `InlineKeyboardButton` objects if you already

package/out/convenience/session.js

@@ -212,21 +212,11 @@ class MemorySessionStorage {
      * @param timeToLive TTL in milliseconds, default is `Infinity`
      */
     constructor(timeToLive = Infinity) {
-        Object.defineProperty(this, "timeToLive", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: timeToLive
-        });
+        this.timeToLive = timeToLive;
         /**
          * Internally used `Map` instance that stores the session data
          */
-        Object.defineProperty(this, "storage", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: new Map()
-        });
+        this.storage = new Map();
     }
     read(key) {
         const value = this.storage.get(key);

package/out/core/api.js

@@ -21,32 +21,6 @@ const client_js_1 = require("./client.js");
  */
 class Api {
     constructor(token, config, webhookReplyEnvelope) {
-        /**
-         * Provides access to all methods of the Telegram Bot API exactly as
-         * documented on the website (https://core.telegram.org/bots/api). No
-         * arguments are pulled up in the function signature for convenience.
-         *
-         * If you suppress compiler warnings, this also allows for raw api calls to
-         * undocumented methods with arbitrary parameters—use only if you know what
-         * you are doing.
-         */
-        Object.defineProperty(this, "raw", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        /**
-         * Configuration object for the API instance, used as a namespace to
-         * separate those API operations that are related to grammY from methods of
-         * the Telegram Bot API. Contains advanced options!
-         */
-        Object.defineProperty(this, "config", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         const { raw, use, installedTransformers } = (0, client_js_1.createRawApi)(token, config, webhookReplyEnvelope);
         this.raw = raw;
         this.config = {

package/out/core/client.d.ts

@@ -74,7 +74,26 @@ export interface ApiClientOptions {
      * @param method The API method to be called, e.g. `getMe`
      * @returns The URL that will be fetched during the API call
      */
-    buildUrl?: (root: string, token: string, method: string) => Parameters<typeof fetch>[0];
+    buildUrl?: (root: string, token: string, method: string) => string | URL;
+    /**
+     * Maximum number of seconds that a request to the Bot API server may take.
+     * If a request has not completed before this time has elapsed, grammY
+     * aborts the request and errors. Without such a timeout, networking issues
+     * may cause your bot to leave open a connection indefinitely, which may
+     * effectively make your bot freeze.
+     *
+     * You probably do not have to care about this option. In rare cases, you
+     * may want to adjust it if you are transferring large files via slow
+     * connections to your own Bot API server.
+     *
+     * The default number of seconds is `500`, which corresponds to 8 minutes
+     * and 20 seconds. Note that this is also the value that is hard-coded in
+     * the official Bot API server, so you cannot perform any successful
+     * requests that exceed this time frame (even if you would allow it in
+     * grammY). Setting this option to higher than the default only makes sense
+     * with a custom Bot API server.
+     */
+    timeoutSeconds?: number;
     /**
      * If the bot is running on webhooks, as soon as the bot receives an update
      * from Telegram, it is possible to make up to one API call in the response

package/out/core/client.js

@@ -11,90 +11,64 @@ function concatTransformer(prev, trans) {
 }
 class ApiClient {
     constructor(token, options = {}, webhookReplyEnvelope = {}) {
-        var _a, _b, _c, _d;
-        Object.defineProperty(this, "token", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: token
-        });
-        Object.defineProperty(this, "webhookReplyEnvelope", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: webhookReplyEnvelope
-        });
-        Object.defineProperty(this, "options", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "hasUsedWebhookReply", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
-        Object.defineProperty(this, "installedTransformers", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: []
-        });
-        Object.defineProperty(this, "call", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: async (method, payload, signal) => {
-                debug("Calling", method);
-                const url = this.options.buildUrl(this.options.apiRoot, this.token, method);
-                const formDataRequired = (0, payload_js_1.requiresFormDataUpload)(payload);
-                if (this.webhookReplyEnvelope.send !== undefined &&
-                    !this.hasUsedWebhookReply &&
-                    !formDataRequired &&
-                    this.options.canUseWebhookReply(method)) {
-                    this.hasUsedWebhookReply = true;
-                    const config = (0, payload_js_1.createJsonPayload)({ ...payload, method });
-                    await this.webhookReplyEnvelope.send(config.body);
-                    return { ok: true, result: true };
-                }
-                else {
-                    const p = payload !== null && payload !== void 0 ? payload : {};
-                    const sensLogs = this.options.sensitiveLogs;
-                    const abortController = new shim_node_js_1.AbortController();
-                    const abort = combineAborts(abortController, signal);
-                    const res = await new Promise((resolve, reject) => {
-                        function onStreamError(err) {
-                            abort();
-                            reject(err);
-                        }
-                        const onHttpError = toHttpError(method, sensLogs, reject);
-                        const config = formDataRequired
-                            ? (0, payload_js_1.createFormDataPayload)(p, onStreamError)
-                            : (0, payload_js_1.createJsonPayload)(p);
-                        const opts = {
-                            ...this.options.baseFetchConfig,
-                            signal: abortController.signal,
-                            ...config,
-                        };
-                        (0, shim_node_js_1.fetch)(url, opts).then((res) => res.json()).then(resolve)
-                            .catch(onHttpError);
-                    });
-                    return res;
-                }
+        var _a, _b, _c, _d, _e;
+        this.token = token;
+        this.webhookReplyEnvelope = webhookReplyEnvelope;
+        this.hasUsedWebhookReply = false;
+        this.installedTransformers = [];
+        this.call = async (method, p, signal) => {
+            const payload = p !== null && p !== void 0 ? p : {};
+            debug("Calling", method);
+            // General config
+            const opts = this.options;
+            const formDataRequired = (0, payload_js_1.requiresFormDataUpload)(payload);
+            // Short-circuit on webhook reply
+            if (this.webhookReplyEnvelope.send !== undefined &&
+                !this.hasUsedWebhookReply &&
+                !formDataRequired &&
+                opts.canUseWebhookReply(method)) {
+                this.hasUsedWebhookReply = true;
+                const config = (0, payload_js_1.createJsonPayload)({ ...payload, method });
+                await this.webhookReplyEnvelope.send(config.body);
+                return { ok: true, result: true };
             }
-        });
+            // Handle timeouts and errors in the underlying form-data stream
+            const controller = createAbortControllerFromSignal(signal);
+            const timeout = createTimeout(controller, opts.timeoutSeconds, method);
+            const streamErr = createStreamError(controller);
+            // Build request URL and config
+            const url = opts.buildUrl(opts.apiRoot, this.token, method);
+            const config = formDataRequired
+                ? (0, payload_js_1.createFormDataPayload)(payload, (err) => streamErr.catch(err))
+                : (0, payload_js_1.createJsonPayload)(payload);
+            const sig = controller.signal;
+            const options = { ...opts.baseFetchConfig, signal: sig, ...config };
+            // Perform fetch call, and handle networking errors
+            const successPromise = (0, shim_node_js_1.fetch)(url instanceof URL ? url.href : url, options)
+                .catch((0, error_js_1.toHttpError)(method, opts.sensitiveLogs));
+            // Those are the three possible outcomes of the fetch call:
+            const operations = [successPromise, streamErr.promise, timeout.promise];
+            // Wait for result
+            try {
+                const res = await Promise.race(operations);
+                return await res.json();
+            }
+            finally {
+                if (timeout.handle !== undefined)
+                    clearTimeout(timeout.handle);
+            }
+        };
         const apiRoot = (_a = options.apiRoot) !== null && _a !== void 0 ? _a : "https://api.telegram.org";
         this.options = {
             apiRoot,
             buildUrl: (_b = options.buildUrl) !== null && _b !== void 0 ? _b : ((root, token, method) => `${root}/bot${token}/${method}`),
+            timeoutSeconds: (_c = options.timeoutSeconds) !== null && _c !== void 0 ? _c : 500,
             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,
+            canUseWebhookReply: (_d = options.canUseWebhookReply) !== null && _d !== void 0 ? _d : (() => false),
+            sensitiveLogs: (_e = options.sensitiveLogs) !== null && _e !== void 0 ? _e : false,
         };
         if (this.options.apiRoot.endsWith("/")) {
             throw new Error(`Remove the trailing '/' from the 'apiRoot' option (use '${this.options.apiRoot.substring(0, this.options.apiRoot.length - 1)}' instead of '${this.options.apiRoot}')`);
@@ -109,9 +83,8 @@ class ApiClient {
         const data = await this.call(method, payload, signal);
         if (data.ok)
             return data.result;
-        else {
-            throw new error_js_1.GrammyError(`Call to '${method}' failed!`, data, method, payload);
-        }
+        else
+            throw (0, error_js_1.toGrammyError)(data, method, payload);
     }
 }
 /**
@@ -164,25 +137,36 @@ const proxyMethods = {
         return [];
     },
 };
-function isTelegramError(err) {
-    return (typeof err === "object" &&
-        err !== null &&
-        "status" in err &&
-        "statusText" in err);
+/** Creates a timeout error which aborts a given controller */
+function createTimeout(controller, seconds, method) {
+    let handle = undefined;
+    const promise = new Promise((_, reject) => {
+        handle = setTimeout(() => {
+            const msg = `Request to '${method}' timed out after ${seconds} seconds`;
+            reject(new Error(msg));
+            controller.abort();
+        }, 1000 * seconds);
+    });
+    return { promise, handle };
 }
-function toHttpError(method, sensitiveLogs, reject) {
-    return (err) => {
-        let msg = `Network request for '${method}' failed!`;
-        if (isTelegramError(err))
-            msg += ` (${err.status}: ${err.statusText})`;
-        if (sensitiveLogs && err instanceof Error)
-            msg += ` ${err.message}`;
-        reject(new error_js_1.HttpError(msg, err));
+/** Creates a stream error which abort a given controller */
+function createStreamError(abortController) {
+    let onError = (err) => {
+        // Re-throw by default, but will be overwritten immediately
+        throw err;
     };
+    const promise = new Promise((_, reject) => {
+        onError = (err) => {
+            reject(err);
+            abortController.abort();
+        };
+    });
+    return { promise, catch: onError };
 }
-function combineAborts(abortController, signal) {
+function createAbortControllerFromSignal(signal) {
+    const abortController = new shim_node_js_1.AbortController();
     if (signal === undefined)
-        return () => abortController.abort();
+        return abortController;
     const sig = signal;
     function abort() {
         abortController.abort();
@@ -192,6 +176,6 @@ function combineAborts(abortController, signal) {
         abort();
     else
         sig.addEventListener("abort", abort);
-    return abort;
+    return { abort, signal: abortController.signal };
 }
 const shim_node_js_1 = require("../shim.node.js");

package/out/core/error.d.ts

@@ -29,6 +29,7 @@ export declare class GrammyError extends Error implements ApiError {
     /** The payload that was passed when calling the method. */
     payload: Record<string, unknown>);
 }
+export declare function toGrammyError(err: ApiError, method: string, payload: Record<string, unknown>): GrammyError;
 /**
  * This class represents errors that are thrown by grammY because an HTTP call
  * to the Telegram Bot API failed.
@@ -49,3 +50,4 @@ export declare class HttpError extends Error {
     /** The thrown error object. */
     error: unknown);
 }
+export declare function toHttpError(method: string, sensitiveLogs: boolean): (err: unknown) => never;

package/out/core/error.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpError = exports.GrammyError = void 0;
+exports.toHttpError = exports.HttpError = exports.toGrammyError = exports.GrammyError = void 0;
 /**
  * This class represents errors that are thrown by grammY because the Telegram
  * Bot API responded with an error.
@@ -20,46 +20,10 @@ class GrammyError extends Error {
     payload) {
         var _a;
         super(`${message} (${err.error_code}: ${err.description})`);
-        Object.defineProperty(this, "method", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: method
-        });
-        Object.defineProperty(this, "payload", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: payload
-        });
+        this.method = method;
+        this.payload = payload;
         /** Flag that this request was unsuccessful. Always `false`. */
-        Object.defineProperty(this, "ok", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
-        /** An integer holding Telegram's error code. Subject to change. */
-        Object.defineProperty(this, "error_code", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        /** A human-readable description of the error. */
-        Object.defineProperty(this, "description", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        /** Further parameters that may help to automatically handle the error. */
-        Object.defineProperty(this, "parameters", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+        this.ok = false;
         this.name = "GrammyError";
         this.error_code = err.error_code;
         this.description = err.description;
@@ -67,6 +31,10 @@ class GrammyError extends Error {
     }
 }
 exports.GrammyError = GrammyError;
+function toGrammyError(err, method, payload) {
+    return new GrammyError(`Call to '${method}' failed!`, err, method, payload);
+}
+exports.toGrammyError = toGrammyError;
 /**
  * This class represents errors that are thrown by grammY because an HTTP call
  * to the Telegram Bot API failed.
@@ -85,13 +53,25 @@ class HttpError extends Error {
     /** The thrown error object. */
     error) {
         super(message);
-        Object.defineProperty(this, "error", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: error
-        });
+        this.error = error;
         this.name = "HttpError";
     }
 }
 exports.HttpError = HttpError;
+function isTelegramError(err) {
+    return (typeof err === "object" &&
+        err !== null &&
+        "status" in err &&
+        "statusText" in err);
+}
+function toHttpError(method, sensitiveLogs) {
+    return (err) => {
+        let msg = `Network request for '${method}' failed!`;
+        if (isTelegramError(err))
+            msg += ` (${err.status}: ${err.statusText})`;
+        if (sensitiveLogs && err instanceof Error)
+            msg += ` ${err.message}`;
+        throw new HttpError(msg, err);
+    };
+}
+exports.toHttpError = toHttpError;

package/out/mod.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/out/platform.node.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -58,31 +62,7 @@ class InputFile {
      * @param filename Optional name of the file
      */
     constructor(file, filename) {
-        Object.defineProperty(this, "consumed", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
-        Object.defineProperty(this, "fileData", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        /**
-         * Optional name of the constructed `InputFile` instance.
-         *
-         * Check out the
-         * [documenation](https://grammy.dev/guide/files.html#uploading-your-own-file)
-         * on sending files with `InputFile`.
-         */
-        Object.defineProperty(this, "filename", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+        this.consumed = false;
         this.fileData = file;
         filename !== null && filename !== void 0 ? filename : (filename = this.guessFilename(file));
         this.filename = filename;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "grammy",
     "description": "The Telegram Bot Framework.",
-    "version": "1.7.0",
+    "version": "1.7.3",
     "author": "KnorpelSenf",
     "license": "MIT",
     "engines": {
@@ -25,15 +25,15 @@
     "dependencies": {
         "@grammyjs/types": "^2.6.0",
         "abort-controller": "^3.0.0",
-        "debug": "^4.3.3",
-        "node-fetch": "^2.6.5"
+        "debug": "^4.3.4",
+        "node-fetch": "^2.6.7"
     },
     "devDependencies": {
         "@types/debug": "^4.1.7",
-        "@types/node": "^12.20.36",
-        "@types/node-fetch": "^2.5.12",
+        "@types/node": "^12.20.47",
+        "@types/node-fetch": "^2.6.1",
         "all-contributors-cli": "^6.20.0",
-        "deno2node": "^1.1.0"
+        "deno2node": "^1.3.0"
     },
     "files": [
         "out/"