@toa.io/boot 1.0.0-alpha.24 → 1.0.0-alpha.246

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/boot",
-  "version": "1.0.0-alpha.24",
+  "version": "1.0.0-alpha.246",
   "description": "Toa Boot",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -20,13 +20,14 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/core": "1.0.0-alpha.24",
-    "@toa.io/filesystem": "1.0.0-alpha.24",
-    "@toa.io/generic": "1.0.0-alpha.24",
-    "@toa.io/norm": "1.0.0-alpha.24",
-    "@toa.io/schema": "1.0.0-alpha.24",
+    "@toa.io/core": "1.0.0-alpha.246",
+    "@toa.io/filesystem": "1.0.0-alpha.225",
+    "@toa.io/generic": "1.0.0-alpha.225",
+    "@toa.io/norm": "1.0.0-alpha.246",
+    "@toa.io/schemas": "1.0.0-alpha.246",
     "clone-deep": "4.0.1",
-    "dotenv": "16.1.1"
+    "dotenv": "16.1.1",
+    "openspan": "1.0.0-alpha.246"
   },
-  "gitHead": "308058561dfc97337a8b9755f357644e7dba8859"
+  "gitHead": "d6ee2a7246c64a44c50c28fadcfd1e27aaf137cb"
 }

package/src/bindings/produce.js

@@ -9,18 +9,19 @@ const produce = (component, operations) => group(operations, (factory, endpoints
 const group = (operations, callback) => {
   const map = {}
 
-  for (const [endpoint, operation] of Object.entries(operations)) {
-    // noinspection JSUnresolvedVariable
-    const bindings = global.TOA_INTEGRATION_BINDINGS_LOOP_DISABLED
-      ? operation.bindings
-      : [LOOP].concat(operation.bindings)
-
-    for (const binding of bindings) {
-      if (!map[binding]) map[binding] = []
-
-      map[binding].push(endpoint)
+  if (operations !== undefined)
+    for (const [endpoint, operation] of Object.entries(operations)) {
+      // noinspection JSUnresolvedVariable
+      const bindings = global.TOA_INTEGRATION_BINDINGS_LOOP_DISABLED
+        ? operation.bindings
+        : [LOOP].concat(operation.bindings)
+
+      for (const binding of bindings) {
+        if (!map[binding]) map[binding] = []
+
+        map[binding].push(endpoint)
+      }
     }
-  }
 
   return Object.entries(map).map(([binding, endpoints]) => callback(factory(binding), endpoints))
 }

package/src/bridge.js

@@ -1,7 +1,8 @@
 'use strict'
 
-const algorithm = (bridge, path, endpoint, context) => {
-  const algorithm = resolve(bridge).algorithm(path, endpoint, context)
+async function algorithm (bridge, path, endpoint, context) {
+  const factory = resolve(bridge)
+  const algorithm = await factory.algorithm(path, endpoint, context)
 
   algorithm.depends(context)
 
@@ -10,6 +11,16 @@ const algorithm = (bridge, path, endpoint, context) => {
 
 const event = (bridge, path, label, context) => resolve(bridge).event(path, label, context)
 const receiver = (bridge, path, label) => resolve(bridge).receiver(path, label)
+const guard = (bridge, path, label, context) => resolve(bridge).guard(path, label, context)
+
+async function rc (bridge, path, context) {
+  const factory = resolve(bridge)
+
+  if (factory.rc === undefined)
+    return
+
+  return factory.rc(path, context)
+}
 
 const factories = {}
 
@@ -26,3 +37,5 @@ const resolve = (bridge) => {
 exports.algorithm = algorithm
 exports.event = event
 exports.receiver = receiver
+exports.guard = guard
+exports.rc = rc

package/src/cascade.js

@@ -4,13 +4,13 @@ const { Cascade } = require('@toa.io/core')
 
 const boot = require('./index')
 
-const cascade = (manifest, endpoint, definition, context) => {
+async function cascade (manifest, endpoint, definition, context, rc) {
   const bridges = []
 
   if (definition.forward) endpoint = definition.forward
 
   if (definition.bridge) {
-    const bridge = boot.bridge.algorithm(definition.bridge, manifest.path, endpoint, context)
+    const bridge = await boot.bridge.algorithm(definition.bridge, manifest.path, endpoint, context)
 
     bridges.unshift(bridge)
   }
@@ -22,12 +22,12 @@ const cascade = (manifest, endpoint, definition, context) => {
 
     if (operation === undefined) continue
 
-    const bridge = boot.bridge.algorithm(operation.bridge, prototype.path, endpoint, context)
+    const bridge = await boot.bridge.algorithm(operation.bridge, prototype.path, endpoint, context)
 
     bridges.unshift(bridge)
   }
 
-  return new Cascade(bridges)
+  return new Cascade(bridges, rc)
 }
 
 exports.cascade = cascade

package/src/component.js

@@ -1,24 +1,19 @@
 'use strict'
 
-const { remap } = require('@toa.io/generic')
-const {
-  Component,
-  Locator,
-  State,
-  entities
-} = require('@toa.io/core')
-const { Schema } = require('@toa.io/schema')
+const { Component, Locator, State, entities } = require('@toa.io/core')
+const schemas = require('@toa.io/schemas')
 
 const boot = require('./index')
+const { span } = require('./span')
 
-/**
- * @param {toa.norm.Component} manifest
- * @returns {Promise<toa.core.Component>}
- */
 const component = async (manifest) => {
-  boot.extensions.load(manifest)
-
   const locator = new Locator(manifest.name, manifest.namespace)
+
+  return span(`component ${locator.id}`, () => create(manifest, locator))
+}
+
+const create = async (manifest, locator) => {
+  boot.extensions.load(manifest)
   const storage = boot.storage(manifest)
   const context = await boot.context(manifest)
   const emission = boot.emission(manifest.events, locator, context)
@@ -26,17 +21,15 @@ const component = async (manifest) => {
   let state
 
   if (manifest.entity !== undefined) {
-    const schema = new Schema(manifest.entity.schema)
-    const entity = new entities.Factory(schema)
+    const schema = schemas.schema(manifest.entity.schema)
+    const guards = await boot.guards(manifest, context)
+    const entity = new entities.Factory(schema, guards)
 
     state = new State(storage, entity, emission, manifest.entity.associated)
   }
 
-  const operations = manifest.operations === undefined
-    ? {}
-    : remap(manifest.operations, (definition, endpoint) =>
-      boot.operation(manifest, endpoint, definition, context, state))
-
+  const rc = await boot.rc(manifest, context)
+  const operations = await bootOperations(manifest, context, state, rc)
   const component = new Component(locator, operations)
 
   if (storage) component.depends(storage)
@@ -45,4 +38,16 @@ const component = async (manifest) => {
   return boot.extensions.component(component)
 }
 
+async function bootOperations (manifest, context, state, rc) {
+  if (manifest.operations === undefined)
+    return {}
+
+  const operations = {}
+
+  for (const [endpoint, definition] of Object.entries(manifest.operations))
+    operations[endpoint] = await boot.operation(manifest, endpoint, definition, context, state, rc)
+
+  return operations
+}
+
 exports.component = component

package/src/composition.js

@@ -1,24 +1,44 @@
 'use strict'
 
+const { console } = require('openspan')
 const { Composition } = require('@toa.io/core')
+const { version } = require('@toa.io/runtime/package.json')
 
 const boot = require('./index')
+const { span } = require('./span')
 
 async function composition (paths, options) {
   options = Object.assign({}, options)
 
-  const manifests = await Promise.all(paths.map((path) => boot.manifest(path, options)))
-  const tenants = await Promise.all(manifests.map(boot.extensions.tenants))
-  const expositions = await Promise.all(manifests.map(boot.discovery.expose))
-  const components = await Promise.all(manifests.map(boot.component))
+  return span('boot composition', async () => {
+    const manifests = await span('load manifests',
+      async () => await Promise.all(paths.map((path) => boot.manifest(path, options))))
 
-  const producers = components.map((component, index) =>
-    boot.bindings.produce(component, manifests[index].operations))
+    console.info('Starting composition', {
+      runtime: version,
+      components: manifests.map((manifest) => manifest.locator.id)
+    })
 
-  const receivers = await Promise.all(components.map((component, index) =>
-    boot.receivers(manifests[index], component)))
+    const tenants = await span('create tenants',
+      async () => await Promise.all(manifests.map(boot.extensions.tenants)))
 
-  return new Composition(expositions.flat(), producers.flat(), receivers.flat(), tenants.flat())
+    const expositions = await span('expose discovery',
+      async () => await Promise.all(manifests.map(boot.discovery.expose)))
+
+    const components = await span('create components',
+      async () => await Promise.all(manifests.map(boot.component)))
+
+    const producers = components.map((component, index) =>
+      boot.bindings.produce(component, manifests[index].operations))
+
+    const receivers = await span('create receivers',
+      async () => await Promise.all(components.map((component, index) =>
+        boot.receivers(manifests[index], component))))
+
+    const composition = new Composition(expositions.flat(), producers.flat(), receivers.flat(), tenants.flat())
+
+    return boot.extensions.manage(composition)
+  })
 }
 
 exports.composition = composition

package/src/contract.js

@@ -1,18 +1,18 @@
 'use strict'
 
 const { contract: { Request, Reply } } = require('@toa.io/core')
-const { Schema } = require('@toa.io/schema')
+const schemas = require('@toa.io/schemas')
 
 const request = (definition, entity) => {
   const request = Request.schema(definition, entity)
-  const schema = new Schema(request, { removeAdditional: true }) // soft inputs
+  const schema = schemas.schema(request, { removeAdditional: true })
 
-  return new Request(schema)
+  return new Request(schema, definition)
 }
 
-const reply = (output, error) => {
-  const reply = Reply.schema(output, error)
-  const schema = new Schema(reply) // outputs strict
+const reply = (output, errors) => {
+  const reply = Reply.schema(output, errors)
+  const schema = schemas.schema(reply)
 
   return new Reply(schema)
 }

package/src/emission.js

@@ -13,7 +13,7 @@ const emission = (definitions, locator, context) => {
     const decorator = extensions.emitter(emitter, label)
     const bridge = boot.bridge.event(definition.bridge, definition.path, label, context)
 
-    return new Event(definition, decorator, bridge)
+    return new Event({ ...definition, label: `${locator.id}.${label}` }, decorator, bridge)
   })
 
   return new Emission(events)

package/src/extensions/index.js

@@ -5,6 +5,7 @@ const { component } = require('./component')
 const { context } = require('./context')
 const { emitter } = require('./emitter')
 const { load } = require('./load')
+const { manage } = require('./manage')
 const { receiver } = require('./receiver')
 const { storage } = require('./storage')
 const { tenants } = require('./tenants')
@@ -14,6 +15,7 @@ exports.component = component
 exports.context = context
 exports.emitter = emitter
 exports.load = load
+exports.manage = manage
 exports.receiver = receiver
 exports.storage = storage
 exports.tenants = tenants

package/src/extensions/load.js

@@ -6,9 +6,11 @@ const { resolve } = require('./resolve')
  * @param {toa.norm.Component} manifest
  */
 const load = (manifest) => {
-  if (manifest.extensions === undefined) return
+  if (manifest.extensions === undefined)
+    return
 
-  for (const name of Object.keys(manifest.extensions)) resolve(name, manifest.path)
+  for (const name of Object.keys(manifest.extensions))
+    resolve(name, manifest.path)
 }
 
 exports.load = load

package/src/extensions/manage.js

@@ -0,0 +1,20 @@
+'use strict'
+
+const { instances } = require('./instances')
+
+/**
+ * @param {toa.core.Connector} composition
+ * @returns {toa.core.Connector}
+ */
+const manage = (composition) => {
+  let managed = composition
+
+  for (const factory of Object.values(instances)) {
+    if (factory.manage !== undefined)
+      managed = factory.manage(managed)
+  }
+
+  return managed
+}
+
+exports.manage = manage

package/src/extensions/receiver.js

@@ -11,7 +11,8 @@ const receiver = (receiver, locator) => {
   let decorated = receiver
 
   for (const factory of Object.values(instances)) {
-    if (factory.receiver !== undefined) decorated = factory.receiver(decorated, locator)
+    if (factory.receiver !== undefined)
+      decorated = factory.receiver(decorated, locator)
   }
 
   return decorated

package/src/extensions/tenants.js

@@ -16,7 +16,7 @@ const tenants = (manifest) => {
 
     if (factory.tenant === undefined) continue
 
-    const tenant = factory.tenant(manifest.locator, declaration)
+    const tenant = factory.tenant(manifest.locator, declaration, manifest)
 
     tenants.push(tenant)
   }

package/src/guards.js

@@ -0,0 +1,23 @@
+'use strict'
+
+const { Guard } = require('@toa.io/core')
+const boot = require('./index')
+
+async function guards(manifest, context) {
+  if (manifest.guards === undefined)
+    return 
+
+  const entries = Object.entries(manifest.guards)
+
+  return await Promise.all(entries.map(async ([name, guard]) => {
+    const bridge = await load(guard, name, context)
+
+    return new Guard(name, bridge)
+  }))
+}
+
+async function load(guard, name, context) {
+  return await boot.bridge.guard(guard.bridge, guard.path, name, context)
+}
+
+exports.guards = guards

package/src/index.js

@@ -14,6 +14,8 @@ const { operation } = require('./operation')
 const { receivers, receive } = require('./receivers')
 const { remote } = require('./remote')
 const { storage } = require('./storage')
+const { guards } = require('./guards')
+const { rc } = require('./rc')
 
 exports.bindings = require('./bindings')
 exports.bridge = require('./bridge')
@@ -34,3 +36,5 @@ exports.receivers = receivers
 exports.receive = receive
 exports.remote = remote
 exports.storage = storage
+exports.guards = guards
+exports.rc = rc

package/src/manifest.js

@@ -1,17 +1,18 @@
 'use strict'
 
 const clone = require('clone-deep')
+const { basename } = require('node:path')
 const { merge } = require('@toa.io/generic')
 const { component: load } = require('@toa.io/norm')
 const { Locator } = require('@toa.io/core')
 
-/**
- * @type {toa.boot.Manifest}
- */
+const { span } = require('./span')
+
 const manifest = async (path, options = {}) => {
   options = merge(clone(options), DEFAULTS)
 
-  const manifest = await load(path)
+  const manifest = await span({ name: `manifest ${basename(path)}`, attributes: { path } },
+    async () => await load(path))
 
   if (options?.bindings !== undefined) {
     if ('operations' in manifest) {

package/src/operation.js

@@ -1,15 +1,24 @@
 'use strict'
 
-const { Transition, Observation, Assignment, Operation, Query } = require('@toa.io/core')
+const {
+  Transition,
+  Observation,
+  Assignment,
+  Operation,
+  Query,
+  Effect,
+  Unmanaged
+} = require('@toa.io/core')
 
 const boot = require('./index')
 
-const operation = (manifest, endpoint, definition, context, scope) => {
-  const cascade = boot.cascade(manifest, endpoint, definition, context)
+async function operation (manifest, endpoint, definition, context, scope, rc) {
+  const cascade = await boot.cascade(manifest, endpoint, definition, context, rc)
   const reply = boot.contract.reply(definition.output, definition.error)
   const input = definition.input
   const request = boot.contract.request({ input }, manifest.entity)
   const contracts = { reply, request }
+
   const query = manifest.entity === undefined
     ? undefined
     : new Query(manifest.entity.schema.properties)
@@ -24,7 +33,8 @@ const TYPES = {
   observation: Observation,
   assignment: Assignment,
   computation: Operation,
-  effect: Operation
+  effect: Effect,
+  unmanaged: Unmanaged
 }
 
 exports.operation = operation

package/src/rc.js

@@ -0,0 +1,9 @@
+'use strict'
+
+const boot = require('./index')
+
+async function rc (manifest, context) {
+  return boot.bridge.rc(manifest.bridge, manifest.path, context)
+}
+
+exports.rc = rc

package/src/receivers.js

@@ -5,23 +5,25 @@ const { Receiver, Locator } = require('@toa.io/core')
 const boot = require('./index')
 const extensions = require('./extensions')
 
-const receivers = async (manifest, runtime) => {
+const receivers = async (manifest, component) => {
   if (manifest.receivers === undefined) return []
 
   const receivers = []
   const local = await boot.remote(manifest.locator, manifest)
 
   for (const [label, definition] of Object.entries(manifest.receivers)) {
+    const locator = Locator.parse(label)
+    const source = definition.source ? Locator.parse(definition.source) : locator
+    const destination = `${source.id}.${label.split('.').pop()}`
+
     const bridge = definition.bridge !== undefined ? boot.bridge.receiver(definition.bridge, manifest.path, label) : undefined
-    const receiver = new Receiver(definition, local, bridge)
+    const receiver = new Receiver({ ...definition, label, destination }, local, bridge)
     const decorator = extensions.receiver(receiver, manifest.locator)
 
-    const locator = Locator.parse(label)
     const transport = definition.binding ?? await resolveBinding(locator, label)
-    const source = definition.source ? Locator.parse(definition.source) : locator
     const binding = boot.bindings.receive(transport, source, label, manifest.locator.id, decorator)
 
-    binding.depends(runtime)
+    binding.depends(component)
     receivers.push(binding)
   }
 

package/src/remote.js

@@ -1,14 +1,20 @@
 'use strict'
 
+const { console } = require('openspan')
 const { Remote } = require('@toa.io/core')
 const { remap } = require('@toa.io/generic')
 
 const boot = require('./index')
 
-const remote = async (locator, manifest = undefined) => {
-  const discovery = await boot.discovery.discovery()
+const remote = async (locator, manifest) => {
+  let discovery
 
-  if (manifest === undefined) manifest = await discovery.lookup(locator)
+  if (manifest === undefined) {
+    console.debug('Lookup', { locator: locator.id })
+
+    discovery = await boot.discovery.discovery(locator)
+    manifest = await discovery.lookup(locator)
+  }
 
   const calls = manifest.operations === undefined
     ? {}
@@ -17,7 +23,8 @@ const remote = async (locator, manifest = undefined) => {
   const remote = new Remote(locator, calls)
 
   // ensure discovery shutdown
-  remote.depends(discovery)
+  if (discovery !== undefined)
+    remote.depends(discovery)
 
   return remote
 }

package/src/span.js

@@ -0,0 +1,16 @@
+'use strict'
+
+const { console } = require('openspan')
+
+const enabled = process.env.TOA_BOOT_TRACE === '1'
+
+/**
+ * Creates a span if boot tracing is enabled (TOA_BOOT_TRACE=1), otherwise just runs the task
+ *
+ * @param {string | object} options
+ * @param {() => Promise<any>} task
+ * @returns {Promise<any>}
+ */
+const span = async (options, task) => enabled ? console.span(options, task) : task()
+
+exports.span = span

package/types/index.d.ts

@@ -5,17 +5,17 @@ export * as bindings from './bindings'
 
 export async function composition (paths: string[], options?: composition.Options): Promise<core.Connector>
 
-export async function remote (locator: core.Locator): Promise<core.Component>
+export async function remote (locator: core.Locator): Promise<core.Remote>
 
 export async function receive<T = any> (
   label: string,
-  receiver: Receiver,
+  receiver: Receiver
 ): Promise<core.Connector>
 
 export async function receive<T = any> (
   label: string,
   group: string | undefined,
-  receiver: Receiver,
+  receiver: Receiver
 ): Promise<core.Connector>
 
 type Receiver = { receive: (message: core.Message<T>) => void | Promise<void> }