nesoi 3.0.9 → 3.0.10

package/lib/engine/apps/monolyth/monolyth.app.js

@@ -76,8 +76,8 @@ class MonolythApp extends inline_app_1.InlineApp {
         }
         return super.daemon();
     }
-    makeDaemon(trxEngines, providers) {
-        return new MonolythDaemon(this.name, trxEngines, providers, this._config);
+    makeDaemon(trxEngines, services) {
+        return new MonolythDaemon(this.name, trxEngines, services, this._config);
     }
     // Reboot (from Watcher)
     async remake() {
@@ -86,18 +86,18 @@ class MonolythApp extends inline_app_1.InlineApp {
             log_1.Log.error('app', 'monolyth', `Attempt to remake app ${this.name} failed: Daemon not running.`);
             return;
         }
-        await daemon_1.Daemon.destroy(this._daemon);
+        await this._daemon.destroy();
         this.bootPromise = undefined;
         const app = await this.make();
-        await daemon_1.Daemon.reload(this._daemon, app.trxEngines, app.providers);
+        await this._daemon.reload(app.trxEngines, app.services);
     }
     // Type Builder Overrides
     modules(modules) {
         super.modules(modules);
         return this;
     }
-    provider($) {
-        super.provider($);
+    service($) {
+        super.service($);
         return this;
     }
     get config() {

package/lib/engine/apps/service.d.ts

@@ -0,0 +1,30 @@
+import { AnyModule } from '../module';
+/**
+ * Service
+ */
+type Optional<T> = (T extends undefined ? [] : never) | [cfg: T];
+export declare abstract class Service<out Name extends string, Config = never> {
+    /**
+     * This property MUST be set on the implementation class.
+     */
+    static defaultName: string;
+    name: Name;
+    config: Config;
+    libPaths?: string[];
+    abstract up($: {
+        modules: Record<string, AnyModule>;
+    }): void | Promise<void>;
+    abstract down(): void | Promise<void>;
+    constructor(...cfg: Optional<Config>);
+    constructor(name: Name, ...cfg: Optional<Config>);
+}
+export type AnyService = Service<any, any>;
+export interface IService {
+    name: string;
+    libPaths?: string[];
+    up(this: IService, $: {
+        modules: Record<string, AnyModule>;
+    }): void | Promise<void>;
+    down(this: IService): void | Promise<void>;
+}
+export {};

package/lib/engine/apps/service.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Service = void 0;
+class Service {
+    constructor(arg1, arg2) {
+        if (typeof arg1 === 'string') {
+            this.name = arg1;
+        }
+        else {
+            this.name = this.constructor.defaultName;
+        }
+        this.config = arg2 || arg1;
+    }
+}
+exports.Service = Service;

package/lib/engine/auth/authn.d.ts

@@ -13,10 +13,19 @@ export type AuthnRequest<P extends keyof any> = {
  * @subcategory Auth
  */
 export declare abstract class AuthnProvider<U extends User> {
+    /**
+     * - If `true`, this provider is run for all transactions, regardless
+     * of a token being sent on the authentication request.
+     * - If `false`, the `$.token` is always defined.
+     */
+    abstract eager: boolean;
     abstract authenticate($: {
         trx: AnyTrxNode;
+        token?: AuthnToken;
+    }): Promise<{
         token: AuthnToken;
-    }): Promise<U>;
+        user: U;
+    }>;
 }
 export type AnyAuthnProviders = {
     [K: string]: AuthnProvider<any>;

package/lib/engine/auth/zero.authn_provider.d.ts

@@ -9,11 +9,15 @@ type ZeroUser = {
  * @subcategory Auth
  */
 export declare class ZeroAuthnProvider extends AuthnProvider<ZeroUser> {
+    eager: boolean;
     authenticate($: {
-        token: string;
+        token?: string;
     }): Promise<{
-        id: number;
-        name: string;
+        token: string;
+        user: {
+            id: number;
+            name: string;
+        };
     }>;
 }
 export {};

package/lib/engine/auth/zero.authn_provider.js

@@ -7,10 +7,17 @@ const authn_1 = require("./authn");
  * @subcategory Auth
  */
 class ZeroAuthnProvider extends authn_1.AuthnProvider {
+    constructor() {
+        super(...arguments);
+        this.eager = false;
+    }
     authenticate($) {
         return Promise.resolve({
-            id: 0,
-            name: $.token
+            token: $.token,
+            user: {
+                id: 0,
+                name: $.token
+            }
         });
     }
 }

package/lib/engine/cli/cli.d.ts

@@ -1,9 +1,9 @@
 import { AnyDaemon } from '../daemon';
 import { CLIAdapter } from './cli_adapter';
-export type CLIConfig<Providers> = {
+export type CLIConfig<Services> = {
     editor?: string;
     adapters?: {
-        [x: string]: (cli: CLI, providers: Providers) => CLIAdapter;
+        [x: string]: (cli: CLI, services: Services) => CLIAdapter;
     };
 };
 /**

package/lib/engine/cli/cli.js

@@ -25,7 +25,7 @@ class CLI {
         // Build adapters
         this.adapters = {};
         Object.entries(config?.adapters || {}).forEach(([key, val]) => {
-            this.adapters[key] = val(this, daemon_1.Daemon.get(daemon, 'providers'));
+            this.adapters[key] = val(this, daemon_1.Daemon.get(daemon, 'services'));
             this.adapters[key].name = key;
         });
         this.input = new cli_input_1.CLIInputHandler(this.getCmds());

package/lib/engine/cli/ui.js

@@ -142,7 +142,7 @@ class UI {
      * Ask a yes or no question and wait for the answer
      */
     static async yesOrNo(text, defaul = 'n') {
-        const answer = await this.waitForAnyKey('\n\t» ' + (0, string_1.colored)(text, 'lightblue') + (0, string_1.colored)(' [y|n]', 'lightgray'));
+        const answer = await this.waitForAnyKey('\n\t» ' + (0, string_1.colored)(text, 'lightblue') + (0, string_1.colored)(' [y|n]', 'darkgray'));
         if (answer.name === 'y')
             return true;
         return false;

package/lib/engine/daemon.d.ts

@@ -6,7 +6,7 @@ import { AnyUsers, AuthnRequest } from './auth/authn';
 import { TrxNode } from './transaction/trx_node';
 import { TrxStatus } from './transaction/trx';
 import { AnyModule } from './module';
-import { AnyAppProvider } from './apps/app';
+import { IService } from './apps/service';
 /**
  * A background process running one or more modules,
  * which runs _Transactions_ for the available elements.
@@ -18,15 +18,15 @@ import { AnyAppProvider } from './apps/app';
 export declare abstract class Daemon<S extends $Space, Modules extends ModuleName<S>> {
     protected name: string;
     protected trxEngines: Record<Modules, AnyTrxEngine>;
-    protected providers: Record<string, AnyAppProvider>;
+    protected services: Record<string, IService>;
     protected config?: AnyAppConfig | undefined;
     /**
      * @param name Name of the daemon (taken from App)
      * @param trxEngines A dictionary of Transaction Engine by module name
-     * @param providers A dictionary of App Provider by name
+     * @param services A dictionary of Service by name
      * @param config Optional `AppConfig`
      */
-    constructor(name: string, trxEngines: Record<Modules, AnyTrxEngine>, providers: Record<string, AnyAppProvider>, config?: AnyAppConfig | undefined);
+    constructor(name: string, trxEngines: Record<Modules, AnyTrxEngine>, services: Record<string, IService>, config?: AnyAppConfig | undefined);
     /**
      * Prepare a transaction to be run by the Daemon.
      *
@@ -45,31 +45,31 @@ export declare abstract class Daemon<S extends $Space, Modules extends ModuleNam
      */
     private bindControllers;
     /**
-     * Destroy the providers and transaction engines of this daemon
+     * Destroy the services and transaction engines of this daemon
      *
      * @param A `Daemon` instance
      */
-    static destroy(daemon: AnyDaemon): Promise<void>;
+    destroy(): Promise<void>;
     /**
-     * Replace the providers and transaction engines of this daemon
+     * Replace the services and transaction engines of this daemon
      * and rebind the controllers
      *
      * @param daemon A `Daemon` instance
      * @param trxEngines A dictionary of Transaction Engine by module name
-     * @param providers A dictionary of App Provider by name
+     * @param services A dictionary of Service by name
      */
-    static reload(daemon: AnyDaemon, trxEngines: Record<string, AnyTrxEngine>, providers: Record<string, any>): void;
+    reload(trxEngines: Record<Modules, AnyTrxEngine>, services: Record<string, any>): void;
     /**
      * Return a `Daemon` property.
      * This is used to read private properties.
      *
      * @param daemon A `Daemon` instance
-     * @param key A `Daemon` property `'name'|'providers'|'app'`
+     * @param key A `Daemon` property `'name'|'services'|'app'`
      * @returns The selected property
      */
     static get<T extends {
         name: string;
-        providers: Record<string, any>;
+        services: Record<string, any>;
         app: AnyAppConfig;
     }, K extends keyof T>(daemon: AnyDaemon | undefined, key: K): T[K];
     /**

package/lib/engine/daemon.js

@@ -16,13 +16,13 @@ class Daemon {
     /**
      * @param name Name of the daemon (taken from App)
      * @param trxEngines A dictionary of Transaction Engine by module name
-     * @param providers A dictionary of App Provider by name
+     * @param services A dictionary of Service by name
      * @param config Optional `AppConfig`
      */
-    constructor(name, trxEngines, providers, config) {
+    constructor(name, trxEngines, services, config) {
         this.name = name;
         this.trxEngines = trxEngines;
-        this.providers = providers;
+        this.services = services;
         this.config = config;
         this.bindControllers();
         log_1.Log.info('daemon', name, 'Woo-ha!');
@@ -63,41 +63,41 @@ class Daemon {
         }
     }
     /**
-     * Destroy the providers and transaction engines of this daemon
+     * Destroy the services and transaction engines of this daemon
      *
      * @param A `Daemon` instance
      */
-    static async destroy(daemon) {
+    async destroy() {
         log_1.Log.info('daemon', this.name, 'Stop');
-        for (const key in daemon.providers) {
-            const provider = daemon.providers[key];
-            await provider.down(provider);
-            delete daemon.providers[key];
+        for (const key in this.services) {
+            const service = this.services[key];
+            await service.down();
+            delete this.services[key];
         }
-        for (const key in daemon.trxEngines) {
-            delete daemon.trxEngines[key];
+        for (const key in this.trxEngines) {
+            delete this.trxEngines[key];
         }
     }
     /**
-     * Replace the providers and transaction engines of this daemon
+     * Replace the services and transaction engines of this daemon
      * and rebind the controllers
      *
      * @param daemon A `Daemon` instance
      * @param trxEngines A dictionary of Transaction Engine by module name
-     * @param providers A dictionary of App Provider by name
+     * @param services A dictionary of Service by name
      */
-    static reload(daemon, trxEngines, providers) {
+    reload(trxEngines, services) {
         log_1.Log.info('daemon', this.name, 'Reloaded');
-        daemon.trxEngines = trxEngines;
-        daemon.providers = providers;
-        daemon.bindControllers();
+        this.trxEngines = trxEngines;
+        this.services = services;
+        this.bindControllers();
     }
     /**
      * Return a `Daemon` property.
      * This is used to read private properties.
      *
      * @param daemon A `Daemon` instance
-     * @param key A `Daemon` property `'name'|'providers'|'app'`
+     * @param key A `Daemon` property `'name'|'services'|'app'`
      * @returns The selected property
      */
     static get(daemon, key) {

package/lib/engine/dependency.d.ts

@@ -1,4 +1,4 @@
-import { BuilderType } from "../schema";
+import { $Module, BuilderType } from "../schema";
 import { AnyBuilder, AnyElementSchema } from './module';
 import { Overlay } from './util/type';
 import { JobBuilderNode } from "../elements/blocks/job/job.builder";
@@ -80,6 +80,7 @@ export declare class $Dependency {
      * @returns The type name of the dependency
      */
     static typeName(dep: $Dependency, fromModule: string): string;
+    static resolve(module: $Module, dep: $Dependency): import("../elements").$Message | import("../elements").$Machine | import("../elements").$Bucket | import("../elements").$Constants | import("../elements").$Job | import("../elements").$Externals | import("../elements").$Resource | import("../elements").$Controller | undefined;
 }
 /**
  * A element builder, along with metadata required for building it.

package/lib/engine/dependency.js

@@ -121,6 +121,24 @@ class $Dependency {
                 .type;
         }
     }
+    static resolve(module, dep) {
+        if (dep.type === 'constants')
+            return module.constants;
+        if (dep.type === 'externals')
+            return module.externals;
+        if (dep.type === 'bucket')
+            return module.buckets[dep.name];
+        if (dep.type === 'message')
+            return module.messages[dep.name];
+        if (dep.type === 'job')
+            return module.jobs[dep.name];
+        if (dep.type === 'resource')
+            return module.resources[dep.name];
+        if (dep.type === 'machine')
+            return module.machines[dep.name];
+        if (dep.type === 'controller')
+            return module.controllers[dep.name];
+    }
 }
 exports.$Dependency = $Dependency;
 /**

package/lib/engine/module.d.ts

@@ -25,7 +25,8 @@ import { $Controller } from "../elements/edge/controller/controller.schema";
 import { $Job } from "../elements/blocks/job/job.schema";
 import { ModuleTree } from './tree';
 import { AnyResourceJobBuilder } from "../elements/blocks/job/internal/resource_job.builder";
-import { AnyApp, AnyAppProvider } from './apps/app';
+import { AnyApp } from './apps/app';
+import { AnyService } from './apps/service';
 import { AnyMachineJobBuilder } from "../elements/blocks/job/internal/machine_job.builder";
 import { AnyQueueBuilder } from "../elements/blocks/queue/queue.builder";
 import { $Queue } from "../elements/blocks/queue/queue.schema";
@@ -127,12 +128,13 @@ export declare class Module<S extends $Space, $ extends $Module> {
      * Include references for external elements on the module.
      * This allows a module to use elements from other modules directly,
      * on single-threaded `Apps`.
+     * This implementation also includes transitive dependencies.
      *
      * @param daemon A `Daemon` instance
      * @param dependencies: A dictionary of dependencies by element type
      * @returns The `Module`, for call-chaining
      */
-    injectDependencies(daemon: AnyDaemon, dependencies: {
+    injectDependencies(modules: Record<string, AnyModule>, dependencies: {
         buckets?: $Dependency[];
         jobs?: $Dependency[];
         messages?: $Dependency[];
@@ -173,9 +175,9 @@ export declare class Module<S extends $Space, $ extends $Module> {
      * Create elements from schemas, and the NQL engine for this module.
      *
      * @param app A `App` instance
-     * @param providers A dictionary of providers by name
+     * @param services A dictionary of services by name
      */
-    start(app: AnyApp, providers: Record<string, AnyAppProvider>): void;
+    start(app: AnyApp, services: Record<string, AnyService>): void;
     /**
      * Destroy all elements from module.
      */

package/lib/engine/module.js

@@ -163,14 +163,15 @@ class Module {
      * Include references for external elements on the module.
      * This allows a module to use elements from other modules directly,
      * on single-threaded `Apps`.
+     * This implementation also includes transitive dependencies.
      *
      * @param daemon A `Daemon` instance
      * @param dependencies: A dictionary of dependencies by element type
      * @returns The `Module`, for call-chaining
      */
-    injectDependencies(daemon, dependencies) {
+    injectDependencies(modules, dependencies) {
         dependencies.buckets?.forEach(dep => {
-            const bucketModule = daemon_1.Daemon.getModule(daemon, dep.module);
+            const bucketModule = modules[dep.module];
             const bucket = bucketModule.buckets[dep.name];
             if (!bucket) {
                 throw new Error(`Internal Error: unable to find bucket '${dep.tag}' during injection to module '${this.name}'`);
@@ -178,15 +179,19 @@ class Module {
             this.buckets[dep.refName] = bucket;
         });
         dependencies.jobs?.forEach(dep => {
-            const jobModule = daemon_1.Daemon.getModule(daemon, dep.module);
+            const jobModule = modules[dep.module];
             const job = jobModule.jobs[dep.name];
             if (!job) {
                 throw new Error(`Internal Error: unable to find job '${dep.tag}' during injection to module '${this.name}'`);
             }
             this.jobs[dep.refName] = job;
+            const schema = job.schema;
+            this.injectDependencies(modules, {
+                messages: schema.input
+            });
         });
         dependencies.messages?.forEach(dep => {
-            const messageModule = daemon_1.Daemon.getModule(daemon, dep.module);
+            const messageModule = modules[dep.module];
             const message = messageModule.messages[dep.name];
             if (!message) {
                 throw new Error(`Internal Error: unable to find message '${dep.tag}' during injection to module '${this.name}'`);
@@ -194,12 +199,18 @@ class Module {
             this.messages[dep.refName] = message;
         });
         dependencies.machines?.forEach(dep => {
-            const machineModule = daemon_1.Daemon.getModule(daemon, dep.module);
+            const machineModule = modules[dep.module];
             const machine = machineModule.machines[dep.name];
             if (!machine) {
                 throw new Error(`Internal Error: unable to find machine '${dep.tag}' during injection to module '${this.name}'`);
             }
             this.machines[dep.refName] = machine;
+            const schema = machine.schema;
+            this.injectDependencies(modules, {
+                messages: schema.input,
+                buckets: schema.buckets,
+                jobs: schema.jobs
+            });
         });
         return this;
     }
@@ -316,14 +327,14 @@ class Module {
      * Create elements from schemas, and the NQL engine for this module.
      *
      * @param app A `App` instance
-     * @param providers A dictionary of providers by name
+     * @param services A dictionary of services by name
      */
-    start(app, providers) {
+    start(app, services) {
         const info = app_1.App.getInfo(app);
         const config = info.config;
         Object.entries(this.schema.buckets).forEach(([name, schema]) => {
             const bucketConfig = config.buckets?.[this.name]?.[name];
-            this.buckets[name] = new bucket_1.Bucket(schema, bucketConfig, providers);
+            this.buckets[name] = new bucket_1.Bucket(schema, bucketConfig, services);
         });
         Object.entries(this.schema.messages).forEach(([name, schema]) => {
             this.messages[name] = new message_parser_1.MessageParser(schema);
@@ -339,7 +350,7 @@ class Module {
         });
         Object.entries(this.schema.controllers).forEach(([name, schema]) => {
             const controllerConfig = config.controllers?.[this.name]?.[name];
-            this.controllers[name] = new controller_1.Controller(this, schema, controllerConfig, providers);
+            this.controllers[name] = new controller_1.Controller(this, schema, controllerConfig, services);
         });
         Object.entries(this.schema.queues).forEach(([name, schema]) => {
             this.queues[name] = new queue_1.Queue(this, schema);
@@ -409,7 +420,11 @@ class Module {
         await virtualModule.start({ config: {} }, {});
         // Inject externals
         if (def.externals) {
-            virtualModule.injectDependencies(daemon, def.externals);
+            const modules = {};
+            daemon_1.Daemon.getModules(daemon).forEach(module => {
+                modules[module.name] = module;
+            });
+            virtualModule.injectDependencies(modules, def.externals);
         }
         return virtualModule;
     }

package/lib/engine/transaction/nodes/bucket.trx_node.js

@@ -32,8 +32,7 @@ class BucketTrxNode {
             out = await fn(trx);
         }
         catch (e) {
-            await trx_node_1.TrxNode.error(trx, e);
-            throw e;
+            throw await trx_node_1.TrxNode.error(trx, e);
         }
         await trx_node_1.TrxNode.ok(trx, fmtTrxOut ? fmtTrxOut(out) : out);
         return out;

package/lib/engine/transaction/nodes/bucket_query.trx_node.js

@@ -35,8 +35,7 @@ class BucketQueryTrxNode {
             });
         }
         catch (e) {
-            await trx_node_1.TrxNode.error(this.trx, e); // Bucket unexpected error
-            throw e;
+            throw await trx_node_1.TrxNode.error(this.trx, e); // Bucket unexpected error
         }
         await trx_node_1.TrxNode.ok(this.trx, { length: results.data.length });
         return results.data.length
@@ -52,13 +51,11 @@ class BucketQueryTrxNode {
             });
         }
         catch (e) {
-            await trx_node_1.TrxNode.error(this.trx, e); // Bucket unexpected error
-            throw e;
+            throw await trx_node_1.TrxNode.error(this.trx, e); // Bucket unexpected error
         }
         if (!results.data.length) {
             const e = error_1.NesoiError.Bucket.Query.NoResults({ bucket: this.bucket.schema.alias, query: this.query });
-            await trx_node_1.TrxNode.error(this.trx, e);
-            throw e;
+            throw await trx_node_1.TrxNode.error(this.trx, e);
         }
         await trx_node_1.TrxNode.ok(this.trx, { length: results.data.length });
         return results.data[0];
@@ -70,8 +67,7 @@ class BucketQueryTrxNode {
             results = await this.bucket.query(this.trx, this.query, undefined, this.view);
         }
         catch (e) {
-            await trx_node_1.TrxNode.error(this.trx, e); // Bucket unexpected error
-            throw e;
+            throw await trx_node_1.TrxNode.error(this.trx, e); // Bucket unexpected error
         }
         await trx_node_1.TrxNode.ok(this.trx, { length: results.data.length });
         return results.data;
@@ -88,8 +84,7 @@ class BucketQueryTrxNode {
             result = await this.bucket.query(this.trx, this.query, pagination, this.view);
         }
         catch (e) {
-            await trx_node_1.TrxNode.error(this.trx, e); // Bucket unexpected error
-            throw e;
+            throw await trx_node_1.TrxNode.error(this.trx, e); // Bucket unexpected error
         }
         await trx_node_1.TrxNode.ok(this.trx, { length: result.data.length });
         return result;

package/lib/engine/transaction/nodes/job.trx_node.js

@@ -26,8 +26,7 @@ class JobTrxNode {
             response = await this.job.consumeRaw(trx, message, this.ctx);
         }
         catch (e) {
-            await trx_node_1.TrxNode.error(trx, e);
-            throw e;
+            throw await trx_node_1.TrxNode.error(trx, e);
         }
         await trx_node_1.TrxNode.ok(trx, response);
         return response;
@@ -40,8 +39,7 @@ class JobTrxNode {
             response = await this.job.consume(trx, message, this.ctx);
         }
         catch (e) {
-            await trx_node_1.TrxNode.error(trx, e);
-            throw e;
+            throw await trx_node_1.TrxNode.error(trx, e);
         }
         await trx_node_1.TrxNode.ok(trx, response);
         return response;

package/lib/engine/transaction/nodes/machine.trx_node.js

@@ -19,8 +19,7 @@ class MachineTrxNode {
             response = await this.machine.consumeRaw(trx, message);
         }
         catch (e) {
-            await trx_node_1.TrxNode.error(trx, e);
-            throw e;
+            throw await trx_node_1.TrxNode.error(trx, e);
         }
         await trx_node_1.TrxNode.ok(trx, response);
         return response;
@@ -33,8 +32,7 @@ class MachineTrxNode {
             response = await this.machine.consume(trx, message);
         }
         catch (e) {
-            await trx_node_1.TrxNode.error(trx, e);
-            throw e;
+            throw await trx_node_1.TrxNode.error(trx, e);
         }
         await trx_node_1.TrxNode.ok(trx, response);
         return response;

package/lib/engine/transaction/nodes/queue.trx_node.js

@@ -19,8 +19,7 @@ class QueueTrxNode {
             // response = this.queue.push(trx, raw);
         }
         catch (e) {
-            await trx_node_1.TrxNode.error(trx, e);
-            throw e;
+            throw await trx_node_1.TrxNode.error(trx, e);
         }
         await trx_node_1.TrxNode.ok(trx, response);
     }

package/lib/engine/transaction/nodes/resource.trx_node.js

@@ -19,8 +19,7 @@ class ResourceTrxNode {
             response = await this.resource.consume(trx, message);
         }
         catch (e) {
-            await trx_node_1.TrxNode.error(trx, e);
-            throw e;
+            throw await trx_node_1.TrxNode.error(trx, e);
         }
         await trx_node_1.TrxNode.ok(trx, response);
         return response;
@@ -71,8 +70,7 @@ class ResourceTrxNode {
             response = await this.resource.consumeRaw(trx, message);
         }
         catch (e) {
-            await trx_node_1.TrxNode.error(trx, e);
-            throw e;
+            throw await trx_node_1.TrxNode.error(trx, e);
         }
         await trx_node_1.TrxNode.ok(trx, response);
         return response;