Improve configurability

bin/generate-docs

@@ -1,4 +1,5 @@
-#!/bin/bash -ex
+#!/usr/bin/env bash
+set -ex
 
 rm -r docs || true
 

bin/start

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 exec node index.js

bin/units

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # run tests with pipefail to avoid false passes
 # see https://github.com/pelias/pelias/issues/744

middleware/sendJSON.js

@@ -3,11 +3,16 @@ const es = require('elasticsearch');
 const logger = require( 'pelias-logger' ).get( 'api' );
 const PeliasParameterError = require('../sanitizer/PeliasParameterError');
 const PeliasTimeoutError = require('../sanitizer/PeliasTimeoutError');
+const PeliasServiceError = require('../sanitizer/PeliasServiceError');
 
 function isParameterError(error) {
   return error instanceof PeliasParameterError;
 }
 
+function isServiceError(error) {
+  return error instanceof PeliasServiceError;
+}
+
 function isTimeoutError(error) {
   return error instanceof PeliasTimeoutError ||
          error instanceof es.errors.RequestTimeout;
@@ -36,7 +41,7 @@ function sendJSONResponse(req, res, next) {
   const errorCodes = errors.map(function(error) {
     if (isParameterError(error)) {
       return 400;
-    } else if (isTimeoutError(error) || isElasticsearchError(error)) {
+    } else if (isTimeoutError(error) || isElasticsearchError(error) || isServiceError(error)) {
       return 502;
     } else {
       return 500;

query/autocomplete.js

@@ -67,6 +67,8 @@ query.filter( views.focus_point_filter );
 
 // --------------------------------
 
+const overrides = config.get('api.autocomplete.default_overrides');
+
 /**
   map request variables to query variables for all inputs
   provided by this HTTP request.
@@ -75,6 +77,10 @@ function generateQuery( clean ){
 
   const vs = new peliasQuery.Vars( defaults );
 
+  if (_.isObject(overrides)) {
+    vs.set(overrides);
+  }
+
   // sources
   if( _.isArray(clean.sources) && !_.isEmpty(clean.sources) ){
     vs.var( 'sources', clean.sources );

query/reverse.js

@@ -1,5 +1,6 @@
 const _ = require('lodash');
 const peliasQuery = require('pelias-query');
+const config = require('pelias-config').generate();
 const defaults = require('./reverse_defaults');
 
 //------------------------------
@@ -23,10 +24,16 @@ query.filter( peliasQuery.view.boundary_gid );
 
 // --------------------------------
 
+const overrides = config.get('api.reverse.default_overrides');
+
 function generateQuery( clean ){
 
   const vs = new peliasQuery.Vars( defaults );
 
+  if (_.isObject(overrides)) {
+    vs.set(overrides);
+  }
+
   // set size
   if( clean.querySize ){
     vs.var( 'size', clean.querySize);

query/search.js

@@ -1,6 +1,7 @@
 const _ = require('lodash');
 const peliasQuery = require('pelias-query');
 const defaults = require('./search_defaults');
+const config = require('pelias-config').generate();
 const textParser = require('./text_parser');
 
 //------------------------------
@@ -24,6 +25,8 @@ fallbackQuery.filter( peliasQuery.view.categories );
 fallbackQuery.filter( peliasQuery.view.boundary_gid );
 // --------------------------------
 
+const overrides = config.get('api.search.default_overrides');
+
 /**
   map request variables to query variables for all inputs
   provided by this HTTP request.
@@ -32,6 +35,9 @@ function generateQuery( clean ){
 
   const vs = new peliasQuery.Vars( defaults );
 
+  if (_.isObject(overrides)) {
+    vs.set(overrides);
+  }
 
   // input text
   vs.var( 'input:name', clean.text );

sanitizer/PeliasServiceError.js

@@ -0,0 +1,15 @@
+class PeliasServiceError extends Error {
+    constructor(message = '') {
+        super(message);
+    }
+
+    toString() {
+        return this.message;
+    }
+
+    toJSON() {
+        return this.message;
+    }
+}
+
+module.exports = PeliasServiceError;

sanitizer/sanitizeAll.js

@@ -1,9 +1,14 @@
 const PeliasParameterError = require('./PeliasParameterError');
 const PeliasTimeoutError = require('../sanitizer/PeliasTimeoutError');
+const PeliasServiceError = require('../sanitizer/PeliasServiceError');
 
 function getCorrectErrorType(message) {
-  if (message.includes( 'Timeout')) {
+  if (message.includes( 'Timeout') || message.includes('timeout')) {
     return new PeliasTimeoutError(message);
+  } else if ( message.includes('parse response') ||
+      message.includes('ECONN') ||
+      message.includes('ENOTFOUND')) {
+    return new PeliasServiceError(message);
   }
 
   // most errors are parameter errors
@@ -15,7 +20,7 @@ function getCorrectErrorType(message) {
 // on Error objects here
 function ensureInstanceOfError(error) {
   if (error instanceof Error) {
-    // preserve the message and stack trace of existing Error objecs
+    // preserve the message and stack trace of existing Error objects
     const newError = getCorrectErrorType(error.message);
     newError.stack = error.stack;
     return newError;

test/unit/helper/diffPlaces.js

@@ -690,7 +690,7 @@ module.exports.tests.normalizeString = function (test, common) {
 
   test('diacritics', function (t) {
     t.equal(normalizeString('Malmö'), 'malmo');
-    t.equal(normalizeString('Grolmanstraße'), 'grolmanstraße');
+    t.equal(normalizeString('Grolmanstraße'), 'grolmanstrasse');
     t.equal(normalizeString('àáâãäåấắæầằçḉèéêëếḗềḕ'), 'aaaaaaaaaeaacceeeeeeee');
     t.end();
   });

test/unit/middleware/sendJSON.js

@@ -1,6 +1,7 @@
 const es = require('elasticsearch');
 const middleware = require('../../../middleware/sendJSON');
 const PeliasTimeoutError = require('../../../sanitizer/PeliasTimeoutError');
+const PeliasServiceError = require('../../../sanitizer/PeliasServiceError');
 
 module.exports.tests = {};
 
@@ -243,6 +244,24 @@ module.exports.tests.unknown_exception = function(test, common) {
   });
 };
 
+module.exports.tests.econnrefused = function(test, common) {
+  test('connection refused', function(t) {
+    var res = { body: { geocoding: {
+          errors: [ new PeliasServiceError('Some service error') ]
+        }}};
+
+    res.status = function( code ){
+      return { json: function( body ){
+          t.equal( code, 502, 'Bad Gateway' );
+          t.deepEqual( body, res.body, 'body set' );
+          t.end();
+        }};
+    };
+
+    middleware(null, res);
+  });
+};
+
 module.exports.all = function (tape, common) {
 
   function test(name, testFunction) {

test/unit/sanitizer/sanitizeAll.js

@@ -1,6 +1,7 @@
 var sanitizeAll = require('../../../sanitizer/sanitizeAll');
 const PeliasParameterError = require('../../../sanitizer/PeliasParameterError');
 const PeliasTimeoutError = require('../../../sanitizer/PeliasTimeoutError');
+const PeliasServiceError = require('../../../sanitizer/PeliasServiceError');
 
 module.exports.tests = {};
 
@@ -154,6 +155,38 @@ module.exports.tests.all = function(test, common) {
     t.end();
   });
 
+  test('Various connection errors should be converted to a PeliasServiceError type', function(t) {
+    var req = {};
+    const error_messages = [
+        'connect ECONNREFUSED 127.0.0.1:12345',
+        'getaddrinfo ENOTFOUND foobar',
+        'http://127.0.0.1:12345/parse?address=3400%20Kane%20Hill%20Rd could not parse response: foobar',
+    ];
+    var sanitizers = {
+      'first': {
+        sanitize: function(){
+          req.clean.a = 'first sanitizer';
+          return {
+            errors: error_messages.map(msg => new Error(msg)),
+            warnings: []
+          };
+        }
+      }
+    };
+
+    var expected_req = {
+      clean: {
+        a: 'first sanitizer'
+      },
+      errors: error_messages.map(msg => new PeliasServiceError(msg)),
+      warnings: []
+    };
+
+    sanitizeAll.runAllChecks(req, sanitizers);
+    t.deepEquals(req, expected_req);
+    t.end();
+  });
+
   test('req.query should be passed to individual sanitizers when available', function(t) {
     var req = {
       query: {