From dc0cc40d5f2c034226b1ffc3f673893530bfc1f2 Mon Sep 17 00:00:00 2001
From: joshuafontany <joshua.fontany@gmail.com>
Date: Thu, 27 Feb 2025 21:18:22 -0800
Subject: [PATCH] normalize module paths for MSW server plugin, setup globals
 type defition for $tw, setup jsfonfig.json to map $:/ paths to file system
 paths

---
 globals.d.ts                                  |  2 ++
 jsconfig.json                                 | 29 +++++++++++++++++++
 .../modules/commands/mws-add-permission.js    |  2 +-
 .../modules/commands/mws-add-role.js          |  2 +-
 .../modules/commands/mws-add-user.js          |  2 +-
 .../commands/mws-assign-role-permission.js    |  2 +-
 .../modules/commands/mws-assign-user-role.js  |  2 +-
 .../modules/commands/mws-create-bag.js        |  2 +-
 .../modules/commands/mws-create-recipe.js     |  4 +--
 .../modules/commands/mws-listen.js            |  2 +-
 .../modules/commands/mws-load-archive.js      |  2 +-
 .../modules/commands/mws-load-plugin-bags.js  |  4 +--
 .../modules/commands/mws-load-tiddlers.js     |  2 +-
 .../modules/commands/mws-load-wiki-folder.js  |  2 +-
 .../modules/commands/mws-save-archive.js      |  2 +-
 .../modules/commands/mws-save-tiddler-text.js |  2 +-
 .../modules/commands/mws-test-server.js       |  2 +-
 .../multiwikiserver/modules/mws-server.js     | 18 +++++++-----
 .../routes/handlers/change-user-password.js   |  2 +-
 .../modules/routes/handlers/delete-acl.js     |  2 +-
 .../routes/handlers/delete-bag-tiddler.js     |  2 +-
 .../modules/routes/handlers/delete-role.js    |  2 +-
 .../routes/handlers/delete-user-account.js    |  2 +-
 .../modules/routes/handlers/get-acl.js        |  2 +-
 .../routes/handlers/get-bag-tiddler-blob.js   |  2 +-
 .../routes/handlers/get-bag-tiddler.js        |  2 +-
 .../modules/routes/handlers/get-bag.js        |  2 +-
 .../modules/routes/handlers/get-index.js      |  4 +--
 .../modules/routes/handlers/get-login.js      |  2 +-
 .../routes/handlers/get-recipe-events.js      |  2 +-
 .../routes/handlers/get-recipe-tiddler.js     |  2 +-
 .../handlers/get-recipe-tiddlers-json.js      |  2 +-
 .../modules/routes/handlers/get-system.js     |  2 +-
 .../modules/routes/handlers/get-users.js      |  2 +-
 .../modules/routes/handlers/get-wiki.js       |  2 +-
 .../modules/routes/handlers/manage-roles.js   |  2 +-
 .../modules/routes/handlers/manage-user.js    |  2 +-
 .../modules/routes/handlers/post-acl.js       |  2 +-
 .../routes/handlers/post-anon-config.js       |  2 +-
 .../modules/routes/handlers/post-anon.js      |  2 +-
 .../routes/handlers/post-bag-tiddlers.js      |  4 +--
 .../modules/routes/handlers/post-bag.js       |  2 +-
 .../modules/routes/handlers/post-login.js     |  2 +-
 .../modules/routes/handlers/post-logout.js    |  2 +-
 .../modules/routes/handlers/post-recipe.js    |  2 +-
 .../modules/routes/handlers/post-role.js      |  2 +-
 .../modules/routes/handlers/post-user.js      |  2 +-
 .../modules/routes/handlers/put-bag.js        |  2 +-
 .../routes/handlers/put-recipe-tiddler.js     |  2 +-
 .../modules/routes/handlers/put-recipe.js     |  2 +-
 .../modules/routes/handlers/update-role.js    |  2 +-
 .../routes/handlers/update-user-profile.js    |  2 +-
 .../modules/routes/helpers/acl-middleware.js  |  2 +-
 .../modules/routes/helpers/multipart-forms.js |  4 +--
 .../multiwikiserver/modules/startup.js        |  8 ++---
 .../modules/store/attachments.js              |  2 +-
 .../modules/store/sql-engine.js               |  8 +++--
 .../modules/store/sql-tiddler-database.js     |  6 ++--
 .../modules/store/sql-tiddler-store.js        |  6 ++--
 .../store/tests-sql-tiddler-database.js       |  4 +--
 .../modules/store/tests-sql-tiddler-store.js  |  4 +--
 .../modules/tests/test-attachment.js          |  2 +-
 .../multiwikiserver/scripts/admin-dropdown.js |  6 +++-
 63 files changed, 124 insertions(+), 83 deletions(-)
 create mode 100644 globals.d.ts
 create mode 100644 jsconfig.json

diff --git a/globals.d.ts b/globals.d.ts
new file mode 100644
index 000000000..be131e2dd
--- /dev/null
+++ b/globals.d.ts
@@ -0,0 +1,2 @@
+// globals.d.ts
+declare var $tw: any;
diff --git a/jsconfig.json b/jsconfig.json
new file mode 100644
index 000000000..281dbec84
--- /dev/null
+++ b/jsconfig.json
@@ -0,0 +1,29 @@
+{
+    "compilerOptions": {
+      "target": "ES2019",
+      "module": "CommonJS",
+      "lib": ["dom", "es2019"],
+      "allowSyntheticDefaultImports": true,
+      "checkJs": true,
+      "baseUrl": ".",
+      "paths": {
+        "$:/plugins/*": ["plugins/*"],
+        "$:/core/*": ["core/*"],
+        "$:/editions/*": ["editions/*"]
+      }
+    },
+    "include": [
+      "globals.d.ts",
+      "core/**/*.js",
+      "plugins/**/*.js",
+      "editions/**/*.js"
+    ],
+    "exclude": [
+      "node_modules",
+      ".git",
+      "dist",
+      "tmp",
+      "output"
+    ]
+}
+  
\ No newline at end of file
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-add-permission.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-add-permission.js
index fe7429566..13f5aebf9 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-add-permission.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-add-permission.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-add-permission.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-add-permission.js
 type: application/javascript
 module-type: command
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-add-role.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-add-role.js
index ec435a97f..35ee1b7cb 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-add-role.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-add-role.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-add-role.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-add-role.js
 type: application/javascript
 module-type: command
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-add-user.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-add-user.js
index fc0c4e6e1..737f3db73 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-add-user.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-add-user.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-add-user.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-add-user.js
 type: application/javascript
 module-type: command
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-assign-role-permission.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-assign-role-permission.js
index 89ed568d9..ae4037ad3 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-assign-role-permission.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-assign-role-permission.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-assign-role-permission.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-assign-role-permission.js
 type: application/javascript
 module-type: command
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-assign-user-role.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-assign-user-role.js
index 2657dbdd3..3f39f7741 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-assign-user-role.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-assign-user-role.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-assign-user-role.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-assign-user-role.js
 type: application/javascript
 module-type: command
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-create-bag.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-create-bag.js
index c90088a87..cb89f65a6 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-create-bag.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-create-bag.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-create-bag.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-create-bag.js
 type: application/javascript
 module-type: command
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-create-recipe.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-create-recipe.js
index 6515c817a..5ce9da89d 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-create-recipe.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-create-recipe.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-create-recipe.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-create-recipe.js
 type: application/javascript
 module-type: command
 
@@ -35,7 +35,7 @@ Command.prototype.execute = function() {
 	}
 	var recipeName = this.params[0],
 		bagList = (this.params[1] || "").split(" "),
-		recipeDescription = this.params[2] || recipeNameName;
+		recipeDescription = this.params[2] || recipeName;
 	// Create recipe
 	var result = $tw.mws.store.createRecipe(recipeName,bagList,recipeDescription);
 	if(result) {
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-listen.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-listen.js
index 0ee10f9be..32567a452 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-listen.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-listen.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-listen.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-listen.js
 type: application/javascript
 module-type: command
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-archive.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-archive.js
index 9e37cb32b..c6d0649ac 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-archive.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-archive.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-load-archive.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-archive.js
 type: application/javascript
 module-type: command
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-plugin-bags.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-plugin-bags.js
index 40bfb3749..19c680349 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-plugin-bags.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-plugin-bags.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-load-plugin-bags.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-plugin-bags.js
 type: application/javascript
 module-type: command
 
@@ -40,7 +40,7 @@ function loadPluginBags() {
 			const bagName = makePluginBagName(type,publisher,name);
 			const result = $tw.mws.store.createBag(bagName,pluginFields.description || "(no description)",{allowPrivilegedCharacters: true});
 			if(result) {
-				console.log(`Error creating plugin bag ${bagname}: ${JSON.stringify(result)}`);
+				console.log(`Error creating plugin bag ${bagName}: ${JSON.stringify(result)}`);
 			}
 			$tw.mws.store.saveBagTiddler(pluginFields,bagName);
 		},
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-tiddlers.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-tiddlers.js
index 659e2398c..e771bd6d1 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-tiddlers.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-tiddlers.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-load-tiddlers.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-tiddlers.js
 type: application/javascript
 module-type: command
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-wiki-folder.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-wiki-folder.js
index ada8c86be..ec45e2480 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-wiki-folder.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-wiki-folder.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-load-wiki-folder.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-load-wiki-folder.js
 type: application/javascript
 module-type: command
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-save-archive.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-save-archive.js
index d8b67753c..18e458b2c 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-save-archive.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-save-archive.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-save-archive.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-save-archive.js
 type: application/javascript
 module-type: command
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-save-tiddler-text.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-save-tiddler-text.js
index 524ec948a..2faf1b912 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-save-tiddler-text.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-save-tiddler-text.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-save-tiddler-text.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-save-tiddler-text.js
 type: application/javascript
 module-type: command
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-test-server.js b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-test-server.js
index 5d03844aa..96bd3ba89 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-test-server.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-test-server.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/commands/mws-test-server.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/commands/mws-test-server.js
 type: application/javascript
 module-type: command
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/mws-server.js b/plugins/tiddlywiki/multiwikiserver/modules/mws-server.js
index 132159a8f..05a3c9dd5 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/mws-server.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/mws-server.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/mws-server.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/mws-server.js
 type: application/javascript
 module-type: library
 
@@ -507,24 +507,26 @@ Server.prototype.requestHandler = function(request,response,options) {
 	} else if(route.bodyFormat === "string" || route.bodyFormat === "www-form-urlencoded" || !route.bodyFormat) {
 		// Set the encoding for the incoming request
 		request.setEncoding("utf8");
-		var data = "";
+		var rawData = "";
 		request.on("data",function(chunk) {
-			data += chunk.toString();
+			rawData += chunk.toString();
 		});
 		request.on("end",function() {
 			if(route.bodyFormat === "www-form-urlencoded") {
-				data = queryString.parse(data);
+				// Assign the parsed data directly to state.data.
+				state.data = queryString.parse(rawData);
+			} else {
+				state.data = rawData;
 			}
-			state.data = data;
 			route.handler(request,response,state);
 		});
 	} else if(route.bodyFormat === "buffer") {
-		var data = [];
+		var bufferData = [];
 		request.on("data",function(chunk) {
-			data.push(chunk);
+			bufferData.push(chunk);
 		});
 		request.on("end",function() {
-			state.data = Buffer.concat(data);
+			state.data = Buffer.concat(bufferData);
 			route.handler(request,response,state);
 		})
 	} else {
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/change-user-password.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/change-user-password.js
index 303b8e4e6..34e3a970e 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/change-user-password.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/change-user-password.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/change-password.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/change-password.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-acl.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-acl.js
index a4c4768e4..0b5982369 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-acl.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-acl.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/delete-acl.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-acl.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-bag-tiddler.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-bag-tiddler.js
index 722ef2d8c..a65dcf834 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-bag-tiddler.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-bag-tiddler.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/delete-bag-tiddler.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-bag-tiddler.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-role.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-role.js
index 571545b15..00a37b89f 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-role.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-role.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/delete-role.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-role.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-user-account.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-user-account.js
index 5fb0f219f..8df1cf79e 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-user-account.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-user-account.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/delete-user-account.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/delete-user-account.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-acl.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-acl.js
index 1c6e2f1b7..6a5949ca8 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-acl.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-acl.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-acl.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-acl.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag-tiddler-blob.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag-tiddler-blob.js
index 28d23212c..13d39b22f 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag-tiddler-blob.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag-tiddler-blob.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-bag-tiddler-blob.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag-tiddler-blob.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag-tiddler.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag-tiddler.js
index 52b169652..b52a71bb5 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag-tiddler.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag-tiddler.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-bag-tiddler.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag-tiddler.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag.js
index 7d262b83f..de6123a47 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-bag.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-bag.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-index.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-index.js
index 1b5dc96fe..f0c40ce0b 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-index.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-index.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-index.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-index.js
 type: application/javascript
 module-type: mws-route
 
@@ -24,7 +24,7 @@ exports.handler = function(request,response,state) {
 
 	// If application/json is requested then this is an API request, and gets the response in JSON
 	if(request.headers.accept && request.headers.accept.indexOf("application/json") !== -1) {
-		state.sendResponse(200,{"Content-Type": "application/json"},JSON.stringify(recipes),"utf8");
+		state.sendResponse(200,{"Content-Type": "application/json"},JSON.stringify(recipeList),"utf8");
 	} else {
 		// This is not a JSON API request, we should return the raw tiddler content
 		response.writeHead(200, "OK",{
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-login.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-login.js
index dd0421a66..2657e68a9 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-login.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-login.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-login.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-login.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-events.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-events.js
index bfdc40c18..3f91cfb49 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-events.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-events.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-recipe-events.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-events.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddler.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddler.js
index a50657ce5..99fdc7718 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddler.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddler.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-recipe-tiddler.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddler.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddlers-json.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddlers-json.js
index e16e3d10a..09a5b7b71 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddlers-json.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddlers-json.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-recipe-tiddlers-json.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddlers-json.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-system.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-system.js
index a5346c1a6..fa1820389 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-system.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-system.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-system.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-system.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-users.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-users.js
index 142258aa0..5c9dc0aa2 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-users.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-users.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-users.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-users.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-wiki.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-wiki.js
index 1765f5e20..ad209bcd4 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-wiki.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-wiki.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-wiki.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-wiki.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/manage-roles.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/manage-roles.js
index e6400dbb9..6070fb891 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/manage-roles.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/manage-roles.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/manage-roles.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/manage-roles.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/manage-user.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/manage-user.js
index cada04b83..b11547262 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/manage-user.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/manage-user.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/manage-user.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/manage-user.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-acl.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-acl.js
index 63a9f414f..8fb4690c0 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-acl.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-acl.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/post-acl.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-acl.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-anon-config.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-anon-config.js
index e1e841516..7b1a35965 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-anon-config.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-anon-config.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/post-anon-config.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-anon-config.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-anon.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-anon.js
index 911b6ef97..da6fb5ef7 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-anon.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-anon.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/post-anon.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-anon.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-bag-tiddlers.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-bag-tiddlers.js
index 0f520b1ba..12ed611e9 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-bag-tiddlers.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-bag-tiddlers.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/post-bag-tiddlers.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-bag-tiddlers.js
 type: application/javascript
 module-type: mws-route
 
@@ -27,7 +27,7 @@ exports.entityName = "bag"
 exports.handler = function(request,response,state) {
 	const path = require("path"),
 		fs = require("fs"),
-		processIncomingStream = require("$:/plugins/tiddlywiki/multiwikiserver/routes/helpers/multipart-forms.js").processIncomingStream;
+		processIncomingStream = require("$:/plugins/tiddlywiki/multiwikiserver/modules/routes/helpers/multipart-forms.js").processIncomingStream;
 	// Get the  parameters
 	var bag_name = $tw.utils.decodeURIComponentSafe(state.params[0]);
 	// Process the incoming data
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-bag.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-bag.js
index bd59b0642..8c2249186 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-bag.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-bag.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/post-bag.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-bag.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-login.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-login.js
index b2bc0ff4d..f0c10767e 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-login.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-login.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/post-login.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-login.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-logout.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-logout.js
index 36d901b44..130837b83 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-logout.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-logout.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/post-logout.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-logout.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-recipe.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-recipe.js
index aa38986a0..11116ca0f 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-recipe.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-recipe.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/post-recipe.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-recipe.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-role.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-role.js
index 9692c7d68..99b127325 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-role.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-role.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/post-role.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-role.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-user.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-user.js
index ff3acbfc9..a1202d1bb 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-user.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-user.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/post-user.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/post-user.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-bag.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-bag.js
index d174ee8ce..12ea3fdb1 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-bag.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-bag.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/put-bag.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-bag.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe-tiddler.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe-tiddler.js
index 25279cdd0..eaf2e922f 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe-tiddler.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe-tiddler.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/put-recipe-tiddler.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe-tiddler.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe.js
index 002c5e4db..c2fb98ffb 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/put-recipe.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/update-role.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/update-role.js
index 081ba9b73..d51501627 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/update-role.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/update-role.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/update-role.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/update-role.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/update-user-profile.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/update-user-profile.js
index 3cbc06690..5da97186a 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/update-user-profile.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/update-user-profile.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/update-profile.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/update-profile.js
 type: application/javascript
 module-type: mws-route
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/helpers/acl-middleware.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/helpers/acl-middleware.js
index 7210ed82c..bfabb1cd1 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/helpers/acl-middleware.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/helpers/acl-middleware.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/helpers/acl-middleware.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/modules/routes/helpers/acl-middleware.js
 type: application/javascript
 module-type: library
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/helpers/multipart-forms.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/helpers/multipart-forms.js
index 6a46699fa..563c3770c 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/routes/helpers/multipart-forms.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/helpers/multipart-forms.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/routes/helpers/multipart-forms.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/routes/helpers/multipart-forms.js
 type: application/javascript
 module-type: library
 
@@ -72,7 +72,7 @@ exports.processIncomingStream = function(options) {
 			} else {
 				const partFile = parts.find(part => part.name === "file-to-upload" && !!part.filename);
 				if(!partFile) {
-					return state.sendResponse(400, {"Content-Type": "text/plain"},"Missing file to upload");
+					return options.state.sendResponse(400, {"Content-Type": "text/plain"},"Missing file to upload");
 				}
 				const type = partFile.headers["content-type"];
 				const tiddlerFields = {
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/startup.js b/plugins/tiddlywiki/multiwikiserver/modules/startup.js
index 42686e889..c6918cbf9 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/startup.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/startup.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/startup.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/startup.js
 type: application/javascript
 module-type: startup
 
@@ -31,11 +31,11 @@ exports.startup = function() {
 function setupStore() {
 	const path = require("path");
 	// Create and initialise the attachment store and the tiddler store
-	const AttachmentStore = require("$:/plugins/tiddlywiki/multiwikiserver/store/attachments.js").AttachmentStore,
+	const AttachmentStore = require("$:/plugins/tiddlywiki/multiwikiserver/modules/store/attachments.js").AttachmentStore,
 		attachmentStore = new AttachmentStore({
 			storePath: path.resolve($tw.boot.wikiPath,"store/")
 		}),
-		SqlTiddlerStore = require("$:/plugins/tiddlywiki/multiwikiserver/store/sql-tiddler-store.js").SqlTiddlerStore,
+		SqlTiddlerStore = require("$:/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-store.js").SqlTiddlerStore,
 		store = new SqlTiddlerStore({
 			databasePath: path.resolve($tw.boot.wikiPath,"store/database.sqlite"),
 			engine: $tw.wiki.getTiddlerText("$:/config/MultiWikiServer/Engine","better"), // better || wasm
@@ -49,7 +49,7 @@ function ServerManager(store) {
 }
 
 ServerManager.prototype.createServer = function(options) {
-	const MWSServer = require("$:/plugins/tiddlywiki/multiwikiserver/mws-server.js").Server,
+	const MWSServer = require("$:/plugins/tiddlywiki/multiwikiserver/modules/mws-server.js").Server,
 		server = new MWSServer(options);
 	this.servers.push(server);
 	return server;
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/store/attachments.js b/plugins/tiddlywiki/multiwikiserver/modules/store/attachments.js
index 352f96a83..b66a58a10 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/store/attachments.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/store/attachments.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/store/attachments.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/store/attachments.js
 type: application/javascript
 module-type: library
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/store/sql-engine.js b/plugins/tiddlywiki/multiwikiserver/modules/store/sql-engine.js
index 00d15edf3..044c98a38 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/store/sql-engine.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/store/sql-engine.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/store/sql-engine.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/store/sql-engine.js
 type: application/javascript
 module-type: library
 
@@ -16,6 +16,7 @@ Create a database engine. Options include:
 
 databasePath - path to the database file (can be ":memory:" or missing to get a temporary database)
 engine - wasm | better
+verbose - flag to turn on console logging, defaults to undefined
 */
 function SqlEngine(options) {
 	options = options || {};
@@ -37,6 +38,9 @@ function SqlEngine(options) {
 			({ DatabaseSync: Database } = require("node:sqlite"));
 			break;
 		case "wasm":
+			// "node-sqlite3-wasm" requires manual installation
+			// see https://mws.tiddlywiki.com/#Database%20Engines
+			// @ts-ignore
 			({ Database } = require("node-sqlite3-wasm"));
 			break;
 		case "better":
@@ -44,7 +48,7 @@ function SqlEngine(options) {
 			break;
 	}
 	this.db = new Database(databasePath,{
-		verbose: undefined && console.log
+		verbose: options.verbose ? console.log : undefined
 	});
 	// Turn on WAL mode for better-sqlite3
 	if(this.engine === "better") {
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-database.js b/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-database.js
index 14f8641f4..a06cb2b21 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-database.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-database.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/store/sql-tiddler-database.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-database.js
 type: application/javascript
 module-type: library
 
@@ -20,7 +20,7 @@ engine - wasm | better
 */
 function SqlTiddlerDatabase(options) {
 	options = options || {};
-	const SqlEngine = require("$:/plugins/tiddlywiki/multiwikiserver/store/sql-engine.js").SqlEngine;
+	const SqlEngine = require("$:/plugins/tiddlywiki/multiwikiserver/modules/store/sql-engine.js").SqlEngine;
 	this.engine = new SqlEngine({
 		databasePath: options.databasePath,
 		engine: options.engine
@@ -1041,7 +1041,7 @@ SqlTiddlerDatabase.prototype.findUserBySessionId = function(sessionId) {
 
 	const lastAccessed = new Date(sessionResult.last_accessed);
 	const expirationTime = 24 * 60 * 60 * 1000; // 24 hours in milliseconds
-	if (new Date() - lastAccessed > expirationTime) {
+	if (new Date().getTime() - lastAccessed.getTime() > expirationTime) {
 			// Session has expired
 			this.deleteSession(sessionId);
 			return null;
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-store.js b/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-store.js
index bb32eba18..eec36d52c 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-store.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-store.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/store/sql-tiddler-store.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-store.js
 type: application/javascript
 module-type: library
 
@@ -31,7 +31,7 @@ function SqlTiddlerStore(options) {
 	this.eventOutstanding = {}; // Hashmap by type of boolean true of outstanding events
 	// Create the database
 	this.databasePath = options.databasePath || ":memory:";
-	var SqlTiddlerDatabase = require("$:/plugins/tiddlywiki/multiwikiserver/store/sql-tiddler-database.js").SqlTiddlerDatabase;
+	var SqlTiddlerDatabase = require("$:/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-database.js").SqlTiddlerDatabase;
 	this.sqlTiddlerDatabase = new SqlTiddlerDatabase({
 		databasePath: this.databasePath,
 		engine: options.engine
@@ -201,7 +201,7 @@ SqlTiddlerStore.prototype.saveTiddlersFromPath = function(tiddler_files_path,bag
 		// Save the tiddlers
 		for(const tiddlersFromFile of tiddlersFromPath) {
 			for(const tiddler of tiddlersFromFile.tiddlers) {
-				self.saveBagTiddler(tiddler,bag_name,null);
+				self.saveBagTiddler(tiddler,bag_name);
 			}
 		}
 	});
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/store/tests-sql-tiddler-database.js b/plugins/tiddlywiki/multiwikiserver/modules/store/tests-sql-tiddler-database.js
index 563f86bf5..d9229a4de 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/store/tests-sql-tiddler-database.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/store/tests-sql-tiddler-database.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/store/tests-sql-tiddler-database.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/store/tests-sql-tiddler-database.js
 type: application/javascript
 tags: [[$:/tags/test-spec]]
 
@@ -27,7 +27,7 @@ describe("SQL tiddler database with better-sqlite3", function() {
 
 function runSqlDatabaseTests(engine) {
 	// Create and initialise the tiddler store
-	var SqlTiddlerDatabase = require("$:/plugins/tiddlywiki/multiwikiserver/store/sql-tiddler-database.js").SqlTiddlerDatabase;
+	var SqlTiddlerDatabase = require("$:/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-database.js").SqlTiddlerDatabase;
 	const sqlTiddlerDatabase = new SqlTiddlerDatabase({
 		engine: engine
 	});
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/store/tests-sql-tiddler-store.js b/plugins/tiddlywiki/multiwikiserver/modules/store/tests-sql-tiddler-store.js
index c5888b2ce..677bba072 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/store/tests-sql-tiddler-store.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/store/tests-sql-tiddler-store.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/multiwikiserver/store/tests-sql-tiddler-store.js
+title: $:/plugins/tiddlywiki/multiwikiserver/modules/store/tests-sql-tiddler-store.js
 type: application/javascript
 tags: [[$:/tags/test-spec]]
 
@@ -22,7 +22,7 @@ describe("SQL tiddler store with better-sqlite3", function() {
 });
 
 function runSqlStoreTests(engine) {
-	var SqlTiddlerStore = require("$:/plugins/tiddlywiki/multiwikiserver/store/sql-tiddler-store.js").SqlTiddlerStore;
+	var SqlTiddlerStore = require("$:/plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-store.js").SqlTiddlerStore;
 
 	var store;
 
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/tests/test-attachment.js b/plugins/tiddlywiki/multiwikiserver/modules/tests/test-attachment.js
index 9298c43f8..055aa8431 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/tests/test-attachment.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/tests/test-attachment.js
@@ -11,7 +11,7 @@ if(typeof window === 'undefined' && typeof process !== 'undefined' && process.ve
   var fs = require('fs');
   var path = require('path');
   var assert = require('assert');
-  var AttachmentStore = require('$:/plugins/tiddlywiki/multiwikiserver/store/attachments.js').AttachmentStore;
+  var AttachmentStore = require('$:/plugins/tiddlywiki/multiwikiserver/modules/store/attachments.js').AttachmentStore;
   const {Buffer} = require('buffer');
 
 	function generateFileWithSize(filePath, sizeInBytes) {
diff --git a/plugins/tiddlywiki/multiwikiserver/scripts/admin-dropdown.js b/plugins/tiddlywiki/multiwikiserver/scripts/admin-dropdown.js
index 58336e65f..4eb25aba4 100644
--- a/plugins/tiddlywiki/multiwikiserver/scripts/admin-dropdown.js
+++ b/plugins/tiddlywiki/multiwikiserver/scripts/admin-dropdown.js
@@ -4,11 +4,15 @@ type: application/javascript
 
 \*/
 
+// @ts-check
 (function () {
 document.addEventListener("click", function (event) {
+	/** @type {HTMLElement|null} */
 	var dropdown = document.querySelector(".mws-admin-dropdown-content");
+	/** @type {HTMLElement|null} */
 	var dropbtn = document.querySelector(".mws-admin-dropbtn");
-	if(!event.target.matches(".mws-admin-dropbtn")) {
+	// Ensure event.target is an Element
+	if (!(event.target instanceof Element) || !event.target.matches(".mws-admin-dropbtn")) {
 		if(dropdown.style.display === "block") {
 			dropdown.style.display = "none";
 		}