Merge pull request #12 from morganney/develop

Switch to umo and proxy over https

README.md

@@ -6,5 +6,5 @@ Converts the [NextBus][1] [Public XML Feed][2], which is used to build real-time
 All documentation is hosted at [restbus.info][0].
 
 [0]: http://restbus.info
-[1]: http://www.nextbus.com
-[2]: http://www.nextbus.com/xmlFeedDocs/NextBusXMLFeed.pdf
+[1]: https://retro.umoiq.com/
+[2]: https://retro.umoiq.com/xmlFeedDocs/NextBusXMLFeed.pdf

lib/api/agencies.js

@@ -1,4 +1,4 @@
-var http = require('http');
+var https = require('https');
 var utils = require('../utils');
 var NBXML_FEED = utils.c.NEXTBUS_XMLFEED;
 var agencies = {};
@@ -58,7 +58,7 @@ function getLinks(hrefs, agency, req) {
 }
 
 agencies.list = function(req, res) {
-  http.get(utils.getOptionsWithPath(NBXML_FEED + '?command=agencyList'), function(nbres) {
+  https.get(utils.getOptionsWithPath(NBXML_FEED + '?command=agencyList'), function(nbres) {
     utils.getJsFromXml(nbres, function(err, js) {
       var json = [],
           uri;
@@ -85,7 +85,7 @@ agencies.list = function(req, res) {
 agencies.get = function(req, res) {
   var agency_id = req.params.agency;
 
-  http.get(utils.getOptionsWithPath(NBXML_FEED + '?command=agencyList'), function(nbres) {
+  https.get(utils.getOptionsWithPath(NBXML_FEED + '?command=agencyList'), function(nbres) {
     utils.getJsFromXml(nbres, function(err, js) {
       var json = false,
           uri, ruri, vuri, auri;

lib/api/predictions.js

@@ -1,4 +1,4 @@
-var http = require('http');
+var https = require('https');
 var zlib = require('zlib');
 var qs = require('querystring');
 var utils = require('../utils');
@@ -14,7 +14,7 @@ predictions.get = function(req, res) {
       onsplit = params.onsplit || 'routes',
       path = params.path || [NBXML_FEED, '?command=predictions&a=', a, '&r=', r, '&s=', s].join('');
 
-  http.get(utils.getOptionsWithPath(path), function(nbres) {
+  https.get(utils.getOptionsWithPath(path), function(nbres) {
     utils.getJsFromXml(nbres, function(err, js) {
       var json = [], nberr, url, uri;
 
@@ -149,8 +149,8 @@ predictions.get = function(req, res) {
  *
  * @uri /agencies/:agency/stops/:code/predictions
  *
- * @param {Object:req} The node native http.ClientRequest object.
- * @param {Object:res} The node native http.ServerResponse object.
+ * @param {Object:req} The node native https.ClientRequest object.
+ * @param {Object:res} The node native https.ServerResponse object.
  */
 predictions.list = function(req, res) {
   var p = req.params;
@@ -164,8 +164,8 @@ predictions.list = function(req, res) {
  * Tuples <====> F:5650 (route-id:stop-id)
  * @uri /agencies/:agency/tuples/:tuples/predictions e.g. /agencies/sf-muni/tuples/F:5650,N:6997/predictions
  *
- * @param {Object:req} The node native http.ClientRequest object.
- * @param {Object:res} The node native http.ServerResponse object.
+ * @param {Object:req} The node native https.ClientRequest object.
+ * @param {Object:res} The node native https.ServerResponse object.
  */
 
 predictions.tuples = function(req, res) {
@@ -190,8 +190,8 @@ predictions.tuples = function(req, res) {
  * UNSTABLE: The data from NextBus behind this request can be removed at any moment and
  * without notice. Use this particular method at your own risk.
  *
- * @param {Object:req} The node native http.ClientRequest object.
- * @param {Object:res} The node native http.ServerResponse object.
+ * @param {Object:req} The node native https.ClientRequest object.
+ * @param {Object:res} The node native https.ServerResponse object.
  */
 predictions.location = function(req, res) {
   var p = req.params,
@@ -220,7 +220,7 @@ predictions.location = function(req, res) {
         'content-length': postdata.length
       }
     };
-    postreq = http.request(options, function(nbres) {
+    postreq = https.request(options, function(nbres) {
       var nbjson = '';
 
       nbres.on('data', function(d) { if(d) nbjson += d; });

lib/api/routes.js

@@ -1,4 +1,4 @@
-var http = require('http');
+var https = require('https');
 var utils = require('../utils');
 var C = utils.c;
 var NBXML_FEED = C.NEXTBUS_XMLFEED;
@@ -55,7 +55,7 @@ routes.list = function(req, res) {
   var path = [NBXML_FEED, '?command=routeList&a=', req.params.agency].join(''),
       params = req.params;
 
-  http.get(utils.getOptionsWithPath(path), function(nbres) {
+  https.get(utils.getOptionsWithPath(path), function(nbres) {
     utils.getJsFromXml(nbres, function(err, js) {
       var json = [],
           nberr, rte, uri;
@@ -127,7 +127,7 @@ routes.get = function(req, res) {
   var p = req.params,
       path = [NBXML_FEED, '?command=routeConfig&a=', p.agency, '&r=', p.route].join('');
 
-  http.get(utils.getOptionsWithPath(path), function(nbres) {
+  https.get(utils.getOptionsWithPath(path), function(nbres) {
     utils.getJsFromXml(nbres, function(err, js) {
       var json = {},
           route, $, nberr, uri, vuri, ruri;

lib/api/vehicles.js

@@ -1,4 +1,4 @@
-var http = require('http');
+var https = require('https');
 var utils = require('../utils');
 var C = utils.c;
 var NBXML_FEED = C.NEXTBUS_XMLFEED;
@@ -77,16 +77,16 @@ function getLinks(hrefs, v, req) {
  * parameter in the request to NextBus, but leave it without a value, then all agency vehicles are
  * returned as desired. However, including it allows us to reuse this method for vehicles.routelist.
  *
- * @param {Object:req} The node native http.ClientRequest object.
- * @param {Object:res} The node native http.ServerResponse object.
+ * @param {Object:req} The node native https.ClientRequest object.
+ * @param {Object:res} The node native https.ServerResponse object.
  */
 vehicles.list = function(req, res) {
   var p = req.params,
       a = p.agency,
       r = p.route ? p.route : '',
       path = [NBXML_FEED, '?command=vehicleLocations&a=', a, '&r=', r, '&t=0'].join('');
 
-  http.get(utils.getOptionsWithPath(path), function(nbres) {
+  https.get(utils.getOptionsWithPath(path), function(nbres) {
     utils.getJsFromXml(nbres, function(err, js) {
       var json = [], nberr, vehicles, uri, ruri;
 
@@ -128,7 +128,7 @@ vehicles.get = function(req, res) {
       v = p.vehicle,
       path = [NBXML_FEED, '?command=vehicleLocation&a=', a, '&v=', v].join('');
 
-  http.get(utils.getOptionsWithPath(path), function(nbres) {
+  https.get(utils.getOptionsWithPath(path), function(nbres) {
     utils.getJsFromXml(nbres, function(err, js) {
       var nberr, uri, auri, ruri;
 

lib/utils.js

@@ -1,17 +1,10 @@
 var zlib = require('zlib');
 var js4xml = require('xml2js').parseString;
+// @see https://retro.umoiq.com/xmlFeedDocs/NextBusXMLFeed.pdf
 var options = {
-  hostname: 'webservices.nextbus.com',
+  host: 'retro.umoiq.com',
+  hostname: 'retro.umoiq.com',
   headers: {'accept-encoding':'gzip,deflate'}
-  // Make http request to NextBus use 'Connection: close' instead of 'Connection: keep-alive'
-  // Might help with avoiding the weird node.js error when restarting server (and/or changing NODE_ENV):
-  //
-  // Error: read ECONNRESET
-  // at errnoException (net.js:901:11)
-  // at TCP.onread (net.js:556:19)
-  //
-  // @see http://nodejs.org/api/http.html#http_http_request_options_callback
-  // agent: false
 };
 var utils = {};