npm - @bsb/base - Versions diffs - 9.0.0 → 9.0.3 - Mend

@bsb/base 9.0.0 → 9.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (36) hide show

package/README.md +11 -49
package/lib/plugins/config-default/interfaces.d.ts +3 -2
package/lib/schemas/config-default.plugin.json +1 -1
package/lib/schemas/events-default.plugin.json +1 -1
package/lib/schemas/observable-default.plugin.json +1 -1
package/lib/serviceBase/events.js +2 -2
package/lib/serviceBase/events.js.map +1 -1
package/lib/serviceBase/observable.js +1 -1
package/lib/serviceBase/observable.js.map +1 -1
package/lib/serviceBase/plugins.d.ts +8 -1
package/lib/serviceBase/plugins.js +115 -25
package/lib/serviceBase/plugins.js.map +1 -1
package/lib/serviceBase/services.js +2 -2
package/lib/serviceBase/services.js.map +1 -1
package/lib/tests/mocks.d.ts +37 -0
package/lib/tests/mocks.js +164 -0
package/lib/tests/mocks.js.map +1 -0
package/lib/tests/sb/plugins/events/broadcast.d.ts +30 -0
package/lib/tests/sb/plugins/events/broadcast.js +357 -0
package/lib/tests/sb/plugins/events/broadcast.js.map +1 -0
package/lib/tests/sb/plugins/events/emit.d.ts +30 -0
package/lib/tests/sb/plugins/events/emit.js +353 -0
package/lib/tests/sb/plugins/events/emit.js.map +1 -0
package/lib/tests/sb/plugins/events/emitAndReturn.d.ts +30 -0
package/lib/tests/sb/plugins/events/emitAndReturn.js +382 -0
package/lib/tests/sb/plugins/events/emitAndReturn.js.map +1 -0
package/lib/tests/sb/plugins/events/emitStreamAndReceiveStream.d.ts +30 -0
package/lib/tests/sb/plugins/events/emitStreamAndReceiveStream.js +298 -0
package/lib/tests/sb/plugins/events/emitStreamAndReceiveStream.js.map +1 -0
package/lib/tests/sb/plugins/events/index.d.ts +28 -0
package/lib/tests/sb/plugins/events/index.js +69 -0
package/lib/tests/sb/plugins/events/index.js.map +1 -0
package/lib/tests/trace.d.ts +41 -0
package/lib/tests/trace.js +85 -0
package/lib/tests/trace.js.map +1 -0
package/package.json +92 -91

package/README.md CHANGED Viewed

@@ -86,34 +86,6 @@ Boot flow (high level):
 Timekeeping metrics are recorded for each step and logged as timers. A heartbeat counter runs hourly.
-### ServiceBase APIs (for BSB contributors only)
-- Construction (modern):
-  ```ts
-  import { ServiceBase, BSBPreset } from "@bettercorp/service-base";
-  // Simple defaults (local dev only)
-  const app = ServiceBase.development();
-  // Preset with overrides (local dev only)
-  const prod = ServiceBase.fromPreset(BSBPreset.PRODUCTION, { cwd: "/app" });
-  // Fully custom options (local dev only)
-  const custom = ServiceBase.create({ cwd: process.cwd(), plugins: ["logging-default", "events-default"] });
-  ```
-- Lifecycle:
-  ```ts
-  await app.init();
-  await app.run();
-  // app.dispose(code, reason) is called automatically on signals/errors
-  ```
-- Add a service plugin programmatically (local dev only, before services init):
-  ```ts
-  import { BSBService } from "@bettercorp/service-base";
-  class MyService extends BSBService<{ greeting: string }> { /* ... */ }
-  await app.addService("service-my", MyService as any, { greeting: "hi" });
-  ```
 ### Subsystems
 - `SBConfig` (configuration)
   - Defaults to `config-default` plugin; can be replaced via environment variables
@@ -134,7 +106,7 @@ Timekeeping metrics are recorded for each step and logged as timers. A heartbeat
 `SBPlugins` looks for plugins in the following order (container usage prefers the first external option):
 - Local project (dev): `src/plugins/<type>-<name>/index.ts`
 - Local build: `lib/plugins/<type>-<name>/index.js`
-- External plugin directory (`BSB_PLUGIN_DIR`) [preferred in container]: `<dir>/<npmPackage>/<version or latest>/lib/plugins/<type>-<name>/index.js`
+- External plugin directory (`BSB_PLUGIN_DIR`) [preferred in container]: `<dir>/<npmPackage>/<major>/<minor>/<micro>/lib/plugins/<type>-<name>/index.js`
 - Node modules: `node_modules/<npmPackage>/lib/plugins/<type>-<name>/index.js`
 Each plugin folder must export at least a `Plugin` class. Optionally export a `Config` class that extends `BSBPluginConfig` to provide validation and structured config.
@@ -161,7 +133,7 @@ Built‑in plugin types include: `config-*`, `logging-*`, `metrics-*`, `events-*
 - `npm test`: Mocha + NYC coverage in TS mode
 - `npm run testDev`: Run tests without coverage (faster for development)
 - `npm run generate-docs`: Generate TypeDoc JSON to `docs.json`
-- `npm run docs`: Build static docs to `../docs/dist/languages/nodejs/types`
+- API Reference: Hosted at `https://types.bsbcode.dev/nodejs/`
 - `npm run export-schemas`: Export event schemas to `lib/schemas/{plugin-name}.json`
 - `npm run generate-plugin-json`: Generate plugin metadata in `lib/schemas/`
@@ -179,28 +151,25 @@ Example run (with mounted plugins directory):
 docker run --rm \
   -e BSB_PLUGINS="@bettercorp/your-plugin" \
   -v $(pwd)/plugins:/mnt/plugins \
-  bettercorp/bsb-node:latest
+  betterweb/service-base:9
 ```
 Recommended plugin directory layout (when using `BSB_PLUGIN_DIR`):
 ```
 /mnt/plugins/
   @org/plugin-a/
-    latest/
-      package.json            # version field used when resolving
-      lib/plugins/service-plugin-a/index.js
-      lib/plugins/logging-xyz/index.js
-    1.2.3/
+    1/2/3/
       package.json
       lib/plugins/service-plugin-a/index.js
+      lib/plugins/logging-xyz/index.js
   @org/plugin-b/
-    latest/
+    2/4/1/
       package.json
       lib/plugins/events-abc/index.js
 ```
 Notes
-- In container deployments, prefer placing prebuilt plugins under `BSB_PLUGIN_DIR` as above. This avoids network installs on boot and ensures deterministic versions via versioned folders or `latest`.
+- In container deployments, prefer placing prebuilt plugins under `BSB_PLUGIN_DIR` as above. This avoids network installs on boot and ensures deterministic versions via immutable versioned folders.
 - `BSB_PLUGINS` is available for dynamic `npm install` at startup, but mounting a curated plugin repository via `BSB_PLUGIN_DIR` is recommended for production.
 ### Environment Variables
@@ -209,8 +178,8 @@ Notes
 - `BSB_PLUGINS`: Comma‑separated list of npm packages to install at container start (entrypoint.js)
 - `BSB_PLUGIN_UPDATE`: `yes|y|true` to run `npm update` at container start
 - Config plugin override (advanced):
-  - `BSB_LOGGER_PLUGIN`: Name of config plugin (must start with `config-`)
-  - `BSB_LOGGER_PLUGIN_PACKAGE`: npm package name hosting the config plugin
+  - `BSB_CONFIG_PLUGIN`: Name of config plugin (must start with `config-`)
+  - `BSB_CONFIG_PLUGIN_PACKAGE`: npm package name hosting the config plugin
 ### Documentation
@@ -221,7 +190,7 @@ Notes
 #### API Documentation
 - API docs are generated with TypeDoc (`typedoc.json`).
   - `npm run generate-docs` → emits `docs.json`
-  - `npm run docs` → builds static site under `../docs/dist/languages/nodejs/types`
+  - API docs are served at `https://types.bsbcode.dev/nodejs/`
 ### Testing
 - Tests: Mocha + ts-node with NYC coverage
@@ -238,11 +207,6 @@ Quick reference:
 - Use cross-language type helpers (`uuid`, `int32`, `datetime`, etc.) for better code generation
 - Plugin metadata auto-generates `PLUGIN_CLIENT` and schema files during build
-Legacy templates are available under `templates/` but use outdated v8 patterns:
-- `templates/plugin.ts`, `templates/pluginClient.ts` (service plugin + client)
-- `templates/events.ts` (events plugin)
-- `templates/logger.ts` (logging plugin)
 At minimum, export a `Plugin` class in `lib/plugins/<type>-<name>/index.js` (or `src/plugins/.../index.ts` in dev). For configurable plugins, export a `Config` created with `createConfigSchema()`. Publish your plugin as an npm package or ship its prebuilt folder structure under `BSB_PLUGIN_DIR`.
 ### Quick Start (Container)
@@ -251,7 +215,7 @@ At minimum, export a `Plugin` class in `lib/plugins/<type>-<name>/index.js` (or
 docker run --rm \
   -v $(pwd)/plugins:/mnt/plugins:ro \
   -e BSB_PLUGIN_DIR=/mnt/plugins \
-  bettercorp/bsb-node:latest
+  betterweb/service-base:9
 ```
 Local development (for contributors only):
@@ -259,5 +223,3 @@ Local development (for contributors only):
 npm install
 npm run dev
 ```

package/lib/plugins/config-default/interfaces.d.ts CHANGED Viewed

@@ -36,9 +36,10 @@ export interface DeploymentProfile {
     /**
      * @name NPM Package version
      * @description The NPM package version that holds the plugin
-     * @example 1.0.0
-     * @example 1.0.1
+     * @example 1.2
+     * @example 1.2.3
      */
+    version?: string;
     /**
      * @name Plugin name
      * @description The name of the plugin

package/lib/schemas/config-default.plugin.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "id": "config-default",
   "name": "config-default",
-  "version": "9.0.0",
+  "version": "9.0.3",
   "description": "Default configuration plugin for profile and plugin resolution",
   "category": "config",
   "tags": [

package/lib/schemas/events-default.plugin.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "id": "events-default",
   "name": "events-default",
-  "version": "9.0.0",
+  "version": "9.0.3",
   "description": "Default in-process events plugin for BSB event routing",
   "category": "events",
   "tags": [

package/lib/schemas/observable-default.plugin.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "id": "observable-default",
   "name": "observable-default",
-  "version": "9.0.0",
+  "version": "9.0.3",
   "description": "Default console observable plugin for logging output",
   "category": "observable",
   "tags": [

package/lib/serviceBase/events.js CHANGED Viewed

@@ -134,7 +134,7 @@ class SBEvents {
                 name: plugin,
                 package: plugins[plugin].package,
                 plugin: plugins[plugin].plugin,
-                version: "",
+                version: plugins[plugin].version ?? "",
             }, plugins[plugin].filter);
         }
         this.observableBackend.info(tTrace, "Adding \"events-default\" as events");
@@ -247,7 +247,7 @@ class SBEvents {
             name: plugin.name,
             file: plugin.plugin,
         });
-        const newPlugin = await this.sbPlugins.loadPlugin(this.observableBackend, plugin.package ?? null, plugin.plugin, plugin.name);
+        const newPlugin = await this.sbPlugins.loadPlugin(this.observableBackend, plugin.package ?? null, plugin.plugin, plugin.name, plugin.version ?? null);
         if (newPlugin === null || !newPlugin.success) {
             this.observableBackend.error(tTrace, "Failed to import events plugin: {name} from ({package}){file}", {
                 package: plugin.package ?? "this project",

package/lib/serviceBase/events.js.map CHANGED Viewed

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

package/lib/serviceBase/observable.js CHANGED Viewed

@@ -274,7 +274,7 @@ class SBObservable {
                 continue;
             }
             try {
-                const loadResult = await this.sbPlugins.loadPlugin(this.observableBackend, pluginDef.package ?? null, pluginDef.plugin, pluginKey);
+                const loadResult = await this.sbPlugins.loadPlugin(this.observableBackend, pluginDef.package ?? null, pluginDef.plugin, pluginKey, pluginDef.version ?? null);
                 if (!loadResult || !loadResult.success) {
                     this.observableBackend.error(trace, "Failed to load observable plugin {plugin}", { plugin: pluginKey });
                     continue;

package/lib/serviceBase/observable.js.map CHANGED Viewed

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

package/lib/serviceBase/plugins.d.ts CHANGED Viewed

@@ -42,7 +42,14 @@ export declare class SBPlugins {
     protected nodeModulesPluginDir: string;
     protected referencedPluginDir: string | null;
     protected devMode: boolean;
+    private static readonly MINOR_SELECTOR_REGEX;
+    private static readonly EXACT_VERSION_REGEX;
+    private static readonly SEMVER_REGEX;
     constructor(cwd: string, devMode: boolean);
-    loadPlugin<NamedType extends PluginType, ClassType extends PluginTypeDefinitionRef<NamedType> = PluginTypeDefinitionRef<NamedType>>(log: IPluginLogging, npmPackage: string | null, plugin: string, name: string): Promise<Result<LoadedPlugin<NamedType, ClassType>, Error>>;
+    private parseSemver;
+    private compareSemver;
+    private listVersionsFromReferencedDir;
+    private resolveVersionFromSelector;
+    loadPlugin<NamedType extends PluginType, ClassType extends PluginTypeDefinitionRef<NamedType> = PluginTypeDefinitionRef<NamedType>>(log: IPluginLogging, npmPackage: string | null, plugin: string, name: string, requestedVersion?: string | null): Promise<Result<LoadedPlugin<NamedType, ClassType>, Error>>;
     loadPluginFile<NamedType extends PluginType, ClassType extends PluginTypeDefinitionRef<NamedType>>(pluginPath: string, pluginName: string, packageCwd: string, version: string): Promise<LoadedPlugin<NamedType, ClassType>>;
 }

package/lib/serviceBase/plugins.js CHANGED Viewed

@@ -53,19 +53,110 @@ class SBPlugins {
     nodeModulesPluginDir;
     referencedPluginDir = null;
     devMode;
+    static MINOR_SELECTOR_REGEX = /^\d+\.\d+$/;
+    static EXACT_VERSION_REGEX = /^\d+\.\d+\.\d+$/;
+    static SEMVER_REGEX = /^(\d+)\.(\d+)\.(\d+)$/;
     constructor(cwd, devMode) {
         this.cwd = cwd;
         this.devMode = devMode;
         this.nodeModulesPluginDir = (0, node_path_1.join)(this.cwd, "./node_modules/");
-        if (typeof process.env.BSB_PLUGIN_DIR == "string" &&
-            process.env.BSB_PLUGIN_DIR.length > 3) {
-            if (!(0, node_fs_1.existsSync)(process.env.BSB_PLUGIN_DIR)) {
-                throw new Error(`Plugin directory ${process.env.BSB_PLUGIN_DIR} does not exist`);
+        const pluginDirEnv = process.env.BSB_PLUGINS_DIR ?? process.env.BSB_PLUGIN_DIR;
+        if (typeof pluginDirEnv == "string" &&
+            pluginDirEnv.length > 3) {
+            if (!(0, node_fs_1.existsSync)(pluginDirEnv)) {
+                throw new Error(`Plugin directory ${pluginDirEnv} does not exist`);
             }
-            this.referencedPluginDir = process.env.BSB_PLUGIN_DIR;
+            this.referencedPluginDir = pluginDirEnv;
         }
     }
-    async loadPlugin(log, npmPackage, plugin, name) {
+    parseSemver(version) {
+        const match = version.match(SBPlugins.SEMVER_REGEX);
+        if (!match)
+            return null;
+        return [Number(match[1]), Number(match[2]), Number(match[3])];
+    }
+    compareSemver(a, b) {
+        const pa = this.parseSemver(a);
+        const pb = this.parseSemver(b);
+        if (!pa || !pb)
+            return 0;
+        if (pa[0] !== pb[0])
+            return pa[0] - pb[0];
+        if (pa[1] !== pb[1])
+            return pa[1] - pb[1];
+        return pa[2] - pb[2];
+    }
+    listVersionsFromReferencedDir(npmPackage) {
+        if (!this.referencedPluginDir)
+            return [];
+        const packageRoot = (0, node_path_1.join)(this.referencedPluginDir, npmPackage);
+        if (!(0, node_fs_1.existsSync)(packageRoot))
+            return [];
+        const out = [];
+        // New hierarchical layout: /pkg/<major>/<minor>/<micro>/
+        for (const majorEntry of (0, node_fs_1.readdirSync)(packageRoot, { withFileTypes: true })) {
+            if (!majorEntry.isDirectory() || !/^\d+$/.test(majorEntry.name))
+                continue;
+            const majorPath = (0, node_path_1.join)(packageRoot, majorEntry.name);
+            for (const minorEntry of (0, node_fs_1.readdirSync)(majorPath, { withFileTypes: true })) {
+                if (!minorEntry.isDirectory() || !/^\d+$/.test(minorEntry.name))
+                    continue;
+                const minorPath = (0, node_path_1.join)(majorPath, minorEntry.name);
+                for (const microEntry of (0, node_fs_1.readdirSync)(minorPath, { withFileTypes: true })) {
+                    if (!microEntry.isDirectory() || !/^\d+$/.test(microEntry.name))
+                        continue;
+                    const pluginRoot = (0, node_path_1.join)(minorPath, microEntry.name);
+                    out.push({
+                        version: `${majorEntry.name}.${minorEntry.name}.${microEntry.name}`,
+                        packageCwd: pluginRoot,
+                        pluginRoot,
+                    });
+                }
+            }
+        }
+        // Legacy layout: /pkg/<major.minor.micro>/
+        for (const versionEntry of (0, node_fs_1.readdirSync)(packageRoot, { withFileTypes: true })) {
+            if (!versionEntry.isDirectory())
+                continue;
+            if (!SBPlugins.EXACT_VERSION_REGEX.test(versionEntry.name))
+                continue;
+            const pluginRoot = (0, node_path_1.join)(packageRoot, versionEntry.name);
+            out.push({
+                version: versionEntry.name,
+                packageCwd: pluginRoot,
+                pluginRoot,
+            });
+        }
+        const dedup = new Map();
+        for (const item of out) {
+            // Prefer first-seen entries (hierarchical layout is collected first).
+            if (!dedup.has(item.version)) {
+                dedup.set(item.version, item);
+            }
+        }
+        return Array.from(dedup.values());
+    }
+    resolveVersionFromSelector(versions, requestedVersion) {
+        if (versions.length === 0)
+            return null;
+        const sorted = versions.slice().sort((a, b) => this.compareSemver(a.version, b.version));
+        if (requestedVersion == null || requestedVersion.length === 0) {
+            return sorted[sorted.length - 1];
+        }
+        if (SBPlugins.EXACT_VERSION_REGEX.test(requestedVersion)) {
+            return sorted.find((x) => x.version === requestedVersion) ?? null;
+        }
+        if (SBPlugins.MINOR_SELECTOR_REGEX.test(requestedVersion)) {
+            const [major, minor] = requestedVersion.split(".");
+            const matching = sorted.filter((x) => {
+                const parsed = this.parseSemver(x.version);
+                return parsed !== null && String(parsed[0]) === major && String(parsed[1]) === minor;
+            });
+            return matching.length > 0 ? matching[matching.length - 1] : null;
+        }
+        throw new Error(`Invalid plugin version selector "${requestedVersion}". Allowed formats: "major.minor" or "major.minor.micro".`);
+    }
+    async loadPlugin(log, npmPackage, plugin, name, requestedVersion) {
         const tTrace = internalTrace(`loadPlugin:${npmPackage}:${plugin}`);
         log.debug(tTrace, `Plugin {name} from {package} try load as {pluginName}`, {
             name: plugin,
@@ -75,7 +166,10 @@ class SBPlugins {
         const nodeModulesLib = npmPackage !== null;
         let pluginPath = "";
         let packageCwd = this.cwd;
-        let version = "1.0.0";
+        let version = (typeof requestedVersion === "string" &&
+            requestedVersion.length > 0)
+            ? requestedVersion
+            : "1.0.0";
         if (!nodeModulesLib) {
             // If no package is defined in the config, we will not look anywhere else except for the local plugins
             if (this.devMode) {
@@ -97,27 +191,23 @@ class SBPlugins {
         else {
             // If a package is defined in the config, we will look for the plugin in the BSB_PLUGIN_DIR env, followed by the node_modules directory. Local plugins are not used.
             if (this.referencedPluginDir) {
-                const T1packageCwd = (0, node_path_1.join)(this.referencedPluginDir, npmPackage, version);
-                const T1pluginPath = (0, node_path_1.join)(this.referencedPluginDir, npmPackage, version, "./lib/plugins/" + plugin);
-                if ((0, node_fs_1.existsSync)(T1pluginPath)) {
-                    pluginPath = T1pluginPath;
-                    packageCwd = T1packageCwd;
-                }
-                else {
-                    const T2pluginPath = (0, node_path_1.join)(this.referencedPluginDir, npmPackage, "latest", "./lib/plugins/" + plugin);
-                    const T2packageCwd = (0, node_path_1.join)(this.referencedPluginDir, npmPackage, "latest");
-                    if ((0, node_fs_1.existsSync)(T2pluginPath)) {
-                        pluginPath = T2pluginPath;
-                        packageCwd = T2packageCwd;
+                const availableVersions = this.listVersionsFromReferencedDir(npmPackage);
+                const resolved = this.resolveVersionFromSelector(availableVersions, requestedVersion ?? null);
+                if (resolved) {
+                    const versionedPluginPath = (0, node_path_1.join)(resolved.pluginRoot, "./lib/plugins/" + plugin);
+                    if ((0, node_fs_1.existsSync)(versionedPluginPath)) {
+                        pluginPath = versionedPluginPath;
+                        packageCwd = resolved.packageCwd;
+                        version = resolved.version;
                     }
                 }
             }
-            if (pluginPath == '') {
-                const T3pluginPath = (0, node_path_1.join)(this.nodeModulesPluginDir, npmPackage, "./lib/plugins/" + plugin);
-                const T3packageCwd = (0, node_path_1.join)(this.nodeModulesPluginDir, npmPackage);
-                if ((0, node_fs_1.existsSync)(T3pluginPath)) {
-                    pluginPath = T3pluginPath;
-                    packageCwd = T3packageCwd;
+            if (pluginPath == "") {
+                const nodeModulesPluginPath = (0, node_path_1.join)(this.nodeModulesPluginDir, npmPackage, "./lib/plugins/" + plugin);
+                const nodeModulesPackageCwd = (0, node_path_1.join)(this.nodeModulesPluginDir, npmPackage);
+                if ((0, node_fs_1.existsSync)(nodeModulesPluginPath)) {
+                    pluginPath = nodeModulesPluginPath;
+                    packageCwd = nodeModulesPackageCwd;
                 }
             }
             if ((0, node_fs_1.existsSync)(packageCwd) && (0, node_fs_1.existsSync)((0, node_path_1.join)(packageCwd, "./package.json"))) {

package/lib/serviceBase/plugins.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../src/serviceBase/plugins.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;;;AAEH,~~qCAAmD~~;~~AACnD~~,yCAAiC;AAEjC,8CAA0J;AAE1J;;GAEG;AACH,SAAS,aAAa,CAAC,IAAY;IACjC,OAAO,IAAA,6BAAgB,EAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;AACzD,CAAC;~~AAED~~;;;;;;;;GAQG;AACH,MAAa,SAAS;IACpB;;OAEG;IACO,GAAG,CAAS;IACZ,oBAAoB,CAAS;IAC7B,mBAAmB,GAAkB,IAAI,CAAC;IAC1C,OAAO,CAAU;~~IAE3B~~,YAAY,GAAW,EAAE,OAAgB;QACvC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,oBAAoB,GAAG,IAAA,gBAAI,EAAC,IAAI,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;QAC9D,~~IACE~~,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,QAAQ;~~YAC7C~~,OAAO,CAAC,GAAG,CAAC,~~cAAc~~,CAAC,MAAM,GAAG,CAAC,~~EACrC~~,CAAC;~~YACD~~,IAAI,CAAC,IAAA,oBAAU,EAAC,OAAO,CAAC,GAAG,CAAC,~~cAAc~~,CAAC,EAAE,CAAC;~~gBAC5C~~,MAAM,IAAI,KAAK,CAAC,~~oBAAqB~~,OAAO,CAAC,GAAG,CAAC,~~cAAe~~,~~iBAAiB~~,CAAC,CAAC;~~YACrF~~,CAAC;~~YACD~~,IAAI,CAAC,~~mBAAmB~~,GAAG,OAAO,CAAC,GAAG,CAAC,~~cAAc~~,CAAC;QACxD,CAAC;~~IACH~~,CAAC;IAEM,KAAK,CAAC,UAAU,CAIrB,GAAmB,EACnB,UAAyB,EACzB,MAAc,EACd,IAAY;~~QAEZ~~,MAAM,MAAM,GAAG,aAAa,CAAC,cAAe,UAAW,IAAK,MAAO,EAAE,CAAC,CAAC;QACvE,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,uDAAuD,EAAE;YACzE,IAAI,EAAE,MAAM;YACZ,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,UAAU,IAAI,MAAM;SAC9B,CAAC,CAAC;QACH,MAAM,cAAc,GAAG,UAAU,KAAK,IAAI,CAAC;QAC3C,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC;QAC1B,IAAI,OAAO,GAAG,OAAO,CAAC;~~QACtB~~,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,sGAAsG;YACtG,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACjB,UAAU,GAAG,IAAA,gBAAI,EAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,GAAG,MAAM,CAAC,CAAC;gBACvD,IAAI,CAAC,IAAA,oBAAU,EAAC,UAAU,CAAC,EAAE,CAAC;oBAC5B,UAAU,GAAG,EAAE,CAAC;gBAClB,CAAC;YACH,CAAC;YACD,IAAI,UAAU,IAAI,EAAE,EAAE,CAAC;gBACrB,UAAU,GAAG,IAAA,gBAAI,EAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,GAAG,MAAM,CAAC,CAAC;YACzD,CAAC;YACD,MAAM,eAAe,GAAG,IAAA,gBAAI,EAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;YAC3D,IAAI,IAAA,oBAAU,EAAC,eAAe,CAAC,EAAE,CAAC;gBAChC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAA,sBAAY,EAAC,eAAe,EAAE,OAAO,CAAC;qBACnC,QAAQ,EAAE,CACd,CAAC;gBACF,OAAO,GAAG,WAAW,CAAC,OAAO,IAAE,OAAO,CAAC;YACzC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,oKAAoK;YACpK,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC7B,MAAM,~~YAAY~~,GAAG,~~IAAA,gBAAI,EAAC,~~IAAI,CAAC,~~mBAAmB~~,~~EAAE~~,UAAU,~~EAAE,OAAO,~~CAAC,CAAC;gBACzE,MAAM,~~YAAY~~,GAAG,~~IAAA,gBAAI,EAAC,~~IAAI,CAAC,~~mBAAmB~~,~~EAAE~~,~~UAAU~~,~~EAAE~~,~~OAAO,EAAE,~~gBAAgB,~~GAAG~~,~~MAAM~~,~~CAAC~~,CAAC;~~gBACpG~~,IAAI,~~IAAA~~,~~oBAAU,EAAC,YAAY,CAAC,~~EAAE,CAAC;~~oBAC7B~~,~~UAAU,GAAG,YAAY,CAAC;oBAC1B,UAAU,GAAG,YAAY,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,~~MAAM,~~YAAY~~,GAAG,IAAA,gBAAI,EAAC,~~IAAI~~,CAAC,~~mBAAmB,EAAE,~~UAAU,EAAE,~~QAAQ,EAAE,~~gBAAgB,GAAG,MAAM,CAAC,CAAC;~~oBACrG~~,~~MAAM~~,~~YAAY,GAAG,~~IAAA,~~gBAAI~~,EAAC,~~IAAI~~,CAAC,~~mBAAmB,~~EAAE,UAAU,~~EAAE~~,~~QAAQ~~,CAAC~~,CAAC~~;~~oBAC1E~~,~~IAAI~~,~~IAAA~~,~~oBAAU~~,~~EAAC,YAAY,~~CAAC,~~EAAE~~,CAAC;~~wBAC7B~~,~~UAAU~~,GAAG,~~YAAY~~,CAAC~~;wBAC1B~~,~~UAAU~~,~~GAAG,YAAY,~~CAAC;~~oBAC5B~~,CAAC;gBACH,CAAC;~~YACH~~,CAAC;YACD,IAAI,UAAU,IAAI,EAAE,EAAE,CAAC;gBACrB,MAAM,~~YAAY~~,GAAG,IAAA,gBAAI,EAAC,IAAI,CAAC,oBAAoB,EAAE,UAAU,EAAE,gBAAgB,GAAG,MAAM,CAAC,CAAC;~~gBAC5F~~,MAAM,~~YAAY~~,GAAG,IAAA,gBAAI,EAAC,IAAI,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;~~gBACjE~~,IAAI,IAAA,oBAAU,EAAC,~~YAAY~~,CAAC,EAAE,CAAC;~~oBAC7B~~,UAAU,GAAG,~~YAAY~~,CAAC;~~oBAC1B~~,UAAU,GAAG,~~YAAY~~,CAAC;~~gBAC5B~~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~~;CACF;AAlLD~~,~~8BAkLC~~"}
1	+ {"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../src/serviceBase/plugins.ts"],"names":[],"mappings":"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"}

package/lib/serviceBase/services.js CHANGED Viewed

@@ -85,7 +85,7 @@ class SBServices {
                 name: plugin,
                 package: plugins[plugin].package,
                 plugin: plugins[plugin].plugin,
-                version: "",
+                version: plugins[plugin].version ?? "",
             });
         }
         for (const activeService of this._activeServices) {
@@ -196,7 +196,7 @@ class SBServices {
             name: plugin.name,
             file: plugin.plugin,
         });
-        const newPlugin = await this.sbPlugins.loadPlugin(this.observableBackend, plugin.package ?? null, plugin.plugin, plugin.name);
+        const newPlugin = await this.sbPlugins.loadPlugin(this.observableBackend, plugin.package ?? null, plugin.plugin, plugin.name, plugin.version ?? null);
         if (newPlugin === null || !newPlugin.success) {
             this.observableBackend.error(tTrace, "Failed to import service plugin: {name} from ({package}){file}", {
                 package: plugin.package ?? "this project",