@geode/opengeodeweb-front 10.6.1 → 10.6.2

package/.oxlintrc.json

@@ -2,7 +2,7 @@
   "categories": {
     "correctness": "error",
     "suspicious": "error",
-    "pedantic": "warn",
+    "pedantic": "error",
     "perf": "error",
     "style": "error",
     "restriction": "error"
@@ -45,18 +45,60 @@
       }
     ],
     "eslint/no-console": "warn", // Disable for debugging. Disable later to not have browser logs
-    "sort-imports": ["error", { "allowSeparatedGroups": true }],
+    "sort-imports": [
+      "error",
+      {
+        "allowSeparatedGroups": true
+      }
+    ],
     "eslint/no-undefined": "off", // Conflict with unicorn/no-typeof-undefined which prefers direct undefined comparison
     "import/prefer-default-export": "off",
     "import/no-named-export": "off",
-    "import/no-namespace": ["error", { "ignore": ["vuetify/*"] }],
-    "vue/max-props": ["error", { "maxProps": 8 }],
+    "import/no-namespace": [
+      "error",
+      {
+        "ignore": ["vuetify/*"]
+      }
+    ],
+    "import/max-dependencies": [
+      "warn",
+      {
+        "max": 10
+      }
+    ],
+    "max-lines-per-function": [
+      "warn",
+      {
+        "max": 50,
+        "skipBlankLines": true,
+        "skipComments": true
+      }
+    ],
+    "unicorn/no-useless-undefined": "off",
+    "max-lines": [
+      "error",
+      {
+        "skipBlankLines": true,
+        "skipComments": true
+      }
+    ],
+    "vue/max-props": [
+      "error",
+      {
+        "maxProps": 8
+      }
+    ],
     "oxc/no-optional-chaining": "off",
     "node/no-process-env": "off",
     "no-continue": "off",
     "vitest/require-hook": "off",
     "import/unambiguous": "off",
-    "max-params": ["warn", { "max": 4 }],
+    "max-params": [
+      "warn",
+      {
+        "max": 4
+      }
+    ],
     "import/no-nodejs-modules": "off",
     "eslint/no-magic-numbers": [
       "error",
@@ -94,7 +136,9 @@
       "rules": {
         "vitest/require-hook": "off",
         "vitest/no-hooks": "off",
-        "vitest/no-importing-vitest-globals": "off"
+        "vitest/no-importing-vitest-globals": "off",
+        "max-lines-per-function": "off",
+        "max-statements": "off"
       }
     },
     {

package/app/components/Recaptcha.vue

@@ -1,5 +1,5 @@
 <script setup>
-  import { appMode } from "@ogw_front/utils/app_mode"
+  import { appMode } from "@ogw_front/utils/local/app_mode"
   import { useInfraStore } from "@ogw_front/stores/infra"
 
   const RESPONSE_STATUS_OK = 200

package/app/stores/app.js

@@ -265,27 +265,25 @@ export const useAppStore = defineStore("app", () => {
 
   const projectFolderPath = ref("")
   function createProjectFolder() {
-    const { PROJECT } = useRuntimeConfig().public
     const schema = {
       $id: "/api/app/project_folder_path",
       methods: ["POST"],
       type: "object",
-      properties: {
-        PROJECT: { type: "string" },
-      },
-      required: ["PROJECT"],
+      properties: {},
+      required: [],
       additionalProperties: true,
     }
-    const params = { PROJECT }
-
-    console.log(createProjectFolder.name, { PROJECT })
 
-    return request(schema, params, {
-      response_function: async (response) => {
-        console.log(`[APP] ${response.projectFolderPath} created`)
-        projectFolderPath.value = response.projectFolderPath
+    return request(
+      schema,
+      {},
+      {
+        response_function: async (response) => {
+          console.log(`[APP] ${response.projectFolderPath} created`)
+          projectFolderPath.value = response.projectFolderPath
+        },
       },
-    })
+    )
   }
 
   return {

package/app/stores/geode.js

@@ -1,6 +1,6 @@
 import { Status } from "@ogw_front/utils/status"
 import { api_fetch } from "@ogw_internal/utils/api_fetch"
-import { appMode } from "@ogw_front/utils/app_mode"
+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"
@@ -82,28 +82,16 @@ export const useGeodeStore = defineStore("geode", {
     launch(args) {
       console.log("[GEODE] Launching back microservice...", { args })
       const appStore = useAppStore()
-
-      const { BACK_PATH, BACK_COMMAND } = useRuntimeConfig().public
-
-      console.log("[GEODE] BACK_PATH", BACK_PATH)
-      console.log("[GEODE] BACK_COMMAND", BACK_COMMAND)
       const schema = {
         $id: "/api/app/run_back",
         methods: ["POST"],
         type: "object",
-        properties: {
-          BACK_PATH: { type: "string" },
-          BACK_COMMAND: { type: "string" },
-        },
-        required: ["BACK_PATH", "BACK_COMMAND"],
+        properties: {},
+        required: [],
         additionalProperties: true,
       }
 
-      const params = {
-        BACK_PATH,
-        BACK_COMMAND,
-        args,
-      }
+      const params = { args }
 
       console.log("[GEODE] params", params)
       return appStore.request(schema, params, {

package/app/stores/infra.js

@@ -1,13 +1,12 @@
-import { appMode, getAppMode } from "@ogw_front/utils/app_mode"
 import { Status } from "@ogw_front/utils/status"
+import { appMode } from "@ogw_front/utils/local/app_mode"
+import { registerRunningExtensions } from "@ogw_front/utils/extension"
 import { useAppStore } from "@ogw_front/stores/app"
 import { useLambdaStore } from "@ogw_front/stores/lambda"
 
-import { registerRunningExtensions } from "@ogw_front/utils/extension"
-
 export const useInfraStore = defineStore("infra", {
   state: () => ({
-    app_mode: getAppMode(),
+    app_mode: useRuntimeConfig().public.MODE,
     ID: "",
     is_captcha_validated: false,
     status: Status.NOT_CREATED,

package/app/stores/viewer.js

@@ -8,11 +8,10 @@ import "@kitware/vtk.js/Rendering/OpenGL/Profiles/Geometry"
 import SmartConnect from "wslink/src/SmartConnect"
 import { connectImageStream } from "@kitware/vtk.js/Rendering/Misc/RemoteView"
 import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
-import { useRuntimeConfig } from "nuxt/app"
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { appMode } from "@ogw_front/utils/app_mode"
+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"
@@ -140,29 +139,16 @@ export const useViewerStore = defineStore(
     function launch(args = { projectFolderPath }) {
       console.log("[VIEWER] Launching viewer microservice...", { args })
       const appStore = useAppStore()
-
-      const { VIEWER_PATH, VIEWER_COMMAND } = useRuntimeConfig().public
-
-      console.log("[VIEWER] VIEWER_PATH", VIEWER_PATH)
-      console.log("[VIEWER] VIEWER_COMMAND", VIEWER_COMMAND)
       const schema = {
         $id: "/api/app/run_viewer",
         methods: ["POST"],
         type: "object",
-        properties: {
-          VIEWER_PATH: { type: "string" },
-          VIEWER_COMMAND: { type: "string" },
-        },
-        required: ["VIEWER_PATH", "VIEWER_COMMAND"],
+        properties: {},
+        required: [],
         additionalProperties: true,
       }
 
-      const params = {
-        VIEWER_PATH,
-        VIEWER_COMMAND,
-        args,
-      }
-
+      const params = { args }
       console.log("[VIEWER] params", params)
 
       return appStore.request(schema, params, {

package/app/utils/extension.js

@@ -2,7 +2,6 @@
 
 // Third party imports
 import _ from "lodash"
-import { useRuntimeConfig } from "nuxt/app"
 
 // Local imports
 import { useAppStore } from "@ogw_front/stores/app"

package/app/utils/file_import_workflow.js

@@ -41,7 +41,7 @@ async function importItem(item) {
   const treeviewStore = useTreeviewStore()
   const registerTask = dataStore.registerObject(item.id)
   const addDataTask = dataStore.addItem(item)
-  console.log({ dataStore })
+
   const addDataComponentsTask =
     item.viewer_type === "model"
       ? dataStore.addComponents(item)

package/app/utils/local/app_mode.js

@@ -0,0 +1,7 @@
+const appMode = {
+  DESKTOP: "DESKTOP",
+  BROWSER: "BROWSER",
+  CLOUD: "CLOUD",
+}
+
+export { appMode }

package/app/utils/local/cleanup.js

@@ -0,0 +1,151 @@
+// Node imports
+import fs from "node:fs"
+import path from "node:path"
+import { setTimeout } from "node:timers/promises"
+
+// Third party imports
+import { WebSocket } from "ws"
+import pTimeout from "p-timeout"
+import { rimraf } from "rimraf"
+
+const MAX_DELETE_FOLDER_RETRIES = 5
+
+async function deleteFolderRecursive(folderPath) {
+  if (!fs.existsSync(folderPath)) {
+    console.log(`Folder ${folderPath} does not exist.`)
+    return
+  }
+  for (let i = 0; i <= MAX_DELETE_FOLDER_RETRIES; i += 1) {
+    try {
+      console.log(`Deleting folder: ${folderPath}`)
+      // oxlint-disable-next-line no-await-in-loop
+      await rimraf(folderPath)
+      console.log(`Deleted folder: ${folderPath}`)
+      return
+    } catch (error) {
+      console.error(`Error deleting folder ${folderPath}:`, error)
+      // Wait before retrying
+      const MILLISECONDS_PER_RETRY = 1000
+      const DELAY = MILLISECONDS_PER_RETRY * (i + 1)
+      // oxlint-disable-next-line no-await-in-loop
+      await setTimeout(DELAY)
+      console.log("Retrying delete folder")
+    }
+  }
+}
+
+function killHttpMicroservice(microservice) {
+  console.log("killHttpMicroservice", { ...microservice })
+  const failMessage = `Failed to kill ${microservice.name}`
+  async function do_kill() {
+    try {
+      await fetch(microservice.url, {
+        method: microservice.method,
+      })
+      throw new Error(failMessage)
+    } catch (error) {
+      console.log(`${microservice.name} closed`, error)
+    }
+  }
+  return pTimeout(do_kill(), {
+    milliseconds: 5000,
+    message: failMessage,
+  })
+}
+
+function killWebsocketMicroservice(microservice) {
+  console.log("killWebsocketMicroservice", { ...microservice })
+  const failMessage = `Failed to kill ${microservice.name}`
+  const successMessage = `Disconnected from ${microservice.name} WebSocket server`
+  function do_kill() {
+    // oxlint-disable-next-line promise/avoid-new
+    return new Promise((resolve) => {
+      const socket = new WebSocket(microservice.url)
+      socket.on("open", () => {
+        console.log("Connected to WebSocket server")
+        socket.send(
+          JSON.stringify({
+            id: "system:hello",
+            method: "wslink.hello",
+            args: [{ secret: "wslink-secret" }],
+          }),
+        )
+      })
+      socket.on("message", (data) => {
+        const message = data.toString()
+        console.log("Received from server:", message)
+        if (message.includes("hello")) {
+          socket.send(
+            JSON.stringify({
+              id: "application.exit",
+              method: "application.exit",
+            }),
+          )
+          console.log(successMessage)
+          socket.close()
+          resolve()
+        }
+      })
+      socket.on("close", () => {
+        console.log(successMessage)
+        resolve()
+      })
+      socket.on("error", (error) => {
+        console.error("WebSocket error:", error)
+        socket.close()
+        resolve()
+      })
+    })
+  }
+  return pTimeout(do_kill(), {
+    milliseconds: 5000,
+    message: failMessage,
+  })
+}
+
+function killMicroservice(microservice) {
+  if (microservice.type === "back") {
+    return killHttpMicroservice(microservice)
+  } else if (microservice.type === "viewer") {
+    return killWebsocketMicroservice(microservice)
+  } else {
+    throw new Error(`Unknown microservice type: ${microservice.type}`)
+  }
+}
+
+function killMicroservices(microservices) {
+  console.log("killMicroservices", { microservices })
+  return Promise.all(
+    microservices.map(
+      async (microservice) => await killMicroservice(microservice),
+    ),
+  )
+}
+
+function projectMicroservices(projectFolderPath) {
+  console.log("projectMicroservices", { projectFolderPath })
+  const filePath = microservicesMetadatasPath(projectFolderPath)
+
+  if (!fs.existsSync(filePath)) {
+    const microservicesMetadatas = { microservices: [] }
+    fs.writeFileSync(
+      filePath,
+      JSON.stringify(microservicesMetadatas, undefined, 2),
+      "utf8",
+    )
+  }
+  const content = JSON.parse(fs.readFileSync(filePath, "utf8"))
+  return content.microservices
+}
+
+async function cleanupBackend(projectFolderPath) {
+  const microservices = projectMicroservices(projectFolderPath)
+  await killMicroservices(microservices)
+  await deleteFolderRecursive(projectFolderPath)
+}
+
+function microservicesMetadatasPath(projectFolderPath) {
+  return path.join(projectFolderPath, "microservices.json")
+}
+
+export { cleanupBackend, microservicesMetadatasPath }

package/app/utils/local/microservices.js

@@ -4,18 +4,14 @@ import fs from "node:fs"
 import path from "node:path"
 
 // Third party imports
-import { WebSocket } from "ws"
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json" with { type: "json" }
 import { getPort } from "get-port-please"
 import pTimeout from "p-timeout"
 
 // Local imports
 import { commandExistsSync, waitForReady } from "./scripts.js"
-import {
-  deleteFolderRecursive,
-  executableName,
-  executablePath,
-} from "./path.js"
+import { executableName, executablePath } from "./path.js"
+import { microservicesMetadatasPath } from "./cleanup.js"
 
 const DEFAULT_TIMEOUT_SECONDS = 30
 const MILLISECONDS_PER_SECOND = 1000
@@ -34,9 +30,12 @@ async function runScript(
   expectedResponse,
   timeoutSeconds = DEFAULT_TIMEOUT_SECONDS,
 ) {
-  const command = commandExistsSync(execName)
-    ? execName
-    : path.join(await executablePath(execPath), executableName(execName))
+  let command = ""
+  if (commandExistsSync(execName)) {
+    command = execName
+  } else {
+    command = path.join(executablePath(execPath), executableName(execName))
+  }
   console.log("runScript", command, args)
   const child = child_process.spawn(command, args, {
     encoding: "utf8",
@@ -119,93 +118,6 @@ async function runViewer(execName, execPath, args = {}) {
   return port
 }
 
-function killHttpMicroservice(microservice) {
-  console.log("killHttpMicroservice", { ...microservice })
-  const failMessage = `Failed to kill ${microservice.name}`
-  async function do_kill() {
-    try {
-      await fetch(microservice.url, {
-        method: microservice.method,
-      })
-      throw new Error(failMessage)
-    } catch (error) {
-      console.log(`${microservice.name} closed`, error)
-    }
-  }
-  return pTimeout(do_kill(), {
-    milliseconds: 5000,
-    message: failMessage,
-  })
-}
-
-function killWebsocketMicroservice(microservice) {
-  console.log("killWebsocketMicroservice", { ...microservice })
-  const failMessage = `Failed to kill ${microservice.name}`
-  const successMessage = `Disconnected from ${microservice.name} WebSocket server`
-  function do_kill() {
-    // oxlint-disable-next-line promise/avoid-new
-    return new Promise((resolve) => {
-      const socket = new WebSocket(microservice.url)
-      socket.on("open", () => {
-        console.log("Connected to WebSocket server")
-        socket.send(
-          JSON.stringify({
-            id: "system:hello",
-            method: "wslink.hello",
-            args: [{ secret: "wslink-secret" }],
-          }),
-        )
-      })
-      socket.on("message", (data) => {
-        const message = data.toString()
-        console.log("Received from server:", message)
-        if (message.includes("hello")) {
-          socket.send(
-            JSON.stringify({
-              id: "application.exit",
-              method: "application.exit",
-            }),
-          )
-          console.log(successMessage)
-          socket.close()
-          resolve()
-        }
-      })
-      socket.on("close", () => {
-        console.log(successMessage)
-        resolve()
-      })
-      socket.on("error", (error) => {
-        console.error("WebSocket error:", error)
-        socket.close()
-        resolve()
-      })
-    })
-  }
-  return pTimeout(do_kill(), {
-    milliseconds: 5000,
-    message: failMessage,
-  })
-}
-
-function killMicroservice(microservice) {
-  if (microservice.type === "back") {
-    return killHttpMicroservice(microservice)
-  } else if (microservice.type === "viewer") {
-    return killWebsocketMicroservice(microservice)
-  } else {
-    throw new Error(`Unknown microservice type: ${microservice.type}`)
-  }
-}
-
-function killMicroservices(microservices) {
-  console.log("killMicroservices", { microservices })
-  return Promise.all(
-    microservices.map(
-      async (microservice) => await killMicroservice(microservice),
-    ),
-  )
-}
 function projectMicroservices(projectFolderPath) {
   console.log("projectMicroservices", { projectFolderPath })
   const filePath = microservicesMetadatasPath(projectFolderPath)
@@ -222,16 +134,6 @@ function projectMicroservices(projectFolderPath) {
   return content.microservices
 }
 
-async function cleanupBackend(projectFolderPath) {
-  const microservices = projectMicroservices(projectFolderPath)
-  await killMicroservices(microservices)
-  await deleteFolderRecursive(projectFolderPath)
-}
-
-function microservicesMetadatasPath(projectFolderPath) {
-  return path.join(projectFolderPath, "microservices.json")
-}
-
 function addMicroserviceMetadatas(projectFolderPath, serviceObj) {
   const microservices = projectMicroservices(projectFolderPath)
   if (serviceObj.type === "back") {
@@ -250,12 +152,4 @@ function addMicroserviceMetadatas(projectFolderPath, serviceObj) {
   )
 }
 
-export {
-  addMicroserviceMetadatas,
-  cleanupBackend,
-  getAvailablePort,
-  killMicroservices,
-  projectMicroservices,
-  runBack,
-  runViewer,
-}
+export { addMicroserviceMetadatas, getAvailablePort, runBack, runViewer }

package/app/utils/local/path.js

@@ -2,37 +2,22 @@
 import fs from "node:fs"
 import os from "node:os"
 import path from "node:path"
-import { setTimeout } from "node:timers/promises"
 
 // Third party imports
-import isElectron from "is-electron"
-import { rimraf } from "rimraf"
 import { v4 as uuidv4 } from "uuid"
 
-const MAX_DELETE_FOLDER_RETRIES = 5
+// Local imports
+import { appMode } from "./app_mode.js"
 
-function venvScriptPath(microservicePath) {
-  const venvPath = path.join(microservicePath, "venv")
-  let scriptPath = ""
-  if (process.platform === "win32") {
-    scriptPath = path.join(venvPath, "Scripts")
-  } else {
-    scriptPath = path.join(venvPath, "bin")
-  }
-  return scriptPath
-}
-
-async function executablePath(microservicePath) {
-  if (isElectron()) {
-    const electron = await import("electron")
-    if (electron.app.isPackaged) {
-      return process.resourcesPath
-    } else {
-      return venvScriptPath(microservicePath)
-    }
-  } else {
-    return venvScriptPath(microservicePath)
+function executablePath(microservicePath) {
+  console.log("[executablePath]", { microservicePath }, process.env.NODE_ENV)
+  if (
+    useRuntimeConfig().public.MODE === appMode.DESKTOP &&
+    process.env.NODE_ENV === "production"
+  ) {
+    return process.env.RESOURCES_PATH
   }
+  return microservicePath
 }
 
 function executableName(name) {
@@ -54,33 +39,4 @@ function generateProjectFolderPath(projectName) {
   return path.join(os.tmpdir(), projectName.replace(/\//g, "_"), uuidv4())
 }
 
-async function deleteFolderRecursive(folderPath) {
-  if (!fs.existsSync(folderPath)) {
-    console.log(`Folder ${folderPath} does not exist.`)
-    return
-  }
-  for (let i = 0; i <= MAX_DELETE_FOLDER_RETRIES; i += 1) {
-    try {
-      console.log(`Deleting folder: ${folderPath}`)
-      // oxlint-disable-next-line no-await-in-loop
-      await rimraf(folderPath)
-      console.log(`Deleted folder: ${folderPath}`)
-      return
-    } catch (error) {
-      console.error(`Error deleting folder ${folderPath}:`, error)
-      // Wait before retrying
-      const MILLISECONDS_PER_RETRY = 1000
-      const DELAY = MILLISECONDS_PER_RETRY * (i + 1)
-      // oxlint-disable-next-line no-await-in-loop
-      await setTimeout(DELAY)
-      console.log("Retrying delete folder")
-    }
-  }
-}
-export {
-  createPath,
-  executablePath,
-  executableName,
-  deleteFolderRecursive,
-  generateProjectFolderPath,
-}
+export { createPath, executablePath, executableName, generateProjectFolderPath }

package/app/utils/local/scripts.js

@@ -4,6 +4,8 @@ import fs from "node:fs"
 import { on } from "node:events"
 import path from "node:path"
 
+import { appMode } from "./app_mode.js"
+
 function commandExistsSync(execName) {
   const envPath = process.env.PATH || ""
   return envPath.split(path.delimiter).some((dir) => {
@@ -37,7 +39,7 @@ async function waitNuxt(nuxtProcess) {
 }
 
 async function runBrowser(scriptName) {
-  process.env.BROWSER = true
+  process.env.MODE = appMode.BROWSER
 
   const nuxtProcess = child_process.spawn("npm", ["run", scriptName], {
     shell: true,

package/nuxt.config.js

@@ -11,26 +11,13 @@ export default defineNuxtConfig({
   runtimeConfig: {
     public: {
       API_URL: "api.geode-solutions.com",
-      BACK_COMMAND: "opengeodeweb-back",
-      BACK_PATH: path.join(
-        __dirname,
-        "tests",
-        "integration",
-        "microservices",
-        "back",
-      ),
-      BROWSER: process.env.BROWSER ?? false,
+      COMMAND_BACK: "opengeodeweb-back",
+      COMMAND_VIEWER: "opengeodeweb-viewer",
+      NUXT_ROOT_PATH: __dirname,
+      MODE: process.env.MODE || "CLOUD",
       PROJECT: package_json.name,
       SITE_BRANCH:
         process.env.NODE_ENV === "production" ? process.env.SITE_BRANCH : "",
-      VIEWER_COMMAND: "opengeodeweb-viewer",
-      VIEWER_PATH: path.join(
-        __dirname,
-        "tests",
-        "integration",
-        "microservices",
-        "viewer",
-      ),
     },
   },
 
@@ -69,7 +56,6 @@ export default defineNuxtConfig({
         "fast-deep-equal",
         "globalthis",
         "h3",
-        "is-electron",
         "js-file-download",
         "lodash",
         "seedrandom",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.6.1",
+  "version": "10.6.2",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {
@@ -23,6 +23,9 @@
   },
   "scripts": {
     "lint": "eslint --fix --ext .js,.vue --ignore-path .gitignore .",
+    "build:back": "npx opengeodeweb-microservice-pyinstaller ../OpenGeodeWeb-Back",
+    "build:viewer": "npx opengeodeweb-microservice-pyinstaller ../OpenGeodeWeb-Viewer",
+    "build:microservices": "concurrently \"npm run build:back\" \"npm run build:viewer\"",
     "test": "npm run test:unit",
     "tests": "vitest --config ./tests/vitest.config.js",
     "test:unit": "npm run tests --project unit",
@@ -45,7 +48,6 @@
     "conf": "15.1.0",
     "dexie": "4.2.1",
     "get-port-please": "3.2.0",
-    "is-electron": "2.2.2",
     "js-file-download": "0.4.12",
     "jszip": "3.10.1",
     "node-stream-zip": "1.15.0",

package/server/api/app/project_folder_path.post.js

@@ -1,7 +1,7 @@
 // Node imports
 
 // Third party imports
-import { createError, defineEventHandler, readBody } from "h3"
+import { createError, defineEventHandler } from "h3"
 
 // Local imports
 import {
@@ -9,9 +9,12 @@ import {
   generateProjectFolderPath,
 } from "@geode/opengeodeweb-front/app/utils/local/path.js"
 
+import { useRuntimeConfig } from "nitropack/runtime"
+
 export default defineEventHandler(async (event) => {
   try {
-    const { PROJECT } = await readBody(event)
+    const config = useRuntimeConfig(event).public
+    const { PROJECT } = config
     const projectFolderPath = generateProjectFolderPath(PROJECT)
     await createPath(projectFolderPath)
 

package/server/api/app/run_back.post.js

@@ -9,13 +9,17 @@ import {
   runBack,
 } from "@geode/opengeodeweb-front/app/utils/local/microservices.js"
 
+import { useRuntimeConfig } from "nitropack/runtime"
+
 export default defineEventHandler(async (event) => {
   try {
-    const { BACK_COMMAND, BACK_PATH, args } = await readBody(event)
-    const port = await runBack(BACK_COMMAND, BACK_PATH, args)
+    const config = useRuntimeConfig(event).public
+    const { COMMAND_BACK, NUXT_ROOT_PATH } = config
+    const { args } = await readBody(event)
+    const port = await runBack(COMMAND_BACK, NUXT_ROOT_PATH, args)
     await addMicroserviceMetadatas(args.projectFolderPath, {
       type: "back",
-      name: BACK_COMMAND,
+      name: COMMAND_BACK,
       port,
     })
 

package/server/api/app/run_viewer.post.js

@@ -9,13 +9,17 @@ import {
   runViewer,
 } from "@geode/opengeodeweb-front/app/utils/local/microservices.js"
 
+import { useRuntimeConfig } from "nitropack/runtime"
+
 export default defineEventHandler(async (event) => {
   try {
-    const { VIEWER_COMMAND, VIEWER_PATH, args } = await readBody(event)
-    const port = await runViewer(VIEWER_COMMAND, VIEWER_PATH, args)
+    const config = useRuntimeConfig(event).public
+    const { COMMAND_VIEWER, NUXT_ROOT_PATH } = config
+    const { args } = await readBody(event)
+    const port = await runViewer(COMMAND_VIEWER, NUXT_ROOT_PATH, args)
     await addMicroserviceMetadatas(args.projectFolderPath, {
       type: "viewer",
-      name: VIEWER_COMMAND,
+      name: COMMAND_VIEWER,
       port,
     })
 

package/tests/integration/setup.js

@@ -4,7 +4,6 @@ import path from "node:path"
 
 // Third party imports
 import { afterAll, beforeAll, expect, vi } from "vitest"
-import { useRuntimeConfig } from "nuxt/app"
 
 // Local imports
 import {
@@ -17,7 +16,7 @@ import {
   generateProjectFolderPath,
 } from "@ogw_front/utils/local/path"
 import { Status } from "@ogw_front/utils/status"
-import { appMode } from "@ogw_front/utils/app_mode"
+import { appMode } from "@ogw_front/utils/local/app_mode"
 import { importFile } from "@ogw_front/utils/file_import_workflow"
 import { setupActivePinia } from "@ogw_tests/utils"
 import { useGeodeStore } from "@ogw_front/stores/geode"
@@ -32,17 +31,17 @@ async function runMicroservices() {
   const infraStore = useInfraStore()
   const viewerStore = useViewerStore()
   infraStore.app_mode = appMode.BROWSER
-  const { BACK_COMMAND, BACK_PATH, PROJECT, VIEWER_COMMAND, VIEWER_PATH } =
+  const { COMMAND_BACK, PROJECT, COMMAND_VIEWER, NUXT_ROOT_PATH } =
     useRuntimeConfig().public
   const projectFolderPath = generateProjectFolderPath(PROJECT)
   await createPath(projectFolderPath)
 
   const [back_port, viewer_port] = await Promise.all([
-    runBack(BACK_COMMAND, BACK_PATH, {
+    runBack(COMMAND_BACK, NUXT_ROOT_PATH, {
       projectFolderPath,
       uploadFolderPath: data_folder,
     }),
-    runViewer(VIEWER_COMMAND, VIEWER_PATH, { projectFolderPath }),
+    runViewer(COMMAND_VIEWER, NUXT_ROOT_PATH, { projectFolderPath }),
   ])
 
   console.log("back_port", back_port)
@@ -50,12 +49,12 @@ async function runMicroservices() {
 
   await addMicroserviceMetadatas(projectFolderPath, {
     type: "back",
-    name: BACK_COMMAND,
+    name: COMMAND_BACK,
     port: back_port,
   })
   await addMicroserviceMetadatas(projectFolderPath, {
     type: "viewer",
-    name: VIEWER_COMMAND,
+    name: COMMAND_VIEWER,
     port: viewer_port,
   })
 

package/tests/integration/stores/data_style/mesh/cells.nuxt.test.js

@@ -4,7 +4,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { cleanupBackend } from "@ogw_front/utils/local/microservices"
+import { cleanupBackend } from "@ogw_front/utils/local/cleanup"
 import { setupIntegrationTests } from "@ogw_tests/integration/setup"
 import { useDataStyleStore } from "@ogw_front/stores/data_style"
 import { useViewerStore } from "@ogw_front/stores/viewer"

package/tests/integration/stores/data_style/mesh/edges.nuxt.test.js

@@ -4,7 +4,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { cleanupBackend } from "@ogw_front/utils/local/microservices"
+import { cleanupBackend } from "@ogw_front/utils/local/cleanup"
 import { setupIntegrationTests } from "@ogw_tests/integration/setup"
 import { useDataStyleStore } from "@ogw_front/stores/data_style"
 import { useViewerStore } from "@ogw_front/stores/viewer"

package/tests/integration/stores/data_style/mesh/index.nuxt.test.js

@@ -4,7 +4,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { cleanupBackend } from "@ogw_front/utils/local/microservices"
+import { cleanupBackend } from "@ogw_front/utils/local/cleanup"
 import { setupIntegrationTests } from "@ogw_tests/integration/setup"
 import { useDataStyleStore } from "@ogw_front/stores/data_style"
 import { useViewerStore } from "@ogw_front/stores/viewer"

package/tests/integration/stores/data_style/mesh/points.nuxt.test.js

@@ -4,7 +4,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { cleanupBackend } from "@ogw_front/utils/local/microservices"
+import { cleanupBackend } from "@ogw_front/utils/local/cleanup"
 import { setupIntegrationTests } from "@ogw_tests/integration/setup"
 import { useDataStyleStore } from "@ogw_front/stores/data_style"
 import { useViewerStore } from "@ogw_front/stores/viewer"

package/tests/integration/stores/data_style/mesh/polygons.nuxt.test.js

@@ -4,7 +4,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { cleanupBackend } from "@ogw_front/utils/local/microservices"
+import { cleanupBackend } from "@ogw_front/utils/local/cleanup"
 import { setupIntegrationTests } from "@ogw_tests/integration/setup"
 import { useDataStyleStore } from "@ogw_front/stores/data_style"
 import { useViewerStore } from "@ogw_front/stores/viewer"

package/tests/integration/stores/data_style/mesh/polyhedra.nuxt.test.js

@@ -4,7 +4,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { cleanupBackend } from "@ogw_front/utils/local/microservices"
+import { cleanupBackend } from "@ogw_front/utils/local/cleanup"
 import { setupIntegrationTests } from "@ogw_tests/integration/setup"
 import { useDataStyleStore } from "@ogw_front/stores/data_style"
 import { useViewerStore } from "@ogw_front/stores/viewer"

package/tests/integration/stores/data_style/model/blocks.nuxt.test.js

@@ -4,7 +4,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { cleanupBackend } from "@ogw_front/utils/local/microservices"
+import { cleanupBackend } from "@ogw_front/utils/local/cleanup"
 import { setupIntegrationTests } from "@ogw_tests/integration/setup"
 import { useDataStore } from "@ogw_front/stores/data"
 import { useDataStyleStore } from "@ogw_front/stores/data_style"

package/tests/integration/stores/data_style/model/corners.nuxt.test.js

@@ -4,7 +4,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { cleanupBackend } from "@ogw_front/utils/local/microservices"
+import { cleanupBackend } from "@ogw_front/utils/local/cleanup"
 import { setupIntegrationTests } from "@ogw_tests/integration/setup"
 import { useDataStore } from "@ogw_front/stores/data"
 import { useDataStyleStore } from "@ogw_front/stores/data_style"

package/tests/integration/stores/data_style/model/edges.nuxt.test.js

@@ -4,7 +4,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { cleanupBackend } from "@ogw_front/utils/local/microservices"
+import { cleanupBackend } from "@ogw_front/utils/local/cleanup"
 import { setupIntegrationTests } from "@ogw_tests/integration/setup"
 import { useDataStyleStore } from "@ogw_front/stores/data_style"
 import { useViewerStore } from "@ogw_front/stores/viewer"

package/tests/integration/stores/data_style/model/index.nuxt.test.js

@@ -4,7 +4,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { cleanupBackend } from "@ogw_front/utils/local/microservices"
+import { cleanupBackend } from "@ogw_front/utils/local/cleanup"
 import { setupIntegrationTests } from "@ogw_tests/integration/setup"
 import { useDataStyleStore } from "@ogw_front/stores/data_style"
 import { useViewerStore } from "@ogw_front/stores/viewer"

package/tests/integration/stores/data_style/model/lines.nuxt.test.js

@@ -4,7 +4,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { cleanupBackend } from "@ogw_front/utils/local/microservices"
+import { cleanupBackend } from "@ogw_front/utils/local/cleanup"
 import { setupIntegrationTests } from "@ogw_tests/integration/setup"
 import { useDataStore } from "@ogw_front/stores/data"
 import { useDataStyleStore } from "@ogw_front/stores/data_style"

package/tests/integration/stores/data_style/model/points.nuxt.test.js

@@ -4,7 +4,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { cleanupBackend } from "@ogw_front/utils/local/microservices"
+import { cleanupBackend } from "@ogw_front/utils/local/cleanup"
 import { setupIntegrationTests } from "@ogw_tests/integration/setup"
 import { useDataStyleStore } from "@ogw_front/stores/data_style"
 import { useViewerStore } from "@ogw_front/stores/viewer"

package/tests/integration/stores/data_style/model/surfaces.nuxt.test.js

@@ -4,7 +4,7 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { cleanupBackend } from "@ogw_front/utils/local/microservices"
+import { cleanupBackend } from "@ogw_front/utils/local/cleanup"
 import { setupIntegrationTests } from "@ogw_tests/integration/setup"
 import { useDataStore } from "@ogw_front/stores/data"
 import { useDataStyleStore } from "@ogw_front/stores/data_style"

package/tests/integration/stores/viewer.nuxt.test.js

@@ -6,7 +6,7 @@ import opengeodeweb_viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { cleanupBackend } from "@ogw_front/utils/local/microservices"
+import { cleanupBackend } from "@ogw_front/utils/local/cleanup"
 import { runMicroservices } from "@ogw_tests/integration/setup"
 import { setupActivePinia } from "@ogw_tests/utils"
 import { useViewerStore } from "@ogw_front/stores/viewer"

package/tests/unit/composables/project_manager.nuxt.test.js

@@ -2,7 +2,7 @@
 import { beforeEach, describe, expect, test, vi } from "vitest"
 
 // Local imports
-import { appMode } from "@ogw_front/utils/app_mode"
+import { appMode } from "@ogw_front/utils/local/app_mode"
 import { setupActivePinia } from "@ogw_tests/utils"
 import { useProjectManager } from "@ogw_front/composables/project_manager"
 

package/tests/unit/stores/geode.nuxt.test.js

@@ -5,7 +5,7 @@ import { registerEndpoint } from "@nuxt/test-utils/runtime"
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { appMode } from "@ogw_front/utils/app_mode"
+import { appMode } from "@ogw_front/utils/local/app_mode"
 import { setupActivePinia } from "@ogw_tests/utils"
 import { useGeodeStore } from "@ogw_front/stores/geode"
 import { useInfraStore } from "@ogw_front/stores/infra"

package/tests/unit/stores/infra.nuxt.test.js

@@ -4,7 +4,7 @@ import { registerEndpoint } from "@nuxt/test-utils/runtime"
 
 // Local imports
 import { Status } from "@ogw_front/utils/status"
-import { appMode } from "@ogw_front/utils/app_mode"
+import { appMode } from "@ogw_front/utils/local/app_mode"
 import { setupActivePinia } from "@ogw_tests/utils"
 import { useGeodeStore } from "@ogw_front/stores/geode"
 import { useInfraStore } from "@ogw_front/stores/infra"

package/tests/unit/stores/viewer.nuxt.test.js

@@ -12,7 +12,7 @@ import {
 
 import { WebSocket } from "ws"
 // Local imports
-import { appMode } from "@ogw_front/utils/app_mode"
+import { appMode } from "@ogw_front/utils/local/app_mode"
 import { setupActivePinia } from "@ogw_tests/utils"
 import { useInfraStore } from "@ogw_front/stores/infra"
 import { useViewerStore } from "@ogw_front/stores/viewer"

package/app/utils/app_mode.js

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

package/tests/integration/microservices/back/requirements-internal.in

@@ -1 +0,0 @@
-opengeodeweb-back

package/tests/integration/microservices/back/requirements.txt

@@ -1,8 +0,0 @@
-#
-# This file is autogenerated by pip-compile with Python 3.12
-# by the following command:
-#
-#    pip-compile --output-file=tests/integration/microservices/back/requirements.txt tests/integration/microservices/back/requirements.in
-#
-
-opengeodeweb-back==6.*,>=6.3.4

package/tests/integration/microservices/viewer/requirements-internal.in

@@ -1 +0,0 @@
-opengeodeweb-viewer

package/tests/integration/microservices/viewer/requirements.txt

@@ -1,8 +0,0 @@
-#
-# This file is autogenerated by pip-compile with Python 3.12
-# by the following command:
-#
-#    pip-compile --output-file=tests/integration/microservices/viewer/requirements.txt tests/integration/microservices/viewer/requirements.in
-#
-
-opengeodeweb-viewer==1.*,>=1.15.6