@toa.io/extensions.exposition 1.0.0-alpha.272 → 1.0.0-alpha.274

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

@@ -2,9 +2,22 @@ name: pots
 
 entity:
   schema:
-    title: string(64)
-    volume: number(0, 1000]
-    temperature?: number(0, 300]
+    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
@@ -14,27 +27,68 @@ operations:
     query: false
     forward: transit
     input:
-      title*: .
-      volume*: .
-      temperature: .
+      properties:
+        temperature:
+          type: string
+          default: .
+        title:
+          type: string
+          default: .
+        volume:
+          type: string
+          default: .
+      type: object
+      required:
+        - title
+        - volume
     errors:
       - NO_WAY
       - WONT_CREATE
   transit:
     concurrency: retry
     input:
-      title: .
-      volume: .
-      temperature: .
+      properties:
+        title:
+          type: string
+          default: .
+        volume:
+          type: string
+          default: .
+        temperature:
+          type: string
+          default: .
+      type: object
   observe:
     output:
-      id: string
-      title: string
-      volume: number
-      temperature: number
+      properties:
+        id:
+          type: string
+        title:
+          type: string
+        volume:
+          type: number
+        temperature:
+          type: number
+      type: object
   enumerate:
     output:
-      - id: .
-        title: .
-        volume: .
-        temperature?: .
+      type: array
+      items:
+        properties:
+          id:
+            type: string
+            default: .
+          title:
+            type: string
+            default: .
+          volume:
+            type: string
+            default: .
+          temperature:
+            type: string
+            default: .
+        type: object
+        required:
+          - id
+          - title
+          - volume

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

@@ -3,5 +3,11 @@ name: pricing
 operations:
   quote:
     input:
-      volume*: number
-    output: number
+      properties:
+        volume:
+          type: number
+      type: object
+      required:
+        - volume
+    output:
+      type: number

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

@@ -2,7 +2,9 @@ name: sequences
 
 operations:
   numbers:
-    input: 5
+    input:
+      type: number
+      default: 5
 
 exposition:
   /tokens:

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

@@ -2,15 +2,30 @@ name: users
 
 entity:
   schema:
-    name: string
+    properties:
+      name:
+        type: string
+    type: object
 
 operations:
   transit:
     concurrency: retry
     input:
-      name*: .
+      properties:
+        name:
+          type: string
+          default: .
+      type: object
+      required:
+        - name
   create:
     concurrency: retry
     query: false
     input:
-      name*: .
+      properties:
+        name:
+          type: string
+          default: .
+      type: object
+      required:
+        - name

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

@@ -3,11 +3,21 @@ name: properties
 
 entity:
   schema:
-    newbie: false
+    properties:
+      newbie:
+        type: boolean
+        default: false
+    type: object
   associated: true
 
 operations:
   transit:
     concurrency: retry
     input:
-      newbie*: .
+      properties:
+        newbie:
+          type: string
+          default: .
+      type: object
+      required:
+        - newbie

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/extensions.exposition",
-  "version": "1.0.0-alpha.272",
+  "version": "1.0.0-alpha.274",
   "description": "Toa Exposition",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -18,12 +18,11 @@
   },
   "dependencies": {
     "@simplewebauthn/server": "13.3.3",
-    "@toa.io/core": "1.0.0-alpha.272",
-    "@toa.io/generic": "1.0.0-alpha.272",
-    "@toa.io/schemas": "1.0.0-alpha.272",
+    "@toa.io/core": "1.0.0-alpha.273",
+    "@toa.io/generic": "1.0.0-alpha.273",
+    "@toa.io/schemas": "1.0.0-alpha.274",
     "bcryptjs": "3.0.3",
     "content-type": "2.1.0",
-    "error-value": "0.4.4",
     "jose": "6.2.10",
     "js-yaml": "5.4.1",
     "lru-cache": "11.5.2",
@@ -62,5 +61,5 @@
     },
     "testEnvironment": "node"
   },
-  "gitHead": "1a451755445935c04cf5b373bcc73942cac0bb10"
+  "gitHead": "7df32eb2872155c45681c299036b1efbeefd6518"
 }

package/schemas/annotation.cos.yaml

@@ -1,17 +1,37 @@
-authorities*: <string>
-class: string
-resources:
-  # `null` deploys the service without any, which every deployment has to state one way
-  # or the other — see `migrations/263.md`.
-  type: object
-  nullable: true
-  properties:
-    cpu: &constraint
-      type: array
-      items: { type: string }
-      minItems: 2
-      maxItems: 2
-    memory: *constraint
-annotations: <string>
-debug: boolean
-/: ~
+properties:
+  class:
+    type: string
+  resources:
+    # `null` deploys the service without any, which every deployment has to state one way
+    # or the other — see `migrations/263.md`.
+    type: object
+    nullable: true
+    properties:
+      cpu:
+        type: array
+        items:
+          type: string
+        minItems: 2
+        maxItems: 2
+      memory:
+        type: array
+        items:
+          type: string
+        minItems: 2
+        maxItems: 2
+  annotations:
+    type: object
+    patternProperties:
+      ^.+$:
+        type: string
+  debug:
+    type: boolean
+  /: {}
+  authorities:
+    type: object
+    patternProperties:
+      ^.+$:
+        type: string
+type: object
+required:
+  - authorities

package/schemas/directive.cos.yaml

@@ -1,3 +1,7 @@
-family: string
-name: string
-value: ~
+properties:
+  family:
+    type: string
+  name:
+    type: string
+  value: {}
+type: object

package/schemas/io/throttle.cos.yaml

@@ -1,15 +1,20 @@
 definitions:
-  component: &component
+  component:
     anyOf:
       - type: string
-        enum: [ip, path, route, identity]
+        enum:
+          - ip
+          - path
+          - route
+          - identity
       - type: object
         properties:
           segment:
             type: string
-        required: [segment]
+        required:
+          - segment
         additionalProperties: false
-  condition: &condition
+  condition:
     type: object
     properties:
       status:
@@ -18,15 +23,49 @@ type: object
 properties:
   key:
     anyOf:
-      - *component
+      - anyOf:
+          - type: string
+            enum:
+              - ip
+              - path
+              - route
+              - identity
+          - type: object
+            properties:
+              segment:
+                type: string
+            required:
+              - segment
+            additionalProperties: false
       - type: array
-        items: *component
+        items:
+          anyOf:
+            - type: string
+              enum:
+                - ip
+                - path
+                - route
+                - identity
+            - type: object
+              properties:
+                segment:
+                  type: string
+              required:
+                - segment
+              additionalProperties: false
         minItems: 1
   condition:
     anyOf:
-      - *condition
+      - type: object
+        properties:
+          status:
+            type: number
       - type: array
-        items: *condition
+        items:
+          type: object
+          properties:
+            status:
+              type: number
         minItems: 1
   requests:
     type: integer

package/schemas/method.cos.yaml

@@ -1,9 +1,21 @@
-verb: /^(GET|HEAD|POST|PUT|PATCH|DELETE|LOCK|UNLOCK)$/
-mapping:
-  namespace: string
-  component: string
-  endpoint: string
-  query:
-    $ref: query
-  ...: false
-directives: [ref:directive]
+properties:
+  verb:
+    type: string
+    pattern: ^(GET|HEAD|POST|PUT|PATCH|DELETE|LOCK|UNLOCK)$
+  mapping:
+    properties:
+      namespace:
+        type: string
+      component:
+        type: string
+      endpoint:
+        type: string
+      query:
+        $ref: query
+    additionalProperties: false
+    type: object
+  directives:
+    type: array
+    items:
+      $ref: directive
+type: object

package/schemas/node.cos.yaml

@@ -1,7 +1,22 @@
-protected: boolean
-isolated: boolean
-forward: string
-routes: [ref:route]
-methods: [ref:method]
-directives: [ref:directive]
-version: string
+properties:
+  protected:
+    type: boolean
+  isolated:
+    type: boolean
+  forward:
+    type: string
+  routes:
+    type: array
+    items:
+      $ref: route
+  methods:
+    type: array
+    items:
+      $ref: method
+  directives:
+    type: array
+    items:
+      $ref: directive
+  version:
+    type: string
+type: object

package/schemas/octets/delete.cos.yaml

@@ -1,2 +1,15 @@
-workflow+: <string>
-_: true
+properties:
+  workflow:
+    oneOf:
+      - type: object
+        patternProperties:
+          ^.+$:
+            type: string
+      - type: array
+        items:
+          type: object
+          patternProperties:
+            ^.+$:
+              type: string
+nullable: true
+type: object

package/schemas/octets/get.cos.yaml

@@ -1,2 +1,5 @@
-meta: boolean
-_: true
+properties:
+  meta:
+    type: boolean
+nullable: true
+type: object

package/schemas/octets/put.cos.yaml

@@ -18,11 +18,14 @@ properties:
       type: string
   workflow:
     anyOf:
-      - &unit
-        type: object
+      - type: object
         patternProperties:
           ^.+$:
             type: string
       - type: array
-        items: *unit
+        items:
+          type: object
+          patternProperties:
+            ^.+$:
+              type: string
 additionalProperties: false

package/schemas/octets/workflow.cos.yaml

@@ -4,7 +4,6 @@ definitions:
     patternProperties:
       ^[a-zA-Z0-9_]+$:
         type: string
-
 oneOf:
   - $ref: '#/definitions/unit'
   - type: array

package/schemas/query.cos.yaml

@@ -1,14 +1,31 @@
-id?: string
-criteria?: string
-sort?: string
-search?: boolean
-sample?: integer
-omit?:
-  $ref: range
-limit?:
-  $ref: range
-selectors?: [string]
-projection?: [string]
-parameters?: [string]
-deleted?: boolean
-_: true
+properties:
+  id:
+    type: string
+  criteria:
+    type: string
+  sort:
+    type: string
+  search:
+    type: boolean
+  sample:
+    type: integer
+  omit:
+    $ref: range
+  limit:
+    $ref: range
+  selectors:
+    type: array
+    items:
+      type: string
+  projection:
+    type: array
+    items:
+      type: string
+  parameters:
+    type: array
+    items:
+      type: string
+  deleted:
+    type: boolean
+nullable: true
+type: object

package/schemas/querystring.cos.yaml

@@ -1,9 +1,19 @@
-id: string
-criteria: string
-search: string
-sample: number
-sort: string
-omit: number
-limit: number
-version: number
-...: false
+properties:
+  id:
+    type: string
+  criteria:
+    type: string
+  search:
+    type: string
+  sample:
+    type: number
+  sort:
+    type: string
+  omit:
+    type: number
+  limit:
+    type: number
+  version:
+    type: number
+additionalProperties: false
+type: object

package/schemas/range.cos.yaml

@@ -1,2 +1,10 @@
-value?: number
-range: [number]
+properties:
+  range:
+    type: array
+    items:
+      type: number
+  value:
+    type: number
+type: object
+required:
+  - range

package/schemas/route.cos.yaml

@@ -1,2 +1,6 @@
-path: string
-node: ref:node
+properties:
+  path:
+    type: string
+  node:
+    $ref: node
+type: object

package/source/Branch.test.ts

@@ -0,0 +1,37 @@
+import { decide } from './Branch'
+import type { Branch, Exposed } from './Branch'
+
+function branch (version: string, timestamp: number): Branch {
+  return {
+    namespace: 'default',
+    component: 'one',
+    isolated: false,
+    node: { routes: [], methods: [], directives: [] },
+    version,
+    timestamp
+  }
+}
+
+function exposed (version: string, timestamp: number): Exposed {
+  return { version, timestamp, nodes: [] }
+}
+
+it('should refresh the same version', () => {
+  expect(decide(exposed('a', 1), branch('a', 2))).toStrictEqual('refresh')
+})
+
+it('should refresh the same version announced by an older tenant', () => {
+  expect(decide(exposed('a', 2), branch('a', 1))).toStrictEqual('refresh')
+})
+
+it('should merge a newer tenant', () => {
+  expect(decide(exposed('a', 1), branch('b', 2))).toStrictEqual('merge')
+})
+
+it('should not merge a tenant that started earlier', () => {
+  expect(decide(exposed('b', 2), branch('a', 1))).toStrictEqual('superseded')
+})
+
+it('should merge when tenants started at the same time', () => {
+  expect(decide(exposed('a', 1), branch('b', 1))).toStrictEqual('merge')
+})

package/source/Branch.ts

@@ -1,4 +1,5 @@
 import type * as RTD from './RTD/syntax'
+import type { Node } from './RTD'
 
 export interface Branch {
   namespace: string
@@ -6,4 +7,40 @@ export interface Branch {
   isolated: boolean
   node: RTD.Node
   version: string
+
+  /**
+   * When the tenant that announced it started, by its own clock. A replica on its way
+   * out announces the same component with an older stamp than the one replacing it, and
+   * that is what tells the two apart when their versions differ.
+   */
+  timestamp: number
+}
+
+/** A branch the gateway has merged, and the tenant it came from. */
+export interface Exposed {
+  version: string
+
+  /** The start time of the tenant this branch came from. */
+  timestamp: number
+
+  nodes: Node[]
 }
+
+/**
+ * What to do with an announcement about a component that already has a branch exposed.
+ *
+ * - `refresh`: the same version, so its expiration is extended and its endpoints left alone
+ * - `superseded`: it came from a tenant that started before the one exposed now
+ * - `merge`: everything else
+ */
+export function decide (exposed: Exposed, branch: Branch): Decision {
+  if (exposed.version === branch.version)
+    return 'refresh'
+
+  if (branch.timestamp < exposed.timestamp)
+    return 'superseded'
+
+  return 'merge'
+}
+
+export type Decision = 'merge' | 'refresh' | 'superseded'