@tstdl/base 0.90.27 → 0.90.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.90.27",
+  "version": "0.90.28",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"

package/utils/cryptography.d.ts

@@ -115,9 +115,10 @@ export declare function generatePbkdf2Key(extractable?: boolean): Promise<Crypto
 export declare function deriveBytes(algorithm: DeriveAlgorithm, baseKey: CryptoKey, length: number): Promise<Uint8Array>;
 /**
  * derive multiply byte arrays from key
- * @param count how many Uint8Arrays to dervice
- * @param length length of each Uint8Array in bytes
  * @param algorithm algorithm to derive with
  * @param baseKey key to derive from
+ * @param length length of each Uint8Array in bytes, if single number is provided, it is used for every array
+ * @param count how many Uint8Arrays to derive
  */
-export declare function deriveBytesMultiple<C extends number>(algorithm: DeriveAlgorithm, baseKey: CryptoKey, count: C, length: number): Promise<ReadonlyTuple<Uint8Array, C>>;
+export declare function deriveBytesMultiple<const Lengths extends readonly number[]>(algorithm: DeriveAlgorithm, baseKey: CryptoKey, lengths: Lengths): Promise<ReadonlyTuple<Uint8Array, Lengths['length']>>;
+export declare function deriveBytesMultiple<const C extends number>(algorithm: DeriveAlgorithm, baseKey: CryptoKey, length: C, count: number): Promise<ReadonlyTuple<Uint8Array, C>>;

package/utils/cryptography.js

@@ -2,7 +2,7 @@ import { createArray } from './array/array.js';
 import { encodeBase64, encodeBase64Url } from './base64.js';
 import { decodeText, encodeHex, encodeUtf8 } from './encoding.js';
 import { getRandomBytes } from './random.js';
-import { isDefined, isString } from './type-guards.js';
+import { isArray, isDefined, isString } from './type-guards.js';
 import { zBase32Encode } from './z-base32.js';
 const subtle = globalThis.crypto.subtle;
 /**
@@ -162,17 +162,18 @@ export async function deriveBytes(algorithm, baseKey, length) {
     const bytes = await globalThis.crypto.subtle.deriveBits(algorithm, baseKey, length * 8);
     return new Uint8Array(bytes);
 }
-/**
- * derive multiply byte arrays from key
- * @param count how many Uint8Arrays to dervice
- * @param length length of each Uint8Array in bytes
- * @param algorithm algorithm to derive with
- * @param baseKey key to derive from
- */
-export async function deriveBytesMultiple(algorithm, baseKey, count, length) {
-    const totalBits = count * length * 8;
+export async function deriveBytesMultiple(algorithm, baseKey, lengthOrLengths, countOrNothing) {
+    const lengths = isArray(lengthOrLengths) ? lengthOrLengths : createArray(countOrNothing, () => lengthOrLengths);
+    const totalBits = lengths.reduce((sum, length) => sum + length, 0) * 8;
     const bytes = await globalThis.crypto.subtle.deriveBits(algorithm, baseKey, totalBits);
-    return createArray(count, (index) => new Uint8Array(bytes.slice(index * length, (index * length) + length)));
+    const arrays = [];
+    for (let i = 0; i < bytes.byteLength;) {
+        const slice = bytes.slice(i, i + lengths[arrays.length]);
+        const array = new Uint8Array(slice);
+        arrays.push(array);
+        i += slice.byteLength;
+    }
+    return arrays;
 }
 function isBinaryKey(key) {
     return isDefined(key.byteLength);