From 92638db4a4beb1ee63991b103a7aa0b673290f1f Mon Sep 17 00:00:00 2001 From: David Reed Date: Thu, 30 Jun 2022 00:28:32 -0400 Subject: [PATCH 1/2] update bare-server-node dependency, rebuild package.json, make main.sh executable --- .vscode/settings.json | 5 ++ index.mjs | 24 +++-- main.sh | 0 package-lock.json | 197 +++++++++++++++++++++++++++++++++++++----- package.json | 1 + 5 files changed, 199 insertions(+), 28 deletions(-) create mode 100644 .vscode/settings.json mode change 100644 => 100755 main.sh diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..eed76c5 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "editor.formatOnSave": false, + "editor.formatOnPaste": false, + "editor.formatOnType": false +} \ No newline at end of file diff --git a/index.mjs b/index.mjs index 0844c93..65f1166 100644 --- a/index.mjs +++ b/index.mjs @@ -1,21 +1,29 @@ -import Server from 'bare-server-node'; +import createServer from '@tomphttp/bare-server-node'; import http from 'http'; import nodeStatic from 'node-static'; -const bare = new Server('/bare/', ''); +const bare = createServer('/bare/'); const serve = new nodeStatic.Server('static/'); const server = http.createServer(); -server.on('request', (request, response) => { - if (bare.route_request(request, response)) return true; - serve.serve(request, response); +server.on('request', (req, res) => { + if (bare.shouldRoute(req)) { + bare.routeRequest(req, res); + } else { + serve.serve(req, res); + } }); server.on('upgrade', (req, socket, head) => { - if(bare.route_upgrade(req, socket, head))return; - socket.end(); + if (bare.shouldRoute(req, socket, head)) { + bare.routeUpgrade(req, socket, head); + }else{ + socket.end(); + } }); -server.listen(process.env.PORT || 8080); +server.listen({ + port: process.env.PORT || 8080, +}); diff --git a/main.sh b/main.sh old mode 100644 new mode 100755 diff --git a/package-lock.json b/package-lock.json index 2f259cc..be1750b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,17 +9,38 @@ "version": "1.0.0", "license": "GPL-3.0-or-later", "dependencies": { + "@tomphttp/bare-server-node": "^1.0.2-beta-readme2", "bare-server-node": "github:tomphttp/bare-server-node", "node-static": "^0.7.11" + } + }, + "node_modules/@tomphttp/bare-server-node": { + "version": "1.0.2-beta-typings3", + "resolved": "https://registry.npmjs.org/@tomphttp/bare-server-node/-/bare-server-node-1.0.2-beta-typings3.tgz", + "integrity": "sha512-XSYfma4O8nEOHIQ9f6ufvm0oPEHeZyIlEuWZTtZPf+0rmU9eYHHzHAZCxVs0XcpCu+qMwSlzr//fmuMhhyvIxg==", + "dependencies": { + "commander": "^9.0.0", + "dotenv": "^16.0.1", + "fetch-headers": "^3.0.1", + "http-errors": "^2.0.0" }, - "devDependencies": {} + "bin": { + "bare-server-node": "scripts/start.js" + } }, "node_modules/bare-server-node": { - "version": "0.0.1", - "resolved": "git+ssh://git@github.com/tomphttp/bare-server-node.git#c3f0dfd80dc1d4bc99606e4da0eb20ff980acfb6", + "name": "@tomphttp/bare-server-node", + "version": "1.0.2-beta-readme2", + "resolved": "git+ssh://git@github.com/tomphttp/bare-server-node.git#c392b2d647b01fcb485494c1a4564a177db7cacf", "license": "GPL-3.0", "dependencies": { - "commander": "^9.0.0" + "commander": "^9.0.0", + "dotenv": "^16.0.1", + "fetch-headers": "^3.0.1", + "http-errors": "^2.0.0" + }, + "bin": { + "bare-server-node": "scripts/start.js" } }, "node_modules/colors": { @@ -31,13 +52,67 @@ } }, "node_modules/commander": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-9.0.0.tgz", - "integrity": "sha512-JJfP2saEKbQqvW+FI93OYUB4ByV5cizMpFMiiJI8xDbBvQvSkIk0VvQdn1CZ8mqAO8Loq2h0gYTYtDFUZUeERw==", + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz", + "integrity": "sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw==", "engines": { "node": "^12.20.0 || >=14" } }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/dotenv": { + "version": "16.0.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz", + "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==", + "engines": { + "node": ">=12" + } + }, + "node_modules/fetch-headers": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fetch-headers/-/fetch-headers-3.0.1.tgz", + "integrity": "sha512-Kq+NyED/wLgT29St7aW47gAWg8EmmE5QmhwQ5RmPRULYLqpglA7Kc/ZnbqXu2vhH6mw1koikew2g94WiHLPmpA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/jimmywarting" + }, + { + "type": "github", + "url": "https://paypal.me/jimmywarting" + } + ], + "engines": { + "node": ">=12.20" + } + }, + "node_modules/http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "dependencies": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, "node_modules/mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", @@ -52,7 +127,7 @@ "node_modules/minimist": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==" }, "node_modules/node-static": { "version": "0.7.11", @@ -73,27 +148,62 @@ "node_modules/optimist": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==", "dependencies": { "minimist": "~0.0.1", "wordwrap": "~0.0.2" } }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + }, + "node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "engines": { + "node": ">=0.6" + } + }, "node_modules/wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==", "engines": { "node": ">=0.4.0" } } }, "dependencies": { - "bare-server-node": { - "version": "git+ssh://git@github.com/tomphttp/bare-server-node.git#c3f0dfd80dc1d4bc99606e4da0eb20ff980acfb6", - "from": "bare-server-node@tomphttp/bare-server-node", + "@tomphttp/bare-server-node": { + "version": "1.0.2-beta-typings3", + "resolved": "https://registry.npmjs.org/@tomphttp/bare-server-node/-/bare-server-node-1.0.2-beta-typings3.tgz", + "integrity": "sha512-XSYfma4O8nEOHIQ9f6ufvm0oPEHeZyIlEuWZTtZPf+0rmU9eYHHzHAZCxVs0XcpCu+qMwSlzr//fmuMhhyvIxg==", "requires": { - "commander": "^9.0.0" + "commander": "^9.0.0", + "dotenv": "^16.0.1", + "fetch-headers": "^3.0.1", + "http-errors": "^2.0.0" + } + }, + "bare-server-node": { + "version": "git+ssh://git@github.com/tomphttp/bare-server-node.git#c392b2d647b01fcb485494c1a4564a177db7cacf", + "from": "bare-server-node@github:tomphttp/bare-server-node", + "requires": { + "commander": "^9.0.0", + "dotenv": "^16.0.1", + "fetch-headers": "^3.0.1", + "http-errors": "^2.0.0" } }, "colors": { @@ -102,9 +212,41 @@ "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" }, "commander": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-9.0.0.tgz", - "integrity": "sha512-JJfP2saEKbQqvW+FI93OYUB4ByV5cizMpFMiiJI8xDbBvQvSkIk0VvQdn1CZ8mqAO8Loq2h0gYTYtDFUZUeERw==" + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz", + "integrity": "sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw==" + }, + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + }, + "dotenv": { + "version": "16.0.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz", + "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==" + }, + "fetch-headers": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fetch-headers/-/fetch-headers-3.0.1.tgz", + "integrity": "sha512-Kq+NyED/wLgT29St7aW47gAWg8EmmE5QmhwQ5RmPRULYLqpglA7Kc/ZnbqXu2vhH6mw1koikew2g94WiHLPmpA==" + }, + "http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "requires": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "mime": { "version": "1.6.0", @@ -114,7 +256,7 @@ "minimist": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==" }, "node-static": { "version": "0.7.11", @@ -129,16 +271,31 @@ "optimist": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==", "requires": { "minimist": "~0.0.1", "wordwrap": "~0.0.2" } }, + "setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + }, + "statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" + }, + "toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" + }, "wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==" } } } diff --git a/package.json b/package.json index 8febf17..46c5d51 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "dependencies": { + "@tomphttp/bare-server-node": "^1.0.2-beta-readme2", "bare-server-node": "github:tomphttp/bare-server-node", "node-static": "^0.7.11" }, From a7fa3c9f9b754ddbad80958c7defe5c4c47031c6 Mon Sep 17 00:00:00 2001 From: David Reed Date: Thu, 30 Jun 2022 00:33:31 -0400 Subject: [PATCH 2/2] remove VSCode config --- .vscode/settings.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index eed76c5..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "editor.formatOnSave": false, - "editor.formatOnPaste": false, - "editor.formatOnType": false -} \ No newline at end of file