(fix): broken connections

packages/mtp/src/context.tsx

@@ -144,7 +144,7 @@ export function Provider(props: {
   children: ReactNode;
   blockConnection?: boolean;
 }) {
-  const { load } = useStorage();
+  const { load, save } = useStorage();
 
   const [readyState, setReadyState] = useState<number>(
     ConnectionState.Disconnected,
@@ -300,13 +300,19 @@ export function Provider(props: {
 
         await MTPClient.init();
 
-        const [userId, keyring] = await Promise.all([
+        const [userId, keyring, storedSessionId] = await Promise.all([
           load("user_id"),
           load("mtp_keyring"),
+          load("session_id"),
         ]);
         if (!userId || !keyring) {
           throw new Error("Missing login credentials");
         }
+        let sessionId = storedSessionId;
+        if (!Number.isSafeInteger(sessionId) || sessionId <= 0) {
+          sessionId = Date.now();
+          await save("session_id", sessionId);
+        }
         const forcedOmikronUrl = await load("forced_omikron_url");
         const forcedOmikronPublicKey = await load("forced_omikron_public_key");
 
@@ -404,27 +410,6 @@ export function Provider(props: {
         clientRef.current = client;
         setReadyState(client.state);
 
-        const authPayload = new Promise<
-          ProtocolMessage<"IdentificationResponse">
-        >((resolve, reject) => {
-          const unsubscribe = client.subscribe(
-            "IdentificationResponse",
-            (message) => {
-              try {
-                unsubscribe();
-                if (message.type.startsWith("Error")) {
-                  reject(new Error(`Authentication failed: ${message.type}`));
-                  return;
-                }
-                resolve(validateResponse("IdentificationResponse", message));
-              } catch (authPayloadError) {
-                unsubscribe();
-                reject(authPayloadError);
-              }
-            },
-          );
-        });
-
         clearReconnectTimer();
 
         // Schedule reconnect reset
@@ -438,7 +423,31 @@ export function Provider(props: {
         setIdentifying(true);
 
         await client.auth();
-        const finalResponse = await authPayload;
+        const finalResponse = validateResponse(
+          "ClientStateSync",
+          await client.request("ClientConnected", {
+            SessionId: sessionId,
+            VersionNumber: 0,
+            CacheValid: false,
+            CacheSchemaVersion: 0,
+          }),
+        );
+
+        if (finalResponse.type.startsWith("Error")) {
+          throw new Error(
+            `State synchronization failed: ${finalResponse.type}`,
+          );
+        }
+
+        const acknowledgement = await client.request("ClientStateAck", {
+          SessionId: sessionId,
+          VersionNumber: finalResponse.data.VersionNumber,
+        });
+        if (acknowledgement.type.startsWith("Error")) {
+          throw new Error(
+            `State acknowledgement failed: ${acknowledgement.type}`,
+          );
+        }
 
         if (disposed || clientRef.current !== client) return;
 
@@ -451,11 +460,15 @@ export function Provider(props: {
       } catch (connectError) {
         if (disposed) return;
         cleanup();
+        const connectErrorMessage =
+          connectError instanceof Error
+            ? connectError.message
+            : String(connectError ?? "Unknown error");
         log(
           0,
           "mtp",
           "red",
-          "Connection/authentication attempt failed",
+          `Connection/authentication attempt failed: ${connectErrorMessage}`,
           getProtocolErrorDetails(connectError) ?? connectError,
         );
 
@@ -465,10 +478,7 @@ export function Provider(props: {
           log(0, "mtp", "red", "Reconnection attempts exhausted", connectError);
           sonnerToast.error("Connection failed", {
             id: "mtp-connection-toast",
-            description:
-              connectError instanceof Error
-                ? connectError.message.split(":")[0]
-                : String(connectError ?? "Unknown error"),
+            description: connectErrorMessage.split(":")[0],
             icon: null,
             duration: Infinity,
             closeButton: true,
@@ -531,7 +541,7 @@ export function Provider(props: {
       setIdentifying(false);
       sonnerToast.dismiss("mtp-connection-toast");
     };
-  }, [mtpUrl, props.blockConnection, load]);
+  }, [mtpUrl, props.blockConnection, load, save]);
 
   // No Iota check
   useEffect(() => {

packages/shared/src/data.ts

@@ -106,7 +106,7 @@ const authPayload = z.object({
   Contacts: z
     .array(
       z.object({
-        LastMessageAt: z.number(),
+        LastMessageAt: z.number().default(0),
         UserId: z.number(),
         LastMessage: z
           .object({
@@ -114,7 +114,7 @@ const authPayload = z.object({
             SenderId: z.number(),
           })
           .optional(),
-        Messages: z.array(Message),
+        Messages: z.array(Message).default([]),
       }),
     )
     .default([]),
@@ -129,6 +129,16 @@ const authPayload = z.object({
     .default([]),
 });
 
+const clientStateSync = authPayload.extend({
+  SessionId: z.number().int().positive(),
+  VersionNumber: z.number().int().nonnegative(),
+  CacheSchemaVersion: z.number().int().nonnegative(),
+  SyncMode: z.enum(["full", "delta"]),
+  Messages: z.array(Message).default([]),
+  DeletedMessageIds: z.array(z.number()).default([]),
+  DeletedContactIds: z.array(z.number()).default([]),
+});
+
 export type Contacts = z.infer<typeof authPayload.shape.Contacts>;
 export type Communities = z.infer<typeof authPayload.shape.Communities>;
 export type Calls = z.infer<typeof authPayload.shape.Calls>;
@@ -184,6 +194,26 @@ export const mtp = {
     request: z.object({}).optional(),
     response: authPayload,
   },
+  ClientConnected: {
+    request: z.object({
+      SessionId: z.number().int().positive(),
+      VersionNumber: z.number().int().nonnegative(),
+      CacheValid: z.boolean(),
+      CacheSchemaVersion: z.number().int().nonnegative(),
+    }),
+    response: clientStateSync,
+  },
+  ClientStateSync: {
+    request: z.object({}).optional(),
+    response: clientStateSync,
+  },
+  ClientStateAck: {
+    request: z.object({
+      SessionId: z.number().int().positive(),
+      VersionNumber: z.number().int().nonnegative(),
+    }),
+    response: z.object({}),
+  },
   GetUserData: {
     request: z.object({
       UserId: z.number().optional(),