@spacemolt/lib 12.1.0 → 12.2.1

package/dist/index.js

@@ -2988,7 +2988,8 @@ var ACTIONS = {
 
 // src/generated/commands.gen.ts
 function buildCommands(dispatch) {
-  const bind = (tool, action) => (params) => dispatch(tool, action, params);
+  const bind = (tool, action) => (params, requestId) => dispatch(tool, action, params, requestId);
+  const bindBare = (tool, action) => (requestId) => dispatch(tool, action, undefined, requestId);
   return {
     spacemolt: {
       abandon_mission: bind("spacemolt", "abandon_mission"),
@@ -2997,45 +2998,45 @@ function buildCommands(dispatch) {
       buy: bind("spacemolt", "buy"),
       cloak: bind("spacemolt", "cloak"),
       complete_mission: bind("spacemolt", "complete_mission"),
-      completed_missions: bind("spacemolt", "completed_missions"),
+      completed_missions: bindBare("spacemolt", "completed_missions"),
       craft: bind("spacemolt", "craft"),
       decline_mission: bind("spacemolt", "decline_mission"),
       distress_signal: bind("spacemolt", "distress_signal"),
-      dock: bind("spacemolt", "dock"),
+      dock: bindBare("spacemolt", "dock"),
       find_route: bind("spacemolt", "find_route"),
-      get_achievements: bind("spacemolt", "get_achievements"),
-      get_active_missions: bind("spacemolt", "get_active_missions"),
-      get_base: bind("spacemolt", "get_base"),
-      get_cargo: bind("spacemolt", "get_cargo"),
-      get_commands: bind("spacemolt", "get_commands"),
+      get_achievements: bindBare("spacemolt", "get_achievements"),
+      get_active_missions: bindBare("spacemolt", "get_active_missions"),
+      get_base: bindBare("spacemolt", "get_base"),
+      get_cargo: bindBare("spacemolt", "get_cargo"),
+      get_commands: bindBare("spacemolt", "get_commands"),
       get_empire_info: bind("spacemolt", "get_empire_info"),
-      get_faction_achievements: bind("spacemolt", "get_faction_achievements"),
+      get_faction_achievements: bindBare("spacemolt", "get_faction_achievements"),
       get_guide: bind("spacemolt", "get_guide"),
-      get_location: bind("spacemolt", "get_location"),
+      get_location: bindBare("spacemolt", "get_location"),
       get_map: bind("spacemolt", "get_map"),
-      get_missions: bind("spacemolt", "get_missions"),
-      get_nearby: bind("spacemolt", "get_nearby"),
+      get_missions: bindBare("spacemolt", "get_missions"),
+      get_nearby: bindBare("spacemolt", "get_nearby"),
       get_notifications: bind("spacemolt", "get_notifications"),
-      get_player: bind("spacemolt", "get_player"),
-      get_poi: bind("spacemolt", "get_poi"),
-      get_queue: bind("spacemolt", "get_queue"),
-      get_ship: bind("spacemolt", "get_ship"),
-      get_skills: bind("spacemolt", "get_skills"),
-      get_state: bind("spacemolt", "get_state"),
-      get_status: bind("spacemolt", "get_status"),
-      get_system: bind("spacemolt", "get_system"),
-      get_system_agents: bind("spacemolt", "get_system_agents"),
-      get_tax_estimate: bind("spacemolt", "get_tax_estimate"),
+      get_player: bindBare("spacemolt", "get_player"),
+      get_poi: bindBare("spacemolt", "get_poi"),
+      get_queue: bindBare("spacemolt", "get_queue"),
+      get_ship: bindBare("spacemolt", "get_ship"),
+      get_skills: bindBare("spacemolt", "get_skills"),
+      get_state: bindBare("spacemolt", "get_state"),
+      get_status: bindBare("spacemolt", "get_status"),
+      get_system: bindBare("spacemolt", "get_system"),
+      get_system_agents: bindBare("spacemolt", "get_system_agents"),
+      get_tax_estimate: bindBare("spacemolt", "get_tax_estimate"),
       get_version: bind("spacemolt", "get_version"),
       hunt: bind("spacemolt", "hunt"),
       inspect: bind("spacemolt", "inspect"),
       install_mod: bind("spacemolt", "install_mod"),
       jettison: bind("spacemolt", "jettison"),
       jump: bind("spacemolt", "jump"),
-      list_passengers: bind("spacemolt", "list_passengers"),
-      list_station_passengers: bind("spacemolt", "list_station_passengers"),
+      list_passengers: bindBare("spacemolt", "list_passengers"),
+      list_station_passengers: bindBare("spacemolt", "list_station_passengers"),
       load_passenger: bind("spacemolt", "load_passenger"),
-      mine: bind("spacemolt", "mine"),
+      mine: bindBare("spacemolt", "mine"),
       prepay_tax: bind("spacemolt", "prepay_tax"),
       recycle: bind("spacemolt", "recycle"),
       refuel: bind("spacemolt", "refuel"),
@@ -3043,48 +3044,48 @@ function buildCommands(dispatch) {
       repair_module: bind("spacemolt", "repair_module"),
       scan: bind("spacemolt", "scan"),
       search_systems: bind("spacemolt", "search_systems"),
-      self_destruct: bind("spacemolt", "self_destruct"),
+      self_destruct: bindBare("spacemolt", "self_destruct"),
       sell: bind("spacemolt", "sell"),
       subscribe_observation: bind("spacemolt", "subscribe_observation"),
-      survey_system: bind("spacemolt", "survey_system"),
+      survey_system: bindBare("spacemolt", "survey_system"),
       travel: bind("spacemolt", "travel"),
-      undock: bind("spacemolt", "undock"),
+      undock: bindBare("spacemolt", "undock"),
       uninstall_mod: bind("spacemolt", "uninstall_mod"),
       unload_passenger: bind("spacemolt", "unload_passenger"),
-      unsubscribe_observation: bind("spacemolt", "unsubscribe_observation"),
+      unsubscribe_observation: bindBare("spacemolt", "unsubscribe_observation"),
       use_item: bind("spacemolt", "use_item"),
       view_completed_mission: bind("spacemolt", "view_completed_mission")
     },
     spacemolt_auth: {
       claim: bind("spacemolt_auth", "claim"),
       login: bind("spacemolt_auth", "login"),
-      login_link: bind("spacemolt_auth", "login_link"),
+      login_link: bindBare("spacemolt_auth", "login_link"),
       login_link_poll: bind("spacemolt_auth", "login_link_poll"),
       login_token: bind("spacemolt_auth", "login_token"),
-      logout: bind("spacemolt_auth", "logout"),
+      logout: bindBare("spacemolt_auth", "logout"),
       register: bind("spacemolt_auth", "register")
     },
     spacemolt_battle: {
-      advance: bind("spacemolt_battle", "advance"),
+      advance: bindBare("spacemolt_battle", "advance"),
       engage: bind("spacemolt_battle", "engage"),
       log: bind("spacemolt_battle", "log"),
       reload: bind("spacemolt_battle", "reload"),
-      retreat: bind("spacemolt_battle", "retreat"),
+      retreat: bindBare("spacemolt_battle", "retreat"),
       stance: bind("spacemolt_battle", "stance"),
-      status: bind("spacemolt_battle", "status"),
+      status: bindBare("spacemolt_battle", "status"),
       summary: bind("spacemolt_battle", "summary"),
       target: bind("spacemolt_battle", "target")
     },
     spacemolt_citizenship: {
       apply: bind("spacemolt_citizenship", "apply"),
-      list: bind("spacemolt_citizenship", "list"),
+      list: bindBare("spacemolt_citizenship", "list"),
       renounce: bind("spacemolt_citizenship", "renounce"),
       withdraw: bind("spacemolt_citizenship", "withdraw")
     },
     spacemolt_drone: {
       deploy: bind("spacemolt_drone", "deploy"),
       get: bind("spacemolt_drone", "get"),
-      list: bind("spacemolt_drone", "list"),
+      list: bindBare("spacemolt_drone", "list"),
       load: bind("spacemolt_drone", "load"),
       name: bind("spacemolt_drone", "name"),
       recall: bind("spacemolt_drone", "recall"),
@@ -3095,7 +3096,7 @@ function buildCommands(dispatch) {
       allow_faction: bind("spacemolt_facility", "allow_faction"),
       allow_player: bind("spacemolt_facility", "allow_player"),
       ban: bind("spacemolt_facility", "ban"),
-      base_cost: bind("spacemolt_facility", "base_cost"),
+      base_cost: bindBare("spacemolt_facility", "base_cost"),
       browse_for_sale: bind("spacemolt_facility", "browse_for_sale"),
       build: bind("spacemolt_facility", "build"),
       buy_listing: bind("spacemolt_facility", "buy_listing"),
@@ -3103,21 +3104,21 @@ function buildCommands(dispatch) {
       cancel_listing: bind("spacemolt_facility", "cancel_listing"),
       deploy_outpost: bind("spacemolt_facility", "deploy_outpost"),
       dismantle: bind("spacemolt_facility", "dismantle"),
-      dismantle_outpost: bind("spacemolt_facility", "dismantle_outpost"),
+      dismantle_outpost: bindBare("spacemolt_facility", "dismantle_outpost"),
       facility_set_description: bind("spacemolt_facility", "facility_set_description"),
       faction_build: bind("spacemolt_facility", "faction_build"),
       faction_dismantle: bind("spacemolt_facility", "faction_dismantle"),
-      faction_list: bind("spacemolt_facility", "faction_list"),
-      faction_owned: bind("spacemolt_facility", "faction_owned"),
+      faction_list: bindBare("spacemolt_facility", "faction_list"),
+      faction_owned: bindBare("spacemolt_facility", "faction_owned"),
       faction_upgrade: bind("spacemolt_facility", "faction_upgrade"),
       found_station: bind("spacemolt_facility", "found_station"),
       job_add: bind("spacemolt_facility", "job_add"),
       job_cancel: bind("spacemolt_facility", "job_cancel"),
       job_list: bind("spacemolt_facility", "job_list"),
       job_reorder: bind("spacemolt_facility", "job_reorder"),
-      list: bind("spacemolt_facility", "list"),
+      list: bindBare("spacemolt_facility", "list"),
       list_for_sale: bind("spacemolt_facility", "list_for_sale"),
-      owned: bind("spacemolt_facility", "owned"),
+      owned: bindBare("spacemolt_facility", "owned"),
       personal_build: bind("spacemolt_facility", "personal_build"),
       personal_decorate: bind("spacemolt_facility", "personal_decorate"),
       personal_visit: bind("spacemolt_facility", "personal_visit"),
@@ -3137,13 +3138,13 @@ function buildCommands(dispatch) {
       set_refuel_price: bind("spacemolt_facility", "set_refuel_price"),
       set_repair_price: bind("spacemolt_facility", "set_repair_price"),
       set_service_access: bind("spacemolt_facility", "set_service_access"),
-      station_info: bind("spacemolt_facility", "station_info"),
+      station_info: bindBare("spacemolt_facility", "station_info"),
       station_set_name: bind("spacemolt_facility", "station_set_name"),
       transfer: bind("spacemolt_facility", "transfer"),
       types: bind("spacemolt_facility", "types"),
       unban: bind("spacemolt_facility", "unban"),
       upgrade: bind("spacemolt_facility", "upgrade"),
-      upgrades: bind("spacemolt_facility", "upgrades")
+      upgrades: bindBare("spacemolt_facility", "upgrades")
     },
     spacemolt_faction: {
       accept_ally: bind("spacemolt_faction", "accept_ally"),
@@ -3155,23 +3156,23 @@ function buildCommands(dispatch) {
       decline_invite: bind("spacemolt_faction", "decline_invite"),
       delete_role: bind("spacemolt_faction", "delete_role"),
       delete_room: bind("spacemolt_faction", "delete_room"),
-      garages: bind("spacemolt_faction", "garages"),
-      get_invites: bind("spacemolt_faction", "get_invites"),
+      garages: bindBare("spacemolt_faction", "garages"),
+      get_invites: bindBare("spacemolt_faction", "get_invites"),
       info: bind("spacemolt_faction", "info"),
       invite: bind("spacemolt_faction", "invite"),
       join: bind("spacemolt_faction", "join"),
       kick: bind("spacemolt_faction", "kick"),
-      leave: bind("spacemolt_faction", "leave"),
+      leave: bindBare("spacemolt_faction", "leave"),
       list: bind("spacemolt_faction", "list"),
-      list_missions: bind("spacemolt_faction", "list_missions"),
+      list_missions: bindBare("spacemolt_faction", "list_missions"),
       prepay_tax: bind("spacemolt_faction", "prepay_tax"),
       propose_ally: bind("spacemolt_faction", "propose_ally"),
       propose_peace: bind("spacemolt_faction", "propose_peace"),
       remove_ally: bind("spacemolt_faction", "remove_ally"),
       remove_enemy: bind("spacemolt_faction", "remove_enemy"),
-      rooms: bind("spacemolt_faction", "rooms"),
+      rooms: bindBare("spacemolt_faction", "rooms"),
       set_enemy: bind("spacemolt_faction", "set_enemy"),
-      tax_estimate: bind("spacemolt_faction", "tax_estimate"),
+      tax_estimate: bindBare("spacemolt_faction", "tax_estimate"),
       visit_room: bind("spacemolt_faction", "visit_room"),
       withdraw_invite: bind("spacemolt_faction", "withdraw_invite")
     },
@@ -3188,50 +3189,50 @@ function buildCommands(dispatch) {
       create_sell_order: bind("spacemolt_faction_commerce", "create_sell_order")
     },
     spacemolt_fleet: {
-      accept: bind("spacemolt_fleet", "accept"),
+      accept: bindBare("spacemolt_fleet", "accept"),
       board: bind("spacemolt_fleet", "board"),
-      create: bind("spacemolt_fleet", "create"),
-      decline: bind("spacemolt_fleet", "decline"),
-      disband: bind("spacemolt_fleet", "disband"),
-      disembark: bind("spacemolt_fleet", "disembark"),
+      create: bindBare("spacemolt_fleet", "create"),
+      decline: bindBare("spacemolt_fleet", "decline"),
+      disband: bindBare("spacemolt_fleet", "disband"),
+      disembark: bindBare("spacemolt_fleet", "disembark"),
       invite: bind("spacemolt_fleet", "invite"),
       kick: bind("spacemolt_fleet", "kick"),
-      leave: bind("spacemolt_fleet", "leave"),
-      status: bind("spacemolt_fleet", "status")
+      leave: bindBare("spacemolt_fleet", "leave"),
+      status: bindBare("spacemolt_fleet", "status")
     },
     spacemolt_intel: {
-      espionage: bind("spacemolt_intel", "espionage"),
-      intel_status: bind("spacemolt_intel", "intel_status"),
+      espionage: bindBare("spacemolt_intel", "espionage"),
+      intel_status: bindBare("spacemolt_intel", "intel_status"),
       query_intel: bind("spacemolt_intel", "query_intel"),
       query_trade_intel: bind("spacemolt_intel", "query_trade_intel"),
       scan_poi: bind("spacemolt_intel", "scan_poi"),
       submit_intel: bind("spacemolt_intel", "submit_intel"),
       submit_trade_intel: bind("spacemolt_intel", "submit_trade_intel"),
-      trade_intel_status: bind("spacemolt_intel", "trade_intel_status")
+      trade_intel_status: bindBare("spacemolt_intel", "trade_intel_status")
     },
     spacemolt_market: {
-      analyze_market: bind("spacemolt_market", "analyze_market"),
+      analyze_market: bindBare("spacemolt_market", "analyze_market"),
       cancel_order: bind("spacemolt_market", "cancel_order"),
       create_buy_order: bind("spacemolt_market", "create_buy_order"),
       create_sell_order: bind("spacemolt_market", "create_sell_order"),
       estimate_purchase: bind("spacemolt_market", "estimate_purchase"),
       modify_order: bind("spacemolt_market", "modify_order"),
-      subscribe_market: bind("spacemolt_market", "subscribe_market"),
-      unsubscribe_market: bind("spacemolt_market", "unsubscribe_market"),
+      subscribe_market: bindBare("spacemolt_market", "subscribe_market"),
+      unsubscribe_market: bindBare("spacemolt_market", "unsubscribe_market"),
       view_market: bind("spacemolt_market", "view_market"),
       view_orders: bind("spacemolt_market", "view_orders")
     },
     spacemolt_salvage: {
-      insure: bind("spacemolt_salvage", "insure"),
+      insure: bindBare("spacemolt_salvage", "insure"),
       loot: bind("spacemolt_salvage", "loot"),
-      policies: bind("spacemolt_salvage", "policies"),
-      quote: bind("spacemolt_salvage", "quote"),
-      release: bind("spacemolt_salvage", "release"),
-      scrap: bind("spacemolt_salvage", "scrap"),
-      sell: bind("spacemolt_salvage", "sell"),
+      policies: bindBare("spacemolt_salvage", "policies"),
+      quote: bindBare("spacemolt_salvage", "quote"),
+      release: bindBare("spacemolt_salvage", "release"),
+      scrap: bindBare("spacemolt_salvage", "scrap"),
+      sell: bindBare("spacemolt_salvage", "sell"),
       set_home: bind("spacemolt_salvage", "set_home"),
       tow: bind("spacemolt_salvage", "tow"),
-      wrecks: bind("spacemolt_salvage", "wrecks")
+      wrecks: bindBare("spacemolt_salvage", "wrecks")
     },
     spacemolt_ship: {
       browse_ships: bind("spacemolt_ship", "browse_ships"),
@@ -3243,15 +3244,15 @@ function buildCommands(dispatch) {
       commission_ship: bind("spacemolt_ship", "commission_ship"),
       commission_status: bind("spacemolt_ship", "commission_status"),
       list_ship_for_sale: bind("spacemolt_ship", "list_ship_for_sale"),
-      list_ships: bind("spacemolt_ship", "list_ships"),
+      list_ships: bindBare("spacemolt_ship", "list_ships"),
       place_ship_buy_order: bind("spacemolt_ship", "place_ship_buy_order"),
-      refit_ship: bind("spacemolt_ship", "refit_ship"),
+      refit_ship: bindBare("spacemolt_ship", "refit_ship"),
       rename_ship: bind("spacemolt_ship", "rename_ship"),
       scrap_ship: bind("spacemolt_ship", "scrap_ship"),
       sell_ship_to_order: bind("spacemolt_ship", "sell_ship_to_order"),
       supply_commission: bind("spacemolt_ship", "supply_commission"),
       switch_ship: bind("spacemolt_ship", "switch_ship"),
-      view_ship_buy_orders: bind("spacemolt_ship", "view_ship_buy_orders")
+      view_ship_buy_orders: bindBare("spacemolt_ship", "view_ship_buy_orders")
     },
     spacemolt_shipping: {
       accept: bind("spacemolt_shipping", "accept"),
@@ -3284,7 +3285,7 @@ function buildCommands(dispatch) {
       get_action_log: bind("spacemolt_social", "get_action_log"),
       get_chat_history: bind("spacemolt_social", "get_chat_history"),
       get_notes: bind("spacemolt_social", "get_notes"),
-      get_notification_settings: bind("spacemolt_social", "get_notification_settings"),
+      get_notification_settings: bindBare("spacemolt_social", "get_notification_settings"),
       mute_notifications: bind("spacemolt_social", "mute_notifications"),
       petition: bind("spacemolt_social", "petition"),
       read_note: bind("spacemolt_social", "read_note"),
@@ -3301,7 +3302,7 @@ function buildCommands(dispatch) {
       withdraw: bind("spacemolt_storage", "withdraw")
     },
     spacemolt_transfer: {
-      get_trades: bind("spacemolt_transfer", "get_trades"),
+      get_trades: bindBare("spacemolt_transfer", "get_trades"),
       trade_accept: bind("spacemolt_transfer", "trade_accept"),
       trade_cancel: bind("spacemolt_transfer", "trade_cancel"),
       trade_decline: bind("spacemolt_transfer", "trade_decline"),
@@ -4026,6 +4027,7 @@ class Account {
   subscribedMarketBaseId;
   observationSubscribedState = false;
   observationActiveScanState = false;
+  stateRevision = 0;
   subscribedObservationPoiId;
   reconnectedListeners = new Set;
   reconnectingListeners = new Set;
@@ -4087,7 +4089,7 @@ class Account {
   }
   get commands() {
     if (!this._commands) {
-      this._commands = buildCommands((tool, action, payload) => this.send(tool, action, payload));
+      this._commands = buildCommands((tool, action, payload, requestId) => this.send(tool, action, payload, requestId));
     }
     return this._commands;
   }
@@ -4194,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)
@@ -4222,25 +4226,25 @@ class Account {
     await this.query("spacemolt_auth", "logout");
     this._authenticated = false;
   }
-  query(tool, action, payload) {
+  query(tool, action, payload, requestId) {
     return this.withRateLimitRetry(async () => {
-      const requestId = this.nextRequestId();
-      const promise = this.correlator.awaitQuery(requestId);
-      this.sendFrame(tool, action, payload, requestId);
+      const id = this.claimRequestId(requestId);
+      const promise = this.correlator.awaitQuery(id);
+      this.sendFrame(tool, action, payload, id);
       try {
         return await withTimeout(promise, this.queryTimeoutMs, `No response to ${tool}/${action} within ${this.queryTimeoutMs}ms`);
       } catch (err) {
-        this.correlator.cancel(requestId);
+        this.correlator.cancel(id);
         throw err;
       }
     });
   }
-  mutate(tool, action, payload, onAck) {
+  mutate(tool, action, payload, onAck, requestId) {
     const mutationTimeoutMs = TRANSIT_ACTIONS.has(`${tool}/${action}`) ? this.mutationTimeoutMs : this.fastMutationTimeoutMs;
     return this.enqueueMutation(() => this.withRateLimitRetry(() => {
-      const requestId = this.nextRequestId();
-      const promise = this.awaitMutationWithTimeout(requestId, mutationTimeoutMs, onAck);
-      this.sendFrame(tool, action, payload, requestId);
+      const id = this.claimRequestId(requestId);
+      const promise = this.awaitMutationWithTimeout(id, mutationTimeoutMs, onAck);
+      this.sendFrame(tool, action, payload, id);
       return promise;
     }));
   }
@@ -4270,9 +4274,9 @@ class Account {
       });
     });
   }
-  send(tool, action, payload) {
+  send(tool, action, payload, requestId) {
     const def = ACTIONS[`${tool}/${action}`];
-    return def?.kind === "mutation" ? this.mutate(tool, action, payload) : this.query(tool, action, payload);
+    return def?.kind === "mutation" ? this.mutate(tool, action, payload, undefined, requestId) : this.query(tool, action, payload, requestId);
   }
   on(type, handler) {
     return this.emitter.on(type, handler);
@@ -4330,6 +4334,8 @@ class Account {
       nearby_players: nearbyPlayers,
       nearby_player_count: view.nearby.size
     });
+    if (changed.length)
+      this.stateRevision++;
     if (changed.length)
       this.emitStateChange(changed);
   }
@@ -4348,6 +4354,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();
@@ -4408,7 +4531,18 @@ class Account {
     this.socket.send({ tool, action, ...payload ? { payload } : {}, request_id: requestId });
   }
   nextRequestId() {
-    return `r${++this.requestSeq}`;
+    let id = `r${++this.requestSeq}`;
+    while (this.correlator.has(id))
+      id = `r${++this.requestSeq}`;
+    return id;
+  }
+  claimRequestId(requestId) {
+    if (!requestId)
+      return this.nextRequestId();
+    if (this.correlator.has(requestId)) {
+      throw new SpacemoltError("duplicate_request_id", `request_id "${requestId}" is already in flight`);
+    }
+    return requestId;
   }
   routeFrame(frame) {
     if (isRecord(frame.payload))
@@ -4453,6 +4587,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)
@@ -4487,6 +4623,7 @@ class Account {
         return;
       }
       default:
+        this.applyFleetMovementPush(frame);
         this.emitter.emit(frame);
     }
   }
@@ -5115,38 +5252,38 @@ var TYPED_NOTIFICATION_TYPES = [
   "trade_offer_received"
 ];
 export {
-  retryAfterMsFromClose,
-  mintWsToken,
-  isWelcomeFrame,
-  isResultFrame,
-  isRegisteredFrame,
-  isLoggedInFrame,
-  isErrorFrame,
-  isActionResultFrame,
-  isActionErrorFrame,
-  httpBaseFromWs,
-  fetchStations,
-  fetchMap,
-  fetchCatalogConditional,
-  fetchCatalog,
-  buildCommands,
-  TypedEmitter,
-  TYPED_NOTIFICATION_TYPES,
-  StateCache,
-  SpacemoltError,
-  SpacemoltClient,
-  Socket,
-  STATE_SECTIONS,
-  ObservationCache,
-  MemoryCredentialStore,
-  MarketCache,
-  MapCache,
-  GENERATED_SPEC_VERSION,
-  EventStream,
-  ConnectionClosedError,
-  ClerkSource,
-  CatalogCache,
-  CLOSE_CODE,
+  ACTIONS,
   Account,
-  ACTIONS
+  CLOSE_CODE,
+  CatalogCache,
+  ClerkSource,
+  ConnectionClosedError,
+  EventStream,
+  GENERATED_SPEC_VERSION,
+  MapCache,
+  MarketCache,
+  MemoryCredentialStore,
+  ObservationCache,
+  STATE_SECTIONS,
+  Socket,
+  SpacemoltClient,
+  SpacemoltError,
+  StateCache,
+  TYPED_NOTIFICATION_TYPES,
+  TypedEmitter,
+  buildCommands,
+  fetchCatalog,
+  fetchCatalogConditional,
+  fetchMap,
+  fetchStations,
+  httpBaseFromWs,
+  isActionErrorFrame,
+  isActionResultFrame,
+  isErrorFrame,
+  isLoggedInFrame,
+  isRegisteredFrame,
+  isResultFrame,
+  isWelcomeFrame,
+  mintWsToken,
+  retryAfterMsFromClose
 };

package/dist/node.js

@@ -29,24 +29,6 @@ function isStoredAccount(value) {
   }
 }
 
-class MemoryCredentialStore {
-  accounts = new Map;
-  list() {
-    return Promise.resolve([...this.accounts.values()]);
-  }
-  get(id) {
-    return Promise.resolve(this.accounts.get(id));
-  }
-  put(account) {
-    this.accounts.set(account.id, account);
-    return Promise.resolve();
-  }
-  remove(id) {
-    this.accounts.delete(id);
-    return Promise.resolve();
-  }
-}
-
 // src/auth/file-store.ts
 class FileCredentialStore {
   path;