@tiddlywiki/mws 0.1.13 → 0.2.0

package/mws.run.mjs

@@ -3,28 +3,48 @@
 import { existsSync, readFileSync, } from "fs";
 
 const cwd = process.cwd();
+
 /** @type {import("./package.json") | null} */
-const pkg = existsSync(`${cwd}/package.json`)
-  ? tryParseJSON(readFileSync(`${cwd}/package.json`, "utf8"))
-  : null;
+const pkg = existsSync(`${cwd}/package.json`) && tryParseJSON(readFileSync(`${cwd}/package.json`, "utf8")) || null;
 
-if(pkg?.name === "@tiddlywiki/mws" && existsSync(`${cwd}/mws.dev.mjs`)) {
+if (pkg && pkg.name === "@tiddlywiki/mws" && existsSync(`${cwd}/mws.dev.mjs`)) {
   console.error("This appears to be a development version of MWS.");
   process.exit(1);
 }
 
-if(!pkg?.dependencies?.["@tiddlywiki/mws"] || pkg.name !== "@tiddlywiki/mws-instance" || !pkg.private) {
+if (pkg && pkg.name === "@tiddlywiki/mws-instance" && pkg.private) {
+  if (pkg.version !== "0.2.0") {
+    console.log([
+      "=======================================================================================",
+      "The data folder you are trying to open appears to be from a different version of MWS.",
+      "",
+      "Folder: " + process.cwd(),
+      "Version: " + pkg.version,
+      "",
+      "To prevent data loss the program will now exit.",
+      "=======================================================================================",
+    ].join("\n"));
+    process.exit(1);
+  }
+  // need absolute path because of cwd
+  import(`file://${cwd}/node_modules/@tiddlywiki/mws/dist/mws.js`)
+    .then(mws => mws.default(pkg.version))
+    .catch(console.error);
+} else {
   console.error("This does not appear to be a valid MWS data folder.");
   console.error("Please run this command in the root of your MWS data folder.");
   process.exit(1);
 }
 
-import(`file://${cwd}/node_modules/@tiddlywiki/mws/dist/mws.js`).then(mws => mws.default()).catch(console.error);
-
+/**
+ * 
+ * @param {string} file 
+ * @returns 
+ */
 function tryParseJSON(file) {
   try {
     return JSON.parse(file);
-  } catch(e) {
+  } catch (e) {
     return undefined;
   }
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tiddlywiki/mws",
   "description": "TiddlyWiki Multiple Wiki Server",
   "private": false,
-  "version": "0.1.13",
+  "version": "0.2.0",
   "bin": {
     "mws": "./mws.run.mjs"
   },
@@ -19,12 +19,8 @@
     }
   },
   "workspaces": [
-    "packages/events",
-    "packages/commander",
-    "packages/server",
-    "packages/mws",
-    "packages/react-admin",
-    "packages/tiddlywiki-types"
+    "packages/*",
+    "prisma"
   ],
   "files": [
     "dist",
@@ -32,7 +28,7 @@
     "plugins",
     "prisma",
     "public",
-    "scripts.mjs",
+    "scripts",
     "mws.run.mjs"
   ],
   "engines": {
@@ -40,37 +36,28 @@
   },
   "scripts": {
     "install-android": "GYP_DEFINES=\"android_ndk_path=''\" npm install",
-    "docs": "node scripts.mjs docs",
-    "start": "node scripts.mjs start",
+    "docs": "node scripts/scripts.mjs docs",
+    "start": "node scripts/scripts.mjs start",
     "certs": "(cd dev && bash localhost_certs.sh)",
     "tsc": "TSCMWS=1 npx tsup",
-    "build": "tsup && npm run build:admin",
-    "build:admin": "node scripts.mjs client-build",
+    "tsc2": "tsc -p tsconfig.json --noEmit",
+    "tsc-client": "cd packages/react-admin && npm run tsc",
+    "build": "node scripts/scripts.mjs build",
     "build:client": "cd plugins/client && tsc",
-    "dev:init-store": "rm -rf dev/wiki/store && DEBUG= npm start init-store",
+    "prisma:gen": "cd tools && npm run prisma:gen",
+    "prisma:mig": "cd tools && npm run prisma:mig",
+    "dev-quick-reset": "node scripts/scripts.mjs dev-quick-reset",
     "env": "env",
-    "test": "node scripts.mjs test",
-    "prisma:format": "prettier --write prisma/client/*.js prisma/client/*/*.js",
-    "prisma:generate": "node scripts.mjs prisma:generate",
-    "prisma:migrate": "DATABASE_URL=file:test.sqlite npx prisma migrate dev --create-only --skip-generate --schema prisma/schema.prisma"
+    "test": "node scripts/scripts.mjs test"
   },
   "dependencies": {
-    "@prisma/adapter-better-sqlite3": "6.10.1",
-    "@serenity-kit/opaque": "^0.8.4",
-    "prisma-client": "file:prisma/client",
-    "source-map-support": "^0.5.21",
-    "tiddlywiki": "^5.3.2"
+    "@prisma/adapter-better-sqlite3": "7.8.0",
+    "@prisma/client": "7.8.0",
+    "@serenity-kit/opaque": "1.1.0",
+    "source-map-support": "0.5.21"
   },
   "devDependencies": {
-    "@prisma/client": "6.10.1",
-    "@types/node": "^24.0.0",
-    "prettier": "^3.6.1",
-    "prisma": "6.10.1",
-    "prisma-json-types-generator": "3.5.0",
-    "tsup": "^8.5.0",
-    "typescript": "^5.8.3"
-  },
-  "peerDependencies": {
-    "tiddlywiki": "^5.3.2"
+    "@types/node": "^24.6.0",
+    "@types/source-map-support": "0.5.10"
   }
-}
+}

package/plugins/client/plugin.info

@@ -1,7 +1,7 @@
 {
 	"title": "$:/plugins/mws/client",
 	"name": "MultiWikiClient",
-	"description": "Synchronise changes from the browser to TiddlyWiki ~MultiWikiServer     ",
+	"description": "Synchronise changes from the browser to TiddlyWiki MultiWikiServer",
 	"list": "readme",
 	"plugin-priority": 12,
 	"stability": "STABILITY_1_EXPERIMENTAL",

package/plugins/client/src/multiwikiclientadaptor.ts

@@ -19,30 +19,15 @@ previous operation to complete before sending a new one.
 // the blank line is important, and so is the following use strict
 "use strict";
 
-import type { ServerEventsMap } from '@tiddlywiki/events';
-import type { ZodRoute, WikiStatusRoutes, WikiRecipeRoutes } from '@tiddlywiki/mws';
-import type { zod } from '@tiddlywiki/server';
-import type { Syncer, Tiddler, TiddlerFields } from 'tiddlywiki';
+// import type { ServerEventsMap } from '@tiddlywiki/events';
+// import type { ZodRoute, WikiStatusRoutes, WikiRecipeRoutes } from '@tiddlywiki/mws';
+// import type { zod } from '@tiddlywiki/server';
+import type { Syncer, Tiddler, TiddlerFields, Wiki } from 'tiddlywiki';
+
+import {} from "@tiddlywiki/mws-prisma";
 declare global { const fflate: typeof import("./fflate"); }
 declare const self: never;
 
-// registerZodRoutes(parent, new WikiStatusRoutes(), Object.keys({
-// 	handleGetAllBagStates: true,
-// 	handleGetBagState: true,
-// 	handleGetRecipeStatus: true,
-// 	handleGetRecipeEvents: true,
-// 	handleGetBags: true,
-// } satisfies RouterKeyMap<WikiStatusRoutes, true>));
-
-// registerZodRoutes(parent, new WikiRecipeRoutes(), Object.keys({
-// 	handleDeleteRecipeTiddler: true,
-// 	handleLoadRecipeTiddler: true,
-// 	handleSaveRecipeTiddler: true,
-// 	rpcDeleteRecipeTiddlerList: true,
-// 	rpcLoadRecipeTiddlerList: true,
-// 	rpcSaveRecipeTiddlerList: true,
-// } satisfies RouterKeyMap<WikiRecipeRoutes, true>));
-
 declare class Logger {
 	constructor(componentName: any, options: any);
 	componentName: any;
@@ -61,19 +46,6 @@ declare class Logger {
 	clearAlerts(): void;
 }
 
-type WikiStatusTypes = {
-	[K in keyof WikiStatusRoutes]: WikiStatusRoutes[K] extends ZodRoute<infer M, infer B, infer P, infer Q, infer T, infer R>
-	? { M: M, B: B, P: P, Q: Q, T: T, R: R }
-	: never
-}
-type WikiRecipeTypes = {
-	[K in keyof WikiRecipeRoutes]: WikiRecipeRoutes[K] extends ZodRoute<infer M, infer B, infer P, infer Q, infer T, infer R>
-	? { M: M, B: B, P: P, Q: Q, T: T, R: R }
-	: never
-}
-interface RouteTypes extends WikiStatusTypes, WikiRecipeTypes {
-}
-
 declare module 'tiddlywiki' {
 	export interface Syncer<AD> {
 		wiki: Wiki;
@@ -236,7 +208,7 @@ interface MWSAdaptorInfo {
 
 
 class MultiWikiClientAdaptor implements SyncAdaptor<MWSAdaptorInfo> {
-	private wiki;
+	private wiki: Wiki;
 	private host;
 	private recipe;
 	private useServerSentEvents;
@@ -259,11 +231,11 @@ class MultiWikiClientAdaptor implements SyncAdaptor<MWSAdaptorInfo> {
 	constructor(options: { wiki: any }) {
 		this.wiki = options.wiki;
 		this.host = this.getHost();
-		this.recipe = this.wiki.getTiddlerText("$:/config/multiwikiclient/recipe");
+		this.recipe = this.wiki.getTiddlerText("$:/config/multiwikiclient/recipe", "default")!;
 		this.useServerSentEvents = this.wiki.getTiddlerText(ENABLE_SSE_TIDDLER) === "yes";
 		this.isDevMode = this.wiki.getTiddlerText(IS_DEV_MODE_TIDDLER) === "yes";
 		this.useGzipStream = this.wiki.getTiddlerText(ENABLE_GZIP_STREAM_TIDDLER) === "yes";
-		this.last_known_revision_id = this.wiki.getTiddlerText("$:/state/multiwikiclient/recipe/last_revision_id", "0")
+		this.last_known_revision_id = this.wiki.getTiddlerText("$:/state/multiwikiclient/recipe/last_revision_id", "0")!
 		this.outstandingRequests = Object.create(null); // Hashmap by title of outstanding request object: {type: "PUT"|"GET"|"DELETE"}
 		this.lastRecordedUpdate = Object.create(null); // Hashmap by title of last recorded update via SSE: {type: "update"|"detetion", revision_id:}
 		this.logger = new $tw.utils.Logger("MultiWikiClientAdaptor");
@@ -272,7 +244,7 @@ class MultiWikiClientAdaptor implements SyncAdaptor<MWSAdaptorInfo> {
 		this.offline = false;
 		this.username = "";
 		// Compile the dirty tiddler filter
-		this.incomingUpdatesFilterFn = this.wiki.compileFilter(this.wiki.getTiddlerText(INCOMING_UPDATES_FILTER_TIDDLER));
+		this.incomingUpdatesFilterFn = this.wiki.compileFilter(this.wiki.getTiddlerText(INCOMING_UPDATES_FILTER_TIDDLER)!);
 		this.setConnectionStatus(SERVER_NOT_CONNECTED);
 	}
 
@@ -402,7 +374,7 @@ class MultiWikiClientAdaptor implements SyncAdaptor<MWSAdaptorInfo> {
 	connectRecipeEvents() {
 		const event = new EventSource(this.host + "recipe/" + encodeURIComponent(this.recipe) + "/events?first-event-id=" + encodeURIComponent(this.last_known_revision_id));
 		this.setConnectionStatus(SERVER_CONNECTING_SSE);
-		let syncTimeout: NodeJS.Timeout | null = null;
+		let syncTimeout: number | null = null;
 		const debounceSyncFromServer = () => {
 			if (syncTimeout) {
 				clearTimeout(syncTimeout);

package/plugins/client/src/mws.d.ts

@@ -1,4 +1,5 @@
 import "./types";
 export * from "packages/mws/src/index";
 export * from "packages/server/src/index";
-export * from "packages/events/src/index";
+export * from "packages/events/src/index";
+export * from "packages/utils/src/index";