cortico-world-surfing 0.4.0 → 0.4.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.1 - 2026-11-13
+
+- Save the Microlink API key directly in the Surfing panel. The compact password field clears after saving, and leaving it empty preserves the existing key.
+
 ## 0.4.0 - 2026-11-06
 
 - Add `surfing_search_all`, which searches Bilibili, Tieba, Moegirlpedia and Baidu Baike in parallel and returns short results. Open numbered results and further Tieba results with `surfing_read_page`. The WebUI has a switch for each source and a per-source result limit.

package/README.md

@@ -31,19 +31,14 @@
 
 无需 API Key 即可使用 Microlink 后备。配置 Key 后使用认证接口及该 Key 的额度；Key 仅发送给 Microlink，不进入模型回执。
 
-在网上冲浪的「配置」页找到「Microlink 远程渲染」，点击「打开密钥文件」，编辑部署目录的 `.env`：
-
-```dotenv
-CORTICO_SURFING_MICROLINK_API_KEY=
-```
+在网上冲浪的「配置」页找到「Microlink 远程渲染」。
 
 取得免费 Key 的步骤：
 
 1. 打开 [Microlink 注册页](https://dashboard.microlink.io/signup)，注册账号并登录，无需购买付费套餐。
 2. 在控制台左侧选择「Overview」，点击「Usage」标签。
 3. 点击「Development」标签右上角的「…」，复制 API Key。
-4. 将 Key 填在上面的等号后，不加引号，保存文件。
-5. 点击「刷新密钥状态」，状态变为「API Key 已配置」。下次远程读取使用新 Key；清空值并保存可恢复免 Key 调用。
+4. 将 Key 粘贴到 Microlink API Key 输入框并保存，下次远程读取即使用新 Key。
 
 免 Key 和免费 Key 的额度不同，当前限制见 [Microlink 额度说明](https://microlink.io/docs/api/basics/rate-limit)。额度耗尽或访问失败时，回执说明原因；已有短静态正文仍返回，并标明未取得完整渲染内容。
 

package/dist/webui.js

@@ -843,7 +843,6 @@ var require_ipaddr = __commonJS({
 var import_ipaddr = __toESM(require_ipaddr(), 1);
 
 // src/config.ts
-var SURFING_MICROLINK_SECRET = "CORTICO_SURFING_MICROLINK_API_KEY";
 var PROXY_MODE_PATH = "worlds.surfing.network.proxyCompatibility";
 var PROXY_RANGES_PATH = "worlds.surfing.network.customProxyRanges";
 var SURFING_DEFAULTS = {
@@ -1066,7 +1065,7 @@ async function mount(ctx) {
     const toggles = ui.h("div", "segwrap umulti");
     toggles.style.flexWrap = "wrap";
     for (const [path, property] of Object.entries(group.schema.properties)) {
-      const save = (value, apply) => saveValue(path, property.title, saved, value, apply);
+      const save2 = (value, apply) => saveValue(path, property.title, saved, value, apply);
       if (property.type === "boolean") {
         const toggle = ui.h("button", "seg", property.title);
         toggle.type = "button";
@@ -1075,7 +1074,7 @@ async function mount(ctx) {
         toggle.addEventListener("click", () => {
           const value = !toggle.classList.contains("active");
           showPressed(toggle, value);
-          save(value);
+          save2(value);
         }, { signal: ctx.signal });
         toggles.append(toggle);
         continue;
@@ -1084,7 +1083,7 @@ async function mount(ctx) {
       note.id = path;
       const scale = property["x-scale"] ?? 1;
       const input = ui.input({ type: "number", value: String(Number(state.values[path]) / scale), onChange: (value) => {
-        save(Number(value) * scale, (next) => {
+        save2(Number(value) * scale, (next) => {
           if (input.value === value) input.value = String(Number(next) / scale);
         });
       } });
@@ -1135,34 +1134,25 @@ async function mount(ctx) {
       keyStatus.classList.add("bad");
     }
   }
-  const keyBar = ui.rowbar();
-  keyBar.append(
-    keyPill,
-    ui.button("\u6253\u5F00\u5BC6\u94A5\u6587\u4EF6", { onClick: () => {
-      void keyAction(async () => {
-        await ctx.invoke("openKeyFile");
-        return "\u5DF2\u6253\u5F00\u5BC6\u94A5\u6587\u4EF6";
-      });
-    } }),
-    ui.button("\u5237\u65B0\u5BC6\u94A5\u72B6\u6001", { onClick: () => {
-      void keyAction(async () => {
-        showKey((await ctx.invoke("state")).keySet);
-        void ctx.refresh().catch(() => void 0);
-        return "\u5DF2\u5237\u65B0\u5BC6\u94A5\u72B6\u6001";
-      });
-    } }),
-    keyStatus
-  );
-  showKey(state.keySet);
+  const keyInput = ui.input({ type: "password", cls: "mono", onCommit: () => save.click() });
+  const save = ui.button("\u4FDD\u5B58\u5BC6\u94A5", { size: "sm", variant: "primary", onClick: () => {
+    if (!keyInput.value.trim()) return;
+    void keyAction(async () => {
+      const next = await ctx.invoke("saveKey", [keyInput.value]);
+      keyInput.value = "";
+      showKey(next.keySet);
+      return "\u5DF2\u4FDD\u5B58";
+    });
+  } });
+  const keyRow = ui.rowbar();
+  keyRow.append(keyInput, save);
   const steps = ui.h("ol");
   steps.style.cssText = "list-style:decimal;padding-left:24px;margin:6px 0;line-height:1.8";
-  const secret = ui.h("code", "mono", `${SURFING_MICROLINK_SECRET}=`);
   for (const parts of [
     ["\u6253\u5F00", anchor("Microlink \u6CE8\u518C\u9875", "https://dashboard.microlink.io/signup"), "\uFF0C\u6CE8\u518C\u8D26\u53F7\u5E76\u767B\u5F55\uFF0C\u65E0\u9700\u8D2D\u4E70\u4ED8\u8D39\u5957\u9910\u3002"],
     ["\u5728\u63A7\u5236\u53F0\u5DE6\u4FA7\u9009\u62E9\u300COverview\u300D\uFF0C\u70B9\u51FB\u300CUsage\u300D\u6807\u7B7E\u3002"],
     ["\u70B9\u51FB\u300CDevelopment\u300D\u6807\u7B7E\u53F3\u4E0A\u89D2\u7684\u300C\u2026\u300D\uFF0C\u590D\u5236 API Key\u3002"],
-    ["\u70B9\u51FB\u300C\u6253\u5F00\u5BC6\u94A5\u6587\u4EF6\u300D\uFF0C\u5C06 Key \u586B\u5728 ", secret, " \u540E\u9762\uFF0C\u4E0D\u52A0\u5F15\u53F7\uFF0C\u4FDD\u5B58\u6587\u4EF6\u3002"],
-    ["\u4FDD\u5B58\u540E\uFF0C\u4E0B\u6B21\u8FDC\u7A0B\u8BFB\u53D6\u4F7F\u7528\u8BE5 Key \u7684\u989D\u5EA6\u3002\u70B9\u51FB\u300C\u5237\u65B0\u5BC6\u94A5\u72B6\u6001\u300D\u53EF\u67E5\u770B\u914D\u7F6E\u72B6\u6001\u3002\u6E05\u7A7A Key \u7684\u503C\u5E76\u4FDD\u5B58\u53EF\u6062\u590D\u514D Key \u8C03\u7528\u3002"]
+    ["\u5728 Microlink API Key \u8F93\u5165\u6846\u7C98\u8D34\u5E76\u4FDD\u5B58\u3002"]
   ]) {
     const step = ui.h("li");
     step.append(...parts);
@@ -1172,11 +1162,12 @@ async function mount(ctx) {
   limits.append("\u514D Key \u548C\u514D\u8D39 Key \u7684\u989D\u5EA6\u4E0D\u540C\uFF0C\u5F53\u524D\u9650\u5236\u89C1", anchor("Microlink \u989D\u5EA6\u8BF4\u660E", "https://microlink.io/docs/api/basics/rate-limit"), "\u3002");
   const microlink = ui.sheet({
     title: "Microlink \u8FDC\u7A0B\u6E32\u67D3",
-    desc: "\u672C\u673A Chromium \u4E0D\u53EF\u7528\u65F6\uFF0C\u5C06\u7F51\u9875 URL \u4EA4\u7ED9 Microlink \u6E32\u67D3\u3002API Key \u53EF\u9009\uFF0C\u7559\u7A7A\u4F7F\u7528\u514D Key \u989D\u5EA6\u3002"
+    desc: "\u672C\u673A Chromium \u4E0D\u53EF\u7528\u65F6\uFF0C\u5C06\u7F51\u9875 URL \u4EA4\u7ED9 Microlink \u6E32\u67D3\u3002API Key \u53EF\u9009\uFF0C\u672A\u914D\u7F6E\u65F6\u4F7F\u7528\u514D Key \u989D\u5EA6\u3002"
   });
   const help = ui.foldSheet("surfing-microlink-key", { title: "\u5982\u4F55\u53D6\u5F97 API Key", defaultOpen: false });
   help.body.append(steps, limits);
-  microlink.body.append(keyBar, help.el);
+  microlink.body.append(keyPill, ui.field("Microlink API Key", keyRow), keyStatus, help.el);
+  showKey(state.keySet);
   layout.append(microlink.el);
   ctx.root.replaceChildren(layout);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cortico-world-surfing",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "type": "module",
   "description": "搜索、上网冲浪、学习最新的知识。读取公开网页正文和B站视频简介、字幕、评论，支持B站、贴吧与百科站点搜索、缩写释义、分段续读。",
   "author": "DTMosken",

package/src/webui/client.ts

@@ -1,5 +1,5 @@
 import type { WebUiClientBundle, WebUiPanelContext } from 'cortico/web/shared/client-panel.ts';
-import { PROXY_MODE_PATH, PROXY_RANGES_PATH, SURFING_CONFIG_GROUPS, SURFING_LIMITS_CONFIG_GROUP, SURFING_MICROLINK_SECRET, SURFING_PROXY_CONFIG_GROUP } from '../config.ts';
+import { PROXY_MODE_PATH, PROXY_RANGES_PATH, SURFING_CONFIG_GROUPS, SURFING_LIMITS_CONFIG_GROUP, SURFING_PROXY_CONFIG_GROUP } from '../config.ts';
 
 type ConfigValue = number | boolean | string;
 interface ConfigState { values: Record<string, ConfigValue>; keySet: boolean }
@@ -131,25 +131,25 @@ async function mount(ctx: WebUiPanelContext): Promise<void> {
     try { keyStatus.textContent = await run(); keyStatus.classList.remove('bad'); }
     catch (error) { keyStatus.textContent = errorText(error); keyStatus.classList.add('bad'); }
   }
-  const keyBar = ui.rowbar();
-  keyBar.append(keyPill,
-    ui.button('打开密钥文件', { onClick: () => { void keyAction(async () => { await ctx.invoke('openKeyFile'); return '已打开密钥文件'; }); } }),
-    ui.button('刷新密钥状态', { onClick: () => { void keyAction(async () => {
-      showKey((await ctx.invoke<ConfigState>('state')).keySet);
-      void ctx.refresh().catch(() => undefined);
-      return '已刷新密钥状态';
-    }); } }), keyStatus);
-  showKey(state.keySet);
-
+  const keyInput = ui.input({ type: 'password', cls: 'mono', onCommit: () => save.click() });
+  const save = ui.button('保存密钥', { size: 'sm', variant: 'primary', onClick: () => {
+    if (!keyInput.value.trim()) return;
+    void keyAction(async () => {
+      const next = await ctx.invoke<ConfigState>('saveKey', [keyInput.value]);
+      keyInput.value = '';
+      showKey(next.keySet);
+      return '已保存';
+    });
+  } });
+  const keyRow = ui.rowbar();
+  keyRow.append(keyInput, save);
   const steps = ui.h('ol');
   steps.style.cssText = 'list-style:decimal;padding-left:24px;margin:6px 0;line-height:1.8';
-  const secret = ui.h('code', 'mono', `${SURFING_MICROLINK_SECRET}=`);
   for (const parts of [
     ['打开', anchor('Microlink 注册页', 'https://dashboard.microlink.io/signup'), '，注册账号并登录，无需购买付费套餐。'],
     ['在控制台左侧选择「Overview」，点击「Usage」标签。'],
     ['点击「Development」标签右上角的「…」，复制 API Key。'],
-    ['点击「打开密钥文件」，将 Key 填在 ', secret, ' 后面，不加引号，保存文件。'],
-    ['保存后，下次远程读取使用该 Key 的额度。点击「刷新密钥状态」可查看配置状态。清空 Key 的值并保存可恢复免 Key 调用。'],
+    ['在 Microlink API Key 输入框粘贴并保存。'],
   ]) {
     const step = ui.h('li');
     step.append(...parts);
@@ -159,11 +159,12 @@ async function mount(ctx: WebUiPanelContext): Promise<void> {
   limits.append('免 Key 和免费 Key 的额度不同，当前限制见', anchor('Microlink 额度说明', 'https://microlink.io/docs/api/basics/rate-limit'), '。');
   const microlink = ui.sheet({
     title: 'Microlink 远程渲染',
-    desc: '本机 Chromium 不可用时，将网页 URL 交给 Microlink 渲染。API Key 可选，留空使用免 Key 额度。',
+    desc: '本机 Chromium 不可用时，将网页 URL 交给 Microlink 渲染。API Key 可选，未配置时使用免 Key 额度。',
   });
   const help = ui.foldSheet('surfing-microlink-key', { title: '如何取得 API Key', defaultOpen: false });
   help.body.append(steps, limits);
-  microlink.body.append(keyBar, help.el);
+  microlink.body.append(keyPill, ui.field('Microlink API Key', keyRow), keyStatus, help.el);
+  showKey(state.keySet);
   layout.append(microlink.el);
   ctx.root.replaceChildren(layout);
 }

package/src/world.ts

@@ -12,7 +12,6 @@ import { PageReader, pageKey } from './page-reader.ts';
 import { SnapshotCache, estimateTokens, type Material } from './snapshots.ts';
 import { MicrolinkRenderer } from './microlink.ts';
 import { SITE_SOURCES, continueTieba, searchSites } from './sites.ts';
-import { prepareKeyFile, openSecretFile } from './secret-file.ts';
 
 const ENV_PROMPT_FILE = fileURLToPath(new URL('./ENV_PROMPT.md', import.meta.url));
 
@@ -80,8 +79,7 @@ export class SurfingWorld implements World {
   private stopped = false;
   private last?: { status: string; failed: boolean; estimatedTokens: number; sourceTruncated: boolean };
 
-  constructor(private readonly ctx: WorldContext<SurfingConfigSection>, private readonly client = new PublicClient(),
-    private readonly openFile = openSecretFile) {
+  constructor(private readonly ctx: WorldContext<SurfingConfigSection>, private readonly client = new PublicClient()) {
     applyConfigDefaults(ctx.cfg);
     this.pages = new PageReader(undefined, new MicrolinkRenderer(() => ctx.secret(SURFING_MICROLINK_SECRET)));
   }
@@ -244,9 +242,13 @@ export class SurfingWorld implements World {
         if (panel !== 'config') throw new Error('未知面板。');
         if (method === 'state') return this.configState();
         if (method === 'save') { this.saveConfig(args[0], args[1]); return this.configState(); }
-        if (method === 'openKeyFile') {
-          const file = prepareKeyFile(this.ctx.botDir);
-          await this.openFile(file); return { file };
+        if (method === 'saveKey') {
+          const [value] = args;
+          if (typeof value !== 'string') throw new Error('密钥须为文本');
+          const key = value.trim();
+          if (/\s/.test(key)) throw new Error('密钥不能包含空白字符');
+          if (key) this.ctx.storeSecret(SURFING_MICROLINK_SECRET, key);
+          return this.configState();
         }
         throw new Error('未知操作。');
       },

package/src/secret-file.ts

@@ -1,24 +0,0 @@
-import { spawn } from 'node:child_process';
-import { appendFileSync, existsSync, readFileSync, writeFileSync } from 'node:fs';
-import { join } from 'node:path';
-import { SURFING_MICROLINK_SECRET } from './config.ts';
-
-export function prepareKeyFile(botDir: string): string {
-  const file = join(botDir, '.env');
-  const contents = existsSync(file) ? readFileSync(file, 'utf8') : '';
-  if (!new RegExp(`^${SURFING_MICROLINK_SECRET}=`, 'm').test(contents)) {
-    const line = `${contents && !contents.endsWith('\n') ? '\n' : ''}${SURFING_MICROLINK_SECRET}=\n`;
-    if (existsSync(file)) appendFileSync(file, line);
-    else writeFileSync(file, line, { mode: 0o600 });
-  }
-  return file;
-}
-
-export function openSecretFile(file: string): Promise<void> {
-  const command = process.platform === 'win32' ? 'notepad.exe' : process.platform === 'darwin' ? 'open' : 'xdg-open';
-  return new Promise((resolve, reject) => {
-    const child = spawn(command, [file], { detached: true, stdio: 'ignore' });
-    child.once('error', () => reject(new Error('无法打开密钥文件。')));
-    child.once('spawn', () => { child.unref(); resolve(); });
-  });
-}