@matter/general 0.16.10 → 0.16.11-alpha.0-20260225-033797f3c
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/cjs/crypto/Key.d.ts +10 -11
- package/dist/cjs/crypto/Key.d.ts.map +1 -1
- package/dist/cjs/crypto/Key.js +41 -2
- package/dist/cjs/crypto/Key.js.map +2 -2
- package/dist/cjs/crypto/Pem.js +1 -1
- package/dist/cjs/crypto/Pem.js.map +1 -1
- package/dist/cjs/crypto/X509.d.ts +7 -7
- package/dist/cjs/crypto/X509.d.ts.map +1 -1
- package/dist/cjs/crypto/X509.js +20 -18
- package/dist/cjs/crypto/X509.js.map +2 -2
- package/dist/cjs/net/http/HttpEndpoint.d.ts +7 -0
- package/dist/cjs/net/http/HttpEndpoint.d.ts.map +1 -1
- package/dist/cjs/net/http/HttpEndpointFactory.d.ts +1 -1
- package/dist/cjs/net/http/HttpEndpointFactory.d.ts.map +1 -1
- package/dist/cjs/net/http/HttpService.d.ts +6 -1
- package/dist/cjs/net/http/HttpService.d.ts.map +1 -1
- package/dist/cjs/net/http/HttpService.js +9 -8
- package/dist/cjs/net/http/HttpService.js.map +2 -2
- package/dist/cjs/net/mqtt/MqttEndpoint.d.ts +2 -0
- package/dist/cjs/net/mqtt/MqttEndpoint.d.ts.map +1 -1
- package/dist/esm/crypto/Key.d.ts +10 -11
- package/dist/esm/crypto/Key.d.ts.map +1 -1
- package/dist/esm/crypto/Key.js +42 -3
- package/dist/esm/crypto/Key.js.map +2 -2
- package/dist/esm/crypto/Pem.js +1 -1
- package/dist/esm/crypto/Pem.js.map +1 -1
- package/dist/esm/crypto/X509.d.ts +7 -7
- package/dist/esm/crypto/X509.d.ts.map +1 -1
- package/dist/esm/crypto/X509.js +20 -18
- package/dist/esm/crypto/X509.js.map +2 -2
- package/dist/esm/net/http/HttpEndpoint.d.ts +7 -0
- package/dist/esm/net/http/HttpEndpoint.d.ts.map +1 -1
- package/dist/esm/net/http/HttpEndpointFactory.d.ts +1 -1
- package/dist/esm/net/http/HttpEndpointFactory.d.ts.map +1 -1
- package/dist/esm/net/http/HttpService.d.ts +6 -1
- package/dist/esm/net/http/HttpService.d.ts.map +1 -1
- package/dist/esm/net/http/HttpService.js +9 -8
- package/dist/esm/net/http/HttpService.js.map +2 -2
- package/dist/esm/net/mqtt/MqttEndpoint.d.ts +2 -0
- package/dist/esm/net/mqtt/MqttEndpoint.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/crypto/Key.ts +65 -16
- package/src/crypto/Pem.ts +1 -1
- package/src/crypto/X509.ts +22 -19
- package/src/net/http/HttpEndpoint.ts +8 -0
- package/src/net/http/HttpEndpointFactory.ts +1 -1
- package/src/net/http/HttpService.ts +15 -7
- package/src/net/mqtt/MqttEndpoint.ts +2 -0
package/dist/cjs/crypto/Key.d.ts
CHANGED
|
@@ -73,18 +73,15 @@ export interface Key extends JsonWebKey {
|
|
|
73
73
|
x?: string;
|
|
74
74
|
y?: string;
|
|
75
75
|
/**
|
|
76
|
-
* Binary alias to private key field. Automatically encodes/decodes the
|
|
77
|
-
* base-64 private key.
|
|
76
|
+
* Binary alias to private key field. Automatically encodes/decodes the base-64 private key.
|
|
78
77
|
*/
|
|
79
78
|
privateBits?: Bytes;
|
|
80
79
|
/**
|
|
81
|
-
* Binary alias to the x field. Automatically encodes/decodes the base-64
|
|
82
|
-
* x-point on EC public keys.
|
|
80
|
+
* Binary alias to the x field. Automatically encodes/decodes the base-64 x-point on EC public keys.
|
|
83
81
|
*/
|
|
84
82
|
xBits?: Bytes;
|
|
85
83
|
/**
|
|
86
|
-
* Binary alias to the y field. Automatically encodes/decodes the base-64
|
|
87
|
-
* y-point on EC public keys.
|
|
84
|
+
* Binary alias to the y field. Automatically encodes/decodes the base-64 y-point on EC public keys.
|
|
88
85
|
*/
|
|
89
86
|
yBits?: Bytes;
|
|
90
87
|
/**
|
|
@@ -92,21 +89,23 @@ export interface Key extends JsonWebKey {
|
|
|
92
89
|
*/
|
|
93
90
|
sec1?: Bytes;
|
|
94
91
|
/**
|
|
95
|
-
* Import
|
|
92
|
+
* Import of PKCS #8 format as DER or PEM and export as DER.
|
|
96
93
|
*/
|
|
97
94
|
pkcs8?: Bytes;
|
|
95
|
+
/**
|
|
96
|
+
* Import/export of PKCS #8 format as PEM.
|
|
97
|
+
*/
|
|
98
|
+
pem?: string;
|
|
98
99
|
/**
|
|
99
100
|
* Import (write-only) of public keys encoded in SPKI format.
|
|
100
101
|
*/
|
|
101
102
|
spki?: Bytes;
|
|
102
103
|
/**
|
|
103
|
-
* Import/export of EC public key in SEC1/SPKI format. Maps to x & y
|
|
104
|
-
* fields internally.
|
|
104
|
+
* Import/export of EC public key in SEC1/SPKI format. Maps to x & y fields internally.
|
|
105
105
|
*/
|
|
106
106
|
publicBits?: Bytes;
|
|
107
107
|
/**
|
|
108
|
-
* Import/export of BinaryKeyPair structure used as an alternate
|
|
109
|
-
* serialization format for legacy reasons.
|
|
108
|
+
* Import/export of BinaryKeyPair structure used as an alternate serialization format for legacy reasons.
|
|
110
109
|
*/
|
|
111
110
|
keyPairBits?: BinaryKeyPair;
|
|
112
111
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Key.d.ts","sourceRoot":"","sources":["../../../src/crypto/Key.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"Key.d.ts","sourceRoot":"","sources":["../../../src/crypto/Key.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AA8BzC,oBAAY,OAAO;IACf,EAAE,OAAO;IACT,GAAG,QAAQ;IACX,GAAG,QAAQ;CACd;AAED,oBAAY,SAAS;IACjB,IAAI,UAAU;IACd,IAAI,UAAU;IACd,IAAI,UAAU;CACjB;AAqBD,MAAM,MAAM,aAAa,GAAG;IACxB,SAAS,EAAE,KAAK,CAAC;IACjB,UAAU,EAAE,KAAK,CAAC;CACrB,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,WAAW,GAAI,SAAQ,UAAU;IACnC;;OAEG;IACH,SAAS,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IAEvB;;OAEG;IACH,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IAEnB;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IAElB;;OAEG;IACH,UAAU,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;IAE5B;;OAEG;IACH,OAAO,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IAEnB;;;OAGG;IACH,WAAW,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IAEzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC3B,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC;IAEpB;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd;;OAEG;IACH,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb;;OAEG;IACH,UAAU,CAAC,EAAE,KAAK,CAAC;IAEnB;;OAEG;IACH,WAAW,CAAC,EAAE,aAAa,CAAC;IAE5B;;OAEG;IACH,SAAS,EAAE,KAAK,CAAC;IAEjB;;OAEG;IACH,UAAU,EAAE,KAAK,CAAC;IAElB;;OAEG;IACH,OAAO,EAAE,aAAa,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,SAAU,SAAQ,GAAG;IAClC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;IACjB,KAAK,EAAE,SAAS,CAAC;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,KAAK,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,UAAW,SAAQ,SAAS;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;IACV,WAAW,EAAE,KAAK,CAAC;IACnB,UAAU,EAAE,KAAK,CAAC;IAClB,OAAO,EAAE,aAAa,CAAC;IACvB,WAAW,EAAE,aAAa,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,YAAa,SAAQ,GAAG;IACrC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;CACb;AAqRD;;GAEG;AACH,wBAAgB,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,OAuG3C;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,UAAU,EAAE,KAAK,GAAG,aAAa,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,GAanE,UAAU,CAC1B;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,GAKxD,SAAS,CAClB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,OAMrE;AAED,yBAAiB,GAAG,CAAC;IACjB;;;;OAIG;IACH,SAAgB,eAAe,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,GAAG,KAAK,CAI1E;CACJ"}
|
package/dist/cjs/crypto/Key.js
CHANGED
|
@@ -32,6 +32,7 @@ var import_MatterError = require("../MatterError.js");
|
|
|
32
32
|
var import_Bytes = require("../util/Bytes.js");
|
|
33
33
|
var import_Crypto = require("./Crypto.js");
|
|
34
34
|
var import_CryptoError = require("./CryptoError.js");
|
|
35
|
+
var import_Pem = require("./Pem.js");
|
|
35
36
|
/**
|
|
36
37
|
* @license
|
|
37
38
|
* Copyright 2022-2026 Matter.js Authors
|
|
@@ -84,6 +85,11 @@ const CurveLookup = {
|
|
|
84
85
|
["0103840022" /* prime384r1 */]: "P-384" /* p384 */,
|
|
85
86
|
["0103840023" /* prime521r1 */]: "P-521" /* p521 */
|
|
86
87
|
};
|
|
88
|
+
const CurveOidLookup = {
|
|
89
|
+
["P-256" /* p256 */]: "2a8648ce3d030107" /* prime256r1 */,
|
|
90
|
+
["P-384" /* p384 */]: "0103840022" /* prime384r1 */,
|
|
91
|
+
["P-521" /* p521 */]: "0103840023" /* prime521r1 */
|
|
92
|
+
};
|
|
87
93
|
function checkDerVersion(type, node, version) {
|
|
88
94
|
const derVersion = node && node._tag === import_DerCodec.DerType.Integer && node._bytes && node._bytes.byteLength === 1 && import_Bytes.Bytes.of(node._bytes)[0];
|
|
89
95
|
if (derVersion !== version) {
|
|
@@ -127,7 +133,7 @@ var Translators;
|
|
|
127
133
|
};
|
|
128
134
|
Translators2.pkcs8 = {
|
|
129
135
|
set: function(input) {
|
|
130
|
-
const outer =
|
|
136
|
+
const outer = import_Pem.Pem.decode(input);
|
|
131
137
|
const version = outer?._elements?.[0];
|
|
132
138
|
checkDerVersion("PKCS #8", version, 0);
|
|
133
139
|
const algorithmElements = outer?._elements?.[1]?._elements;
|
|
@@ -147,7 +153,40 @@ var Translators;
|
|
|
147
153
|
this.privateBits = key;
|
|
148
154
|
},
|
|
149
155
|
get: function() {
|
|
150
|
-
|
|
156
|
+
if (this.type !== "EC" /* EC */ || !this.d || !this.crv) {
|
|
157
|
+
return void 0;
|
|
158
|
+
}
|
|
159
|
+
const curveOid = CurveOidLookup[this.crv];
|
|
160
|
+
if (!curveOid) {
|
|
161
|
+
throw new import_CryptoError.KeyInputError(`Unsupported curve for PKCS #8 export: ${this.crv}`);
|
|
162
|
+
}
|
|
163
|
+
const privateBits = this.privateBits;
|
|
164
|
+
if (privateBits === void 0) {
|
|
165
|
+
return void 0;
|
|
166
|
+
}
|
|
167
|
+
const innerSequence = import_DerCodec.DerCodec.encode({
|
|
168
|
+
version: 1,
|
|
169
|
+
privateKey: privateBits
|
|
170
|
+
});
|
|
171
|
+
return import_DerCodec.DerCodec.encode({
|
|
172
|
+
version: 0,
|
|
173
|
+
algorithm: {
|
|
174
|
+
algorithmId: (0, import_DerCodec.ObjectId)("2a8648ce3d0201" /* ecPublicKey */),
|
|
175
|
+
curve: (0, import_DerCodec.ObjectId)(curveOid)
|
|
176
|
+
},
|
|
177
|
+
privateKey: { _tag: import_DerCodec.DerType.OctetString, _bytes: innerSequence }
|
|
178
|
+
});
|
|
179
|
+
}
|
|
180
|
+
};
|
|
181
|
+
Translators2.pem = {
|
|
182
|
+
set: function(input) {
|
|
183
|
+
this.pkcs8 = import_Pem.Pem.asDer(input);
|
|
184
|
+
},
|
|
185
|
+
get: function() {
|
|
186
|
+
const pkcs82 = this.pkcs8;
|
|
187
|
+
if (pkcs82) {
|
|
188
|
+
return import_Pem.Pem.encode(pkcs82, "PRIVATE KEY");
|
|
189
|
+
}
|
|
151
190
|
}
|
|
152
191
|
};
|
|
153
192
|
Translators2.spki = {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/crypto/Key.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,yBAAuB;AACvB,
|
|
5
|
-
"names": ["KeyType", "CurveType", "Asn1ObjectID", "Translators", "publicBits", "Aliases", "Base64Codecs", "AssertedAliases", "Key"]
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,yBAAuB;AACvB,sBAAqD;AACrD,yBAAiD;AACjD,mBAAsB;AACtB,oBAAmB;AACnB,yBAA8B;AAC9B,iBAAoB;AAZpB;AAAA;AAAA;AAAA;AAAA;AAcA,MAAM;AAAA,EACF;AAAA,EACA,MAAM,EAAE,cAAc,OAAO,gBAAgB;AACjD,IAAI;AAEJ,MAAM,WAAW;AAAA,EACb;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACJ;AAEO,IAAK,UAAL,kBAAKA,aAAL;AACH,EAAAA,SAAA,QAAK;AACL,EAAAA,SAAA,SAAM;AACN,EAAAA,SAAA,SAAM;AAHE,SAAAA;AAAA,GAAA;AAML,IAAK,YAAL,kBAAKC,eAAL;AACH,EAAAA,WAAA,UAAO;AACP,EAAAA,WAAA,UAAO;AACP,EAAAA,WAAA,UAAO;AAHC,SAAAA;AAAA,GAAA;AAMZ,IAAK,eAAL,kBAAKC,kBAAL;AACI,EAAAA,cAAA,iBAAc;AACd,EAAAA,cAAA,gBAAa;AACb,EAAAA,cAAA,gBAAa;AACb,EAAAA,cAAA,gBAAa;AAJZ,SAAAA;AAAA,GAAA;AAOL,MAAM,cAAc;AAAA,EAChB,CAAC,mCAAuB,GAAG;AAAA,EAC3B,CAAC,6BAAuB,GAAG;AAAA,EAC3B,CAAC,6BAAuB,GAAG;AAC/B;AAEA,MAAM,iBAAyC;AAAA,EAC3C,CAAC,kBAAc,GAAG;AAAA,EAClB,CAAC,kBAAc,GAAG;AAAA,EAClB,CAAC,kBAAc,GAAG;AACtB;AAmKA,SAAS,gBAAgB,MAAc,MAA2B,SAAiB;AAC/E,QAAM,aACF,QACA,KAAK,SAAS,wBAAQ,WACtB,KAAK,UACL,KAAK,OAAO,eAAe,KAC3B,mBAAM,GAAG,KAAK,MAAM,EAAE,CAAC;AAE3B,MAAI,eAAe,SAAS;AACxB,UAAM,IAAI,iCAAc,GAAG,IAAI,uBAAuB;AAAA,EAC1D;AACJ;AAEA,SAAS,eAAe,MAAc,MAAgB;AAClD,QAAM,KAAK,QAAQ,KAAK,SAAS,wBAAQ,oBAAoB,KAAK,QAAQ,aAAa,KAAK,KAAK;AAEjG,MAAI,GAAI,QAAO;AAEf,QAAM,IAAI,iCAAc,qBAAqB,IAAI,MAAM;AAC3D;AAEA,SAAS,YAAY,MAAc,MAAgB;AAC/C,QAAM,MAAM,eAAe,MAAM,IAAI;AACrC,QAAM,QAAc,YAAa,mBAAM,MAAM,GAAG,CAAC;AACjD,MAAI,MAAO,QAAO;AAClB,QAAM,IAAI,iCAAc,eAAe,IAAI,WAAW;AAC1D;AAEA,SAAS,UAAU,MAAc,MAAgB,UAAmB,wBAAQ,aAAa;AACrF,QAAM,MAAM,QAAQ,KAAK,SAAS,WAAW,KAAK,QAAQ,aAAa,KAAK,KAAK;AAEjF,MAAI,IAAK,QAAO;AAEhB,QAAM,IAAI,+BAAY,WAAW,IAAI,WAAW;AACpD;AAGA,IAAU;AAAA,CAAV,CAAUC,iBAAV;AAEW,EAAMA,aAAA,OAAO;AAAA,IAChB,KAAK,SAAqB,OAAc;AACpC,YAAM,UAAU,yBAAS,OAAO,KAAK;AAGrC,YAAM,cAAc,SAAS,YAAY,CAAC;AAC1C,sBAAgB,SAAS,aAAa,CAAC;AAGvC,YAAM,YAAY,SAAS,YAAY,CAAC,GAAG,YAAY,CAAC;AACxD,YAAM,QAAQ,YAAY,SAAS,SAAS;AAG5C,YAAM,UAAU,SAAS,YAAY,CAAC;AACtC,YAAM,MAAM,UAAU,SAAS,OAAO;AAEtC,WAAK,OAAO;AACZ,WAAK,QAAQ;AACb,WAAK,cAAc;AAAA,IACvB;AAAA,IAEA,KAAK,WAAY;AACb,YAAM,IAAI,uCAAoB,6BAA6B;AAAA,IAC/D;AAAA,EACJ;AAGO,EAAMA,aAAA,QAAQ;AAAA,IACjB,KAAK,SAAqB,OAAc;AACpC,YAAM,QAAQ,eAAI,OAAO,KAAK;AAG9B,YAAM,UAAU,OAAO,YAAY,CAAC;AACpC,sBAAgB,WAAW,SAAS,CAAC;AAGrC,YAAM,oBAAoB,OAAO,YAAY,CAAC,GAAG;AACjD,YAAM,YAAY,eAAe,WAAW,oBAAoB,CAAC,CAAC;AAClE,UAAI,mBAAM,MAAM,SAAS,MAAM,oCAA0B;AACrD,cAAM,IAAI,iCAAc,0CAA0C;AAAA,MACtE;AAGA,YAAM,QAAQ,YAAY,WAAW,oBAAoB,CAAC,CAAC;AAG3D,YAAM,aAAa,OAAO,YAAY,CAAC,EAAE;AACzC,UAAI,eAAe,UAAa,eAAe,MAAM;AACjD,cAAM,IAAI,iCAAc,qBAAqB;AAAA,MACjD;AACA,YAAM,QAAQ,yBAAS,OAAO,UAAU;AACxC,YAAM,MAAM,UAAU,WAAW,OAAO,YAAY,CAAC,CAAC;AAEtD,WAAK,OAAO;AACZ,WAAK,QAAQ;AACb,WAAK,cAAc;AAAA,IACvB;AAAA,IAEA,KAAK,WAAwC;AACzC,UAAI,KAAK,SAAS,iBAAc,CAAC,KAAK,KAAK,CAAC,KAAK,KAAK;AAClD,eAAO;AAAA,MACX;AAEA,YAAM,WAAW,eAAe,KAAK,GAAG;AACxC,UAAI,CAAC,UAAU;AACX,cAAM,IAAI,iCAAc,yCAAyC,KAAK,GAAG,EAAE;AAAA,MAC/E;AAEA,YAAM,cAAc,KAAK;AACzB,UAAI,gBAAgB,QAAW;AAC3B,eAAO;AAAA,MACX;AAGA,YAAM,gBAAgB,yBAAS,OAAO;AAAA,QAClC,SAAS;AAAA,QACT,YAAY;AAAA,MAChB,CAAC;AAGD,aAAO,yBAAS,OAAO;AAAA,QACnB,SAAS;AAAA,QACT,WAAW;AAAA,UACP,iBAAa,0BAAS,kCAAwB;AAAA,UAC9C,WAAO,0BAAS,QAAQ;AAAA,QAC5B;AAAA,QACA,YAAY,EAAE,MAAM,wBAAQ,aAAa,QAAQ,cAAc;AAAA,MACnE,CAAC;AAAA,IACL;AAAA,EACJ;AAGO,EAAMA,aAAA,MAAM;AAAA,IACf,KAAK,SAAqB,OAAe;AACrC,WAAK,QAAQ,eAAI,MAAM,KAAK;AAAA,IAChC;AAAA,IAEA,KAAK,WAAyC;AAC1C,YAAMC,SAAQ,KAAK;AACnB,UAAIA,QAAO;AACP,eAAO,eAAI,OAAOA,QAAO,aAAa;AAAA,MAC1C;AAAA,IACJ;AAAA,EACJ;AAGO,EAAMD,aAAA,OAAO;AAAA,IAChB,KAAK,SAAqB,OAAc;AACpC,YAAM,UAAU,yBAAS,OAAO,KAAK;AAErC,YAAM,oBAAoB,SAAS,YAAY,CAAC,GAAG;AAGnD,YAAM,YAAY,eAAe,QAAQ,oBAAoB,CAAC,CAAC;AAC/D,UAAI,mBAAM,MAAM,SAAS,MAAM,oCAA0B;AACrD,cAAM,IAAI,iCAAc,uCAAuC;AAAA,MACnE;AAGA,YAAM,QAAQ,YAAY,QAAQ,oBAAoB,CAAC,CAAC;AAGxD,YAAM,MAAM,UAAU,QAAQ,SAAS,YAAY,CAAC,GAAG,wBAAQ,SAAS;AAExE,WAAK,OAAO;AACZ,WAAK,QAAQ;AACb,WAAK,aAAa;AAAA,IACtB;AAAA,IAEA,KAAK,WAAY;AACb,YAAM,IAAI,uCAAoB,6BAA6B;AAAA,IAC/D;AAAA,EACJ;AAGO,EAAMA,aAAA,aAAa;AAAA,IACtB,KAAK,SAAqB,OAAc;AACpC,YAAM,OAAO,mBAAM,GAAG,KAAK;AAC3B,UAAI,EAAE,KAAK,SAAS,IAAI;AACpB,cAAM,IAAI,iCAAc,6BAA6B;AAAA,MACzD;AAEA,cAAQ,KAAK,CAAC,GAAG;AAAA,QACb,KAAK;AAAA,QACL,KAAK;AACD,gBAAM,IAAI,iCAAc,oCAAoC;AAAA,QAEhE,KAAK;AACD;AAAA,QAEJ,KAAK;AACD,gBAAM,IAAI,iCAAc,qCAAqC;AAAA,MACrE;AAEA,YAAM,oBAAoB,KAAK,SAAS,KAAK;AAE7C,iBAAW,MAAM,gBAAgB;AAEjC,WAAK,OAAO;AACZ,WAAK,QAAQ,KAAK,MAAM,GAAG,mBAAmB,CAAC;AAC/C,WAAK,QAAQ,KAAK,MAAM,mBAAmB,CAAC;AAAA,IAChD;AAAA,IAEA,KAAK,WAAqB;AACtB,UAAI,KAAK,UAAU,UAAa,KAAK,UAAU,QAAW;AACtD,eAAO;AAAA,MACX;AAEA,aAAO,mBAAM,OAAO,IAAI,WAAW,CAAC,CAAI,CAAC,GAAG,KAAK,OAAO,KAAK,KAAK;AAAA,IACtE;AAAA,EACJ;AAGO,EAAMA,aAAA,cAAc;AAAA,IACvB,KAAK,SAAqB,SAAwB;AAC9C,WAAK,aAAa,QAAQ;AAC1B,WAAK,cAAc,QAAQ;AAAA,IAC/B;AAAA,IAEA,KAAK,WAAgD;AACjD,YAAME,cAAa,KAAK;AACxB,YAAM,cAAc,KAAK;AACzB,UAAIA,gBAAe,UAAa,gBAAgB,QAAW;AACvD;AAAA,MACJ;AACA,aAAO;AAAA,QACH,WAAW,mBAAM,GAAGA,WAAU;AAAA,QAC9B,YAAY,mBAAM,GAAG,WAAW;AAAA,MACpC;AAAA,IACJ;AAAA,EACJ;AAAA,GAhMM;AAmMV,IAAK,UAAL,kBAAKC,aAAL;AACI,EAAAA,SAAA,eAAY;AACZ,EAAAA,SAAA,WAAQ;AACR,EAAAA,SAAA,UAAO;AACP,EAAAA,SAAA,gBAAa;AACb,EAAAA,SAAA,aAAU;AACV,EAAAA,SAAA,iBAAc;AANb,SAAAA;AAAA,GAAA;AASL,IAAK,eAAL,kBAAKC,kBAAL;AACI,EAAAA,cAAA,iBAAc;AACd,EAAAA,cAAA,WAAQ;AACR,EAAAA,cAAA,WAAQ;AAHP,SAAAA;AAAA,GAAA;AAML,IAAK,kBAAL,kBAAKC,qBAAL;AACI,EAAAA,iBAAA,eAAY;AACZ,EAAAA,iBAAA,gBAAa;AACb,EAAAA,iBAAA,aAAU;AAHT,SAAAA;AAAA,GAAA;AAML,SAAS,WAAW,KAAU,OAAe;AACzC,MAAI,CAAC,IAAI,OAAO;AAEZ,YAAQ,OAAO;AAAA,MACX,KAAK;AACD,YAAI,QAAQ;AACZ;AAAA,MAEJ,KAAK;AACD,YAAI,QAAQ;AACZ;AAAA,MAEJ,KAAK;AACD,YAAI,QAAQ;AACZ;AAAA,MAEJ;AACI,cAAM,IAAI,iCAAc,4CAA4C,KAAK,EAAE;AAAA,IACnF;AAAA,EACJ;AACJ;AAKO,SAAS,IAAI,YAA0B;AAC1C,QAAM,OAAO,CAAC;AAGd,aAAW,OAAO,UAAU;AACxB,QAAK,WAAmB,GAAG,MAAM,OAAW,CAAC,KAAa,GAAG,IAAK,WAAmB,GAAG;AAAA,EAC5F;AACA,WAAS,OAAO,MAAc;AAC1B,UAAM,IAAI,OAAO,yBAAyB,YAAY,IAAI;AAC1D,QAAI,KAAK,EAAE,UAAU,QAAW;AAC5B,MAAC,KAAa,IAAI,IAAI,EAAE;AAAA,IAC5B;AAAA,EACJ;AAKA,SAAO,QAAQ,OAAO,EAAE,QAAQ,CAAC,CAAC,OAAO,MAAM,MAAM;AACjD,WAAO,eAAe,MAAM,OAAO;AAAA,MAC/B,KAAK,MAAM,KAAK,MAAM;AAAA,MACtB,KAAK,WAAU,KAAK,MAAM,IAAI;AAAA,IAClC,CAAC;AACD,WAAO,KAAK;AAAA,EAChB,CAAC;AAGD,SAAO,QAAQ,YAAY,EAAE,QAAQ,CAAC,CAAC,OAAO,MAAM,MAAM;AACtD,WAAO,eAAe,MAAM,OAAO;AAAA,MAC/B,KAAK,MAAM,KAAK,MAAM,MAAM,UAAa,0BAAO,OAAO,KAAK,MAAM,CAAC;AAAA,MACnE,KAAK,WAAU,KAAK,MAAM,IAAI,UAAU,SAAY,SAAY,0BAAO,OAAO,OAAO,IAAI;AAAA,IAC7F,CAAC;AACD,WAAO,KAAK;AAAA,EAChB,CAAC;AAGD,SAAO,QAAQ,WAAW,EAAE,QAAQ,CAAC,CAAC,MAAM,UAAU,MAAM;AACxD,WAAO,eAAe,MAAM,MAAM,UAAiB;AAAA,EACvD,CAAC;AAGD,SAAO,KAAK,WAAW,EAAE,QAAQ,UAAQ,OAAO,IAAI,CAAC;AAGrD,SAAO,QAAQ,eAAe,EAAE,QAAQ,CAAC,CAAC,OAAO,MAAM,MAAM;AACzD,WAAO,eAAe,MAAM,OAAO;AAAA,MAC/B,KAAK,MAAM;AACP,cAAM,SAAS,KAAK,MAAM;AAC1B,YAAI,WAAW,QAAW;AACtB,gBAAM,IAAI,iCAAc,aAAa,MAAM,iBAAiB;AAAA,QAChE;AACA,eAAO;AAAA,MACX;AAAA,MAEA,KAAK,CAAC,UAAe;AACjB,aAAK,MAAM,IAAI;AAAA,MACnB;AAAA,IACJ,CAAC;AAED,WAAO,KAAK;AAAA,EAChB,CAAC;AAGD,WAAS,0BAA0B;AAC/B,QAAI,KAAK,SAAS,cAAY,OAAM,IAAI,iCAAc,8CAA8C;AACpG,QAAI,CAAC,KAAK,QAAS,OAAM,IAAI,iCAAc,iDAAiD;AAE5F,UAAM,MAAM,KAAK;AACjB,QAAI;AAEJ,YAAQ,KAAK;AAAA,MACT,KAAK;AACD,oBAAY;AAIZ;AAAA,MAEJ;AACI,cAAM,IAAI,iCAAc,8BAA8B,GAAG,EAAE;AAAA,IACnE;AAGA,UAAM,cAAc,aAAa,mBAAM,GAAG,KAAK,UAAU,CAAC;AAC1D,UAAM,QAAQ,MAAM,UAAU,WAAW;AAGzC,SAAK,QAAQ,gBAAgB,MAAM,GAAG,SAAS;AAC/C,SAAK,QAAQ,gBAAgB,MAAM,GAAG,SAAS;AAAA,EACnD;AAEA,MAAI,KAAK,SAAS,eAAY;AAC1B,QAAI,KAAK,GAAG;AACR,iBAAW,MAAM,KAAK,WAAW,UAAU;AAAA,IAC/C,WAAW,KAAK,OAAO;AACnB,iBAAW,MAAM,KAAK,MAAM,UAAU;AAAA,IAC1C;AAEA,QAAI,KAAK,MAAM,CAAC,KAAK,KAAK,CAAC,KAAK,IAAI;AAChC,8BAAwB;AAAA,IAC5B;AAAA,EACJ;AAEA,SAAO;AACX;AAKO,SAAS,WAAW,YAAmC,SAAwB;AAClF,MAAI,MAAM;AACV,MAAI,mBAAM,QAAQ,UAAU,GAAG;AAC3B,WAAO;AAAA,EACX,OAAO;AACH,WAAO,WAAW;AAClB,UAAM,WAAW;AAAA,EACrB;AACA,SAAO,IAAI;AAAA,IACP,MAAM;AAAA,IACN,YAAY;AAAA,IACZ,WAAW;AAAA,IACX,GAAG;AAAA,EACP,CAAQ;AACZ;AAKO,SAAS,UAAU,WAAkB,SAAwB;AAChE,SAAO,IAAI;AAAA,IACP,MAAM;AAAA,IACN;AAAA,IACA,GAAG;AAAA,EACP,CAAC;AACL;AAKO,SAAS,aAAa,YAAmB,SAAwB;AACpE,SAAO,IAAI;AAAA,IACP,MAAM;AAAA,IACN;AAAA,IACA,GAAG;AAAA,EACP,CAAC;AACL;AAAA,CAEO,CAAUC,SAAV;AAMI,WAAS,gBAAgB,KAAiB,SAA2B;AAGxE,WAAO,mBAAM,GAAG,gBAAgB,mBAAM,GAAG,IAAI,WAAW,GAAG,mBAAM,GAAG,QAAQ,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,EAAE;AAAA,EACzG;AAJO,EAAAA,KAAS;AAAA,GANH;",
|
|
5
|
+
"names": ["KeyType", "CurveType", "Asn1ObjectID", "Translators", "pkcs8", "publicBits", "Aliases", "Base64Codecs", "AssertedAliases", "Key"]
|
|
6
6
|
}
|
package/dist/cjs/crypto/Pem.js
CHANGED
|
@@ -69,7 +69,7 @@ ${body}
|
|
|
69
69
|
if (endPos >= lines.length) {
|
|
70
70
|
throw new import_CryptoError.CertificateError("No END line in PEM file");
|
|
71
71
|
}
|
|
72
|
-
const base64 = lines.slice(startPos + 1, endPos
|
|
72
|
+
const base64 = lines.slice(startPos + 1, endPos).join("").replace(/\s/g, "");
|
|
73
73
|
try {
|
|
74
74
|
return import_Base64Codec.Base64.decode(base64);
|
|
75
75
|
} catch (cause) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/crypto/Pem.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,yBAAuB;AACvB,sBAAyB;AACzB,mBAAsB;AACtB,yBAAiC;AATjC;AAAA;AAAA;AAAA;AAAA;AAgBO,IAAU;AAAA,CAAV,CAAUA,SAAV;AACI,WAAS,OAAO,KAAiB,OAAO,eAAe;AAC1D,WAAO,KAAK,YAAY;AAExB,QAAI;AACJ,QAAI,mBAAM,QAAQ,GAAG,GAAG;AACpB,cAAQ;AAAA,IACZ,OAAO;AACH,cAAQ,yBAAS,OAAO,GAAG;AAAA,IAC/B;AAEA,UAAM,OAAO,0BAAO,OAAO,mBAAM,GAAG,KAAK,CAAC,EACrC,MAAM,UAAU,EAChB,KAAK,IAAI;AAEd,WAAO,cAAc,IAAI;AAAA,EAAU,IAAI;AAAA,WAAc,IAAI;AAAA,EAC7D;AAfO,EAAAA,KAAS;AAiBT,WAAS,MAAM,UAAoB;AACtC,QAAI,mBAAM,QAAQ,QAAQ,GAAG;AACzB,UAAI,mBAAM,GAAG,QAAQ,EAAE,CAAC,MAAM,IAAI,WAAW,CAAC,GAAG;AAC7C,mBAAW,IAAI,YAAY,EAAE,OAAO,QAAQ;AAAA,MAChD,OAAO;AACH,eAAO;AAAA,MACX;AAAA,IACJ;AAEA,UAAM,QAAQ,SAAS,MAAM,IAAI;AACjC,QAAI,WAAW;AACf,WAAO,WAAW,MAAM,UAAU,CAAC,MAAM,QAAQ,EAAE,WAAW,aAAa,GAAG;AAC1E;AAAA,IACJ;AACA,QAAI,YAAY,MAAM,QAAQ;AAC1B,YAAM,IAAI,oCAAiB,2BAA2B;AAAA,IAC1D;AAEA,QAAI,SAAS,WAAW;AACxB,WAAO,SAAS,MAAM,UAAU,CAAC,MAAM,MAAM,EAAE,WAAW,WAAW,GAAG;AACpE;AAAA,IACJ;AACA,QAAI,UAAU,MAAM,QAAQ;AACxB,YAAM,IAAI,oCAAiB,yBAAyB;AAAA,IACxD;AAEA,UAAM,SAAS,MACV,MAAM,WAAW,GAAG,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,yBAAuB;AACvB,sBAAyB;AACzB,mBAAsB;AACtB,yBAAiC;AATjC;AAAA;AAAA;AAAA;AAAA;AAgBO,IAAU;AAAA,CAAV,CAAUA,SAAV;AACI,WAAS,OAAO,KAAiB,OAAO,eAAe;AAC1D,WAAO,KAAK,YAAY;AAExB,QAAI;AACJ,QAAI,mBAAM,QAAQ,GAAG,GAAG;AACpB,cAAQ;AAAA,IACZ,OAAO;AACH,cAAQ,yBAAS,OAAO,GAAG;AAAA,IAC/B;AAEA,UAAM,OAAO,0BAAO,OAAO,mBAAM,GAAG,KAAK,CAAC,EACrC,MAAM,UAAU,EAChB,KAAK,IAAI;AAEd,WAAO,cAAc,IAAI;AAAA,EAAU,IAAI;AAAA,WAAc,IAAI;AAAA,EAC7D;AAfO,EAAAA,KAAS;AAiBT,WAAS,MAAM,UAAoB;AACtC,QAAI,mBAAM,QAAQ,QAAQ,GAAG;AACzB,UAAI,mBAAM,GAAG,QAAQ,EAAE,CAAC,MAAM,IAAI,WAAW,CAAC,GAAG;AAC7C,mBAAW,IAAI,YAAY,EAAE,OAAO,QAAQ;AAAA,MAChD,OAAO;AACH,eAAO;AAAA,MACX;AAAA,IACJ;AAEA,UAAM,QAAQ,SAAS,MAAM,IAAI;AACjC,QAAI,WAAW;AACf,WAAO,WAAW,MAAM,UAAU,CAAC,MAAM,QAAQ,EAAE,WAAW,aAAa,GAAG;AAC1E;AAAA,IACJ;AACA,QAAI,YAAY,MAAM,QAAQ;AAC1B,YAAM,IAAI,oCAAiB,2BAA2B;AAAA,IAC1D;AAEA,QAAI,SAAS,WAAW;AACxB,WAAO,SAAS,MAAM,UAAU,CAAC,MAAM,MAAM,EAAE,WAAW,WAAW,GAAG;AACpE;AAAA,IACJ;AACA,QAAI,UAAU,MAAM,QAAQ;AACxB,YAAM,IAAI,oCAAiB,yBAAyB;AAAA,IACxD;AAEA,UAAM,SAAS,MACV,MAAM,WAAW,GAAG,MAAM,EAC1B,KAAK,EAAE,EACP,QAAQ,OAAO,EAAE;AAEtB,QAAI;AACA,aAAO,0BAAO,OAAO,MAAM;AAAA,IAC/B,SAAS,OAAO;AACZ,YAAM,QAAQ,IAAI,oCAAiB,8BAA8B;AACjE,YAAM,QAAQ;AACd,YAAM;AAAA,IACV;AAAA,EACJ;AAtCO,EAAAA,KAAS;AAwCT,WAAS,OAAO,UAAoB;AACvC,UAAM,QAAQ,MAAM,QAAQ;AAE5B,QAAI;AACA,aAAO,yBAAS,OAAO,KAAK;AAAA,IAChC,SAAS,OAAO;AACZ,YAAM,QAAQ,IAAI,oCAAiB,2BAA2B;AAC9D,YAAM,QAAQ;AACd,YAAM;AAAA,IACV;AAAA,EACJ;AAVO,EAAAA,KAAS;AAAA,GA1DH;",
|
|
5
5
|
"names": ["Pem"]
|
|
6
6
|
}
|
|
@@ -25,18 +25,18 @@ export declare namespace X509 {
|
|
|
25
25
|
}
|
|
26
26
|
interface DistinguishedName extends Record<string, DerNodeDefinition> {
|
|
27
27
|
}
|
|
28
|
-
interface
|
|
29
|
-
basicConstraints
|
|
28
|
+
interface Extensions {
|
|
29
|
+
basicConstraints?: {
|
|
30
30
|
isCa: boolean;
|
|
31
31
|
pathLen?: number;
|
|
32
32
|
};
|
|
33
|
-
subjectKeyIdentifier
|
|
34
|
-
keyUsage
|
|
33
|
+
subjectKeyIdentifier?: Bytes;
|
|
34
|
+
keyUsage?: KeyUsage;
|
|
35
35
|
extendedKeyUsage?: number[];
|
|
36
|
-
authorityKeyIdentifier
|
|
36
|
+
authorityKeyIdentifier?: Bytes;
|
|
37
37
|
futureExtension?: Bytes[];
|
|
38
38
|
}
|
|
39
|
-
namespace
|
|
39
|
+
namespace Extensions {
|
|
40
40
|
const BASIC_CONSTRAINTS = 5578003n;
|
|
41
41
|
const KEY_USAGE = 5577999n;
|
|
42
42
|
const EXTENDED_KEY_USAGE = 5578021n;
|
|
@@ -61,7 +61,7 @@ export declare namespace X509 {
|
|
|
61
61
|
validity: ValidityWindow;
|
|
62
62
|
subject: DistinguishedName;
|
|
63
63
|
publicKey: EcPublicKey;
|
|
64
|
-
extensions:
|
|
64
|
+
extensions: Extensions;
|
|
65
65
|
}
|
|
66
66
|
interface Certificate extends UnsignedCertificate {
|
|
67
67
|
signature: Bytes;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"X509.d.ts","sourceRoot":"","sources":["../../../src/crypto/X509.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAIH,YAAY,EAGZ,iBAAiB,EACjB,SAAS,EACT,qBAAqB,EAErB,QAAQ,EAEX,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAI/B,yBAAiB,IAAI,CAAC;IAClB;;OAEG;IACH,SAAsB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,WAAW,CAAC,CAKpG;IAED;;OAEG;IACH,SAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,GAAG,mBAAmB,UAEvE;IAED;;OAEG;IACH,SAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,GAAG,mBAAmB,
|
|
1
|
+
{"version":3,"file":"X509.d.ts","sourceRoot":"","sources":["../../../src/crypto/X509.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/crypto/X509.js
CHANGED
|
@@ -47,10 +47,8 @@ var X509;
|
|
|
47
47
|
X5092.certificateToPem = certificateToPem;
|
|
48
48
|
function certificateToDer(cert) {
|
|
49
49
|
const { serialNumber, signatureAlgorithm, issuer, validity, subject, publicKey, extensions } = cert;
|
|
50
|
-
const {
|
|
51
|
-
|
|
52
|
-
} = extensions;
|
|
53
|
-
if (!isCa && pathLen !== void 0) {
|
|
50
|
+
const { basicConstraints } = extensions;
|
|
51
|
+
if (basicConstraints && !basicConstraints.isCa && basicConstraints.pathLen !== void 0) {
|
|
54
52
|
throw new import_CryptoError.CertificateError("Path length must be undefined for non-CA certificates.");
|
|
55
53
|
}
|
|
56
54
|
let ast = {
|
|
@@ -85,20 +83,20 @@ var X509;
|
|
|
85
83
|
"encipherOnly",
|
|
86
84
|
"decipherOnly"
|
|
87
85
|
];
|
|
88
|
-
let
|
|
89
|
-
((
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
})(
|
|
86
|
+
let Extensions;
|
|
87
|
+
((Extensions2) => {
|
|
88
|
+
Extensions2.BASIC_CONSTRAINTS = 0x551d13n;
|
|
89
|
+
Extensions2.KEY_USAGE = 0x551d0fn;
|
|
90
|
+
Extensions2.EXTENDED_KEY_USAGE = 0x551d25n;
|
|
91
|
+
Extensions2.SUBJECT_KEY_IDENTIFIER = 0x551d0en;
|
|
92
|
+
Extensions2.AUTHORITY_KEY_IDENTIFIER = 0x551d23n;
|
|
93
|
+
})(Extensions = X5092.Extensions || (X5092.Extensions = {}));
|
|
96
94
|
function SubjectKeyIdentifier(identifier) {
|
|
97
|
-
return (0, import_DerCodec.DerObject)(
|
|
95
|
+
return (0, import_DerCodec.DerObject)(Extensions.SUBJECT_KEY_IDENTIFIER, { value: import_DerCodec.DerCodec.encode(identifier) });
|
|
98
96
|
}
|
|
99
97
|
X5092.SubjectKeyIdentifier = SubjectKeyIdentifier;
|
|
100
98
|
function AuthorityKeyIdentifier(identifier) {
|
|
101
|
-
return (0, import_DerCodec.DerObject)(
|
|
99
|
+
return (0, import_DerCodec.DerObject)(Extensions.AUTHORITY_KEY_IDENTIFIER, {
|
|
102
100
|
value: import_DerCodec.DerCodec.encode({ id: (0, import_DerCodec.ContextTaggedBytes)(0, identifier) })
|
|
103
101
|
});
|
|
104
102
|
}
|
|
@@ -108,7 +106,7 @@ var X509;
|
|
|
108
106
|
if (toEncode?.isCa === false) {
|
|
109
107
|
delete toEncode.isCa;
|
|
110
108
|
}
|
|
111
|
-
return (0, import_DerCodec.DerObject)(
|
|
109
|
+
return (0, import_DerCodec.DerObject)(Extensions.BASIC_CONSTRAINTS, { critical: true, value: import_DerCodec.DerCodec.encode(toEncode) });
|
|
112
110
|
}
|
|
113
111
|
X5092.BasicConstraints = BasicConstraints;
|
|
114
112
|
function ExtendedKeyUsage(values) {
|
|
@@ -140,7 +138,7 @@ var X509;
|
|
|
140
138
|
throw new import_DerCodec.DerError(`Unsupported extended key usage value ${value}`);
|
|
141
139
|
}
|
|
142
140
|
});
|
|
143
|
-
return (0, import_DerCodec.DerObject)(
|
|
141
|
+
return (0, import_DerCodec.DerObject)(Extensions.EXTENDED_KEY_USAGE, {
|
|
144
142
|
critical: true,
|
|
145
143
|
value: import_DerCodec.DerCodec.encode(data)
|
|
146
144
|
});
|
|
@@ -158,7 +156,7 @@ var X509;
|
|
|
158
156
|
if (typeof value !== "number") {
|
|
159
157
|
value = encodeKeyUsage(value);
|
|
160
158
|
}
|
|
161
|
-
return (0, import_DerCodec.DerObject)(
|
|
159
|
+
return (0, import_DerCodec.DerObject)(Extensions.KEY_USAGE, {
|
|
162
160
|
critical: true,
|
|
163
161
|
value: import_DerCodec.DerCodec.encode((0, import_DerCodec.DatatypeOverride)(import_DerCodec.DerType.BitString, value))
|
|
164
162
|
});
|
|
@@ -176,11 +174,15 @@ const ExtensionEncoders = {
|
|
|
176
174
|
function extensionsToAst(extensions) {
|
|
177
175
|
const ast = {};
|
|
178
176
|
for (const key in extensions) {
|
|
177
|
+
const value = extensions[key];
|
|
178
|
+
if (value === void 0) {
|
|
179
|
+
continue;
|
|
180
|
+
}
|
|
179
181
|
const encoder = ExtensionEncoders[key];
|
|
180
182
|
if (encoder === void 0) {
|
|
181
183
|
throw new import_MatterError.ImplementationError(`Unsupported X.509 certificate extension ${key}`);
|
|
182
184
|
}
|
|
183
|
-
ast[key] = encoder(
|
|
185
|
+
ast[key] = encoder(value);
|
|
184
186
|
}
|
|
185
187
|
return ast;
|
|
186
188
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/crypto/X509.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,sBAaO;AACP,yBAAoC;AACpC,mBAAsB;AAEtB,yBAAiC;AAEjC,iBAAoB;AACpB,kBAAqB;AA1BrB;AAAA;AAAA;AAAA;AAAA;AA4BO,IAAU;AAAA,CAAV,CAAUA,UAAV;AAIH,iBAAsB,KAAK,QAAgB,KAAU,MAAiD;AAClG,WAAO;AAAA,MACH,GAAG;AAAA,MACH,YAAY,MAAM,OAAO,UAAU,KAAK,iBAAiB,IAAI,CAAC,GAAG;AAAA,IACrE;AAAA,EACJ;AALA,EAAAA,MAAsB;AAUf,WAAS,iBAAiB,MAAyC;AACtE,WAAO,eAAI,OAAO,iBAAiB,IAAI,CAAC;AAAA,EAC5C;AAFO,EAAAA,MAAS;AAOT,WAAS,iBAAiB,MAAyC;AACtE,UAAM,EAAE,cAAc,oBAAoB,QAAQ,UAAU,SAAS,WAAW,WAAW,IAAI;AAE/F,UAAM
|
|
5
|
-
"names": ["X509", "
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,sBAaO;AACP,yBAAoC;AACpC,mBAAsB;AAEtB,yBAAiC;AAEjC,iBAAoB;AACpB,kBAAqB;AA1BrB;AAAA;AAAA;AAAA;AAAA;AA4BO,IAAU;AAAA,CAAV,CAAUA,UAAV;AAIH,iBAAsB,KAAK,QAAgB,KAAU,MAAiD;AAClG,WAAO;AAAA,MACH,GAAG;AAAA,MACH,YAAY,MAAM,OAAO,UAAU,KAAK,iBAAiB,IAAI,CAAC,GAAG;AAAA,IACrE;AAAA,EACJ;AALA,EAAAA,MAAsB;AAUf,WAAS,iBAAiB,MAAyC;AACtE,WAAO,eAAI,OAAO,iBAAiB,IAAI,CAAC;AAAA,EAC5C;AAFO,EAAAA,MAAS;AAOT,WAAS,iBAAiB,MAAyC;AACtE,UAAM,EAAE,cAAc,oBAAoB,QAAQ,UAAU,SAAS,WAAW,WAAW,IAAI;AAE/F,UAAM,EAAE,iBAAiB,IAAI;AAC7B,QAAI,oBAAoB,CAAC,iBAAiB,QAAQ,iBAAiB,YAAY,QAAW;AACtF,YAAM,IAAI,oCAAiB,wDAAwD;AAAA,IACvF;AAEA,QAAI,MAAyC;AAAA,MACzC,aAAS,+BAAc,GAAG,CAAC;AAAA;AAAA,MAC3B,kBAAc,kCAAiB,wBAAQ,SAAS,YAAY;AAAA,MAC5D,oBAAoB,sBAAsB,iBAAK;AAAA,MAC/C;AAAA,MACA;AAAA,MACA;AAAA,MACA,eAAe;AAAA,MACf,gBAAY,+BAAc,GAAG,gBAAgB,UAAU,CAAC;AAAA,IAC5D;AAEA,QAAI,eAAe,MAAM;AACrB,YAAM;AAAA,QACF;AAAA,QACA,oBAAoB,KAAK;AAAA,QACzB,eAAW,8BAAa,KAAK,SAAS;AAAA,MAC1C;AAAA,IACJ;AAEA,WAAO,yBAAS,OAAO,GAAG;AAAA,EAC9B;AA5BO,EAAAA,MAAS;AA8BT,EAAMA,MAAA,gBAAgB;AAAA,IACzB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACJ;AAkBO,MAAU;AAAV,IAAUC,gBAAV;AACI,IAAMA,YAAA,oBAAoB;AAC1B,IAAMA,YAAA,YAAY;AAClB,IAAMA,YAAA,qBAAqB;AAC3B,IAAMA,YAAA,yBAAyB;AAC/B,IAAMA,YAAA,2BAA2B;AAAA,KAL3B,aAAAD,MAAA,eAAAA,MAAA;AAmCV,WAAS,qBAAqB,YAAmB;AACpD,eAAO,2BAAU,WAAW,wBAAwB,EAAE,OAAO,yBAAS,OAAO,UAAU,EAAE,CAAC;AAAA,EAC9F;AAFO,EAAAA,MAAS;AAIT,WAAS,uBAAuB,YAAmB;AACtD,eAAO,2BAAU,WAAW,0BAA0B;AAAA,MAClD,OAAO,yBAAS,OAAO,EAAE,QAAI,oCAAmB,GAAG,UAAU,EAAE,CAAC;AAAA,IACpE,CAAC;AAAA,EACL;AAJO,EAAAA,MAAS;AAMT,WAAS,iBAAiB,aAAkB;AAC/C,UAAM,WAAW,EAAE,GAAG,YAAY;AAClC,QAAI,UAAU,SAAS,OAAO;AAG1B,aAAO,SAAS;AAAA,IACpB;AACA,eAAO,2BAAU,WAAW,mBAAmB,EAAE,UAAU,MAAM,OAAO,yBAAS,OAAO,QAAQ,EAAE,CAAC;AAAA,EACvG;AARO,EAAAA,MAAS;AAUT,WAAS,iBAAiB,QAA8B;AAC3D,QAAI,WAAW,QAAW;AACtB;AAAA,IACJ;AACA,UAAM,OAAO,CAAC;AACd,WAAO,QAAQ,WAAS;AACpB,cAAQ,OAAO;AAAA,QACX,KAAK;AACD,eAAK,iBAAa,0BAAS,iBAAiB,WAAW;AACvD;AAAA,QACJ,KAAK;AACD,eAAK,iBAAa,0BAAS,iBAAiB,WAAW;AACvD;AAAA,QACJ,KAAK;AACD,eAAK,kBAAc,0BAAS,iBAAiB,YAAY;AACzD;AAAA,QACJ,KAAK;AACD,eAAK,sBAAkB,0BAAS,iBAAiB,gBAAgB;AACjE;AAAA,QACJ,KAAK;AACD,eAAK,mBAAe,0BAAS,iBAAiB,aAAa;AAC3D;AAAA,QACJ,KAAK;AACD,eAAK,kBAAc,0BAAS,iBAAiB,YAAY;AACzD;AAAA,QACJ;AACI,gBAAM,IAAI,yBAAS,wCAAwC,KAAK,EAAE;AAAA,MAC1E;AAAA,IACJ,CAAC;AAED,eAAO,2BAAU,WAAW,oBAAoB;AAAA,MAC5C,UAAU;AAAA,MACV,OAAO,yBAAS,OAAO,IAAI;AAAA,IAC/B,CAAC;AAAA,EACL;AAlCO,EAAAA,MAAS;AAoCT,IAAUE,sBAAV;AACI,IAAMA,kBAAA,cAAc;AACpB,IAAMA,kBAAA,cAAc;AACpB,IAAMA,kBAAA,eAAe;AACrB,IAAMA,kBAAA,mBAAmB;AACzB,IAAMA,kBAAA,gBAAgB;AACtB,IAAMA,kBAAA,eAAe;AAAA,KANf,mBAAAF,MAAA,qBAAAA,MAAA;AASV,WAAS,SAAS,OAA0B;AAC/C,QAAI,OAAO,UAAU,UAAU;AAC3B,cAAQ,eAAe,KAAK;AAAA,IAChC;AAEA,eAAO,2BAAU,WAAW,WAAW;AAAA,MACnC,UAAU;AAAA,MACV,OAAO,yBAAS,WAAO,kCAAiB,wBAAQ,WAAW,KAAK,CAAC;AAAA,IACrE,CAAC;AAAA,EACL;AATO,EAAAA,MAAS;AAAA,GAnLH;AA+LjB,MAAM,oBAAoB;AAAA,EACtB,kBAAkB,KAAK;AAAA,EACvB,UAAU,KAAK;AAAA,EACf,kBAAkB,KAAK;AAAA,EACvB,sBAAsB,KAAK;AAAA,EAC3B,wBAAwB,KAAK;AAAA,EAC7B,iBAAiB,CAAC,eAAqB,0BAAS,mBAAM,OAAO,GAAI,UAAU,CAAC,CAAE,CAAC;AACnF;AAKA,SAAS,gBAAgB,YAA6B;AAClD,QAAM,MAA6B,CAAC;AAEpC,aAAW,OAAO,YAAY;AAC1B,UAAM,QAAQ,WAAW,GAA4B;AACrD,QAAI,UAAU,QAAW;AACrB;AAAA,IACJ;AAEA,UAAM,UAAU,kBAAkB,GAA4B;AAC9D,QAAI,YAAY,QAAW;AACvB,YAAM,IAAI,uCAAoB,2CAA2C,GAAG,EAAE;AAAA,IAClF;AAEA,QAAI,GAAG,IAAI,QAAQ,KAAK;AAAA,EAC5B;AAEA,SAAO;AACX;AAIA,SAAS,eAAe,OAAsB;AAC1C,MAAI,MAAM;AACV,MAAI,UAAU;AACd,aAAW,QAAQ,KAAK,eAAe;AACnC,QAAI,MAAM,IAAI,GAAG;AACb,iBAAW;AAAA,IACf;AACA,YAAQ;AAAA,EACZ;AACA,SAAO;AACX;",
|
|
5
|
+
"names": ["X509", "Extensions", "ExtendedKeyUsage"]
|
|
6
6
|
}
|
|
@@ -47,6 +47,13 @@ export declare namespace HttpEndpoint {
|
|
|
47
47
|
* Configuration options.
|
|
48
48
|
*/
|
|
49
49
|
interface Options {
|
|
50
|
+
certificate?: string;
|
|
51
|
+
key?: string;
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* Full configuration.
|
|
55
|
+
*/
|
|
56
|
+
interface Configuration extends Options {
|
|
50
57
|
address: AppAddress.Definition;
|
|
51
58
|
}
|
|
52
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpEndpoint.d.ts","sourceRoot":"","sources":["../../../../src/net/http/HttpEndpoint.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD;;;;GAIG;AACH,MAAM,WAAW,YAAY;IACzB;;OAEG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC;IAEhC;;OAEG;IACH,EAAE,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC;IAE5B;;OAEG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,yBAAiB,YAAY,CAAC;IAC1B;;OAEG;IACH,KAAY,WAAW,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,YAAY,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAC;IAE9E;;OAEG;IACH,KAAY,SAAS,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAEvG;;OAEG;IACH,UAAiB,YAAa,SAAQ,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC;KAAG;IAEnF;;OAEG;IACH,KAAY,SAAS,GAAG,KAAK,GAAG,MAAM,CAAC;IAEvC;;OAEG;IACH,UAAiB,OAAO;QACpB,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC;KAClC;CACJ"}
|
|
1
|
+
{"version":3,"file":"HttpEndpoint.d.ts","sourceRoot":"","sources":["../../../../src/net/http/HttpEndpoint.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD;;;;GAIG;AACH,MAAM,WAAW,YAAY;IACzB;;OAEG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC;IAEhC;;OAEG;IACH,EAAE,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC;IAE5B;;OAEG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,yBAAiB,YAAY,CAAC;IAC1B;;OAEG;IACH,KAAY,WAAW,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,YAAY,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAC;IAE9E;;OAEG;IACH,KAAY,SAAS,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAEvG;;OAEG;IACH,UAAiB,YAAa,SAAQ,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC;KAAG;IAEnF;;OAEG;IACH,KAAY,SAAS,GAAG,KAAK,GAAG,MAAM,CAAC;IAEvC;;OAEG;IACH,UAAiB,OAAO;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,GAAG,CAAC,EAAE,MAAM,CAAC;KAChB;IAED;;OAEG;IACH,UAAiB,aAAc,SAAQ,OAAO;QAC1C,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC;KAClC;CACJ"}
|
|
@@ -18,6 +18,6 @@ export declare abstract class HttpEndpointFactory {
|
|
|
18
18
|
* Indicates support for WebSocket handlers.
|
|
19
19
|
*/
|
|
20
20
|
supportsWs: boolean;
|
|
21
|
-
abstract create(options: HttpEndpoint.
|
|
21
|
+
abstract create(options: HttpEndpoint.Configuration): Promise<HttpEndpoint>;
|
|
22
22
|
}
|
|
23
23
|
//# sourceMappingURL=HttpEndpointFactory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpEndpointFactory.d.ts","sourceRoot":"","sources":["../../../../src/net/http/HttpEndpointFactory.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD;;;;GAIG;AACH,8BAAsB,mBAAmB;IACrC;;OAEG;IACH,YAAY,UAAQ;IAEpB;;OAEG;IACH,UAAU,UAAQ;IAElB,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"HttpEndpointFactory.d.ts","sourceRoot":"","sources":["../../../../src/net/http/HttpEndpointFactory.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD;;;;GAIG;AACH,8BAAsB,mBAAmB;IACrC;;OAEG;IACH,YAAY,UAAQ;IAEpB;;OAEG;IACH,UAAU,UAAQ;IAElB,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;CAC9E"}
|
|
@@ -14,7 +14,12 @@ import { HttpEndpointFactory } from "./HttpEndpointFactory.js";
|
|
|
14
14
|
export declare class HttpService {
|
|
15
15
|
#private;
|
|
16
16
|
constructor(factory: HttpEndpointFactory);
|
|
17
|
-
create(
|
|
17
|
+
create({ address, certificate, key }: HttpService.Configuration): Promise<HttpEndpoint>;
|
|
18
18
|
static [Environmental.create](env: Environment): HttpService;
|
|
19
19
|
}
|
|
20
|
+
export declare namespace HttpService {
|
|
21
|
+
interface Configuration extends HttpEndpoint.Options {
|
|
22
|
+
address: AppAddress.Definition | AppAddress.Definition[];
|
|
23
|
+
}
|
|
24
|
+
}
|
|
20
25
|
//# sourceMappingURL=HttpService.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpService.d.ts","sourceRoot":"","sources":["../../../../src/net/http/HttpService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAI/D;;GAEG;AACH,qBAAa,WAAW;;gBAIR,OAAO,EAAE,mBAAmB;IAIlC,MAAM,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"HttpService.d.ts","sourceRoot":"","sources":["../../../../src/net/http/HttpService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAI/D;;GAEG;AACH,qBAAa,WAAW;;gBAIR,OAAO,EAAE,mBAAmB;IAIlC,MAAM,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE,WAAW,CAAC,aAAa;IA6CrE,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW;CAKjD;AAED,yBAAiB,WAAW,CAAC;IACzB,UAAiB,aAAc,SAAQ,YAAY,CAAC,OAAO;QACvD,OAAO,EAAE,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;KAC5D;CACJ"}
|
|
@@ -38,14 +38,15 @@ class HttpService {
|
|
|
38
38
|
constructor(factory) {
|
|
39
39
|
this.#factory = factory;
|
|
40
40
|
}
|
|
41
|
-
async create(
|
|
41
|
+
async create({ address, certificate, key }) {
|
|
42
|
+
const addresses = Array.isArray(address) ? address : [address];
|
|
42
43
|
if (addresses.length === 1) {
|
|
43
|
-
return this.#
|
|
44
|
+
return this.#forConfig({ address: addresses[0], certificate, key });
|
|
44
45
|
}
|
|
45
46
|
const endpoints = Array();
|
|
46
47
|
try {
|
|
47
|
-
for (const
|
|
48
|
-
endpoints.push(await this.#
|
|
48
|
+
for (const address2 of addresses) {
|
|
49
|
+
endpoints.push(await this.#forConfig({ address: address2, certificate, key }));
|
|
49
50
|
}
|
|
50
51
|
} catch (e) {
|
|
51
52
|
await Promise.allSettled(endpoints.map((endpoint) => endpoint.close()));
|
|
@@ -53,9 +54,9 @@ class HttpService {
|
|
|
53
54
|
}
|
|
54
55
|
return new import_HttpEndpointGroup.HttpEndpointGroup(endpoints);
|
|
55
56
|
}
|
|
56
|
-
async #
|
|
57
|
-
const addr = import_AppAddress.AppAddress.for(address);
|
|
58
|
-
if (
|
|
57
|
+
async #forConfig(config) {
|
|
58
|
+
const addr = import_AppAddress.AppAddress.for(config.address);
|
|
59
|
+
if (!["http", "https", "ws", "wss"].includes(addr.appProtocol)) {
|
|
59
60
|
throw new import_MatterError.ImplementationError(`Unsupported address ${addr} for HTTP endpoint`);
|
|
60
61
|
}
|
|
61
62
|
const key = JSON.stringify(addr.transport);
|
|
@@ -69,7 +70,7 @@ class HttpService {
|
|
|
69
70
|
);
|
|
70
71
|
}
|
|
71
72
|
} else {
|
|
72
|
-
endpoint = new import_HttpSharedEndpoint.HttpSharedEndpoint(addr.isTls, () => this.#factory.create(
|
|
73
|
+
endpoint = new import_HttpSharedEndpoint.HttpSharedEndpoint(addr.isTls, () => this.#factory.create(config));
|
|
73
74
|
this.#endpoints[key] = endpoint;
|
|
74
75
|
}
|
|
75
76
|
return await endpoint.use();
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/net/http/HttpService.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,2BAA8B;AAC9B,yBAAoC;AACpC,wBAA2B;AAE3B,iCAAoC;AACpC,+BAAkC;AAClC,gCAAmC;AAbnC;AAAA;AAAA;AAAA;AAAA;AAkBO,MAAM,YAAY;AAAA,EACrB;AAAA,EACA,aAAa,CAAC;AAAA,EAEd,YAAY,SAA8B;AACtC,SAAK,WAAW;AAAA,EACpB;AAAA,EAEA,MAAM,UAAU,
|
|
5
|
-
"names": []
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,2BAA8B;AAC9B,yBAAoC;AACpC,wBAA2B;AAE3B,iCAAoC;AACpC,+BAAkC;AAClC,gCAAmC;AAbnC;AAAA;AAAA;AAAA;AAAA;AAkBO,MAAM,YAAY;AAAA,EACrB;AAAA,EACA,aAAa,CAAC;AAAA,EAEd,YAAY,SAA8B;AACtC,SAAK,WAAW;AAAA,EACpB;AAAA,EAEA,MAAM,OAAO,EAAE,SAAS,aAAa,IAAI,GAA8B;AACnE,UAAM,YAAY,MAAM,QAAQ,OAAO,IAAI,UAAU,CAAC,OAAO;AAE7D,QAAI,UAAU,WAAW,GAAG;AACxB,aAAO,KAAK,WAAW,EAAE,SAAS,UAAU,CAAC,GAAG,aAAa,IAAI,CAAC;AAAA,IACtE;AAEA,UAAM,YAAY,MAAoB;AAEtC,QAAI;AACA,iBAAWA,YAAW,WAAW;AAC7B,kBAAU,KAAK,MAAM,KAAK,WAAW,EAAE,SAAAA,UAAS,aAAa,IAAI,CAAC,CAAC;AAAA,MACvE;AAAA,IACJ,SAAS,GAAG;AACR,YAAM,QAAQ,WAAW,UAAU,IAAI,cAAY,SAAS,MAAM,CAAC,CAAC;AACpE,YAAM;AAAA,IACV;AAEA,WAAO,IAAI,2CAAkB,SAAS;AAAA,EAC1C;AAAA,EAEA,MAAM,WAAW,QAAoC;AACjD,UAAM,OAAO,6BAAW,IAAI,OAAO,OAAO;AAC1C,QAAI,CAAC,CAAC,QAAQ,SAAS,MAAM,KAAK,EAAE,SAAS,KAAK,WAAW,GAAG;AAC5D,YAAM,IAAI,uCAAoB,uBAAuB,IAAI,oBAAoB;AAAA,IACjF;AAEA,UAAM,MAAM,KAAK,UAAU,KAAK,SAAS;AACzC,QAAI,WAAW,KAAK,WAAW,GAAG;AAClC,QAAI,UAAU;AACV,UAAI,SAAS,UAAU,KAAK,OAAO;AAC/B,cAAM,SAAS,KAAK,QAAQ,cAAc;AAC1C,cAAM,aAAa,SAAS,QAAQ,cAAc;AAClD,cAAM,IAAI;AAAA,UACN,mBAAmB,IAAI,OAAO,MAAM,6BAA6B,UAAU;AAAA,QAC/E;AAAA,MACJ;AAAA,IACJ,OAAO;AACH,iBAAW,IAAI,6CAAmB,KAAK,OAAO,MAAM,KAAK,SAAS,OAAO,MAAM,CAAC;AAChF,WAAK,WAAW,GAAG,IAAI;AAAA,IAC3B;AAEA,WAAO,MAAM,SAAS,IAAI;AAAA,EAC9B;AAAA,EAEA,QAAQ,mCAAc,MAAM,EAAE,KAAkB;AAC5C,UAAM,WAAW,IAAI,YAAY,IAAI,IAAI,8CAAmB,CAAC;AAC7D,QAAI,IAAI,aAAa,QAAQ;AAC7B,WAAO;AAAA,EACX;AACJ;",
|
|
5
|
+
"names": ["address"]
|
|
6
6
|
}
|
|
@@ -26,6 +26,8 @@ export declare namespace MqttEndpoint {
|
|
|
26
26
|
function Message(message: Message): Message;
|
|
27
27
|
interface ConnectionOptions {
|
|
28
28
|
address: AppAddress.Definition;
|
|
29
|
+
certificate?: string;
|
|
30
|
+
key?: string;
|
|
29
31
|
environment?: Environment;
|
|
30
32
|
will?: Message;
|
|
31
33
|
onUp?: (endpoint: MqttEndpoint) => MaybePromise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MqttEndpoint.d.ts","sourceRoot":"","sources":["../../../../src/net/mqtt/MqttEndpoint.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,WAAW,YAAY;IACzB,SAAS,CACL,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,YAAY,CAAC,mBAAmB,GAC3C,qBAAqB,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3D,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,yBAAiB,YAAY,CAAC;IAC1B,UAAiB,OAAO;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI,CAAC;QAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,eAAe,CAAC,EAAE,KAAK,CAAC;QACxB,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KACnB;IAED,SAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,WAEvC;IAED,UAAiB,iBAAiB;QAC9B,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC;QAC/B,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;QACf,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;KAC3D;IAED,UAAiB,mBAAmB;QAChC,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC;KACxB;CACJ"}
|
|
1
|
+
{"version":3,"file":"MqttEndpoint.d.ts","sourceRoot":"","sources":["../../../../src/net/mqtt/MqttEndpoint.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,WAAW,YAAY;IACzB,SAAS,CACL,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,YAAY,CAAC,mBAAmB,GAC3C,qBAAqB,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3D,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,yBAAiB,YAAY,CAAC;IAC1B,UAAiB,OAAO;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI,CAAC;QAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,eAAe,CAAC,EAAE,KAAK,CAAC;QACxB,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KACnB;IAED,SAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,WAEvC;IAED,UAAiB,iBAAiB;QAC9B,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC;QAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;QACf,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;KAC3D;IAED,UAAiB,mBAAmB;QAChC,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC;KACxB;CACJ"}
|
package/dist/esm/crypto/Key.d.ts
CHANGED
|
@@ -73,18 +73,15 @@ export interface Key extends JsonWebKey {
|
|
|
73
73
|
x?: string;
|
|
74
74
|
y?: string;
|
|
75
75
|
/**
|
|
76
|
-
* Binary alias to private key field. Automatically encodes/decodes the
|
|
77
|
-
* base-64 private key.
|
|
76
|
+
* Binary alias to private key field. Automatically encodes/decodes the base-64 private key.
|
|
78
77
|
*/
|
|
79
78
|
privateBits?: Bytes;
|
|
80
79
|
/**
|
|
81
|
-
* Binary alias to the x field. Automatically encodes/decodes the base-64
|
|
82
|
-
* x-point on EC public keys.
|
|
80
|
+
* Binary alias to the x field. Automatically encodes/decodes the base-64 x-point on EC public keys.
|
|
83
81
|
*/
|
|
84
82
|
xBits?: Bytes;
|
|
85
83
|
/**
|
|
86
|
-
* Binary alias to the y field. Automatically encodes/decodes the base-64
|
|
87
|
-
* y-point on EC public keys.
|
|
84
|
+
* Binary alias to the y field. Automatically encodes/decodes the base-64 y-point on EC public keys.
|
|
88
85
|
*/
|
|
89
86
|
yBits?: Bytes;
|
|
90
87
|
/**
|
|
@@ -92,21 +89,23 @@ export interface Key extends JsonWebKey {
|
|
|
92
89
|
*/
|
|
93
90
|
sec1?: Bytes;
|
|
94
91
|
/**
|
|
95
|
-
* Import
|
|
92
|
+
* Import of PKCS #8 format as DER or PEM and export as DER.
|
|
96
93
|
*/
|
|
97
94
|
pkcs8?: Bytes;
|
|
95
|
+
/**
|
|
96
|
+
* Import/export of PKCS #8 format as PEM.
|
|
97
|
+
*/
|
|
98
|
+
pem?: string;
|
|
98
99
|
/**
|
|
99
100
|
* Import (write-only) of public keys encoded in SPKI format.
|
|
100
101
|
*/
|
|
101
102
|
spki?: Bytes;
|
|
102
103
|
/**
|
|
103
|
-
* Import/export of EC public key in SEC1/SPKI format. Maps to x & y
|
|
104
|
-
* fields internally.
|
|
104
|
+
* Import/export of EC public key in SEC1/SPKI format. Maps to x & y fields internally.
|
|
105
105
|
*/
|
|
106
106
|
publicBits?: Bytes;
|
|
107
107
|
/**
|
|
108
|
-
* Import/export of BinaryKeyPair structure used as an alternate
|
|
109
|
-
* serialization format for legacy reasons.
|
|
108
|
+
* Import/export of BinaryKeyPair structure used as an alternate serialization format for legacy reasons.
|
|
110
109
|
*/
|
|
111
110
|
keyPairBits?: BinaryKeyPair;
|
|
112
111
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Key.d.ts","sourceRoot":"","sources":["../../../src/crypto/Key.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"Key.d.ts","sourceRoot":"","sources":["../../../src/crypto/Key.ts"],"names":[],"mappings":"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"}
|