From 25ef47a78ff2a6e5a10af20646c0d9748564280c Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 23 Aug 2023 16:25:15 -0700
Subject: [PATCH] Use express-ws types

---
 demo/server.js |  7 +++----
 package.json   |  1 +
 yarn.lock      | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/demo/server.js b/demo/server.js
index d399eac8..e6eb25f1 100644
--- a/demo/server.js
+++ b/demo/server.js
@@ -15,8 +15,8 @@ const pty = require('node-pty');
 const USE_BINARY = os.platform() !== "win32";
 
 function startServer() {
-  var app = express();
-  expressWs(app);
+  const app = express();
+  const appWs = expressWs(app).app;
 
   var terminals = {},
     unsentOutput = {},
@@ -93,8 +93,7 @@ function startServer() {
     res.end();
   });
 
-  // @ts-ignore
-  app.ws('/terminals/:pid', function (ws, req) {
+  appWs.ws('/terminals/:pid', function (ws, req) {
     var term = terminals[parseInt(req.params.pid)];
     console.log('Connected to terminal ' + term.pid);
     temporaryDisposable[term.pid].dispose();
diff --git a/package.json b/package.json
index 59c53f91..9f702558 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     "@types/debug": "^4.1.7",
     "@types/deep-equal": "^1.0.1",
     "@types/express": "4",
+    "@types/express-ws": "^3.0.1",
     "@types/glob": "^7.2.0",
     "@types/jsdom": "^16.2.13",
     "@types/mocha": "^9.0.0",
diff --git a/yarn.lock b/yarn.lock
index e989d88d..a1b8508e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -525,7 +525,7 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
   integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
 
-"@types/express-serve-static-core@^4.17.33":
+"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33":
   version "4.17.36"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.36.tgz#baa9022119bdc05a4adfe740ffc97b5f9360e545"
   integrity sha512-zbivROJ0ZqLAtMzgzIUC4oNqDG9iF0lSsAqpOD9kbs5xcIM3dTiyuHvBc7R8MtWBp3AAWGaovJa+wzWPjLYW7Q==
@@ -535,7 +535,16 @@
     "@types/range-parser" "*"
     "@types/send" "*"
 
-"@types/express@4":
+"@types/express-ws@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/express-ws/-/express-ws-3.0.1.tgz#6fbf5dfdbeedd16479ccbeecbca63c14be26612e"
+  integrity sha512-VguRXzcpPBF0IggIGpUoM65cZJDfMQxoc6dKoCz1yLzcwcXW7ft60yhq3ygKhyEhEIQFtLrWjyz4AJ1qjmzCFw==
+  dependencies:
+    "@types/express" "*"
+    "@types/express-serve-static-core" "*"
+    "@types/ws" "*"
+
+"@types/express@*", "@types/express@4":
   version "4.17.17"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4"
   integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==
@@ -687,7 +696,7 @@
     tapable "^2.2.0"
     webpack "^5"
 
-"@types/ws@^8.2.0":
+"@types/ws@*", "@types/ws@^8.2.0":
   version "8.5.5"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb"
   integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==