bugfix/remove potentially broken packages and redundancies

Author: nemozak1

babel.config.js

@@ -3,8 +3,7 @@
   "version": "1.1.3",
   "private": true,
   "types": [
-    "jest",
-    "node"
+    "jest"
   ],
   "scripts": {
     "dev": "vite & ts-node server/app.ts",
@@ -22,9 +21,7 @@
     "@element-plus/icons-vue": "^2.1.0",
     "@fontsource/roboto": "^5.0.0",
     "@highlightjs/vue-plugin": "^2.1.0",
-    "@types/jest": "^29.5.14",
-    "@types/supertest": "^6.0.2",
-    "ai": "^4.1.11",
+    "ai": "^4.1.43",
     "axios": "^1.7.4",
     "cheerio": "^1.0.0",
     "class-transformer": "^0.5.1",
@@ -34,12 +31,10 @@
     "element-plus": "^2.3.9",
     "express": "^4.21.0",
     "express-session": "^1.17.3",
-    "got": "^14.4.5",
     "highlight.js": "^11.8.0",
     "json-editor-vue": "^0.17.3",
     "jsonwebtoken": "^9.0.2",
     "markdown-it": "^14.1.0",
-    "node-fetch": "v2.6",
     "oauth": "^0.10.0",
     "obp-typescript": "^1.0.36",
     "pinia": "^2.0.37",
@@ -49,7 +44,6 @@
     "routing-controllers": "^0.10.4",
     "socket.io": "^4.7.5",
     "socket.io-client": "^4.7.5",
-    "supertest": "^7.0.0",
     "typedi": "^0.10.0",
     "uuid": "^9.0.1",
     "vanilla-jsoneditor": "^2.3.3",
@@ -60,22 +54,18 @@
     "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.8",
-    "@babel/preset-env": "^7.26.8",
-    "@babel/preset-typescript": "^7.26.0",
     "@rushstack/eslint-patch": "^1.4.0",
-    "@types/express": "^5.0.0",
+    "@types/jest": "^29.5.14",
     "@types/jsdom": "^21.1.7",
     "@types/jsonwebtoken": "^9.0.6",
     "@types/markdown-it": "^14.1.1",
-    "@types/node": "^22.13.4",
+    "@types/node": "^20.5.7",
     "@vitejs/plugin-vue": "^4.3.0",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/eslint-config-prettier": "^9.0.0",
     "@vue/eslint-config-typescript": "^14.0.0",
     "@vue/test-utils": "^2.4.0",
     "@vue/tsconfig": "^0.1.3",
-    "babel-jest": "^29.7.0",
     "eslint": "^9.15.0",
     "eslint-plugin-vue": "^9.12.0",
     "jest": "^29.7.0",
@@ -84,6 +74,7 @@
     "npm-run-all2": "^7.0.1",
     "prettier": "^3.0.1",
     "superagent": "^9.0.0",
+    "supertest": "^7.0.0",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.1",
     "typescript": "~5.2.2",

package.json

@@ -68,20 +68,20 @@ export class OpeyController {
           }
         })
 
-        let nodeStream: NodeJS.ReadableStream | null = null
+        let stream: ReadableStream | null = null
 
         try {
           // Read stream from OpeyClientService
-          nodeStream = await this.opeyClientService.stream(user_input)
-          console.debug(`Stream received readable: ${nodeStream.readable}`)
+          stream = await this.opeyClientService.stream(user_input)
+          console.debug(`Stream received readable: ${stream}`)
 
         } catch (error) {
           console.error("Error reading stream: ", error)
           response.status(500).json({ error: 'Internal Server Error' })
           return
         }
 
-        if (!nodeStream || !nodeStream.readable) {
+        if (!stream) {
           console.error("Stream is not readable")
           response.status(500).json({ error: 'Internal Server Error' })
           return
@@ -99,23 +99,22 @@ export class OpeyController {
           response.setHeader('Connection', 'keep-alive')
 
           let data: any[] = []
+          
+          const streamReader = stream.getReader()
+          console.log("Got stream reader: ", streamReader)
+
+          streamReader
+            .read()
+            .then(function processText({ done, value }) {
+              if (done) {
+                console.log("Stream done")
+                return response.status(200).json(data)
+              }
+              console.log("Stream value: ", value)
+              data.push(value)
+              response.write(`data: ${value}\n\n`)
+            })
 
-          nodeStream.on('data', (chunk) => {
-            const bufferChunk = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-            data.push(bufferChunk);
-            response.write(`data: ${chunk.toString()}\n\n`)
-          })
-          nodeStream.on('end', () => {
-            //console.log('Stream ended')
-            const totalData = Buffer.concat(data)
-            response.write(totalData)
-            response.end()
-          })
-          nodeStream.on('error', (error) => {
-            console.error(error)
-            response.write(`data: Error reading stream\n\n`)
-            response.end()
-          })
         } catch (error) {
           console.error("Error writing data: ", error)
           response.status(500).json({ error: 'Internal Server Error' })

server/controllers/OpeyIIController.ts

@@ -1,6 +1,5 @@
 import { Service } from 'typedi'
 import { UserInput, StreamInput, OpeyConfig, AuthConfig } from '../schema/OpeySchema'
-import fetch from 'node-fetch';
 
 @Service()
 export default class OpeyClientService {
@@ -47,7 +46,7 @@ export default class OpeyClientService {
         }
     }
 
-    async stream(user_input: UserInput): Promise<NodeJS.ReadableStream> {
+    async stream(user_input: UserInput): Promise<ReadableStream> {
         // Endpoint to post a message to Opey and stream the response tokens/messages
         try {
 
@@ -69,7 +68,7 @@ export default class OpeyClientService {
             if (!response.body) {
                 throw new Error("No response body")
             }
-            return response.body as NodeJS.ReadableStream
+            return response.body
         }
         catch (error) {
             throw new Error(`Error streaming from Opey: ${error}`)

server/services/OpeyClientService.ts

@@ -1,6 +1,5 @@
 import app, { instance } from '../server/app';
 import request from 'supertest';
-import fetch from 'node-fetch';
 import http from 'node:http';
 import { UserInput } from '../server/schema/OpeySchema';
 import {v4 as uuidv4} from 'uuid';