Fix bookstore events

Fix connection to event namespace
ducksmanager · Feb 4, 2024 · 9f040bf · 9f040bf
1 parent 126c1d2
commit 9f040bf
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 26 deletions.
diff --git a/apps/web/src/components/Bookstores.vue b/apps/web/src/components/Bookstores.vue
@@ -174,6 +174,8 @@ import { MapboxMap, MapboxMarker, MapboxPopup } from "vue-mapbox-ts";
 
 import { SimpleBookstore } from "~dm-types/SimpleBookstore";
 
+import { bookstoreServices } from "../composables/useSocket";
+
 const { fetchStats } = users();
 const { stats: userStats } = storeToRefs(users());
 

diff --git a/apps/web/src/composables/useSocket.ts b/apps/web/src/composables/useSocket.ts
@@ -48,29 +48,7 @@ const useSocket = <Services extends EventsMap>(
   namespaceName: string,
   cacheOptions?: Required<SocketCacheOptions>,
 ) => {
-  const socket = io(import.meta.env.VITE_SOCKET_URL + namespaceName, {
-    auth: async (cb) => {
-      if (!session.value) {
-        return;
-      }
-      const token = await session.value.getToken();
-      console.log(token);
-      cb({
-        token,
-      });
-    },
-  });
-
-  socket.on("connect_error", (e) => {
-    if (session.value?.onConnectError) {
-      session.value.onConnectError();
-      console.debug(`Namespace ${namespaceName}: connect_error: ${e}`);
-    } else {
-      console.error(
-        `Namespace ${namespaceName}: onConnectError is not defined`,
-      );
-    }
-  });
+  let socket: Socket;
 
   return new Proxy({} as EventCalls<Services> & { connect: () => void }, {
     get:
@@ -80,6 +58,27 @@ const useSocket = <Services extends EventsMap>(
       ): Promise<
         EventReturnTypeIncludingError<Services[EventName]> | undefined
       > => {
+        if (!socket) {
+          socket = io(import.meta.env.VITE_SOCKET_URL + namespaceName, {
+            auth: async (cb) => {
+              if (!session.value) {
+                return;
+              }
+              cb({
+                token: await session.value.getToken(),
+              });
+            },
+          }).on("connect_error", (e) => {
+            if (session.value?.onConnectError) {
+              session.value.onConnectError();
+              console.debug(`Namespace ${namespaceName}: connect_error: ${e}`);
+            } else {
+              console.error(
+                `Namespace ${namespaceName}: onConnectError is not defined`,
+              );
+            }
+          });
+        }
         if (event === "connect") {
           socket.connect();
           return;
@@ -168,7 +167,7 @@ export const eventsServices = useSocket<EventsServices>(
   EventsServices.namespaceEndpoint,
 );
 export const bookstoreServices = useSocket<BookstoreServices>(
-  BookcaseServices.namespaceEndpoint,
+  BookstoreServices.namespaceEndpoint,
 );
 export const collectionServices = useSocket<CollectionServices>(
   CollectionServices.namespaceEndpoint,

diff --git a/packages/api/services/coa/index.ts b/packages/api/services/coa/index.ts
@@ -10,7 +10,8 @@ import stories from "./stories";
 import Services from "./types";
 
 export default (io: Server) => {
-  (io.of(Services.namespaceEndpoint) as Namespace<Services>).on("connection", (socket) => {      console.log("connected to coa");
+  (io.of(Services.namespaceEndpoint) as Namespace<Services>).on("connection", (socket) => {      
+    console.log("connected to coa");
 
     countries(socket);
     publications(socket);

diff --git a/packages/api/services/global-stats/index.ts b/packages/api/services/global-stats/index.ts
@@ -45,7 +45,6 @@ export default (io: Server) => {
       socket.on(
         "getUsersPointsAndStats",
         async (userIds: number[], callback) => {
-          console.log('!')
           if (userIds.length) {
             const result = {
               points: await getMedalPoints(userIds),