vimd 0.1.6 → 0.1.7

package/dist/cli/commands/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/dev.ts"],"names":[],"mappings":"AAWA,UAAU,UAAU;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC,CAwGf"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/dev.ts"],"names":[],"mappings":"AAYA,UAAU,UAAU;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC,CA+If"}

package/dist/cli/commands/dev.js

@@ -6,6 +6,7 @@ import { LiveServer } from '../../core/server.js';
 import { PandocDetector } from '../../core/pandoc-detector.js';
 import { Logger } from '../../utils/logger.js';
 import { ProcessManager } from '../../utils/process-manager.js';
+import { SessionManager } from '../../utils/session-manager.js';
 import * as path from 'path';
 import fs from 'fs-extra';
 export async function devCommand(filePath, options) {
@@ -23,44 +24,73 @@ export async function devCommand(filePath, options) {
         if (options.open !== undefined) {
             config.open = options.open;
         }
+        let port = config.port;
+        // 2. Clean dead sessions first
+        const deadCleaned = await SessionManager.cleanDeadSessions();
+        if (deadCleaned > 0) {
+            Logger.info(`Cleaned ${deadCleaned} stale session(s)`);
+        }
+        // 3. Check and cleanup previous session on same port
+        const cleanup = await SessionManager.cleanupSessionOnPort(port);
+        if (cleanup.killed) {
+            Logger.info(`Stopped previous session on port ${port}`);
+        }
+        if (cleanup.htmlRemoved) {
+            Logger.info('Removed previous preview file');
+        }
+        // 4. Check if port is available (might be used by other app)
+        if (!(await SessionManager.isPortAvailable(port))) {
+            const newPort = await SessionManager.findAvailablePort(port + 1);
+            Logger.warn(`Port ${port} is in use by another application`);
+            Logger.info(`Using port ${newPort} instead`);
+            port = newPort;
+        }
         Logger.info(`Theme: ${config.theme}`);
-        Logger.info(`Port: ${config.port}`);
-        // 2. Check pandoc installation
+        Logger.info(`Port: ${port}`);
+        // 5. Check pandoc installation
         PandocDetector.ensureInstalled();
-        // 3. Check file exists
+        // 6. Check file exists
         const absolutePath = path.resolve(filePath);
         if (!(await fs.pathExists(absolutePath))) {
             Logger.error(`File not found: ${filePath}`);
             process.exit(1);
         }
-        // 4. Prepare output HTML in source directory
+        // 7. Prepare output HTML in source directory
         const sourceDir = path.dirname(absolutePath);
         const basename = path.basename(filePath, path.extname(filePath));
         const htmlFileName = `vimd-preview-${basename}.html`;
         const htmlPath = path.join(sourceDir, htmlFileName);
-        // 5. Prepare converter
+        // 8. Prepare converter
         const converter = new MarkdownConverter({
             theme: config.theme,
             pandocOptions: config.pandoc,
             customCSS: config.css,
             template: config.template,
         });
-        // 6. Initial conversion
+        // 9. Initial conversion
         Logger.info('Converting markdown...');
         const html = await converter.convertWithTemplate(absolutePath);
         await converter.writeHTML(html, htmlPath);
         Logger.success('Conversion complete');
-        // 7. Start live server from source directory
+        // 10. Start live server from source directory
         const server = new LiveServer({
-            port: config.port,
+            port: port,
             host: config.host,
             open: config.open,
             root: sourceDir,
         });
         await server.start(htmlPath);
+        // 11. Save session
+        await SessionManager.saveSession({
+            pid: process.pid,
+            port: port,
+            htmlPath: htmlPath,
+            sourcePath: absolutePath,
+            startedAt: new Date().toISOString(),
+        });
         Logger.info(`Watching: ${filePath}`);
         Logger.info('Press Ctrl+C to stop');
-        // 8. Start file watching
+        // 12. Start file watching
         const watcher = new FileWatcher(absolutePath, config.watch);
         watcher.onChange(async (changedPath) => {
             Logger.info('File changed, reconverting...');
@@ -77,7 +107,7 @@ export async function devCommand(filePath, options) {
             }
         });
         watcher.start();
-        // 9. Register cleanup - remove generated HTML file
+        // 13. Register cleanup - remove generated HTML file and session
         ProcessManager.onExit(async () => {
             Logger.info('Shutting down...');
             await watcher.stop();
@@ -90,6 +120,8 @@ export async function devCommand(filePath, options) {
             catch {
                 // Ignore errors when removing file
             }
+            // Remove session from registry
+            await SessionManager.removeSession(port);
             Logger.info('Cleanup complete');
         });
     }

package/dist/utils/session-manager.d.ts

@@ -0,0 +1,65 @@
+export interface VimdSession {
+    pid: number;
+    port: number;
+    htmlPath: string;
+    sourcePath: string;
+    startedAt: string;
+}
+export interface VimdSessions {
+    [port: string]: VimdSession;
+}
+export interface CleanupResult {
+    killed: boolean;
+    htmlRemoved: boolean;
+    previousPort?: number;
+    previousSource?: string;
+}
+export declare class SessionManager {
+    private static readonly SESSIONS_DIR;
+    private static readonly SESSIONS_FILE;
+    /**
+     * Load all sessions from file
+     */
+    static loadSessions(): Promise<VimdSessions>;
+    /**
+     * Save sessions to file
+     */
+    static saveSessions(sessions: VimdSessions): Promise<void>;
+    /**
+     * Get session for specific port
+     */
+    static getSession(port: number): Promise<VimdSession | null>;
+    /**
+     * Save session for specific port
+     */
+    static saveSession(session: VimdSession): Promise<void>;
+    /**
+     * Remove session for specific port
+     */
+    static removeSession(port: number): Promise<void>;
+    /**
+     * Check if a process is alive
+     */
+    static isProcessAlive(pid: number): boolean;
+    /**
+     * Kill a process safely
+     */
+    static killProcess(pid: number): Promise<boolean>;
+    /**
+     * Clean up dead sessions (PIDs that no longer exist)
+     */
+    static cleanDeadSessions(): Promise<number>;
+    /**
+     * Clean up previous session on the same port
+     */
+    static cleanupSessionOnPort(port: number): Promise<CleanupResult>;
+    /**
+     * Check if a port is available
+     */
+    static isPortAvailable(port: number): Promise<boolean>;
+    /**
+     * Find an available port starting from startPort
+     */
+    static findAvailablePort(startPort: number): Promise<number>;
+}
+//# sourceMappingURL=session-manager.d.ts.map

package/dist/utils/session-manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/utils/session-manager.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;CAC7B;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAkC;IACtE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAGnC;IAEF;;OAEG;WACU,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC;IAWlD;;OAEG;WACU,YAAY,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhE;;OAEG;WACU,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAKlE;;OAEG;WACU,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAM7D;;OAEG;WACU,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMvD;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAS3C;;OAEG;WACU,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBvD;;OAEG;WACU,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IA0BjD;;OAEG;WACU,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAmCvE;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAYtD;;OAEG;WACU,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAcnE"}

package/dist/utils/session-manager.js

@@ -0,0 +1,168 @@
+// src/utils/session-manager.ts
+import fs from 'fs-extra';
+import * as path from 'path';
+import * as os from 'os';
+import * as net from 'net';
+export class SessionManager {
+    /**
+     * Load all sessions from file
+     */
+    static async loadSessions() {
+        try {
+            if (await fs.pathExists(this.SESSIONS_FILE)) {
+                return await fs.readJson(this.SESSIONS_FILE);
+            }
+        }
+        catch {
+            // Corrupted file, start fresh
+        }
+        return {};
+    }
+    /**
+     * Save sessions to file
+     */
+    static async saveSessions(sessions) {
+        await fs.ensureDir(this.SESSIONS_DIR);
+        await fs.writeJson(this.SESSIONS_FILE, sessions, { spaces: 2 });
+    }
+    /**
+     * Get session for specific port
+     */
+    static async getSession(port) {
+        const sessions = await this.loadSessions();
+        return sessions[port.toString()] || null;
+    }
+    /**
+     * Save session for specific port
+     */
+    static async saveSession(session) {
+        const sessions = await this.loadSessions();
+        sessions[session.port.toString()] = session;
+        await this.saveSessions(sessions);
+    }
+    /**
+     * Remove session for specific port
+     */
+    static async removeSession(port) {
+        const sessions = await this.loadSessions();
+        delete sessions[port.toString()];
+        await this.saveSessions(sessions);
+    }
+    /**
+     * Check if a process is alive
+     */
+    static isProcessAlive(pid) {
+        try {
+            process.kill(pid, 0);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    /**
+     * Kill a process safely
+     */
+    static async killProcess(pid) {
+        try {
+            process.kill(pid, 'SIGTERM');
+            // Wait a bit for graceful shutdown
+            await new Promise((resolve) => setTimeout(resolve, 500));
+            // Force kill if still alive
+            if (this.isProcessAlive(pid)) {
+                process.kill(pid, 'SIGKILL');
+            }
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    /**
+     * Clean up dead sessions (PIDs that no longer exist)
+     */
+    static async cleanDeadSessions() {
+        const sessions = await this.loadSessions();
+        let cleaned = 0;
+        for (const [port, session] of Object.entries(sessions)) {
+            if (!this.isProcessAlive(session.pid)) {
+                // Process is dead, clean up HTML if exists
+                try {
+                    if (await fs.pathExists(session.htmlPath)) {
+                        await fs.remove(session.htmlPath);
+                    }
+                }
+                catch {
+                    // Ignore removal errors
+                }
+                delete sessions[port];
+                cleaned++;
+            }
+        }
+        if (cleaned > 0) {
+            await this.saveSessions(sessions);
+        }
+        return cleaned;
+    }
+    /**
+     * Clean up previous session on the same port
+     */
+    static async cleanupSessionOnPort(port) {
+        const session = await this.getSession(port);
+        if (!session) {
+            return { killed: false, htmlRemoved: false };
+        }
+        const result = {
+            killed: false,
+            htmlRemoved: false,
+            previousPort: port,
+            previousSource: session.sourcePath,
+        };
+        // Kill process if alive
+        if (this.isProcessAlive(session.pid)) {
+            result.killed = await this.killProcess(session.pid);
+        }
+        // Remove HTML file
+        try {
+            if (await fs.pathExists(session.htmlPath)) {
+                await fs.remove(session.htmlPath);
+                result.htmlRemoved = true;
+            }
+        }
+        catch {
+            // Ignore removal errors
+        }
+        // Remove session from registry
+        await this.removeSession(port);
+        return result;
+    }
+    /**
+     * Check if a port is available
+     */
+    static isPortAvailable(port) {
+        return new Promise((resolve) => {
+            const server = net.createServer();
+            server.once('error', () => resolve(false));
+            server.once('listening', () => {
+                server.close();
+                resolve(true);
+            });
+            server.listen(port, '127.0.0.1');
+        });
+    }
+    /**
+     * Find an available port starting from startPort
+     */
+    static async findAvailablePort(startPort) {
+        const MAX_ATTEMPTS = 10;
+        for (let i = 0; i < MAX_ATTEMPTS; i++) {
+            const port = startPort + i;
+            if (await this.isPortAvailable(port)) {
+                return port;
+            }
+        }
+        throw new Error(`No available port found (tried ${startPort}-${startPort + MAX_ATTEMPTS - 1})`);
+    }
+}
+SessionManager.SESSIONS_DIR = path.join(os.tmpdir(), 'vimd');
+SessionManager.SESSIONS_FILE = path.join(SessionManager.SESSIONS_DIR, 'sessions.json');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vimd",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Real-time Markdown preview tool with pandoc (view markdown)",
   "type": "module",
   "keywords": [