node-opcua-server 2.117.0 → 2.118.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/base_server.js +14 -37
- package/dist/base_server.js.map +1 -1
- package/dist/helper.js +4 -24
- package/dist/helper.js.map +1 -1
- package/dist/opcua_server.d.ts +4 -0
- package/dist/opcua_server.js +43 -43
- package/dist/opcua_server.js.map +1 -1
- package/dist/register_server_manager.js +3 -26
- package/dist/register_server_manager.js.map +1 -1
- package/dist/server_end_point.js +41 -42
- package/dist/server_end_point.js.map +1 -1
- package/dist/server_engine.d.ts +25 -1
- package/dist/server_engine.js +24 -25
- package/dist/server_engine.js.map +1 -1
- package/package.json +41 -41
- package/source/base_server.ts +4 -4
- package/source/helper.ts +1 -1
- package/source/opcua_server.ts +51 -16
- package/source/register_server_manager.ts +1 -1
- package/source/server_end_point.ts +39 -19
- package/source/server_engine.ts +80 -2
package/dist/base_server.js
CHANGED
|
@@ -1,27 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
4
|
};
|
|
@@ -31,11 +8,11 @@ exports.OPCUABaseServer = void 0;
|
|
|
31
8
|
* @module node-opcua-server
|
|
32
9
|
*/
|
|
33
10
|
// tslint:disable:no-console
|
|
34
|
-
const
|
|
35
|
-
const
|
|
36
|
-
const
|
|
11
|
+
const fs_1 = __importDefault(require("fs"));
|
|
12
|
+
const path_1 = __importDefault(require("path"));
|
|
13
|
+
const os_1 = __importDefault(require("os"));
|
|
37
14
|
const util_1 = require("util");
|
|
38
|
-
const
|
|
15
|
+
const async_1 = __importDefault(require("async"));
|
|
39
16
|
const chalk_1 = __importDefault(require("chalk"));
|
|
40
17
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
41
18
|
const global_mutex_1 = require("@ster5/global-mutex");
|
|
@@ -60,7 +37,7 @@ const warningLog = errorLog;
|
|
|
60
37
|
const default_server_info = {
|
|
61
38
|
// The globally unique identifier for the application instance. This URI is used as
|
|
62
39
|
// ServerUri in Services if the application is a Server.
|
|
63
|
-
applicationUri: (0, node_opcua_common_1.makeApplicationUrn)(
|
|
40
|
+
applicationUri: (0, node_opcua_common_1.makeApplicationUrn)(os_1.default.hostname(), "NodeOPCUA-Server"),
|
|
64
41
|
// The globally unique identifier for the product.
|
|
65
42
|
productUri: "NodeOPCUA-Server",
|
|
66
43
|
// A localized descriptive name for the application.
|
|
@@ -113,7 +90,7 @@ class OPCUABaseServer extends node_opcua_common_1.OPCUASecureObject {
|
|
|
113
90
|
}
|
|
114
91
|
options.privateKeyFile = options.privateKeyFile || options.serverCertificateManager.privateKey;
|
|
115
92
|
options.certificateFile =
|
|
116
|
-
options.certificateFile ||
|
|
93
|
+
options.certificateFile || path_1.default.join(options.serverCertificateManager.rootDir, "own/certs/certificate.pem");
|
|
117
94
|
super(options);
|
|
118
95
|
this.serverCertificateManager = options.serverCertificateManager;
|
|
119
96
|
this.capabilitiesForMDNS = [];
|
|
@@ -143,7 +120,7 @@ class OPCUABaseServer extends node_opcua_common_1.OPCUASecureObject {
|
|
|
143
120
|
});
|
|
144
121
|
}
|
|
145
122
|
async createDefaultCertificate() {
|
|
146
|
-
if (
|
|
123
|
+
if (fs_1.default.existsSync(this.certificateFile)) {
|
|
147
124
|
return;
|
|
148
125
|
}
|
|
149
126
|
// collect all hostnames
|
|
@@ -153,9 +130,9 @@ class OPCUABaseServer extends node_opcua_common_1.OPCUASecureObject {
|
|
|
153
130
|
/* to do */
|
|
154
131
|
}
|
|
155
132
|
}
|
|
156
|
-
if (!
|
|
133
|
+
if (!fs_1.default.existsSync(this.certificateFile)) {
|
|
157
134
|
await (0, global_mutex_1.withLock)({ fileToLock: this.certificateFile + ".mutex" }, async () => {
|
|
158
|
-
if (
|
|
135
|
+
if (fs_1.default.existsSync(this.certificateFile)) {
|
|
159
136
|
return;
|
|
160
137
|
}
|
|
161
138
|
const applicationUri = this.serverInfo.applicationUri;
|
|
@@ -243,7 +220,7 @@ class OPCUABaseServer extends node_opcua_common_1.OPCUASecureObject {
|
|
|
243
220
|
(0, node_opcua_date_time_1.uninstallPeriodicClockAdjustment)();
|
|
244
221
|
this.serverCertificateManager.dispose().then(() => {
|
|
245
222
|
debugLog("OPCUABaseServer#shutdown starting");
|
|
246
|
-
|
|
223
|
+
async_1.default.forEach(this.endpoints, (endpoint, callback) => {
|
|
247
224
|
cleanupEndpoint(endpoint);
|
|
248
225
|
endpoint.shutdown(callback);
|
|
249
226
|
}, (err) => {
|
|
@@ -255,9 +232,9 @@ class OPCUABaseServer extends node_opcua_common_1.OPCUASecureObject {
|
|
|
255
232
|
shutdownChannels(callback) {
|
|
256
233
|
(0, node_opcua_assert_1.assert)(typeof callback === "function");
|
|
257
234
|
debugLog("OPCUABaseServer#shutdownChannels");
|
|
258
|
-
|
|
235
|
+
async_1.default.forEach(this.endpoints, (endpoint, inner_callback) => {
|
|
259
236
|
debugLog(" shutting down endpoint ", endpoint.endpointDescriptions()[0].endpointUrl);
|
|
260
|
-
|
|
237
|
+
async_1.default.series([
|
|
261
238
|
// xx (callback2: (err?: Error| null) => void) => {
|
|
262
239
|
// xx endpoint.suspendConnection(callback2);
|
|
263
240
|
// xx },
|
|
@@ -359,7 +336,7 @@ class OPCUABaseServer extends node_opcua_common_1.OPCUASecureObject {
|
|
|
359
336
|
if (!callback) {
|
|
360
337
|
throw new Error("Internal Error");
|
|
361
338
|
}
|
|
362
|
-
|
|
339
|
+
async_1.default.forEach(this.endpoints, (ep, _inner_callback) => {
|
|
363
340
|
/* istanbul ignore next */
|
|
364
341
|
if (doDebug) {
|
|
365
342
|
debugLog("Suspending ", ep.endpointDescriptions()[0].endpointUrl);
|
|
@@ -374,7 +351,7 @@ class OPCUABaseServer extends node_opcua_common_1.OPCUASecureObject {
|
|
|
374
351
|
}, (err) => callback(err));
|
|
375
352
|
}
|
|
376
353
|
resumeEndPoints(callback) {
|
|
377
|
-
|
|
354
|
+
async_1.default.forEach(this.endpoints, (ep, _inner_callback) => {
|
|
378
355
|
ep.restoreConnection(_inner_callback);
|
|
379
356
|
}, (err) => callback(err));
|
|
380
357
|
}
|
package/dist/base_server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base_server.js","sourceRoot":"","sources":["../source/base_server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"base_server.js","sourceRoot":"","sources":["../source/base_server.ts"],"names":[],"mappings":";;;;;;AAAA;;GAEG;AACH,4BAA4B;AAC5B,4CAAoB;AACpB,gDAAwB;AACxB,4CAAoB;AACpB,+BAA6B;AAC7B,kDAA0B;AAC1B,kDAA0B;AAC1B,yDAA2C;AAC3C,sDAA+C;AAE/C,mFAKwC;AACxC,yDAAqG;AACrG,iEAA2E;AAC3E,+DAAwG;AACxG,uDAAgF;AAChF,uDAAmE;AACnE,6DAK6B;AAE7B,+EAAuF;AACvF,+EAAqF;AACrF,+EAAsE;AACtE,yFAAiE;AACjE,mEAAiE;AAGjE,uDAA4C;AAE5C,yDAAkE;AAKlE,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,UAAU,GAAG,QAAQ,CAAC;AAE5B,MAAM,mBAAmB,GAAG;IACxB,mFAAmF;IACnF,wDAAwD;IACxD,cAAc,EAAE,IAAA,sCAAkB,EAAC,YAAE,CAAC,QAAQ,EAAE,EAAE,kBAAkB,CAAC;IAErE,kDAAkD;IAClD,UAAU,EAAE,kBAAkB;IAE9B,oDAAoD;IACpD,eAAe,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE;IACpD,eAAe,EAAE,8CAAe,CAAC,MAAM;IACvC,gBAAgB,EAAE,EAAE;IAEpB,mBAAmB,EAAE,EAAE;IAEvB,aAAa,EAAE,EAAE;CACpB,CAAC;AAEF,SAAS,eAAe,CAAC,QAA6B;IAClD,IAAI,QAAQ,CAAC,eAAe,EAAE;QAC1B,IAAA,0BAAM,EAAC,OAAO,QAAQ,CAAC,eAAe,KAAK,UAAU,CAAC,CAAC;QACvD,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;QAChE,QAAQ,CAAC,eAAe,GAAG,SAAS,CAAC;KACxC;IAED,IAAI,QAAQ,CAAC,iBAAiB,EAAE;QAC5B,IAAA,0BAAM,EAAC,OAAO,QAAQ,CAAC,iBAAiB,KAAK,UAAU,CAAC,CAAC;QACzD,QAAQ,CAAC,cAAc,CAAC,cAAc,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QACpE,QAAQ,CAAC,iBAAiB,GAAG,SAAS,CAAC;KAC1C;IACD,IAAI,QAAQ,CAAC,qBAAqB,EAAE;QAChC,IAAA,0BAAM,EAAC,OAAO,QAAQ,CAAC,qBAAqB,KAAK,UAAU,CAAC,CAAC;QAC7D,QAAQ,CAAC,cAAc,CAAC,mBAAmB,EAAE,QAAQ,CAAC,qBAAqB,CAAC,CAAC;QAC7E,QAAQ,CAAC,qBAAqB,GAAG,SAAS,CAAC;KAC9C;IACD,IAAI,QAAQ,CAAC,4BAA4B,EAAE;QACvC,IAAA,0BAAM,EAAC,OAAO,QAAQ,CAAC,4BAA4B,KAAK,UAAU,CAAC,CAAC;QACpE,QAAQ,CAAC,cAAc,CAAC,0BAA0B,EAAE,QAAQ,CAAC,4BAA4B,CAAC,CAAC;QAC3F,QAAQ,CAAC,4BAA4B,GAAG,SAAS,CAAC;KACrD;AACL,CAAC;AAgBD,MAAM,aAAa,GAAG,GAAG,EAAE;IACvB,WAAW;AACf,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAa,eAAgB,SAAQ,qCAAiB;IAGlD;;OAEG;IACH,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC;IAC3C,CAAC;IAUD,YAAY,OAAgC;QACxC,OAAO,GAAG,OAAO,IAAK,EAA6B,CAAC;QAEpD,IAAI,CAAC,OAAO,CAAC,wBAAwB,EAAE;YACnC,OAAO,CAAC,wBAAwB,GAAG,IAAA,6DAA4B,EAAC,KAAK,CAAC,CAAC;SAC1E;QACD,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,wBAAwB,CAAC,UAAU,CAAC;QAC/F,OAAO,CAAC,eAAe;YACnB,OAAO,CAAC,eAAe,IAAI,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAAC;QAEhH,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,wBAAwB,GAAG,OAAO,CAAC,wBAAwB,CAAC;QACjE,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QAEvB,MAAM,UAAU,GAAkC;YAC9C,GAAG,mBAAmB;YACtB,GAAG,OAAO,CAAC,UAAU;SACxB,CAAC;QACF,UAAU,CAAC,eAAe,GAAG,IAAA,2CAAmB,EAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAC7E,IAAI,CAAC,UAAU,GAAG,IAAI,qDAAsB,CAAC,UAAU,CAAC,CAAC;QAEzD,IAAI,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YAC1D,QAAQ,CAAC,mDAAmD,EAAE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC7G;QAED,IAAI,CAAC,UAAU,CAAC,eAAgB,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,MAAM,IAAI,IAAI,CAAC;QAE1F,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,MAAM,EAAE;YAC1C,UAAU,CACN,yEAAyE,EACzE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,QAAQ,EAAE,CAC7C,CAAC;SACL;QAED,MAAM,gBAAgB,GAAG,UAAU,CAAC,cAAc,IAAI,EAAE,CAAC;QAExD,IAAI,CAAC,UAAkB,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAA,qDAA+B,EAAC,gBAAgB,CAAC,CAAC,CAAC;QAErH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC9B,MAAM,IAAI,GAAG,MAAM,IAAA,qDAA+B,GAAE,CAAC;QACzD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC9B,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC9B,CAAC,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,wBAAwB;QACpC,IAAI,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;YACrC,OAAO;SACV;QAED,wBAAwB;QACxB,MAAM,SAAS,GAAG,EAAE,CAAC;QACrB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE;YAC5B,KAAK,MAAM,EAAE,IAAI,CAAC,CAAC,oBAAoB,EAAE,EAAE;gBACvC,WAAW;aACd;SACJ;QACD,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;YACtC,MAAM,IAAA,uBAAQ,EAAC,EAAE,UAAU,EAAE,IAAI,CAAC,eAAe,GAAG,QAAQ,EAAE,EAAE,KAAK,IAAI,EAAE;gBACvE,IAAI,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;oBACrC,OAAO;iBACV;gBACD,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,cAAe,CAAC;gBACvD,MAAM,IAAI,GAAG,IAAA,iDAA2B,GAAE,CAAC;gBAC3C,MAAM,QAAQ,GAAG,IAAA,iCAAW,GAAE,CAAC;gBAC/B,MAAM,GAAG,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAE3C,MAAM,IAAI,CAAC,wBAAwB,CAAC,2BAA2B,CAAC;oBAC5D,cAAc;oBACd,GAAG;oBACH,8BAA8B;oBAC9B,UAAU,EAAE,IAAI,CAAC,eAAe;oBAEhC,OAAO,EAAE,IAAA,4CAAW,EAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAK,EAAE,QAAQ,CAAC;oBAErE,SAAS,EAAE,IAAI,IAAI,EAAE;oBACrB,QAAQ,EAAE,GAAG,GAAG,EAAE,CAAC,WAAW;iBACjC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAEM,KAAK,CAAC,YAAY;QACrB,MAAM,IAAI,CAAC,wBAAwB,CAAC,UAAU,EAAE,CAAC;QACjD,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACtC,QAAQ,CAAC,oBAAoB,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;QAC9F,QAAQ,CAAC,oBAAoB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACrD,MAAM,IAAA,iDAA6B,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,UAAU,CAAC,cAAe,CAAC,CAAC;IACxH,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,IAAkC;QAC3C,IAAA,0BAAM,EAAC,OAAO,IAAI,KAAK,UAAU,CAAC,CAAC;QACnC,IAAI,CAAC,UAAU,EAAE;aACZ,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACtB,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACnC,CAAC;IAES,KAAK,CAAC,wBAAwB;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC;QAChC,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,MAAM,IAAI,EAAE,CAAC;SAChB;IACL,CAAC;IAES,KAAK,CAAC,UAAU;QACtB,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAEtC,IAAA,0BAAM,EAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QACtC,IAAA,0BAAM,EAAC,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,gCAAgC,CAAC,CAAC;QAEpE,IAAA,qDAA8B,GAAE,CAAC;QACjC,4DAA4D;QAC5D,MAAM,MAAM,GAAG,IAAI,CAAC;QACpB,MAAM,eAAe,GAAG,UAAqC,OAAiC;YAC1F,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC7C,CAAC,CAAC;QAEF,MAAM,iBAAiB,GAAG,UAAqC,OAAiC;YAC5F,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC/C,CAAC,CAAC;QAEF,MAAM,qBAAqB,GAAG,UAAqC,UAAuB;YACtF,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QACvD,CAAC,CAAC;QAEF,MAAM,4BAA4B,GAAG,UAEjC,UAAuB,EACvB,WAAyB;YAEzB,MAAM,CAAC,IAAI,CAAC,0BAA0B,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;QAC3E,CAAC,CAAC;QAEF,MAAM,QAAQ,GAAoB,EAAE,CAAC;QAErC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE;YACnC,IAAA,0BAAM,EAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;YAEpC,QAAQ,CAAC,eAAe,GAAG,eAAe,CAAC;YAC3C,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;YAEpD,QAAQ,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;YAC/C,QAAQ,CAAC,EAAE,CAAC,cAAc,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC;YAExD,QAAQ,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;YACvD,QAAQ,CAAC,EAAE,CAAC,mBAAmB,EAAE,QAAQ,CAAC,qBAAqB,CAAC,CAAC;YAEjE,QAAQ,CAAC,4BAA4B,GAAG,4BAA4B,CAAC;YACrE,QAAQ,CAAC,EAAE,CAAC,0BAA0B,EAAE,QAAQ,CAAC,4BAA4B,CAAC,CAAC;YAE/E,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SACnH;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IAED;;;OAGG;IACI,QAAQ,CAAC,IAA2B;QACvC,IAAA,0BAAM,EAAC,OAAO,IAAI,KAAK,UAAU,CAAC,CAAC;QACnC,IAAA,uDAAgC,GAAE,CAAC;QACnC,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YAC9C,QAAQ,CAAC,mCAAmC,CAAC,CAAC;YAC9C,eAAK,CAAC,OAAO,CACT,IAAI,CAAC,SAAS,EACd,CAAC,QAA6B,EAAE,QAA+B,EAAE,EAAE;gBAC/D,eAAe,CAAC,QAAQ,CAAC,CAAC;gBAC1B,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAChC,CAAC,EACD,CAAC,GAAkB,EAAE,EAAE;gBACnB,QAAQ,CAAC,oBAAoB,CAAC,CAAC;gBAC/B,IAAI,CAAC,GAAI,CAAC,CAAC;YACf,CAAC,CACJ,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAIM,gBAAgB,CAAC,QAAuC;QAC3D,IAAA,0BAAM,EAAC,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC;QACvC,QAAQ,CAAC,kCAAkC,CAAC,CAAC;QAC7C,eAAK,CAAC,OAAO,CACT,IAAI,CAAC,SAAS,EACd,CAAC,QAA6B,EAAE,cAA4C,EAAE,EAAE;YAC5E,QAAQ,CAAC,0BAA0B,EAAE,QAAQ,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YACrF,eAAK,CAAC,MAAM,CACR;gBACI,oEAAoE;gBACpE,iEAAiE;gBACjE,yBAAyB;gBACzB,CAAC,SAAuC,EAAE,EAAE;oBACxC,QAAQ,CAAC,yBAAyB,EAAE,CAAC;oBACrC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBACjC,CAAC;gBACD,gEAAgE;gBAChE,4DAA4D;gBAC5D,oBAAoB;aACvB,EACD,cAAc,CACjB,CAAC;QACN,CAAC,EACD,QAAS,CACZ,CAAC;IACN,CAAC;IAED;;OAEG;IACI,UAAU,CAAC,OAAgB,EAAE,OAAiC;QACjE,IAAA,0BAAM,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxB,IAAA,0BAAM,EAAC,OAAO,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC;QAChC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAEhC,4FAA4F;QAC5F,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YACvB,OAAO,CAAC,YAAY,GAAG,CAAC,GAAW,EAAE,SAAmB,CAAC,4BAA4B,EAAE,EAAE;gBACrF,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9C,CAAC,CAAC;SACL;QAED,kBAAkB;QAClB,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE/B,IAAI,OAAO,EAAE;YACT,QAAQ,CACJ,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,0DAA0D,CAAC,EAC5E,OAAO,CAAC,SAAS,EACjB,OAAO,CAAC,MAAM,CAAC,IAAI,CACtB,CAAC;SACL;QAED,IAAI,UAAkB,CAAC;QACvB,IAAI,QAAkB,CAAC;QAEvB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEvC,IAAI;YACA,4CAA4C;YAC5C,MAAM,OAAO,GAAI,IAAY,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC5D,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE;gBAC/B,8CAA8C;gBAC9C,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;aAClC;iBAAM;gBACH,UAAU,GAAG,yCAAyC,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;gBAC7E,UAAU,CAAC,UAAU,CAAC,CAAC;gBACvB,QAAQ,CAAC,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;gBACrC,QAAQ,GAAG,gBAAgB,CAAC,oCAAW,CAAC,qBAAqB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;gBAC7E,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;aAClE;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,wBAAwB;YACxB,MAAM,WAAW,GAAG,gEAAgE,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YAC3G,UAAU,CAAC,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;YACxC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/B,IAAA,kDAA+B,EAAC,GAAY,CAAC,CAAC;YAE9C,IAAI,mBAAmB,GAAG,EAAE,CAAC;YAC7B,mBAAmB,CAAC,IAAI,CAAC,gDAAgD,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACjG,IAAI,YAAK,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE;gBAC1B,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACtC,IAAI,GAAG,CAAC,KAAK,EAAE;oBACX,mBAAmB,GAAG,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;iBAC3E;aACJ;YACD,QAAQ,GAAG,gBAAgB,CAAC,oCAAW,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;YAE/E,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;SAClE;IACL,CAAC;IAED;;OAEG;IACI,cAAc,CAAC,WAA2B;QAC7C,IAAI,SAAS,GAA0B,EAAE,CAAC;QAC1C,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE;YACnC,MAAM,EAAE,GAAG,QAAQ,CAAC,oBAAoB,EAAE,CAAC;YAC3C,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,2BAAQ,EAAC,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7F,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;SAC5C;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IACD;;OAEG;IACI,cAAc;QACjB,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,WAAY,CAAC;IACjD,CAAC;IAEM,gBAAgB;QACnB,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAsB,EAAE,EAAE;YAChE,OAAO,CAAC,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,CAAC,WAAY,CAAC;QACpD,CAAC,CAAC,CAAC;QACH,OAAO,aAAa,CAAC;IACzB,CAAC;IAEM,UAAU,CAAC,OAAiC;QAC/C,IAAI,CAAC,UAAU,CAAC,aAAa,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxD,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClC,OAAO,OAAO,CAAC;IACnB,CAAC;IAWM,gBAAgB,CAAC,QAAgC;QACpD,0BAA0B;QAC1B,IAAI,CAAC,QAAQ,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;SACrC;QACD,eAAK,CAAC,OAAO,CACT,IAAI,CAAC,SAAS,EACd,CAAC,EAAuB,EAAE,eAAe,EAAE,EAAE;YACzC,0BAA0B;YAC1B,IAAI,OAAO,EAAE;gBACT,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;aACrE;YAED,EAAE,CAAC,iBAAiB,CAAC,CAAC,GAAkB,EAAE,EAAE;gBACxC,0BAA0B;gBAC1B,IAAI,OAAO,EAAE;oBACT,QAAQ,CAAC,YAAY,EAAE,EAAE,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;iBACpE;gBACD,eAAe,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;QACP,CAAC,EACD,CAAC,GAAkB,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAI,CAAC,CACzC,CAAC;IACN,CAAC;IASM,eAAe,CAAC,QAAgC;QACnD,eAAK,CAAC,OAAO,CACT,IAAI,CAAC,SAAS,EACd,CAAC,EAAuB,EAAE,eAAe,EAAE,EAAE;YACzC,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAC1C,CAAC,EACD,CAAC,GAAkB,EAAE,EAAE,CAAC,QAAS,CAAC,GAAI,CAAC,CAC1C,CAAC;IACN,CAAC;IAES,OAAO,CAAC,OAAgB,EAAE,OAAiC;QACjE,WAAW;IACf,CAAC;IAED;;OAEG;IACO,uBAAuB,CAAC,OAAgB,EAAE,OAAiC;QACjF,MAAM,OAAO,GAAG,OAAO,CAAC,OAA8B,CAAC;QAEvD,IAAA,0BAAM,EAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,qBAAqB,CAAC,CAAC;QAEtD,MAAM,QAAQ,GAAG,IAAI,mDAAoB,CAAC,EAAE,CAAC,CAAC;QAE9C;;;;;;;;;;;WAWG;QACH,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QACvD,IAAI,OAAO,CAAC,WAAW,EAAE;YACrB,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,CACtC,CAAC,QAA6B,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,KAAK,OAAO,CAAC,WAAW,CAClF,CAAC;YACF,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrB,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC;aACjC;SACJ;QACD,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,QAA6B,EAAE,EAAE,CAAC,CAAE,QAAgB,CAAC,UAAU,CAAC,CAAC;QAEjH,gBAAgB;QAChB,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YACvD,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,QAAa,EAAE,EAAE;gBAC7D,OAAO,OAAO,CAAC,WAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;YAC3E,CAAC,CAAC,CAAC;SACN;QAED,uEAAuE;QACvE,iDAAiD;QACjD,yCAAyC;QACzC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAA6B,EAAE,EAAE;YACzD,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,GAAG,OAAO,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IACnE,CAAC;IAED;;OAEG;IACO,sBAAsB,CAAC,OAAgB,EAAE,OAAiC;QAChF,uDAAuD;QACvD,0GAA0G;QAC1G,wGAAwG;QACxG,yGAAyG;QACzG,wFAAwF;QAExF,MAAM,UAAU,GAAG,GAAG,CAAC,CAAC,eAAe;QACvC,UAAU,CAAC,GAAG,EAAE;YACZ,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAChC,IAAA,0BAAM,EAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,oBAAoB,CAAC,CAAC;YACrD,IAAI,CAAC,CAAC,OAAO,YAAY,iDAAkB,CAAC,EAAE;gBAC1C,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;aAC3C;YAED,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACvC,gBAAgB;YAChB,SAAS;YACT,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrD,gFAAgF;gBAChF,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,YAAoC,EAAE,EAAE;oBAC9D,OAAO,OAAO,CAAC,UAAW,CAAC,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;gBACzE,CAAC,CAAC,CAAC;aACN;YAED,SAAS,KAAK,CAAC,sBAA8C;gBACzD,OAAO,IAAI,qDAAsB,CAAC;oBAC9B,eAAe,EAAE,sBAAsB,CAAC,eAAe;oBACvD,eAAe,EAAE,sBAAsB,CAAC,eAAe;oBACvD,cAAc,EAAE,sBAAsB,CAAC,cAAc;oBACrD,mBAAmB,EAAE,sBAAsB,CAAC,mBAAmB;oBAC/D,aAAa,EAAE,sBAAsB,CAAC,aAAa;oBACnD,gBAAgB,EAAE,sBAAsB,CAAC,gBAAgB;oBACzD,UAAU,EAAE,sBAAsB,CAAC,UAAU;iBAChD,CAAC,CAAC;YACP,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,kDAAmB,CAAC;gBACrC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;aAC9B,CAAC,CAAC;YAEH,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QACnE,CAAC,EAAE,UAAU,CAAC,CAAC;IACnB,CAAC;IAED;;OAEG;IACO,WAAW;QACjB,IAAI,QAAQ,GAA+B,EAAE,CAAC;QAE9C,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE;YACnC,MAAM,CAAC,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;YACjC,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SACjC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;;AApfL,0CAqfC;AApfiB,gCAAgB,GAAG,gBAAgB,CAAC;AAsftD;;;;;GAKG;AACH,SAAS,gBAAgB,CAAC,UAAsB,EAAE,QAAkB;IAChE,MAAM,QAAQ,GAAG,IAAI,gDAAY,EAAE,CAAC;IACpC,QAAQ,CAAC,cAAc,CAAC,aAAa,GAAG,UAAU,CAAC;IACnD,oGAAoG;IAEpG,IAAA,0BAAM,EAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChC,IAAA,0BAAM,EAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC;IAExC,QAAQ,CAAC,cAAc,CAAC,WAAW,GAAG,QAAQ,CAAC;IAC/C,4BAA4B;IAC5B,UAAU,CAAC,eAAK,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,iCAAiC;AACjC,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACnC,MAAM,IAAI,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;AAClC,eAAe,CAAC,SAAS,CAAC,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;AAClH,eAAe,CAAC,SAAS,CAAC,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;AACpH,eAAe,CAAC,SAAS,CAAC,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC"}
|
package/dist/helper.js
CHANGED
|
@@ -1,30 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
24
4
|
};
|
|
25
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
6
|
exports.installSessionLoggingOnEngine = exports.installSubscriptionMonitoring = exports.installSessionLogging = void 0;
|
|
27
|
-
const
|
|
7
|
+
const util_1 = __importDefault(require("util"));
|
|
28
8
|
const server_subscription_1 = require("./server_subscription");
|
|
29
9
|
const consolelog = (...args) => {
|
|
30
10
|
const d = new Date();
|
|
@@ -41,7 +21,7 @@ function installSessionLogging(server) {
|
|
|
41
21
|
}
|
|
42
22
|
exports.installSessionLogging = installSessionLogging;
|
|
43
23
|
const info = (subscription) => {
|
|
44
|
-
return
|
|
24
|
+
return util_1.default.format(subscription.subscriptionId, server_subscription_1.SubscriptionState[subscription.state].padEnd(9), subscription.state, "kac=", subscription.currentKeepAliveCount.toString().padStart(3) +
|
|
45
25
|
"/" +
|
|
46
26
|
subscription.maxKeepAliveCount.toString().padStart(3), "ltc=", subscription.currentLifetimeCount.toString().padStart(3) +
|
|
47
27
|
"/" +
|
package/dist/helper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../source/helper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../source/helper.ts"],"names":[],"mappings":"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"}
|
package/dist/opcua_server.d.ts
CHANGED
|
@@ -71,7 +71,11 @@ export interface OPCUAServerEndpointOptions {
|
|
|
71
71
|
disableDiscovery?: boolean;
|
|
72
72
|
}
|
|
73
73
|
export interface OPCUAServerOptions extends OPCUABaseServerOptions, OPCUAServerEndpointOptions {
|
|
74
|
+
/**
|
|
75
|
+
* @deprecated
|
|
76
|
+
*/
|
|
74
77
|
alternateEndpoints?: OPCUAServerEndpointOptions[];
|
|
78
|
+
endpoints?: OPCUAServerEndpointOptions[];
|
|
75
79
|
/**
|
|
76
80
|
* the server certificate full path filename
|
|
77
81
|
*
|
package/dist/opcua_server.js
CHANGED
|
@@ -6,29 +6,6 @@
|
|
|
6
6
|
// tslint:disable:no-console
|
|
7
7
|
// tslint:disable:max-line-length
|
|
8
8
|
// tslint:disable:unified-signatures
|
|
9
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
12
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
13
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
14
|
-
}
|
|
15
|
-
Object.defineProperty(o, k2, desc);
|
|
16
|
-
}) : (function(o, m, k, k2) {
|
|
17
|
-
if (k2 === undefined) k2 = k;
|
|
18
|
-
o[k2] = m[k];
|
|
19
|
-
}));
|
|
20
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
21
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
22
|
-
}) : function(o, v) {
|
|
23
|
-
o["default"] = v;
|
|
24
|
-
});
|
|
25
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
26
|
-
if (mod && mod.__esModule) return mod;
|
|
27
|
-
var result = {};
|
|
28
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
29
|
-
__setModuleDefault(result, mod);
|
|
30
|
-
return result;
|
|
31
|
-
};
|
|
32
9
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
33
10
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
34
11
|
};
|
|
@@ -36,11 +13,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
36
13
|
exports.OPCUAServer = exports.RegisterServerMethod = exports.filterDiagnosticInfo = void 0;
|
|
37
14
|
const crypto_1 = require("crypto");
|
|
38
15
|
const util_1 = require("util");
|
|
39
|
-
const
|
|
16
|
+
const async_1 = __importDefault(require("async"));
|
|
40
17
|
const chalk_1 = __importDefault(require("chalk"));
|
|
41
18
|
const node_opcua_hostname_1 = require("node-opcua-hostname");
|
|
42
19
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
43
|
-
const
|
|
20
|
+
const node_opcua_utils_1 = require("node-opcua-utils");
|
|
44
21
|
const node_opcua_address_space_1 = require("node-opcua-address-space");
|
|
45
22
|
const node_opcua_certificate_manager_1 = require("node-opcua-certificate-manager");
|
|
46
23
|
const node_opcua_common_1 = require("node-opcua-common");
|
|
@@ -66,7 +43,7 @@ const node_opcua_status_code_1 = require("node-opcua-status-code");
|
|
|
66
43
|
const node_opcua_types_1 = require("node-opcua-types");
|
|
67
44
|
const node_opcua_variant_1 = require("node-opcua-variant");
|
|
68
45
|
const node_opcua_variant_2 = require("node-opcua-variant");
|
|
69
|
-
const
|
|
46
|
+
const node_opcua_utils_2 = require("node-opcua-utils");
|
|
70
47
|
const base_server_1 = require("./base_server");
|
|
71
48
|
const factory_1 = require("./factory");
|
|
72
49
|
const monitored_item_1 = require("./monitored_item");
|
|
@@ -172,7 +149,7 @@ function _serverEndpointsForCreateSessionResponse(server, endpointUrl, serverUri
|
|
|
172
149
|
return server
|
|
173
150
|
._get_endpoints(endpointUrl)
|
|
174
151
|
.filter((e) => !e.restricted) // remove restricted endpoints
|
|
175
|
-
.filter((e) => (0,
|
|
152
|
+
.filter((e) => (0, node_opcua_utils_2.matchUri)(e.endpointUrl, endpointUrl))
|
|
176
153
|
.map(getRequiredEndpointInfo);
|
|
177
154
|
}
|
|
178
155
|
function adjustSecurityPolicy(channel, userTokenPolicy_securityPolicyUri) {
|
|
@@ -633,7 +610,8 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
|
|
|
633
610
|
this.allowAnonymous = options.allowAnonymous;
|
|
634
611
|
this.discoveryServerEndpointUrl = options.discoveryServerEndpointUrl || "opc.tcp://%FQDN%:4840";
|
|
635
612
|
(0, node_opcua_assert_1.assert)(typeof this.discoveryServerEndpointUrl === "string");
|
|
636
|
-
this.serverInfo.applicationType =
|
|
613
|
+
this.serverInfo.applicationType =
|
|
614
|
+
options.serverInfo?.applicationType === undefined ? node_opcua_service_endpoints_1.ApplicationType.Server : options.serverInfo.applicationType;
|
|
637
615
|
this.capabilitiesForMDNS = options.capabilitiesForMDNS || ["NA"];
|
|
638
616
|
this.registerServerMethod = options.registerServerMethod || RegisterServerMethod.HIDDEN;
|
|
639
617
|
_installRegisterServerManager(this);
|
|
@@ -656,20 +634,40 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
|
|
|
656
634
|
applicationUri: () => this.serverInfo.applicationUri,
|
|
657
635
|
buildInfo,
|
|
658
636
|
isAuditing: options.isAuditing,
|
|
659
|
-
serverCapabilities: options.serverCapabilities
|
|
637
|
+
serverCapabilities: options.serverCapabilities,
|
|
638
|
+
serverConfiguration: {
|
|
639
|
+
serverCapabilities: () => {
|
|
640
|
+
return this.capabilitiesForMDNS || ["NA"];
|
|
641
|
+
},
|
|
642
|
+
supportedPrivateKeyFormat: ["PEM"],
|
|
643
|
+
applicationType: () => this.serverInfo.applicationType,
|
|
644
|
+
applicationUri: () => this.serverInfo.applicationUri || "",
|
|
645
|
+
productUri: () => this.serverInfo.productUri || "",
|
|
646
|
+
// hasSecureElement: () => false,
|
|
647
|
+
multicastDnsEnabled: () => this.registerServerMethod === RegisterServerMethod.MDNS
|
|
648
|
+
}
|
|
660
649
|
});
|
|
661
650
|
this.objectFactory = new factory_1.Factory(this.engine);
|
|
662
|
-
const endpointDefinitions =
|
|
651
|
+
const endpointDefinitions = [
|
|
652
|
+
...(options.endpoints || []),
|
|
653
|
+
...(options.alternateEndpoints || [])
|
|
654
|
+
];
|
|
663
655
|
const hostname = (0, node_opcua_hostname_1.getFullyQualifiedDomainName)();
|
|
664
|
-
endpointDefinitions.
|
|
665
|
-
port
|
|
666
|
-
|
|
667
|
-
alternateHostname: options.alternateHostname,
|
|
668
|
-
disableDiscovery: options.disableDiscovery,
|
|
669
|
-
hostname: options.hostname || hostname,
|
|
670
|
-
securityModes: options.securityModes,
|
|
671
|
-
securityPolicies: options.securityPolicies
|
|
656
|
+
endpointDefinitions.forEach((endpointDefinition) => {
|
|
657
|
+
endpointDefinition.port = endpointDefinition.port === undefined ? 26543 : endpointDefinition.port;
|
|
658
|
+
endpointDefinition.hostname = endpointDefinition.hostname || hostname;
|
|
672
659
|
});
|
|
660
|
+
if (!options.endpoints) {
|
|
661
|
+
endpointDefinitions.push({
|
|
662
|
+
port: options.port === undefined ? 26543 : options.port,
|
|
663
|
+
hostname: options.hostname || hostname,
|
|
664
|
+
allowAnonymous: options.allowAnonymous,
|
|
665
|
+
alternateHostname: options.alternateHostname,
|
|
666
|
+
disableDiscovery: options.disableDiscovery,
|
|
667
|
+
securityModes: options.securityModes,
|
|
668
|
+
securityPolicies: options.securityPolicies
|
|
669
|
+
});
|
|
670
|
+
}
|
|
673
671
|
// todo should self.serverInfo.productUri match self.engine.buildInfo.productUri ?
|
|
674
672
|
for (const endpointOptions of endpointDefinitions) {
|
|
675
673
|
const endPoint = this.createEndpointDescriptions(options, endpointOptions);
|
|
@@ -739,7 +737,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
|
|
|
739
737
|
}
|
|
740
738
|
});
|
|
741
739
|
});
|
|
742
|
-
|
|
740
|
+
async_1.default.series(tasks, done);
|
|
743
741
|
}
|
|
744
742
|
shutdown(...args) {
|
|
745
743
|
const timeout = args.length === 1 ? OPCUAServer.defaultShutdownTimeout : args[0];
|
|
@@ -1009,7 +1007,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
|
|
|
1009
1007
|
const buff = cryptoFactory.asymmetricDecrypt(password, serverPrivateKey);
|
|
1010
1008
|
// server certificate may be invalid and asymmetricDecrypt may fail
|
|
1011
1009
|
if (!buff || buff.length < 4) {
|
|
1012
|
-
|
|
1010
|
+
async_1.default.setImmediate(() => callback(null, false));
|
|
1013
1011
|
return;
|
|
1014
1012
|
}
|
|
1015
1013
|
const length = buff.readUInt32LE(0) - serverNonce.length;
|
|
@@ -1066,7 +1064,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
|
|
|
1066
1064
|
if (userIdentityToken instanceof node_opcua_service_session_1.UserNameIdentityToken) {
|
|
1067
1065
|
return this.userNameIdentityTokenAuthenticateUser(channel, session, userTokenPolicy, userIdentityToken, callback);
|
|
1068
1066
|
}
|
|
1069
|
-
|
|
1067
|
+
async_1.default.setImmediate(callback.bind(null, null, true));
|
|
1070
1068
|
}
|
|
1071
1069
|
makeServerNonce() {
|
|
1072
1070
|
return (0, crypto_1.randomBytes)(32);
|
|
@@ -1101,7 +1099,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
|
|
|
1101
1099
|
// sessionId visible in its AddressSpace for diagnostic purposes. The Client should provide a name that is
|
|
1102
1100
|
// unique for the instance of the Client.
|
|
1103
1101
|
// If this parameter is not specified the Server shall assign a value.
|
|
1104
|
-
if (
|
|
1102
|
+
if ((0, node_opcua_utils_1.isNullOrUndefined)(request.sessionName)) {
|
|
1105
1103
|
// see also #198
|
|
1106
1104
|
// let's the server assign a sessionName for this lazy client.
|
|
1107
1105
|
debugLog("assigning OPCUAServer.fallbackSessionName because client's sessionName is null ", OPCUAServer.fallbackSessionName);
|
|
@@ -2344,7 +2342,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
|
|
|
2344
2342
|
if (!Object.prototype.hasOwnProperty.call(endpointOptions, "port") ||
|
|
2345
2343
|
!isFinite(endpointOptions.port) ||
|
|
2346
2344
|
typeof endpointOptions.port !== "number") {
|
|
2347
|
-
throw new Error("expecting a valid port (number)");
|
|
2345
|
+
throw new Error("expecting a valid port (number) when specified. alternatively you can specify port:0 and node-opcua will choose the first available port");
|
|
2348
2346
|
}
|
|
2349
2347
|
const port = Number(endpointOptions.port || 0);
|
|
2350
2348
|
const endPoint = this.createEndpoint(port, serverOption);
|
|
@@ -2362,6 +2360,8 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
|
|
|
2362
2360
|
disableDiscovery: !!endpointOptions.disableDiscovery,
|
|
2363
2361
|
// xx hostname,
|
|
2364
2362
|
resourcePath: serverOption.resourcePath || ""
|
|
2363
|
+
// TODO userTokenTypes: endpointOptions.userTokenTypes || undefined,
|
|
2364
|
+
// TODO allowUnsecurePassword: endpointOptions.allowUnsecurePassword || false
|
|
2365
2365
|
});
|
|
2366
2366
|
return endPoint;
|
|
2367
2367
|
}
|