fix: SharedStateManager sometimes tries to join channels too early (#351)

Author: BinaryMuse

src/lib/shared_state/adapter.ts

@@ -59,13 +59,20 @@ export class AtuinSharedStateAdapter<T extends SharableState> implements SharedS
   }
 
   public async init() {
-    const socketManager = SocketManager.get();
-    this.channel = socketManager.channel(`shared-state:${this.stateId}`);
     this.logger = new Logger(`PhoenixSharedStateAdapter: ${this.stateId}`);
-    this.unsub = this.channel.on(Event.UPDATE, this.handleUpdate);
+    const socketManager = SocketManager.get();
+
+    socketManager.onConnect(() => {
+      this.channel = socketManager.channel(`shared-state:${this.stateId}`);
+      this.unsub = this.channel.on(Event.UPDATE, this.handleUpdate);
+    });
   }
 
   public async ensureConnected() {
+    if (!this.channel) {
+      throw new Error("Channel not yet initialized");
+    }
+
     if (this.channel!.state === "joined" || this.channel!.state === "joining") return;
 
     try {
@@ -81,6 +88,10 @@ export class AtuinSharedStateAdapter<T extends SharableState> implements SharedS
   }
 
   public resync(last_known_version: Version): Promise<ResyncPayload<T>> {
+    if (!this.channel) {
+      throw new Error("Channel not yet initialized");
+    }
+
     return this.channel!.push<ResyncRequest>(Event.RESYNC_REQ, { last_known_version }).receive<
       ResyncPayload<T>
     >();
@@ -89,7 +100,7 @@ export class AtuinSharedStateAdapter<T extends SharableState> implements SharedS
   public destroy() {
     this.logger!.debug("Shutting down");
     this.unsub?.();
-    this.channel!.leave();
+    this.channel?.leave();
     this.emitter.clearListeners();
   }
 

src/lib/shared_state/manager.ts

@@ -14,6 +14,7 @@ import {
 import { useStore } from "@/state/store";
 import { ConnectionState } from "@/state/store/user_state";
 import { Rc } from "@binarymuse/ts-stdlib";
+import { timeoutPromise } from "../utils";
 
 function applyOptimisticUpdates<T>(data: T, updates: Array<OptimisticUpdate>) {
   for (const update of updates) {
@@ -230,14 +231,14 @@ export class SharedStateManager<T extends SharableState> {
       (state) => state.connectionState,
       (connectionState) => {
         if (connectionState === ConnectionState.Online) {
-          this.adapter
-            .ensureConnected()
-            .then(() => {
-              this.resync();
-            })
-            .catch((_err) => {
-              this.logger.error("Failed to ensure channel connection");
-            });
+          // onConnect is async on the next tick, so wait a small amount of time to init
+          timeoutPromise(100, undefined).then(() => {
+            return this.adapter.ensureConnected()
+          }).then(() => {
+            return this.resync();
+          }).catch((err) => {
+            this.logger.error("Failed to ensure channel connection and resync:", err);
+          });
         }
       },
       {