@yuntower/yuntower-account-web-sdk 0.0.13 → 0.0.15

package/dist/index.d.ts

@@ -32,9 +32,11 @@ declare class YunTowerAccountSDK {
     private setupMessageListener;
     /**
      * 弹窗授权模式
-     * @param callback 授权回调函数
+     * @param optionsOrCallback 配置（可选）或回调；传 { autoCloseOnFinish: false } 可关闭「成功/失败时自动关窗」
+     * @param callback 授权回调（当第一个参数为 options 时必传）
+     * @returns 返回 { close }，由接入方在需要时调用 close() 关闭授权窗口
      */
-    window(callback?: (response: CallbackResponse) => void): void;
+    window(optionsOrCallback?: WindowOptions | ((response: CallbackResponse) => void), callback?: (response: CallbackResponse) => void): WindowController;
     /**
      * 重定向授权模式
      * @param redirectUrl 授权完成后的重定向URL

package/dist/index.js

@@ -72,15 +72,19 @@ class YunTowerAccountSDK {
         if (!this.isValidOrigin(event.origin)) {
             return false;
         }
-        if (event.data?.action === "status") {
-            const { status, data, msg } = event.data;
+        const data = event.data;
+        const isStatusMessage = data?.action === "status" || data?.type === "status";
+        if (isStatusMessage) {
+            const status = data.status;
+            const msg = data.msg;
+            const responseData = data.data;
             if (status === "success") {
                 this.authStatus = true;
             }
             callback({
                 event: "auth",
                 status,
-                data,
+                data: responseData,
                 msg,
             });
             return true;
@@ -104,35 +108,74 @@ class YunTowerAccountSDK {
     }
     /**
      * 弹窗授权模式
-     * @param callback 授权回调函数
+     * @param optionsOrCallback 配置（可选）或回调；传 { autoCloseOnFinish: false } 可关闭「成功/失败时自动关窗」
+     * @param callback 授权回调（当第一个参数为 options 时必传）
+     * @returns 返回 { close }，由接入方在需要时调用 close() 关闭授权窗口
      */
-    window(callback = () => { }) {
+    window(optionsOrCallback, callback) {
+        const options = optionsOrCallback && typeof optionsOrCallback === "object"
+            ? optionsOrCallback
+            : {};
+        const userCallback = typeof optionsOrCallback === "function"
+            ? optionsOrCallback
+            : callback ?? (() => { });
+        const autoCloseOnFinish = options.autoCloseOnFinish !== false;
         const authUrl = this.buildAuthUrl("window");
         const authWindow = window.open(authUrl, "_blank", "width=500,height=600");
         if (!authWindow) {
             throw new Error("[YunTowerAccountSDK] 无法打开授权窗口，可能被浏览器拦截");
         }
-        const cleanup = this.setupMessageListener(callback);
-        // 监听窗口关闭状态
-        const checkInterval = setInterval(() => {
+        let intervalId = null;
+        const cleanup = this.setupMessageListener((response) => {
+            if (intervalId != null) {
+                clearInterval(intervalId);
+                intervalId = null;
+            }
+            cleanup();
+            if (autoCloseOnFinish && authWindow && !authWindow.closed) {
+                // 延后关窗，避免部分浏览器在 message 回调里同步 close 不生效
+                setTimeout(() => {
+                    if (authWindow && !authWindow.closed) {
+                        authWindow.close();
+                    }
+                }, 0);
+            }
+            userCallback(response);
+        });
+        // 轮询授权窗状态，间隔 1s 便于尽快收到授权页回复
+        intervalId = setInterval(() => {
             if (authWindow.closed) {
-                clearInterval(checkInterval);
+                if (intervalId != null) {
+                    clearInterval(intervalId);
+                    intervalId = null;
+                }
                 cleanup();
-                callback({
+                userCallback({
                     event: "closed",
                     status: "success",
                 });
             }
             else {
-                // 发送状态检查消息
                 try {
                     authWindow.postMessage({ action: "status" }, "*");
                 }
                 catch {
-                    // 窗口可能已经关闭，忽略错误
+                    // 窗口可能已关闭，忽略
                 }
             }
-        }, 3000);
+        }, 1000);
+        return {
+            close() {
+                if (intervalId != null) {
+                    clearInterval(intervalId);
+                    intervalId = null;
+                }
+                cleanup();
+                if (authWindow && !authWindow.closed) {
+                    authWindow.close();
+                }
+            },
+        };
     }
     /**
      * 重定向授权模式

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yuntower/yuntower-account-web-sdk",
   "description": "YunTower Account Web SDK",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "private": false,
   "author": "yuntower",
   "license": "Apache-2.0",