otter-bridge - npm Package Compare versions

Comparing version 0.0.3-alpha.18 to 0.0.3-alpha.19

dist/index.d.ts

@@ -29,2 +29,3 @@ declare enum GameType {
     constructor(gameType?: GameType, gameName?: string);
+    private _waitForEnvReady;
     init(): Promise<IInitRes>;
@@ -31,0 +32,0 @@ env(): Promise<envResult>;

dist/index.js

@@ -58,10 +58,2 @@ "use strict";
 var import_urijs = __toESM(require("urijs"));
-
-// src/env.ts
-var Env = class {
-};
-Env.valid = typeof (window == null ? void 0 : window.flutter_inappwebview) !== "undefined";
-var env_default = Env;
-
-// src/index.ts
 var GameType = /* @__PURE__ */ ((GameType2) => {
@@ -74,2 +66,5 @@ GameType2["default"] = "default";
 var OtterBridge = class _OtterBridge {
+  constructor() {
+    this.valid = typeof window.flutter_inappwebview !== "undefined";
+  }
   // Singleton instance
@@ -84,4 +79,4 @@ static get instance() {
     return __async(this, arguments, function* (handlerName, params = {}) {
-      if (!env_default.valid) {
-        return Promise.reject("Not in an otter app");
+      if (!this.valid) {
+        return Promise.reject("Otter app env not ready");
       }
@@ -101,5 +96,28 @@ return yield window.flutter_inappwebview.callHandler(
   }
+  _waitForEnvReady() {
+    return __async(this, null, function* () {
+      return new Promise((resolve, reject) => {
+        if (OtterBridge.instance.valid)
+          resolve(true);
+        const timeout = setTimeout(() => {
+          OtterBridge.instance.valid = false;
+          resolve(false);
+        }, 1e4);
+        window.addEventListener("flutterInAppWebViewPlatformReady", function(event) {
+          OtterBridge.instance.valid = true;
+          clearTimeout(timeout);
+          resolve(true);
+        });
+      });
+    });
+  }
   init() {
     return __async(this, null, function* () {
       try {
+        const envRes = yield this._waitForEnvReady();
+        if (!envRes) {
+          return {
+            clientAvailable: false
+          };
+        }
         const sidRes = yield OtterBridge.instance.callHandler(
@@ -106,0 +124,0 @@ _BridgeHandler.HANDLER_ENUM.getSid

package.json

 {
   "name": "otter-bridge",
-  "version": "0.0.3-alpha.18",
+  "version": "0.0.3-alpha.19",
   "description": "Otter game web jsbridge",
@@ -5,0 +5,0 @@ "files": [

src/index.ts

 import URI from "urijs";
-import Env from "./env";
 
@@ -20,5 +19,7 @@ export enum GameType {
 
+  valid: boolean = typeof (window as any).flutter_inappwebview !== "undefined";
+
   async callHandler(handlerName: string, params: any = {}) {
-    if (!Env.valid) {
-      return Promise.reject("Not in an otter app");
+    if (!this.valid) {
+      return Promise.reject("Otter app env not ready");
     }
@@ -66,4 +67,27 @@ return await (window as any).flutter_inappwebview.callHandler(
 
+  private async _waitForEnvReady(): Promise<boolean> {
+    return new Promise<boolean>((resolve, reject) => {
+      if (OtterBridge.instance.valid) resolve(true);
+
+      const timeout = setTimeout(() => {
+        OtterBridge.instance.valid = false;
+        resolve(false);
+      },10000);
+
+      window.addEventListener("flutterInAppWebViewPlatformReady", function(event) {
+        OtterBridge.instance.valid = true;
+        clearTimeout(timeout);
+        resolve(true);
+       });
+    });
+  }
+
   async init(): Promise<IInitRes> {
     try {
+      const envRes = await this._waitForEnvReady();
+      if (!envRes) {
+        return {
+          clientAvailable: false,
+        }
+      }
       const sidRes = await OtterBridge.instance.callHandler(
@@ -70,0 +94,0 @@ BridgeHandler.HANDLER_ENUM.getSid,

No alert changes

Improved metrics

Total package byte prevSize

46829

increased by8.85%

Lines of code

869

increased by7.02%

Worsened metrics

Number of package files

8

decreased by-11.11%

No dependency changes