cafe-utility 36.1.2 → 36.1.4

package/index.d.ts

@@ -727,6 +727,7 @@ export declare class ChunkSplitter {
 	private onBatch
 	private onIntermediateChunk?
 	private hasParity
+	private pendingParities
 	constructor(onBatch: (batch: ChunkEntry[]) => Promise<ChunkEntry[]>, maxShards?: number, encrypted?: boolean, onIntermediateChunk?: (chunk: Chunk, hasParity: boolean) => void)
 	static root(data: Uint8Array): Promise<Chunk>
 	static encryptedRoot(data: Uint8Array): Promise<{
@@ -735,6 +736,7 @@ export declare class ChunkSplitter {
 	}>
 	append(data: Uint8Array, level?: number, spanIncrement?: bigint): Promise<void>
 	private elevate
+	private sealParities
 	private flushBatch
 	finalize(level?: number): Promise<Chunk>
 }

package/index.js

@@ -2154,19 +2154,19 @@ function keccakPermutate(n) {
 			C = (n[3] << 1) | (n[2] >>> 31),
 			R = (n[5] << 30) | (n[4] >>> 2),
 			I = (n[4] << 30) | (n[5] >>> 2),
-			D = (n[6] << 28) | (n[7] >>> 4),
-			P = (n[7] << 28) | (n[6] >>> 4),
+			P = (n[6] << 28) | (n[7] >>> 4),
+			D = (n[7] << 28) | (n[6] >>> 4),
 			B = (n[8] << 27) | (n[9] >>> 5),
 			U = (n[9] << 27) | (n[8] >>> 5),
 			j = (n[11] << 4) | (n[10] >>> 28),
 			L = (n[10] << 4) | (n[11] >>> 28),
 			N = (n[13] << 12) | (n[12] >>> 20),
-			v = (n[12] << 12) | (n[13] >>> 20),
-			F = (n[14] << 6) | (n[15] >>> 26),
+			F = (n[12] << 12) | (n[13] >>> 20),
+			v = (n[14] << 6) | (n[15] >>> 26),
 			z = (n[15] << 6) | (n[14] >>> 26),
 			W = (n[17] << 23) | (n[16] >>> 9),
-			H = (n[16] << 23) | (n[17] >>> 9),
-			q = (n[18] << 20) | (n[19] >>> 12),
+			q = (n[16] << 23) | (n[17] >>> 9),
+			H = (n[18] << 20) | (n[19] >>> 12),
 			V = (n[19] << 20) | (n[18] >>> 12),
 			J = (n[20] << 3) | (n[21] >>> 29),
 			K = (n[21] << 3) | (n[20] >>> 29),
@@ -2198,7 +2198,7 @@ function keccakPermutate(n) {
 			bn = (n[46] << 24) | (n[47] >>> 8),
 			An = (n[48] << 14) | (n[49] >>> 18),
 			$n = (n[49] << 14) | (n[48] >>> 18)
-		;(n[0] = k ^ (~N & G)), (n[1] = O ^ (~v & _)), (n[2] = N ^ (~G & fn)), (n[3] = v ^ (~_ & ln)), (n[4] = G ^ (~fn & An)), (n[5] = _ ^ (~ln & $n)), (n[6] = fn ^ (~An & k)), (n[7] = ln ^ (~$n & O)), (n[8] = An ^ (~k & N)), (n[9] = $n ^ (~O & v)), (n[10] = D ^ (~q & J)), (n[11] = P ^ (~V & K)), (n[12] = q ^ (~J & on)), (n[13] = V ^ (~K & sn)), (n[14] = J ^ (~on & wn)), (n[15] = K ^ (~sn & xn)), (n[16] = on ^ (~wn & D)), (n[17] = sn ^ (~xn & P)), (n[18] = wn ^ (~D & q)), (n[19] = xn ^ (~P & V)), (n[20] = T ^ (~F & Y)), (n[21] = C ^ (~z & X)), (n[22] = F ^ (~Y & an)), (n[23] = z ^ (~X & hn)), (n[24] = Y ^ (~an & dn)), (n[25] = X ^ (~hn & pn)), (n[26] = an ^ (~dn & T)), (n[27] = hn ^ (~pn & C)), (n[28] = dn ^ (~T & F)), (n[29] = pn ^ (~C & z)), (n[30] = B ^ (~j & Z)), (n[31] = U ^ (~L & Q)), (n[32] = j ^ (~Z & cn)), (n[33] = L ^ (~Q & un)), (n[34] = Z ^ (~cn & yn)), (n[35] = Q ^ (~un & bn)), (n[36] = cn ^ (~yn & B)), (n[37] = un ^ (~bn & U)), (n[38] = yn ^ (~B & j)), (n[39] = bn ^ (~U & L)), (n[40] = R ^ (~W & nn)), (n[41] = I ^ (~H & tn)), (n[42] = W ^ (~nn & en)), (n[43] = H ^ (~tn & rn)), (n[44] = nn ^ (~en & mn)), (n[45] = tn ^ (~rn & gn)), (n[46] = en ^ (~mn & R)), (n[47] = rn ^ (~gn & I)), (n[48] = mn ^ (~R & W)), (n[49] = gn ^ (~I & H)), (n[0] ^= IOTA_CONSTANTS[t * 2]), (n[1] ^= IOTA_CONSTANTS[t * 2 + 1])
+		;(n[0] = k ^ (~N & G)), (n[1] = O ^ (~F & _)), (n[2] = N ^ (~G & fn)), (n[3] = F ^ (~_ & ln)), (n[4] = G ^ (~fn & An)), (n[5] = _ ^ (~ln & $n)), (n[6] = fn ^ (~An & k)), (n[7] = ln ^ (~$n & O)), (n[8] = An ^ (~k & N)), (n[9] = $n ^ (~O & F)), (n[10] = P ^ (~H & J)), (n[11] = D ^ (~V & K)), (n[12] = H ^ (~J & on)), (n[13] = V ^ (~K & sn)), (n[14] = J ^ (~on & wn)), (n[15] = K ^ (~sn & xn)), (n[16] = on ^ (~wn & P)), (n[17] = sn ^ (~xn & D)), (n[18] = wn ^ (~P & H)), (n[19] = xn ^ (~D & V)), (n[20] = T ^ (~v & Y)), (n[21] = C ^ (~z & X)), (n[22] = v ^ (~Y & an)), (n[23] = z ^ (~X & hn)), (n[24] = Y ^ (~an & dn)), (n[25] = X ^ (~hn & pn)), (n[26] = an ^ (~dn & T)), (n[27] = hn ^ (~pn & C)), (n[28] = dn ^ (~T & v)), (n[29] = pn ^ (~C & z)), (n[30] = B ^ (~j & Z)), (n[31] = U ^ (~L & Q)), (n[32] = j ^ (~Z & cn)), (n[33] = L ^ (~Q & un)), (n[34] = Z ^ (~cn & yn)), (n[35] = Q ^ (~un & bn)), (n[36] = cn ^ (~yn & B)), (n[37] = un ^ (~bn & U)), (n[38] = yn ^ (~B & j)), (n[39] = bn ^ (~U & L)), (n[40] = R ^ (~W & nn)), (n[41] = I ^ (~q & tn)), (n[42] = W ^ (~nn & en)), (n[43] = q ^ (~tn & rn)), (n[44] = nn ^ (~en & mn)), (n[45] = tn ^ (~rn & gn)), (n[46] = en ^ (~mn & R)), (n[47] = rn ^ (~gn & I)), (n[48] = mn ^ (~R & W)), (n[49] = gn ^ (~I & q)), (n[0] ^= IOTA_CONSTANTS[t * 2]), (n[1] ^= IOTA_CONSTANTS[t * 2 + 1])
 	}
 }
 function bytesToNumbers(n) {
@@ -2640,7 +2640,7 @@ class Chunk {
 ;(exports.Chunk = Chunk), (Chunk.hashFunction = keccak256)
 class ChunkSplitter {
 	constructor(t, e, r = !1, i) {
-		;(this.counters = [1]), (this.pending = [[]]), (this.hasParity = [!1]), (this.encrypted = r), (this.refSize = r ? 64 : 32), (this.maxShards = e ?? 4096 / this.refSize), (this.chunks = [new Chunk()]), (this.onBatch = t), (this.onIntermediateChunk = i)
+		;(this.counters = [1]), (this.pending = [[]]), (this.hasParity = [!1]), (this.pendingParities = []), (this.encrypted = r), (this.refSize = r ? 64 : 32), (this.maxShards = e ?? 4096 / this.refSize), (this.chunks = [new Chunk()]), (this.onBatch = t), (this.onIntermediateChunk = i)
 	}
 	static async root(t) {
 		const e = new _a(_a.NOOP)
@@ -2659,29 +2659,33 @@ class ChunkSplitter {
 		}
 	}
 	async elevate(t) {
-		if (((this.counters[t] = ++this.counters[t] % (4096 / this.refSize)), this.pending[t] || (this.pending[t] = []), t >= 1 && this.onIntermediateChunk && (this.onIntermediateChunk(this.chunks[t], this.hasParity[t] ?? !1), (this.hasParity[t] = !1)), this.encrypted)) {
+		if (((this.counters[t] = ++this.counters[t] % (4096 / this.refSize)), this.pending[t] || (this.pending[t] = []), this.sealParities(t), t >= 1 && this.onIntermediateChunk && (this.onIntermediateChunk(this.chunks[t], this.hasParity[t] ?? !1), (this.hasParity[t] = !1)), this.encrypted)) {
 			const { address: e, key: r } = this.chunks[t].encryptedHash(),
 				i = new Uint8Array(64)
 			i.set(e), i.set(r, 32), this.pending[t].push({ entry: { chunk: this.chunks[t], key: r }, ref: i, span: this.chunks[t].span })
 		} else this.pending[t].push({ entry: { chunk: this.chunks[t] }, ref: this.chunks[t].hash(), span: this.chunks[t].span })
 		;(this.chunks[t] = new Chunk()), this.pending[t].length >= this.maxShards && (await this.flushBatch(t))
 	}
+	sealParities(t) {
+		const e = this.pendingParities[t]
+		if (e?.length) {
+			this.pendingParities[t] = []
+			for (const r of e) this.chunks[t].writer.write(new Uint8ArrayReader(r))
+		}
+	}
 	async flushBatch(t) {
 		this.chunks[t + 1] || (this.chunks.push(new Chunk()), this.counters.push(1), this.pending.push([]), this.hasParity.push(!1))
 		const e = this.pending[t]
 		this.pending[t] = []
 		const r = await this.onBatch(e.map(i => i.entry))
 		for (const { ref: i, span: o } of e) await this.append(i, t + 1, o)
-		r.length > 0 && (this.hasParity[t + 1] = !0)
-		for (const { chunk: i, key: o } of r)
-			if ((this.chunks[t + 1].writer.max() === 0 && (await this.elevate(t + 1)), this.encrypted)) {
-				const { address: s, key: c } = i.encryptedHash(o),
-					u = new Uint8Array(64)
-				u.set(s), u.set(c, 32), this.chunks[t + 1].writer.write(new Uint8ArrayReader(u))
-			} else this.chunks[t + 1].writer.write(new Uint8ArrayReader(i.hash()))
+		if (r.length > 0) {
+			;(this.hasParity[t + 1] = !0), this.pendingParities[t + 1] || (this.pendingParities[t + 1] = [])
+			for (const { chunk: i } of r) this.pendingParities[t + 1].push(i.hash())
+		}
 	}
 	async finalize(t = 0) {
-		return this.pending[t]?.length && (await this.flushBatch(t)), this.chunks[t + 1] ? (this.counters[t] === 1 ? (await this.elevate(t + 1), await this.flushBatch(t + 1), (this.chunks[t + 1] = this.chunks[t]), this.finalize(t + 1)) : (await this.elevate(t), await this.flushBatch(t), this.finalize(t + 1))) : (t >= 1 && this.onIntermediateChunk && this.onIntermediateChunk(this.chunks[t], this.hasParity[t] ?? !1), this.chunks[t])
+		return this.pending[t]?.length && (await this.flushBatch(t)), this.chunks[t + 1] ? (this.counters[t] === 1 ? (await this.elevate(t + 1), await this.flushBatch(t + 1), (this.chunks[t + 1] = this.chunks[t]), this.finalize(t + 1)) : (await this.elevate(t), await this.flushBatch(t), this.finalize(t + 1))) : (this.sealParities(t), t >= 1 && this.onIntermediateChunk && this.onIntermediateChunk(this.chunks[t], this.hasParity[t] ?? !1), this.chunks[t])
 	}
 }
 ;(exports.ChunkSplitter = ChunkSplitter), (_a = ChunkSplitter), (ChunkSplitter.NOOP = async n => [])

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cafe-utility",
-	"version": "36.1.2",
+	"version": "36.1.4",
 	"description": "",
 	"main": "index.js",
 	"exports": {