tileblaster 1.0.7 → 1.0.9

package/builtins/check.js

@@ -3,22 +3,13 @@
 const cache = {};
 
 module.exports = function({ req, res, opts, data }, next, skip){
+	const debug = this.lib.debug;
 
 	// fill cache for map
 	if (!cache.hasOwnProperty(data.map)) {
 
 		cache[data.map] = {};
 
-		// skip function
-		cache[data.map].abort = function(err){
-			if (res.used) return;
-			res.statusCode = cache[data.map].status;
-			if (cache[data.map].hints && err) res.setHeader("x-tileblaster-hint", err.message || err.toString());
-			res.end();
-			res.used = true; // mark connection as used
-			return skip(); // skip rest of jobs
-		};
-
 		cache[data.map].status = (opts.status && Number.isInteger(opts.status)) ? opts.status : 204;
 
 		cache[data.map].hints = !!opts.hints;
@@ -99,29 +90,40 @@ module.exports = function({ req, res, opts, data }, next, skip){
 	};
 	opts = cache[data.map];
 
+	// skip function
+	const abort = function abort (err){
+		debug.info("Check: Abort %s/%s/%s/%s: %s", data.map, data.req.params.z, data.req.params.x, data.req.params.y, err.message || err.toString());
+		if (res.used) return;
+		res.statusCode = cache[data.map].status;
+		if (cache[data.map].hints && err) res.setHeader("x-tileblaster-hint", err.message || err.toString());
+		res.end();
+		res.used = true; // mark connection as used
+		return skip(); // skip rest of jobs
+	};
+
 	// check for NaNs
-	if (isNaN(data.req.params.z) || isNaN(data.req.params.x) || isNaN(data.req.params.y)) return cache[data.map].abort(new Error("illegal zxy."));
+	if (isNaN(data.req.params.z) || isNaN(data.req.params.x) || isNaN(data.req.params.y)) return abort(new Error("illegal zxy."));
 
 	// check zoom
-	if (data.req.params.z < opts.minZoom || data.req.params.z > opts.maxZoom) return cache[data.map].abort(new Error("illegal zoom."));
+	if (data.req.params.z < opts.minZoom || data.req.params.z > opts.maxZoom) return abort(new Error("illegal zoom."));
 
 	// check bounds
 	if (opts.bounds) {
 		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.req.params.x < opts.bounds[data.req.params.z][0] || data.req.params.x > opts.bounds[data.req.params.z][2]) return cache[data.map].abort(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 abort(new Error("x is out of bounds."));
 		} else {
 			// 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 cache[data.map].abort(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 abort(new Error("x is out of bounds, bounds span antimeridian"));
 		}
-		if (data.req.params.y < opts.bounds[data.req.params.z][1] || data.req.params.y > opts.bounds[data.req.params.z][3]) return cache[data.map].abort(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 abort(new Error("y is out of bounds."));
 	}
 
 	// check extension
-	if (opts.extensions.length > 0 && !opts.extensions.includes(data.req.params.e) && !opts.extensions.includes(data.req.params.f)) return cache[data.map].abort(new Error("illegal extension."));
+	if (opts.extensions.length > 0 && !opts.extensions.includes(data.req.params.e) && !opts.extensions.includes(data.req.params.f)) return abort(new Error("illegal extension."));
 
 	// check density
-	if (opts.density && !opts.density.includes(data.req.params.d) && !opts.density.includes(data.req.params.f)) return cache[data.map].abort(new Error("illegal density marker."));
+	if (opts.density && !opts.density.includes(data.req.params.d) && !opts.density.includes(data.req.params.f)) return abort(new Error("illegal density marker."));
 
 	// all passed
 	next();

package/builtins/versatiles.js

@@ -17,22 +17,23 @@ module.exports = function({ req, res, opts, data }, next, skip){
 			headers: ((opts.hasOwnProperty("headers")) ? opts.headers : {}),
 		});
 
-		// skip function
-		cache[data.map].abort = function(err){
-			if (res.used) return;
-			res.statusCode = 204; // no content
-			res.setHeader("x-tileblaster-hint", err.message || err.toString());
-			res.end();
-			res.used = true; // mark connection as used
-			return skip(); // skip rest of jobs
-		};
-
 	};
 	const vt = cache[data.map];
 
-	debug.info("Fetching %s/%s/%s", data.req.params.z, data.req.params.x, data.req.params.y);
+	// abort function
+	const abort = function abort(err){
+		debug.info("Versatiles: Abort %s/%s/%s/%s: %s", data.map, data.req.params.z, data.req.params.x, data.req.params.y, err.message || err.toString());
+		if (res.used) return;
+		res.statusCode = 204; // no content
+		res.end();
+		res.used = true; // mark connection as used
+		return skip(); // skip rest of jobs
+	};
+
+	debug.info("Versatiles: Fetching %s/%s/%s/%s", data.map, data.req.params.z, data.req.params.x, data.req.params.y);
 	vt.getTile(data.req.params.z, data.req.params.x, data.req.params.y, function(err, buf){
-		if (err) return cache[data.map].abort(err); // fail gracefully
+		if (err) return abort(err); // fail gracefully
+		if (buf.length === 0) return abort(new Error("Tile does not exist")); // fail gracefully
 
 		// if precompressed, keep in tile stack
 		/* TODO evaluate side effects
@@ -51,7 +52,7 @@ module.exports = function({ req, res, opts, data }, next, skip){
 
 		// decompress tile
 		vt.decompress(vt.header.tile_precompression, buf, function(err, buf){
-			if (err) return cache[data.map].abort(err); // fail gracefully
+			if (err) return abort(err); // fail gracefully
 
 			const tile = {
 				buffer: buf,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileblaster",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "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.10.0",
-    "sharp": "^0.32.4",
+    "pmtiles": "^2.11.0",
+    "sharp": "^0.33.2",
     "versatiles": "^0.3.1",
     "vtt": "^0.0.3"
   },

package/tileblaster.js

@@ -113,9 +113,26 @@ const tileblaster = module.exports = function tileblaster(config){
 
 		self.queue.push(function(next){ // queue tasks
 
+			args.start = Date.now();
+			args.timeout = setTimeout(function(){
+				debug.warn("Task timed out: %s (%d total, %d running)", req.path, self.queue.stack.length, self.queue.running);
+				if (res.used) return debug.warn("Connection already used.", req.path);
+				res.used = true;
+				args.timeout = null;
+				res.statusCode = 500;
+				res.setHeader("content-type", "text/plain");
+				res.end("Error.");
+				next();
+			},30000);
+
 			// create tasks from map
 			tasks(self.maps[req.map]).run(args, function(err, { res }){
 
+				// check if timed out
+				if (args.timeout === null) return;
+				clearTimeout(args.timeout);
+				debug.info("Task complete: %s (%ds)", req.path, ((Date.now()-args.start)/1000));
+
 				next(); // free queue
 
 				// FIXME provide more context