save

Author: SiarheiFedartsou

docker/Dockerfile

@@ -3,9 +3,12 @@ ARG DOCKER_TAG
 ARG BUILD_CONCURRENCY
 RUN mkdir -p /src  && mkdir -p /opt
 
+
 RUN apt-get update && \
-    apt-get -y --no-install-recommends install ca-certificates cmake make git gcc g++ libbz2-dev libxml2-dev wget \
+    apt-get -y --no-install-recommends install ca-certificates curl cmake make git gcc g++ libbz2-dev libxml2-dev wget \
     libzip-dev libboost1.74-all-dev lua5.4 liblua5.4-dev -o APT::Install-Suggests=0 -o APT::Install-Recommends=0
+RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - && \
+    apt-get install -y nodejs
 
 RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
     ldconfig /usr/local/lib && \
@@ -32,36 +35,33 @@ RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
     case ${DOCKER_TAG} in *"-debug"*) BUILD_TYPE="Debug";; esac && \
     case ${DOCKER_TAG} in *"-assertions"*) BUILD_TYPE="RelWithDebInfo" && ENABLE_ASSERTIONS="On" && BUILD_TOOLS="On";; esac && \
     echo "Building ${BUILD_TYPE} with ENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} BUILD_TOOLS=${BUILD_TOOLS}" && \
-    cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} -DBUILD_TOOLS=${BUILD_TOOLS} -DENABLE_LTO=On && \
+    cmake .. -DENABLE_NODE_BINDINGS=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} -DBUILD_TOOLS=${BUILD_TOOLS} -DENABLE_LTO=On && \
     make -j${NPROC} install && \
-    cd ../profiles && \
-    cp -r * /opt && \
-    strip /usr/local/bin/* && \
-    rm -rf /src /usr/local/lib/libosrm*
-
+    cd .. && \z
+    npm install -g --only=production
 
-# Multistage build to reduce image size - https://docs.docker.com/engine/userguide/eng-image/multistage-build/#use-multi-stage-builds
-# Only the content below ends up in the image, this helps remove /src from the image (which is large)
-FROM debian:bullseye-slim as runstage
+# # Multistage build to reduce image size - https://docs.docker.com/engine/userguide/eng-image/multistage-build/#use-multi-stage-builds
+# # Only the content below ends up in the image, this helps remove /src from the image (which is large)
+# FROM debian:bullseye-slim as runstage
 
-COPY --from=builder /usr/local /usr/local
-COPY --from=builder /opt /opt
+# COPY --from=builder /usr/local /usr/local
+# COPY --from=builder /opt /opt
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends libboost-program-options1.74.0 libboost-regex1.74.0 \
-        libboost-date-time1.74.0 libboost-chrono1.74.0 libboost-filesystem1.74.0 \
-        libboost-iostreams1.74.0 libboost-system1.74.0 libboost-thread1.74.0 \
-        expat liblua5.4-0 && \
-    rm -rf /var/lib/apt/lists/* && \
-# add /usr/local/lib to ldconfig to allow loading libraries from there
-    ldconfig /usr/local/lib
+# RUN apt-get update && \
+#     apt-get install -y --no-install-recommends libboost-program-options1.74.0 libboost-regex1.74.0 \
+#         libboost-date-time1.74.0 libboost-chrono1.74.0 libboost-filesystem1.74.0 \
+#         libboost-iostreams1.74.0 libboost-system1.74.0 libboost-thread1.74.0 \
+#         expat liblua5.4-0 && \
+#     rm -rf /var/lib/apt/lists/* && \
+# # add /usr/local/lib to ldconfig to allow loading libraries from there
+#     ldconfig /usr/local/lib
 
-RUN /usr/local/bin/osrm-extract --help && \
-    /usr/local/bin/osrm-routed --help && \
-    /usr/local/bin/osrm-contract --help && \
-    /usr/local/bin/osrm-partition --help && \
-    /usr/local/bin/osrm-customize --help
+# RUN /usr/local/bin/osrm-extract --help && \
+#     /usr/local/bin/osrm-routed --help && \
+#     /usr/local/bin/osrm-contract --help && \
+#     /usr/local/bin/osrm-partition --help && \
+#     /usr/local/bin/osrm-customize --help
 
-WORKDIR /opt
+# WORKDIR /opt
 
-EXPOSE 5000
+# EXPOSE 5000

src/nodejs/node_osrm.cpp

@@ -225,6 +225,9 @@ inline void async(const Nan::FunctionCallbackInfo<v8::Value> &info,
             Nan::Set(error_obj,
                      Nan::New("message").ToLocalChecked(),
                      Nan::New(error->message).ToLocalChecked());
+            Nan::Set(error_obj,
+                     Nan::New("description").ToLocalChecked(),
+                     Nan::New(error->message).ToLocalChecked());
             Nan::Set(error_obj,
                      Nan::New("code").ToLocalChecked(),
                      Nan::New(error->code).ToLocalChecked());