tileblaster 0.4.1 → 0.4.4

package/LICENSE

@@ -0,0 +1,21 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <https://unlicense.org/>

package/config.js.dist

@@ -23,23 +23,23 @@ module.exports = {
 
 	// maps
 	"maps": {
-		
+
 		// map id, accessible via //server/mapid/z/x/y.ext
 		"example": {
-		
-			// backend url: 
+
+			// backend url:
 			// * {s} subdomains specified in sub
 			// * {z}, {x}, {y} tile coordinates
 			// * {e} extension
 			// * {r} resolution marker
 			"url": "https://{s}.tiles.example.com/tiles/{z}/{x}/{y}{r}.{e}",
-		
-			// url points to cloudtiles container (→ https://github.com/OpenCloudTiles/opencloudtiles-specification)
-			"cloudtiles": false,
-			
+
+			// url points to versatiles container (→ https://github.com/versatiles-org/versatiles-spec)
+			"versatiles": false,
+
 			// backend uses tms instead of zxy
 			"tms": false,
-		
+
 			// possible extensions
 			"ext": ["mvt","json","topojson","png","jpg"],
 
@@ -57,23 +57,23 @@ module.exports = {
 
 			// valid resolution markers
 			"res": ["@2x","@4x"],
-			
+
 			// optimize tiles
 			// * .png with `optipng`
 			// * .jpg with `mozjpeg`
 			"optimize": true,
-			
+
 			// compress tiles (only makes sense for non-rastered tiles like json, pbf, mvt)
 			"compress": [ "gz", "br" ],
-			
+
 			// write tiles to disk
 			"cache": true,
 
 			// minimum time tiles are kept
 			"expires": "1d",
-			
+
 		},
-		
+
 		// more backends here
 
 	},

package/lib/tileblaster.js

@@ -9,17 +9,16 @@ var zlib = require("zlib");
 var stream = require("stream");
 
 var debug = require("debug")("tileblaster");
-var request = require("request");
-var mkdirp = require("mkdirp");
+var phin = require("phin");
 var queue = require("quu");
-var glob = require("glob");
+var walk = require("klaw");
 var dur = require("dur");
 
-// optional dependencies; if only 
+// optional dependencies; if only
 try { var pnck = require("pnck"); } catch (err) { var pnck = null; }
 try { var jpck = require("jpck"); } catch (err) { var jpck = null; }
 try { var zopfli = require("node-zopfli"); } catch (err) { var zopfli = null; }
-try { var cloudtiles = require("cloudtiles"); } catch (err) { var cloudtiles = null; }
+try { var versatiles = require("versatiles"); } catch (err) { var versatiles = null; }
 
 // load package
 var pckg = require("../package.json");
@@ -63,16 +62,19 @@ tileblaster.prototype.init = function(config){
 	self.srvr = null;
 
 	// statistics
-	self.statistics = { 
-		hits: 0, 
+	self.statistics = {
+		hits: 0,
 		phits: 0,
-		served: 0, 
-		last: Date.now() 
+		served: 0,
+		last: Date.now()
 	};
 
+	// http agents
+	self.agents = {};
+
 	// compression queue
 	self.cqueue = queue(1);
-	
+
 	// have maps with active expires?
 	self.expiration = false;
 
@@ -80,7 +82,7 @@ tileblaster.prototype.init = function(config){
 	self.reconfigure(config);
 
 	return this;
-	
+
 };
 
 // reconfigure
@@ -88,13 +90,13 @@ tileblaster.prototype.reconfigure = function(config){
 	var self = this;
 
 	debug("<init> reconfiguring");
-	
+
 	// cache
 	self.errcache = {};
-	
+
 	// keep config
 	self.config = config || {};
-	
+
 	// id
 	self.config.id = (!!self.config.id) ? self.config.id : "tileblaster";
 
@@ -106,24 +108,24 @@ tileblaster.prototype.reconfigure = function(config){
 
 	// expires (default: never)
 	self.config.expires = (dur(self.config.expires) || Infinity);
-	
+
 	// queue size
 	self.config.queue = Math.max(parseInt(self.config.queue,10)||100,1);
 
 	// extend mime types
 	if (!!self.config.mime) Object.keys(self.config.mime).map(function(ext){ self.mime[ext] = self.config.mime[ext] });
-	
+
 	// queue
 	self.queue = queue(self.config.queue);
 
 	// check configured maps
 	self.maps = Object.keys(self.config.maps).reduce(function(maps, id){
-	
+
 		return maps[id] = (function(map,id){
-			
+
 			// default zoom
 			if (!map.zoom) map.zoom = [0,20];
-			
+
 			// check for subdomain feature
 			if (map.url.indexOf("{s}") >= 0) {
 				if (!map.sub) throw new Error("no subdomains configured for map "+mapid);
@@ -132,21 +134,21 @@ tileblaster.prototype.reconfigure = function(config){
 			} else {
 				map.sub = false;
 			}
-			
+
 			// resolutions
 			if (!map.res) map.res = [ "" ];
 			if (!(map.res instanceof Array)) map.res = [ map.res ];
 			map.res = map.res.filter(function(res){
 				return (res === "") || /^@[1-9][0-9]*(\.[0-9]+)?x$/.test(res);
 			});
-		
+
 			// precalculate bbox for zoom levels
 			map.bounds = false;
 			if (!!map.bbox) {
 
 				// check if bbox and zoom are valid
 				if (!(map.bbox instanceof Array) || map.bbox.length !== 4 || !self._checklnglat([map.bbox[0],map.bbox[1]]) || !self._checklnglat([map.bbox[2],map.bbox[3]])) throw new Error("invalid bounding box: "+JSON.stringify(map.bbox));
-		
+
 				// sort bbox to ensure wsen
 				map.bbox = [
 					Math.min(map.bbox[0], map.bbox[2]),
@@ -154,58 +156,58 @@ tileblaster.prototype.reconfigure = function(config){
 					Math.max(map.bbox[0], map.bbox[2]),
 					Math.max(map.bbox[1], map.bbox[3]),
 				];
-		
+
 				map.bounds = [];
 				self._range(map.zoom).forEach(function(z){
-					map.bounds[z] = { 
-						"w": self._lngid(map.bbox[0],z), 
-						"s": self._latid(map.bbox[1],z), 
-						"e": self._lngid(map.bbox[2],z), 
-						"n": self._latid(map.bbox[3],z) 
+					map.bounds[z] = {
+						"w": self._lngid(map.bbox[0],z),
+						"s": self._latid(map.bbox[1],z),
+						"e": self._lngid(map.bbox[2],z),
+						"n": self._latid(map.bbox[3],z)
 					};
 				});
-	
+
 			};
-			
+
 			// ensure extension list is array
 			map.ext = (!!map.ext) ? (map.ext instanceof Array) ? map.ext : [map.ext] : false;
-			
+
 			// expires
 			if (!!map.expires) map.expires = dur(map.expires);
 			if (!!map.expires) self.expiration = true;
 			if (!map.expires) map.expires = Infinity;
-			
+
 			// cache
 			map.cache = (!map.hasOwnProperty("cache")) ? true : (!!map.cache);
-			
+
 			// compression
 			map.compress = map.compress.filter(function(c){ return (self.comp.indexOf(c) >= 0) });
-			
-			// is cloudtile
-			map.cloudtiles = (map.cloudtiles === true);
-			
+
+			// is versatiles
+			map.versatiles = (map.cloudtiles === true || map.versatiles === true);
+
 			return map;
-			
+
 		})(self.config.maps[id],id), maps;
-	
+
 	},{});
-	
+
 	// build user agent
 	if (!self.config.useragent) self.config.useragent = util.format("%s/%s (+%s)", pckg.name, pckg.version, pckg.homepage);
 
 	// cleanup timer
 	self.config.cleanup = (!!self.config.cleanup) ? dur(self.config.cleanup) : false;
 	if (!!self.cleaner) clearInterval(self.cleaner);
-	if (self.config.cleanup && self.expiration) self.cleaner = setInterval(function(){ self.cleanup(); }, self.config.cleanup).unref();
-	
+	if (self.config.cleanup && self.expiration) self.cleaner = setInterval(function(){ self.cleanup(); }, self.config.cleanup).unref(), self.cleanup();
+
 };
 
 // return server
 tileblaster.prototype.server = function(){
 	var self = this;
-	
+
 	self.srvr = http.createServer(function (req, res) {
-	
+
 		self.statistics.hits++;
 
 		// check http method
@@ -239,34 +241,34 @@ tileblaster.prototype.server = function(){
 
 		self.tile(t.mapid, t.z, t.x, t.y, t.r, t.ext, function(err, stream, meta){
 			if (err) return debug("<server> [%s] error: %s", t.p, err.toString()), (!!self.config.hints&&res.setHeader("x-err-hint",err.toString())), res.statusCode = 204, res.end();
-			
+
 			// send headers
 			res.writeHead(200, { "Content-Type": meta['content-type'] });
-			
+
 			stream.on("end", function(){
 				debug("<server> [%s] done", t.p);
 				self.statistics.served++;
 			});
-			
+
 			// pipe stream to http client
 			stream.pipe(res);
-			
+
 		});
-		
+
 	});
-	
+
 	// in case self.listen() was called before self.server();
 	if (self.listentome) self.listen();
 	if (!!self.config.heartbeat) self.heartbeat();
-	
+
 	return this;
-	
+
 };
 
 // listen on socket
 tileblaster.prototype.listen = function(){
 	var self = this;
-	
+
 	// wait for server to be ready
 	if (!self.srvr) return (self.listentome = true), this;
 
@@ -296,7 +298,7 @@ tileblaster.prototype.listen = function(){
 		if (err) debug("<listen> unable to listen on socket %s", self.config.socket), process.exit(1);
 		debug("<listen> listening on socket %s", self.config.socket);
 	});
-	
+
 	return this;
 
 };
@@ -304,7 +306,7 @@ tileblaster.prototype.listen = function(){
 // start heartbeat server
 tileblaster.prototype.heartbeat = function(){
 	var self = this;
-		
+
 	if (!!self.config.heartbeat) self.nsa = require("nsa")({
 		server: self.config.heartbeat,
 		service: self.config.id,
@@ -312,7 +314,7 @@ tileblaster.prototype.heartbeat = function(){
 	}).start(function(){
 		// send stats every five minutes
 		setInterval(function(){
-			
+
 			var h = self.statistics.hits - self.statistics.phits;
 			var t = Date.now() - self.statistics.last;
 			self.statistics.phits = self.statistics.hits;
@@ -324,14 +326,14 @@ tileblaster.prototype.heartbeat = function(){
 			self.nsa.send(s);
 			debug("<stat> %s req/s, %s served", s["req/s"], s.served);
 		},60000).unref();
-		
+
 	});
 
 	(function(terminate){
-		
+
 		process.on("SIGTERM", function(){ terminate("SIGTERM"); });
 		process.on("SIGINT", function(){ terminate("SIGINT"); });
-		
+
 	})(function(signal){
 		debug("<terminate> %s", signal);
 		debug("<heartbeat> statistics: %j", self.statistics);
@@ -349,52 +351,43 @@ tileblaster.prototype.cleanup = function(){
 
 	// clean up error cache
 	var d = Date.now();
-	self.errcache = self.errcache.filter(function(e){
-		return (e.until > d);
-	});
-	
-	// FIXME: extra process
-	
+	self.errcache = Object.entries(self.errcache).reduce(function(errcache, [ key, value ]){
+		if (value.until < d) errcache[key] = value;
+		return errcache;
+	},{});
+
+	// delete queue
+	var deletequeue = queue(1000);
+	var now = Date.now();
+
 	// clean up map tiles
-	Object.keys(self.maps).filter(function(mapid){ 
+	Object.keys(self.maps).filter(function(mapid){
 		return (!!self.maps[mapid].expires);
 	}).forEach(function(mapid){
 		self.queue.push(function(done){
-			debug("<cleanup> [%s] start", mapid);
-			glob(path.resolve(self.config.tiles, mapid, '**/*'), function(err, files){
-				if (err) return debug("<cleanup> [%s] err: %s", mapid, err), done();
-				if (files.length === 0) return debug("<cleanup> [%s] empty", mapid), done();
-
-				var d = 0;
-				var q = queue(5).done(function(n){
-					return debug("<cleanup> [%s] checked %d files, deleted %d", mapid, n, d), done();
-				});
-				
-				files.forEach(function(f){
-					q.push(function(next){
-						fs.stat(f, function(err, stat){
-							if (err) return debug("<cleanup> [%s] err: %s", mapid, err), next();
-							// debug("<cleanup> [%s] %d <> %d", f, (Date.now() - (stat.birthtimeMs || stat.ctimeMs)), self.maps[mapid].expires);
-							if ((Date.now() - (stat.birthtimeMs || stat.ctimeMs)) < self.maps[mapid].expires) return next();
-							fs.unlink(f, function(err){
-								if (err) return debug("<cleanup> [%s] err: %s", mapid, err), next();
-								d++;
-								next();
-							});
-						});
-					});
+			debug("<cleanup> start: %s", mapid);
+			walk(path.resolve(self.config.tiles, mapid)).on("data", function(f){
+				if (f.stats.isFile() && f.stats.mtimeMs+self.maps[mapid].expires < now) deletequeue.push(function(done){
+					fs.unlink(f.path, done);
 				});
+			}).on("error", function(err){
+				if (err.code !== "ENOENT") debug("<cleanup> err: %s", err);
+				else debug("<cleanup> done: %s", mapid);
+				done();
+			}).on("end", function(){
+				debug("<cleanup> done: %s", mapid);
+				done();
 			});
 		});
 	});
-	
+
 	return this;
 };
 
 // get tile
 tileblaster.prototype.tile = function(mapid, z, x, y, r, e, fn){
 	var self = this;
-	
+
 	// optionalize r and e
 	if (typeof r === 'function') var e = r, r = false;
 	if (typeof e === 'function') var fn = e, e = null;
@@ -403,28 +396,28 @@ tileblaster.prototype.tile = function(mapid, z, x, y, r, e, fn){
 	var tilefile = self._tilefile(mapid, z, x, y, r, e);
 
 	debug("<tile> [%s] requested", tilefile);
-	
+
 	// check tile
 	self._checktile(mapid, z, x, y, r, e, function(err){
 		if (err) return fn(err);
 
 		debug("<tile> [%s] valid", tilefile);
-	
+
 		// check for cached 404 tiles
 		if (!!self.errcache[tilefile] && (self.errcache[tilefile].until > Date.now())) return fn(new Error("Known bad tile: "+self.errcache[tilefile].err), null);
-	
+
 		// resolve tile path
 		var tilepath = path.resolve(self.config.tiles, tilefile);
-	
+
 		// construct upstream tile url
 		var tileurl = self._tileurl(mapid, z, x, y, r, e);
 
 		(function(next){
-			
-			// cloudtile branch
-			if (self.maps[mapid].cloudtiles) return self.cloudtile(tileurl, mapid, z, x, y, next);
+
+			// versatiles branch
+			if (self.maps[mapid].versatiles) return self.versatile(tileurl, mapid, z, x, y, next);
 			self.fetchtile(tileurl, mapid, next);
-			
+
 		})(function(err, tilestream, meta){
 
 			if (err) {
@@ -450,28 +443,27 @@ tileblaster.prototype.tile = function(mapid, z, x, y, r, e, fn){
 					'content-type': (self.mime[e])
 				});
 			});
-			
+
 			if (!!self.config.maps[mapid].cache) streams.push(function(tilestream){
-				
+
 				// don't overwrite if tile exists
 				fs.access(tilepath, fs.constants.F_OK, function(err){
 					if (!err) return debug("<tile> [%s] exists", tilefile);
 
-					mkdirp(path.dirname(tilepath)).then(function(err){
+					fs.mkdir(path.dirname(tilepath), { recursive: true }, function(err){
+						if (err) return debug("<tile> [%s] -- %s", tilefile, err);
 
 						// save to tmp file, rename when done
 						tilestream.pipe(fs.createWriteStream(tilepath+".tmp").on('finish', function(){
 							fs.rename(tilepath+".tmp", tilepath, function(){
-								
+
 								// compress
 								if (self.config.maps[mapid].compress instanceof Array && self.config.maps[mapid].compress.length > 0) self.compress(tilepath, self.config.maps[mapid].compress);
-								
+
 								debug("<tile> [%s] saved", tilefile);
 							});
-						})); 
+						}));
 
-					}).catch(function(err){
-						debug("<tile> [%s] -- %s", tilefile, err);
 					});
 
 				});
@@ -482,9 +474,9 @@ tileblaster.prototype.tile = function(mapid, z, x, y, r, e, fn){
 			tilestream.pipe(self.optimize(mapid, e)).pipe(self._mux.apply(self, streams));
 
 		});
-		
+
 	});
-	
+
 	return this;
 };
 
@@ -494,50 +486,65 @@ tileblaster.prototype.fetchtile = function(tileurl, mapid, fn){
 
 	self.queue.push(function(done){
 
+		// create agent
+		var proto = tileurl.substr(0,tileurl.indexOf(":"));
+		if (!self.agents.hasOwnProperty(proto)) self.agents[proto] = new require(proto).Agent({ keepAlive: true });
+
 		debug("<fetchtile> [%s] requested", tileurl);
 		var d = 0;
 
-		request({
-			method: "GET",
+		phin({
 			url: tileurl,
-			encoding: null, // no conversion to string
-			gzip: true, // some tileservers enforce gzip, so better expect it
-			headers: { 
+			headers: {
 				'user-agent': self.config.useragent, // be nice and tell who we are
 				...(self.config.maps[mapid].headers||{}), // extra headers from config
-			 }, 
-		}).on('response', function(resp){
+			},
+			parse: "none",
+			stream: true,
+			followRedirects: true,
+			compression: true,
+			timeout: 10000,
+			core: { agent: self.agents[proto] },
+		}).then(function(resp){
 
 			// check mime type, status code, content-length, FIXME: cache!
-			if (resp.statusCode !== 200) return fn(new Error("status code "+resp.statusCode), resp.statusCode);
-			if (!resp.headers['content-type']||(!!self.maps[mapid].mime&&self.maps[mapid].mime.indexOf(resp.headers['content-type'])<0)) return fn(new Error("invalid content type "+resp.headers['content-type']), resp.statusCode);
-			if (!!resp.headers['content-length']&&parseInt(resp.headers['content-length'],10)===0) return fn(new Error("no content"), resp.statusCode);
+			if (resp.statusCode !== 200) return resp.stream.destroy(), fn(new Error("status code "+resp.statusCode), resp.statusCode);
+
+			// parse raw headers if not set
+			if (!resp.headers) {
+				let rawHeaders = [ ...resp.rawHeaders ];
+				resp.headers = {};
+				while (rawHeaders.length > 0) resp.headers[ rawHeaders.shift().toLowerCase() ] = rawHeaders.shift();
+			};
+
+			// check headers
+			if (!resp.headers['content-type']||(!!self.maps[mapid].mime&&self.maps[mapid].mime.indexOf(resp.headers['content-type'])<0)) return resp.stream.destroy(), fn(new Error("invalid content type "+resp.headers['content-type']), resp.statusCode);
+			if (!!resp.headers['content-length']&&parseInt(resp.headers['content-length'],10)===0) return resp.stream.destroy(), fn(new Error("no content"), resp.statusCode);
 
 			// signal queue when read stream has finished
-			this.once('end', function(){ (!d++)&&done(); });
+			resp.stream.once('end', function(){ (!d++)&&done(); });
 
 			debug("<fetchtile> [%s] received", tileurl);
 
-			return fn(null, this, {
+			return fn(null, resp.stream, {
 				date: (new Date(resp.headers.date||Date.now()).valueOf()),
 				size: (parseInt(resp.headers['content-length'],10)||null),
 				mime: (resp.headers['content-type']||'application/octet-stream'),
 			});
-	
-		}).on('error', function(err){
+
+		}).catch(function(err){
 			return debug("<fetchtile> error fetching '%s': %s", tileurl, err), fn(err, null), done();
-		}).on("end", function(){
-			(!d++)&&done();
 		});
+
 	});
-	
+
 };
 
-// get cloudtile
-tileblaster.prototype.cloudtile = function(tileurl, mapid, z, x, y, fn) {
+// get versatile
+tileblaster.prototype.versatile = function(tileurl, mapid, z, x, y, fn) {
 	const self = this;
-	if (!cloudtiles) return fn(new Error("Missing dependency: cloudtiles"));
-	if (!self.maps[mapid].c) self.maps[mapid].c = cloudtiles(tileurl, { tms: !!self.maps[mapid].tms });
+	if (!versatile) return fn(new Error("Missing dependency: versatiles"));
+	if (!self.maps[mapid].c) self.maps[mapid].c = versatiles(tileurl, { tms: !!self.maps[mapid].tms });
 	self.maps[mapid].c.getTile(z,x,y, function(err, buffer){
 		if (err) return fn(err);
 		return fn(null, stream.Readable.from(buffer));
@@ -548,30 +555,30 @@ tileblaster.prototype.cloudtile = function(tileurl, mapid, z, x, y, fn) {
 // optimization
 tileblaster.prototype.optimize = function(mapid, ext){
 	var self = this;
-	
+
 	var strm = new stream.PassThrough;
-		
+
 	if (self.maps[mapid].optimize) switch (ext) {
-		case "png": 
+		case "png":
 			if (!pnck) break;
 			debug("<optimize> [%s] png", mapid);
 			return strm.pipe(pnck(['-o7','-zc8','-zm8','-f5','-quiet','-fix']));
 		break;
-		case "jpg": 
-		case "jpeg": 
+		case "jpg":
+		case "jpeg":
 			if (!jpck) break;
 			debug("<optimize> [%s] jpg", mapid);
-			strm = strm.pipe(jpck({ 
-				optimize: true, 
-				copy: "none", 
-				fastcrush: true, 
-				limit: 102400 
+			strm = strm.pipe(jpck({
+				optimize: true,
+				copy: "none",
+				fastcrush: true,
+				limit: 102400
 			}));
 		break;
 	}
-	
+
 	return strm;
-		
+
 };
 
 // compression
@@ -625,7 +632,7 @@ tileblaster.prototype.compress = function(file, comp){
 // stream multiplexer
 tileblaster.prototype._mux = function(fn){
 	var self = this;
-		
+
 	// create a passthrough stream for every callback argument
 	// call back with created stream
 	var streams = Array.from(arguments).map(function(f){
@@ -633,7 +640,7 @@ tileblaster.prototype._mux = function(fn){
 			return f(s),s;
 		})(new stream.PassThrough,f);
 	});
-	
+
 	// multiplex to streams
 	return (new stream.Writable({
 		write: function(chunk, encoding, done) {
@@ -649,12 +656,12 @@ tileblaster.prototype._mux = function(fn){
 			done();
 		}
 	}));
-	
+
 };
 
 // get all integer steps including start and end
 tileblaster.prototype._range = function(z){
-	var zooms = [], z = Array.from(z.sort(function(a,b){ return a-b; })); // ensure order and deref 
+	var zooms = [], z = Array.from(z.sort(function(a,b){ return a-b; })); // ensure order and deref
 	while (z[0]<=z[1]) zooms.push(z[0]++);
 	return zooms;
 };
@@ -699,7 +706,7 @@ tileblaster.prototype._checktile = function(mapid, z, x, y, r, ext, fn){
 	// check bbox
 	if (!!self.maps[mapid].bbox && (x < self.maps[mapid].bounds[z].w || x > self.maps[mapid].bounds[z].e)) return debug("<check> invalid tile x %d <> [%d-%d@%d] for map '%s'", x, self.maps[mapid].bounds[z].e, self.maps[mapid].bounds[z].w, z, mapid), fn(new Error("Disallowed tile x"));
 	if (!!self.maps[mapid].bbox && (y < self.maps[mapid].bounds[z].n || y > self.maps[mapid].bounds[z].s)) return debug("<check> invalid tile y %d <> [%d-%d@%d] for map '%s'", y, self.maps[mapid].bounds[z].n, self.maps[mapid].bounds[z].s, z, mapid), fn(new Error("Disallowed tile y"));
-	
+
 	fn(null);
 
 };
@@ -707,10 +714,10 @@ tileblaster.prototype._checktile = function(mapid, z, x, y, r, ext, fn){
 // transform parameters to url
 tileblaster.prototype._tileurl = function(mapid, z, x, y, r, e){
 	var self = this;
-	
+
 	// when backend uses tms
 	if (!!self.maps[mapid].tms) y = Math.pow(2,z)-y-1;
-	
+
 	return self.maps[mapid].url
 		.replace("{s}", (self.maps[mapid].sub !== false) ? self.maps[mapid].sub[Math.floor(Math.random()*self.maps[mapid].sub.length)] : "")
 		.replace("{x}", x.toFixed(0))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileblaster",
-  "version": "0.4.1",
+  "version": "0.4.4",
   "description": "pretty fast optimizing & compressing tile caching proxy",
   "main": "lib/tileblaster.js",
   "bin": {
@@ -19,18 +19,17 @@
   "dependencies": {
     "debug": "^4.3.4",
     "dur": "^0.0.3",
-    "glob": "^8.1.0",
+    "klaw": "^4.1.0",
     "minimist": "^1.2.7",
-    "mkdirp": "^2.0.0",
     "node-watch": "^0.7.3",
     "nsa": "^0.2",
-    "quu": "^0.4.3",
-    "request": "^2.88"
+    "phin": "^3.7.0",
+    "quu": "^0.4.3"
   },
   "optionalDependencies": {
-    "cloudtiles": "^0.0.6",
     "jpck": "^1.0.2",
     "node-zopfli": "^2.1.4",
-    "pnck": "^1.0.1"
+    "pnck": "^1.0.1",
+    "versatiles": "^0.2.0"
   }
 }

package/readme.md

@@ -6,13 +6,13 @@ tileblaster is a map tile caching (and optimizing) proxy, designed to run with n
 
 `npm i tileblaster -g`
 
-use `--no-optional` if you don't want tile optimization or [opencloudtiles](https://github.com/OpenCloudTiles/opencloudtiles-specification) support.
+use `--no-optional` if you don't want tile optimization or [versatiles](https://github.com/versatiles-org/versatiles-spec) support.
 
 ## run
 
 `tileblaster /path/to/config.js`
 
-Use [forever](https://npmjs.com/package/forever), [pm2](https://npmjs.com/package/pm2) or similar to run tileblaster as service;
+Use [pm2](https://npmjs.com/package/pm2), [nodemon](https://npmjs.com/package/nodemon), [forever](https://npmjs.com/package/forever) or similar to run tileblaster as service;
 
 ## configuration
 
@@ -28,10 +28,10 @@ upstream upstream_tileblaster {
 server {
 	listen 80;
 	server_name tileblaster;
-	
+
 	gzip_static on;
 	# brotli_static on; # if ngx_brotli is available
-	
+
 	if (-f $document_root/$uri.err) {
 		return 204;
 	}
@@ -50,9 +50,9 @@ server {
 ## usage
 
 get the tiles via `http://server/<mapid>/<z>/<x>/<y>[<d>].<ext>`
-	
+
 * `<mapid>` is the map id specified in your `config.js`
 * `<z>`, `<x>` and `<z>` are the tile coorinates
 * `<d>` is the optional pixel density marker, for example `@2x`
-* `<ext>` is the extension, for example `png`, `geojson` or `mvt`
-	
+* `<ext>` is the extension, for example `png`, `geojson` or `pbf`
+