diff --git a/controller/node-js/client/index.html b/controller/node-js/client/index.html index d9ad588d6..0c6cbfdc0 100644 --- a/controller/node-js/client/index.html +++ b/controller/node-js/client/index.html @@ -13,7 +13,7 @@ - +
@@ -35,7 +35,7 @@
- +
diff --git a/controller/node-js/client/index.js b/controller/node-js/client/index.js index 3f8f7fb67..75dc0748d 100644 --- a/controller/node-js/client/index.js +++ b/controller/node-js/client/index.js @@ -17,8 +17,7 @@ import { BotMessageHandler } from './bot-message-handler' const botMessageHandler = new BotMessageHandler(connection) const onData = data => { - console.log() - botMessageHandler.handle((data).status, connection) + botMessageHandler.handle(JSON.parse(data).status, connection) } const onQuit = () => { diff --git a/controller/node-js/package.json b/controller/node-js/package.json index 6cbb6b451..342458ca8 100644 --- a/controller/node-js/package.json +++ b/controller/node-js/package.json @@ -1,27 +1,24 @@ { "name": "controller-js", - "version": "1.0.0", + "version": "2.0.0", "description": "", "main": "index.js", "scripts": { - "prestart": "cd server && npm install", - "start": "run-p dev:server dev:start-server", + "postinstall": "cd server && npm install", + "start": "npx run-p dev:server dev:start-client", "start-nohup": "nohup npm run start", "dev:server": "npm run start --prefix server", - "dev:start-server-headless": "NODE_ENV=development snowpack build --watch", - "dev:start-server": "npx snowpack dev --port 8081", - "build": "snowpack build", - "lint": "npx eslint server/*.js --fix && npx eslint client/*.js --fix" + "dev:start-client": "vite --port 8081 --host", + "build": "vite build", + "lint": "eslint server/*.js --fix && eslint client/*.js --fix" }, "author": "Ivo Zivkov", "devDependencies": { - "eslint": "^7.32.0", - "eslint-config-standard": "^16.0.3", - "eslint-plugin-import": "^2.25.3", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-promise": "^5.2.0", - "http2-proxy": "^5.0.53", - "npm-run-all": "^4.1.5", - "snowpack": "^3.8.8" + "vite": "^5.2.0", + "npm-run-all2": "^6.0.0", + "eslint": "^9.0.0", + "eslint-plugin-import": "^2.29.0", + "eslint-plugin-n": "^17.0.0", + "eslint-plugin-promise": "^6.0.0" } } diff --git a/controller/node-js/server/package.json b/controller/node-js/server/package.json index 955b35ccb..b088b85f4 100644 --- a/controller/node-js/server/package.json +++ b/controller/node-js/server/package.json @@ -1,6 +1,6 @@ { "name": "server", - "version": "1.0.0", + "version": "2.0.0", "description": "", "main": "index.js", "scripts": { @@ -9,24 +9,21 @@ }, "author": "Ivo Zivkov", "dependencies": { - "cookie-parser": "~1.4.4", - "debug": "~2.6.9", + "cookie-parser": "^1.4.7", + "debug": "^4.3.4", "dnssd2": "^1.0.0", - "ejs": "^3.1.6", - "express": "^4.17.1", - "http-errors": "~1.6.3", - "morgan": "~1.9.1", + "ejs": "^3.1.10", + "express": "^4.19.2", + "http-errors": "^2.0.0", + "morgan": "^1.10.0", "net": "^1.0.2", - "ws": "^7.5.0" + "ws": "^8.17.0" }, "devDependencies": { - "@types/express": "^4.17.11", - "eslint": "^7.32.0", - "eslint-config-standard": "^16.0.3", - "eslint-plugin-import": "^2.25.3", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-promise": "^5.2.0", - "nodemon": "^2.0.7", - "npm-run-all": "^4.1.5" + "eslint": "^9.0.0", + "eslint-plugin-import": "^2.29.0", + "eslint-plugin-n": "^17.0.0", + "eslint-plugin-promise": "^6.0.0", + "nodemon": "^3.1.0" } } diff --git a/controller/node-js/snowpack.config.js b/controller/node-js/snowpack.config.js deleted file mode 100644 index a3a18da0c..000000000 --- a/controller/node-js/snowpack.config.js +++ /dev/null @@ -1,39 +0,0 @@ -const proxy = import('http2-proxy') - -/** @type {import("snowpack").SnowpackUserConfig } */ -module.exports = { - mount: { - "client": "/" - }, - optimize: { - bundle: true, - minify: true, - target: 'es2018', - treeshake: true, - }, - routes: [ - { - src: '/ws', - upgrade: (req, socket, head) => { - - const defaultWSHandler = (err, req, socket, head) => { - if (err) { - console.error('proxy error', err); - socket.destroy(); - } - }; - - proxy.ws( - req, - socket, - head, - { - hostname: 'localhost', - port: 7071, - }, - defaultWSHandler, - ); - }, - }, - ], -}; \ No newline at end of file diff --git a/controller/node-js/vite.config.js b/controller/node-js/vite.config.js new file mode 100644 index 000000000..e4d86f1ac --- /dev/null +++ b/controller/node-js/vite.config.js @@ -0,0 +1,8 @@ +import { defineConfig } from 'vite' + +export default defineConfig({ + root: 'client', + server: { + allowedHosts: true + } +})