@kevisual/kv-login 0.1.2 → 0.1.3

package/dist/app.d.ts

@@ -109,4 +109,7 @@ declare global {
     }
 }
 
-export { loginEmitter };
+declare const clearCode: () => void;
+declare const checkPluginLogin: () => Promise<void>;
+
+export { checkPluginLogin, clearCode, loginEmitter };

package/dist/app.js

@@ -2972,19 +2972,23 @@ UnsafeHTMLDirective.directiveName = "unsafeHTML";
 UnsafeHTMLDirective.resultType = HTML_RESULT2;
 var unsafeHTML = directive(UnsafeHTMLDirective);
 
-// ../../node_modules/.pnpm/@kevisual+query@0.0.29_ws@8.18.0_zod@3.25.76/node_modules/@kevisual/query/dist/query-browser.js
+// ../../node_modules/.pnpm/@kevisual+query@0.0.33/node_modules/@kevisual/query/dist/query-browser.js
 var isTextForContentType = (contentType) => {
   if (!contentType)
     return false;
-  const textTypes = ["text/", "xml", "html", "javascript", "css", "csv", "plain", "x-www-form-urlencoded"];
+  const textTypes = ["text/", "xml", "html", "javascript", "css", "csv", "plain", "x-www-form-urlencoded", "md"];
   return textTypes.some((type) => contentType.includes(type));
 };
 var adapter = async (opts = {}, overloadOpts) => {
   const controller = new AbortController;
   const signal = controller.signal;
-  const isBlob = opts.isBlob || false;
-  const isText = opts.isText || false;
   const isPostFile = opts.isPostFile || false;
+  let responseType = opts.responseType || "json";
+  if (opts.isBlob) {
+    responseType = "blob";
+  } else if (opts.isText) {
+    responseType = "text";
+  }
   const timeout = opts.timeout || 60000 * 3;
   const timer = setTimeout(() => {
     controller.abort();
@@ -3002,6 +3006,9 @@ var adapter = async (opts = {}, overloadOpts) => {
   const isGet = method === "GET";
   if (isGet) {
     url.search = new URLSearchParams(opts.body).toString();
+  } else {
+    const params = opts.params || {};
+    url.search = new URLSearchParams(params).toString();
   }
   let body = undefined;
   if (isGet) {
@@ -3023,15 +3030,16 @@ var adapter = async (opts = {}, overloadOpts) => {
     headers
   }).then(async (response) => {
     const contentType = response.headers.get("Content-Type");
-    if (isBlob) {
+    if (responseType === "blob") {
       return await response.blob();
     }
+    const isText = responseType === "text";
     const isJson = contentType && contentType.includes("application/json");
     if (isJson && !isText) {
       return await response.json();
     } else if (isTextForContentType(contentType)) {
       return {
-        code: 200,
+        code: response.status,
         status: response.status,
         data: await response.text()
       };
@@ -3050,15 +3058,6 @@ var adapter = async (opts = {}, overloadOpts) => {
     clearTimeout(timer);
   });
 };
-var setBaseResponse = (res) => {
-  res.success = res.code === 200;
-  res.showError = (fn) => {
-    if (!res.success && !res.noMsg) {
-      fn?.();
-    }
-  };
-  return res;
-};
 var wrapperError = ({ code, message }) => {
   const result = {
     code: code || 500,
@@ -3079,9 +3078,11 @@ class Query {
   timeout;
   stop;
   qws;
+  isClient = false;
   constructor(opts) {
     this.adapter = opts?.adapter || adapter;
-    this.url = opts?.url || "/api/router";
+    const defaultURL = opts?.isClient ? "/client/router" : "/api/router";
+    this.url = opts?.url || defaultURL;
     this.headers = opts?.headers || {
       "Content-Type": "application/json"
     };
@@ -3147,7 +3148,6 @@ class Query {
     }
     return _adapter(req).then(async (res) => {
       try {
-        setBaseResponse(res);
         if (_afterResponse) {
           return await _afterResponse(res, {
             req,
@@ -3187,7 +3187,13 @@ class Query {
         ..._options?.headers || {}
       }
     });
-    return setBaseResponse(res);
+    if (res && !res.code) {
+      return {
+        code: 200,
+        data: res
+      };
+    }
+    return res;
   }
 }
 
@@ -3216,8 +3222,8 @@ class BaseQuery {
   }
 }
 
-// ../../node_modules/.pnpm/@kevisual+query@0.0.29_ws@8.18.0_zod@3.25.76/node_modules/@kevisual/query/dist/query.js
-var setBaseResponse2 = (res) => {
+// ../../node_modules/.pnpm/@kevisual+query@0.0.33/node_modules/@kevisual/query/dist/query.js
+var setBaseResponse = (res) => {
   res.success = res.code === 200;
   res.showError = (fn) => {
     if (!res.success && !res.noMsg) {
@@ -3407,7 +3413,7 @@ class MyCache extends CacheWorkspace {
   }
 }
 
-// ../../node_modules/.pnpm/@kevisual+query-login@0.0.7_@kevisual+query@0.0.29_ws@8.18.0_zod@3.25.76_/node_modules/@kevisual/query-login/dist/query-login-browser.js
+// ../../node_modules/.pnpm/@kevisual+query-login@0.0.7_@kevisual+query@0.0.33/node_modules/@kevisual/query-login/dist/query-login-browser.js
 var LoginCacheStore = class {
   cache;
   name;
@@ -3614,7 +3620,7 @@ var QueryLogin = class extends BaseQuery {
     }
     return this.post({ key: "refreshToken", data }, {
       afterResponse: async (response, ctx) => {
-        setBaseResponse2(response);
+        setBaseResponse(response);
         return response;
       }
     });
@@ -3639,7 +3645,7 @@ var QueryLogin = class extends BaseQuery {
               body,
               headers: { ...headers, Authorization: `Bearer ${accessToken}` }
             });
-            setBaseResponse2(res2);
+            setBaseResponse(res2);
             return res2;
           }
         } else {
@@ -4238,6 +4244,8 @@ var clearCode = () => {
   const url = new URL(window.location.href);
   url.searchParams.delete("code");
   url.searchParams.delete("state");
+  url.searchParams.delete("user-check");
+  url.searchParams.delete("redirect");
   window.history.replaceState({}, document.title, url.toString());
 };
 var checkWechat = async () => {
@@ -4282,6 +4290,27 @@ var checkMpWechat = async () => {
     closePage();
   }
 };
+var checkPluginLogin = async () => {
+  const userCheck = "user-check";
+  const url = new URL(location.href);
+  const redirect = url.searchParams.get("redirect");
+  const redirectUrl = redirect ? decodeURIComponent(redirect) : "";
+  const checkKey = url.searchParams.get(userCheck);
+  if (redirect && checkKey) {
+    const me = await query.getMe();
+    if (me.code === 200) {
+      message.success("登录插件中...");
+      const token = await query.cacheStore.getAccessToken();
+      const newRedirectUrl = new URL(redirectUrl);
+      newRedirectUrl.searchParams.set("token", token + "");
+      setTimeout(() => {
+        window.open(newRedirectUrl.toString(), "_blank");
+      }, 2000);
+      return;
+    }
+  }
+  console.log("checkKey", checkKey, redirectUrl);
+};
 var isWechat = () => {
   const ua = navigator.userAgent.toLowerCase();
   return /micromessenger/i.test(ua);
@@ -5563,5 +5592,7 @@ class KvLogin extends HTMLElement {
 }
 customElements.define("kv-login", KvLogin);
 export {
-  loginEmitter
+  loginEmitter,
+  clearCode,
+  checkPluginLogin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/kv-login",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "",
   "main": "src/main.ts",
   "scripts": {
@@ -36,6 +36,6 @@
   },
   "types": "./types/index.d.ts",
   "devDependencies": {
-    "@types/bun": "^1.3.3"
+    "@types/bun": "^1.3.5"
   }
 }

package/src/main.ts

@@ -1,7 +1,6 @@
-import { checkPluginLogin, clearCode } from './modules/login-handle';
 import './pages/kv-login'
 import './pages/kv-message'
 
 export { loginEmitter } from './pages/kv-login'
 
-export { checkPluginLogin, clearCode }
+export { checkPluginLogin, clearCode } from './modules/login-handle';