node-opcua-address-space 2.142.0 → 2.143.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-address-space",
-    "version": "2.142.0",
+    "version": "2.143.0",
     "description": "pure nodejs OPCUA SDK - module address-space",
     "main": "./dist/src/index_current.js",
     "types": "./dist/source/index.d.ts",
@@ -21,14 +21,14 @@
         "chalk": "4.1.2",
         "dequeue": "^1.0.5",
         "lodash": "4.17.21",
-        "node-opcua-address-space-base": "2.142.0",
+        "node-opcua-address-space-base": "2.143.0",
         "node-opcua-assert": "2.139.0",
         "node-opcua-basic-types": "2.139.0",
         "node-opcua-binary-stream": "2.139.0",
-        "node-opcua-client-dynamic-extension-object": "2.142.0",
+        "node-opcua-client-dynamic-extension-object": "2.143.0",
         "node-opcua-constants": "2.139.0",
         "node-opcua-crypto": "4.16.0",
-        "node-opcua-data-access": "2.142.0",
+        "node-opcua-data-access": "2.143.0",
         "node-opcua-data-model": "2.139.0",
         "node-opcua-data-value": "2.142.0",
         "node-opcua-date-time": "2.139.0",
@@ -37,23 +37,23 @@
         "node-opcua-extension-object": "2.139.0",
         "node-opcua-factory": "2.139.0",
         "node-opcua-nodeid": "2.139.0",
-        "node-opcua-nodeset-ua": "2.142.0",
+        "node-opcua-nodeset-ua": "2.143.0",
         "node-opcua-numeric-range": "2.139.0",
         "node-opcua-object-registry": "2.139.0",
-        "node-opcua-pseudo-session": "2.142.0",
-        "node-opcua-service-browse": "2.142.0",
-        "node-opcua-service-call": "2.142.0",
-        "node-opcua-service-history": "2.142.0",
-        "node-opcua-service-translate-browse-path": "2.142.0",
-        "node-opcua-service-write": "2.142.0",
+        "node-opcua-pseudo-session": "2.143.0",
+        "node-opcua-service-browse": "2.143.0",
+        "node-opcua-service-call": "2.143.0",
+        "node-opcua-service-history": "2.143.0",
+        "node-opcua-service-translate-browse-path": "2.143.0",
+        "node-opcua-service-write": "2.143.0",
         "node-opcua-status-code": "2.139.0",
-        "node-opcua-types": "2.142.0",
+        "node-opcua-types": "2.143.0",
         "node-opcua-utils": "2.139.0",
         "node-opcua-variant": "2.142.0",
-        "node-opcua-xml2json": "2.142.0",
-        "semver": "^7.6.3",
+        "node-opcua-xml2json": "2.143.0",
+        "semver": "^7.7.0",
         "set-prototype-of": "^1.0.0",
-        "thenify-ex": "4.2.0",
+        "thenify-ex": "4.4.0",
         "xml-writer": "^1.7.0"
     },
     "devDependencies": {
@@ -61,8 +61,8 @@
         "node-opcua-leak-detector": "2.139.0",
         "node-opcua-nodesets": "2.139.0",
         "node-opcua-packet-analyzer": "2.139.0",
-        "node-opcua-service-filter": "2.142.0",
-        "node-opcua-test-fixtures": "2.142.0",
+        "node-opcua-service-filter": "2.143.0",
+        "node-opcua-test-fixtures": "2.143.0",
         "source-map-support": "^0.5.21"
     },
     "author": "Etienne Rossignon",
@@ -80,7 +80,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "50cfa07779d4c07b299176ac9c27527fcd97d079",
+    "gitHead": "3bd85d4036f219f6f7e401d54e60afb3592ff1ba",
     "files": [
         "dist",
         "distHelpers",

package/source/loader/decode_xml_extension_object.ts

@@ -67,7 +67,7 @@ export function decodeXmlExtensionObject(
 
     const reader = makeXmlExtensionObjectReader(dataType.nodeId, definitionMap, new Map(), translateNodeId);
     const parser2 = new Xml2Json(reader);
-    const pojo = parser2.parseStringSync(xmlBody);
+    const pojo = parser2.parseString(xmlBody);
 
     const userDefinedExtensionObject = addressSpace.constructExtensionObject(dataType, pojo);
 

package/source/loader/generateAddressSpaceRaw.ts

@@ -80,7 +80,7 @@ async function parseDependencies(xmlData: string): Promise<NodesetInfo> {
         }
     };
     const parser = new Xml2Json(state0);
-    parser.parseStringSync(xmlData);
+    parser.parseString(xmlData);
     if (models.length === 0 && namespaceUris.length >= 1) {
         models.push({
             modelUri: namespaceUris[0],
@@ -210,7 +210,7 @@ export async function generateAddressSpaceRaw(
         }
     }
 
-    await nodesetLoader.terminateAsync();
+    await nodesetLoader.terminate();
     adjustNamespaceArray(addressSpace);
     // however process them in series
 }

package/source/loader/load_nodeset2.ts

@@ -142,8 +142,8 @@ function makeDefaultVariant(
     return variant;
 }
 export interface NodeSet2ParserEngine {
-    addNodeSet: (xmlData: string, callback1: SimpleCallback) => void;
-    terminate: (callback: SimpleCallback) => void;
+    addNodeSet: (xmlData: string) => Promise<void>;
+    terminate: () => Promise<void>;
 }
 
 function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLoaderOptions): NodeSet2ParserEngine {
@@ -229,8 +229,8 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
         if (!namespace) {
             throw new Error(
                 "cannot find namespace for " +
-                namespaceUri +
-                "\nplease make sure to initialize your address space with the corresponding nodeset files"
+                    namespaceUri +
+                    "\nplease make sure to initialize your address space with the corresponding nodeset files"
             );
         }
         foundNamespaceMap.set(namespaceUri, namespace);
@@ -817,7 +817,7 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
                 browseName: convertQualifiedName(attrs.BrowseName),
                 parentNodeId: attrs.ParentNodeId || null,
                 nodeId: convertToNodeId(attrs.NodeId) || null,
-                methodDeclarationId: attrs.MethodDeclarationId ? _translateNodeId(attrs.MethodDeclarationId) : null,
+                methodDeclarationId: attrs.MethodDeclarationId ? _translateNodeId(attrs.MethodDeclarationId) : null
             };
             this.isDraft = attrs.ReleaseStatus === "Draft";
             this.isDeprecated = attrs.ReleaseStatus === "Deprecated";
@@ -971,7 +971,7 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
 
     const parser = new Xml2Json(state_0);
 
-    function terminate(callback: SimpleCallback) {
+    async function terminate() {
         make_back_references(addressSpace1);
 
         // setting up Server_NamespaceArray
@@ -993,7 +993,7 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
         doDebug &&
             debugLog(
                 chalk.bgGreenBright("Performing post loading tasks -------------------------------------------") +
-                chalk.green("DONE")
+                    chalk.green("DONE")
             );
 
         async function performPostLoadingTasks(tasks: Task[]): Promise<void> {
@@ -1050,16 +1050,16 @@ function makeNodeSetParserEngine(addressSpace: IAddressSpace, options: NodeSetLo
             doDebug && debugLog(chalk.bgGreenBright("Performing post variable initialization ---------------------"));
             promoteObjectsAndVariables(addressSpace);
         }
-        finalSteps()
-            .then(() => callback!())
-            .catch((err1: Error) => {
-                errorLog("Error ", renderError(err1));
-                callback!(err1);
-            });
+
+        try {
+            await finalSteps();
+        } catch (err) {
+            renderError(err);
+        }
     }
-    function addNodeSet(xmlData: string, callback1: SimpleCallback) {
+    async function addNodeSet(xmlData: string): Promise<void> {
         _reset_namespace_translation();
-        parser.parseString(xmlData, callback1);
+        parser.parseString(xmlData);
     }
 
     return {
@@ -1077,22 +1077,11 @@ export class NodeSetLoader {
         this._s = makeNodeSetParserEngine(addressSpace, options || {});
     }
 
-    addNodeSet(xmlData: string, callback: ErrorCallback): void {
-        if (!callback) {
-            throw new Error("Expecting callback function");
-        }
-        return this._s.addNodeSet(xmlData, callback);
-    }
-
     async addNodeSetAsync(xmlData: string): Promise<void> {
-        return promisify(this.addNodeSet).call(this, xmlData);
-    }
-
-    terminate(callback: ErrorCallback): void {
-        this._s.terminate(callback);
+        return await this._s.addNodeSet(xmlData);
     }
 
-    async terminateAsync(): Promise<void> {
-        return promisify(this.terminate).call(this);
+    async terminate(): Promise<void> {
+        await this._s.terminate();
     }
 }