ai_co_discuss 0.3.52 → 0.3.54

package/docs/THIRD_PARTY_NOTICES.md

@@ -12,7 +12,7 @@
 
 PDF 站内预览使用 [Mozilla PDF.js](https://github.com/mozilla/pdf.js) 的 `pdfjs-dist 6.4.299`，遵循 Apache-2.0；完整许可证随 [web/pdfjs/LICENSE](../web/pdfjs/LICENSE) 分发。CMap、标准字体、ICC 与 WASM 解码器的独立许可证保留在 `web/pdfjs/cmaps/`、`standard_fonts/`、`iccs/`、`wasm/` 中。构建只复制所需运行文件及这些许可证，不使用远程 CDN。
 
-`package.json` 声明直接依赖，`package-lock.json` 记录实际版本、来源及包许可元数据。Vue、Nuxt UI、Markdown-it、KaTeX、Motion、Iconify / Lucide、fflate、uqr 等第三方代码用于前端渲染、本地备份与配对二维码；Vite、Tailwind CSS 与 Wrangler 用于构建和部署。
+`package.json` 声明直接依赖，`package-lock.json` 记录实际版本、来源及包许可元数据。Vue、Nuxt UI、Markdown-it、KaTeX、Motion、Iconify / Lucide、fflate、uqr、jsQR 等第三方代码用于前端渲染、本地备份、配对二维码的显示与扫描；Vite、Tailwind CSS 与 Wrangler 用于构建和部署。
 
 发布带依赖的程序或重新打包前端时，应保留所使用包中的 LICENSE / NOTICE 文件和生成产物中的许可注释。KaTeX 的样式表与公式字体随前端复制到 `web/katex/`（附其 LICENSE），其包内许可同样适用；Lucide 图标遵循该图标集自身许可。依赖安装后的原始许可位于各 `node_modules/<package>/`，下方附录保存直接依赖及当前前端实际打包模块的许可文本，便于源码与静态产物一同分发。
 
@@ -1263,6 +1263,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ```
 
+## jsQR 1.4.0
+
+来源：[jsQR](https://github.com/cozmo/jsQR)，用于在网页内扫描设备配对二维码。按 Apache License 2.0 授权，全文见 <https://www.apache.org/licenses/LICENSE-2.0>。
+
 ## uqr 0.1.2
 
 来源：[uqr](https://github.com/unjs/uqr)，用于在网页上显示设备配对二维码。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai_co_discuss",
-  "version": "0.3.52",
+  "version": "0.3.54",
   "bin": {
     "codiscuss": "runner/codiscuss.mjs"
   },
@@ -34,6 +34,7 @@
     "markdown-it-cjk-friendly": "3.0.0",
     "motion-v": "2.7.0",
     "pdfjs-dist": "6.4.299",
+    "jsqr": "1.4.0",
     "uqr": "0.1.2",
     "vite": "8.3.4",
     "vue": "3.5.44",

package/web/app.js

@@ -53,7 +53,7 @@ const RELAY_PING_MS = 25000;
 const ROOM_RELAY_PATH = /^\/api\/(rooms|folders|revisions)(\/|\?|$)/;
 // One part of a file sent to the computer stays well inside the relay's 1 MiB frame once encoded and encrypted.
 const RELAY_UPLOAD_PART_BYTES = 384 * 1024;
-const COMPUTER_UNREACHABLE = "电脑未连接：请登录管理员，并确认电脑开机且运行 codiscuss";
+const COMPUTER_UNREACHABLE = "电脑未连接：请先与电脑配对，并确认电脑开机且运行 codiscuss";
 let local_connection = null;
 let computer_connecting = false;
 let relay_machine = null;
@@ -220,7 +220,7 @@ async function request_json(path, payload, access_token) {
   const token = access_token || (target_room ? localStorage.getItem(`discuss-access:${target_room}`) : null);
   options.headers = token ? { "X-Discussion-Token": token } : {};
   // The online website has no accounts: a paired device signs its requests with its own non-exportable key.
-  if (state.admin.devices && /^\/api\/(machines|admin\/profile)/.test(path)) {
+  if ((state.admin.devices || paired_record()) && /^\/api\/(machines|admin\/profile|admin$)/.test(path)) {
     const credential = await device_credential(payload === undefined ? "GET" : "POST", path.split("?")[0]);
     if (credential) options.headers["X-CoDiscuss-Device"] = credential;
   }
@@ -340,7 +340,7 @@ async function update_admin_profile(patch) {
     patch = { ...patch, username: patch.username.trim() };
   }
   const result = await request_json("/api/admin/profile", patch);
-  apply_admin_state({ local: state.admin.local, registered: true, setup_available: false, logged_in: true, profile: result.profile });
+  apply_admin_state({ local: state.admin.local, devices: state.admin.devices, computer_rooms: state.admin.computer_rooms, registered: true, setup_available: false, logged_in: true, profile: result.profile });
 }
 
 /** Shrink the chosen image into a small square data URL that fits the server limit. */
@@ -1954,8 +1954,8 @@ function save_room_credentials(room, token, members = []) {
 
 /** Public administrator state for the account UI; the session token never leaves the controller. */
 function admin_snapshot() {
-  const { loaded, local, registered, setup_available, logged_in, profile, identity_version } = state.admin;
-  return { loaded, local, registered, setup_available, logged_in, identity_version, profile: profile && { ...profile } };
+  const { loaded, local, devices, registered, setup_available, logged_in, profile, identity_version } = state.admin;
+  return { loaded, local, devices, registered, setup_available, logged_in, identity_version, profile: profile && { ...profile } };
 }
 
 /** Build only non-secret status metadata for the currently selected room. */
@@ -2080,6 +2080,16 @@ function take_pairing_code() {
   notify("info", "已读取配对码：打开 设置 → 账号，点“配对”");
 }
 
+/** Take the code and computer fingerprint from a scanned pairing link; answers the code, or "" when it is not one. */
+function take_scanned_pairing(text) {
+  const hash = String(text || "").split("#")[1] || "";
+  const code = (hash.match(/(?:^|&)pair=([0-9A-Za-z-]{12,16})/) || [])[1];
+  if (!code) return "";
+  state.device.pairing_code = code.toUpperCase();
+  state.device.pairing_fp = (hash.match(/(?:^|&)fp=([0-9a-f]{32})/) || [])[1] || "";
+  return state.device.pairing_code;
+}
+
 /** Read a site-bound connection without exposing its credential to the shared view snapshot. */
 function restore_local_connection() {
   const fragment = new URLSearchParams(location.hash?.slice(1) || "");
@@ -2105,6 +2115,8 @@ function restore_local_connection() {
 async function local_launch_request(action, payload) {
   // A website without rooms of its own reaches the computer only through the relay; pairing itself still needs the local bridge.
   if (relay_machine && (!local_connection || computer_rooms_only() && action !== "machine-link")) return relay_command(action, payload);
+  // Only the computer's own page has a local service at this address; elsewhere the computer is reached through the relay alone.
+  if (!local_connection && !["127.0.0.1", "localhost"].includes(location.hostname)) throw Object.assign(new Error(COMPUTER_UNREACHABLE), { preflight: true });
   const headers = { "Content-Type": "application/json", "X-CoDiscuss-Local": "1" };
   if (local_connection) headers["X-CoDiscuss-Connection"] = local_connection.token;
   let response;
@@ -2276,7 +2288,8 @@ async function pair_this_device(code) {
       state.admin.logged_in = true;
       publish_view();
       notify("info", "这台设备已与电脑配对");
-      // Settings and the computer's rooms load now that the computer accepts this device.
+      // The owner's profile, settings and the computer's rooms load now that the computer accepts this device.
+      await load_admin_state();
       await load_launch_settings();
       if (computer_rooms_only()) connect_computer_rooms();
     } });
@@ -2770,7 +2783,6 @@ async function load_launch_settings() {
   state.launch.connect_command = local ? "codiscuss local open" : `codiscuss local connect "${location.origin}"`;
   try {
     local_connection = null;
-    relay_machine = null;
     take_pairing_code();
     local_connection = restore_local_connection();
     state.launch.remote = Boolean(local_connection);
@@ -2779,8 +2791,9 @@ async function load_launch_settings() {
       // Pair first, so the computer this page runs on can then be reached through the relay like any other device.
       state.launch.relay = await load_relay_machine();
       // An online computer that publishes a command key does everything the local service would; an older one only creates rooms.
-      if (!state.launch.relay?.online || !state.launch.relay.public_key) return;
-      relay_machine = state.launch.relay;
+      // The previous one stays in use until this answer arrives, so requests made meanwhile still reach the computer.
+      relay_machine = state.launch.relay?.online && state.launch.relay.public_key ? state.launch.relay : null;
+      if (!relay_machine) return;
       state.launch.remote = true;
     }
     const settings = await local_launch_request("settings");
@@ -4689,7 +4702,7 @@ window.discuss_view = { snapshot: view_snapshot, write_field: write_view_field,
   admin: { register: register_admin, login: login_admin, logout: logout_admin,
     update_profile: update_admin_profile, avatar_from_file: admin_avatar_from_file, validate: validate_admin_form,
     sessions: admin_sessions, revoke: revoke_admin_sessions, change_password: change_admin_password },
-  device: { request: device_request, pair: pair_this_device, invite: invite_device, renew: renew_this_device, confirm_write: confirm_write_grant, forget: forget_pairing,
+  device: { request: device_request, pair: pair_this_device, take_scanned: take_scanned_pairing, invite: invite_device, renew: renew_this_device, confirm_write: confirm_write_grant, forget: forget_pairing,
     label: device_label, prompt_confirm: () => state.device.prompt?.run(), prompt_cancel: () => state.device.prompt?.cancel() },
   request: request_json, rewind_plan, identities: IDENTITIES, display_name, mention_handles, mentioned_members, render_room_markdown, sources: SOURCE_LABELS,
   set_member_access, set_member_model, allow_denials, set_member_adapter, reload_room_models, read_room_files, limits_label, stop_reason_label, participant_model, participant_files, participant_session_hint, participant_access,