@spacemolt/lib 12.2.0 → 12.2.2

package/dist/account.d.ts

@@ -160,6 +160,8 @@ export declare class Account {
     private subscribedMarketBaseId;
     private observationSubscribedState;
     private observationActiveScanState;
+    /** Invalidates an in-flight reconciliation whenever a newer cache update arrives. */
+    private stateRevision;
     private subscribedObservationPoiId;
     private readonly reconnectedListeners;
     private readonly reconnectingListeners;
@@ -374,6 +376,22 @@ export declare class Account {
      * after every state update that could carry a `location` change.
      */
     private checkSubscriptionsAgainstLocation;
+    /**
+     * Fleet followers do not submit the movement mutation themselves, so their
+     * arrival is delivered as a plain `ok` push rather than an `action_result`
+     * carrying a state delta. Bridge the location data present on those pushes
+     * into the cache. Fleet docking is the one exception: its push only contains
+     * the station's display name, not the canonical base ID used by `docked_at`,
+     * so refresh the canonical snapshot instead of caching the wrong identifier.
+     */
+    private applyFleetMovementPush;
+    /**
+     * Fleet movement pushes omit follower fuel and skill deltas, while docking
+     * omits the canonical base ID. Reconcile those fields from one authoritative
+     * snapshot. A newer movement push invalidates an older in-flight query so a
+     * delayed dock/arrival snapshot cannot move the cache backwards.
+     */
+    private reconcileFleetState;
     /** Close the connection deliberately. Suppresses auto-reconnect. */
     close(): void;
     /** Fired after a successful reconnect + re-auth. Returns an unsubscribe function. */

package/dist/index.js

@@ -4027,6 +4027,7 @@ class Account {
   subscribedMarketBaseId;
   observationSubscribedState = false;
   observationActiveScanState = false;
+  stateRevision = 0;
   subscribedObservationPoiId;
   reconnectedListeners = new Set;
   reconnectingListeners = new Set;
@@ -4195,6 +4196,8 @@ class Account {
     const result = await this.commands.spacemolt.get_status();
     const snapshot = requireStructuredContent(result, "spacemolt/get_status");
     const changed = this.cache.seed(snapshot);
+    if (changed.length)
+      this.stateRevision++;
     if (changed.includes("location"))
       this.checkSubscriptionsAgainstLocation();
     if (changed.length)
@@ -4227,8 +4230,8 @@ class Account {
     return this.withRateLimitRetry(async () => {
       const id = this.claimRequestId(requestId);
       const promise = this.correlator.awaitQuery(id);
-      this.sendFrame(tool, action, payload, id);
       try {
+        this.sendFrame(tool, action, payload, id);
         return await withTimeout(promise, this.queryTimeoutMs, `No response to ${tool}/${action} within ${this.queryTimeoutMs}ms`);
       } catch (err) {
         this.correlator.cancel(id);
@@ -4240,12 +4243,10 @@ class Account {
     const mutationTimeoutMs = TRANSIT_ACTIONS.has(`${tool}/${action}`) ? this.mutationTimeoutMs : this.fastMutationTimeoutMs;
     return this.enqueueMutation(() => this.withRateLimitRetry(() => {
       const id = this.claimRequestId(requestId);
-      const promise = this.awaitMutationWithTimeout(id, mutationTimeoutMs, onAck);
-      this.sendFrame(tool, action, payload, id);
-      return promise;
+      return this.awaitMutationWithTimeout(id, mutationTimeoutMs, () => this.sendFrame(tool, action, payload, id), onAck);
     }));
   }
-  awaitMutationWithTimeout(requestId, mutationTimeoutMs, onAck) {
+  awaitMutationWithTimeout(requestId, mutationTimeoutMs, send, onAck) {
     return new Promise((resolve, reject) => {
       let timer;
       const arm = (ms, message) => {
@@ -4269,6 +4270,14 @@ class Account {
           clearTimeout(timer);
         reject(err instanceof Error ? err : new Error(String(err)));
       });
+      try {
+        send();
+      } catch (err) {
+        if (timer)
+          clearTimeout(timer);
+        this.correlator.cancel(requestId);
+        reject(err instanceof Error ? err : new Error(String(err)));
+      }
     });
   }
   send(tool, action, payload, requestId) {
@@ -4331,6 +4340,8 @@ class Account {
       nearby_players: nearbyPlayers,
       nearby_player_count: view.nearby.size
     });
+    if (changed.length)
+      this.stateRevision++;
     if (changed.length)
       this.emitStateChange(changed);
   }
@@ -4349,6 +4360,123 @@ class Account {
       this.subscribedObservationPoiId = undefined;
     }
   }
+  applyFleetMovementPush(frame) {
+    if (frame.type !== "ok" || !isRecord(frame.payload) || typeof frame.payload.action !== "string")
+      return;
+    const payload = frame.payload;
+    let changed = [];
+    let reconcile = false;
+    const currentLocation = this.cache.location;
+    const currentSystem = {
+      connections: currentLocation?.connections,
+      empire: currentLocation?.empire,
+      security_status: currentLocation?.security_status,
+      system_id: currentLocation?.system_id,
+      system_name: currentLocation?.system_name
+    };
+    switch (payload.action) {
+      case "fleet_jump": {
+        if (typeof payload.destination !== "string" || typeof payload.arrival_tick !== "number") {
+          this.warnMalformedFrame(frame);
+          return;
+        }
+        changed = this.cache.applyDelta({
+          location: {
+            in_transit: true,
+            transit_arrival_tick: payload.arrival_tick,
+            transit_dest_system_id: payload.destination,
+            transit_type: "jump"
+          }
+        });
+        reconcile = true;
+        break;
+      }
+      case "jumped":
+      case "pathfinder_arrival": {
+        if (typeof payload.system_id !== "string" || typeof payload.system !== "string") {
+          this.warnMalformedFrame(frame);
+          return;
+        }
+        changed = this.cache.applyDelta({
+          location: {
+            in_transit: false,
+            poi_id: typeof payload.poi === "string" ? payload.poi : undefined,
+            system_id: payload.system_id,
+            system_name: payload.system
+          }
+        });
+        reconcile = true;
+        break;
+      }
+      case "fleet_travel": {
+        if (typeof payload.destination !== "string" || typeof payload.arrival_tick !== "number") {
+          this.warnMalformedFrame(frame);
+          return;
+        }
+        changed = this.cache.applyDelta({
+          location: {
+            ...currentSystem,
+            in_transit: true,
+            transit_arrival_tick: payload.arrival_tick,
+            transit_dest_poi_id: payload.destination,
+            transit_type: "travel"
+          }
+        });
+        reconcile = true;
+        break;
+      }
+      case "arrived": {
+        if (typeof payload.poi_id !== "string" || typeof payload.poi !== "string") {
+          this.warnMalformedFrame(frame);
+          return;
+        }
+        changed = this.cache.applyDelta({
+          location: {
+            ...currentSystem,
+            in_transit: false,
+            poi_id: payload.poi_id,
+            poi_name: payload.poi
+          }
+        });
+        reconcile = true;
+        break;
+      }
+      case "fleet_undock":
+        changed = currentLocation ? this.cache.patchSection("location", { docked_at: undefined }) : this.cache.applyDelta({ location: {} });
+        break;
+      case "fleet_dock":
+        reconcile = true;
+        break;
+      default:
+        return;
+    }
+    const revision = ++this.stateRevision;
+    if (changed.includes("location"))
+      this.checkSubscriptionsAgainstLocation();
+    if (changed.length)
+      this.emitStateChange(changed);
+    if (reconcile)
+      this.reconcileFleetState(revision, payload.action);
+  }
+  async reconcileFleetState(revision, action) {
+    try {
+      const result = await this.commands.spacemolt.get_status();
+      const snapshot = requireStructuredContent(result, "spacemolt/get_status");
+      if (revision !== this.stateRevision)
+        return;
+      const changed = this.cache.seed(snapshot);
+      if (changed.length)
+        this.stateRevision++;
+      if (changed.includes("location"))
+        this.checkSubscriptionsAgainstLocation();
+      if (changed.length)
+        this.emitStateChange(changed);
+    } catch (err) {
+      if (revision === this.stateRevision) {
+        console.warn(`[spacemolt] failed to reconcile state after ${action}`, err);
+      }
+    }
+  }
   close() {
     this.userClosing = true;
     this.socket.close();
@@ -4465,6 +4593,8 @@ class Account {
         const delta = frame.payload.result;
         if (delta) {
           const changed = this.cache.applyDelta(delta);
+          if (changed.length)
+            this.stateRevision++;
           if (changed.includes("location"))
             this.checkSubscriptionsAgainstLocation();
           if (changed.length)
@@ -4499,6 +4629,7 @@ class Account {
         return;
       }
       default:
+        this.applyFleetMovementPush(frame);
         this.emitter.emit(frame);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spacemolt/lib",
-  "version": "12.2.0",
+  "version": "12.2.2",
   "description": "The definitive TypeScript library for SpaceMolt. WebSocket-v2-first, multi-account, with local state caches. Internals are regenerated from the server's OpenAPI spec.",
   "type": "module",
   "module": "./dist/index.js",