@bsb/base 9.0.5 → 9.1.1

package/lib/plugins/events-default/events/emitAndReturn.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * BSB (Better-Service-Base) is an event-bus based microservice framework.
  * Copyright (C) 2016 - 2025 BetterCorp (PTY) Ltd
@@ -25,11 +24,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.emitAndReturn = void 0;
-const node_events_1 = require("node:events");
-const index_1 = require("../../../index");
-class emitAndReturn extends node_events_1.EventEmitter {
+import { EventEmitter } from "node:events";
+import { BSBError } from "../../../index.js";
+export class emitAndReturn extends EventEmitter {
     constructor(_log) {
         super();
     }
@@ -74,7 +71,7 @@ class emitAndReturn extends node_events_1.EventEmitter {
         const self = this;
         return new Promise((resolve, reject) => {
             const timeoutHandler = setTimeout(() => {
-                const timeoutError = new index_1.BSBError(sendObs.trace, "Timeout: {pluginName}-{event}", {
+                const timeoutError = new BSBError(sendObs.trace, "Timeout: {pluginName}-{event}", {
                     pluginName,
                     event,
                 });
@@ -96,5 +93,4 @@ class emitAndReturn extends node_events_1.EventEmitter {
         });
     }
 }
-exports.emitAndReturn = emitAndReturn;
 //# sourceMappingURL=emitAndReturn.js.map

package/lib/plugins/events-default/events/emitAndReturn.js.map

@@ -1 +1 @@
-{"version":3,"file":"emitAndReturn.js","sourceRoot":"","sources":["../../../../src/plugins/events-default/events/emitAndReturn.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"emitAndReturn.js","sourceRoot":"","sources":["../../../../src/plugins/events-default/events/emitAndReturn.ts"],"names":[],"mappings":"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"}

package/lib/plugins/events-default/events/emitStreamAndReceiveStream.d.ts

@@ -26,7 +26,7 @@
  */
 import { EventEmitter } from "node:events";
 import { Readable } from "node:stream";
-import { Observable, IPluginLogging } from "../../../index";
+import { Observable, IPluginLogging } from "../../../index.js";
 export declare class emitStreamAndReceiveStream extends EventEmitter {
     private readonly staticCommsTimeout;
     constructor(_log: IPluginLogging);

package/lib/plugins/events-default/events/emitStreamAndReceiveStream.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * BSB (Better-Service-Base) is an event-bus based microservice framework.
  * Copyright (C) 2016 - 2025 BetterCorp (PTY) Ltd
@@ -25,12 +24,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.emitStreamAndReceiveStream = void 0;
-const node_events_1 = require("node:events");
-const node_crypto_1 = require("node:crypto");
-const index_1 = require("../../../index");
-class emitStreamAndReceiveStream extends node_events_1.EventEmitter {
+import { EventEmitter } from "node:events";
+import { randomUUID } from "node:crypto";
+import { BSBError } from "../../../index.js";
+export class emitStreamAndReceiveStream extends EventEmitter {
     // If we try receive or send a stream and the other party is not ready for some reason, we will automatically timeout in 5s.
     staticCommsTimeout = 1000;
     constructor(_log) {
@@ -46,7 +43,7 @@ class emitStreamAndReceiveStream extends node_events_1.EventEmitter {
             pluginName,
             timeoutSeconds,
         });
-        const streamId = `${(0, node_crypto_1.randomUUID)()}=${timeoutSeconds}`;
+        const streamId = `${randomUUID()}=${timeoutSeconds}`;
         receiveObs.log.debug("receiveStream: listening to {streamId} ({pluginName}-{event})", {
             streamId,
             pluginName,
@@ -55,7 +52,7 @@ class emitStreamAndReceiveStream extends node_events_1.EventEmitter {
         const self = this;
         return new Promise((resolve) => {
             const receiptTimeoutHandler = setTimeout(() => {
-                const timeoutError = new index_1.BSBError(receiveObs.trace, "Receive Receipt Timeout");
+                const timeoutError = new BSBError(receiveObs.trace, "Receive Receipt Timeout");
                 receiveObs.error(timeoutError);
                 listener(receiveObs, timeoutError, null);
                 self.emit(`${streamId}-error`, receiveObs, timeoutError);
@@ -108,11 +105,11 @@ class emitStreamAndReceiveStream extends node_events_1.EventEmitter {
                 rejectI(e);
             };
             let receiptTimeoutHandler = setTimeout(() => {
-                const timeoutError = new index_1.BSBError(sendObs.trace, "Send Receipt Timeout");
+                const timeoutError = new BSBError(sendObs.trace, "Send Receipt Timeout");
                 reject(timeoutError);
             }, self.staticCommsTimeout);
             const timeoutHandler = setTimeout(() => {
-                const timeoutError = new index_1.BSBError(sendObs.trace, "Stream Timeout");
+                const timeoutError = new BSBError(sendObs.trace, "Stream Timeout");
                 reject(timeoutError);
             }, timeout * 1000);
             self.once(`${streamId}-emit`, () => {
@@ -130,5 +127,4 @@ class emitStreamAndReceiveStream extends node_events_1.EventEmitter {
         });
     }
 }
-exports.emitStreamAndReceiveStream = emitStreamAndReceiveStream;
 //# sourceMappingURL=emitStreamAndReceiveStream.js.map

package/lib/plugins/events-default/events/emitStreamAndReceiveStream.js.map

@@ -1 +1 @@
-{"version":3,"file":"emitStreamAndReceiveStream.js","sourceRoot":"","sources":["../../../../src/plugins/events-default/events/emitStreamAndReceiveStream.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"emitStreamAndReceiveStream.js","sourceRoot":"","sources":["../../../../src/plugins/events-default/events/emitStreamAndReceiveStream.ts"],"names":[],"mappings":"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"}

package/lib/plugins/events-default/events/index.d.ts

@@ -24,7 +24,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-export { emit } from "./emit";
-export { emitAndReturn } from "./emitAndReturn";
-export { emitStreamAndReceiveStream } from "./emitStreamAndReceiveStream";
-export { broadcast } from "./broadcast";
+export { emit } from "./emit.js";
+export { emitAndReturn } from "./emitAndReturn.js";
+export { emitStreamAndReceiveStream } from "./emitStreamAndReceiveStream.js";
+export { broadcast } from "./broadcast.js";

package/lib/plugins/events-default/events/index.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * BSB (Better-Service-Base) is an event-bus based microservice framework.
  * Copyright (C) 2016 - 2025 BetterCorp (PTY) Ltd
@@ -25,14 +24,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.broadcast = exports.emitStreamAndReceiveStream = exports.emitAndReturn = exports.emit = void 0;
-var emit_1 = require("./emit");
-Object.defineProperty(exports, "emit", { enumerable: true, get: function () { return emit_1.emit; } });
-var emitAndReturn_1 = require("./emitAndReturn");
-Object.defineProperty(exports, "emitAndReturn", { enumerable: true, get: function () { return emitAndReturn_1.emitAndReturn; } });
-var emitStreamAndReceiveStream_1 = require("./emitStreamAndReceiveStream");
-Object.defineProperty(exports, "emitStreamAndReceiveStream", { enumerable: true, get: function () { return emitStreamAndReceiveStream_1.emitStreamAndReceiveStream; } });
-var broadcast_1 = require("./broadcast");
-Object.defineProperty(exports, "broadcast", { enumerable: true, get: function () { return broadcast_1.broadcast; } });
+export { emit } from "./emit.js";
+export { emitAndReturn } from "./emitAndReturn.js";
+export { emitStreamAndReceiveStream } from "./emitStreamAndReceiveStream.js";
+export { broadcast } from "./broadcast.js";
 //# sourceMappingURL=index.js.map

package/lib/plugins/events-default/events/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/events-default/events/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;;;AAEH,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,iDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,2EAA0E;AAAjE,wIAAA,0BAA0B,OAAA;AACnC,yCAAwC;AAA/B,sGAAA,SAAS,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/events-default/events/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC"}

package/lib/plugins/events-default/index.d.ts

@@ -25,12 +25,12 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 import { Readable } from "node:stream";
-import { emit, broadcast, emitAndReturn, emitStreamAndReceiveStream } from "../../plugins/events-default/events/index";
-import { Observable } from "../../index";
-import { BSBEvents, BSBEventsConstructor } from "../../base/BSBEvents";
-export declare const Config: import("../../index").BSBPluginConfigClass<undefined>;
+import { emit, broadcast, emitAndReturn, emitStreamAndReceiveStream } from "../../plugins/events-default/events/index.js";
+import { Observable } from "../../index.js";
+import { BSBEvents, BSBEventsConstructor } from "../../base/BSBEvents.js";
+export declare const Config: import("../../index.js").BSBPluginConfigClass<undefined>;
 export declare class Plugin extends BSBEvents<InstanceType<typeof Config>> {
-    static Config: import("../../index").BSBPluginConfigClass<undefined>;
+    static Config: import("../../index.js").BSBPluginConfigClass<undefined>;
     init?(): void;
     protected broadcast: broadcast;
     protected emit: emit;

package/lib/plugins/events-default/index.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * BSB (Better-Service-Base) is an event-bus based microservice framework.
  * Copyright (C) 2016 - 2025 BetterCorp (PTY) Ltd
@@ -25,12 +24,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Plugin = exports.Config = void 0;
-const index_1 = require("../../plugins/events-default/events/index");
-const BSBEvents_1 = require("../../base/BSBEvents");
-const PluginConfig_1 = require("../../base/PluginConfig");
-exports.Config = (0, PluginConfig_1.createConfigSchema)({
+import { emit, broadcast, emitAndReturn, emitStreamAndReceiveStream, } from "../../plugins/events-default/events/index.js";
+import { BSBEvents } from "../../base/BSBEvents.js";
+import { createConfigSchema } from "../../base/PluginConfig.js";
+export const Config = createConfigSchema({
     name: "events-default",
     description: "Default in-process events plugin for BSB event routing",
     image: "../docs/public/assets/images/bsb-logo.png",
@@ -40,18 +37,18 @@ exports.Config = (0, PluginConfig_1.createConfigSchema)({
         "./docs/core-plugins/events-default-patterns.md",
     ],
 });
-class Plugin extends BSBEvents_1.BSBEvents {
-    static Config = exports.Config;
+export class Plugin extends BSBEvents {
+    static Config = Config;
     broadcast;
     emit;
     ear;
     eas;
     constructor(config) {
         super(config);
-        this.broadcast = new index_1.broadcast(this.__internalObservable);
-        this.emit = new index_1.emit(this.__internalObservable);
-        this.ear = new index_1.emitAndReturn(this.__internalObservable);
-        this.eas = new index_1.emitStreamAndReceiveStream(this.__internalObservable);
+        this.broadcast = new broadcast(this.__internalObservable);
+        this.emit = new emit(this.__internalObservable);
+        this.ear = new emitAndReturn(this.__internalObservable);
+        this.eas = new emitStreamAndReceiveStream(this.__internalObservable);
     }
     dispose() {
         this.broadcast.dispose();
@@ -84,5 +81,4 @@ class Plugin extends BSBEvents_1.BSBEvents {
         return this.eas.sendStream(obs, pluginName, event, streamId, stream);
     }
 }
-exports.Plugin = Plugin;
 //# sourceMappingURL=index.js.map

package/lib/plugins/events-default/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/events-default/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/events-default/index.ts"],"names":[],"mappings":"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"}

package/lib/plugins/observable-default/index.d.ts

@@ -24,12 +24,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-import { BSBObservable, BSBObservableConstructor, BSBError } from "../../base";
-import { DTrace, LogMeta } from "../../interfaces";
-import { z } from "zod";
-export declare const Config: import("../../base").BSBPluginConfigClass<z.ZodObject<{}, z.core.$strip>>;
+import { BSBObservable, BSBObservableConstructor, BSBError } from "../../base/index.js";
+import { DTrace, LogMeta } from "../../interfaces/index.js";
+import * as av from "@anyvali/js";
+export declare const Config: import("../../base/PluginConfig.js").BSBPluginConfigClass<av.OptionalSchema<av.ObjectSchema<{}>>>;
 export declare class Plugin extends BSBObservable<InstanceType<typeof Config>> {
-    static Config: import("../../base").BSBPluginConfigClass<z.ZodObject<{}, z.core.$strip>>;
+    static Config: import("../../base/PluginConfig.js").BSBPluginConfigClass<av.OptionalSchema<av.ObjectSchema<{}>>>;
     private logFormatter;
     constructor(config: BSBObservableConstructor<InstanceType<typeof Config>>);
     private formatLog;

package/lib/plugins/observable-default/index.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * BSB (Better-Service-Base) is an event-bus based microservice framework.
  * Copyright (C) 2016 - 2025 BetterCorp (PTY) Ltd
@@ -25,10 +24,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Plugin = exports.Config = void 0;
-const base_1 = require("../../base");
-const zod_1 = require("zod");
+import { BSBObservable, LogFormatter, BSBError, createConfigSchema } from "../../base/index.js";
+import * as av from "@anyvali/js";
 // Console colours for log output
 const CONSOLE_COLOURS = {
     Reset: "\x1b[0m",
@@ -61,7 +58,7 @@ const LOG_LEVELS = {
     WARN: "warn",
     ERROR: "error",
 };
-exports.Config = (0, base_1.createConfigSchema)({
+export const Config = createConfigSchema({
     name: "observable-default",
     description: "Default console observable plugin for logging output",
     image: "../docs/public/assets/images/bsb-logo.png",
@@ -70,10 +67,10 @@ exports.Config = (0, base_1.createConfigSchema)({
         "./docs/core-plugins/observable-default.md",
         "./docs/core-plugins/observable-default-production.md",
     ],
-}, zod_1.z.object({}));
-class Plugin extends base_1.BSBObservable {
-    static Config = exports.Config;
-    logFormatter = new base_1.LogFormatter();
+}, av.optional(av.object({}, { unknownKeys: "strip" })).default({}));
+export class Plugin extends BSBObservable {
+    static Config = Config;
+    logFormatter = new LogFormatter();
     constructor(config) {
         super(config);
     }
@@ -124,7 +121,7 @@ class Plugin extends base_1.BSBObservable {
         this.formatLog(LOG_LEVELS.WARN, pluginName, trace, message, meta);
     }
     error(trace, pluginName, message, meta) {
-        if (message instanceof base_1.BSBError) {
+        if (message instanceof BSBError) {
             if (message.raw !== null) {
                 this.formatLog(LOG_LEVELS.ERROR, pluginName, message.raw.trace, message.raw.message, message.raw.meta);
             }
@@ -149,5 +146,4 @@ class Plugin extends base_1.BSBObservable {
         // No runtime setup needed for console logger
     }
 }
-exports.Plugin = Plugin;
 //# sourceMappingURL=index.js.map

package/lib/plugins/observable-default/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/observable-default/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/observable-default/index.ts"],"names":[],"mappings":"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"}