@owlmeans/client-socket 0.1.18-rc.10 → 0.1.18-rc.11

package/README.md

@@ -1,11 +1,12 @@
 # @owlmeans/client-socket
 
-React hook and factory for WebSocket connections via OwlMeans module routing.
+React hook and factory for WebSocket connections via OwlMeans entrypoint routing.
 
 ## Overview
 
-- `ws(module, request?)` — creates a `Connection` by resolving the module URL and opening a WebSocket
-- `useWs(module, request?)` — React hook wrapping `ws()` with lifecycle management
+- `ws(entrypoint, request?)` — creates a `Connection` from the entrypoint's URL and opens a WebSocket
+- `useWs(entrypoint, request?)` — React hook wrapping `ws()` with lifecycle management; it takes an
+  alias or an entrypoint
 - The returned `Connection` implements `@owlmeans/socket`'s `Connection` interface
 
 ## Installation
@@ -16,7 +17,7 @@ bun add @owlmeans/client-socket
 
 ## Usage
 
-Connect to a WebSocket module and observe events:
+Connect to a WebSocket entrypoint and observe events:
 
 ```typescript
 import { useWs } from '@owlmeans/client-socket'
@@ -39,19 +40,19 @@ Direct connection (non-hook):
 
 ```typescript
 import { ws } from '@owlmeans/client-socket'
-import type { ClientModule } from '@owlmeans/client-module'
+import type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
 
-const wsModule = context.module<ClientModule<string>>('story-thinking')
-const connection = await ws(wsModule, { params: { id: storyId } })
+const wsEntrypoint = context.entrypoint<ClientEntrypoint<string>>('story-thinking')
+const connection = await ws(wsEntrypoint, { params: { id: storyId } })
 ```
 
 ## API
 
-### `ws(module, request?): Promise<Connection>`
+### `ws(entrypoint, request?): Promise<Connection>`
 
-Resolves the module URL, opens a WebSocket, and returns a `Connection` once the socket opens.
+Builds the entrypoint's URL, opens a WebSocket, and returns a `Connection` once the socket opens.
 
-### `useWs(module, request?): Connection | null`
+### `useWs(entrypoint, request?): Connection | null`
 
 React hook version of `ws()`. Returns `null` while connecting. Manages connection lifecycle (opens on mount, closes on unmount).
 
@@ -59,7 +60,7 @@ React hook version of `ws()`. Returns `null` while connecting. Manages connectio
 
 - [`@owlmeans/socket`](../socket) — `Connection` interface with `notify`, `observe`, `call` methods
 - [`@owlmeans/server-socket`](../server-socket) — server-side connection handler
-- [`@owlmeans/client-module`](../client-module) — `ClientModule` passed to `ws()`
+- [`@owlmeans/client-entrypoint`](../client-entrypoint) — `ClientEntrypoint` passed to `ws()`
 
 <!-- owlmeans:agent-guidance:start -->
 ## Agent guidance

package/agent-meta/manifest.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 2,
   "package": "@owlmeans/client-socket",
-  "version": "0.1.18-rc.10",
-  "generatedAt": "2026-09-01T12:04:42.731Z",
+  "version": "0.1.18-rc.11",
+  "generatedAt": "2026-09-01T16:28:56.987Z",
   "canonicalRepo": "https://github.com/owlmeans/common",
   "entries": [
     {

package/agent-meta/skills/client-socket/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: client-socket
-description: How to use @owlmeans/client-socket — client-side WebSocket connection helpers for browsers and native clients. Auto-invoked when importing client socket primitives.
+description: How to use @owlmeans/client-socket — opening a WebSocket connection to a socket entrypoint from browsers and native clients, plus the useWs hook. Auto-invoked when importing client socket primitives.
 user-invocable: false
 ---
 <!-- AUTO-GENERATED — do not edit. Regenerate via sync-agent-meta. -->
@@ -8,23 +8,44 @@ user-invocable: false
 # @owlmeans/client-socket
 
 **Layer:** Client
-**Install:** `"@owlmeans/client-socket": "^0.1.18-rc.10"` in `dependencies`
+**Install:** `"@owlmeans/client-socket": "^0.1.18-rc.11"` in `dependencies`
 
 ## Key Exports
 
 | Export | Description |
 |--------|-------------|
-| `Socket` types | Client socket connection shape |
-| Helpers | Connect, send, subscribe to channels |
+| `ws(entrypoint, request?)` | Open a `Connection` to a socket entrypoint |
+| `useWs(entrypoint \| alias, request?)` | React hook — connects, keeps the connection, closes it on unmount |
+| `Config` / `Context` | The client config and context types this package expects |
+
+## How the address is built
+
+A socket entrypoint is **addressed, not called**: `entrypointUrl` from
+`@owlmeans/client-entrypoint/utils` turns the declaration plus the asking context into the `wss://`
+URL — `:params` filled in, query appended, protocol and TLS taken from the entrypoint's address —
+and the connection is opened on that. Nothing is hand-concatenated, so the same declaration that the
+server binds is the one the client dials.
+
+The connection sends a `ping` every 30 seconds and clears the heartbeat on close.
 
 ## Usage
 
 ```typescript
-import { connectSocket } from '@owlmeans/client-socket'
-const socket = await connectSocket(context, { url: 'wss://api/ws' })
-socket.subscribe('projects', msg => console.log(msg))
+import { useWs } from '@owlmeans/client-socket'
+import { AUTH_QUERY } from '@owlmeans/auth'
+
+const connection = useWs(app.api.project.stream, {
+  params: { id },
+  query: { [AUTH_QUERY]: token },
+})
+
+connection?.listen(async message => { /* ... */ })
 ```
 
+`useWs` reconnects when the alias, the auth query value or the params change, and closes the
+connection when the component unmounts.
+
 ## Depends On
 
-- `@owlmeans/socket`, `@owlmeans/client-context`
+- `@owlmeans/socket`, `@owlmeans/client-entrypoint` (`entrypointUrl`, `provideRequest`), `@owlmeans/client-context`
+- `@owlmeans/client` — `useContext`, `useValue`

package/build/helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAG3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAUlD,eAAO,MAAM,EAAE,WAAkB,gBAAgB,CAAC,MAAM,CAAC,YAAY,eAAe,CAAC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,KAAG,OAAO,CAAC,UAAU,CA0B5H,CAAA;AAED,eAAO,MAAM,KAAK,WAAY,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,YAAY,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,KAAG,UAAU,GAAG,IAyBpH,CAAA"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAE3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AASlD,eAAO,MAAM,EAAE,GAAU,QAAQ,gBAAgB,CAAC,MAAM,CAAC,EAAE,UAAU,eAAe,CAAC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,KAAG,OAAO,CAAC,UAAU,CAuB5H,CAAA;AAED,eAAO,MAAM,KAAK,GAAI,QAAQ,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,EAAE,UAAU,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,KAAG,UAAU,GAAG,IAyBpH,CAAA"}

package/build/helper.js

@@ -1,19 +1,14 @@
 import { provideRequest } from '@owlmeans/client-entrypoint';
-import { EntrypointOutcome } from '@owlmeans/entrypoint';
-import { SocketInitializationError } from '@owlmeans/socket';
 import { makeConnection } from './utils/connection.js';
 import { assertContext } from '@owlmeans/context';
 import { useContext, useValue } from '@owlmeans/client';
 import { AUTH_QUERY } from '@owlmeans/auth';
-import { urlCall } from '@owlmeans/client-entrypoint/utils';
+import { entrypointUrl } from '@owlmeans/client-entrypoint/utils';
 import { useEffect, useMemo } from 'react';
 export const ws = async (module, request) => {
     const ctx = assertContext(module.ctx, 'client-ws');
-    request = request ?? provideRequest(module.getAlias(), module.getPath());
-    const [url, state] = await urlCall({ ref: module })(request);
-    if (state !== EntrypointOutcome.Ok) {
-        throw new SocketInitializationError;
-    }
+    request = request ?? provideRequest(module.alias, module.path());
+    const url = await entrypointUrl({ ref: module }, request);
     const socket = new WebSocket(url);
     return new Promise(resolve => {
         socket.onopen = () => {
@@ -34,11 +29,11 @@ export const useWs = (module, request) => {
     const ctx = useContext();
     const mod = useMemo(() => typeof module === 'string' ? ctx.entrypoint(module) : module, [module]);
     const connection = useValue(async () => {
-        const _request = provideRequest(mod.getAlias(), mod.getPath());
+        const _request = provideRequest(mod.alias, mod.path());
         Object.assign(_request, request);
         return await ws(mod, _request);
     }, [
-        mod.getAlias(),
+        mod.alias,
         request?.query?.[AUTH_QUERY],
         request?.params ? JSON.stringify(request.params) : undefined
     ]);

package/build/helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAE5D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AACjE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE1C,MAAM,CAAC,MAAM,EAAE,GAAG,KAAK,EAAE,MAAgC,EAAE,OAA6C,EAAuB,EAAE;IAC/H,MAAM,GAAG,GAAG,aAAa,CAAkB,MAAM,CAAC,GAAc,EAAE,WAAW,CAAC,CAAA;IAC9E,OAAO,GAAG,OAAO,IAAI,cAAc,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IAChE,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,CAAA;IAEzD,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,CAAA;IAEjC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE;YACnB,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;gBACjC,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;oBACzC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;gBAC/C,CAAC;YACH,CAAC,EAAE,MAAM,CAAC,CAAA;YAEV,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;gBACpC,OAAO,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAA;gBACzE,aAAa,CAAC,SAAS,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;YAEF,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAA;QACtC,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,MAAsC,EAAE,OAAuC,EAAqB,EAAE;IAC1H,MAAM,GAAG,GAAG,UAAU,EAAE,CAAA;IACxB,MAAM,GAAG,GAAG,OAAO,CACjB,GAAG,EAAE,CAAC,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAmB,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EACpF,CAAC,MAAM,CAAC,CACT,CAAA;IACD,MAAM,UAAU,GAAG,QAAQ,CAAa,KAAK,IAAI,EAAE;QACjD,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;QACtD,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAChC,OAAO,MAAM,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;IAChC,CAAC,EAAE;QACD,GAAG,CAAC,KAAK;QACT,OAAO,EAAE,KAAK,EAAE,CAAC,UAAU,CAAC;QAC5B,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;KAC7D,CAAC,CAAA;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;YACvB,OAAO,GAAG,EAAE;gBACV,KAAK,UAAU,CAAC,KAAK,EAAE,CAAA;YACzB,CAAC,CAAA;QACH,CAAC;IACH,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;IAEhB,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA"}

package/build/utils/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/utils/connection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAA4B,MAAM,kBAAkB,CAAA;AAG5E,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,QACnF,SAAS,YAAY,CAAC,KAC3B,UAkDF,CAAA"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/utils/connection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAA4B,MAAM,kBAAkB,CAAA;AAG5E,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EACzF,MAAM,SAAS,EAAE,UAAU,CAAC,KAC3B,UAkDF,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/client-socket",
-  "version": "0.1.18-rc.10",
+  "version": "0.1.18-rc.11",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -30,14 +30,14 @@
     "typescript": "^7.0.2"
   },
   "dependencies": {
-    "@owlmeans/auth": "^0.1.18-rc.7",
-    "@owlmeans/basic-envelope": "^0.1.18-rc.9",
-    "@owlmeans/client": "^0.1.18-rc.11",
-    "@owlmeans/client-context": "^0.1.18-rc.9",
-    "@owlmeans/client-entrypoint": "^0.1.18-rc.9",
-    "@owlmeans/context": "^0.1.18-rc.6",
-    "@owlmeans/entrypoint": "^0.1.18-rc.8",
-    "@owlmeans/socket": "^0.1.18-rc.7"
+    "@owlmeans/auth": "^0.1.18-rc.8",
+    "@owlmeans/basic-envelope": "^0.1.18-rc.10",
+    "@owlmeans/client": "^0.1.18-rc.13",
+    "@owlmeans/client-context": "^0.1.18-rc.11",
+    "@owlmeans/client-entrypoint": "^0.1.18-rc.11",
+    "@owlmeans/context": "^0.1.18-rc.7",
+    "@owlmeans/entrypoint": "^0.1.18-rc.9",
+    "@owlmeans/socket": "^0.1.18-rc.8"
   },
   "publishConfig": {
     "access": "public"

package/src/helper.ts

@@ -1,25 +1,20 @@
 import type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
 import type { AbstractRequest } from '@owlmeans/entrypoint'
 import { provideRequest } from '@owlmeans/client-entrypoint'
-import { EntrypointOutcome } from '@owlmeans/entrypoint'
 import type { Connection } from '@owlmeans/socket'
-import { SocketInitializationError } from '@owlmeans/socket'
 import { makeConnection } from './utils/connection.js'
 import { assertContext } from '@owlmeans/context'
 import type { Config, Context } from './types.js'
 import { useContext, useValue } from '@owlmeans/client'
 import { AUTH_QUERY } from '@owlmeans/auth'
-import { urlCall } from '@owlmeans/client-entrypoint/utils'
+import { entrypointUrl } from '@owlmeans/client-entrypoint/utils'
 import { useEffect, useMemo } from 'react'
 
 export const ws = async (module: ClientEntrypoint<string>, request?: AbstractRequest<{ token?: string }>): Promise<Connection> => {
   const ctx = assertContext<Config, Context>(module.ctx as Context, 'client-ws')
-  request = request ?? provideRequest(module.getAlias(), module.getPath())
-  const [url, state] = await urlCall({ ref: module })(request)
+  request = request ?? provideRequest(module.alias, module.path())
+  const url = await entrypointUrl({ ref: module }, request)
 
-  if (state !== EntrypointOutcome.Ok) {
-    throw new SocketInitializationError
-  }
   const socket = new WebSocket(url)
 
   return new Promise(resolve => {
@@ -47,11 +42,11 @@ export const useWs = (module: string | ClientEntrypoint<any>, request?: Partial<
     [module]
   )
   const connection = useValue<Connection>(async () => {
-    const _request = provideRequest(mod.getAlias(), mod.getPath())
+    const _request = provideRequest(mod.alias, mod.path())
     Object.assign(_request, request)
     return await ws(mod, _request)
   }, [
-    mod.getAlias(),
+    mod.alias,
     request?.query?.[AUTH_QUERY],
     request?.params ? JSON.stringify(request.params) : undefined
   ])