@qmuse/qmuse-cli 1.0.4 → 1.0.5-dev.2

package/dist/api.js

@@ -11,6 +11,10 @@ export function createSessionExchangeRequest(opts) {
 export function consumeSessionExchangeToken(token, opts) {
     return apiCall('POST', '/api/login/session-exchange/consume', { token }, { anonymous: true, ...opts });
 }
+/** 查询服务端实际登录身份，不触发 /api/user/me 的奖励和活跃副作用。 */
+export function whoami(cfg) {
+    return apiCall('GET', '/api/user/whoami', undefined, cfg);
+}
 export function listSpaces(pageIndex = 1, pageSize = 20, cfg) {
     const path = `/api/space/list?pageIndex=${pageIndex}&pageSize=${pageSize}`;
     return apiCall('GET', path, undefined, cfg);

package/dist/cli.js

@@ -94,8 +94,7 @@ function output(value, flags) {
     process.stdout.write(`${json}\n`);
 }
 function fail(message) {
-    log.error(message);
-    process.exit(1);
+    throw new Error(message);
 }
 function requireAuth(cfg) {
     if (!hasAuth(cfg)) {
@@ -619,18 +618,64 @@ async function cmdDev(command, flags) {
 }
 async function cmdWhoami(flags) {
     const cfg = resolveCfg(flags);
+    const apiBaseUrl = `${cfg.baseUrl}${cfg.apiPrefix || ''}`;
+    if (!hasAuth(cfg)) {
+        if (flags['--json'] === true) {
+            output({
+                apiBaseUrl,
+                loggedIn: false,
+                ...(cfg.spaceId ? { spaceId: cfg.spaceId } : {}),
+            }, flags);
+            return;
+        }
+        log.info(`QMuse API: ${apiBaseUrl}`);
+        log.info('登录状态 : 未登录');
+        if (cfg.spaceId)
+            log.info(`本地空间 : ${cfg.spaceId}`);
+        return;
+    }
+    const result = await api.whoami(cfg);
+    if (!result.ok || !result.data?.userId) {
+        if (result.status === 401) {
+            if (flags['--json'] === true) {
+                output({
+                    apiBaseUrl,
+                    loggedIn: false,
+                    ...(cfg.spaceId ? { spaceId: cfg.spaceId } : {}),
+                }, flags);
+                return;
+            }
+            log.info(`QMuse API: ${apiBaseUrl}`);
+            log.info('登录状态 : 会话已失效');
+            if (cfg.spaceId)
+                log.info(`本地空间 : ${cfg.spaceId}`);
+            return;
+        }
+        fail(`查询当前用户失败: ${result.errorMessage ?? result.errorCode ?? `HTTP ${result.status}`}`);
+    }
+    const currentUser = result.data;
     if (flags['--json'] === true) {
         output({
-            apiBaseUrl: `${cfg.baseUrl}${cfg.apiPrefix || ''}`,
-            loggedIn: hasAuth(cfg),
-            ...(cfg.spaceId ? { spaceId: cfg.spaceId } : {}),
+            apiBaseUrl,
+            loggedIn: true,
+            userId: currentUser.userId,
+            userName: currentUser.userName,
+            ...(currentUser.avatarUrl ? { avatarUrl: currentUser.avatarUrl } : {}),
+            spaceId: currentUser.spaceId,
+            spaceName: currentUser.spaceName ?? null,
+            tenantCode: currentUser.tenantCode,
         }, flags);
         return;
     }
-    log.info(`QMuse API: ${cfg.baseUrl}${cfg.apiPrefix || ''}`);
-    log.info(`登录状态 : ${hasAuth(cfg) ? '已登录' : '未登录'}`);
-    if (cfg.spaceId)
-        log.info(`当前空间 : ${cfg.spaceId}`);
+    log.info(`QMuse API: ${apiBaseUrl}`);
+    log.info('登录状态 : 已登录');
+    log.info(`当前用户 : ${currentUser.userName} [${currentUser.userId}]`);
+    const spaceName = currentUser.spaceName?.trim();
+    const spaceLabel = currentUser.spaceId
+        ? (spaceName ? `${spaceName} [${currentUser.spaceId}]` : currentUser.spaceId)
+        : '(无)';
+    log.info(`当前空间 : ${spaceLabel}`);
+    log.info(`业务租户 : ${currentUser.tenantCode ?? 'QMuse 默认'}`);
 }
 async function cmdConfig(command, flags) {
     const sub = command[1];
@@ -821,10 +866,11 @@ async function main() {
         const msg = err instanceof Error ? err.message : String(err);
         if (flags['--json'] === true) {
             output({ success: false, message: msg }, flags);
-            process.exitCode = 1;
         }
-        else
-            fail(msg);
+        else {
+            log.error(msg);
+        }
+        process.exitCode = 1;
     }
     finally {
         finishUpdateNotice();

package/dist/login.js

@@ -1,8 +1,8 @@
 /**
  * QMuse 网页确认登录：服务端创建短期请求，浏览器确认后由 CLI 轮询换取会话。
  */
-import { execFile } from 'node:child_process';
 import { createInterface } from 'node:readline';
+import open from 'open';
 import * as api from './api.js';
 import { buildUrl } from './client.js';
 import { apiOrigin, loadConfig, saveSession } from './config.js';
@@ -52,10 +52,7 @@ export function closePrompt() {
     }
 }
 export function openBrowser(url) {
-    const command = process.platform === 'darwin' ? 'open' : 'xdg-open';
-    return new Promise(resolve => {
-        execFile(command, [url], error => resolve(!error));
-    });
+    return open(url, { wait: false }).then(() => true, () => false);
 }
 export function persistSession(sessionId, targetConfig = loadConfig()) {
     const origin = apiOrigin(targetConfig.baseUrl);
@@ -103,11 +100,9 @@ export async function loginBrowser(cfg, options = {}, dependencyOverrides) {
     log.info('正在打开 QMuse 登录页面...');
     log.info(`确认码：${token.slice(-6).toUpperCase()}`);
     if (!await dependencies.open(authUrl.toString())) {
-        return {
-            success: false,
-            method: 'browser',
-            message: '无法打开 QMuse 登录页面，请检查系统默认浏览器配置后重试',
-        };
+        log.warn('无法自动打开浏览器，请复制下面的一次性地址到浏览器中打开：');
+        log.raw(`${authUrl.toString()}\n`);
+        log.warn('该地址包含一次性登录凭证，请勿分享');
     }
     log.info('等待网页确认登录...');
     const deadline = dependencies.now() + Math.min(SESSION_EXCHANGE_POLL_TIMEOUT_MS, expiresInSeconds * 1000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qmuse/qmuse-cli",
-  "version": "1.0.4",
+  "version": "1.0.5-dev.2",
   "description": "将本地 React 项目安全导入 QMuse 的命令行客户端",
   "type": "module",
   "bin": {
@@ -21,6 +21,7 @@
   "dependencies": {
     "@napi-rs/keyring": "2.0.0",
     "ignore": "^7.0.8",
+    "open": "^11.0.4",
     "semver": "7.7.4",
     "yazl": "^3.3.1"
   },