minerender 2.1.0-alpha.35 → 2.1.0-alpha.36

package/dist/node/index.d.mts

@@ -585,13 +585,11 @@ declare class BatchedExecutor {
     readonly interval: number;
     readonly batch: number;
     private readonly queue;
-    private readonly task;
     constructor(interval?: number, batch?: number);
-    submit(task: Task): void;
-    private run;
-    private runNext;
+    submit<T>(task: Task<T>): Promise<T>;
+    stop(): void;
 }
-type Task = () => any | Promise<any>;
+type Task<T = unknown> = () => T | Promise<T>;
 
 declare function prefix(prefix?: string): string;
 

package/dist/node/index.d.ts

@@ -585,13 +585,11 @@ declare class BatchedExecutor {
     readonly interval: number;
     readonly batch: number;
     private readonly queue;
-    private readonly task;
     constructor(interval?: number, batch?: number);
-    submit(task: Task): void;
-    private run;
-    private runNext;
+    submit<T>(task: Task<T>): Promise<T>;
+    stop(): void;
 }
-type Task = () => any | Promise<any>;
+type Task<T = unknown> = () => T | Promise<T>;
 
 declare function prefix(prefix?: string): string;
 

package/dist/node/index.js

@@ -1661,24 +1661,20 @@ var AssetLoadError = class extends Error {
 };
 
 // src/util/BatchedExecutor.ts
+var import_jobqu2 = require("jobqu");
 var BatchedExecutor = class {
   constructor(interval = 1, batch = 30) {
+    if (!Number.isFinite(interval) || interval < 0) throw new RangeError("Batch interval must be finite and nonnegative");
+    if (!Number.isInteger(batch) || batch < 1) throw new RangeError("Batch size must be a positive integer");
     this.interval = interval;
     this.batch = batch;
-    this.queue = [];
-    this.task = setInterval(() => this.run());
+    this.queue = new import_jobqu2.JobQueue(async (task) => task(), { interval, maxPerRun: batch, maxActive: batch });
   }
   submit(task) {
-    this.queue.push(task);
+    return this.queue.add(() => task());
   }
-  run() {
-    for (let i = 0; i < this.batch; i++) {
-      this.runNext();
-    }
-  }
-  runNext() {
-    let next = this.queue.shift();
-    if (next) next();
+  stop() {
+    this.queue.end();
   }
 };
 
@@ -7413,22 +7409,39 @@ var MineRenderWorld = class {
     const chunk = Chunk.isAir(value) ? this.getChunkAt(posOrX) : this.getOrCreateChunkAt(posOrX);
     return chunk?.setBlockAt(posOrX, value);
   }
-  async placeMultiBlock(multiblock, useBatches = true, executor = new BatchedExecutor()) {
-    const keys = new Set(multiblock.blocks.map((block) => AssetKey.parse("blockstates", block.type)));
-    await BlockStates.getAll(keys);
-    const place = async (block) => {
-      if (useBatches && typeof executor !== "undefined") {
-        await new Promise((resolve, reject) => {
-          executor.submit(() => {
-            this.setBlockAt(block.position, block).then(resolve).catch(reject);
-          });
-        });
-      } else {
-        await this.setBlockAt(block.position, block);
+  async placeMultiBlock(multiblock, useBatches = true, executor) {
+    const keys = /* @__PURE__ */ new Map();
+    for (const block of multiblock.blocks) {
+      if (Chunk.isAir(block)) continue;
+      const key = AssetKey.parse("blockstates", block.type);
+      keys.set(key.serialize(), key);
+    }
+    await BlockStates.getAll(keys.values());
+    if (!useBatches) {
+      for (const block of multiblock.blocks) await this.setBlockAt(block.position, block);
+      return;
+    }
+    const positions = /* @__PURE__ */ new Map();
+    for (const block of multiblock.blocks) {
+      const key = block.position.join(",");
+      const group = positions.get(key);
+      if (group) group.push(block);
+      else positions.set(key, [block]);
+    }
+    const groups = [...positions.values()];
+    const queue = executor ?? new BatchedExecutor();
+    try {
+      for (let i = 0; i < groups.length; i += queue.batch) {
+        const results = await Promise.allSettled(groups.slice(i, i + queue.batch).map(
+          (blocks) => queue.submit(async () => {
+            for (const block of blocks) await this.setBlockAt(block.position, block);
+          })
+        ));
+        const failure = results.find((result) => result.status === "rejected");
+        if (failure?.status === "rejected") throw failure.reason;
       }
-    };
-    for (let block of multiblock.blocks) {
-      await place(block);
+    } finally {
+      if (!executor) queue.stop();
     }
   }
   async clear() {