@loadmap/sim 0.1.0 → 0.2.0

package/dist/index.d.ts

@@ -47,8 +47,15 @@ interface Particle {
   to: Place;
   /** Set on a copy made at a fan-out: the branch stage it is heading to. */
   branch?: string;
-  /** superseded: merged into a newer unit of its key; unread: a fan-out that made no copy. */
-  outcome?: 'delivered' | 'dropped' | 'rejected' | 'superseded' | 'unread';
+  /** Set on a cache hit heading back to where it came from, answered. */
+  back?: boolean;
+  /** Which attempt this is: 0 for the first, 1 for the first retry, and so on. */
+  attempt?: number;
+  /**
+   * superseded: merged into a newer unit of its key; unread: a fan-out that made no copy; answered: a cache hit back
+   * where it came from.
+   */
+  outcome?: 'delivered' | 'dropped' | 'rejected' | 'superseded' | 'unread' | 'answered';
 }
 interface QueueState {
   /** Units waiting. */
@@ -91,10 +98,17 @@ export declare class Sim {
   queue(stage: string, flow: string): QueueState;
   /** How busy a stage is, 0–1, smoothed: for a workers stage, the share of its workers at work. */
   busy(stage: string): number;
-  /** The share a pass stage (arrivals) or a fan-out (copies) rejects because its component is past capacity. */
+  /**
+   * The share a pass, limit or cache stage (of what reaches it) or a fan-out (of its copies) rejects because its
+   * component is past capacity.
+   */
   shed(stage: string): number;
-  /** How busy worker `i` of a workers stage is, 0–1. */
+  /** How busy worker `i` of a workers stage is, 0–1; 0 in a pod an autoscaler has not started. */
   slotBusy(stage: string, i: number): number;
+  /** Units per second actually reaching a stage on the flows' routes, after what stages before it turned away. */
+  arriving(stage: string): number;
+  /** The pods a workers stage runs: fewer than it draws while an autoscaler holds it small. */
+  running(stage: string): number;
 }
 export declare function createSim(model: Model, ev: Evaluation, o?: SimOptions): Sim;
 export type { Fill, Particle, Place, QueueState, SimOptions };

package/dist/index.js

@@ -132,37 +132,41 @@ var Sim = class {
 				return false;
 			};
 			this.particles = this.particles.filter((d) => fits(d.from, d.flow) && fits(d.to, d.flow));
-			for (const s of Object.values(ev.stages)) if (s.kind === "workers") this.#fills.set(s.id, fillOrder(s.pods, s.perPod, s.fill, this.#o.seed));
+			this.#fills.clear();
 		}
 		const full = this.#model.thresholds.full;
+		const stages = Object.values(ev.stages);
 		this.#shed.clear();
+		for (const s of stages) this.#shed.set(s.id, "shed" in s ? s.shed : 0);
 		this.#inflow.clear();
-		for (const s of Object.values(ev.stages)) {
-			const u = (s.kind === "pass" || s.kind === "fanout") && s.component ? this.#util(s.component) : null;
-			this.#shed.set(s.id, u != null && u > full ? 1 - full / u : 0);
-		}
 		for (const f of this.#model.flowIds) {
 			let rate = ev.flows[f] ?? 0;
 			for (const st of ev.routes[f] ?? []) {
 				this.#inflow.set(`${st}/${f}`, rate);
-				rate *= 1 - (this.#shed.get(st) ?? 0);
+				const s = ev.stages[st];
+				if (s.kind !== "fanout") rate *= 1 - (this.#shed.get(st) ?? 0);
+				if (s.kind === "cache") rate *= 1 - s.hit;
 			}
 		}
 		this.#capacity.clear();
-		const routedThrough = (s) => this.#model.flowIds.filter((f) => ev.routes[f]?.includes(s));
-		for (const s of Object.values(ev.stages)) {
+		const atFull = /* @__PURE__ */ new Map();
+		for (const s of stages) {
 			const c = s.component ? ev.components[s.component] : void 0;
 			let cap = Number.POSITIVE_INFINITY;
 			if (c && c.util != null && c.full != null && Number.isFinite(c.full)) {
 				if (c.full > 0) {
-					const at = this.#model.evaluate({
-						...ev.values,
-						load: c.full
-					});
-					cap = routedThrough(s.id).reduce((a, f) => a + (at.flows[f] ?? 0), 0);
+					let at = atFull.get(c.full);
+					if (!at) {
+						at = this.#model.evaluate({
+							...ev.values,
+							load: c.full
+						});
+						atFull.set(c.full, at);
+					}
+					cap = this.#model.flowIds.reduce((a, f) => a + (at.at[s.id]?.[f] ?? 0), 0);
 				} else {
-					const now = routedThrough(s.id).reduce((a, f) => a + (this.#inflow.get(`${s.id}/${f}`) ?? 0), 0);
-					cap = c.util > 0 ? now * full / c.util : 0;
+					const offered = this.#model.flowIds.reduce((x, f) => x + (ev.at[s.id]?.[f] ?? 0), 0);
+					cap = c.util > 0 ? offered * full / c.util : 0;
 				}
 			}
 			this.#capacity.set(s.id, cap);
@@ -188,14 +192,33 @@ var Sim = class {
 	busy(stage) {
 		return this.#busy.get(stage) ?? this.#steadyBusy(stage);
 	}
-	/** The share a pass stage (arrivals) or a fan-out (copies) rejects because its component is past capacity. */
+	/**
+	* The share a pass, limit or cache stage (of what reaches it) or a fan-out (of its copies) rejects because its
+	* component is past capacity.
+	*/
 	shed(stage) {
 		return this.#shed.get(stage) ?? 0;
 	}
-	/** How busy worker `i` of a workers stage is, 0–1. */
+	/** How busy worker `i` of a workers stage is, 0–1; 0 in a pod an autoscaler has not started. */
 	slotBusy(stage, i) {
-		const f = this.#fills.get(stage);
-		return f ? busyOf(i, f, this.busy(stage)) : 0;
+		const s = this.#ev.stages[stage];
+		if (s?.kind !== "workers" || i >= s.running * s.perPod) return 0;
+		const key = `${stage}/${s.running}`;
+		let f = this.#fills.get(key);
+		if (!f) {
+			f = fillOrder(s.running, s.perPod, s.fill, this.#o.seed);
+			this.#fills.set(key, f);
+		}
+		return busyOf(i, f, this.busy(stage));
+	}
+	/** Units per second actually reaching a stage on the flows' routes, after what stages before it turned away. */
+	arriving(stage) {
+		return this.#model.flowIds.reduce((a, f) => a + (this.#inflow.get(`${stage}/${f}`) ?? 0), 0);
+	}
+	/** The pods a workers stage runs: fewer than it draws while an autoscaler holds it small. */
+	running(stage) {
+		const s = this.#ev.stages[stage];
+		return s?.kind === "workers" ? s.running : 0;
 	}
 	#util(component) {
 		return this.#ev.components[component]?.util ?? null;
@@ -203,7 +226,12 @@ var Sim = class {
 	#steadyBusy(stage) {
 		const s = this.#ev.stages[stage];
 		const u = s?.component ? this.#util(s.component) : null;
-		return Math.min(1, (u ?? 0) / this.#model.thresholds.full);
+		return Math.min(1, (u ?? 0) / this.#model.thresholds.full * this.#scaled(stage));
+	}
+	/** The workers drawn over the workers running: the busy share of the running ones is that much higher. */
+	#scaled(stage) {
+		const s = this.#ev.stages[stage];
+		return s?.kind === "workers" && s.running > 0 ? s.pods / s.running : 1;
 	}
 	#stepQueues(dt) {
 		const ev = this.#ev;
@@ -278,14 +306,14 @@ var Sim = class {
 		for (const s of Object.values(ev.stages)) {
 			if (s.kind !== "workers") continue;
 			const cap = this.#capacity.get(s.id) ?? Number.POSITIVE_INFINITY;
-			const now = taken.has(s.id) && Number.isFinite(cap) && cap > 0 ? taken.get(s.id) / (cap * dt) : this.#steadyBusy(s.id);
+			const now = taken.has(s.id) && Number.isFinite(cap) && cap > 0 ? taken.get(s.id) / (cap * dt) * this.#scaled(s.id) : this.#steadyBusy(s.id);
 			this.#busy.set(s.id, ema(this.#busy.get(s.id) ?? now, Math.min(1, now), dt));
 		}
 	}
 	#spawnDots(dtReal) {
 		const { minDots, maxDots, legSeconds, maxParticles } = this.#o;
 		for (const f of this.#model.flowIds) {
-			const rate = this.#ev.flows[f] ?? 0;
+			const rate = this.#ev.retry[f]?.rate ?? this.#ev.flows[f] ?? 0;
 			if (rate <= 0) continue;
 			const perSec = Math.min(maxDots, Math.max(minDots, rate / this.dotScale));
 			let acc = (this.#spawn.get(f) ?? 0) + perSec * dtReal;
@@ -307,6 +335,23 @@ var Sim = class {
 			this.#spawn.set(f, acc);
 		}
 	}
+	/** A unit turned away, sent again from its source while it has retries left and the budget allows. */
+	#retry(d) {
+		const r = this.#ev.retry[d.flow];
+		const attempt = (d.attempt ?? 0) + 1;
+		if (!r || attempt > r.times || this.#r() >= r.retried) return null;
+		return {
+			id: this.#nextId++,
+			flow: d.flow,
+			leg: 0,
+			phase: "move",
+			t: 0,
+			dur: this.#o.legSeconds,
+			from: { stage: null },
+			to: this.#place(this.#ev.routes[d.flow][0], d.flow),
+			attempt
+		};
+	}
 	#moveDots(dtReal) {
 		const ev = this.#ev;
 		const fade = (d, outcome, dur) => {
@@ -327,9 +372,18 @@ var Sim = class {
 			d.to = this.#place(route[d.leg], d.flow);
 		};
 		const born = [];
+		const reject = (d) => {
+			fade(d, "rejected", .6);
+			const again = this.particles.length + born.length < this.#o.maxParticles ? this.#retry(d) : null;
+			if (again) born.push(again);
+		};
 		for (const d of this.particles) {
 			d.t += dtReal;
 			if (d.t < d.dur) continue;
+			if (d.phase === "move" && d.back) {
+				fade(d, "answered", .35);
+				continue;
+			}
 			const stage = ev.stages[d.to.stage ?? ""];
 			if (d.phase === "fade" || !stage) {
 				d.phase = "fade";
@@ -356,8 +410,15 @@ var Sim = class {
 				if (made) fade(d, "delivered", 0);
 				else fade(d, "unread", .6);
 			} else if (d.phase === "move") {
-				if (stage.kind === "pass" && this.#r() < this.shed(stage.id)) fade(d, "rejected", .6);
-				else if (stage.kind === "queue") {
+				if ((stage.kind === "pass" || stage.kind === "limit" || stage.kind === "cache") && this.#r() < this.shed(stage.id)) reject(d);
+				else if (stage.kind === "cache" && this.#r() < stage.hit) {
+					const to = d.from;
+					d.from = d.to;
+					d.to = to;
+					d.t = 0;
+					d.dur = this.#o.legSeconds;
+					d.back = true;
+				} else if (stage.kind === "queue") {
 					const lag = this.queue(stage.id, d.flow).lag;
 					d.phase = "hold";
 					d.t = 0;
@@ -389,7 +450,7 @@ var Sim = class {
 		}
 		if (s?.kind === "workers") return {
 			stage,
-			cell: this.#pickWorker(s.id, s.pods * s.perPod)
+			cell: this.#pickWorker(s.id, s.running * s.perPod)
 		};
 		return { stage };
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loadmap/sim",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "The fluid queue simulation behind loadmap's moving dots: priorities, drop rules, worker fill, seeded randomness.",
   "keywords": [
     "loadmap",
@@ -28,7 +28,7 @@
     "dist"
   ],
   "dependencies": {
-    "@loadmap/core": "0.1.0"
+    "@loadmap/core": "0.2.0"
   },
   "peerDependencies": {},
   "scripts": {