@twin.org/node-core 0.0.1-next.4 → 0.0.1-next.7

package/dist/cjs/index.cjs

@@ -308,10 +308,10 @@ async function bootstrapNodeUser(engineCore, context, envVars, features) {
             const authUserEntityStorage = entityStorageModels.EntityStorageConnectorFactory.get(core.StringHelper.kebabCase("AuthenticationUser"));
             const email = envVars.username ?? DEFAULT_NODE_USERNAME;
             let nodeAdminUser = await authUserEntityStorage.get(email);
-            const generatedPassword = envVars.password ?? crypto.PasswordGenerator.generate(16);
-            const passwordBytes = core.Converter.utf8ToBytes(generatedPassword);
             if (core.Is.empty(nodeAdminUser)) {
                 engineCore.logInfo(core.I18n.formatMessage("node.creatingNodeUser"));
+                const generatedPassword = envVars.password ?? crypto.PasswordGenerator.generate(16);
+                const passwordBytes = core.Converter.utf8ToBytes(generatedPassword);
                 const saltBytes = core.RandomHelper.generate(16);
                 const hashedPassword = await apiAuthEntityStorageService.PasswordHelper.hashPassword(passwordBytes, saltBytes);
                 nodeAdminUser = {
@@ -327,12 +327,21 @@ async function bootstrapNodeUser(engineCore, context, envVars, features) {
             else {
                 engineCore.logInfo(core.I18n.formatMessage("node.existingNodeUser"));
                 // The user already exists, so double check the other details match
-                const saltBytes = core.Converter.base64ToBytes(nodeAdminUser.salt);
-                const hashedPassword = await apiAuthEntityStorageService.PasswordHelper.hashPassword(passwordBytes, saltBytes);
-                if (nodeAdminUser.identity !== context.state.nodeIdentity ||
-                    nodeAdminUser.password !== hashedPassword) {
-                    nodeAdminUser.password = hashedPassword;
+                let needsUpdate = false;
+                if (nodeAdminUser.identity !== context.state.nodeIdentity) {
                     nodeAdminUser.identity = context.state.nodeIdentity;
+                    needsUpdate = true;
+                }
+                if (core.Is.stringValue(envVars.password)) {
+                    const passwordBytes = core.Converter.utf8ToBytes(envVars.password);
+                    const saltBytes = core.Converter.base64ToBytes(nodeAdminUser.salt);
+                    const hashedPassword = await apiAuthEntityStorageService.PasswordHelper.hashPassword(passwordBytes, saltBytes);
+                    if (nodeAdminUser.password !== hashedPassword) {
+                        nodeAdminUser.password = hashedPassword;
+                        needsUpdate = true;
+                    }
+                }
+                if (needsUpdate) {
                     await authUserEntityStorage.set(nodeAdminUser);
                 }
             }
@@ -495,10 +504,12 @@ async function bootstrapAuth(engineCore, context, envVars, features) {
  * @param envVars The environment variables.
  * @param openApiSpecFile Path to the OpenAPI spec file.
  * @param stateStorage The state storage.
- * @param customConfig Extends the engine configuration with any additional custom configuration.
+ * @param extendConfig Extends the engine configuration with any additional custom configuration.
+ * @param extendEngine Extends the engine with any additional options.
+ * @param extendEngineServer Extends the engine server with any additional options.
  * @returns The engine server.
  */
-async function start(serverInfo, envVarsPrefix, envVars, openApiSpecFile, stateStorage, customConfig) {
+async function start(serverInfo, envVarsPrefix, envVars, openApiSpecFile, stateStorage, extendConfig, extendEngine, extendEngineServer) {
     envVars.storageFileRoot ??= "";
     if ((envVars.entityStorageConnectorType === engineTypes.EntityStorageConnectorType.File ||
         envVars.blobStorageConnectorType === engineTypes.BlobStorageConnectorType.File ||
@@ -511,8 +522,8 @@ async function start(serverInfo, envVarsPrefix, envVars, openApiSpecFile, stateS
     // Build the engine configuration from the environment variables.
     const engineConfig = engine.buildEngineConfiguration(envVars);
     // Extend the engine configuration with a custom type.
-    if (core.Is.function(customConfig)) {
-        await customConfig(engineConfig);
+    if (core.Is.function(extendConfig)) {
+        await extendConfig(engineConfig);
     }
     // Build the server configuration from the environment variables.
     const serverConfig = engineServer.buildEngineServerConfiguration(envVars, engineConfig, serverInfo, openApiSpecFile);
@@ -522,11 +533,19 @@ async function start(serverInfo, envVarsPrefix, envVars, openApiSpecFile, stateS
         stateStorage: stateStorage ?? new engineCore.FileStateStorage(envVars.stateFilename ?? ""),
         customBootstrap: async (core, engineContext) => bootstrap(core, engineContext, envVars)
     });
+    // Extend the engine.
+    if (core.Is.function(extendEngine)) {
+        await extendEngine(engine$1);
+    }
+    // Construct the server with the engine.
+    const server = new engineServer.EngineServer({ engineCore: engine$1 });
+    // Extend the engine server.
+    if (core.Is.function(extendEngineServer)) {
+        await extendEngineServer(server);
+    }
     // Need to register the engine with the factory so that background tasks
     // can clone it to spawn new instances.
     engineModels.EngineCoreFactory.register("engine", () => engine$1);
-    // Construct the server with the engine.
-    const server = new engineServer.EngineServer({ engineCore: engine$1 });
     // Start the server, which also starts the engine.
     const canContinue = await server.start();
     if (canContinue) {
@@ -549,7 +568,7 @@ async function run(options) {
     try {
         const serverInfo = {
             name: options?.serverName ?? "TWIN Node Server",
-            version: options?.serverVersion ?? "0.0.1-next.4" // x-release-please-version
+            version: options?.serverVersion ?? "0.0.1-next.7" // x-release-please-version
         };
         console.log(`\u001B[4m🌩️  ${serverInfo.name} v${serverInfo.version}\u001B[24m\n`);
         const executionDirectory = options?.executionDirectory ?? getExecutionDirectory();
@@ -579,7 +598,7 @@ async function run(options) {
             throw new core.GeneralError("node", "noEnvVars", { prefix: envPrefix });
         }
         console.info();
-        const startResult = await start(serverInfo, envPrefix, envVars, options?.openApiSpecFile, options.stateStorage, options.customConfig);
+        const startResult = await start(serverInfo, envPrefix, envVars, options?.openApiSpecFile, options.stateStorage, options.extendConfig, options.extendEngine, options.extendEngineServer);
         if (!core.Is.empty(startResult)) {
             for (const signal of ["SIGHUP", "SIGINT", "SIGTERM"]) {
                 process.on(signal, async () => {

package/dist/esm/index.mjs

@@ -287,10 +287,10 @@ async function bootstrapNodeUser(engineCore, context, envVars, features) {
             const authUserEntityStorage = EntityStorageConnectorFactory.get(StringHelper.kebabCase("AuthenticationUser"));
             const email = envVars.username ?? DEFAULT_NODE_USERNAME;
             let nodeAdminUser = await authUserEntityStorage.get(email);
-            const generatedPassword = envVars.password ?? PasswordGenerator.generate(16);
-            const passwordBytes = Converter.utf8ToBytes(generatedPassword);
             if (Is.empty(nodeAdminUser)) {
                 engineCore.logInfo(I18n.formatMessage("node.creatingNodeUser"));
+                const generatedPassword = envVars.password ?? PasswordGenerator.generate(16);
+                const passwordBytes = Converter.utf8ToBytes(generatedPassword);
                 const saltBytes = RandomHelper.generate(16);
                 const hashedPassword = await PasswordHelper.hashPassword(passwordBytes, saltBytes);
                 nodeAdminUser = {
@@ -306,12 +306,21 @@ async function bootstrapNodeUser(engineCore, context, envVars, features) {
             else {
                 engineCore.logInfo(I18n.formatMessage("node.existingNodeUser"));
                 // The user already exists, so double check the other details match
-                const saltBytes = Converter.base64ToBytes(nodeAdminUser.salt);
-                const hashedPassword = await PasswordHelper.hashPassword(passwordBytes, saltBytes);
-                if (nodeAdminUser.identity !== context.state.nodeIdentity ||
-                    nodeAdminUser.password !== hashedPassword) {
-                    nodeAdminUser.password = hashedPassword;
+                let needsUpdate = false;
+                if (nodeAdminUser.identity !== context.state.nodeIdentity) {
                     nodeAdminUser.identity = context.state.nodeIdentity;
+                    needsUpdate = true;
+                }
+                if (Is.stringValue(envVars.password)) {
+                    const passwordBytes = Converter.utf8ToBytes(envVars.password);
+                    const saltBytes = Converter.base64ToBytes(nodeAdminUser.salt);
+                    const hashedPassword = await PasswordHelper.hashPassword(passwordBytes, saltBytes);
+                    if (nodeAdminUser.password !== hashedPassword) {
+                        nodeAdminUser.password = hashedPassword;
+                        needsUpdate = true;
+                    }
+                }
+                if (needsUpdate) {
                     await authUserEntityStorage.set(nodeAdminUser);
                 }
             }
@@ -474,10 +483,12 @@ async function bootstrapAuth(engineCore, context, envVars, features) {
  * @param envVars The environment variables.
  * @param openApiSpecFile Path to the OpenAPI spec file.
  * @param stateStorage The state storage.
- * @param customConfig Extends the engine configuration with any additional custom configuration.
+ * @param extendConfig Extends the engine configuration with any additional custom configuration.
+ * @param extendEngine Extends the engine with any additional options.
+ * @param extendEngineServer Extends the engine server with any additional options.
  * @returns The engine server.
  */
-async function start(serverInfo, envVarsPrefix, envVars, openApiSpecFile, stateStorage, customConfig) {
+async function start(serverInfo, envVarsPrefix, envVars, openApiSpecFile, stateStorage, extendConfig, extendEngine, extendEngineServer) {
     envVars.storageFileRoot ??= "";
     if ((envVars.entityStorageConnectorType === EntityStorageConnectorType.File ||
         envVars.blobStorageConnectorType === BlobStorageConnectorType.File ||
@@ -490,8 +501,8 @@ async function start(serverInfo, envVarsPrefix, envVars, openApiSpecFile, stateS
     // Build the engine configuration from the environment variables.
     const engineConfig = buildEngineConfiguration(envVars);
     // Extend the engine configuration with a custom type.
-    if (Is.function(customConfig)) {
-        await customConfig(engineConfig);
+    if (Is.function(extendConfig)) {
+        await extendConfig(engineConfig);
     }
     // Build the server configuration from the environment variables.
     const serverConfig = buildEngineServerConfiguration(envVars, engineConfig, serverInfo, openApiSpecFile);
@@ -501,11 +512,19 @@ async function start(serverInfo, envVarsPrefix, envVars, openApiSpecFile, stateS
         stateStorage: stateStorage ?? new FileStateStorage(envVars.stateFilename ?? ""),
         customBootstrap: async (core, engineContext) => bootstrap(core, engineContext, envVars)
     });
+    // Extend the engine.
+    if (Is.function(extendEngine)) {
+        await extendEngine(engine);
+    }
+    // Construct the server with the engine.
+    const server = new EngineServer({ engineCore: engine });
+    // Extend the engine server.
+    if (Is.function(extendEngineServer)) {
+        await extendEngineServer(server);
+    }
     // Need to register the engine with the factory so that background tasks
     // can clone it to spawn new instances.
     EngineCoreFactory.register("engine", () => engine);
-    // Construct the server with the engine.
-    const server = new EngineServer({ engineCore: engine });
     // Start the server, which also starts the engine.
     const canContinue = await server.start();
     if (canContinue) {
@@ -528,7 +547,7 @@ async function run(options) {
     try {
         const serverInfo = {
             name: options?.serverName ?? "TWIN Node Server",
-            version: options?.serverVersion ?? "0.0.1-next.4" // x-release-please-version
+            version: options?.serverVersion ?? "0.0.1-next.7" // x-release-please-version
         };
         console.log(`\u001B[4m🌩️  ${serverInfo.name} v${serverInfo.version}\u001B[24m\n`);
         const executionDirectory = options?.executionDirectory ?? getExecutionDirectory();
@@ -558,7 +577,7 @@ async function run(options) {
             throw new GeneralError("node", "noEnvVars", { prefix: envPrefix });
         }
         console.info();
-        const startResult = await start(serverInfo, envPrefix, envVars, options?.openApiSpecFile, options.stateStorage, options.customConfig);
+        const startResult = await start(serverInfo, envPrefix, envVars, options?.openApiSpecFile, options.stateStorage, options.extendConfig, options.extendEngine, options.extendEngineServer);
         if (!Is.empty(startResult)) {
             for (const signal of ["SIGHUP", "SIGINT", "SIGTERM"]) {
                 process.on(signal, async () => {

package/dist/types/models/IRunOptions.d.ts

@@ -1,4 +1,4 @@
-import type { IEngineStateStorage } from "@twin.org/engine-models";
+import type { IEngineCore, IEngineServer, IEngineStateStorage } from "@twin.org/engine-models";
 import type { IEngineConfig } from "@twin.org/engine-types";
 /**
  * The options when running the node.
@@ -36,7 +36,15 @@ export interface IRunOptions {
     /**
      * Method to extend the engine configuration with any additional custom configuration.
      */
-    customConfig?: (config: IEngineConfig) => Promise<void>;
+    extendConfig?: (config: IEngineConfig) => Promise<void>;
+    /**
+     * Method to extend the engine with any additional options.
+     */
+    extendEngine?: (engine: IEngineCore) => Promise<void>;
+    /**
+     * Method to extend the engine server with any additional options.
+     */
+    extendEngineServer?: (engineServer: IEngineServer) => Promise<void>;
     /**
      * The state storage to use for the engine.
      * If not provided, a default file-based state storage will be used.

package/dist/types/server.d.ts

@@ -1,6 +1,6 @@
 import type { IServerInfo } from "@twin.org/api-models";
 import { Engine } from "@twin.org/engine";
-import { type IEngineStateStorage } from "@twin.org/engine-models";
+import { type IEngineCore, type IEngineServer, type IEngineStateStorage } from "@twin.org/engine-models";
 import { EngineServer } from "@twin.org/engine-server";
 import type { IEngineServerConfig } from "@twin.org/engine-server-types";
 import { type IEngineConfig } from "@twin.org/engine-types";
@@ -13,10 +13,12 @@ import type { INodeVariables } from "./models/INodeVariables";
  * @param envVars The environment variables.
  * @param openApiSpecFile Path to the OpenAPI spec file.
  * @param stateStorage The state storage.
- * @param customConfig Extends the engine configuration with any additional custom configuration.
+ * @param extendConfig Extends the engine configuration with any additional custom configuration.
+ * @param extendEngine Extends the engine with any additional options.
+ * @param extendEngineServer Extends the engine server with any additional options.
  * @returns The engine server.
  */
-export declare function start(serverInfo: IServerInfo, envVarsPrefix: string, envVars: INodeVariables, openApiSpecFile?: string, stateStorage?: IEngineStateStorage, customConfig?: (config: IEngineConfig) => Promise<void>): Promise<{
+export declare function start(serverInfo: IServerInfo, envVarsPrefix: string, envVars: INodeVariables, openApiSpecFile?: string, stateStorage?: IEngineStateStorage, extendConfig?: (config: IEngineConfig) => Promise<void>, extendEngine?: (engine: IEngineCore) => Promise<void>, extendEngineServer?: (engineServer: IEngineServer) => Promise<void>): Promise<{
     engine: Engine<IEngineServerConfig, INodeState>;
     server: EngineServer;
 } | undefined>;

package/docs/changelog.md

@@ -1,16 +1,45 @@
 # @twin.org/node-core - Changelog
 
-## [0.0.1-next.4](https://github.com/twinfoundation/node/compare/node-core-v0.0.1-next.3...node-core-v0.0.1-next.4) (2025-05-27)
+## [0.0.1-next.7](https://github.com/twinfoundation/node/compare/node-core-v0.0.1-next.6...node-core-v0.0.1-next.7) (2025-06-17)
+
+
+### Bug Fixes
+
+* adding a condition to verify if the password exists when bootstrapping ([6030a42](https://github.com/twinfoundation/node/commit/6030a42bdaf581678d96932fd0b809396bf7b8b0))
+* adding a condition to verify if the password exists when bootstrapping ([c66f396](https://github.com/twinfoundation/node/commit/c66f396717394161a7647d1f08b3d87729d96e96))
+* pr comments [#1](https://github.com/twinfoundation/node/issues/1) ([66e795b](https://github.com/twinfoundation/node/commit/66e795b16c372ab131ec1de30085aee90e4dbbd0))
 
+## [0.0.1-next.6](https://github.com/twinfoundation/node/compare/node-core-v0.0.1-next.5...node-core-v0.0.1-next.6) (2025-06-12)
 
 ### Features
 
-* improve error reporting ([fcd39a1](https://github.com/twinfoundation/node/commit/fcd39a18da2a6ce33965a99ca5f2f36f4aba712f))
+- add extend engine and server methods ([ec09c7e](https://github.com/twinfoundation/node/commit/ec09c7eb882d9f5797f2fd372e96cad1a3716f59))
+- add extend engine and server methods ([0136a6f](https://github.com/twinfoundation/node/commit/0136a6f3f4e1a82b1427ee9618b8a17c79bc7fda))
+- additional run options ([c35e5bb](https://github.com/twinfoundation/node/commit/c35e5bbb8a80fe6a36628d41f64585b3723d9ad7))
+- improve error reporting ([fcd39a1](https://github.com/twinfoundation/node/commit/fcd39a18da2a6ce33965a99ca5f2f36f4aba712f))
+- initial commit ([522f1e5](https://github.com/twinfoundation/node/commit/522f1e515348f9b1dd1eeb3170b1249e2b0b5371))
+- node app use JavaScript ([14fe08c](https://github.com/twinfoundation/node/commit/14fe08cb760dd885a5dac9056a4d5dbc3d61df64))
+- update dependencies ([9d25f16](https://github.com/twinfoundation/node/commit/9d25f16f1d554cd38f3bec28fdf7f8fff892ceaf))
+
+### Bug Fixes
+
+- broken docs ([61479fd](https://github.com/twinfoundation/node/commit/61479fd618f766d22c5aafec5277e1a89e22b453))
+
+## [0.0.1-next.5](https://github.com/twinfoundation/node/compare/node-core-v0.0.1-next.4...node-core-v0.0.1-next.5) (2025-06-12)
+
+### Features
+
+- add extend engine and server methods ([0136a6f](https://github.com/twinfoundation/node/commit/0136a6f3f4e1a82b1427ee9618b8a17c79bc7fda))
+
+## [0.0.1-next.4](https://github.com/twinfoundation/node/compare/node-core-v0.0.1-next.3...node-core-v0.0.1-next.4) (2025-05-27)
+
+### Features
 
+- improve error reporting ([fcd39a1](https://github.com/twinfoundation/node/commit/fcd39a18da2a6ce33965a99ca5f2f36f4aba712f))
 
 ### Bug Fixes
 
-* broken docs ([61479fd](https://github.com/twinfoundation/node/commit/61479fd618f766d22c5aafec5277e1a89e22b453))
+- broken docs ([61479fd](https://github.com/twinfoundation/node/commit/61479fd618f766d22c5aafec5277e1a89e22b453))
 
 ## [0.0.1-next.3](https://github.com/twinfoundation/node/compare/node-core-v0.0.1-next.2...node-core-v0.0.1-next.3) (2025-05-27)
 

package/docs/reference/functions/start.md

@@ -1,6 +1,6 @@
 # Function: start()
 
-> **start**(`serverInfo`, `envVarsPrefix`, `envVars`, `openApiSpecFile?`, `stateStorage?`, `customConfig?`): `Promise`\<`undefined` \| \{ `engine`: `Engine`\<`IEngineServerConfig`, [`INodeState`](../interfaces/INodeState.md)\>; `server`: `EngineServer`; \}\>
+> **start**(`serverInfo`, `envVarsPrefix`, `envVars`, `openApiSpecFile?`, `stateStorage?`, `extendConfig?`, `extendEngine?`, `extendEngineServer?`): `Promise`\<`undefined` \| \{ `engine`: `Engine`\<`IEngineServerConfig`, [`INodeState`](../interfaces/INodeState.md)\>; `server`: `EngineServer`; \}\>
 
 Start the engine server.
 
@@ -36,12 +36,24 @@ Path to the OpenAPI spec file.
 
 The state storage.
 
-### customConfig?
+### extendConfig?
 
 (`config`) => `Promise`\<`void`\>
 
 Extends the engine configuration with any additional custom configuration.
 
+### extendEngine?
+
+(`engine`) => `Promise`\<`void`\>
+
+Extends the engine with any additional options.
+
+### extendEngineServer?
+
+(`engineServer`) => `Promise`\<`void`\>
+
+Extends the engine server with any additional options.
+
 ## Returns
 
 `Promise`\<`undefined` \| \{ `engine`: `Engine`\<`IEngineServerConfig`, [`INodeState`](../interfaces/INodeState.md)\>; `server`: `EngineServer`; \}\>

package/docs/reference/interfaces/IRunOptions.md

@@ -66,9 +66,9 @@ The path to the OpenAPI spec file, defaults to docs/open-api/spec.json.
 
 ***
 
-### customConfig()?
+### extendConfig()?
 
-> `optional` **customConfig**: (`config`) => `Promise`\<`void`\>
+> `optional` **extendConfig**: (`config`) => `Promise`\<`void`\>
 
 Method to extend the engine configuration with any additional custom configuration.
 
@@ -84,6 +84,42 @@ Method to extend the engine configuration with any additional custom configurati
 
 ***
 
+### extendEngine()?
+
+> `optional` **extendEngine**: (`engine`) => `Promise`\<`void`\>
+
+Method to extend the engine with any additional options.
+
+#### Parameters
+
+##### engine
+
+`IEngineCore`
+
+#### Returns
+
+`Promise`\<`void`\>
+
+***
+
+### extendEngineServer()?
+
+> `optional` **extendEngineServer**: (`engineServer`) => `Promise`\<`void`\>
+
+Method to extend the engine server with any additional options.
+
+#### Parameters
+
+##### engineServer
+
+`IEngineServer`
+
+#### Returns
+
+`Promise`\<`void`\>
+
+***
+
 ### stateStorage?
 
 > `optional` **stateStorage**: `IEngineStateStorage`\<`IEngineState`\>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/node-core",
-	"version": "0.0.1-next.4",
+	"version": "0.0.1-next.7",
 	"description": "TWIN Node Core for serving APIs using the specified configuration",
 	"repository": {
 		"type": "git",