update wisp server node

Author: ProgrammerIn-wonderland

.eslintignore

@@ -15,4 +15,5 @@ chimerix/
 dreamlandjs/
 x86_image_wizard/twisp/
 x86_image_wizard/epoxy/
-native-file-system-adapter/
+native-file-system-adapter/
+server/

Makefile

@@ -182,7 +182,7 @@ static: all
 	cp -r public/* static/
 
 server: FORCE
-	cd server; npx ts-node server.ts
+	cd server; node server.js
 
 # v86 imports
 v86/src/rust/gen/jit.rs: 

server/package.json

@@ -3,6 +3,7 @@
     "scripts": {
         "start": "ts-node server.ts"
     },
+    "type": "module",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/MercuryWorkshop/AnuraOS.git"
@@ -14,13 +15,12 @@
     },
     "homepage": "https://github.com/MercuryWorkshop/AnuraOS#readme",
     "dependencies": {
-        "@mercuryworkshop/wisp-js": "^0.2.1",
         "@types/express": "^4.17.21",
         "@types/ws": "^8.5.12",
         "express": "^4.21.0",
         "ts-node": "^10.9.2",
         "typescript": "^5.6.2",
-        "wisp-server-node": "^1.1.5",
+        "wisp-server-node": "^1.1.7",
         "ws": "^8.18.0"
     }
 }

server/server.ts renamed to server/server.js

@@ -1,8 +1,9 @@
 import express from "express";
 import path from "path";
-import { server as wisp } from "@mercuryworkshop/wisp-js";
+import wisp from "wisp-server-node";
 import { Socket } from "node:net";
-__dirname = path.join(process.cwd(), "..");
+
+const __dirname = path.join(process.cwd(), "..");
 
 const app = express();
 const port = process.env.PORT || 8000;
@@ -24,5 +25,5 @@ app.use(express.static(__dirname + "/aboutproxy/static"));
 const server = app.listen(port, () => console.log("Listening on port: ", port));
 
 server.on("upgrade", (request, socket, head) => {
-    wisp.routeRequest(request, socket as Socket, head);
+    wisp.routeRequest(request, socket, head);
 });