fix: progression system

Author: chase-moskal

s/browser/behemoth-opfs.ts

@@ -2,7 +2,7 @@
 import {Behemoth} from "../core/behemoth.js"
 import {Hash, SetOptions} from "../core/types.js"
 import {hashBlob} from "../core/tools/hash-blob.js"
-import {progression} from "../core/utils/progression.js"
+import {Progression} from "../core/utils/progression.js"
 import {writeBlobToOpfs} from "./utils/write-blob-to-opfs.js"
 import {getOpfsFileHandle} from "./utils/get-opfs-file-handle.js"
 
@@ -35,14 +35,14 @@ export class BehemothOpfs extends Behemoth {
 	}
 
 	async set(blob: Blob, o?: SetOptions) {
-		const progress = progression(blob.size * 2, o?.onProgress)
+		const progress = Progression.blobStorage(blob.size, o?.onProgress)
 
-		const hash = await hashBlob(blob, progress.add)
+		const hash = await hashBlob(blob, progress.hashing.set)
 
 		if (!await this.has(hash))
-			await writeBlobToOpfs(blob, this.#directory, hash, progress.add)
+			await writeBlobToOpfs(blob, this.#directory, hash, progress.storing.set)
 
-		progress.done()
+		progress.finish()
 		return hash
 	}
 

s/core/behemoth-memory.ts

@@ -3,7 +3,7 @@ import {GMap} from "@e280/stz"
 import {Behemoth} from "./behemoth.js"
 import {SetOptions, Hash} from "./types.js"
 import {hashBlob} from "./tools/hash-blob.js"
-import {progression} from "./utils/progression.js"
+import {Progression} from "./utils/progression.js"
 
 export class BehemothMemory extends Behemoth {
 	#map = new GMap<Hash, Blob>()
@@ -21,14 +21,14 @@ export class BehemothMemory extends Behemoth {
 	}
 
 	async set(blob: Blob, o?: SetOptions) {
-		const progress = progression(blob.size * 2, o?.onProgress)
+		const progress = Progression.blobStorage(blob.size, o?.onProgress)
 
-		const hash = await hashBlob(blob, progress.add)
+		const hash = await hashBlob(blob, progress.hashing.set)
 
 		if (!await this.has(hash))
 			this.#map.set(hash, blob)
 
-		progress.done()
+		progress.finish()
 		return hash
 	}
 

s/core/utils/progression.ts

@@ -1,23 +1,51 @@
 
 import {Progress} from "../types.js"
 
-export const progression = (
-		total: number,
-		onProgress: ((p: Progress) => void) = (() => {}),
-	) => {
+export class Progression {
+	static blobStorage(blobSize: number, onProgress: ((p: Progress) => void) = (() => {})) {
+		let total = blobSize * 2
+		let done = 0
+		onProgress({total, done})
 
-	let done = 0
-	onProgress({total, done})
-
-	return {
-		add: (n: number) => {
-			done += n
+		function report() {
+			done = hashing.done + storing.done
 			onProgress({total, done})
-		},
+		}
 
-		done: () => {
+		function finish() {
 			onProgress({total, done: total})
-		},
+		}
+
+		const hashing = new Progression(blobSize, report)
+		const storing = new Progression(blobSize, report)
+		return {hashing, storing, finish}
+	}
+
+	done = 0
+
+	constructor(
+		public total: number,
+		public onProgress: ((p: Progress) => void) = (() => {}),
+	) {}
+
+	#report() {
+		const {total, done} = this
+		this.onProgress({total, done})
+	}
+
+	add = (n: number) => {
+		this.done += n
+		this.#report()
+	}
+
+	set = (n: number) => {
+		this.done = n
+		this.#report()
+	}
+
+	finish = () => {
+		this.done = this.total
+		this.#report()
 	}
 }
 

s/node/behemoth-disk.ts

@@ -7,7 +7,7 @@ import {readBlob} from "../core/tools/readers.js"
 import {Hash, SetOptions} from "../core/types.js"
 import {hashBlob} from "../core/tools/hash-blob.js"
 import {writeToFile} from "./utils/write-to-file.js"
-import {progression} from "../core/utils/progression.js"
+import {Progression} from "../core/utils/progression.js"
 
 export class BehemothDisk extends Behemoth {
 	static async mkdir(path: string) {
@@ -37,14 +37,14 @@ export class BehemothDisk extends Behemoth {
 	}
 
 	async set(blob: Blob, o?: SetOptions) {
-		const progress = progression(blob.size * 2, o?.onProgress)
+		const progress = Progression.blobStorage(blob.size, o?.onProgress)
 
-		const hash = await hashBlob(blob, progress.add)
+		const hash = await hashBlob(blob, progress.hashing.set)
 
 		if (!await this.has(hash))
-			await writeToFile(this.#path(hash), readBlob(blob), progress.add)
+			await writeToFile(this.#path(hash), readBlob(blob), progress.storing.set)
 
-		progress.done()
+		progress.finish()
 		return hash
 	}