An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:fire: Remove retired mobile map bridge handshakes https://github.com/siyuan-note/siyuan/issues/20129
Daniel0c7aa71bdc48
diff --git a/app/src/mobile/index.ts b/app/src/mobile/index.tsindex 688f9f70c4..939b74b07c 100644--- a/app/src/mobile/index.ts+++ b/app/src/mobile/index.ts@@ -212,8 +212,6 @@ class App {fetchPost("/api/system/getConf", {}, guardStartup<IWebSocketData>(async (confResponse) => {setStartupLanguage(confResponse.data.conf.appearance.lang);setStartupStage("engine");- // 现代 Android 壳先完成可信主文档握手,再开放保持同步语义的原生接口。- await window.JSAndroid?.ready;await ensureLute({reloadOnFailure: false});addScript(`${Constants.PROTYLE_CDN}/js/protyle-html.js?v=${Constants.SIYUAN_VERSION}`, "protyleWcHtmlScript");window.siyuan.config = systemConfig(confResponse.data.conf);diff --git a/app/src/mobile/util/androidBridgeStartup.test.ts b/app/src/mobile/util/androidBridgeStartup.test.tsindex 34eb8e9b80..461673b508 100644--- a/app/src/mobile/util/androidBridgeStartup.test.ts+++ b/app/src/mobile/util/androidBridgeStartup.test.ts@@ -15,13 +15,13 @@ const visit = (node: import("typescript").Node) => {};visit(source);-const startup = (ready?: Promise<void>) => {+const startup = () => {const calls: string[] = [];const stop = new Error("script boundary");const module = {exports: undefined as (response: unknown) => Promise<void>};const scope = {module, exports: module.exports,- window: {JSAndroid: ready ? {ready} : {}},+ window: {JSAndroid: {}},Constants: {PROTYLE_CDN: "/protyle", SIYUAN_VERSION: "test"},console: {error: () => calls.push("error")},setStartupLanguage() {},@@ -36,49 +36,21 @@ const startup = (ready?: Promise<void>) => {return {calls, stop, run: () => module.exports({data: {conf: {appearance: {lang: "en"}}}})};};-test("Android startup waits for the trusted document grant before plugins and native reads", async () => {- let grant: () => void;- const scenario = startup(new Promise<void>(resolve => { grant = resolve; }));- const pending = scenario.run();- await Promise.resolve();- assert.deepEqual(scenario.calls, []);- grant();- await pending;- assert.deepEqual(scenario.calls, ["script", "error"]);-});--test("failed Android grants abort initialization without calling native readers", async () => {- const scenario = startup(Promise.reject(new Error("expired document")));- await scenario.run();- assert.deepEqual(scenario.calls, ["error"]);-});--test("legacy Android and browser startup do not require a new bridge", async () => {+test("Android startup initializes the engine without a bridge handshake", async () => {const scenario = startup();await scenario.run();assert.deepEqual(scenario.calls, ["script", "error"]);});-test("authentication callbacks preserve their synchronous result after the trusted bridge grant", async () => {+test("authentication callbacks preserve their synchronous native result", () => {const html = readFileSync("stage/auth.html", "utf8");- const start = html.indexOf(" let androidBridgeReady = true");+ const start = html.indexOf(" if (window.JSAndroid && window.JSAndroid.getOIDCCallback)");const end = html.indexOf(" if (window.JSHarmony && window.JSHarmony.getOIDCCallback)", start);assert.ok(start > 0 && end > start);- let grant: () => void;const calls: string[] = [];const scope = {window: {JSAndroid: {- ready: new Promise<void>(resolve => { grant = resolve; }),getOIDCCallback: () => { calls.push("read"); return "siyuan://callback"; },}}, handleOIDCCallback: (value: string) => calls.push(value), console: {error: () => calls.push("error")}};- const run = runInNewContext(`(async () => {${html.substring(start, end)}})`, scope) as () => Promise<void>;- const pending = run();- await Promise.resolve();- assert.deepEqual(calls, []);- grant();- await pending;+ runInNewContext(html.substring(start, end), scope);assert.deepEqual(calls, ["read", "siyuan://callback"]);- calls.length = 0;- scope.window.JSAndroid.ready = Promise.reject(new Error("expired document"));- await run();- assert.deepEqual(calls, ["error"]);});diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.tsindex 61e6e2ac6d..fbbc3bb05c 100644--- a/app/src/types/index.d.ts+++ b/app/src/types/index.d.ts@@ -197,7 +197,6 @@ interface Window {};siyuan: ISiyuan;JSAndroid: {- ready?: Promise<void>openAuthURL(url: string): voidreturnDesktop(): voidopenExternal(url: string): voiddiff --git a/app/stage/auth.html b/app/stage/auth.htmlindex 9623e97fa2..25fd3faeec 100644--- a/app/stage/auth.html+++ b/app/stage/auth.html@@ -711,14 +711,7 @@} catch (e) {// console.log(e)}- let androidBridgeReady = true- try {- await window.JSAndroid?.ready- } catch (_error) {- androidBridgeReady = false- console.error('Android native bridge initialization failed')- }- if (androidBridgeReady && window.JSAndroid && window.JSAndroid.getOIDCCallback) {+ if (window.JSAndroid && window.JSAndroid.getOIDCCallback) {const callbackURL = window.JSAndroid.getOIDCCallback()if (callbackURL) {handleOIDCCallback(callbackURL)