@@ -65,15 +65,21 @@ export const use_viewer_store = defineStore("viewer", {
6565 const config = { application : "Viewer" }
6666 config . sessionURL = this . base_url
6767
68- const { client } = this
69- if ( this . is_running && client . isConnected ( ) ) {
70- client . disconnect ( - 1 )
71- this . is_running = false
72- }
73- let clientToConnect = client
74- if ( _ . isEmpty ( clientToConnect ) ) {
75- clientToConnect = vtkWSLinkClient . newInstance ( )
76- }
68+ const { client } = this
69+ console . log ( "client" , client )
70+ console . log ( "status" , this . status )
71+ if ( this . status === Status . CONNECTED && client . isConnected ( ) ) {
72+ console . log ( "disconnect" )
73+
74+ client . disconnect ( - 1 )
75+ this . status = Status . NOT_CONNECTED
76+ }
77+ let clientToConnect = client
78+ if ( _ . isEmpty ( clientToConnect ) ) {
79+ console . log ( "isEmpty" )
80+
81+ clientToConnect = vtkWSLinkClient . newInstance ( )
82+ }
7783
7884 // Connect to busy store
7985 clientToConnect . onBusyChange ( ( count ) => {
@@ -97,29 +103,34 @@ export const use_viewer_store = defineStore("viewer", {
97103 console . error ( message )
98104 } )
99105
100- // Connect
101- const { connectImageStream } = await import (
102- "@kitware/vtk.js/Rendering/Misc/RemoteView"
103- )
104- return new Promise ( ( resolve , reject ) => {
105- clientToConnect
106- . connect ( config )
107- . then ( ( validClient ) => {
108- connectImageStream ( validClient . getConnection ( ) . getSession ( ) )
109- this . client = validClient
110- clientToConnect . endBusy ( )
106+ // Connect
107+ const { connectImageStream } = await import (
108+ "@kitware/vtk.js/Rendering/Misc/RemoteView"
109+ )
110+ console . log ( "before connect" )
111+ const viewer_store = this
112+ return new Promise ( ( resolve , reject ) => {
113+ clientToConnect
114+ . connect ( config )
115+ . then ( ( validClient ) => {
116+ console . log ( "validClient" , validClient )
117+ connectImageStream ( validClient . getConnection ( ) . getSession ( ) )
118+ viewer_store . client = validClient
119+ clientToConnect . endBusy ( )
111120
112- // Now that the client is ready let's setup the server for us
113- viewer_call ( {
114- schema : schemas . opengeodeweb_viewer . viewer . reset_visualization ,
121+ // Now that the client is ready let's setup the server for us
122+ viewer_call ( {
123+ schema : schemas . opengeodeweb_viewer . viewer . reset_visualization ,
124+ } )
125+ viewer_store . status = Status . CONNECTED
126+ resolve ( )
127+ } )
128+ . catch ( ( error ) => {
129+ console . error ( error )
130+ viewer_store . status = Status . NOT_CONNECTED
131+ reject ( error )
115132 } )
116- this . is_running = true
117- resolve ( )
118- } )
119- . catch ( ( error ) => {
120- console . error ( error )
121- reject ( error )
122- } )
133+ } )
123134 } )
124135 } ,
125136 start_request ( ) {
0 commit comments