@vess-id/mdl 0.0.15 → 0.0.16
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/lib/mdoc/Verifier.js +1 -45
- package/lib/mdoc/parser.js +1 -18
- package/lib/mdoc/utils.js +1 -16
- package/package.json +8 -7
package/lib/mdoc/Verifier.js
CHANGED
|
@@ -78,12 +78,8 @@ class Verifier {
|
|
|
78
78
|
});
|
|
79
79
|
}
|
|
80
80
|
async verifyDeviceSignature(document, options) {
|
|
81
|
-
console.log('[mdocOid4vpRPVerify] verifyDeviceSignature() called');
|
|
82
|
-
console.log('[mdocOid4vpRPVerify] - document type:', document.constructor.name);
|
|
83
|
-
console.log('[mdocOid4vpRPVerify] - sessionTranscriptBytes length:', options.sessionTranscriptBytes?.length ?? 'N/A');
|
|
84
81
|
const onCheck = (0, checkCallback_1.onCatCheck)(options.onCheck, 'DEVICE_AUTH');
|
|
85
82
|
if (!(document instanceof DeviceSignedDocument_1.DeviceSignedDocument)) {
|
|
86
|
-
console.log('[mdocOid4vpRPVerify] ❌ Document is not DeviceSignedDocument');
|
|
87
83
|
onCheck({
|
|
88
84
|
status: 'FAILED',
|
|
89
85
|
check: 'The document is not signed by the device.',
|
|
@@ -95,12 +91,6 @@ class Verifier {
|
|
|
95
91
|
const { docType } = document;
|
|
96
92
|
const { deviceKeyInfo } = document.issuerSigned.issuerAuth.decodedPayload;
|
|
97
93
|
const { deviceKey: deviceKeyCoseKey } = deviceKeyInfo || {};
|
|
98
|
-
console.log('[mdocOid4vpRPVerify] - docType:', docType);
|
|
99
|
-
console.log('[mdocOid4vpRPVerify] - deviceAuth present:', !!deviceAuth);
|
|
100
|
-
console.log('[mdocOid4vpRPVerify] - deviceAuth.deviceSignature present:', !!deviceAuth?.deviceSignature);
|
|
101
|
-
console.log('[mdocOid4vpRPVerify] - deviceAuth.deviceMac present:', !!deviceAuth?.deviceMac);
|
|
102
|
-
console.log('[mdocOid4vpRPVerify] - deviceKeyCoseKey present:', !!deviceKeyCoseKey);
|
|
103
|
-
console.log('[mdocOid4vpRPVerify] - nameSpaces:', Object.keys(nameSpaces));
|
|
104
94
|
// Prevent cloning of the mdoc and mitigate man in the middle attacks
|
|
105
95
|
if (!deviceAuth.deviceMac && !deviceAuth.deviceSignature) {
|
|
106
96
|
onCheck({
|
|
@@ -129,48 +119,22 @@ class Verifier {
|
|
|
129
119
|
return;
|
|
130
120
|
}
|
|
131
121
|
if (deviceAuth.deviceSignature) {
|
|
132
|
-
console.log('[mdocOid4vpRPVerify] Starting deviceSignature verification for docType:', docType);
|
|
133
122
|
const deviceKeyJwk = (0, cose_kit_1.COSEKeyToJWK)(deviceKeyCoseKey);
|
|
134
|
-
console.log('[mdocOid4vpRPVerify] Device key JWK:', JSON.stringify(deviceKeyJwk, null, 2));
|
|
135
|
-
console.log('[mdocOid4vpRPVerify] Device key alg from JWK:', deviceKeyJwk.alg);
|
|
136
|
-
console.log('[mdocOid4vpRPVerify] Device signature alg:', deviceAuth.deviceSignature.algName);
|
|
137
123
|
// When deviceKey (COSE Key) does not contain the `alg` parameter, use the one specified by the COSE_Sign1
|
|
138
124
|
const algToUse = deviceKeyJwk.alg ?? deviceAuth.deviceSignature.algName;
|
|
139
|
-
console.log('[mdocOid4vpRPVerify] Using algorithm for key import:', algToUse);
|
|
140
125
|
const deviceKey = await (0, jose_1.importJWK)(deviceKeyJwk, algToUse);
|
|
141
|
-
console.log('[mdocOid4vpRPVerify] Device key imported successfully');
|
|
142
126
|
// ECDSA/EdDSA authentication
|
|
143
127
|
try {
|
|
144
128
|
const ds = deviceAuth.deviceSignature;
|
|
145
|
-
console.log('[mdocOid4vpRPVerify] DeviceSignature details:');
|
|
146
|
-
console.log('[mdocOid4vpRPVerify] - protectedHeaders:', JSON.stringify(ds.protectedHeaders, null, 2));
|
|
147
|
-
console.log('[mdocOid4vpRPVerify] - unprotectedHeaders:', JSON.stringify(ds.unprotectedHeaders, null, 2));
|
|
148
|
-
console.log('[mdocOid4vpRPVerify] - signature length:', ds.signature?.length);
|
|
149
|
-
console.log('[mdocOid4vpRPVerify] - signature (hex):', buffer_1.Buffer.from(ds.signature).toString('hex'));
|
|
150
|
-
console.log('[mdocOid4vpRPVerify] - deviceAuthenticationBytes length:', deviceAuthenticationBytes.length);
|
|
151
|
-
console.log('[mdocOid4vpRPVerify] - deviceAuthenticationBytes (hex):', buffer_1.Buffer.from(deviceAuthenticationBytes).toString('hex'));
|
|
152
|
-
console.log('[mdocOid4vpRPVerify] Creating Sign1 object for verification...');
|
|
153
129
|
const sign1 = new cose_kit_1.Sign1(ds.protectedHeaders, ds.unprotectedHeaders, deviceAuthenticationBytes, ds.signature);
|
|
154
|
-
console.log('[mdocOid4vpRPVerify] Calling Sign1.verify()...');
|
|
155
130
|
const verificationResult = await sign1.verify(deviceKey);
|
|
156
|
-
console.log('[mdocOid4vpRPVerify] Sign1.verify() result:', verificationResult);
|
|
157
131
|
onCheck({
|
|
158
132
|
status: verificationResult ? 'PASSED' : 'FAILED',
|
|
159
133
|
check: 'Device signature must be valid',
|
|
160
134
|
id: checkCallback_1.VerificationAssessmentId.DEVICE_AUTH.DeviceSignatureValidity,
|
|
161
135
|
});
|
|
162
|
-
if (!verificationResult) {
|
|
163
|
-
console.log('[mdocOid4vpRPVerify] ❌ Device signature verification FAILED');
|
|
164
|
-
}
|
|
165
|
-
else {
|
|
166
|
-
console.log('[mdocOid4vpRPVerify] ✓ Device signature verification PASSED');
|
|
167
|
-
}
|
|
168
136
|
}
|
|
169
137
|
catch (err) {
|
|
170
|
-
console.log('[mdocOid4vpRPVerify] ❌ Exception during device signature verification:', err);
|
|
171
|
-
console.log('[mdocOid4vpRPVerify] Error name:', err.name);
|
|
172
|
-
console.log('[mdocOid4vpRPVerify] Error message:', err.message);
|
|
173
|
-
console.log('[mdocOid4vpRPVerify] Error stack:', err.stack);
|
|
174
138
|
onCheck({
|
|
175
139
|
status: 'FAILED',
|
|
176
140
|
check: 'Device signature must be valid',
|
|
@@ -301,16 +265,8 @@ class Verifier {
|
|
|
301
265
|
* @param options.ephemeralReaderKey The private part of the ephemeral key used in the session where the DeviceResponse was obtained. This is only required if the DeviceResponse is using the MAC method for device authentication.
|
|
302
266
|
*/
|
|
303
267
|
async verify(encodedDeviceResponse, options = {}) {
|
|
304
|
-
console.log('[mdocOid4vpRPVerify] verify() called');
|
|
305
|
-
console.log('[mdocOid4vpRPVerify] - encodedDeviceResponse length:', encodedDeviceResponse.length);
|
|
306
|
-
console.log('[mdocOid4vpRPVerify] - encodedSessionTranscript length:', options.encodedSessionTranscript?.length ?? 'N/A');
|
|
307
|
-
console.log('[mdocOid4vpRPVerify] - encodedSessionTranscript (hex):', options.encodedSessionTranscript ? buffer_1.Buffer.from(options.encodedSessionTranscript).toString('hex') : 'N/A');
|
|
308
|
-
console.log('[mdocOid4vpRPVerify] - skipDeviceSignatureVerification:', options.skipDeviceSignatureVerification);
|
|
309
|
-
console.log('[mdocOid4vpRPVerify] - disableCertificateChainValidation:', options.disableCertificateChainValidation);
|
|
310
268
|
const onCheck = (0, checkCallback_1.buildCallback)(options.onCheck);
|
|
311
269
|
const dr = (0, parser_1.parse)(encodedDeviceResponse);
|
|
312
|
-
console.log('[mdocOid4vpRPVerify] - parsed DeviceResponse version:', dr.version);
|
|
313
|
-
console.log('[mdocOid4vpRPVerify] - parsed DeviceResponse documents count:', dr.documents?.length);
|
|
314
270
|
onCheck({
|
|
315
271
|
status: dr.version ? 'PASSED' : 'FAILED',
|
|
316
272
|
check: 'Device Response must include "version" element.',
|
|
@@ -452,4 +408,4 @@ class Verifier {
|
|
|
452
408
|
}
|
|
453
409
|
}
|
|
454
410
|
exports.Verifier = Verifier;
|
|
455
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Verifier.js","sourceRoot":"","sources":["../../src/mdoc/Verifier.ts"],"names":[],"mappings":"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"}
|
|
411
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Verifier.js","sourceRoot":"","sources":["../../src/mdoc/Verifier.ts"],"names":[],"mappings":"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"}
|
package/lib/mdoc/parser.js
CHANGED
|
@@ -26,20 +26,11 @@ const parseIssuerAuthElement = (rawIssuerAuth, expectedDocType) => {
|
|
|
26
26
|
return issuerAuth;
|
|
27
27
|
};
|
|
28
28
|
const parseDeviceAuthElement = (rawDeviceAuth) => {
|
|
29
|
-
console.log('[mdocOid4vpRPVerify] parseDeviceAuthElement called');
|
|
30
|
-
console.log('[mdocOid4vpRPVerify] - rawDeviceAuth type:', rawDeviceAuth instanceof Map ? 'Map' : typeof rawDeviceAuth);
|
|
31
|
-
console.log('[mdocOid4vpRPVerify] - rawDeviceAuth entries count:', rawDeviceAuth instanceof Map ? rawDeviceAuth.size : Object.keys(rawDeviceAuth).length);
|
|
32
29
|
const { deviceSignature, deviceMac } = Object.fromEntries(rawDeviceAuth);
|
|
33
|
-
console.log('[mdocOid4vpRPVerify] - deviceSignature present:', !!deviceSignature);
|
|
34
|
-
console.log('[mdocOid4vpRPVerify] - deviceMac present:', !!deviceMac);
|
|
35
30
|
if (deviceSignature) {
|
|
36
|
-
console.log('[mdocOid4vpRPVerify] - Using deviceSignature');
|
|
37
|
-
console.log('[mdocOid4vpRPVerify] - deviceSignature array length:', deviceSignature.length);
|
|
38
31
|
const sign1 = new cose_kit_1.Sign1(...deviceSignature);
|
|
39
|
-
console.log('[mdocOid4vpRPVerify] - Sign1 created with alg:', sign1.algName);
|
|
40
32
|
return { deviceSignature: sign1 };
|
|
41
33
|
}
|
|
42
|
-
console.log('[mdocOid4vpRPVerify] - Using deviceMac');
|
|
43
34
|
return { deviceMac: new cose_kit_1.Mac0(...deviceMac) };
|
|
44
35
|
};
|
|
45
36
|
const namespaceToArray = (entries) => {
|
|
@@ -67,27 +58,19 @@ const mapDeviceNameSpaces = (namespace) => {
|
|
|
67
58
|
* @returns {Promise<MDoc>} - The parsed device response
|
|
68
59
|
*/
|
|
69
60
|
const parse = (encoded) => {
|
|
70
|
-
console.log('[mdocOid4vpRPVerify] parse() called');
|
|
71
|
-
console.log('[mdocOid4vpRPVerify] - encoded length:', encoded.length);
|
|
72
61
|
let deviceResponse;
|
|
73
62
|
try {
|
|
74
63
|
deviceResponse = (0, cbor_1.cborDecode)(encoded);
|
|
75
|
-
console.log('[mdocOid4vpRPVerify] - CBOR decode successful');
|
|
76
64
|
}
|
|
77
65
|
catch (err) {
|
|
78
|
-
console.log('[mdocOid4vpRPVerify] - ❌ CBOR decode failed:', err.message);
|
|
79
66
|
throw new errors_1.MDLParseError(`Unable to decode device response: ${err.message}`);
|
|
80
67
|
}
|
|
81
68
|
// Handle both Map and Object responses from cbor-x
|
|
82
69
|
const isResponseMap = deviceResponse instanceof Map;
|
|
83
|
-
console.log('[mdocOid4vpRPVerify] - deviceResponse type:', isResponseMap ? 'Map' : typeof deviceResponse);
|
|
84
70
|
const responseData = isResponseMap
|
|
85
71
|
? Object.fromEntries(deviceResponse)
|
|
86
72
|
: deviceResponse;
|
|
87
73
|
const { version, documents, status } = responseData;
|
|
88
|
-
console.log('[mdocOid4vpRPVerify] - version:', version);
|
|
89
|
-
console.log('[mdocOid4vpRPVerify] - documents count:', documents?.length);
|
|
90
|
-
console.log('[mdocOid4vpRPVerify] - status:', status);
|
|
91
74
|
const parsedDocuments = documents.map((doc) => {
|
|
92
75
|
// Helper functions to handle both Map and Object
|
|
93
76
|
const isDocMap = doc instanceof Map;
|
|
@@ -173,4 +156,4 @@ const parseIssuerSigned = (issuerSignedCbor, docType) => {
|
|
|
173
156
|
return new IssuerSignedDocument_1.IssuerSignedDocument(docType, issuerSigned);
|
|
174
157
|
};
|
|
175
158
|
exports.parseIssuerSigned = parseIssuerSigned;
|
|
176
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
159
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyc2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21kb2MvcGFyc2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLHVEQUFtRDtBQUNuRCx1Q0FBdUM7QUFDdkMsa0NBQXFDO0FBQ3JDLHVDQUFvQztBQUlwQyxvRUFBNEM7QUFDNUMseURBQXNEO0FBQ3RELHFDQUF5QztBQUN6Qyx1RUFBb0U7QUFDcEUsdUVBQW9FO0FBRXBFLE1BQU0sc0JBQXNCLEdBQUcsQ0FDN0IsYUFBNEIsRUFDNUIsZUFBdUIsRUFDWCxFQUFFO0lBQ2QsTUFBTSxVQUFVLEdBQUcsSUFBSSxvQkFBVSxDQUFDLEdBQUcsYUFBYSxDQUFDLENBQUM7SUFDcEQsTUFBTSxFQUFFLGNBQWMsRUFBRSxHQUFHLFVBQVUsQ0FBQztJQUN0QyxNQUFNLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLGNBQWMsQ0FBQztJQUU1QyxJQUFJLE9BQU8sS0FBSyxlQUFlLEVBQUUsQ0FBQztRQUNoQyxNQUFNLElBQUksc0JBQWEsQ0FBQyxrQ0FBa0MsZUFBZSxFQUFFLENBQUMsQ0FBQztJQUMvRSxDQUFDO0lBRUQsSUFBSSxDQUFDLE9BQU8sSUFBSSxJQUFBLGtDQUFlLEVBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQ3RELE1BQU0sSUFBSSxzQkFBYSxDQUFDLHNDQUFzQyxDQUFDLENBQUM7SUFDbEUsQ0FBQztJQUVELE9BQU8sVUFBVSxDQUFDO0FBQ3BCLENBQUMsQ0FBQztBQUVGLE1BQU0sc0JBQXNCLEdBQUcsQ0FBQyxhQUE0QixFQUFjLEVBQUU7SUFDMUUsTUFBTSxFQUFFLGVBQWUsRUFBRSxTQUFTLEVBQUUsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBRXpFLElBQUksZUFBZSxFQUFFLENBQUM7UUFDcEIsTUFBTSxLQUFLLEdBQUcsSUFBSSxnQkFBSyxDQUFDLEdBQUcsZUFB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
|
package/lib/mdoc/utils.js
CHANGED
|
@@ -105,19 +105,10 @@ const calculateEphemeralMacKey = async (privateKey, publicKey, sessionTranscript
|
|
|
105
105
|
};
|
|
106
106
|
exports.calculateEphemeralMacKey = calculateEphemeralMacKey;
|
|
107
107
|
const calculateDeviceAutenticationBytes = (sessionTranscript, docType, nameSpaces) => {
|
|
108
|
-
console.log('[mdocOid4vpRPVerify] calculateDeviceAutenticationBytes called');
|
|
109
|
-
console.log('[mdocOid4vpRPVerify] - docType:', docType);
|
|
110
|
-
console.log('[mdocOid4vpRPVerify] - sessionTranscript type:', sessionTranscript instanceof Uint8Array ? 'Uint8Array' : typeof sessionTranscript);
|
|
111
|
-
console.log('[mdocOid4vpRPVerify] - sessionTranscript length:', sessionTranscript instanceof Uint8Array ? sessionTranscript.length : 'N/A');
|
|
112
|
-
if (sessionTranscript instanceof Uint8Array) {
|
|
113
|
-
console.log('[mdocOid4vpRPVerify] - sessionTranscript (hex):', buffer_1.Buffer.from(sessionTranscript).toString('hex'));
|
|
114
|
-
}
|
|
115
|
-
console.log('[mdocOid4vpRPVerify] - nameSpaces keys:', Object.keys(nameSpaces));
|
|
116
108
|
let decodedSessionTranscript;
|
|
117
109
|
if (sessionTranscript instanceof Uint8Array) {
|
|
118
110
|
// Decode CBOR to get the raw data
|
|
119
111
|
const decoded = (0, cbor_1.cborDecode)(sessionTranscript);
|
|
120
|
-
console.log('[mdocOid4vpRPVerify] - decoded type:', decoded instanceof DataItem_1.DataItem ? 'DataItem' : (Array.isArray(decoded) ? 'Array' : typeof decoded));
|
|
121
112
|
// Check if it's a DataItem and extract data, otherwise use decoded directly
|
|
122
113
|
if (decoded instanceof DataItem_1.DataItem) {
|
|
123
114
|
decodedSessionTranscript = decoded.data;
|
|
@@ -125,15 +116,11 @@ const calculateDeviceAutenticationBytes = (sessionTranscript, docType, nameSpace
|
|
|
125
116
|
else {
|
|
126
117
|
decodedSessionTranscript = decoded;
|
|
127
118
|
}
|
|
128
|
-
console.log('[mdocOid4vpRPVerify] - decodedSessionTranscript type:', Array.isArray(decodedSessionTranscript) ? 'Array' : typeof decodedSessionTranscript);
|
|
129
|
-
console.log('[mdocOid4vpRPVerify] - decodedSessionTranscript:', JSON.stringify(decodedSessionTranscript, null, 2));
|
|
130
119
|
}
|
|
131
120
|
else {
|
|
132
121
|
decodedSessionTranscript = sessionTranscript;
|
|
133
|
-
console.log('[mdocOid4vpRPVerify] - sessionTranscript (not Uint8Array):', JSON.stringify(decodedSessionTranscript, null, 2));
|
|
134
122
|
}
|
|
135
123
|
const nameSpacesAsMap = new Map(Object.entries(nameSpaces).map(([ns, items]) => [ns, new Map(Object.entries(items))]));
|
|
136
|
-
console.log('[mdocOid4vpRPVerify] - nameSpacesAsMap size:', nameSpacesAsMap.size);
|
|
137
124
|
const encode = DataItem_1.DataItem.fromData([
|
|
138
125
|
'DeviceAuthentication',
|
|
139
126
|
decodedSessionTranscript,
|
|
@@ -141,8 +128,6 @@ const calculateDeviceAutenticationBytes = (sessionTranscript, docType, nameSpace
|
|
|
141
128
|
DataItem_1.DataItem.fromData(nameSpacesAsMap),
|
|
142
129
|
]);
|
|
143
130
|
const result = (0, cbor_1.cborEncode)(encode);
|
|
144
|
-
console.log('[mdocOid4vpRPVerify] - deviceAuthenticationBytes result length:', result.length);
|
|
145
|
-
console.log('[mdocOid4vpRPVerify] - deviceAuthenticationBytes result (hex):', buffer_1.Buffer.from(result).toString('hex'));
|
|
146
131
|
return result;
|
|
147
132
|
};
|
|
148
133
|
exports.calculateDeviceAutenticationBytes = calculateDeviceAutenticationBytes;
|
|
@@ -164,4 +149,4 @@ function fromPEM(pem) {
|
|
|
164
149
|
});
|
|
165
150
|
return certs;
|
|
166
151
|
}
|
|
167
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
152
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWRvYy91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUE4SEEsd0NBRUM7QUFFRCwwQkFlQztBQWpKRCw2Q0FBK0I7QUFDL0IsNkNBQTBDO0FBQzFDLDZDQUEwQztBQUMxQyw2Q0FBMEM7QUFDMUMsb0RBQXNDO0FBQ3RDLG1DQUFnQztBQUNoQyx1REFBK0I7QUFDL0IsdUNBQXdDO0FBRXhDLGtDQUFpRDtBQUNqRCwrQ0FBNEM7QUFDNUMsOERBQTJDO0FBRTNDLE1BQU0sRUFBRSxNQUFNLEVBQUUsR0FBRyxTQUFTLENBQUM7QUFFN0IsS0FBSyxDQUFDLFNBQVMsQ0FBQyxXQUFXLEVBQUUsSUFBSSxLQUFLLENBQUMsWUFBWSxDQUFDLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQztBQUVoRyxNQUFNLFVBQVUsR0FBRyxLQUFLLEVBQzdCLEdBQWdCLEVBQ2hCLElBQWlCLEVBQ0ssRUFBRTtJQUN4QixNQUFNLFdBQVcsR0FBRyxNQUFNLE1BQU0sQ0FBQyxTQUFTLENBQ3hDLEtBQUssRUFDTCxHQUFHLEVBQ0gsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsRUFDakMsS0FBSyxFQUNMLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxDQUNuQixDQUFDO0lBRUYsTUFBTSxJQUFJLEdBQUcsTUFBTSxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxXQUFXLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFFMUQsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDLENBQUM7QUFmVyxRQUFBLFVBQVUsY0FlckI7QUFFRjs7Ozs7Ozs7Ozs7R0FXRztBQUNJLE1BQU0sd0JBQXdCLEdBQUcsS0FBSyxFQUMzQyxV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
|
package/package.json
CHANGED
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vess-id/mdl",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.16",
|
|
4
4
|
"description": "Parse and and validate MDOC CBOR encoded binaries according to ISO 18013-5.",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
7
|
+
"scripts": {
|
|
8
|
+
"test": "jest --verbose",
|
|
9
|
+
"lint": "eslint ./src/**/*.ts",
|
|
10
|
+
"build": "rm -rf lib ; tsc",
|
|
11
|
+
"prepare": "husky"
|
|
12
|
+
},
|
|
7
13
|
"repository": {
|
|
8
14
|
"type": "git",
|
|
9
15
|
"url": "https://github.com/vess-id/mdl.git"
|
|
@@ -72,10 +78,5 @@
|
|
|
72
78
|
},
|
|
73
79
|
"engines": {
|
|
74
80
|
"node": ">=16.0.0"
|
|
75
|
-
},
|
|
76
|
-
"scripts": {
|
|
77
|
-
"test": "jest --verbose",
|
|
78
|
-
"lint": "eslint ./src/**/*.ts",
|
|
79
|
-
"build": "rm -rf lib ; tsc"
|
|
80
81
|
}
|
|
81
|
-
}
|
|
82
|
+
}
|