From 8f97d4a71bd962affb3f54d8c385511d0399354a Mon Sep 17 00:00:00 2001
From: Zixaphir <zixaphirmoxphar@gmail.com>
Date: Wed, 14 Jun 2023 14:31:19 -0700
Subject: [PATCH] Send abort signal to koboldcpp server on abort, mk. 2

Implemented the abort request being sent through server.js instead
of the client endpoint.
---
 server.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/server.js b/server.js
index 5a2366433..209ac7b35 100644
--- a/server.js
+++ b/server.js
@@ -412,8 +412,20 @@ app.post("/generate", jsonParser, async function (request, response_generate = r
             response = await fetch(url, { method: 'POST', timeout: 0, ...args });
 
             if (request.body.streaming) {
-
-                request.socket.on('close', function () {
+                request.socket.on('close', async function () {
+                    if (controller.signal.aborted) {
+                        try {
+                            // send abort signal to koboldcpp
+                            await fetch(`${api_server}/extra/abort`, {
+                                method: 'POST',
+                            });
+                        } catch {
+                            // likely endpoint not available on older versions of koboldcpp
+                            if ('status' in error) {
+                                console.log('Status Code from Kobold:', error.status);
+                            }
+                        }
+                    }
                     response.body.destroy(); // Close the remote stream
                     response_generate.end(); // End the Express response
                 });