simplify decoding, 108 pass, 23 fail

Author: boorad

bun.lockb

@@ -1940,7 +1940,7 @@ SPEC CHECKSUMS:
   fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
   glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
   hermes-engine: 46f1ffbf0297f4298862068dd4c274d4ac17a1fd
-  NitroModules: c36d6f656038a56beb1b1bcab2d0252d71744013
+  NitroModules: 3a58d9bc70815a0d5de4476ed6a36eff05a6a0ae
   OpenSSL-Universal: b60a3702c9fea8b3145549d421fdb018e53ab7b4
   QuickCrypto: 11878b44cfc77fad2ea8f387a16e315841651305
   RCT-Folly: 84578c8756030547307e4572ab1947de1685c599

example/ios/Podfile.lock

@@ -14,36 +14,36 @@ import { test } from '../util';
 
 const SUITE = 'cipher';
 const ciphers = getCiphers();
-const key = 'secret';
+const key = randomFillSync(new Uint8Array(32));
 const iv = randomFillSync(new Uint8Array(16));
 const plaintext =
   '32|RmVZZkFUVmpRRkp0TmJaUm56ZU9qcnJkaXNNWVNpTTU*|iXmckfRWZBGWWELw' +
   'eCBsThSsfUHLeRe0KCsK8ooHgxie0zOINpXxfZi/oNG7uq9JWFVCk70gfzQH8ZUJ' +
   'jAfaFg**';
 
-test(SUITE, 'cipher - valid algorithm', async () => {
+test(SUITE, 'valid algorithm', async () => {
   expect(() => {
     createCipheriv('aes-128-cbc', key, iv, {});
   }).to.not.throw();
 });
 
-test(SUITE, 'cipher - invalid algorithm', async () => {
+test(SUITE, 'invalid algorithm', async () => {
   expect(() => {
     createCipheriv('aes-128-boorad', key, iv, {});
   }).to.throw(/Invalid Cipher Algorithm: aes-128-boorad/);
 });
 
-test(SUITE, 'cipher - getSupportedCiphers', async () => {
+test(SUITE, 'getSupportedCiphers', async () => {
   expect(ciphers).to.be.instanceOf(Array);
   expect(ciphers).to.have.length.greaterThan(0);
 });
 
 // different value types
-test(SUITE, 'cipher - strings', async () => {
+test(SUITE, 'strings', async () => {
   roundtrip('aes-128-cbc', '0123456789abcd0123456789', '12345678', plaintext);
 });
 
-test(SUITE, 'cipher - buffers', async () => {
+test(SUITE, 'buffers', async () => {
   roundtrip(
     'aes-128-cbc',
     Buffer.from('0123456789abcd0123456789'),
@@ -54,7 +54,7 @@ test(SUITE, 'cipher - buffers', async () => {
 
 // update/final
 ciphers.forEach(cipherName => {
-  test(SUITE, `cipher - non-stream - ${cipherName}`, async () => {
+  test(SUITE, `non-stream - ${cipherName}`, async () => {
     roundtrip(cipherName, key, iv, plaintext);
   });
 });

example/src/tests/cipher/cipher_tests.ts

@@ -72,7 +72,6 @@
     "events": "3.3.0",
     "react-native-quick-base64": "2.1.2",
     "readable-stream": "4.5.2",
-    "string_decoder": "1.3.0",
     "util": "0.12.5"
   },
   "devDependencies": {

packages/react-native-quick-crypto/package.json

@@ -1,8 +1,6 @@
 import { NitroModules } from 'react-native-nitro-modules';
 import Stream, { type TransformOptions } from 'readable-stream';
-import { StringDecoder } from 'string_decoder';
 import { Buffer } from '@craftzdog/react-native-buffer';
-import { Buffer as SBuffer } from 'safe-buffer';
 import type {
   CipherCCMOptions,
   CipherCCMTypes,
@@ -12,10 +10,9 @@ import type {
   CipherOCBTypes,
 } from 'crypto'; // @types/node
 import type { Cipher as NativeCipher } from './specs/cipher.nitro';
-import { binaryLikeToArrayBuffer } from './utils';
+import { ab2str, binaryLikeToArrayBuffer } from './utils';
 import type { BinaryLike, BinaryLikeNode, Encoding } from './utils';
 import {
-  getDecoder,
   getDefaultEncoding,
   getUIntOption,
   normalizeEncoding,
@@ -44,7 +41,6 @@ interface CipherArgs {
 
 class CipherCommon extends Stream.Transform {
   private native: NativeCipher;
-  private decoder: StringDecoder | undefined;
 
   constructor({
     isCipher,
@@ -83,13 +79,12 @@ class CipherCommon extends Stream.Transform {
       throw new Error('Invalid data argument');
     }
 
-    data = binaryLikeToArrayBuffer(data, inputEncoding);
-    const ret = this.native.update(data);
+    const ret = this.native.update(
+      binaryLikeToArrayBuffer(data, inputEncoding),
+    );
 
     if (outputEncoding && outputEncoding !== 'buffer') {
-      this.decoder = getDecoder(this.decoder, outputEncoding);
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      return this.decoder!.write(SBuffer.from(ret) as any);
+      return ab2str(ret, outputEncoding);
     }
 
     return Buffer.from(ret);
@@ -101,9 +96,7 @@ class CipherCommon extends Stream.Transform {
     const ret = this.native.final();
 
     if (outputEncoding && outputEncoding !== 'buffer') {
-      this.decoder = getDecoder(this.decoder, outputEncoding);
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      return this.decoder!.end(SBuffer.from(ret) as any);
+      return ab2str(ret, outputEncoding);
     }
 
     return Buffer.from(ret);
@@ -289,4 +282,4 @@ export const cipherExports = {
   getCiphers,
 };
 
-export type { Cipher, Decipher };
+export type { Cipher, Decipher };

packages/react-native-quick-crypto/src/cipher.ts

@@ -1,4 +1,3 @@
-import { StringDecoder } from 'string_decoder';
 import type { Encoding } from './types';
 
 // Mimics node behavior for default global encoding
@@ -49,10 +48,6 @@ export function validateEncoding(data: string, encoding: string) {
   }
 }
 
-export function getDecoder(decoder?: StringDecoder, encoding?: BufferEncoding) {
-  return decoder ?? new StringDecoder(encoding);
-}
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function getUIntOption(options: Record<string, any>, key: string) {
   let value;