mrmd-server 0.1.1 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mrmd-server",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "HTTP server for mrmd - run mrmd in any browser, access from anywhere",
   "type": "module",
   "main": "src/index.js",

package/src/server.js

@@ -11,7 +11,10 @@ import { WebSocketServer } from 'ws';
 import path from 'path';
 import fs from 'fs/promises';
 import { existsSync } from 'fs';
-import { fileURLToPath } from 'url';
+import { fileURLToPath, pathToFileURL } from 'url';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
 
 import { createAuthMiddleware, generateToken } from './auth.js';
 import { EventBus } from './events.js';
@@ -335,15 +338,26 @@ export async function createServer(config) {
  */
 function findElectronDir(fromDir) {
   const candidates = [
+    // Development: sibling directories
     path.join(fromDir, '../../mrmd-electron'),
     path.join(fromDir, '../../../mrmd-electron'),
     path.join(process.cwd(), '../mrmd-electron'),
     path.join(process.cwd(), 'mrmd-electron'),
-    // In npx/installed context, it might be in node_modules
+    // npm/npx: node_modules relative to mrmd-server package
+    path.join(fromDir, '../node_modules/mrmd-electron'),
     path.join(fromDir, '../../node_modules/mrmd-electron'),
+    // npm/npx: node_modules in cwd
     path.join(process.cwd(), 'node_modules/mrmd-electron'),
   ];
 
+  // Also try require.resolve to find the package
+  try {
+    const electronPkg = path.dirname(require.resolve('mrmd-electron/package.json'));
+    candidates.unshift(electronPkg);
+  } catch (e) {
+    // mrmd-electron not found via require, continue with path search
+  }
+
   for (const candidate of candidates) {
     const indexPath = path.join(candidate, 'index.html');
     if (existsSync(indexPath)) {