@geode/opengeodeweb-front 10.0.5 → 10.0.6-rc.2

package/app/utils/local.js

@@ -5,10 +5,9 @@ import child_process from "child_process"
 import WebSocket from "ws"
 
 // Third party imports
-import pkg from "electron"
-const { app, dialog } = pkg
 import { getPort } from "get-port-please"
 import isElectron from "is-electron"
+import pTimeout from "p-timeout"
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json" with { type: "json" }
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" with { type: "json" }
 
@@ -23,12 +22,13 @@ function venv_script_path(root_path, microservice_path) {
   return script_path
 }
 
-function executable_path(microservice_path) {
+async function executable_path(microservice_path) {
   if (isElectron()) {
-    if (app.isPackaged) {
+    const electron = await import("electron")
+    if (electron.app.isPackaged) {
       return process.resourcesPath
     } else {
-      return venv_script_path(app.getAppPath(), microservice_path)
+      return venv_script_path(electron.app.getAppPath(), microservice_path)
     }
   } else {
     return venv_script_path(process.cwd(), microservice_path)
@@ -88,8 +88,9 @@ async function run_script(
 
     // You can also use a variable to save the output for when the script closes later
     child.stderr.setEncoding("utf8")
-    child.on("error", (error) => {
-      dialog.showMessageBox({
+    child.on("error", async (error) => {
+      const electron = await import("electron")
+      electron.dialog.showMessageBox({
         title: "Title",
         type: "warning",
         message: "Error occured.\r\n" + error,
@@ -185,71 +186,87 @@ function delete_folder_recursive(data_folder_path) {
     return
   }
   try {
-    fs.rmSync(data_folder_path, { recursive: true, force: true })
-    console.log(`Deleted folder: ${data_folder_path}`)
+    for (const i = 0; i <= 5; i++) {
+      console.log(`Deleting folder: ${data_folder_path}`)
+      fs.rmSync(data_folder_path, { recursive: true, force: true })
+      console.log(`Deleted folder: ${data_folder_path}`)
+      return
+    }
   } catch (err) {
     console.error(`Error deleting folder ${data_folder_path}:`, err)
   }
 }
 
 function kill_back(back_port) {
-  return new Promise((resolve, reject) => {
-    fetch(
-      "http://localhost:" +
-        back_port +
-        "/" +
-        back_schemas.opengeodeweb_back.kill.$id,
-      {
-        method: back_schemas.opengeodeweb_back.kill.methods[0],
-      },
-    )
-      .then(() => {
-        console.log("Back not killed")
-        reject()
-      })
-      .catch(() => {
-        console.log("Back closed")
-        resolve()
-      })
-  })
+  return pTimeout(
+    new Promise((resolve, reject) => {
+      fetch(
+        "http://localhost:" +
+          back_port +
+          "/" +
+          back_schemas.opengeodeweb_back.kill.$id,
+        {
+          method: back_schemas.opengeodeweb_back.kill.methods[0],
+        },
+      )
+        .then(() => {
+          console.log("Failed to kill back")
+          reject()
+        })
+        .catch(() => {
+          console.log("Back closed")
+          resolve()
+        })
+    }),
+    {
+      milliseconds: 500,
+      message: "Failed to kill back",
+    },
+  )
 }
 
 function kill_viewer(viewer_port) {
-  return new Promise((resolve) => {
-    const socket = new WebSocket("ws://localhost:" + viewer_port + "/ws")
-    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")) {
+  return pTimeout(
+    new Promise((resolve) => {
+      const socket = new WebSocket("ws://localhost:" + viewer_port + "/ws")
+      socket.on("open", () => {
+        console.log("Connected to WebSocket server")
         socket.send(
           JSON.stringify({
-            id: viewer_schemas.opengeodeweb_viewer.kill.$id,
-            method: viewer_schemas.opengeodeweb_viewer.kill.$id,
+            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: viewer_schemas.opengeodeweb_viewer.kill.$id,
+              method: viewer_schemas.opengeodeweb_viewer.kill.$id,
+            }),
+          )
+          resolve()
+        }
+      })
+      socket.on("close", () => {
+        console.log("Disconnected from WebSocket server")
         resolve()
-      }
-    })
-    socket.on("close", () => {
-      console.log("Disconnected from WebSocket server")
-      resolve()
-    })
-    socket.on("error", (error) => {
-      console.error("WebSocket error:", error)
-      resolve()
-    })
-  })
+      })
+      socket.on("error", (error) => {
+        console.error("WebSocket error:", error)
+        resolve()
+      })
+    }),
+    {
+      milliseconds: 500,
+      message: "Failed to kill viewer",
+    },
+  )
 }
 
 async function run_browser(

package/package.json

@@ -1,5 +1,9 @@
 {
   "name": "@geode/opengeodeweb-front",
+  "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
+  "type": "module",
+  "version": "10.0.6-rc.2",
+  "main": "./nuxt.config.js",
   "scripts": {
     "lint": "eslint --fix --ext .js,.vue --ignore-path .gitignore .",
     "test": "npm run test:unit",
@@ -9,6 +13,31 @@
     "geode_objects": "node scripts/generate_geode_objects.js && prettier ./assets/geode_objects.js --write",
     "build": ""
   },
+  "dependencies": {
+    "@geode/opengeodeweb-back": "next",
+    "@geode/opengeodeweb-viewer": "next",
+    "@kitware/vtk.js": "33.3.0",
+    "@mdi/font": "7.4.47",
+    "@pinia/nuxt": "0.11.3",
+    "@types/node": "22.15.3",
+    "@vueuse/components": "13.1.0",
+    "@vueuse/nuxt": "13.1.0",
+    "ajv": "8.17.1",
+    "get-port-please": "3.2.0",
+    "is-electron": "2.2.2",
+    "js-file-download": "0.4.12",
+    "nuxt": "4.2.2",
+    "p-timeout": "7.0.1",
+    "pinia": "3.0.4",
+    "sass": "1.87.0",
+    "semver": "7.7.1",
+    "uuid": "11.1.0",
+    "vue3-carousel": "0.3.4",
+    "vuetify": "3.10.11",
+    "vuetify-nuxt-module": "0.18.7",
+    "ws": "8.18.3",
+    "wslink": "1.12.4"
+  },
   "devDependencies": {
     "@nuxt/test-utils": "3.21.0",
     "@pinia/testing": "1.0.3",
@@ -33,36 +62,12 @@
     "vitest": "4.0.15",
     "vitest-environment-nuxt": "1.0.1"
   },
+  "peerDependencies": {
+    "electron": "36.4.0"
+  },
   "overrides": {
     "vue": "latest"
   },
-  "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
-  "type": "module",
-  "version": "10.0.5",
-  "main": "./nuxt.config.js",
-  "dependencies": {
-    "@geode/opengeodeweb-back": "latest",
-    "@geode/opengeodeweb-viewer": "latest",
-    "@kitware/vtk.js": "33.3.0",
-    "@mdi/font": "7.4.47",
-    "@pinia/nuxt": "0.11.3",
-    "@types/node": "22.15.3",
-    "@vueuse/components": "13.1.0",
-    "@vueuse/nuxt": "13.1.0",
-    "ajv": "8.17.1",
-    "get-port-please": "3.2.0",
-    "is-electron": "2.2.2",
-    "js-file-download": "0.4.12",
-    "nuxt": "4.2.2",
-    "pinia": "3.0.4",
-    "sass": "1.87.0",
-    "semver": "7.7.1",
-    "uuid": "11.1.0",
-    "vue3-carousel": "0.3.4",
-    "vuetify": "3.10.11",
-    "ws": "8.18.3",
-    "wslink": "1.12.4"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Geode-solutions/OpenGeodeWeb-Front.git"

package/tests/integration/setup.js

@@ -40,9 +40,11 @@ async function setupIntegrationTests(file_name, geode_object) {
   const microservices_path = path.join("tests", "integration", "microservices")
   const project_folder_path = path.join(data_folder, uuidv4())
   const upload_folder_path = path.join(__dirname, "data", "uploads")
-  const back_path = executable_path(path.join(microservices_path, "back"))
+  const back_path = await executable_path(path.join(microservices_path, "back"))
   const back_name = executable_name("opengeodeweb-back")
-  const viewer_path = executable_path(path.join(microservices_path, "viewer"))
+  const viewer_path = await executable_path(
+    path.join(microservices_path, "viewer"),
+  )
   const viewer_name = executable_name("opengeodeweb-viewer")
   const [back_port, viewer_port] = await Promise.all([
     run_back(back_name, back_path, {