@chongqingliangyunzhijing/ssquant-cli 0.2.0 → 0.2.1

package/README.md

@@ -5,6 +5,8 @@
 
 ## 发给 AI
 
+开户完成后，账户列表显示柜台分配的实际交易账号，可直接用于 `account use` 和 `account delete`。开户中的请求可按操作号查询进度，已有内部编号仍可用于选择账户。
+
 > 请完整读取 https://www.pandaaiquant.com/ssquant/openapi/v1/agent-install-guide/cli ，按指引帮我安装 SSQUANT 期货仿真交易 CLI，使用我的 PandaAI 账号登录。请完成安装和环境检查，需要浏览器登录、验证码或授权时提醒我。登录后列出账户和剩余名额。如果我需要开户，问我初始资金（万元，1 至 10000），换算成人民币元，等我确认再创建。最后告诉我账户和就绪状态。本次仅做接入和开户。
 
 运行 `ssquant --help` 查看交易命令。查询、开户、交易计划和操作状态支持 `--json`。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chongqingliangyunzhijing/ssquant-cli",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "SSQUANT 期货仿真交易命令行工具",
   "type": "module",
   "bin": {

package/src/auth.js

@@ -61,7 +61,7 @@ export async function loginBrowser({ scope = 'futures:read futures:trade', timeo
   const { verifier, challenge } = makePkce();
   const state = b64url(crypto.randomBytes(16));
 
-  const { server, port, waitForCode } = await startCallbackServer(timeout);
+  const { server, port, waitForCode, finish } = await startCallbackServer(timeout, state);
   const redirectUri = `http://127.0.0.1:${port}/callback`;
 
   const url = apiUrl('/oauth/authorize') + '?' + new URLSearchParams({
@@ -93,42 +93,49 @@ export async function loginBrowser({ scope = 'futures:read futures:trade', timeo
         client_id: clientId(),
       },
     });
-    return persist(data);
+    const saved = persist(data);
+    finish('success');
+    return saved;
+  } catch (error) {
+    finish('error');
+    throw error;
   } finally {
     server.close();
   }
 }
 
-function startCallbackServer(timeoutSec) {
+export function startCallbackServer(timeoutSec, expectedState) {
   return new Promise((resolve, reject) => {
     let settle;
     const waitForCode = new Promise((res, rej) => {
       settle = { res, rej };
     });
 
+    let browserResponse;
+    const finish = (result) => {
+      if (!browserResponse || browserResponse.writableEnded) return;
+      browserResponse.writeHead(303, {
+        Location: LOGIN_HOME_URL + '?result=' + result,
+        'Cache-Control': 'no-store',
+        'Referrer-Policy': 'no-referrer',
+      }).end();
+    };
     const server = http.createServer((req, res) => {
       const u = new URL(req.url, 'http://127.0.0.1');
-      if (!u.pathname.startsWith('/callback')) {
+      if (req.method !== 'GET' || u.pathname !== '/callback') {
         res.writeHead(404).end();
         return;
       }
-      const err = u.searchParams.get('error');
-      const html = (msg) =>
-        `<!doctype html><meta charset="utf-8"><body style="font-family:system-ui;padding:40px">
-         <h2>${msg}</h2><p>可以关闭本页面，回到命令行继续。</p></body>`;
-      if (err) {
-        res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' })
-          .end(html('✗ 授权被拒绝'));
+      if (u.searchParams.get('state') !== expectedState || browserResponse ||
+          (!u.searchParams.get('code') && !u.searchParams.get('error'))) {
+        res.writeHead(400, { 'Cache-Control': 'no-store' }).end();
+        return;
+      }
+      browserResponse = res;
+      if (u.searchParams.get('error')) {
         settle.rej(new ApiError('access_denied', '你在浏览器中拒绝了授权'));
         return;
       }
-      // 回调只负责交付一次性 code；交付后离开 localhost 页面，避免把 code
-      // 留在地址栏或让用户看到一个简陋的本地确认页。
-      res.writeHead(303, {
-        Location: LOGIN_HOME_URL,
-        'Cache-Control': 'no-store',
-        'Referrer-Policy': 'no-referrer',
-      }).end();
       settle.res({
         code: u.searchParams.get('code'),
         state: u.searchParams.get('state'),
@@ -144,7 +151,7 @@ function startCallbackServer(timeoutSec) {
 
     // 端口交给系统分配：固定端口会在多开时冲突
     server.listen(0, '127.0.0.1', () => {
-      resolve({ server, port: server.address().port, waitForCode });
+      resolve({ server, port: server.address().port, waitForCode, finish });
     });
     server.on('error', reject);
   });
@@ -158,6 +165,7 @@ export function persist(d) {
     expiresAt: Date.now() + (d.expires_in || 2592000) * 1000,
     scope: d.scope,
     accountId: d.account_id,
+    tradingAccount: d.trading_account ?? null,
     market: d.market,
     clientId: clientId(),
     savedAt: new Date().toISOString(),

package/src/commands/sim.js

@@ -34,7 +34,7 @@ export async function create(opts) {
 export async function use(id) {
   const { data } = await request('/sim/accounts/' + encodeURIComponent(id) + '/select', { method:'POST' });
   persist(data);
-  show({ accountId:id });
+  show({ accountId: data.trading_account ?? null, ...(!data.trading_account && { accountRef: data.account_id }) });
 }
 export async function remove(id, opts) {
   if (!opts.yes && !/^y(es)?$/i.test(await ask(`确认删除 ${id} 并释放名额？柜台已有委托仍可能成交。[y/N] `))) return;

package/src/commands/system.js

@@ -5,7 +5,7 @@ import { emit, say } from '../output.js';
 
 export async function login() {
   const info = await loginBrowser();
-  emit({ authenticated: true, accountId: info.accountId || null });
+  emit({ authenticated: true, accountId: info.tradingAccount || null });
   say('已登录 PandaAI。运行 ssquant account list 查看账户和名额。');
 }
 export function logout() {

package/src/http.js

@@ -89,10 +89,23 @@ async function rawFetch(url, {
   return { res, json };
 }
 
+// API 保留稳定的内部关联键，CLI 的账户号始终用柜台分配的交易账号。
+function forDisplay(value, selectedAccount) {
+  if (Array.isArray(value)) return value.map(item => forDisplay(item, selectedAccount));
+  if (!value || typeof value !== 'object') return value;
+  const result = Object.fromEntries(Object.entries(value).map(([key, item]) => [key, forDisplay(item, selectedAccount)]));
+  if (typeof result.accountId === 'string' && result.accountId.startsWith('sq_')) {
+    const number = result.tradingAccount ?? selectedAccount ?? null;
+    if (!number) result.accountRef = result.accountId;
+    result.accountId = number;
+  }
+  return result;
+}
+
 /** 服务端信封 → 结果或抛错 */
 function unwrap({ res, json }) {
   if (res.ok && json && json.code === '0') {
-    return { data: json.data, meta: json.meta, requestId: json.request_id };
+    return { data: forDisplay(json.data, res.headers.get('X-SSQUANT-Trading-Account')), meta: json.meta, requestId: json.request_id };
   }
   const code = (json && json.code) || `http_${res.status}`;
   const message = (json && json.message) || `HTTP ${res.status}`;