tileblaster 0.4.3 → 0.4.5

package/lib/tileblaster.js

@@ -8,17 +8,17 @@ var util = require("util");
 var zlib = require("zlib");
 var stream = require("stream");
 
-var debug = require("debug")("tileblaster");
 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;
 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 versatiles = require("versatiles"); } catch (err) { var versatiles = null; }
+try { var debug = require("debug")("tileblaster"); } catch (err) { var debug = function(){ if (process.env.DEBUG) console.error(...arguments); }}
 
 // load package
 var pckg = require("../package.json");
@@ -198,7 +198,7 @@ tileblaster.prototype.reconfigure = function(config){
 	// 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();
 
 };
 
@@ -307,7 +307,16 @@ tileblaster.prototype.listen = function(){
 tileblaster.prototype.heartbeat = function(){
 	var self = this;
 
-	if (!!self.config.heartbeat) self.nsa = require("nsa")({
+	if (!self.config.heartbeat) return;
+
+	// check if nsa dependency is installed
+	try {
+		var nsa = require("nsa");
+	} catch (err) {
+		return debug("<heartbeat> missing dependency: nsa");
+	}
+
+	self.nsa = nsa({
 		server: self.config.heartbeat,
 		service: self.config.id,
 		interval: "10s"
@@ -351,41 +360,32 @@ tileblaster.prototype.cleanup = function(){
 
 	// clean up error cache
 	var d = Date.now();
-	self.errcache = self.errcache.filter(function(e){
-		return (e.until > d);
-	});
+	self.errcache = Object.entries(self.errcache).reduce(function(errcache, [ key, value ]){
+		if (value.until < d) errcache[key] = value;
+		return errcache;
+	},{});
 
-	// FIXME: extra process
+	// delete queue
+	var deletequeue = queue(1000);
+	var now = Date.now();
 
 	// clean up map tiles
 	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();
 			});
 		});
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileblaster",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "pretty fast optimizing & compressing tile caching proxy",
   "main": "lib/tileblaster.js",
   "bin": {
@@ -17,19 +17,19 @@
   },
   "homepage": "https://github.com/yetzt/tileblaster#readme",
   "dependencies": {
-    "debug": "^4.3.4",
     "dur": "^0.0.3",
-    "glob": "^8.1.0",
+    "klaw": "^4.1.0",
     "minimist": "^1.2.7",
     "node-watch": "^0.7.3",
-    "nsa": "^0.2",
     "phin": "^3.7.0",
     "quu": "^0.4.3"
   },
   "optionalDependencies": {
-    "versatiles": "^0.2.0",
+    "debug": "^4.3.4",
     "jpck": "^1.0.2",
     "node-zopfli": "^2.1.4",
-    "pnck": "^1.0.1"
+    "nsa": "^0.2",
+    "pnck": "^1.0.1",
+    "versatiles": "^0.2.0"
   }
 }