@daneren2005/shared-memory-ecs 1.2.2 → 1.4.0

package/dist/index.js

@@ -1,4 +1,4 @@
-import { a as e, i as t, n, o as r, r as i, s as a, t as o } from "./create-component-worker-Bd1BTUkq.js";
+import { a as e, i as t, n, o as r, r as i, s as a, t as o } from "./create-component-worker-vbX3vEia.js";
 import s from "@daneren2005/shared-memory-objects/memory-heap";
 import { MAX_BYTE_OFFSET_LENGTH as c } from "@daneren2005/shared-memory-objects/utils/pointer";
 import l from "@daneren2005/shared-memory-objects/local-pool";
@@ -150,9 +150,16 @@ var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescr
 	update(e) {
 		if (this.currentDelta += e, this.currentDelta >= this.deltaBetweenRuns || this.firstRun) {
 			let e = 0;
-			return this.deltaBetweenRuns > 0 && (e = this.currentDelta % this.deltaBetweenRuns), this.run(this.currentDelta - e), this.currentDelta = e, this.firstRun = !1, !0;
+			return this.deltaBetweenRuns > 0 && (e = this.currentDelta % this.deltaBetweenRuns), this.run(this.currentDelta - e), this.currentDelta = e, this.firstRun = !1, this.onRunFinished(), !0;
 		} else return !1;
 	}
+	onRunFinished() {
+		this.world.notifySystemRunCompleted(this);
+	}
+	isCurrentlyRunning() {
+		return !1;
+	}
+	waitForRunToComplete() {}
 	shouldRun() {
 		return !0;
 	}
@@ -171,12 +178,18 @@ var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescr
 		super.clear(), this.remainingInstancesToRun = [], this.remainingInstancesStartTime = null;
 	}
 	update(e) {
-		return this.remainingInstancesToRun.length ? (this.runIterables(this.remainingInstancesToRun, this.remainingInstancesStartTime ?? 0), this.currentDelta += e, !0) : super.update(e);
+		return this.remainingInstancesToRun.length ? (this.runIterables(this.remainingInstancesToRun, this.remainingInstancesStartTime ?? 0), this.currentDelta += e, this.remainingInstancesToRun.length || this.onRunFinished(), !0) : super.update(e);
 	}
 	run(e) {
 		let t = this.getIterables();
 		this.runIterables(t, e);
 	}
+	onRunFinished() {
+		this.remainingInstancesToRun.length || super.onRunFinished();
+	}
+	isCurrentlyRunning() {
+		return this.remainingInstancesToRun.length > 0;
+	}
 	runIterables(e, t) {
 		let n = performance.now();
 		this.beforeRunIterables();
@@ -229,12 +242,16 @@ var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescr
 	updateFunction;
 	entities = [];
 	queryEntities = {};
+	worldExtension;
 	constructor(e) {
 		super(), this.updateFunction = e;
 	}
 	postMessage(e) {
-		if (e.type === "init") this.onMessageTyped({ type: "loaded" });
+		if (e.type === "init") this.onMessageTyped({ type: "init-complete" });
+		else if (e.type === "load") this.worldExtension = this.updateFunction.init?.(e.data) ?? void 0, this.onMessageTyped({ type: "loaded" });
+		else if (e.type === "reset") this.entities = [], this.queryEntities = {};
 		else if (e.type === "run") {
+			this.worldExtension && Object.assign(e.world, this.worldExtension);
 			let t = performance.now(), n = [], r = {}, i = [];
 			this.entities = a(this.entities, e.entities);
 			let o = {};
@@ -281,6 +298,7 @@ var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescr
 			let c = performance.now() - t;
 			this.onMessageTyped({
 				type: "run-complete",
+				generation: e.generation,
 				runTime: c,
 				events: n,
 				systemEvents: r,
@@ -296,9 +314,12 @@ var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescr
 	options;
 	worker;
 	isWorkerThread;
-	loaded = !1;
+	initialized = !1;
+	initPromise = null;
 	loadingPromise = null;
+	runCompletePromise = null;
 	isRunning = !1;
+	generation = 0;
 	queryEntities = {};
 	queryDeltas = {};
 	constructor(e, t) {
@@ -315,35 +336,75 @@ var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescr
 	initWorker() {
 		this.worker.onmessage = (e) => {
 			let t = e.data;
-			if (t.type === "loaded") this.loaded = !0, this.loadingPromise &&= (this.loadingPromise.resolve(), null);
+			if (t.type === "init-complete") this.initialized = !0, this.initPromise &&= (this.initPromise.resolve(), null);
+			else if (t.type === "loaded") this.loadingPromise &&= (this.loadingPromise.resolve(), null);
 			else if (t.type === "run-complete") {
+				if (t.generation !== this.generation) return;
 				this.isRunning = !1, this.world.emit(`system-${this.name}-worker-finished`, t.runTime);
 				for (let e of Object.keys(t.systemEvents)) this.emit(e, t.systemEvents[e]);
 				t.events.forEach((e) => {
 					let t = this.world.getEntityByEid(e.entityId);
 					if (!t) {
-						console.warn(`Could not find entity with id ${e.entityId}`);
+						console.warn(`${this.name}-event ${e.event}: Could not find entity with id ${e.entityId}`);
 						return;
 					}
 					t.emit(e.event, ...e.args);
 				}), t.created.forEach((e) => {
 					this.world.loadEntity(e);
-				}), this.world.emit(`system-${this.name}-worker-events-finished`, t.runTime);
+				}), this.world.emit(`system-${this.name}-worker-events-finished`, t.runTime), this.world.notifySystemRunCompleted(this), this.runCompletePromise &&= (this.runCompletePromise.resolve(), null);
 			}
 		}, this.worker.postMessage({ type: "init" });
 	}
 	init() {
-		if (this.loaded) return;
-		if (this.loadingPromise) return this.loadingPromise.promise;
+		if (this.initialized) return;
+		if (this.initPromise) return this.initPromise.promise;
 		let { promise: e, resolve: t } = Promise.withResolvers();
-		return this.loadingPromise = {
+		return this.initPromise = {
 			promise: e,
 			resolve: t
 		}, e;
 	}
+	finishLoading() {
+		let { promise: e, resolve: t } = Promise.withResolvers();
+		this.loadingPromise = {
+			promise: e,
+			resolve: t
+		};
+		let n = {
+			type: "load",
+			data: this.options.getInitData?.()
+		};
+		return this.worker.postMessage(n), e;
+	}
+	clear() {
+		if (super.clear(), this.isRunning && !this.runCompletePromise) {
+			let { promise: e, resolve: t } = Promise.withResolvers();
+			this.runCompletePromise = {
+				promise: e,
+				resolve: t
+			};
+		}
+		this.isRunning = !1, this.generation++, this.entities.clear(), Object.values(this.queryEntities).forEach((e) => e.clear()), this.queryDeltas = {}, this.worker.postMessage({ type: "reset" });
+	}
 	update(e) {
 		return this.isRunning ? (this.currentDelta += e, !1) : super.update(e);
 	}
+	onRunFinished() {}
+	isCurrentlyRunning() {
+		return this.isRunning;
+	}
+	waitForRunToComplete() {
+		if (this.isRunning) {
+			if (!this.runCompletePromise) {
+				let { promise: e, resolve: t } = Promise.withResolvers();
+				this.runCompletePromise = {
+					promise: e,
+					resolve: t
+				};
+			}
+			return this.runCompletePromise.promise;
+		}
+	}
 	run(e) {
 		let t = {
 			gameTime: this.world.gameTime,
@@ -356,6 +417,7 @@ var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescr
 		});
 		let i = {
 			type: "run",
+			generation: this.generation,
 			world: t,
 			entities: n,
 			queries: r
@@ -442,7 +504,10 @@ var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescr
 	}
 	removeComponent(e) {
 		let t = this.components[e];
-		t && (this.world.registry[e].memoryComponent.delete(t.index), delete this.components[e], this.emit("component-removed", e));
+		if (t) {
+			let n = this.world.registry[e];
+			this.world.deferComponentMemoryFree(n.memoryComponent, t.index, n.free ? () => n.free(t) : void 0), delete this.components[e], this.emit("component-removed", e);
+		}
 	}
 	setComponent(e, t, n) {
 		let r = this.components[e];
@@ -457,10 +522,10 @@ var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescr
 		n && (delete n[t], this.emit("component-property-deleted", e, t));
 	}
 	deleteAllComponentMemory() {
-		let e = this.world.registry;
-		for (let t of Object.keys(this.components)) {
-			let n = this.components[t];
-			n && e[t].memoryComponent.delete(n.index);
+		let e = this.world.registry, t = this.components;
+		for (let n of Object.keys(t)) {
+			let r = e[n], i = t[n];
+			i && this.world.deferComponentMemoryFree(r.memoryComponent, i.index, r.free ? () => r.free(i) : void 0);
 		}
 	}
 	load(e) {
@@ -513,7 +578,7 @@ var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescr
 	createEntity(e) {
 		return new D(this.world, e);
 	}
-}, k = c, A = class extends v.default {
+}, k = c, A = 1e4, j = class extends v.default {
 	heap;
 	registry;
 	factory;
@@ -524,6 +589,17 @@ var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescr
 	timeScale = 1;
 	paused = !1;
 	destroyed = !1;
+	pristine = !0;
+	activeFreeBuffer = {
+		frees: [],
+		waitingSystems: /* @__PURE__ */ new Set(),
+		waitElapsed: 0
+	};
+	nextFreeBuffer = {
+		frees: [],
+		waitingSystems: /* @__PURE__ */ new Set(),
+		waitElapsed: 0
+	};
 	constructor(e, t = {}) {
 		super(), this.heap = new s({ bufferSize: t.heapSize ?? k });
 		let n = {
@@ -542,8 +618,11 @@ var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescr
 	async init() {
 		await Promise.all(this.systems.map((e) => e.init()).filter((e) => e instanceof Promise));
 	}
+	finishLoadingSystems() {
+		return Promise.all(this.systems.map((e) => e.finishLoading()).filter((e) => e instanceof Promise));
+	}
 	addEntity(e, t = !0) {
-		return this.entities.set(e.eid, e), e.world = this, e.on("component-added", (t) => {
+		return this.entities.set(e.eid, e), e.world = this, this.pristine = !1, e.on("component-added", (t) => {
 			this.addEntityToComponentSystem(e, t);
 		}), e.on("component-removed", (t) => {
 			this.removeEntityFromComponentSystem(e, t);
@@ -555,13 +634,21 @@ var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescr
 		return this.factory.loadEntity(e, t);
 	}
 	load(e) {
-		for (let e of Array.from(this.entities.values())) this.removeEntity(e);
-		this.systems.forEach((e) => e.clear());
+		if (!this.pristine) {
+			for (let e of Array.from(this.entities.values())) this.removeEntity(e);
+			this.systems.forEach((e) => e.clear()), this.consolidateFreeBuffersForReload();
+		}
 		let t = e.entities.map((e) => this.loadEntity(e, !1));
 		for (let e of t) e.finishLoading(), this.emit("entity-added", e), e.on("death", () => {
 			this.onEntityDied(e);
 		});
-		this.gameTime = e.gameTime ?? 0, this.playerTime = e.playerTime ?? 0, this.timeScale = e.timeScale ?? 1;
+		this.gameTime = e.gameTime ?? 0, this.playerTime = e.playerTime ?? 0, this.timeScale = e.timeScale ?? 1, this.finishLoadingSystems();
+	}
+	async clear() {
+		if (!this.pristine) {
+			for (let e of Array.from(this.entities.values())) this.removeEntity(e);
+			this.systems.forEach((e) => e.clear()), await Promise.all(this.systems.map((e) => e.waitForRunToComplete()).filter((e) => e instanceof Promise)), this.freeAllPendingBuffers(), this.pristine = !0;
+		}
 	}
 	removeEntity(e) {
 		this.entities.delete(e.eid) && this.emit("entity-removed", e), e.deleteAllComponentMemory();
@@ -572,6 +659,43 @@ var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescr
 	getEntityByEid(e) {
 		return this.entities.get(e);
 	}
+	deferComponentMemoryFree(e, t, n) {
+		this.nextFreeBuffer.frees.push({
+			memoryComponent: e,
+			index: t,
+			free: n
+		});
+	}
+	notifySystemRunCompleted(e) {
+		this.activeFreeBuffer.waitingSystems.delete(e) && this.activeFreeBuffer.waitingSystems.size === 0 && this.processFreeBuffers();
+	}
+	processFreeBuffers() {
+		for (; this.activeFreeBuffer.waitingSystems.size === 0 && (this.activeFreeBuffer.frees.length > 0 && this.performFrees(this.activeFreeBuffer), this.nextFreeBuffer.frees.length !== 0);) this.promoteNextFreeBuffer();
+	}
+	promoteNextFreeBuffer() {
+		let e = this.activeFreeBuffer;
+		this.activeFreeBuffer = this.nextFreeBuffer, this.nextFreeBuffer = e;
+		let t = this.activeFreeBuffer;
+		t.waitElapsed = 0, t.waitingSystems.clear();
+		for (let e of this.systems) (e.shouldRun() || e.isCurrentlyRunning()) && t.waitingSystems.add(e);
+	}
+	consolidateFreeBuffersForReload() {
+		this.activeFreeBuffer.frees.length > 0 && (this.nextFreeBuffer.frees.push(...this.activeFreeBuffer.frees), this.activeFreeBuffer.frees.length = 0), this.activeFreeBuffer.waitingSystems.clear(), this.activeFreeBuffer.waitElapsed = 0;
+	}
+	freeAllPendingBuffers() {
+		this.performFrees(this.activeFreeBuffer), this.performFrees(this.nextFreeBuffer), this.activeFreeBuffer.waitingSystems.clear(), this.activeFreeBuffer.waitElapsed = 0, this.nextFreeBuffer.waitingSystems.clear(), this.nextFreeBuffer.waitElapsed = 0;
+	}
+	performFrees(e) {
+		for (let t of e.frees) t.free?.(), t.memoryComponent.delete(t.index);
+		e.frees.length = 0;
+	}
+	checkFreeBufferTimeout(e) {
+		let t = this.activeFreeBuffer;
+		if (t.waitingSystems.size !== 0 && (t.waitElapsed += e, t.waitElapsed >= A)) {
+			let e = Array.from(t.waitingSystems).map((e) => e.name).join(", ");
+			console.warn(`shared-memory-ecs: deferred component free waited over ${A}ms on system(s): ${e}; freeing anyway`), t.waitingSystems.clear(), this.processFreeBuffers();
+		}
+	}
 	addSystem(e) {
 		return this.systems.push(e), this.emit("system-added", e), e;
 	}
@@ -592,23 +716,24 @@ var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescr
 	}
 	runUpdate(e) {
 		if (this.playerTime += e, this.paused) return {};
-		e = this.timeScale * e, this.gameTime += e;
-		let t = null;
-		return this.systems.forEach((n) => {
+		let t = e;
+		e = this.timeScale * e, this.gameTime += e, this.processFreeBuffers();
+		let n = null;
+		return this.systems.forEach((t) => {
 			let r = !0, i = !1, a = !1;
-			this.emit(`system-${n.name}-started`);
+			this.emit(`system-${t.name}-started`);
 			try {
-				r = n.shouldRun(), r && (i = n.update(e));
+				r = t.shouldRun(), r && (i = t.update(e));
 			} catch (e) {
-				let n = e;
-				console.error(n.message, n), a = !0, t = n;
+				let t = e;
+				console.error(t.message, t), a = !0, n = t;
 			}
-			this.emit(`system-${n.name}-finished`, {
+			this.emit(`system-${t.name}-finished`, {
 				ran: i,
 				shouldRun: r,
 				failed: a
 			});
-		}), { lastSystemError: t };
+		}), this.checkFreeBufferTimeout(t), { lastSystemError: n };
 	}
 	pause() {
 		this.paused = !0;
@@ -638,19 +763,19 @@ var u = Object.create, d = Object.defineProperty, f = Object.getOwnPropertyDescr
 };
 //#endregion
 //#region src/actions/kill-entity.ts
-function j(e) {
+function M(e) {
 	e.components.entity.dead = !0, e.emit("death");
 }
 //#endregion
 //#region src/performance-timing.ts
-var M = 1e3, N = {
+var N = 1e3, P = {
 	avg: 0,
 	min: 0,
 	max: 0,
 	samples: 0
 };
-function P(e) {
-	if (!e.length) return { ...N };
+function F(e) {
+	if (!e.length) return { ...P };
 	let t = 0, n = Infinity, r = 0;
 	for (let i of e) t += i, i < n && (n = i), i > r && (r = i);
 	return {
@@ -660,13 +785,13 @@ function P(e) {
 		samples: e.length
 	};
 }
-var F = class extends v.default {
+var I = class extends v.default {
 	world;
 	ticksBetweenUpdates;
 	stats = {
-		update: { ...N },
+		update: { ...P },
 		systems: [],
-		events: { ...N }
+		events: { ...P }
 	};
 	ticks = 0;
 	updateStart = 0;
@@ -683,9 +808,9 @@ var F = class extends v.default {
 		this.ticks = 0, this.updateTimes = [], this.systemTimings.forEach((e) => {
 			e.run = [], e.events = [], e.eventStart = -1;
 		}), this.stats = {
-			update: { ...N },
+			update: { ...P },
 			systems: [],
-			events: { ...N }
+			events: { ...P }
 		};
 	}
 	destroy() {
@@ -727,14 +852,14 @@ var F = class extends v.default {
 			let t = this.systemTimings.get(e.name);
 			return {
 				name: e.name,
-				run: P(t?.run ?? []),
-				events: P(t?.events ?? [])
+				run: F(t?.run ?? []),
+				events: F(t?.events ?? [])
 			};
-		}), t = { ...N };
+		}), t = { ...P };
 		e.forEach((e) => {
 			t.avg += e.events.avg, t.min += e.events.min, t.max += e.events.max, t.samples += e.events.samples;
 		}), this.stats = {
-			update: P(this.updateTimes),
+			update: F(this.updateTimes),
 			systems: e,
 			events: t
 		}, this.ticks = 0, this.updateTimes = [], this.systemTimings.forEach((e) => {
@@ -743,6 +868,6 @@ var F = class extends v.default {
 	}
 };
 //#endregion
-export { D as BaseEntity, A as BaseWorld, E as ComponentSystem, w as ComponentWebWorker, t as DEAD_INDEX, M as DEFAULT_TICKS_BETWEEN_UPDATES, O as EntityFactory, S as EntitySystem, x as IterableSystem, y as MemoryComponent, F as PerformanceTiming, e as STATIC_INDEX, b as System, C as WebWorker, o as createComponentWorker, n as createEntityWorker, r as entityDefinition, j as killEntity, i as killEntityWorker };
+export { D as BaseEntity, j as BaseWorld, E as ComponentSystem, w as ComponentWebWorker, t as DEAD_INDEX, N as DEFAULT_TICKS_BETWEEN_UPDATES, O as EntityFactory, S as EntitySystem, x as IterableSystem, y as MemoryComponent, I as PerformanceTiming, e as STATIC_INDEX, b as System, C as WebWorker, o as createComponentWorker, n as createEntityWorker, r as entityDefinition, M as killEntity, i as killEntityWorker };
 
 //# sourceMappingURL=index.js.map