Try t ohandle JS exceptions a little more gracefully.

This is an experiment.

Author: wcjohns

InterSpec/InterSpecApp.h

@@ -80,13 +80,6 @@ class InterSpec_API InterSpecApp : public Wt::WApplication
   //isAndroid(): Searches for Android in the user agent string
   bool isAndroid() const;
 
-#if( WT_VERSION>=0x3030400 )
-  //ToDo: define a custom handler for javascript errors
-//  virtual void handleJavaScriptError(const std::string& errorText)
-//  {
-//    std::cerr << "JS error: " << errorText << std::endl;
-//  }
-#endif
 
   /* svlog send the message to the InterSpec for display to the user. */
   void svlog( const Wt::WString& message, int priority = 1 );
@@ -266,8 +259,10 @@ class InterSpec_API InterSpecApp : public Wt::WApplication
   /** Adds `m_activeTimeSinceDbUpdate` to the database, saving the updated result. */
   void updateUsageTimeToDb();
 
+#if( WT_VERSION>=0x3030400 )
   virtual void handleJavaScriptError( const std::string &errorText );
-
+#endif
+  
 #if( !BUILD_FOR_WEB_DEPLOYMENT )
   /** Checks for URL argument "externalid", or equivalently "apptoken", and if found sets m_externalToken to it.
    

InterSpec/InterSpecServer.h

@@ -190,6 +190,16 @@ namespace InterSpecServer
   /** Sets the session as dead. */
   InterSpec_API void set_session_destructing( const char *session_token );
 
+  /** Sets marks the session as being allowed to be loaded again.
+   
+   This is used when session JS crashes.
+   
+   If session token does not already exist, it will not be added.
+   
+   Returns true if successful (found session token, and reset state).
+   */
+  InterSpec_API bool set_session_reload_allow( const char *session_token );
+  
 #if( !BUILD_FOR_WEB_DEPLOYMENT )
   /** Open one or more files from the filesystem.  For macOS this would be
    dropping a file to the app icon in the Finder.  Or on Windows it would be

src/InterSpecApp.cpp

@@ -183,6 +183,8 @@ bool InterSpecApp::checkExternalTokenFromUrl()
     {
       m_externalToken = p.second.front();
 
+      InterSpecServer::add_allowed_session_token( m_externalToken.c_str(), InterSpecServer::SessionType::PrimaryAppInstance );
+      
       const int status = InterSpecServer::set_session_loaded( m_externalToken.c_str() );
 
       pair<bool,InterSpecServer::SessionType> session_type
@@ -1304,6 +1306,8 @@ void InterSpecApp::prepareForEndOfSession()
   Wt::log("debug") << "Have prepared for end of session " << sessionId() << ".";
 }//void InterSpecApp::prepareForEndOfSession()
 
+
+#if( WT_VERSION>=0x3030400 )
 void InterSpecApp::handleJavaScriptError( const std::string &errorText )
 {
   const string js_err_msg = WString("There was a javascript error: {1}")
@@ -1331,8 +1335,14 @@ void InterSpecApp::handleJavaScriptError( const std::string &errorText )
 
   // Default WApplication implementation logs error, and then calls WApplication:quit()
   WApplication::handleJavaScriptError( errorText );
+  
+#if( !BUILD_FOR_WEB_DEPLOYMENT )
+  // Allow re-loading of the window
+  if( !m_externalToken.empty() )
+    InterSpecServer::set_session_reload_allow( m_externalToken.c_str() );
+#endif //#if( !BUILD_FOR_WEB_DEPLOYMENT )
 }//void handleJavaScriptError( const std::string &errorText )
-
+#endif //#if( WT_VERSION>=0x3030400 )
 
 void InterSpecApp::clearSession()
 {

src/InterSpecServer.cpp

@@ -762,7 +762,22 @@ void killServer()
     }
   }//void set_session_destructing( const char *session_token )
 
+  
+  bool set_session_reload_allow( const char *session_token )
+  {
+    lock_guard<mutex> lock( ns_sessions_mutex );
+    auto pos = ns_sessions.find( session_token );
+    if( pos == end(ns_sessions) )
+      return false;
+    
+    SessionState &session = pos->second;
+    session.auth_time = std::chrono::system_clock::now();
+    session.current_state = SessionState::State::AuthorizedNotLoaded;
+      
+    return true;
+  }//bool set_session_reload_allow( const char *session_token )
 
+  
   int session_status( const char *session_token )
   {
     lock_guard<mutex> lock( ns_sessions_mutex );
@@ -934,7 +949,7 @@ std::string file_to_open_on_load( const std::string &session_token )
   auto pos = ns_sessions.find( session_token );
   if( pos == end(ns_sessions) )
   {
-    assert( 0 );
+    //assert( 0 );
     return "";
   }