mirrors
/
TiddlyWiki5
mirror of https://github.com/Jermolene/TiddlyWiki5
1
0
Fork 0
Code Issues Releases Wiki Activity

The listen command shouldn't return until the server is listening

This commit is contained in:
Jeremy Ruston 2024-03-11 21:45:27 +00:00
parent 8b5c3746f8
commit 24413c53dd
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/modules/commands/listen.js
View File

@ -16,7 +16,7 @@ var Server = require("$:/core/modules/server/server.js").Server;
exports.info = { exports.info = {
name: "listen", name: "listen",
synchronous: true, synchronous: false,
namedParameterMode: true, namedParameterMode: true,
mandatoryParameters: [] mandatoryParameters: []
}; };
@ -38,7 +38,11 @@ Command.prototype.execute = function() {
wiki: this.commander.wiki, wiki: this.commander.wiki,
variables: self.params variables: self.params
}); });
var nodeServer = this.server.listen(); var nodeServer = this.server.listen(null,null,null,{
callback: function() {
self.callback();
}
});
$tw.hooks.invokeHook("th-server-command-post-start",this.server,nodeServer,"tiddlywiki"); $tw.hooks.invokeHook("th-server-command-post-start",this.server,nodeServer,"tiddlywiki");
return null; return null;
}; };

8
core/modules/server/server.js
View File

@ -430,8 +430,9 @@ Listen for requests
port: optional port number (falls back to value of "port" variable) port: optional port number (falls back to value of "port" variable)
host: optional host address (falls back to value of "host" variable) host: optional host address (falls back to value of "host" variable)
prefix: optional prefix (falls back to value of "path-prefix" variable) prefix: optional prefix (falls back to value of "path-prefix" variable)
callback: optional callback(err) to be invoked when the listener is up and running
*/ */
Server.prototype.listen = function(port,host,prefix) { Server.prototype.listen = function(port,host,prefix,options) {
var self = this; var self = this;
// Handle defaults for port and host // Handle defaults for port and host
port = port || this.get("port"); port = port || this.get("port");
@ -458,7 +459,7 @@ Server.prototype.listen = function(port,host,prefix) {
if(self.get("debug-level") !== "none") { if(self.get("debug-level") !== "none") {
var start = $tw.utils.timer(); var start = $tw.utils.timer();
response.on("finish",function() { response.on("finish",function() {
console.log("Response tim:",request.method,request.url,$tw.utils.timer() - start); console.log("Response time:",request.method,request.url,$tw.utils.timer() - start);
}); });
} }
self.requestHandler(request,response,options); self.requestHandler(request,response,options);
@ -469,6 +470,9 @@ Server.prototype.listen = function(port,host,prefix) {
url = self.protocol + "://" + (address.family === "IPv6" ? "[" + address.address + "]" : address.address) + ":" + address.port + prefix; url = self.protocol + "://" + (address.family === "IPv6" ? "[" + address.address + "]" : address.address) + ":" + address.port + prefix;
$tw.utils.log("Serving on " + url,"brown/orange"); $tw.utils.log("Serving on " + url,"brown/orange");
$tw.utils.log("(press ctrl-C to exit)","red"); $tw.utils.log("(press ctrl-C to exit)","red");
if(options.callback) {
options.callback(null);
}
}); });
// Listen // Listen
return server.listen(port,host); return server.listen(port,host);