@flighthq/socket 0.5.1-edge.1059.c56d3cd → 0.5.1-edge.1350.8ce488b

package/README.md

@@ -13,5 +13,5 @@ Import the supported application-facing API from `@flighthq/socket`. The `@fligh
 This package is part of the locked-version Flight SDK graph. Applications may instead install and import `@flighthq/sdk` when package-level tree shaking is sufficient.
 
 - [Flight project](https://github.com/flighthq/flight)
-- [Source for @flighthq/socket@0.5.1-edge.1059.c56d3cd](https://github.com/flighthq/flight/tree/c56d3cda9aa3602334632ba5110c8ff1279391d5/packages/socket)
-- [License](https://github.com/flighthq/flight/blob/c56d3cda9aa3602334632ba5110c8ff1279391d5/LICENSE.md)
+- [Source for @flighthq/socket@0.5.1-edge.1350.8ce488b](https://github.com/flighthq/flight/tree/8ce488bfe444eded2fb281e7b9696e5ce7fabdc0/packages/socket)
+- [License](https://github.com/flighthq/flight/blob/8ce488bfe444eded2fb281e7b9696e5ce7fabdc0/LICENSE.md)

package/dist/contract.d.ts

@@ -1,5 +1,4 @@
 export * from './enableSocketGuards';
 export * from './explainSocketSendFailure';
 export * from './socket';
-export { initializeWebSocketBackend } from './socket';
 //# sourceMappingURL=contract.d.ts.map

package/dist/contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,UAAU,CAAC"}

package/dist/contract.js

@@ -1,5 +1,4 @@
 export * from './enableSocketGuards';
 export * from './explainSocketSendFailure';
 export * from './socket';
-export { initializeWebSocketBackend } from './socket';
 //# sourceMappingURL=contract.js.map

package/dist/contract.js.map

@@ -1 +1 @@
-{"version":3,"file":"contract.js","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"contract.js","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,UAAU,CAAC"}

package/dist/socket.d.ts

@@ -1,14 +1,12 @@
-import type { Entity, EntityConstruction, HasNetSocket, Socket, SocketBackend, SocketGuard, SocketOptions, SocketReadyState, SocketSignals, TcpSocketConnection, TcpSocketOptions } from '@flighthq/types/contract';
+import type { HostSocketProvider, Socket, SocketGuard, SocketOptions, SocketReadyState, SocketSignals, TcpSocketConnection, TcpSocketOptions } from '@flighthq/types/contract';
 export declare function attachSocket(socket: Socket): void;
 export declare function closeSocket(socket: Socket, code?: number, reason?: string): void;
-export declare function createSocket(host: HasNetSocket, options: Readonly<SocketOptions>): Socket;
-export declare function createWebSocketBackend(): SocketBackend & Entity;
+export declare function createSocket(hostSocket: Readonly<HostSocketProvider>, options: Readonly<SocketOptions>): Socket;
 export declare function detachSocket(socket: Socket): void;
 export declare function disposeSocket(socket: Socket): void;
 export declare function enableSocketSignals(socket: Socket): SocketSignals;
 export declare function getSocketReadyState(socket: Readonly<Socket>): SocketReadyState;
-export declare function initializeWebSocketBackend(out: EntityConstruction<SocketBackend & Entity>): void;
-export declare function openTcpSocket(host: HasNetSocket, options: Readonly<TcpSocketOptions>): TcpSocketConnection | null;
+export declare function openTcpSocket(hostSocket: Readonly<HostSocketProvider>, options: Readonly<TcpSocketOptions>): TcpSocketConnection | null;
 export declare function sendSocketMessage(socket: Readonly<Socket>, data: string | ArrayBuffer): boolean;
 export declare function setSocketGuard(guard: SocketGuard | null): void;
 //# sourceMappingURL=socket.d.ts.map

package/dist/socket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../src/socket.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,MAAM,EACN,kBAAkB,EAClB,YAAY,EACZ,MAAM,EACN,aAAa,EAIb,WAAW,EAEX,aAAa,EACb,gBAAgB,EAEhB,aAAa,EACb,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,0BAA0B,CAAC;AAKlC,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAGjD;AAKD,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAShF;AAQD,wBAAgB,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,MAAM,CAkBzF;AAED,wBAAgB,sBAAsB,IAAI,aAAa,GAAG,MAAM,CAI/D;AAID,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAEjD;AAKD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CASlD;AAMD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAcjE;AAGD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAE9E;AAMD,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,kBAAkB,CAAC,aAAa,GAAG,MAAM,CAAC,GAAG,IAAI,CAwBhG;AAKD,wBAAgB,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,CAAC,gBAAgB,CAAC,GAAG,mBAAmB,GAAG,IAAI,CAEjH;AAKD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,OAAO,CAQ/F;AAID,wBAAgB,cAAc,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,GAAG,IAAI,CAE9D"}
+{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../src/socket.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,kBAAkB,EAClB,MAAM,EAGN,WAAW,EAEX,aAAa,EACb,gBAAgB,EAEhB,aAAa,EACb,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,0BAA0B,CAAC;AAKlC,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAGjD;AAKD,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAShF;AAQD,wBAAgB,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,MAAM,CAkB/G;AAID,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAEjD;AAKD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CASlD;AAMD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAcjE;AAGD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAE9E;AAKD,wBAAgB,aAAa,CAC3B,UAAU,EAAE,QAAQ,CAAC,kBAAkB,CAAC,EACxC,OAAO,EAAE,QAAQ,CAAC,gBAAgB,CAAC,GAClC,mBAAmB,GAAG,IAAI,CAE5B;AAKD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,OAAO,CAQ/F;AAID,wBAAgB,cAAc,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,GAAG,IAAI,CAE9D"}

package/dist/socket.js

@@ -1,6 +1,6 @@
 import { allocateEntity, finishEntity } from '@flighthq/entity/contract';
 import { createSignal, emitSignal } from '@flighthq/signals/contract';
-// Resumes delivery of backend events to the socket's signals (idempotent). Pair with detachSocket.
+// Resumes delivery of provider events to the socket's signals (idempotent). Pair with detachSocket.
 // createSocket leaves a new socket attached, so this is only needed to resume after detachSocket. A
 // disposed socket is terminal and cannot be reattached.
 export function attachSocket(socket) {
@@ -9,7 +9,7 @@ export function attachSocket(socket) {
     socket.runtime.delivering = true;
 }
 // Begins a clean close of the live connection. Transitions readyState connecting/open → 'closing';
-// the backend's close event later transitions it to 'closed'. A no-op when already closing or closed.
+// the provider's close event later transitions it to 'closed'. A no-op when already closing or closed.
 // This is the connection command, distinct from disposeSocket (which releases the entity to GC).
 export function closeSocket(socket, code, reason) {
     const runtime = socket.runtime;
@@ -24,11 +24,11 @@ export function closeSocket(socket, code, reason) {
 }
 // Allocates a Socket entity plus its runtime and opens the connection through the host's socket
 // provider,
-// wiring the backend's open/message/close/error into the socket's (still inert) signal group. The
+// wiring the provider's open/message/close/error into the socket's (still inert) signal group. The
 // socket starts in 'connecting' and is left attached (delivering). Enable signals with
-// enableSocketSignals to observe events. A backend that does not support the transport yields a null
+// enableSocketSignals to observe events. A provider that does not support the transport yields a null
 // connection and the socket stays in 'connecting' until closed.
-export function createSocket(host, options) {
+export function createSocket(hostSocket, options) {
     const runtime = {
         connection: null,
         signals: null,
@@ -42,18 +42,13 @@ export function createSocket(host, options) {
     // The provider comes from the host the caller passed. A host that carries no socket transport
     // yields no connection rather than reaching a process-global fallback: absence is an answer here,
     // and the guard reports it.
-    const backend = host.net.socket;
+    const backend = hostSocket;
     runtime.connection = backend === undefined ? null : backend.openSocket(options, makeSocketEventSink(runtime));
     if (runtime.connection === null)
         _guard?.({ operation: 'createSocket', reason: 'no-connection', socket });
     return socket;
 }
-export function createWebSocketBackend() {
-    const out = allocateEntity();
-    initializeWebSocketBackend(out);
-    return finishEntity(out);
-}
-// Stops delivery of backend events to the socket's signals. The live connection is untouched — use
+// Stops delivery of provider events to the socket's signals. The live connection is untouched — use
 // closeSocket to close it. Safe to call repeatedly; resume with attachSocket.
 export function detachSocket(socket) {
     socket.runtime.delivering = false;
@@ -92,48 +87,19 @@ export function enableSocketSignals(socket) {
     }
     return runtime.signals;
 }
-// The socket's current connection phase, tracked on the runtime from backend events and closeSocket.
+// The socket's current connection phase, tracked on the runtime from provider events and closeSocket.
 export function getSocketReadyState(socket) {
     return socket.runtime.readyState;
 }
-// Builds the web backend over the DOM WebSocket. Nothing constructs one at import time, so importing
-// the package has no side effect; a host composes this value into its own net group. Returns a
-// null connection when WebSocket is unavailable (non-browser host) rather than throwing; raw TCP/UDP
-// is likewise unsupported here and only reachable through a native backend.
-export function initializeWebSocketBackend(out) {
-    out.openSocket = (options, events) => {
-        if (typeof WebSocket === 'undefined')
-            return null;
-        const ws = options.protocols !== undefined
-            ? new WebSocket(options.url, options.protocols)
-            : new WebSocket(options.url);
-        ws.binaryType = options.binaryType ?? 'arraybuffer';
-        ws.onopen = () => events.handleSocketOpen();
-        ws.onmessage = (event) => events.handleSocketMessage(toSocketMessage(event.data));
-        ws.onclose = (event) => events.handleSocketClose({ code: event.code, reason: event.reason, wasClean: event.wasClean });
-        ws.onerror = () => events.handleSocketError();
-        return {
-            sendSocketFrame(data) {
-                if (ws.readyState !== WebSocket.OPEN)
-                    return false;
-                ws.send(data);
-                return true;
-            },
-            closeSocketConnection(code, reason) {
-                ws.close(code, reason);
-            },
-        };
-    };
-}
 // Opens a raw TCP byte stream through the socket provider selected by the caller's host. Browser and
 // other framed-only providers omit openTcpSocket, so unsupported raw TCP returns null without trying
 // openSocket or interpreting the endpoint as a WebSocket URL.
-export function openTcpSocket(host, options) {
-    return host.net.socket?.openTcpSocket?.(options) ?? null;
+export function openTcpSocket(hostSocket, options) {
+    return hostSocket?.openTcpSocket?.(options) ?? null;
 }
 // Sends a text or binary frame over the live connection without mutating or copying either argument.
 // Returns false — a sentinel, not a throw — when the socket is disposed, not open, has no connection,
-// or the backend rejects the send. explainSocketSendFailure diagnoses the deterministic preflight paths.
+// or the provider rejects the send. explainSocketSendFailure diagnoses the deterministic preflight paths.
 export function sendSocketMessage(socket, data) {
     const runtime = socket.runtime;
     if (runtime.disposed) {
@@ -150,9 +116,9 @@ export function setSocketGuard(guard) {
     _guard = guard;
 }
 let _guard = null;
-// Builds the backend→entity sink bound to one socket's runtime: it updates readyState and emits the
+// Builds the provider→entity sink bound to one socket's runtime: it updates readyState and emits the
 // opt-in signals. Every handler is a no-op once the runtime stops delivering (detach/dispose), so a
-// late backend event after teardown fires nothing.
+// late provider event after teardown fires nothing.
 function makeSocketEventSink(runtime) {
     return {
         handleSocketOpen() {
@@ -183,11 +149,4 @@ function makeSocketEventSink(runtime) {
         },
     };
 }
-// Maps a raw WebSocket message payload onto a SocketMessage. A string is a text frame; anything else
-// (with binaryType 'arraybuffer', an ArrayBuffer) is a binary frame.
-function toSocketMessage(data) {
-    if (typeof data === 'string')
-        return { data, binary: false };
-    return { data: data, binary: true };
-}
 //# sourceMappingURL=socket.js.map

package/dist/socket.js.map

@@ -1 +1 @@
-{"version":3,"file":"socket.js","sourceRoot":"","sources":["../src/socket.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"socket.js","sourceRoot":"","sources":["../src/socket.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flighthq/socket",
-  "version": "0.5.1-edge.1059.c56d3cd",
+  "version": "0.5.1-edge.1350.8ce488b",
   "author": "Joshua Granick and other contributors",
   "license": "MIT",
   "repository": {
@@ -38,10 +38,10 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/entity": "0.5.1-edge.1059.c56d3cd",
-    "@flighthq/log": "0.5.1-edge.1059.c56d3cd",
-    "@flighthq/signals": "0.5.1-edge.1059.c56d3cd",
-    "@flighthq/types": "0.5.1-edge.1059.c56d3cd"
+    "@flighthq/entity": "0.5.1-edge.1350.8ce488b",
+    "@flighthq/log": "0.5.1-edge.1350.8ce488b",
+    "@flighthq/signals": "0.5.1-edge.1350.8ce488b",
+    "@flighthq/types": "0.5.1-edge.1350.8ce488b"
   },
   "devDependencies": {
     "typescript": "^5.3.0"

package/src/enableSocketGuards.test.ts

@@ -1,5 +1,5 @@
 import { addLogSink, createMemoryLogSink, getMemoryLogSinkEntries, removeLogSink } from '@flighthq/log/contract';
-import type { HasNetSocket, LogEntry, SocketBackend } from '@flighthq/types/contract';
+import type { HostSocketProvider, LogEntry } from '@flighthq/types/contract';
 
 import { areSocketGuardsEnabled, disableSocketGuards, enableSocketGuards } from './enableSocketGuards';
 import { closeSocket, createSocket, disposeSocket, enableSocketSignals, sendSocketMessage } from './socket';
@@ -15,7 +15,7 @@ function captureLog(run: () => void): readonly LogEntry[] {
   }
 }
 
-function backend(hasConnection: boolean): SocketBackend {
+function backend(hasConnection: boolean): HostSocketProvider {
   return {
     openSocket() {
       if (!hasConnection) return null;
@@ -28,8 +28,8 @@ afterEach(() => {
   disableSocketGuards();
 });
 
-function hostOf(backend: SocketBackend): HasNetSocket {
-  return { net: { socket: backend } } as HasNetSocket;
+function hostOf(backend: HostSocketProvider): { readonly net: { readonly socket: HostSocketProvider } } {
+  return { net: { socket: backend } } as { readonly net: { readonly socket: HostSocketProvider } };
 }
 
 describe('areSocketGuardsEnabled', () => {
@@ -46,7 +46,7 @@ describe('disableSocketGuards', () => {
     enableSocketGuards();
     disableSocketGuards();
     const host = hostOf(backend(false));
-    expect(captureLog(() => createSocket(host, { url: 'tcp://silent' }))).toEqual([]);
+    expect(captureLog(() => createSocket(host.net.socket, { url: 'tcp://silent' }))).toEqual([]);
   });
 });
 
@@ -55,8 +55,8 @@ describe('enableSocketGuards', () => {
     enableSocketGuards();
     const host = hostOf(backend(false));
     const entries = captureLog(() => {
-      createSocket(host, { url: 'tcp://unsupported' });
-      createSocket(host, { url: 'tcp://unsupported-again' });
+      createSocket(host.net.socket, { url: 'tcp://unsupported' });
+      createSocket(host.net.socket, { url: 'tcp://unsupported-again' });
     });
     expect(entries).toHaveLength(1);
     expect(entries[0]).toMatchObject({ channel: 'socket' });
@@ -71,7 +71,7 @@ describe('enableSocketGuards', () => {
   it('warns once per command issued after terminal disposal', () => {
     enableSocketGuards();
     const host = hostOf(backend(true));
-    const socket = createSocket(host, { url: 'ws://disposed' });
+    const socket = createSocket(host.net.socket, { url: 'ws://disposed' });
     disposeSocket(socket);
     const entries = captureLog(() => {
       closeSocket(socket);
@@ -94,7 +94,7 @@ describe('enableSocketGuards', () => {
   it('stays silent for ordinary pre-open sends and closes', () => {
     enableSocketGuards();
     const host = hostOf(backend(true));
-    const socket = createSocket(host, { url: 'ws://connecting' });
+    const socket = createSocket(host.net.socket, { url: 'ws://connecting' });
     const entries = captureLog(() => {
       sendSocketMessage(socket, 'early');
       closeSocket(socket);

package/src/explainSocketSendFailure.test.ts

@@ -1,4 +1,4 @@
-import type { HasNetSocket, SocketBackend, SocketEventSink } from '@flighthq/types/contract';
+import type { HostSocketProvider, SocketEventSink } from '@flighthq/types/contract';
 
 import { explainSocketSendFailure } from './explainSocketSendFailure';
 import { createSocket, disposeSocket, sendSocketMessage } from './socket';
@@ -6,9 +6,9 @@ import { createSocket, disposeSocket, sendSocketMessage } from './socket';
 function installBackend(
   hasConnection: boolean,
   sendResult = true,
-): { host: HasNetSocket; sink: () => SocketEventSink } {
+): { host: { readonly net: { readonly socket: HostSocketProvider } }; sink: () => SocketEventSink } {
   let sink!: SocketEventSink;
-  const backend: SocketBackend = {
+  const backend: HostSocketProvider = {
     openSocket(_options, events) {
       sink = events;
       if (!hasConnection) return null;
@@ -21,14 +21,14 @@ function installBackend(
   return { host: hostOf(backend), sink: () => sink };
 }
 
-function hostOf(backend: SocketBackend): HasNetSocket {
-  return { net: { socket: backend } } as HasNetSocket;
+function hostOf(backend: HostSocketProvider): { readonly net: { readonly socket: HostSocketProvider } } {
+  return { net: { socket: backend } } as { readonly net: { readonly socket: HostSocketProvider } };
 }
 
 describe('explainSocketSendFailure', () => {
   it('identifies an unsupported backend with no connection', () => {
     const { host } = installBackend(false);
-    const socket = createSocket(host, { url: 'tcp://host' });
+    const socket = createSocket(host.net.socket, { url: 'tcp://host' });
     expect(explainSocketSendFailure(socket)).toEqual({
       reason: 'no-connection',
       readyState: 'connecting',
@@ -38,7 +38,7 @@ describe('explainSocketSendFailure', () => {
 
   it('reports the current non-open phase when a connection exists', () => {
     const { host } = installBackend(true);
-    const socket = createSocket(host, { url: 'ws://host' });
+    const socket = createSocket(host.net.socket, { url: 'ws://host' });
     expect(explainSocketSendFailure(socket)).toEqual({
       reason: 'not-open',
       readyState: 'connecting',
@@ -48,7 +48,7 @@ describe('explainSocketSendFailure', () => {
 
   it('returns null once the socket can reach its backend, even when that backend returns false', () => {
     const { host, sink: getSink } = installBackend(true, false);
-    const socket = createSocket(host, { url: 'ws://host' });
+    const socket = createSocket(host.net.socket, { url: 'ws://host' });
     getSink().handleSocketOpen();
     expect(sendSocketMessage(socket, 'frame')).toBe(false);
     expect(explainSocketSendFailure(socket)).toBeNull();
@@ -56,7 +56,7 @@ describe('explainSocketSendFailure', () => {
 
   it('distinguishes terminal disposal from other closed or disconnected states', () => {
     const { host } = installBackend(true);
-    const socket = createSocket(host, { url: 'ws://host' });
+    const socket = createSocket(host.net.socket, { url: 'ws://host' });
     disposeSocket(socket);
     expect(explainSocketSendFailure(socket)).toEqual({
       reason: 'disposed',

package/src/socket.test.ts

@@ -1,7 +1,6 @@
 import { connectSignal } from '@flighthq/signals/contract';
 import type {
-  HasNetSocket,
-  SocketBackend,
+  HostSocketProvider,
   SocketCloseInfo,
   SocketConnection,
   SocketEventSink,
@@ -15,18 +14,16 @@ import {
   attachSocket,
   closeSocket,
   createSocket,
-  createWebSocketBackend,
   detachSocket,
   disposeSocket,
   enableSocketSignals,
   getSocketReadyState,
-  initializeWebSocketBackend,
   sendSocketMessage,
   setSocketGuard,
 } from './socket';
 
 interface FakeSocket {
-  backend: SocketBackend;
+  backend: HostSocketProvider;
   sink: SocketEventSink;
   sent: (string | ArrayBuffer)[];
   closes: { code?: number; reason?: string }[];
@@ -46,7 +43,7 @@ function fakeBackend(): FakeSocket {
     sendReturns: true,
     lastOptions: null,
     sink: null as unknown as SocketEventSink,
-    backend: null as unknown as SocketBackend,
+    backend: null as unknown as HostSocketProvider,
   };
   state.backend = {
     openSocket(options, events): SocketConnection | null {
@@ -71,8 +68,8 @@ afterEach(() => {
   setSocketGuard(null);
 });
 
-function hostOf(backend: SocketBackend): HasNetSocket {
-  return { net: { socket: backend } } as HasNetSocket;
+function hostOf(backend: HostSocketProvider): { readonly net: { readonly socket: HostSocketProvider } } {
+  return { net: { socket: backend } } as { readonly net: { readonly socket: HostSocketProvider } };
 }
 
 function tcpConnection(): TcpSocketConnection {
@@ -87,7 +84,7 @@ describe('attachSocket', () => {
   it('resumes delivery after a detach', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     const signals = enableSocketSignals(socket);
     let opens = 0;
     connectSignal(signals.onSocketOpen, () => opens++);
@@ -100,7 +97,7 @@ describe('attachSocket', () => {
   it('cannot resume delivery after terminal disposal', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     const signals = enableSocketSignals(socket);
     let opens = 0;
     connectSignal(signals.onSocketOpen, () => opens++);
@@ -116,7 +113,7 @@ describe('closeSocket', () => {
   it('transitions to closing and forwards code/reason to the connection', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     fake.sink.handleSocketOpen();
     closeSocket(socket, 1000, 'bye');
     expect(getSocketReadyState(socket)).toBe('closing');
@@ -126,7 +123,7 @@ describe('closeSocket', () => {
   it('reaches closed once the backend close event arrives', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     fake.sink.handleSocketOpen();
     closeSocket(socket);
     fake.sink.handleSocketClose({ code: 1000, reason: '', wasClean: true });
@@ -136,7 +133,7 @@ describe('closeSocket', () => {
   it('is a no-op when already closed', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     fake.sink.handleSocketOpen();
     closeSocket(socket);
     fake.sink.handleSocketClose({ code: 1000, reason: '', wasClean: true });
@@ -147,7 +144,7 @@ describe('closeSocket', () => {
   it('stays closed and does not close the connection again after disposal', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     disposeSocket(socket);
     closeSocket(socket);
     expect(getSocketReadyState(socket)).toBe('closed');
@@ -159,7 +156,7 @@ describe('createSocket', () => {
   it('opens through the backend in the connecting state and records the url', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://host/path' });
+    const socket = createSocket(host.net.socket, { url: 'ws://host/path' });
     expect(socket.url).toBe('ws://host/path');
     expect(getSocketReadyState(socket)).toBe('connecting');
     expect(fake.lastOptions?.url).toBe('ws://host/path');
@@ -168,7 +165,7 @@ describe('createSocket', () => {
   it('passes protocols and binaryType through to the backend', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    createSocket(host, { url: 'ws://x', protocols: ['a', 'b'], binaryType: 'arraybuffer' });
+    createSocket(host.net.socket, { url: 'ws://x', protocols: ['a', 'b'], binaryType: 'arraybuffer' });
     expect(fake.lastOptions?.protocols).toEqual(['a', 'b']);
     expect(fake.lastOptions?.binaryType).toBe('arraybuffer');
   });
@@ -177,7 +174,7 @@ describe('createSocket', () => {
     const fake = fakeBackend();
     fake.openReturnsNull = true;
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'tcp://x' });
+    const socket = createSocket(host.net.socket, { url: 'tcp://x' });
     expect(getSocketReadyState(socket)).toBe('connecting');
     expect(sendSocketMessage(socket, 'x')).toBe(false);
   });
@@ -185,7 +182,7 @@ describe('createSocket', () => {
   it('emits a text message with binary false and a binary message with binary true', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     const signals = enableSocketSignals(socket);
     const received: SocketMessage[] = [];
     connectSignal(signals.onSocketMessage, (m) => received.push(m));
@@ -202,7 +199,7 @@ describe('createSocket', () => {
   it('emits close info with code, reason, and wasClean', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     const signals = enableSocketSignals(socket);
     const infos: SocketCloseInfo[] = [];
     connectSignal(signals.onSocketClose, (i) => infos.push(i));
@@ -213,7 +210,7 @@ describe('createSocket', () => {
   it('emits onSocketError', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     const signals = enableSocketSignals(socket);
     let errors = 0;
     connectSignal(signals.onSocketError, () => errors++);
@@ -222,102 +219,11 @@ describe('createSocket', () => {
   });
 });
 
-describe('createWebSocketBackend', () => {
-  it('constructs a WebSocket with url and protocols and sets binaryType', () => {
-    const restore = installFakeWebSocket();
-    try {
-      createWebSocketBackend().openSocket(
-        { url: 'ws://host', protocols: ['chat'], binaryType: 'arraybuffer' },
-        noopSink(),
-      );
-      const ws = FakeWebSocket.last!;
-      expect(ws.url).toBe('ws://host');
-      expect(ws.protocols).toEqual(['chat']);
-      expect(ws.binaryType).toBe('arraybuffer');
-    } finally {
-      restore();
-    }
-  });
-
-  it('translates an incoming string message to binary false', () => {
-    const restore = installFakeWebSocket();
-    try {
-      const received: SocketMessage[] = [];
-      createWebSocketBackend().openSocket({ url: 'ws://x' }, sinkCollecting(received));
-      FakeWebSocket.last!.onmessage!({ data: 'hello' } as MessageEvent);
-      expect(received).toEqual([{ data: 'hello', binary: false }]);
-    } finally {
-      restore();
-    }
-  });
-
-  it('translates an incoming ArrayBuffer message to binary true', () => {
-    const restore = installFakeWebSocket();
-    try {
-      const received: SocketMessage[] = [];
-      createWebSocketBackend().openSocket({ url: 'ws://x' }, sinkCollecting(received));
-      const buffer = new Uint8Array([9]).buffer;
-      FakeWebSocket.last!.onmessage!({ data: buffer } as MessageEvent);
-      expect(received[0]).toEqual({ data: buffer, binary: true });
-    } finally {
-      restore();
-    }
-  });
-
-  it('maps close events and open into the sink', () => {
-    const restore = installFakeWebSocket();
-    try {
-      let opened = false;
-      const closes: SocketCloseInfo[] = [];
-      const sink: SocketEventSink = {
-        ...noopSink(),
-        handleSocketOpen: () => (opened = true),
-        handleSocketClose: (i) => closes.push(i),
-      };
-      createWebSocketBackend().openSocket({ url: 'ws://x' }, sink);
-      const ws = FakeWebSocket.last!;
-      ws.onopen!(new Event('open'));
-      ws.onclose!({ code: 1000, reason: 'done', wasClean: true } as CloseEvent);
-      expect(opened).toBe(true);
-      expect(closes).toEqual([{ code: 1000, reason: 'done', wasClean: true }]);
-    } finally {
-      restore();
-    }
-  });
-
-  it('sends only when the WebSocket is OPEN and closes with code/reason', () => {
-    const restore = installFakeWebSocket();
-    try {
-      const connection = createWebSocketBackend().openSocket({ url: 'ws://x' }, noopSink())!;
-      const ws = FakeWebSocket.last!;
-      ws.readyState = FakeWebSocket.CONNECTING;
-      expect(connection.sendSocketFrame('x')).toBe(false);
-      ws.readyState = FakeWebSocket.OPEN;
-      expect(connection.sendSocketFrame('y')).toBe(true);
-      expect(ws.sent).toEqual(['y']);
-      connection.closeSocketConnection(1001, 'later');
-      expect(ws.closed).toEqual({ code: 1001, reason: 'later' });
-    } finally {
-      restore();
-    }
-  });
-
-  it('returns a null connection when WebSocket is unavailable', () => {
-    const original = (globalThis as { WebSocket?: unknown }).WebSocket;
-    (globalThis as { WebSocket?: unknown }).WebSocket = undefined;
-    try {
-      expect(createWebSocketBackend().openSocket({ url: 'ws://x' }, noopSink())).toBeNull();
-    } finally {
-      (globalThis as { WebSocket?: unknown }).WebSocket = original;
-    }
-  });
-});
-
 describe('detachSocket', () => {
   it('stops backend events from reaching the signals', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     const signals = enableSocketSignals(socket);
     let opens = 0;
     connectSignal(signals.onSocketOpen, () => opens++);
@@ -331,7 +237,7 @@ describe('disposeSocket', () => {
   it('closes an open connection and detaches so later events fire no signal', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     const signals = enableSocketSignals(socket);
     let messages = 0;
     connectSignal(signals.onSocketMessage, () => messages++);
@@ -347,7 +253,7 @@ describe('disposeSocket', () => {
   it('is safe to call on a fresh socket', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     expect(() => disposeSocket(socket)).not.toThrow();
   });
 });
@@ -356,21 +262,21 @@ describe('enableSocketSignals', () => {
   it('returns the same group on repeated calls', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     expect(enableSocketSignals(socket)).toBe(enableSocketSignals(socket));
   });
 
   it('leaves a bare socket without signals', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     expect(socket.runtime.signals).toBeNull();
   });
 
   it('returns an inert stable group without reviving a disposed socket', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     disposeSocket(socket);
     const first = enableSocketSignals(socket);
     expect(enableSocketSignals(socket)).toBe(first);
@@ -383,7 +289,7 @@ describe('getSocketReadyState', () => {
   it('reflects connecting → open → closing → closed transitions', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     expect(getSocketReadyState(socket)).toBe('connecting');
     fake.sink.handleSocketOpen();
     expect(getSocketReadyState(socket)).toBe('open');
@@ -394,46 +300,43 @@ describe('getSocketReadyState', () => {
   });
 });
 
-describe('initializeWebSocketBackend', () => {
-  it('is the construction initializer of createWebSocketBackend', () => {
-    expect(typeof initializeWebSocketBackend).toBe('function');
-  });
-});
-
 describe('openTcpSocket', () => {
   it('forwards the endpoint unchanged and returns the backend connection by identity', () => {
     const expected = tcpConnection();
     const options: TcpSocketOptions = { host: 'db.internal', port: 5432 };
     const openTcpSocketBackend = vi.fn(() => expected);
-    const backend: SocketBackend = {
+    const backend: HostSocketProvider = {
       openSocket: vi.fn(() => null),
       openTcpSocket: openTcpSocketBackend,
     };
 
-    expect(openTcpSocket(hostOf(backend), options)).toBe(expected);
+    expect(openTcpSocket(hostOf(backend).net.socket, options)).toBe(expected);
     expect(openTcpSocketBackend).toHaveBeenCalledWith(options);
   });
 
   it('returns null when the host carries no socket backend', () => {
-    const host = { net: {} } as HasNetSocket;
-    expect(openTcpSocket(host, { host: 'localhost', port: 9000 })).toBeNull();
+    const host = { net: {} } as { readonly net: { readonly socket: HostSocketProvider } };
+    expect(openTcpSocket(host.net.socket, { host: 'localhost', port: 9000 })).toBeNull();
   });
 
-  it('returns null for the web backend without attempting framed openSocket', () => {
-    const backend = createWebSocketBackend();
+  // A framed-only provider — the shape every browser transport takes — omits openTcpSocket entirely.
+  // Raw TCP must then report absence rather than falling through to openSocket and reinterpreting the
+  // endpoint as a WebSocket URL.
+  it('returns null for a framed-only backend without attempting framed openSocket', () => {
+    const backend: HostSocketProvider = { openSocket: vi.fn(() => null) };
     const openSocket = vi.spyOn(backend, 'openSocket');
 
-    expect(openTcpSocket(hostOf(backend), { host: 'localhost', port: 9000 })).toBeNull();
+    expect(openTcpSocket(hostOf(backend).net.socket, { host: 'localhost', port: 9000 })).toBeNull();
     expect(openSocket).not.toHaveBeenCalled();
   });
 
   it('preserves an explicit null from a backend that cannot open the endpoint', () => {
-    const backend: SocketBackend = {
+    const backend: HostSocketProvider = {
       openSocket: vi.fn(() => null),
       openTcpSocket: vi.fn(() => null),
     };
 
-    expect(openTcpSocket(hostOf(backend), { host: 'unreachable.internal', port: 22 })).toBeNull();
+    expect(openTcpSocket(hostOf(backend).net.socket, { host: 'unreachable.internal', port: 22 })).toBeNull();
   });
 });
 
@@ -441,7 +344,7 @@ describe('sendSocketMessage', () => {
   it('sends through the connection and returns true when open', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     fake.sink.handleSocketOpen();
     expect(sendSocketMessage(socket, 'ping')).toBe(true);
     expect(fake.sent).toEqual(['ping']);
@@ -450,7 +353,7 @@ describe('sendSocketMessage', () => {
   it('returns false without throwing when not open', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     expect(sendSocketMessage(socket, 'ping')).toBe(false);
     expect(fake.sent).toEqual([]);
   });
@@ -458,7 +361,7 @@ describe('sendSocketMessage', () => {
   it('returns false after disposal without reaching the released connection', () => {
     const fake = fakeBackend();
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     fake.sink.handleSocketOpen();
     disposeSocket(socket);
     expect(sendSocketMessage(socket, 'ping')).toBe(false);
@@ -469,7 +372,7 @@ describe('sendSocketMessage', () => {
     const fake = fakeBackend();
     fake.openReturnsNull = true;
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'tcp://x' });
+    const socket = createSocket(host.net.socket, { url: 'tcp://x' });
     fake.sink.handleSocketOpen();
     expect(getSocketReadyState(socket)).toBe('open');
     expect(sendSocketMessage(socket, 'ping')).toBe(false);
@@ -479,7 +382,7 @@ describe('sendSocketMessage', () => {
     const fake = fakeBackend();
     fake.sendReturns = false;
     const host = hostOf(fake.backend);
-    const socket = createSocket(host, { url: 'ws://x' });
+    const socket = createSocket(host.net.socket, { url: 'ws://x' });
     fake.sink.handleSocketOpen();
     Object.freeze(socket.runtime);
     Object.freeze(socket);
@@ -489,62 +392,6 @@ describe('sendSocketMessage', () => {
   });
 });
 
-function noopSink(): SocketEventSink {
-  return {
-    handleSocketOpen() {},
-    handleSocketMessage() {},
-    handleSocketClose() {},
-    handleSocketError() {},
-  };
-}
-
-function sinkCollecting(received: SocketMessage[]): SocketEventSink {
-  return { ...noopSink(), handleSocketMessage: (m) => received.push(m) };
-}
-
-// A minimal stand-in for the DOM WebSocket, recording constructor args, sends, and close, and
-// exposing dispatchable onopen/onmessage/onclose/onerror handlers.
-class FakeWebSocket {
-  static CONNECTING = 0;
-  static OPEN = 1;
-  static CLOSING = 2;
-  static CLOSED = 3;
-  static last: FakeWebSocket | null = null;
-
-  url: string;
-  protocols?: readonly string[];
-  binaryType = 'blob';
-  readyState = FakeWebSocket.CONNECTING;
-  sent: (string | ArrayBuffer)[] = [];
-  closed: { code?: number; reason?: string } | null = null;
-  onopen: ((event: Event) => void) | null = null;
-  onmessage: ((event: MessageEvent) => void) | null = null;
-  onclose: ((event: CloseEvent) => void) | null = null;
-  onerror: ((event: Event) => void) | null = null;
-
-  constructor(url: string, protocols?: string | string[]) {
-    this.url = url;
-    if (protocols !== undefined) this.protocols = typeof protocols === 'string' ? [protocols] : protocols;
-    FakeWebSocket.last = this;
-  }
-
-  send(data: string | ArrayBuffer): void {
-    this.sent.push(data);
-  }
-
-  close(code?: number, reason?: string): void {
-    this.closed = { code, reason };
-  }
-}
-
-function installFakeWebSocket(): () => void {
-  const original = (globalThis as { WebSocket?: unknown }).WebSocket;
-  FakeWebSocket.last = null;
-  (globalThis as { WebSocket?: unknown }).WebSocket = FakeWebSocket;
-  return () => {
-    (globalThis as { WebSocket?: unknown }).WebSocket = original;
-  };
-}
 describe('setSocketGuard', () => {
   it('installs and removes the core notice hook', () => {
     const notices: string[] = [];
@@ -552,10 +399,10 @@ describe('setSocketGuard', () => {
     const unsupported = fakeBackend();
     unsupported.openReturnsNull = true;
     const host = hostOf(unsupported.backend);
-    createSocket(host, { url: 'tcp://x' });
+    createSocket(host.net.socket, { url: 'tcp://x' });
 
     const supported = fakeBackend();
-    const socket = createSocket(hostOf(supported.backend), { url: 'ws://x' });
+    const socket = createSocket(hostOf(supported.backend).net.socket, { url: 'ws://x' });
     disposeSocket(socket);
     closeSocket(socket);
     sendSocketMessage(socket, 'x');

package/src/socketHost.test.ts

@@ -1,8 +1,8 @@
-import type { HasNetSocket, SocketBackend, SocketConnection, SocketEventSink } from '@flighthq/types/contract';
+import type { HostSocketProvider, SocketConnection, SocketEventSink } from '@flighthq/types/contract';
 
 import { createSocket, getSocketReadyState } from './socket';
 
-function recordingBackend(label: string, opened: string[]): SocketBackend {
+function recordingBackend(label: string, opened: string[]): HostSocketProvider {
   return {
     openSocket(_options, events: SocketEventSink): SocketConnection | null {
       opened.push(label);
@@ -17,14 +17,16 @@ function recordingBackend(label: string, opened: string[]): SocketBackend {
   };
 }
 
-function hostWith(backend: SocketBackend | undefined): HasNetSocket {
-  return { net: backend === undefined ? {} : { socket: backend } } as HasNetSocket;
+function hostWith(backend: HostSocketProvider | undefined): { readonly net: { readonly socket: HostSocketProvider } } {
+  return { net: backend === undefined ? {} : { socket: backend } } as {
+    readonly net: { readonly socket: HostSocketProvider };
+  };
 }
 
 describe('createSocket', () => {
   it('opens through the provider carried by the host it is given', () => {
     const opened: string[] = [];
-    createSocket(hostWith(recordingBackend('a', opened)), { url: 'wss://example.test' });
+    createSocket(hostWith(recordingBackend('a', opened)).net.socket, { url: 'wss://example.test' });
     expect(opened).toEqual(['a']);
   });
 
@@ -33,8 +35,8 @@ describe('createSocket', () => {
   // it carried — this is the property the migration exists to create.
   it('keeps two hosts independent', () => {
     const opened: string[] = [];
-    createSocket(hostWith(recordingBackend('first', opened)), { url: 'wss://one.test' });
-    createSocket(hostWith(recordingBackend('second', opened)), { url: 'wss://two.test' });
+    createSocket(hostWith(recordingBackend('first', opened)).net.socket, { url: 'wss://one.test' });
+    createSocket(hostWith(recordingBackend('second', opened)).net.socket, { url: 'wss://two.test' });
     expect(opened).toEqual(['first', 'second']);
   });
 
@@ -42,7 +44,7 @@ describe('createSocket', () => {
   // quietly reaching a process-global web backend. The socket stays 'connecting', which is the
   // documented shape for a backend that cannot open the transport.
   it('yields no connection when the host carries no socket provider', () => {
-    const socket = createSocket(hostWith(undefined), { url: 'wss://absent.test' });
+    const socket = createSocket(hostWith(undefined).net.socket, { url: 'wss://absent.test' });
     expect(socket.runtime.connection).toBeNull();
     expect(getSocketReadyState(socket)).toBe('connecting');
   });
@@ -50,7 +52,7 @@ describe('createSocket', () => {
   it('does not consult one host provider when another host is passed', () => {
     const opened: string[] = [];
     const unused = recordingBackend('unused', opened);
-    createSocket(hostWith(recordingBackend('used', opened)), { url: 'wss://x.test' });
+    createSocket(hostWith(recordingBackend('used', opened)).net.socket, { url: 'wss://x.test' });
     expect(opened).not.toContain('unused');
     expect(unused).toBeDefined();
   });