nodalis-compiler 1.0.31 → 1.0.32

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [1.0.32] 2026-06-05
+- Fixed problems with writing registers to Modbus.
+
 ## [1.0.31] 2026-04-28
 - Added an "exports.json" file that can be used to designate exported local variables in
 programs when compiling a folder of ST files.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodalis-compiler",
-  "version": "1.0.31",
+  "version": "1.0.32",
   "description": "Compiles IEC-61131-3/10 languages into code that can be used as a PLC on multiple platforms.",
   "icon": "nodalis.png",
   "main": "src/nodalis.js",
@@ -16,6 +16,9 @@
   },
   "files": [
     "src/",
+    "!src/compilers/support/jint/nodalis/NodalisPLC/bin/",
+    "!src/compilers/support/jint/nodalis/NodalisPLC/obj/",
+    "!src/compilers/support/jint/nodalis/publish/",
     "README.md",
     "LICENSE",
     "package.json",

package/src/compilers/JSCompiler.js

@@ -114,6 +114,7 @@ export class JSCompiler extends Compiler {
         let tasks = [];
         let programs = [];
         let globals = [];
+        let csharpGlobals = [];
         let taskCode = "";
         let mapCode = "";
         let plcname = "NodalisPLC";
@@ -143,6 +144,7 @@ export class JSCompiler extends Compiler {
             else if(line.indexOf("//Global=") > -1){
                 let global = JSON.parse(line.substring(line.indexOf("=") + 1).trim());
                 globals.push(`opcServer.mapVariable("${global.Name}", "${global.Address}");`)
+                csharpGlobals.push(`opcServer.MapVariable(${toCSharpStringLiteral(global.Name)}, ${toCSharpStringLiteral(global.Address)});`)
 
             }
             else if(line.trim().startsWith("PROGRAM")){
@@ -273,6 +275,7 @@ export function run(){
 
             // Keep the Jint project sources in the main output directory.
             fs.cpSync(supportDir, projectOutputDir, { recursive: true, force: true });
+            patchJintProgramOpcMappings(projectOutputDir, csharpGlobals);
 
             // Build from the main output directory, then move publish artifacts under bin.
             const buildPath = path.resolve(path.join(projectOutputDir, buildScript));
@@ -347,3 +350,15 @@ function installDependencies(outputDir) {
     shell: true
   });
 }
+
+function patchJintProgramOpcMappings(projectOutputDir, csharpGlobals) {
+  const programPath = path.join(projectOutputDir, "NodalisPLC", "Program.cs");
+  let programSource = fs.readFileSync(programPath, "utf-8");
+  const mappingCode = csharpGlobals.map((line) => `        ${line}`).join("\n");
+  programSource = programSource.replace("        // {opcServerMappings}", mappingCode);
+  fs.writeFileSync(programPath, programSource, "utf-8");
+}
+
+function toCSharpStringLiteral(value) {
+  return `"${String(value).replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`;
+}

package/src/compilers/support/generic/modbus.cpp

@@ -197,47 +197,86 @@ ModbusRequest ModbusClient::createWriteSingleRegister(uint16_t address, uint16_t
     return { deviceAddress, WRITE_SINGLE_REGISTER, address, 1, data };
 }
 
-bool ModbusClient::sendRequest(const ModbusRequest& req, ModbusResponse& resp) {
+bool ModbusClient::sendRequest(const ModbusRequest &req, ModbusResponse &resp)
+{
     std::vector<uint8_t> pdu;
 
-    // Handle function-specific encoding
-    if (req.function == WRITE_SINGLE_COIL) {
-        // Function 0x05: Write Single Coil
+    if (req.function == WRITE_SINGLE_COIL)
+    {
+        pdu = {
+            req.function,
+            static_cast<uint8_t>(req.startAddress >> 8),
+            static_cast<uint8_t>(req.startAddress & 0xFF)};
+
+        if (req.data.size() != 2)
+        {
+            std::cerr << "Invalid data size for Write Single Coil.\n";
+            return false;
+        }
+
+        pdu.push_back(req.data[0]);
+        pdu.push_back(req.data[1]);
+    }
+    else if (req.function == WRITE_SINGLE_REGISTER)
+    {
         pdu = {
             req.function,
             static_cast<uint8_t>(req.startAddress >> 8),
-            static_cast<uint8_t>(req.startAddress & 0xFF)
-        };
-        if (req.data.size() == 2) {
-            pdu.push_back(req.data[0]);  // Hi byte (0xFF or 0x00)
-            pdu.push_back(req.data[1]);  // Lo byte (always 0x00)
-        } else {
-            std::cerr << "Invalid data size for Write Single Coil (expected 2 bytes).\n";
+            static_cast<uint8_t>(req.startAddress & 0xFF)};
+
+        if (req.data.size() != 2)
+        {
+            std::cerr << "Invalid data size for Write Single Register.\n";
             return false;
         }
-    } else {
-        // Default encoding for most function codes
+
+        pdu.push_back(req.data[0]); // value high byte
+        pdu.push_back(req.data[1]); // value low byte
+    }
+    else if (req.function == READ_HOLDING_REGISTERS ||
+             req.function == READ_INPUT_REGISTERS ||
+             req.function == READ_COILS ||
+             req.function == READ_DISCRETE_INPUTS)
+    {
         pdu = {
             req.function,
             static_cast<uint8_t>(req.startAddress >> 8),
             static_cast<uint8_t>(req.startAddress & 0xFF),
             static_cast<uint8_t>(req.quantity >> 8),
-            static_cast<uint8_t>(req.quantity & 0xFF)
-        };
+            static_cast<uint8_t>(req.quantity & 0xFF)};
+    }
+    else if (req.function == WRITE_MULTIPLE_REGISTERS)
+    {
+        pdu = {
+            req.function,
+            static_cast<uint8_t>(req.startAddress >> 8),
+            static_cast<uint8_t>(req.startAddress & 0xFF),
+            static_cast<uint8_t>(req.quantity >> 8),
+            static_cast<uint8_t>(req.quantity & 0xFF),
+            static_cast<uint8_t>(req.data.size())};
+
         pdu.insert(pdu.end(), req.data.begin(), req.data.end());
     }
+    else
+    {
+        std::cerr << "Unsupported Modbus function: " << static_cast<int>(req.function) << "\n";
+        return false;
+    }
 
     std::vector<uint8_t> response;
-    if (!sendRaw(pdu, response)) return false;
+    if (!sendRaw(pdu, response))
+        return false;
 
-    if (response.size() < 2) return false;
+    if (response.size() < 2)
+        return false;
 
     resp.address = req.address;
     resp.function = response[0];
     resp.data.assign(response.begin() + 1, response.end());
     resp.exceptionCode = (resp.function & 0x80) ? resp.data[0] : 0;
 
-    if (resp.exceptionCode > 0) {
+    if (resp.exceptionCode > 0)
+    {
         std::cerr << "MODBUS exception code: " << static_cast<int>(resp.exceptionCode) << "\n";
         return false;
     }

package/src/compilers/support/jint/nodalis/NodalisEngine/NodalisEngine.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="BACnet" Version="3.0.2" />
     <PackageReference Include="Jint" Version="4.4.2" />
     <PackageReference Include="System.Text.Json" Version="*" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.5.374.118" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.5.378.134" />
   </ItemGroup>
   <ItemGroup>
     <None Include="README.md" Pack="true" PackagePath="\" />
@@ -24,7 +24,7 @@
   <PropertyGroup>
   <TargetFrameworks>net8.0</TargetFrameworks> 
   <GeneratePackageOnBuild>true</GeneratePackageOnBuild> <!-- optional -->
-  <Version>1.0.10</Version>
+  <Version>1.0.12</Version>
   <Authors>Nathan Skipper</Authors>
   <Company>Montgomery Technology, Inc.</Company>
   <PackageId>NodalisEngine</PackageId>

package/src/compilers/support/jint/nodalis/NodalisEngine/OPCClient.cs

@@ -21,6 +21,7 @@ using Opc.Ua.Client;
 using Opc.Ua.Configuration;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
 
 namespace Nodalis
@@ -30,7 +31,7 @@ namespace Nodalis
     /// </summary>
     public class OPCClient : IOClient
     {
-        private Session? _session;
+        private ISession? _session;
         private ApplicationConfiguration? _config;
         /// <summary>
         /// Instantiates a new OPCClient.
@@ -52,23 +53,35 @@ namespace Nodalis
                     {
                         ApplicationName = "NodalisOPCUAClient",
                         ApplicationType = ApplicationType.Client,
-                        SecurityConfiguration = new SecurityConfiguration
-                        {
-                            ApplicationCertificate = new CertificateIdentifier(),
-                            AutoAcceptUntrustedCertificates = true,
-                        },
+                        SecurityConfiguration = CreateSecurityConfiguration(),
                         TransportConfigurations = new TransportConfigurationCollection(),
                         TransportQuotas = new TransportQuotas { OperationTimeout = 15000 },
                         ClientConfiguration = new ClientConfiguration { DefaultSessionTimeout = 60000 }
                     };
                     await _config.Validate(ApplicationType.Client);
+                    await _config.CertificateValidator.UpdateAsync(_config, default);
 
                     var app = new ApplicationInstance { ApplicationName = "NodalisOPCUAClient", ApplicationType = ApplicationType.Client, ApplicationConfiguration = _config };
-                    var endpoint = CoreClientUtils.SelectEndpoint(endpointUrl, false, 15000);
-                    var endpointConfig = EndpointConfiguration.Create(_config);
-                    var endpointDesc = new ConfiguredEndpoint(null, endpoint, endpointConfig);
+                    await app.CheckApplicationInstanceCertificatesAsync(false, 0);
 
-                    _session = await Session.Create(_config, endpointDesc, false, "", 60000, null, null);
+                    var endpoint = CoreClientUtils.SelectEndpoint(_config, endpointUrl, false, 15000);
+                    var endpointConfig = EndpointConfiguration.Create(_config);
+                    var configuredEndpoint = new ConfiguredEndpoint(null, endpoint, endpointConfig);
+
+                    var sessionFactory = new DefaultSessionFactory();
+
+                    _session = await sessionFactory.CreateAsync(
+                        _config,
+                        (ITransportWaitingConnection?)null,
+                        configuredEndpoint,
+                        true,
+                        false,
+                        _config.ApplicationName,
+                        60000,
+                        new UserIdentity(),
+                        null,
+                        default
+                    );
                     connected = true;
                     Console.WriteLine("OPC UA connected.");
                 }
@@ -80,6 +93,46 @@ namespace Nodalis
             });
         }
 
+        private static SecurityConfiguration CreateSecurityConfiguration()
+        {
+            string pkiRoot = Path.Combine(AppContext.BaseDirectory, "pki");
+            string ownStore = Path.Combine(pkiRoot, "own");
+            string trustedPeerStore = Path.Combine(pkiRoot, "trusted");
+            string trustedIssuerStore = Path.Combine(pkiRoot, "issuer");
+            string rejectedStore = Path.Combine(pkiRoot, "rejected");
+
+            Directory.CreateDirectory(ownStore);
+            Directory.CreateDirectory(trustedPeerStore);
+            Directory.CreateDirectory(trustedIssuerStore);
+            Directory.CreateDirectory(rejectedStore);
+
+            return new SecurityConfiguration
+            {
+                ApplicationCertificate = new CertificateIdentifier
+                {
+                    StoreType = CertificateStoreType.Directory,
+                    StorePath = ownStore,
+                    SubjectName = "CN=NodalisOPCUAClient"
+                },
+                TrustedPeerCertificates = new CertificateTrustList
+                {
+                    StoreType = CertificateStoreType.Directory,
+                    StorePath = trustedPeerStore
+                },
+                TrustedIssuerCertificates = new CertificateTrustList
+                {
+                    StoreType = CertificateStoreType.Directory,
+                    StorePath = trustedIssuerStore
+                },
+                RejectedCertificateStore = new CertificateTrustList
+                {
+                    StoreType = CertificateStoreType.Directory,
+                    StorePath = rejectedStore
+                },
+                AutoAcceptUntrustedCertificates = true
+            };
+        }
+
         private NodeId GetNodeId(string remote) => new NodeId($"s={remote}", 1);
 
         public override bool ReadBit(string address, out int result)

package/src/compilers/support/jint/nodalis/NodalisEngine/OPCServer.cs

@@ -21,6 +21,7 @@ using Opc.Ua.Configuration;
 using Opc.Ua.Server;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
 
 namespace Nodalis
@@ -57,8 +58,9 @@ namespace Nodalis
         /// <summary>
         /// Starts the server.
         /// </summary>
+        /// <param name="hostname">The hostname or IP address for the server.</param>
         /// <returns></returns>
-        public async Task StartAsync()
+        public async Task StartAsync(string hostname = "localhost")
         {
             _application = new ApplicationInstance
             {
@@ -71,30 +73,83 @@ namespace Nodalis
             {
                 ApplicationName = "NodalisServer",
                 ApplicationType = ApplicationType.Server,
-                ApplicationUri = "urn:localhost:NodalisServer",
+                ApplicationUri = $"urn:{hostname}:NodalisServer",
                 ServerConfiguration = new ServerConfiguration
                 {
-                    BaseAddresses = { "opc.tcp://localhost:4840/UA/Nodalis" }
+                    BaseAddresses = { $"opc.tcp://{hostname}:4840/UA/Nodalis" },
+                    SecurityPolicies =
+                    {
+                        new ServerSecurityPolicy
+                        {
+                            SecurityMode = MessageSecurityMode.None,
+                            SecurityPolicyUri = SecurityPolicies.None
+                        }
+                    },
+                    UserTokenPolicies =
+                    {
+                        new UserTokenPolicy
+                        {
+                            TokenType = UserTokenType.Anonymous
+                        }
+                    }
                 },
                 TransportQuotas = new TransportQuotas { OperationTimeout = 15000 },
-                SecurityConfiguration = new SecurityConfiguration
-                {
-                    ApplicationCertificate = new CertificateIdentifier(),
-                    AutoAcceptUntrustedCertificates = true
-                },
+                SecurityConfiguration = CreateSecurityConfiguration(),
                 CertificateValidator = new CertificateValidator(),
                 //DiagnosticsConfiguration = new DiagnosticsConfiguration { Enabled = true },
                 Extensions = new XmlElementCollection()
             };
 
             await config.Validate(ApplicationType.Server);
+            await config.CertificateValidator.UpdateAsync(config, default);
 
             _application.ApplicationConfiguration = config;
+            await _application.CheckApplicationInstanceCertificatesAsync(false, 0);
 
             _server = new NodalisServer(_engine, _addressMap);
             _application.Start(_server);
 
-            Console.WriteLine("OPC UA Server started at: opc.tcp://localhost:4840/UA/Nodalis");
+            Console.WriteLine($"OPC UA Server started at: opc.tcp://{hostname}:4840/UA/Nodalis");
+        }
+
+        private static SecurityConfiguration CreateSecurityConfiguration()
+        {
+            string pkiRoot = Path.Combine(AppContext.BaseDirectory, "pki");
+            string ownStore = Path.Combine(pkiRoot, "own");
+            string trustedPeerStore = Path.Combine(pkiRoot, "trusted");
+            string trustedIssuerStore = Path.Combine(pkiRoot, "issuer");
+            string rejectedStore = Path.Combine(pkiRoot, "rejected");
+
+            Directory.CreateDirectory(ownStore);
+            Directory.CreateDirectory(trustedPeerStore);
+            Directory.CreateDirectory(trustedIssuerStore);
+            Directory.CreateDirectory(rejectedStore);
+
+            return new SecurityConfiguration
+            {
+                ApplicationCertificate = new CertificateIdentifier
+                {
+                    StoreType = CertificateStoreType.Directory,
+                    StorePath = ownStore,
+                    SubjectName = "CN=NodalisServer"
+                },
+                TrustedPeerCertificates = new CertificateTrustList
+                {
+                    StoreType = CertificateStoreType.Directory,
+                    StorePath = trustedPeerStore
+                },
+                TrustedIssuerCertificates = new CertificateTrustList
+                {
+                    StoreType = CertificateStoreType.Directory,
+                    StorePath = trustedIssuerStore
+                },
+                RejectedCertificateStore = new CertificateTrustList
+                {
+                    StoreType = CertificateStoreType.Directory,
+                    StorePath = rejectedStore
+                },
+                AutoAcceptUntrustedCertificates = true
+            };
         }
         /// <summary>
         /// Stops the server.
@@ -222,6 +277,7 @@ namespace Nodalis
                     var variable = new BaseDataVariableState(folder)
                     {
                         SymbolicName = name,
+                        ReferenceTypeId = ReferenceTypeIds.Organizes,
                         NodeId = new NodeId(name, NamespaceIndex),
                         BrowseName = new QualifiedName(name, NamespaceIndex),
                         DisplayName = name,
@@ -251,6 +307,7 @@ namespace Nodalis
                         }
                     };
 
+                    folder.AddChild(variable);
                     AddPredefinedNode(SystemContext, variable);
                 }
             }
@@ -261,6 +318,7 @@ namespace Nodalis
                 else if (address.Contains("X")) return _engine.ReadByte(address);
                 else if (address.Contains("W")) return _engine.ReadWord(address);
                 else if (address.Contains("D")) return _engine.ReadDWord(address);
+                else if (address.Contains("L")) return _engine.ReadLWord(address);
                 return false;
             }
 
@@ -272,6 +330,7 @@ namespace Nodalis
                     case byte bt: _engine.WriteByte(address, bt); break;
                     case ushort us: _engine.WriteWord(address, us); break;
                     case uint ui: _engine.WriteDWord(address, ui); break;
+                    case ulong ui64: _engine.WriteLWord(address, ui64); break;
                     default: throw new InvalidCastException($"Unsupported value type: {value?.GetType()?.Name}");
                 }
             }
@@ -283,6 +342,7 @@ namespace Nodalis
                 else if (address.Contains("X")) return DataTypeIds.Byte;
                 else if (address.Contains("W")) return DataTypeIds.UInt16;
                 else if (address.Contains("D")) return DataTypeIds.UInt32;
+                else if (address.Contains("L")) return DataTypeIds.UInt64;
                 return DataTypeIds.Boolean;
             }
 

package/src/compilers/support/jint/nodalis/NodalisEngine/README.md

@@ -88,6 +88,11 @@ NodalisEngine is distributed under the Apache 2.0 license. See the headers insid
 
 # Changelog
 
+## [1.0.12] - 2026-05-04
+- Added ability to set hostname for OPCServer.
+- Added support for LWord types to OPCServer.
+- Fixed problems with connecting to OPCServer
+
 ## [1.0.9] - 2026-02-12
 
 - Fixed TP function block.