@xfe-repo/cli-plugin-oauth 2.0.9 → 2.0.10

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @xfe-repo/cli-plugin-oauth
 
+## 2.0.10
+
+### Patch Changes
+
+- 优化插件性能
+
 ## 2.0.9
 
 ### Patch Changes

package/dist/index.js

@@ -59,11 +59,13 @@ export function oauthPlugin() {
                 slot: ['footer'],
                 value: (state) => {
                     const currentSession = resolveOptionalOAuthState(state.xfe, state.oauth);
-                    return currentSession ? `Oauth ${currentSession.isAuthenticated ? '已登录' : '未登录'}` : undefined;
+                    const isAuthenticated = currentSession && isOAuthAccessTokenValid(currentSession, Math.floor(Date.now() / MILLISECONDS_PER_SECOND));
+                    return currentSession ? `Oauth ${isAuthenticated ? '已登录' : '未登录'}` : undefined;
                 },
                 color: (state) => {
                     const currentSession = resolveOptionalOAuthState(state.xfe, state.oauth);
-                    return currentSession?.isAuthenticated ? 'cyan' : 'yellow';
+                    const isAuthenticated = currentSession && isOAuthAccessTokenValid(currentSession, Math.floor(Date.now() / MILLISECONDS_PER_SECOND));
+                    return isAuthenticated ? 'cyan' : 'yellow';
                 },
             });
             hooks.registerCommand({
@@ -197,24 +199,34 @@ async function getUser(ctx, runtime) {
     }
     const user = normalizeOAuthUserInfo(await response.json());
     const latest = resolveOAuthStateForConfig(config, ctx.store.getState().oauth);
-    saveOAuthSession(ctx, config, { ...toOAuthSessionState(latest, config.name), ...user });
+    saveOAuthSession(ctx, config, { ...latest, ...user });
     return user;
 }
 async function logout(ctx) {
     const config = parseOptionalOAuthConfig(ctx.store.getState().xfe);
     const current = config ? resolveOAuthStateForConfig(config, ctx.store.getState().oauth) : undefined;
     const name = config?.name || current?.name || DEFAULT_OAUTH_NAME;
-    const storeState = cloneOAuthState(ctx.store.getState().oauth);
-    if (config)
-        delete storeState[resolveOAuthConfigKey(config)];
-    ctx.store.setState({ oauth: storeState });
+    const storeState = ctx.store.getState().oauth ?? oauthStoreInitial;
+    const currentConfigKey = config ? resolveOAuthConfigKey(config) : undefined;
+    const nextStoreState = currentConfigKey
+        ? Object.fromEntries(Object.entries(storeState).filter(([configKey]) => configKey !== currentConfigKey))
+        : storeState;
+    ctx.store.setState({ oauth: nextStoreState });
     ctx.logger.success(`${name} 已退出登录`);
 }
 // ─── Config And State ──────────────────────────────────────
 function resolveOAuthStateForConfig(config, state) {
     const configKey = resolveOAuthConfigKey(config);
     const session = state?.[configKey];
-    return session ? toOAuthSessionState(session, config.name) : createEmptyOAuthSession(config.name);
+    return {
+        name: session?.name || config.name,
+        accessToken: session?.accessToken || '',
+        refreshToken: session?.refreshToken || '',
+        tokenType: session?.tokenType || DEFAULT_TOKEN_TYPE,
+        expiresAt: session?.expiresAt ?? 0,
+        userId: session?.userId ?? 0,
+        userName: session?.userName || '',
+    };
 }
 function parseOAuthConfig(xfeConfig) {
     const config = parseOptionalOAuthConfig(xfeConfig);
@@ -235,8 +247,8 @@ function parseOptionalOAuthConfig(xfeConfig) {
 }
 function saveOAuthSession(ctx, config, session) {
     const configKey = resolveOAuthConfigKey(config);
-    const storeState = cloneOAuthState(ctx.store.getState().oauth);
-    storeState[configKey] = toOAuthSessionState(session, config.name);
+    const storeState = { ...(ctx.store.getState().oauth ?? oauthStoreInitial) };
+    storeState[configKey] = session;
     ctx.store.setState({ oauth: storeState });
 }
 function resolveOptionalOAuthState(xfeConfig, state) {
@@ -260,38 +272,8 @@ function resolveOAuthConfigKey(config) {
     const digest = createHash(OAUTH_CONFIG_HASH_ALGORITHM).update(payload).digest(OAUTH_CONFIG_HASH_ENCODING);
     return `${OAUTH_CONFIG_KEY_PREFIX}:${digest}`;
 }
-function cloneOAuthState(stateMap) {
-    if (!stateMap)
-        return {};
-    return Object.fromEntries(Object.entries(stateMap)
-        .filter((entry) => isOAuthSessionState(entry[1]))
-        .map(([configKey, session]) => [configKey, toOAuthSessionState(session, session.name)]));
-}
-function isOAuthSessionState(value) {
-    if (typeof value !== 'object' || value === null || Array.isArray(value))
-        return false;
-    const record = value;
-    return typeof record.name === 'string';
-}
-function createEmptyOAuthSession(name) {
-    return toOAuthSessionState(undefined, name);
-}
-function toOAuthSessionState(state, name) {
-    return {
-        name: state?.name || name,
-        accessToken: state?.accessToken || '',
-        refreshToken: state?.refreshToken || '',
-        idToken: state?.idToken || '',
-        tokenType: state?.tokenType || DEFAULT_TOKEN_TYPE,
-        scope: state?.scope || '',
-        expiresAt: state?.expiresAt ?? 0,
-        isAuthenticated: state?.isAuthenticated ?? false,
-        userId: state?.userId ?? 0,
-        userName: state?.userName || '',
-    };
-}
 function isOAuthAccessTokenValid(state, now) {
-    return state.isAuthenticated && !!state.accessToken && (!state.expiresAt || state.expiresAt - TOKEN_EXPIRY_SKEW_SECONDS > now);
+    return !!state.accessToken && (!state.expiresAt || state.expiresAt - TOKEN_EXPIRY_SKEW_SECONDS > now);
 }
 function createOAuthSessionFromToken(config, tokenResponse, now, fallbackRefreshToken = '') {
     const expiresIn = tokenResponse.expiresIn();
@@ -299,11 +281,8 @@ function createOAuthSessionFromToken(config, tokenResponse, now, fallbackRefresh
         name: config.name,
         accessToken: tokenResponse.access_token ?? '',
         refreshToken: tokenResponse.refresh_token || fallbackRefreshToken,
-        idToken: tokenResponse.id_token || '',
         tokenType: tokenResponse.token_type || DEFAULT_TOKEN_TYPE,
-        scope: tokenResponse.scope || '',
         expiresAt: expiresIn ? now + expiresIn : 0,
-        isAuthenticated: true,
         userId: 0,
         userName: '',
     };
@@ -317,31 +296,16 @@ function normalizeOAuthUserInfo(input) {
     const userRecord = nestedRecord ?? rootRecord;
     const userIdKeys = ['userId', 'user_id', 'UserId', 'id', 'uid'];
     const userNameKeys = ['name', 'userName', 'user_name', 'UserName', 'username', 'nickName', 'nikeName', 'nickname'];
-    let userId = 0;
-    let userName = '';
-    for (const key of userIdKeys) {
-        const value = userRecord[key];
-        if (typeof value === 'number' && Number.isInteger(value)) {
-            userId = value;
-            break;
-        }
-        if (typeof value === 'string' && value.trim()) {
-            const parsed = Number.parseInt(value, 10);
-            if (!Number.isNaN(parsed)) {
-                userId = parsed;
-                break;
-            }
-        }
-    }
+    const userId = userIdKeys
+        .map((key) => userRecord[key])
+        .map((value) => (typeof value === 'number' ? value : typeof value === 'string' ? Number.parseInt(value, 10) : Number.NaN))
+        .find(Number.isInteger) ?? 0;
     if (!userId)
         throw new Error('OAuth 用户信息缺少 userId');
-    for (const key of userNameKeys) {
-        const value = userRecord[key];
-        if (typeof value === 'string' && value.trim()) {
-            userName = value.trim();
-            break;
-        }
-    }
+    const userName = userNameKeys
+        .map((key) => userRecord[key])
+        .find((value) => typeof value === 'string' && !!value.trim())
+        ?.trim();
     if (!userName)
         throw new Error('OAuth 用户信息缺少 userName');
     return { userId, userName };

package/dist/types.d.ts

@@ -24,11 +24,8 @@ export interface OAuthSessionState {
     name: string;
     accessToken: string;
     refreshToken: string;
-    idToken: string;
     tokenType: string;
-    scope: string;
     expiresAt: number;
-    isAuthenticated: boolean;
     userId: number;
     userName: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/cli-plugin-oauth",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "XFE OAuth plugin - login through OIDC/OAuth and expose token state",
   "type": "module",
   "main": "./dist/index.js",
@@ -13,8 +13,7 @@
   },
   "devDependencies": {
     "@types/node": "^24.3.0",
-    "typescript": "^5.9.2",
-    "vitest": "^3.1.0"
+    "typescript": "^5.9.2"
   },
   "files": [
     "dist",
@@ -24,8 +23,7 @@
   "license": "ISC",
   "scripts": {
     "dev": "tsc -p tsconfig.json -w",
-    "build": "tsc -p tsconfig.json",
-    "test": "vitest run",
+    "build": "pnpm clean && tsc -p tsconfig.json",
     "clean": "rm -rf dist"
   }
 }

package/dist/callback-runner.d.ts

@@ -1,8 +0,0 @@
-/**
- * @xfe-repo/cli-plugin-oauth - OAuth 回调子进程
- *
- * 在独立 Node 进程中等待本地 OAuth 回调，让 CLI session 的 Ctrl+C
- * 可以通过 ctx.exec 终止等待中的回调服务。
- */
-export {};
-//# sourceMappingURL=callback-runner.d.ts.map

package/dist/callback-runner.js

@@ -1,26 +0,0 @@
-/**
- * @xfe-repo/cli-plugin-oauth - OAuth 回调子进程
- *
- * 在独立 Node 进程中等待本地 OAuth 回调，让 CLI session 的 Ctrl+C
- * 可以通过 ctx.exec 终止等待中的回调服务。
- */
-import { OAUTH_CALLBACK_URL_PREFIX, startOAuthCallbackServer } from './callback-server.js';
-async function main() {
-    const redirectUri = process.argv[2];
-    if (!redirectUri)
-        throw new Error('缺少 OAuth redirectUri 参数');
-    const callbackServer = await startOAuthCallbackServer(redirectUri);
-    try {
-        const callbackUrl = await callbackServer.waitForCallback();
-        process.stdout.write(`${OAUTH_CALLBACK_URL_PREFIX}${callbackUrl.href}\n`);
-    }
-    finally {
-        await callbackServer.close();
-    }
-}
-main().catch((error) => {
-    const message = error instanceof Error ? error.message : String(error);
-    process.stderr.write(`${message}\n`);
-    process.exitCode = 1;
-});
-//# sourceMappingURL=callback-runner.js.map