@spacemolt/lib 15.0.0 → 15.0.1

package/dist/account.d.ts

@@ -15,7 +15,7 @@ import type { AuthCredentials } from './auth/credentials.js';
 import type { LoggedInPayload as LoggedInPayloadSchema, SubscribeMarketResponse, SubscribeObservationResponse } from './generated/openapi/types.gen.js';
 import type { NotificationPayloads, TypedNotificationType } from './generated/notifications.gen.js';
 import type { FleetPush, OkPush } from './push-frames.js';
-import { type ConnectionClosedError } from './errors.js';
+import { ConnectionClosedError } from './errors.js';
 import { type MarketBook } from './state/market.js';
 import { type ObservationView } from './state/observation.js';
 import type { GameState, MutationAck, MutationResult, QueryResult, RawFrame, StateSection, WelcomeFrame } from './protocol.js';

package/dist/index.js

@@ -4308,9 +4308,16 @@ class Account {
     });
   }
   makeSocket() {
-    this.socket = new Socket({ url: this.url, webSocketFactory: this.webSocketFactory });
-    this.socket.onFrame = (frame) => this.routeFrame(frame);
-    this.socket.onClose = (err) => this.handleClose(err);
+    const socket = new Socket({ url: this.url, webSocketFactory: this.webSocketFactory });
+    socket.onFrame = (frame) => {
+      if (this.socket === socket)
+        this.routeFrame(frame);
+    };
+    socket.onClose = (err) => {
+      if (this.socket === socket)
+        this.handleClose(err);
+    };
+    this.socket = socket;
   }
   get state() {
     return this.cache.snapshot();
@@ -4451,8 +4458,11 @@ class Account {
     }
   }
   async refresh() {
+    const revision = this.stateRevision;
     const result = await this.commands.spacemolt.get_status();
     const snapshot = requireStructuredContent(result, "spacemolt/get_status");
+    if (revision !== this.stateRevision)
+      return this.cache.snapshot();
     const changed = this.cache.seed(snapshot);
     if (changed.length)
       this.stateRevision++;
@@ -4983,10 +4993,19 @@ class Account {
   async reconnectOnce() {
     if (!this.credentialsProvider)
       throw new Error("reconnectOnce requires credentials");
+    const stopIfClosed = () => {
+      if (!this.userClosing)
+        return;
+      this.socket.close();
+      throw new ConnectionClosedError("account was closed");
+    };
+    stopIfClosed();
     this.socket.close();
     this.makeSocket();
     await this.open();
+    stopIfClosed();
     await this.authenticate(await this.credentialsProvider());
+    stopIfClosed();
     await this.resubscribe();
   }
   async resubscribe() {
@@ -5484,7 +5503,13 @@ class SpacemoltClient {
       return;
     }
     this.reconnectingIds.add(id);
-    this.enqueueRateLimited(() => this.withConnectRetry(() => account.reconnectOnce())).then(() => this.notifyAccountReconnected(account)).catch((reconnectErr) => {
+    const wanted = () => this.connected.get(id) === account;
+    this.enqueueRateLimited(() => this.withConnectRetry(async () => wanted() ? account.reconnectOnce() : undefined)).then(() => {
+      if (wanted())
+        this.notifyAccountReconnected(account);
+    }).catch((reconnectErr) => {
+      if (!wanted())
+        return;
       console.warn(`[spacemolt] failed to reconnect "${id}": ${reconnectErr}`);
       this.connected.delete(id);
       this.notifyAccountDisconnected(id, err);

package/package.json

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