@futpib/parser 1.0.4 → 1.0.6

package/src/javaKeyStoreParser.ts

@@ -1,5 +1,7 @@
+import { MUtf8Decoder } from 'mutf-8';
 import { createExactSequenceParser } from './exactSequenceParser.js';
 import { createFixedLengthSequenceParser } from './fixedLengthSequenceParser.js';
+import { createObjectParser } from './objectParser.js';
 import { type Parser, setParserName } from './parser.js';
 import { parserCreatorCompose } from './parserCreatorCompose.js';
 import { promiseCompose } from './promiseCompose.js';
@@ -35,12 +37,14 @@ const createUint32BECountPrefixedParser = <T>(elementParser: Parser<T, Uint8Arra
 	count => createQuantifierParser(elementParser, count),
 )();
 
+const mutf8Decoder = new MUtf8Decoder();
+
 const javaModifiedUTF8StringParser: Parser<string, Uint8Array> = promiseCompose(
 	parserCreatorCompose(
 		() => uint16BEParser,
 		length => createFixedLengthSequenceParser(length),
 	)(),
-	uint8Array => Buffer.from(uint8Array).toString('utf8'), // TODO?: Java Modified UTF-8 decoding
+	uint8Array => mutf8Decoder.decode(uint8Array),
 );
 
 const uint32LengthPrefixedUint8ArrayParser = parserCreatorCompose(
@@ -49,22 +53,19 @@ const uint32LengthPrefixedUint8ArrayParser = parserCreatorCompose(
 )();
 
 const javaKeyStoreImplementationParser: Parser<'JKS' | 'JCEKS', Uint8Array> = promiseCompose(
-	createUnionParser<Uint8Array, Uint8Array>([
-		createExactSequenceParser<Uint8Array>(Buffer.from('feedfeed', 'hex')),
-		createExactSequenceParser<Uint8Array>(Buffer.from('cececece', 'hex')),
+	createUnionParser([
+		createExactSequenceParser(Buffer.from('feedfeed', 'hex')),
+		createExactSequenceParser(Buffer.from('cececece', 'hex')),
 	]),
 	uint8Array => uint8Array[0] === 0xFE ? 'JKS' : 'JCEKS',
 );
 
 const javaKeyStorePrivateKeyEntryPrivateKeyParser = uint32LengthPrefixedUint8ArrayParser;
 
-const javaKeyStorePrivateKeyEntryCertificateParser = promiseCompose(
-	createTupleParser([
-		javaModifiedUTF8StringParser,
-		uint32LengthPrefixedUint8ArrayParser,
-	]),
-	([ type, certificate ]) => ({ type, certificate }),
-);
+const javaKeyStorePrivateKeyEntryCertificateParser = createObjectParser({
+	type: javaModifiedUTF8StringParser,
+	certificate: uint32LengthPrefixedUint8ArrayParser,
+});
 
 const javaKeyStorePrivateKeyEntryCertificateChainParser = createUint32BECountPrefixedParser(javaKeyStorePrivateKeyEntryCertificateParser);
 
@@ -109,24 +110,9 @@ const javaKeyStoreEntryParser = createUnionParser([
 
 const javaKeyStoreEntriesParser = createUint32BECountPrefixedParser(javaKeyStoreEntryParser);
 
-const javaKeyStoreParser_ = createTupleParser([
-	javaKeyStoreImplementationParser,
-	uint32BEParser,
-	javaKeyStoreEntriesParser,
-	createFixedLengthSequenceParser(20),
-]);
-
-export const javaKeyStoreParser: Parser<unknown, Uint8Array> = promiseCompose(
-	javaKeyStoreParser_,
-	([
-		implementation,
-		version,
-		entries,
-		hash,
-	]) => ({
-		implementation,
-		version,
-		entries,
-		hash,
-	}),
-);
+export const javaKeyStoreParser: Parser<unknown, Uint8Array> = createObjectParser({
+	implementation: javaKeyStoreImplementationParser,
+	version: uint32BEParser,
+	entries: javaKeyStoreEntriesParser,
+	hash: createFixedLengthSequenceParser<Uint8Array>(20),
+});