@lemon-fe/mini-app 0.1.45 → 0.1.50

package/es/global.d.ts

@@ -1,5 +1,14 @@
 import { UserInfo } from './typings';
-interface Mini {
+declare global {
+    interface Window {
+        ReactNativeWebView?: {
+            postMessage(e: string): void;
+        };
+        mini?: typeof mini;
+    }
+}
+export declare const mini: {
+    loaded: boolean;
     getSystemInfoSync(): {
         statusBarHeight: number;
         pixelRatio: number;
@@ -10,31 +19,29 @@ interface Mini {
             left: number;
         };
     };
-    addListener(cb: (e: string) => void): void;
     getExtraPayload(): unknown;
+    methodRegister(name: string, opts?: {
+        success?: ((value: any) => void) | undefined;
+        fail?: ((err: Error) => void) | undefined;
+        params?: any;
+    }): void;
+    methodSuccess(id: number, value: unknown): void;
+    methodFail(id: number, err: Error): void;
+    addListener(cb: (e: string) => void): () => void;
+    postMessage(e: string): void;
     scanCode(opts: {
         success: (value: string) => void;
     }): void;
-    setStatusBarStyle(opt: {
+    exit(): void;
+    setStatusBarStyle(opts: {
         success?: () => void;
         params: 'default' | 'light-content' | 'dark-content';
     }): void;
-    exit(): void;
-    getUserInfo(opt: {
-        success?: (user: UserInfo) => void;
+    getUserInfo(opts: {
+        success?: ((user: UserInfo) => void) | undefined;
     }): void;
-    getAccessToken(opt: {
-        success?: (token: string | null) => void;
+    getAccessToken(opts: {
+        success?: ((token: string | null) => void) | undefined;
     }): void;
-}
-declare global {
-    interface Window {
-        ReactNativeWebView?: {
-            postMessage(e: string): void;
-        };
-        mini?: Mini;
-    }
-}
-export declare let mini: Mini;
+};
 export declare function createApp(render: () => void): void;
-export {};

package/es/global.js

@@ -1,8 +1,12 @@
+var methodID = 0;
+var methods = {};
+var listeners = [];
 export var mini = {
+  loaded: false,
   getSystemInfoSync: function getSystemInfoSync() {
     return {
       statusBarHeight: 0,
-      pixelRatio: window.devicePixelRatio,
+      pixelRatio: 1,
       safeArea: {
         top: 0,
         right: 0,
@@ -11,29 +15,95 @@ export var mini = {
       }
     };
   },
-  addListener: function addListener() {},
-  getExtraPayload: function getExtraPayload() {},
-  scanCode: function scanCode() {},
-  exit: function exit() {},
-  setStatusBarStyle: function setStatusBarStyle() {},
-  getUserInfo: function getUserInfo() {},
-  getAccessToken: function getAccessToken() {}
+  getExtraPayload: function getExtraPayload() {
+    return;
+  },
+  methodRegister: function methodRegister(name) {
+    var _window$ReactNativeWe;
+
+    var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var mOpts = opts || {};
+    methods[methodID] = {
+      success: mOpts.success,
+      fail: mOpts.fail
+    };
+    (_window$ReactNativeWe = window.ReactNativeWebView) === null || _window$ReactNativeWe === void 0 ? void 0 : _window$ReactNativeWe.postMessage(JSON.stringify({
+      type: 'METHOD',
+      target: {
+        id: methodID,
+        name: name,
+        params: mOpts.params
+      }
+    }));
+
+    if (methodID >= Number.MAX_SAFE_INTEGER) {
+      methodID = 0;
+    } else {
+      methodID += 1;
+    }
+  },
+  methodSuccess: function methodSuccess(id, value) {
+    var method = methods[id];
+
+    if (method !== undefined) {
+      if (method.success !== undefined) {
+        method.success(value);
+      }
+
+      delete methods[id];
+    }
+  },
+  methodFail: function methodFail(id, err) {
+    var method = methods[id];
+
+    if (method !== undefined) {
+      if (method.fail !== undefined) {
+        method.fail(err);
+      }
+
+      delete methods[id];
+    }
+  },
+  addListener: function addListener(cb) {
+    listeners.push(cb);
+    return function () {
+      var index = listeners.findIndex(function (item) {
+        return item === cb;
+      });
+      listeners.splice(index, 1);
+    };
+  },
+  postMessage: function postMessage(e) {
+    listeners.forEach(function (item) {
+      item(e);
+    });
+  },
+  scanCode: function scanCode(opts) {
+    mini.methodRegister('SCAN_CODE', opts);
+  },
+  exit: function exit() {
+    mini.methodRegister('EXIT');
+  },
+  setStatusBarStyle: function setStatusBarStyle(opts) {
+    mini.methodRegister('SET_STATUS_BAR_STYLE', opts);
+  },
+  getUserInfo: function getUserInfo(opts) {
+    mini.methodRegister('GET_USER_INFO', opts);
+  },
+  getAccessToken: function getAccessToken(opts) {
+    mini.methodRegister('GET_ACCESS_TOKEN', opts);
+  }
 };
+window.mini = mini;
 export function createApp(render) {
   var count = 0;
 
   var check = function check() {
-    if (window.mini === undefined) {
-      count++;
-
-      if (count <= 10) {
-        setTimeout(check, 100);
-      } else {
-        render();
-      }
-    } else {
-      mini = window.mini;
+    if (mini.loaded || count >= 10) {
       render();
+    } else {
+      count++;
+      setTimeout(check, 100);
     }
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/mini-app",
-  "version": "0.1.45",
+  "version": "0.1.50",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -23,7 +23,6 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "react": "^17.0.2",
     "react-transition-group": "^4.4.2"
   },
   "peerDependencies": {
@@ -32,7 +31,8 @@
   },
   "devDependencies": {
     "@types/react-transition-group": "^4.4.4",
-    "color-string": "^1.9.0"
+    "color-string": "^1.9.0",
+    "react": "^17.0.2"
   },
-  "gitHead": "fbaba06659f3a22092c6810d373c3d45c4533a21"
+  "gitHead": "27699afefdba7171bdc07a5e90a81308d699d1bf"
 }