node-opcua-common 2.85.0 → 2.86.1
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.
|
@@ -1,18 +1,15 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
/**
|
|
3
|
-
* @module node-opcua-common
|
|
4
|
-
*/
|
|
5
2
|
import { EventEmitter } from "events";
|
|
6
|
-
import { Certificate,
|
|
3
|
+
import { Certificate, PrivateKey } from "node-opcua-crypto";
|
|
7
4
|
export interface ICertificateKeyPairProvider {
|
|
8
5
|
getCertificate(): Certificate;
|
|
9
6
|
getCertificateChain(): Certificate;
|
|
10
|
-
getPrivateKey():
|
|
7
|
+
getPrivateKey(): PrivateKey;
|
|
11
8
|
}
|
|
12
9
|
export interface ICertificateKeyPairProviderPriv extends ICertificateKeyPairProvider {
|
|
13
10
|
$$certificate: null | Certificate;
|
|
14
11
|
$$certificateChain: null | Certificate;
|
|
15
|
-
$$
|
|
12
|
+
$$privateKey: null | PrivateKey;
|
|
16
13
|
}
|
|
17
14
|
export interface IOPCUASecureObjectOptions {
|
|
18
15
|
certificateFile?: string;
|
|
@@ -32,5 +29,5 @@ export declare class OPCUASecureObject extends EventEmitter implements ICertific
|
|
|
32
29
|
constructor(options: IOPCUASecureObjectOptions);
|
|
33
30
|
getCertificate(): Certificate;
|
|
34
31
|
getCertificateChain(): Certificate;
|
|
35
|
-
getPrivateKey():
|
|
32
|
+
getPrivateKey(): PrivateKey;
|
|
36
33
|
}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.OPCUASecureObject = void 0;
|
|
4
|
-
/**
|
|
5
|
-
* @module node-opcua-common
|
|
6
|
-
*/
|
|
7
4
|
const events_1 = require("events");
|
|
8
5
|
const fs = require("fs");
|
|
9
6
|
const node_opcua_assert_1 = require("node-opcua-assert");
|
|
@@ -12,8 +9,8 @@ function _load_certificate(certificateFilename) {
|
|
|
12
9
|
const der = (0, node_opcua_crypto_1.readCertificate)(certificateFilename);
|
|
13
10
|
return der;
|
|
14
11
|
}
|
|
15
|
-
function
|
|
16
|
-
return (0, node_opcua_crypto_1.
|
|
12
|
+
function _load_private_key(privateKeyFilename) {
|
|
13
|
+
return (0, node_opcua_crypto_1.readPrivateKey)(privateKeyFilename);
|
|
17
14
|
}
|
|
18
15
|
/**
|
|
19
16
|
* an object that provides a certificate and a privateKey
|
|
@@ -53,11 +50,11 @@ class OPCUASecureObject extends events_1.EventEmitter {
|
|
|
53
50
|
}
|
|
54
51
|
getPrivateKey() {
|
|
55
52
|
const priv = this;
|
|
56
|
-
if (!priv.$$
|
|
53
|
+
if (!priv.$$privateKey) {
|
|
57
54
|
(0, node_opcua_assert_1.assert)(fs.existsSync(this.privateKeyFile), "private file must exist :" + this.privateKeyFile);
|
|
58
|
-
priv.$$
|
|
55
|
+
priv.$$privateKey = _load_private_key(this.privateKeyFile);
|
|
59
56
|
}
|
|
60
|
-
return priv.$$
|
|
57
|
+
return priv.$$privateKey;
|
|
61
58
|
}
|
|
62
59
|
}
|
|
63
60
|
exports.OPCUASecureObject = OPCUASecureObject;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opcua_secure_object.js","sourceRoot":"","sources":["../source/opcua_secure_object.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"opcua_secure_object.js","sourceRoot":"","sources":["../source/opcua_secure_object.ts"],"names":[],"mappings":";;;AAIA,mCAAsC;AACtC,yBAAyB;AAEzB,yDAA2C;AAC3C,yDAAwG;AAYxG,SAAS,iBAAiB,CAAC,mBAA2B;IAClD,MAAM,GAAG,GAAG,IAAA,mCAAe,EAAC,mBAAmB,CAAC,CAAC;IACjD,OAAO,GAAG,CAAC;AACf,CAAC;AAED,SAAS,iBAAiB,CAAC,kBAA0B;IACjD,OAAO,IAAA,kCAAc,EAAC,kBAAkB,CAAC,CAAC;AAC9C,CAAC;AAOD;;;;;;;GAOG;AACH,MAAa,iBAAkB,SAAQ,qBAAY;IAI/C,YAAY,OAAkC;QAC1C,KAAK,EAAE,CAAC;QACR,IAAA,0BAAM,EAAC,OAAO,OAAO,CAAC,eAAe,KAAK,QAAQ,CAAC,CAAC;QACpD,IAAA,0BAAM,EAAC,OAAO,OAAO,CAAC,cAAc,KAAK,QAAQ,CAAC,CAAC;QAEnD,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,0BAA0B,CAAC;QAC7E,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,0BAA0B,CAAC;IAC/E,CAAC;IAEM,cAAc;QACjB,MAAM,IAAI,GAAG,IAAkD,CAAC;QAChE,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACrB,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC7C,IAAI,CAAC,aAAa,GAAG,IAAA,6BAAS,EAAC,SAAS,CAAC,CAAC,CAAC,CAAgB,CAAC;SAC/D;QACD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAEM,mBAAmB;QACtB,MAAM,IAAI,GAAG,IAAkD,CAAC;QAChE,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC1B,IAAA,0BAAM,EAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,+BAA+B,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC;YACpG,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAClE,IAAI,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;gBACjE,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBAClE,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC;aAC7E;SACJ;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACnC,CAAC;IAEM,aAAa;QAChB,MAAM,IAAI,GAAG,IAAkD,CAAC;QAChE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACpB,IAAA,0BAAM,EAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,2BAA2B,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;YAC9F,IAAI,CAAC,YAAY,GAAG,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SAC9D;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;CACJ;AA3CD,8CA2CC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-common",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.86.1",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module -common",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"test": "mocha",
|
|
@@ -12,8 +12,8 @@
|
|
|
12
12
|
"types": "./dist/index.d.ts",
|
|
13
13
|
"dependencies": {
|
|
14
14
|
"node-opcua-assert": "2.77.0",
|
|
15
|
-
"node-opcua-crypto": "^1.
|
|
16
|
-
"node-opcua-types": "2.
|
|
15
|
+
"node-opcua-crypto": "^2.1.2",
|
|
16
|
+
"node-opcua-types": "2.86.1"
|
|
17
17
|
},
|
|
18
18
|
"devDependencies": {
|
|
19
19
|
"@types/node": "18.11.9",
|
|
@@ -34,5 +34,5 @@
|
|
|
34
34
|
"internet of things"
|
|
35
35
|
],
|
|
36
36
|
"homepage": "http://node-opcua.github.io/",
|
|
37
|
-
"gitHead": "
|
|
37
|
+
"gitHead": "389ba18585ff4b62f6fee58b69bd871a8e6b0dff"
|
|
38
38
|
}
|
|
@@ -1,29 +1,30 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module node-opcua-common
|
|
3
3
|
*/
|
|
4
|
+
import { createPrivateKey } from "crypto";
|
|
4
5
|
import { EventEmitter } from "events";
|
|
5
6
|
import * as fs from "fs";
|
|
6
7
|
|
|
7
8
|
import { assert } from "node-opcua-assert";
|
|
8
|
-
import { Certificate,
|
|
9
|
+
import { Certificate, PrivateKey, readCertificate, readPrivateKey, split_der } from "node-opcua-crypto";
|
|
9
10
|
|
|
10
11
|
export interface ICertificateKeyPairProvider {
|
|
11
12
|
getCertificate(): Certificate;
|
|
12
13
|
getCertificateChain(): Certificate;
|
|
13
|
-
getPrivateKey():
|
|
14
|
+
getPrivateKey(): PrivateKey;
|
|
14
15
|
}
|
|
15
16
|
export interface ICertificateKeyPairProviderPriv extends ICertificateKeyPairProvider {
|
|
16
17
|
$$certificate: null | Certificate;
|
|
17
18
|
$$certificateChain: null | Certificate;
|
|
18
|
-
$$
|
|
19
|
+
$$privateKey: null | PrivateKey;
|
|
19
20
|
}
|
|
20
21
|
function _load_certificate(certificateFilename: string): Certificate {
|
|
21
22
|
const der = readCertificate(certificateFilename);
|
|
22
23
|
return der;
|
|
23
24
|
}
|
|
24
25
|
|
|
25
|
-
function
|
|
26
|
-
return
|
|
26
|
+
function _load_private_key(privateKeyFilename: string): PrivateKey {
|
|
27
|
+
return readPrivateKey(privateKeyFilename);
|
|
27
28
|
}
|
|
28
29
|
|
|
29
30
|
export interface IOPCUASecureObjectOptions {
|
|
@@ -74,12 +75,12 @@ export class OPCUASecureObject extends EventEmitter implements ICertificateKeyPa
|
|
|
74
75
|
return priv.$$certificateChain;
|
|
75
76
|
}
|
|
76
77
|
|
|
77
|
-
public getPrivateKey():
|
|
78
|
+
public getPrivateKey(): PrivateKey {
|
|
78
79
|
const priv = this as unknown as ICertificateKeyPairProviderPriv;
|
|
79
|
-
if (!priv.$$
|
|
80
|
+
if (!priv.$$privateKey) {
|
|
80
81
|
assert(fs.existsSync(this.privateKeyFile), "private file must exist :" + this.privateKeyFile);
|
|
81
|
-
priv.$$
|
|
82
|
+
priv.$$privateKey = _load_private_key(this.privateKeyFile);
|
|
82
83
|
}
|
|
83
|
-
return priv.$$
|
|
84
|
+
return priv.$$privateKey;
|
|
84
85
|
}
|
|
85
86
|
}
|