refactor: mv app src

index.js

@@ -3,7 +3,7 @@ const HTTPS = require('https');
 const FS = require('fs');
 
 DEBUG('index start...');
-const APP=require('./app/app');
+const main=require('./src/main');
 
 //TODO make port available via config
 //set port
@@ -11,18 +11,18 @@ const PORT=parseInt(process.env.PORT, 10)||65535;
 DEBUG('PORT: '+PORT);
 
 //TODO make env available via config
-//pass 'APP' to server
+//pass 'main' to server
 DEBUG('NODE_ENV: '+process.env.NODE_ENV);
 if (process.env.NODE_ENV !== 'production') {
     DEBUG('development mode');
-    APP.listen(PORT);
+    main.listen(PORT);
 }else{
     DEBUG('production mode');
     HTTPS.createServer({
 	//TODO make key and cert available via config
         key: FS.readFileSync('./p'),
         cert: FS.readFileSync('./f')
-    }, APP)
+    }, main)
     .listen(PORT, ()=>DEBUG('listening on port '+PORT));
 }
 

src/main.js

@@ -1,11 +1,11 @@
 const debug=require('debug')('debug');
-debug('app start...');
+debug('main start...');
 
 require('dotenv').config();
 const HELMET = require('helmet');
 const COMPRESSION = require('compression');
 
-const EXPRESS = require("express");
+const express = require("express");
 const CORS = require("cors");
 
 //get API root with alive msg
@@ -156,16 +156,16 @@ let whitelist = [
     'http(s)://foo.bar'
 ];
 
-const APP = EXPRESS();
+const app = express();
 
 //compress all routes
-APP.use(COMPRESSION());
+app.use(COMPRESSION());
 
 //protect against vulnerabilities
-APP.use(HELMET());
+app.use(HELMET());
 
 //configure CORS
-APP.use(CORS({
+app.use(CORS({
     origin: function(origin, callback){
         // allow requests with no origin
         debug('origin: '+origin)
@@ -181,97 +181,100 @@ APP.use(CORS({
     }
 }));
 //api enable/disable?
-APP.use('/', ROOTROUTER);
+app.use('/', ROOTROUTER);
 //agency
-APP.use('/agency', AGENCYROUTER);
-APP.use('/agency-name', AGENCYNAMEROUTER);
-APP.use('/agency-url', AGENCYURLROUTER);
-APP.use('/agencyids',agencyIds);
+app.use('/agency', AGENCYROUTER);
+app.use('/agency-name', AGENCYNAMEROUTER);
+app.use('/agency-url', AGENCYURLROUTER);
+app.use('/agencyids',agencyIds);
 
 //get all entries from table
-APP.use('/agency-all', AGENCYALLROUTER);
-APP.use('/frequencies-all', FREQUENCIESALLROUTER);
-APP.use('/routes-all', ROUTESALLROUTER);
-APP.use('/stops-all', STOPSALLROUTER);
+app.use('/agency-all', AGENCYALLROUTER);
+app.use('/frequencies-all', FREQUENCIESALLROUTER);
+app.use('/routes-all', ROUTESALLROUTER);
+app.use('/stops-all', STOPSALLROUTER);
 
 //offset and limit
-APP.use('/agency-oset-limit',agencyOsetLimit);
-APP.use('/agency-id-name-oset-limit',agencyIdName);
-APP.use('/calendar-oset-limit',calendarOsetLimit);
-APP.use('/calendar_dates-oset-limit',calendarDatesOsetLimit);
-APP.use('/frequencies-oset-limit',frequenciesOsetLimit);
-APP.use('/levels-oset-limit',levelsOsetLimit);
-APP.use('/pathways-oset-limit',pathwaysOsetLimit);
-APP.use('/routes-oset-limit',routesOsetLimit);
-APP.use('/shapes-oset-limit',shapesOsetLimit);
-APP.use('/stops-oset-limit',stopsOsetLimit);
-APP.use('/stop_times-oset-limit',stopTimesOsetLimit);
-APP.use('/transfers-oset-limit',transfersOsetLimit);
-APP.use('/trips-oset-limit',tripsOsetLimit);
+app.use('/agency-oset-limit',agencyOsetLimit);
+app.use('/agency-id-name-oset-limit',agencyIdName);
+app.use('/calendar-oset-limit',calendarOsetLimit);
+app.use('/calendar_dates-oset-limit',calendarDatesOsetLimit);
+app.use('/frequencies-oset-limit',frequenciesOsetLimit);
+app.use('/levels-oset-limit',levelsOsetLimit);
+app.use('/pathways-oset-limit',pathwaysOsetLimit);
+app.use('/routes-oset-limit',routesOsetLimit);
+app.use('/shapes-oset-limit',shapesOsetLimit);
+app.use('/stops-oset-limit',stopsOsetLimit);
+app.use('/stop_times-oset-limit',stopTimesOsetLimit);
+app.use('/transfers-oset-limit',transfersOsetLimit);
+app.use('/trips-oset-limit',tripsOsetLimit);
 //get routes by agency_id
-APP.use('/routes',routesByAgencyId);
+app.use('/routes',routesByAgencyId);
 
 //count
 //get route count by providing agency_id
-APP.use('/route-count', ROUTECOUNT);
-APP.use('/trip-count', TRIPCOUNT);
-APP.use('/number-of-routes', numberOfRoutes);
-APP.use('/number-of-trips', numberOfTrips);
+app.use('/route-count', ROUTECOUNT);
+app.use('/trip-count', TRIPCOUNT);
+app.use('/number-of-routes', numberOfRoutes);
+app.use('/number-of-trips', numberOfTrips);
 
 //get route_short-name by providing trip_short_name
-APP.use('/route-short-name', ROUTESHORTNAME);
+app.use('/route-short-name', ROUTESHORTNAME);
 
-APP.use('/pt-by-ifleet', ptByIfleet);
+app.use('/pt-by-ifleet', ptByIfleet);
 //trips
-APP.use('/trip-headsign', TRIPHEADSIGNROUTER);
-APP.use('/trips', TRIPSROUTER);
-APP.use('/trips-by-route-id', tripsByRouteId);
-APP.use('/trip-count-day-agency', tripCountDayAgency);
-APP.use('/trip-count-day-route', tripCountDayRoute);
-APP.use('/trip-calendar-by-agency-id', tripCalendarByAgencyId);
-APP.use('/trip-calendar-by-route-id', tripCalendarByRouteId);
-APP.use('/trips-by-route-day', tripsByRouteDay);
+app.use('/trip-headsign', TRIPHEADSIGNROUTER);
+app.use('/trips', TRIPSROUTER);
+app.use('/trips-by-route-id', tripsByRouteId);
+app.use('/trip-count-day-agency', tripCountDayAgency);
+app.use('/trip-count-day-route', tripCountDayRoute);
+app.use('/trip-calendar-by-agency-id', tripCalendarByAgencyId);
+app.use('/trip-calendar-by-route-id', tripCalendarByRouteId);
+app.use('/trips-by-route-day', tripsByRouteDay);
 //trip updates
-APP.use('/trip-updates-by-route-day', tripUpdatesByRouteDay);
+app.use('/trip-updates-by-route-day', tripUpdatesByRouteDay);
 //service
-APP.use('/service', ROUTESERVICE);
+app.use('/service', ROUTESERVICE);
 /** TODO Disable this route as it is not working!
-APP.use('/servicedays', ROUTESERVICEDAYS);
+app.use('/servicedays', ROUTESERVICEDAYS);
 */
-APP.use('/service-overview', ROUTESERVICEOVERVIEW);
-APP.use('/dates-service-available',datesServiceAvailable);
-APP.use('/dates-service-added',datesServiceAdded);
-APP.use('/dates-service-removed',datesServiceRemoved);
-APP.use('/service-availability',serviceAvailability);
-APP.use('/service-ability-by-route-id',serviceAbilityByRouteId);
-APP.use('/services-by-route-id', servicesByRouteId);
+app.use('/service-overview', ROUTESERVICEOVERVIEW);
+app.use('/dates-service-available',datesServiceAvailable);
+app.use('/dates-service-added',datesServiceAdded);
+app.use('/dates-service-removed',datesServiceRemoved);
+app.use('/service-availability',serviceAvailability);
+app.use('/service-ability-by-route-id',serviceAbilityByRouteId);
+app.use('/services-by-route-id', servicesByRouteId);
 //entry count
-APP.use('/table-areas-count', tableAreasCount);
-APP.use('/table-agency-count', tableAgencyCount);
-APP.use('/table-attributions-count', tableAttributionsCount);
-APP.use('/table-calendar-count', tableCalendarCount);
-APP.use('/table-calendar_dates-count', tableCalendarDatesCount);
-APP.use('/table-fare_attributes-count', tableFareAttributesCount);
-APP.use('/table-fare_leg-rules-count', tableFareLegRulesCount);
-APP.use('/table-fare_media-count', tableFareMediaCount);
-APP.use('/table-fare_products-count', tableFareProductsCount);
-APP.use('/table-fare_rules-count', tableFareRulesCount);
-APP.use('/table-fare_transfer-rules-count', tableFareTransferRulesCount);
-APP.use('/table-feed_info-count', tableFeedInfoCount);
-APP.use('/table-frequencies-count', tableFrequenciesCount);
-APP.use('/table-levels-count', tableLevelsCount);
-APP.use('/table-pathways-count', tablePathwaysCount);
-APP.use('/table-routes-count', tableRoutesCount);
-APP.use('/table-shapes-count', tableShapesCount);
-APP.use('/table-stop_areas-count', tableStopAreasCount);
-APP.use('/table-stops-count', tableStopsCount);
-APP.use('/table-stop_times-count', tableStopTimesCount);
-APP.use('/table-transfers-count', tableTransfersCount);
-APP.use('/table-translations-count', tableTranslationsCount);
-APP.use('/table-trips-count', tableTripsCount);
+app.use('/table-areas-count', tableAreasCount);
+app.use('/table-agency-count', tableAgencyCount);
+app.use('/table-attributions-count', tableAttributionsCount);
+app.use('/table-calendar-count', tableCalendarCount);
+app.use('/table-calendar_dates-count', tableCalendarDatesCount);
+app.use('/table-fare_attributes-count', tableFareAttributesCount);
+app.use('/table-fare_leg-rules-count', tableFareLegRulesCount);
+app.use('/table-fare_media-count', tableFareMediaCount);
+app.use('/table-fare_products-count', tableFareProductsCount);
+app.use('/table-fare_rules-count', tableFareRulesCount);
+app.use('/table-fare_transfer-rules-count', tableFareTransferRulesCount);
+app.use('/table-feed_info-count', tableFeedInfoCount);
+app.use('/table-frequencies-count', tableFrequenciesCount);
+app.use('/table-levels-count', tableLevelsCount);
+app.use('/table-pathways-count', tablePathwaysCount);
+app.use('/table-routes-count', tableRoutesCount);
+app.use('/table-shapes-count', tableShapesCount);
+app.use('/table-stop_areas-count', tableStopAreasCount);
+app.use('/table-stops-count', tableStopsCount);
+app.use('/table-stop_times-count', tableStopTimesCount);
+app.use('/table-transfers-count', tableTransfersCount);
+app.use('/table-translations-count', tableTranslationsCount);
+app.use('/table-trips-count', tableTripsCount);
+
 //number of tables
-APP.use('/table-count', tableCount);
+app.use('/table-count', tableCount);
+
 //array with name of all tables
-APP.use('/table-names', tableNames);
-module.exports=APP;
-debug('app done..');
+app.use('/table-names', tableNames);
+
+module.exports=app;
+debug('main done..');