Add cli server command

also fix heroku procfile
also update all dependencies to latest version

Author: jperelli

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 3.7.0
+
+Add serve command to CLI
+
+ - Add serve subcommand to CLI
+ - Fix sample-server
+ - Updated all dependencies to latest version
+
 # 3.6.0
 
 New CLI interface, puppeteer singleton

Procfile

@@ -1 +1 @@
-web: node sample-server.js
+web: node src/cli.js serve

README.md

@@ -20,7 +20,7 @@ osmsm -g '{"type":"Point","coordinates":[-105.01621,39.57422]}' > map.png
 
 ```bash
 sudo npm i -g osm-static-maps --unsafe-perm=true
-``` 
+```
 
 ### 2. nodejs library
 
@@ -42,15 +42,15 @@ const imageBinaryBuffer = await osmsm({geojson})
 
 ### 3. Standalone sample server
 
-```
-git clone git@github.com:jperelli/osm-static-maps.git
-cd osm-static-maps
-npm install
-npm start
+```bash
+sudo npm i -g osm-static-maps
+osmsm serve
 ```
 
 Or you can use docker-compose
-```
+```bash
+git clone git@github.com:jperelli/osm-static-maps.git
+cd osm-static-maps
 docker-compose up
 ```
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "osm-static-maps",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "description": "Create a static image of a map with the features you want",
   "author": "Julian Perelli",
   "contributors": [
@@ -15,24 +15,24 @@
     "url": "http://github.com/jperelli/osm-static-maps.git"
   },
   "dependencies": {
-    "commander": "4.1.1",
+    "commander": "5.0.0",
     "express": "4.17.1",
     "handlebars": "4.7.3",
     "imagemin": "7.0.1",
     "imagemin-jpegtran": "6.0.0",
     "imagemin-optipng": "7.1.0",
     "leaflet": "1.6.0",
     "leaflet-polylinedecorator": "1.6.0",
-    "mapbox-gl": "1.8.1",
-    "mapbox-gl-leaflet": "0.0.11",
+    "mapbox-gl": "1.9.0",
+    "mapbox-gl-leaflet": "0.0.12",
     "puppeteer": "2.1.1"
   },
   "engines": {
     "node": ">=12"
   },
   "scripts": {
-    "start": "node sample-server.js",
-    "dev": "nodemon -e js,html sample-server.js",
+    "start": "node src/cli.js serve",
+    "dev": "nodemon -e js,html src/cli.js serve",
     "installandstartdev": "npm install && npm run dev"
   },
   "main": "./src/lib.js",

src/cli.js

@@ -82,7 +82,43 @@ program
   .option(
     "-k, --markerIconOptions <json string>",
     "Set marker icon options (see doc in https://leafletjs.com/reference-1.6.0.html#icon-option)"
-  );
+  )
+  .action(function(cmd) {
+    const opts = cmd.opts();
+
+    // DEBUG
+    // process.stderr.write(JSON.stringify(opts, undefined, 2));
+    // process.stderr.write("\n");
+
+    if (!["png", "jpeg"].includes(opts.type)) {
+      process.stderr.write(
+        '-F|--type can only have the values "png" or "jpeg"\n'
+      );
+      process.exit(2);
+    }
+
+    osmsm(opts)
+      .then(v => {
+        process.stdout.write(v);
+        process.stdout.end();
+        process.exit(0);
+      })
+      .catch(e => {
+        process.stderr.write(e.toString());
+        process.exit(1);
+      });
+  });
+
+program
+  .command("serve")
+  .option("-p, --port <number>", "Port number to listen")
+  .action(function(cmd) {
+    const server = require("./server");
+    const port = cmd.port || process.env.PORT || 3000;
+    server.listen(port, function() {
+      console.log("osmsm server listening on port " + port);
+    });
+  });
 
 program.on("--help", function() {
   process.stdout.write("\n");
@@ -97,25 +133,3 @@ program.on("--help", function() {
 });
 
 program.parse(process.argv);
-
-const opts = program.opts();
-
-// DEBUG
-// process.stderr.write(JSON.stringify(opts, undefined, 2));
-// process.stderr.write("\n");
-
-if (!["png", "jpeg"].includes(opts.type)) {
-  process.stderr.write('-F|--type can only have the values "png" or "jpeg"\n');
-  process.exit(2);
-}
-
-osmsm(opts)
-  .then(v => {
-    process.stdout.write(v);
-    process.stdout.end();
-    process.exit(0);
-  })
-  .catch(e => {
-    process.stderr.write(e.toString());
-    process.exit(1);
-  });

sample-server.js renamed to src/server.js

@@ -1,20 +1,14 @@
 var express = require("express"),
   http = require("http"),
-  osmsm = require("./lib/lib.js");
+  osmsm = require("./lib.js");
 
 var app = express();
-app.set("port", process.env.PORT || 3000);
+// app.set("port", process.env.PORT || 3000);
 app.set("views", __dirname + "/lib");
 app.set("view engine", "handlebars");
 app.set("view options", { layout: false });
 app.use(express.json({ limit: "50mb" }));
 
-http
-  .createServer(app)
-  .listen(app.get("port"), () =>
-    console.log("Express server listening on port " + app.get("port"))
-  );
-
 app.use((req, res, next) => {
   console.log(
     "[" +
@@ -44,3 +38,5 @@ app.get("/dynamic", (req, res) =>
 app.post("/dynamic", (req, res) =>
   handler(res, { ...req.body, renderToHtml: true })
 );
+
+module.exports = http.createServer(app)