Merge pull request #854 from Telegram-Mini-Apps/bugfix/sdk-broken-request

Bugfix/sdk broken request

Author: heyqbnk

.changeset/large-readers-collect.md

@@ -0,0 +1,5 @@
+---
+"@tma.js/bridge": patch
+---
+
+Set a specific value in the `prepared_message_failed.error` event field.

.changeset/silly-trainers-rule.md

@@ -0,0 +1,5 @@
+---
+"@tma.js/sdk": patch
+---
+
+Set correct values for exported `request` and `request2` variables.

packages/bridge/src/events/types/events.ts

@@ -505,18 +505,18 @@ export interface Events {
   /**
    * Failed to send a prepared message.
    * @since 8.0
-   * @see https://docs.telegram-mini-apps.com/platform/events#prepare-message-failed
+   * @see https://docs.telegram-mini-apps.com/platform/events#prepared-message-failed
    */
   prepared_message_failed: {
     /**
      * Occurred error.
      */
-    error: string;
+    error: 'USER_DECLINED' | string;
   };
   /**
    * A prepared message was sent.
    * @since 8.0
-   * @see https://docs.telegram-mini-apps.com/platform/events#prepare-message-sent
+   * @see https://docs.telegram-mini-apps.com/platform/events#prepared-message-sent
    */
   prepared_message_sent: never;
   /**

packages/sdk/src/globals/request.ts

@@ -6,7 +6,7 @@ import {
   type Request2FpFn,
   type Request2Fn,
 } from '@tma.js/bridge';
-import { BetterPromise } from 'better-promises';
+import { throwifyFpFn } from '@tma.js/toolkit';
 
 import { postEventFp } from '@/globals/postEvent.js';
 
@@ -32,10 +32,6 @@ export const request2Fp: Request2FpFn = (method: any, events: any, options: any)
  * @deprecated To be removed in the next major update. Use `request` instead, it provides
  * a proper way of handling multiple events.
  */
-export const request: RequestFn = (...args: any[]) => {
-  return BetterPromise.fn(() => (requestFp as any)(...args)());
-};
+export const request = throwifyFpFn(requestFp) as RequestFn;
 
-export const request2: Request2Fn = (...args: any[]) => {
-  return BetterPromise.fn(() => (request2Fp as any)(...args)());
-};
+export const request2 = throwifyFpFn(request2Fp) as Request2Fn;