@spacemolt/lib 13.2.0 → 14.0.0

package/dist/index.js

@@ -1,3 +1,22 @@
+// src/generated/frames.gen.ts
+var WELCOME_PAYLOAD_FIELDS = {
+  current_tick: { kind: "number", required: true },
+  game_info: { kind: "string", required: true },
+  help_text: { kind: "string", required: true },
+  motd: { kind: "string", required: false },
+  release_date: { kind: "string", required: true },
+  release_notes: { kind: "string[]", required: true },
+  server_time: { kind: "number", required: true },
+  terms: { kind: "string", required: true },
+  tick_rate: { kind: "number", required: true },
+  version: { kind: "string", required: true },
+  website: { kind: "string", required: true }
+};
+var REGISTERED_PAYLOAD_FIELDS = {
+  password: { kind: "string", required: true },
+  player_id: { kind: "string", required: true }
+};
+
 // src/validation.ts
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -24,14 +43,28 @@ function isActionErrorFrame(frame) {
 function isErrorFrame(frame) {
   return frame.type === "error" && hasPayload(frame) && typeof frame.payload.code === "string" && typeof frame.payload.message === "string" && (frame.payload.details === undefined || isRecord(frame.payload.details)) && (frame.payload.pending_command === undefined || typeof frame.payload.pending_command === "string");
 }
+function matchesKind(value, kind) {
+  const element = kind.endsWith("[]") ? kind.slice(0, -2) : undefined;
+  if (element)
+    return Array.isArray(value) && value.every((item) => typeof item === element);
+  return typeof value === kind;
+}
+function matchesFields(payload, fields) {
+  return Object.entries(fields).every(([field, { kind, required }]) => {
+    const value = payload[field];
+    if (value === undefined)
+      return !required;
+    return matchesKind(value, kind);
+  });
+}
 function isWelcomeFrame(frame) {
-  return frame.type === "welcome" && hasPayload(frame) && typeof frame.payload.version === "string" && typeof frame.payload.release_date === "string" && Array.isArray(frame.payload.release_notes) && frame.payload.release_notes.every((note) => typeof note === "string") && typeof frame.payload.tick_rate === "number" && typeof frame.payload.current_tick === "number" && typeof frame.payload.server_time === "number" && (frame.payload.motd === undefined || typeof frame.payload.motd === "string") && typeof frame.payload.game_info === "string" && typeof frame.payload.website === "string" && typeof frame.payload.help_text === "string" && typeof frame.payload.terms === "string";
+  return frame.type === "welcome" && hasPayload(frame) && matchesFields(frame.payload, WELCOME_PAYLOAD_FIELDS);
 }
 function isLoggedInFrame(frame) {
   return frame.type === "logged_in" && hasPayload(frame);
 }
 function isRegisteredFrame(frame) {
-  return frame.type === "registered" && hasPayload(frame) && typeof frame.payload.password === "string" && typeof frame.payload.player_id === "string";
+  return frame.type === "registered" && hasPayload(frame) && matchesFields(frame.payload, REGISTERED_PAYLOAD_FIELDS);
 }
 var STATE_SECTIONS = [
   "player",
@@ -45,7 +78,7 @@ var STATE_SECTIONS = [
   "prize_recoveries"
 ];
 // src/generated/actions.gen.ts
-var GENERATED_SPEC_VERSION = "v0.586.0";
+var GENERATED_SPEC_VERSION = "v0.593.0";
 var ACTIONS = {
   "spacemolt_arena/accept": {
     tool: "spacemolt_arena",
@@ -74,6 +107,14 @@ var ACTIONS = {
       { name: "max_side_size", type: "number", required: false, description: "For 'challenge': maximum ships per side. 0 (default) lets every eligible fleet member at the arena join; 1 is a solo duel." }
     ]
   },
+  "spacemolt_arena/challenges": {
+    tool: "spacemolt_arena",
+    action: "challenges",
+    kind: "query",
+    summary: "Consequence-free combat at an arena POI: challenge a pilot, fight on the normal battle engine, leave with ship and crew intact",
+    responseType: "ArenaChallengesResponse",
+    params: []
+  },
   "spacemolt_arena/decline": {
     tool: "spacemolt_arena",
     action: "decline",
@@ -82,6 +123,16 @@ var ACTIONS = {
     detailsType: "ArenaActionResponse",
     params: []
   },
+  "spacemolt_arena/fight": {
+    tool: "spacemolt_arena",
+    action: "fight",
+    kind: "mutation",
+    summary: "Consequence-free combat at an arena POI: challenge a pilot, fight on the normal battle engine, leave with ship and crew intact",
+    detailsType: "ArenaFightResponse",
+    params: [
+      { name: "id", type: "string", required: true, description: "For 'fight': the NPC challenge to start, from 'challenges'.", positional: 0 }
+    ]
+  },
   "spacemolt_arena/status": {
     tool: "spacemolt_arena",
     action: "status",
@@ -224,7 +275,7 @@ var ACTIONS = {
     summary: "Manage your battle — maneuver, target enemies, adopt combat stances, or self-destruct",
     responseType: "BattleResponse",
     params: [
-      { name: "id", type: '"fire" | "evade" | "brace" | "flee" | "board"', required: true, description: "Battle stance: fire (100% dmg dealt/taken), evade (0%/50%, costs fuel), brace (0%/25%, shields regen 2x), flee (0%/100%, auto-retreats to escape), or board (0%/100%, automatically closes for repeated latch attempts; requires target_id and marines). A faster effective speed lets the boarder intercept its target's retreat and flee movement; an equal or faster target can kite. Changing away from board begins non-instant withdrawal.", enumValues: ["fire", "evade", "brace", "flee", "board"], positional: 0 },
+      { name: "id", type: '"fire" | "evade" | "brace" | "flee" | "board"', required: true, description: "Battle stance: fire (100% dmg dealt/taken), evade (0%/50%, costs fuel), brace (0%/25%, shields regen 2x), flee (0%/100%, auto-retreats to escape), or board (0%/100%, automatically closes for repeated latch attempts; requires target_id and marines). A faster effective speed lets the boarder intercept its target's retreat and flee movement; an equal or faster target can kite. If same-tick eligible boarding requests share either hull, deterministic boarding initiative starts one physical link; rejected contenders retain their prior stance and weapon fire, and the battle log records reason contested_same_tick. Changing away from board begins non-instant withdrawal.", enumValues: ["fire", "evade", "brace", "flee", "board"], positional: 0 },
       { name: "marines", type: "number", required: false, description: "Positive fit-marine commitment required when setting stance=board. The battle tick caps it to the fit marines actually available." },
       { name: "target", type: "string", required: false, description: "ID or name of the enemy — required when focusing a target and when entering the board stance. Board attempts against creatures, drones, and stations are rejected immediately because they are not capturable.", positional: 1 }
     ]
@@ -978,7 +1029,7 @@ var ACTIONS = {
       { name: "rewards", type: "{ credits?: number; items?: Record<string, unknown>[] }", required: true, description: "Mission rewards (credits, items, reputation)" },
       { name: "title", type: "string", required: true, description: "Mission title" },
       { name: "triggers", type: "string[]", required: false, description: "Optional: triggers like 'open_to_all' to allow non-members" },
-      { name: "type", type: "string", required: true, description: "Mission type (delivery, combat, exploration, etc.)" }
+      { name: "type", type: "string", required: true, description: "Mission type (delivery, combat, exploration, bounty, etc.)" }
     ]
   },
   "spacemolt_faction_admin/promote": {
@@ -1665,7 +1716,7 @@ var ACTIONS = {
     tool: "spacemolt_salvage",
     action: "sell",
     kind: "mutation",
-    summary: "Sell a towed wreck to the salvage yard for credits",
+    summary: "Sell a towed wreck to an NPC salvage yard for credits",
     detailsType: "SellWreckResponse",
     params: []
   },
@@ -2540,7 +2591,7 @@ var ACTIONS = {
     summary: "Attack another player, pirate, empire NPC, creature, station, or intact prize",
     detailsType: "AttackResponse",
     params: [
-      { name: "id", type: "string", required: true, description: "ID of the target: a player, pirate, empire NPC, wildlife creature, intact-prize actor, or station. Prize actor IDs come from get_nearby. Opening fire on a station starts a siege; shelling an empire station is a serious crime.", positional: 0 }
+      { name: "id", type: "string", required: true, description: "ID of the target: a player, pirate, empire NPC, wildlife creature, intact-prize actor, or station. Prize actor IDs come from get_nearby. Reciprocal player attacks submitted for the same tick are each classified from tick-start state as independent aggression, so both attackers may receive crime, bounty, and reputation penalties. Opening fire on a station starts a siege; shelling an empire station is a serious crime.", positional: 0 }
     ]
   },
   "spacemolt/buy": {
@@ -3211,7 +3262,9 @@ function buildCommands(dispatch) {
       accept: bindBare("spacemolt_arena", "accept"),
       cancel: bindBare("spacemolt_arena", "cancel"),
       challenge: bind("spacemolt_arena", "challenge"),
+      challenges: bindBare("spacemolt_arena", "challenges"),
       decline: bindBare("spacemolt_arena", "decline"),
+      fight: bind("spacemolt_arena", "fight"),
       status: bindBare("spacemolt_arena", "status")
     },
     spacemolt_auth: {
@@ -3609,6 +3662,16 @@ function retryAfterMsFromClose(err) {
 }
 
 // src/events/emitter.ts
+function notifyListeners(listeners, label, ...args) {
+  for (const listener of listeners) {
+    try {
+      listener(...args);
+    } catch (err) {
+      console.warn(`[spacemolt] ${label} listener threw: ${err}`);
+    }
+  }
+}
+
 class EventStream {
   onClose;
   buffer = [];
@@ -3903,14 +3966,17 @@ class StateCache {
 function extractPendingAck(structured) {
   if (!structured)
     return;
-  if (structured.pending === true) {
-    return { command: String(structured.command ?? ""), message: String(structured.message ?? "") };
-  }
   const details = structured.details;
-  if (isRecord(details) && details.pending === true) {
-    return { command: String(details.command ?? ""), message: String(details.message ?? "") };
-  }
-  return;
+  const source = structured.pending === true ? structured : isRecord(details) && details.pending === true ? details : undefined;
+  if (!source)
+    return;
+  return {
+    pending: true,
+    command: String(source.command ?? ""),
+    message: String(source.message ?? ""),
+    ...typeof source.auto_docked === "boolean" && { auto_docked: source.auto_docked },
+    ...typeof source.auto_undocked === "boolean" && { auto_undocked: source.auto_undocked }
+  };
 }
 
 class Correlator {
@@ -3944,14 +4010,14 @@ class Correlator {
           return this.rejectInvalidResponse(requestId, pending, frame.type);
         const payload = frame.payload;
         if (pending.kind === "query") {
-          this.settle(requestId);
+          this.pending.delete(requestId);
           pending.resolve({ result: payload.result, structuredContent: payload.structuredContent });
           return true;
         }
         const structured = payload.structuredContent;
         const ack = extractPendingAck(structured);
         if (!ack) {
-          this.settle(requestId);
+          this.pending.delete(requestId);
           pending.resolve({
             command: String(structured?.command ?? ""),
             tick: 0,
@@ -3969,7 +4035,7 @@ class Correlator {
         if (!isActionResultFrame(frame))
           return this.rejectInvalidResponse(requestId, pending, frame.type);
         const payload = frame.payload;
-        this.settle(requestId);
+        this.pending.delete(requestId);
         pending.resolve({
           command: payload.command,
           tick: payload.tick,
@@ -3982,14 +4048,14 @@ class Correlator {
       case "action_error": {
         if (!isActionErrorFrame(frame))
           return this.rejectInvalidResponse(requestId, pending, frame.type);
-        this.settle(requestId);
+        this.pending.delete(requestId);
         pending.reject(errorFromActionFrame(frame));
         return true;
       }
       case "error": {
         if (!isErrorFrame(frame))
           return this.rejectInvalidResponse(requestId, pending, frame.type);
-        this.settle(requestId);
+        this.pending.delete(requestId);
         pending.reject(errorFromFrame(frame));
         return true;
       }
@@ -4002,46 +4068,15 @@ class Correlator {
       pending.reject(err);
     this.pending.clear();
   }
-  settle(requestId) {
-    this.pending.delete(requestId);
-  }
   rejectInvalidResponse(requestId, pending, frameType) {
-    this.settle(requestId);
+    this.pending.delete(requestId);
     pending.reject(new SpacemoltError("invalid_response", `Malformed ${frameType} frame for request ${requestId}`));
     return true;
   }
 }
 
 // src/transport/socket.ts
-class NativeWebSocketAdapter {
-  socket;
-  constructor(url) {
-    this.socket = new WebSocket(url);
-  }
-  send(data) {
-    this.socket.send(data);
-  }
-  close(code, reason) {
-    this.socket.close(code, reason);
-  }
-  addEventListener(...args) {
-    switch (args[0]) {
-      case "open":
-        this.socket.addEventListener("open", () => args[1]());
-        break;
-      case "message":
-        this.socket.addEventListener("message", (event) => args[1]({ data: event.data }));
-        break;
-      case "close":
-        this.socket.addEventListener("close", (event) => args[1]({ code: event.code, reason: event.reason }));
-        break;
-      case "error":
-        this.socket.addEventListener("error", (event) => args[1](event));
-        break;
-    }
-  }
-}
-var defaultFactory = (url) => new NativeWebSocketAdapter(url);
+var defaultFactory = (url) => new WebSocket(url);
 
 class Socket {
   opts;
@@ -4416,17 +4451,8 @@ class Account {
       this.stateListeners.delete(listener);
     };
   }
-  notifyListeners(listeners, label, ...args) {
-    for (const listener of listeners) {
-      try {
-        listener(...args);
-      } catch (err) {
-        console.warn(`[spacemolt] ${label} listener threw: ${err}`);
-      }
-    }
-  }
   emitStateChange(changed) {
-    this.notifyListeners(this.stateListeners, "onStateChange", changed);
+    notifyListeners(this.stateListeners, "onStateChange", changed);
   }
   async logout() {
     await this.query("spacemolt_auth", "logout");
@@ -4850,7 +4876,7 @@ class Account {
     if (this.shouldReconnect(err)) {
       this.reconnectLoop(err);
     } else if (!this.userClosing) {
-      this.notifyListeners(this.disconnectedListeners, "onDisconnected", err);
+      notifyListeners(this.disconnectedListeners, "onDisconnected", err);
     }
   }
   shouldReconnect(err) {
@@ -4869,7 +4895,7 @@ class Account {
     const cfg = this.reconnectConfig;
     const retryAfterMs = retryAfterMsFromClose(err);
     for (let attempt = 1;attempt <= cfg.maxRetries; attempt++) {
-      this.notifyListeners(this.reconnectingListeners, "onReconnecting", attempt);
+      notifyListeners(this.reconnectingListeners, "onReconnecting", attempt);
       const backoff = attempt === 1 && retryAfterMs !== undefined ? retryAfterMs : Math.min(cfg.baseDelayMs * 2 ** (attempt - 1), cfg.maxDelayMs);
       await delay(backoff);
       if (this.userClosing) {
@@ -4879,12 +4905,12 @@ class Account {
       try {
         await this.reconnectOnce();
         this.reconnecting = false;
-        this.notifyListeners(this.reconnectedListeners, "onReconnected");
+        notifyListeners(this.reconnectedListeners, "onReconnected");
         return;
       } catch {}
     }
     this.reconnecting = false;
-    this.notifyListeners(this.disconnectedListeners, "onDisconnected", err);
+    notifyListeners(this.disconnectedListeners, "onDisconnected", err);
   }
   async reconnectOnce() {
     if (!this.credentialsProvider)
@@ -5168,16 +5194,13 @@ class SpacemoltClient {
     return () => this.accountDisconnectedListeners.delete(listener);
   }
   notifyAccountConnected(account) {
-    for (const listener of this.accountConnectedListeners)
-      listener(account);
+    notifyListeners(this.accountConnectedListeners, "onAccountConnected", account);
   }
   notifyAccountReconnected(account) {
-    for (const listener of this.accountReconnectedListeners)
-      listener(account);
+    notifyListeners(this.accountReconnectedListeners, "onAccountReconnected", account);
   }
   notifyAccountDisconnected(id, err) {
-    for (const listener of this.accountDisconnectedListeners)
-      listener(id, err);
+    notifyListeners(this.accountDisconnectedListeners, "onAccountDisconnected", id, err);
   }
   get httpBaseUrl() {
     return this.opts.httpBaseUrl ?? (this.opts.url ? httpBaseFromWs(this.opts.url) : DEFAULT_HTTP_BASE);

package/dist/protocol.d.ts

@@ -7,7 +7,7 @@
  * spec instead (see src/generated/). Endpoint: `/ws/v2`.
  */
 import type { NotificationPayloads, TypedNotificationType } from './generated/notifications.gen.js';
-import type { LoggedInPayload, RegisteredPayload, V2GameState, WelcomePayload } from './generated/openapi/types.gen.js';
+import type { LoggedInPayload, NotificationActionError, NotificationActionResult, PendingActionResponse, RegisteredPayload, V2GameState, WelcomePayload } from './generated/openapi/types.gen.js';
 /** Inbound frame: client -> server. `payload` is omitted when an action takes none. */
 export interface InboundFrame {
     tool: string;
@@ -27,36 +27,25 @@ export interface ResultFrame {
         structuredContent?: Record<string, unknown>;
     };
 }
-/** Mutation-ack: a `result` frame whose structuredContent flags `pending: true`. */
-export interface PendingAck {
-    pending: true;
-    command: string;
-    message: string;
-}
 /** Outcome push for a queued mutation; echoes the original request_id. */
 export interface ActionResultFrame {
     type: 'action_result';
     request_id?: string;
-    payload: {
-        command: string;
-        tick: number;
+    /**
+     * The server's published `Notification_action_result`, except for `result`:
+     * the spec leaves it untyped because the v1 and v2 shapes differ, and on
+     * `/ws/v2` it is always the delta. Narrow it here rather than lose the type.
+     */
+    payload: Omit<NotificationActionResult, 'result'> & {
         /** A V2GameState delta — only the sections that changed. See StateDelta. */
         result: StateDelta;
-        auto_docked?: boolean;
-        auto_undocked?: boolean;
     };
 }
 /** Failure outcome for a queued mutation. */
 export interface ActionErrorFrame {
     type: 'action_error';
     request_id?: string;
-    payload: {
-        command: string;
-        tick: number;
-        code: string;
-        message: string;
-        details?: Record<string, unknown>;
-    };
+    payload: NotificationActionError;
 }
 /** Generic error frame emitted by the framing layer or a handler. */
 export interface ErrorFrame {
@@ -163,11 +152,13 @@ export interface QueryResult<T = Record<string, unknown>> {
     /** Raw JSON for programmatic consumption, typed to the command's response. */
     structuredContent?: T;
 }
-/** The immediate `pending: true` acknowledgement for a queued mutation. */
-export interface MutationAck {
-    command: string;
-    message: string;
-}
+/**
+ * The immediate `pending: true` acknowledgement for a queued mutation. The
+ * server's published `PendingActionResponse`, so the `auto_docked`/
+ * `auto_undocked` flags it carries reach the caller at ack time rather than
+ * only on the final outcome.
+ */
+export type MutationAck = PendingActionResponse;
 /**
  * Resolved value of a two-phase mutation, delivered when the action executes.
  * `TDetails` is the action-specific shape of `delta.details` (e.g. `jump` ->

package/dist/transport/correlator.d.ts

@@ -50,6 +50,5 @@ export declare class Correlator {
     handle(frame: RawFrame): boolean;
     /** Reject every in-flight request — used when the socket closes. */
     rejectAll(err: ConnectionClosedError | SpacemoltError): void;
-    private settle;
     private rejectInvalidResponse;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spacemolt/lib",
-  "version": "13.2.0",
+  "version": "14.0.0",
   "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",