wip refactor

Author: JulienChampagnol

components/Launcher.vue

@@ -24,10 +24,15 @@
   const infra_store = use_infra_store()
   const site_key = useRuntimeConfig().public.RECAPTCHA_SITE_KEY
 
+  if (import.meta.client) {
+    if (infra_store.is_captcha_validated) {
+      infra_store.create_backend()
+    }
+  }
   watch(
     () => infra_store.is_captcha_validated,
     (value, oldValue) => {
-      if (value && !oldValue && process.client) {
+      if (value && !oldValue && import.meta.client) {
         infra_store.create_backend()
       }
     },

stores/geode.js

@@ -1,10 +1,9 @@
 import back_schemas from "@geode/opengeodeweb-back/schemas.json"
 import Status from "@ogw_f/utils/status.js"
-import appMode from "@ogw_f/utils/app_mode.js"
 
 export const use_geode_store = defineStore("geode", {
   state: () => ({
-    port: "443",
+    port: "99",
     request_counter: 0,
     status: Status.NOT_CONNECTED,
   }),

stores/infra.js

@@ -1,13 +1,11 @@
 import { useStorage } from "@vueuse/core"
-import isElectron from "is-electron"
 import Status from "@ogw_f/utils/status.js"
-import { appMode, getAppMode } from "@ogw_f/utils/app_mode.js"
 
 export const use_infra_store = defineStore("infra", {
   state: () => ({
     app_mode: getAppMode(),
     ID: useStorage("ID", ""),
-    is_captcha_validated: this.app_mode != appMode.CLOUD ? true : false,
+    is_captcha_validated: true,
     status: Status.NOT_CREATED,
   }),
   getters: {
@@ -44,42 +42,43 @@ export const use_infra_store = defineStore("infra", {
   },
   actions: {
     async create_backend() {
+      console.log("create_backend")
       if (this.status === Status.CREATED) return
       return navigator.locks.request("infra.create_backend", async (lock) => {
         this.status = Status.CREATING
         if (this.status === Status.CREATED) return
         console.log("LOCK GRANTED !", lock)
-        if (this.app_mode != appMode.BROWSER) {
-          const geode_store = use_geode_store()
-          const viewer_store = use_viewer_store()
-          const feedback_store = use_feedback_store()
-          if (isElectron()) {
-            const back_port = await window.electronAPI.run_back(
-              geode_store.port,
-            )
-            geode_store.$patch({ default_local_port: back_port })
-            const viewer_port = await window.electronAPI.run_viewer(
-              viewer_store.port,
-            )
-            viewer_store.$patch({ default_local_port: viewer_port })
-          } else {
-            const { data, error } = await useFetch(this.lambda_url, {
-              method: "POST",
-            })
-            if (error.value || !data.value) {
-              this.status = Status.NOT_CREATED
-              feedback_store.server_error = true
-              return
-            }
-            this.ID = data.value.ID
-            localStorage.setItem("ID", data.value.ID)
+        // if (this.app_mode != appMode.BROWSER) {
+        const geode_store = use_geode_store()
+        const viewer_store = use_viewer_store()
+        const feedback_store = use_feedback_store()
+        if (this.app_mode == appMode.CLOUD) {
+          const back_port = await window.electronAPI.run_back(geode_store.port)
+          geode_store.$patch({ default_local_port: back_port })
+          const viewer_port = await window.electronAPI.run_viewer(
+            viewer_store.port,
+          )
+          viewer_store.$patch({ default_local_port: viewer_port })
+        } else {
+          const { data, error } = await useFetch(this.lambda_url, {
+            method: "POST",
+          })
+          if (error.value || !data.value) {
+            this.status = Status.NOT_CREATED
+            feedback_store.server_error = true
+            return
           }
+          this.ID = data.value.ID
+          localStorage.setItem("ID", data.value.ID)
         }
+        // }
         this.status = Status.CREATED
+        console.log("this.status", this.status)
         return this.create_connection()
       })
     },
     async create_connection() {
+      console.log("create_connection")
       await use_viewer_store().ws_connect()
       await use_geode_store().do_ping()
       return

stores/viewer.js

@@ -3,11 +3,10 @@ import vtkWSLinkClient from "@kitware/vtk.js/IO/Core/WSLinkClient"
 import "@kitware/vtk.js/Rendering/OpenGL/Profiles/Geometry"
 import schemas from "@geode/opengeodeweb-viewer/schemas.json"
 import Status from "@ogw_f/utils/status.js"
-import appMode from "@ogw_f/utils/app_mode.js"
 
 export const use_viewer_store = defineStore("viewer", {
   state: () => ({
-    port: "443",
+    port: "99",
     client: {},
     config: null,
     picking_mode: false,

utils/app_mode.js

@@ -1,12 +1,12 @@
 import isElectron from "is-electron"
 
-const appMode = {
+export const appMode = {
   DESKTOP: "DESKTOP",
   BROWSER: "BROWSER",
   CLOUD: "CLOUD",
 }
 
-function getAppMode() {
+export function getAppMode() {
   if (isElectron()) {
     return appMode.DESKTOP
   }