ai_co_discuss 0.2.97 → 0.2.98

package/backend/admin.py

@@ -127,7 +127,7 @@ def register_admin(connection, payload, setup_key, now):
     password = valid_password(payload.get("password"))
     supplied = payload.get("setup_key")
     setup = connection.execute("SELECT token_hash FROM admin_setup WHERE id=1").fetchone()
-    # Either the install token or the one-time token written by `codiscuss admin token` registers.
+    # Either the install token or the one-time token written by `codiscuss token` registers.
     if not isinstance(supplied, str) or not (
             same_secret(supplied.strip(), setup_key)
             or setup and hmac.compare_digest(hashlib.sha256(supplied.strip().encode()).hexdigest(), setup["token_hash"])):

package/backend/schema.sql

@@ -161,7 +161,7 @@ CREATE TABLE IF NOT EXISTS admin_sessions (
     token_hash TEXT PRIMARY KEY,
     created_at INTEGER NOT NULL
 );
--- One-time registration token from `codiscuss admin token` on the deploying computer; cleared once the administrator registers.
+-- One-time registration token from `codiscuss token` on the deploying computer; cleared once the administrator registers.
 CREATE TABLE IF NOT EXISTS admin_setup (
     id INTEGER PRIMARY KEY CHECK(id=1),
     token_hash TEXT NOT NULL,

package/docs/deployment.md

@@ -96,10 +96,10 @@ Windows PowerShell 使用 `New-Item -ItemType Directory -Force -Path .wrangler/d
 ```sh
 npx wrangler d1 execute DB --remote --config .wrangler/deploy/wrangler.jsonc --file backend/schema.sql
 npm run deploy -- --cwd .wrangler/deploy
-codiscuss admin token
+codiscuss token
 ```
 
-`codiscuss admin token` 生成注册管理员用的一次性令牌（需已 `wrangler login`），在网站左下角注册时填入；在已用 `codiscuss local connect` 连上本机的网页注册时，账号密码会保存到 `~/.codiscuss/admin-accounts.json`。注册后其他设备直接用账号密码登录。`schema.sql` 可重复执行；升级已有站点前请先备份 D1（`npx wrangler d1 export`）。
+`codiscuss token` 生成注册管理员用的一次性令牌（需已 `wrangler login`），在网站左下角注册时填入；在已用 `codiscuss local connect` 连上本机的网页注册时，账号密码会保存到 `~/.codiscuss/admin-accounts.json`。注册后其他设备直接用账号密码登录。`schema.sql` 可重复执行；升级已有站点前请先备份 D1（`npx wrangler d1 export`）。
 
 发布后检查网页、`/api/health`，以及：
 

package/docs/en/deployment.md

@@ -96,10 +96,10 @@ Keep the binding names `DB` and `ATTACHMENTS`. Without the R2 binding, text disc
 ```sh
 npx wrangler d1 execute DB --remote --config .wrangler/deploy/wrangler.jsonc --file backend/schema.sql
 npm run deploy -- --cwd .wrangler/deploy
-codiscuss admin token
+codiscuss token
 ```
 
-`codiscuss admin token` prints a one-time token for registering the administrator (requires `wrangler login`); enter it when registering from the bottom-left corner. Registering from a page connected with `codiscuss local connect` also saves the account to `~/.codiscuss/admin-accounts.json`. Other devices then simply log in with the username and password. `schema.sql` is safe to re-run; back up D1 (`npx wrangler d1 export`) before upgrading an existing site.
+`codiscuss token` prints a one-time token for registering the administrator (requires `wrangler login`); enter it when registering from the bottom-left corner. Registering from a page connected with `codiscuss local connect` also saves the account to `~/.codiscuss/admin-accounts.json`. Other devices then simply log in with the username and password. `schema.sql` is safe to re-run; back up D1 (`npx wrangler d1 export`) before upgrading an existing site.
 
 After publishing, check the page, `/api/health`, and:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai_co_discuss",
-  "version": "0.2.97",
+  "version": "0.2.98",
   "bin": {
     "codiscuss": "runner/codiscuss.mjs"
   },

package/runner/admin_account.mjs

@@ -1,8 +1,7 @@
 /** Site administrator setup from the deploying computer: a one-time registration token and the saved account. */
 import { spawnSync } from 'node:child_process';
 import { createHash, randomBytes } from 'node:crypto';
-import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
-import { tmpdir } from 'node:os';
+import { existsSync, mkdirSync, readFileSync } from 'node:fs';
 import { join, resolve } from 'node:path';
 import { parseArgs } from 'node:util';
 
@@ -12,11 +11,11 @@ import { service_home } from './discussion_service.mjs';
 const DEFAULT_CONFIG = join('.wrangler', 'deploy', 'wrangler.jsonc');
 const ACCOUNTS_FILE = 'admin-accounts.json';
 const TOKEN_BYTES = 32;
-const HELP = `用法：codiscuss admin token [--config WRANGLER_CONFIG]
+const HELP = `用法：codiscuss token [--config WRANGLER_CONFIG]
 
-token  生成一次性管理员注册令牌，经 wrangler 把它的哈希写入线上 D1，立即生效。
-       在线上网页左下角注册管理员时填入；注册成功即作废，重新运行会替换旧令牌。
-       需要这台电脑已 wrangler login；--config 默认为当前目录的 ${DEFAULT_CONFIG}。
+生成一次性管理员注册令牌，经 wrangler 把它的哈希写入线上 D1，立即生效。
+在线上网页左下角注册管理员时填入；注册成功即作废，重新运行会替换旧令牌。
+需要这台电脑已 wrangler login；--config 默认为当前目录的 ${DEFAULT_CONFIG}。
 
 在已用 codiscuss local connect 连上本机服务的网页注册后，账号与密码保存在 ~/.codiscuss/${ACCOUNTS_FILE}。
 `;
@@ -27,12 +26,9 @@ export function create_admin_token(config, run = run_wrangler) {
   if (!existsSync(path)) throw new Error(`找不到部署配置 ${path}；请在项目目录运行，或用 --config 指定 wrangler.jsonc`);
   const token = randomBytes(TOKEN_BYTES).toString('hex');
   const hashed = createHash('sha256').update(token).digest('hex');
-  const directory = mkdtempSync(join(tmpdir(), 'codiscuss-admin-'));
-  const sql = join(directory, 'admin-setup.sql');
-  try {
-    writeFileSync(sql, `INSERT OR REPLACE INTO admin_setup (id,token_hash,created_at) VALUES (1,'${hashed}',${Math.floor(Date.now() / 1000)});\n`);
-    run(['d1', 'execute', 'DB', '--remote', '--config', path, '--file', sql]);
-  } finally { rmSync(directory, { recursive: true, force: true }); }
+  // --command uses the ordinary query API; --file goes through D1's upload-based import, which fails behind some networks.
+  run(['d1', 'execute', 'DB', '--remote', '--config', path, '--command',
+    `INSERT OR REPLACE INTO admin_setup (id,token_hash,created_at) VALUES (1,'${hashed}',${Math.floor(Date.now() / 1000)})`]);
   return { token, config: path };
 }
 
@@ -55,12 +51,12 @@ export function save_admin_account(home, { site, username, password }) {
   return { saved: path };
 }
 
-/** `codiscuss admin ...` */
+/** `codiscuss token [--config FILE]` */
 export function admin_main(args) {
   const { values, positionals } = parseArgs({ args, allowPositionals: true, options: {
     config: { type: 'string' }, help: { type: 'boolean', short: 'h' },
   } });
-  if (values.help || positionals[0] !== 'token') return process.stdout.write(HELP);
+  if (values.help || positionals.length) return process.stdout.write(HELP);
   const { token } = create_admin_token(values.config);
   process.stdout.write(`管理员注册令牌（一次性）：\n${token}\n\n在线上网页左下角注册管理员时填入。注册成功后作废；账号密码在已连接本机服务的网页注册时保存到 ${join(service_home(), ACCOUNTS_FILE)}。\n`);
 }

package/runner/codiscuss.mjs

@@ -17,7 +17,7 @@ const HELP = `AI CoDiscuss CLI
   （无命令）            在当前终端启动服务，Ctrl+C 停止
   install / setup       安装持久命令并配置 / 配置已有安装
   local COMMAND         管理本机网站，或 connect 连接线上站点
-  admin token           生成线上网站的一次性管理员注册令牌
+  token                 生成线上网站的一次性管理员注册令牌
   service COMMAND       启动、停止、查询服务，或登记房间
   launch COMMAND        保存启动配置，或从 AI 对话启动讨论
   room COMMAND          创建、读取或更新讨论房间
@@ -120,7 +120,7 @@ async function main(args = process.argv.slice(2)) {
   if (command === 'launch') return launch_main(args.slice(1));
   if (['install', 'setup'].includes(command)) return setup_main(command, args.slice(1));
   if (command === 'local') return local_main(args.slice(1));
-  if (command === 'admin') return admin_main(args.slice(1));
+  if (command === 'token') return admin_main(args.slice(1));
   if (!command || (command === 'run' && args.length === 1)) return service_cli([]);
   if (SERVICE_COMMANDS.has(command) || command === '--json') return service_cli(args);
   return website_cli(args);