@toa.io/extensions.exposition 1.0.0-alpha.284 → 1.0.0-alpha.286

package/features/steps/Realtime.ts

@@ -4,7 +4,7 @@ import tsflow from 'cucumber-tsflow'
 
 import { Factory } from '@toa.io/extensions.realtime'
 import * as boot from '@toa.io/boot'
-import { match } from '@toa.io/generic'
+import { match, timeout } from '@toa.io/generic'
 import { load as parse } from 'js-yaml'
 import { Agent } from '@toa.io/agent'
 import { Parameters } from './Parameters.js'
@@ -23,13 +23,13 @@ export class Realtime {
   private log: Record<string, unknown[]> = {}
   private aborted = false
 
-  public constructor (gateway: Gateway, parameters: Parameters, captures: Captures) {
+  public constructor(gateway: Gateway, parameters: Parameters, captures: Captures) {
     this.gateway = gateway
     this.agent = new Agent(parameters.origin, captures)
   }
 
   @given('the Realtime is running with the following annotation:')
-  public async start (yaml: string): Promise<void> {
+  public async start(yaml: string): Promise<void> {
     await Realtime.stop()
 
     const annotation = parse(yaml) as Record<string, string>
@@ -50,25 +50,20 @@ export class Realtime {
   }
 
   @given('the identity {word} is consuming realtime events')
-  public async connect (name: string): Promise<void> {
+  public async connect(name: string): Promise<void> {
     await this.gateway.start()
 
     const id = await this.createIdentity(name)
 
-    const parts = await this.agent.parts(`
-      GET /realtime/streams/\${{ ${name}.id }}/ HTTP/1.1
-      authorization: Token \${{ ${name}.token }}
-      accept: application/json
-    `) as AsyncIterable<Uint8Array>
+    const parts = await this.open(name)
 
     void this.consume(id, parts).catch((e) => {
-      if (!this.aborted)
-        console.debug('Consumption interrupted', e)
+      if (!this.aborted) console.debug('Consumption interrupted', e)
     })
   }
 
   @then('the following event `{word}` is received by {word}:')
-  public async received (label: string, name: string, yaml: string): Promise<void> {
+  public async received(label: string, name: string, yaml: string): Promise<void> {
     const id = this.agent.captures.get(`${name}.id`)
     const tag = `${id}:${label}`
     const expected = parse(yaml)
@@ -76,8 +71,7 @@ export class Realtime {
     if (this.log[tag] !== undefined)
       for (const data of this.log[tag])
         // eslint-disable-next-line max-depth
-        if (match(data, expected))
-          return
+        if (match(data, expected)) return
 
     const [event] = await once(this.events, tag)
 
@@ -85,7 +79,7 @@ export class Realtime {
   }
 
   @after()
-  public abort (): void {
+  public abort(): void {
     this.aborted = true
     this.agent.abort()
     this.log = {}
@@ -93,9 +87,8 @@ export class Realtime {
   }
 
   @afterAll()
-  public static async stop (): Promise<void> {
-    if (this.instance === null)
-      return
+  public static async stop(): Promise<void> {
+    if (this.instance === null) return
 
     await this.instance.disconnect()
 
@@ -103,7 +96,30 @@ export class Realtime {
     process.env.TOA_REALTIME = undefined
   }
 
-  private async createIdentity (name: string): Promise<string> {
+  /**
+   * The stream is asked for until the gateway has the route, not once. The realtime service
+   * is started by the step before this one and its `connect` is not awaited there — so the
+   * branch that carries `/realtime/streams` is still being announced while this runs, and
+   * asking too early reads the 404 that precedes the route.
+   */
+  private async open(name: string): Promise<AsyncIterable<Uint8Array>> {
+    const deadline = Date.now() + DISCOVERY
+
+    for (;;)
+      try {
+        return (await this.agent.parts(`
+          GET /realtime/streams/\${{ ${name}.id }}/ HTTP/1.1
+          authorization: Token \${{ ${name}.token }}
+          accept: application/json
+        `)) as AsyncIterable<Uint8Array>
+      } catch (error) {
+        if (Date.now() > deadline) throw error
+
+        await timeout(POLL)
+      }
+  }
+
+  private async createIdentity(name: string): Promise<string> {
     const password = Math.random().toString(36).slice(2)
     const username = name + Math.random().toString(36).slice(2)
 
@@ -138,13 +154,12 @@ export class Realtime {
     return this.agent.captures.get(`${name}.id`) as string
   }
 
-  private async consume (id: string, parts: any): Promise<void> {
+  private async consume(id: string, parts: any): Promise<void> {
     for await (const part of parts) {
       const text = Buffer.from(part.body).toString('utf8')
       const event = JSON.parse(text)
 
-      if (typeof event === 'string')
-        continue
+      if (typeof event === 'string') continue
 
       const tag = `${id}:${event.event}`
 
@@ -155,3 +170,6 @@ export class Realtime {
   }
 }
 
+/** How long the route is waited for, and how often it is asked for. */
+const DISCOVERY = 5000
+const POLL = 50

package/features/steps/Workspace.ts

@@ -7,12 +7,16 @@ import { overwrite } from '@toa.io/generic'
 export class Workspace {
   private root: string = devNull
 
-  public static exists (_0: unknown, _1: unknown, descriptor: PropertyDescriptor): PropertyDescriptor {
+  public static exists(
+    _0: unknown,
+    _1: unknown,
+    descriptor: PropertyDescriptor
+  ): PropertyDescriptor {
     const method = descriptor.value
 
     descriptor.value = async function (this: Workspace, ...args: any[]): Promise<any> {
-      if (this.root === devNull) this.root =
-        await mkdtemp(join(tmpdir(), Math.random().toString(36).slice(2)))
+      if (this.root === devNull)
+        this.root = await mkdtemp(join(tmpdir(), Math.random().toString(36).slice(2)))
 
       return method.apply(this, args)
     }
@@ -21,19 +25,18 @@ export class Workspace {
   }
 
   @Workspace.exists
-  public async addComponent (name: string, patch?: object): Promise<string> {
+  public async addComponent(name: string, patch?: object): Promise<string> {
     const source = join(import.meta.dirname, 'components', name)
     const target = join(this.root, name)
 
     await cp(source, target, { force: true, recursive: true })
 
-    if (patch !== undefined)
-      await this.patchManifest(target, patch)
+    if (patch !== undefined) await this.patchManifest(target, patch)
 
     return target
   }
 
-  private async patchManifest (target: string, patch: object): Promise<void> {
+  private async patchManifest(target: string, patch: object): Promise<void> {
     const path = join(target, 'manifest.toa.yaml')
 
     const manifest = load(await readFile(path, 'utf8')) as object

package/features/steps/components/audit/operations/record.js

@@ -1,4 +1,4 @@
-export async function effect (input) {
+export async function effect(input) {
   await new Promise((resolve) => setTimeout(resolve, 500))
 
   return null

package/features/steps/components/echo/operations/affect.js

@@ -1,3 +1,3 @@
-export function effect (input) {
+export function effect(input) {
   return `Hello ${input.name}`
 }

package/features/steps/components/echo/operations/compute.js

@@ -1,3 +1,3 @@
-export function computation (input) {
+export function computation(input) {
   return `Hello ${input.name}`
 }

package/features/steps/components/echo/operations/echo.js

@@ -1,3 +1,3 @@
-export function computation (input) {
+export function computation(input) {
   return input
 }

package/features/steps/components/echo/operations/error.js

@@ -1,4 +1,4 @@
-export function computation () {
+export function computation() {
   const err = { code: 'CODE', message: 'message' }
 
   Object.setPrototypeOf(err, Error.prototype)

package/features/steps/components/echo/operations/identity.js

@@ -1,3 +1,3 @@
-export function computation (input) {
+export function computation(input) {
   return input
 }

package/features/steps/components/echo/operations/parameters.js

@@ -1,3 +1,3 @@
-export function computation (input) {
+export function computation(input) {
   return input
 }

package/features/steps/components/echo/operations/ping.js

@@ -1,3 +1,3 @@
-export function computation () {
+export function computation() {
   return 'pong'
 }

package/features/steps/components/echo/operations/unwrap.js

@@ -1,3 +1,3 @@
-export function computation (input) {
+export function computation(input) {
   return JSON.parse(input.buf)
 }

package/features/steps/components/greeter/operations/greet.js

@@ -1,3 +1,3 @@
-export function computation () {
+export function computation() {
   return 'Hello'
 }

package/features/steps/components/notify/operations/send.js

@@ -1,4 +1,4 @@
-export async function effect (input) {
+export async function effect(input) {
   await new Promise((resolve) => setTimeout(resolve, 800))
 
   return null

package/features/steps/components/octets.tester/operations/authority.js

@@ -1,3 +1,3 @@
-export function computation (input) {
+export function computation(input) {
   return input.authority
 }

package/features/steps/components/octets.tester/operations/bar.js

@@ -1,6 +1,6 @@
 import { setTimeout } from 'node:timers/promises'
 
-async function bar (input, context) {
+async function bar(input, context) {
   await setTimeout(10)
 
   return { bar: 'baz' }

package/features/steps/components/octets.tester/operations/baz.js

@@ -1,6 +1,6 @@
 import { setTimeout } from 'node:timers/promises'
 
-async function baz (input, context) {
+async function baz(input, context) {
   await setTimeout(30)
 
   return input.steps ?? null

package/features/steps/components/octets.tester/operations/concat.js

@@ -1,4 +1,4 @@
-function concat (input) {
+function concat(input) {
   return input.parameters.a + ' ' + input.parameters.b
 }
 

package/features/steps/components/octets.tester/operations/echo.js

@@ -1,4 +1,4 @@
-function echo (input) {
+function echo(input) {
   return input
 }
 

package/features/steps/components/octets.tester/operations/err.js

@@ -1,6 +1,6 @@
 import { setTimeout } from 'node:timers/promises'
 
-async function err (_) {
+async function err(_) {
   await setTimeout(20)
 
   const err = Object.create(Error.prototype)

package/features/steps/components/octets.tester/operations/foo.js

@@ -1,4 +1,4 @@
-async function foo (input, context) {
+async function foo(input, context) {
   return { foo: 'bar' }
 }
 

package/features/steps/components/octets.tester/operations/id.js

@@ -1,4 +1,4 @@
-function id (input) {
+function id(input) {
   return input.entry.id
 }
 

package/features/steps/components/octets.tester/operations/identity.js

@@ -1,4 +1,4 @@
-function identity (input) {
+function identity(input) {
   return input.identity
 }
 

package/features/steps/components/octets.tester/operations/redirect.js

@@ -1,5 +1,7 @@
-function redirect (input) {
-  return input.parameters.type in urls ? { url: urls[input.parameters.type] } : ERR_UNKNOWN
+function redirect(input) {
+  return input.parameters.type in urls
+    ? { url: urls[input.parameters.type] }
+    : ERR_UNKNOWN
 }
 
 // an error a caller is meant to see carries a code, always
@@ -8,8 +10,8 @@ const ERR_UNKNOWN = new (class UnknownError extends Error {
 })()
 
 const urls = {
-  'rfc': 'https://www.rfc-editor.org/rfc/rfc9564.txt',
-  'img': 'https://www.w3.org/assets/logos/w3c/w3c-no-bars.svg'
+  rfc: 'https://www.rfc-editor.org/rfc/rfc9564.txt',
+  img: 'https://www.w3.org/assets/logos/w3c/w3c-no-bars.svg'
 }
 
 export { redirect as computation }

package/features/steps/components/octets.tester/operations/yex.js

@@ -1,6 +1,6 @@
 import { setTimeout } from 'node:timers/promises'
 
-async function * effect (_) {
+async function* effect(_) {
   await setTimeout(10)
   yield 'hello'
 

package/features/steps/components/octets.tester/operations/yield.js

@@ -1,6 +1,6 @@
 import { setTimeout } from 'node:timers/promises'
 
-async function * effect (_) {
+async function* effect(_) {
   await setTimeout(10)
   yield 'hello'
 

package/features/steps/components/orders/manifest.toa.yaml

@@ -1,18 +1,16 @@
 name: orders
 
 entity:
-  schema:
-    properties:
-      title:
-        type: string
-      volume:
-        type: number
-      price:
-        type: number
-    type: object
-    required:
-      - title
-      - volume
+  properties:
+    title:
+      type: string
+    volume:
+      type: number
+    price:
+      type: number
+  required:
+    - title
+    - volume
 
 operations:
   create:

package/features/steps/components/orders/operations/create.js

@@ -1,5 +1,7 @@
-export async function transition (input, object, context) {
-  const price = await context.remote.default.pricing.quote({ input: { volume: input.volume } })
+export async function transition(input, object, context) {
+  const price = await context.remote.default.pricing.quote({
+    input: { volume: input.volume }
+  })
 
   return Object.assign(object, { ...input, price })
 }

package/features/steps/components/pots/manifest.toa.yaml

@@ -1,26 +1,21 @@
 name: pots
 
 entity:
-  schema:
-    properties:
-      title:
-        type: string
-        maxLength: 64
-      volume:
-        type: number
-        exclusiveMinimum: 0
-        maximum: 1000
-      temperature:
-        type: number
-        exclusiveMinimum: 0
-        maximum: 300
-    type: object
-    required:
-      - title
-      - volume
-  index:
-    text:
-      title: text
+  properties:
+    title:
+      type: string
+      maxLength: 64
+    volume:
+      type: number
+      exclusiveMinimum: 0
+      maximum: 1000
+    temperature:
+      type: number
+      exclusiveMinimum: 0
+      maximum: 300
+  required:
+    - title
+    - volume
 
 operations:
   create:

package/features/steps/components/pots/migrations/0002-indexes.yaml

@@ -0,0 +1,4 @@
+- index:
+    name: index_text
+    keys:
+      title: text

package/features/steps/components/pricing/operations/quote.js

@@ -1,3 +1,3 @@
-export async function computation (input) {
+export async function computation(input) {
   return input.volume * 42
 }

package/features/steps/components/sequences/manifest.toa.yaml

@@ -4,7 +4,6 @@ operations:
   numbers:
     input:
       type: number
-      default: 5
 
 exposition:
   /tokens:

package/features/steps/components/sequences/operations/numbers.js

@@ -1,4 +1,4 @@
-function * effect (amount) {
+function* effect(amount) {
   for (let i = 0; i < amount; i++) yield i
 }
 

package/features/steps/components/sequences/operations/tokens.js

@@ -1,14 +1,14 @@
 import { randomBytes } from 'node:crypto'
 
-async function * computation () {
+async function* computation() {
   while (true) {
     await timeout(Math.floor(Math.random() * 100) + 10)
     yield randomBytes(4).toString('hex')
   }
 }
 
-function timeout (ms) {
-  return new Promise(resolve => setTimeout(resolve, ms))
+function timeout(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms))
 }
 
 export { computation }

package/features/steps/components/users/manifest.toa.yaml

@@ -1,11 +1,9 @@
 name: users
 
 entity:
-  schema:
-    properties:
-      name:
-        type: string
-    type: object
+  properties:
+    name:
+      type: string
 
 operations:
   transit:

package/features/steps/components/users/operations/create.js

@@ -1,4 +1,4 @@
-export function transition (input, object) {
+export function transition(input, object) {
   if (input.name === 'return_error') {
     const e = new Error()
 

package/features/steps/components/users.properties/manifest.toa.yaml

@@ -2,13 +2,12 @@ namespace: users
 name: properties
 
 entity:
-  schema:
-    properties:
-      newbie:
-        type: boolean
-        default: false
-    type: object
   associated: true
+  properties:
+    newbie:
+      type: boolean
+  blank:
+    newbie: false
 
 operations:
   transit:

package/features/steps/map.ts

@@ -12,14 +12,14 @@ const COMPONENTS = ['introspection.nodes', 'introspection.edges']
  * The map's own components, as the introspection package ships them. Mounted rather
  * than copied on purpose: a scenario about a manifest must read that manifest.
  */
-export function components (): string[] {
+export function components(): string[] {
   const root = dirname(require.resolve(PACKAGE + '/package.json'))
 
   return COMPONENTS.map((name) => join(root, 'components', name))
 }
 
 /** `norm` declares `component` as a namespace of types; the runtime export is a function. */
-export async function manifests (): Promise<Manifest[]> {
+export async function manifests(): Promise<Manifest[]> {
   const { component } = norm as unknown as Norm
 
   return await Promise.all(components().map(async (path) => await component(path)))

package/features/timestamps.feature

@@ -37,5 +37,5 @@ Feature: Entity timestamp
       """
       200 OK
       last-modified: ${{ created }}
-      content-length: 149
+      content-length: 145
       """

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/extensions.exposition",
-  "version": "1.0.0-alpha.284",
+  "version": "1.0.0-alpha.286",
   "type": "module",
   "description": "Toa Exposition",
   "author": "temich <tema.gurtovoy@gmail.com>",
@@ -18,11 +18,11 @@
     "access": "public"
   },
   "dependencies": {
+    "@node-rs/bcrypt": "1.10.8",
     "@simplewebauthn/server": "14.0.0",
-    "@toa.io/core": "1.0.0-alpha.284",
-    "@toa.io/generic": "1.0.0-alpha.283",
-    "@toa.io/schemas": "1.0.0-alpha.283",
-    "bcryptjs": "3.0.3",
+    "@toa.io/core": "1.0.0-alpha.286",
+    "@toa.io/generic": "1.0.0-alpha.286",
+    "@toa.io/schemas": "1.0.0-alpha.286",
     "content-type": "3.0.0",
     "jose": "6.2.10",
     "js-yaml": "5.4.1",
@@ -31,7 +31,7 @@
     "minimatch": "10.2.6",
     "msgpackr": "2.1.0",
     "negotiator": "1.1.0",
-    "openspan": "1.0.0-alpha.277",
+    "openspan": "1.0.0-alpha.286",
     "paseto": "4.0.0"
   },
   "scripts": {
@@ -58,5 +58,5 @@
     "@types/cors": "2.8.19",
     "@types/negotiator": "0.6.5"
   },
-  "gitHead": "006755556879e91e8d68fa86753aa3b475bdf4bf"
+  "gitHead": "81f3d0688f17668b902be336d1749cc715edcdb6"
 }

package/readme.md

@@ -130,18 +130,18 @@ exposition:
     example: the.example.com
 ```
 
-| Option        | Description                                                                                                       |
-|---------------|-------------------------------------------------------------------------------------------------------------------|
-| `auhorities`  | Mapping of authority identifiers to domain names. See [Authorities](documentation/authorities.md).                |
-| `class`       | Ingress class.                                                                                                    |
-| `annotations` | Ingress annotations.                                                                                              |
-| `debug`       | Output server errors. Default `false`.                                                                            |
-| `ip`          | Header the client address is read from. See [Client address](documentation/ip.md).                              |
+| Option        | Description                                                                                                                   |
+| ------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `auhorities`  | Mapping of authority identifiers to domain names. See [Authorities](documentation/authorities.md).                            |
+| `class`       | Ingress class.                                                                                                                |
+| `annotations` | Ingress annotations.                                                                                                          |
+| `debug`       | Output server errors. Default `false`.                                                                                        |
+| `ip`          | Header the client address is read from. See [Client address](documentation/ip.md).                                            |
 | `bouncer`     | Meter of failed authentications per address. See [Identity authentication](documentation/identity.md#failed-authentications). |
-| `oauth`       | Authorization server exposed to OAuth clients. See [OAuth](documentation/oauth.md).                               |
-| `protocol`    | `h1` or `h2c`. See [Protocol](documentation/protocol.md).                                                         |
-| `rpc`         | JSON-RPC at `/.rpc`; none is served without it. See [JSON-RPC](documentation/rpc.md).                             |
-| `mcp`         | MCP at `/.mcp`; none is served without it. See [MCP](documentation/mcp.md).                                       |
+| `oauth`       | Authorization server exposed to OAuth clients. See [OAuth](documentation/oauth.md).                                           |
+| `protocol`    | `h1` or `h2c`. See [Protocol](documentation/protocol.md).                                                                     |
+| `rpc`         | JSON-RPC at `/.rpc`; none is served without it. See [JSON-RPC](documentation/rpc.md).                                         |
+| `mcp`         | MCP at `/.mcp`; none is served without it. See [MCP](documentation/mcp.md).                                                   |
 
 ### Observability