wip

Author: SiarheiFedartsou

features/lib/osrm_loader.js

@@ -48,12 +48,12 @@ class OSRMBaseLoader{
         var retryCount = 0;
         let retry = (err) => {
           if (err) {
-            if (retryCount < 10) {
-             // const timeoutMs = 10 * Math.pow(this.scope.OSRM_CONNECTION_EXP_BACKOFF_COEF, retryCount);
+            if (retryCount < this.scope.OSRM_CONNECTION_RETRIES) {
+              const timeoutMs = 10 * Math.pow(this.scope.OSRM_CONNECTION_EXP_BACKOFF_COEF, retryCount);
               retryCount++;
               setTimeout(() => {
                 tryConnect(this.scope.OSRM_IP, this.scope.OSRM_PORT, retry); 
-            }, 1000);
+            }, timeoutMs);
             } else {
               callback(new Error(`Could not connect to osrm-routed after ${this.scope.OSRM_CONNECTION_RETRIES} retries.`));
             }

features/support/env.js

@@ -40,7 +40,7 @@ module.exports = function () {
 
         this.OSRM_PORT = process.env.OSRM_PORT && parseInt(process.env.OSRM_PORT) || 5000;
         this.OSRM_IP = process.env.OSRM_IP || '127.0.0.1';
-        this.OSRM_CONNECTION_RETRIES = process.env.OSRM_CONNECTION_RETRIES && parseInt(process.env.OSRM_CONNECTION_RETRIES) || 10;
+        this.OSRM_CONNECTION_RETRIES = process.env.OSRM_CONNECTION_RETRIES && parseInt(process.env.OSRM_CONNECTION_RETRIES) || 100;
         this.OSRM_CONNECTION_EXP_BACKOFF_COEF = process.env.OSRM_CONNECTION_EXP_BACKOFF_COEF && parseFloat(process.env.OSRM_CONNECTION_EXP_BACKOFF_COEF) || 1.0;
 
         this.HOST = `http://${this.OSRM_IP}:${this.OSRM_PORT}`;

server/server.js

@@ -157,7 +157,7 @@ function main() {
             rewriteUrl: (req) => {
                 // https://github.com/fastify/fastify/issues/2487
                 // TODO: why url is optional?
-                const u = req.url.replace(';', '-');
+                const u = req.url.replace(';', '%3B');
                 console.log(u);
                 return u;
             }
@@ -167,18 +167,26 @@ function main() {
         }));
         // TODO: validation
         fastify.get('/:service(route|nearest|table|match|trip|tile)/v1/:profile/:coordinates', (request, reply) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
             const { service, profile, coordinates } = request.params;
             const query = request.query;
-            const parsedCoordinates = coordinates.split('-').map((c) => c.split(',').map((n) => parseFloat(n)));
+            const parsedCoordinates = coordinates.split(';').map((c) => c.split(',').map((n) => parseFloat(n)));
             const handlers = new Map();
             handlers.set('nearest', handleNearest);
             handlers.set('route', handleRoute);
             handlers.set('table', handleTable);
             handlers.set('trip', handleTrip);
             handlers.set('match', handleMatch);
             reply.type('application/json').code(200);
-            return (_a = handlers.get(service)) === null || _a === void 0 ? void 0 : _a(osrm, parsedCoordinates, query);
+            const handler = handlers.get(service);
+            if (handler == null) {
+                return {
+                    code: 'InvalidService',
+                    message: `Service ${service} not found!`
+                };
+            }
+            const result = yield handler(osrm, parsedCoordinates, query);
+            result['code'] = 'Ok';
+            return result;
         }));
         fastify.listen({ port: argv.port, host: argv.ip }, (err, address) => {
             if (err) {

server/server.ts

@@ -134,7 +134,7 @@ async function main() {
     rewriteUrl: (req) => {
       // https://github.com/fastify/fastify/issues/2487
       // TODO: why url is optional?
-      const u = req.url!.replace(';', '-');
+      const u = req.url!.replace(';', '%3B');
       console.log(u);
       return u
     }
@@ -148,7 +148,7 @@ async function main() {
   fastify.get('/:service(route|nearest|table|match|trip|tile)/v1/:profile/:coordinates', async (request, reply) => {
     const { service, profile, coordinates } = request.params as any;
     const query = request.query as any;
-    const parsedCoordinates = coordinates.split('-').map((c: string) => c.split(',').map((n: string) => parseFloat(n)));
+    const parsedCoordinates = coordinates.split(';').map((c: string) => c.split(',').map((n: string) => parseFloat(n)));
 
     const handlers: Map<string, Function> = new Map();
     handlers.set('nearest', handleNearest);
@@ -159,8 +159,18 @@ async function main() {
 
     reply.type('application/json').code(200)
 
+    const handler = handlers.get(service);
 
-    return handlers.get(service)?.(osrm, parsedCoordinates, query);
+    if (handler == null) {
+      return {
+        code: 'InvalidService',
+        message: `Service ${service} not found!`
+      }
+    }
+
+    const result = await handler(osrm, parsedCoordinates, query);
+    result['code'] = 'Ok';
+    return result;
   })
 
   fastify.listen({ port: argv.port, host: argv.ip }, (err, address) => {