fix chat state caching problem (#5940)

open-chat-labs · Jun 14, 2024 · 0af5784 · 0af5784
1 parent 51be054
commit 0af5784
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 13 deletions.
diff --git a/frontend/app/src/components/register/Register.svelte b/frontend/app/src/components/register/Register.svelte
@@ -6,7 +6,7 @@
     import UsernameInput from "../UsernameInput.svelte";
     import { createEventDispatcher, getContext } from "svelte";
     import { writable, type Writable } from "svelte/store";
-    import type { CreatedUser, OpenChat } from "openchat-client";
+    import { type CreatedUser, type OpenChat } from "openchat-client";
     import Button from "../Button.svelte";
     import Select from "../Select.svelte";
     import ModalContent from "../ModalContent.svelte";
@@ -107,6 +107,8 @@
                     isBot: false,
                 };
                 dispatch("createdUser", createdUser);
+            } else {
+                error.set(`Unexpected register user response: ${resp}`);
             }
         });
     }

diff --git a/frontend/openchat-agent/src/services/openchatAgent.ts b/frontend/openchat-agent/src/services/openchatAgent.ts
@@ -1787,7 +1787,7 @@ export class OpenChatAgent extends EventTarget {
 
         const updatedEvents = getUpdatedEvents(directChatUpdates, groupUpdates, communityUpdates);
 
-        if (!anyErrors) {
+        if (!anyErrors && this.userClient.userId !== ANON_USER_ID) {
             setCachedChats(this.db, this.principal, state, updatedEvents);
         }
 

diff --git a/frontend/openchat-agent/src/services/user/anonUser.client.ts b/frontend/openchat-agent/src/services/user/anonUser.client.ts
@@ -66,9 +66,14 @@ import type {
     TokenSwapStatusResponse,
     ApproveTransferResponse,
 } from "openchat-shared";
+import { ANON_USER_ID } from "openchat-shared";
 import { AnonymousOperationError } from "openchat-shared";
 
 export class AnonUserClient {
+    public get userId(): string {
+        return ANON_USER_ID;
+    }
+
     static create(): AnonUserClient {
         console.debug("ANON: creating anonymous user client");
         return new AnonUserClient();

diff --git a/frontend/openchat-agent/src/utils/caching.ts b/frontend/openchat-agent/src/utils/caching.ts
@@ -48,7 +48,7 @@ import type { CryptocurrencyContent } from "openchat-shared";
 import type { PrizeContent } from "openchat-shared";
 import type { P2PSwapContent } from "openchat-shared";
 
-const CACHE_VERSION = 103;
+const CACHE_VERSION = 104;
 const MAX_INDEX = 9999999999;
 
 export type Database = Promise<IDBPDatabase<ChatSchema>>;

diff --git a/frontend/openchat-client/src/openchat.ts b/frontend/openchat-client/src/openchat.ts
@@ -646,8 +646,8 @@ export class OpenChat extends OpenChatAgentWorker {
         this.loadUser();
     }
 
-    logError(message?: unknown, ...optionalParams: unknown[]): void {
-        this._logger.error(message, ...optionalParams);
+    logError(message: unknown, error: unknown, ...optionalParams: unknown[]): void {
+        this._logger.error(message, error, ...optionalParams);
     }
 
     logMessage(message?: unknown, ...optionalParams: unknown[]): void {

diff --git a/frontend/openchat-client/src/stores/markRead.ts b/frontend/openchat-client/src/stores/markRead.ts
@@ -147,9 +147,11 @@ export class MessageReadTracker {
 
         if (req.length > 0) {
             console.log("Sending messages read to the server: ", JSON.stringify(req));
-            api.sendRequest({ kind: "markMessagesRead", payload: req }).finally(() =>
-                this.triggerLoop(api),
-            );
+            api.sendRequest({ kind: "markMessagesRead", payload: req })
+                .catch((err) => {
+                    console.log("Error calling markMessagesRead", err);
+                })
+                .finally(() => this.triggerLoop(api));
         } else {
             this.triggerLoop(api);
         }

diff --git a/frontend/openchat-shared/src/utils/logging.ts b/frontend/openchat-shared/src/utils/logging.ts
@@ -1,10 +1,10 @@
 export type Logger = {
-    error(message?: unknown, ...optionalParams: unknown[]): void;
+    error(message: unknown, error: unknown, ...optionalParams: unknown[]): void;
     log(message?: unknown, ...optionalParams: unknown[]): void;
     debug(message?: unknown, ...optionalParams: unknown[]): void;
 };
 
-import Rollbar from "rollbar";
+import Rollbar, { type LogArgument } from "rollbar";
 import { offline } from "./network";
 
 let rollbar: Rollbar | undefined;
@@ -32,10 +32,10 @@ export function inititaliseLogger(apikey: string, version: string, env: string):
         });
     }
     return {
-        error(message?: unknown, ...optionalParams: unknown[]): void {
-            console.error(message as string, optionalParams);
+        error(message: unknown, error: unknown, ...optionalParams: unknown[]): void {
+            console.error(message as string, error, optionalParams);
             if (!offline()) {
-                rollbar?.error(message as string, optionalParams);
+                rollbar?.error(error as LogArgument, message as LogArgument, optionalParams);
             }
         },
         log(message?: unknown, ...optionalParams: unknown[]): void {