@fyresmith/hive-server 4.0.0 → 4.0.1

package/cli/constants.js

@@ -18,17 +18,14 @@ export const REQUIRED_ENV_KEYS = [
   'DISCORD_CLIENT_ID',
   'DISCORD_CLIENT_SECRET',
   'DISCORD_REDIRECT_URI',
-  'DISCORD_GUILD_ID',
   'OWNER_DISCORD_ID',
   'JWT_SECRET',
   'VAULT_PATH',
   'PORT',
-  'YJS_PORT',
 ];
 
 export const DEFAULT_ENV_VALUES = {
   PORT: '3000',
-  YJS_PORT: '3001',
 };
 
 export const DEFAULT_CONFIG = {

package/cli/env-file.js

@@ -76,9 +76,7 @@ export function validateEnvValues(values) {
   }
 
   const port = parseInt(values.PORT ?? '', 10);
-  const yjsPort = parseInt(values.YJS_PORT ?? '', 10);
   if (!Number.isInteger(port) || port <= 0) issues.push('PORT must be a positive integer');
-  if (!Number.isInteger(yjsPort) || yjsPort <= 0) issues.push('YJS_PORT must be a positive integer');
 
   try {
     const uri = new URL(values.DISCORD_REDIRECT_URI ?? '');
@@ -113,12 +111,10 @@ export async function promptForEnv({ envFile, existing, yes = false, preset = {}
   const questions = [
     { name: 'DISCORD_CLIENT_ID', message: 'Discord Client ID' },
     { name: 'DISCORD_CLIENT_SECRET', message: 'Discord Client Secret', secret: true },
-    { name: 'DISCORD_GUILD_ID', message: 'Discord Guild ID' },
     { name: 'OWNER_DISCORD_ID', message: 'Managed vault owner Discord ID' },
     { name: 'JWT_SECRET', message: 'JWT secret', secret: true },
     { name: 'VAULT_PATH', message: 'Vault absolute path' },
     { name: 'PORT', message: 'HTTP port' },
-    { name: 'YJS_PORT', message: 'Yjs WS port' },
     { name: 'DISCORD_REDIRECT_URI', message: 'Discord redirect URI' },
   ];
 

package/cli/flows/setup.js

@@ -95,7 +95,6 @@ export async function runSetupWizard(options) {
   const shouldSetupTunnel = await promptConfirm('Configure Cloudflare Tunnel now?', yes, true);
   if (shouldSetupTunnel) {
     const port = parseInteger(envValues.PORT, 'PORT');
-    const yjsPort = parseInteger(envValues.YJS_PORT, 'YJS_PORT');
     const tunnelName = requiredOrFallback(options.tunnelName, nextConfig.tunnelName || DEFAULT_TUNNEL_NAME);
     const cloudflaredConfigFile = requiredOrFallback(
       options.cloudflaredConfigFile,
@@ -109,7 +108,6 @@ export async function runSetupWizard(options) {
       configFile: cloudflaredConfigFile,
       certPath: DEFAULT_CLOUDFLARED_CERT,
       port,
-      yjsPort,
       yes,
       installService: tunnelService,
     });

package/cli/tunnel.js

@@ -138,10 +138,9 @@ export async function writeCloudflaredConfig({
   credentialsFile,
   domain,
   port,
-  yjsPort,
 }) {
   await mkdir(dirname(configFile), { recursive: true });
-  const yaml = `tunnel: ${tunnelId}\ncredentials-file: ${credentialsFile}\n\ningress:\n  - hostname: ${domain}\n    path: /yjs/*\n    service: http://localhost:${yjsPort}\n\n  - hostname: ${domain}\n    service: http://localhost:${port}\n\n  - service: http_status:404\n`;
+  const yaml = `tunnel: ${tunnelId}\ncredentials-file: ${credentialsFile}\n\ningress:\n  - hostname: ${domain}\n    service: http://localhost:${port}\n\n  - service: http_status:404\n`;
   await writeFile(configFile, yaml, 'utf-8');
   return yaml;
 }
@@ -358,7 +357,6 @@ export async function setupTunnel({
   configFile,
   certPath,
   port,
-  yjsPort,
   yes = false,
   installService = false,
 }) {
@@ -379,7 +377,6 @@ export async function setupTunnel({
     credentialsFile,
     domain,
     port,
-    yjsPort,
   });
 
   info(`Ensuring DNS route for ${domain}`);

package/index.js

@@ -16,7 +16,6 @@ const REQUIRED = [
   'DISCORD_CLIENT_ID',
   'DISCORD_CLIENT_SECRET',
   'DISCORD_REDIRECT_URI',
-  'DISCORD_GUILD_ID',
   'OWNER_DISCORD_ID',
 ];
 
@@ -28,13 +27,9 @@ function validateEnv() {
   }
 
   const port = parseInt(process.env.PORT ?? '3000', 10);
-  const yjsPort = parseInt(process.env.YJS_PORT ?? '3001', 10);
   if (!Number.isInteger(port) || port <= 0) {
     throw new Error('[startup] PORT must be a positive integer');
   }
-  if (!Number.isInteger(yjsPort) || yjsPort <= 0) {
-    throw new Error('[startup] YJS_PORT must be a positive integer');
-  }
 
   return { port };
 }
@@ -68,6 +63,18 @@ export async function startHiveServer(options = {}) {
 
   app.use(express.json());
 
+  // Allow desktop plugin fetch calls (Authorization header triggers preflight).
+  app.use((req, res, next) => {
+    res.setHeader('Access-Control-Allow-Origin', '*');
+    res.setHeader('Access-Control-Allow-Methods', 'GET,POST,PUT,PATCH,DELETE,OPTIONS');
+    res.setHeader('Access-Control-Allow-Headers', 'Authorization,Content-Type');
+    if (req.method === 'OPTIONS') {
+      res.sendStatus(204);
+      return;
+    }
+    next();
+  });
+
   // Auth routes
   app.use('/auth', authRoutes);
   app.use('/managed', managedRoutes);
@@ -85,7 +92,17 @@ export async function startHiveServer(options = {}) {
   }
 
   attachHandlers(io, getActiveRooms, broadcastFileUpdated, forceCloseRoom);
-  startYjsServer(broadcastFileUpdated);
+  const yjsWss = startYjsServer(httpServer, broadcastFileUpdated);
+
+  httpServer.on('upgrade', (req, socket, head) => {
+    const { pathname } = new URL(req.url, 'http://localhost');
+    if (pathname.startsWith('/yjs')) {
+      yjsWss.handleUpgrade(req, socket, head, (ws) => {
+        yjsWss.emit('connection', ws, req);
+      });
+    }
+    // Socket.IO handles /socket.io upgrades automatically via its own listener
+  });
 
   // Chokidar watch for external (non-plugin) changes
   vault.initWatcher((relPath, event) => {

package/lib/yjsServer.js

@@ -204,10 +204,9 @@ export async function forceCloseRoom(relPath) {
   await closeRoom(docName, { closeClients: true, reason: 'forced' });
 }
 
-export function startYjsServer(broadcastFileUpdated) {
+export function startYjsServer(httpServer, broadcastFileUpdated) {
   broadcastRef = broadcastFileUpdated;
-  const port = parseInt(process.env.YJS_PORT ?? '3001', 10);
-  const wss = new WebSocketServer({ port });
+  const wss = new WebSocketServer({ noServer: true });
 
   wss.on('connection', async (conn, req) => {
     const url = new URL(req.url, 'http://localhost');
@@ -274,6 +273,5 @@ export function startYjsServer(broadcastFileUpdated) {
     }
   });
 
-  console.log(`[yjs] WebSocket server listening on port ${port}`);
   return wss;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fyresmith/hive-server",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "type": "module",
   "description": "Collaborative Obsidian vault server",
   "main": "index.js",

package/routes/auth.js

@@ -29,9 +29,10 @@ router.get('/login', (req, res) => {
   const state = randomBytes(16).toString('hex');
   stateMap.set(state, { ts: Date.now() });
 
+  const scope = process.env.DISCORD_GUILD_ID ? ['identify', 'guilds'] : ['identify'];
   const url = oauth.generateAuthUrl({
     clientId: process.env.DISCORD_CLIENT_ID,
-    scope: ['identify', 'guilds'],
+    scope,
     redirectUri: process.env.DISCORD_REDIRECT_URI,
     state,
   });
@@ -56,22 +57,25 @@ router.get('/callback', async (req, res) => {
 
   try {
     // Exchange code for access token
+    const scope = process.env.DISCORD_GUILD_ID ? ['identify', 'guilds'] : ['identify'];
     const tokenData = await oauth.tokenRequest({
       clientId: process.env.DISCORD_CLIENT_ID,
       clientSecret: process.env.DISCORD_CLIENT_SECRET,
       redirectUri: process.env.DISCORD_REDIRECT_URI,
       code,
-      scope: ['identify', 'guilds'],
+      scope,
       grantType: 'authorization_code',
     });
 
     const accessToken = tokenData.access_token;
 
-    // Verify guild membership
-    const guilds = await oauth.getUserGuilds(accessToken);
-    const isMember = guilds.some((g) => g.id === process.env.DISCORD_GUILD_ID);
-    if (!isMember) {
-      return res.status(403).send('Access denied: you are not a member of the required Discord server.');
+    // Verify guild membership (only when DISCORD_GUILD_ID is configured)
+    if (process.env.DISCORD_GUILD_ID) {
+      const guilds = await oauth.getUserGuilds(accessToken);
+      const isMember = guilds.some((g) => g.id === process.env.DISCORD_GUILD_ID);
+      if (!isMember) {
+        return res.status(403).send('Access denied: you are not a member of the required Discord server.');
+      }
     }
 
     // Fetch user profile

package/routes/managed.js

@@ -13,6 +13,17 @@ import {
 
 const router = Router();
 
+router.use((req, res, next) => {
+  res.setHeader('Access-Control-Allow-Origin', '*');
+  res.setHeader('Access-Control-Allow-Methods', 'GET,POST,PUT,PATCH,DELETE,OPTIONS');
+  res.setHeader('Access-Control-Allow-Headers', 'Authorization,Content-Type');
+  if (req.method === 'OPTIONS') {
+    res.sendStatus(204);
+    return;
+  }
+  next();
+});
+
 function getVaultPath() {
   const value = String(process.env.VAULT_PATH ?? '').trim();
   if (!value) throw new Error('VAULT_PATH env var is required');