tileblaster 1.0.0 → 1.0.2

package/config.dist.js

@@ -3,7 +3,7 @@ const config = module.exports = {
 
 	id: "tileblaster", // id of the tileblaster instance, in case you want to run more than one; default: tileblaster
 
-	treads: 1, // number of worker threads in cluster, default: 1
+	threads: 1, // number of worker threads in cluster, default: 1
 	queue: 10, // number of parallel tile processes per worker, default: 12
 
 	server: {

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.0",
+  "version": "1.0.2",
   "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"
   },

package/readme.md

@@ -70,8 +70,8 @@ server {
 		proxy_set_header Accept-Encoding $http_accept_encoding;
 		proxy_set_header Accept-Language $http_accept_language;
 		proxy_set_header Accept $http_accept;
-		proxy_set_header If-Modified-Since $http_if_modified_since
-		proxy_set_header If-None-Match $http_if_none_match
+		proxy_set_header If-Modified-Since $http_if_modified_since;
+		proxy_set_header If-None-Match $http_if_none_match;
 		proxy_http_version 1.1;
 		proxy_pass http://tileblaster;
 	}

package/tileblaster.js

@@ -177,10 +177,15 @@ tileblaster.prototype.shutdown = function(){
 	let closed = 0;
 	self.servers.forEach(function(server){
 		server.close(function(){
-			if (++closed === self.servers.length) {
-				debug.info("All Servers Closed");
-				process.exit(0);
-			}
+			(function(fn){
+				if (!server.socket) return fn();
+				fs.unlink(server.socket, fn);
+			})(function(){
+				if (++closed === self.servers.length) {
+					debug.info("All Servers Closed");
+					process.exit(0);
+				}
+			});
 		});
 	});
 	// watchdog
@@ -422,19 +427,38 @@ tileblaster.prototype.listen = function(router){
 
 		} else if (listen.socket) {
 
-			fs.unlink(listen.socket, function(err) { // try unlink leftover socket
-				if (err && err.code !== "ENOENT") return debug.error("Deleting socket '%s':", listen.socket, err);
-				server.listen(listen.socket, function(err) {
-					if (err) return debug.error("Binding to socket '%s':", listen.socket, err);
-					debug.info("Listening on socket '%s'", listen.socket);
-					self.servers.push(server);
-					if (listen.mode) fs.chmod(listen.socket, listen.mode, function(err){
-						if (err) return debug.error("Changing permissions of socket '%s' to '%s':", listen.socket, listen.perms.toString(8), err);
-					});
-					if (listen.group) fs.chown(listen.socket, os.userInfo().uid, listen.group, function(err){
-						if (err) return debug.error("Changing gid of socket '%s' to '%s':", listen.socket, listen.gid, err);
+			// create different sockets per instance
+			if (self.config.threads > 1) {
+				let ext = path.extname(listen.socket);
+				listen.socket = path.join(path.dirname(listen.socket), path.basename(listen.socket, ext) + self.config.id + ext);
+			}
+
+			// ensure socket dir exists
+			fs.mkdir(path.dirname(listen.socket), { recursive: true }, function(err){
+				if (err && err.code !== "ENOENT") return debug.error("Creating socket dir '%s':", path.dirname(listen.socket), err);
+
+				// inlink old socket
+				fs.unlink(listen.socket, function(err) { // try unlink leftover socket
+					if (err && err.code !== "ENOENT") return debug.error("Deleting socket '%s':", listen.socket, err);
+
+					server.listen(listen.socket, function(err) {
+						if (err) return debug.error("Binding to socket '%s':", listen.socket, err);
+
+						// store socket path
+						server.socket = listen.socket;
+
+						debug.info("Listening on socket '%s'", listen.socket);
+						self.servers.push(server);
+						if (listen.mode) fs.chmod(listen.socket, listen.mode, function(err){
+							if (err) return debug.error("Changing permissions of socket '%s' to '%s':", listen.socket, listen.perms.toString(8), err);
+						});
+						if (listen.group) fs.chown(listen.socket, os.userInfo().uid, listen.group, function(err){
+							if (err) return debug.error("Changing gid of socket '%s' to '%s':", listen.socket, listen.gid, err);
+						});
+
 					});
 				});
+
 			});
 
 		}