[ARVADOS-WORKBENCH2] created: bb04a1b7b0075cc18eeabc44ba5d4adb553fa8a6
Git user
git at public.curoverse.com
Mon May 28 12:04:19 EDT 2018
at bb04a1b7b0075cc18eeabc44ba5d4adb553fa8a6 (commit)
commit bb04a1b7b0075cc18eeabc44ba5d4adb553fa8a6
Author: Daniel Kos <daniel.kos at contractors.roche.com>
Date: Mon May 28 18:04:06 2018 +0200
Add initial server implementation
Feature #13536
Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos at contractors.roche.com>:
diff --git a/.gitignore b/.gitignore
index 280ad3f..8954d25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ yarn-error.log*
.idea
.vscode
+*.log
diff --git a/config/default.json b/config/default.json
new file mode 100644
index 0000000..2310630
--- /dev/null
+++ b/config/default.json
@@ -0,0 +1,3 @@
+{
+ "port": 3000
+}
diff --git a/package.json b/package.json
index b213bb5..3faa68b 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,10 @@
"private": true,
"dependencies": {
"@material-ui/core": "1.0.0",
+ "body-parser": "1.18.3",
+ "compression": "1.7.2",
+ "config": "1.30.0",
+ "expressjs": "1.0.1",
"react": "16.3.2",
"react-dom": "16.3.2",
"react-redux": "5.0.7",
@@ -13,14 +17,17 @@
"react-scripts-ts": "2.16.0",
"redux": "4.0.0",
"redux-devtools": "3.4.1",
- "typesafe-actions": "2.0.3"
+ "typesafe-actions": "2.0.3",
+ "winston": "^2.4.2"
},
"scripts": {
"start": "react-scripts-ts start",
"build": "react-scripts-ts build",
"test": "react-scripts-ts test --env=jsdom",
"eject": "react-scripts-ts eject",
- "lint": "tslint src/** -t verbose"
+ "lint": "tslint src/** -t verbose",
+ "server:build": "tsc -p ./server/tsconfig.json",
+ "server:start": "tsc -p ./server/tsconfig.json && node ./build/server/server.js"
},
"devDependencies": {
"@types/jest": "22.2.3",
@@ -32,6 +39,10 @@
"@types/react-router-dom": "4.2.6",
"@types/react-router-redux": "5.0.14",
"@types/redux-devtools": "3.0.44",
+ "@types/body-parser": "1.17.0",
+ "@types/compression": "0.0.36",
+ "@types/express": "4.11.1",
+ "@types/winston": "2.3.9",
"typescript": "2.8.3"
},
"moduleNameMapper": {
diff --git a/server/server.ts b/server/server.ts
new file mode 100644
index 0000000..34f429c
--- /dev/null
+++ b/server/server.ts
@@ -0,0 +1,58 @@
+import * as http from "http";
+import * as path from "path";
+import * as express from "express";
+import * as bodyParser from 'body-parser';
+import * as compress from 'compression';
+import * as log from 'winston';
+const config = require('config');
+
+const rootDir = __dirname;
+
+console.log("Root dir:", rootDir);
+console.log("Port:", config.get('port'));
+
+log.add(log.transports.File, {
+ filename: path.resolve(rootDir, 'arvados.log'),
+ json: false
+});
+
+const app = express();
+
+app.use(compress({}));
+app.set('port', config.get('port') || 3000);
+
+const staticPath = path.resolve(rootDir, '../static');
+const indexPath = path.resolve(rootDir, '../index.html');
+
+app.use("/static", express.static(staticPath, {'maxAge': '14d'}));
+app.use("/*", (req, res) => {
+ res.sendFile(indexPath);
+});
+
+app.use(bodyParser.json({
+ limit: '150mb'
+}));
+app.use(bodyParser.urlencoded({
+ limit: '150mb',
+ extended: true
+}));
+
+app.use((req, res, next) => {
+ res.header('Access-Control-Allow-Origin', '*');
+ res.header('Access-Control-Allow-Credentials', 'true');
+ res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS');
+ res.header('Access-Control-Allow-Headers', 'Content-Type, Authorization, Content-Length, X-Requested-With, Pragma, Cache-Control');
+ if (req.method === 'OPTIONS') {
+ res.end();
+ } else {
+ next();
+ }
+});
+
+const createServer = function() {
+ http.createServer(app).listen(app.get('port'), function() {
+ log.info("Express server listening on port " + app.get('port'));
+ });
+};
+
+createServer();
diff --git a/server/tsconfig.json b/server/tsconfig.json
new file mode 100644
index 0000000..0b48415
--- /dev/null
+++ b/server/tsconfig.json
@@ -0,0 +1,26 @@
+{
+ "compilerOptions": {
+ "baseUrl": ".",
+ "outDir": "../build/server",
+ "module": "commonjs",
+ "target": "es2016",
+ "lib": ["es2016", "dom"],
+ "sourceMap": true,
+ "allowJs": true,
+ "moduleResolution": "node",
+ "rootDir": "./",
+ "forceConsistentCasingInFileNames": true,
+ "noImplicitReturns": true,
+ "noImplicitThis": true,
+ "noImplicitAny": true,
+ "strictNullChecks": true,
+ "suppressImplicitAnyIndexErrors": true,
+ "noUnusedLocals": false,
+ "experimentalDecorators": true,
+ "emitDecoratorMetadata": true
+ },
+ "exclude": [
+ "node_modules",
+ "build"
+ ]
+}
diff --git a/yarn.lock b/yarn.lock
index 93702cd..e2ba119 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -55,6 +55,44 @@
scroll "^2.0.3"
warning "^3.0.0"
+"@types/body-parser@*", "@types/body-parser@^1.17.0":
+ version "1.17.0"
+ resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c"
+ dependencies:
+ "@types/connect" "*"
+ "@types/node" "*"
+
+"@types/compression@^0.0.36":
+ version "0.0.36"
+ resolved "https://registry.yarnpkg.com/@types/compression/-/compression-0.0.36.tgz#7646602ffbfc43ea48a8bf0b2f1d5e5f9d75c0d0"
+ dependencies:
+ "@types/express" "*"
+
+"@types/connect@*":
+ version "3.4.32"
+ resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28"
+ dependencies:
+ "@types/node" "*"
+
+"@types/events@*":
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
+
+"@types/express-serve-static-core@*":
+ version "4.11.2"
+ resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.11.2.tgz#b3c4bd7d45f765dbb782842fa80200967ae14eba"
+ dependencies:
+ "@types/events" "*"
+ "@types/node" "*"
+
+"@types/express@*", "@types/express@^4.11.1":
+ version "4.11.1"
+ resolved "https://registry.yarnpkg.com/@types/express/-/express-4.11.1.tgz#f99663b3ab32d04cb11db612ef5dd7933f75465b"
+ dependencies:
+ "@types/body-parser" "*"
+ "@types/express-serve-static-core" "*"
+ "@types/serve-static" "*"
+
"@types/history@*":
version "4.6.2"
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.6.2.tgz#12cfaba693ba20f114ed5765467ff25fdf67ddb0"
@@ -70,6 +108,10 @@
csstype "^2.0.0"
indefinite-observable "^1.0.1"
+"@types/mime@*":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b"
+
"@types/node@*", "@types/node at 10.1.2":
version "10.1.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.1.2.tgz#1b928a0baa408fc8ae3ac012cc81375addc147c6"
@@ -131,6 +173,19 @@
"@types/react" "*"
redux "^3.6.0"
+"@types/serve-static@*":
+ version "1.13.2"
+ resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48"
+ dependencies:
+ "@types/express-serve-static-core" "*"
+ "@types/mime" "*"
+
+"@types/winston@^2.3.9":
+ version "2.3.9"
+ resolved "https://registry.yarnpkg.com/@types/winston/-/winston-2.3.9.tgz#1ff9f1bb57952fe3d88c1b21c4899ede316a35bc"
+ dependencies:
+ "@types/node" "*"
+
abab@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
@@ -408,6 +463,10 @@ async@^2.1.2, async@^2.1.4, async@^2.4.1, async@^2.5.0:
dependencies:
lodash "^4.17.10"
+async@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9"
+
asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -1138,6 +1197,21 @@ body-parser at 1.18.2:
raw-body "2.3.2"
type-is "~1.6.15"
+body-parser@^1.18.3:
+ version "1.18.3"
+ resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
+ dependencies:
+ bytes "3.0.0"
+ content-type "~1.0.4"
+ debug "2.6.9"
+ depd "~1.1.2"
+ http-errors "~1.6.3"
+ iconv-lite "0.4.23"
+ on-finished "~2.3.0"
+ qs "6.5.2"
+ raw-body "2.3.3"
+ type-is "~1.6.16"
+
bonjour@^3.5.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
@@ -1619,6 +1693,10 @@ colormin@^1.0.5:
css-color-names "0.0.4"
has "^1.0.1"
+colors at 1.0.x:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+
colors@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
@@ -1655,7 +1733,7 @@ compressible@~2.0.13:
dependencies:
mime-db ">= 1.33.0 < 2"
-compression@^1.5.2:
+compression@^1.5.2, compression@^1.7.2:
version "1.7.2"
resolved "http://registry.npmjs.org/compression/-/compression-1.7.2.tgz#aaffbcd6aaf854b44ebb280353d5ad1651f59a69"
dependencies:
@@ -1680,6 +1758,13 @@ concat-stream@^1.5.0:
readable-stream "^2.2.2"
typedarray "^0.0.6"
+config@^1.30.0:
+ version "1.30.0"
+ resolved "https://registry.yarnpkg.com/config/-/config-1.30.0.tgz#1d60a9f35348a13c175798d384e81a5a16c3ba6e"
+ dependencies:
+ json5 "0.4.0"
+ os-homedir "1.0.2"
+
configstore@^3.0.0:
version "3.1.2"
resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
@@ -1964,6 +2049,10 @@ currently-unhandled@^0.4.1:
dependencies:
array-find-index "^1.0.1"
+cycle at 1.0.x:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2"
+
cyclist@~0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
@@ -2593,6 +2682,10 @@ express@^4.13.3:
utils-merge "1.0.1"
vary "~1.1.2"
+expressjs@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/expressjs/-/expressjs-1.0.1.tgz#220328469a18df5ad615e2b7a0ce995f17fbaeef"
+
extend-shallow@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -2654,6 +2747,10 @@ extsprintf@^1.2.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+eyes at 0.1.x:
+ version "0.1.8"
+ resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
+
fast-deep-equal@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
@@ -3283,7 +3380,7 @@ http-errors at 1.6.2:
setprototypeof "1.0.3"
statuses ">= 1.3.1 < 2"
-http-errors@~1.6.2:
+http-errors at 1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
version "1.6.3"
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
dependencies:
@@ -3333,7 +3430,7 @@ iconv-lite at 0.4.19:
version "0.4.19"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite at 0.4.23, iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
version "0.4.23"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
dependencies:
@@ -3779,7 +3876,7 @@ isomorphic-fetch@^2.1.1:
node-fetch "^1.0.1"
whatwg-fetch ">=0.10.0"
-isstream@~0.1.2:
+isstream at 0.1.x, isstream@~0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -4207,6 +4304,10 @@ json3@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+json5 at 0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-0.4.0.tgz#054352e4c4c80c86c0923877d449de176a732c8d"
+
json5@^0.5.0, json5@^0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
@@ -5108,7 +5209,7 @@ os-browserify@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-os-homedir@^1.0.0, os-homedir@^1.0.1:
+os-homedir at 1.0.2, os-homedir@^1.0.0, os-homedir@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
@@ -5759,7 +5860,7 @@ qs at 6.5.1:
version "6.5.1"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-qs@~6.5.1:
+qs at 6.5.2, qs@~6.5.1:
version "6.5.2"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
@@ -5828,6 +5929,15 @@ raw-body at 2.3.2:
iconv-lite "0.4.19"
unpipe "1.0.0"
+raw-body at 2.3.3:
+ version "2.3.3"
+ resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
+ dependencies:
+ bytes "3.0.0"
+ http-errors "1.6.3"
+ iconv-lite "0.4.23"
+ unpipe "1.0.0"
+
rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
version "1.2.7"
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.7.tgz#8a10ca30d588d00464360372b890d06dacd02297"
@@ -5914,7 +6024,7 @@ react-redux at 5.0.7:
loose-envify "^1.1.0"
prop-types "^15.6.0"
-react-router-dom@^4.2.2:
+react-router-dom at 4.2.2:
version "4.2.2"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.2.2.tgz#c8a81df3adc58bba8a76782e946cbd4eae649b8d"
dependencies:
@@ -6780,6 +6890,10 @@ ssri@^5.2.4:
dependencies:
safe-buffer "^5.1.1"
+stack-trace at 0.0.x:
+ version "0.0.10"
+ resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
+
stack-utils@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
@@ -7704,6 +7818,17 @@ window-size at 0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+winston@^2.4.2:
+ version "2.4.2"
+ resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.2.tgz#3ca01f763116fc48db61053b7544e750431f8db0"
+ dependencies:
+ async "~1.0.0"
+ colors "1.0.x"
+ cycle "1.0.x"
+ eyes "0.1.x"
+ isstream "0.1.x"
+ stack-trace "0.0.x"
+
wordwrap at 0.0.2:
version "0.0.2"
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list