tileblaster 1.0.9 → 1.0.11

package/builtins/convert.js

@@ -0,0 +1,57 @@
+// convert
+module.exports = function convert({ opts, data }, next){
+	const sharp = this.lib.sharp;
+	const debug = this.lib.debug;
+
+	// check if sharp is available
+	if (typeof sharp === "undefined") {
+		debug.warn("Convert: Sharp dependency is missing.");
+		return next();
+	};
+
+	// check if tile should be optimized
+	if (!["png","jpeg","jpg","gif"].includes(data.tile.type)) {
+		debug.warn("Convert: Unsupported file type: %s", data.tile.type);
+		return next();
+	};
+
+	Promise.allSettled(["jpeg","png"].map(function(method){
+		return new Promise(function(resolve, reject) {
+			if (!opts[method]) return reject();
+
+			// copy primary tile
+			const tile = { ...data.tile };
+
+			// fixme: find suitable tile in tiles
+			sharp(tile.buffer).toFormat(method, opts[method]).toBuffer(function(err, buffer, info){
+				if (err) {
+					debug.error("Convert: %s", err);
+					return reject();
+				};
+
+				// fix tile
+				tile.buffer = buffer;
+				tile.path = tile.path+"."+method;
+				tile.type = method;
+				tile.mimetype = "image/"+method;
+				tile.headers = { ...tile.headers };
+
+				// add to tile stack
+				data.tiles.unshift(tile);
+
+				// set primary if smaller
+				if (buffer.length < data.tile.buffer.length) {
+					debug.info("Converted '%s': -%db", tile.path.magenta, data.tile.buffer.length-buffer.length);
+					data.tile = tile;
+				};
+
+				resolve();
+
+			});
+
+		});
+	})).then(function(){
+		next();
+	});
+
+};

package/builtins/optimize.js

@@ -84,7 +84,7 @@ if (worker.isMainThread) {
 		});
 
 		// check if there are jobs
-		if (jobs.length === 0) return debug.warn("Nothing to optimize for '%s': -%db", data.tile.path.magenta), next();
+		if (jobs.length === 0) return debug.warn("Nothing to optimize for '%s': -%db", (data.tile.path||"").magenta), next();
 
 		// execute
 		Promise.allSettled(jobs).then(function(){

package/docs/config.md

@@ -275,6 +275,21 @@ Edit vectortiles
 
 **Not yet implemented** FIXME
 
+#### `convert`
+
+Convert raster tiles to differen Formats.
+The resulting tile with the smallest size becomes the main tile.
+
+``` js
+{
+	builtin: "convert",
+	jpeg: {
+		quality: 90,
+		mozjpeg: true,
+	},
+}
+```
+
 #### `modernize`
 
 Convert JPEG or PNG raster tiles to WebP or AVIF.

package/lib/retrieve.js

@@ -1,4 +1,4 @@
-const phin = require("phin");
+const phn = require("phn");
 
 // prepare agents with keepalive enabled
 const agents = {
@@ -6,10 +6,10 @@ const agents = {
 	https: new require("node:https").Agent({ keepAlive: true }),
 };
 
-// agentify phin
-const retrieve = module.exports = async function retrieve(opts, fn) {
+// agentify phn
+const retrieve = module.exports = async function retrieve(opts) {
 	if (typeof opts === "string") opts = { url: opts }; // ensure opts is object
 	if (!opts.hasOwnProperty("core")) opts.core = {}; // ensure core is present
 	if (!opts.core.hasOwnProperty("agent")) opts.core.agent = agents[opts.url.slice(0,opts.url.indexOf(":"))]; // set agent by protocol
-	return phin(opts, fn);
+	return phn(opts);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileblaster",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "a quick and versatile map tile caching proxy",
   "main": "tileblaster.js",
   "bin": {
@@ -26,7 +26,7 @@
     "klaw": "^4.1.0",
     "minimist": "^1.2.8",
     "node-watch": "^0.7.4",
-    "phin": "^3.7.0",
+    "phn": "^0.0.1",
     "quu": "^0.4.3"
   },
   "optionalDependencies": {

package/tileblaster.js

@@ -33,7 +33,7 @@ const tileblaster = module.exports = function tileblaster(config){
 
 	// load builtins
 	self.builtins = {};
-	self.loadBuiltins([ "cors", "parse", "check", "noop", "tileserver", "versatiles", "pmtiles", "mbtiles", "edit", "compress", "cache", "deliver", "dump", "modernize", "optimize", "sharp" ]);
+	self.loadBuiltins([ "cors", "parse", "check", "noop", "tileserver", "versatiles", "pmtiles", "mbtiles", "edit", "compress", "cache", "deliver", "dump", "modernize", "optimize", "convert", "sharp" ]);
 
 	// assemble task lists for maps
 	self.maps = {};