diff --git a/core-server/server/routes/delete-tiddler.js b/core-server/server/routes/delete-tiddler.js index 33cb40d55..f1b7d9d73 100644 --- a/core-server/server/routes/delete-tiddler.js +++ b/core-server/server/routes/delete-tiddler.js @@ -12,6 +12,10 @@ exports.method = "DELETE"; exports.path = /^\/bags\/default\/tiddlers\/(.+)$/; +exports.info = { + priority: 100 +}; + exports.handler = function(request,response,state) { var title = $tw.utils.decodeURIComponentSafe(state.params[0]); state.wiki.deleteTiddler(title); diff --git a/core-server/server/routes/get-favicon.js b/core-server/server/routes/get-favicon.js index 8b757b2f7..602b130e5 100644 --- a/core-server/server/routes/get-favicon.js +++ b/core-server/server/routes/get-favicon.js @@ -12,6 +12,10 @@ exports.method = "GET"; exports.path = /^\/favicon.ico$/; +exports.info = { + priority: 100 +}; + exports.handler = function(request,response,state) { var buffer = state.wiki.getTiddlerText("$:/favicon.ico",""); state.sendResponse(200,{"Content-Type": "image/x-icon"},buffer,"base64"); diff --git a/core-server/server/routes/get-file.js b/core-server/server/routes/get-file.js index 39681de4c..72c6d74ff 100644 --- a/core-server/server/routes/get-file.js +++ b/core-server/server/routes/get-file.js @@ -12,6 +12,10 @@ exports.method = "GET"; exports.path = /^\/files\/(.+)$/; +exports.info = { + priority: 100 +}; + exports.handler = function(request,response,state) { var path = require("path"), fs = require("fs"), diff --git a/core-server/server/routes/get-index.js b/core-server/server/routes/get-index.js index 7ba52faf6..bc236c9f5 100644 --- a/core-server/server/routes/get-index.js +++ b/core-server/server/routes/get-index.js @@ -12,6 +12,10 @@ exports.method = "GET"; exports.path = /^\/$/; +exports.info = { + priority: 100 +}; + exports.handler = function(request,response,state) { var text = state.wiki.renderTiddler(state.server.get("root-render-type"),state.server.get("root-tiddler")), responseHeaders = { diff --git a/core-server/server/routes/get-login-basic.js b/core-server/server/routes/get-login-basic.js index bca3bd18d..2066a0cff 100644 --- a/core-server/server/routes/get-login-basic.js +++ b/core-server/server/routes/get-login-basic.js @@ -12,6 +12,10 @@ exports.method = "GET"; exports.path = /^\/login-basic$/; +exports.info = { + priority: 100 +}; + exports.handler = function(request,response,state) { if(!state.authenticatedUsername) { // Challenge if there's no username diff --git a/core-server/server/routes/get-status.js b/core-server/server/routes/get-status.js index d93c64037..e6394dc04 100644 --- a/core-server/server/routes/get-status.js +++ b/core-server/server/routes/get-status.js @@ -12,6 +12,10 @@ exports.method = "GET"; exports.path = /^\/status$/; +exports.info = { + priority: 100 +}; + exports.handler = function(request,response,state) { var text = JSON.stringify({ username: state.authenticatedUsername || state.server.get("anon-username") || "", diff --git a/core-server/server/routes/get-tiddler-html.js b/core-server/server/routes/get-tiddler-html.js index a891ea6e7..fd9663240 100644 --- a/core-server/server/routes/get-tiddler-html.js +++ b/core-server/server/routes/get-tiddler-html.js @@ -12,6 +12,10 @@ exports.method = "GET"; exports.path = /^\/([^\/]+)$/; +exports.info = { + priority: 100 +}; + exports.handler = function(request,response,state) { var title = $tw.utils.decodeURIComponentSafe(state.params[0]), tiddler = state.wiki.getTiddler(title); diff --git a/core-server/server/routes/get-tiddler.js b/core-server/server/routes/get-tiddler.js index 58ecb8a43..72b635978 100644 --- a/core-server/server/routes/get-tiddler.js +++ b/core-server/server/routes/get-tiddler.js @@ -12,6 +12,10 @@ exports.method = "GET"; exports.path = /^\/recipes\/default\/tiddlers\/(.+)$/; +exports.info = { + priority: 100 +}; + exports.handler = function(request,response,state) { var title = $tw.utils.decodeURIComponentSafe(state.params[0]), tiddler = state.wiki.getTiddler(title), diff --git a/core-server/server/routes/get-tiddlers-json.js b/core-server/server/routes/get-tiddlers-json.js index 89f91032e..c2d146150 100644 --- a/core-server/server/routes/get-tiddlers-json.js +++ b/core-server/server/routes/get-tiddlers-json.js @@ -14,6 +14,10 @@ exports.method = "GET"; exports.path = /^\/recipes\/default\/tiddlers.json$/; +exports.info = { + priority: 100 +}; + exports.handler = function(request,response,state) { var filter = state.queryParameters.filter || DEFAULT_FILTER; if(state.wiki.getTiddlerText("$:/config/Server/AllowAllExternalFilters") !== "yes") { diff --git a/core-server/server/routes/put-tiddler.js b/core-server/server/routes/put-tiddler.js index 74327bd50..3c0a4f537 100644 --- a/core-server/server/routes/put-tiddler.js +++ b/core-server/server/routes/put-tiddler.js @@ -12,6 +12,10 @@ exports.method = "PUT"; exports.path = /^\/recipes\/default\/tiddlers\/(.+)$/; +exports.info = { + priority: 100 +}; + exports.handler = function(request,response,state) { var title = $tw.utils.decodeURIComponentSafe(state.params[0]), fields = $tw.utils.parseJSONSafe(state.data); diff --git a/core-server/server/server.js b/core-server/server/server.js index 2118e9b50..a074e549f 100644 --- a/core-server/server/server.js +++ b/core-server/server/server.js @@ -74,6 +74,11 @@ function Server(options) { // console.log("Loading server route " + title); self.addRoute(routeDefinition); }); + this.routes.sort((a, b) => { + const priorityA = a.info?.priority ?? 100, + priorityB = b.info?.priority ?? 100; + return priorityB - priorityA; + }); // Initialise the http vs https this.listenOptions = null; this.protocol = "http";