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

package/dist/cjs/index.cjs

@@ -15,6 +15,7 @@ var cliCore = require('@twin.org/cli-core');
 var rightsManagementRestClient = require('@twin.org/rights-management-rest-client');
 var engineServer = require('@twin.org/engine-server');
 var modules = require('@twin.org/modules');
+var node_child_process = require('node:child_process');
 var dotenv = require('dotenv');
 var engine = require('@twin.org/engine');
 var engineCore = require('@twin.org/engine-core');
@@ -958,14 +959,22 @@ async function configureLogging(coreConfig, envVars) {
             additionalConnectorCount++;
         }
     }
+    // If more than one logging connector, then we need to add a multi connector
+    // and set it as the default one
     if (additionalConnectorCount > 1) {
-        coreConfig.types.loggingConnector?.push({
+        coreConfig.types.loggingConnector.push({
             type: engineTypes.LoggingConnectorType.Multi,
             options: {
                 loggingConnectorTypes
-            }
+            },
+            isDefault: true
         });
     }
+    else if (additionalConnectorCount > 0) {
+        // If only one connector, then we set it as the default one
+        coreConfig.types.loggingConnector[coreConfig.types.loggingConnector.length - 1].isDefault =
+            true;
+    }
     if (additionalConnectorCount > 0) {
         coreConfig.types.loggingComponent ??= [];
         // We set the isDefault flag so that other components will get this service by default
@@ -1974,6 +1983,7 @@ async function start(nodeOptions, nodeEngineConfig, envVars) {
 
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
+const moduleCache = {};
 /**
  * Run the TWIN Node server.
  * @param nodeOptions Optional configuration options for running the server.
@@ -1984,7 +1994,7 @@ async function run(nodeOptions) {
         nodeOptions ??= {};
         const serverInfo = {
             name: nodeOptions?.serverName ?? "TWIN Node Server",
-            version: nodeOptions?.serverVersion ?? "0.0.2-next.22" // x-release-please-version
+            version: nodeOptions?.serverVersion ?? "0.0.2-next.24" // x-release-please-version
         };
         cliCore.CLIDisplay.header(serverInfo.name, serverInfo.version, "🌩️ ");
         if (!core.Is.stringValue(nodeOptions?.executionDirectory)) {
@@ -2127,6 +2137,12 @@ async function buildConfiguration(processEnv, options, serverInfo) {
  */
 function overrideModuleImport(executionDirectory) {
     modules.ModuleHelper.overrideImport(async (moduleName) => {
+        if (moduleCache[moduleName]) {
+            return {
+                module: moduleCache[moduleName],
+                useDefault: false
+            };
+        }
         // If the module path for example when dynamically loading
         // modules looks like a local file then we try to resolve
         // using the local file system
@@ -2143,13 +2159,38 @@ function overrideModuleImport(executionDirectory) {
             if (exists) {
                 // If the module exists then we can load it, otherwise
                 // we fallback to regular handling to see if that can import it
+                const module = await import(process.platform === "win32" ? `file://${localFilename}` : localFilename);
+                moduleCache[moduleName] = module;
+                return {
+                    module,
+                    useDefault: false
+                };
+            }
+        }
+        try {
+            // Try and load from node_modules manually
+            // This is needed for some environments where
+            // the module resolution doesn't work as expected
+            const npmRoot = node_child_process.execSync("npm root").toString().trim().replace(/\\/g, "/");
+            const packageJson = await loadJsonFile(path.resolve(npmRoot, moduleName, "package.json"));
+            const mainFile = packageJson?.module ?? packageJson?.main ?? "index.js";
+            const modulePath = path.resolve(npmRoot, moduleName, mainFile);
+            const exists = await fileExists(modulePath);
+            if (exists) {
+                const module = await import(process.platform === "win32" ? `file://${modulePath}` : modulePath);
+                moduleCache[moduleName] = module;
                 return {
-                    module: await import(process.platform === "win32" ? `file://${localFilename}` : localFilename),
+                    module,
                     useDefault: false
                 };
             }
         }
-        // The filename doesn't look like a local module, so just use default handling
+        catch {
+            // We just fallback to default handling if not possible
+        }
+        // We don't appear to be able to manually resolve this module
+        // So we let the default handling take care of it
+        // This will allow built-in modules and regular node_modules to load as normal
         return {
             useDefault: true
         };

package/dist/esm/index.mjs

@@ -13,6 +13,7 @@ import { CLIDisplay } from '@twin.org/cli-core';
 import { PolicyNegotiationPointClient, DataAccessPointClient } from '@twin.org/rights-management-rest-client';
 import { addDefaultRestPaths, addDefaultSocketPaths, EngineServer } from '@twin.org/engine-server';
 import { ModuleHelper } from '@twin.org/modules';
+import { execSync } from 'node:child_process';
 import * as dotenv from 'dotenv';
 import { Engine } from '@twin.org/engine';
 import { FileStateStorage } from '@twin.org/engine-core';
@@ -937,14 +938,22 @@ async function configureLogging(coreConfig, envVars) {
             additionalConnectorCount++;
         }
     }
+    // If more than one logging connector, then we need to add a multi connector
+    // and set it as the default one
     if (additionalConnectorCount > 1) {
-        coreConfig.types.loggingConnector?.push({
+        coreConfig.types.loggingConnector.push({
             type: LoggingConnectorType.Multi,
             options: {
                 loggingConnectorTypes
-            }
+            },
+            isDefault: true
         });
     }
+    else if (additionalConnectorCount > 0) {
+        // If only one connector, then we set it as the default one
+        coreConfig.types.loggingConnector[coreConfig.types.loggingConnector.length - 1].isDefault =
+            true;
+    }
     if (additionalConnectorCount > 0) {
         coreConfig.types.loggingComponent ??= [];
         // We set the isDefault flag so that other components will get this service by default
@@ -1953,6 +1962,7 @@ async function start(nodeOptions, nodeEngineConfig, envVars) {
 
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
+const moduleCache = {};
 /**
  * Run the TWIN Node server.
  * @param nodeOptions Optional configuration options for running the server.
@@ -1963,7 +1973,7 @@ async function run(nodeOptions) {
         nodeOptions ??= {};
         const serverInfo = {
             name: nodeOptions?.serverName ?? "TWIN Node Server",
-            version: nodeOptions?.serverVersion ?? "0.0.2-next.22" // x-release-please-version
+            version: nodeOptions?.serverVersion ?? "0.0.2-next.24" // x-release-please-version
         };
         CLIDisplay.header(serverInfo.name, serverInfo.version, "🌩️ ");
         if (!Is.stringValue(nodeOptions?.executionDirectory)) {
@@ -2106,6 +2116,12 @@ async function buildConfiguration(processEnv, options, serverInfo) {
  */
 function overrideModuleImport(executionDirectory) {
     ModuleHelper.overrideImport(async (moduleName) => {
+        if (moduleCache[moduleName]) {
+            return {
+                module: moduleCache[moduleName],
+                useDefault: false
+            };
+        }
         // If the module path for example when dynamically loading
         // modules looks like a local file then we try to resolve
         // using the local file system
@@ -2122,13 +2138,38 @@ function overrideModuleImport(executionDirectory) {
             if (exists) {
                 // If the module exists then we can load it, otherwise
                 // we fallback to regular handling to see if that can import it
+                const module = await import(process.platform === "win32" ? `file://${localFilename}` : localFilename);
+                moduleCache[moduleName] = module;
+                return {
+                    module,
+                    useDefault: false
+                };
+            }
+        }
+        try {
+            // Try and load from node_modules manually
+            // This is needed for some environments where
+            // the module resolution doesn't work as expected
+            const npmRoot = execSync("npm root").toString().trim().replace(/\\/g, "/");
+            const packageJson = await loadJsonFile(path.resolve(npmRoot, moduleName, "package.json"));
+            const mainFile = packageJson?.module ?? packageJson?.main ?? "index.js";
+            const modulePath = path.resolve(npmRoot, moduleName, mainFile);
+            const exists = await fileExists(modulePath);
+            if (exists) {
+                const module = await import(process.platform === "win32" ? `file://${modulePath}` : modulePath);
+                moduleCache[moduleName] = module;
                 return {
-                    module: await import(process.platform === "win32" ? `file://${localFilename}` : localFilename),
+                    module,
                     useDefault: false
                 };
             }
         }
-        // The filename doesn't look like a local module, so just use default handling
+        catch {
+            // We just fallback to default handling if not possible
+        }
+        // We don't appear to be able to manually resolve this module
+        // So we let the default handling take care of it
+        // This will allow built-in modules and regular node_modules to load as normal
         return {
             useDefault: true
         };

package/docs/changelog.md

@@ -1,5 +1,19 @@
 # @twin.org/node-core - Changelog
 
+## [0.0.2-next.24](https://github.com/twinfoundation/node/compare/node-core-v0.0.2-next.23...node-core-v0.0.2-next.24) (2025-10-08)
+
+
+### Features
+
+* add isDefault flag to logging connectors ([358e839](https://github.com/twinfoundation/node/commit/358e8394819dab9832d3a9ebfac74b897b7d5f40))
+
+## [0.0.2-next.23](https://github.com/twinfoundation/node/compare/node-core-v0.0.2-next.22...node-core-v0.0.2-next.23) (2025-10-07)
+
+
+### Features
+
+* add module cache and improve resolution ([482be05](https://github.com/twinfoundation/node/commit/482be056c37a598033250ea8a7288a33cf3470b4))
+
 ## [0.0.2-next.22](https://github.com/twinfoundation/node/compare/node-core-v0.0.2-next.21...node-core-v0.0.2-next.22) (2025-10-07)
 
 

package/package.json

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