From e455c5f9f1a8a7313a781a590992d00a80a69b7f Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Tue, 21 Jul 2026 15:18:35 +0200
Subject: [PATCH 01/20] save wip [skip ci]

---
 app/stores/back.js                    | 7 +++++++
 app/stores/viewer.js                  | 5 +++++
 nuxt.config.js                        | 9 ++++++---
 server/utils/microservice-registry.js | 6 ++++++
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 server/utils/microservice-registry.js

diff --git a/app/stores/back.js b/app/stores/back.js
index 486adb6db..369d5a98a 100644
--- a/app/stores/back.js
+++ b/app/stores/back.js
@@ -7,6 +7,8 @@ import { useAppStore } from "@ogw_front/stores/app";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
 import { useInfraStore } from "@ogw_front/stores/infra";
 
+import { setBackPort } from "../../server/utils/microservice-registry"
+
 const MILLISECONDS_IN_SECOND = 1000;
 const DEFAULT_PING_INTERVAL_SECONDS = 10;
 
@@ -100,6 +102,11 @@ export const useBackStore = defineStore("back", {
           response_function: (response) => {
             console.log(`[GEODE] Back launched on port ${response.port}`);
             this.default_local_port = response.port;
+            useRuntimeConfig().PORT_BACK = response.port;
+            setBackPort(response.port);
+            console.log(`[GEODE] Updated PORT_BACK to ${useRuntimeConfig().public.PORT_BACK}`);
+            console.log(`[GEODE] Updated PORT_BACK to ${useRuntimeConfig()}`);
+
           },
         },
       );
diff --git a/app/stores/viewer.js b/app/stores/viewer.js
index e034a4daa..55fd784d9 100644
--- a/app/stores/viewer.js
+++ b/app/stores/viewer.js
@@ -14,6 +14,9 @@ import { useAppStore } from "@ogw_front/stores/app";
 import { useInfraStore } from "@ogw_front/stores/infra";
 import { viewer_call } from "@ogw_internal/utils/viewer_call";
 
+import { setViewerPort } from "../../server/utils/microservice-registry"
+
+
 const MS_PER_SECOND = 1000;
 const SECONDS_PER_REQUEST = 10;
 const request_timeout = MS_PER_SECOND * SECONDS_PER_REQUEST;
@@ -150,6 +153,8 @@ export const useViewerStore = defineStore(
           response_function: (response) => {
             console.log(`[VIEWER] Viewer launched on port ${response.port}`);
             default_local_port.value = response.port;
+            useRuntimeConfig().PORT_VIEWER = response.port;
+            setViewerPort(response.port);
           },
         },
       );
diff --git a/nuxt.config.js b/nuxt.config.js
index d3aad622e..e3de848af 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -3,6 +3,7 @@ import path from "node:path";
 
 // Local imports
 import package_json from "./package.json";
+import { getBackPort, getViewerPort } from "./server/utils/microservice-registry.js";
 
 const __dirname = import.meta.dirname;
 
@@ -11,6 +12,8 @@ export default defineNuxtConfig({
     public: {
       COMMAND_BACK: "opengeodeweb-back",
       COMMAND_VIEWER: "opengeodeweb-viewer",
+      PORT_BACK: undefined,
+      PORT_VIEWER: undefined,
       NUXT_ROOT_PATH: __dirname,
       MODE: process.env.MODE || "CLOUD",
       PROJECT: package_json.name,
@@ -18,9 +21,9 @@ export default defineNuxtConfig({
   },
 
   modules: [["@pinia/nuxt", { autoImports: ["defineStore", "storeToRefs"] }], "@vueuse/nuxt"],
-  imports: {
-    scan: false,
-  },
+  // imports: {
+  //   scan: false,
+  // },
 
   alias: {
     "@ogw_front": path.resolve(__dirname, "app"),
diff --git a/server/utils/microservice-registry.js b/server/utils/microservice-registry.js
new file mode 100644
index 000000000..3676946b2
--- /dev/null
+++ b/server/utils/microservice-registry.js
@@ -0,0 +1,6 @@
+let backPort = undefined;
+let viewerPort = undefined;
+export const setBackPort = (port) => { backPort = port }
+export const getBackPort = () => backPort
+export const setViewerPort = (port) => { viewerPort = port }
+export const getViewerPort = () => viewerPort
\ No newline at end of file

From 231249209dbbbbe45ddc44cd6f004808cd52f1ce Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Wed, 22 Jul 2026 17:21:50 +0200
Subject: [PATCH 02/20] [skip ci}

---
 nuxt.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nuxt.config.js b/nuxt.config.js
index e3de848af..5e3136afe 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -12,8 +12,8 @@ export default defineNuxtConfig({
     public: {
       COMMAND_BACK: "opengeodeweb-back",
       COMMAND_VIEWER: "opengeodeweb-viewer",
-      PORT_BACK: undefined,
-      PORT_VIEWER: undefined,
+      BACK_BASE_URL: undefined,
+      VIEWER_BASE_URL: undefined,
       NUXT_ROOT_PATH: __dirname,
       MODE: process.env.MODE || "CLOUD",
       PROJECT: package_json.name,

From e00fb6b27ebeb20b110d2e02dbd18be638d4b8d2 Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Mon, 27 Jul 2026 09:45:07 +0200
Subject: [PATCH 03/20] save wip [skip ci]

---
 app/components/FileSelector.vue | 23 +++++---------
 app/stores/app.js               | 17 ++++++++--
 app/stores/back.js              | 11 ++-----
 app/stores/viewer.js            |  5 ---
 app/utils/extension.js          |  2 +-
 app/utils/import_workflow.js    |  4 +--
 internal/utils/api_fetch.js     | 56 ++++++++++++---------------------
 internal/utils/upload_file.js   | 50 -----------------------------
 nuxt.config.js                  | 10 +++---
 shared/utils/fetch_raw.js       | 47 +++++++++++++++++++++++++++
 shared/utils/fetch_schema.js    | 35 +++++++++++++++++++++
 shared/utils/upload_file.js     | 48 ++++++++++++++++++++++++++++
 shared/utils/wrapper.js         | 22 +++++++++++++
 13 files changed, 203 insertions(+), 127 deletions(-)
 delete mode 100644 internal/utils/upload_file.js
 create mode 100644 shared/utils/fetch_raw.js
 create mode 100644 shared/utils/fetch_schema.js
 create mode 100644 shared/utils/upload_file.js
 create mode 100644 shared/utils/wrapper.js

diff --git a/app/components/FileSelector.vue b/app/components/FileSelector.vue
index ed2a26b04..9f98c884a 100644
--- a/app/components/FileSelector.vue
+++ b/app/components/FileSelector.vue
@@ -1,11 +1,7 @@
 <script setup>
-import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
-
 import FetchingData from "@ogw_front/components/FetchingData";
 import FileUploader from "@ogw_front/components/FileUploader";
-import { useBackStore } from "@ogw_front/stores/back";
-
-const schema = schemas.opengeodeweb_back.allowed_files;
+import { getAllowedFiles } from "@ogw_shared/utils/file";
 
 const emit = defineEmits(["update_values", "increment_step", "decrement_step"]);
 
@@ -35,7 +31,9 @@ watch(
   },
 );
 
-const toggle_loading = useToggle(loading);
+function toggleLoading() {
+  useToggle(loading);
+}
 
 function files_uploaded_event(value) {
   if (value.length > 0) {
@@ -44,16 +42,11 @@ function files_uploaded_event(value) {
   }
 }
 
-async function get_allowed_files() {
-  toggle_loading();
-  const backStore = useBackStore();
-  const response = await backStore.request({ schema });
-  accept.value = response.extensions.map((extension) => `.${extension}`).join(",");
-  toggle_loading();
-}
-
 // oxlint-disable-next-line no-top-level-await
-await get_allowed_files();
+await getAllowedFiles({
+  beforeFunction: () => toggleLoading(),
+  afterFunction: () => toggleLoading(),
+});
 </script>
 
 <template>
diff --git a/app/stores/app.js b/app/stores/app.js
index 5eb7cab3c..531892717 100644
--- a/app/stores/app.js
+++ b/app/stores/app.js
@@ -195,8 +195,17 @@ export const useAppStore = defineStore("app", () => {
     return getExtension(extensionId)?.enabled ?? false;
   }
 
-  function upload(file, callbacks = {}) {
+  function uploadExtension(file, callbacks = {}) {
     const route = "/api/extensions/upload";
+    const schema = {
+      $id: "/api/extensions/upload",
+      methods: ["POST"],
+      type: "object",
+      properties: { PROJECT: { type: "string" } },
+      required: ["PROJECT"],
+      additionalProperties: true,
+    };
+    const params = { PROJECT };
     const store = useAppStore();
     return upload_file(
       store,
@@ -219,7 +228,7 @@ export const useAppStore = defineStore("app", () => {
     const store = useAppStore();
     return api_fetch(
       store,
-      { schema, params, headers: {} },
+      { schema, params },
       {
         ...callbacks,
         response_function: async (response) => {
@@ -263,6 +272,8 @@ export const useAppStore = defineStore("app", () => {
     );
   }
 
+
+
   return {
     stores,
     registerStore,
@@ -280,7 +291,7 @@ export const useAppStore = defineStore("app", () => {
     setExtensionEnabled,
     getExtensionEnabled,
     request,
-    upload,
+    uploadExtension,
     projectFolderPath,
     createProjectFolder,
     start_request,
diff --git a/app/stores/back.js b/app/stores/back.js
index 369d5a98a..0bcd8ff2b 100644
--- a/app/stores/back.js
+++ b/app/stores/back.js
@@ -7,8 +7,6 @@ import { useAppStore } from "@ogw_front/stores/app";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
 import { useInfraStore } from "@ogw_front/stores/infra";
 
-import { setBackPort } from "../../server/utils/microservice-registry"
-
 const MILLISECONDS_IN_SECOND = 1000;
 const DEFAULT_PING_INTERVAL_SECONDS = 10;
 
@@ -102,11 +100,6 @@ export const useBackStore = defineStore("back", {
           response_function: (response) => {
             console.log(`[GEODE] Back launched on port ${response.port}`);
             this.default_local_port = response.port;
-            useRuntimeConfig().PORT_BACK = response.port;
-            setBackPort(response.port);
-            console.log(`[GEODE] Updated PORT_BACK to ${useRuntimeConfig().public.PORT_BACK}`);
-            console.log(`[GEODE] Updated PORT_BACK to ${useRuntimeConfig()}`);
-
           },
         },
       );
@@ -141,11 +134,11 @@ export const useBackStore = defineStore("back", {
       );
     },
     upload(file, callbacks = {}) {
-      const route = back_schemas.opengeodeweb_back.upload_file.$id;
+      const schema = back_schemas.opengeodeweb_back.upload_file;
       return upload_file(
         this,
         {
-          route,
+          schema,
           file,
         },
         {
diff --git a/app/stores/viewer.js b/app/stores/viewer.js
index 55fd784d9..e034a4daa 100644
--- a/app/stores/viewer.js
+++ b/app/stores/viewer.js
@@ -14,9 +14,6 @@ import { useAppStore } from "@ogw_front/stores/app";
 import { useInfraStore } from "@ogw_front/stores/infra";
 import { viewer_call } from "@ogw_internal/utils/viewer_call";
 
-import { setViewerPort } from "../../server/utils/microservice-registry"
-
-
 const MS_PER_SECOND = 1000;
 const SECONDS_PER_REQUEST = 10;
 const request_timeout = MS_PER_SECOND * SECONDS_PER_REQUEST;
@@ -153,8 +150,6 @@ export const useViewerStore = defineStore(
           response_function: (response) => {
             console.log(`[VIEWER] Viewer launched on port ${response.port}`);
             default_local_port.value = response.port;
-            useRuntimeConfig().PORT_VIEWER = response.port;
-            setViewerPort(response.port);
           },
         },
       );
diff --git a/app/utils/extension.js b/app/utils/extension.js
index 0fffb4db7..78aeaeb8a 100644
--- a/app/utils/extension.js
+++ b/app/utils/extension.js
@@ -71,7 +71,7 @@ async function unloadExtension(extensionId) {
 
 async function uploadExtension(file) {
   const appStore = useAppStore();
-  await appStore.upload(file);
+  await appStore.uploadExtension(file);
 }
 
 function runExtensions() {
diff --git a/app/utils/import_workflow.js b/app/utils/import_workflow.js
index 8631091ba..4fe352b7f 100644
--- a/app/utils/import_workflow.js
+++ b/app/utils/import_workflow.js
@@ -89,8 +89,8 @@ async function importFile(filename, geode_object_type) {
     filename,
   };
   const response = await backStore.request({ schema, params });
-  const item = buildImportItemFromPayloadApi(response, geode_object_type);
-  return importItem(item);
+  // const item = buildImportItemFromPayloadApi(response, geode_object_type);
+  return importItem(response);
 }
 
 async function importWorkflowFromSnapshot(items) {
diff --git a/internal/utils/api_fetch.js b/internal/utils/api_fetch.js
index bda3664d2..5cbe7ed78 100644
--- a/internal/utils/api_fetch.js
+++ b/internal/utils/api_fetch.js
@@ -1,4 +1,4 @@
-import _ from "lodash";
+import { fetchRaw } from "@ogw_shared/utils/fetch_raw";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
 import { validate_schema } from "@ogw_front/utils/validate_schema";
 
@@ -12,7 +12,6 @@ export function api_fetch(
   const feedbackStore = useFeedbackStore();
 
   const body = params || {};
-
   const { valid, error: schema_error } = validate_schema(schema, body);
 
   if (!valid) {
@@ -26,53 +25,38 @@ export function api_fetch(
   microservice.start_request();
 
   const method = schema.methods.find((methodItem) => methodItem !== "OPTIONS");
-  const request_options = {
-    method,
-    headers,
-  };
-  if (!_.isEmpty(body)) {
-    request_options.body = body;
-  }
 
-  if (schema.max_retry) {
-    request_options.max_retry = schema.max_retry;
-  }
-
-  function performFetch() {
-    return $fetch(schema.$id, {
+  return fetchRaw(
+    {
+      route: schema.$id,
+      method,
       baseURL: microservice.base_url,
-      ...request_options,
-      onRequestError({ error }) {
+      params: body,
+      headers,
+      max_retry: schema.max_retry,
+      timeout,
+    },
+    {
+      onRequestError(error) {
         microservice.stop_request();
         feedbackStore.add_error(error.code, schema.$id, error.message, error.stack);
         if (request_error_function) {
           request_error_function(error);
         }
       },
-      onResponse({ response }) {
-        if (response.ok) {
-          microservice.stop_request();
-          if (response_function) {
-            response_function(response._data);
-          }
+      onResponse(data) {
+        microservice.stop_request();
+        if (response_function) {
+          response_function(data);
         }
       },
-      onResponseError({ response }) {
+      onResponseError(response) {
         microservice.stop_request();
         feedbackStore.add_error(response.status, schema.$id, response.name, response.description);
         if (response_error_function) {
           response_error_function(response);
         }
       },
-    });
-  }
-
-  if (timeout !== undefined && timeout > 0) {
-    return pTimeout(performCall(), {
-      milliseconds: timeout,
-      message: `${schema.$id}: Timed out after ${timeout}ms`,
-    });
-  }
-
-  return performFetch();
-}
+    },
+  );
+}
\ No newline at end of file
diff --git a/internal/utils/upload_file.js b/internal/utils/upload_file.js
deleted file mode 100644
index d98b07645..000000000
--- a/internal/utils/upload_file.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import { useFeedbackStore } from "@ogw_front/stores/feedback.js";
-
-async function upload_file(
-  microservice,
-  { route, file },
-  { request_error_function, response_function, response_error_function } = {},
-) {
-  console.log("[UPLOAD_FILE] Uploading file", { route, file });
-  const feedbackStore = useFeedbackStore();
-  if (!(file instanceof File)) {
-    throw new Error("file must be a instance of File");
-  }
-
-  const body = new FormData();
-  body.append("file", file);
-
-  const request_options = {
-    method: "PUT",
-    body,
-  };
-  microservice.start_request();
-  return await $fetch(route, {
-    baseURL: microservice.base_url || "",
-    ...request_options,
-    onRequestError({ error }) {
-      microservice.stop_request();
-      feedbackStore.add_error(error.code, route, error.message, error.stack);
-      if (request_error_function) {
-        request_error_function(error);
-      }
-    },
-    onResponse({ response }) {
-      if (response.ok) {
-        microservice.stop_request();
-        if (response_function) {
-          response_function(response);
-        }
-      }
-    },
-    onResponseError({ response }) {
-      microservice.stop_request();
-      feedbackStore.add_error(response.status, route, response.name, response.description);
-      if (response_error_function) {
-        response_error_function(response);
-      }
-    },
-  });
-}
-
-export { upload_file };
diff --git a/nuxt.config.js b/nuxt.config.js
index 5e3136afe..0768da525 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -3,7 +3,6 @@ import path from "node:path";
 
 // Local imports
 import package_json from "./package.json";
-import { getBackPort, getViewerPort } from "./server/utils/microservice-registry.js";
 
 const __dirname = import.meta.dirname;
 
@@ -12,8 +11,6 @@ export default defineNuxtConfig({
     public: {
       COMMAND_BACK: "opengeodeweb-back",
       COMMAND_VIEWER: "opengeodeweb-viewer",
-      BACK_BASE_URL: undefined,
-      VIEWER_BASE_URL: undefined,
       NUXT_ROOT_PATH: __dirname,
       MODE: process.env.MODE || "CLOUD",
       PROJECT: package_json.name,
@@ -21,14 +18,15 @@ export default defineNuxtConfig({
   },
 
   modules: [["@pinia/nuxt", { autoImports: ["defineStore", "storeToRefs"] }], "@vueuse/nuxt"],
-  // imports: {
-  //   scan: false,
-  // },
+  imports: {
+    scan: false,
+  },
 
   alias: {
     "@ogw_front": path.resolve(__dirname, "app"),
     "@ogw_internal": path.resolve(__dirname, "internal"),
     "@ogw_server": path.resolve(__dirname, "server"),
+    "@ogw_shared": path.resolve(__dirname, "shared"),
     "@ogw_tests": path.resolve(__dirname, "tests"),
   },
 
diff --git a/shared/utils/fetch_raw.js b/shared/utils/fetch_raw.js
new file mode 100644
index 000000000..5beece11a
--- /dev/null
+++ b/shared/utils/fetch_raw.js
@@ -0,0 +1,47 @@
+import _ from "lodash";
+import pTimeout from "p-timeout";
+
+function fetchRaw(
+  { schema, params = {}, baseURL, headers, max_retry, timeout, expectEvent = false },
+  { onRequestError, onResponse, onResponseError } = {},
+) {
+  const body = params;
+  if (expectEvent) { headers["Accept"] = "text/event-stream" }
+  const method = schema.methods.find((method) => method !== "OPTIONS");
+  const request_options = { method, headers };
+
+  if (!_.isEmpty(body)) { request_options.body = body }
+  if (max_retry) { request_options.max_retry = max_retry }
+
+  function doFetch() {
+    return $fetch(schema.$id, {
+      baseURL,
+      ...request_options,
+      onRequestError({ error }) {
+        if (onRequestError) {
+          onRequestError(error);
+        }
+      },
+      onResponse({ response }) {
+        if (response.ok && onResponse) {
+          onResponse(response._data);
+        }
+      },
+      onResponseError({ response }) {
+        if (onResponseError) {
+          onResponseError(response);
+        }
+      },
+    });
+  }
+
+  if (timeout > 0) {
+    return pTimeout(doFetch(), {
+      milliseconds: timeout,
+      message: `${route}: Timed out after ${timeout}ms`,
+    });
+  }
+  return doFetch();
+}
+
+export { fetchRaw };
\ No newline at end of file
diff --git a/shared/utils/fetch_schema.js b/shared/utils/fetch_schema.js
new file mode 100644
index 000000000..43ecb4072
--- /dev/null
+++ b/shared/utils/fetch_schema.js
@@ -0,0 +1,35 @@
+import { validate_schema } from "@ogw_front/utils/validate_schema";
+
+import { fetchRaw } from "./fetch_raw.js";
+
+const ERROR_400 = 400;
+
+export function fetchSchema(
+  { schema, baseURL, params, headers, timeout },
+  { onRequestError, onResponse, onResponseError, onValidationError } = {},
+) {
+  const validationBody = params || {};
+  const { valid, error: schema_error } = validate_schema(schema, validationBody);
+
+  if (!valid) {
+    if (process.env.NODE_ENV !== "production") {
+      console.log("Bad request", schema_error, schema, params);
+    }
+    if (onValidationError) {
+      onValidationError({ status: ERROR_400, error: schema_error });
+    }
+    throw new Error(`${schema.$id}: ${schema_error}`);
+  }
+
+  return fetchRaw(
+    {
+      schema,
+      params,
+      baseURL,
+      headers,
+      max_retry: schema.max_retry,
+      timeout,
+    },
+    { onRequestError, onResponse, onResponseError },
+  );
+}
\ No newline at end of file
diff --git a/shared/utils/upload_file.js b/shared/utils/upload_file.js
new file mode 100644
index 000000000..05dcdb213
--- /dev/null
+++ b/shared/utils/upload_file.js
@@ -0,0 +1,48 @@
+import { performFetch } from "@ogw_shared/utils/perform_fetch";
+import { useFeedbackStore } from "@ogw_front/stores/feedback.js";
+
+async function upload_file(
+  microservice,
+  { schema, file },
+  { request_error_function, response_function, response_error_function } = {},
+) {
+  console.log("[UPLOAD_FILE] Uploading file", { route, file });
+  const feedbackStore = useFeedbackStore();
+
+  if (!(file instanceof File)) {
+    throw new Error("file must be a instance of File");
+  }
+
+  const params = new FormData();
+  params.append("file", file);
+
+  microservice.start_request();
+
+  return performFetch(
+    { route: schema.$id, method: "PUT", base_url: microservice.base_url, params },
+    {
+      onRequestError(error) {
+        microservice.stop_request();
+        feedbackStore.add_error(error.code, route, error.message, error.stack);
+        if (request_error_function) {
+          request_error_function(error);
+        }
+      },
+      onResponse(response) {
+        microservice.stop_request();
+        if (response_function) {
+          response_function(response);
+        }
+      },
+      onResponseError(response) {
+        microservice.stop_request();
+        feedbackStore.add_error(response.status, route, response.name, response.description);
+        if (response_error_function) {
+          response_error_function(response);
+        }
+      },
+    },
+  );
+}
+
+export { upload_file };
\ No newline at end of file
diff --git a/shared/utils/wrapper.js b/shared/utils/wrapper.js
new file mode 100644
index 000000000..9ec8ead82
--- /dev/null
+++ b/shared/utils/wrapper.js
@@ -0,0 +1,22 @@
+import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
+
+
+
+
+function getAllowedFiles({ beforeFunction, afterFunction }) {
+  beforeFunction();
+  const backStore = useBackStore();
+  const schema = schemas.opengeodeweb_back.allowed_files;
+  return backStore.request(
+    { schema },
+    {
+      response_function: (response) => {
+        accept.value = response.extensions.map((extension) => `.${extension}`).join(",");
+      },
+    },
+  );
+  afterFunction();
+}
+
+
+export { getAllowedFiles };
\ No newline at end of file

From 3cd2381ef8f97426c3af1165ee926729b995643c Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Mon, 27 Jul 2026 16:57:55 +0200
Subject: [PATCH 04/20] save wip [skip ci]

---
 app/components/FileSelector.vue           | 22 ++++++++++----
 app/stores/app.js                         |  3 --
 app/stores/back.js                        | 10 -------
 app/stores/viewer.js                      | 12 --------
 app/utils/import_workflow.js              |  8 ------
 app/utils/log.js                          | 18 ++++++++++++
 internal/utils/api_fetch.js               | 35 ++++++++---------------
 {shared => internal}/utils/upload_file.js | 15 ++++++----
 internal/utils/viewer_call.js             |  6 ++--
 shared/utils/fetch_raw.js                 |  9 +++---
 shared/utils/fetch_schema.js              | 21 ++++++++------
 shared/utils/file.js                      |  6 ++++
 shared/utils/wrapper.js                   | 22 --------------
 13 files changed, 84 insertions(+), 103 deletions(-)
 create mode 100644 app/utils/log.js
 rename {shared => internal}/utils/upload_file.js (77%)
 create mode 100644 shared/utils/file.js
 delete mode 100644 shared/utils/wrapper.js

diff --git a/app/components/FileSelector.vue b/app/components/FileSelector.vue
index 9f98c884a..4a53d4fb5 100644
--- a/app/components/FileSelector.vue
+++ b/app/components/FileSelector.vue
@@ -1,10 +1,14 @@
 <script setup>
+import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 import FetchingData from "@ogw_front/components/FetchingData";
 import FileUploader from "@ogw_front/components/FileUploader";
-import { getAllowedFiles } from "@ogw_shared/utils/file";
+import { useBackStore } from "@ogw_front/stores/back";
 
 const emit = defineEmits(["update_values", "increment_step", "decrement_step"]);
 
+const backStore = useBackStore();
+const schema = schemas.opengeodeweb_back.allowed_files;
+
 const { multiple, files, autoUpload, showOverlay } = defineProps({
   multiple: { type: Boolean, required: true },
   files: { type: Array, default: () => [] },
@@ -42,11 +46,19 @@ function files_uploaded_event(value) {
   }
 }
 
+function getAllowedFiles() {
+  return backStore.request(
+    { schema },
+    {
+      response_function: (response) => {
+        accept.value = response.extensions.map((extension) => `.${extension}`).join(",");
+      },
+    },
+  );
+}
+
 // oxlint-disable-next-line no-top-level-await
-await getAllowedFiles({
-  beforeFunction: () => toggleLoading(),
-  afterFunction: () => toggleLoading(),
-});
+await getAllowedFiles();
 </script>
 
 <template>
diff --git a/app/stores/app.js b/app/stores/app.js
index 531892717..40945af5f 100644
--- a/app/stores/app.js
+++ b/app/stores/app.js
@@ -223,8 +223,6 @@ export const useAppStore = defineStore("app", () => {
   }
 
   function request({ schema, params }, callbacks = {}) {
-    console.log("[APP] Request:", schema.$id);
-
     const store = useAppStore();
     return api_fetch(
       store,
@@ -232,7 +230,6 @@ export const useAppStore = defineStore("app", () => {
       {
         ...callbacks,
         response_function: async (response) => {
-          console.log("[APP] Request completed:", schema.$id);
           if (callbacks.response_function) {
             await callbacks.response_function(response);
           }
diff --git a/app/stores/back.js b/app/stores/back.js
index 0bcd8ff2b..5ac2d28d9 100644
--- a/app/stores/back.js
+++ b/app/stores/back.js
@@ -110,22 +110,12 @@ export const useBackStore = defineStore("back", {
       return Promise.resolve();
     },
     request({ schema, params = {} }, callbacks = {}) {
-      console.log("[GEODE] Request:", schema.$id);
-      const start = Date.now();
-
       return api_fetch(
         this,
         { schema, params, headers: {} },
         {
           ...callbacks,
           response_function: async (response) => {
-            console.log(
-              "[GEODE] Request completed:",
-              schema.$id,
-              "in",
-              (Date.now() - start) / MILLISECONDS_IN_SECOND,
-              "s",
-            );
             if (callbacks.response_function) {
               await callbacks.response_function(response);
             }
diff --git a/app/stores/viewer.js b/app/stores/viewer.js
index e034a4daa..155816cc0 100644
--- a/app/stores/viewer.js
+++ b/app/stores/viewer.js
@@ -162,25 +162,13 @@ export const useViewerStore = defineStore(
     }
 
     function request({ schema, params = {}, timeout = request_timeout }, callbacks = {}) {
-      console.log("[VIEWER] Request:", schema.$id);
-      const start = Date.now();
-
-      // Get current store instance to pass to viewer_call
       const store = useViewerStore();
-
       return viewer_call(
         store,
         { schema, params, timeout },
         {
           ...callbacks,
           response_function: async (response) => {
-            console.log(
-              "[VIEWER] Request completed:",
-              schema.$id,
-              "in",
-              (Date.now() - start) / MS_PER_SECOND,
-              "s",
-            );
             if (callbacks.response_function) {
               await callbacks.response_function(response);
             }
diff --git a/app/utils/import_workflow.js b/app/utils/import_workflow.js
index 4fe352b7f..eb479a7d2 100644
--- a/app/utils/import_workflow.js
+++ b/app/utils/import_workflow.js
@@ -35,13 +35,6 @@ async function importWorkflow(files) {
   return results;
 }
 
-function buildImportItemFromPayloadApi(value, geode_object_type) {
-  return {
-    geode_object_type,
-    ...value,
-  };
-}
-
 async function importItem(item) {
   const dataStore = useDataStore();
   const dataStyleStore = useDataStyleStore();
@@ -89,7 +82,6 @@ async function importFile(filename, geode_object_type) {
     filename,
   };
   const response = await backStore.request({ schema, params });
-  // const item = buildImportItemFromPayloadApi(response, geode_object_type);
   return importItem(response);
 }
 
diff --git a/app/utils/log.js b/app/utils/log.js
new file mode 100644
index 000000000..ea5fc6c78
--- /dev/null
+++ b/app/utils/log.js
@@ -0,0 +1,18 @@
+function startRequestLog(microservice, schema) {
+  console.log(`[${microservice.$id}] Request:`, schema.$id);
+  const requestStartingTime = new Date(Date.now());
+  return requestStartingTime
+}
+
+function endRequestLog(microservice, schema, requestStartingTime) {
+  const requestEndingTime = new Date(Date.now());
+  console.log(
+    `[${microservice.$id}] Request completed:`,
+    schema.$id,
+    "in",
+    (requestEndingTime.getSeconds() - requestStartingTime.getSeconds()),
+    "s",
+  );
+}
+
+export { startRequestLog, endRequestLog }
\ No newline at end of file
diff --git a/internal/utils/api_fetch.js b/internal/utils/api_fetch.js
index 5cbe7ed78..1cdd4d198 100644
--- a/internal/utils/api_fetch.js
+++ b/internal/utils/api_fetch.js
@@ -1,37 +1,21 @@
-import { fetchRaw } from "@ogw_shared/utils/fetch_raw";
+import { endRequestLog, startRequestLog } from "@ogw_front/utils/log";
+import { fetchSchema } from "@ogw_shared/utils/fetch_schema";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
-import { validate_schema } from "@ogw_front/utils/validate_schema";
-
-const ERROR_400 = 400;
 
 export function api_fetch(
   microservice,
-  { schema, params, headers },
+  { schema, params = {}, headers },
   { request_error_function, response_function, response_error_function, timeout } = {},
 ) {
   const feedbackStore = useFeedbackStore();
-
-  const body = params || {};
-  const { valid, error: schema_error } = validate_schema(schema, body);
-
-  if (!valid) {
-    if (process.env.NODE_ENV !== "production") {
-      console.log("Bad request", schema_error, schema, params);
-    }
-    feedbackStore.add_error(ERROR_400, schema.$id, "Bad request", schema_error);
-    throw new Error(`${schema.$id}: ${schema_error}`);
-  }
-
   microservice.start_request();
 
-  const method = schema.methods.find((methodItem) => methodItem !== "OPTIONS");
-
-  return fetchRaw(
+  const requestStartingTime = startRequestLog(microservice, schema);
+  return fetchSchema(
     {
-      route: schema.$id,
-      method,
+      schema,
       baseURL: microservice.base_url,
-      params: body,
+      params,
       headers,
       max_retry: schema.max_retry,
       timeout,
@@ -45,6 +29,7 @@ export function api_fetch(
         }
       },
       onResponse(data) {
+        endRequestLog(microservice, schema, requestStartingTime);
         microservice.stop_request();
         if (response_function) {
           response_function(data);
@@ -57,6 +42,10 @@ export function api_fetch(
           response_error_function(response);
         }
       },
+      onValidationError(code, route, name, error) {
+        microservice.stop_request();
+        feedbackStore.add_error(code, route, name, error);
+      },
     },
   );
 }
\ No newline at end of file
diff --git a/shared/utils/upload_file.js b/internal/utils/upload_file.js
similarity index 77%
rename from shared/utils/upload_file.js
rename to internal/utils/upload_file.js
index 05dcdb213..fd7348a3a 100644
--- a/shared/utils/upload_file.js
+++ b/internal/utils/upload_file.js
@@ -1,12 +1,12 @@
-import { performFetch } from "@ogw_shared/utils/perform_fetch";
+import { fetchSchema } from "@ogw_shared/utils/fetch_schema.js";
 import { useFeedbackStore } from "@ogw_front/stores/feedback.js";
 
-async function upload_file(
+function upload_file(
   microservice,
   { schema, file },
   { request_error_function, response_function, response_error_function } = {},
 ) {
-  console.log("[UPLOAD_FILE] Uploading file", { route, file });
+  console.log("[UPLOAD_FILE] Uploading file", { schema, file });
   const feedbackStore = useFeedbackStore();
 
   if (!(file instanceof File)) {
@@ -18,8 +18,13 @@ async function upload_file(
 
   microservice.start_request();
 
-  return performFetch(
-    { route: schema.$id, method: "PUT", base_url: microservice.base_url, params },
+  return fetchSchema(
+    {
+      route: schema.$id,
+      method: schema.methods.find((method) => method !== "OPTIONS"),
+      params,
+      baseURL: microservice.base_url,
+    },
     {
       onRequestError(error) {
         microservice.stop_request();
diff --git a/internal/utils/viewer_call.js b/internal/utils/viewer_call.js
index afc00dbcd..bed9968fc 100644
--- a/internal/utils/viewer_call.js
+++ b/internal/utils/viewer_call.js
@@ -1,4 +1,5 @@
 import pTimeout from "p-timeout";
+import { endRequestLog, startRequestLog } from "@ogw_front/utils/log";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
 import { validate_schema } from "@ogw_front/utils/validate_schema";
 
@@ -28,9 +29,10 @@ export function viewer_call(
       return;
     }
     microservice.start_request();
-
+    const requestStart = startRequestLog(microservice, schema);
     try {
       const value = await client.getConnection().getSession().call(schema.$id, [params]);
+      endRequestLog(microservice, schema, requestStart);
       if (response_function) {
         await response_function(value);
       }
@@ -49,7 +51,7 @@ export function viewer_call(
     }
   }
 
-  if (timeout !== undefined && timeout > 0) {
+  if (timeout > 0) {
     return pTimeout(performCall(), {
       milliseconds: timeout,
       message: `${schema.$id}: Timed out after ${timeout}ms`,
diff --git a/shared/utils/fetch_raw.js b/shared/utils/fetch_raw.js
index 5beece11a..ede8c30e5 100644
--- a/shared/utils/fetch_raw.js
+++ b/shared/utils/fetch_raw.js
@@ -2,19 +2,18 @@ import _ from "lodash";
 import pTimeout from "p-timeout";
 
 function fetchRaw(
-  { schema, params = {}, baseURL, headers, max_retry, timeout, expectEvent = false },
+  { route, method, params = {}, baseURL, headers, max_retry, timeout, expectEvent = false },
   { onRequestError, onResponse, onResponseError } = {},
 ) {
-  const body = params;
   if (expectEvent) { headers["Accept"] = "text/event-stream" }
-  const method = schema.methods.find((method) => method !== "OPTIONS");
+
   const request_options = { method, headers };
 
-  if (!_.isEmpty(body)) { request_options.body = body }
+  if (!_.isEmpty(params)) { request_options.body = params }
   if (max_retry) { request_options.max_retry = max_retry }
 
   function doFetch() {
-    return $fetch(schema.$id, {
+    return $fetch(route, {
       baseURL,
       ...request_options,
       onRequestError({ error }) {
diff --git a/shared/utils/fetch_schema.js b/shared/utils/fetch_schema.js
index 43ecb4072..b3aaf674e 100644
--- a/shared/utils/fetch_schema.js
+++ b/shared/utils/fetch_schema.js
@@ -1,29 +1,32 @@
-import { validate_schema } from "@ogw_front/utils/validate_schema";
+// Third party imports
+import { validate_schema } from "@geode/opengeodeweb-front/app/utils/validate_schema.js";
 
+// Local imports
 import { fetchRaw } from "./fetch_raw.js";
 
 const ERROR_400 = 400;
 
-export function fetchSchema(
-  { schema, baseURL, params, headers, timeout },
+function fetchSchema(
+  { schema, params = {}, baseURL, headers, timeout },
   { onRequestError, onResponse, onResponseError, onValidationError } = {},
 ) {
-  const validationBody = params || {};
-  const { valid, error: schema_error } = validate_schema(schema, validationBody);
+  console.log("fetchSchema", { schema, baseURL, params, headers, timeout });
+  const { valid, error: schema_error } = validate_schema(schema, params);
 
   if (!valid) {
     if (process.env.NODE_ENV !== "production") {
       console.log("Bad request", schema_error, schema, params);
     }
     if (onValidationError) {
-      onValidationError({ status: ERROR_400, error: schema_error });
+      onValidationError({ code: ERROR_400, name: "Bad request", error: schema_error });
     }
     throw new Error(`${schema.$id}: ${schema_error}`);
   }
 
   return fetchRaw(
     {
-      schema,
+      route: schema.$id,
+      method: schema.methods.find((method) => method !== "OPTIONS"),
       params,
       baseURL,
       headers,
@@ -32,4 +35,6 @@ export function fetchSchema(
     },
     { onRequestError, onResponse, onResponseError },
   );
-}
\ No newline at end of file
+}
+
+export { fetchSchema };
\ No newline at end of file
diff --git a/shared/utils/file.js b/shared/utils/file.js
new file mode 100644
index 000000000..aea00a5e6
--- /dev/null
+++ b/shared/utils/file.js
@@ -0,0 +1,6 @@
+function assertFile(file) {
+  if (!(file instanceof File)) {
+    throw new Error("file must be an instance of File");
+  }
+}
+export { assertFile };
\ No newline at end of file
diff --git a/shared/utils/wrapper.js b/shared/utils/wrapper.js
deleted file mode 100644
index 9ec8ead82..000000000
--- a/shared/utils/wrapper.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
-
-
-
-
-function getAllowedFiles({ beforeFunction, afterFunction }) {
-  beforeFunction();
-  const backStore = useBackStore();
-  const schema = schemas.opengeodeweb_back.allowed_files;
-  return backStore.request(
-    { schema },
-    {
-      response_function: (response) => {
-        accept.value = response.extensions.map((extension) => `.${extension}`).join(",");
-      },
-    },
-  );
-  afterFunction();
-}
-
-
-export { getAllowedFiles };
\ No newline at end of file

From b242cf0c16771d5751ef6889d6d4711fe6188bbd Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Tue, 28 Jul 2026 17:11:43 +0200
Subject: [PATCH 05/20] save wip [skip ci]

---
 internal/utils/upload_file.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal/utils/upload_file.js b/internal/utils/upload_file.js
index fd7348a3a..5c2879eb4 100644
--- a/internal/utils/upload_file.js
+++ b/internal/utils/upload_file.js
@@ -1,4 +1,5 @@
 import { fetchSchema } from "@ogw_shared/utils/fetch_schema.js";
+import { fetchRaw } from "@ogw_shared/utils/fetch_raw.js";
 import { useFeedbackStore } from "@ogw_front/stores/feedback.js";
 
 function upload_file(
@@ -18,7 +19,7 @@ function upload_file(
 
   microservice.start_request();
 
-  return fetchSchema(
+  return fetchRaw(
     {
       route: schema.$id,
       method: schema.methods.find((method) => method !== "OPTIONS"),

From ce2cc961da3c781d91df9041401dfb5e4754e50e Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Wed, 29 Jul 2026 10:36:28 +0200
Subject: [PATCH 06/20] pull [skip ci]


From 488b1d9e2e1357acedd7bb864a82e6d9aff536bf Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Thu, 30 Jul 2026 10:42:28 +0200
Subject: [PATCH 07/20] save wip [skip ci]

---
 app/components/FileSelector.vue   |  4 ++--
 app/components/ObjectSelector.vue | 10 +++++-----
 app/stores/app.js                 | 27 ++++++++++++++++++++++++-
 app/stores/back.js                | 26 +++++++++++-------------
 app/stores/infra.js               |  5 -----
 app/stores/viewer.js              | 20 +++++++++----------
 app/utils/stores.js               | 33 +++++++++++++++++++++++++++++++
 internal/utils/upload_file.js     |  4 ++--
 shared/utils/fetch_raw.js         |  6 +++---
 shared/utils/fetch_schema.js      |  3 ++-
 shared/utils/file.js              | 11 ++++++++++-
 shared/utils/utils.js             |  5 +++++
 12 files changed, 110 insertions(+), 44 deletions(-)
 create mode 100644 app/utils/stores.js
 create mode 100644 shared/utils/utils.js

diff --git a/app/components/FileSelector.vue b/app/components/FileSelector.vue
index 4a53d4fb5..feedc1036 100644
--- a/app/components/FileSelector.vue
+++ b/app/components/FileSelector.vue
@@ -7,7 +7,6 @@ import { useBackStore } from "@ogw_front/stores/back";
 const emit = defineEmits(["update_values", "increment_step", "decrement_step"]);
 
 const backStore = useBackStore();
-const schema = schemas.opengeodeweb_back.allowed_files;
 
 const { multiple, files, autoUpload, showOverlay } = defineProps({
   multiple: { type: Boolean, required: true },
@@ -47,11 +46,12 @@ function files_uploaded_event(value) {
 }
 
 function getAllowedFiles() {
+  const schema = schemas.opengeodeweb_back.allowed_files;
   return backStore.request(
     { schema },
     {
       response_function: (response) => {
-        accept.value = response.extensions.map((extension) => `.${extension}`).join(",");
+        accept.value = response.extensions.map((extension) => `.${extension}`).join(", ");
       },
     },
   );
diff --git a/app/components/ObjectSelector.vue b/app/components/ObjectSelector.vue
index 616390ddc..0386f7f12 100644
--- a/app/components/ObjectSelector.vue
+++ b/app/components/ObjectSelector.vue
@@ -53,7 +53,7 @@ function isCsvFile(filename) {
   return filename.toLowerCase().endsWith(".csv") || filename.toLowerCase().endsWith(".csv.json");
 }
 
-async function get_allowed_objects() {
+async function getAllowedObjects() {
   toggle_loading();
   allowed_objects.value = {};
   multiple_files_no_common.value = false;
@@ -90,19 +90,19 @@ async function get_allowed_objects() {
   allowed_objects.value = final_object;
   const selected_object = select_geode_object(final_object);
   if (selected_object) {
-    set_geode_object(selected_object);
+    setGeodeObject(selected_object);
   }
   toggle_loading();
 }
 
-function set_geode_object(geode_object_type) {
+function setGeodeObject(geode_object_type) {
   if (geode_object_type) {
     emit("update_values", { geode_object_type });
     emit("increment_step");
   }
 }
 // oxlint-disable-next-line no-top-level-await
-await get_allowed_objects();
+await getAllowedObjects();
 </script>
 
 <template>
@@ -124,7 +124,7 @@ await get_allowed_objects();
               class="card ma-2"
               hover
               rounded
-              @click="set_geode_object(key)"
+              @click="setGeodeObject(key)"
               :disabled="!value['is_loadable']"
               :elevation="value['is_loadable'] ? 5 : 3"
             >
diff --git a/app/stores/app.js b/app/stores/app.js
index 40945af5f..2277df3ab 100644
--- a/app/stores/app.js
+++ b/app/stores/app.js
@@ -3,11 +3,32 @@ import { api_fetch } from "@ogw_internal/utils/api_fetch.js";
 import { upload_file } from "@ogw_internal/utils/upload_file.js";
 
 import { killExtension } from "@ogw_front/utils/extension.js";
+import { isCloudMode, getRestApiProtocol, getRestApiPort } from "@ogw_front/utils/stores.js";
 import { useInfraStore } from "@ogw_front/stores/infra";
 
+
 // oxlint-disable-next-line max-lines-per-function, max-statements
 export const useAppStore = defineStore("app", () => {
   const stores = [];
+  const infraStore = useInfraStore();
+  const default_local_port = ref("3000");
+
+  const protocol = computed(() => {
+    return getRestApiProtocol()
+  });
+
+  const port = computed(() => {
+    return getRestApiPort(default_local_port.value)
+  });
+
+  const base_url = computed(() => {
+    let app_url = `${protocol.value}://${infraStore.domain_name}:${port.value}`;
+    if (isCloudMode()) {
+      app_url += `/server`;
+    }
+    return app_url;
+  });
+
 
   function registerStore(store) {
     const isAlreadyRegistered = stores.some((registeredStore) => registeredStore.$id === store.$id);
@@ -209,7 +230,7 @@ export const useAppStore = defineStore("app", () => {
     const store = useAppStore();
     return upload_file(
       store,
-      { route, file },
+      { schema, file },
       {
         ...callbacks,
         response_function: async (response) => {
@@ -245,6 +266,8 @@ export const useAppStore = defineStore("app", () => {
   function stop_request() {
     request_counter.value -= 1;
   }
+  const is_busy = computed(() => request_counter.value > 0);
+
 
   const projectFolderPath = ref("");
   function createProjectFolder() {
@@ -273,6 +296,7 @@ export const useAppStore = defineStore("app", () => {
 
   return {
     stores,
+    base_url,
     registerStore,
     exportStores,
     importStores,
@@ -293,5 +317,6 @@ export const useAppStore = defineStore("app", () => {
     createProjectFolder,
     start_request,
     stop_request,
+    is_busy,
   };
 });
diff --git a/app/stores/back.js b/app/stores/back.js
index 5ac2d28d9..7c1e17d77 100644
--- a/app/stores/back.js
+++ b/app/stores/back.js
@@ -1,12 +1,17 @@
 import { Status } from "@ogw_front/utils/status";
 import { api_fetch } from "@ogw_internal/utils/api_fetch";
-import { appMode } from "@ogw_front/utils/local/app_mode";
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 import { upload_file } from "@ogw_internal/utils/upload_file.js";
 import { useAppStore } from "@ogw_front/stores/app";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
 import { useInfraStore } from "@ogw_front/stores/infra";
 
+import {
+  isCloudMode,
+  getRestApiProtocol,
+  getRestApiPort
+} from "@ogw_front/utils/stores";
+
 const MILLISECONDS_IN_SECOND = 1000;
 const DEFAULT_PING_INTERVAL_SECONDS = 10;
 
@@ -19,24 +24,18 @@ export const useBackStore = defineStore("back", {
   }),
   getters: {
     protocol() {
-      if (useInfraStore().app_mode === appMode.CLOUD) {
-        return "https";
-      }
-      return "http";
+      return getRestApiProtocol()
     },
     port() {
-      if (useInfraStore().app_mode === appMode.CLOUD) {
-        return "443";
-      }
-      return this.default_local_port;
+      return getRestApiPort(this.default_local_port)
     },
     base_url() {
       const infraStore = useInfraStore();
-      let geode_url = `${this.protocol}://${infraStore.domain_name}:${this.port}`;
-      if (infraStore.app_mode === appMode.CLOUD) {
-        geode_url += `/geode`;
+      let back_url = `${this.protocol}://${infraStore.domain_name}:${this.port}`;
+      if (isCloudMode()) {
+        back_url += `/geode`;
       }
-      return geode_url;
+      return back_url;
     },
     is_busy() {
       return this.request_counter > 0;
@@ -134,7 +133,6 @@ export const useBackStore = defineStore("back", {
         {
           ...callbacks,
           response_function: async (response) => {
-            console.log("[GEODE] Request completed:", route);
             if (callbacks.response_function) {
               await callbacks.response_function(response);
             }
diff --git a/app/stores/infra.js b/app/stores/infra.js
index 2fbdeffd8..ffff609eb 100644
--- a/app/stores/infra.js
+++ b/app/stores/infra.js
@@ -77,11 +77,6 @@ export const useInfraStore = defineStore("infra", {
     },
     async create_connection() {
       console.log("[INFRA] Starting create_connection");
-      console.log(
-        "[INFRA] Connecting microservices:",
-        this.microservices.map((store) => store.$id),
-      );
-
       await Promise.all(
         this.microservices.map(async (store) => {
           console.log("[INFRA] Connecting to microservice:", store.$id);
diff --git a/app/stores/viewer.js b/app/stores/viewer.js
index 155816cc0..69b675a13 100644
--- a/app/stores/viewer.js
+++ b/app/stores/viewer.js
@@ -9,11 +9,17 @@ import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json
 
 // Local imports
 import { Status } from "@ogw_front/utils/status";
-import { appMode } from "@ogw_front/utils/local/app_mode";
 import { useAppStore } from "@ogw_front/stores/app";
 import { useInfraStore } from "@ogw_front/stores/infra";
 import { viewer_call } from "@ogw_internal/utils/viewer_call";
 
+import {
+  isCloudMode,
+  getWebsocketApiProtocol,
+  getWebsocketApiPort
+} from "@ogw_front/utils/stores.js";
+
+
 const MS_PER_SECOND = 1000;
 const SECONDS_PER_REQUEST = 10;
 const request_timeout = MS_PER_SECOND * SECONDS_PER_REQUEST;
@@ -34,22 +40,16 @@ export const useViewerStore = defineStore(
     const busy = ref(0);
 
     const protocol = computed(() => {
-      if (infraStore.app_mode === appMode.CLOUD) {
-        return "wss";
-      }
-      return "ws";
+      return getWebsocketApiProtocol()
     });
 
     const port = computed(() => {
-      if (infraStore.app_mode === appMode.CLOUD) {
-        return "443";
-      }
-      return default_local_port.value;
+      return getWebsocketApiPort(default_local_port.value)
     });
 
     const base_url = computed(() => {
       let viewer_url = `${protocol.value}://${infraStore.domain_name}:${port.value}`;
-      if (infraStore.app_mode === appMode.CLOUD) {
+      if (isCloudMode()) {
         viewer_url += `/viewer`;
       }
       viewer_url += "/ws";
diff --git a/app/utils/stores.js b/app/utils/stores.js
new file mode 100644
index 000000000..275e47f8f
--- /dev/null
+++ b/app/utils/stores.js
@@ -0,0 +1,33 @@
+import { useInfraStore } from "@ogw_front/stores/infra";
+import { appMode } from "@ogw_front/utils/local/app_mode";
+
+function isCloudMode() {
+  const infraStore = useInfraStore();
+  return infraStore.app_mode === appMode.CLOUD;
+}
+
+function getRestApiProtocol() {
+  const protocol = isCloudMode() ? "https" : "http";
+  return protocol
+}
+function getRestApiPort(defaultLocalPort) {
+  const port = isCloudMode() ? "443" : defaultLocalPort;
+  return port
+}
+function getWebsocketApiProtocol() {
+  const protocol = isCloudMode() ? "wss" : "ws";
+  return protocol
+}
+function getWebsocketApiPort(defaultLocalPort) {
+  const port = isCloudMode() ? "443" : defaultLocalPort;
+  return port
+}
+
+
+export {
+  isCloudMode,
+  getRestApiPort,
+  getRestApiProtocol,
+  getWebsocketApiProtocol,
+  getWebsocketApiPort
+}
diff --git a/internal/utils/upload_file.js b/internal/utils/upload_file.js
index 5c2879eb4..e584790ee 100644
--- a/internal/utils/upload_file.js
+++ b/internal/utils/upload_file.js
@@ -1,4 +1,3 @@
-import { fetchSchema } from "@ogw_shared/utils/fetch_schema.js";
 import { fetchRaw } from "@ogw_shared/utils/fetch_raw.js";
 import { useFeedbackStore } from "@ogw_front/stores/feedback.js";
 
@@ -18,10 +17,11 @@ function upload_file(
   params.append("file", file);
 
   microservice.start_request();
+  const route = schema.$id;
 
   return fetchRaw(
     {
-      route: schema.$id,
+      route,
       method: schema.methods.find((method) => method !== "OPTIONS"),
       params,
       baseURL: microservice.base_url,
diff --git a/shared/utils/fetch_raw.js b/shared/utils/fetch_raw.js
index ede8c30e5..3bba4d28c 100644
--- a/shared/utils/fetch_raw.js
+++ b/shared/utils/fetch_raw.js
@@ -1,15 +1,15 @@
-import _ from "lodash";
 import pTimeout from "p-timeout";
+import { hasBody } from "./file.js";
 
 function fetchRaw(
   { route, method, params = {}, baseURL, headers, max_retry, timeout, expectEvent = false },
   { onRequestError, onResponse, onResponseError } = {},
 ) {
+  console.log("fetchRaw", { route, method, params, baseURL, headers, max_retry, timeout, expectEvent });
   if (expectEvent) { headers["Accept"] = "text/event-stream" }
 
   const request_options = { method, headers };
-
-  if (!_.isEmpty(params)) { request_options.body = params }
+  if (hasBody(params)) { request_options.body = params }
   if (max_retry) { request_options.max_retry = max_retry }
 
   function doFetch() {
diff --git a/shared/utils/fetch_schema.js b/shared/utils/fetch_schema.js
index b3aaf674e..4aea97b39 100644
--- a/shared/utils/fetch_schema.js
+++ b/shared/utils/fetch_schema.js
@@ -7,7 +7,7 @@ import { fetchRaw } from "./fetch_raw.js";
 const ERROR_400 = 400;
 
 function fetchSchema(
-  { schema, params = {}, baseURL, headers, timeout },
+  { schema, params = {}, baseURL, headers, timeout, expectEvent = false },
   { onRequestError, onResponse, onResponseError, onValidationError } = {},
 ) {
   console.log("fetchSchema", { schema, baseURL, params, headers, timeout });
@@ -32,6 +32,7 @@ function fetchSchema(
       headers,
       max_retry: schema.max_retry,
       timeout,
+      expectEvent,
     },
     { onRequestError, onResponse, onResponseError },
   );
diff --git a/shared/utils/file.js b/shared/utils/file.js
index aea00a5e6..b45d9fd87 100644
--- a/shared/utils/file.js
+++ b/shared/utils/file.js
@@ -1,6 +1,15 @@
+import _ from "lodash";
+
 function assertFile(file) {
   if (!(file instanceof File)) {
     throw new Error("file must be an instance of File");
   }
 }
-export { assertFile };
\ No newline at end of file
+
+function hasBody(params) {
+  if (params instanceof FormData || params instanceof Blob) {
+    return true;
+  }
+  return !_.isEmpty(params);
+}
+export { assertFile, hasBody };
\ No newline at end of file
diff --git a/shared/utils/utils.js b/shared/utils/utils.js
new file mode 100644
index 000000000..aede427e0
--- /dev/null
+++ b/shared/utils/utils.js
@@ -0,0 +1,5 @@
+function getFileExtension(filename) {
+    return filename.slice(filename.lastIndexOf(".") + 1);
+}
+
+export { getFileExtension };
\ No newline at end of file

From aa8fdda6d3e33df277875dc55f2d71124a3f9094 Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Thu, 30 Jul 2026 10:55:51 +0200
Subject: [PATCH 08/20] cleanup [skip ci]

---
 app/components/FileSelector.vue       | 14 +++++---------
 internal/utils/api_fetch.js           |  2 +-
 server/utils/microservice-registry.js |  6 ------
 3 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 server/utils/microservice-registry.js

diff --git a/app/components/FileSelector.vue b/app/components/FileSelector.vue
index feedc1036..5a39d8ca7 100644
--- a/app/components/FileSelector.vue
+++ b/app/components/FileSelector.vue
@@ -45,16 +45,12 @@ function files_uploaded_event(value) {
   }
 }
 
-function getAllowedFiles() {
+async function getAllowedFiles() {
+  toggleLoading();
   const schema = schemas.opengeodeweb_back.allowed_files;
-  return backStore.request(
-    { schema },
-    {
-      response_function: (response) => {
-        accept.value = response.extensions.map((extension) => `.${extension}`).join(", ");
-      },
-    },
-  );
+  const response = await backStore.request({ schema });
+  accept.value = response.extensions.map((extension) => `.${extension}`).join(",");
+  toggleLoading();
 }
 
 // oxlint-disable-next-line no-top-level-await
diff --git a/internal/utils/api_fetch.js b/internal/utils/api_fetch.js
index 78f294b9f..a526ed500 100644
--- a/internal/utils/api_fetch.js
+++ b/internal/utils/api_fetch.js
@@ -4,7 +4,7 @@ import { useFeedbackStore } from "@ogw_front/stores/feedback";
 
 export function api_fetch(
   microservice,
-  { schema, params = {}, headers },
+  { schema, params = {}, headers = {} },
   { request_error_function, response_function, response_error_function, timeout } = {},
 ) {
   const feedbackStore = useFeedbackStore();
diff --git a/server/utils/microservice-registry.js b/server/utils/microservice-registry.js
deleted file mode 100644
index 3676946b2..000000000
--- a/server/utils/microservice-registry.js
+++ /dev/null
@@ -1,6 +0,0 @@
-let backPort = undefined;
-let viewerPort = undefined;
-export const setBackPort = (port) => { backPort = port }
-export const getBackPort = () => backPort
-export const setViewerPort = (port) => { viewerPort = port }
-export const getViewerPort = () => viewerPort
\ No newline at end of file

From c072de8627f2ff271d2285ecc35072eb955c784e Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Thu, 30 Jul 2026 15:50:31 +0200
Subject: [PATCH 09/20] cleanup [skip ci]

---
 app/stores/app.js    |  8 ++------
 app/stores/viewer.js | 10 ++--------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/app/stores/app.js b/app/stores/app.js
index 5ed7950cd..553a2b616 100644
--- a/app/stores/app.js
+++ b/app/stores/app.js
@@ -13,13 +13,9 @@ export const useAppStore = defineStore("app", () => {
   const infraStore = useInfraStore();
   const default_local_port = ref("3000");
 
-  const protocol = computed(() => {
-    return getRestApiProtocol()
-  });
+  const protocol = computed(() => getRestApiProtocol());
 
-  const port = computed(() => {
-    return getRestApiPort(default_local_port.value)
-  });
+  const port = computed(() => getRestApiPort(default_local_port.value));
 
   const base_url = computed(() => {
     let app_url = `${protocol.value}://${infraStore.domain_name}:${port.value}`;
diff --git a/app/stores/viewer.js b/app/stores/viewer.js
index 3b07dbbfc..d78a41d13 100644
--- a/app/stores/viewer.js
+++ b/app/stores/viewer.js
@@ -39,14 +39,8 @@ export const useViewerStore = defineStore(
     const version = ref("0.0.0");
     const busy = ref(0);
 
-    const protocol = computed(() => {
-      return getWebsocketApiProtocol()
-    });
-
-    const port = computed(() => {
-      return getWebsocketApiPort(default_local_port.value)
-    });
-
+    const protocol = computed(() => getWebsocketApiProtocol());
+    const port = computed(() => getWebsocketApiPort(default_local_port.value));
     const base_url = computed(() => {
       let viewer_url = `${protocol.value}://${infraStore.domain_name}:${port.value}`;
       if (isCloudMode()) {

From 1a953cb34d73a639764ad9866ae6af9ed8a46a9b Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Fri, 31 Jul 2026 11:30:29 +0200
Subject: [PATCH 10/20] cleanup [skip ci]

---
 app/components/ObjectSelector.vue | 99 ++++++++-----------------------
 app/stores/app.js                 |  2 +-
 app/stores/viewer.js              |  2 +
 shared/utils/utils.js             | 80 ++++++++++++++++++++++++-
 4 files changed, 106 insertions(+), 77 deletions(-)

diff --git a/app/components/ObjectSelector.vue b/app/components/ObjectSelector.vue
index 0386f7f12..f077c039a 100644
--- a/app/components/ObjectSelector.vue
+++ b/app/components/ObjectSelector.vue
@@ -3,6 +3,7 @@ import FetchingData from "@ogw_front/components/FetchingData.vue";
 import { geode_objects } from "@ogw_front/assets/geode_objects";
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 import { useBackStore } from "@ogw_front/stores/back";
+import { deriveAllowedObjects } from "@ogw_shared/utils/utils.js";
 
 const schema = schemas.opengeodeweb_back.allowed_objects;
 
@@ -15,84 +16,34 @@ const { filenames } = defineProps({
 const backStore = useBackStore();
 
 const loading = ref(false);
-const allowed_objects = ref({});
-const toggle_loading = useToggle(loading);
-const multiple_files_no_common = ref(false);
+const allowedGeodeObjects = ref({});
+const toggleLoading = useToggle(loading);
+const multipleFilesNoCommon = ref(false);
 
-function select_geode_object(object_map) {
-  const object_keys = Object.keys(object_map);
-  if (object_keys.length === 0) {
-    return undefined;
-  }
-  if (object_keys.length === 1 && object_map[object_keys[0]].is_loadable > 0) {
-    return object_keys[0];
-  }
-  const highest_load_score = Math.max(...object_keys.map((key) => object_map[key].is_loadable));
-  if (highest_load_score <= 0) {
-    return undefined;
-  }
-  const best_score_objects = object_keys.filter(
-    (key) => object_map[key].is_loadable === highest_load_score,
-  );
-  if (best_score_objects.length === 1) {
-    return best_score_objects[0];
-  }
-  const highest_priority = Math.max(
-    ...best_score_objects.map((key) => object_map[key].object_priority ?? -Infinity),
-  );
-  const best_priority_objects = best_score_objects.filter(
-    (key) => object_map[key].object_priority === highest_priority,
-  );
-  if (highest_priority !== -Infinity && best_priority_objects.length === 1) {
-    return best_priority_objects[0];
-  }
-  return undefined;
-}
-
-function isCsvFile(filename) {
-  return filename.toLowerCase().endsWith(".csv") || filename.toLowerCase().endsWith(".csv.json");
-}
-
-async function getAllowedObjects() {
-  toggle_loading();
-  allowed_objects.value = {};
-  multiple_files_no_common.value = false;
-
-  const promise_array = filenames.map((filename) => {
+async function fetchAllowedObjectsList() {
+  const promiseArray = filenames.map((filename) => {
     const params = { filename };
     return backStore.request({ schema, params });
   });
-  const responses = await Promise.all(promise_array);
-  const allowed_objects_list = responses.map((response) => response.allowed_objects);
-  const all_keys = [...new Set(allowed_objects_list.flatMap((obj) => Object.keys(obj)))];
-  const common_keys = all_keys.filter((key) => allowed_objects_list.every((obj) => key in obj));
+  const responses = await Promise.all(promiseArray);
+  return responses.map((response) => response.allowed_objects);
+}
 
-  if (filenames.length > 1 && all_keys.length > 0 && common_keys.length === 0) {
-    multiple_files_no_common.value = true;
-  }
+async function getAllowedGeodeObjects() {
+  toggleLoading();
+  allowedGeodeObjects.value = {};
+  multipleFilesNoCommon.value = false;
 
-  const final_object = {};
-  for (const key of common_keys) {
-    const load_scores = allowed_objects_list.map((obj) => obj[key].is_loadable);
-    const priorities = allowed_objects_list
-      .map((obj) => obj[key].object_priority)
-      .filter((priority) => priority !== undefined);
-    final_object[key] = { is_loadable: Math.min(...load_scores) };
-    if (priorities.length > 0) {
-      final_object[key].object_priority = Math.max(...priorities);
-    }
-  }
-  const isCsv = filenames.some((filename) => isCsvFile(filename));
-  if (isCsv && !final_object["PointSet3D"]) {
-    final_object["PointSet3D"] = { is_loadable: 1, object_priority: 100 };
-  }
+  const allowedGeodeObjectsList = await fetchAllowedObjectsList();
+  const derived = deriveAllowedObjects(filenames, allowedGeodeObjectsList);
 
-  allowed_objects.value = final_object;
-  const selected_object = select_geode_object(final_object);
-  if (selected_object) {
-    setGeodeObject(selected_object);
+  allowedGeodeObjects.value = derived.allowedGeodeObjects;
+  multipleFilesNoCommon.value = derived.multipleFilesNoCommon;
+  console.log({ derived });
+  if (derived.selectedGeodeObject) {
+    setGeodeObject(derived.selectedGeodeObject);
   }
-  toggle_loading();
+  toggleLoading();
 }
 
 function setGeodeObject(geode_object_type) {
@@ -102,13 +53,13 @@ function setGeodeObject(geode_object_type) {
   }
 }
 // oxlint-disable-next-line no-top-level-await
-await getAllowedObjects();
+await getAllowedGeodeObjects();
 </script>
 
 <template>
   <FetchingData v-if="loading" />
-  <v-row v-else-if="Object.keys(allowed_objects).length" class="justify-left">
-    <v-col v-for="(value, key) in allowed_objects" :key="key" cols="3" md="4">
+  <v-row v-else-if="Object.keys(allowedGeodeObjects).length" class="justify-left">
+    <v-col v-for="(value, key) in allowedGeodeObjects" :key="key" cols="3" md="4">
       <v-tooltip
         :text="
           value['is_loadable']
@@ -139,7 +90,7 @@ await getAllowedObjects();
       </v-tooltip>
     </v-col>
   </v-row>
-  <v-row v-else-if="multiple_files_no_common" class="pa-5">
+  <v-row v-else-if="multipleFilesNoCommon" class="pa-5">
     <v-card class="card" variant="tonal" rounded>
       <v-card-text>
         These files cannot be loaded together because they don't share a common data type.
diff --git a/app/stores/app.js b/app/stores/app.js
index 553a2b616..dd0f29eee 100644
--- a/app/stores/app.js
+++ b/app/stores/app.js
@@ -10,7 +10,6 @@ import { useInfraStore } from "@ogw_front/stores/infra";
 // oxlint-disable-next-line max-lines-per-function, max-statements
 export const useAppStore = defineStore("app", () => {
   const stores = [];
-  const infraStore = useInfraStore();
   const default_local_port = ref("3000");
 
   const protocol = computed(() => getRestApiProtocol());
@@ -18,6 +17,7 @@ export const useAppStore = defineStore("app", () => {
   const port = computed(() => getRestApiPort(default_local_port.value));
 
   const base_url = computed(() => {
+    const infraStore = useInfraStore();
     let app_url = `${protocol.value}://${infraStore.domain_name}:${port.value}`;
     if (isCloudMode()) {
       app_url += `/server`;
diff --git a/app/stores/viewer.js b/app/stores/viewer.js
index d78a41d13..592c60cf8 100644
--- a/app/stores/viewer.js
+++ b/app/stores/viewer.js
@@ -40,7 +40,9 @@ export const useViewerStore = defineStore(
     const busy = ref(0);
 
     const protocol = computed(() => getWebsocketApiProtocol());
+
     const port = computed(() => getWebsocketApiPort(default_local_port.value));
+
     const base_url = computed(() => {
       let viewer_url = `${protocol.value}://${infraStore.domain_name}:${port.value}`;
       if (isCloudMode()) {
diff --git a/shared/utils/utils.js b/shared/utils/utils.js
index aede427e0..2a8f34505 100644
--- a/shared/utils/utils.js
+++ b/shared/utils/utils.js
@@ -1,5 +1,81 @@
 function getFileExtension(filename) {
-    return filename.slice(filename.lastIndexOf(".") + 1);
+  return filename.slice(filename.lastIndexOf(".") + 1);
 }
 
-export { getFileExtension };
\ No newline at end of file
+function selectGeodeObject(objectMap) {
+  console.log("selectGeodeObject", { objectMap });
+  const objectKeys = Object.keys(objectMap);
+  if (objectKeys.length === 0) {
+    return undefined;
+  }
+  if (objectKeys.length === 1 && objectMap[objectKeys[0]].is_loadable > 0) {
+    return objectKeys[0];
+  }
+
+  const highestLoadScore = Math.max(...objectKeys.map((key) => objectMap[key].is_loadable));
+  if (highestLoadScore <= 0) {
+    return undefined;
+  }
+
+  const bestScoreObjects = objectKeys.filter(
+    (key) => objectMap[key].is_loadable === highestLoadScore,
+  );
+  if (bestScoreObjects.length === 1) {
+    return bestScoreObjects[0];
+  }
+
+  const highestPriority = Math.max(
+    ...bestScoreObjects.map((key) => objectMap[key].object_priority ?? -Infinity),
+  );
+  const bestPriorityObjects = bestScoreObjects.filter(
+    (key) => objectMap[key].object_priority === highestPriority,
+  );
+  if (highestPriority !== -Infinity && bestPriorityObjects.length === 1) {
+    return bestPriorityObjects[0];
+  }
+
+  return undefined;
+}
+
+function intersectAllowedObjects(allowedObjectsList) {
+  console.log("intersectAllowedObjects", { allowedObjectsList });
+
+  const allKeys = [...new Set(allowedObjectsList.flatMap((obj) => Object.keys(obj)))];
+  const commonKeys = allKeys.filter((key) => allowedObjectsList.every((obj) => key in obj));
+
+  const merged = {};
+  for (const key of commonKeys) {
+    const loadScores = allowedObjectsList.map((obj) => obj[key].is_loadable);
+    const priorities = allowedObjectsList
+      .map((obj) => obj[key].object_priority)
+      .filter((priority) => priority !== undefined);
+
+    merged[key] = { is_loadable: Math.min(...loadScores) };
+    if (priorities.length > 0) {
+      merged[key].object_priority = Math.max(...priorities);
+    }
+  }
+
+  return { commonKeys, allKeys, merged };
+}
+
+
+function deriveAllowedObjects(filenames, allowedObjectsList) {
+  console.log("deriveAllowedObjects", { filenames, allowedObjectsList });
+
+  const { commonKeys, allKeys, merged } = intersectAllowedObjects(allowedObjectsList);
+
+  const multipleFilesNoCommon =
+    filenames.length > 1 && allKeys.length > 0 && commonKeys.length === 0;
+
+
+  const selectedGeodeObject = selectGeodeObject(merged);
+
+  return {
+    allowed_objects: merged,
+    multipleFilesNoCommon,
+    selectedGeodeObject,
+  };
+}
+
+export { deriveAllowedObjects, getFileExtension };
\ No newline at end of file

From 8a5b6d956ac16c0ee8e1fa20672e256af7930847 Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Fri, 31 Jul 2026 13:43:13 +0200
Subject: [PATCH 11/20] v0 working

---
 shared/utils/fetch_raw.js |  4 ++--
 shared/utils/utils.js     | 13 ++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/shared/utils/fetch_raw.js b/shared/utils/fetch_raw.js
index 3bba4d28c..61b084f01 100644
--- a/shared/utils/fetch_raw.js
+++ b/shared/utils/fetch_raw.js
@@ -1,8 +1,8 @@
-import pTimeout from "p-timeout";
 import { hasBody } from "./file.js";
+import pTimeout from "p-timeout";
 
 function fetchRaw(
-  { route, method, params = {}, baseURL, headers, max_retry, timeout, expectEvent = false },
+  { route, method, params = {}, baseURL, headers = {}, max_retry, timeout, expectEvent = false },
   { onRequestError, onResponse, onResponseError } = {},
 ) {
   console.log("fetchRaw", { route, method, params, baseURL, headers, max_retry, timeout, expectEvent });
diff --git a/shared/utils/utils.js b/shared/utils/utils.js
index 2a8f34505..bc94f1923 100644
--- a/shared/utils/utils.js
+++ b/shared/utils/utils.js
@@ -3,7 +3,6 @@ function getFileExtension(filename) {
 }
 
 function selectGeodeObject(objectMap) {
-  console.log("selectGeodeObject", { objectMap });
   const objectKeys = Object.keys(objectMap);
   if (objectKeys.length === 0) {
     return undefined;
@@ -38,16 +37,14 @@ function selectGeodeObject(objectMap) {
 }
 
 function intersectAllowedObjects(allowedObjectsList) {
-  console.log("intersectAllowedObjects", { allowedObjectsList });
-
-  const allKeys = [...new Set(allowedObjectsList.flatMap((obj) => Object.keys(obj)))];
-  const commonKeys = allKeys.filter((key) => allowedObjectsList.every((obj) => key in obj));
+  const allKeys = [...new Set(allowedObjectsList.flatMap((object) => Object.keys(object)))];
+  const commonKeys = allKeys.filter((key) => allowedObjectsList.every((object) => key in object));
 
   const merged = {};
   for (const key of commonKeys) {
-    const loadScores = allowedObjectsList.map((obj) => obj[key].is_loadable);
+    const loadScores = allowedObjectsList.map((object) => object[key].is_loadable);
     const priorities = allowedObjectsList
-      .map((obj) => obj[key].object_priority)
+      .map((object) => object[key].object_priority)
       .filter((priority) => priority !== undefined);
 
     merged[key] = { is_loadable: Math.min(...loadScores) };
@@ -61,8 +58,6 @@ function intersectAllowedObjects(allowedObjectsList) {
 
 
 function deriveAllowedObjects(filenames, allowedObjectsList) {
-  console.log("deriveAllowedObjects", { filenames, allowedObjectsList });
-
   const { commonKeys, allKeys, merged } = intersectAllowedObjects(allowedObjectsList);
 
   const multipleFilesNoCommon =

From f027995f66aa66c5f88b8f484299612ac8e62b77 Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Fri, 31 Jul 2026 14:05:18 +0200
Subject: [PATCH 12/20] fix(Refactor): refactor functions in shared cleanup

---
 app/components/FileSelector.vue   | 19 +++++++++----------
 app/components/ObjectSelector.vue |  3 +--
 app/utils/extension.js            |  2 +-
 shared/utils/fetch_raw.js         |  1 -
 shared/utils/utils.js             | 14 +++++++-------
 5 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/app/components/FileSelector.vue b/app/components/FileSelector.vue
index 5a39d8ca7..ed2a26b04 100644
--- a/app/components/FileSelector.vue
+++ b/app/components/FileSelector.vue
@@ -1,12 +1,13 @@
 <script setup>
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
+
 import FetchingData from "@ogw_front/components/FetchingData";
 import FileUploader from "@ogw_front/components/FileUploader";
 import { useBackStore } from "@ogw_front/stores/back";
 
-const emit = defineEmits(["update_values", "increment_step", "decrement_step"]);
+const schema = schemas.opengeodeweb_back.allowed_files;
 
-const backStore = useBackStore();
+const emit = defineEmits(["update_values", "increment_step", "decrement_step"]);
 
 const { multiple, files, autoUpload, showOverlay } = defineProps({
   multiple: { type: Boolean, required: true },
@@ -34,9 +35,7 @@ watch(
   },
 );
 
-function toggleLoading() {
-  useToggle(loading);
-}
+const toggle_loading = useToggle(loading);
 
 function files_uploaded_event(value) {
   if (value.length > 0) {
@@ -45,16 +44,16 @@ function files_uploaded_event(value) {
   }
 }
 
-async function getAllowedFiles() {
-  toggleLoading();
-  const schema = schemas.opengeodeweb_back.allowed_files;
+async function get_allowed_files() {
+  toggle_loading();
+  const backStore = useBackStore();
   const response = await backStore.request({ schema });
   accept.value = response.extensions.map((extension) => `.${extension}`).join(",");
-  toggleLoading();
+  toggle_loading();
 }
 
 // oxlint-disable-next-line no-top-level-await
-await getAllowedFiles();
+await get_allowed_files();
 </script>
 
 <template>
diff --git a/app/components/ObjectSelector.vue b/app/components/ObjectSelector.vue
index f077c039a..25baa7893 100644
--- a/app/components/ObjectSelector.vue
+++ b/app/components/ObjectSelector.vue
@@ -1,9 +1,9 @@
 <script setup>
 import FetchingData from "@ogw_front/components/FetchingData.vue";
+import { deriveAllowedObjects } from "@ogw_shared/utils/utils.js";
 import { geode_objects } from "@ogw_front/assets/geode_objects";
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 import { useBackStore } from "@ogw_front/stores/back";
-import { deriveAllowedObjects } from "@ogw_shared/utils/utils.js";
 
 const schema = schemas.opengeodeweb_back.allowed_objects;
 
@@ -39,7 +39,6 @@ async function getAllowedGeodeObjects() {
 
   allowedGeodeObjects.value = derived.allowedGeodeObjects;
   multipleFilesNoCommon.value = derived.multipleFilesNoCommon;
-  console.log({ derived });
   if (derived.selectedGeodeObject) {
     setGeodeObject(derived.selectedGeodeObject);
   }
diff --git a/app/utils/extension.js b/app/utils/extension.js
index 7f8b52163..3afdcf88d 100644
--- a/app/utils/extension.js
+++ b/app/utils/extension.js
@@ -71,7 +71,7 @@ async function unloadExtension(extensionId) {
 
 async function uploadExtension(file) {
   const appStore = useAppStore();
-  await appStore.uploadExtension(file);
+  await appStore.upload(file);
 }
 
 function runExtensions() {
diff --git a/shared/utils/fetch_raw.js b/shared/utils/fetch_raw.js
index 61b084f01..98bc75547 100644
--- a/shared/utils/fetch_raw.js
+++ b/shared/utils/fetch_raw.js
@@ -5,7 +5,6 @@ function fetchRaw(
   { route, method, params = {}, baseURL, headers = {}, max_retry, timeout, expectEvent = false },
   { onRequestError, onResponse, onResponseError } = {},
 ) {
-  console.log("fetchRaw", { route, method, params, baseURL, headers, max_retry, timeout, expectEvent });
   if (expectEvent) { headers["Accept"] = "text/event-stream" }
 
   const request_options = { method, headers };
diff --git a/shared/utils/utils.js b/shared/utils/utils.js
index bc94f1923..3c3cdcf04 100644
--- a/shared/utils/utils.js
+++ b/shared/utils/utils.js
@@ -40,34 +40,34 @@ function intersectAllowedObjects(allowedObjectsList) {
   const allKeys = [...new Set(allowedObjectsList.flatMap((object) => Object.keys(object)))];
   const commonKeys = allKeys.filter((key) => allowedObjectsList.every((object) => key in object));
 
-  const merged = {};
+  const mergedAllowedObjects = {};
   for (const key of commonKeys) {
     const loadScores = allowedObjectsList.map((object) => object[key].is_loadable);
     const priorities = allowedObjectsList
       .map((object) => object[key].object_priority)
       .filter((priority) => priority !== undefined);
 
-    merged[key] = { is_loadable: Math.min(...loadScores) };
+    mergedAllowedObjects[key] = { is_loadable: Math.min(...loadScores) };
     if (priorities.length > 0) {
-      merged[key].object_priority = Math.max(...priorities);
+      mergedAllowedObjects[key].object_priority = Math.max(...priorities);
     }
   }
 
-  return { commonKeys, allKeys, merged };
+  return { commonKeys, allKeys, mergedAllowedObjects };
 }
 
 
 function deriveAllowedObjects(filenames, allowedObjectsList) {
-  const { commonKeys, allKeys, merged } = intersectAllowedObjects(allowedObjectsList);
+  const { commonKeys, allKeys, mergedAllowedObjects } = intersectAllowedObjects(allowedObjectsList);
 
   const multipleFilesNoCommon =
     filenames.length > 1 && allKeys.length > 0 && commonKeys.length === 0;
 
 
-  const selectedGeodeObject = selectGeodeObject(merged);
+  const selectedGeodeObject = selectGeodeObject(mergedAllowedObjects);
 
   return {
-    allowed_objects: merged,
+    mergedAllowedObjects,
     multipleFilesNoCommon,
     selectedGeodeObject,
   };

From d3f53299c2fe775c4e54b12e75bafb1e91e640ef Mon Sep 17 00:00:00 2001
From: JulienChampagnol <91873154+JulienChampagnol@users.noreply.github.com>
Date: Fri, 31 Jul 2026 12:06:30 +0000
Subject: [PATCH 13/20] Apply prepare changes

---
 app/stores/app.js             |  5 -----
 app/stores/back.js            | 10 +++-------
 app/stores/viewer.js          |  3 +--
 app/utils/log.js              |  6 +++---
 app/utils/stores.js           | 13 ++++++-------
 internal/utils/upload_file.js |  2 +-
 shared/utils/fetch_raw.js     | 14 ++++++++++----
 shared/utils/fetch_schema.js  |  2 +-
 shared/utils/file.js          |  2 +-
 shared/utils/utils.js         |  4 +---
 10 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/app/stores/app.js b/app/stores/app.js
index dd0f29eee..ef12f11e9 100644
--- a/app/stores/app.js
+++ b/app/stores/app.js
@@ -6,7 +6,6 @@ import { killExtension } from "@ogw_front/utils/extension.js";
 import { isCloudMode, getRestApiProtocol, getRestApiPort } from "@ogw_front/utils/stores.js";
 import { useInfraStore } from "@ogw_front/stores/infra";
 
-
 // oxlint-disable-next-line max-lines-per-function, max-statements
 export const useAppStore = defineStore("app", () => {
   const stores = [];
@@ -25,7 +24,6 @@ export const useAppStore = defineStore("app", () => {
     return app_url;
   });
 
-
   function registerStore(store) {
     const isAlreadyRegistered = stores.some((registeredStore) => registeredStore.$id === store.$id);
     if (isAlreadyRegistered) {
@@ -255,7 +253,6 @@ export const useAppStore = defineStore("app", () => {
   }
   const is_busy = computed(() => request_counter.value > 0);
 
-
   const projectFolderPath = ref("");
   function createProjectFolder() {
     const { PROJECT } = useRuntimeConfig().public;
@@ -279,8 +276,6 @@ export const useAppStore = defineStore("app", () => {
     );
   }
 
-
-
   return {
     stores,
     base_url,
diff --git a/app/stores/back.js b/app/stores/back.js
index 486d76458..d68c06820 100644
--- a/app/stores/back.js
+++ b/app/stores/back.js
@@ -6,11 +6,7 @@ import { useAppStore } from "@ogw_front/stores/app";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
 import { useInfraStore } from "@ogw_front/stores/infra";
 
-import {
-  isCloudMode,
-  getRestApiProtocol,
-  getRestApiPort
-} from "@ogw_front/utils/stores";
+import { isCloudMode, getRestApiProtocol, getRestApiPort } from "@ogw_front/utils/stores";
 
 const MILLISECONDS_IN_SECOND = 1000;
 const DEFAULT_PING_INTERVAL_SECONDS = 10;
@@ -24,10 +20,10 @@ export const useBackStore = defineStore("back", {
   }),
   getters: {
     protocol() {
-      return getRestApiProtocol()
+      return getRestApiProtocol();
     },
     port() {
-      return getRestApiPort(this.default_local_port)
+      return getRestApiPort(this.default_local_port);
     },
     base_url() {
       const infraStore = useInfraStore();
diff --git a/app/stores/viewer.js b/app/stores/viewer.js
index 592c60cf8..3b0f4e96a 100644
--- a/app/stores/viewer.js
+++ b/app/stores/viewer.js
@@ -16,10 +16,9 @@ import { viewer_call } from "@ogw_internal/utils/viewer_call";
 import {
   isCloudMode,
   getWebsocketApiProtocol,
-  getWebsocketApiPort
+  getWebsocketApiPort,
 } from "@ogw_front/utils/stores.js";
 
-
 const MS_PER_SECOND = 1000;
 const SECONDS_PER_REQUEST = 10;
 const request_timeout = MS_PER_SECOND * SECONDS_PER_REQUEST;
diff --git a/app/utils/log.js b/app/utils/log.js
index ea5fc6c78..6fd4bf54a 100644
--- a/app/utils/log.js
+++ b/app/utils/log.js
@@ -1,7 +1,7 @@
 function startRequestLog(microservice, schema) {
   console.log(`[${microservice.$id}] Request:`, schema.$id);
   const requestStartingTime = new Date(Date.now());
-  return requestStartingTime
+  return requestStartingTime;
 }
 
 function endRequestLog(microservice, schema, requestStartingTime) {
@@ -10,9 +10,9 @@ function endRequestLog(microservice, schema, requestStartingTime) {
     `[${microservice.$id}] Request completed:`,
     schema.$id,
     "in",
-    (requestEndingTime.getSeconds() - requestStartingTime.getSeconds()),
+    requestEndingTime.getSeconds() - requestStartingTime.getSeconds(),
     "s",
   );
 }
 
-export { startRequestLog, endRequestLog }
\ No newline at end of file
+export { startRequestLog, endRequestLog };
diff --git a/app/utils/stores.js b/app/utils/stores.js
index 275e47f8f..aa7cf7337 100644
--- a/app/utils/stores.js
+++ b/app/utils/stores.js
@@ -8,26 +8,25 @@ function isCloudMode() {
 
 function getRestApiProtocol() {
   const protocol = isCloudMode() ? "https" : "http";
-  return protocol
+  return protocol;
 }
 function getRestApiPort(defaultLocalPort) {
   const port = isCloudMode() ? "443" : defaultLocalPort;
-  return port
+  return port;
 }
 function getWebsocketApiProtocol() {
   const protocol = isCloudMode() ? "wss" : "ws";
-  return protocol
+  return protocol;
 }
 function getWebsocketApiPort(defaultLocalPort) {
   const port = isCloudMode() ? "443" : defaultLocalPort;
-  return port
+  return port;
 }
 
-
 export {
   isCloudMode,
   getRestApiPort,
   getRestApiProtocol,
   getWebsocketApiProtocol,
-  getWebsocketApiPort
-}
+  getWebsocketApiPort,
+};
diff --git a/internal/utils/upload_file.js b/internal/utils/upload_file.js
index e584790ee..90e93e331 100644
--- a/internal/utils/upload_file.js
+++ b/internal/utils/upload_file.js
@@ -51,4 +51,4 @@ function upload_file(
   );
 }
 
-export { upload_file };
\ No newline at end of file
+export { upload_file };
diff --git a/shared/utils/fetch_raw.js b/shared/utils/fetch_raw.js
index 98bc75547..bd1f2d67c 100644
--- a/shared/utils/fetch_raw.js
+++ b/shared/utils/fetch_raw.js
@@ -5,11 +5,17 @@ function fetchRaw(
   { route, method, params = {}, baseURL, headers = {}, max_retry, timeout, expectEvent = false },
   { onRequestError, onResponse, onResponseError } = {},
 ) {
-  if (expectEvent) { headers["Accept"] = "text/event-stream" }
+  if (expectEvent) {
+    headers["Accept"] = "text/event-stream";
+  }
 
   const request_options = { method, headers };
-  if (hasBody(params)) { request_options.body = params }
-  if (max_retry) { request_options.max_retry = max_retry }
+  if (hasBody(params)) {
+    request_options.body = params;
+  }
+  if (max_retry) {
+    request_options.max_retry = max_retry;
+  }
 
   function doFetch() {
     return $fetch(route, {
@@ -42,4 +48,4 @@ function fetchRaw(
   return doFetch();
 }
 
-export { fetchRaw };
\ No newline at end of file
+export { fetchRaw };
diff --git a/shared/utils/fetch_schema.js b/shared/utils/fetch_schema.js
index 4aea97b39..165a8481f 100644
--- a/shared/utils/fetch_schema.js
+++ b/shared/utils/fetch_schema.js
@@ -38,4 +38,4 @@ function fetchSchema(
   );
 }
 
-export { fetchSchema };
\ No newline at end of file
+export { fetchSchema };
diff --git a/shared/utils/file.js b/shared/utils/file.js
index b45d9fd87..0dcb993fd 100644
--- a/shared/utils/file.js
+++ b/shared/utils/file.js
@@ -12,4 +12,4 @@ function hasBody(params) {
   }
   return !_.isEmpty(params);
 }
-export { assertFile, hasBody };
\ No newline at end of file
+export { assertFile, hasBody };
diff --git a/shared/utils/utils.js b/shared/utils/utils.js
index 3c3cdcf04..288634263 100644
--- a/shared/utils/utils.js
+++ b/shared/utils/utils.js
@@ -56,14 +56,12 @@ function intersectAllowedObjects(allowedObjectsList) {
   return { commonKeys, allKeys, mergedAllowedObjects };
 }
 
-
 function deriveAllowedObjects(filenames, allowedObjectsList) {
   const { commonKeys, allKeys, mergedAllowedObjects } = intersectAllowedObjects(allowedObjectsList);
 
   const multipleFilesNoCommon =
     filenames.length > 1 && allKeys.length > 0 && commonKeys.length === 0;
 
-
   const selectedGeodeObject = selectGeodeObject(mergedAllowedObjects);
 
   return {
@@ -73,4 +71,4 @@ function deriveAllowedObjects(filenames, allowedObjectsList) {
   };
 }
 
-export { deriveAllowedObjects, getFileExtension };
\ No newline at end of file
+export { deriveAllowedObjects, getFileExtension };

From 4105b30962ae0a068324bc7068539d8ca40f3519 Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Fri, 31 Jul 2026 16:25:29 +0200
Subject: [PATCH 14/20] pr comments + oxlint [skip ci]

---
 app/components/ObjectSelector.vue                    | 12 ++++++------
 app/stores/app.js                                    |  6 +++---
 internal/utils/viewer_call.js                        |  3 +++
 shared/utils/fetch_raw.js                            | 12 ++++++++++--
 shared/utils/{utils.js => response_handlers/load.js} |  4 ++--
 5 files changed, 24 insertions(+), 13 deletions(-)
 rename shared/utils/{utils.js => response_handlers/load.js} (95%)

diff --git a/app/components/ObjectSelector.vue b/app/components/ObjectSelector.vue
index 25baa7893..812f75a92 100644
--- a/app/components/ObjectSelector.vue
+++ b/app/components/ObjectSelector.vue
@@ -1,7 +1,7 @@
 <script setup>
 import FetchingData from "@ogw_front/components/FetchingData.vue";
-import { deriveAllowedObjects } from "@ogw_shared/utils/utils.js";
 import { geode_objects } from "@ogw_front/assets/geode_objects";
+import { resolveAllowedObjects } from "@ogw_shared/utils/response_handlers/load.js.js";
 import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 import { useBackStore } from "@ogw_front/stores/back";
 
@@ -35,12 +35,12 @@ async function getAllowedGeodeObjects() {
   multipleFilesNoCommon.value = false;
 
   const allowedGeodeObjectsList = await fetchAllowedObjectsList();
-  const derived = deriveAllowedObjects(filenames, allowedGeodeObjectsList);
+  const resolved = resolveAllowedObjects(filenames, allowedGeodeObjectsList);
 
-  allowedGeodeObjects.value = derived.allowedGeodeObjects;
-  multipleFilesNoCommon.value = derived.multipleFilesNoCommon;
-  if (derived.selectedGeodeObject) {
-    setGeodeObject(derived.selectedGeodeObject);
+  allowedGeodeObjects.value = resolved.allowedGeodeObjects;
+  multipleFilesNoCommon.value = resolved.multipleFilesNoCommon;
+  if (resolved.selectedGeodeObject) {
+    setGeodeObject(resolved.selectedGeodeObject);
   }
   toggleLoading();
 }
diff --git a/app/stores/app.js b/app/stores/app.js
index ef12f11e9..f4fb6d5c4 100644
--- a/app/stores/app.js
+++ b/app/stores/app.js
@@ -1,9 +1,9 @@
 // Local imports
+import { getRestApiPort, getRestApiProtocol, isCloudMode } from "@ogw_front/utils/stores.js";
 import { api_fetch } from "@ogw_internal/utils/api_fetch.js";
 import { upload_file } from "@ogw_internal/utils/upload_file.js";
 
 import { killExtension } from "@ogw_front/utils/extension.js";
-import { isCloudMode, getRestApiProtocol, getRestApiPort } from "@ogw_front/utils/stores.js";
 import { useInfraStore } from "@ogw_front/stores/infra";
 
 // oxlint-disable-next-line max-lines-per-function, max-statements
@@ -106,7 +106,7 @@ export const useAppStore = defineStore("app", () => {
     return loadedExtensions.value.get(id);
   }
 
-  async function loadExtension(path, port, backendPath = undefined) {
+  async function loadExtension(path, extensionPort, backendPath = undefined) {
     try {
       let finalURL = path;
 
@@ -123,7 +123,7 @@ export const useAppStore = defineStore("app", () => {
       // oxlint-disable-next-line no-inline-comments
       const extensionModule = await import(/* @vite-ignore */ finalURL);
       const store = extensionModule.metadata.store();
-      store.$patch({ default_local_port: port });
+      store.$patch({ default_local_port: extensionPort });
 
       if (finalURL !== path && finalURL.startsWith("blob:")) {
         URL.revokeObjectURL(finalURL);
diff --git a/internal/utils/viewer_call.js b/internal/utils/viewer_call.js
index bed9968fc..6e72ba798 100644
--- a/internal/utils/viewer_call.js
+++ b/internal/utils/viewer_call.js
@@ -1,4 +1,7 @@
+// Third party imports
 import pTimeout from "p-timeout";
+
+// Local imports
 import { endRequestLog, startRequestLog } from "@ogw_front/utils/log";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
 import { validate_schema } from "@ogw_front/utils/validate_schema";
diff --git a/shared/utils/fetch_raw.js b/shared/utils/fetch_raw.js
index bd1f2d67c..17675ada3 100644
--- a/shared/utils/fetch_raw.js
+++ b/shared/utils/fetch_raw.js
@@ -1,12 +1,20 @@
-import { hasBody } from "./file.js";
+// Third party imports
+import _ from "lodash";
 import pTimeout from "p-timeout";
 
+// Local imports
+import { hasBody } from "./file.js";
+
 function fetchRaw(
   { route, method, params = {}, baseURL, headers = {}, max_retry, timeout, expectEvent = false },
   { onRequestError, onResponse, onResponseError } = {},
 ) {
   if (expectEvent) {
-    headers["Accept"] = "text/event-stream";
+    if (_.isEmpty(headers)) {
+      headers["Accept"] = "text/event-stream";
+    } else {
+      headers["Accept"] = `${headers["Accept"]}, text/event-stream`;
+    }
   }
 
   const request_options = { method, headers };
diff --git a/shared/utils/utils.js b/shared/utils/response_handlers/load.js
similarity index 95%
rename from shared/utils/utils.js
rename to shared/utils/response_handlers/load.js
index 288634263..94c12ef4e 100644
--- a/shared/utils/utils.js
+++ b/shared/utils/response_handlers/load.js
@@ -56,7 +56,7 @@ function intersectAllowedObjects(allowedObjectsList) {
   return { commonKeys, allKeys, mergedAllowedObjects };
 }
 
-function deriveAllowedObjects(filenames, allowedObjectsList) {
+function resolveAllowedObjects(filenames, allowedObjectsList) {
   const { commonKeys, allKeys, mergedAllowedObjects } = intersectAllowedObjects(allowedObjectsList);
 
   const multipleFilesNoCommon =
@@ -71,4 +71,4 @@ function deriveAllowedObjects(filenames, allowedObjectsList) {
   };
 }
 
-export { deriveAllowedObjects, getFileExtension };
+export { resolveAllowedObjects, getFileExtension };

From 8a47ae7d48acb23cbd35973c6eed17a0276b3f09 Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Fri, 31 Jul 2026 16:25:40 +0200
Subject: [PATCH 15/20] pr comments + oxlint [skip ci]

---
 shared/utils/fetch_raw.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/shared/utils/fetch_raw.js b/shared/utils/fetch_raw.js
index 17675ada3..b781ab661 100644
--- a/shared/utils/fetch_raw.js
+++ b/shared/utils/fetch_raw.js
@@ -10,10 +10,11 @@ function fetchRaw(
   { onRequestError, onResponse, onResponseError } = {},
 ) {
   if (expectEvent) {
+    const value = "text/event-stream"
     if (_.isEmpty(headers)) {
-      headers["Accept"] = "text/event-stream";
+      headers["Accept"] = value;
     } else {
-      headers["Accept"] = `${headers["Accept"]}, text/event-stream`;
+      headers["Accept"] = `${headers["Accept"]}, ${value}`;
     }
   }
 

From 4ed29282e7731734477ad9b682497875e73d023f Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Fri, 31 Jul 2026 16:26:09 +0200
Subject: [PATCH 16/20] trigger tests


From 9b08756695e29b9d8f8a912500f19f48e3d0d838 Mon Sep 17 00:00:00 2001
From: JulienChampagnol <91873154+JulienChampagnol@users.noreply.github.com>
Date: Fri, 31 Jul 2026 14:27:06 +0000
Subject: [PATCH 17/20] Apply prepare changes

---
 shared/utils/fetch_raw.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/utils/fetch_raw.js b/shared/utils/fetch_raw.js
index b781ab661..5686d9de5 100644
--- a/shared/utils/fetch_raw.js
+++ b/shared/utils/fetch_raw.js
@@ -10,7 +10,7 @@ function fetchRaw(
   { onRequestError, onResponse, onResponseError } = {},
 ) {
   if (expectEvent) {
-    const value = "text/event-stream"
+    const value = "text/event-stream";
     if (_.isEmpty(headers)) {
       headers["Accept"] = value;
     } else {

From 578721c2c7d30c22d76a6de896fff7092414d82d Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Fri, 31 Jul 2026 16:34:53 +0200
Subject: [PATCH 18/20] oxlint & validate_schema is shared

---
 app/stores/viewer.js                          | 4 ++--
 app/utils/stores.js                           | 2 +-
 internal/utils/viewer_call.js                 | 2 +-
 {app => shared}/utils/validate_schema.js      | 0
 tests/unit/utils/validate_schema.nuxt.test.js | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename {app => shared}/utils/validate_schema.js (100%)

diff --git a/app/stores/viewer.js b/app/stores/viewer.js
index 3b0f4e96a..0aeb2ada6 100644
--- a/app/stores/viewer.js
+++ b/app/stores/viewer.js
@@ -14,9 +14,9 @@ import { useInfraStore } from "@ogw_front/stores/infra";
 import { viewer_call } from "@ogw_internal/utils/viewer_call";
 
 import {
-  isCloudMode,
-  getWebsocketApiProtocol,
   getWebsocketApiPort,
+  getWebsocketApiProtocol,
+  isCloudMode,
 } from "@ogw_front/utils/stores.js";
 
 const MS_PER_SECOND = 1000;
diff --git a/app/utils/stores.js b/app/utils/stores.js
index aa7cf7337..eb4a92522 100644
--- a/app/utils/stores.js
+++ b/app/utils/stores.js
@@ -1,5 +1,5 @@
-import { useInfraStore } from "@ogw_front/stores/infra";
 import { appMode } from "@ogw_front/utils/local/app_mode";
+import { useInfraStore } from "@ogw_front/stores/infra";
 
 function isCloudMode() {
   const infraStore = useInfraStore();
diff --git a/internal/utils/viewer_call.js b/internal/utils/viewer_call.js
index 6e72ba798..d03a98484 100644
--- a/internal/utils/viewer_call.js
+++ b/internal/utils/viewer_call.js
@@ -4,7 +4,7 @@ import pTimeout from "p-timeout";
 // Local imports
 import { endRequestLog, startRequestLog } from "@ogw_front/utils/log";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
-import { validate_schema } from "@ogw_front/utils/validate_schema";
+import { validate_schema } from "@ogw_shared/utils/validate_schema";
 
 const ERROR_400 = 400;
 
diff --git a/app/utils/validate_schema.js b/shared/utils/validate_schema.js
similarity index 100%
rename from app/utils/validate_schema.js
rename to shared/utils/validate_schema.js
diff --git a/tests/unit/utils/validate_schema.nuxt.test.js b/tests/unit/utils/validate_schema.nuxt.test.js
index dc5706f33..8fa29b267 100644
--- a/tests/unit/utils/validate_schema.nuxt.test.js
+++ b/tests/unit/utils/validate_schema.nuxt.test.js
@@ -2,7 +2,7 @@
 import { describe, expect, test } from "vitest";
 
 // Local imports
-import { validate_schema } from "@ogw_front/utils/validate_schema";
+import { validate_schema } from "@ogw_shared/utils/validate_schema";
 
 // CONSTANTS
 const MIN_0 = 0;

From 147952eca5fdeb22c0f3a9c43dbae2f1255e28bb Mon Sep 17 00:00:00 2001
From: JulienChampagnol <julien.champagnol@geode-solutions.com>
Date: Fri, 31 Jul 2026 16:38:45 +0200
Subject: [PATCH 19/20] oxlint

---
 app/stores/back.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/stores/back.js b/app/stores/back.js
index d68c06820..806293597 100644
--- a/app/stores/back.js
+++ b/app/stores/back.js
@@ -6,7 +6,11 @@ import { useAppStore } from "@ogw_front/stores/app";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
 import { useInfraStore } from "@ogw_front/stores/infra";
 
-import { isCloudMode, getRestApiProtocol, getRestApiPort } from "@ogw_front/utils/stores";
+import {
+  getRestApiPort,
+  getRestApiProtocol,
+  isCloudMode,
+} from "@ogw_front/utils/stores";
 
 const MILLISECONDS_IN_SECOND = 1000;
 const DEFAULT_PING_INTERVAL_SECONDS = 10;

From d9550da2c3a8c235a0e32fa970f2b4751a043b62 Mon Sep 17 00:00:00 2001
From: JulienChampagnol <91873154+JulienChampagnol@users.noreply.github.com>
Date: Fri, 31 Jul 2026 14:39:26 +0000
Subject: [PATCH 20/20] Apply prepare changes

---
 app/stores/back.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/stores/back.js b/app/stores/back.js
index 806293597..a4034c13e 100644
--- a/app/stores/back.js
+++ b/app/stores/back.js
@@ -6,11 +6,7 @@ import { useAppStore } from "@ogw_front/stores/app";
 import { useFeedbackStore } from "@ogw_front/stores/feedback";
 import { useInfraStore } from "@ogw_front/stores/infra";
 
-import {
-  getRestApiPort,
-  getRestApiProtocol,
-  isCloudMode,
-} from "@ogw_front/utils/stores";
+import { getRestApiPort, getRestApiProtocol, isCloudMode } from "@ogw_front/utils/stores";
 
 const MILLISECONDS_IN_SECOND = 1000;
 const DEFAULT_PING_INTERVAL_SECONDS = 10;