File tree Expand file tree Collapse file tree 1 file changed +10
-12
lines changed Expand file tree Collapse file tree 1 file changed +10
-12
lines changed Original file line number Diff line number Diff line change @@ -184,7 +184,7 @@ function kill_back(back_port) {
184184} 
185185
186186function  kill_viewer ( viewer_port )  { 
187-   return  new  Promise ( ( resolve ,   reject )  =>  { 
187+   return  new  Promise ( ( resolve )  =>  { 
188188    const  socket  =  new  WebSocket ( "ws://localhost:"  +  viewer_port  +  "/ws" ) 
189189    socket . on ( "open" ,  ( )  =>  { 
190190      console . log ( "Connected to WebSocket server" ) 
@@ -200,17 +200,15 @@ function kill_viewer(viewer_port) {
200200      const  message  =  data . toString ( ) 
201201      console . log ( "Received from server:" ,  message ) 
202202      if  ( message . includes ( "hello" ) )  { 
203-         try  { 
204-           socket . send ( 
205-             JSON . stringify ( { 
206-               id : viewer_schemas . opengeodeweb_viewer . kill . $id , 
207-               method : viewer_schemas . opengeodeweb_viewer . kill . $id , 
208-             } ) , 
209-           ) 
210-         }  catch  ( error )  { 
211-           console . error ( "WebSocket error:" ,  error ) 
212-           resolve ( ) 
213-         } 
203+         socket . send ( 
204+           JSON . stringify ( { 
205+             id : viewer_schemas . opengeodeweb_viewer . kill . $id , 
206+             method : viewer_schemas . opengeodeweb_viewer . kill . $id , 
207+           } ) , 
208+         ) 
209+       }  else  if  ( message . includes ( "Viewer killed" ) )  { 
210+         console . log ( "Received last message from WebSocket server" ) 
211+         resolve ( ) 
214212      } 
215213    } ) 
216214    socket . on ( "close" ,  ( )  =>  { 
    
 
   
 
     
   
   
          
     
  
    
     
 
    
      
     
 
     
    You can’t perform that action at this time.
  
 
    
  
     
    
      
        
     
 
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments