@devframes/hub 0.8.0 → 0.8.1

package/dist/client/index.d.mts

@@ -2,7 +2,7 @@ import { N as NavTarget, O as DevframeViewIframe, P as RemoteConnectionInfo, a a
 import { DEFAULT_CATEGORIES_ORDER } from "../constants.mjs";
 import { w as DevframeMessagesClient, y as DevframeMessageEntryInput } from "../context-Cw5sDVoA.mjs";
 import "../index-Bx3T-R7i.mjs";
-import { DevframeClientRpcHost, DevframeConnectionStatus, DevframeRpcClient, DevframeRpcClientOptions, DevframeRpcContext, RpcClientEvents, RpcClientEvents as RpcClientEvents$1 } from "devframe/client";
+import { DevframeClientRpcHost, DevframeConnection, DevframeConnectionStatus, DevframeRpcClient, DevframeRpcClientOptions, DevframeRpcContext, RpcClientEvents, RpcClientEvents as RpcClientEvents$1 } from "devframe/client";
 import { EventEmitter } from "devframe/types";
 import { SharedState } from "devframe/utils/shared-state";
 import { WhenContext } from "devframe/utils/when";
@@ -256,6 +256,16 @@ declare function getDevframeClientContext(): DevframeClientContext | undefined;
  */
 declare function setDevframeClientContext(ctx: DevframeClientContext | undefined): void;
 //#endregion
+//#region src/client/dock-resources.d.ts
+/**
+ * Resolve a dock iframe URL relative to the Devframe server that provided the
+ * dock entry. This keeps root-relative and dot-relative paths on the host
+ * server when an external viewer renders the hub.
+ */
+declare function resolveDockUrl(url: string, connection: DevframeConnection): string;
+/** Resolve URL-backed dock icons while preserving Iconify names and data URLs. */
+declare function resolveDockIcon(icon: DevframeDockEntryIcon, connection: DevframeConnection): DevframeDockEntryIcon;
+//#endregion
 //#region src/client/frame-nav.d.ts
 /**
  * Shared-iframe soft navigation — the viewer-side half of a host↔iframe
@@ -463,8 +473,18 @@ interface MessagesClientOptions {
  */
 declare function createMessagesClient(rpc: DevframeRpcClient, options?: MessagesClientOptions): DevframeMessagesClient;
 //#endregion
+//#region src/remote-url.d.ts
+/** Remove the remote connection descriptor from a URL before displaying or copying it. */
+declare function stripRemoteConnectionFromUrl(input: string): string;
+//#endregion
 //#region src/client/remote.d.ts
 type ConnectRemoteDevframeOptions = Omit<DevframeRpcClientOptions, 'connectionMeta' | 'authToken'>;
+/**
+ * Build an external viewer URL from an existing trusted Devframe connection.
+ * Returns the original URL if the connection has no auth token, does not use
+ * WebSockets, or has an invalid metadata URL.
+ */
+declare function buildRemoteDevframeUrl(url: string, connection: DevframeConnection): string;
 /**
  * Parse a {@link RemoteConnectionInfo} descriptor from the current page's URL
  * (or a provided URL/string). Checks the URL fragment first, then the query.
@@ -484,4 +504,4 @@ declare function parseRemoteConnection(input?: string): RemoteConnectionInfo | n
  */
 declare function connectRemoteDevframe(options?: ConnectRemoteDevframeOptions): Promise<DevframeRpcClient>;
 //#endregion
-export { CLIENT_CONTEXT_KEY, CommandsContext, ConnectRemoteDevframeOptions, DEFAULT_CATEGORIES_ORDER, DevframeClientContext, DevframeClientHost, DevframeClientHostOptions, type DevframeClientRpcHost, DockClientScriptContext, DockClientType, DockEntryState, DockEntryStateEvents, DockPanelStorage, DockRegistration, DockRenderer, DockRendererInstance, DockRendererMountOptions, DockRenderersContext, DocksConnectionContext, DocksContext, DocksEntriesContext, DocksPanelContext, FRAME_NAV_CHANNEL, FRAME_NAV_VERSION, FrameNavClient, FrameNavClientOptions, FrameNavEnvelope, FrameNavFrameMessage, FrameNavHostMessage, FrameNavHostPayload, FrameNavListenTarget, FrameTab, MessagesClientOptions, type RpcClientEvents, WhenClauseContext, attachFrameNavClient, connectRemoteDevframe, createDevframeClientHost, createMessagesClient, getDevframeClientContext, parseRemoteConnection, setDevframeClientContext };
+export { CLIENT_CONTEXT_KEY, CommandsContext, ConnectRemoteDevframeOptions, DEFAULT_CATEGORIES_ORDER, DevframeClientContext, DevframeClientHost, DevframeClientHostOptions, type DevframeClientRpcHost, DockClientScriptContext, DockClientType, DockEntryState, DockEntryStateEvents, DockPanelStorage, DockRegistration, DockRenderer, DockRendererInstance, DockRendererMountOptions, DockRenderersContext, DocksConnectionContext, DocksContext, DocksEntriesContext, DocksPanelContext, FRAME_NAV_CHANNEL, FRAME_NAV_VERSION, FrameNavClient, FrameNavClientOptions, FrameNavEnvelope, FrameNavFrameMessage, FrameNavHostMessage, FrameNavHostPayload, FrameNavListenTarget, FrameTab, MessagesClientOptions, type RpcClientEvents, WhenClauseContext, attachFrameNavClient, buildRemoteDevframeUrl, connectRemoteDevframe, createDevframeClientHost, createMessagesClient, getDevframeClientContext, parseRemoteConnection, resolveDockIcon, resolveDockUrl, setDevframeClientContext, stripRemoteConnectionFromUrl };

package/dist/client/index.mjs

@@ -1,6 +1,7 @@
 import { DEFAULT_CATEGORIES_ORDER, DEFAULT_STATE_USER_SETTINGS } from "../constants.mjs";
+import { n as stripRemoteConnectionFromUrl, t as buildRemoteConnectionUrl } from "../remote-url-KVXtKP47.mjs";
 import { REMOTE_CONNECTION_KEY } from "devframe/constants";
-import { connectDevframe, getDevframeRpcClient } from "devframe/client";
+import { connectDevframe, getDevframeRpcClient, resolveWsUrl } from "devframe/client";
 import { createEventEmitter } from "devframe/utils/events";
 import { destr } from "destr";
 export * from "devframe/client";
@@ -21,6 +22,53 @@ function setDevframeClientContext(ctx) {
 	globalThis[CLIENT_CONTEXT_KEY] = ctx;
 }
 //#endregion
+//#region src/client/dock-resources.ts
+const URL_SCHEME_RE = /^[a-z][a-z\d+.-]*:/i;
+function resolveResourceUrl(value, connection) {
+	const url = value.trim();
+	if (!url || URL_SCHEME_RE.test(url) || url.startsWith("//")) return url;
+	if (!url.startsWith("/") && !url.startsWith("./") && !url.startsWith("../")) return url;
+	try {
+		return new URL(url, connection.metaBaseUrl).href;
+	} catch {
+		return url;
+	}
+}
+function resolveIconUrl(value, connection) {
+	const url = value.trim();
+	if (!url || URL_SCHEME_RE.test(url) || url.startsWith("//")) return url;
+	if (!url.includes("/") && !url.includes(".")) return url;
+	try {
+		return new URL(url, connection.metaBaseUrl).href;
+	} catch {
+		return url;
+	}
+}
+/**
+* Resolve a dock iframe URL relative to the Devframe server that provided the
+* dock entry. This keeps root-relative and dot-relative paths on the host
+* server when an external viewer renders the hub.
+*/
+function resolveDockUrl(url, connection) {
+	const resolved = resolveResourceUrl(url, connection);
+	if (resolved !== url.trim()) return resolved;
+	const value = url.trim();
+	if (!value || URL_SCHEME_RE.test(value) || value.startsWith("//")) return /^localhost:\d/i.test(value) ? `http://${value}` : value;
+	try {
+		return new URL(`http://${value}`).href;
+	} catch {
+		return value;
+	}
+}
+/** Resolve URL-backed dock icons while preserving Iconify names and data URLs. */
+function resolveDockIcon(icon, connection) {
+	if (typeof icon === "string") return resolveIconUrl(icon, connection);
+	return {
+		light: resolveIconUrl(icon.light, connection),
+		dark: resolveIconUrl(icon.dark, connection)
+	};
+}
+//#endregion
 //#region src/client/frame-nav.ts
 /**
 * Shared-iframe soft navigation — the viewer-side half of a host↔iframe
@@ -650,6 +698,27 @@ function base64UrlDecode(value) {
 	for (let i = 0; i < binary.length; i++) bytes[i] = binary.charCodeAt(i);
 	return new TextDecoder().decode(bytes);
 }
+/**
+* Build an external viewer URL from an existing trusted Devframe connection.
+* Returns the original URL if the connection has no auth token, does not use
+* WebSockets, or has an invalid metadata URL.
+*/
+function buildRemoteDevframeUrl(url, connection) {
+	if (!connection.authToken || connection.connectionMeta.backend !== "websocket") return url;
+	let base;
+	try {
+		base = new URL(connection.metaBaseUrl);
+	} catch {
+		return url;
+	}
+	return buildRemoteConnectionUrl(url, {
+		v: 1,
+		backend: "websocket",
+		websocket: resolveWsUrl(connection.connectionMeta.websocket, connection.metaBaseUrl, base),
+		authToken: connection.authToken,
+		origin: base.origin
+	});
+}
 function extractKeyFromFragment(hash) {
 	if (!hash) return null;
 	const raw = hash.startsWith("#") ? hash.slice(1) : hash;
@@ -726,4 +795,4 @@ async function connectRemoteDevframe(options = {}) {
 	});
 }
 //#endregion
-export { CLIENT_CONTEXT_KEY, DEFAULT_CATEGORIES_ORDER, FRAME_NAV_CHANNEL, FRAME_NAV_VERSION, attachFrameNavClient, connectRemoteDevframe, createDevframeClientHost, createMessagesClient, getDevframeClientContext, parseRemoteConnection, setDevframeClientContext };
+export { CLIENT_CONTEXT_KEY, DEFAULT_CATEGORIES_ORDER, FRAME_NAV_CHANNEL, FRAME_NAV_VERSION, attachFrameNavClient, buildRemoteDevframeUrl, connectRemoteDevframe, createDevframeClientHost, createMessagesClient, getDevframeClientContext, parseRemoteConnection, resolveDockIcon, resolveDockUrl, setDevframeClientContext, stripRemoteConnectionFromUrl };

package/dist/node/index.mjs

@@ -1,6 +1,6 @@
 import { DEFAULT_CATEGORIES_ORDER, DEFAULT_STATE_USER_SETTINGS } from "../constants.mjs";
 import { r as defineHubRpcFunction } from "../define-Pbx8dsKz.mjs";
-import { REMOTE_CONNECTION_KEY } from "devframe/constants";
+import { t as buildRemoteConnectionUrl } from "../remote-url-KVXtKP47.mjs";
 import { createEventEmitter } from "devframe/utils/events";
 import { coerceAgentPositionalArgs, createHostContext, createStorage } from "devframe/node";
 import { debounce } from "perfect-debounce";
@@ -231,45 +231,6 @@ function normaliseRemoteOptions(remote) {
 		originLock: opts.originLock ?? true
 	};
 }
-function base64UrlEncode(value) {
-	const bytes = new TextEncoder().encode(value);
-	let binary = "";
-	for (const byte of bytes) binary += String.fromCharCode(byte);
-	return btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
-}
-function buildRemoteUrl(baseUrl, payload, transport) {
-	const encoded = base64UrlEncode(JSON.stringify(payload));
-	const param = `${REMOTE_CONNECTION_KEY}=${encoded}`;
-	if (transport === "fragment") {
-		const hashIdx = baseUrl.indexOf("#");
-		if (hashIdx === -1) return `${baseUrl}#${param}`;
-		const before = baseUrl.slice(0, hashIdx);
-		const rawHash = baseUrl.slice(hashIdx + 1);
-		if (!rawHash) return `${before}#${param}`;
-		const routeQueryIdx = rawHash.indexOf("?");
-		if (routeQueryIdx !== -1) {
-			const beforeQuery = rawHash.slice(0, routeQueryIdx + 1);
-			const params = new URLSearchParams(rawHash.slice(routeQueryIdx + 1));
-			params.set(REMOTE_CONNECTION_KEY, encoded);
-			return `${before}#${beforeQuery}${params.toString()}`;
-		}
-		const parts = rawHash.split("&");
-		const existingIdx = parts.findIndex((part) => {
-			const [key] = part.split("=");
-			return key === REMOTE_CONNECTION_KEY;
-		});
-		if (existingIdx >= 0) {
-			parts[existingIdx] = param;
-			return `${before}#${parts.join("&")}`;
-		}
-		return `${before}#${rawHash}&${param}`;
-	}
-	const qIdx = baseUrl.indexOf("?");
-	const hashIdx = baseUrl.indexOf("#");
-	const hash = hashIdx === -1 ? "" : baseUrl.slice(hashIdx);
-	const beforeHash = hashIdx === -1 ? baseUrl : baseUrl.slice(0, hashIdx);
-	return `${beforeHash}${qIdx === -1 || qIdx >= (hashIdx === -1 ? beforeHash.length : hashIdx) ? "?" : "&"}${param}${hash}`;
-}
 var DevframeDocksHost = class {
 	context;
 	views = /* @__PURE__ */ new Map();
@@ -303,7 +264,7 @@ var DevframeDocksHost = class {
 		};
 		return {
 			...view,
-			url: buildRemoteUrl(view.url, payload, record.options.transport)
+			url: buildRemoteConnectionUrl(view.url, payload, record.options.transport)
 		};
 	}
 	resolveDevServerOrigin() {

package/dist/remote-url-KVXtKP47.mjs

@@ -0,0 +1,73 @@
+import { REMOTE_CONNECTION_KEY } from "devframe/constants";
+//#region src/remote-url.ts
+function base64UrlEncode(value) {
+	const bytes = new TextEncoder().encode(value);
+	let binary = "";
+	for (const byte of bytes) binary += String.fromCharCode(byte);
+	return btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+}
+function setRemoteConnectionParam(value, param) {
+	const parts = value ? value.split("&") : [];
+	const existingIdx = parts.findIndex((part) => part.split("=")[0] === REMOTE_CONNECTION_KEY);
+	if (existingIdx >= 0) parts[existingIdx] = param;
+	else parts.push(param);
+	return parts.join("&");
+}
+/** Encode a remote connection descriptor into an external viewer URL. */
+function buildRemoteConnectionUrl(baseUrl, payload, transport = "fragment") {
+	const param = `${REMOTE_CONNECTION_KEY}=${base64UrlEncode(JSON.stringify(payload))}`;
+	if (transport === "fragment") {
+		const hashIdx = baseUrl.indexOf("#");
+		if (hashIdx === -1) return `${baseUrl}#${param}`;
+		const beforeHash = baseUrl.slice(0, hashIdx);
+		const rawHash = baseUrl.slice(hashIdx + 1);
+		if (!rawHash) return `${beforeHash}#${param}`;
+		const routeQueryIdx = rawHash.indexOf("?");
+		if (routeQueryIdx !== -1) return `${beforeHash}#${rawHash.slice(0, routeQueryIdx + 1)}${setRemoteConnectionParam(rawHash.slice(routeQueryIdx + 1), param)}`;
+		return `${beforeHash}#${setRemoteConnectionParam(rawHash, param)}`;
+	}
+	const hashIdx = baseUrl.indexOf("#");
+	const hash = hashIdx === -1 ? "" : baseUrl.slice(hashIdx);
+	const beforeHash = hashIdx === -1 ? baseUrl : baseUrl.slice(0, hashIdx);
+	return `${beforeHash}${beforeHash.includes("?") ? "&" : "?"}${param}${hash}`;
+}
+/** Remove the remote connection descriptor from a URL before displaying or copying it. */
+function stripRemoteConnectionFromUrl(input) {
+	function stripParamList(value) {
+		const parts = value.split("&");
+		const filtered = parts.filter((part) => part.split("=")[0] !== REMOTE_CONNECTION_KEY);
+		return [filtered.join("&"), filtered.length !== parts.length];
+	}
+	const hashIdx = input.indexOf("#");
+	let beforeHash = hashIdx === -1 ? input : input.slice(0, hashIdx);
+	let hash = hashIdx === -1 ? void 0 : input.slice(hashIdx + 1);
+	let changed = false;
+	if (hash !== void 0) {
+		const routeQueryIdx = hash.indexOf("?");
+		if (routeQueryIdx === -1) {
+			const [nextHash, didChange] = stripParamList(hash);
+			hash = nextHash;
+			changed ||= didChange;
+		} else {
+			const route = hash.slice(0, routeQueryIdx);
+			const [query, didChange] = stripParamList(hash.slice(routeQueryIdx + 1));
+			if (didChange) {
+				hash = query ? `${route}?${query}` : route;
+				changed = true;
+			}
+		}
+	}
+	const queryIdx = beforeHash.indexOf("?");
+	if (queryIdx !== -1) {
+		const path = beforeHash.slice(0, queryIdx);
+		const [query, didChange] = stripParamList(beforeHash.slice(queryIdx + 1));
+		if (didChange) {
+			beforeHash = query ? `${path}?${query}` : path;
+			changed = true;
+		}
+	}
+	if (!changed) return input;
+	return hash ? `${beforeHash}#${hash}` : beforeHash;
+}
+//#endregion
+export { stripRemoteConnectionFromUrl as n, buildRemoteConnectionUrl as t };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@devframes/hub",
   "type": "module",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Framework-neutral hub layer for devframe — docks, terminals, messages, commands.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -33,7 +33,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "devframe": "0.8.0"
+    "devframe": "0.8.1"
   },
   "dependencies": {
     "@standard-schema/spec": "^1.1.0",
@@ -49,7 +49,7 @@
     "mlly": "^1.8.2",
     "tsdown": "^0.22.14",
     "valibot": "^1.4.2",
-    "devframe": "0.8.0"
+    "devframe": "0.8.1"
   },
   "scripts": {
     "build": "tsdown",