grammy 1.7.3 → 1.8.2

package/out/convenience/keyboard.js

@@ -31,8 +31,8 @@ exports.InlineKeyboard = exports.Keyboard = void 0;
 class Keyboard {
     constructor() {
         /**
-         * The nested array that holds the custom keyboard. It will be extended every time
-         * you call one of the provided methods.
+         * The nested array that holds the custom keyboard. It will be extended
+         * every time you call one of the provided methods.
          */
         this.keyboard = [[]];
     }
@@ -100,6 +100,17 @@ class Keyboard {
     requestPoll(text, type) {
         return this.add({ text, request_poll: { type } });
     }
+    /**
+     * Adds a new web app button. The Web App that will be launched when the
+     * user presses the button. The Web App will be able to send a
+     * “web_app_data” service message. Available in private chats only.
+     *
+     * @param text Text text to display
+     * @param url An HTTPS URL of a Web App to be opened with additional data
+     */
+    webApp(text, url) {
+        return this.add({ text, web_app: { url } });
+    }
     /**
      * Return the resulting custom keyboard that was built. May be called in the
      * end if necessary so you can specify more options in `reply_markup`.
@@ -174,22 +185,6 @@ class InlineKeyboard {
     url(text, url) {
         return this.add({ text, url });
     }
-    /**
-     * Adds a new login button. This can be used as a replacement for the
-     * Telegram Login Widget. You must specify an HTTP URL used to automatically
-     * authorize the user.
-     *
-     * @param text The text to display
-     * @param loginUrl The login URL as string or `LoginUrl` object
-     */
-    login(text, loginUrl) {
-        return this.add({
-            text,
-            login_url: typeof loginUrl === "string"
-                ? { url: loginUrl }
-                : loginUrl,
-        });
-    }
     /**
      * Adds a new callback query button. The button contains a text and a custom
      * payload. This payload will be sent back to your bot when the button is
@@ -211,6 +206,31 @@ class InlineKeyboard {
     text(text, data = text) {
         return this.add({ text, callback_data: data });
     }
+    /**
+     * Adds a new web app button, confer https://core.telegram.org/bots/webapps
+     *
+     * @param text The text to display
+     * @param url An HTTPS URL of a Web App to be opened with additional data
+     */
+    webApp(text, url) {
+        return this.add({ text, web_app: { url } });
+    }
+    /**
+     * Adds a new login button. This can be used as a replacement for the
+     * Telegram Login Widget. You must specify an HTTP URL used to automatically
+     * authorize the user.
+     *
+     * @param text The text to display
+     * @param loginUrl The login URL as string or `LoginUrl` object
+     */
+    login(text, loginUrl) {
+        return this.add({
+            text,
+            login_url: typeof loginUrl === "string"
+                ? { url: loginUrl }
+                : loginUrl,
+        });
+    }
     /**
      * Adds a new inline query button. Telegram clients will let the user pick a
      * chat when this button is pressed. This will start an inline query. The
@@ -247,7 +267,8 @@ class InlineKeyboard {
         return this.add({ text, switch_inline_query_current_chat: query });
     }
     /**
-     * Adds a new game query button, confer https://core.telegram.org/bots/api#games
+     * Adds a new game query button, confer
+     * https://core.telegram.org/bots/api#games
      *
      * This type of button must always be the first button in the first row.
      *
@@ -257,9 +278,11 @@ class InlineKeyboard {
         return this.add({ text, callback_game: {} });
     }
     /**
-     * Adds a new payment button, confer https://core.telegram.org/bots/api#payments
+     * Adds a new payment button, confer
+     * https://core.telegram.org/bots/api#payments
      *
-     * This type of button must always be the first button in the first row and can only be used in invoice messages.
+     * This type of button must always be the first button in the first row and
+     * can only be used in invoice messages.
      *
      * @param text The text to display
      */

package/out/convenience/session.js

@@ -64,13 +64,15 @@ function session(options = {}) {
         Object.defineProperty(ctx, "session", {
             get() {
                 if (key === undefined) {
-                    throw new Error("Cannot access session data because the session key was undefined!");
+                    const msg = undef("access", getSessionKey);
+                    throw new Error(msg);
                 }
                 return value;
             },
             set(v) {
                 if (key === undefined) {
-                    throw new Error("Cannot assign session data because the session key was undefined!");
+                    const msg = undef("assign", getSessionKey);
+                    throw new Error(msg);
                 }
                 value = v;
             },
@@ -132,7 +134,8 @@ function lazySession(options = {}) {
         async function load() {
             var _a;
             if (key === undefined) {
-                throw new Error("Cannot access lazy session data because the session key was undefined!");
+                const msg = undef("access", getSessionKey, { lazy: true });
+                throw new Error(msg);
             }
             let v = await storage.read(key);
             if (!fetching)
@@ -162,7 +165,8 @@ function lazySession(options = {}) {
             },
             set(v) {
                 if (key === undefined) {
-                    throw new Error("Cannot assign lazy session data because the session key was undefined!");
+                    const msg = undef("assign", getSessionKey, { lazy: true });
+                    throw new Error(msg);
                 }
                 wrote = true;
                 fetching = false;
@@ -184,10 +188,20 @@ function lazySession(options = {}) {
     };
 }
 exports.lazySession = lazySession;
+/** Stores session data per chat by default */
 function defaultGetSessionKey(ctx) {
     var _a;
     return (_a = ctx.chat) === null || _a === void 0 ? void 0 : _a.id.toString();
 }
+/** Returns a useful error message for when the session key is undefined */
+function undef(op, getSessionKey, opts = {}) {
+    var _a;
+    const lazy = (_a = opts.lazy) !== null && _a !== void 0 ? _a : false;
+    const reason = getSessionKey === defaultGetSessionKey
+        ? "this update does not belong to a chat, so the session key is undefined"
+        : "the custom `getSessionKey` function returned undefined for this update";
+    return `Cannot ${op} ${lazy ? "lazy " : ""}session data because ${reason}!`;
+}
 /**
  * The memory session storage is a built-in storage adapter that saves your
  * session data in RAM using a regular JavaScript `Map` object. If you use this

package/out/convenience/webhook.d.ts

@@ -70,8 +70,8 @@ interface ReqResHandler {
      */
     respond: (json: string) => unknown;
     /**
-     * Some frameworks (e.g. Deno's std/http `listenAndServe`) assume
-     * that handler returns something
+     * Some frameworks (e.g. Deno's std/http `listenAndServe`) assume that
+     * handler returns something
      */
     handlerReturn?: any;
 }
@@ -95,7 +95,7 @@ export declare type FrameworkAdapter = (...args: any[]) => ReqResHandler;
  * about how to run your bot with webhooks.
  *
  * @param bot The bot for which to create a callback
- * @param framework An optional string identifying the framework (default: 'express')
+ * @param adapter An optional string identifying the framework (default: 'express')
  * @param onTimeout An optional strategy to handle timeouts (default: 'throw')
  * @param timeoutMilliseconds An optional number of timeout milliseconds (default: 10_000)
  */

package/out/convenience/webhook.js

@@ -24,24 +24,19 @@ const adapters = { ...frameworks_node_js_1.adapters, callback: callbackAdapter }
  * about how to run your bot with webhooks.
  *
  * @param bot The bot for which to create a callback
- * @param framework An optional string identifying the framework (default: 'express')
+ * @param adapter An optional string identifying the framework (default: 'express')
  * @param onTimeout An optional strategy to handle timeouts (default: 'throw')
  * @param timeoutMilliseconds An optional number of timeout milliseconds (default: 10_000)
  */
 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) => {
         if (!initialized) {
-            if (firstUpdate) {
-                initCall = bot.init();
-                firstUpdate = false;
-            }
-            await initCall;
+            // Will dedupe concurrently incoming calls from several updates
+            await bot.init();
             initialized = true;
         }
         const { update, respond, end, handlerReturn } = server(...args);