zmp-sdk 2.22.3 → 2.23.0-rc.1

package/dist/index.es.js

@@ -3740,7 +3740,7 @@ class ZMPEEmitter extends eventemitter3 {
     }
 }
 
-var version$1 = "2.22.3";
+var version$1 = "2.23.0-rc.1";
 
 class Basics {
     /**
@@ -4908,7 +4908,7 @@ var CORSRequest = {
     execute: execute
 };
 
-var _ZaloJSBridge_instances, _ZaloJSBridge_cookies, _ZaloJSBridge_actionRuntimeInfo, _ZaloJSBridge_jsCall;
+var _ZaloJSBridge_instances, _ZaloJSBridge_jumpRunning, _ZaloJSBridge_cookies, _ZaloJSBridge_actionRuntimeInfo, _ZaloJSBridge_jsCall;
 class ZaloJSBridge extends eventemitter3 {
     constructor() {
         super();
@@ -4921,45 +4921,19 @@ class ZaloJSBridge extends eventemitter3 {
         this._userAgent = getUserAgent();
         this._device = checkPlatform();
         this.isJumped = false;
-        _ZaloJSBridge_cookies.set(this, null);
+        _ZaloJSBridge_jumpRunning.set(this, void 0);
+        _ZaloJSBridge_cookies.set(this, []);
         _ZaloJSBridge_actionRuntimeInfo.set(this, void 0);
-        this.jump = () => {
-            return new Promise((resolve, reject) => {
-                if (!_.isUndefined(__classPrivateFieldGet(this, _ZaloJSBridge_cookies, "f")) && !_.isNull(__classPrivateFieldGet(this, _ZaloJSBridge_cookies, "f"))) {
-                    resolve(__classPrivateFieldGet(this, _ZaloJSBridge_cookies, "f"));
-                }
-                else {
-                    this.callNative(ACTION.JUMP_LOGIN, {})
-                        .then((data) => {
-                        const cookies = (data && data.cookiesOAuthLogins) || [];
-                        const actionPermission = (data && data.actionPermission) || [];
-                        Object.entries(actionPermission).forEach((item) => {
-                            const key = item[0];
-                            const value = item[1] || { perm: 0, decode: 0 };
-                            if (!__classPrivateFieldGet(this, _ZaloJSBridge_actionRuntimeInfo, "f")[key]) {
-                                __classPrivateFieldGet(this, _ZaloJSBridge_actionRuntimeInfo, "f")[key] = {
-                                    permission: false,
-                                    support: false
-                                };
-                            }
-                            __classPrivateFieldGet(this, _ZaloJSBridge_actionRuntimeInfo, "f")[key].permission = value.perm === 1;
-                        });
-                        const jsToken = cookies.find((cookie) => cookie.name === COOKIE_NAME.JS_TOKEN);
-                        if (jsToken) {
-                            this.jsAccessTk = jsToken.value;
-                            window.ZJSBridge.setJSToken &&
-                                window.ZJSBridge.setJSToken(jsToken.value);
-                        }
-                        __classPrivateFieldSet(this, _ZaloJSBridge_cookies, cookies, "f");
-                        this.isJumped = true;
-                        resolve(cookies);
-                    })
-                        .catch((error) => {
-                        this.isJumped = false;
-                        reject(error);
-                    });
-                }
-            });
+        this.getCookie = (name) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            yield this.jump();
+            const cookie = (_a = __classPrivateFieldGet(this, _ZaloJSBridge_cookies, "f")) === null || _a === void 0 ? void 0 : _a.find((cookie) => cookie.name === name);
+            return cookie;
+        });
+        this.getCookieSync = (name) => {
+            var _a;
+            const cookie = (_a = __classPrivateFieldGet(this, _ZaloJSBridge_cookies, "f")) === null || _a === void 0 ? void 0 : _a.find((cookie) => cookie.name === name);
+            return cookie;
         };
         this._jsCallFuncCallbacks = {};
         __classPrivateFieldSet(this, _ZaloJSBridge_actionRuntimeInfo, {}, "f");
@@ -4988,6 +4962,7 @@ class ZaloJSBridge extends eventemitter3 {
                 }
             }, 5000);
         }
+        __classPrivateFieldSet(this, _ZaloJSBridge_jumpRunning, 0, "f");
     }
     static getInstance() {
         if (!ZaloJSBridge.instance) {
@@ -5001,6 +4976,68 @@ class ZaloJSBridge extends eventemitter3 {
     set jsAccessTk(value) {
         this._jsAccessTk = value;
     }
+    jump() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const _this = this;
+            function waiting() {
+                return __awaiter(this, void 0, void 0, function* () {
+                    return yield new Promise((resolve) => {
+                        const interval = setInterval(() => {
+                            if (__classPrivateFieldGet(_this, _ZaloJSBridge_jumpRunning, "f") <= 1 || _this.isJumped) {
+                                resolve('done');
+                                clearInterval(interval);
+                            }
+                        }, 200);
+                    });
+                });
+            }
+            __classPrivateFieldSet(this, _ZaloJSBridge_jumpRunning, +__classPrivateFieldGet(this, _ZaloJSBridge_jumpRunning, "f") + 1, "f");
+            if (__classPrivateFieldGet(this, _ZaloJSBridge_jumpRunning, "f") > 1) {
+                yield waiting();
+            }
+            return new Promise((resolve, reject) => {
+                if (this.isJumped) {
+                    resolve(__classPrivateFieldGet(this, _ZaloJSBridge_cookies, "f"));
+                    __classPrivateFieldSet(this, _ZaloJSBridge_jumpRunning, +__classPrivateFieldGet(this, _ZaloJSBridge_jumpRunning, "f") - 1, "f");
+                }
+                else {
+                    this.debug('******** call jump ********');
+                    this.callNative(ACTION.JUMP_LOGIN, {})
+                        .then((data) => {
+                        const cookies = (data && data.cookiesOAuthLogins) || [];
+                        const actionPermission = (data && data.actionPermission) || [];
+                        Object.entries(actionPermission).forEach((item) => {
+                            const key = item[0];
+                            const value = item[1] || { perm: 0, decode: 0 };
+                            if (!__classPrivateFieldGet(this, _ZaloJSBridge_actionRuntimeInfo, "f")[key]) {
+                                __classPrivateFieldGet(this, _ZaloJSBridge_actionRuntimeInfo, "f")[key] = {
+                                    permission: false,
+                                    support: false
+                                };
+                            }
+                            __classPrivateFieldGet(this, _ZaloJSBridge_actionRuntimeInfo, "f")[key].permission = value.perm === 1;
+                        });
+                        const jsToken = cookies.find((cookie) => cookie.name === COOKIE_NAME.JS_TOKEN);
+                        if (jsToken) {
+                            this.jsAccessTk = jsToken.value;
+                            window.ZJSBridge.setJSToken &&
+                                window.ZJSBridge.setJSToken(jsToken.value);
+                        }
+                        __classPrivateFieldSet(this, _ZaloJSBridge_cookies, cookies, "f");
+                        this.isJumped = true;
+                        resolve(cookies);
+                    })
+                        .catch((error) => {
+                        this.isJumped = false;
+                        reject(error);
+                    })
+                        .finally(() => {
+                        __classPrivateFieldSet(this, _ZaloJSBridge_jumpRunning, +__classPrivateFieldGet(this, _ZaloJSBridge_jumpRunning, "f") - 1, "f");
+                    });
+                }
+            });
+        });
+    }
     sendLogData(data) {
         try {
             const logData = data.map((item) => {
@@ -5112,7 +5149,7 @@ class ZaloJSBridge extends eventemitter3 {
     }
     callNative(action, data, option) {
         this.debug(action.name, data);
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             const handleNativeCallback = (cb) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b, _c, _d, _e, _f, _g, _h;
                 try {
@@ -5136,7 +5173,8 @@ class ZaloJSBridge extends eventemitter3 {
                             error = new AppError(COMMON_NATIVE_ERROR_CODE[platform][cb.error_code].code, COMMON_NATIVE_ERROR_CODE[platform][cb.error_code].message);
                         }
                         else if ((_b = (_a = action.error_list) === null || _a === void 0 ? void 0 : _a[platform]) === null || _b === void 0 ? void 0 : _b[String(cb.error_code)]) {
-                            let error_message = action.error_list[platform][String(cb.error_code)].map_to.message;
+                            let error_message = action.error_list[platform][String(cb.error_code)].map_to
+                                .message;
                             if ((_e = (_d = (_c = action.error_list) === null || _c === void 0 ? void 0 : _c[platform]) === null || _d === void 0 ? void 0 : _d[String(cb.error_code)]) === null || _e === void 0 ? void 0 : _e.need_more_detail) {
                                 error_message = `${(_h = (_g = (_f = action.error_list) === null || _f === void 0 ? void 0 : _f[platform]) === null || _g === void 0 ? void 0 : _g[String(cb.error_code)]) === null || _h === void 0 ? void 0 : _h.map_to.message}: ${cb.error_message}`;
                             }
@@ -5156,6 +5194,12 @@ class ZaloJSBridge extends eventemitter3 {
                     return reject(error);
                 }
             });
+            /**
+             * Check jump status and auto call jump
+             */
+            if (!action.skip_jump) {
+                yield this.jump();
+            }
             const isIOS = checkPlatform().isIOS;
             const isSupportAction = checkIOSSupportAction(action);
             if (isIOS && !isSupportAction) {
@@ -5170,10 +5214,10 @@ class ZaloJSBridge extends eventemitter3 {
             else {
                 __classPrivateFieldGet(this, _ZaloJSBridge_instances, "m", _ZaloJSBridge_jsCall).call(this, action, data, handleNativeCallback, option === null || option === void 0 ? void 0 : option.isMultiCallback, option === null || option === void 0 ? void 0 : option.nRetry, option === null || option === void 0 ? void 0 : option.haveTimeout);
             }
-        });
+        }));
     }
 }
-_ZaloJSBridge_cookies = new WeakMap(), _ZaloJSBridge_actionRuntimeInfo = new WeakMap(), _ZaloJSBridge_instances = new WeakSet(), _ZaloJSBridge_jsCall = function _ZaloJSBridge_jsCall(action, options, callback, isMultiCallback = false, nRetry = 3, haveTimeout = true) {
+_ZaloJSBridge_jumpRunning = new WeakMap(), _ZaloJSBridge_cookies = new WeakMap(), _ZaloJSBridge_actionRuntimeInfo = new WeakMap(), _ZaloJSBridge_instances = new WeakSet(), _ZaloJSBridge_jsCall = function _ZaloJSBridge_jsCall(action, options, callback, isMultiCallback = false, nRetry = 3, haveTimeout = true) {
     try {
         const actionName = action.name;
         const key = generateUniqueString(actionName);
@@ -6270,6 +6314,21 @@ class ZaloMiniProgramSDKService {
         this.setActionBarConfig = (setState) => {
             __classPrivateFieldSet(this, _ZaloMiniProgramSDKService_actionBarConfig, setState(__classPrivateFieldGet(this, _ZaloMiniProgramSDKService_actionBarConfig, "f")), "f");
         };
+        this.getAuthCode = () => __awaiter(this, void 0, void 0, function* () {
+            var _t, _u;
+            const authCode = (_t = (yield __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_bridge, "f").getCookie(COOKIE_NAME.ZOAUTH))) === null || _t === void 0 ? void 0 : _t.value;
+            const authCodeVerify = (_u = (yield __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_bridge, "f").getCookie(COOKIE_NAME.ZOAUTH_VRF))) === null || _u === void 0 ? void 0 : _u.value;
+            return {
+                authCode,
+                authCodeVerify
+            };
+        });
+        this.setAccessToken = (accessToken) => {
+            __classPrivateFieldSet(this, _ZaloMiniProgramSDKService_accessToken, accessToken, "f");
+            __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_bridge, "f").accessTk = accessToken;
+            window.ZJSBridge.setZAccSession &&
+                window.ZJSBridge.setZAccSession(accessToken);
+        };
         this.getVersion = Basics.getVersion;
         this.getSystemInfo = Basics.getSystemInfo;
         this.setNavigationBarTitle = NavigationBar.setNavigationBarTitle;
@@ -6386,10 +6445,34 @@ class ZaloMiniProgramSDKService {
         return __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_zAppId, "f");
     }
     getDeviceId() {
-        return __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_deviceId, "f");
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            return (_a = (yield __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_bridge, "f").getCookie(COOKIE_NAME.DEVICE_ID))) === null || _a === void 0 ? void 0 : _a.value;
+        });
+    }
+    getDeviceIdSync() {
+        var _a;
+        return (_a = __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_bridge, "f").getCookieSync(COOKIE_NAME.DEVICE_ID)) === null || _a === void 0 ? void 0 : _a.value;
     }
     getContext() {
-        return __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_context, "f");
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const contextID = (_a = (yield __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_bridge, "f").getCookie(COOKIE_NAME.CONTEXT_ID))) === null || _a === void 0 ? void 0 : _a.value;
+            const contextType = (_b = (yield __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_bridge, "f").getCookie(COOKIE_NAME.CONTEXT_TYPE))) === null || _b === void 0 ? void 0 : _b.value;
+            return {
+                type: contextType,
+                id: contextID
+            };
+        });
+    }
+    getContextSync() {
+        var _a, _b;
+        const contextID = (_a = __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_bridge, "f").getCookieSync(COOKIE_NAME.CONTEXT_ID)) === null || _a === void 0 ? void 0 : _a.value;
+        const contextType = (_b = __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_bridge, "f").getCookieSync(COOKIE_NAME.CONTEXT_TYPE)) === null || _b === void 0 ? void 0 : _b.value;
+        return {
+            type: contextType,
+            id: contextID
+        };
     }
     getJSBridge() {
         return __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_bridge, "f");
@@ -6400,29 +6483,12 @@ class ZaloMiniProgramSDKService {
             if (__classPrivateFieldGet(this, _ZaloMiniProgramSDKService_accessToken, "f") && deltaTime < __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_tokenExpiresIn, "f")) {
                 return __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_accessToken, "f");
             }
-            const cookies = yield __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_bridge, "f").jump();
-            const deviceId = cookies.find((cookie) => cookie.name === COOKIE_NAME.DEVICE_ID);
-            const contextID = cookies.find((cookie) => cookie.name === COOKIE_NAME.CONTEXT_ID);
-            const contextType = cookies.find((cookie) => cookie.name === COOKIE_NAME.CONTEXT_TYPE);
-            if (deviceId) {
-                __classPrivateFieldSet(this, _ZaloMiniProgramSDKService_deviceId, deviceId.value, "f");
-            }
-            if (contextID && contextType) {
-                __classPrivateFieldSet(this, _ZaloMiniProgramSDKService_context, {
-                    id: contextID.value,
-                    type: contextType.value
-                }, "f");
-            }
-            const zOAuthCookie = cookies.find((cookie) => cookie.name === COOKIE_NAME.ZOAUTH);
-            const zOAuthVrfCookie = cookies.find((cookie) => cookie.name === COOKIE_NAME.ZOAUTH_VRF);
-            if (!_.isUndefined(zOAuthCookie) &&
-                !_.isNull(zOAuthCookie) &&
-                _.isString(zOAuthCookie.value)) {
-                __classPrivateFieldSet(this, _ZaloMiniProgramSDKService_zOAuth, zOAuthCookie.value, "f");
-                if (!_.isUndefined(zOAuthVrfCookie) &&
-                    !_.isNull(zOAuthVrfCookie) &&
-                    _.isString(zOAuthVrfCookie.value)) {
-                    __classPrivateFieldSet(this, _ZaloMiniProgramSDKService_zOAuthVrf, zOAuthVrfCookie.value, "f");
+            const zOAuth = yield (yield this.getAuthCode()).authCode;
+            const zOAuthVrf = yield (yield this.getAuthCode()).authCodeVerify;
+            if (zOAuth) {
+                __classPrivateFieldSet(this, _ZaloMiniProgramSDKService_zOAuth, zOAuth, "f");
+                if (zOAuthVrf) {
+                    __classPrivateFieldSet(this, _ZaloMiniProgramSDKService_zOAuthVrf, zOAuthVrf, "f");
                     yield this.loginZaloV4();
                 }
                 else {
@@ -6497,7 +6563,7 @@ class ZaloMiniProgramSDKService {
             if (!__classPrivateFieldGet(this, _ZaloMiniProgramSDKService_accessToken, "f")) {
                 throw apiResponse.error.loginRequired();
             }
-            if (deltaTime < __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_tokenExpiresIn, "f"))
+            if (!__classPrivateFieldGet(this, _ZaloMiniProgramSDKService_prevGetTokenTimestamp, "f") || deltaTime < __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_tokenExpiresIn, "f"))
                 return __classPrivateFieldGet(this, _ZaloMiniProgramSDKService_accessToken, "f");
             return yield this.login();
         });
@@ -6524,7 +6590,10 @@ class MockSDKService {
         this.getAppId = () => {
             return __classPrivateFieldGet(this, _MockSDKService_appId, "f");
         };
-        this.getDeviceId = () => {
+        this.getDeviceId = () => __awaiter(this, void 0, void 0, function* () {
+            return Promise.resolve('');
+        });
+        this.getDeviceIdSync = () => {
             return '';
         };
         this.login = () => {
@@ -6827,8 +6896,19 @@ class MockSDKService {
         this.openAppStore = (data) => {
             return Promise.resolve();
         };
+        this.getAuthCode = () => {
+            return Promise.resolve({
+                authCode: '',
+                authCodeVerify: ''
+            });
+        };
     }
     getContext() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return Promise.resolve(null);
+        });
+    }
+    getContextSync() {
         return null;
     }
     on(event, fn, context) {
@@ -6849,6 +6929,7 @@ class MockSDKService {
             data: ''
         });
     }
+    setAccessToken(accessToken) { }
 }
 _MockSDKService_appId = new WeakMap(), _MockSDKService_appConfig = new WeakMap(), _MockSDKService_zOAuth = new WeakMap(), _MockSDKService_accessToken = new WeakMap(), _MockSDKService_cache = new WeakMap(), _MockSDKService_loggedId = new WeakMap();
 
@@ -8738,7 +8819,6 @@ let SDKCreator = class SDKCreator {
     }
     vibrate(object) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log(object);
             yield __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").vibrate(object);
         });
     }
@@ -8892,10 +8972,28 @@ let SDKCreator = class SDKCreator {
         __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").setNavigationBarLeftButton(undefined, 0);
     }
     getDeviceId() {
-        return __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").getDeviceId();
+        return __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").getDeviceIdSync();
+    }
+    getDeviceIdAsync(object) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").getDeviceId();
+        });
     }
     getContext() {
-        return __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").getContext();
+        return __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").getContextSync();
+    }
+    getContextAsync(object) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").getContext();
+        });
+    }
+    getAuthCode(object) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").getAuthCode();
+        });
+    }
+    setAccessToken(accessToken) {
+        return __classPrivateFieldGet(this, _SDKCreator_sdkService, "f").setAccessToken(accessToken);
     }
 };
 _SDKCreator_sdkService = new WeakMap();