@twin.org/engine-core 0.0.2-next.22 → 0.0.2-next.24

package/dist/cjs/index.cjs

@@ -45,7 +45,7 @@ class MemoryStateStorage {
      * @returns The state of the engine or undefined if it doesn't exist.
      */
     async load(engineCore) {
-        engineCore.logInfo(core.I18n.formatMessage(`${core.StringHelper.camelCase(MemoryStateStorage.CLASS_NAME)}.loading`, {
+        engineCore.logInfo(core.I18n.formatMessage(`${"memoryStateStorage"}.loading`, {
             filename: this._engineState
         }));
         return this._engineState;
@@ -58,7 +58,7 @@ class MemoryStateStorage {
      */
     async save(engineCore, state) {
         if (!this._readonlyMode) {
-            engineCore.logInfo(core.I18n.formatMessage(`${core.StringHelper.camelCase(MemoryStateStorage.CLASS_NAME)}.saving`));
+            engineCore.logInfo(core.I18n.formatMessage(`${"memoryStateStorage"}.saving`));
             this._engineState = state;
         }
     }
@@ -71,12 +71,15 @@ class MemoryStateStorage {
  */
 class EngineCore {
     /**
-     * Name for the engine logger, used for direct console logging.
+     * Name for the engine logger component, used for direct console logging.
      */
-    static LOGGING_TYPE_NAME = "engine-logging-service";
+    static LOGGING_COMPONENT_TYPE_NAME = "engine-logging-service";
+    /**
+     * Name for the engine logger connector, used for direct console logging.
+     */
+    static LOGGING_CONNECTOR_TYPE_NAME = "engine-logging-connector";
     /**
      * Runtime name for the class.
-     * @internal
      */
     static CLASS_NAME = "EngineCore";
     /**
@@ -161,11 +164,18 @@ class EngineCore {
         core.Guards.stringValue(EngineCore.CLASS_NAME, "type", type);
         core.Guards.stringValue(EngineCore.CLASS_NAME, "module", module);
         core.Guards.stringValue(EngineCore.CLASS_NAME, "method", method);
-        this._typeInitialisers.push({
-            type,
-            module,
-            method
-        });
+        const currentIndex = this._typeInitialisers.findIndex(t => t.type === type);
+        if (currentIndex >= 0) {
+            this._typeInitialisers[currentIndex].module = module;
+            this._typeInitialisers[currentIndex].method = method;
+        }
+        else {
+            this._typeInitialisers.push({
+                type,
+                module,
+                method
+            });
+        }
     }
     /**
      * Get the type config for a specific type.
@@ -203,7 +213,7 @@ class EngineCore {
                         this.logInfo(core.I18n.formatMessage(`${"engineCore"}.componentStarting`, {
                             element: instance.instanceType
                         }));
-                        await instance.component.start(this._context.state.nodeIdentity, EngineCore.LOGGING_TYPE_NAME);
+                        await instance.component.start(this._context.state.nodeIdentity, EngineCore.LOGGING_COMPONENT_TYPE_NAME);
                     }
                 }
                 this.logInfo(core.I18n.formatMessage(`${"engineCore"}.componentsComplete`));
@@ -235,7 +245,7 @@ class EngineCore {
                     element: instance.instanceType
                 }));
                 try {
-                    await instance.component.stop(this._context.state.nodeIdentity, EngineCore.LOGGING_TYPE_NAME);
+                    await instance.component.stop(this._context.state.nodeIdentity, EngineCore.LOGGING_COMPONENT_TYPE_NAME);
                 }
                 catch (err) {
                     this.logError(new core.GeneralError(EngineCore.CLASS_NAME, "componentStopFailed", {
@@ -353,7 +363,12 @@ class EngineCore {
                 registeredType = registeredTypes.find(t => t.features?.every(f => features.includes(f)))?.type;
             }
             else {
-                registeredType = registeredTypes[0]?.type;
+                // First look for the default entry
+                registeredType = registeredTypes.find(t => t.isDefault)?.type;
+                // Can't find a default so just use the first entry
+                if (!core.Is.stringValue(registeredType)) {
+                    registeredType = registeredTypes[0]?.type;
+                }
             }
         }
         return registeredType;
@@ -428,18 +443,11 @@ class EngineCore {
                     });
                     result.factory?.register(finalInstanceType, () => result.component);
                     this._context.registeredInstances[typeKey] ??= [];
-                    if (typeConfig[i].isDefault ?? false) {
-                        this._context.registeredInstances[typeKey].unshift({
-                            type: finalInstanceType,
-                            features: typeConfig[i].features
-                        });
-                    }
-                    else {
-                        this._context.registeredInstances[typeKey].push({
-                            type: finalInstanceType,
-                            features: typeConfig[i].features
-                        });
-                    }
+                    this._context.registeredInstances[typeKey].push({
+                        type: finalInstanceType,
+                        isDefault: typeConfig[i].isDefault,
+                        features: typeConfig[i].features
+                    });
                 }
                 else {
                     throw new core.GeneralError("engineCore", "componentUnknownType", {
@@ -465,23 +473,23 @@ class EngineCore {
                 }
             });
         this._context.componentInstances.push({
-            instanceType: EngineCore.LOGGING_TYPE_NAME,
+            instanceType: EngineCore.LOGGING_CONNECTOR_TYPE_NAME,
             component: engineLoggerConnector
         });
-        loggingModels.LoggingConnectorFactory.register(EngineCore.LOGGING_TYPE_NAME, () => engineLoggerConnector);
+        loggingModels.LoggingConnectorFactory.register(EngineCore.LOGGING_CONNECTOR_TYPE_NAME, () => engineLoggerConnector);
         this._context.registeredInstances.loggingConnector = [
             {
-                type: EngineCore.LOGGING_TYPE_NAME
+                type: EngineCore.LOGGING_CONNECTOR_TYPE_NAME
             }
         ];
         const engineLoggerComponent = new loggingService.LoggingService({
-            loggingConnectorType: EngineCore.LOGGING_TYPE_NAME
+            loggingConnectorType: EngineCore.LOGGING_CONNECTOR_TYPE_NAME
         });
         this._engineLoggingComponent = engineLoggerComponent;
-        core.ComponentFactory.register(EngineCore.LOGGING_TYPE_NAME, () => engineLoggerComponent);
+        core.ComponentFactory.register(EngineCore.LOGGING_COMPONENT_TYPE_NAME, () => engineLoggerComponent);
         this._context.registeredInstances.loggingComponent = [
             {
-                type: EngineCore.LOGGING_TYPE_NAME
+                type: EngineCore.LOGGING_COMPONENT_TYPE_NAME
             }
         ];
     }
@@ -537,7 +545,7 @@ class EngineCore {
                     this.logInfo(core.I18n.formatMessage(`${"engineCore"}.bootstrapping`, {
                         element: instanceName
                     }));
-                    const bootstrapSuccess = await instance.component.bootstrap(EngineCore.LOGGING_TYPE_NAME);
+                    const bootstrapSuccess = await instance.component.bootstrap(EngineCore.LOGGING_COMPONENT_TYPE_NAME);
                     // If the bootstrap method failed then throw an error
                     if (!bootstrapSuccess) {
                         throw new core.GeneralError(EngineCore.CLASS_NAME, "bootstrapFailed", {
@@ -603,7 +611,7 @@ class FileStateStorage {
      */
     async load(engineCore) {
         try {
-            engineCore.logInfo(core.I18n.formatMessage(`${core.StringHelper.camelCase(FileStateStorage.CLASS_NAME)}.loading`, {
+            engineCore.logInfo(core.I18n.formatMessage(`${"fileStateStorage"}.loading`, {
                 filename: this._filename
             }));
             if (await this.fileExists(this._filename)) {
@@ -612,7 +620,7 @@ class FileStateStorage {
             }
         }
         catch (err) {
-            throw new core.GeneralError(FileStateStorage.CLASS_NAME, "loadingError", { filename: this._filename }, core.BaseError.fromError(err));
+            throw new core.GeneralError(FileStateStorage.CLASS_NAME, "failedLoading", { filename: this._filename }, core.BaseError.fromError(err));
         }
     }
     /**
@@ -624,7 +632,7 @@ class FileStateStorage {
     async save(engineCore, state) {
         if (!this._readonlyMode) {
             try {
-                engineCore.logInfo(core.I18n.formatMessage(`${core.StringHelper.camelCase(FileStateStorage.CLASS_NAME)}.saving`, {
+                engineCore.logInfo(core.I18n.formatMessage(`${"fileStateStorage"}.saving`, {
                     filename: this._filename
                 }));
                 try {
@@ -634,7 +642,7 @@ class FileStateStorage {
                 await promises.writeFile(this._filename, JSON.stringify(state, undefined, "\t"), "utf8");
             }
             catch (err) {
-                throw new core.GeneralError(FileStateStorage.CLASS_NAME, "savingError", { filename: this._filename }, core.BaseError.fromError(err));
+                throw new core.GeneralError(FileStateStorage.CLASS_NAME, "failedSaving", { filename: this._filename }, core.BaseError.fromError(err));
             }
         }
     }

package/dist/esm/index.mjs

@@ -1,5 +1,5 @@
 import { isMainThread } from 'node:worker_threads';
-import { I18n, StringHelper, Is, Guards, BaseError, GeneralError, ErrorHelper, ComponentFactory } from '@twin.org/core';
+import { I18n, Is, Guards, BaseError, GeneralError, ErrorHelper, ComponentFactory } from '@twin.org/core';
 import { EntitySchemaFactory } from '@twin.org/entity';
 import { ConsoleLoggingConnector } from '@twin.org/logging-connector-console';
 import { SilentLoggingConnector, LoggingConnectorFactory } from '@twin.org/logging-models';
@@ -43,7 +43,7 @@ class MemoryStateStorage {
      * @returns The state of the engine or undefined if it doesn't exist.
      */
     async load(engineCore) {
-        engineCore.logInfo(I18n.formatMessage(`${StringHelper.camelCase(MemoryStateStorage.CLASS_NAME)}.loading`, {
+        engineCore.logInfo(I18n.formatMessage(`${"memoryStateStorage"}.loading`, {
             filename: this._engineState
         }));
         return this._engineState;
@@ -56,7 +56,7 @@ class MemoryStateStorage {
      */
     async save(engineCore, state) {
         if (!this._readonlyMode) {
-            engineCore.logInfo(I18n.formatMessage(`${StringHelper.camelCase(MemoryStateStorage.CLASS_NAME)}.saving`));
+            engineCore.logInfo(I18n.formatMessage(`${"memoryStateStorage"}.saving`));
             this._engineState = state;
         }
     }
@@ -69,12 +69,15 @@ class MemoryStateStorage {
  */
 class EngineCore {
     /**
-     * Name for the engine logger, used for direct console logging.
+     * Name for the engine logger component, used for direct console logging.
      */
-    static LOGGING_TYPE_NAME = "engine-logging-service";
+    static LOGGING_COMPONENT_TYPE_NAME = "engine-logging-service";
+    /**
+     * Name for the engine logger connector, used for direct console logging.
+     */
+    static LOGGING_CONNECTOR_TYPE_NAME = "engine-logging-connector";
     /**
      * Runtime name for the class.
-     * @internal
      */
     static CLASS_NAME = "EngineCore";
     /**
@@ -159,11 +162,18 @@ class EngineCore {
         Guards.stringValue(EngineCore.CLASS_NAME, "type", type);
         Guards.stringValue(EngineCore.CLASS_NAME, "module", module);
         Guards.stringValue(EngineCore.CLASS_NAME, "method", method);
-        this._typeInitialisers.push({
-            type,
-            module,
-            method
-        });
+        const currentIndex = this._typeInitialisers.findIndex(t => t.type === type);
+        if (currentIndex >= 0) {
+            this._typeInitialisers[currentIndex].module = module;
+            this._typeInitialisers[currentIndex].method = method;
+        }
+        else {
+            this._typeInitialisers.push({
+                type,
+                module,
+                method
+            });
+        }
     }
     /**
      * Get the type config for a specific type.
@@ -201,7 +211,7 @@ class EngineCore {
                         this.logInfo(I18n.formatMessage(`${"engineCore"}.componentStarting`, {
                             element: instance.instanceType
                         }));
-                        await instance.component.start(this._context.state.nodeIdentity, EngineCore.LOGGING_TYPE_NAME);
+                        await instance.component.start(this._context.state.nodeIdentity, EngineCore.LOGGING_COMPONENT_TYPE_NAME);
                     }
                 }
                 this.logInfo(I18n.formatMessage(`${"engineCore"}.componentsComplete`));
@@ -233,7 +243,7 @@ class EngineCore {
                     element: instance.instanceType
                 }));
                 try {
-                    await instance.component.stop(this._context.state.nodeIdentity, EngineCore.LOGGING_TYPE_NAME);
+                    await instance.component.stop(this._context.state.nodeIdentity, EngineCore.LOGGING_COMPONENT_TYPE_NAME);
                 }
                 catch (err) {
                     this.logError(new GeneralError(EngineCore.CLASS_NAME, "componentStopFailed", {
@@ -351,7 +361,12 @@ class EngineCore {
                 registeredType = registeredTypes.find(t => t.features?.every(f => features.includes(f)))?.type;
             }
             else {
-                registeredType = registeredTypes[0]?.type;
+                // First look for the default entry
+                registeredType = registeredTypes.find(t => t.isDefault)?.type;
+                // Can't find a default so just use the first entry
+                if (!Is.stringValue(registeredType)) {
+                    registeredType = registeredTypes[0]?.type;
+                }
             }
         }
         return registeredType;
@@ -426,18 +441,11 @@ class EngineCore {
                     });
                     result.factory?.register(finalInstanceType, () => result.component);
                     this._context.registeredInstances[typeKey] ??= [];
-                    if (typeConfig[i].isDefault ?? false) {
-                        this._context.registeredInstances[typeKey].unshift({
-                            type: finalInstanceType,
-                            features: typeConfig[i].features
-                        });
-                    }
-                    else {
-                        this._context.registeredInstances[typeKey].push({
-                            type: finalInstanceType,
-                            features: typeConfig[i].features
-                        });
-                    }
+                    this._context.registeredInstances[typeKey].push({
+                        type: finalInstanceType,
+                        isDefault: typeConfig[i].isDefault,
+                        features: typeConfig[i].features
+                    });
                 }
                 else {
                     throw new GeneralError("engineCore", "componentUnknownType", {
@@ -463,23 +471,23 @@ class EngineCore {
                 }
             });
         this._context.componentInstances.push({
-            instanceType: EngineCore.LOGGING_TYPE_NAME,
+            instanceType: EngineCore.LOGGING_CONNECTOR_TYPE_NAME,
             component: engineLoggerConnector
         });
-        LoggingConnectorFactory.register(EngineCore.LOGGING_TYPE_NAME, () => engineLoggerConnector);
+        LoggingConnectorFactory.register(EngineCore.LOGGING_CONNECTOR_TYPE_NAME, () => engineLoggerConnector);
         this._context.registeredInstances.loggingConnector = [
             {
-                type: EngineCore.LOGGING_TYPE_NAME
+                type: EngineCore.LOGGING_CONNECTOR_TYPE_NAME
             }
         ];
         const engineLoggerComponent = new LoggingService({
-            loggingConnectorType: EngineCore.LOGGING_TYPE_NAME
+            loggingConnectorType: EngineCore.LOGGING_CONNECTOR_TYPE_NAME
         });
         this._engineLoggingComponent = engineLoggerComponent;
-        ComponentFactory.register(EngineCore.LOGGING_TYPE_NAME, () => engineLoggerComponent);
+        ComponentFactory.register(EngineCore.LOGGING_COMPONENT_TYPE_NAME, () => engineLoggerComponent);
         this._context.registeredInstances.loggingComponent = [
             {
-                type: EngineCore.LOGGING_TYPE_NAME
+                type: EngineCore.LOGGING_COMPONENT_TYPE_NAME
             }
         ];
     }
@@ -535,7 +543,7 @@ class EngineCore {
                     this.logInfo(I18n.formatMessage(`${"engineCore"}.bootstrapping`, {
                         element: instanceName
                     }));
-                    const bootstrapSuccess = await instance.component.bootstrap(EngineCore.LOGGING_TYPE_NAME);
+                    const bootstrapSuccess = await instance.component.bootstrap(EngineCore.LOGGING_COMPONENT_TYPE_NAME);
                     // If the bootstrap method failed then throw an error
                     if (!bootstrapSuccess) {
                         throw new GeneralError(EngineCore.CLASS_NAME, "bootstrapFailed", {
@@ -601,7 +609,7 @@ class FileStateStorage {
      */
     async load(engineCore) {
         try {
-            engineCore.logInfo(I18n.formatMessage(`${StringHelper.camelCase(FileStateStorage.CLASS_NAME)}.loading`, {
+            engineCore.logInfo(I18n.formatMessage(`${"fileStateStorage"}.loading`, {
                 filename: this._filename
             }));
             if (await this.fileExists(this._filename)) {
@@ -610,7 +618,7 @@ class FileStateStorage {
             }
         }
         catch (err) {
-            throw new GeneralError(FileStateStorage.CLASS_NAME, "loadingError", { filename: this._filename }, BaseError.fromError(err));
+            throw new GeneralError(FileStateStorage.CLASS_NAME, "failedLoading", { filename: this._filename }, BaseError.fromError(err));
         }
     }
     /**
@@ -622,7 +630,7 @@ class FileStateStorage {
     async save(engineCore, state) {
         if (!this._readonlyMode) {
             try {
-                engineCore.logInfo(I18n.formatMessage(`${StringHelper.camelCase(FileStateStorage.CLASS_NAME)}.saving`, {
+                engineCore.logInfo(I18n.formatMessage(`${"fileStateStorage"}.saving`, {
                     filename: this._filename
                 }));
                 try {
@@ -632,7 +640,7 @@ class FileStateStorage {
                 await writeFile(this._filename, JSON.stringify(state, undefined, "\t"), "utf8");
             }
             catch (err) {
-                throw new GeneralError(FileStateStorage.CLASS_NAME, "savingError", { filename: this._filename }, BaseError.fromError(err));
+                throw new GeneralError(FileStateStorage.CLASS_NAME, "failedSaving", { filename: this._filename }, BaseError.fromError(err));
             }
         }
     }

package/dist/types/engineCore.d.ts

@@ -6,9 +6,17 @@ import type { IEngineCoreOptions } from "./models/IEngineCoreOptions";
  */
 export declare class EngineCore<C extends IEngineCoreConfig = IEngineCoreConfig, S extends IEngineState = IEngineState> implements IEngineCore<C, S> {
     /**
-     * Name for the engine logger, used for direct console logging.
+     * Name for the engine logger component, used for direct console logging.
      */
-    static readonly LOGGING_TYPE_NAME: string;
+    static readonly LOGGING_COMPONENT_TYPE_NAME: string;
+    /**
+     * Name for the engine logger connector, used for direct console logging.
+     */
+    static readonly LOGGING_CONNECTOR_TYPE_NAME: string;
+    /**
+     * Runtime name for the class.
+     */
+    static readonly CLASS_NAME: string;
     /**
      * The core context.
      */
@@ -83,6 +91,7 @@ export declare class EngineCore<C extends IEngineCoreConfig = IEngineCoreConfig,
     getRegisteredInstances(): {
         [name: string]: {
             type: string;
+            isDefault?: boolean;
             features?: string[];
         }[];
     };

package/docs/changelog.md

@@ -1,5 +1,33 @@
 # @twin.org/engine-core - Changelog
 
+## [0.0.2-next.24](https://github.com/twinfoundation/engine/compare/engine-core-v0.0.2-next.23...engine-core-v0.0.2-next.24) (2025-10-08)
+
+
+### Features
+
+* maintain isDefault flag for registered instances ([2ac5bee](https://github.com/twinfoundation/engine/commit/2ac5bee094bef42b396cc82b0d18bb6aebe27352))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @twin.org/engine-models bumped from 0.0.2-next.23 to 0.0.2-next.24
+
+## [0.0.2-next.23](https://github.com/twinfoundation/engine/compare/engine-core-v0.0.2-next.22...engine-core-v0.0.2-next.23) (2025-10-07)
+
+
+### Features
+
+* override type initialisers with new registrations ([5b4ff56](https://github.com/twinfoundation/engine/commit/5b4ff561d06b6513c870a72bb20ba23c0653cfe8))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @twin.org/engine-models bumped from 0.0.2-next.22 to 0.0.2-next.23
+
 ## [0.0.2-next.22](https://github.com/twinfoundation/engine/compare/engine-core-v0.0.2-next.21...engine-core-v0.0.2-next.22) (2025-10-07)
 
 

package/docs/reference/classes/EngineCore.md

@@ -38,11 +38,27 @@ The options for the engine.
 
 ## Properties
 
-### LOGGING\_TYPE\_NAME
+### LOGGING\_COMPONENT\_TYPE\_NAME
 
-> `readonly` `static` **LOGGING\_TYPE\_NAME**: `string` = `"engine-logging-service"`
+> `readonly` `static` **LOGGING\_COMPONENT\_TYPE\_NAME**: `string` = `"engine-logging-service"`
 
-Name for the engine logger, used for direct console logging.
+Name for the engine logger component, used for direct console logging.
+
+***
+
+### LOGGING\_CONNECTOR\_TYPE\_NAME
+
+> `readonly` `static` **LOGGING\_CONNECTOR\_TYPE\_NAME**: `string` = `"engine-logging-connector"`
+
+Name for the engine logger connector, used for direct console logging.
+
+***
+
+### CLASS\_NAME
+
+> `readonly` `static` **CLASS\_NAME**: `string`
+
+Runtime name for the class.
 
 ***
 

package/locales/en.json

@@ -1,10 +1,7 @@
 {
 	"error": {
 		"engineCore": {
-			"connectorUnknownType": "Unknown connector type \"{type}\" specified for \"{connectorType}\"",
 			"componentUnknownType": "Unknown component type \"{type}\" specified for \"{componentType}\"",
-			"entityStorageCustomMissing": "Entity storage custom \"{typeCustom}\" missing for component \"{storageName}\"",
-			"entityStorageMissing": "Entity storage configuration missing for component \"{storageName}\"",
 			"bootstrapFailed": "Bootstrap failed for component \"{component}\", please check the logs for more information",
 			"componentStopFailed": "Failed to stop component \"{component}\"",
 			"instanceTypeNotFound": "Instance type not found for \"{type}\" with features \"{features}\""
@@ -24,7 +21,6 @@
 		"stopping": "Engine is stopping",
 		"stopped": "Engine has stopped",
 		"configuring": "Configuring {element}",
-		"configuringEntityStorage": "Configuring {element} with name \"{storageName}\" using \"{storageType}\" connector",
 		"bootstrapStarted": "Bootstrap started",
 		"bootstrapComplete": "Bootstrap complete",
 		"bootstrapping": "Bootstrap {element}",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/engine-core",
-	"version": "0.0.2-next.22",
+	"version": "0.0.2-next.24",
 	"description": "Engine core.",
 	"repository": {
 		"type": "git",
@@ -17,7 +17,7 @@
 		"@twin.org/core": "next",
 		"@twin.org/crypto": "next",
 		"@twin.org/data-core": "next",
-		"@twin.org/engine-models": "0.0.2-next.22",
+		"@twin.org/engine-models": "0.0.2-next.24",
 		"@twin.org/entity": "next",
 		"@twin.org/logging-connector-console": "next",
 		"@twin.org/logging-models": "next",