@yorozu/utils 1.0.25 → 1.0.52

package/async/bitmap-work-queue.d.ts

@@ -12,6 +12,11 @@ export type BitmapWorkQueueStats = {
     active: number;
     queued: number;
 };
+export type BitmapWorkQueueOptions = {
+    concurrency?: number;
+    idle?: boolean;
+    onError?: (error: Error, id: string) => void;
+};
 export type BitmapWorkQueue = {
     enqueue(job: BitmapWorkJob): boolean;
     cancel(id: string): boolean;
@@ -19,7 +24,4 @@ export type BitmapWorkQueue = {
     resume(): void;
     readonly stats: BitmapWorkQueueStats;
 };
-export declare function createBitmapWorkQueue(opts?: {
-    concurrency?: number;
-    idle?: boolean;
-}): BitmapWorkQueue;
+export declare function createBitmapWorkQueue(opts?: BitmapWorkQueueOptions): BitmapWorkQueue;

package/async/priority-work-queue.d.ts

@@ -19,7 +19,10 @@ export type PriorityWorkQueue = {
     enqueue(job: PriorityWorkJob): boolean;
     cancel(id: string): boolean;
     cancelAll(): void;
+    pause(): void;
+    resume(): void;
     isBusy(id: string): boolean;
+    isRunning(id: string): boolean;
     get stats(): PriorityWorkQueueStats;
 };
 export declare function createPriorityWorkQueue(opts?: PriorityWorkQueueOptions): PriorityWorkQueue;

package/index.js

@@ -1737,6 +1737,28 @@ var ConditionVariable = class {
 	}
 };
 //#endregion
+//#region src/types/error.ts
+function unknownToError(err) {
+	if (err instanceof Error) return err;
+	if (typeof err === "string") return new Error(err);
+	let error = "";
+	try {
+		error = JSON.stringify(err);
+	} catch (_) {}
+	return new Error(error, { cause: err });
+}
+var NotImplementedError = class extends Error {
+	constructor(message, options = {}) {
+		super(`Not implemented${message != null ? `: ${message}` : ""}`, options);
+	}
+};
+function throwNotImplemented(message, options) {
+	throw new NotImplementedError(message, options);
+}
+function throwUnreachable() {
+	throw new Error("Unreachable");
+}
+//#endregion
 //#region src/async/idle.ts
 function requestIdle(fn, opts) {
 	let g = globalThis;
@@ -1766,6 +1788,9 @@ function requestIdle(fn, opts) {
 //#endregion
 //#region src/async/bitmap-work-queue.ts
 var PRI_ORDER$1 = ["visible", "preload"];
+function isAbortError$1(err) {
+	return err instanceof Error && err.name === "AbortError";
+}
 function resolveConcurrency$1(value) {
 	if (value === void 0) return 1;
 	let n = Math.floor(value);
@@ -1833,27 +1858,49 @@ function createBitmapWorkQueue(opts) {
 	}
 	function startJob(job) {
 		let controller = new AbortController();
-		active.set(job.id, {
+		let token = {
 			id: job.id,
 			controller
-		});
+		};
+		active.set(job.id, token);
 		(async () => {
+			let bitmap;
+			let reported;
 			try {
 				let signal = controller.signal;
 				if (signal.aborted) return;
-				let bitmap = await createImageBitmap(job.source);
-				if (signal.aborted) {
+				bitmap = await createImageBitmap(job.source, { signal });
+				if (active.get(job.id) !== token || signal.aborted) {
 					bitmap.close();
+					bitmap = void 0;
 					return;
 				}
-				if (job.run) await job.run({
-					signal,
-					bitmap
-				});
-				else bitmap.close();
-			} catch {} finally {
-				active.delete(job.id);
+				if (job.run) {
+					let owned = bitmap;
+					bitmap = void 0;
+					await job.run({
+						signal,
+						bitmap: owned
+					});
+				} else {
+					bitmap.close();
+					bitmap = void 0;
+				}
+			} catch (err) {
+				if (bitmap) {
+					try {
+						bitmap.close();
+					} catch {}
+					bitmap = void 0;
+				}
+				if (!isAbortError$1(err) && !controller.signal.aborted) reported = unknownToError(err);
+			} finally {
+				if (active.get(job.id) === token) active.delete(job.id);
+				else reported = void 0;
 			}
+			if (reported) try {
+				opts?.onError?.(reported, job.id);
+			} catch {}
 			pump();
 		})();
 	}
@@ -1879,12 +1926,15 @@ function createBitmapWorkQueue(opts) {
 			let running = active.get(id);
 			if (!running) return false;
 			running.controller.abort();
+			active.delete(id);
+			pump();
 			return true;
 		},
 		pause() {
 			paused = true;
 		},
 		resume() {
+			if (!paused) return;
 			paused = false;
 			pump();
 		},
@@ -1963,28 +2013,6 @@ async function parallelMap(iterable, executor, options = {}) {
 	return result;
 }
 //#endregion
-//#region src/types/error.ts
-function unknownToError(err) {
-	if (err instanceof Error) return err;
-	if (typeof err === "string") return new Error(err);
-	let error = "";
-	try {
-		error = JSON.stringify(err);
-	} catch (_) {}
-	return new Error(error, { cause: err });
-}
-var NotImplementedError = class extends Error {
-	constructor(message, options = {}) {
-		super(`Not implemented${message != null ? `: ${message}` : ""}`, options);
-	}
-};
-function throwNotImplemented(message, options) {
-	throw new NotImplementedError(message, options);
-}
-function throwUnreachable() {
-	throw new Error("Unreachable");
-}
-//#endregion
 //#region src/async/priority-work-queue.ts
 var PRI_ORDER = [
 	"visible",
@@ -2013,6 +2041,7 @@ function createPriorityWorkQueue(opts) {
 	let queuedPri = /* @__PURE__ */ new Map();
 	let active = /* @__PURE__ */ new Map();
 	let maxActive = 0;
+	let paused = false;
 	function queuedCount() {
 		return queuedPri.size;
 	}
@@ -2037,6 +2066,7 @@ function createPriorityWorkQueue(opts) {
 		}
 	}
 	function pump() {
+		if (paused) return;
 		while (active.size < concurrency) {
 			let job = pickNext();
 			if (!job) return;
@@ -2090,9 +2120,20 @@ function createPriorityWorkQueue(opts) {
 			queuedPri.clear();
 			for (let running of active.values()) running.controller.abort();
 		},
+		pause() {
+			paused = true;
+		},
+		resume() {
+			if (!paused) return;
+			paused = false;
+			pump();
+		},
 		isBusy(id) {
 			return active.has(id) || queuedPri.has(id);
 		},
+		isRunning(id) {
+			return active.has(id);
+		},
 		get stats() {
 			return {
 				active: active.size,

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@yorozu/utils",
     "type": "module",
-    "version": "1.0.25",
+    "version": "1.0.52",
     "description": "quality of life",
     "license": "MIT",
     "exports": {