node-opcua-samples 2.100.0 → 2.101.0

package/bin/di_server.js

@@ -1,17 +1,22 @@
 #!/usr/bin/env node
+/* eslint-disable max-statements */
 "use strict";
 const path = require("path");
 const os = require("os");
 const chalk = require("chalk");
-const { OPCUAServer, Variant, DataType, makeApplicationUrn, nodesets, RegisterServerMethod } = require("node-opcua");
+const {
+    OPCUAServer,
+    Variant,
+    OPCUACertificateManager,
+    DataType,
+    makeApplicationUrn,
+    nodesets,
+    RegisterServerMethod
+} = require("node-opcua");
 const { makeBoiler, createBoilerType } = require("node-opcua-address-space/testHelpers");
 
 Error.stackTraceLimit = Infinity;
 
-function constructFilename(filename) {
-    return path.join(__dirname, "../", filename);
-}
-
 const { assert } = require("node-opcua-assert");
 const argv = require("yargs")
     .wrap(132)
@@ -30,12 +35,30 @@ const argv = require("yargs")
     .alias("k", "keySize")
 
     .string("discoveryServerEndpointUrl")
-    .describe("discoveryServerEndpointUrl", " end point of the discovery server to regiser to")
+    .describe("discoveryServerEndpointUrl", " end point of the discovery server to register to")
     .default("discoveryServerEndpointUrl", "opc.tcp://localhost:4840")
     .alias("d", "discoveryServerEndpointUrl").argv;
 
 const port = parseInt(argv.port) || 26543;
 
+function wn(s, w) {
+    return s.toString().padStart(w, "0");
+}
+function t(d) {
+    return wn(d.getHours(), 2) + ":" + wn(d.getMinutes(), 2) + ":" + wn(d.getSeconds(), 2) + ":" + wn(d.getMilliseconds(), 3);
+}
+function w(str, width) {
+    return (str || "").toString().padEnd(width).substring(0, width);
+}
+
+const envPaths = require("env-paths");
+const config = envPaths("NodeOPCUA-DI-Server").config;
+const pkiFolder = path.join(config, "PKI");
+
+const serverCertificateManager = new OPCUACertificateManager({
+    rootFolder: pkiFolder
+});
+
 const userManager = {
     isValidUser: function (userName, password) {
         if (userName === "user1" && password === "password1") {
@@ -48,53 +71,8 @@ const userManager = {
     }
 };
 
-const keySize = argv.keySize;
-const server_certificate_file = constructFilename("certificates/server_selfsigned_cert_" + keySize + ".pem");
-const server_certificate_privatekey_file = constructFilename("certificates/server_key_" + keySize + ".pem");
-
-const server = new OPCUAServer({
-    alternateHostname: argv.alternateHostname,
-
-    certificateFile: server_certificate_file,
-    privateKeyFile: server_certificate_privatekey_file,
-
-    port,
-    resourcePath: "/UA/Server",
-
-    nodeset_filename: [nodesets.standard, nodesets.di, nodesets.adi],
-
-    serverInfo: {
-        applicationUri: makeApplicationUrn(os.hostname(), "NodeOPCUA-SimpleADIDemoServer"),
-        productUri: "urn:NodeOPCUA-SimpleADIDemoServer",
-        applicationName: { text: "NodeOPCUA-SimpleADIDemoServer" },
-        gatewayServerUri: null,
-        discoveryProfileUri: null,
-        discoveryUrls: []
-    },
-    buildInfo: {
-        buildNumber: "1234"
-    },
-    serverCapabilities: {
-        maxSessions: 1500,
-        operationLimits: {
-            maxNodesPerRead: 1000,
-            maxNodesPerBrowse: 2000
-        }
-    },
-    maxConnectionsPerEndpoint: 1500,
-
-    userManager: userManager,
-    registerServerMethod: RegisterServerMethod.LDS,
-    discoveryServerEndpointUrl: argv.discoveryServerEndpointUrl || "opc.tcp://" + hostname() + ":4840"
-});
-
-process.title = "Node OPCUA Server on port : " + port;
-
-const hostname = os.hostname();
-
-server.on("post_initialize", function () {
+function buildAddressSpace(server) {
     const addressSpace = server.engine.addressSpace;
-
     const namespace = addressSpace.getOwnNamespace();
 
     const rootFolder = addressSpace.findNode("RootFolder");
@@ -125,7 +103,6 @@ server.on("post_initialize", function () {
     console.log("discoveryServerEndpointUrl  ", server.discoveryServerEndpointUrl);
 
     const mySpectrometer = spectrometerDeviceType.instantiate({ browseName: "MySpectrometer", organizedBy: deviceSet });
-    // create a spectro meter
 
     function createChannel(options) {
         assert(typeof options.browseName === "string");
@@ -176,24 +153,115 @@ server.on("post_initialize", function () {
     makeBoiler(addressSpace, {
         browseName: "Boiler#1"
     });
-});
-
+}
 function dumpNode(node) {
-    function w(str, width) {
-        return str.padEnd(width).substring(0, width);
-    }
     return Object.entries(node)
         .map((key, value) => "      " + w(key, 30) + "  : " + (value === null ? null : value.toString()))
         .join("\n");
 }
 
-console.log(chalk.yellow("  server PID          :"), process.pid);
+(async () => {
+    const server = new OPCUAServer({
+        alternateHostname: argv.alternateHostname,
+        port,
+        resourcePath: "/UA/Server",
+
+        serverCertificateManager,
+
+        nodeset_filename: [nodesets.standard, nodesets.di, nodesets.adi],
+
+        serverInfo: {
+            applicationUri: makeApplicationUrn(os.hostname(), "NodeOPCUA-SimpleADIDemoServer"),
+            productUri: "urn:NodeOPCUA-SimpleADIDemoServer",
+            applicationName: { text: "NodeOPCUA-SimpleADIDemoServer" },
+            gatewayServerUri: null,
+            discoveryProfileUri: null,
+            discoveryUrls: []
+        },
+        buildInfo: {
+            buildNumber: "1234"
+        },
+        serverCapabilities: {
+            maxSessions: 1500,
+            operationLimits: {
+                maxNodesPerRead: 1000,
+                maxNodesPerBrowse: 2000
+            }
+        },
+        maxConnectionsPerEndpoint: 1500,
+
+        userManager,
+        registerServerMethod: RegisterServerMethod.LDS,
+        discoveryServerEndpointUrl: argv.discoveryServerEndpointUrl || "opc.tcp://" + hostname() + ":4840"
+    });
+    process.title = "Node OPCUA Server on port : " + port;
+
+    server.on("create_session", function (session) {
+        console.log(" SESSION CREATED");
+        console.log(chalk.cyan("    client application URI: "), session.clientDescription.applicationUri);
+        console.log(chalk.cyan("        client product URI: "), session.clientDescription.productUri);
+        console.log(chalk.cyan("   client application name: "), session.clientDescription.applicationName.toString());
+        console.log(chalk.cyan("   client application type: "), session.clientDescription.applicationType.toString());
+        console.log(chalk.cyan("              session name: "), session.sessionName ? session.sessionName.toString() : "<null>");
+        console.log(chalk.cyan("           session timeout: "), session.sessionTimeout);
+        console.log(chalk.cyan("                session id: "), session.sessionId);
+    });
 
-server.start(function (err) {
-    if (err) {
-        console.log(" Server failed to start ... exiting");
-        process.exit(-3);
-    }
+    server.on("session_closed", function (session, reason) {
+        console.log(" SESSION CLOSED :", reason);
+        console.log(chalk.cyan("              session name: "), session.sessionName ? session.sessionName.toString() : "<null>");
+    });
+
+    server.on("response", function (response) {
+        console.log(
+            t(response.responseHeader.timestamp),
+            response.responseHeader.requestHandle,
+            response.schema.name,
+            " status = ",
+            response.responseHeader.serviceResult.toString()
+        );
+        switch (response.schema.name) {
+            case "ModifySubscriptionResponse":
+            case "CreateMonitoredItemsResponse":
+            case "RepublishResponse":
+            case "WriteResponse":
+                //xx console.log(response.toString());
+                break;
+        }
+    });
+
+    server.on("request", function (request, channel) {
+        console.log(
+            t(request.requestHeader.timestamp),
+            request.requestHeader.requestHandle,
+            request.schema.name,
+            " ID =",
+            channel.channelId.toString()
+        );
+        switch (request.schema.name) {
+            case "ModifySubscriptionRequest":
+            case "CreateMonitoredItemsRequest":
+            case "RepublishRequest":
+                //xx console.log(request.toString());
+                break;
+            case "ReadRequest":
+                break;
+            case "WriteRequest":
+                break;
+            case "TranslateBrowsePathsToNodeIdsRequest":
+                break;
+        }
+    });
+
+    const hostname = os.hostname();
+
+    await server.initialize();
+
+    buildAddressSpace(server);
+
+    console.log(chalk.yellow("  server PID          :"), process.pid);
+
+    await server.start();
 
     const endpointUrl = server.getEndpointUrl();
 
@@ -209,89 +277,14 @@ server.start(function (err) {
     console.log(chalk.yellow("\n  server now waiting for connections. CTRL+C to stop"));
 
     console.log(server.buildInfo.toString());
-});
-
-server.on("create_session", function (session) {
-    console.log(" SESSION CREATED");
-    console.log(chalk.cyan("    client application URI: "), session.clientDescription.applicationUri);
-    console.log(chalk.cyan("        client product URI: "), session.clientDescription.productUri);
-    console.log(chalk.cyan("   client application name: "), session.clientDescription.applicationName.toString());
-    console.log(chalk.cyan("   client application type: "), session.clientDescription.applicationType.toString());
-    console.log(chalk.cyan("              session name: "), session.sessionName ? session.sessionName.toString() : "<null>");
-    console.log(chalk.cyan("           session timeout: "), session.sessionTimeout);
-    console.log(chalk.cyan("                session id: "), session.sessionId);
-});
-
-server.on("session_closed", function (session, reason) {
-    console.log(" SESSION CLOSED :", reason);
-    console.log(chalk.cyan("              session name: "), session.sessionName ? session.sessionName.toString() : "<null>");
-});
-
-function w(s, w) {
-    return s.toString().padStart(w, "0");
-}
-function t(d) {
-    return w(d.getHours(), 2) + ":" + w(d.getMinutes(), 2) + ":" + w(d.getSeconds(), 2) + ":" + w(d.getMilliseconds(), 3);
-}
-
-server.on("response", function (response) {
-    console.log(
-        t(response.responseHeader.timestamp),
-        response.responseHeader.requestHandle,
-        response.schema.name,
-        " status = ",
-        response.responseHeader.serviceResult.toString()
-    );
-    switch (response.schema.name) {
-        case "ModifySubscriptionResponse":
-        case "CreateMonitoredItemsResponse":
-        case "RepublishResponse":
-        case "WriteResponse":
-            //xx console.log(response.toString());
-            break;
-    }
-});
 
-function indent(str, nb) {
-    const spacer = "                                             ".slice(0, nb);
-    return str
-        .split("\n")
-        .map(function (s) {
-            return spacer + s;
-        })
-        .join("\n");
-}
-server.on("request", function (request, channel) {
-    console.log(
-        t(request.requestHeader.timestamp),
-        request.requestHeader.requestHandle,
-        request.schema.name,
-        " ID =",
-        channel.channelId.toString()
-    );
-    switch (request.schema.name) {
-        case "ModifySubscriptionRequest":
-        case "CreateMonitoredItemsRequest":
-        case "RepublishRequest":
-            //xx console.log(request.toString());
-            break;
-        case "ReadRequest":
-            break;
-        case "WriteRequest":
-            break;
-        case "TranslateBrowsePathsToNodeIdsRequest":
-            break;
-    }
-});
-
-process.on("SIGINT", function () {
+    await new Promise((resolve) => process.once("SIGINT", resolve));
     // only work on linux apparently
     console.log(chalk.red.bold(" Received server interruption from user "));
     console.log(chalk.red.bold(" shutting down ..."));
-    server.shutdown(1000, function () {
-        console.log(chalk.red.bold(" shutting down completed "));
-        console.log(chalk.red.bold(" done "));
-        console.log("");
-        process.exit(-1);
-    });
-});
+    await server.shutdown(1000);
+    console.log(chalk.red.bold(" shutting down completed "));
+    console.log(chalk.red.bold(" done "));
+    console.log("");
+    process.exit(-1);
+})();

package/dist/mini_server_on_port_0.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env ts-node
+export {};

package/dist/mini_server_on_port_0.js

@@ -0,0 +1,34 @@
+#!/usr/bin/env ts-node
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_opcua_1 = require("node-opcua");
+const chalk = require("chalk");
+function main() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const serverOptions = {
+            port: 0,
+            nodeset_filename: [node_opcua_1.nodesets.standard],
+        };
+        const server = new node_opcua_1.OPCUAServer(serverOptions);
+        yield server.initialize();
+        yield server.start();
+        const endpointUrl = server.getEndpointUrl();
+        console.log(chalk.yellow("  server on port      :"), chalk.cyan(server.endpoints[0].port.toString()));
+        console.log(chalk.yellow("  endpointUrl         :"), chalk.cyan(endpointUrl));
+        console.log(chalk.yellow("\n  server now waiting for connections. CTRL+C to stop"));
+        yield new Promise((resolve) => process.once("SIGINT", () => resolve()));
+        server.shutdown(1000);
+        console.log(chalk.red.bold(" shutting down completed "));
+    });
+}
+main();
+//# sourceMappingURL=mini_server_on_port_0.js.map

package/dist/mini_server_on_port_0.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mini_server_on_port_0.js","sourceRoot":"","sources":["../bin/mini_server_on_port_0.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAA2H;AAC3H,+BAA+B;AAC/B,SAAe,IAAI;;QAEf,MAAM,aAAa,GAAG;YAClB,IAAI,EAAE,CAAC;YACP,gBAAgB,EAAE,CAAC,qBAAQ,CAAC,QAAQ,CAAC;SACxC,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,wBAAW,CAAC,aAAa,CAAC,CAAC;QAC9C,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;QAC1B,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QAGrB,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,CAAC;QAE5C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACtG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;QAC9E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,wDAAwD,CAAC,CAAC,CAAC;QAEpF,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAC,EAAE,CAAA,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC5E,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC;IAC7D,CAAC;CAAA;AAED,IAAI,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-samples",
-    "version": "2.100.0",
+    "version": "2.101.0",
     "description": "pure nodejs OPCUA SDK - module samples",
     "bin": {
         "simple_client": "./dist/simple_client_ts.js",
@@ -22,16 +22,16 @@
         "easy-table": "^1.2.0",
         "env-paths": "2.2.1",
         "exit": "^0.1.2",
-        "node-opcua": "2.100.0",
-        "node-opcua-address-space": "2.100.0",
-        "node-opcua-address-space-for-conformance-testing": "2.100.0",
+        "node-opcua": "2.101.0",
+        "node-opcua-address-space": "2.101.0",
+        "node-opcua-address-space-for-conformance-testing": "2.101.0",
         "node-opcua-assert": "2.98.1",
-        "node-opcua-client-crawler": "2.100.0",
+        "node-opcua-client-crawler": "2.101.0",
         "node-opcua-crypto": "^2.1.2",
         "node-opcua-pki": "^3.0.2",
-        "node-opcua-server-configuration": "2.100.0",
+        "node-opcua-server-configuration": "2.101.0",
         "node-opcua-utils": "2.98.1",
-        "node-opcua-vendor-diagnostic": "2.100.0",
+        "node-opcua-vendor-diagnostic": "2.101.0",
         "sprintf-js": "^1.1.2",
         "treeify": "^1.1.0",
         "underscore": "^1.13.6",
@@ -52,7 +52,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "e143ff72418bb3db8c0a2cb8d4b7e54a90521a73",
+    "gitHead": "77abad969406b6d7d76e6bc07a8aa94ae07f3db2",
     "files": [
         "dist"
     ]