@owlmeans/server-job 0.1.18-rc.2 → 0.1.18-rc.3

package/README.md

@@ -1,101 +1,10 @@
 # @owlmeans/server-job
 
-The read side of a queue, as entrypoints an application elevates: list, get, cancel and a socket
-that pushes lifecycle events. Jobs themselves are enqueued and processed through
-[`@owlmeans/queue`](../queue) and its driver — nothing here produces or consumes work.
+Server entrypoints for a queue job protocol group: list, get, cancel and lifecycle watch.
 
-## Overview
-
-- `declareJobEntrypoints(root, opts?)` — the four declarations, for the app's SHARED package
-- `serveJobEntrypoints(entrypoints, root, opts?)` — elevate them with this package's handlers
-- `listJobs` / `getJob` / `cancelJob` / `watchJobs` — the handlers, when an app elevates by hand
-- A caller sees only the jobs it owns; the escape hatch is an option, not a hardcoded permission
-
-## Installation
-
-```bash
-bun add @owlmeans/server-job@^0.1.18-rc.0
-```
-
-## Usage
-
-Declare the group once, in the package both halves import:
-
-```typescript
-import { declareJobEntrypoints } from '@owlmeans/server-job'
-
-export const REPORTS = 'reports'
-export const entrypoints = [
-  ...declareJobEntrypoints(REPORTS, { path: '/reports/jobs', parent: app.api.base }),
-]
-```
-
-Serve it in the API process, alongside the queue driver it already wires:
-
-```typescript
-import { serveJobEntrypoints } from '@owlmeans/server-job'
-import { appendRedisQueue } from '@owlmeans/redis-queue'
-
-appendRedisQueue(context)
-serveJobEntrypoints(entrypoints, REPORTS, { queue: REPORT_QUEUE })
-context.registerEntrypoints(entrypoints)
-```
-
-Enqueue with the owner in the payload — that is what every read here filters on:
-
-```typescript
-await context.jobs<ReportJob, ReportResult>(REPORT_QUEUE).create({
-  name: 'report:build',
-  data: { owner: req.auth!.profileId ?? req.auth!.userId, target: id },
-})
-```
-
-And report progress from the processor, so there is something to watch:
-
-```typescript
-worker.process(REPORT_QUEUE, 'report:build', async job => {
-  for (const [done, page] of pages.entries()) {
-    await job.touch()
-    await job.progress({ done, total: pages.length })
-    await render(page)
-  }
-  return { url }
-})
-```
-
-## Ownership
-
-`data.owner` (rename it with `ownerField`) is compared against `auth.profileId ?? auth.userId`.
-A job that exists but belongs to someone else answers exactly as an absent one: `UnknownJob`.
-
-An operator console passes a predicate instead of a permission name:
-
-```typescript
-serveJobEntrypoints(entrypoints, REPORTS, {
-  queue: REPORT_QUEUE,
-  admin: req => req.auth?.scopes?.includes('ops') === true,
-})
-```
-
-## The one gotcha
-
-A `JobEvent` carries no owner, so `watchJobs` attributes each frame by reading its job back. A
-queue configured with `removeOnComplete` has nothing left to read when the completion arrives, and
-an unattributable frame is dropped rather than fanned out. Leave completed jobs in place on any
-queue that is watched.
-
-## Depends On
-
-- [`@owlmeans/queue`](../queue) — `ctx.jobs(queue)`, `JobRecord`, `JobEvent`, `UnknownJob`
-- [`@owlmeans/server-api`](../server-api) — `handleRequest` / `handleParams`
-- [`@owlmeans/server-socket`](../server-socket) — `handleConnection`
-- [`@owlmeans/server-entrypoint`](../server-entrypoint) — `elevate`
-- [`@owlmeans/auth-common`](../auth-common) — `DEFAULT_GUARD`
-
-## Related
-
-- [`@owlmeans/client-job`](../client-job) — the browser half that addresses these entrypoints
-- [`@owlmeans/web-panel`](../web-panel) `./jobs` — `JobProgress`, `JobStatus`, `useJobToasts`
+Declare a group in shared code with `declareJobEntrypoints(root, options)`, then register
+`...serveJobEntrypoints(jobProtocols)` in the API runtime. The package returns local bindings and
+keeps the shared job declarations immutable.
 
 <!-- owlmeans:agent-guidance:start -->
 ## Agent guidance
@@ -105,7 +14,7 @@ This package ships embedded agent skills under `agent-meta/`. After installing y
 your project's skill store (`.agents/skills/`):
 
 ```sh
-npx @owlmeans/agent-skills@^0.1.18-rc.14
+npx @owlmeans/agent-skills@^0.1.18-rc.15
 ```
 
 The embedded files are version-matched to this package release. Do not edit them

package/agent-meta/manifest.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 2,
   "package": "@owlmeans/server-job",
-  "version": "0.1.18-rc.2",
-  "generatedAt": "2026-09-10T23:12:07.514Z",
+  "version": "0.1.18-rc.3",
+  "generatedAt": "2026-09-12T08:39:52.731Z",
   "canonicalRepo": "https://github.com/owlmeans/common",
   "entries": [
     {

package/agent-meta/skills/server-job/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: server-job
-description: How to use @owlmeans/server-job — declaring and elevating the list/get/cancel/watch entrypoints over a queue, the ownership rule that scopes them to the authenticated subject, the admin escape hatch, and the socket that pushes JobEvent frames. Auto-invoked when exposing queue jobs to an application's UI or importing job entrypoint helpers.
+description: How to use @owlmeans/server-job — declaring and binding the list/get/cancel/watch entrypoints over a queue, the ownership rule that scopes them to the authenticated subject, the admin escape hatch, and the socket that pushes JobEvent frames. Auto-invoked when exposing queue jobs to an application's UI or importing job entrypoint helpers.
 user-invocable: false
 ---
 <!-- AUTO-GENERATED — do not edit. Regenerate via sync-agent-meta. -->
@@ -8,10 +8,10 @@ user-invocable: false
 # @owlmeans/server-job
 
 **Layer:** Server
-**Install:** `"@owlmeans/server-job": "^0.1.18-rc.2"` in `dependencies`
+**Install:** `"@owlmeans/server-job": "^0.1.18-rc.3"` in `dependencies`
 
 The READ side of a queue. `@owlmeans/queue` and its driver enqueue and process; this package turns
-what they leave behind into four entrypoints an application elevates, so that "a long job reports
+what they leave behind into four entrypoints an application binds, so that "a long job reports
 progress to the user's screen" is wiring rather than code.
 
 ## Key Exports
@@ -20,8 +20,8 @@ progress to the user's screen" is wiring rather than code.
 |--------|-------------|
 | `declareJobEntrypoints(root, opts?)` | The four declarations of one job group, for the SHARED package |
 | `jobEntrypointAliases(root)` | `{ base, list, get, cancel, watch }` — the alias shape both halves use |
-| `serveJobEntrypoints(entrypoints, root, opts?)` | Elevate the group with this package's handlers |
-| `listJobs(opts?)` / `getJob(opts?)` / `cancelJob(opts?)` | The HTTP handlers, for elevating by hand |
+| `serveJobEntrypoints(jobProtocols, opts?)` | Return the local bindings for one declared job protocol group |
+| `listJobs(opts?)` / `getJob(opts?)` / `cancelJob(opts?)` | The HTTP handlers, for binding by hand |
 | `watchJobs(opts?)` | The socket handler — pushes `JobEvent` frames under `JOB_EVENT` |
 | `jobOwnerOf(req)` / `requireJobOwner(req)` / `jobViewer(req, ctx, opts?)` | Who a request reads as |
 | `jobScope(viewer, opts?)` / `owns(record, viewer, opts?)` / `readOwnedJob(...)` | Applying that to records |
@@ -40,9 +40,9 @@ the package its API and its browser both import, and neither side ever writes a
 import { declareJobEntrypoints } from '@owlmeans/server-job'
 
 export const REPORTS = 'reports'
-export const entrypoints = [
-  ...declareJobEntrypoints(REPORTS, { path: '/reports/jobs', parent: app.api.base }),
-]
+export const protocols = {
+  jobs: declareJobEntrypoints(REPORTS, { path: '/reports/jobs', parent: app.api.base }),
+}
 ```
 
 Aliases are `<root>`, `<root>:list`, `<root>:get`, `<root>:cancel`, `<root>:watch`. **That shape,
@@ -65,15 +65,16 @@ import { serveJobEntrypoints } from '@owlmeans/server-job'
 import { appendRedisQueue } from '@owlmeans/redis-queue'
 
 appendRedisQueue(context)
-serveJobEntrypoints(entrypoints, REPORTS, { queue: REPORT_QUEUE })
-context.registerEntrypoints(entrypoints)
+export const appEntrypoints = [
+  ...serveJobEntrypoints(protocols.jobs, { queue: REPORT_QUEUE }),
+]
+context.registerEntrypoints(appEntrypoints)
 ```
 
-`elevate` replaces in place, so an app wanting one handler of its own elevates that alias again
-afterwards. `queue` names which declared queue the group reads; omitted, `ctx.jobs()` answers with
-the sole declared queue and refuses to guess once there are two. Passing an array that carries no
-group under that root is a `SyntaxError` — the declarations and the serving call must name the same
-root, and they usually do because both read it from one exported constant.
+Pass the declared protocol group, never a flattened or materialized entrypoint list. `serveJobEntrypoints()`
+returns only local bindings; an app wanting a custom handler binds the same protocol afterwards.
+`queue` names which declared queue the group reads; omitted, `ctx.jobs()` answers with the sole
+declared queue and refuses to guess once there are two.
 
 ## The ownership rule
 
@@ -98,7 +99,7 @@ The escape hatch is a predicate, never a permission name — which permission, g
 "operator" is the application's decision:
 
 ```typescript
-serveJobEntrypoints(entrypoints, REPORTS, {
+serveJobEntrypoints(protocols.jobs, {
   queue: REPORT_QUEUE,
   admin: req => req.auth?.scopes?.includes('ops') === true,
 })
@@ -127,9 +128,9 @@ than fanned out to everyone. **Leave completed jobs in place on any queue that i
 ## Depends On
 
 - `@owlmeans/queue` — `ctx.jobs(queue)`, `JobRecord`, `JobEvent`, `JobState`, `UnknownJob`
-- `@owlmeans/server-api` — `handleRequest`, `handleParams`
-- `@owlmeans/server-socket` — `handleConnection`, and the guard enforcement that fills `req.auth`
-- `@owlmeans/server-entrypoint` — `elevate`
+- `@owlmeans/server-api` — `handlers`
+- `@owlmeans/server-socket` — `connection(protocol, callback)` and guard enforcement that fills `req.auth`
+- `@owlmeans/server-entrypoint` — `bind`
 - `@owlmeans/auth-common` — `DEFAULT_GUARD`
 
 ## Related

package/build/actions/cancel.d.ts

@@ -1,6 +1,5 @@
-import type { AbstractResponse } from '@owlmeans/entrypoint';
-import type { RefedEntrypointHandler } from '@owlmeans/server-entrypoint';
-import type { JobHandlerOptions } from '../types.js';
+import { handlers } from '@owlmeans/server-api';
+import type { Context, JobEntrypoints, JobHandlerOptions } from '../types.js';
 /**
  * Cancel a job and answer with what was cancelled.
  *
@@ -11,5 +10,5 @@ import type { JobHandlerOptions } from '../types.js';
  *
  * @throws {UnknownJob}
  */
-export declare const cancelJob: (opts?: JobHandlerOptions) => RefedEntrypointHandler<AbstractResponse<any>>;
+export declare const cancelJob: (protocol: JobEntrypoints['cancel'], opts?: JobHandlerOptions) => ReturnType<ReturnType<typeof handlers<Context>>['params']>;
 //# sourceMappingURL=cancel.d.ts.map

package/build/actions/cancel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cancel.d.ts","sourceRoot":"","sources":["../../src/actions/cancel.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAGpD;;;;;;;;;GASG;AACH,eAAO,MAAM,SAAS,UACb,iBAAiB,KACvB,sBAAsB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAO3C,CAAA"}
+{"version":3,"file":"cancel.d.ts","sourceRoot":"","sources":["../../src/actions/cancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAG7E;;;;;;;;;GASG;AACH,eAAO,MAAM,SAAS,aACV,cAAc,CAAC,QAAQ,CAAC,SAC3B,iBAAiB,KACvB,UAAU,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAOxD,CAAA"}

package/build/actions/cancel.js

@@ -1,4 +1,4 @@
-import { handleParams } from '@owlmeans/server-api';
+import { handlers } from '@owlmeans/server-api';
 import { jobViewer, jobsOf, readOwnedJob } from '../utils/index.js';
 /**
  * Cancel a job and answer with what was cancelled.
@@ -10,7 +10,7 @@ import { jobViewer, jobsOf, readOwnedJob } from '../utils/index.js';
  *
  * @throws {UnknownJob}
  */
-export const cancelJob = (opts) => handleParams(async ({ id }, ctx, req) => {
+export const cancelJob = (protocol, opts) => handlers().params(protocol, async ({ id }, ctx, req) => {
     const resource = jobsOf(ctx, opts);
     // Read first: `take` cannot tell whose job it removed, so ownership is settled before it.
     await readOwnedJob(resource, id, await jobViewer(req, ctx, opts), opts);

package/build/actions/cancel.js.map

@@ -1 +1 @@
-{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../src/actions/cancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAInD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEnE;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,IAAwB,EACuB,EAAE,CACjD,YAAY,CAAiB,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACtD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAClC,0FAA0F;IAC1F,MAAM,YAAY,CAAC,QAAQ,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAA;IAEvE,OAAO,MAAM,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AAChC,CAAC,CAAC,CAAA"}
+{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../src/actions/cancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEnE;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,QAAkC,EAClC,IAAwB,EACoC,EAAE,CAC9D,QAAQ,EAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC9D,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAClC,0FAA0F;IAC1F,MAAM,YAAY,CAAC,QAAQ,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAA;IAEvE,OAAO,MAAM,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AAChC,CAAC,CAAC,CAAA"}

package/build/actions/get.d.ts

@@ -1,10 +1,9 @@
-import type { AbstractResponse } from '@owlmeans/entrypoint';
-import type { RefedEntrypointHandler } from '@owlmeans/server-entrypoint';
-import type { JobHandlerOptions } from '../types.js';
+import { handlers } from '@owlmeans/server-api';
+import type { Context, JobEntrypoints, JobHandlerOptions } from '../types.js';
 /**
  * One job.
  *
  * @throws {UnknownJob} for an id that is absent AND for one that belongs to someone else.
  */
-export declare const getJob: (opts?: JobHandlerOptions) => RefedEntrypointHandler<AbstractResponse<any>>;
+export declare const getJob: (protocol: JobEntrypoints['get'], opts?: JobHandlerOptions) => ReturnType<ReturnType<typeof handlers<Context>>['params']>;
 //# sourceMappingURL=get.d.ts.map

package/build/actions/get.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../src/actions/get.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAGpD;;;;GAIG;AACH,eAAO,MAAM,MAAM,UACV,iBAAiB,KACvB,sBAAsB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAK3C,CAAA"}
+{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../src/actions/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAG7E;;;;GAIG;AACH,eAAO,MAAM,MAAM,aACP,cAAc,CAAC,KAAK,CAAC,SACxB,iBAAiB,KACvB,UAAU,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAKxD,CAAA"}

package/build/actions/get.js

@@ -1,11 +1,11 @@
-import { handleParams } from '@owlmeans/server-api';
+import { handlers } from '@owlmeans/server-api';
 import { jobViewer, jobsOf, readOwnedJob } from '../utils/index.js';
 /**
  * One job.
  *
  * @throws {UnknownJob} for an id that is absent AND for one that belongs to someone else.
  */
-export const getJob = (opts) => handleParams(async ({ id }, ctx, req) => {
+export const getJob = (protocol, opts) => handlers().params(protocol, async ({ id }, ctx, req) => {
     const resource = jobsOf(ctx, opts);
     return await readOwnedJob(resource, id, await jobViewer(req, ctx, opts), opts);
 });

package/build/actions/get.js.map

@@ -1 +1 @@
-{"version":3,"file":"get.js","sourceRoot":"","sources":["../../src/actions/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAInD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEnE;;;;GAIG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CACpB,IAAwB,EACuB,EAAE,CACjD,YAAY,CAAiB,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACtD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAElC,OAAO,MAAM,YAAY,CAAC,QAAQ,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAA;AAChF,CAAC,CAAC,CAAA"}
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../src/actions/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEnE;;;;GAIG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CACpB,QAA+B,EAC/B,IAAwB,EACoC,EAAE,CAC9D,QAAQ,EAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC9D,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAElC,OAAO,MAAM,YAAY,CAAC,QAAQ,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAA;AAChF,CAAC,CAAC,CAAA"}

package/build/actions/list.d.ts

@@ -1,6 +1,5 @@
-import type { AbstractResponse } from '@owlmeans/entrypoint';
-import type { RefedEntrypointHandler } from '@owlmeans/server-entrypoint';
-import type { JobHandlerOptions } from '../types.js';
+import { handlers } from '@owlmeans/server-api';
+import type { Context, JobEntrypoints, JobHandlerOptions } from '../types.js';
 /**
  * The caller's jobs, newest first.
  *
@@ -9,5 +8,5 @@ import type { JobHandlerOptions } from '../types.js';
  * name filters go through the same criteria language as every other resource, so a filter written
  * for this list means the same thing applied to the store the browser holds.
  */
-export declare const listJobs: (opts?: JobHandlerOptions) => RefedEntrypointHandler<AbstractResponse<any>>;
+export declare const listJobs: (protocol: JobEntrypoints['list'], opts?: JobHandlerOptions) => ReturnType<ReturnType<typeof handlers<Context>>['request']>;
 //# sourceMappingURL=list.d.ts.map

package/build/actions/list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../src/actions/list.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAKzE,OAAO,KAAK,EAAE,iBAAiB,EAAgB,MAAM,aAAa,CAAA;AAGlE;;;;;;;GAOG;AACH,eAAO,MAAM,QAAQ,UACZ,iBAAiB,KACvB,sBAAsB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAe7C,CAAA"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../src/actions/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAK/C,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAgB,MAAM,aAAa,CAAA;AAG3F;;;;;;;GAOG;AACH,eAAO,MAAM,QAAQ,aACT,cAAc,CAAC,MAAM,CAAC,SACzB,iBAAiB,KACvB,UAAU,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAe3D,CAAA"}

package/build/actions/list.js

@@ -1,4 +1,4 @@
-import { handleRequest } from '@owlmeans/server-api';
+import { handlers } from '@owlmeans/server-api';
 import { DEFAULT_JOB_SORT } from '../consts.js';
 import { jobScope, jobViewer, jobsOf } from '../utils/index.js';
 /**
@@ -9,7 +9,7 @@ import { jobScope, jobViewer, jobsOf } from '../utils/index.js';
  * name filters go through the same criteria language as every other resource, so a filter written
  * for this list means the same thing applied to the store the browser holds.
  */
-export const listJobs = (opts) => handleRequest(async (req, ctx) => {
+export const listJobs = (protocol, opts) => handlers().request(protocol, async (req, ctx) => {
     const resource = jobsOf(ctx, opts);
     const viewer = await jobViewer(req, ctx, opts);
     const query = (req.query ?? {});

package/build/actions/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/actions/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAMpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE/D;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,IAAwB,EACuB,EAAE,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACnF,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAClC,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;IAC9C,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAiB,CAAA;IAE/C,MAAM,KAAK,GAAwB;QACjC,GAAG,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC;QACzB,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACpD,CAAA;IAED,OAAO,MAAM,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE;QAChC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAClD,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC3E,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/actions/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAI/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE/D;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,QAAgC,EAChC,IAAwB,EACqC,EAAE,CAAC,QAAQ,EAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACzH,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAClC,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;IAC9C,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAiB,CAAA;IAE/C,MAAM,KAAK,GAAwB;QACjC,GAAG,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC;QACzB,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACpD,CAAA;IAED,OAAO,MAAM,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE;QAChC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAClD,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC3E,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/build/actions/watch.d.ts

@@ -1,6 +1,5 @@
-import type { AbstractResponse } from '@owlmeans/entrypoint';
-import type { RefedEntrypointHandler } from '@owlmeans/server-entrypoint';
-import type { JobHandlerOptions } from '../types.js';
+import { connection } from '@owlmeans/server-socket';
+import type { JobEntrypoints, JobHandlerOptions } from '../types.js';
 /**
  * Push this caller's job lifecycle events down a socket.
  *
@@ -13,5 +12,5 @@ import type { JobHandlerOptions } from '../types.js';
  * attributed by is gone by the time the event arrives, and an unattributable event is dropped
  * rather than fanned out to everyone. Leave completed jobs in place on any queue that is watched.
  */
-export declare const watchJobs: (opts?: JobHandlerOptions) => RefedEntrypointHandler<AbstractResponse<any>>;
+export declare const watchJobs: (protocol: JobEntrypoints['watch'], opts?: JobHandlerOptions) => ReturnType<typeof connection>;
 //# sourceMappingURL=watch.d.ts.map

package/build/actions/watch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/actions/watch.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAKzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAGpD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,SAAS,UACb,iBAAiB,KACvB,sBAAsB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAyC7C,CAAA"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/actions/watch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAKpD,OAAO,KAAK,EAAW,cAAc,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAG7E;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,SAAS,aACV,cAAc,CAAC,OAAO,CAAC,SAC1B,iBAAiB,KACvB,UAAU,CAAC,OAAO,UAAU,CAyC7B,CAAA"}

package/build/actions/watch.js

@@ -1,4 +1,4 @@
-import { handleConnection } from '@owlmeans/server-socket';
+import { connection } from '@owlmeans/server-socket';
 import { MessageType } from '@owlmeans/socket';
 import { JOB_EVENT } from '../consts.js';
 import { jobViewer, jobsOf, owns } from '../utils/index.js';
@@ -14,7 +14,7 @@ import { jobViewer, jobsOf, owns } from '../utils/index.js';
  * attributed by is gone by the time the event arrives, and an unattributable event is dropped
  * rather than fanned out to everyone. Leave completed jobs in place on any queue that is watched.
  */
-export const watchJobs = (opts) => handleConnection(async (conn, ctx, req) => {
+export const watchJobs = (protocol, opts) => connection(protocol, async (conn, ctx, req) => {
     const resource = jobsOf(ctx, opts);
     const viewer = await jobViewer(req, ctx, opts);
     const mine = new Set();

package/build/actions/watch.js.map

@@ -1 +1 @@
-{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../src/actions/watch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAI1D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAE3D;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,IAAwB,EACuB,EAAE,CAAC,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC5F,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAClC,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;IAC9C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAA;IAE9B,MAAM,YAAY,GAAG,KAAK,EAAE,KAAe,EAAoB,EAAE;QAC/D,IAAI,MAAM,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;YACzC,OAAO,IAAI,CAAA;QACb,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAC5C,IAAI,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC;YAClD,OAAO,KAAK,CAAA;QACd,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAElB,OAAO,IAAI,CAAA;IACb,CAAC,CAAA;IAED,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACzD,IAAI,CAAC;YACH,IAAI,MAAM,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC9B,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;YACrC,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,MAAM,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QAC1B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChC,OAAM;QACR,CAAC;QACD,MAAM,GAAG,GAAG,OAA6B,CAAA;QACzC,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,CAAC,MAAM,IAAI,GAAG,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;YAC7D,IAAI,CAAC;gBACH,MAAM,WAAW,EAAE,CAAA;YACrB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,CAAC,CAAC,CAAA;YAClD,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../src/actions/watch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAE3D;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,QAAiC,EACjC,IAAwB,EACO,EAAE,CAAC,UAAU,CAA2B,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC1G,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAClC,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;IAC9C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAA;IAE9B,MAAM,YAAY,GAAG,KAAK,EAAE,KAAe,EAAoB,EAAE;QAC/D,IAAI,MAAM,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;YACzC,OAAO,IAAI,CAAA;QACb,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAC5C,IAAI,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC;YAClD,OAAO,KAAK,CAAA;QACd,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAElB,OAAO,IAAI,CAAA;IACb,CAAC,CAAA;IAED,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACzD,IAAI,CAAC;YACH,IAAI,MAAM,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC9B,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;YACrC,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,MAAM,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QAC1B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChC,OAAM;QACR,CAAC;QACD,MAAM,GAAG,GAAG,OAA6B,CAAA;QACzC,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,CAAC,MAAM,IAAI,GAAG,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;YAC7D,IAAI,CAAC;gBACH,MAAM,WAAW,EAAE,CAAA;YACrB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,CAAC,CAAC,CAAA;YAClD,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/build/entrypoints.d.ts

@@ -1,5 +1,4 @@
-import type { CommonEntrypoint } from '@owlmeans/entrypoint';
-import type { JobEntrypointAliases, JobEntrypointOptions } from './types.js';
+import type { JobEntrypointAliases, JobEntrypoints, JobEntrypointOptions } from './types.js';
 /**
  * The aliases one job group answers under.
  *
@@ -11,11 +10,11 @@ export declare const jobEntrypointAliases: (root: string) => JobEntrypointAliase
  * Declare the list/get/cancel/watch entrypoints of one job group.
  *
  * It belongs in the SHARED package of a target app — the one both the API and the browser import —
- * so that the server elevates and the client calls the very declarations, and neither side ever
+ * so that the server binds and the client calls the very declarations, and neither side ever
  * writes a path. Declaring a second group is the same call with another root.
  *
  * The guard rides on the base alone: guards are inherited, so stating it once is what keeps the
  * four from drifting apart.
  */
-export declare const declareJobEntrypoints: (root: string, opts?: JobEntrypointOptions) => CommonEntrypoint[];
+export declare const declareJobEntrypoints: (root: string, opts?: JobEntrypointOptions) => JobEntrypoints;
 //# sourceMappingURL=entrypoints.d.ts.map

package/build/entrypoints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entrypoints.d.ts","sourceRoot":"","sources":["../src/entrypoints.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAM5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAE5E;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,SAAU,MAAM,KAAG,oBAMlD,CAAA;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,qBAAqB,SAC1B,MAAM,SAAS,oBAAoB,KACxC,gBAAgB,EAoBlB,CAAA"}
+{"version":3,"file":"entrypoints.d.ts","sourceRoot":"","sources":["../src/entrypoints.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,oBAAoB,EAAE,cAAc,EAAE,oBAAoB,EAAgB,MAAM,YAAY,CAAA;AAE1G;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,SAAU,MAAM,KAAG,oBAMlD,CAAA;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,qBAAqB,SAC1B,MAAM,SAAS,oBAAoB,KACxC,cA0BF,CAAA"}

package/build/entrypoints.js

@@ -1,4 +1,4 @@
-import { entrypoint, filter, guard, query } from '@owlmeans/entrypoint';
+import { contract, openProtocol, protocol, typed } from '@owlmeans/entrypoint';
 import { backend, route, RouteMethod, socket } from '@owlmeans/route';
 import { DEFAULT_GUARD } from '@owlmeans/auth-common';
 import { DEFAULT_JOB_PATH } from './consts.js';
@@ -20,7 +20,7 @@ export const jobEntrypointAliases = (root) => ({
  * Declare the list/get/cancel/watch entrypoints of one job group.
  *
  * It belongs in the SHARED package of a target app — the one both the API and the browser import —
- * so that the server elevates and the client calls the very declarations, and neither side ever
+ * so that the server binds and the client calls the very declarations, and neither side ever
  * writes a path. Declaring a second group is the same call with another root.
  *
  * The guard rides on the base alone: guards are inherited, so stating it once is what keeps the
@@ -32,15 +32,15 @@ export const declareJobEntrypoints = (root, opts) => {
         ...(opts?.parent != null ? { parent: opts.parent } : {}),
         ...(opts?.service != null ? { service: opts.service } : {}),
     };
-    const guarded = opts?.guard === null ? undefined : guard(opts?.guard ?? DEFAULT_GUARD);
-    return [
-        entrypoint(route(aliases.base, opts?.path ?? DEFAULT_JOB_PATH, backend(base)), guarded),
-        entrypoint(route(aliases.list, '/', backend(aliases.base)), filter(query(JobListQuerySchema))),
+    const guarded = opts?.guard === null ? undefined : { guards: opts?.guard ?? DEFAULT_GUARD };
+    return {
+        base: openProtocol(route(aliases.base, opts?.path ?? DEFAULT_JOB_PATH, backend(base)), guarded),
+        list: protocol(route(aliases.list, '/', backend(aliases.base)), contract.request({ query: typed(JobListQuerySchema) }, typed())),
         // Static before parametric, so `/watch` is not swallowed by `/:id`. The router picks the
         // static branch on its own; the order here is for whoever reads the declaration.
-        entrypoint(route(aliases.watch, '/watch', socket(aliases.base))),
-        entrypoint(route(aliases.get, '/:id', backend(aliases.base))),
-        entrypoint(route(aliases.cancel, '/:id', backend(aliases.base, RouteMethod.DELETE))),
-    ];
+        watch: protocol(route(aliases.watch, '/watch', socket(aliases.base)), contract(typed())),
+        get: protocol(route(aliases.get, '/:id', backend(aliases.base)), contract.request({ params: typed() }, typed())),
+        cancel: protocol(route(aliases.cancel, '/:id', backend(aliases.base, RouteMethod.DELETE)), contract.request({ params: typed() }, typed())),
+    };
 };
 //# sourceMappingURL=entrypoints.js.map

package/build/entrypoints.js.map

@@ -1 +1 @@
-{"version":3,"file":"entrypoints.js","sourceRoot":"","sources":["../src/entrypoints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAEvE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAGjD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAwB,EAAE,CAAC,CAAC;IAC3E,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,GAAG,IAAI,OAAO;IACpB,GAAG,EAAE,GAAG,IAAI,MAAM;IAClB,MAAM,EAAE,GAAG,IAAI,SAAS;IACxB,KAAK,EAAE,GAAG,IAAI,QAAQ;CACvB,CAAC,CAAA;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,IAAY,EAAE,IAA2B,EACrB,EAAE;IACtB,MAAM,OAAO,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAA;IAC1C,MAAM,IAAI,GAA0B;QAClC,GAAG,CAAC,IAAI,EAAE,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,GAAG,CAAC,IAAI,EAAE,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC5D,CAAA;IACD,MAAM,OAAO,GAAG,IAAI,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,IAAI,aAAa,CAAC,CAAA;IAEtF,OAAO;QACL,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC;QACvF,UAAU,CACR,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAC/C,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAClC;QACD,yFAAyF;QACzF,iFAAiF;QACjF,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAChE,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7D,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;KACrF,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"entrypoints.js","sourceRoot":"","sources":["../src/entrypoints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAC9E,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAGjD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAwB,EAAE,CAAC,CAAC;IAC3E,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,GAAG,IAAI,OAAO;IACpB,GAAG,EAAE,GAAG,IAAI,MAAM;IAClB,MAAM,EAAE,GAAG,IAAI,SAAS;IACxB,KAAK,EAAE,GAAG,IAAI,QAAQ;CACvB,CAAC,CAAA;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,IAAY,EAAE,IAA2B,EACzB,EAAE;IAClB,MAAM,OAAO,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAA;IAC1C,MAAM,IAAI,GAA0B;QAClC,GAAG,CAAC,IAAI,EAAE,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,GAAG,CAAC,IAAI,EAAE,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC5D,CAAA;IACD,MAAM,OAAO,GAAG,IAAI,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,IAAI,aAAa,EAAE,CAAA;IAE3F,OAAO;QACL,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC;QAC/F,IAAI,EAAE,QAAQ,CACZ,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAC/C,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,CAAe,kBAAkB,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAC9E;QACD,yFAAyF;QACzF,iFAAiF;QACjF,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAQ,CAAC,CAAC;QAC9F,GAAG,EAAE,QAAQ,CACX,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EACjD,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAkB,EAAE,EAAE,KAAK,EAAE,CAAC,CAC/D;QACD,MAAM,EAAE,QAAQ,CACd,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,EACxE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAkB,EAAE,EAAE,KAAK,EAAE,CAAC,CAC/D;KACF,CAAA;AACH,CAAC,CAAA"}

package/build/helper.d.ts

@@ -1,14 +1,12 @@
-import type { ServerEntrypoint } from '@owlmeans/server-entrypoint';
-import type { CommonEntrypoint } from '@owlmeans/entrypoint';
-import type { JobHandlerOptions } from './types.js';
+import type { JobEntrypoints, JobHandlerOptions } from './types.js';
 /**
  * Attach this package's handlers to a group declared by {@link declareJobEntrypoints}.
  *
  * The whole server half of "a long job reports progress to the user's screen" is this call plus
  * the queue driver an app already wires — nothing is subclassed, and an app that wants one
- * handler of its own elevates that alias itself afterwards, since `elevate` replaces in place.
+ * handler of its own binds that alias itself afterwards.
  *
  * @throws {SyntaxError} when the array carries no group under that root.
  */
-export declare const serveJobEntrypoints: <R>(entrypoints: (CommonEntrypoint | ServerEntrypoint<R>)[], root: string, opts?: JobHandlerOptions) => ServerEntrypoint<R>[];
+export declare const serveJobEntrypoints: (entrypoints: JobEntrypoints, opts?: JobHandlerOptions) => import("@owlmeans/server-entrypoint").ServerProtocolEntrypoint<import("@owlmeans/entrypoint").EntrypointProtocolDeclaration>[];
 //# sourceMappingURL=helper.d.ts.map

package/build/helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAG5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,GAAI,CAAC,eACtB,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,MAAM,SAAS,iBAAiB,KAC9F,gBAAgB,CAAC,CAAC,CAAC,EASrB,CAAA"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnE;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,gBAAiB,cAAc,SAAS,iBAAiB,mIAMxF,CAAA"}

package/build/helper.js

@@ -1,21 +1,19 @@
-import { elevate } from '@owlmeans/server-entrypoint';
-import { jobEntrypointAliases } from './entrypoints.js';
+import { bind } from '@owlmeans/server-entrypoint';
 import { cancelJob, getJob, listJobs, watchJobs } from './actions/index.js';
 /**
  * Attach this package's handlers to a group declared by {@link declareJobEntrypoints}.
  *
  * The whole server half of "a long job reports progress to the user's screen" is this call plus
  * the queue driver an app already wires — nothing is subclassed, and an app that wants one
- * handler of its own elevates that alias itself afterwards, since `elevate` replaces in place.
+ * handler of its own binds that alias itself afterwards.
  *
  * @throws {SyntaxError} when the array carries no group under that root.
  */
-export const serveJobEntrypoints = (entrypoints, root, opts) => {
-    const aliases = jobEntrypointAliases(root);
-    elevate(entrypoints, aliases.base);
-    elevate(entrypoints, aliases.list, listJobs(opts));
-    elevate(entrypoints, aliases.watch, watchJobs(opts));
-    elevate(entrypoints, aliases.get, getJob(opts));
-    return elevate(entrypoints, aliases.cancel, cancelJob(opts));
-};
+export const serveJobEntrypoints = (entrypoints, opts) => [
+    bind(entrypoints.base),
+    bind(entrypoints.list, listJobs(entrypoints.list, opts)),
+    bind(entrypoints.watch, watchJobs(entrypoints.watch, opts)),
+    bind(entrypoints.get, getJob(entrypoints.get, opts)),
+    bind(entrypoints.cancel, cancelJob(entrypoints.cancel, opts)),
+];
 //# sourceMappingURL=helper.js.map

package/build/helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AAGrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAG3E;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,WAAuD,EAAE,IAAY,EAAE,IAAwB,EACxE,EAAE;IACzB,MAAM,OAAO,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAA;IAE1C,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;IAClC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;IAClD,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAA;IACpD,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;IAE/C,OAAO,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAA;AAC9D,CAAC,CAAA"}
+{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAG3E;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,WAA2B,EAAE,IAAwB,EAAE,EAAE,CAAC;IAC5F,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IACtB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACxD,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC3D,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACpD,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC9D,CAAA"}

package/build/types.d.ts

@@ -3,6 +3,7 @@ import type { AbstractRequest } from '@owlmeans/entrypoint';
 import type { QueueAppend, QueueConfig } from '@owlmeans/queue';
 import type { ApiServerAppend } from '@owlmeans/server-api';
 import type { ServerConfig, ServerContext } from '@owlmeans/server-context';
+import type { EntrypointProtocol, OpenRequest, OpenValue } from '@owlmeans/entrypoint';
 export interface Config extends ServerConfig {
     queue?: QueueConfig;
 }
@@ -16,6 +17,24 @@ export interface JobEntrypointAliases {
     cancel: string;
     watch: string;
 }
+/** The immutable declarations for one job group, addressed by property rather than alias lookup. */
+export interface JobEntrypoints {
+    base: EntrypointProtocol<OpenRequest, OpenValue>;
+    list: EntrypointProtocol<{
+        query: JobListQuery;
+    }, unknown>;
+    get: EntrypointProtocol<{
+        params: {
+            id: string;
+        };
+    }, unknown>;
+    cancel: EntrypointProtocol<{
+        params: {
+            id: string;
+        };
+    }, unknown>;
+    watch: EntrypointProtocol<OpenRequest, void>;
+}
 export interface JobEntrypointOptions {
     /** The path segment the group answers under. Defaults to `/jobs`. */
     path?: string;

package/build/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAE3E,MAAM,WAAW,MAAO,SAAQ,YAAY;IAC1C,KAAK,CAAC,EAAE,WAAW,CAAA;CACpB;AAED,MAAM,WAAW,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,aAAa,CAAC,CAAC,CAAC,EAC1E,eAAe,EAAE,WAAW;CAAI;AAElC,gGAAgG;AAChG,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,oBAAoB;IACnC,qEAAqE;IACrE,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,wFAAwF;IACxF,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACtB;AAED,8DAA8D;AAC9D,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,YAAY,CAAC,WAAW,CAAC,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CACnF;AAED,MAAM,WAAW,iBAAiB;IAChC,uFAAuF;IACvF,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,mFAAmF;IACnF,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,qFAAqF;IACrF,KAAK,CAAC,EAAE,aAAa,CAAA;CACtB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAEtF,MAAM,WAAW,MAAO,SAAQ,YAAY;IAC1C,KAAK,CAAC,EAAE,WAAW,CAAA;CACpB;AAED,MAAM,WAAW,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,aAAa,CAAC,CAAC,CAAC,EAC1E,eAAe,EAAE,WAAW;CAAI;AAElC,gGAAgG;AAChG,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;CACd;AAED,oGAAoG;AACpG,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,kBAAkB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;IAChD,IAAI,EAAE,kBAAkB,CAAC;QAAE,KAAK,EAAE,YAAY,CAAA;KAAE,EAAE,OAAO,CAAC,CAAA;IAC1D,GAAG,EAAE,kBAAkB,CAAC;QAAE,MAAM,EAAE;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,EAAE,OAAO,CAAC,CAAA;IAC5D,MAAM,EAAE,kBAAkB,CAAC;QAAE,MAAM,EAAE;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,EAAE,OAAO,CAAC,CAAA;IAC/D,KAAK,EAAE,kBAAkB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;CAC7C;AAED,MAAM,WAAW,oBAAoB;IACnC,qEAAqE;IACrE,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,wFAAwF;IACxF,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACtB;AAED,8DAA8D;AAC9D,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,YAAY,CAAC,WAAW,CAAC,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CACnF;AAED,MAAM,WAAW,iBAAiB;IAChC,uFAAuF;IACvF,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,mFAAmF;IACnF,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,qFAAqF;IACrF,KAAK,CAAC,EAAE,aAAa,CAAA;CACtB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/server-job",
-  "version": "0.1.18-rc.2",
+  "version": "0.1.18-rc.3",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -30,17 +30,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@owlmeans/auth": "^0.1.18-rc.11",
-    "@owlmeans/auth-common": "^0.1.18-rc.15",
-    "@owlmeans/context": "^0.1.18-rc.10",
-    "@owlmeans/entrypoint": "^0.1.18-rc.13",
-    "@owlmeans/queue": "^0.1.18-rc.11",
-    "@owlmeans/resource": "^0.1.18-rc.11",
-    "@owlmeans/route": "^0.1.18-rc.11",
-    "@owlmeans/server-api": "^0.1.18-rc.19",
-    "@owlmeans/server-context": "^0.1.18-rc.14",
-    "@owlmeans/server-entrypoint": "^0.1.18-rc.13",
-    "@owlmeans/server-socket": "^0.1.18-rc.20",
-    "@owlmeans/socket": "^0.1.18-rc.11"
+    "@owlmeans/auth": "^0.1.18-rc.12",
+    "@owlmeans/auth-common": "^0.1.18-rc.16",
+    "@owlmeans/context": "^0.1.18-rc.11",
+    "@owlmeans/entrypoint": "^0.1.18-rc.14",
+    "@owlmeans/queue": "^0.1.18-rc.12",
+    "@owlmeans/resource": "^0.1.18-rc.12",
+    "@owlmeans/route": "^0.1.18-rc.12",
+    "@owlmeans/server-api": "^0.1.18-rc.20",
+    "@owlmeans/server-context": "^0.1.18-rc.15",
+    "@owlmeans/server-entrypoint": "^0.1.18-rc.14",
+    "@owlmeans/server-socket": "^0.1.18-rc.21",
+    "@owlmeans/socket": "^0.1.18-rc.12"
   }
 }

package/src/actions/cancel.ts

@@ -1,7 +1,5 @@
-import { handleParams } from '@owlmeans/server-api'
-import type { AbstractResponse } from '@owlmeans/entrypoint'
-import type { RefedEntrypointHandler } from '@owlmeans/server-entrypoint'
-import type { JobHandlerOptions } from '../types.js'
+import { handlers } from '@owlmeans/server-api'
+import type { Context, JobEntrypoints, JobHandlerOptions } from '../types.js'
 import { jobViewer, jobsOf, readOwnedJob } from '../utils/index.js'
 
 /**
@@ -15,9 +13,10 @@ import { jobViewer, jobsOf, readOwnedJob } from '../utils/index.js'
  * @throws {UnknownJob}
  */
 export const cancelJob = (
+  protocol: JobEntrypoints['cancel'],
   opts?: JobHandlerOptions
-): RefedEntrypointHandler<AbstractResponse<any>> =>
-  handleParams<{ id: string }>(async ({ id }, ctx, req) => {
+): ReturnType<ReturnType<typeof handlers<Context>>['params']> =>
+  handlers<Context>().params(protocol, async ({ id }, ctx, req) => {
     const resource = jobsOf(ctx, opts)
     // Read first: `take` cannot tell whose job it removed, so ownership is settled before it.
     await readOwnedJob(resource, id, await jobViewer(req, ctx, opts), opts)

package/src/actions/get.ts

@@ -1,7 +1,5 @@
-import { handleParams } from '@owlmeans/server-api'
-import type { AbstractResponse } from '@owlmeans/entrypoint'
-import type { RefedEntrypointHandler } from '@owlmeans/server-entrypoint'
-import type { JobHandlerOptions } from '../types.js'
+import { handlers } from '@owlmeans/server-api'
+import type { Context, JobEntrypoints, JobHandlerOptions } from '../types.js'
 import { jobViewer, jobsOf, readOwnedJob } from '../utils/index.js'
 
 /**
@@ -10,9 +8,10 @@ import { jobViewer, jobsOf, readOwnedJob } from '../utils/index.js'
  * @throws {UnknownJob} for an id that is absent AND for one that belongs to someone else.
  */
 export const getJob = (
+  protocol: JobEntrypoints['get'],
   opts?: JobHandlerOptions
-): RefedEntrypointHandler<AbstractResponse<any>> =>
-  handleParams<{ id: string }>(async ({ id }, ctx, req) => {
+): ReturnType<ReturnType<typeof handlers<Context>>['params']> =>
+  handlers<Context>().params(protocol, async ({ id }, ctx, req) => {
     const resource = jobsOf(ctx, opts)
 
     return await readOwnedJob(resource, id, await jobViewer(req, ctx, opts), opts)

package/src/actions/list.ts

@@ -1,11 +1,9 @@
-import { handleRequest } from '@owlmeans/server-api'
-import type { AbstractResponse } from '@owlmeans/entrypoint'
-import type { RefedEntrypointHandler } from '@owlmeans/server-entrypoint'
+import { handlers } from '@owlmeans/server-api'
 import type { Criteria } from '@owlmeans/resource'
 import type { JobRecord } from '@owlmeans/queue'
 import type { JobState } from '@owlmeans/queue'
 import { DEFAULT_JOB_SORT } from '../consts.js'
-import type { JobHandlerOptions, JobListQuery } from '../types.js'
+import type { Context, JobEntrypoints, JobHandlerOptions, JobListQuery } from '../types.js'
 import { jobScope, jobViewer, jobsOf } from '../utils/index.js'
 
 /**
@@ -17,8 +15,9 @@ import { jobScope, jobViewer, jobsOf } from '../utils/index.js'
  * for this list means the same thing applied to the store the browser holds.
  */
 export const listJobs = (
+  protocol: JobEntrypoints['list'],
   opts?: JobHandlerOptions
-): RefedEntrypointHandler<AbstractResponse<any>> => handleRequest(async (req, ctx) => {
+): ReturnType<ReturnType<typeof handlers<Context>>['request']> => handlers<Context>().request(protocol, async (req, ctx) => {
   const resource = jobsOf(ctx, opts)
   const viewer = await jobViewer(req, ctx, opts)
   const query = (req.query ?? {}) as JobListQuery

package/src/actions/watch.ts

@@ -1,11 +1,9 @@
-import { handleConnection } from '@owlmeans/server-socket'
-import type { AbstractResponse } from '@owlmeans/entrypoint'
-import type { RefedEntrypointHandler } from '@owlmeans/server-entrypoint'
+import { connection } from '@owlmeans/server-socket'
 import type { EventMessage } from '@owlmeans/socket'
 import { MessageType } from '@owlmeans/socket'
 import type { JobEvent } from '@owlmeans/queue'
 import { JOB_EVENT } from '../consts.js'
-import type { JobHandlerOptions } from '../types.js'
+import type { Context, JobEntrypoints, JobHandlerOptions } from '../types.js'
 import { jobViewer, jobsOf, owns } from '../utils/index.js'
 
 /**
@@ -21,8 +19,9 @@ import { jobViewer, jobsOf, owns } from '../utils/index.js'
  * rather than fanned out to everyone. Leave completed jobs in place on any queue that is watched.
  */
 export const watchJobs = (
+  protocol: JobEntrypoints['watch'],
   opts?: JobHandlerOptions
-): RefedEntrypointHandler<AbstractResponse<any>> => handleConnection(async (conn, ctx, req) => {
+): ReturnType<typeof connection> => connection<typeof protocol, Context>(protocol, async (conn, ctx, req) => {
   const resource = jobsOf(ctx, opts)
   const viewer = await jobViewer(req, ctx, opts)
   const mine = new Set<string>()

package/src/entrypoints.ts

@@ -1,11 +1,10 @@
-import { entrypoint, filter, guard, query } from '@owlmeans/entrypoint'
-import type { CommonEntrypoint } from '@owlmeans/entrypoint'
+import { contract, openProtocol, protocol, typed } from '@owlmeans/entrypoint'
 import { backend, route, RouteMethod, socket } from '@owlmeans/route'
 import type { RouteOptions } from '@owlmeans/route'
 import { DEFAULT_GUARD } from '@owlmeans/auth-common'
 import { DEFAULT_JOB_PATH } from './consts.js'
 import { JobListQuerySchema } from './schemas.js'
-import type { JobEntrypointAliases, JobEntrypointOptions } from './types.js'
+import type { JobEntrypointAliases, JobEntrypoints, JobEntrypointOptions, JobListQuery } from './types.js'
 
 /**
  * The aliases one job group answers under.
@@ -25,7 +24,7 @@ export const jobEntrypointAliases = (root: string): JobEntrypointAliases => ({
  * Declare the list/get/cancel/watch entrypoints of one job group.
  *
  * It belongs in the SHARED package of a target app — the one both the API and the browser import —
- * so that the server elevates and the client calls the very declarations, and neither side ever
+ * so that the server binds and the client calls the very declarations, and neither side ever
  * writes a path. Declaring a second group is the same call with another root.
  *
  * The guard rides on the base alone: guards are inherited, so stating it once is what keeps the
@@ -33,24 +32,30 @@ export const jobEntrypointAliases = (root: string): JobEntrypointAliases => ({
  */
 export const declareJobEntrypoints = (
   root: string, opts?: JobEntrypointOptions
-): CommonEntrypoint[] => {
+): JobEntrypoints => {
   const aliases = jobEntrypointAliases(root)
   const base: Partial<RouteOptions> = {
     ...(opts?.parent != null ? { parent: opts.parent } : {}),
     ...(opts?.service != null ? { service: opts.service } : {}),
   }
-  const guarded = opts?.guard === null ? undefined : guard(opts?.guard ?? DEFAULT_GUARD)
+  const guarded = opts?.guard === null ? undefined : { guards: opts?.guard ?? DEFAULT_GUARD }
 
-  return [
-    entrypoint(route(aliases.base, opts?.path ?? DEFAULT_JOB_PATH, backend(base)), guarded),
-    entrypoint(
+  return {
+    base: openProtocol(route(aliases.base, opts?.path ?? DEFAULT_JOB_PATH, backend(base)), guarded),
+    list: protocol(
       route(aliases.list, '/', backend(aliases.base)),
-      filter(query(JobListQuerySchema))
+      contract.request({ query: typed<JobListQuery>(JobListQuerySchema) }, typed())
     ),
     // Static before parametric, so `/watch` is not swallowed by `/:id`. The router picks the
     // static branch on its own; the order here is for whoever reads the declaration.
-    entrypoint(route(aliases.watch, '/watch', socket(aliases.base))),
-    entrypoint(route(aliases.get, '/:id', backend(aliases.base))),
-    entrypoint(route(aliases.cancel, '/:id', backend(aliases.base, RouteMethod.DELETE))),
-  ]
+    watch: protocol(route(aliases.watch, '/watch', socket(aliases.base)), contract(typed<void>())),
+    get: protocol(
+      route(aliases.get, '/:id', backend(aliases.base)),
+      contract.request({ params: typed<{ id: string }>() }, typed())
+    ),
+    cancel: protocol(
+      route(aliases.cancel, '/:id', backend(aliases.base, RouteMethod.DELETE)),
+      contract.request({ params: typed<{ id: string }>() }, typed())
+    ),
+  }
 }

package/src/helper.ts

@@ -1,28 +1,20 @@
-import { elevate } from '@owlmeans/server-entrypoint'
-import type { ServerEntrypoint } from '@owlmeans/server-entrypoint'
-import type { CommonEntrypoint } from '@owlmeans/entrypoint'
-import { jobEntrypointAliases } from './entrypoints.js'
+import { bind } from '@owlmeans/server-entrypoint'
 import { cancelJob, getJob, listJobs, watchJobs } from './actions/index.js'
-import type { JobHandlerOptions } from './types.js'
+import type { JobEntrypoints, JobHandlerOptions } from './types.js'
 
 /**
  * Attach this package's handlers to a group declared by {@link declareJobEntrypoints}.
  *
  * The whole server half of "a long job reports progress to the user's screen" is this call plus
  * the queue driver an app already wires — nothing is subclassed, and an app that wants one
- * handler of its own elevates that alias itself afterwards, since `elevate` replaces in place.
+ * handler of its own binds that alias itself afterwards.
  *
  * @throws {SyntaxError} when the array carries no group under that root.
  */
-export const serveJobEntrypoints = <R>(
-  entrypoints: (CommonEntrypoint | ServerEntrypoint<R>)[], root: string, opts?: JobHandlerOptions
-): ServerEntrypoint<R>[] => {
-  const aliases = jobEntrypointAliases(root)
-
-  elevate(entrypoints, aliases.base)
-  elevate(entrypoints, aliases.list, listJobs(opts))
-  elevate(entrypoints, aliases.watch, watchJobs(opts))
-  elevate(entrypoints, aliases.get, getJob(opts))
-
-  return elevate(entrypoints, aliases.cancel, cancelJob(opts))
-}
+export const serveJobEntrypoints = (entrypoints: JobEntrypoints, opts?: JobHandlerOptions) => [
+  bind(entrypoints.base),
+  bind(entrypoints.list, listJobs(entrypoints.list, opts)),
+  bind(entrypoints.watch, watchJobs(entrypoints.watch, opts)),
+  bind(entrypoints.get, getJob(entrypoints.get, opts)),
+  bind(entrypoints.cancel, cancelJob(entrypoints.cancel, opts)),
+]

package/src/types.ts

@@ -3,6 +3,7 @@ import type { AbstractRequest } from '@owlmeans/entrypoint'
 import type { QueueAppend, QueueConfig } from '@owlmeans/queue'
 import type { ApiServerAppend } from '@owlmeans/server-api'
 import type { ServerConfig, ServerContext } from '@owlmeans/server-context'
+import type { EntrypointProtocol, OpenRequest, OpenValue } from '@owlmeans/entrypoint'
 
 export interface Config extends ServerConfig {
   queue?: QueueConfig
@@ -20,6 +21,15 @@ export interface JobEntrypointAliases {
   watch: string
 }
 
+/** The immutable declarations for one job group, addressed by property rather than alias lookup. */
+export interface JobEntrypoints {
+  base: EntrypointProtocol<OpenRequest, OpenValue>
+  list: EntrypointProtocol<{ query: JobListQuery }, unknown>
+  get: EntrypointProtocol<{ params: { id: string } }, unknown>
+  cancel: EntrypointProtocol<{ params: { id: string } }, unknown>
+  watch: EntrypointProtocol<OpenRequest, void>
+}
+
 export interface JobEntrypointOptions {
   /** The path segment the group answers under. Defaults to `/jobs`. */
   path?: string