From 2efe0f55f166eddff1d3bb2494c36323156da21c Mon Sep 17 00:00:00 2001 From: Alexander Cerutti Date: Sat, 12 May 2018 14:35:37 +0200 Subject: [PATCH] Splitted Webserver from operative module --- index.js | 15 +-------------- package.json | 2 +- server.js | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 server.js diff --git a/index.js b/index.js index f103bab..7659aed 100644 --- a/index.js +++ b/index.js @@ -4,19 +4,15 @@ const path = require("path"); const crypto = require("crypto"); const { spawn } = require("child_process"); const archiver = require("archiver"); -const express = require("express"); const async = require("async"); const _configuration = Object.freeze(require("./config.json")); -const instance = express(); const supportedTypesOfPass = /(boardingPass|eventTicket|coupon|generic|storeCard)/i; const passModelsDir = _configuration.models.dir; const outputDir = _configuration.output.dir; const Certificates = _configuration.certificates; -instance.use(express.json()); - /** Apply a filter to arg0 to remove hidden files names (starting with dot) @function removeDotFiles @@ -372,13 +368,4 @@ function RequestHandler(request, response) { }); } -instance.listen(80, "0.0.0.0", function(request, response) { - console.log("Listening on 80"); -}); - -instance.get("/", function (request, response) { - response.send("Hello there!"); -}); - -instance.get("/gen/:type/", RequestHandler); -instance.post("/gen/:type/", RequestHandler); +module.exports = { RequestHandler }; diff --git a/package.json b/package.json index 62c6399..bafb5f2 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "A passkit generator webserver", "main": "index.js", "scripts": { - "start": "node index.js" + "start": "node server.js" }, "author": "Alexander Patrick Cerutti", "license": "ISC", diff --git a/server.js b/server.js new file mode 100644 index 0000000..fafbd7b --- /dev/null +++ b/server.js @@ -0,0 +1,17 @@ +const express = require("express"); +const { RequestHandler } = require("./index") + +const instance = express(); + +instance.use(express.json()); + +instance.listen(80, "0.0.0.0", function(request, response) { + console.log("Listening on 80"); +}); + +instance.get("/", function (request, response) { + response.send("Hello there!"); +}); + +instance.get("/gen/:type/", RequestHandler); +instance.post("/gen/:type/", RequestHandler);