vcorp-chrome 1.7.0 → 2.0.0

package/extension/background.js

@@ -15,6 +15,7 @@ import { CRED_URL, redactCreds } from './redact.js';
 import { identityOf, stripMarkPrefix } from './identity.js';
 import { validateScript, condText, repeatMax, EXEC_BUDGET, collectRefs, toRecipe } from './script.js';
 import { initCloud, ensureCloud } from './cloud.js';
+import { loadDef, loadHostAllowed, checkLoadParams, checkCallParams } from './load.js';
 
 // ---------- 连接层 ----------
 //
@@ -658,6 +659,22 @@ async function runCloud(cmd, params, tabId, sid, label) {
 
 const liveList = async () => (await chrome.storage.session.get(LIVE_SIDS))[LIVE_SIDS] || [];
 
+// 桥的名单只有桥能更新，而桥一死就没人再推了——扩展不自己清，死会话会一直算在线，
+// 它们留在页面上的标记也摘不掉。只在确认重连失败之后调（见 hc-keepalive），
+// 瞬断时不能清，否则标记会闪一下。桥回来时会在 welcome 后补一份真名单。
+async function dropBridgeSessions() {
+  const { [BRIDGE_SIDS]: bridge = [] } = await chrome.storage.session.get(BRIDGE_SIDS).catch(() => ({}));
+  if (bridge.length) await onBridgeEvent({ event: 'sessions', live: [] });
+}
+
+// 面板显示用：没连着桥时只有云端名单可信。比 dropBridgeSessions 更早生效，
+// 否则「未连接」旁边最多还会挂 30 秒已经过期的本机 agent。
+async function shownSids() {
+  if (await connected()) return liveList();
+  const { [CLOUD_SIDS]: cloud = [] } = await chrome.storage.session.get(CLOUD_SIDS);
+  return cloud;
+}
+
 // 这个标签页此刻的主人们。只算**还连着**的会话——判据和 liveOwnersOf 一致：
 // 已结束的会话留下的槽不算数，否则关掉一个终端窗口之后，它的标记会永远挂在那儿。
 //
@@ -870,6 +887,8 @@ function actText(cmd, p = {}) {
     case 'download': return '下载';
     case 'upload': return '上传文件';
     case 'eval': return '执行脚本';
+    case 'load': return `加载能力包 ${p.name || ''}`;
+    case 'call': return `${p.name || ''} ${p.action || ''}`;
     case 'wait': return '等待';
     case 'ask': return '请用户搭把手';
     // act 的每一步在批处理循环里单独同步过了（带「第 i/n 步」），
@@ -1904,6 +1923,69 @@ function sparse(text) {
   return n <= 3 && excerpt.replace(/\s+/g, '').length < 160;
 }
 
+// ---------- 能力包 ----------
+//
+// 装包的顺序：先核对页面在包的 hosts 里，再等页面自己的全局（waitFor）出现，
+// 最后注入扩展包里的文件、调 ready()。页面上已经是同一版本就不重复注入——
+// 重注会把上游里的模块状态（缓存、事件监听）再建一份。
+
+function withTimeout(promise, ms, what) {
+  let t;
+  return Promise.race([
+    promise,
+    new Promise((_, reject) => {
+      t = setTimeout(() => reject(err('TIMEOUT', `${what} 超过 ${Math.round(ms / 1000)} 秒没返回`)), ms);
+    }),
+  ]).finally(() => clearTimeout(t));
+}
+
+const LOAD_WAIT_MS = 30000;
+
+async function ensureLoad(id, def, { force = false } = {}) {
+  const tab = await chrome.tabs.get(id);
+  if (!loadHostAllowed(def, tab.url)) {
+    throw err('LOAD_DENIED', `能力包 ${def.name} 只能用在 ${def.hosts.join('、')}，这个标签页在 ${hostOf(tab.url) || '非网页地址'}`);
+  }
+  const probe = async () => (await chrome.scripting.executeScript({
+    target: { tabId: id },
+    world: 'MAIN',
+    func: (name, waitFor) => ({
+      page: !waitFor || typeof window[waitFor] !== 'undefined',
+      version: (window.__vcorpLoads && window.__vcorpLoads[name] && window.__vcorpLoads[name].version) || '',
+    }),
+    args: [def.name, def.waitFor],
+  }))[0]?.result;
+
+  const until = Date.now() + LOAD_WAIT_MS;
+  let st = await probe();
+  while (!st?.page) {
+    if (Date.now() > until) throw err('LOAD_NOT_READY', `页面 ${LOAD_WAIT_MS / 1000} 秒内没准备好（缺 ${def.waitFor}）。等编辑器加载完、或先打开一个工程再试`);
+    await sleep(500);
+    st = await probe();
+  }
+  if (force || st.version !== def.version) {
+    await chrome.scripting.executeScript({ target: { tabId: id }, world: 'MAIN', files: def.files });
+  }
+  // ready() 说没准备好（比如编辑器还在打开工程）就接着等，和上面等 waitFor 共用一个期限
+  const readyOnce = async () => (await withTimeout(chrome.scripting.executeScript({
+    target: { tabId: id },
+    world: 'MAIN',
+    func: async (name) => {
+      const load = window.__vcorpLoads && window.__vcorpLoads[name];
+      if (!load) return { ok: false, reason: '注入后没注册上' };
+      try { return await load.ready(); } catch (e) { return { ok: false, reason: String((e && e.message) || e) }; }
+    },
+    args: [def.name],
+  }), LOAD_WAIT_MS, `${def.name}.ready`))[0]?.result;
+  let ready = await readyOnce();
+  while (!ready?.ok && Date.now() < until) {
+    await sleep(1000);
+    ready = await readyOnce();
+  }
+  if (!ready?.ok) throw err('LOAD_NOT_READY', `能力包 ${def.name} 没准备好：${ready?.reason || '未知原因'}`);
+  return { version: def.version, ready };
+}
+
 const HANDLERS = {
   async snapshot(p, tabId, ctx) {
     const id = await resolveTab(tabId);
@@ -2368,6 +2450,63 @@ const HANDLERS = {
   //
   // 换到 MAIN world 之后受页面 CSP 管：没设 CSP 的站点能用了，大站仍然拦——
   // 但那是真实且可解释的边界，不再是「哪儿都不能用」。
+  // 能力包：把扩展包里的一套有类型的接口装进页面（见 load.js 顶部）。
+  // 和 eval 的区别：注入的是扩展自己的文件（executeScript files），调用传的是结构化克隆的数据，
+  // 没有字符串变代码这一步——所以云端可以开放它，页面 CSP 也拦不住。
+  async load(p, tabId) {
+    const { name } = checkLoadParams(p);
+    const id = await resolveTab(tabId);
+    const def = loadDef(name);
+    const info = await ensureLoad(id, def, { force: !!p.reload });
+    const lines = [
+      `已加载能力包 ${def.name}（${def.title}）${info.version}`,
+      `页面状态：${JSON.stringify(info.ready)}`,
+      `用 call {name:"${def.name}", action, payload} 调用。`,
+      `只读（${def.actions.read.length}）：${def.actions.read.join(' ')}`,
+      `改动设计（${def.actions.write.length}）：${def.actions.write.join(' ')}`,
+    ];
+    return { untrusted: true, text: lines.join('\n') };
+  },
+
+  async call(p, tabId) {
+    const { name, action, payload, timeout, kind } = checkCallParams(p);
+    const def = loadDef(name);
+    const id = await resolveTab(tabId);
+    const run = () => withTimeout(chrome.scripting.executeScript({
+      target: { tabId: id },
+      world: 'MAIN',
+      func: async (name, action, payload) => {
+        const load = window.__vcorpLoads && window.__vcorpLoads[name];
+        if (!load) return { gone: true };
+        try {
+          const v = await load.call(action, payload);
+          let text;
+          try { text = JSON.stringify(v === undefined ? null : v); } catch { text = JSON.stringify(String(v)); }
+          return { ok: true, text };
+        } catch (e) {
+          return { ok: false, code: (e && e.code) || '', message: String((e && e.message) || e) };
+        }
+      },
+      args: [name, action, payload],
+    }), timeout, `${name}.${action}`).then((r) => r?.[0]?.result);
+
+    let result;
+    try {
+      await ensureLoad(id, def);
+      result = await run();
+      // 页面刚好在两步之间刷新了：再装一次，只重试这一回
+      if (result?.gone) { await ensureLoad(id, def); result = await run(); }
+    } catch (e) {
+      if (e.code) throw e;
+      throw err('LOAD_GONE', `${name}.${action} 没跑完：${e.message}（页面可能刷新或关掉了，结果未知，先读一下现状再决定要不要重做）`);
+    }
+    if (!result || result.gone) throw err('LOAD_GONE', `页面里找不到能力包 ${name}`);
+    if (!result.ok) {
+      throw err(result.code === 'LOAD_DENIED' ? 'LOAD_DENIED' : 'LOAD_ERROR', `${name}.${action} 失败：${result.message}`);
+    }
+    return { untrusted: true, text: result.text, ...(kind === 'write' ? { audit: `${name}.${action}` } : {}) };
+  },
+
   async eval(p, tabId) {
     const id = await resolveTab(tabId);
 
@@ -2734,7 +2873,9 @@ chrome.alarms?.onAlarm.addListener(async () => {
   const kicked = await chrome.runtime.sendMessage({ __hcBridge: 'kick' }).catch(() => null);
   if (kicked?.connected) return setBadge(true);
   await directConnect();
-  setBadge(await connected());
+  const up = await connected();
+  setBadge(up);
+  if (!up) await dropBridgeSessions();
 });
 chrome.tabs.onRemoved.addListener(async (tabId) => {
   // 全局槽 + 所有会话级槽一次扫清，别留指向死 tab 的槽
@@ -2845,7 +2986,7 @@ chrome.runtime.onMessage.addListener((m, sender, sendResponse) => {
   if (m.__hcPopup === 'sessions') {
     (async () => {
       try {
-        const [all, lives] = await Promise.all([chrome.storage.local.get(null), liveList()]);
+        const [all, lives] = await Promise.all([chrome.storage.local.get(null), shownSids()]);
         const clients = await chrome.storage.session.get(lives.map(sidClientKey));
         const rows = [];
         for (const sid of lives) {