dsh-tiddlywiki 0.26.6 → 0.26.7

package/lib/index.js

@@ -2574,10 +2574,40 @@ function rejectCrossSiteWrite(req, res, allowedMethods) {
 	}, 403);
 	return true;
 }
-/** Read-only route guard: GET/HEAD only, no side effects on any other method. */
+/**
+* Read-only route guard: GET/HEAD only, no side effects on any other method. */
 function rejectNonRead(req, res) {
 	return rejectCrossSiteWrite(req, res, ["GET", "HEAD"]);
 }
+/**
+* Absolute loopback base for a same-origin proxy path, from a request's `Host`
+* header (v0.26.7). Returns undefined when the header is unusable, in which
+* case the caller simply omits the absolute twin and clients keep using the
+* relative path.
+*
+* WHY THIS EXISTS: the DSH **desktop** app serves its renderer from the custom
+* `dsh-app:` scheme, and TiddlyWiki's own TiddlyWeb sync adaptor refuses to load
+* on a document whose protocol does not start with `http`
+* (`plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js`:
+* `if($tw.browser && document.location.protocol.substr(0,4) === "http")`).
+* Embedded from `dsh-app://app/…` the wiki therefore had NO sync adaptor:
+* `$:/status/IsReadOnly` was never written, TW's read-only stylesheet (which
+* treats a MISSING status as read-only) hid 添加条目 / 日志 / 导入 / 管理器 /
+* 编辑 …, and the saver fell back to local-only dirty tracking — an edit made
+* there could not be saved either. The client falls back to this absolute URL
+* only while its own document is not on http(s) (see `resolveTwUrl` in
+* `src/client/endpoints.ts`), so http(s) embedders — loopback, LAN, Tailscale,
+* domain, HTTPS — are never moved off their own origin.
+*
+* `http` is deliberate rather than `x-forwarded-proto`: the desktop app's host
+* always listens on plain HTTP loopback, and only a renderer able to reach it
+* ever reads this value.
+*/
+function absoluteHostBase(hostHeader, proxyPath) {
+	const host = typeof hostHeader === "string" ? hostHeader.trim() : Array.isArray(hostHeader) ? String(hostHeader[0] ?? "").trim() : "";
+	if (!/^[A-Za-z0-9.\-[\]:]+$/.test(host)) return void 0;
+	return `http://${host}${proxyPath}`;
+}
 //#endregion
 //#region src/host/sanitize.ts
 /**
@@ -6679,6 +6709,14 @@ function registerRoutes(ctx, deps) {
 	* tags, it cannot know the text is a secret.
 	*/
 	const referencesBlockedTitle = (value) => value !== void 0 && BLOCKED_PROXY_TITLE_PREFIXES.some((prefix) => value.includes(prefix));
+	/**
+	* Absolute twin of `twProxy` for embedders whose own document is not on
+	* http(s) — the DSH desktop app's `dsh-app:` renderer (v0.26.7). See
+	* `absoluteHostBase()` in http.ts for the full why; clients only consult it
+	* while their own page is not http(s), so nothing changes for http(s)
+	* deployments.
+	*/
+	const twProxyAbsoluteBase = (req) => absoluteHostBase(req.headers.host, TW_PROXY_PATH);
 	const handleStatus = async (req, res) => {
 		if (rejectNonRead(req, res)) return;
 		const view = deps.server.status();
@@ -6688,6 +6726,7 @@ function registerRoutes(ctx, deps) {
 			...view,
 			logs: redactLogLines(view.logs),
 			twProxy: TW_PROXY_PATH,
+			twProxyAbsolute: twProxyAbsoluteBase(req),
 			git: gitSummary,
 			note: { tag: deps.noteDefaults().tag },
 			ui: deps.uiDefaults()
@@ -6765,7 +6804,8 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: true,
 				...await pendingSummary,
-				twUrl: TW_PROXY_PATH
+				twUrl: TW_PROXY_PATH,
+				twUrlAbsolute: twProxyAbsoluteBase(req)
 			});
 		} catch (err) {
 			json(res, {
@@ -7186,7 +7226,8 @@ function registerRoutes(ctx, deps) {
 			json(res, {
 				ok: true,
 				...result,
-				twUrl: TW_PROXY_PATH
+				twUrl: TW_PROXY_PATH,
+				twUrlAbsolute: twProxyAbsoluteBase(req)
 			});
 		} catch (err) {
 			if (err instanceof WriteConflictError) {