diff --git a/apps/dumili/src/composables/useDumiliSocket.ts b/apps/dumili/src/composables/useDumiliSocket.ts
index b83964f4f..a4a8e393b 100644
--- a/apps/dumili/src/composables/useDumiliSocket.ts
+++ b/apps/dumili/src/composables/useDumiliSocket.ts
@@ -10,7 +10,6 @@ import EdgeCreatorServices from "~dm-services/edgecreator/types";
 import EdgesServices from "~dm-services/edges/types";
 import EventsServices from "~dm-services/events/types";
 import GlobalStatsServices from "~dm-services/global-stats/types";
-import LoginServices from "~dm-services/login/types";
 import PresentationTextServices from "~dm-services/presentation-text/types";
 import PublicCollectionServices from "~dm-services/public-collection/types";
 import StatsServices from "~dm-services/stats/types";
@@ -49,10 +48,6 @@ const defaultExport = (options: {
     publicCollection: socket.addNamespace<PublicCollectionServices>(
       PublicCollectionServices.namespaceEndpoint,
     ),
-    login: socket.addNamespace<LoginServices>(
-      LoginServices.namespaceEndpoint,
-      {},
-    ),
 
     bookcase: socket.addNamespace<BookcaseServices>(
       BookcaseServices.namespaceEndpoint,
diff --git a/apps/web/src/composables/useDmSocket.ts b/apps/web/src/composables/useDmSocket.ts
index 5bac1752a..8c0f2c887 100644
--- a/apps/web/src/composables/useDmSocket.ts
+++ b/apps/web/src/composables/useDmSocket.ts
@@ -11,7 +11,6 @@ import EdgeCreatorServices from "~dm-services/edgecreator/types";
 import EdgesServices from "~dm-services/edges/types";
 import EventsServices from "~dm-services/events/types";
 import GlobalStatsServices from "~dm-services/global-stats/types";
-import LoginServices from "~dm-services/login/types";
 import PresentationTextServices from "~dm-services/presentation-text/types";
 import PublicCollectionServices from "~dm-services/public-collection/types";
 import StatsServices from "~dm-services/stats/types";
@@ -62,7 +61,6 @@ const defaultExport = (
       PublicCollectionServices.namespaceEndpoint,
     ),
     app: socket.addNamespace<AppServices>(AppServices.namespaceEndpoint),
-    login: socket.addNamespace<LoginServices>(LoginServices.namespaceEndpoint),
 
     bookcase: socket.addNamespace<BookcaseServices>(
       BookcaseServices.namespaceEndpoint,
@@ -115,10 +113,11 @@ const defaultExport = (
       CollectionServices.namespaceEndpoint,
       {
         session,
-        cache: {
-          storage: cacheStorage,
-          ttl: 1000, // 1 second only, because we want to always get the latest data but still cache in case of offline
-        },
+        // TODO cache is wrongly done on all endpoints if uncommented, it should be done only on retrieval endpoints
+        // cache: {
+        //   storage: cacheStorage,
+        //   ttl: 1000, // 1 second only, because we want to always get the latest data but still cache in case of offline
+        // },
       },
     ),
     coverId: socket.addNamespace<CoverIdServices>(
diff --git a/apps/web/src/pages/demo.vue b/apps/web/src/pages/demo.vue
index c7085a8ab..7eda56e5f 100644
--- a/apps/web/src/pages/demo.vue
+++ b/apps/web/src/pages/demo.vue
@@ -14,7 +14,7 @@ const { user } = storeToRefs(collection());
 const router = useRouter();
 
 const {
-  login: { services: loginServices },
+  auth: { services: authServices },
 } = inject(socketInjectionKey)!;
 
 watch(
@@ -28,7 +28,7 @@ watch(
 );
 
 (async () => {
-  const result = await loginServices.loginAsDemo();
+  const result = await authServices.loginAsDemo();
   switch (result.error) {
     case "No demo user found":
       console.error(result.error);
diff --git a/apps/web/src/pages/signup.vue b/apps/web/src/pages/signup.vue
index c180df428..e93701e81 100644
--- a/apps/web/src/pages/signup.vue
+++ b/apps/web/src/pages/signup.vue
@@ -68,7 +68,7 @@ import Cookies from "js-cookie";
 
 import type { ScopedError } from "~socket.io-services/types";
 
-const { signup: userSignup, loadUser } = collection();
+const { loadUser } = collection();
 const { user } = storeToRefs(collection());
 const router = useRouter();
 
diff --git a/apps/web/src/stores/collection.ts b/apps/web/src/stores/collection.ts
index 96a5cc12a..4ccea5444 100644
--- a/apps/web/src/stores/collection.ts
+++ b/apps/web/src/stores/collection.ts
@@ -12,7 +12,7 @@ import type {
   purchase,
   subscription,
 } from "~prisma-schemas/schemas/dm";
-import type { EventReturnType, ScopedError } from "~socket.io-services/types";
+import type { EventReturnType } from "~socket.io-services/types";
 
 import useCollection from "../composables/useCollection";
 import { socketInjectionKey } from "../composables/useDmSocket";
@@ -41,7 +41,7 @@ export const collection = defineStore("collection", () => {
   const {
     collection: { services: collectionServices },
     stats: { services: statsServices },
-    login: { services: loginServices },
+    auth: { services: authServices },
     options: socketOptions,
   } = inject(socketInjectionKey)!;
 
@@ -52,8 +52,8 @@ export const collection = defineStore("collection", () => {
   >(null);
 
   const collectionUtils = useCollection(
-      issues as ShallowRef<(issue & { issuecode: string })[]>,
-    ),
+    issues as ShallowRef<(issue & { issuecode: string })[]>,
+  ),
     watchedPublicationsWithSales = shallowRef<string[] | null>(null),
     purchases = shallowRef<purchase[] | null>(null),
     watchedAuthors = shallowRef<authorUser[] | null>(null),
@@ -81,8 +81,8 @@ export const collection = defineStore("collection", () => {
     >(null),
     coaIssueCountsByPublicationcode = shallowRef<
       | EventReturnType<
-          CollectionServices["getIssues"]
-        >["countByPublicationcode"]
+        CollectionServices["getIssues"]
+      >["countByPublicationcode"]
       | null
     >(null),
     user = shallowRef<
@@ -120,7 +120,7 @@ export const collection = defineStore("collection", () => {
           ([publicationcode1], [publicationcode2]) =>
             Math.sign(
               totalPerPublicationUniqueIssuecodes.value[publicationcode2]! -
-                totalPerPublicationUniqueIssuecodes.value[publicationcode1]!,
+              totalPerPublicationUniqueIssuecodes.value[publicationcode1]!,
             ),
         ),
     ),
@@ -312,7 +312,7 @@ export const collection = defineStore("collection", () => {
       onSuccess: (token: string) => void,
       onError: (e: string) => void,
     ) => {
-      const response = await loginServices.login({
+      const response = await authServices.login({
         username,
         password,
       });
@@ -322,30 +322,6 @@ export const collection = defineStore("collection", () => {
         onSuccess(response as string);
       }
     },
-    signup = async (
-      username: string,
-      password: string,
-      password2: string,
-      email: string,
-      onSuccess: (token: string) => void,
-      onError: (e: ScopedError) => void,
-    ) => {
-      const response = await collectionServices.createUser({
-        username,
-        password,
-        password2,
-        email,
-      });
-      if (response.error) {
-        if (response.selector) {
-          onError(response);
-        } else {
-          console.error(response.error, response.errorDetails);
-        }
-      } else {
-        onSuccess(response.token);
-      }
-    },
     loadUser = async (afterUpdate = false) => {
       if (!isLoadingUser.value && (afterUpdate || !user.value)) {
         isLoadingUser.value = true;
@@ -371,7 +347,7 @@ export const collection = defineStore("collection", () => {
   console.log(issues.value);
   return {
     ...collectionUtils,
-    loginServices,
+    authServices,
     issues,
     publicationUrlRoot,
     createPurchase,
@@ -404,7 +380,6 @@ export const collection = defineStore("collection", () => {
     previousVisit,
     purchases,
     purchasesById,
-    signup,
     subscriptions,
     suggestions,
     totalPerPublicationUniqueIssuecodes,
diff --git a/apps/whattheduck/.env b/apps/whattheduck/.env
index c5785c077..dd6840d52 100644
--- a/apps/whattheduck/.env
+++ b/apps/whattheduck/.env
@@ -1,8 +1,8 @@
 BASE_URL=http://localhost:8003
 
-VITE_DM_SOCKET_URL=https://api-websocket.ducksmanager.net
+#VITE_DM_SOCKET_URL=https://api-websocket.ducksmanager.net
 
-#VITE_DM_SOCKET_URL=http://localhost:3000
+VITE_DM_SOCKET_URL=http://localhost:3000
 
 VITE_DISCORD_URL=https://discord.gg/ruk3FsD
 VITE_DM_URL=https://ducksmanager.net
diff --git a/apps/whattheduck/package.json b/apps/whattheduck/package.json
index f3678a914..62afb4677 100644
--- a/apps/whattheduck/package.json
+++ b/apps/whattheduck/package.json
@@ -80,6 +80,7 @@
     "concurrently": "^9.0.1",
     "eslint": "^9.12.0",
     "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-i18next": "^6.1.0",
     "eslint-plugin-prettier-vue": "^5.0.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
diff --git a/apps/whattheduck/src/App.vue b/apps/whattheduck/src/App.vue
index 0641569a7..3cca1ee6c 100644
--- a/apps/whattheduck/src/App.vue
+++ b/apps/whattheduck/src/App.vue
@@ -4,7 +4,7 @@
     <OfflineBanner :on-offline="routeMeta.onOffline" v-if="isOfflineMode" />
 
     <ion-router-outlet
-      v-if="route.path === '/login' || route.path === '/test'"
+      v-if="['/login', '/signup', '/test'].includes(route.path)"
       :style="{ 'margin-top': `${offlineBannerHeight}px` }"
       id="main-content"
       :class="{ 'greyed-out': bundleDownloadProgress !== undefined }"
diff --git a/apps/whattheduck/src/components/List.vue b/apps/whattheduck/src/components/List.vue
index f4bfbcde1..a770dfc9f 100644
--- a/apps/whattheduck/src/components/List.vue
+++ b/apps/whattheduck/src/components/List.vue
@@ -2,83 +2,90 @@
   <ion-content v-if="!items" ref="content">
     {{ t('Chargement…') }}
   </ion-content>
-  <ion-content v-else-if="!items.length" ref="content">
-    {{ t('Cette liste est vide.') }}
-  </ion-content>
-  <ion-content
-    v-else
-    ref="content"
-    class="no-padding"
-    scroll-events
-    @ion-scroll="onScroll"
-    @ion-scroll-end="isScrolling = false"
-  >
-    <template v-if="$slots['row-label']">
-      <RecycleScroller
-        :style="{ visibility: isCameraPreviewShown ? 'hidden' : 'visible' }"
-        class="scroller"
-        :items="filteredItems"
-        :item-size="32"
-        key-field="uniqueKey"
-        item-class="item-wrapper"
-        v-slot="{ item: { key, item, isOwned, nextItemType } }"
-      >
-        <Row
-          :id="key"
-          :type="itemType"
-          :class="{ [`is-next-item-${nextItemType}`]: !!nextItemType, 'is-owned': isOwned }"
-        >
-          <template #fill-bar v-if="item">
-            <slot name="fill-bar" :item="item" />
-          </template>
-          <template #prefix v-if="item">
-            <slot name="row-prefix" :item="item" />
-          </template>
-          <template #label>
-            <slot name="row-label" :item="item" />
-          </template>
-          <template #suffix>
-            <slot name="row-suffix" :item="item" />
-          </template>
-        </Row>
-      </RecycleScroller>
-      <div id="edit-issues-buttons" v-if="selectedIssuecodes">
-        <EditIssuesConfirmCancelButtons
-          :confirm-ios="pencilOutline"
-          :confirm-md="pencilSharp"
-          :cancel-ios="closeOutline"
-          :cancel-md="closeSharp"
-          @cancel="selectedIssuecodes = null"
-          @confirm="updateNavigationToSelectedIssuecodes"
-        /></div
-    ></template>
-    <slot v-else name="default" />
-    <EditIssuesButton
-      v-if="!selectedIssuecodes && !isCameraPreviewShown"
-      @show-camera-preview="isCameraPreviewShown = true"
-    />
-
-    <template v-if="isCameraPreviewShown">
-      <div :id="cameraPreviewElementId"></div>
-      <div class="overlay" ref="overlay">
-        <ion-button ref="takePhotoButton" @click="takePhoto().then(() => (isCameraPreviewShown = false))" size="large">
-          <ion-icon :ios="apertureOutline" :md="apertureSharp" />
-        </ion-button>
-        <ion-button size="large" color="danger" @click="isCameraPreviewShown = false">
-          <ion-icon :ios="closeOutline" :md="closeSharp" />
-        </ion-button></div
-    ></template>
-
-    <div
-      v-show="isScrolling"
-      v-if="itemInCenterOfViewport"
-      id="scroll-text"
-      slot="fixed"
-      :style="{ top: `${scrollPositionPct}%` }"
+  <template v-else>
+    <ion-content v-if="!items.length" ref="content">
+      <slot v-if="$slots.empty" name="empty" />
+      <template v-else>{{ t('Cette liste est vide.') }}</template>
+    </ion-content>
+    <ion-content
+      v-else
+      ref="content"
+      class="no-padding"
+      scroll-events
+      @ion-scroll="onScroll"
+      @ion-scroll-end="isScrolling = false"
     >
-      {{ getItemTextFn(itemInCenterOfViewport) }}
-    </div></ion-content
-  >
+      <template v-if="$slots['row-label']">
+        <RecycleScroller
+          :style="{ visibility: isCameraPreviewShown ? 'hidden' : 'visible' }"
+          class="scroller"
+          :items="filteredItems"
+          :item-size="32"
+          key-field="uniqueKey"
+          item-class="item-wrapper"
+          v-slot="{ item: { key, item, isOwned, nextItemType } }"
+        >
+          <Row
+            :id="key"
+            :type="itemType"
+            :class="{ [`is-next-item-${nextItemType}`]: !!nextItemType, 'is-owned': isOwned }"
+          >
+            <template #fill-bar v-if="item">
+              <slot name="fill-bar" :item="item" />
+            </template>
+            <template #prefix v-if="item">
+              <slot name="row-prefix" :item="item" />
+            </template>
+            <template #label>
+              <slot name="row-label" :item="item" />
+            </template>
+            <template #suffix>
+              <slot name="row-suffix" :item="item" />
+            </template>
+          </Row>
+        </RecycleScroller>
+        <div id="edit-issues-buttons" v-if="selectedIssuecodes">
+          <EditIssuesConfirmCancelButtons
+            :confirm-ios="pencilOutline"
+            :confirm-md="pencilSharp"
+            :cancel-ios="closeOutline"
+            :cancel-md="closeSharp"
+            @cancel="selectedIssuecodes = null"
+            @confirm="updateNavigationToSelectedIssuecodes"
+          /></div
+      ></template>
+      <slot v-else name="default" />
+      </ion-content>
+      <EditIssuesButton
+        v-if="!selectedIssuecodes && !isCameraPreviewShown"
+        @show-camera-preview="isCameraPreviewShown = true"
+      />
+
+      <template v-if="isCameraPreviewShown">
+        <div :id="cameraPreviewElementId"></div>
+        <div class="overlay" ref="overlay">
+          <ion-button
+            ref="takePhotoButton"
+            @click="takePhoto().then(() => (isCameraPreviewShown = false))"
+            size="large"
+          >
+            <ion-icon :ios="apertureOutline" :md="apertureSharp" />
+          </ion-button>
+          <ion-button size="large" color="danger" @click="isCameraPreviewShown = false">
+            <ion-icon :ios="closeOutline" :md="closeSharp" />
+          </ion-button></div
+      ></template>
+
+      <div
+        v-show="isScrolling"
+        v-if="itemInCenterOfViewport"
+        id="scroll-text"
+        slot="fixed"
+        :style="{ top: `${scrollPositionPct}%` }"
+      >
+        {{ getItemTextFn(itemInCenterOfViewport) }}
+      </div>
+  </template>
 </template>
 
 <script setup lang="ts" generic="Item extends Required<any>">
@@ -94,6 +101,7 @@ import { app } from '~/stores/app';
 
 defineSlots<{
   'default'(): any;
+  'empty'(): any;
   'fill-bar'(props: { item: Item }): any;
   'row-prefix'(props: { item: Item }): any;
   'row-label'(props: { item: Item }): any;
diff --git a/apps/whattheduck/src/stores/wtdcollection.ts b/apps/whattheduck/src/stores/wtdcollection.ts
index 858765325..a5857cddb 100644
--- a/apps/whattheduck/src/stores/wtdcollection.ts
+++ b/apps/whattheduck/src/stores/wtdcollection.ts
@@ -23,7 +23,6 @@ export const wtdcollection = defineStore('wtdcollection', () => {
     loadUserIssueQuotations,
     loadUser,
     login,
-    signup,
     updateCollectionSingleIssue,
     updateCollectionMultipleIssues,
   } = webCollectionStore;
@@ -50,10 +49,10 @@ export const wtdcollection = defineStore('wtdcollection', () => {
   );
 
   const ownedCountries = computed(() =>
-      ownedPublications.value
-        ? [...new Set((ownedPublications.value || []).map((publicationcode) => publicationcode.split('/')[0]))].sort()
-        : ownedPublications.value,
-    ),
+    ownedPublications.value
+      ? [...new Set((ownedPublications.value || []).map((publicationcode) => publicationcode.split('/')[0]))].sort()
+      : ownedPublications.value,
+  ),
     ownedPublications = computed(() =>
       issues.value
         ? [...new Set((issues.value || []).map(({ publicationcode }) => publicationcode))].sort()
@@ -106,7 +105,6 @@ export const wtdcollection = defineStore('wtdcollection', () => {
     purchases,
     purchasesById,
     quotationSum,
-    signup,
     suggestions,
     total,
     totalPerCountry,
diff --git a/apps/whattheduck/src/views/AppWithPersistedData.vue b/apps/whattheduck/src/views/AppWithPersistedData.vue
index 55223a49f..438686e5b 100644
--- a/apps/whattheduck/src/views/AppWithPersistedData.vue
+++ b/apps/whattheduck/src/views/AppWithPersistedData.vue
@@ -37,14 +37,12 @@ const collectionLoadProgress = computed(() => {
   }
 });
 
-const isCollectionReadonly = computed(() => {
-  return (
-    dataLoader.value.state?.mode === 'LOAD_CACHE' ||
-    (dataLoader.value.state?.mode === 'HYDRATE' &&
-      collectionLoadProgress.value !== undefined &&
-      collectionLoadProgress.value < 1)
-  );
-});
+const isCollectionReadonly = computed(() => (
+  dataLoader.value.state?.mode === 'LOAD_CACHE' ||
+  (dataLoader.value.state?.mode === 'HYDRATE' &&
+    collectionLoadProgress.value !== undefined &&
+    collectionLoadProgress.value < 1)
+));
 
 watch(
   [isPersistedDataLoaded, token],
diff --git a/apps/whattheduck/src/views/CountryList.vue b/apps/whattheduck/src/views/CountryList.vue
index fb9987d64..7373bc483 100644
--- a/apps/whattheduck/src/views/CountryList.vue
+++ b/apps/whattheduck/src/views/CountryList.vue
@@ -5,6 +5,7 @@
     :get-item-text-fn="getItemTextFn"
     item-type="countrycode"
   >
+  <template #empty>{{ $t('Votre collection est vide. Ajoutez des numéros en utilisant le bouton en bas à droite :-)') }}</template>
     <template #fill-bar="{ item: { countrycode } }">
       <ion-progress-bar
         type="determinate"
diff --git a/apps/whattheduck/src/views/Login.vue b/apps/whattheduck/src/views/Login.vue
index 59de4d6ab..cc9176bc9 100644
--- a/apps/whattheduck/src/views/Login.vue
+++ b/apps/whattheduck/src/views/Login.vue
@@ -106,7 +106,7 @@ const signup = () => {
 };
 
 const submitLogin = async () => {
-  const response = await socket.value?.login.services.login({
+  const response = await socket.value?.auth.services.login({
     username: username.value,
     password: password.value,
   });
diff --git a/apps/whattheduck/src/views/Signup.vue b/apps/whattheduck/src/views/Signup.vue
index 7787dd6f1..76495427e 100644
--- a/apps/whattheduck/src/views/Signup.vue
+++ b/apps/whattheduck/src/views/Signup.vue
@@ -1,7 +1,9 @@
 <template>
   <ion-page>
     <ion-header>
-      <ion-title class="ion-no-padding">{{ t('Inscription') }}</ion-title>
+      <ion-toolbar>
+        <ion-title class="ion-padding-start">{{ t('Inscription') }}</ion-title>
+      </ion-toolbar>
     </ion-header>
     <ion-content>
       <ion-input
@@ -11,6 +13,7 @@
           'ion-invalid': invalidInputs.includes('username'),
           'ion-touched': touchedInputs.includes('username'),
         }"
+        :error-text="errorTexts.username"
         :aria-label="t('Nom d\'utilisateur DucksManager')"
         :placeholder="t('Nom d\'utilisateur DucksManager')"
         @ion-blur="touchedInputs.push('username')"
@@ -22,6 +25,7 @@
           'ion-invalid': invalidInputs.includes('email'),
           'ion-touched': touchedInputs.includes('email'),
         }"
+        :error-text="errorTexts.email"
         :aria-label="t('Adresse e-mail')"
         :placeholder="t('Adresse e-mail')"
         @ion-blur="touchedInputs.push('email')"
@@ -34,7 +38,7 @@
           'ion-invalid': invalidInputs.includes('password'),
           'ion-touched': touchedInputs.includes('password'),
         }"
-        :error-text="t('Erreur')"
+        :error-text="errorTexts.password"
         :aria-label="t('Mot de passe')"
         :placeholder="t('Mot de passe')"
         @ion-blur="touchedInputs.push('password')"
@@ -63,15 +67,16 @@
           style="float: right"
           :ios="showPasswordConfirmation ? eyeOffOutline : eyeOutline"
           :md="showPasswordConfirmation ? eyeOffSharp : eyeSharp"
-          @click="showPasswordConfirmation = !showPassword"
+          @click="showPasswordConfirmation = !showPasswordConfirmation"
         />
       </ion-input>
+      <ion-row class="ion-padding-top">
       <ion-button @click="submitSignup">
-        {{ t("Terminer l'inscription") }}
+        {{ t("OK") }}
       </ion-button>
-      <ion-button @click="cancelSignup">
+      <ion-button color="light" @click="cancelSignup">
         {{ t('Annuler') }}
-      </ion-button>
+      </ion-button></ion-row>
     </ion-content></ion-page
   >
 </template>
@@ -81,17 +86,14 @@ import { eyeOutline, eyeOffOutline, eyeSharp, eyeOffSharp } from 'ionicons/icons
 
 import useFormErrorHandling from '~/composables/useFormErrorHandling';
 import { app } from '~/stores/app';
-import { wtdcollection } from '~/stores/wtdcollection';
-
-const { token } = storeToRefs(app());
 
-const collectionStore = wtdcollection();
+const { token, socket } = storeToRefs(app());
 
 const { t } = useI18n();
 
 const router = useRouter();
 
-const { validInputs, invalidInputs, touchedInputs, errorTexts, showError, clearErrors } = useFormErrorHandling([
+const { validInputs, invalidInputs, touchedInputs, errorTexts, clearErrors } = useFormErrorHandling([
   'username',
   'email',
   'password',
@@ -116,21 +118,37 @@ const submitSignup = async () => {
     return;
   }
   clearErrors();
-  await collectionStore.signup(
-    username.value,
-    password.value,
-    password.value,
-    email.value,
-    (newToken: string) => {
-      token.value = newToken;
-    },
-    (e) => {
-      showError(e);
-    },
-  );
+   const response = await socket.value?.auth.services.signup({
+    username: username.value,
+    password: password.value,
+    email: email.value,
+   });
+
+   if (typeof response !== 'string' && response && 'error' in response) {
+    errorTexts.value[response.selector!.replace('#', '')] = response.message!;
+  } else {
+    token.value = response;
+  }
 };
+
+
+watch(
+  token,
+  () => {
+    if (token.value) {
+      router.push('/collection#all=all');
+    }
+  },
+  { immediate: true },
+);
 </script>
 <style lang="scss" scoped>
+ion-row {
+  justify-content: space-between;
+  ion-button {
+    width: 40%
+  }
+}
 ion-input {
   ion-icon {
     margin-top: 1rem;
diff --git a/apps/whattheduck/translations/en.json b/apps/whattheduck/translations/en.json
index 44876fbe3..b41ec21a8 100644
--- a/apps/whattheduck/translations/en.json
+++ b/apps/whattheduck/translations/en.json
@@ -158,7 +158,6 @@
   "Sélectionnez un numéro en appuyant dessus.{br}Sélectionnez une liste de numéros consécutive en effectuant un appui long.": "Select an issue by tapping on it.{br}Select a range of issues by long-tapping on the first item of the range.",
   "Taille de la collection pour le mois": "Collection size for month",
   "Tapotez sur un magazine récent pour l'ajouter à votre collection.": "Tap on a recent issue to add it to your collection.",
-  "Terminer l'inscription": "Finish signup",
   "Tous les pays": "All countries",
   "Toutes publications": "All publicationd",
   "Toute la collection": "Whole collection",
@@ -170,6 +169,7 @@
   "Veuillez entrer des nombres valides dans les champs \"largeur\" et \"hauteur\" !": "Please enter valid numbers in the width and height fields!",
   "Vos identifiants sont invalides": "Invalid credentials",
   "Votre collection a été mise à jour": "Your collection has been updated",
+  "Votre collection est vide. Ajoutez des numéros en utilisant le bouton en bas à droite :-)": "Your collection is empty. Add issues using the button at the bottom right :-)",
   "Votre collection s'affiche lorsque vous ouvrez What The Duck. Tapotez sur un pays pour visualiser les magazines que vous possédez, ou tapotez sur + pour ajouter un numéro.": "Your DucksManager collection is displayed when you open What The Duck. Tap on a country to view the publications that you possess, or tap on \"+\" to add an issue to your collection.",
   "Vous avez atteint le nombre maximal d'auteurs surveillés. Supprimez des auteurs existants pour en ajouter d'autres.": "You have reached the maximum number of authors to rate. Remove already watched authors if you want to rate a new one.",
   "Vous avez déjà noté cet auteur !": "You have already rated this author!",
diff --git a/apps/whattheduck/translations/sv.json b/apps/whattheduck/translations/sv.json
index 94ecd225b..55ff4999c 100644
--- a/apps/whattheduck/translations/sv.json
+++ b/apps/whattheduck/translations/sv.json
@@ -142,7 +142,6 @@
     "Sélectionnez au moins un numéro": "Välj åtminstone en utgåva",
     "Sélectionnez un numéro en appuyant dessus.{br}Sélectionnez une liste de numéros consécutive en effectuant un appui long.": "Välj en utgåva genom att trycka på den.{br}Välj en sekvens av utgåvor genom att trycka länge på den första i sekvensen.",
     "Tapotez sur un magazine récent pour l'ajouter à votre collection": "Tryck på ett nytt utgåva för att lägga till det i din samling",
-    "Terminer l'inscription": "Godkänn",
     "Tous les pays": "Alla länder",
     "Toute la collection": "Hela samlingen",
     "Trier par date de publication": "Sortera efter publiceringsdatum",
diff --git a/packages/api/index.ts b/packages/api/index.ts
index c4bb0ca96..5dc99e4fc 100644
--- a/packages/api/index.ts
+++ b/packages/api/index.ts
@@ -21,7 +21,6 @@ import edges from "./services/edges";
 import events from "./services/events";
 import feedback from "./services/feedback";
 import globalStats from "./services/global-stats";
-import login from "./services/login";
 import presentationText from "./services/presentation-text";
 import publicCollection from "./services/public-collection";
 import stats from "./services/stats";
@@ -36,7 +35,7 @@ class ServerWithUser extends Server<
   Record<string, never>,
   Record<string, never>,
   { user?: SessionUser }
-> {}
+> { }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 (BigInt.prototype as any).toJSON = function () {
@@ -144,7 +143,6 @@ if (cluster.isPrimary) {
   events(io);
   feedback(io);
   globalStats(io);
-  login(io);
   presentationText(io);
   publicCollection(io);
   stats(io);
diff --git a/packages/api/package.json b/packages/api/package.json
index 938520e63..a98fbc838 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "build": "bun build --target node --sourcemap index.ts --outfile bundle.mjs",
     "dev": "concurrently -n api,docker-compose,db \"pnpm -F ~api nodemon-watch\" \"docker compose -f docker-compose-dev.yml up pastec mailcatcher\" \"pnpm -F ~prisma-schemas dev\"",
-    "nodemon-watch": "concurrently -n nodemon,tsc \"bun --inspect run --watch index.ts\" \"tsc --noEmit\"",
+    "nodemon-watch": "bun --inspect run --watch index.ts",
     "prod:deploy": "DIR=packages/api pnpm -F '~ci' prod:docker-compose-up",
     "prod:build-docker": "REPO_NAME=ghcr.io/bperel/ducksmanager-api:websocket pnpm -F '~ci' prod:build-docker -f packages/api/Dockerfile",
     "prod:transfer-files-pre": "pnpm -F '~ci' prod:transfer-files @packages/api/.env:packages/api/.env @packages/prisma-clients/.env.prod.local:packages/prisma-schemas/.env",
diff --git a/packages/api/services/login/demo_issues.csv b/packages/api/services/auth/demo_issues.csv
similarity index 100%
rename from packages/api/services/login/demo_issues.csv
rename to packages/api/services/auth/demo_issues.csv
diff --git a/packages/api/services/login/demo_purchases.csv b/packages/api/services/auth/demo_purchases.csv
similarity index 100%
rename from packages/api/services/login/demo_purchases.csv
rename to packages/api/services/auth/demo_purchases.csv
diff --git a/packages/api/services/auth/index.ts b/packages/api/services/auth/index.ts
index 5c812db81..47c02c902 100644
--- a/packages/api/services/auth/index.ts
+++ b/packages/api/services/auth/index.ts
@@ -7,7 +7,11 @@ import { prismaClient } from "~prisma-schemas/schemas/dm/client";
 
 import type Events from "./types";
 import { namespaceEndpoint } from "./types";
-import { isValidEmail, loginAs } from "./util";
+import { generateAccessToken, getHashedPassword, isValidEmail, loginAs } from "./util";
+
+import { prismaClient as prismaDm } from "~prisma-schemas/schemas/dm/client";
+import { validate, UsernameValidation, UsernameCreationValidation, EmailValidation, EmailCreationValidation, PasswordValidation } from "../collection/user/util";
+
 
 export default (io: Server) => {
   (io.of(namespaceEndpoint) as Namespace<Events>).on("connection", (socket) => {
@@ -88,5 +92,83 @@ export default (io: Server) => {
         callback({ error: "Something went wrong" });
       },
     );
+
+    socket.on("getCsrf", (callback) => callback(""));
+
+
+
+    socket.on("signup", async (input, callback) => {
+      const scopedError = await validate(input, [
+        new UsernameValidation(),
+        new UsernameCreationValidation(),
+        new EmailValidation(),
+        new EmailCreationValidation(),
+        new PasswordValidation(),
+      ]);
+      if (scopedError) {
+        callback({ error: "Bad request", ...scopedError });
+      } else {
+        const { username, password, email } = input;
+        const hashedPassword = getHashedPassword(password);
+        const user = await prismaDm.user.create({
+          data: {
+            username,
+            password: hashedPassword,
+            email,
+            signupDate: new Date(),
+          },
+        });
+
+        const privileges = (
+          await prismaDm.userPermission.findMany({
+            where: {
+              username,
+            },
+          })
+        ).groupBy("role", "privilege");
+        const token = generateAccessToken({
+          id: user.id,
+          username,
+          hashedPassword,
+          privileges,
+        });
+
+        callback(token);
+      }
+    });
+
+    socket.on("login", async ({ username, password }, callback) => {
+      console.log("login");
+      const hashedPassword = getHashedPassword(password);
+      const user = await prismaDm.user.findFirst({
+        where: {
+          username,
+          password: hashedPassword,
+        },
+      });
+      if (user) {
+        const token = await loginAs(user, hashedPassword);
+
+        callback(token);
+      } else {
+        callback({ error: "Invalid username or password" });
+      }
+    });
+
+    socket.on("loginAsDemo", async (callback) => {
+      const demoUser = await prismaDm.user.findFirst({
+        where: { username: "demo" },
+      });
+      if (!demoUser) {
+        callback({ error: "No demo user found" });
+      } else {
+        const token = await loginAs(
+          demoUser,
+          getHashedPassword(demoUser!.password),
+        );
+
+        callback({ token });
+      }
+    });
   });
 };
diff --git a/packages/api/services/auth/types.ts b/packages/api/services/auth/types.ts
index 63f80ff61..1b6754141 100644
--- a/packages/api/services/auth/types.ts
+++ b/packages/api/services/auth/types.ts
@@ -25,4 +25,27 @@ export default abstract class {
       >,
     ) => void,
   ) => void;
+
+
+  abstract login: (
+    data: { username: string; password: string },
+    callback: (data: Errorable<string, "Invalid username or password">) => void,
+  ) => void;
+  abstract getCsrf: (callback: (value: string) => void) => void;
+
+  abstract loginAsDemo: (
+    callback: (
+      data: Errorable<{ token: string }, "No demo user found">,
+    ) => void,
+  ) => void;
+
+
+  abstract signup: (
+    data: {
+      username: string;
+      password: string;
+      email: string;
+    },
+    callback: (data: Errorable<string, "Bad request">) => void,
+  ) => void;
 }
diff --git a/packages/api/services/collection/issues/index.ts b/packages/api/services/collection/issues/index.ts
index f0341eb75..b26a817f7 100644
--- a/packages/api/services/collection/issues/index.ts
+++ b/packages/api/services/collection/issues/index.ts
@@ -224,7 +224,7 @@ export default (socket: Socket<Events>) => {
           where ID_Utilisateur = ${socket.data.user!.id}
             and estimationmin is not null
           group by numeros.ID;
-        `.then(getShownQuotations).then(quotations => callback({quotations}))
+        `.then(getShownQuotations).then(quotations => callback({ quotations }))
   );
 };
 
@@ -272,6 +272,9 @@ const addOrChangeIssues = async (
     .map((issuecode) =>
       prismaDm.issue.create({
         data: {
+          country: '',
+          magazine: '',
+          issuenumber: '',
           issuecode,
           condition: condition || issue_condition.indefini,
           isOnSale: isOnSale || false,
@@ -318,6 +321,9 @@ const addOrChangeCopies = async (
     return prismaDm.issue.upsert({
       create: {
         ...common,
+        country: '',
+        magazine: '',
+        issuenumber: '',
         issuecode,
         userId,
         creationDate: new Date(),
@@ -382,6 +388,9 @@ export const resetDemo = async () => {
       return prismaDm.issue.create({
         data: {
           userId: demoUser.id,
+          country: '',
+          magazine: '',
+          issuenumber: '',
           issuecode,
           condition,
           purchaseId: parseInt(purchaseId),
diff --git a/packages/api/services/collection/types.ts b/packages/api/services/collection/types.ts
index 25e850aef..09607f630 100644
--- a/packages/api/services/collection/types.ts
+++ b/packages/api/services/collection/types.ts
@@ -158,14 +158,6 @@ export default abstract class {
       >,
     ) => void,
   ) => void;
-  abstract createUser: (
-    data: {
-      username: string;
-      password: string;
-      email: string;
-    } & Record<string, unknown>,
-    callback: (data: Errorable<{ token: string }, "Bad request">) => void,
-  ) => void;
 
   abstract getWatchedAuthors: (
     callback: (value: AuthorWithUserRating[]) => void,
@@ -186,7 +178,7 @@ export default abstract class {
   abstract getCollectionQuotations: (
     callback: (
       value: Errorable<
-        { quotations: Record<string, InducksIssueQuotationSimple & {estimationAverage: number}> },
+        { quotations: Record<string, InducksIssueQuotationSimple & { estimationAverage: number }> },
         "Bad request"
       >,
     ) => void,
diff --git a/packages/api/services/collection/user/index.ts b/packages/api/services/collection/user/index.ts
index 734155269..e6db01831 100644
--- a/packages/api/services/collection/user/index.ts
+++ b/packages/api/services/collection/user/index.ts
@@ -2,22 +2,19 @@ import type { Socket } from "socket.io";
 
 import PresentationSentenceRequested from "~emails/presentation-sentence-requested";
 import { prismaClient as prismaDm } from "~prisma-schemas/schemas/dm/client";
-import { generateAccessToken, getHashedPassword } from "~services/auth/util";
+import { getHashedPassword } from "~services/auth/util";
 
 import type Events from "../types";
 import type { Validation } from "./util";
 import {
   DiscordIdValidation,
-  EmailCreationValidation,
   EmailUpdateValidation,
   EmailValidation,
   getUser,
   OldPasswordValidation,
-  PasswordsValidation,
+  PasswordValidation,
   PasswordUpdateValidation,
   PresentationTextValidation,
-  UsernameCreationValidation,
-  UsernameValidation,
   validate,
 } from "./util";
 
@@ -60,7 +57,7 @@ export default (socket: Socket<Events>) => {
     if (input.password) {
       validators = [
         ...validators,
-        new PasswordsValidation(),
+        new PasswordValidation(),
         new PasswordUpdateValidation(),
         new OldPasswordValidation(),
       ];
@@ -109,44 +106,4 @@ export default (socket: Socket<Events>) => {
       });
     }
   });
-
-  socket.on("createUser", async (input, callback) => {
-    const scopedError = await validate(input, [
-      new UsernameValidation(),
-      new UsernameCreationValidation(),
-      new EmailValidation(),
-      new EmailCreationValidation(),
-      new PasswordsValidation(),
-    ]);
-    if (scopedError) {
-      callback({ error: "Bad request", ...scopedError });
-    } else {
-      const { username, password, email } = input;
-      const hashedPassword = getHashedPassword(password);
-      const user = await prismaDm.user.create({
-        data: {
-          username,
-          password: hashedPassword,
-          email,
-          signupDate: new Date(),
-        },
-      });
-
-      const privileges = (
-        await prismaDm.userPermission.findMany({
-          where: {
-            username,
-          },
-        })
-      ).groupBy("role", "privilege");
-      const token = generateAccessToken({
-        id: user.id,
-        username,
-        hashedPassword,
-        privileges,
-      });
-
-      callback({ token });
-    }
-  });
 };
diff --git a/packages/api/services/collection/user/util.ts b/packages/api/services/collection/user/util.ts
index 4e4c34a57..528e9e7b8 100644
--- a/packages/api/services/collection/user/util.ts
+++ b/packages/api/services/collection/user/util.ts
@@ -54,14 +54,14 @@ export class UsernameCreationValidation extends Validation {
       .findFirstOrThrow({
         where: { username },
       })
-      .then(() => undefined)
-      .catch(
+      .then(
         () =>
           ({
             message: "Ce nom d'utilisateur est déjà pris",
             selector: "#username",
           }) as const,
-      );
+      )
+      .catch(() => undefined);
 }
 
 export class EmailCreationValidation extends Validation {
@@ -93,10 +93,10 @@ export class EmailUpdateValidation extends Validation {
         currentEmail === email
           ? true
           : (await prismaDm.user.count({
-              where: {
-                email,
-              },
-            })) === 0,
+            where: {
+              email,
+            },
+          })) === 0,
       )
       .then(() => undefined)
       .catch(
@@ -119,26 +119,18 @@ export class EmailValidation extends Validation {
   };
 }
 
-export class PasswordsValidation extends Validation {
+export class PasswordValidation extends Validation {
   run = async ({
     password,
-    password2,
   }: {
     password: user["password"];
-    password2: user["password"];
   }) =>
     password.length < 6
       ? ({
-          message: "Le mot de passe doit comporter au moins 6 caractères",
-          selector: "#password",
-        } as const)
-      : password !== password2
-        ? ({
-            message:
-              "Le mot de passe et sa confirmation doivent être identiques",
-            selector: "#password",
-          } as const)
-        : undefined;
+        message: "Le mot de passe doit comporter au moins 6 caractères",
+        selector: "#password",
+      } as const)
+      : undefined;
 }
 
 export class PasswordUpdateValidation extends Validation {
@@ -151,10 +143,10 @@ export class PasswordUpdateValidation extends Validation {
   }) =>
     !oldPassword || !password
       ? ({
-          selector: "#password",
-          message:
-            "L'ancien et le nouveau mot de passe doivent être remplis si vous souhaitez changer de mot de passe. Si vous ne souhaitez pas changer de mot de passe, laissez les champs correspondant à l'ancien et au nouveau mots de passe vides.",
-        } as const)
+        selector: "#password",
+        message:
+          "L'ancien et le nouveau mot de passe doivent être remplis si vous souhaitez changer de mot de passe. Si vous ne souhaitez pas changer de mot de passe, laissez les champs correspondant à l'ancien et au nouveau mots de passe vides.",
+      } as const)
       : undefined;
 }
 
@@ -187,10 +179,10 @@ export class PresentationTextValidation extends Validation {
   run = async ({ presentationText }: Pick<user, "presentationText">) =>
     String(presentationText).length > 100
       ? ({
-          message:
-            "Le texte de présentation doit comporter entre 1 et 100 caractères",
-          selector: "#presentationText",
-        } as const)
+        message:
+          "Le texte de présentation doit comporter entre 1 et 100 caractères",
+        selector: "#presentationText",
+      } as const)
       : undefined;
 }
 
@@ -198,9 +190,9 @@ export class DiscordIdValidation extends Validation {
   run = async ({ discordId }: Pick<user, "discordId">) =>
     discordId && !/^\d+$/.test(String(discordId))
       ? ({
-          message:
-            "L'identifiant Discord doit être un nombre. Cliquez sur \"Comment trouver mon identifiant de profil Discord ?\" pour plus d'informations.",
-          selector: "#discordId",
-        } as const)
+        message:
+          "L'identifiant Discord doit être un nombre. Cliquez sur \"Comment trouver mon identifiant de profil Discord ?\" pour plus d'informations.",
+        selector: "#discordId",
+      } as const)
       : undefined;
 }
diff --git a/packages/api/services/login/index.ts b/packages/api/services/login/index.ts
deleted file mode 100644
index c6d5e6736..000000000
--- a/packages/api/services/login/index.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import type { Namespace, Server } from "socket.io";
-
-import { prismaClient as prismaDm } from "~prisma-schemas/schemas/dm/client";
-
-import { getHashedPassword, loginAs } from "../auth/util";
-import type Events from "./types";
-import { namespaceEndpoint } from "./types";
-
-export default (io: Server) => {
-  (io.of(namespaceEndpoint) as Namespace<Events>).on("connection", (socket) => {
-    console.log("connected to login");
-
-    socket.on("getCsrf", (callback) => callback(""));
-    socket.on("login", async ({ username, password }, callback) => {
-      console.log("login");
-      const hashedPassword = getHashedPassword(password);
-      const user = await prismaDm.user.findFirst({
-        where: {
-          username,
-          password: hashedPassword,
-        },
-      });
-      if (user) {
-        const token = await loginAs(user, hashedPassword);
-
-        callback(token);
-      } else {
-        callback({ error: "Invalid username or password" });
-      }
-    });
-
-    socket.on("loginAsDemo", async (callback) => {
-      const demoUser = await prismaDm.user.findFirst({
-        where: { username: "demo" },
-      });
-      if (!demoUser) {
-        callback({ error: "No demo user found" });
-      } else {
-        const token = await loginAs(
-          demoUser,
-          getHashedPassword(demoUser!.password),
-        );
-
-        callback({ token });
-      }
-    });
-  });
-};
diff --git a/packages/api/services/login/types.ts b/packages/api/services/login/types.ts
deleted file mode 100644
index 102a6b6e8..000000000
--- a/packages/api/services/login/types.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { Errorable } from "~socket.io-services/types";
-
-export const namespaceEndpoint = "/login";
-export default abstract class {
-  static namespaceEndpoint = namespaceEndpoint;
-  abstract login: (
-    data: { username: string; password: string },
-    callback: (data: Errorable<string, "Invalid username or password">) => void,
-  ) => void;
-  abstract getCsrf: (callback: (value: string) => void) => void;
-
-  abstract loginAsDemo: (
-    callback: (
-      data: Errorable<{ token: string }, "No demo user found">,
-    ) => void,
-  ) => void;
-}
diff --git a/packages/prisma-schemas/schemas/dm/extended/index.ts b/packages/prisma-schemas/schemas/dm/extended/index.ts
index 707fba7e5..a73834adb 100644
--- a/packages/prisma-schemas/schemas/dm/extended/index.ts
+++ b/packages/prisma-schemas/schemas/dm/extended/index.ts
@@ -3,6 +3,32 @@ import { computeTimestamp } from "./edge.timestamp";
 
 export default (prismaClient: PrismaClient) =>
   prismaClient.$extends({
+    query: {
+      issue: {
+        create({ args, query }) {
+          if (!args.data.country) {
+            const [publicationcode, issuenumber] =
+              args.data.issuecode!.split(/[ ]+/);
+            const [country, magazine] = publicationcode.split("/");
+            args.data.country = country;
+            args.data.magazine = magazine;
+            args.data.issuenumber = issuenumber;
+          }
+          return query(args);
+        },
+        upsert({ args, query }) {
+          if (!args.create.country) {
+            const [publicationcode, issuenumber] =
+              args.create.issuecode!.split(/[ ]+/);
+            const [country, magazine] = publicationcode.split("/");
+            args.create.country = country;
+            args.create.magazine = magazine;
+            args.create.issuenumber = issuenumber;
+          }
+          return query(args);
+        },
+      },
+    },
     result: {
       edge: computeTimestamp,
     },
diff --git a/packages/prisma-schemas/schemas/dm/schema.prisma b/packages/prisma-schemas/schemas/dm/schema.prisma
index fa3ecb07c..3fa089bd0 100644
--- a/packages/prisma-schemas/schemas/dm/schema.prisma
+++ b/packages/prisma-schemas/schemas/dm/schema.prisma
@@ -126,12 +126,12 @@ model magazines {
 model issue {
   id              Int             @id @default(autoincrement()) @map("ID")
   /// @deprecated
-  country         String          @map("Pays") @ignore @db.VarChar(3)
+  country         String          @map("Pays") @db.VarChar(3)
   /// @deprecated
-  magazine        String          @map("Magazine") @ignore @db.VarChar(10)
+  magazine        String          @map("Magazine") @db.VarChar(10)
   publicationcode String          @default(dbgenerated("(concat(convert(`Pays` using utf8mb3),'/',convert(`Magazine` using utf8mb3)))")) @db.VarChar(14)
   /// @deprecated
-  issuenumber     String          @map("Numero") @ignore @db.VarChar(12)
+  issuenumber     String          @map("Numero") @db.VarChar(12)
   /// @deprecated
   Numero_nospace  String?         @ignore @db.VarChar(12)
   condition       issue_condition @default(indefini) @map("Etat")
diff --git a/packages/socket.io-client-services/index.ts b/packages/socket.io-client-services/index.ts
index 7b6cde56f..65c7d3487 100644
--- a/packages/socket.io-client-services/index.ts
+++ b/packages/socket.io-client-services/index.ts
@@ -45,7 +45,7 @@ export type EventCalls<S extends EventsMap> = {
 };
 
 export class SocketClient {
-  constructor(private socketRootUrl: string) {}
+  constructor(private socketRootUrl: string) { }
 
   public cacheHydrator = {
     state: ref<null | {
@@ -74,7 +74,7 @@ export class SocketClient {
     },
   };
 
-  public onConnectError = (e: Error, namespace: string, _eventName?:string) => {
+  public onConnectError = (e: Error, namespace: string, _eventName?: string) => {
     console.error(`${namespace}: connect_error: ${e}`);
   };
   public onConnected = (namespace: string) => {
@@ -137,110 +137,111 @@ export class SocketClient {
             _: never,
             event: EventName
           ) =>
-          async (
-            ...args: AllButLast<Parameters<Services[EventName]>>
-          ): Promise<
-            EventReturnTypeIncludingError<Services[EventName]> | undefined
-          > => {
-            let isCacheUsed = false;
-            if (!socket) {
-              console.log(
-                `connecting to ${namespaceName} at ${new Date().toISOString()}`
-              );
-              connect();
-            }
-            const startTime = Date.now();
-            const eventConsoleString = `${namespaceName}/${event}(${JSON.stringify(args)})`;
-            const debugCall = async (post: boolean = false) => {
-              const token = await session?.getToken();
-              if (event !== "toJSON") {
-                console.debug(
-                  `${eventConsoleString} ${post ? `responded in ${Date.now() - startTime}ms` : `called ${token ? "with token" : "without token"}`} at ${new Date().toISOString()}`
+            async (
+              ...args: AllButLast<Parameters<Services[EventName]>>
+            ): Promise<
+              EventReturnTypeIncludingError<Services[EventName]> | undefined
+            > => {
+              let isCacheUsed = false;
+              if (!socket) {
+                console.log(
+                  `connecting to ${namespaceName} at ${new Date().toISOString()}`
                 );
+                connect();
               }
-            };
-            let cacheKey;
-            if (cache) {
-              cacheKey = `${namespaceName}/${event} ${JSON.stringify(args)}`;
-              const cacheData = await cache.storage.get(cacheKey, {
-                cache: {
-                  ttl:
-                    isOffline ||
-                    this.cacheHydrator.state.value?.mode === "LOAD_CACHE"
-                      ? undefined
-                      : typeof cache.ttl === "function"
-                        ? cache.ttl(event, args)
-                        : cache.ttl,
-                },
-              });
-              isCacheUsed =
-                cacheData !== undefined &&
-                !(typeof cacheData === "object" && cacheData.state === "empty");
-              if (isCacheUsed) {
-                console.debug(`${eventConsoleString} served from cache`);
-                if (this.cacheHydrator.state.value) {
-                  switch (this.cacheHydrator.state.value.mode) {
-                    case "LOAD_CACHE":
-                      this.cacheHydrator.state.value.cachedCallsDone.push(
-                        eventConsoleString
-                      );
-                      break;
-                    case "HYDRATE":
-                      if (
-                        this.cacheHydrator.state.value.cachedCallsDone.includes(
+              const startTime = Date.now();
+              const eventConsoleString = `${namespaceName}/${event}(${JSON.stringify(args)})`;
+              const debugCall = async (post: boolean = false) => {
+                const token = await session?.getToken();
+                if (event !== "toJSON") {
+                  console.debug(
+                    `${eventConsoleString} ${post ? `responded in ${Date.now() - startTime}ms` : `called ${token ? "with token" : "without token"}`} at ${new Date().toISOString()}`
+                  );
+                }
+              };
+              let cacheKey;
+              if (cache) {
+                debugger
+                cacheKey = `${namespaceName}/${event} ${JSON.stringify(args)}`;
+                const cacheData = await cache.storage.get(cacheKey, {
+                  cache: {
+                    ttl:
+                      isOffline ||
+                        this.cacheHydrator.state.value?.mode === "LOAD_CACHE"
+                        ? undefined
+                        : typeof cache.ttl === "function"
+                          ? cache.ttl(event, args)
+                          : cache.ttl,
+                  },
+                });
+                isCacheUsed =
+                  cacheData !== undefined &&
+                  !(typeof cacheData === "object" && cacheData.state === "empty");
+                if (isCacheUsed) {
+                  console.debug(`${eventConsoleString} served from cache`);
+                  if (this.cacheHydrator.state.value) {
+                    switch (this.cacheHydrator.state.value.mode) {
+                      case "LOAD_CACHE":
+                        this.cacheHydrator.state.value.cachedCallsDone.push(
                           eventConsoleString
-                        )
-                      ) {
-                        this.cacheHydrator.state.value.hydratedCallsDoneAmount++;
-                        console.log("this.cacheHydrator.state.value.hydratedCallsDoneAmount", this.cacheHydrator.state.value.hydratedCallsDoneAmount)
-                      }
-                      break;
+                        );
+                        break;
+                      case "HYDRATE":
+                        if (
+                          this.cacheHydrator.state.value.cachedCallsDone.includes(
+                            eventConsoleString
+                          )
+                        ) {
+                          this.cacheHydrator.state.value.hydratedCallsDoneAmount++;
+                          console.log("this.cacheHydrator.state.value.hydratedCallsDoneAmount", this.cacheHydrator.state.value.hydratedCallsDoneAmount)
+                        }
+                        break;
+                    }
                   }
+                  return (
+                    cacheData as unknown as {
+                      value: Awaited<ReturnType<Socket["emitWithAck"]>>;
+                    }
+                  ).value;
                 }
-                return (
-                  cacheData as unknown as {
-                    value: Awaited<ReturnType<Socket["emitWithAck"]>>;
-                  }
-                ).value;
               }
-            }
 
-            socket!.on("connect_error", (e) => {
-              isOffline = true;
+              socket!.on("connect_error", (e) => {
+                isOffline = true;
 
-              this.onConnectError(
-                e.message === "websocket error"
-                  ? {
+                this.onConnectError(
+                  e.message === "websocket error"
+                    ? {
                       message: "offline_no_cache",
                       name: "offline_no_cache",
                     }
-                  : e,
-                namespaceName,
-                event
-              );
-            });
-
-            await debugCall();
-            const data = await socket!.emitWithAck(event, ...args);
-            await debugCall(true);
-            if (cache && cacheKey) {
-              cache.storage.set(cacheKey, data, {
-                timeout:
-                  typeof cache.ttl === "function"
-                    ? cache.ttl(event, args)
-                    : cache.ttl,
+                    : e,
+                  namespaceName,
+                  event
+                );
               });
-            }
-            if (
-              this.cacheHydrator.state.value?.mode === "HYDRATE" &&
-              this.cacheHydrator.state.value.cachedCallsDone.includes(
-                eventConsoleString
-              )
-            ) {
-              this.cacheHydrator.state.value.hydratedCallsDoneAmount++;
-            }
-            return data;
-          },
+
+              await debugCall();
+              const data = await socket!.emitWithAck(event, ...args);
+              await debugCall(true);
+              if (cache && cacheKey) {
+                cache.storage.set(cacheKey, data, {
+                  timeout:
+                    typeof cache.ttl === "function"
+                      ? cache.ttl(event, args)
+                      : cache.ttl,
+                });
+              }
+              if (
+                this.cacheHydrator.state.value?.mode === "HYDRATE" &&
+                this.cacheHydrator.state.value.cachedCallsDone.includes(
+                  eventConsoleString
+                )
+              ) {
+                this.cacheHydrator.state.value.hydratedCallsDoneAmount++;
+              }
+              return data;
+            },
       }),
     };
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 747a924f1..fe8c06787 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1000,6 +1000,9 @@ importers:
       eslint-plugin-i18next:
         specifier: ^6.1.0
         version: 6.1.0
+      eslint-plugin-import:
+        specifier: ^2.31.0
+        version: 2.31.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.12.0(jiti@1.21.6))
       eslint-plugin-prettier-vue:
         specifier: ^5.0.0
         version: 5.0.0
@@ -2621,6 +2624,9 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@rtsao/scc@1.1.0':
+    resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
+
   '@rushstack/eslint-patch@1.10.4':
     resolution: {integrity: sha512-WJgX9nzTqknM393q1QJDJmoW28kUfEnybeTfVNcNAPnIx210RXm2DiXiHzfNPJNIUUb1tJnz/l4QGtJ30PgWmA==}
 
@@ -2881,6 +2887,9 @@ packages:
   '@types/json-schema@7.0.15':
     resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
 
+  '@types/json5@0.0.29':
+    resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
+
   '@types/jsonwebtoken@9.0.7':
     resolution: {integrity: sha512-ugo316mmTYBl2g81zDFnZ7cfxlut3o+/EQdaP7J8QN2kY6lJ22hmQYCK5EHcJHbrW+dkCGSCPgbG8JtYj6qSrg==}
 
@@ -3552,6 +3561,10 @@ packages:
   array-ify@1.0.0:
     resolution: {integrity: sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==}
 
+  array-includes@3.1.8:
+    resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==}
+    engines: {node: '>= 0.4'}
+
   array-parallel@0.1.3:
     resolution: {integrity: sha512-TDPTwSWW5E4oiFiKmz6RGJ/a80Y91GuLgUYuLd49+XBS75tYo8PNgaT2K/OxuQYqkoI852MDGBorg9OcUSTQ8w==}
 
@@ -3562,6 +3575,18 @@ packages:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
 
+  array.prototype.findlastindex@1.2.5:
+    resolution: {integrity: sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flat@1.3.2:
+    resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flatmap@1.3.2:
+    resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
+    engines: {node: '>= 0.4'}
+
   arraybuffer.prototype.slice@1.0.3:
     resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
     engines: {node: '>= 0.4'}
@@ -4312,6 +4337,10 @@ packages:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
     engines: {node: '>=8'}
 
+  doctrine@2.1.0:
+    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
+    engines: {node: '>=0.10.0'}
+
   doctrine@3.0.0:
     resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
     engines: {node: '>=6.0.0'}
@@ -4483,6 +4512,9 @@ packages:
     resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
     engines: {node: '>= 0.4'}
 
+  es-shim-unscopables@1.0.2:
+    resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
+
   es-to-primitive@1.2.1:
     resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
     engines: {node: '>= 0.4'}
@@ -4564,6 +4596,27 @@ packages:
     peerDependencies:
       eslint: '*'
 
+  eslint-module-utils@2.12.0:
+    resolution: {integrity: sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+
   eslint-plugin-antfu@2.7.0:
     resolution: {integrity: sha512-gZM3jq3ouqaoHmUNszb1Zo2Ux7RckSvkGksjLWz9ipBYGSv1EwwBETN6AdiUXn+RpVHXTbEMPAPlXJazcA6+iA==}
     peerDependencies:
@@ -4590,6 +4643,16 @@ packages:
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
 
+  eslint-plugin-import@2.31.0:
+    resolution: {integrity: sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+
   eslint-plugin-jsdoc@50.3.1:
     resolution: {integrity: sha512-SY9oUuTMr6aWoJggUS40LtMjsRzJPB5ZT7F432xZIHK3EfHF+8i48GbUBpwanrtlL9l1gILNTHK9o8gEhYLcKA==}
     engines: {node: '>=18'}
@@ -5542,6 +5605,10 @@ packages:
   json-stringify-safe@5.0.1:
     resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
 
+  json5@1.0.2:
+    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
+    hasBin: true
+
   json5@2.2.3:
     resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
     engines: {node: '>=6'}
@@ -6203,6 +6270,18 @@ packages:
     resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
     engines: {node: '>= 0.4'}
 
+  object.fromentries@2.0.8:
+    resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==}
+    engines: {node: '>= 0.4'}
+
+  object.groupby@1.0.3:
+    resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==}
+    engines: {node: '>= 0.4'}
+
+  object.values@1.2.0:
+    resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==}
+    engines: {node: '>= 0.4'}
+
   on-finished@2.3.0:
     resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==}
     engines: {node: '>= 0.8'}
@@ -7326,6 +7405,9 @@ packages:
     resolution: {integrity: sha512-Ibv4KAWfFkFdKJxnWfVtdOmB0Zi1RJVxcbPGiCDsFpCQSsmpWyuzHG3rQyI5YkobWwxFPEyQfu1hdo4qLG2zPw==}
     hasBin: true
 
+  tsconfig-paths@3.15.0:
+    resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
+
   tsconfig-paths@4.2.0:
     resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==}
     engines: {node: '>=6'}
@@ -9594,6 +9676,8 @@ snapshots:
   '@rollup/rollup-win32-x64-msvc@4.24.0':
     optional: true
 
+  '@rtsao/scc@1.1.0': {}
+
   '@rushstack/eslint-patch@1.10.4': {}
 
   '@sentry-internal/feedback@7.119.0':
@@ -9962,6 +10046,8 @@ snapshots:
 
   '@types/json-schema@7.0.15': {}
 
+  '@types/json5@0.0.29': {}
+
   '@types/jsonwebtoken@9.0.7':
     dependencies:
       '@types/node': 20.12.14
@@ -10816,12 +10902,44 @@ snapshots:
 
   array-ify@1.0.0: {}
 
+  array-includes@3.1.8:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-object-atoms: 1.0.0
+      get-intrinsic: 1.2.4
+      is-string: 1.0.7
+
   array-parallel@0.1.3: {}
 
   array-series@0.1.5: {}
 
   array-union@2.1.0: {}
 
+  array.prototype.findlastindex@1.2.5:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-errors: 1.3.0
+      es-object-atoms: 1.0.0
+      es-shim-unscopables: 1.0.2
+
+  array.prototype.flat@1.3.2:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-shim-unscopables: 1.0.2
+
+  array.prototype.flatmap@1.3.2:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-shim-unscopables: 1.0.2
+
   arraybuffer.prototype.slice@1.0.3:
     dependencies:
       array-buffer-byte-length: 1.0.1
@@ -11661,6 +11779,10 @@ snapshots:
     dependencies:
       path-type: 4.0.0
 
+  doctrine@2.1.0:
+    dependencies:
+      esutils: 2.0.3
+
   doctrine@3.0.0:
     dependencies:
       esutils: 2.0.3
@@ -11902,6 +12024,10 @@ snapshots:
       has-tostringtag: 1.0.2
       hasown: 2.0.2
 
+  es-shim-unscopables@1.0.2:
+    dependencies:
+      hasown: 2.0.2
+
   es-to-primitive@1.2.1:
     dependencies:
       is-callable: 1.2.7
@@ -12023,6 +12149,16 @@ snapshots:
     dependencies:
       eslint: 9.12.0(jiti@1.21.6)
 
+  eslint-module-utils@2.12.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint@9.12.0(jiti@1.21.6)):
+    dependencies:
+      debug: 3.2.7(supports-color@5.5.0)
+    optionalDependencies:
+      '@typescript-eslint/parser': 8.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2)
+      eslint: 9.12.0(jiti@1.21.6)
+      eslint-import-resolver-node: 0.3.9
+    transitivePeerDependencies:
+      - supports-color
+
   eslint-plugin-antfu@2.7.0(eslint@9.12.0(jiti@1.21.6)):
     dependencies:
       '@antfu/utils': 0.7.10
@@ -12062,6 +12198,35 @@ snapshots:
       - supports-color
       - typescript
 
+  eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.12.0(jiti@1.21.6)):
+    dependencies:
+      '@rtsao/scc': 1.1.0
+      array-includes: 3.1.8
+      array.prototype.findlastindex: 1.2.5
+      array.prototype.flat: 1.3.2
+      array.prototype.flatmap: 1.3.2
+      debug: 3.2.7(supports-color@5.5.0)
+      doctrine: 2.1.0
+      eslint: 9.12.0(jiti@1.21.6)
+      eslint-import-resolver-node: 0.3.9
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint@9.12.0(jiti@1.21.6))
+      hasown: 2.0.2
+      is-core-module: 2.15.1
+      is-glob: 4.0.3
+      minimatch: 3.1.2
+      object.fromentries: 2.0.8
+      object.groupby: 1.0.3
+      object.values: 1.2.0
+      semver: 6.3.1
+      string.prototype.trimend: 1.0.8
+      tsconfig-paths: 3.15.0
+    optionalDependencies:
+      '@typescript-eslint/parser': 8.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2)
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+
   eslint-plugin-jsdoc@50.3.1(eslint@9.12.0(jiti@1.21.6)):
     dependencies:
       '@es-joy/jsdoccomment': 0.48.0
@@ -13288,6 +13453,10 @@ snapshots:
 
   json-stringify-safe@5.0.1: {}
 
+  json5@1.0.2:
+    dependencies:
+      minimist: 1.2.8
+
   json5@2.2.3: {}
 
   jsonc-eslint-parser@2.4.0:
@@ -14165,6 +14334,25 @@ snapshots:
       has-symbols: 1.0.3
       object-keys: 1.1.1
 
+  object.fromentries@2.0.8:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-object-atoms: 1.0.0
+
+  object.groupby@1.0.3:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+
+  object.values@1.2.0:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-object-atoms: 1.0.0
+
   on-finished@2.3.0:
     dependencies:
       ee-first: 1.1.1
@@ -15378,6 +15566,13 @@ snapshots:
       normalize-path: 3.0.0
       plimit-lit: 1.6.1
 
+  tsconfig-paths@3.15.0:
+    dependencies:
+      '@types/json5': 0.0.29
+      json5: 1.0.2
+      minimist: 1.2.8
+      strip-bom: 3.0.0
+
   tsconfig-paths@4.2.0:
     dependencies:
       json5: 2.2.3