Merge branch 'staging' into request-proxy

package-lock.json

@@ -22,7 +22,7 @@
                 "cookie-session": "^2.1.0",
                 "cors": "^2.8.5",
                 "csrf-csrf": "^2.2.3",
-                "express": "^4.19.2",
+                "express": "^4.20.0",
                 "form-data": "^4.0.0",
                 "google-translate-api-browser": "^3.0.1",
                 "he": "^1.2.0",
@@ -5394,36 +5394,6 @@
                 "node": ">= 0.8.0"
             }
         },
-        "node_modules/serve-static/node_modules/ms": {
-            "version": "2.1.3",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-            "license": "MIT"
-        },
-        "node_modules/serve-static/node_modules/send": {
-            "version": "0.18.0",
-            "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-            "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-            "license": "MIT",
-            "dependencies": {
-                "debug": "2.6.9",
-                "depd": "2.0.0",
-                "destroy": "1.2.0",
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "etag": "~1.8.1",
-                "fresh": "0.5.2",
-                "http-errors": "2.0.0",
-                "mime": "1.6.0",
-                "ms": "2.1.3",
-                "on-finished": "2.4.1",
-                "range-parser": "~1.2.1",
-                "statuses": "2.0.1"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
         "node_modules/set-function-length": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",

package.json

@@ -12,7 +12,7 @@
         "cookie-session": "^2.1.0",
         "cors": "^2.8.5",
         "csrf-csrf": "^2.2.3",
-        "express": "^4.19.2",
+        "express": "^4.20.0",
         "form-data": "^4.0.0",
         "google-translate-api-browser": "^3.0.1",
         "he": "^1.2.0",
@@ -63,6 +63,9 @@
         },
         "node-fetch": {
             "whatwg-url": "^14.0.0"
+        },
+        "express": {
+            "send": "^0.19.0"
         }
     },
     "name": "sillytavern",

public/scripts/slash-commands.js

@@ -2533,22 +2533,23 @@ async function askCharacter(args, text) {
             lastMessage.force_avatar = force_avatar;
             lastMessage.original_avatar = original_avatar;
         }
-
-        // Kill this callback once the event fires
-        eventSource.removeListener(event_types.CHARACTER_MESSAGE_RENDERED, restoreCharacter);
     };
 
-    // Run generate and restore previous character on error
+    // Run generate and restore previous character
     try {
         toastr.info(`Asking ${character.name} something...`);
         await Generate('ask_command');
-    } catch {
+        await saveChatConditional();
+    } catch (error) {
+        console.error('Error running /ask command', error);
+    } finally {
         restoreCharacter();
+
+        if (this_chid !== prevChId) {
+            toastr.error('It is strongly recommended to reload the page.', 'Something went wrong');
+        }
     }
 
-    // Restore previous character once message renders
-    // Hack for generate
-    eventSource.on(event_types.CHARACTER_MESSAGE_RENDERED, restoreCharacter);
     return '';
 }