tileblaster 0.4.8 → 0.4.11

package/lib/tileblaster.js

@@ -505,13 +505,13 @@ tileblaster.prototype.fetchtile = function(tileurl, mapid, fn){
 		phin({
 			url: tileurl,
 			headers: {
+				"accept-encoding": "br, gzip, deflate",
 				'user-agent': self.config.useragent, // be nice and tell who we are
 				...(self.config.maps[mapid].headers||{}), // extra headers from config
 			},
 			parse: "none",
 			stream: true,
 			followRedirects: true,
-			compression: true,
 			timeout: 10000,
 			core: { agent: self.agents[proto] },
 		}).then(function(resp){
@@ -530,6 +530,14 @@ tileblaster.prototype.fetchtile = function(tileurl, mapid, fn){
 			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);
 
+			// decompress stream
+			switch (resp.headers["content-encoding"]) {
+				case 'br': resp.stream = resp.pipe(zlib.createBrotliDecompress()); break;
+				case 'gzip': resp.stream = resp.pipe(zlib.createGunzip()); break;
+				case 'deflate': resp.stream = resp.pipe(zlib.createInflate()); break;
+				default: resp.stream = resp; break;
+			};
+
 			// signal queue when read stream has finished
 			resp.stream.once('end', function(){ (!d++)&&done(); });
 
@@ -556,10 +564,13 @@ tileblaster.prototype.versatile = function(tileurl, mapid, z, x, y, fn) {
 	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, buf){
 		if (err) return fn(err);
-	  var strm = new stream.PassThrough;
-		strm.write(buf);
-		strm.end();
-		return fn(null, strm);
+		self.maps[mapid].c.decompress(self.maps[mapid].c.header.tile_precompression, buf, function(err, buf){
+			if (err) return fn(err);
+			var strm = new stream.PassThrough;
+			strm.write(buf);
+			strm.end();
+			return fn(null, strm);
+		});
 	});
 	return self;
 };
@@ -740,7 +751,6 @@ tileblaster.prototype._tileurl = function(mapid, z, x, y, r, e){
 
 // transform parameters to filename
 tileblaster.prototype._tilefile = function(mapid, z, x, y, r, e){
-	var self = this;
 	return (mapid+"/"+z.toFixed(0)+"/"+x.toFixed(0)+"/"+y.toFixed(0)+((!!r)?r:"")+"."+((e) ? e : ""));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileblaster",
-  "version": "0.4.8",
+  "version": "0.4.11",
   "description": "pretty fast optimizing & compressing tile caching proxy",
   "main": "lib/tileblaster.js",
   "bin": {
@@ -30,7 +30,7 @@
     "node-zopfli": "^2.1.4",
     "nsa": "^0.2",
     "pnck": "^1.0.1",
-    "versatiles": "^0.3.0"
+    "versatiles": "^0.3.1"
   },
   "engines": {
     "node": ">= 10"