@opentdf/sdk 0.2.0 → 0.3.0-beta.2029
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/src/auth/auth.js +1 -1
- package/dist/cjs/src/encodings/base64.js +1 -1
- package/dist/cjs/src/nanoclients.js +5 -5
- package/dist/cjs/src/nanotdf/Client.js +1 -1
- package/dist/cjs/src/nanotdf/NanoTDF.js +1 -1
- package/dist/cjs/src/nanotdf/encrypt-dataset.js +1 -1
- package/dist/cjs/src/nanotdf/encrypt.js +1 -1
- package/dist/cjs/src/nanotdf/helpers/getHkdfSalt.js +1 -1
- package/dist/cjs/src/nanotdf-crypto/digest.js +1 -1
- package/dist/cjs/src/nanotdf-crypto/pemPublicToCrypto.js +4 -27
- package/dist/cjs/src/opentdf.js +175 -45
- package/dist/cjs/src/version.js +1 -1
- package/dist/cjs/tdf3/index.js +1 -1
- package/dist/cjs/tdf3/src/assertions.js +1 -1
- package/dist/cjs/tdf3/src/crypto/salt.js +12 -0
- package/dist/cjs/tdf3/src/models/key-access.js +3 -2
- package/dist/cjs/tdf3/src/tdf.js +8 -3
- package/dist/types/src/access.d.ts.map +1 -1
- package/dist/types/src/auth/auth.d.ts +2 -2
- package/dist/types/src/auth/auth.d.ts.map +1 -1
- package/dist/types/src/auth/providers.d.ts.map +1 -1
- package/dist/types/src/encodings/base64.d.ts +1 -1
- package/dist/types/src/encodings/base64.d.ts.map +1 -1
- package/dist/types/src/nanoclients.d.ts +9 -10
- package/dist/types/src/nanoclients.d.ts.map +1 -1
- package/dist/types/src/nanotdf/Client.d.ts +1 -2
- package/dist/types/src/nanotdf/Client.d.ts.map +1 -1
- package/dist/types/src/nanotdf/NanoTDF.d.ts +1 -2
- package/dist/types/src/nanotdf/NanoTDF.d.ts.map +1 -1
- package/dist/types/src/nanotdf/encrypt-dataset.d.ts +1 -2
- package/dist/types/src/nanotdf/encrypt-dataset.d.ts.map +1 -1
- package/dist/types/src/nanotdf/encrypt.d.ts +1 -2
- package/dist/types/src/nanotdf/encrypt.d.ts.map +1 -1
- package/dist/types/src/nanotdf/helpers/getHkdfSalt.d.ts +1 -2
- package/dist/types/src/nanotdf/helpers/getHkdfSalt.d.ts.map +1 -1
- package/dist/types/src/nanotdf-crypto/digest.d.ts +1 -2
- package/dist/types/src/nanotdf-crypto/digest.d.ts.map +1 -1
- package/dist/types/src/nanotdf-crypto/pemPublicToCrypto.d.ts.map +1 -1
- package/dist/types/src/opentdf.d.ts +29 -5
- package/dist/types/src/opentdf.d.ts.map +1 -1
- package/dist/types/src/seekable.d.ts.map +1 -1
- package/dist/types/src/utils.d.ts.map +1 -1
- package/dist/types/src/version.d.ts +1 -1
- package/dist/types/tdf3/index.d.ts +1 -1
- package/dist/types/tdf3/index.d.ts.map +1 -1
- package/dist/types/tdf3/src/assertions.d.ts +1 -2
- package/dist/types/tdf3/src/assertions.d.ts.map +1 -1
- package/dist/types/tdf3/src/client/index.d.ts +1 -6
- package/dist/types/tdf3/src/client/index.d.ts.map +1 -1
- package/dist/types/tdf3/src/client/validation.d.ts.map +1 -1
- package/dist/types/tdf3/src/crypto/crypto-utils.d.ts.map +1 -1
- package/dist/types/tdf3/src/crypto/salt.d.ts +2 -0
- package/dist/types/tdf3/src/crypto/salt.d.ts.map +1 -0
- package/dist/types/tdf3/src/models/key-access.d.ts.map +1 -1
- package/dist/types/tdf3/src/tdf.d.ts +4 -2
- package/dist/types/tdf3/src/tdf.d.ts.map +1 -1
- package/dist/web/src/auth/auth.js +1 -1
- package/dist/web/src/encodings/base64.js +1 -1
- package/dist/web/src/nanoclients.js +5 -5
- package/dist/web/src/nanotdf/Client.js +1 -1
- package/dist/web/src/nanotdf/NanoTDF.js +1 -1
- package/dist/web/src/nanotdf/encrypt-dataset.js +1 -1
- package/dist/web/src/nanotdf/encrypt.js +1 -1
- package/dist/web/src/nanotdf/helpers/getHkdfSalt.js +1 -1
- package/dist/web/src/nanotdf-crypto/digest.js +1 -1
- package/dist/web/src/nanotdf-crypto/pemPublicToCrypto.js +4 -27
- package/dist/web/src/opentdf.js +174 -44
- package/dist/web/src/version.js +1 -1
- package/dist/web/tdf3/index.js +1 -1
- package/dist/web/tdf3/src/assertions.js +1 -1
- package/dist/web/tdf3/src/crypto/salt.js +9 -0
- package/dist/web/tdf3/src/models/key-access.js +3 -2
- package/dist/web/tdf3/src/tdf.js +7 -3
- package/package.json +12 -12
- package/src/auth/auth.ts +2 -2
- package/src/encodings/base64.ts +1 -1
- package/src/nanoclients.ts +9 -16
- package/src/nanotdf/Client.ts +2 -3
- package/src/nanotdf/NanoTDF.ts +1 -2
- package/src/nanotdf/encrypt-dataset.ts +1 -2
- package/src/nanotdf/encrypt.ts +1 -2
- package/src/nanotdf/helpers/getHkdfSalt.ts +1 -3
- package/src/nanotdf-crypto/digest.ts +1 -3
- package/src/nanotdf-crypto/pemPublicToCrypto.ts +3 -33
- package/src/opentdf.ts +249 -54
- package/src/version.ts +1 -1
- package/tdf3/index.ts +2 -1
- package/tdf3/src/assertions.ts +2 -2
- package/tdf3/src/crypto/salt.ts +11 -0
- package/tdf3/src/models/key-access.ts +2 -1
- package/tdf3/src/tdf.ts +19 -5
- package/dist/cjs/src/tdf/TypedArray.js +0 -3
- package/dist/types/src/tdf/TypedArray.d.ts +0 -2
- package/dist/types/src/tdf/TypedArray.d.ts.map +0 -1
- package/dist/web/src/tdf/TypedArray.js +0 -2
- package/src/tdf/TypedArray.ts +0 -10
|
@@ -123,4 +123,4 @@ function concatenateUint8Arrays(array1, array2) {
|
|
|
123
123
|
combinedArray.set(array2, array1.length);
|
|
124
124
|
return combinedArray;
|
|
125
125
|
}
|
|
126
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
126
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXNzZXJ0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3RkZjMvc3JjL2Fzc2VydGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ25ELE9BQU8sRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQzFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDM0QsT0FBTyxFQUFFLGtCQUFrQixFQUFFLGNBQWMsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBb0MzRjs7OztHQUlHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxJQUFJLENBQUMsQ0FBWTtJQUNyQyxNQUFNLE1BQU0sR0FBRyxjQUFjLENBQUMsQ0FBQyxFQUFFLEVBQUUsT0FBTyxFQUFFLENBQUMsU0FBUyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBRXJGLE1BQU0sSUFBSSxHQUFHLE1BQU0sTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLElBQUksV0FBVyxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7SUFDckYsT0FBTyxHQUFHLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLENBQUM7QUFDckMsQ0FBQztBQUVEOzs7Ozs7O0dBT0c7QUFDSCxLQUFLLFVBQVUsSUFBSSxDQUNqQixJQUFlLEVBQ2YsYUFBcUIsRUFDckIsR0FBVyxFQUNYLEdBQWlCO0lBRWpCLE1BQU0sT0FBTyxHQUFxQjtRQUNoQyxhQUFhO1FBQ2IsWUFBWSxFQUFFLEdBQUc7S0FDbEIsQ0FBQztJQUVGLElBQUksS0FBYSxDQUFDO0lBQ2xCLElBQUksQ0FBQztRQUNILEtBQUssR0FBRyxNQUFNLElBQUksT0FBTyxDQUFDLE9B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
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
const generateSalt = async () => {
|
|
2
|
+
const encoder = new TextEncoder();
|
|
3
|
+
const data = encoder.encode('TDF');
|
|
4
|
+
// Generate hash
|
|
5
|
+
const hashBuffer = await crypto.subtle.digest('SHA-256', data);
|
|
6
|
+
return new Uint8Array(hashBuffer);
|
|
7
|
+
};
|
|
8
|
+
export const ztdfSalt = generateSalt();
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2FsdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3RkZjMvc3JjL2NyeXB0by9zYWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE1BQU0sWUFBWSxHQUFHLEtBQUssSUFBSSxFQUFFO0lBQzlCLE1BQU0sT0FBTyxHQUFHLElBQUksV0FBVyxFQUFFLENBQUM7SUFDbEMsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUVuQyxnQkFBZ0I7SUFDaEIsTUFBTSxVQUFVLEdBQUcsTUFBTSxNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFFL0QsT0FBTyxJQUFJLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQztBQUNwQyxDQUFDLENBQUM7QUFFRixNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsWUFBWSxFQUFFLENBQUMifQ==
|
|
@@ -5,6 +5,7 @@ import { pemPublicToCrypto } from '../../../src/nanotdf-crypto/pemPublicToCrypto
|
|
|
5
5
|
import { cryptoPublicToPem } from '../../../src/utils.js';
|
|
6
6
|
import { Binary } from '../binary.js';
|
|
7
7
|
import * as cryptoService from '../crypto/index.js';
|
|
8
|
+
import { ztdfSalt } from '../crypto/salt.js';
|
|
8
9
|
export const schemaVersion = '1.0';
|
|
9
10
|
export class ECWrapped {
|
|
10
11
|
constructor(url, kid, publicKey, metadata, sid) {
|
|
@@ -26,7 +27,7 @@ export class ECWrapped {
|
|
|
26
27
|
pemPublicToCrypto(this.publicKey),
|
|
27
28
|
]);
|
|
28
29
|
const kek = await keyAgreement(ek.privateKey, clientPublicKey, {
|
|
29
|
-
hkdfSalt:
|
|
30
|
+
hkdfSalt: await ztdfSalt,
|
|
30
31
|
hkdfHash: 'SHA-256',
|
|
31
32
|
});
|
|
32
33
|
const iv = generateRandomNumber(12);
|
|
@@ -94,4 +95,4 @@ export class Wrapped {
|
|
|
94
95
|
return this.keyAccessObject;
|
|
95
96
|
}
|
|
96
97
|
}
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5LWFjY2Vzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3RkZjMvc3JjL21vZGVscy9rZXktYWNjZXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0scURBQXFELENBQUM7QUFDM0YsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZDQUE2QyxDQUFDO0FBQzNFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGtEQUFrRCxDQUFDO0FBQ3JGLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzFELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDdEMsT0FBTyxLQUFLLGFBQWEsTUFBTSxvQkFBb0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFLN0MsTUFBTSxDQUFDLE1BQU0sYUFBYSxHQUFHLEtBQUssQ0FBQztBQUVuQyxNQUFNLE9BQU8sU0FBUztJQUtwQixZQUNrQixHQUFXLEVBQ1gsR0FBdUIsRUFDdkIsU0FBaUIsRUFDakIsUUFBaUIsRUFDakIsR0FBWTtRQUpaLFFBQUcsR0FBSCxHQUFHLENBQVE7UUFDWCxRQUFHLEdBQUgsR0FBRyxDQUFvQjtRQUN2QixjQUFTLEdBQVQsU0FBUyxDQUFRO1FBQ2pCLGFBQVEsR0FBUixRQUFRLENBQVM7UUFDakIsUUFBRyxHQUFILEdBQUcsQ0FBUztRQVRyQixTQUFJLEdBQUcsWUFBWSxDQUFDO1FBVzNCLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FDL0M7WUFDRSxJQUFJLEVBQUUsTUFBTTtZQUNaLFVBQVUsRUFBRSxPQUFPO1NBQ3BCLEVBQ0QsS0FBSyxFQUNMLENBQUMsWUFBWSxFQUFF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
|
package/dist/web/tdf3/src/tdf.js
CHANGED
|
@@ -15,6 +15,7 @@ import { DecoratedReadableStream } from './client/DecoratedReadableStream.js';
|
|
|
15
15
|
import { ECWrapped, Wrapped, } from './models/index.js';
|
|
16
16
|
import { unsigned } from './utils/buffer-crc32.js';
|
|
17
17
|
import { ZipReader, ZipWriter, keyMerge, concatUint8 } from './utils/index.js';
|
|
18
|
+
import { ztdfSalt } from './crypto/salt.js';
|
|
18
19
|
// TODO: input validation on manifest JSON
|
|
19
20
|
const DEFAULT_SEGMENT_SIZE = 1024 * 1024;
|
|
20
21
|
function mailbox() {
|
|
@@ -382,7 +383,7 @@ async function unwrapKey({ manifest, allowedKases, authProvider, dpopKeys, concu
|
|
|
382
383
|
const serverEphemeralKey = await pemPublicToCrypto(sessionPublicKey);
|
|
383
384
|
const ekr = ephemeralEncryptionKeysRaw;
|
|
384
385
|
const kek = await keyAgreement(ekr.privateKey, serverEphemeralKey, {
|
|
385
|
-
hkdfSalt:
|
|
386
|
+
hkdfSalt: await ztdfSalt,
|
|
386
387
|
hkdfHash: 'SHA-256',
|
|
387
388
|
});
|
|
388
389
|
const wrappedKeyAndNonce = base64.decodeArrayBuffer(entityWrappedKey);
|
|
@@ -519,6 +520,10 @@ export async function sliceAndDecrypt({ buffer, reconstructedKeyBinary, slice, c
|
|
|
519
520
|
}
|
|
520
521
|
}
|
|
521
522
|
export async function readStream(cfg) {
|
|
523
|
+
const overview = await loadTDFStream(cfg.chunker);
|
|
524
|
+
return decryptStreamFrom(cfg, overview);
|
|
525
|
+
}
|
|
526
|
+
export async function decryptStreamFrom(cfg, { manifest, zipReader, centralDirectory }) {
|
|
522
527
|
let { allowList } = cfg;
|
|
523
528
|
if (!allowList) {
|
|
524
529
|
if (!cfg.allowedKases) {
|
|
@@ -526,7 +531,6 @@ export async function readStream(cfg) {
|
|
|
526
531
|
}
|
|
527
532
|
allowList = new OriginAllowList(cfg.allowedKases);
|
|
528
533
|
}
|
|
529
|
-
const { manifest, zipReader, centralDirectory } = await loadTDFStream(cfg.chunker);
|
|
530
534
|
if (!manifest) {
|
|
531
535
|
throw new InvalidFileError('Missing manifest data');
|
|
532
536
|
}
|
|
@@ -624,4 +628,4 @@ async function concatenateUint8Array(uint8arrays) {
|
|
|
624
628
|
const buffer = await blob.arrayBuffer();
|
|
625
629
|
return new Uint8Array(buffer);
|
|
626
630
|
}
|
|
627
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tdf.js","sourceRoot":"","sources":["../../../../tdf3/src/tdf.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAE9C,OAAO,EAGL,eAAe,EACf,cAAc,IAAI,gBAAgB,EAClC,eAAe,EACf,uBAAuB,GACxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAqB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,cAAc,EACd,uBAAuB,IAAI,gBAAgB,GAC5C,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAGlF,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAG3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAO9E,OAAO,EACL,SAAS,EAMT,OAAO,GAIR,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/E,0CAA0C;AAC1C,MAAM,oBAAoB,GAAG,IAAI,GAAG,IAAI,CAAC;AAmDzC,SAAS,OAAO;IACd,IAAI,GAAuB,CAAC;IAC5B,IAAI,MAA8B,CAAC;IAEnC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;QACnD,GAAG,GAAG,OAAO,CAAC;QACd,MAAM,GAAG,QAAQ,CAAC;IACpB,CAAC,CAAe,CAAC;IAEjB,OAAO,CAAC,GAAG,GAAG,GAAI,CAAC;IACnB,OAAO,CAAC,MAAM,GAAG,MAAO,CAAC;IAEzB,OAAO,OAAO,CAAC;AACjB,CAAC;AAwED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,GAAW,EACX,SAAiC;IAEjC,OAAO,gBAAgB,CAAC,GAAG,EAAE,SAAS,IAAI,UAAU,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,SAAiB,EACjB,GAA0B;IAE1B,IAAI,GAAG,GAAW,SAAS,CAAC;IAE5B,wEAAwE;IACxE,yCAAyC;IACzC,IAAI,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QACtC,MAAM,CAAC,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;QACvC,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QACnE,GAAG,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,IAAI,EACJ,GAAG,EACH,SAAS,EACT,GAAG,EACH,QAAQ,EACR,GAAG,GAAG,EAAE,EACR,GAAG,GAAG,UAAU,GACD;IACf,yEAAyE;IACzE,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,kBAAkB,CAAC,oDAAoD,CAAC,CAAC;IACrF,CAAC;SAAM,IAAI,CAAC,GAAG,EAAE,CAAC;QAChB,MAAM,IAAI,kBAAkB,CAAC,+BAA+B,CAAC,CAAC;IAChE,CAAC;SAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtB,MAAM,IAAI,kBAAkB,CAAC,uCAAuC,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,MAAc,CAAC;IACnB,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,uBAAuB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IACzD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,kBAAkB,CAC1B,2CAA2C,SAAS,iBAAiB,CAAC,GAAG,EACzE,CAAC,CACF,CAAC;IACJ,CAAC;IACD,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,SAAS;YACZ,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QACtD,KAAK,YAAY;YACf,OAAO,IAAI,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QACxD;YACE,MAAM,IAAI,kBAAkB,CAAC,oCAAoC,IAAI,kBAAkB,CAAC,CAAC;IAC7F,CAAC;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,MAAc;IACjD,MAAM,aAAa,GAAa,EAAE,CAAC;IAEnC,IAAI,CAAC,MAAM,CAAC,IAAI;QAAE,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7C,IAAI,CAAC,MAAM,CAAC,IAAI;QAAE,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC5D,IAAI,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM;QAAE,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAE1E,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;QACzB,MAAM,IAAI,kBAAkB,CAC1B,8DAA8D,aAAa,EAAE,CAC9E,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,OAAgB,EAChB,qBAA+B,EAC/B,MAAc,EACd,QAA4B;IAE5B,8CAA8C;IAC9C,MAAM,OAAO,GAAG;QACd,IAAI,EAAE,WAAW;QACjB,GAAG,EAAE,WAAW;QAChB,QAAQ,EAAE,KAAK;QACf,WAAW,EAAE,IAAI;QACjB,GAAG,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,CAAC;KAC9B,CAAC;IAEF,MAAM,wBAAwB,GAAG,MAAM,qBAAqB,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpF,MAAM,UAAU,GAA2B,EAAE,CAAC;IAC9C,OAAO;QACL,OAAO;QACP,yEAAyE;QACzE,qBAAqB,EAAE,wBAAwB;QAC/C,UAAU,EAAE,UAAU;QACtB,aAAa,EAAE,cAAc;KAC9B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,YAAwB,EACxB,OAAmB,EACnB,aAAiC;IAEjC,QAAQ,aAAa,CAAC,WAAW,EAAE,EAAE,CAAC;QACpC,KAAK,MAAM;YACT,oDAAoD;YACpD,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5B,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,6BAA6B;YAC7B,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAC7C,KAAK,EACL,YAAY,EACZ;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;aAC1B,EACD,IAAI,EACJ,CAAC,MAAM,EAAE,QAAQ,CAAC,CACnB,CAAC;YACF,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;YACvE,OAAO,IAAI,UAAU,CAAC,SAAS,CAAC,CAAC;QACnC,CAAC;QACD;YACE,MAAM,IAAI,kBAAkB,CAAC,8BAA8B,aAAa,GAAG,CAAC,CAAC;IACjF,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,GAAyB;IACzD,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;QACtB,MAAM,IAAI,kBAAkB,CAAC,qCAAqC,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;QACvB,MAAM,IAAI,kBAAkB,CAAC,yBAAyB,CAAC,CAAC;IAC1D,CAAC;IAED,4DAA4D;IAC5D,MAAM,YAAY,GAAc,EAAE,CAAC;IAEnC,GAAG,CAAC,SAAS,KAAK,MAAM,CAAC,gBAAgB,CAAC;IAE1C,MAAM,UAAU,GAAgB;QAC9B;YACE,QAAQ,EAAE,WAAW;SACtB;QACD;YACE,QAAQ,EAAE,iBAAiB;SAC5B;KACF,CAAC;IAEF,IAAI,aAAa,GAAG,IAAI,UAAU,EAAE,CAAC;IAErC,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,MAAM,eAAe,GAAiB,EAAE,CAAC;IAEzC,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;IAClC,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CACtC,GAAG,CAAC,cAAc,EAClB,GAAG,CAAC,qBAAqB,EACzB,GAAG,CAAC,MAAM,EACV,GAAG,CAAC,QAAQ,CACb,CAAC;IAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,2CAA2C;QAC3C,MAAM,IAAI,kBAAkB,CAAC,gEAAgE,CAAC,CAAC;IACjG,CAAC;IAED,yDAAyD;IACzD,MAAM,EAAE,kBAAkB,EAAE,GAAG,GAAG,CAAC;IACnC,MAAM,eAAe,GAAG,MAAM,GAAG,CAAC,qBAAqB,CAAC,OAAO,CAC7D,MAAM,CAAC,eAAe,CAAC,IAAI,WAAW,CAAC,kBAAkB,CAAC,CAAC,EAC3D,GAAG,CAAC,gBAAgB,CAAC,kBAAkB,CACxC,CAAC;IACF,MAAM,aAAa,GAAG,IAAI,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAC5E,MAAM,2BAA2B,GAAG,aAAa,CAAC,MAAM,CAAC;IAEzD,4BAA4B;IAC5B,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,WAAW,CAAC;IACrC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,cAAc,CAAC;IACtC,MAAM,YAAY,GAAG,GAAG,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;IAEnD;;;;;;;MAOE;IACF,MAAM,eAAe,GAAG;QACtB,KAAK,EAAE,CAAC,UAA2C,EAAE,EAAE;YACrD,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YACtD,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC/C,UAAU,GAAG,CAAC,CAAC;YACf,aAAa,GAAG,CAAC,CAAC;QACpB,CAAC;QAED,IAAI,EAAE,KAAK,EAAE,UAA2C,EAAE,EAAE;YAC1D,IAAI,MAAM,CAAC;YAEX,OAAO,aAAa,CAAC,MAAM,GAAG,kBAAkB,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC5D,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,CAAC;gBAClD,MAAM,GAAG,IAAI,CAAC;gBACd,IAAI,KAAK,EAAE,CAAC;oBACV,aAAa,GAAG,WAAW,CAAC,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC;gBACtD,CAAC;YACH,CAAC;YAED,OACE,aAAa,CAAC,MAAM,IAAI,kBAAkB;gBAC1C,CAAC,CAAC,UAAU,CAAC,WAAW;gBACxB,UAAU,CAAC,WAAW,GAAG,CAAC,EAC1B,CAAC;gBACD,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;gBAC3D,MAAM,gBAAgB,GAAG,MAAM,uBAAuB,CAAC,OAAO,CAAC,CAAC;gBAChE,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;gBAErC,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC1D,CAAC;YAED,MAAM,gBAAgB,GAAG,MAAM,IAAI,aAAa,CAAC,MAAM,CAAC;YAExD,IAAI,gBAAgB,EAAE,CAAC;gBACrB,MAAM,gBAAgB,GAAG,MAAM,uBAAuB,CAAC,aAAa,CAAC,CAAC;gBACtE,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;gBACrC,aAAa,GAAG,IAAI,UAAU,EAAE,CAAC;YACnC,CAAC;YAED,IAAI,MAAM,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,UAAU,CAAC;gBACtC,UAAU,CAAC,CAAC,CAAC,CAAC,aAAa,GAAG,aAAa,CAAC;gBAC5C,MAAM,qBAAqB,GAAG,SAAS,CAAC,mBAAmB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;gBAEvF,UAAU,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;gBAC1C,WAAW,CAAC,qBAAqB,CAAC,CAAC;gBAEnC,uBAAuB;gBACvB,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,iBAAiB,CAAC;gBAC3C,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,cAAc,CAAC;gBACtC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACtD,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC/C,UAAU,GAAG,CAAC,CAAC;gBACf,aAAa,GAAG,CAAC,CAAC;gBAElB,gCAAgC;gBAChC,MAAM,aAAa,GAAG,MAAM,qBAAqB,CAAC,eAAe,CAAC,CAAC;gBAEnE,MAAM,UAAU,GAAG,MAAM,YAAY,CACnC,IAAI,UAAU,CAAC,GAAG,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,EACvE,aAAa,EACb,GAAG,CAAC,kBAAkB,CACvB,CAAC;gBAEF,MAAM,OAAO,GAAG,MAAM,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;gBACrD,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,aAAa,CAAC,GAAG,GAAG,OAAO,CAAC;gBAChF,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,aAAa,CAAC,GAAG;oBACnE,GAAG,CAAC,kBAAkB,CAAC;gBAEzB,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;gBAC5F,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,2BAA2B;oBAC7E,2BAA2B,CAAC;gBAC9B,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,cAAc;oBAChE,GAAG,CAAC,yBAAyB,CAAC;gBAChC,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,QAAQ,GAAG,YAAY,CAAC;gBAE5E,QAAQ,CAAC,qBAAqB,CAAC,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC;gBAE1D,MAAM,gBAAgB,GAA2B,EAAE,CAAC;gBACpD,IAAI,GAAG,CAAC,gBAAgB,IAAI,GAAG,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5D,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE;wBACjD,oDAAoD;wBACpD,MAAM,UAAU,GAAiB,eAAe,CAAC,UAAU,IAAI;4BAC7D,GAAG,EAAE,OAAO;4BACZ,GAAG,EAAE,IAAI,UAAU,CAAC,GAAG,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC;yBAC7E,CAAC;wBACF,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,eAAe,CAAC,aAAa,EAAE;4BAChE,GAAG,eAAe;4BAClB,UAAU;yBACX,CAAC,CAAC;wBAEH,qDAAqD;wBACrD,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBACnC,CAAC,CAAC,CACH,CAAC;gBACJ,CAAC;gBAED,QAAQ,CAAC,UAAU,GAAG,gBAAgB,CAAC;gBAEvC,qBAAqB;gBACrB,MAAM,cAAc,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC1E,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;gBACnC,WAAW,CAAC,cAAc,CAAC,CAAC;gBAC5B,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,UAAU,CAAC;gBACtC,UAAU,CAAC,CAAC,CAAC,CAAC,aAAa,GAAG,aAAa,CAAC;gBAC5C,MAAM,sBAAsB,GAAG,SAAS,CAAC,mBAAmB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;gBACxF,UAAU,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;gBAC3C,WAAW,CAAC,sBAAsB,CAAC,CAAC;gBAEpC,kCAAkC;gBAClC,MAAM,yBAAyB,GAAG,cAAc,CAAC;gBACjD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC3C,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;oBAChC,MAAM,MAAM,GAAG,SAAS,CAAC,2BAA2B,CAClD,SAAS,CAAC,aAAa,IAAI,CAAC,EAC5B,SAAS,CAAC,QAAQ,EAClB,SAAS,CAAC,MAAM,IAAI,CAAC,EACrB,SAAS,CAAC,UAAU,IAAI,CAAC,EACzB,UAAU,CACX,CAAC;oBACF,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;oBAC3B,WAAW,CAAC,MAAM,CAAC,CAAC;gBACtB,CAAC;gBACD,MAAM,8BAA8B,GAAG,cAAc,GAAG,yBAAyB,CAAC;gBAClF,MAAM,UAAU,GAAG,SAAS,CAAC,gCAAgC,CAC3D,UAAU,CAAC,MAAM,EACjB,8BAA8B,EAC9B,yBAAyB,CAC1B,CAAC;gBACF,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBAC/B,WAAW,CAAC,UAAU,CAAC,CAAC;gBAExB,UAAU,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;KACF,CAAC;IAEF,MAAM,eAAe,GAAG,IAAI,uBAAuB,CAAC,eAAe,CAAC,CAAC;IACrE,eAAe,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAEpC,OAAO,eAAe,CAAC;IAEvB,qBAAqB;IACrB,SAAS,SAAS,CAAC,QAAgB;QACjC,OAAO,SAAS,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,SAAS,WAAW,CAAC,KAA0B;QAC7C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1C,CAAC;QACD,cAAc,IAAI,KAAK,CAAC,MAAM,CAAC;QAC/B,IAAI,cAAc,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YACnC,MAAM,IAAI,kBAAkB,CAAC,oBAAoB,GAAG,CAAC,SAAS,YAAY,CAAC,CAAC;QAC9E,CAAC;QACD,mEAAmE;QACnE,UAAU,GAAG,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACzC,aAAa,IAAI,KAAK,CAAC,MAAM,CAAC;IAChC,CAAC;IAED,KAAK,UAAU,uBAAuB,CAAC,KAAiB;QACtD,cAAc,IAAI,KAAK,CAAC,MAAM,CAAC;QAC/B,GAAG,CAAC,eAAe,EAAE,CAAC,cAAc,CAAC,CAAC;QAEtC,wHAAwH;QACxH,MAAM,eAAe,GAAG,MAAM,GAAG,CAAC,qBAAqB,CAAC,OAAO,CAC7D,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,EACpC,GAAG,CAAC,gBAAgB,CAAC,kBAAkB,CACxC,CAAC;QACF,MAAM,aAAa,GAAG,IAAI,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QAC5E,MAAM,UAAU,GAAG,MAAM,YAAY,CACnC,IAAI,UAAU,CAAC,GAAG,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,EACvE,IAAI,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,EACvD,GAAG,CAAC,yBAAyB,CAC9B,CAAC;QAEF,eAAe,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QAEjD,YAAY,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,MAAM,CAAC,iBAAiB,CAAC,UAAU,CAAC;YAC1C,WAAW,EAAE,KAAK,CAAC,MAAM,KAAK,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM;YAC3E,oBAAoB,EAClB,aAAa,CAAC,MAAM,KAAK,2BAA2B,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM;SAC1F,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QACrE,WAAW,CAAC,MAAM,CAAC,CAAC;QAEpB,OAAO,MAAM,CAAC;IAChB,CAAC;AACH,CAAC;AAED,iFAAiF;AACjF,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAgB;IAEhB,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,gBAAgB,GAAG,MAAM,SAAS,CAAC,mBAAmB,EAAE,CAAC;IAC/D,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IAClF,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,SAA4B,EAC5B,YAA6B;IAE7B,MAAM,OAAO,GAAG,CAAC,CAAkB,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACnE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;IAEhE,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAClF,IAAI,QAAQ,CAAC,IAAI,GAAG,gBAAgB,CAAC,IAAI,EAAE,CAAC;QAC1C,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5F,MAAM,IAAI,cAAc,CACtB,qDAAqD,IAAI,CAAC,SAAS,CAAC;YAClE,GAAG,eAAe;SACnB,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,EAAE,EACnD,GAAG,eAAe,CACnB,CAAC;IACJ,CAAC;IACD,MAAM,eAAe,GAAoD,MAAM,CAAC,WAAW,CACzF,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAClC,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC5B,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;QACnD,IAAI,GAAG,CAAC,GAAG,IAAI,WAAW,EAAE,CAAC;YAC3B,MAAM,IAAI,gBAAgB,CACxB,yDAAyD,GAAG,CAAC,GAAG,eAAe,GAAG,CAAC,GAAG,GAAG,CAC1F,CAAC;QACJ,CAAC;QACD,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACjB,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QAC7B,CAAC;IACH,CAAC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAOD,KAAK,UAAU,SAAS,CAAC,EACvB,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,oBAAoB,GASrB;IACC,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,IAAI,kBAAkB,CAC1B,yEAAyE,CAC1E,CAAC;IACJ,CAAC;IACD,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,qBAAqB,CAAC;IACrD,MAAM,eAAe,GAAG,uBAAuB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IAEzE,KAAK,UAAU,YAAY,CAAC,YAA6B;QACvD,MAAM,GAAG,GAAG,GAAG,YAAY,CAAC,GAAG,YAAY,CAAC;QAC5C,IAAI,0BAAsC,CAAC;QAC3C,IAAI,uBAAmC,CAAC;QACxC,IAAI,oBAAoB,KAAK,cAAc,EAAE,CAAC;YAC5C,0BAA0B,GAAG,MAAM,eAAe,EAAE,CAAC;YACrD,uBAAuB,GAAG,MAAM,aAAa,CAAC,eAAe,CAAC,0BAA0B,CAAC,CAAC;QAC5F,CAAC;aAAM,IAAI,oBAAoB,KAAK,UAAU,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACxE,0BAA0B,GAAG,MAAM,aAAa,CAAC,eAAe,EAAE,CAAC;YACnE,uBAAuB,GAAG,MAAM,aAAa,CAAC,eAAe,CAAC,0BAA0B,CAAC,CAAC;QAC5F,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,kBAAkB,CAAC,uCAAuC,oBAAoB,GAAG,CAAC,CAAC;QAC/F,CAAC;QAED,MAAM,eAAe,GAAG,uBAAuB,CAAC,SAAS,CAAC;QAE1D,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC;YACpC,SAAS,EAAE,OAAO;YAClB,SAAS,EAAE,YAAY;YACvB,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC,MAAM;YAC7C,eAAe;SAChB,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC;QACnD,MAAM,kBAAkB,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;QAE/E,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,MAAM,eAAe,CAC5E,GAAG,EACH,EAAE,kBAAkB,EAAE,EACtB,YAAY,EACZ,OAAO,CACR,CAAC;QAEF,IAAI,oBAAoB,KAAK,cAAc,EAAE,CAAC;YAC5C,MAAM,kBAAkB,GAAc,MAAM,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;YAChF,MAAM,GAAG,GAAG,0BAA2C,CAAC;YACxD,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,kBAAkB,EAAE;gBACjE,QAAQ,EAAE,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;gBAC1C,QAAQ,EAAE,SAAS;aACpB,CAAC,CAAC;YACH,MAAM,kBAAkB,GAAG,MAAM,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;YACtE,MAAM,EAAE,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAEhD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;YAElF,OAAO;gBACL,GAAG,EAAE,IAAI,UAAU,CAAC,GAAG,CAAC;gBACxB,QAAQ;aACT,CAAC;QACJ,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAC/D,MAAM,kBAAkB,GAAG,MAAM,aAAa,CAAC,qBAAqB,CAClE,GAAG,EACH,uBAAuB,CAAC,UAAU,CACnC,CAAC;QAEF,OAAO;YACL,GAAG,EAAE,IAAI,UAAU,CAAC,kBAAkB,CAAC,WAAW,EAAE,CAAC;YACrD,QAAQ;SACT,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,IAAI,gBAAgB,KAAK,SAAS,IAAI,gBAAgB,GAAG,CAAC,EAAE,CAAC;QAC3D,QAAQ,GAAG,gBAAgB,CAAC;IAC9B,CAAC;IACD,MAAM,aAAa,GAAsD,EAAE,CAAC;IAC5E,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;QACnD,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE,CAAC;YACnD,MAAM,IAAI,cAAc,CACtB,wDAAwD,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,EACjF,EAAE,CACH,CAAC;QACJ,CAAC;QACD,MAAM,WAAW,GAAsD,EAAE,CAAC;QAC1E,KAAK,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7D,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,IAAI,EAAE;gBAC5B,IAAI,CAAC;oBACH,OAAO,MAAM,YAAY,CAAC,YAAY,CAAC,CAAC;gBAC1C,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM,iBAAiB,CAAC,CAAU,CAAC,CAAC;gBACtC,CAAC;YACH,CAAC,CAAC;QACJ,CAAC;QACD,aAAa,CAAC,OAAO,CAAC,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QAC5D,2BAA2B;QAC3B,MAAM,gBAAgB,GAAG,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAClE,OAAO;YACL,sBAAsB,EAAE,MAAM,CAAC,eAAe,CAAC,gBAAgB,CAAC;YAChE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,gCAAgC;SACrE,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,YAAY,cAAc,EAAE,CAAC;YAChC,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;YACxB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxB,MAAM,MAAM,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;QACD,MAAM,CAAC,CAAC;IACV,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAY;IACrC,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAoB,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;QAC3E,OAAO,IAAI,YAAY,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,cAA0B,EAC1B,sBAA8B,EAC9B,IAAY,EACZ,MAAuB,EACvB,yBAA6C,EAC7C,WAAoB;IAEpB,IAAI,yBAAyB,KAAK,MAAM,IAAI,yBAAyB,KAAK,OAAO,EAAE,CAAC;QAClF,MAAM,IAAI,gBAAgB,CAAC,8BAA8B,yBAAyB,GAAG,CAAC,CAAC;IACzF,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,YAAY,CACnC,IAAI,UAAU,CAAC,sBAAsB,CAAC,aAAa,EAAE,CAAC,EACtD,cAAc,EACd,yBAAyB,CAC1B,CAAC;IAEF,MAAM,WAAW,GAAG,WAAW;QAC7B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAClD,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAEzC,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;QACzB,MAAM,IAAI,cAAc,CAAC,wCAAwC,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,MAAM,MAAM,CAAC,OAAO,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAAC;AACtE,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,QAAiB,EACjB,gBAAoC,EACpC,SAAoB,EACpB,sBAA8B,EAC9B,MAAuB,EACvB,yBAA6C,EAC7C,aAA4B,EAC5B,WAAoB;IAEpB,MAAM,mBAAmB,GAAG,GAAG,CAAC;IAChC,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,MAAM,SAAS,GAAG,CAAC,CAAC;IAEpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,mBAAmB,EAAE,CAAC;QAC9D,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAClC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC5B,QAAQ,GAAG,EAAE,CAAC;QAChB,CAAC;QACD,QAAQ,CAAC,IAAI,CACX,CAAC,KAAK,IAAI,EAAE;YACV,IAAI,MAAyB,CAAC;YAE9B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,CAAC;YACzD,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAC7B,CAAC,UAAU,EAAE,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAAC,UAAU,GAAI,oBAA+B,EACvF,CAAC,CACF,CAAC;gBACF,MAAM,GAAG,MAAM,SAAS,CAAC,iBAAiB,CACxC,gBAAgB,EAChB,WAAW,EACX,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,EACxB,UAAU,CACX,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,YAAY,gBAAgB,EAAE,CAAC;oBAClC,MAAM,CAAC,CAAC;gBACV,CAAC;gBACD,MAAM,IAAI,YAAY,CAAC,iCAAiC,EAAE,CAAC,CAAC,CAAC;YAC/D,CAAC;YACD,IAAI,MAAM,EAAE,CAAC;gBACX,eAAe,CAAC;oBACd,MAAM;oBACN,aAAa;oBACb,sBAAsB;oBACtB,KAAK;oBACL,MAAM;oBACN,yBAAyB;oBACzB,WAAW;iBACZ,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,EAAE,CACL,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EACpC,MAAM,EACN,sBAAsB,EACtB,KAAK,EACL,MAAM,EACN,yBAAyB,EACzB,WAAW,GASZ;IACC,KAAK,MAAM,KAAK,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,EAAE,eAAe,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAEjF,MAAM,MAAM,GACV,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC;QAChG,MAAM,cAAc,GAAG,IAAI,UAAU,CACnC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAI,oBAA+B,CAAC,CAChE,CAAC;QAEF,IAAI,cAAc,CAAC,MAAM,KAAK,oBAAoB,EAAE,CAAC;YACnD,MAAM,IAAI,YAAY,CAAC,gCAAgC,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAC/B,cAAc,EACd,sBAAsB,EACtB,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,EACpB,MAAM,EACN,yBAAyB,EACzB,WAAW,CACZ,CAAC;YACF,IAAI,gBAAgB,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,gBAAgB,EAAE,CAAC;gBACrE,MAAM,IAAI,YAAY,CACpB,kCAAkC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,gBAAgB,gBAAgB,GAAG,CAC7F,CAAC;YACJ,CAAC;YACD,KAAK,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,KAAK,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,GAAyB;IACxD,IAAI,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC;IACxB,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,IAAI,kBAAkB,CAAC,yCAAyC,CAAC,CAAC;QAC1E,CAAC;QACD,SAAS,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnF,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,gBAAgB,CAAC,uBAAuB,CAAC,CAAC;IACtD,CAAC;IACD,GAAG,CAAC,aAAa,KAAK,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC;IAEzC,MAAM,EACJ,2BAA2B,EAAE,kBAAkB,EAC/C,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,QAAQ,GACT,GAAG,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC;IACxD,MAAM,EAAE,QAAQ,EAAE,sBAAsB,EAAE,GAAG,MAAM,SAAS,CAAC;QAC3D,QAAQ;QACR,YAAY,EAAE,GAAG,CAAC,YAAY;QAC9B,YAAY,EAAE,SAAS;QACvB,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,aAAa,EAAE,GAAG,CAAC,aAAa;KACjC,CAAC,CAAC;IACH,sLAAsL;IACtL,MAAM,gBAAgB,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;IACzE,MAAM,2BAA2B,GAAG,kBAAkB,IAAI,oBAAoB,CAAC;IAE/E,mCAAmC;IACnC,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,IAAI,QAAQ,CAAC,gBAAgB,CAAC;IACxE,MAAM,WAAW,GAAG,CAAC,WAAW,IAAI,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAEjE,0DAA0D;IAC1D,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAClC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAC7D,CAAC;IAEF,0DAA0D;IAC1D,MAAM,aAAa,GAAG,MAAM,qBAAqB,CAAC,eAAe,CAAC,CAAC;IAEnE,MAAM,kBAAkB,GAAG,aAAa,CAAC,GAAG,CAAC;IAC7C,IAAI,kBAAkB,KAAK,MAAM,IAAI,kBAAkB,KAAK,OAAO,EAAE,CAAC;QACpE,MAAM,IAAI,gBAAgB,CAAC,8BAA8B,kBAAkB,GAAG,CAAC,CAAC;IAClF,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,YAAY,CACnC,IAAI,UAAU,CAAC,gBAAgB,CAAC,aAAa,EAAE,CAAC,EAChD,aAAa,EACb,kBAAkB,CACnB,CAAC;IAEF,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC;QAC5B,KAAK,MAAM,SAAS,IAAI,QAAQ,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC;YAClD,iCAAiC;YACjC,IAAI,YAAY,GAAiB;gBAC/B,GAAG,EAAE,OAAO;gBACZ,GAAG,EAAE,IAAI,UAAU,CAAC,sBAAsB,CAAC,aAAa,EAAE,CAAC;aAC5D,CAAC;YAEF,IAAI,GAAG,CAAC,yBAAyB,EAAE,CAAC;gBAClC,MAAM,QAAQ,GAAG,GAAG,CAAC,yBAAyB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBAClE,IAAI,QAAQ,EAAE,CAAC;oBACb,YAAY,GAAG,QAAQ,CAAC;gBAC1B,CAAC;YACH,CAAC;YACD,MAAM,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,aAAa,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAG,WAAW;QACzB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAClD,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAEzC,IAAI,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,aAAa,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC;QACtF,MAAM,IAAI,cAAc,CAAC,0CAA0C,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,mBAAmB,GAAG,CAAC,CAAC;IAC5B,MAAM,QAAQ,GAAG,IAAI,GAAG,CACtB,QAAQ,CAAC,GAAG,CACV,CAAC,EACC,IAAI,EACJ,oBAAoB,GAAG,2BAA2B,EAClD,WAAW,GAAG,kBAAkB,GACjC,EAAE,EAAE;QACH,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE;YACnB,MAAM,KAAK,GAAU;gBACnB,IAAI;gBACJ,eAAe,EAAE,mBAAmB;gBACpC,oBAAoB;gBACpB,cAAc,EAAE,OAAO,EAAiB;gBACxC,gBAAgB,EAAE,WAAW;aAC9B,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,EAAE,CAAC;QACL,mBAAmB,IAAI,oBAAoB,CAAC;QAC5C,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxB,CAAC,CACF,CACF,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IACnD,MAAM,mBAAmB,GAAG,cAAc,IAAI,kBAAkB,CAAC;IACjE,IAAI,mBAAmB,KAAK,MAAM,IAAI,mBAAmB,KAAK,OAAO,EAAE,CAAC;QACtE,MAAM,IAAI,gBAAgB,CAAC,iCAAiC,mBAAmB,GAAG,CAAC,CAAC;IACtF,CAAC;IAED,qCAAqC;IACrC,gBAAgB,CACd,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAC7B,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EAChB,MAAM,EACN,mBAAmB,EACnB,GAAG,CAAC,aAAa,EACjB,WAAW,CACZ,CAAC;IAEF,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,gBAAgB,GAAG;QACvB,IAAI,EAAE,KAAK,EAAE,UAA2C,EAAE,EAAE;YAC1D,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBACxB,UAAU,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO;YACT,CAAC;YAED,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC;YACtD,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC;YAEpD,UAAU,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;YAC3E,QAAQ,IAAI,KAAK,CAAC,oBAAoB,CAAC;YACvC,GAAG,CAAC,eAAe,EAAE,CAAC,QAAQ,CAAC,CAAC;YAChC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;QACD,GAAG,CAAC,GAAG,CAAC,uBAAuB,IAAI,EAAE,uBAAuB,EAAE,GAAG,CAAC,uBAAuB,EAAE,CAAC;KAC7F,CAAC;IAEF,MAAM,YAAY,GAAG,IAAI,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAEnE,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC;IACjC,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC;IACjC,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,WAAyB;IAC5D,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC;IACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;IACxC,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;AAChC,CAAC"}
|
|
631
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tdf.js","sourceRoot":"","sources":["../../../../tdf3/src/tdf.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opentdf/sdk",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.0-beta.2029",
|
|
4
4
|
"description": "OpenTDF for the Web",
|
|
5
5
|
"homepage": "https://github.com/opentdf/web-sdk",
|
|
6
6
|
"bugs": {
|
|
@@ -74,26 +74,26 @@
|
|
|
74
74
|
"dependencies": {
|
|
75
75
|
"buffer-crc32": "^1.0.0",
|
|
76
76
|
"dpop": "^1.4.1",
|
|
77
|
-
"jose": "^
|
|
77
|
+
"jose": "^6.0.8",
|
|
78
78
|
"json-canonicalize": "^1.0.6",
|
|
79
79
|
"uuid": "~11.1.0"
|
|
80
80
|
},
|
|
81
81
|
"devDependencies": {
|
|
82
|
-
"@eslint/js": "^9.
|
|
82
|
+
"@eslint/js": "^9.21.0",
|
|
83
83
|
"@esm-bundle/chai": "~4.3.4-fix.0",
|
|
84
84
|
"@types/buffer-crc32": "^0.2.4",
|
|
85
85
|
"@types/chai": "~5.0.1",
|
|
86
86
|
"@types/jest": "^29.5.14",
|
|
87
87
|
"@types/jsdom": "^21.1.7",
|
|
88
|
-
"@types/jsonwebtoken": "~9.0.
|
|
88
|
+
"@types/jsonwebtoken": "~9.0.9",
|
|
89
89
|
"@types/mocha": "~10.0.10",
|
|
90
|
-
"@types/node": "^22.13.
|
|
90
|
+
"@types/node": "^22.13.8",
|
|
91
91
|
"@types/send": "^0.17.4",
|
|
92
|
-
"@types/sinon": "~17.0.
|
|
92
|
+
"@types/sinon": "~17.0.4",
|
|
93
93
|
"@types/uuid": "~10.0.0",
|
|
94
94
|
"@types/wicg-file-system-access": "^2023.10.5",
|
|
95
|
-
"@typescript-eslint/eslint-plugin": "^8.
|
|
96
|
-
"@typescript-eslint/parser": "^8.
|
|
95
|
+
"@typescript-eslint/eslint-plugin": "^8.26.0",
|
|
96
|
+
"@typescript-eslint/parser": "^8.26.0",
|
|
97
97
|
"@web/dev-server-esbuild": "1.0.4",
|
|
98
98
|
"@web/dev-server-rollup": "^0.6.4",
|
|
99
99
|
"@web/test-runner": "^0.20.0",
|
|
@@ -102,7 +102,7 @@
|
|
|
102
102
|
"c8": "^10.1.3",
|
|
103
103
|
"chai": "^5.2.0",
|
|
104
104
|
"colors": "^1.4.0",
|
|
105
|
-
"eslint-config-prettier": "^10.0.
|
|
105
|
+
"eslint-config-prettier": "^10.0.2",
|
|
106
106
|
"eslint-plugin-chai-friendly": "^1.0.1",
|
|
107
107
|
"eslint-plugin-prettier": "^5.2.3",
|
|
108
108
|
"glob": "^11.0.1",
|
|
@@ -113,13 +113,13 @@
|
|
|
113
113
|
"license-checker-rseidelsohn": "^4.4.2",
|
|
114
114
|
"mocha": "^11.1.0",
|
|
115
115
|
"nyc": "^17.1.0",
|
|
116
|
-
"prettier": "^3.5.
|
|
116
|
+
"prettier": "^3.5.3",
|
|
117
117
|
"process": "^0.11.10",
|
|
118
118
|
"sinon": "~19.0.2",
|
|
119
119
|
"tsconfig-paths": "^4.2.0",
|
|
120
120
|
"typedoc": "^0.27.9",
|
|
121
|
-
"typescript": "^5.
|
|
122
|
-
"typescript-eslint": "^8.
|
|
121
|
+
"typescript": "^5.8.2",
|
|
122
|
+
"typescript-eslint": "^8.26.0",
|
|
123
123
|
"webpack": "^5.98.0",
|
|
124
124
|
"webpack-cli": "^6.0.1"
|
|
125
125
|
}
|
package/src/auth/auth.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type JWTHeaderParameters, type JWTPayload,
|
|
1
|
+
import { type JWTHeaderParameters, type JWTPayload, SignJWT } from 'jose';
|
|
2
2
|
|
|
3
3
|
export type HttpMethod =
|
|
4
4
|
| 'GET'
|
|
@@ -60,7 +60,7 @@ function getTimestampInSeconds() {
|
|
|
60
60
|
*/
|
|
61
61
|
export async function reqSignature(
|
|
62
62
|
toSign: unknown,
|
|
63
|
-
privateKey:
|
|
63
|
+
privateKey: CryptoKey,
|
|
64
64
|
jwtProtectedHeader: JWTHeaderParameters = { alg: 'RS256' }
|
|
65
65
|
) {
|
|
66
66
|
const now = getTimestampInSeconds();
|
package/src/encodings/base64.ts
CHANGED
|
@@ -74,7 +74,7 @@ function encodeFallback(input: string, urlSafe?: boolean): string {
|
|
|
74
74
|
* Copyright (c) 2012 Niklas von Hertzen
|
|
75
75
|
* MIT License
|
|
76
76
|
*/
|
|
77
|
-
function encodeArrayBuffer(arrayBuffer:
|
|
77
|
+
function encodeArrayBuffer(arrayBuffer: ArrayBufferLike, urlSafe?: boolean): string {
|
|
78
78
|
const bytes = new Uint8Array(arrayBuffer);
|
|
79
79
|
const len = bytes.length;
|
|
80
80
|
const chars = urlSafe ? charsUrlSafe : charsStandard;
|
package/src/nanoclients.ts
CHANGED
|
@@ -10,7 +10,6 @@ import {
|
|
|
10
10
|
} from './nanotdf/index.js';
|
|
11
11
|
import { keyAgreement } from './nanotdf-crypto/index.js';
|
|
12
12
|
import { Policy } from './tdf/Policy.js';
|
|
13
|
-
import { type TypedArray } from './tdf/TypedArray.js';
|
|
14
13
|
import { createAttribute } from './tdf/AttributeObject.js';
|
|
15
14
|
import { fetchECKasPubKey } from './access.js';
|
|
16
15
|
import { ClientConfig } from './nanotdf/Client.js';
|
|
@@ -38,7 +37,7 @@ export class NanoTDFClient extends Client {
|
|
|
38
37
|
*
|
|
39
38
|
* @param ciphertext Ciphertext to decrypt
|
|
40
39
|
*/
|
|
41
|
-
async decrypt(ciphertext: string |
|
|
40
|
+
async decrypt(ciphertext: string | ArrayBufferLike): Promise<ArrayBuffer> {
|
|
42
41
|
// Parse ciphertext
|
|
43
42
|
const nanotdf = NanoTDF.from(ciphertext);
|
|
44
43
|
|
|
@@ -68,7 +67,7 @@ export class NanoTDFClient extends Client {
|
|
|
68
67
|
*
|
|
69
68
|
* @param ciphertext Ciphertext to decrypt
|
|
70
69
|
*/
|
|
71
|
-
async decryptLegacyTDF(ciphertext: string |
|
|
70
|
+
async decryptLegacyTDF(ciphertext: string | ArrayBufferLike): Promise<ArrayBuffer> {
|
|
72
71
|
// Parse ciphertext
|
|
73
72
|
const nanotdf = NanoTDF.from(ciphertext, undefined, true);
|
|
74
73
|
|
|
@@ -91,15 +90,12 @@ export class NanoTDFClient extends Client {
|
|
|
91
90
|
/**
|
|
92
91
|
* Encrypts the given data using the NanoTDF encryption scheme.
|
|
93
92
|
*
|
|
94
|
-
* @param
|
|
95
|
-
* @param
|
|
96
|
-
* @returns
|
|
97
|
-
* @throws
|
|
93
|
+
* @param data The data to be encrypted.
|
|
94
|
+
* @param options The encryption options (currently unused).
|
|
95
|
+
* @returns A promise that resolves to the encrypted data as an ArrayBuffer.
|
|
96
|
+
* @throws If the initialization vector is not a number.
|
|
98
97
|
*/
|
|
99
|
-
async encrypt(
|
|
100
|
-
data: string | TypedArray | ArrayBuffer,
|
|
101
|
-
options?: EncryptOptions
|
|
102
|
-
): Promise<ArrayBuffer> {
|
|
98
|
+
async encrypt(data: string | ArrayBufferLike, options?: EncryptOptions): Promise<ArrayBuffer> {
|
|
103
99
|
// For encrypt always generate the client ephemeralKeyPair
|
|
104
100
|
const ephemeralKeyPair = await this.ephemeralKeyPair;
|
|
105
101
|
const initializationVector = this.iv;
|
|
@@ -234,10 +230,7 @@ export class NanoTDFDatasetClient extends Client {
|
|
|
234
230
|
*
|
|
235
231
|
* @param data to decrypt
|
|
236
232
|
*/
|
|
237
|
-
async encrypt(
|
|
238
|
-
data: string | TypedArray | ArrayBuffer,
|
|
239
|
-
options?: EncryptOptions
|
|
240
|
-
): Promise<ArrayBuffer> {
|
|
233
|
+
async encrypt(data: string | ArrayBufferLike, options?: EncryptOptions): Promise<ArrayBuffer> {
|
|
241
234
|
// Intial encrypt
|
|
242
235
|
if (this.keyIterationCount == 0) {
|
|
243
236
|
const mergedOptions: EncryptOptions = { ...defaultOptions, ...options };
|
|
@@ -323,7 +316,7 @@ export class NanoTDFDatasetClient extends Client {
|
|
|
323
316
|
*
|
|
324
317
|
* @param ciphertext Ciphertext to decrypt
|
|
325
318
|
*/
|
|
326
|
-
async decrypt(ciphertext: string |
|
|
319
|
+
async decrypt(ciphertext: string | ArrayBufferLike): Promise<ArrayBuffer> {
|
|
327
320
|
// Parse ciphertext
|
|
328
321
|
const nanotdf = NanoTDF.from(ciphertext);
|
|
329
322
|
|
package/src/nanotdf/Client.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { type TypedArray } from '../tdf/TypedArray.js';
|
|
2
1
|
import * as base64 from '../encodings/base64.js';
|
|
3
2
|
import { generateKeyPair, keyAgreement } from '../nanotdf-crypto/index.js';
|
|
4
3
|
import getHkdfSalt from './helpers/getHkdfSalt.js';
|
|
@@ -210,9 +209,9 @@ export default class Client {
|
|
|
210
209
|
* @param clientVersion version of the client, as SemVer
|
|
211
210
|
*/
|
|
212
211
|
async rewrapKey(
|
|
213
|
-
nanoTdfHeader:
|
|
212
|
+
nanoTdfHeader: ArrayBufferLike,
|
|
214
213
|
kasRewrapUrl: string,
|
|
215
|
-
magicNumberVersion:
|
|
214
|
+
magicNumberVersion: ArrayBufferLike,
|
|
216
215
|
clientVersion: string
|
|
217
216
|
): Promise<CryptoKey> {
|
|
218
217
|
if (!this.allowedKases.allows(kasRewrapUrl)) {
|
package/src/nanotdf/NanoTDF.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { TypedArray } from '../tdf/TypedArray.js';
|
|
2
1
|
import { base64 } from '../encodings/index.js';
|
|
3
2
|
import Header from './models/Header.js';
|
|
4
3
|
import Payload from './models/Payload.js';
|
|
@@ -22,7 +21,7 @@ export default class NanoTDF {
|
|
|
22
21
|
public signature?: Signature;
|
|
23
22
|
|
|
24
23
|
static from(
|
|
25
|
-
content:
|
|
24
|
+
content: ArrayBufferLike | string,
|
|
26
25
|
encoding?: EncodingEnum,
|
|
27
26
|
legacyTDF = false
|
|
28
27
|
): NanoTDF {
|
|
@@ -3,7 +3,6 @@ import Header from './models/Header.js';
|
|
|
3
3
|
import DefaultParams from './models/DefaultParams.js';
|
|
4
4
|
import Payload from './models/Payload.js';
|
|
5
5
|
import { getBitLength as authTagLengthForCipher } from './models/Ciphers.js';
|
|
6
|
-
import { TypedArray } from '../tdf/TypedArray.js';
|
|
7
6
|
import encrypt from '../nanotdf-crypto/encrypt.js';
|
|
8
7
|
|
|
9
8
|
/**
|
|
@@ -18,7 +17,7 @@ export default async function encryptDataset(
|
|
|
18
17
|
symmetricKey: CryptoKey,
|
|
19
18
|
header: Header,
|
|
20
19
|
iv: Uint8Array,
|
|
21
|
-
data: string |
|
|
20
|
+
data: string | ArrayBufferLike
|
|
22
21
|
): Promise<ArrayBuffer> {
|
|
23
22
|
// Auth tag length for policy and payload
|
|
24
23
|
const authTagLengthInBytes = authTagLengthForCipher(DefaultParams.symmetricCipher) / 8;
|
package/src/nanotdf/encrypt.ts
CHANGED
|
@@ -6,7 +6,6 @@ import EmbeddedPolicy from './models/Policy/EmbeddedPolicy.js';
|
|
|
6
6
|
import Payload from './models/Payload.js';
|
|
7
7
|
import getHkdfSalt from './helpers/getHkdfSalt.js';
|
|
8
8
|
import { getBitLength as authTagLengthForCipher } from './models/Ciphers.js';
|
|
9
|
-
import { TypedArray } from '../tdf/TypedArray.js';
|
|
10
9
|
import { GMAC_BINDING_LEN } from './constants.js';
|
|
11
10
|
import { AlgorithmName, KeyFormat, KeyUsageType } from './../nanotdf-crypto/enums.js';
|
|
12
11
|
|
|
@@ -35,7 +34,7 @@ export default async function encrypt(
|
|
|
35
34
|
kasInfo: KasPublicKeyInfo,
|
|
36
35
|
ephemeralKeyPair: CryptoKeyPair,
|
|
37
36
|
iv: Uint8Array,
|
|
38
|
-
data: string |
|
|
37
|
+
data: string | ArrayBufferLike,
|
|
39
38
|
ecdsaBinding: boolean = DefaultParams.ecdsaBinding
|
|
40
39
|
): Promise<ArrayBuffer> {
|
|
41
40
|
// Generate a symmetric key.
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import { TypedArray } from '../../tdf/TypedArray.js';
|
|
2
|
-
|
|
3
1
|
import { digest, enums } from '../../nanotdf-crypto/index.js';
|
|
4
2
|
|
|
5
3
|
interface HkdfSalt {
|
|
@@ -7,7 +5,7 @@ interface HkdfSalt {
|
|
|
7
5
|
hkdfHash: enums.HashType;
|
|
8
6
|
}
|
|
9
7
|
|
|
10
|
-
export default async function getHkdfSalt(buffer:
|
|
8
|
+
export default async function getHkdfSalt(buffer: ArrayBufferLike): Promise<HkdfSalt> {
|
|
11
9
|
return {
|
|
12
10
|
hkdfSalt: await digest(enums.HashType.Sha256, buffer),
|
|
13
11
|
hkdfHash: enums.HashType.Sha256,
|
|
@@ -29,7 +29,6 @@
|
|
|
29
29
|
|
|
30
30
|
import * as base64 from '../encodings/base64.js';
|
|
31
31
|
import { importX509 } from 'jose';
|
|
32
|
-
import { type KeyObject } from 'crypto';
|
|
33
32
|
import { encodeArrayBuffer as hexEncodeArrayBuffer } from '../encodings/hex.js';
|
|
34
33
|
import { ConfigurationError, TdfError } from '../errors.js';
|
|
35
34
|
|
|
@@ -181,19 +180,6 @@ function toJwsAlg(hex: string) {
|
|
|
181
180
|
return 'RSA-OAEP-512';
|
|
182
181
|
}
|
|
183
182
|
}
|
|
184
|
-
function toSubtleAlg(hex: string) {
|
|
185
|
-
const name = guessAlgorithmName(hex);
|
|
186
|
-
if (name === ECDH || name === ECDSA) {
|
|
187
|
-
return {
|
|
188
|
-
name,
|
|
189
|
-
namedCurve: guessCurveName(hex),
|
|
190
|
-
};
|
|
191
|
-
}
|
|
192
|
-
return {
|
|
193
|
-
name,
|
|
194
|
-
hash: { name: SHA_512 },
|
|
195
|
-
};
|
|
196
|
-
}
|
|
197
183
|
|
|
198
184
|
export async function pemCertToCrypto(
|
|
199
185
|
pem: string,
|
|
@@ -207,26 +193,10 @@ export async function pemCertToCrypto(
|
|
|
207
193
|
const arrayBuffer = base64.decodeArrayBuffer(b64);
|
|
208
194
|
const hex = hexEncodeArrayBuffer(arrayBuffer);
|
|
209
195
|
const jwsAlg = toJwsAlg(hex);
|
|
210
|
-
const
|
|
211
|
-
const { type } =
|
|
196
|
+
const key = await importX509(pem, jwsAlg, { extractable: options.isExtractable });
|
|
197
|
+
const { type } = key;
|
|
212
198
|
if (type !== 'public') {
|
|
213
199
|
throw new ConfigurationError('unpublic');
|
|
214
200
|
}
|
|
215
|
-
|
|
216
|
-
// jose returns a crypto key on node, but we expect a subtle-crypto key
|
|
217
|
-
// The below should convert it, I hope, by exporting to a JWK and back.
|
|
218
|
-
if ((keylike as KeyObject)?.export) {
|
|
219
|
-
const keyObject = keylike as KeyObject;
|
|
220
|
-
const subtleAlg = toSubtleAlg(hex);
|
|
221
|
-
const keyUsages = guessKeyUsages(subtleAlg.name, options.usages);
|
|
222
|
-
const subtleKey = await crypto.subtle.importKey(
|
|
223
|
-
'jwk',
|
|
224
|
-
keyObject.export({ format: 'jwk' }),
|
|
225
|
-
subtleAlg,
|
|
226
|
-
options.isExtractable,
|
|
227
|
-
keyUsages
|
|
228
|
-
);
|
|
229
|
-
return subtleKey;
|
|
230
|
-
}
|
|
231
|
-
return keylike as CryptoKey;
|
|
201
|
+
return key;
|
|
232
202
|
}
|