grammy 1.31.0 → 1.31.2

package/README.md

@@ -314,6 +314,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="11.11%"><a href="https://nometa.xyz/"><img src="https://avatars.githubusercontent.com/u/68379695?v=4?s=100" width="100px;" alt="Mased"/><br /><sub><b>Mased</b></sub></a><br /><a href="#translation-MasedMSD" title="Translation">🌍</a> <a href="https://github.com/grammyjs/grammY/commits?author=MasedMSD" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="11.11%"><a href="https://github.com/ExposedCat"><img src="https://avatars.githubusercontent.com/u/44642024?v=4?s=100" width="100px;" alt="Artem Prokop"/><br /><sub><b>Artem Prokop</b></sub></a><br /><a href="#userTesting-ExposedCat" title="User Testing">📓</a></td>
       <td align="center" valign="top" width="11.11%"><a href="https://chinoman10.com/"><img src="https://avatars.githubusercontent.com/u/8300763?v=4?s=100" width="100px;" alt="Sérgio Rebelo"/><br /><sub><b>Sérgio Rebelo</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3AChinoman10" title="Reviewed Pull Requests">👀</a></td>
+      <td align="center" valign="top" width="11.11%"><a href="https://blog.katsuba.dev"><img src="https://avatars.githubusercontent.com/u/10637135?v=4?s=100" width="100px;" alt="Igor Katsuba"/><br /><sub><b>Igor Katsuba</b></sub></a><br /><a href="#ideas-IKatsuba" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/grammyjs/grammY/commits?author=IKatsuba" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

package/out/core/client.d.ts

@@ -145,6 +145,10 @@ export interface ApiClientOptions {
      * compress: true }` (Node), `{}` (Deno)
      */
     baseFetchConfig?: Omit<NonNullable<Parameters<typeof fetch>[1]>, "method" | "headers" | "body">;
+    /**
+     * `fetch` function to use for making HTTP requests. Default: `node-fetch` in Node.js, `fetch` in Deno.
+     */
+    fetch?: typeof fetch;
     /**
      * When the network connection is unreliable and some API requests fail
      * because of that, grammY will throw errors that tell you exactly which

package/out/core/client.js

@@ -46,7 +46,7 @@ class ApiClient {
             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));
+            const successPromise = this.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
@@ -61,6 +61,11 @@ class ApiClient {
         };
         const apiRoot = (_a = options.apiRoot) !== null && _a !== void 0 ? _a : "https://api.telegram.org";
         const environment = (_b = options.environment) !== null && _b !== void 0 ? _b : "prod";
+        // In an ideal world, `fetch` is independent of the context being called,
+        // but in a Cloudflare worker, any context other than global throws an error.
+        // That is why we need to call custom fetch or fetch without context.
+        const { fetch: customFetch } = options;
+        const fetchFn = customFetch !== null && customFetch !== void 0 ? customFetch : shim_node_js_1.fetch;
         this.options = {
             apiRoot,
             environment,
@@ -72,7 +77,9 @@ class ApiClient {
             },
             canUseWebhookReply: (_e = options.canUseWebhookReply) !== null && _e !== void 0 ? _e : (() => false),
             sensitiveLogs: (_f = options.sensitiveLogs) !== null && _f !== void 0 ? _f : false,
+            fetch: ((...args) => fetchFn(...args)),
         };
+        this.fetch = this.options.fetch;
         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}')`);
         }

package/out/web.mjs

@@ -2239,6 +2239,7 @@ class ApiClient {
     token;
     webhookReplyEnvelope;
     options;
+    fetch;
     hasUsedWebhookReply;
     installedTransformers;
     constructor(token, options = {}, webhookReplyEnvelope = {}){
@@ -2275,7 +2276,7 @@ class ApiClient {
                 signal: sig,
                 ...config
             };
-            const successPromise = fetch(url instanceof URL ? url.href : url, options).catch(toHttpError(method, opts.sensitiveLogs));
+            const successPromise = this.fetch(url instanceof URL ? url.href : url, options).catch(toHttpError(method, opts.sensitiveLogs));
             const operations = [
                 successPromise,
                 streamErr.promise,
@@ -2290,6 +2291,8 @@ class ApiClient {
         };
         const apiRoot = options.apiRoot ?? "https://api.telegram.org";
         const environment = options.environment ?? "prod";
+        const { fetch: customFetch } = options;
+        const fetchFn = customFetch ?? fetch;
         this.options = {
             apiRoot,
             environment,
@@ -2300,8 +2303,10 @@ class ApiClient {
                 ...options.baseFetchConfig
             },
             canUseWebhookReply: options.canUseWebhookReply ?? (()=>false),
-            sensitiveLogs: options.sensitiveLogs ?? false
+            sensitiveLogs: options.sensitiveLogs ?? false,
+            fetch: (...args)=>fetchFn(...args)
         };
+        this.fetch = this.options.fetch;
         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}')`);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "grammy",
     "description": "The Telegram Bot Framework.",
-    "version": "1.31.0",
+    "version": "1.31.2",
     "author": "KnorpelSenf",
     "license": "MIT",
     "engines": {