wip

Author: SiarheiFedartsou

server/server.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fastify_1 = __importDefault(require("fastify"));
+const util = require('util');
 const yargs_1 = __importDefault(require("yargs/yargs"));
 const schema_1 = require("./schema");
 const OSRM = require('../lib/index.js');
@@ -13,84 +14,28 @@ var Format;
     Format["Json"] = "json";
     Format["Flatbuffers"] = "flatbuffers";
 })(Format || (Format = {}));
-// TODO: a lot of copy-paste
-async function tile(osrm, zxy) {
-    const promise = new Promise((resolve, reject) => {
-        osrm.tile(zxy, function (err, response) {
-            if (err) {
-                reject(err);
-            }
-            else {
-                resolve(response);
-            }
-        });
-    });
-    return promise;
-}
-async function route(osrm, options) {
-    const promise = new Promise((resolve, reject) => {
-        osrm.route(options, function (err, response) {
-            if (err) {
-                reject(err);
-            }
-            else {
-                resolve(response);
-            }
-        });
-    });
-    return promise;
-}
-async function nearest(osrm, options) {
-    const promise = new Promise((resolve, reject) => {
-        osrm.nearest(options, function (err, response) {
-            if (err) {
-                reject(err);
-            }
-            else {
-                resolve(response);
-            }
-        });
-    });
-    return promise;
-}
-async function table(osrm, options) {
-    const promise = new Promise((resolve, reject) => {
-        osrm.table(options, function (err, response) {
-            if (err) {
-                reject(err);
-            }
-            else {
-                resolve(response);
-            }
-        });
-    });
-    return promise;
-}
-async function trip(osrm, options) {
-    const promise = new Promise((resolve, reject) => {
-        osrm.trip(options, function (err, response) {
-            if (err) {
-                reject(err);
-            }
-            else {
-                resolve(response);
-            }
-        });
-    });
-    return promise;
-}
-async function match(osrm, options) {
-    const promise = new Promise((resolve, reject) => {
-        osrm.match(options, function (err, response) {
-            if (err) {
-                reject(err);
-            }
-            else {
-                resolve(response);
-            }
-        });
-    });
-    return promise;
+class OSRMWrapper {
+    constructor(osrm) {
+        this.osrm = osrm;
+    }
+    async tile(zxy) {
+        return util.promisify(this.osrm.tile.bind(this.osrm))(zxy);
+    }
+    async route(options) {
+        return util.promisify(this.osrm.route.bind(this.osrm))(options);
+    }
+    async nearest(options) {
+        return util.promisify(this.osrm.nearest.bind(this.osrm))(options);
+    }
+    async table(options) {
+        return util.promisify(this.osrm.table.bind(this.osrm))(options);
+    }
+    async trip(options) {
+        return util.promisify(this.osrm.trip.bind(this.osrm))(options);
+    }
+    async match(options) {
+        return util.promisify(this.osrm.match.bind(this.osrm))(options);
+    }
 }
 async function handleNearest(osrm, coordinates, query, format) {
     const options = {
@@ -100,8 +45,7 @@ async function handleNearest(osrm, coordinates, query, format) {
     if (query.number !== undefined) {
         options.number = query.number;
     }
-    const res = await nearest(osrm, options);
-    return res;
+    return osrm.nearest(options);
 }
 async function handleTable(osrm, coordinates, query, format) {
     const options = {
@@ -123,7 +67,7 @@ async function handleTable(osrm, coordinates, query, format) {
     if (query.destinations && query.destinations !== 'all') {
         options.destinations = query.destinations;
     }
-    return table(osrm, options);
+    return osrm.table(options);
 }
 function handleCommonParams(query, options, format) {
     options.format = format;
@@ -193,7 +137,7 @@ async function handleMatch(osrm, coordinates, query, format) {
     if (query.tidy) {
         options.tidy = query.tidy;
     }
-    const res = await match(osrm, options);
+    const res = await osrm.match(options);
     return res;
 }
 async function handleTrip(osrm, coordinates, query, format) {
@@ -210,7 +154,7 @@ async function handleTrip(osrm, coordinates, query, format) {
     if (query.destination) {
         options.destination = query.destination;
     }
-    const res = await trip(osrm, options);
+    const res = await osrm.trip(options);
     return res;
 }
 async function handleRoute(osrm, coordinates, query, format) {
@@ -227,7 +171,7 @@ async function handleRoute(osrm, coordinates, query, format) {
     if (query.waypoints) {
         options.waypoints = query.waypoints;
     }
-    const res = await route(osrm, options);
+    const res = await osrm.route(options);
     return res;
 }
 async function main() {
@@ -256,7 +200,7 @@ async function main() {
         process.stdout.write('v5.27.0\n');
         return;
     }
-    const osrm = new OSRM({
+    const osrm = new OSRMWrapper(new OSRM({
         path: argv._[0],
         dataset_name: argv.dataset_name,
         algorithm: argv.algorithm,
@@ -268,7 +212,7 @@ async function main() {
         max_nearest_size: argv.max_nearest_size,
         max_alternatives: argv.max_alternatives,
         max_matching_radius: argv.max_matching_size
-    });
+    }));
     const fastify = (0, fastify_1.default)({
         logger: true,
         maxParamLength: Number.MAX_SAFE_INTEGER,
@@ -332,7 +276,7 @@ async function main() {
     fastify.get('/tile/v1/:profile/tile(:x,:y,:zoom).mvt', { schema: schema_1.tileSchema }, async (request, reply) => {
         const { x, y, zoom } = request.params;
         reply.type('application/x-protobuf').code(200);
-        return tile(osrm, [zoom, x, y]);
+        return osrm.tile([zoom, x, y]);
     });
     fastify.listen({ port: argv.port, host: argv.ip }, (err, address) => {
         if (err) {