@edge-sky/dsh-oauth-adapter 0.1.3-rc.3 → 0.1.3-rc.4

package/README.i18n.yaml

@@ -1,4 +1,4 @@
 # Bilingual-pair consistency record: the git blob hash of each side as of the
 # last confirmed-consistent state. Both languages carry equal authority.
-README.md: 643064b672859791cce2551254d03f3154647f20
-README.zh.md: d1f28dc87675dd408f84eb495a67da58a7065b33
+README.md: c30bed23d84ddcd11616cb323d9698c0105ac0dd
+README.zh.md: e77381a4a09dcf7bdfc88d2ec65d57df894f931b

package/lib/client.js

@@ -769,8 +769,20 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/store.ts
 		/** Browser state machine for the plugin-owned OAuth WebSocket. */
-		function socketUrl() {
-			return `${window.location.protocol === "https:" ? "wss:" : "ws:"}//${window.location.host}${OAUTH_SOCKET_PATH}`;
+		/**
+		* Resolve the OAuth socket against the browser page or its desktop-owned Host.
+		* @param page - Current page location.
+		* @param streamBaseUrl - Desktop shell's authenticated local Host origin.
+		* @returns WebSocket URL for the OAuth route.
+		*/
+		function socketUrl(page, streamBaseUrl) {
+			const pageUrl = new URL(page.href);
+			const base = pageUrl.protocol === "http:" || pageUrl.protocol === "https:" ? page.href : streamBaseUrl;
+			if (base === void 0) throw new Error("The DSH Host has no WebSocket origin.");
+			const url = new URL(OAUTH_SOCKET_PATH, base);
+			if (url.protocol !== "http:" && url.protocol !== "https:") throw new Error("The DSH Host has no WebSocket origin.");
+			url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
+			return url.href;
 		}
 		function isServerMessage(value) {
 			return typeof value === "object" && value !== null && typeof value.type === "string";
@@ -947,7 +959,19 @@ window.__ModuleLoader__.load({
 					...this.snapshot,
 					connection: this.socket === void 0 ? "connecting" : "reconnecting"
 				});
-				const socket = new WebSocket(socketUrl(), OAUTH_SOCKET_PROTOCOL);
+				const transport = globalThis.__DSH_TRANSPORT__;
+				let url;
+				try {
+					url = socketUrl(window.location, transport?.streamBaseUrl);
+				} catch {
+					this.update({
+						...this.snapshot,
+						connection: "closed",
+						error: "The DSH Host connection address is unavailable."
+					});
+					return;
+				}
+				const socket = new WebSocket(url, OAUTH_SOCKET_PROTOCOL);
 				this.socket = socket;
 				socket.addEventListener("open", () => {
 					if (this.socket !== socket) return;

package/lib/types/client/store.d.ts

@@ -33,6 +33,13 @@ export interface OAuthAccountsSnapshot {
     errorDetail?: string;
 }
 type Listener = () => void;
+/**
+ * Resolve the OAuth socket against the browser page or its desktop-owned Host.
+ * @param page - Current page location.
+ * @param streamBaseUrl - Desktop shell's authenticated local Host origin.
+ * @returns WebSocket URL for the OAuth route.
+ */
+export declare function socketUrl(page: Pick<Location, 'href'>, streamBaseUrl?: string): string;
 /** Remove interaction-only content once an authorization attempt settles. */
 export declare function settleAttemptView(attempt: AttemptView, status: Extract<ServerMessage, {
     type: 'settled';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@edge-sky/dsh-oauth-adapter",
-  "description": "Web OAuth account surface for official DSH authorization flows",
-  "version": "0.1.3-rc.3",
+  "description": "Web and Desktop OAuth account surface for official DSH authorization flows",
+  "version": "0.1.3-rc.4",
   "author": {
     "name": "edge-sky",
     "url": "https://github.com/edge-sky"