diff --git a/packages/api/package.json b/packages/api/package.json index e29a4e2e..153c977d 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -35,7 +35,6 @@ "express": "^4.17.1", "express-basic-auth": "^1.2.0", "express-fileupload": "^1.2.0", - "express-sse": "^0.5.3", "fs-extra": "^9.1.0", "fs-reverse": "^0.0.3", "get-port": "^5.1.1", @@ -50,7 +49,6 @@ "node-ssh-forward": "^0.7.2", "portfinder": "^1.0.28", "simple-encryptor": "^4.0.0", - "socket.io": "^2.3.0", "tar": "^6.0.5", "uuid": "^3.4.0" }, diff --git a/packages/api/src/main.js b/packages/api/src/main.js index 07f7504d..858139b7 100644 --- a/packages/api/src/main.js +++ b/packages/api/src/main.js @@ -4,7 +4,6 @@ const bodyParser = require('body-parser'); const fileUpload = require('express-fileupload'); const http = require('http'); const cors = require('cors'); -// const io = require('socket.io'); const fs = require('fs'); const getPort = require('get-port'); const childProcessChecker = require('./utility/childProcessChecker'); @@ -44,11 +43,6 @@ function start() { const server = http.createServer(app); - // const sse = new SSE(); - // app.get('/stream', sse.init); - // socket.set(sse); - // socket.set(io(server)); - if (process.env.LOGIN && process.env.PASSWORD) { app.use( basicAuth({ @@ -97,16 +91,6 @@ function start() { // Tell the client to retry every 10 seconds if connectivity is lost res.write('retry: 10000\n\n'); socket.set(res); - - // let count = 0; - - // while (true) { - // await new Promise((resolve) => setTimeout(resolve, 1000)); - - // console.log("Emit", ++count); - // // Emit an SSE that contains the current 'count' as a string - // res.write(`event: ping\ndata: ${JSON.stringify({ count })}\n\n`); - // } }); app.use(bodyParser.json({ limit: '50mb' })); diff --git a/packages/web/package.json b/packages/web/package.json index 3187a2c1..444f47fb 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -45,7 +45,6 @@ "rollup-plugin-terser": "^7.0.0", "rollup-plugin-web-worker-loader": "^1.6.1", "sirv-cli": "^1.0.0", - "socket.io-client": "^2.3.0", "sql-formatter": "^2.3.3", "svelte": "^3.43.0", "svelte-check": "^1.0.0", diff --git a/patches/socket.io+2.3.0.patch b/patches/socket.io+2.3.0.patch deleted file mode 100644 index f8c3477a..00000000 --- a/patches/socket.io+2.3.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/node_modules/socket.io/lib/index.js b/node_modules/socket.io/lib/index.js -index 5287e4e..2f4330d 100644 ---- a/node_modules/socket.io/lib/index.js -+++ b/node_modules/socket.io/lib/index.js -@@ -112,14 +112,14 @@ Server.prototype.serveClient = function(v){ - } - return require.resolve(file); - }; -- if (v && !clientSource) { -- clientSource = read(resolvePath( 'socket.io-client/dist/socket.io.js'), 'utf-8'); -- try { -- clientSourceMap = read(resolvePath( 'socket.io-client/dist/socket.io.js.map'), 'utf-8'); -- } catch(err) { -- debug('could not load sourcemap file'); -- } -- } -+// if (v && !clientSource) { -+// clientSource = read(resolvePath( 'socket.io-client/dist/socket.io.js'), 'utf-8'); -+// try { -+// clientSourceMap = read(resolvePath( 'socket.io-client/dist/socket.io.js.map'), 'utf-8'); -+// } catch(err) { -+// debug('could not load sourcemap file'); -+// } -+// } - return this; - }; - diff --git a/yarn.lock b/yarn.lock index 4d094988..8534c684 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4032,11 +4032,6 @@ express-fileupload@^1.2.0: dependencies: busboy "^0.3.1" -express-sse@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/express-sse/-/express-sse-0.5.3.tgz#6e6cb1a85ef7b6ec1eb658e37e923907c482bd31" - integrity sha512-DJF0nofFGq0IXJLGq95hfrryP3ZprVAVpyZUnmAk6QhHnm7zCzsHBNFP0i4FKFo2XjOf+JiYUKjT7jQhIeljpg== - express@^4.17.1: version "4.17.1" resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" @@ -9551,7 +9546,7 @@ socket.io-adapter@~1.1.0: resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9" integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g== -socket.io-client@2.3.0, socket.io-client@^2.3.0: +socket.io-client@2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz#14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4" integrity sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==