tileblaster 1.0.1 → 1.0.3

package/builtins/check.js

@@ -1,4 +1,4 @@
-// check data.params against constraints
+// check data.req.params against constraints
 
 const cache = {};
 
@@ -86,28 +86,28 @@ module.exports = function({ req, res, opts, data }, next){
 	opts = cache[data.map];
 
 	// check for NaNs
-	if (isNaN(data.params.z) || isNaN(data.params.x) || isNaN(data.params.y)) return next(new Error("illegal zxy."));
+	if (isNaN(data.req.params.z) || isNaN(data.req.params.x) || isNaN(data.req.params.y)) return next(new Error("illegal zxy."));
 
 	// check zoom
-	if (data.params.z < opts.minZoom || data.params.z > opts.maxZoom) return next(new Error("illegal zoom."));
+	if (data.req.params.z < opts.minZoom || data.req.params.z > opts.maxZoom) return next(new Error("illegal zoom."));
 
 	// check bounds
 	if (opts.bounds) {
-		if (opts.bounds[data.params.z][0] < opts.bounds[data.params.z][2]) { // check for bounds spanning antimeridian
+		if (opts.bounds[data.req.params.z][0] < opts.bounds[data.req.params.z][2]) { // check for bounds spanning antimeridian
 			// bounds don't span antimeridian
-			if (data.params.x < opts.bounds[data.params.z][0] || data.params.x > opts.bounds[data.params.z][2]) return next(new Error("x is out of bounds."));
+			if (data.req.params.x < opts.bounds[data.req.params.z][0] || data.req.params.x > opts.bounds[data.req.params.z][2]) return next(new Error("x is out of bounds."));
 		} else {
 			// bounds span antimeridian
-			if (data.params.x > opts.bounds[data.params.z][0] && data.params.x < opts.bounds[data.params.z][2]) return next(new Error("x is out of bounds, bounds span antimeridian"));
+			if (data.req.params.x > opts.bounds[data.req.params.z][0] && data.req.params.x < opts.bounds[data.req.params.z][2]) return next(new Error("x is out of bounds, bounds span antimeridian"));
 		}
-		if (data.params.y < opts.bounds[data.params.z][1] || data.params.y > opts.bounds[data.params.z][3]) return next(new Error("y is out of bounds."));
+		if (data.req.params.y < opts.bounds[data.req.params.z][1] || data.req.params.y > opts.bounds[data.req.params.z][3]) return next(new Error("y is out of bounds."));
 	}
 
 	// check extension
-	if (opts.extensions.length > 0 && !opts.extensions.includes(data.params.e) && !opts.extensions.includes(data.params.f)) return next(new Error("illegal extension."));
+	if (opts.extensions.length > 0 && !opts.extensions.includes(data.req.params.e) && !opts.extensions.includes(data.req.params.f)) return next(new Error("illegal extension."));
 
 	// check density
-	if (opts.density && !opts.density.includes(data.params.d) && !opts.density.includes(data.params.f)) return next(new Error("illegal density marker."));
+	if (opts.density && !opts.density.includes(data.req.params.d) && !opts.density.includes(data.req.params.f)) return next(new Error("illegal density marker."));
 
 	// all passed
 	next();

package/builtins/compress.js

@@ -80,7 +80,7 @@ module.exports = function({ req, res, opts, data }, next){
 	}, [])).then(function(){
 
 		// set tile to best compressed tile client accepts FIXME find by buffer size?
-		const bestCompression = (opts.brotli && data.capabilities.br) ? "br" : (opts.gzip && data.capabilities.gz) ? "gzip" : null;
+		const bestCompression = (opts.brotli && data.req.supports.br) ? "br" : (opts.gzip && data.req.supports.gz) ? "gzip" : null;
 		if (bestCompression) data.tile = data.tiles.find(function(tile){
 			return tile.compression === bestCompression && tile.mimetype === data.tile.mimetype && tile.filetype === data.tile.filetype;
 		}) || data.tile;

package/lib/config.js

@@ -0,0 +1,110 @@
+// parse argv and load config
+
+const fs = require("node:fs");
+const path = require("node:path");
+const format = require("node:util").format;
+const package = require("../package.json");
+const minimist = require("minimist");
+
+// parse command line arguments
+const argv = minimist(process.argv.slice(2), {
+	alias: { v: "verbose", h: "help", s: "socket", p: "port", c: "config", t: "threads" },
+	boolean: [ "help", "verbose" ],
+});
+
+function usage(err){
+	if (err) console.error("%s: %s", package.name, err);
+	else console.error("%s %s -- %s", package.name, package.version, package.description);
+	console.error("");
+	console.error("Usage: %s [options] [-c] config.js", package.name);
+	console.error("Options:");
+	console.error("	-c --config <config.js>		load config file");
+	console.error("	-p --port <[host:]port>		listen on this port (overrides config)");
+	console.error("	-s --socket <socket[,mode,gid]>	listen on this socket (overrides config)");
+	console.error("	-t --threads <num>		number of threads (overrides config)");
+	console.error("	-h --help			print help screen");
+	console.error("	-v --verbose			enable debug output");
+	console.error("	-q --quiet			disable debug output");
+	console.error("");
+	process.exit(err?1:0);
+};
+
+// show help
+if (argv.h) usage();
+
+// enable/disable debug output when --verbose or --quiet
+if (argv.v) process.env.DEBUG = process.env.DEBUG || "tileblaster";
+if (argv.q) process.env.DEBUG = undefined;
+
+// if no --config, try last argument
+if (!argv.c && argv._.length > 0) argv.c = argv._.pop();
+if (!argv.c) usage("No config file specified.");
+
+// resolve config path
+const configfile = path.resolve(process.cwd(), argv.c);
+if (!fs.existsSync(configfile)) usage(format("No config file '%s' does not exist.", configfile));
+
+// load config
+const config = (function(){
+	try {
+		return require(configfile);
+	} catch(err) {
+		usage(format("Could not load config file: %s", err.toString()));
+	}
+})();
+
+// expose configfile for watching
+config._file = configfile;
+
+// override threads
+if (argv.t) {
+	let threads = parseInt(argv.t,10);
+	if (isNaN(threads) || !isFinite(threads)) return usage(format("Illegal number of threads: %s", argv.t));
+	config.threads = threads;
+};
+
+// override host and port
+if (argv.p) {
+	let host, port;
+	if (typeof argv.p === "string" && argv.p.includes(":")) {
+		host = argv.p.split(":");
+		port = parseInt(host.pop());
+		host = host.pop().toLowerCase();
+	} else {
+		port = parseInt(argv.p,10);
+		host = "localhost";
+	}
+
+	// check
+	if (isNaN(port) || !isFinite(port) || port < 1 || port > 65535) return usage(format("Illegal port: %s", argv.p));
+	if (!/^[a-z0-9\-\.\_]$/i.test(host)) return usage(format("Illegal hostname: %s", argv.p));
+
+	// remove all listen directives with port
+	config.listen = config.listen.filter(function(l){
+		return !l.hasOwnProperty("port");
+	});
+
+	// add our own
+	config.listen.push({ port, host });
+};
+
+// override socket
+if (argv.s) {
+	let socket, mode, group;
+	socket = socket.split(/,/g);
+	group = (socket.length >= 3) ? socket[2] : false;
+	mode = (socket.length >= 2) ? parseInt(socket[1],8) : 0o660;
+	socket = socket[0];
+
+	// remove all listen directives with port
+	config.listen = config.listen.filter(function(l){
+		return !l.hasOwnProperty("socket");
+	});
+
+	// add our own
+	config.listen.push({ socket, mode, group });
+
+};
+
+// export
+module.exports = config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileblaster",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "a quick and versatile map tile caching proxy",
   "main": "tileblaster.js",
   "bin": {
@@ -35,8 +35,8 @@
     "mbg": "^0.0.2",
     "node-liblzma": "^1.1.9",
     "optipng-js": "^0.1.2",
-    "pmtiles": "^2.7.1",
-    "sharp": "^0.32.0",
+    "pmtiles": "^2.9.0",
+    "sharp": "^0.32.4",
     "versatiles": "^0.3.1",
     "vtt": "^0.0.3"
   },