v1.3.0: per-player money & reputation in engine + actions (ISS-110)

lib/sim/engine.test.ts

@@ -5,7 +5,7 @@ import { eq } from 'drizzle-orm';
 import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
 import { openGameDb } from '@/lib/db/client';
 import * as schema from '@/lib/db/schema';
-import { getLocalPlayer, updateLocalPlayerEconomy } from '@/lib/db/localPlayer';
+import { LOCAL_PLAYER, getPlayer, getLocalPlayer, updateLocalPlayerEconomy } from '@/lib/db/localPlayer';
 import { loadAirportsGeoJson } from '@/lib/airports';
 import { haversineKm, initialBearingDeg } from '@/lib/geo';
 import { weatherFor } from '@/lib/weather';
@@ -497,6 +497,78 @@ describe('deliverPackages (v0.12.0 arrival delivery)', () => {
     expect(plane.destIcao).toBeNull();
     expect(JSON.parse(plane.queue)).toEqual(['EHAM']); // …the rest of the queue kept for a later dispatch
   });
+
+  // --- Per-owner economy (v1.3.0, ISS-110) ---
+
+  it('pays cash + reputation to the plane OWNER, not the local player', async () => {
+    const { inst, km } = await setupFlight('deliver-owner.db');
+    // A second player owns the starter — distinct economy so any leak into 'local' is visible.
+    await inst.db.insert(schema.players).values({ id: 'player-b', provider: 'test', username: 'b', cash: 1_000, reputation: 5 });
+    await inst.db.update(schema.planes)
+      .set({ ownerId: 'player-b' })
+      .where(eq(schema.planes.id, 'plane-starter'));
+
+    const localBefore = (await getPlayer(inst, LOCAL_PLAYER.id));
+    const bBefore = (await getPlayer(inst, 'player-b'));
+    await inst.db.insert(schema.packages).values([
+      { id: 'p-owner', originIcao: FROM, destIcao: TO, reward: 5_000, cargoType: 'Mail', cargoCount: 1, deadlineSimTime: T0 + 24 * 3_600_000, status: 'loaded', planeId: 'plane-starter', createdSimTime: T0 },
+    ]);
+
+    const clock = T0 + travelMs(km, PLANE_TYPES.atr72.speedKmh); // exactly at arrival
+    expect(await deliverPackages(inst, clock)).toBe(1);
+
+    const bAfter = (await getPlayer(inst, 'player-b'));
+    expect(bAfter.cash).toBeCloseTo(bBefore.cash + 5_000, 9); // the owner was paid…
+    expect(bAfter.reputation).toBeCloseTo(Math.round((bBefore.reputation + reputationGainFor(km)) * 100) / 100, 9); // …with the distance-based rep gain
+    const localAfter = (await getPlayer(inst, LOCAL_PLAYER.id));
+    expect(localAfter.cash).toBe(localBefore.cash); // the local player is untouched…
+    expect(localAfter.reputation).toBe(localBefore.reputation); // …in both directions
+  });
+
+  it('debits the auto top-up from the plane OWNER, not the local player (ISS-082 × ISS-110)', async () => {
+    const { inst, from, to, km, type } = await setupFlight('chain-owner.db');
+    // Owner B funds the chain: distinct cash + rep so both the debit and the discount are attributable.
+    await inst.db.insert(schema.players).values({ id: 'player-b', provider: 'test', username: 'b', cash: 50_000, reputation: 10 });
+
+    // Depart with exactly the wind-adjusted fuel for EDDF→LEMD → lands empty; LEMD→EHAM needs a top-up.
+    const w = weatherFor(FROM);
+    const f = windBurnFactor(w.windKt, w.windDirDeg, initialBearingDeg(from.lat, from.lon, to.lat, to.lon));
+    const depFuel = requiredFuelFor(type.burnPerKm * f, type.emptyWeightKg, type.maxFuel, km);
+    await inst.db.update(schema.planes)
+      .set({ fuel: depFuel, queue: JSON.stringify(['EHAM']), ownerId: 'player-b' })
+      .where(eq(schema.planes.id, 'plane-starter'));
+
+    const localBefore = (await getPlayer(inst, LOCAL_PLAYER.id));
+    const bBefore = (await getPlayer(inst, 'player-b'));
+    const clock = T0 + travelMs(km, type.speedKmh); // exactly at arrival
+    expect(await deliverPackages(inst, clock)).toBe(1);
+
+    // Expected cost from the SAME helpers the engine uses — computed with B's rep discount.
+    const fc = await loadAirportsGeoJson();
+    const nextP = fc.features.find((x) => x.properties.icao === 'EHAM')!.properties;
+    const landedFuel = fuelAtWeighted(depFuel, type.burnPerKm * f, type.emptyWeightKg, type.maxFuel, km, 1);
+    expect(landedFuel).toBeCloseTo(0, 6); // sanity: arrived empty — the top-up path is what ran
+    const wTo = weatherFor(TO);
+    const fNext = windBurnFactor(wTo.windKt, wTo.windDirDeg, initialBearingDeg(to.lat, to.lon, nextP.lat, nextP.lon));
+    const nextRequiredL = requiredFuelFor(
+      type.burnPerKm * fNext,
+      type.emptyWeightKg,
+      type.maxFuel,
+      haversineKm(to.lat, to.lon, nextP.lat, nextP.lon),
+    );
+    const target = Math.min(type.maxFuel, Math.max(landedFuel, nextRequiredL * 1.5));
+    const liters = Math.max(0, target - landedFuel);
+    expect(liters).toBeGreaterThan(0); // the hop genuinely needs more than what's left
+    const rate = repRate(bBefore.reputation, FUEL_DISCOUNT_PER_REP, MAX_FUEL_DISCOUNT);
+    const expectedCost = Math.round(liters * FUEL_PRICE_PER_L * (1 - rate) * 100) / 100;
+
+    const plane = (await inst.db.select().from(schema.planes))[0];
+    expect(plane.status).toBe('flying'); // B's cash funded the chain…
+    expect(plane.destIcao).toBe('EHAM');
+    const bAfter = (await getPlayer(inst, 'player-b'));
+    expect(bAfter.cash).toBeCloseTo(bBefore.cash - expectedCost, 9); // …debited from B…
+    expect((await getPlayer(inst, LOCAL_PLAYER.id)).cash).toBe(localBefore.cash); // …not local
+  });
 });
 
 describe('wear on landed legs (v0.39.0, ISS-069)', () => {

lib/sim/engine.ts

@@ -1,7 +1,7 @@
 import { randomInt, randomUUID } from 'node:crypto';
 import { eq, sql } from 'drizzle-orm';
 import { getGameDb, persist, type GameDb } from '@/lib/db/client';
-import { getLocalPlayer, updateLocalPlayerEconomy } from '@/lib/db/localPlayer';
+import { LOCAL_PLAYER, getLocalPlayer, getPlayer, updatePlayerEconomy } from '@/lib/db/localPlayer';
 import * as schema from '@/lib/db/schema';
 import { loadAirportsGeoJson } from '@/lib/airports';
 import { haversineKm, initialBearingDeg } from '@/lib/geo';
@@ -251,12 +251,13 @@ export async function deliverPackages(inst: GameDb, clockMs: number): Promise<nu
     for (const pk of onBoard) {
       if (pk.status === 'loaded' && clockMs <= pk.deadlineSimTime) {
         await inst.db.update(schema.packages).set({ status: 'delivered' }).where(eq(schema.packages.id, pk.id));
-        // Fresh player read per award so multiple deliveries in one tick all count.
-        const fresh = await getLocalPlayer(inst);
+        // v1.3.0 (ISS-110): the award goes to the DELIVERED PLANE'S OWNER — fresh read per award so
+        // multiple deliveries in one tick all count.
+        const fresh = await getPlayer(inst, p.ownerId);
         // v0.37.0 (ISS-073): special packages add the registry's flat rep bonus on top of the
         // distance-based gain — same double-rounding convention as before (gain rounded to cents, total re-rounded).
         const repBonus = pk.special ? SPECIALS[pk.special]?.repBonus ?? 0 : 0;
-        await updateLocalPlayerEconomy(inst, {
+        await updatePlayerEconomy(inst, p.ownerId, {
           cash: fresh.cash + pk.reward,
           reputation: Math.round((fresh.reputation + reputationGainFor(distanceKm) + repBonus) * 100) / 100,
         });
@@ -306,14 +307,15 @@ export async function deliverPackages(inst: GameDb, clockMs: number): Promise<nu
             // ISS-082: auto top-up — same target/price terms as flyPlane's dispatch refuel.
             const target = Math.min(type.maxFuel, Math.max(landedFuel, nextRequiredL * 1.5));
             const liters = Math.max(0, target - landedFuel);
-            // Fresh player read (same pattern as the delivery awards above) so a top-up in this tick sees current cash.
-            const fresh = await getLocalPlayer(inst);
+            // v1.3.0 (ISS-110): the PLANE OWNER's economy pays — fresh read (same pattern as the
+            // delivery awards above) so a top-up in this tick sees current cash.
+            const fresh = await getPlayer(inst, p.ownerId);
             const cost = Math.round(liters * FUEL_PRICE_PER_L * (1 - repRate(fresh.reputation, FUEL_DISCOUNT_PER_REP, MAX_FUEL_DISCOUNT)) * 100) / 100;
             if (cost === 0 || fresh.cash >= cost) {
               queue.shift();
               chainedTo = nextDest;
               topUpFuel = target;
-              if (cost > 0) await updateLocalPlayerEconomy(inst, { cash: Math.round((fresh.cash - cost) * 100) / 100 });
+              if (cost > 0) await updatePlayerEconomy(inst, p.ownerId, { cash: Math.round((fresh.cash - cost) * 100) / 100 });
             }
           }
         }
@@ -382,7 +384,10 @@ export async function spawnPoolPackages(
     lon: f.properties.lon,
   }));
   const rand = rng ?? mulberry32(randomInt(0, 2 ** 31));
-  // v0.38.0 (ISS-072): spawned jobs carry the local player's CURRENT reputation quality — read once per spawn batch.
+  // v0.38.0 (ISS-072): spawned jobs carry a reputation-based job quality — read once per spawn batch.
+  // ponytail: stays on the seeded 'local' row in v1.3.0 (ISS-110) — pools are SHARED world state
+  // (packages have no owner), so there is no single owning player whose rep should set job quality;
+  // per-player job quality / pools is a later multiplayer step (#112).
   const player = await getLocalPlayer(inst);
 
   let n = 0;
@@ -431,9 +436,12 @@ export async function spawnPoolPackages(
 // package history is dropped, everything else matches GET /api/state exactly. Failures are logged,
 // not fatal: polling still works either way. Background ticks (~1 s) cover action mutations for
 // other clients too.
+// v1.3.0 (ISS-110): the shared broadcast channel has no acting session — it carries the seeded
+// local player's account until per-player SSE frames land (#112). Session-scoped reads (/api/state,
+// /api/events connect frame, action responses) all source their own row.
 async function broadcastState(): Promise<void> {
   try {
-    broadcast(JSON.stringify(sseFrame(await getStateSnapshot())));
+    broadcast(JSON.stringify(sseFrame(await getStateSnapshot(LOCAL_PLAYER.id))));
   } catch (err) {
     console.error('flight: state broadcast failed', err);
   }