wip refactor

Author: JulienChampagnol

components/Launcher.vue

@@ -24,11 +24,6 @@
   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) => {

stores/geode.js

@@ -3,26 +3,29 @@ import Status from "@ogw_f/utils/status.js"
 
 export const use_geode_store = defineStore("geode", {
   state: () => ({
-    port: "99",
+    port: "443",
     request_counter: 0,
     status: Status.NOT_CONNECTED,
   }),
   getters: {
     protocol() {
-      if (use_infra_store().app_mode == appMode.CLOUD) {
+      if (use_infra_store().app_mode == appMode.appMode.CLOUD) {
         return "https"
       }
       return "http"
     },
     base_url() {
       const infra_store = use_infra_store()
       let geode_url = `${this.protocol}://${infra_store.domain_name}:${this.port}`
-      if (infra_store.app_mode == appMode.CLOUD) {
+      if (infra_store.app_mode == appMode.appMode.CLOUD) {
         if (infra_store.ID == "") {
           throw new Error("ID must not be empty in cloud mode")
         }
         geode_url += `/${infra_store.ID}/geode`
       }
+      if (infra_store.app_mode == appMode.appMode.BROWSER) {
+        geode_url += `/geode`
+      }
       return geode_url
     },
     is_busy() {

stores/infra.js

@@ -5,16 +5,15 @@ export const use_infra_store = defineStore("infra", {
   state: () => ({
     app_mode: getAppMode(),
     ID: useStorage("ID", ""),
-    is_captcha_validated: true,
+    is_captcha_validated: this.app_mode == appMode.appMode.CLOUD ? false : true,
     status: Status.NOT_CREATED,
   }),
   getters: {
     domain_name() {
-      if (this.app_mode == appMode.CLOUD) {
+      if (this.app_mode == appMode.appMode.CLOUD) {
         return useRuntimeConfig().public.API_URL
-      } else {
-        return "localhost"
       }
+      return "localhost"
     },
     lambda_url() {
       const geode_store = use_geode_store()
@@ -44,6 +43,7 @@ export const use_infra_store = defineStore("infra", {
     async create_backend() {
       console.log("create_backend")
       if (this.status === Status.CREATED) return
+      console.log("1")
       return navigator.locks.request("infra.create_backend", async (lock) => {
         this.status = Status.CREATING
         if (this.status === Status.CREATED) return
@@ -52,14 +52,15 @@ export const use_infra_store = defineStore("infra", {
         const geode_store = use_geode_store()
         const viewer_store = use_viewer_store()
         const feedback_store = use_feedback_store()
-        if (this.app_mode == appMode.CLOUD) {
+        if (this.app_mode == appMode.appMode.DESKTOP) {
           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 {
+        }
+        if (this.app_mode == appMode.appMode.CLOUD) {
           const { data, error } = await useFetch(this.lambda_url, {
             method: "POST",
           })

stores/viewer.js

@@ -16,21 +16,25 @@ export const use_viewer_store = defineStore("viewer", {
   }),
   getters: {
     protocol() {
-      if (use_infra_store().app_mode == appMode.CLOUD) {
+      if (use_infra_store().app_mode == appMode.appMode.CLOUD) {
         return "wss"
       } else {
         return "ws"
       }
     },
     base_url() {
       const infra_store = use_infra_store()
+
       let viewer_url = `${this.protocol}://${infra_store.domain_name}:${this.port}`
-      if (infra_store.is_cloud) {
+      if (infra_store.app_mode == appMode.appMode.CLOUD) {
         if (infra_store.ID == "") {
           throw new Error("ID must not be empty in cloud mode")
         }
         viewer_url += `/${infra_store.ID}/viewer`
       }
+      if (infra_store.app_mode == appMode.appMode.BROWSER) {
+        viewer_url += `/viewer`
+      }
       viewer_url += "/ws"
       return viewer_url
     },

utils/app_mode.js

@@ -7,6 +7,7 @@ export const appMode = {
 }
 
 export function getAppMode() {
+  console.log("getAppMode process.env", process.env)
   if (isElectron()) {
     return appMode.DESKTOP
   }