@kbapp/js-bridge 0.3.0-alpha.0 → 0.3.2-alpha.0

package/dist/core/index.d.ts

@@ -8,6 +8,9 @@ export declare const $bridge: {
     callHandler: (method: any, args: any, cb: any) => any;
     register: (name: any, fun: any, asyn: any) => void;
     registerHandler: (name: any, fun: any) => void;
+} | {
+    registerHandler(name: string, cb: (data: unknown, cb: (data: Record<string, any>) => void) => void): void;
+    callHandler(name: string, params: any, callback: (...params: any) => void): void;
 };
 /**
  *

package/dist/core/index.js

@@ -10,6 +10,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.callHandlerPromise = exports.callHandler = exports.registerHandler = exports.$bridge = void 0;
 var js_bridge_1 = require("./lib/js-bridge");
@@ -17,6 +18,16 @@ var ds_bridge_1 = require("./lib/ds-bridge");
 var flutter_ds_bridge_1 = require("./lib/flutter-ds-bridge");
 /** 桥接 */
 exports.$bridge = (function (user_agent) {
+    if (!/(kb)/i.test(user_agent)) {
+        return {
+            registerHandler: function (name, cb) {
+                console.error('注册桥接失败,当前环境不支持调用桥接');
+            },
+            callHandler: function (name, params, callback) {
+                console.error('调用桥接失败,当前环境不支持调用桥接');
+            },
+        };
+    }
     if (/(kb_dsbridge_android)/i.test(user_agent)) {
         return (0, ds_bridge_1.default)();
     }
@@ -24,7 +35,7 @@ exports.$bridge = (function (user_agent) {
         return (0, flutter_ds_bridge_1.default)();
     }
     return (0, js_bridge_1.default)();
-})(window.navigator.userAgent);
+})((_a = window === null || window === void 0 ? void 0 : window.navigator) === null || _a === void 0 ? void 0 : _a.userAgent);
 /**
  *
  * @description 注册事件 提供给native端调用
@@ -42,7 +53,7 @@ var callHandler = function (data) {
             result = typeof res === 'string' ? JSON.parse(res) : res;
         }
         catch (error) {
-            result = {};
+            result = null;
         }
         if (result) {
             (_a = data.success) === null || _a === void 0 ? void 0 : _a.call(data, result);

package/dist/lib/trigger-login.d.ts

@@ -60,4 +60,4 @@ import { triggerAppLogin } from '@kbapp/js-bridge';
 triggerAppLogin()
 ```
  */
-export declare function triggerAppLogin(callback?: (loginInfo: AppLoginInfo) => void): void;
+export declare function triggerAppLogin(callback?: (loginInfo: AppLoginInfo) => void): Promise<void>;

package/dist/lib/trigger-login.js

@@ -139,12 +139,8 @@ const handle = watchAppLoginSuccess(() => {
 ```
  */
 var watchAppLoginSuccess = function (callback) {
-    getAppLoginInfo().then(function (loginInfo) {
-        if (loginInfo) {
-            return callback(loginInfo);
-        }
-        watchAppLoginSuccessTask.addTask(callback);
-    });
+    watchAppLoginSuccessTask.addTask(callback);
+    watchAppLoginSuccessTask.triggerCheckTask();
     return function () {
         watchAppLoginSuccessTask.removeTask(callback);
     };
@@ -166,20 +162,26 @@ triggerAppLogin()
  */
 function triggerAppLogin(callback) {
     if (callback === void 0) { callback = function () { }; }
-    (0, exports.watchAppLoginSuccess)(callback);
-    /**
-     * 当reqiureLogin为true时用户取消登录或者, 第三方登录, 均不会触发回调
-     * 只有当用户完成登录流程(第三方不支持)才会回调
-     */
-    (0, core_1.callHandler)({
-        name: 'OpenActRequest',
-        params: { type: 31, data: { requireLogin: true } },
-        success: function (result) {
-            var _a;
-            if ((_a = result.data) === null || _a === void 0 ? void 0 : _a.userId) {
-                watchAppLoginSuccessTask.triggerCheckTask();
-            }
-        },
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            watchAppLoginSuccessTask.addTask(callback);
+            watchAppLoginSuccessTask.triggerCheckTask();
+            /**
+             * 当reqiureLogin为true时用户取消登录或者, 第三方登录, 均不会触发回调
+             * 只有当用户完成登录流程(第三方不支持)才会回调
+             */
+            (0, core_1.callHandler)({
+                name: 'OpenActRequest',
+                params: { type: 31, data: { requireLogin: true } },
+                success: function (result) {
+                    var _a;
+                    if ((_a = result.data) === null || _a === void 0 ? void 0 : _a.userId) {
+                        watchAppLoginSuccessTask.triggerCheckTask();
+                    }
+                },
+            });
+            return [2 /*return*/];
+        });
     });
 }
 exports.triggerAppLogin = triggerAppLogin;

package/package.json

@@ -3,7 +3,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.3.0-alpha.0",
+    "version": "0.3.2-alpha.0",
     "description": "开吧客户端桥接",
     "main": "./dist/index.js",
     "author": "along"