shared-things-server 1.0.5 → 1.1.0

package/dist/cli.js

@@ -1,17 +1,23 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-import { Command } from "commander";
-import { input, confirm } from "@inquirer/prompts";
+import { spawn } from "child_process";
+import * as fs2 from "fs";
+import * as os2 from "os";
+import * as path2 from "path";
+import cors from "@fastify/cors";
+import { confirm, input } from "@inquirer/prompts";
 import chalk from "chalk";
+import { Command } from "commander";
+import Fastify from "fastify";
 import updateNotifier from "update-notifier";
 
 // src/db.ts
-import Database from "better-sqlite3";
-import * as path from "path";
-import * as os from "os";
-import * as fs from "fs";
 import * as crypto from "crypto";
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+import Database from "better-sqlite3";
 var DATA_DIR = process.env.DATA_DIR || path.join(os.homedir(), ".shared-things-server");
 var DB_PATH = path.join(DATA_DIR, "data.db");
 function initDatabase() {
@@ -278,14 +284,6 @@ function resetUserData(db, userId) {
   };
 }
 
-// src/cli.ts
-import * as fs2 from "fs";
-import * as path2 from "path";
-import * as os2 from "os";
-import { spawn } from "child_process";
-import Fastify from "fastify";
-import cors from "@fastify/cors";
-
 // src/auth.ts
 function authMiddleware(db) {
   return (request, reply, done) => {
@@ -294,7 +292,10 @@ function authMiddleware(db) {
     }
     const authHeader = request.headers.authorization;
     if (!authHeader || !authHeader.startsWith("Bearer ")) {
-      reply.code(401).send({ error: "Missing or invalid authorization header", code: "UNAUTHORIZED" });
+      reply.code(401).send({
+        error: "Missing or invalid authorization header",
+        code: "UNAUTHORIZED"
+      });
       return;
     }
     const apiKey = authHeader.slice(7);
@@ -313,7 +314,7 @@ function registerRoutes(app, db) {
   app.get("/health", async () => {
     return { status: "ok", timestamp: (/* @__PURE__ */ new Date()).toISOString() };
   });
-  app.get("/state", async (request) => {
+  app.get("/state", async (_request) => {
     const headings = getAllHeadings(db);
     const todos = getAllTodos(db);
     return {
@@ -342,59 +343,73 @@ function registerRoutes(app, db) {
       syncedAt: (/* @__PURE__ */ new Date()).toISOString()
     };
   });
-  app.post("/push", async (request, reply) => {
-    const { headings, todos } = request.body;
-    const userId = request.user.id;
-    const conflicts = [];
-    try {
-      for (const thingsId of headings.deleted) {
-        deleteHeading(db, thingsId, userId);
-      }
-      for (const heading of headings.upserted) {
-        upsertHeading(db, heading.thingsId, heading.title, heading.position, userId);
-      }
-      for (const serverId of todos.deleted) {
-        deleteTodoByServerId(db, serverId, userId);
-      }
-      for (const todo of todos.upserted) {
-        let headingId = null;
-        if (todo.headingId) {
-          const headingRow = db.prepare(`SELECT id FROM headings WHERE things_id = ?`).get(todo.headingId);
-          headingId = headingRow?.id || null;
+  app.post(
+    "/push",
+    async (request, reply) => {
+      const { headings, todos } = request.body;
+      const userId = request.user.id;
+      const conflicts = [];
+      try {
+        for (const thingsId of headings.deleted) {
+          deleteHeading(db, thingsId, userId);
         }
-        upsertTodoByServerId(db, todo.serverId, {
-          thingsId: todo.thingsId,
-          title: todo.title,
-          notes: todo.notes,
-          dueDate: todo.dueDate,
-          tags: todo.tags,
-          status: todo.status,
-          headingId,
-          position: todo.position
-        }, userId);
-      }
-    } catch (err) {
-      const error = err;
-      if (error.message?.includes("UNIQUE constraint failed")) {
-        reply.status(409);
-        return {
-          error: 'Sync conflict: Server has data that conflicts with your local state. Run "shared-things reset --server" to start fresh.',
-          code: "SYNC_CONFLICT"
-        };
+        for (const heading of headings.upserted) {
+          upsertHeading(
+            db,
+            heading.thingsId,
+            heading.title,
+            heading.position,
+            userId
+          );
+        }
+        for (const serverId of todos.deleted) {
+          deleteTodoByServerId(db, serverId, userId);
+        }
+        for (const todo of todos.upserted) {
+          let headingId = null;
+          if (todo.headingId) {
+            const headingRow = db.prepare(`SELECT id FROM headings WHERE things_id = ?`).get(todo.headingId);
+            headingId = headingRow?.id || null;
+          }
+          upsertTodoByServerId(
+            db,
+            todo.serverId,
+            {
+              thingsId: todo.thingsId,
+              title: todo.title,
+              notes: todo.notes,
+              dueDate: todo.dueDate,
+              tags: todo.tags,
+              status: todo.status,
+              headingId,
+              position: todo.position
+            },
+            userId
+          );
+        }
+      } catch (err) {
+        const error = err;
+        if (error.message?.includes("UNIQUE constraint failed")) {
+          reply.status(409);
+          return {
+            error: 'Sync conflict: Server has data that conflicts with your local state. Run "shared-things reset --server" to start fresh.',
+            code: "SYNC_CONFLICT"
+          };
+        }
+        throw err;
       }
-      throw err;
+      const currentHeadings = getAllHeadings(db);
+      const currentTodos = getAllTodos(db);
+      return {
+        state: {
+          headings: currentHeadings,
+          todos: currentTodos,
+          syncedAt: (/* @__PURE__ */ new Date()).toISOString()
+        },
+        conflicts
+      };
     }
-    const currentHeadings = getAllHeadings(db);
-    const currentTodos = getAllTodos(db);
-    return {
-      state: {
-        headings: currentHeadings,
-        todos: currentTodos,
-        syncedAt: (/* @__PURE__ */ new Date()).toISOString()
-      },
-      conflicts
-    };
-  });
+  );
   app.delete("/reset", async (request) => {
     const userId = request.user.id;
     const result = resetUserData(db, userId);
@@ -409,7 +424,9 @@ function registerRoutes(app, db) {
 }
 
 // src/cli.ts
-var pkg = JSON.parse(fs2.readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
+var pkg = JSON.parse(
+  fs2.readFileSync(new URL("../package.json", import.meta.url), "utf-8")
+);
 var updateCheckInterval = 1e3 * 60 * 60;
 var notifier = updateNotifier({ pkg, updateCheckInterval });
 if (notifier.update) {
@@ -439,8 +456,10 @@ if (notifier.update && notifier.update.current !== notifier.update.latest) {
 process.on("exit", () => {
   if (notifier.update && notifier.update.current !== notifier.update.latest) {
     console.error(
-      chalk.yellow(`
-  Update available: ${notifier.update.current} \u2192 ${notifier.update.latest}`) + chalk.dim(`
+      chalk.yellow(
+        `
+  Update available: ${notifier.update.current} \u2192 ${notifier.update.latest}`
+      ) + chalk.dim(`
   Run: npm i -g ${pkg.name}
 `)
     );
@@ -476,9 +495,13 @@ program.command("start").description("Start the sync server").option("-p, --port
   if (!isChildProcess) {
     const status = isServerRunning();
     if (status.running) {
-      console.log(chalk.yellow(`
-\u26A0\uFE0F  Server already running (PID: ${status.pid})`));
-      console.log(chalk.dim('Use "shared-things-server stop" to stop it first.\n'));
+      console.log(
+        chalk.yellow(`
+\u26A0\uFE0F  Server already running (PID: ${status.pid})`)
+      );
+      console.log(
+        chalk.dim('Use "shared-things-server stop" to stop it first.\n')
+      );
       return;
     }
   }
@@ -486,11 +509,15 @@ program.command("start").description("Start the sync server").option("-p, --port
     ensureDataDir();
     const logFd = fs2.openSync(LOG_FILE, "a");
     const scriptPath = process.argv[1];
-    const child = spawn(process.execPath, [scriptPath, "start", "--port", String(PORT), "--host", HOST], {
-      detached: true,
-      stdio: ["ignore", logFd, logFd],
-      env: { ...process.env, SHARED_THINGS_DETACHED: "1" }
-    });
+    const child = spawn(
+      process.execPath,
+      [scriptPath, "start", "--port", String(PORT), "--host", HOST],
+      {
+        detached: true,
+        stdio: ["ignore", logFd, logFd],
+        env: { ...process.env, SHARED_THINGS_DETACHED: "1" }
+      }
+    );
     fs2.writeFileSync(PID_FILE, String(child.pid));
     child.unref();
     fs2.closeSync(logFd);
@@ -499,13 +526,17 @@ program.command("start").description("Start the sync server").option("-p, --port
     console.log(`  ${chalk.dim("PID:")}  ${child.pid}`);
     console.log(`  ${chalk.dim("URL:")}  http://${HOST}:${PORT}`);
     console.log(`  ${chalk.dim("Logs:")} ${LOG_FILE}`);
-    console.log(chalk.dim('\nUse "shared-things-server logs -f" to follow logs'));
-    console.log(chalk.dim('Use "shared-things-server stop" to stop the server\n'));
+    console.log(
+      chalk.dim('\nUse "shared-things-server logs -f" to follow logs')
+    );
+    console.log(
+      chalk.dim('Use "shared-things-server stop" to stop the server\n')
+    );
     return;
   }
   const db = initDatabase();
   const app = Fastify({
-    logger: isChildProcess ? true : true
+    logger: true
   });
   await app.register(cors, {
     origin: true
@@ -525,9 +556,11 @@ program.command("start").description("Start the sync server").option("-p, --port
   try {
     await app.listen({ port: PORT, host: HOST });
     if (!process.env.SHARED_THINGS_DETACHED) {
-      console.log(chalk.green(`
+      console.log(
+        chalk.green(`
 \u2705 Server running at http://${HOST}:${PORT}
-`));
+`)
+      );
     }
   } catch (err) {
     app.log.error(err);
@@ -599,7 +632,9 @@ program.command("logs").description("Show server logs").option("-f, --follow", "
       process.exit(0);
     });
   } else {
-    const tail = spawn("tail", ["-n", options.lines, LOG_FILE], { stdio: "inherit" });
+    const tail = spawn("tail", ["-n", options.lines, LOG_FILE], {
+      stdio: "inherit"
+    });
     tail.on("close", () => process.exit(0));
   }
 });
@@ -612,7 +647,8 @@ program.command("create-user").description("Create a new user and generate API k
       message: "Username",
       validate: (value) => {
         if (!value.trim()) return "Username is required";
-        if (userExists(db, value.trim())) return `User "${value.trim()}" already exists`;
+        if (userExists(db, value.trim()))
+          return `User "${value.trim()}" already exists`;
         return true;
       }
     });
@@ -628,14 +664,18 @@ program.command("create-user").description("Create a new user and generate API k
   console.log(`  ${chalk.dim("ID:")}       ${id}`);
   console.log(`  ${chalk.dim("Name:")}     ${name}`);
   console.log(`  ${chalk.dim("API Key:")}  ${chalk.cyan(apiKey)}`);
-  console.log(chalk.yellow("\n\u26A0\uFE0F  Save this API key - it cannot be retrieved later!\n"));
+  console.log(
+    chalk.yellow("\n\u26A0\uFE0F  Save this API key - it cannot be retrieved later!\n")
+  );
 });
 program.command("list-users").description("List all users").action(async () => {
   const db = initDatabase();
   const users = listUsers(db);
   if (users.length === 0) {
     console.log(chalk.yellow("\nNo users found.\n"));
-    console.log(chalk.dim("Create a user with: shared-things-server create-user\n"));
+    console.log(
+      chalk.dim("Create a user with: shared-things-server create-user\n")
+    );
   } else {
     console.log(chalk.bold(`
 \u{1F465} Users (${users.length})
@@ -666,7 +706,8 @@ program.command("delete-user").description("Delete a user").option("-n, --name <
       message: "Username to delete",
       validate: (value) => {
         if (!value.trim()) return "Username is required";
-        if (!users.find((u) => u.name === value.trim())) return "User not found";
+        if (!users.find((u) => u.name === value.trim()))
+          return "User not found";
         return true;
       }
     });
@@ -724,7 +765,7 @@ ${title}
     const statusColor = todo.status === "completed" ? chalk.green : todo.status === "canceled" ? chalk.red : chalk.white;
     console.log(`  ${statusColor(statusIcon)} ${chalk.white(todo.title)}`);
     if (todo.notes) {
-      const shortNotes = todo.notes.length > 50 ? todo.notes.substring(0, 50) + "..." : todo.notes;
+      const shortNotes = todo.notes.length > 50 ? `${todo.notes.substring(0, 50)}...` : todo.notes;
       console.log(`    ${chalk.dim("Notes:")} ${shortNotes}`);
     }
     if (todo.dueDate) {
@@ -733,7 +774,9 @@ ${title}
     if (todo.tags && todo.tags.length > 0) {
       console.log(`    ${chalk.dim("Tags:")} ${todo.tags.join(", ")}`);
     }
-    console.log(`    ${chalk.dim("Status:")} ${todo.status} ${chalk.dim("|")} ${chalk.dim("By:")} ${userName} ${chalk.dim("|")} ${todo.updatedAt}`);
+    console.log(
+      `    ${chalk.dim("Status:")} ${todo.status} ${chalk.dim("|")} ${chalk.dim("By:")} ${userName} ${chalk.dim("|")} ${todo.updatedAt}`
+    );
     console.log();
   }
 });
@@ -760,7 +803,9 @@ program.command("reset").description("Delete all todos and headings (keeps users
   db.prepare("DELETE FROM todos").run();
   db.prepare("DELETE FROM headings").run();
   db.prepare("DELETE FROM deleted_items").run();
-  console.log(chalk.green("\n\u2705 All todos and headings deleted. Users preserved.\n"));
+  console.log(
+    chalk.green("\n\u2705 All todos and headings deleted. Users preserved.\n")
+  );
 });
 program.command("purge").description("Delete entire database (all data including users)").action(async () => {
   const dataDir = process.env.DATA_DIR || path2.join(os2.homedir(), ".shared-things-server");
@@ -781,8 +826,12 @@ program.command("purge").description("Delete entire database (all data including
     return;
   }
   fs2.unlinkSync(dbPath);
-  if (fs2.existsSync(dbPath + "-wal")) fs2.unlinkSync(dbPath + "-wal");
-  if (fs2.existsSync(dbPath + "-shm")) fs2.unlinkSync(dbPath + "-shm");
-  console.log(chalk.green('\n\u2705 Database deleted. Run "shared-things-server create-user" to start fresh.\n'));
+  if (fs2.existsSync(`${dbPath}-wal`)) fs2.unlinkSync(`${dbPath}-wal`);
+  if (fs2.existsSync(`${dbPath}-shm`)) fs2.unlinkSync(`${dbPath}-shm`);
+  console.log(
+    chalk.green(
+      '\n\u2705 Database deleted. Run "shared-things-server create-user" to start fresh.\n'
+    )
+  );
 });
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shared-things-server",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "description": "Sync server for Things 3 projects",
   "type": "module",
   "main": "./dist/index.js",
@@ -9,6 +9,7 @@
   },
   "files": [
     "dist",
+    "scripts",
     "README.md"
   ],
   "keywords": [
@@ -55,6 +56,8 @@
   },
   "scripts": {
     "build": "tsup",
-    "dev": "tsx watch src/cli.ts start"
+    "dev": "tsx watch src/cli.ts start",
+    "typecheck": "tsc --noEmit",
+    "postinstall": "node scripts/postinstall.js || true"
   }
 }

package/scripts/postinstall.js

@@ -0,0 +1,124 @@
+#!/usr/bin/env node
+
+/**
+ * Postinstall script: Automatically restart the server if it's running.
+ * This ensures users get the new version after `npm update -g shared-things-server`.
+ *
+ * Safe behaviors:
+ * - Silent success if server is not running
+ * - Never fails npm install (catches all errors)
+ * - Works on any platform (Linux, macOS)
+ */
+
+import { execSync } from "node:child_process";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+
+const DATA_DIR =
+	process.env.DATA_DIR || path.join(os.homedir(), ".shared-things-server");
+const PID_FILE = path.join(DATA_DIR, "server.pid");
+
+function isServerRunning() {
+	if (!fs.existsSync(PID_FILE)) {
+		return { running: false };
+	}
+
+	const pid = parseInt(fs.readFileSync(PID_FILE, "utf-8").trim(), 10);
+
+	try {
+		// Check if process exists (signal 0 doesn't kill, just checks)
+		process.kill(pid, 0);
+		return { running: true, pid };
+	} catch {
+		// Process doesn't exist, clean up stale PID file
+		try {
+			fs.unlinkSync(PID_FILE);
+		} catch {
+			// Ignore cleanup errors
+		}
+		return { running: false };
+	}
+}
+
+function stopServer(pid) {
+	try {
+		process.kill(pid, "SIGTERM");
+		// Wait for graceful shutdown
+		let attempts = 0;
+		while (attempts < 10) {
+			try {
+				process.kill(pid, 0);
+				// Still running, wait
+				execSync("sleep 0.2", { stdio: "pipe" });
+				attempts++;
+			} catch {
+				// Process stopped
+				break;
+			}
+		}
+		// Clean up PID file if still exists
+		if (fs.existsSync(PID_FILE)) {
+			fs.unlinkSync(PID_FILE);
+		}
+		return true;
+	} catch {
+		return false;
+	}
+}
+
+function startServer() {
+	// Verify the command exists
+	try {
+		execSync("which shared-things-server", { stdio: "pipe" });
+	} catch {
+		// Command not in PATH, can't start
+		return false;
+	}
+
+	// Use the CLI's built-in detach mode (-d flag)
+	// This properly handles daemonization and PID file management
+	try {
+		execSync("shared-things-server start -d", {
+			stdio: "pipe",
+			timeout: 10000,
+		});
+		return true;
+	} catch {
+		return false;
+	}
+}
+
+function main() {
+	const status = isServerRunning();
+
+	if (!status.running) {
+		// Server not running, nothing to restart
+		return;
+	}
+
+	// Stop the old server
+	const stopped = stopServer(status.pid);
+	if (!stopped) {
+		console.log(
+			'  ℹ️  Could not auto-restart server. Run "shared-things-server stop && shared-things-server start -d" manually.',
+		);
+		return;
+	}
+
+	// Start with new version
+	const started = startServer();
+	if (started) {
+		console.log("  ✅ Server restarted with new version");
+	} else {
+		console.log(
+			'  ℹ️  Server stopped. Run "shared-things-server start -d" to start it again.',
+		);
+	}
+}
+
+try {
+	main();
+} catch {
+	// Never fail npm install
+}