gramio 0.4.2 → 0.4.4

package/dist/index.cjs

@@ -6,10 +6,10 @@ var callbackData = require('@gramio/callback-data');
 var contexts = require('@gramio/contexts');
 var files = require('@gramio/files');
 var format = require('@gramio/format');
-var utils = require('./utils-BIdmQNPz.cjs');
+var debug = require('debug');
+var utils = require('./utils-CnG66NLH.cjs');
 var middlewareIo = require('middleware-io');
 var keyboards = require('@gramio/keyboards');
-require('debug');
 
 class Composer {
   composer = middlewareIo.Composer.builder();
@@ -518,7 +518,7 @@ class Bot {
     }
   }
   async _callApi(method, params = {}) {
-    const debug$api$method = utils.debug$api.extend(method);
+    const debug$api$method = debug(`gramio:api:${method}`);
     let url = `${this.options.api.baseURL}${this.options.token}/${this.options.api.useTest ? "test/" : ""}${method}`;
     const reqOptions = {
       method: "POST",
@@ -1170,6 +1170,7 @@ const frameworks = {
     header: req.headers[SECRET_TOKEN_HEADER.toLowerCase()],
     unauthorized: () => res.writeHead(401).end(WRONG_TOKEN_ERROR)
   }),
+  // TODO: Maybe unify it by 'WebRequest'
   "std/http": (req) => ({
     update: req.json(),
     header: req.headers.get(SECRET_TOKEN_HEADER),
@@ -1181,6 +1182,12 @@ const frameworks = {
     header: req.headers.get(SECRET_TOKEN_HEADER),
     response: () => responseOK,
     unauthorized: () => responseUnauthorized
+  }),
+  Request: (req) => ({
+    update: req.json(),
+    header: req.headers.get(SECRET_TOKEN_HEADER),
+    response: () => responseOK,
+    unauthorized: () => responseUnauthorized
   })
 };
 

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { CallbackData } from '@gramio/callback-data';
 export * from '@gramio/callback-data';
-import { Context, UpdateName, ContextType, MaybeArray as MaybeArray$1, BotLike, Attachment } from '@gramio/contexts';
+import { Context, UpdateName, ContextType, BotLike, Attachment } from '@gramio/contexts';
 export * from '@gramio/contexts';
 import { APIMethods, TelegramResponseParameters, TelegramAPIResponseError, TelegramUser, APIMethodParams, APIMethodReturn, SetWebhookParams, TelegramUpdate, TelegramReactionTypeEmojiEmoji, SetMyCommandsParams, TelegramBotCommand } from '@gramio/types';
 export * from '@gramio/types';
@@ -111,11 +111,11 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
         /**	Composer */
         composer: Composer;
         /** Store plugin preRequests hooks */
-        preRequests: [Hooks.PreRequest<any>, MaybeArray$1<keyof APIMethods> | undefined][];
+        preRequests: [Hooks.PreRequest<any>, MaybeArray<keyof APIMethods> | undefined][];
         /** Store plugin onResponses hooks */
-        onResponses: [Hooks.OnResponse<any>, MaybeArray$1<keyof APIMethods> | undefined][];
+        onResponses: [Hooks.OnResponse<any>, MaybeArray<keyof APIMethods> | undefined][];
         /** Store plugin onResponseErrors hooks */
-        onResponseErrors: [Hooks.OnResponseError<any>, MaybeArray$1<keyof APIMethods> | undefined][];
+        onResponseErrors: [Hooks.OnResponseError<any>, MaybeArray<keyof APIMethods> | undefined][];
         /**
          * Store plugin groups
          *
@@ -147,11 +147,11 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
         /**	Composer */
         composer: Composer;
         /** Store plugin preRequests hooks */
-        preRequests: [Hooks.PreRequest<any>, MaybeArray$1<keyof APIMethods> | undefined][];
+        preRequests: [Hooks.PreRequest<any>, MaybeArray<keyof APIMethods> | undefined][];
         /** Store plugin onResponses hooks */
-        onResponses: [Hooks.OnResponse<any>, MaybeArray$1<keyof APIMethods> | undefined][];
+        onResponses: [Hooks.OnResponse<any>, MaybeArray<keyof APIMethods> | undefined][];
         /** Store plugin onResponseErrors hooks */
-        onResponseErrors: [Hooks.OnResponseError<any>, MaybeArray$1<keyof APIMethods> | undefined][];
+        onResponseErrors: [Hooks.OnResponseError<any>, MaybeArray<keyof APIMethods> | undefined][];
         /**
          * Store plugin groups
          *
@@ -203,7 +203,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
     derive<Handler extends Hooks.Derive<Context<BotLike> & Derives["global"]>>(handler: Handler): Plugin<Errors, Derives & {
         global: Awaited<ReturnType<Handler>>;
     }>;
-    derive<Update extends UpdateName, Handler extends Hooks.Derive<ContextType<BotLike, Update> & Derives["global"] & Derives[Update]>>(updateName: MaybeArray$1<Update>, handler: Handler): Plugin<Errors, Derives & {
+    derive<Update extends UpdateName, Handler extends Hooks.Derive<ContextType<BotLike, Update> & Derives["global"] & Derives[Update]>>(updateName: MaybeArray<Update>, handler: Handler): Plugin<Errors, Derives & {
         [K in Update]: Awaited<ReturnType<Handler>>;
     }>;
     decorate<Value extends Record<string, any>>(value: Value): Plugin<Errors, Derives & {
@@ -217,7 +217,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
         };
     }>;
     /** Register handler to one or many Updates */
-    on<T extends UpdateName>(updateName: MaybeArray$1<T>, handler: Handler<ContextType<BotLike, T> & Derives["global"] & Derives[T]>): this;
+    on<T extends UpdateName>(updateName: MaybeArray<T>, handler: Handler<ContextType<BotLike, T> & Derives["global"] & Derives[T]>): this;
     /** Register handler to any Updates */
     use(handler: Handler<Context<BotLike> & Derives["global"]>): this;
     /**
@@ -240,21 +240,21 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
      *
      * [Documentation](https://gramio.dev/hooks/pre-request.html)
      *  */
-    preRequest<Methods extends keyof APIMethods, Handler extends Hooks.PreRequest<Methods>>(methods: MaybeArray$1<Methods>, handler: Handler): this;
+    preRequest<Methods extends keyof APIMethods, Handler extends Hooks.PreRequest<Methods>>(methods: MaybeArray<Methods>, handler: Handler): this;
     preRequest(handler: Hooks.PreRequest): this;
     /**
      * This hook called when API return successful response
      *
      * [Documentation](https://gramio.dev/hooks/on-response.html)
      * */
-    onResponse<Methods extends keyof APIMethods, Handler extends Hooks.OnResponse<Methods>>(methods: MaybeArray$1<Methods>, handler: Handler): this;
+    onResponse<Methods extends keyof APIMethods, Handler extends Hooks.OnResponse<Methods>>(methods: MaybeArray<Methods>, handler: Handler): this;
     onResponse(handler: Hooks.OnResponse): this;
     /**
      * This hook called when API return an error
      *
      * [Documentation](https://gramio.dev/hooks/on-response-error.html)
      * */
-    onResponseError<Methods extends keyof APIMethods, Handler extends Hooks.OnResponseError<Methods>>(methods: MaybeArray$1<Methods>, handler: Handler): this;
+    onResponseError<Methods extends keyof APIMethods, Handler extends Hooks.OnResponseError<Methods>>(methods: MaybeArray<Methods>, handler: Handler): this;
     onResponseError(handler: Hooks.OnResponseError): this;
     /**
      * This hook called when the bot is `started`.
@@ -307,7 +307,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
      * })
      * ```
      */
-    onError<T extends UpdateName>(updateName: MaybeArray$1<T>, handler: Hooks.OnError<Errors, ContextType<BotLike, T> & Derives["global"] & Derives[T]>): this;
+    onError<T extends UpdateName>(updateName: MaybeArray<T>, handler: Hooks.OnError<Errors, ContextType<BotLike, T> & Derives["global"] & Derives[T]>): this;
     onError(handler: Hooks.OnError<Errors, Context<BotLike> & Derives["global"]>): this;
     /**
      * ! ** At the moment, it can only pick up types** */
@@ -1050,6 +1050,12 @@ declare const frameworks: {
         response: () => Response;
         unauthorized: () => Response;
     };
+    Request: (req: any) => {
+        update: any;
+        header: any;
+        response: () => Response;
+        unauthorized: () => Response;
+    };
 };
 
 /** Union type of webhook handlers name */

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { CallbackData } from '@gramio/callback-data';
 export * from '@gramio/callback-data';
-import { Context, UpdateName, ContextType, MaybeArray as MaybeArray$1, BotLike, Attachment } from '@gramio/contexts';
+import { Context, UpdateName, ContextType, BotLike, Attachment } from '@gramio/contexts';
 export * from '@gramio/contexts';
 import { APIMethods, TelegramResponseParameters, TelegramAPIResponseError, TelegramUser, APIMethodParams, APIMethodReturn, SetWebhookParams, TelegramUpdate, TelegramReactionTypeEmojiEmoji, SetMyCommandsParams, TelegramBotCommand } from '@gramio/types';
 export * from '@gramio/types';
@@ -111,11 +111,11 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
         /**	Composer */
         composer: Composer;
         /** Store plugin preRequests hooks */
-        preRequests: [Hooks.PreRequest<any>, MaybeArray$1<keyof APIMethods> | undefined][];
+        preRequests: [Hooks.PreRequest<any>, MaybeArray<keyof APIMethods> | undefined][];
         /** Store plugin onResponses hooks */
-        onResponses: [Hooks.OnResponse<any>, MaybeArray$1<keyof APIMethods> | undefined][];
+        onResponses: [Hooks.OnResponse<any>, MaybeArray<keyof APIMethods> | undefined][];
         /** Store plugin onResponseErrors hooks */
-        onResponseErrors: [Hooks.OnResponseError<any>, MaybeArray$1<keyof APIMethods> | undefined][];
+        onResponseErrors: [Hooks.OnResponseError<any>, MaybeArray<keyof APIMethods> | undefined][];
         /**
          * Store plugin groups
          *
@@ -147,11 +147,11 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
         /**	Composer */
         composer: Composer;
         /** Store plugin preRequests hooks */
-        preRequests: [Hooks.PreRequest<any>, MaybeArray$1<keyof APIMethods> | undefined][];
+        preRequests: [Hooks.PreRequest<any>, MaybeArray<keyof APIMethods> | undefined][];
         /** Store plugin onResponses hooks */
-        onResponses: [Hooks.OnResponse<any>, MaybeArray$1<keyof APIMethods> | undefined][];
+        onResponses: [Hooks.OnResponse<any>, MaybeArray<keyof APIMethods> | undefined][];
         /** Store plugin onResponseErrors hooks */
-        onResponseErrors: [Hooks.OnResponseError<any>, MaybeArray$1<keyof APIMethods> | undefined][];
+        onResponseErrors: [Hooks.OnResponseError<any>, MaybeArray<keyof APIMethods> | undefined][];
         /**
          * Store plugin groups
          *
@@ -203,7 +203,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
     derive<Handler extends Hooks.Derive<Context<BotLike> & Derives["global"]>>(handler: Handler): Plugin<Errors, Derives & {
         global: Awaited<ReturnType<Handler>>;
     }>;
-    derive<Update extends UpdateName, Handler extends Hooks.Derive<ContextType<BotLike, Update> & Derives["global"] & Derives[Update]>>(updateName: MaybeArray$1<Update>, handler: Handler): Plugin<Errors, Derives & {
+    derive<Update extends UpdateName, Handler extends Hooks.Derive<ContextType<BotLike, Update> & Derives["global"] & Derives[Update]>>(updateName: MaybeArray<Update>, handler: Handler): Plugin<Errors, Derives & {
         [K in Update]: Awaited<ReturnType<Handler>>;
     }>;
     decorate<Value extends Record<string, any>>(value: Value): Plugin<Errors, Derives & {
@@ -217,7 +217,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
         };
     }>;
     /** Register handler to one or many Updates */
-    on<T extends UpdateName>(updateName: MaybeArray$1<T>, handler: Handler<ContextType<BotLike, T> & Derives["global"] & Derives[T]>): this;
+    on<T extends UpdateName>(updateName: MaybeArray<T>, handler: Handler<ContextType<BotLike, T> & Derives["global"] & Derives[T]>): this;
     /** Register handler to any Updates */
     use(handler: Handler<Context<BotLike> & Derives["global"]>): this;
     /**
@@ -240,21 +240,21 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
      *
      * [Documentation](https://gramio.dev/hooks/pre-request.html)
      *  */
-    preRequest<Methods extends keyof APIMethods, Handler extends Hooks.PreRequest<Methods>>(methods: MaybeArray$1<Methods>, handler: Handler): this;
+    preRequest<Methods extends keyof APIMethods, Handler extends Hooks.PreRequest<Methods>>(methods: MaybeArray<Methods>, handler: Handler): this;
     preRequest(handler: Hooks.PreRequest): this;
     /**
      * This hook called when API return successful response
      *
      * [Documentation](https://gramio.dev/hooks/on-response.html)
      * */
-    onResponse<Methods extends keyof APIMethods, Handler extends Hooks.OnResponse<Methods>>(methods: MaybeArray$1<Methods>, handler: Handler): this;
+    onResponse<Methods extends keyof APIMethods, Handler extends Hooks.OnResponse<Methods>>(methods: MaybeArray<Methods>, handler: Handler): this;
     onResponse(handler: Hooks.OnResponse): this;
     /**
      * This hook called when API return an error
      *
      * [Documentation](https://gramio.dev/hooks/on-response-error.html)
      * */
-    onResponseError<Methods extends keyof APIMethods, Handler extends Hooks.OnResponseError<Methods>>(methods: MaybeArray$1<Methods>, handler: Handler): this;
+    onResponseError<Methods extends keyof APIMethods, Handler extends Hooks.OnResponseError<Methods>>(methods: MaybeArray<Methods>, handler: Handler): this;
     onResponseError(handler: Hooks.OnResponseError): this;
     /**
      * This hook called when the bot is `started`.
@@ -307,7 +307,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
      * })
      * ```
      */
-    onError<T extends UpdateName>(updateName: MaybeArray$1<T>, handler: Hooks.OnError<Errors, ContextType<BotLike, T> & Derives["global"] & Derives[T]>): this;
+    onError<T extends UpdateName>(updateName: MaybeArray<T>, handler: Hooks.OnError<Errors, ContextType<BotLike, T> & Derives["global"] & Derives[T]>): this;
     onError(handler: Hooks.OnError<Errors, Context<BotLike> & Derives["global"]>): this;
     /**
      * ! ** At the moment, it can only pick up types** */
@@ -1050,6 +1050,12 @@ declare const frameworks: {
         response: () => Response;
         unauthorized: () => Response;
     };
+    Request: (req: any) => {
+        update: any;
+        header: any;
+        response: () => Response;
+        unauthorized: () => Response;
+    };
 };
 
 /** Union type of webhook handlers name */

package/dist/index.js

@@ -8,10 +8,10 @@ import { isMediaUpload, convertJsonToFormData, extractFilesToFormData } from '@g
 export * from '@gramio/files';
 import { FormattableMap } from '@gramio/format';
 export * from '@gramio/format';
-import { E as ErrorKind, s as sleep, w as withRetries, T as TelegramError, d as debug$updates, a as debug$api, I as IS_BUN, b as simplifyObject } from './utils-CV4fnsQV.js';
+import debug from 'debug';
+import { E as ErrorKind, s as sleep, w as withRetries, T as TelegramError, d as debug$updates, I as IS_BUN, a as simplifyObject } from './utils-CJlBu70R.js';
 import { Composer as Composer$1, noopNext } from 'middleware-io';
 export * from '@gramio/keyboards';
-import 'debug';
 
 class Composer {
   composer = Composer$1.builder();
@@ -520,7 +520,7 @@ class Bot {
     }
   }
   async _callApi(method, params = {}) {
-    const debug$api$method = debug$api.extend(method);
+    const debug$api$method = debug(`gramio:api:${method}`);
     let url = `${this.options.api.baseURL}${this.options.token}/${this.options.api.useTest ? "test/" : ""}${method}`;
     const reqOptions = {
       method: "POST",
@@ -1172,6 +1172,7 @@ const frameworks = {
     header: req.headers[SECRET_TOKEN_HEADER.toLowerCase()],
     unauthorized: () => res.writeHead(401).end(WRONG_TOKEN_ERROR)
   }),
+  // TODO: Maybe unify it by 'WebRequest'
   "std/http": (req) => ({
     update: req.json(),
     header: req.headers.get(SECRET_TOKEN_HEADER),
@@ -1183,6 +1184,12 @@ const frameworks = {
     header: req.headers.get(SECRET_TOKEN_HEADER),
     response: () => responseOK,
     unauthorized: () => responseUnauthorized
+  }),
+  Request: (req) => ({
+    update: req.json(),
+    header: req.headers.get(SECRET_TOKEN_HEADER),
+    response: () => responseOK,
+    unauthorized: () => responseUnauthorized
   })
 };
 

package/dist/{utils-CV4fnsQV.js → utils-CJlBu70R.js}

@@ -40,9 +40,8 @@ function simplifyObject(obj) {
   return result;
 }
 const IS_BUN = typeof Bun !== "undefined";
-const $debugger = debug("gramio");
-const debug$api = $debugger.extend("api");
-const debug$updates = $debugger.extend("updates");
+debug("gramio:api");
+const debug$updates = debug("gramio:updates");
 
 async function suppressError(fn) {
   try {
@@ -67,4 +66,4 @@ async function withRetries(resultPromise) {
   return result;
 }
 
-export { ErrorKind as E, IS_BUN as I, TelegramError as T, debug$api as a, simplifyObject as b, debug$updates as d, sleep as s, withRetries as w };
+export { ErrorKind as E, IS_BUN as I, TelegramError as T, simplifyObject as a, debug$updates as d, sleep as s, withRetries as w };

package/dist/{utils-BIdmQNPz.cjs → utils-CnG66NLH.cjs}

@@ -42,9 +42,8 @@ function simplifyObject(obj) {
   return result;
 }
 const IS_BUN = typeof Bun !== "undefined";
-const $debugger = debug("gramio");
-const debug$api = $debugger.extend("api");
-const debug$updates = $debugger.extend("updates");
+debug("gramio:api");
+const debug$updates = debug("gramio:updates");
 
 async function suppressError(fn) {
   try {
@@ -72,7 +71,6 @@ async function withRetries(resultPromise) {
 exports.ErrorKind = ErrorKind;
 exports.IS_BUN = IS_BUN;
 exports.TelegramError = TelegramError;
-exports.debug$api = debug$api;
 exports.debug$updates = debug$updates;
 exports.simplifyObject = simplifyObject;
 exports.sleep = sleep;

package/dist/utils.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var utils = require('./utils-BIdmQNPz.cjs');
+var utils = require('./utils-CnG66NLH.cjs');
 require('debug');
 
 

package/dist/utils.js

@@ -1,2 +1,2 @@
-export { w as withRetries } from './utils-CV4fnsQV.js';
+export { w as withRetries } from './utils-CJlBu70R.js';
 import 'debug';

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "gramio",
 	"type": "module",
-	"version": "0.4.2",
+	"version": "0.4.4",
 	"description": "Powerful, extensible and really type-safe Telegram Bot API framework",
 	"main": "dist/index.cjs",
 	"module": "dist/index.js",