@wvdsh/sdk-js 1.3.2 → 1.3.4

package/dist/index.d.ts

@@ -245,14 +245,28 @@ interface P2PConfig {
     maxIncomingMessages?: number;
 }
 
+/**
+ * Base class for SDK managers. Provides the shared `sdk` reference and a
+ * default no-op `destroy()` so the SDK can safely iterate every manager
+ * during teardown without each one having to define an empty stub.
+ *
+ * Override `destroy()` in any manager that owns ongoing state — Convex
+ * subscriptions, intervals, peer connections, monkey-patched globals, etc.
+ * — to make sure that state is released when the SDK is torn down.
+ */
+declare abstract class WavedashManager {
+    protected sdk: WavedashSDK;
+    constructor(sdk: WavedashSDK);
+    destroy(): void;
+}
+
 /**
  * Lobby service
  *
  * Implements each of the lobby methods of the Wavedash SDK
  */
 
-declare class LobbyManager {
-    private sdk;
+declare class LobbyManager extends WavedashManager {
     private unsubscribeLobbyMessages;
     private unsubscribeLobbyUsers;
     private unsubscribeLobbyData;
@@ -342,8 +356,7 @@ declare class LobbyManager {
  * TODO: Extend this to game-level assets as well.
  */
 
-declare class FileSystemManager {
-    private sdk;
+declare class FileSystemManager extends WavedashManager {
     private remoteStorageOrigin;
     constructor(sdk: WavedashSDK);
     /**
@@ -399,8 +412,7 @@ declare class FileSystemManager {
  * Implements each of the user generated content methods of the Wavedash SDK
  */
 
-declare class UGCManager {
-    private sdk;
+declare class UGCManager extends WavedashManager {
     constructor(sdk: WavedashSDK);
     createUGCItem(ugcType: UGCType, title?: string, description?: string, visibility?: UGCVisibility, filePath?: string): Promise<GenericId<"userGeneratedContent">>;
     updateUGCItem(ugcId: GenericId<"userGeneratedContent">, title?: string, description?: string, visibility?: UGCVisibility, filePath?: string): Promise<GenericId<"userGeneratedContent">>;
@@ -413,8 +425,7 @@ declare class UGCManager {
  * Implements each of the leaderboard methods of the Wavedash SDK
  */
 
-declare class LeaderboardManager {
-    private sdk;
+declare class LeaderboardManager extends WavedashManager {
     private leaderboardCache;
     constructor(sdk: WavedashSDK);
     getLeaderboard(name: string): Promise<Leaderboard>;
@@ -433,8 +444,7 @@ declare class LeaderboardManager {
  * Handles WebRTC peer-to-peer connections for lobbies
  */
 
-declare class P2PManager {
-    private sdk;
+declare class P2PManager extends WavedashManager {
     private config;
     private currentConnection;
     private peerConnections;
@@ -479,6 +489,7 @@ declare class P2PManager {
     private textDecoder;
     private initialized;
     constructor(sdk: WavedashSDK);
+    destroy(): void;
     private ensureInitialized;
     init(config?: Partial<P2PConfig>): void;
     initializeP2PForCurrentLobby(lobbyId: GenericId<"lobbies">, members: SDKUser[]): Promise<P2PConnection>;
@@ -548,8 +559,7 @@ type StatEntry = {
     identifier: string;
     value: number;
 };
-declare class StatsManager {
-    private sdk;
+declare class StatsManager extends WavedashManager {
     private stats;
     private unlockedAchievements;
     private dirtyStats;
@@ -558,6 +568,7 @@ declare class StatsManager {
     private knownAchievementIds;
     private loaded;
     private subscriptions;
+    private periodicPersistInterval;
     constructor(sdk: WavedashSDK);
     destroy(): void;
     private isReady;
@@ -585,8 +596,7 @@ declare class StatsManager {
  * Lets the game update userPresence in the backend
  */
 
-declare class HeartbeatManager {
-    private sdk;
+declare class HeartbeatManager extends WavedashManager {
     private deviceFingerprint;
     private deviceFingerprintReady;
     private testConnectionInterval;
@@ -622,8 +632,7 @@ declare class HeartbeatManager {
     isCurrentlyConnected(): boolean;
 }
 
-declare class GameEventManager {
-    private sdk;
+declare class GameEventManager extends WavedashManager {
     private eventQueue;
     constructor(sdk: WavedashSDK);
     notifyGame(event: WavedashEvent, payload: string | number | object): void;
@@ -650,10 +659,9 @@ declare class GameEventManager {
  * calls route through us. The iframe isn't granted the fullscreen feature
  * policy anymore, so without these shims those calls would silently reject.
  */
-declare class FullscreenManager {
+declare class FullscreenManager extends WavedashManager {
     private _isFullscreen;
     private listeners;
-    private sdk;
     constructor(sdk: WavedashSDK);
     isFullscreen(): boolean;
     /**
@@ -680,8 +688,7 @@ declare class FullscreenManager {
  * - `takeFocus()` is also called after load completes so the game starts
  *   with keyboard focus without the player clicking first.
  */
-declare class OverlayManager {
-    private sdk;
+declare class OverlayManager extends WavedashManager {
     constructor(sdk: WavedashSDK);
     toggleOverlay(): void;
     takeFocus(): void;
@@ -694,8 +701,7 @@ declare class OverlayManager {
  * Implements friend-related methods for the Wavedash SDK
  */
 
-declare class FriendsManager {
-    private sdk;
+declare class FriendsManager extends WavedashManager {
     private userCache;
     constructor(sdk: WavedashSDK);
     /**
@@ -780,8 +786,7 @@ declare class WavedashSDK extends EventTarget {
     private _eventsReady;
     get eventsReady(): boolean;
     private launchParams;
-    private sessionEndSent;
-    private convexHttpUrl;
+    private destroyed;
     private gameFinishedLoading;
     Events: {
         readonly LOBBY_MESSAGE: "LobbyMessage";
@@ -869,6 +874,7 @@ declare class WavedashSDK extends EventTarget {
     p2pManager: P2PManager;
     fullscreenManager: FullscreenManager;
     overlayManager: OverlayManager;
+    private managers;
     private gameplayJwt;
     private gameplayJwtPromise;
     private setupWarningTimeout;
@@ -1154,9 +1160,12 @@ declare class WavedashSDK extends EventTarget {
      */
     ensureGameplayJwt(): Promise<string>;
     /**
-     * Set up listeners for page unload events to end gameplay session.
-     * Uses both beforeunload and pagehide for maximum reliability.
+     * Tear down every manager. Called on the parent's `END_SESSION` signal
+     * (committed leaves only — see GameRunnerComponent.svelte). Idempotent.
+     * Each manager's `destroy()` defaults to a no-op; managers with ongoing
+     * state (subscriptions, intervals, peer connections) override it.
      */
+    private destroy;
     private setupSessionEndListeners;
 }
 declare global {

package/dist/index.js

@@ -83,8 +83,20 @@ var WavedashEvents = {
 
 // src/services/lobby.ts
 import { api, IFRAME_MESSAGE_TYPE } from "@wvdsh/api";
-var LobbyManager = class {
+
+// src/services/manager.ts
+var WavedashManager = class {
   constructor(sdk) {
+    this.sdk = sdk;
+  }
+  destroy() {
+  }
+};
+
+// src/services/lobby.ts
+var LobbyManager = class extends WavedashManager {
+  constructor(sdk) {
+    super(sdk);
     // Track current lobby state
     this.unsubscribeLobbyMessages = null;
     this.unsubscribeLobbyUsers = null;
@@ -182,7 +194,6 @@ var LobbyManager = class {
         invites.map((invite) => invite.notificationId)
       );
     };
-    this.sdk = sdk;
     this.unsubscribeLobbyInvites = this.sdk.convexClient.onUpdate(
       api.sdk.gameLobby.getLobbyInvites,
       {},
@@ -611,9 +622,9 @@ function toBlobFromIndexedDBValue(value) {
 import { api as api2 } from "@wvdsh/api";
 var REMOTE_STORAGE_FOLDER = "userfs";
 var WAVEDASH_PERSISTENT_DATA_PATH = "/idbfs/wavedash";
-var FileSystemManager = class {
+var FileSystemManager = class extends WavedashManager {
   constructor(sdk) {
-    this.sdk = sdk;
+    super(sdk);
   }
   /**
    * Converts a local filesystem path into a full R2 object key.
@@ -907,9 +918,9 @@ var FileSystemManager = class {
 
 // src/services/ugc.ts
 import { api as api3 } from "@wvdsh/api";
-var UGCManager = class {
+var UGCManager = class extends WavedashManager {
   constructor(sdk) {
-    this.sdk = sdk;
+    super(sdk);
   }
   async createUGCItem(ugcType, title, description, visibility, filePath) {
     const { ugcId, uploadUrl } = await this.sdk.convexClient.mutation(
@@ -989,11 +1000,11 @@ var UGCManager = class {
 
 // src/services/leaderboards.ts
 import { api as api4 } from "@wvdsh/api";
-var LeaderboardManager = class {
+var LeaderboardManager = class extends WavedashManager {
   constructor(sdk) {
+    super(sdk);
     // Cache leaderboards to return totalEntries synchronously without a network call
     this.leaderboardCache = /* @__PURE__ */ new Map();
-    this.sdk = sdk;
   }
   async getLeaderboard(name) {
     const leaderboard = await this.sdk.convexClient.query(
@@ -1086,8 +1097,9 @@ var DEFAULT_P2P_CONFIG = {
   messageSize: 2048,
   maxIncomingMessages: 1024
 };
-var _P2PManager = class _P2PManager {
+var _P2PManager = class _P2PManager extends WavedashManager {
   constructor(sdk) {
+    super(sdk);
     this.currentConnection = null;
     // WebRTC connection state
     this.peerConnections = /* @__PURE__ */ new Map();
@@ -1171,9 +1183,11 @@ var _P2PManager = class _P2PManager {
     this.textEncoder = new TextEncoder();
     this.textDecoder = new TextDecoder();
     this.initialized = false;
-    this.sdk = sdk;
     this.config = { ...DEFAULT_P2P_CONFIG };
   }
+  destroy() {
+    this.disconnectP2P();
+  }
   ensureInitialized() {
     if (!this.initialized) {
       this.init();
@@ -2403,8 +2417,10 @@ var P2PManager = _P2PManager;
 import { api as api6 } from "@wvdsh/api";
 import debounce2 from "lodash.debounce";
 var STORE_DEBOUNCE_MS = 1e3;
-var StatsManager = class {
+var PERIODIC_PERSIST_MS = 1e4;
+var StatsManager = class extends WavedashManager {
   constructor(sdk) {
+    super(sdk);
     // Current user values
     this.stats = /* @__PURE__ */ new Map();
     this.unlockedAchievements = /* @__PURE__ */ new Set();
@@ -2419,6 +2435,8 @@ var StatsManager = class {
     this.loaded = { stats: false, achievements: false };
     // Subscription cleanup
     this.subscriptions = [];
+    // Background flush timer — see PERIODIC_PERSIST_MS
+    this.periodicPersistInterval = null;
     // ================
     // Store / Persist
     // ================
@@ -2429,14 +2447,20 @@ var StatsManager = class {
       leading: true,
       trailing: true
     });
-    this.sdk = sdk;
     this.subscribe();
     this.requestStats().catch((error) => {
       this.sdk.logger.error("Initial stats fetch failed:", error);
     });
+    this.periodicPersistInterval = setInterval(() => {
+      void this.persist();
+    }, PERIODIC_PERSIST_MS);
   }
   destroy() {
     this.debouncedPersist.cancel();
+    if (this.periodicPersistInterval !== null) {
+      clearInterval(this.periodicPersistInterval);
+      this.periodicPersistInterval = null;
+    }
     for (const unsub of this.subscriptions) unsub();
     this.subscriptions = [];
   }
@@ -2590,8 +2614,9 @@ import {
   HEARTBEAT,
   IFRAME_MESSAGE_TYPE as IFRAME_MESSAGE_TYPE2
 } from "@wvdsh/api";
-var HeartbeatManager = class {
+var HeartbeatManager = class extends WavedashManager {
   constructor(sdk) {
+    super(sdk);
     this.deviceFingerprint = void 0;
     this.testConnectionInterval = null;
     this.heartbeatInterval = null;
@@ -2610,7 +2635,6 @@ var HeartbeatManager = class {
         this.stop();
       }
     };
-    this.sdk = sdk;
     this.isConnected = this.sdk.convexClient.client.connectionState().isWebSocketConnected;
     document.addEventListener("visibilitychange", this.handleVisibilityChange);
     this.deviceFingerprintReady = this.sdk.iframeMessenger.requestFromParent(IFRAME_MESSAGE_TYPE2.GET_DEVICE_FINGERPRINT).then((fingerprint) => {
@@ -2754,10 +2778,10 @@ var HeartbeatManager = class {
 };
 
 // src/services/gameEvents.ts
-var GameEventManager = class {
+var GameEventManager = class extends WavedashManager {
   constructor(sdk) {
+    super(sdk);
     this.eventQueue = [];
-    this.sdk = sdk;
   }
   // ==============================
   // JS -> Game Event Broadcasting
@@ -2797,11 +2821,11 @@ var GameEventManager = class {
 
 // src/services/fullscreen.ts
 import { IFRAME_MESSAGE_TYPE as IFRAME_MESSAGE_TYPE3 } from "@wvdsh/api";
-var FullscreenManager = class {
+var FullscreenManager = class extends WavedashManager {
   constructor(sdk) {
+    super(sdk);
     this._isFullscreen = false;
     this.listeners = /* @__PURE__ */ new Set();
-    this.sdk = sdk;
     this.sdk.iframeMessenger.addEventListener(
       IFRAME_MESSAGE_TYPE3.FULLSCREEN_CHANGED,
       (data) => {
@@ -2886,15 +2910,15 @@ var FullscreenManager = class {
 
 // src/services/overlay.ts
 import { IFRAME_MESSAGE_TYPE as IFRAME_MESSAGE_TYPE4 } from "@wvdsh/api";
-var OverlayManager = class {
+var OverlayManager = class extends WavedashManager {
   constructor(sdk) {
+    super(sdk);
     this.handleKeyDown = (event) => {
       if (event.key === "Tab" && event.shiftKey) {
         event.preventDefault();
         this.toggleOverlay();
       }
     };
-    this.sdk = sdk;
     this.sdk.iframeMessenger.addEventListener(
       IFRAME_MESSAGE_TYPE4.TAKE_FOCUS,
       () => this.takeFocus()
@@ -2938,10 +2962,10 @@ function getCdnImageUrl(r2Key, host, options) {
 }
 
 // src/services/friends.ts
-var FriendsManager = class {
+var FriendsManager = class extends WavedashManager {
   constructor(sdk) {
+    super(sdk);
     this.userCache = /* @__PURE__ */ new Map();
-    this.sdk = sdk;
   }
   /**
    * Cache users from any source (friends, lobby users)
@@ -3240,7 +3264,7 @@ var WavedashSDK = class extends EventTarget {
     super();
     this._initialized = false;
     this._eventsReady = false;
-    this.sessionEndSent = false;
+    this.destroyed = false;
     this.gameFinishedLoading = false;
     // Expose constants for easy access `Wavedash.LobbyVisibility.PUBLIC` etc.
     this.Events = WavedashEvents;
@@ -3272,7 +3296,6 @@ var WavedashSDK = class extends EventTarget {
     this.convexClient.setAuth(
       ({ forceRefreshToken }) => this.getAuthToken(forceRefreshToken)
     );
-    this.convexHttpUrl = sdkConfig.convexHttpUrl;
     this.wavedashUser = sdkConfig.wavedashUser;
     this.iframeMessenger = iframeMessenger;
     this.ugcHost = sdkConfig.ugcHost;
@@ -3289,6 +3312,19 @@ var WavedashSDK = class extends EventTarget {
     this.gameEventManager = new GameEventManager(this);
     this.fullscreenManager = new FullscreenManager(this);
     this.overlayManager = new OverlayManager(this);
+    this.managers = [
+      this.p2pManager,
+      this.lobbyManager,
+      this.statsManager,
+      this.heartbeatManager,
+      this.fileSystemManager,
+      this.ugcManager,
+      this.leaderboardManager,
+      this.friendsManager,
+      this.gameEventManager,
+      this.fullscreenManager,
+      this.overlayManager
+    ];
     this.friendsManager.cacheUsers([
       {
         userId: this.wavedashUser.id,
@@ -4195,6 +4231,9 @@ var WavedashSDK = class extends EventTarget {
         throw new Error(`Failed to refresh gameplay token: ${response.status}`);
       }
       this.gameplayJwt = await response.text();
+      iframeMessenger.postToParent(IFRAME_MESSAGE_TYPE5.GAMEPLAY_JWT_READY, {
+        gameplayJwt: this.gameplayJwt
+      });
       return this.gameplayJwt;
     })().finally(() => {
       if (this.gameplayJwtPromise === promise) {
@@ -4213,48 +4252,23 @@ var WavedashSDK = class extends EventTarget {
     return this.getAuthToken();
   }
   /**
-   * Set up listeners for page unload events to end gameplay session.
-   * Uses both beforeunload and pagehide for maximum reliability.
+   * Tear down every manager. Called on the parent's `END_SESSION` signal
+   * (committed leaves only — see GameRunnerComponent.svelte). Idempotent.
+   * Each manager's `destroy()` defaults to a no-op; managers with ongoing
+   * state (subscriptions, intervals, peer connections) override it.
    */
+  destroy() {
+    if (this.destroyed) return;
+    this.destroyed = true;
+    for (const manager of this.managers) {
+      manager.destroy();
+    }
+  }
   setupSessionEndListeners() {
-    const endSessionEndpoint = `${this.convexHttpUrl}/gameplay/end-session`;
-    void this.ensureGameplayJwt().then(
-      (jwt) => fetch(endSessionEndpoint, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${jwt}`
-        },
-        body: JSON.stringify({ _type: "warmup" })
-      })
-    ).catch(() => {
-    });
-    const endGameplaySession = (_event) => {
-      if (this.sessionEndSent) return;
-      this.sessionEndSent = true;
-      const pendingData = this.statsManager.getPendingData();
-      this.lobbyManager.destroy();
-      this.heartbeatManager.destroy();
-      this.statsManager.destroy();
-      const sessionEndData = {};
-      if (pendingData?.stats?.length) {
-        sessionEndData.stats = pendingData.stats;
-      }
-      if (pendingData?.achievements?.length) {
-        sessionEndData.achievements = pendingData.achievements;
-      }
-      fetch(endSessionEndpoint, {
-        method: "POST",
-        body: JSON.stringify(sessionEndData),
-        keepalive: true,
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${this.gameplayJwt}`
-        }
-      });
-    };
-    window.addEventListener("beforeunload", endGameplaySession);
-    window.addEventListener("pagehide", endGameplaySession);
+    iframeMessenger.addEventListener(
+      IFRAME_MESSAGE_TYPE5.END_SESSION,
+      () => this.destroy()
+    );
   }
 };
 function setupWavedashSDK() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wvdsh/sdk-js",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "type": "module",
   "description": "Wavedash JavaScript SDK",
   "main": "./dist/client.js",
@@ -49,7 +49,7 @@
     "typescript-eslint": "^8.52.0"
   },
   "dependencies": {
-    "@wvdsh/api": "^0.1.9",
+    "@wvdsh/api": "^0.1.11",
     "convex": "^1.34.0",
     "lodash.debounce": "^4.0.8"
   }