Skip to content

Commit

Permalink
Modify all serve_* modules to return a Promise (preparation for #140)
Browse files Browse the repository at this point in the history
  • Loading branch information
@petrsloup
petrsloup committed May 10, 2017
1 parent c233d23 commit d30027e
Show file tree
Hide file tree
Showing 6 changed files with 122 additions and 73 deletions.
38 changes: 23 additions & 15 deletions src/serve_data.js
View file
Expand Up @@ -34,20 +34,24 @@ module.exports = function(options, repo, params, id, styles) {
if (!mbtilesFileStats.isFile() || mbtilesFileStats.size == 0) {
throw Error('Not valid MBTiles file: ' + mbtilesFile);
}
var source = new mbtiles(mbtilesFile, function(err) {
source.getInfo(function(err, info) {
tileJSON['name'] = id;
tileJSON['format'] = 'pbf';

Object.assign(tileJSON, info);

tileJSON['tilejson'] = '2.0.0';
delete tileJSON['filesize'];
delete tileJSON['mtime'];
delete tileJSON['scheme'];

Object.assign(tileJSON, params.tilejson || {});
utils.fixTileJSONCenter(tileJSON);
var source;
var sourceInfoPromise = new Promise(function(resolve, reject) {
source = new mbtiles(mbtilesFile, function(err) {
source.getInfo(function(err, info) {
tileJSON['name'] = id;
tileJSON['format'] = 'pbf';

Object.assign(tileJSON, info);

tileJSON['tilejson'] = '2.0.0';
delete tileJSON['filesize'];
delete tileJSON['mtime'];
delete tileJSON['scheme'];

Object.assign(tileJSON, params.tilejson || {});
utils.fixTileJSONCenter(tileJSON);
resolve();
});
});
});

Expand Down Expand Up @@ -161,5 +165,9 @@ module.exports = function(options, repo, params, id, styles) {
return res.send(info);
});

return app;
return new Promise(function(resolve, reject) {
sourceInfoPromise.then(function() {
resolve(app);
});
});
};
25 changes: 16 additions & 9 deletions src/serve_font.js
View file
Expand Up @@ -15,16 +15,19 @@ module.exports = function(options, allowedFonts) {
var fontPath = options.paths.fonts;

var existingFonts = {};
fs.readdir(options.paths.fonts, function(err, files) {
files.forEach(function(file) {
fs.stat(path.join(fontPath, file), function(err, stats) {
if (!err) {
if (stats.isDirectory() &&
fs.existsSync(path.join(fontPath, file, '0-255.pbf'))) {
existingFonts[path.basename(file)] = true;
var fontListingPromise = new Promise(function(resolve, reject) {
fs.readdir(options.paths.fonts, function(err, files) {
files.forEach(function(file) {
fs.stat(path.join(fontPath, file), function(err, stats) {
if (!err) {
if (stats.isDirectory() &&
fs.existsSync(path.join(fontPath, file, '0-255.pbf'))) {
existingFonts[path.basename(file)] = true;
}
}
}
});
});
resolve();
});
});

Expand Down Expand Up @@ -55,5 +58,9 @@ module.exports = function(options, allowedFonts) {
);
});

return app;
return new Promise(function(resolve, reject) {
fontListingPromise.then(function() {
resolve(app);
});
});
};
34 changes: 20 additions & 14 deletions src/serve_rendered.js
View file
@@ -1,7 +1,6 @@
'use strict';

var async = require('async'),
advancedPool = require('advanced-pool'),
var advancedPool = require('advanced-pool'),
fs = require('fs'),
path = require('path'),
util = require('util'),
Expand Down Expand Up @@ -59,15 +58,18 @@ module.exports = function(options, repo, params, id, dataResolver) {
};

var existingFonts = {};
fs.readdir(options.paths.fonts, function(err, files) {
files.forEach(function(file) {
fs.stat(path.join(options.paths.fonts, file), function(err, stats) {
if (!err) {
if (stats.isDirectory()) {
existingFonts[path.basename(file)] = true;
var fontListingPromise = new Promise(function(resolve, reject) {
fs.readdir(options.paths.fonts, function(err, files) {
files.forEach(function(file) {
fs.stat(path.join(options.paths.fonts, file), function(err, stats) {
if (!err) {
if (stats.isDirectory()) {
existingFonts[path.basename(file)] = true;
}
}
}
});
});
resolve();
});
});

Expand Down Expand Up @@ -223,7 +225,7 @@ module.exports = function(options, repo, params, id, dataResolver) {
}
}

queue.push(function(callback) {
queue.push(new Promise(function(resolve, reject) {
mbtilesFile = path.resolve(options.paths.mbtiles, mbtilesFile);
var mbtilesFileStats = fs.statSync(mbtilesFile);
if (!mbtilesFileStats.isFile() || mbtilesFileStats.size == 0) {
Expand Down Expand Up @@ -279,14 +281,14 @@ module.exports = function(options, repo, params, id, dataResolver) {
}
tileJSON.attribution += source.attribution;
}
callback(null);
resolve();
});
});
});
}));
}
});

async.parallel(queue, function(err, results) {
var renderersReadyPromise = Promise.all(queue).then(function() {
// TODO: make pool sizes configurable
for (var s = 1; s <= maxScaleFactor; s++) {
var minPoolSize = 2;
Expand Down Expand Up @@ -692,5 +694,9 @@ module.exports = function(options, repo, params, id, dataResolver) {
return res.send(info);
});

return app;
return new Promise(function(resolve, reject) {
Promise.all([fontListingPromise, renderersReadyPromise]).then(function() {
resolve(app);
});
});
};
4 changes: 3 additions & 1 deletion src/serve_style.js
View file
Expand Up @@ -117,5 +117,7 @@ module.exports = function(options, repo, params, id, reportTiles, reportFont) {
});
});

return app;
return new Promise(function(resolve, reject) {
resolve(app);
});
};
93 changes: 59 additions & 34 deletions src/server.js
View file
Expand Up @@ -76,6 +76,8 @@ function start(opts) {
paths.sprites = path.resolve(paths.root, paths.sprites || '');
paths.mbtiles = path.resolve(paths.root, paths.mbtiles || '');

var startupPromises = [];

var checkPath = function(type) {
if (!fs.existsSync(paths[type])) {
console.error('The specified path for "' + type + '" does not exist (' + paths[type] + ').');
Expand All @@ -101,7 +103,7 @@ function start(opts) {
}

if (item.serve_data !== false) {
app.use('/styles/', serve_style(options, serving.styles, item, id,
startupPromises.push(serve_style(options, serving.styles, item, id,
function(mbtiles, fromData) {
var dataItemId;
Object.keys(data).forEach(function(id) {
Expand Down Expand Up @@ -130,28 +132,38 @@ function start(opts) {
}
}, function(font) {
serving.fonts[font] = true;
}).then(function(sub) {
app.use('/styles/', sub);
}));
}
if (item.serve_rendered !== false) {
if (serve_rendered) {
app.use('/styles/' + id + '/',
serve_rendered(options, serving.rendered, item, id,
function(mbtiles) {
var mbtilesFile;
Object.keys(data).forEach(function(id) {
if (id == mbtiles) {
mbtilesFile = data[id].mbtiles;
startupPromises.push(
serve_rendered(options, serving.rendered, item, id,
function(mbtiles) {
var mbtilesFile;
Object.keys(data).forEach(function(id) {
if (id == mbtiles) {
mbtilesFile = data[id].mbtiles;
}
});
return mbtilesFile;
}
});
return mbtilesFile;
}));
).then(function(sub) {
app.use('/styles/' + id + '/', sub);
})
);
} else {
item.serve_rendered = false;
}
}
});

app.use('/', serve_font(options, serving.fonts));
startupPromises.push(
serve_font(options, serving.fonts).then(function(sub) {
app.use('/', sub);
})
);

Object.keys(data).forEach(function(id) {
var item = data[id];
Expand All @@ -160,7 +172,11 @@ function start(opts) {
return;
}

app.use('/data/', serve_data(options, serving.data, item, id, serving.styles));
startupPromises.push(
serve_data(options, serving.data, item, id, serving.styles).then(function(sub) {
app.use('/data/', sub);
})
);
});

app.get('/styles.json', function(req, res, next) {
Expand Down Expand Up @@ -221,28 +237,32 @@ function start(opts) {
templateFile = path.resolve(paths.root, options.frontPage);
}
}
fs.readFile(templateFile, function(err, content) {
if (err) {
console.error('Template not found:', err);
}
var compiled = handlebars.compile(content.toString());

app.use(urlPath, function(req, res, next) {
var data = {};
if (dataGetter) {
data = dataGetter(req);
if (!data) {
return res.status(404).send('Not found');
}
startupPromises.push(new Promise(function(resolve, reject) {
fs.readFile(templateFile, function(err, content) {
if (err) {
console.error('Template not found:', err);
reject(err);
}
data['server_version'] = packageJson.name + ' v' + packageJson.version;
data['is_light'] = isLight;
data['key_query_part'] =
req.query.key ? 'key=' + req.query.key + '&amp;' : '';
data['key_query'] = req.query.key ? '?key=' + req.query.key : '';
return res.status(200).send(compiled(data));
var compiled = handlebars.compile(content.toString());

app.use(urlPath, function(req, res, next) {
var data = {};
if (dataGetter) {
data = dataGetter(req);
if (!data) {
return res.status(404).send('Not found');
}
}
data['server_version'] = packageJson.name + ' v' + packageJson.version;
data['is_light'] = isLight;
data['key_query_part'] =
req.query.key ? 'key=' + req.query.key + '&amp;' : '';
data['key_query'] = req.query.key ? '?key=' + req.query.key : '';
return res.status(200).send(compiled(data));
});
resolve();
});
});
}));
};

serveTemplate('/$', 'index', function(req) {
Expand Down Expand Up @@ -355,6 +375,10 @@ function start(opts) {
return data;
});

var startupPromise = Promise.all(startupPromises).then(function() {
console.log('Startup complete');
});

var server = app.listen(process.env.PORT || opts.port, process.env.BIND || opts.bind, function() {
var address = this.address().address;
if (address.indexOf('::') === 0) {
Expand All @@ -368,7 +392,8 @@ function start(opts) {

return {
app: app,
server: server
server: server,
startupPromise: startupPromise
};
}

Expand Down
1 change: 1 addition & 0 deletions test/setup.js
View file
Expand Up @@ -12,6 +12,7 @@ before(function() {
});
global.app = running.app;
global.server = running.server;
return running.startupPromise;
});

after(function() {
Expand Down

0 comments on commit d30027e

Please sign in to comment.