bm-webapp-sdk 0.1.9 → 0.2.0

package/README.md

@@ -69,6 +69,10 @@ param name by setting `botTokenParamName` option. Also, project can have only on
 
 __Remember that you have still to include telegram mini app scripts to enable telegram support.__
 
+### MAX bot support
+
+This library works with [MAX Bridge](https://dev.max.ru/docs/webapps/bridge) also. But you need to specify `botTokenParamName` -- parameter that holds MAX bot token in your project.
+
 ## Request timeout
 
 This library automatically handles request timeout which is 20s by default. If scenario is handling request too long,

package/dist/bm-webapp-sdk.min.js

@@ -1 +1 @@
-(()=>{"use strict";var t={d:(e,s)=>{for(var i in s)t.o(s,i)&&!t.o(e,i)&&Object.defineProperty(e,i,{enumerable:!0,get:s[i]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e),r:t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})}},e={};t.r(e),t.d(e,{WebAppHandler:()=>i});const s={retryDelayOnTimeout:2e3,requestTimeout:6e4,apiEndpoint:"https://console.bot-marketing.com/api/public"};class i{constructor(t){this.options={...s,...t}}isActive(){var t;return"active"===(null===(t=this.data)||void 0===t?void 0:t.statusName)}getVariable(t){var e;return((null===(e=this.data)||void 0===e?void 0:e.variables)||{})[t]}async init(){if(this.data)throw new Error("Handler already initialized");if(this.options.sessionHash)return await this.refreshData(),!this.isActive()&&this.isTelegramInitAvailable()?this.initNewSession():this;if(this.isTelegramInitAvailable())return this.initNewSession();throw new Error("Failed to init handler. You must specify `sessionHash`, or `scenarioCode` when working with Telegram")}async refreshData(){var t;const e=(null===(t=this.data)||void 0===t?void 0:t.hash)||this.options.sessionHash;if(!e)throw new Error("Cannot refresh data: session id is missing");try{return this.data=await this.makeRequest("GET",`tunnelSessions/${e}`),this}catch(t){throw new Error(`Failed to get session data: ${t.message}`)}}requestResponse(){return this.options.responseVar?"function"==typeof this.options.responseVar?this.options.responseVar(this):(this.data.variables||{})[this.options.responseVar]:this}async request(t,e,s){if(this.currentRequest)throw new Error("Please wait until pending request is finished");if(this.data||await this.init(),!this.isActive())throw new Error("Cannot make request: session is not active");if(s)return this.makeRequest("POST",`tunnelSessions/${this.data.hash}/request`,{code:t,params:e}),this;try{return this.currentRequest={controller:new AbortController,timeoutId:setTimeout((()=>this.abort()),this.options.requestTimeout)},this.data=await this.makeRequest("POST",`tunnelSessions/${this.data.hash}/request`,{code:t,params:e},this.currentRequest.controller.signal),this.currentRequest=null,this.requestResponse()}catch(t){if("request_timeout"===t.message)return this.waitUntilSessionFinishesTransition();throw this.currentRequest=null,t}}abort(){this.currentRequest&&(this.currentRequest.controller?this.currentRequest.controller.abort("Request timeout"):(clearTimeout(this.currentRequest.retryTimeoutId),this.currentRequest.reject("Request timeout"),this.currentRequest=null))}isTelegramInitAvailable(){return void 0!==window.Telegram&&void 0!==this.options.scenarioCode}async initNewSession(){try{return this.data=await this.makeRequest("POST",`tunnel/${this.options.scenarioCode}/initWebApp`,{initData:Telegram.WebApp.initData,botTokenParamName:this.options.botTokenParamName,variables:this.options.initVariables}),this}catch(t){throw new Error(`Failed to init new session: ${t.message}`)}}async makeRequest(t,e,s,i){const r=await fetch(`${this.options.apiEndpoint}/${e}`,{method:t,signal:i,..."POST"===t?{body:JSON.stringify(s),headers:{"Content-Type":"application/json",Accept:"application/json"}}:{headers:{Accept:"application/json"}}});if(r.status>=400){const t=await r.json();throw new Error(t.message||`Http Error ${r.status}`)}return r.json()}waitUntilSessionFinishesTransition(){return new Promise(((t,e)=>{this.currentRequest.reject=e;const s=()=>{this.currentRequest.retryTimeoutId=setTimeout((async()=>{if(await this.refreshData(),this.data.isTransitioning)s();else try{t(this.requestResponse())}catch(t){e(t)}}),this.options.retryDelayOnTimeout)};s()}))}}window.BotMarketing=e})();
+(()=>{"use strict";var t={d:(e,s)=>{for(var i in s)t.o(s,i)&&!t.o(e,i)&&Object.defineProperty(e,i,{enumerable:!0,get:s[i]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e),r:t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})}},e={};t.r(e),t.d(e,{WebAppHandler:()=>i});const s={retryDelayOnTimeout:2e3,requestTimeout:6e4,apiEndpoint:"https://console.bot-marketing.com/api/public"};class i{constructor(t){this.options={...s,...t}}isActive(){var t;return"active"===(null===(t=this.data)||void 0===t?void 0:t.statusName)}getVariable(t){var e;return((null===(e=this.data)||void 0===e?void 0:e.variables)||{})[t]}async init(){if(this.data)throw new Error("Handler already initialized");if(this.options.sessionHash)return await this.refreshData(),!this.isActive()&&this.isWebAppInitAvailable()?this.initNewSession():this;if(this.isWebAppInitAvailable())return this.initNewSession();throw new Error("Failed to init handler. You must specify `sessionHash`, or `scenarioCode` when working with Telegram")}async refreshData(){var t;const e=(null===(t=this.data)||void 0===t?void 0:t.hash)||this.options.sessionHash;if(!e)throw new Error("Cannot refresh data: session id is missing");try{return this.data=await this.makeRequest("GET",`tunnelSessions/${e}`),this}catch(t){throw new Error(`Failed to get session data: ${t.message}`)}}requestResponse(){return this.options.responseVar?"function"==typeof this.options.responseVar?this.options.responseVar(this):(this.data.variables||{})[this.options.responseVar]:this}async request(t,e,s){if(this.currentRequest)throw new Error("Please wait until pending request is finished");if(this.data||await this.init(),!this.isActive())throw new Error("Cannot make request: session is not active");if(s)return this.makeRequest("POST",`tunnelSessions/${this.data.hash}/request`,{code:t,params:e}),this;try{return this.currentRequest={controller:new AbortController,timeoutId:setTimeout((()=>this.abort()),this.options.requestTimeout)},this.data=await this.makeRequest("POST",`tunnelSessions/${this.data.hash}/request`,{code:t,params:e},this.currentRequest.controller.signal),this.currentRequest=null,this.requestResponse()}catch(t){if("request_timeout"===t.message)return this.waitUntilSessionFinishesTransition();throw this.currentRequest=null,t}}abort(){this.currentRequest&&(this.currentRequest.controller?this.currentRequest.controller.abort("Request timeout"):(clearTimeout(this.currentRequest.retryTimeoutId),this.currentRequest.reject("Request timeout"),this.currentRequest=null))}getWebAppInstance(){return void 0!==window.Telegram?window.Telegram.WebApp:window.WebApp}isWebAppInitAvailable(){return this.getWebAppInstance()&&void 0!==this.options.scenarioCode}async initNewSession(){try{return this.data=await this.makeRequest("POST",`tunnel/${this.options.scenarioCode}/initWebApp`,{initData:this.getWebAppInstance().initData,botTokenParamName:this.options.botTokenParamName,variables:this.options.initVariables}),this}catch(t){throw new Error(`Failed to init new session: ${t.message}`)}}async makeRequest(t,e,s,i){const r=await fetch(`${this.options.apiEndpoint}/${e}`,{method:t,signal:i,..."POST"===t?{body:JSON.stringify(s),headers:{"Content-Type":"application/json",Accept:"application/json"}}:{headers:{Accept:"application/json"}}});if(r.status>=400){const t=await r.json();throw new Error(t.message||`Http Error ${r.status}`)}return r.json()}waitUntilSessionFinishesTransition(){return new Promise(((t,e)=>{this.currentRequest.reject=e;const s=()=>{this.currentRequest.retryTimeoutId=setTimeout((async()=>{if(await this.refreshData(),this.data.isTransitioning)s();else try{t(this.requestResponse())}catch(t){e(t)}}),this.options.retryDelayOnTimeout)};s()}))}}window.BotMarketing=e})();

package/dist/index.d.ts

@@ -44,6 +44,9 @@ export interface ICurrentRequest {
     retryTimeoutId?: number;
     reject?: (reason?: any) => void;
 }
+export interface IWebApp {
+    initData: string;
+}
 export default class WebAppHandler {
     readonly options: HandlerOptions;
     data?: ScenarioSession;
@@ -56,7 +59,8 @@ export default class WebAppHandler {
     protected requestResponse(): WebAppHandler | any;
     request(code: string, params?: TData, async?: boolean): Promise<WebAppHandler | any>;
     abort(): void;
-    isTelegramInitAvailable(): boolean;
+    getWebAppInstance(): IWebApp | null;
+    isWebAppInitAvailable(): boolean;
     protected initNewSession(): Promise<WebAppHandler>;
     protected makeRequest(method: string, path: string, json?: TData, signal?: AbortSignal): Promise<any>;
     private waitUntilSessionFinishesTransition;
@@ -65,7 +69,10 @@ export default class WebAppHandler {
 export { WebAppHandler };
 declare global {
     interface Window {
-        Telegram: any;
+        Telegram: {
+            WebApp: IWebApp;
+        } | undefined;
+        WebApp: IWebApp | undefined;
     }
 }
 

package/es2019/WebAppHandler.d.ts

@@ -44,6 +44,9 @@ export interface ICurrentRequest {
     retryTimeoutId?: number;
     reject?: (reason?: any) => void;
 }
+export interface IWebApp {
+    initData: string;
+}
 export default class WebAppHandler {
     readonly options: HandlerOptions;
     data?: ScenarioSession;
@@ -56,7 +59,8 @@ export default class WebAppHandler {
     protected requestResponse(): WebAppHandler | any;
     request(code: string, params?: TData, async?: boolean): Promise<WebAppHandler | any>;
     abort(): void;
-    isTelegramInitAvailable(): boolean;
+    getWebAppInstance(): IWebApp | null;
+    isWebAppInitAvailable(): boolean;
     protected initNewSession(): Promise<WebAppHandler>;
     protected makeRequest(method: string, path: string, json?: TData, signal?: AbortSignal): Promise<any>;
     private waitUntilSessionFinishesTransition;

package/es2019/WebAppHandler.js

@@ -20,11 +20,11 @@ export default class WebAppHandler {
             throw new Error("Handler already initialized");
         if (this.options.sessionHash) {
             await this.refreshData();
-            if (!this.isActive() && this.isTelegramInitAvailable())
+            if (!this.isActive() && this.isWebAppInitAvailable())
                 return this.initNewSession();
             return this;
         }
-        else if (this.isTelegramInitAvailable()) {
+        else if (this.isWebAppInitAvailable()) {
             return this.initNewSession();
         }
         else {
@@ -95,13 +95,16 @@ export default class WebAppHandler {
             this.currentRequest = null;
         }
     }
-    isTelegramInitAvailable() {
-        return window.Telegram !== undefined && this.options.scenarioCode !== undefined;
+    getWebAppInstance() {
+        return window.Telegram !== undefined ? window.Telegram.WebApp : window.WebApp;
+    }
+    isWebAppInitAvailable() {
+        return this.getWebAppInstance() && this.options.scenarioCode !== undefined;
     }
     async initNewSession() {
         try {
             this.data = await this.makeRequest("POST", `tunnel/${this.options.scenarioCode}/initWebApp`, {
-                initData: Telegram.WebApp.initData,
+                initData: this.getWebAppInstance().initData,
                 botTokenParamName: this.options.botTokenParamName,
                 variables: this.options.initVariables,
             });
@@ -141,6 +144,7 @@ export default class WebAppHandler {
                         resetTimeout();
                     }
                     else {
+                        this.currentRequest = null;
                         try {
                             resolve(this.requestResponse());
                         }

package/es2019/index.d.ts

@@ -1,7 +1,10 @@
-import WebAppHandler from './WebAppHandler';
+import WebAppHandler, { IWebApp } from './WebAppHandler';
 export { WebAppHandler };
 declare global {
     interface Window {
-        Telegram: any;
+        Telegram: {
+            WebApp: IWebApp;
+        } | undefined;
+        WebApp: IWebApp | undefined;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bm-webapp-sdk",
-  "version": "0.1.9",
+  "version": "0.2.0",
   "description": "",
   "main": "src/index.ts",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -1,9 +1,13 @@
-import WebAppHandler from './WebAppHandler';
+import WebAppHandler, { IWebApp } from './WebAppHandler';
 
 export { WebAppHandler };
 
 declare global {
     interface Window {
-        Telegram: any;
+        Telegram: {
+            WebApp: IWebApp;
+        }|undefined;
+
+        WebApp: IWebApp|undefined;
     }
 }