amikhalev/sprinklers3
1
1
Fork 0
Code Issues 9 Pull Requests 1 Releases Wiki Activity

refactor: Move server entrypoints to bin folder

Browse Source
This commit is contained in:
Alex Mikhalev 2018-09-02 23:29:29 -06:00
parent f013c5b111
commit fce64f3850
5 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -3,7 +3,7 @@
"version": "1.0.0", "version": "1.0.0",
"private": true, "private": true,
"description": "A frontend for mqtt based IoT sprinklers systems", "description": "A frontend for mqtt based IoT sprinklers systems",
"main": "dist/index.js", "main": "dist/bin/server.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1", "test": "echo \"Error: no test specified\" && exit 1",
"clean": "rm -rf ./dist ./build ./public", "clean": "rm -rf ./dist ./build ./public",
@ -14,8 +14,8 @@
"watch:server": "yarn build:server --watch", "watch:server": "yarn build:server --watch",
"start:dev-server": "NODE_ENV=development webpack-dev-server --config ./client/webpack.config.js --env dev", "start:dev-server": "NODE_ENV=development webpack-dev-server --config ./client/webpack.config.js --env dev",
"start": "NODE_ENV=development node .", "start": "NODE_ENV=development node .",
"start:pretty": "yarn start | node dist/logging/prettyPrint.js", "start:pretty": "yarn start | node dist/bin/prettyPrint.js",
"start:nodemon": "nodemon --delay 0.5 --exec \"env NODE_ENV=development node . | node dist/logging/prettyPrint.js\"", "start:nodemon": "nodemon --delay 0.5 --exec \"env NODE_ENV=development node . | node dist/bin/prettyPrint.js\"",
"start:watch": "run-p watch:server start:nodemon", "start:watch": "run-p watch:server start:nodemon",
"start:dev": "run-p start:dev-server start:watch", "start:dev": "run-p start:dev-server start:watch",
"lint:client": "tslint --project client --force --format verbose", "lint:client": "tslint --project client --force --format verbose",

0
server/logging/prettyPrint.ts → server/bin/prettyPrint.ts
View File

27
server/bin/server.ts Normal file
View File

@ -0,0 +1,27 @@
import * as http from "http";
import * as WebSocket from "ws";
import log from "@common/logger";
import { createApp, ServerState, WebSocketApi } from "../";
const state = new ServerState();
const app = createApp(state);
const webSocketApi = new WebSocketApi(state);
const port = +(process.env.PORT || 8080);
const host = process.env.HOST || "0.0.0.0";
const server = new http.Server(app);
const webSocketServer = new WebSocket.Server({ server });
webSocketApi.listen(webSocketServer);
state
.start()
.then(() => {
server.listen(port, host, () => {
log.info(`listening at ${host}:${port}`);
});
})
.catch(err => {
log.error({ err }, "error starting server");
});

32
server/index.ts
View File

@ -4,32 +4,6 @@ import "./configureAlias";
import "./env"; import "./env";
import "./configureLogger"; import "./configureLogger";
import log from "@common/logger"; export { ServerState } from "./state";
import { Server } from "http"; export { createApp } from "./express";
import * as WebSocket from "ws"; export { WebSocketApi } from "./sprinklersRpc/";
import { ServerState } from "./state";
import { createApp } from "./express";
import { WebSocketApi } from "./sprinklersRpc/WebSocketApi";
const state = new ServerState();
const app = createApp(state);
const webSocketApi = new WebSocketApi(state);
const port = +(process.env.PORT || 8080);
const host = process.env.HOST || "0.0.0.0";
const server = new Server(app);
const webSocketServer = new WebSocket.Server({ server });
webSocketApi.listen(webSocketServer);
state
.start()
.then(() => {
server.listen(port, host, () => {
log.info(`listening at ${host}:${port}`);
});
})
.catch(err => {
log.error({ err }, "error starting server");
});

2
server/sprinklersRpc/index.ts Normal file
View File

@ -0,0 +1,2 @@
export * from "./WebSocketApi";
export * from "./WebSocketConnection";