node-opcua-service-discovery 2.104.0 → 2.107.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bonjour.js +11 -2
- package/dist/bonjour.js.map +1 -1
- package/package.json +6 -6
- package/source/bonjour.ts +14 -3
package/dist/bonjour.js
CHANGED
|
@@ -25,11 +25,12 @@ const node_opcua_object_registry_1 = require("node-opcua-object-registry");
|
|
|
25
25
|
const sterfive_bonjour_service_1 = require("sterfive-bonjour-service");
|
|
26
26
|
const debugLog = (0, node_opcua_debug_1.make_debugLog)(__filename);
|
|
27
27
|
const doDebug = (0, node_opcua_debug_1.checkDebugFlag)(__filename);
|
|
28
|
+
const errorLog = (0, node_opcua_debug_1.make_errorLog)(__filename);
|
|
28
29
|
let gBonjour;
|
|
29
30
|
let gBonjourRefCount = 0;
|
|
30
31
|
const registry = new node_opcua_object_registry_1.ObjectRegistry();
|
|
31
32
|
function errorCallback(err) {
|
|
32
|
-
|
|
33
|
+
errorLog(" ERROR received from Bonjour", err.message);
|
|
33
34
|
}
|
|
34
35
|
function acquireBonjour() {
|
|
35
36
|
const bonjour = new sterfive_bonjour_service_1.Bonjour();
|
|
@@ -100,7 +101,15 @@ function isSameService(a, b) {
|
|
|
100
101
|
}
|
|
101
102
|
exports.isSameService = isSameService;
|
|
102
103
|
const serviceToString = (service) => {
|
|
103
|
-
return "host" +
|
|
104
|
+
return ("host" +
|
|
105
|
+
service.host +
|
|
106
|
+
" type=" +
|
|
107
|
+
service.type +
|
|
108
|
+
service.name +
|
|
109
|
+
" on port " +
|
|
110
|
+
service.port +
|
|
111
|
+
" txt " +
|
|
112
|
+
JSON.stringify(service.txt));
|
|
104
113
|
};
|
|
105
114
|
exports.serviceToString = serviceToString;
|
|
106
115
|
// function waitServiceUp(serviceConfig: ServiceConfig, callback: () => void) {
|
package/dist/bonjour.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bonjour.js","sourceRoot":"","sources":["../source/bonjour.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;GAEG;AACH,4BAA4B;AAC5B,+BAA8C;AAC9C,kDAA0B;AAC1B,yDAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"bonjour.js","sourceRoot":"","sources":["../source/bonjour.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-service-discovery",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.107.0",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module service-discovery",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "tsc -b",
|
|
@@ -12,10 +12,10 @@
|
|
|
12
12
|
"types": "./dist/index.d.ts",
|
|
13
13
|
"dependencies": {
|
|
14
14
|
"chalk": "4.1.2",
|
|
15
|
-
"node-opcua-assert": "2.
|
|
16
|
-
"node-opcua-debug": "2.
|
|
17
|
-
"node-opcua-object-registry": "2.
|
|
18
|
-
"node-opcua-types": "2.
|
|
15
|
+
"node-opcua-assert": "2.105.0",
|
|
16
|
+
"node-opcua-debug": "2.105.0",
|
|
17
|
+
"node-opcua-object-registry": "2.105.0",
|
|
18
|
+
"node-opcua-types": "2.107.0",
|
|
19
19
|
"sterfive-bonjour-service": "1.1.4"
|
|
20
20
|
},
|
|
21
21
|
"author": "Etienne Rossignon",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"internet of things"
|
|
34
34
|
],
|
|
35
35
|
"homepage": "http://node-opcua.github.io/",
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "df5c9168eea0d1a521603d181fa66ace7649e79e",
|
|
37
37
|
"files": [
|
|
38
38
|
"dist",
|
|
39
39
|
"source"
|
package/source/bonjour.ts
CHANGED
|
@@ -5,12 +5,13 @@
|
|
|
5
5
|
import { callbackify, promisify } from "util";
|
|
6
6
|
import chalk from "chalk";
|
|
7
7
|
import { assert } from "node-opcua-assert";
|
|
8
|
-
import { checkDebugFlag, make_debugLog } from "node-opcua-debug";
|
|
8
|
+
import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
|
|
9
9
|
import { ObjectRegistry } from "node-opcua-object-registry";
|
|
10
10
|
import { Bonjour, Service, ServiceConfig } from "sterfive-bonjour-service";
|
|
11
11
|
|
|
12
12
|
const debugLog = make_debugLog(__filename);
|
|
13
13
|
const doDebug = checkDebugFlag(__filename);
|
|
14
|
+
const errorLog = make_errorLog(__filename);
|
|
14
15
|
|
|
15
16
|
let gBonjour: Bonjour | undefined;
|
|
16
17
|
let gBonjourRefCount = 0;
|
|
@@ -18,7 +19,7 @@ let gBonjourRefCount = 0;
|
|
|
18
19
|
const registry = new ObjectRegistry();
|
|
19
20
|
|
|
20
21
|
function errorCallback(err: Error) {
|
|
21
|
-
|
|
22
|
+
errorLog(" ERROR received from Bonjour", err.message);
|
|
22
23
|
}
|
|
23
24
|
|
|
24
25
|
export function acquireBonjour(): Bonjour {
|
|
@@ -98,7 +99,17 @@ export function isSameService(a?: ServiceConfig, b?: ServiceConfig): boolean {
|
|
|
98
99
|
}
|
|
99
100
|
|
|
100
101
|
export const serviceToString = (service: ServiceConfig) => {
|
|
101
|
-
return
|
|
102
|
+
return (
|
|
103
|
+
"host" +
|
|
104
|
+
service.host +
|
|
105
|
+
" type=" +
|
|
106
|
+
service.type +
|
|
107
|
+
service.name +
|
|
108
|
+
" on port " +
|
|
109
|
+
service.port +
|
|
110
|
+
" txt " +
|
|
111
|
+
JSON.stringify(service.txt)
|
|
112
|
+
);
|
|
102
113
|
};
|
|
103
114
|
|
|
104
115
|
// function waitServiceUp(serviceConfig: ServiceConfig, callback: () => void) {
|