dredless 0.6.3 → 1.0.0

package/src/state/model/state.js

@@ -1,5 +1,4 @@
 import * as modelDecoder from "./decoder.js";
-import {LoaderConfigTracker} from "./loader-config.js";
 import {navigationDestinationFromEncodedValue} from "../overworld.js";
 
 const {
@@ -47,9 +46,6 @@ const {
     blobKey,
     cloneRecord,
     firstRecord,
-    TABLE_78_FIELD_BITS,
-    table78DeltaRecord,
-    isSemanticLoaderDelta,
     decodeText,
     entityNameFromType,
     markerTypeIdForTables,
@@ -126,7 +122,7 @@ const {
 } = modelDecoder;
 
 export class ModelState {
-    #loaderConfig = new LoaderConfigTracker();
+    #localPlayerEntity = null;
     #blueprintItems = null;
     #helmOccupied = new Map();
     #commsStationOccupied = new Map();
@@ -152,6 +148,18 @@ export class ModelState {
         this.#invalidateDerived();
     }
 
+    get localPlayerEntity() {
+        return this.#localPlayerEntity;
+    }
+
+    setLocalPlayerEntity(entity) {
+        const next = entity == null ? null : Number(entity);
+        if (next !== null && (!Number.isInteger(next) || next < 0)) throw new RangeError("local player entity must be a non-negative integer or null");
+        if (this.#localPlayerEntity === next) return;
+        this.#localPlayerEntity = next;
+        this.#invalidateDerived();
+    }
+
     table(id) {
         // Shared empty map: #summarizeEntity performs ~32 record() lookups per
         // entity, most against absent tables, and each miss used to allocate.
@@ -236,8 +244,6 @@ export class ModelState {
             pushCapped(this.errors, {message: error.message, generation: update.generation}, MAX_RETAINED_ERRORS);
         }
 
-        this.#remapIndexedLoaderConfig(update);
-        this.#updateLoaderConfig(update);
         this.#updateNavigationUnitAutoWarp(update);
         this.#updateHelmOccupancy(update);
         this.#updateCommsStationOccupancy(update);
@@ -354,60 +360,6 @@ export class ModelState {
         this._derived.tableSummariesDirty = true;
     }
 
-    #updateLoaderConfig(update) {
-        const seenEntities = new Set();
-        for (const section of update.sections || []) {
-            if (section.table !== 78) continue;
-            for (const changed of section.records || []) {
-                if (changed.indexedLoaderConfig) {
-                    this.#loaderConfig.updateIndexedSnapshotRecord(null, changed.entity, changed.record, changed.mask, changed.cumulativeRecord, changed.configEntity);
-                    continue;
-                }
-                const typeId = entityTypeIdFromRecord(this.record(7, changed.entity));
-                this.#loaderConfig.updateRecord(null, changed.entity, changed.record ?? this.record(78, changed.entity), changed.mask, changed.previous, {
-                    repeatedInUpdate: seenEntities.has(changed.entity),
-                    allowSparseBaseline: typeId === LOADER_TYPE_ID,
-                    repeatedInSection: changed.repeatedInSection,
-                    semanticSnapshot: Boolean(update.full),
-                    semanticDelta: isSemanticLoaderDelta(changed, update.full),
-                    deltaRecord: table78DeltaRecord(changed)
-                });
-                seenEntities.add(changed.entity);
-            }
-        }
-    }
-
-    #remapIndexedLoaderConfig(update) {
-        if (!update.full || update.error) return;
-        const rows = [];
-        for (const section of update.sections || []) {
-            if (section.table !== 78) continue;
-            for (const changed of section.records || []) rows.push(changed);
-        }
-        if (!rows.length) return;
-
-        const loaderIds = [...this.table(7).entries()]
-            .filter(([, record]) => entityTypeIdFromRecord(record) === LOADER_TYPE_ID)
-            .map(([entity]) => entity)
-            .sort((a, b) => a - b);
-        if (loaderIds.length !== rows.length) return;
-        if (rows.every((row, index) => row.entity === loaderIds[index])) return;
-
-        const remappedTable = new Map();
-        for (const [index, changed] of rows.entries()) {
-            const rawRecord = table78DeltaRecord(changed);
-            changed.configEntity = changed.entity;
-            changed.entity = loaderIds[index];
-            changed.cumulativeRecord = cloneRecord(changed.record || {});
-            changed.record = cloneRecord(rawRecord);
-            delete changed.previous;
-            changed.indexedLoaderConfig = true;
-            remappedTable.set(changed.entity, cloneRecord(rawRecord));
-            update.changedEntities.add(changed.entity);
-        }
-        this.tables.set(78, remappedTable);
-    }
-
     #updateNavigationUnitAutoWarp(update) {
         const trackedBeforeUpdate = new Set(this.#navigationUnitAutoWarp.keys());
         const initializedThisUpdate = new Set();
@@ -496,28 +448,30 @@ export class ModelState {
         const table7 = update.sections.find((section) => section.table === 7);
         if (!table7) return;
 
-        const changedPilotState = new Map();
+        // Zoom state is a hint for helm occupancy when paired with helm updates;
+        // the player flag itself does not identify a pilot or an operated machine.
+        const changedZoomState = new Map();
         for (const section of update.sections) {
             if (section.table !== 55) continue;
             for (const changed of section.records) {
                 if (!(changed.mask & 16)) continue;
                 const player = this.record(55, changed.entity);
-                changedPilotState.set(changed.entity, Boolean(player?.q107));
+                changedZoomState.set(changed.entity, Boolean(player?.q107));
             }
         }
 
-        const activePilotCount = [...this.table(55).values()].filter((record) => record?.q107).length;
+        const zoomedOutPlayerCount = [...this.table(55).values()].filter((record) => record?.q107).length;
         for (const changed of table7.records) {
             const record = this.record(7, changed.entity);
             const typeId = entityTypeIdFromRecord(record);
             if (!HELM_TYPE_IDS.has(typeId)) continue;
 
-            if (activePilotCount > 0 && record?.q20 === 0 && HELM_TYPE_IDS.has(Number(record?.q32))) {
+            if (zoomedOutPlayerCount > 0 && record?.q20 === 0 && HELM_TYPE_IDS.has(Number(record?.q32))) {
                 this.#helmOccupied.set(changed.entity, true);
             }
 
-            if (!(changed.mask & 8) || changedPilotState.size === 0) continue;
-            this.#helmOccupied.set(changed.entity, [...changedPilotState.values()].some(Boolean));
+            if (!(changed.mask & 8) || changedZoomState.size === 0) continue;
+            this.#helmOccupied.set(changed.entity, [...changedZoomState.values()].some(Boolean));
         }
     }
 
@@ -829,7 +783,8 @@ export class ModelState {
         const pusherRecord = rec(72);
         const pusherBeamRecord = rec(42);
         const launcherRecord = rec(44);
-        const loaderRecord = rec(78);
+        const loaderRecord = rec(69);
+        const navigationRecord = rec(78);
         const loaderFilterRecord = rec(76);
         const loaderFilterSlotsRecord = rec(77);
         const commsStationRecord = rec(39);
@@ -864,16 +819,16 @@ export class ModelState {
         const health = summarizeHealth(entityId, healthRecord);
         const fabricator = summarizeFabricator(entityId, fabricatorRecord, itemHolderRecord, typeRecord);
         const cargoEjector = summarizeCargoEjector(entityId, typeId, cargoEjectorRecord);
-        const cannon = summarizeCannon(entityId, cannonRecord, typeId);
+        const cannon = summarizeCannon(entityId, cannonRecord, typeId, transformRecord);
         const thruster = summarizeThruster(entityId, typeId, thrusterRecord);
         const pusher = summarizePusher(entityId, pusherRecord, loaderFilterSlotsRecord);
         const pusherBeam = summarizePusherBeam(entityId, pusherBeamRecord);
         const launcher = summarizeItemLauncher(entityId, typeId, launcherRecord);
         const loader = (typeId === LOADER_TYPE_ID || (typeId == null && (loaderRecord || loaderFilterRecord || loaderFilterSlotsRecord)))
-            ? summarizeLoader(entityId, loaderRecord, loaderFilterRecord, loaderFilterSlotsRecord, this.#loaderConfig, typeId === LOADER_TYPE_ID, itemHolderRecord)
+            ? summarizeLoader(entityId, loaderRecord, loaderFilterRecord, loaderFilterSlotsRecord, typeId === LOADER_TYPE_ID, itemHolderRecord)
             : null;
         const cargoHatch = summarizeCargoHatch(entityId, typeId, loaderFilterRecord, loaderFilterSlotsRecord, rec(45));
-        const navigationUnit = summarizeNavigationUnit(entityId, typeId, loaderRecord, this.#navigationUnitAutoWarp.get(entityId));
+        const navigationUnit = summarizeNavigationUnit(entityId, typeId, navigationRecord, this.#navigationUnitAutoWarp.get(entityId));
         const fluidTank = fluidTankRecord ? {
             entity: entityId,
             amount: fluidTankRecord.q24 ?? null,
@@ -882,7 +837,7 @@ export class ModelState {
         const shieldGenerator = typeId === 256 ? summarizeShieldGenerator(entityId, shieldRecord, itemHolderRecord, shieldGeneratorBoostRecord) : null;
         const shieldProjector = typeId === 257 ? summarizeShieldProjector(entityId, shieldProjectorRecord) : null;
         const blueprintPreview = summarizeBlueprintPreview(entityId, blueprintPreviewRecord, transformRecord);
-        const player = summarizePlayer(entityId, playerRecord, rec(14), this.#blueprintPreviewItems());
+        const player = summarizePlayer(entityId, playerRecord, rec(14), this.#blueprintPreviewItems(), rec(56), this.#localPlayerEntity);
         const shipControl = summarizeShipControl(entityId, shipControlRecord);
         const helm = summarizeHelm(entityId, typeId, this.#helmOccupied.get(entityId));
         const commsStation = summarizeCommsStation(entityId, typeId, commsStationRecord, this.#commsStationOccupied.get(entityId));
@@ -1111,7 +1066,6 @@ export class ModelState {
             } else {
                 for (const records of this.tables.values()) records.delete(entity);
             }
-            this.#loaderConfig.delete(null, entity);
             this.#helmOccupied.delete(entity);
             this.#commsStationOccupied.delete(entity);
             this.#navigationUnitAutoWarp.delete(entity);
@@ -1129,7 +1083,6 @@ export class ModelState {
     #readSectionRecords(reader, tag, tableId, spec) {
         const section = {tag, table: tableId, name: spec?.name || null, records: []};
         let entity = 0;
-        const seenEntities = tableId === 78 ? new Set() : null;
         while (reader.remaining > 0) {
             const recordOffset = reader.offset;
             let delta;
@@ -1147,7 +1100,6 @@ export class ModelState {
                 throw new Error(`model table ${tableId} tag ${tag} entity ${entity} mask offset ${reader.offset}: ${error.message}`);
             }
             const record = this.#getRecord(tableId, entity);
-            const previous = tableId === 78 ? cloneRecord(record) : null;
             record.lastMask = mask;
 
             try {
@@ -1158,10 +1110,6 @@ export class ModelState {
             }
 
             const changed = {entity, mask};
-            if (previous) changed.previous = previous;
-            if (seenEntities?.has(entity)) changed.repeatedInSection = true;
-            seenEntities?.add(entity);
-            if (tableId === 78) changed.record = cloneRecord(record);
             section.records.push(changed);
         }
         return section;
@@ -1170,7 +1118,7 @@ export class ModelState {
     #getRecord(tableId, entity) {
         if (!this.tables.has(tableId)) this.tables.set(tableId, new Map());
         const records = this.tables.get(tableId);
-        if (!records.has(entity)) records.set(entity, {});
+        if (!records.has(entity)) records.set(entity, {...MODEL_TABLE_SPECS.get(tableId)?.defaults});
         return records.get(entity);
     }
 

package/src/state/world/index.js

@@ -28,6 +28,7 @@ function pushBounded(target, value, limit) {
 export class WorldStore {
     #overworldId = null;
     #shipWorldId = null;
+    #cameraFocus = null;
 
     constructor(limits = {}) {
         this.currentWorldId = null;
@@ -47,6 +48,17 @@ export class WorldStore {
 
     apply(packet) {
         if (!packet || packet.world == null) return null;
+        if (packet.type === 21) {
+            if (this.#cameraFocus && this.#cameraFocus.world !== packet.world) {
+                this.worlds.get(Number(this.#cameraFocus.world))?.model.setLocalPlayerEntity(null);
+            }
+            this.#cameraFocus = packet;
+            this.currentWorldId = Number(packet.world);
+            const world = this.get(packet.world);
+            world.model.setLocalPlayerEntity(null);
+            this.#resolveLocalPlayer(world);
+            return {type: "camera-focus", world, packet};
+        }
         if (packet.type === 22) return this.#applyMeta(packet);
         if (packet.type === 23) return this.#applyTiles(packet);
         if (packet.type === 20) return this.#applyModel(packet);
@@ -98,16 +110,27 @@ export class WorldStore {
         return this.worlds.get(Number(shipWorld.parentWorld))?.entity(shipWorld.parentEntity) || null;
     }
 
+    #resolveLocalPlayer(world) {
+        if (!this.#cameraFocus || Number(this.#cameraFocus.world) !== world.id || world.seed == null) return;
+        const focus = world.decodeEncrypted(this.#cameraFocus.data);
+        // Official camera message is [player_ent, zero], encrypted with the world seed.
+        if (Array.isArray(focus) && focus.length === 2 && Number.isInteger(focus[0]) && focus[0] >= 0 && focus[1] === 0) {
+            world.model.setLocalPlayerEntity(focus[0]);
+        }
+    }
+
     #applyMeta(packet) {
         if (packet.removed) {
             const world = this.worlds.get(Number(packet.world));
             if (world) world.readMeta(packet);
             this.worlds.delete(Number(packet.world));
+            if (Number(this.#cameraFocus?.world) === Number(packet.world)) this.#cameraFocus = null;
             if (this.currentWorldId === Number(packet.world)) this.currentWorldId = null;
             return {type: "world-removed", world: world || null, packet};
         }
         const world = this.get(packet.world);
         world.readMeta(packet);
+        this.#resolveLocalPlayer(world);
         if (this.currentWorldId == null && !world.isOverworld) this.currentWorldId = world.id;
         return {type: "world", world};
     }
@@ -157,7 +180,10 @@ export class WorldStore {
         if (packet.model_data && world.seed != null) {
             const previousModel = world.model;
             try {
-                if (packet.full) world.model = new ModelState({isOverworld: world.isOverworld});
+                if (packet.full) {
+                    world.model = new ModelState({isOverworld: world.isOverworld});
+                    world.model.setLocalPlayerEntity(previousModel.localPlayerEntity);
+                }
                 result.decoded = decodeModelPayload(packet.model_data, packet.world, world.seed);
                 result.model = world.model.apply(result.decoded, {full: Boolean(packet.full)});
                 if (result.model?.error && packet.full && previousModel) world.model = previousModel;