@geode/opengeodeweb-front 10.6.0 → 10.6.1-rc.1

package/app/stores/viewer.js

@@ -6,6 +6,8 @@ import vtkWSLinkClient, {
 import _ from "lodash"
 // oxlint-disable-next-line no-unassigned-import
 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"
 
@@ -22,6 +24,7 @@ const request_timeout = MS_PER_SECOND * SECONDS_PER_REQUEST
 
 export const useViewerStore = defineStore(
   "viewer",
+  // oxlint-disable-next-line max-lines-per-function max-statements
   () => {
     const infraStore = useInfraStore()
     const default_local_port = ref("1234")
@@ -76,7 +79,7 @@ export const useViewerStore = defineStore(
       picking_mode.value = false
     }
 
-    async function ws_connect() {
+    function ws_connect() {
       if (status.value === Status.CONNECTED) {
         return
       }
@@ -87,46 +90,31 @@ export const useViewerStore = defineStore(
         try {
           console.log("VIEWER LOCK GRANTED !", lock)
           status.value = Status.CONNECTING
-          const { default: SmartConnect } =
-            await import("wslink/src/SmartConnect")
           vtkWSLinkClient.setSmartConnectClass(SmartConnect)
 
-          const config_obj = { application: "Viewer" }
-          config_obj.sessionURL = base_url.value
-
-          if (status.value === Status.CONNECTED && client.value.isConnected()) {
-            client.value.disconnect(-1)
-            status.value = Status.NOT_CONNECTED
-          }
-          let clientToConnect = client.value
-          if (_.isEmpty(clientToConnect)) {
-            clientToConnect = newInstance()
+          if (_.isEmpty(client.value)) {
+            client.value = newInstance()
           }
 
-          // Connect to busy store
-          clientToConnect.onBusyChange((count) => {
+          client.value.onBusyChange((count) => {
             buzy.value = count
           })
-          clientToConnect.beginBusy()
-
-          // Error
-          clientToConnect.onConnectionError((httpReq) => {
+          client.value.onConnectionError((httpReq) => {
             const message = httpReq?.response?.error || `Connection error`
             console.error(message)
           })
-
-          // Close
-          clientToConnect.onConnectionClose((httpReq) => {
+          client.value.onConnectionClose((httpReq) => {
             const message = httpReq?.response?.error || `Connection close`
             console.error(message)
           })
 
-          // Connect
-          const { connectImageStream } =
-            await import("@kitware/vtk.js/Rendering/Misc/RemoteView")
-          client.value = await clientToConnect.connect(config_obj)
+          client.value.beginBusy()
+          await client.value.connect({
+            application: "Viewer",
+            sessionURL: base_url.value,
+          })
           connectImageStream(client.value.getConnection().getSession())
-          clientToConnect.endBusy()
+          client.value.endBusy()
           await request(
             schemas.opengeodeweb_viewer.viewer.reset_visualization,
             {},
@@ -135,7 +123,7 @@ export const useViewerStore = defineStore(
           )
           status.value = Status.CONNECTED
         } catch (error) {
-          console.error("error", error)
+          console.error("ws_connect error", error)
           status.value = Status.NOT_CONNECTED
           throw error
         }
@@ -214,7 +202,7 @@ export const useViewerStore = defineStore(
               "[VIEWER] Request completed:",
               schema.$id,
               "in",
-              (Date.now() - start) / 1_000,
+              (Date.now() - start) / MS_PER_SECOND,
               "s",
             )
             if (callbacks.response_function) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.6.0",
+  "version": "10.6.1-rc.1",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {
@@ -31,15 +31,15 @@
     "build": ""
   },
   "dependencies": {
-    "@geode/opengeodeweb-back": "latest",
-    "@geode/opengeodeweb-viewer": "latest",
+    "@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",
-    "@vueuse/rxjs": "^14.1.0",
+    "@vueuse/rxjs": "14.1.0",
     "ajv": "8.17.1",
     "busboy": "1.6.0",
     "conf": "15.1.0",