vimd 0.3.0 → 0.3.3

package/README.md

@@ -65,10 +65,10 @@
 ### インストール
 
 ```bash
-npm install -g vimd
+npm install -g vimd@0.2.4
 ```
 
-**現在の安定版: v0.3.0**
+**現在の安定版: v0.2.4**
 
 v0.2.0 からは **pandoc なしで利用可能** になりました。
 高品質な出力が必要な場合のみ pandoc をインストールしてください。
@@ -103,14 +103,18 @@ vimd config
 
 ## バージョン情報
 
-**安定版: v0.3.0**（最新版と同一）
+**安定版: v0.2.4**
 
-v0.3.0 では内部アーキテクチャを刷新し、パフォーマンスを改善しました:
-- WebSocket 直接通信によるライブリロード（live-server 依存を削除）
-- バンドルサイズ 83% 削減
+v0.3.x は内部アーキテクチャを刷新した実験的バージョンです。
+安定した動作を求める場合は v0.2.4 をご利用ください。
 
 安定版のインストール:
 ```bash
+npm install -g vimd@0.2.4
+```
+
+最新版（実験的）のインストール:
+```bash
 npm install -g vimd@latest
 ```
 

package/dist/core/websocket-server.d.ts

@@ -37,6 +37,7 @@ export declare class WebSocketServer {
     start(): Promise<ServerStartResult>;
     /**
      * Stop the server
+     * Uses force termination to ensure immediate shutdown
      */
     stop(): Promise<void>;
     /**

package/dist/core/websocket-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-server.d.ts","sourceRoot":"","sources":["../../src/core/websocket-server.ts"],"names":[],"mappings":"AAQA;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;CACtB;AA0CD;;;GAGG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,UAAU,CAA4B;IAC9C,OAAO,CAAC,QAAQ,CAAyB;IACzC,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,OAAO,CAAyB;IACxC,OAAO,CAAC,KAAK,CAAS;gBAEV,OAAO,EAAE,sBAAsB;IAQ3C;;OAEG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAwGzC;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B3B;;OAEG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI;IAU7C;;OAEG;IACH,OAAO,CAAC,kBAAkB;CAc3B"}
+{"version":3,"file":"websocket-server.d.ts","sourceRoot":"","sources":["../../src/core/websocket-server.ts"],"names":[],"mappings":"AAUA;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;CACtB;AA0CD;;;GAGG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,UAAU,CAA4B;IAC9C,OAAO,CAAC,QAAQ,CAAyB;IACzC,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,OAAO,CAAyB;IACxC,OAAO,CAAC,KAAK,CAAS;gBAEV,OAAO,EAAE,sBAAsB;IAQ3C;;OAEG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,iBAAiB,CAAC;IA4GzC;;;OAGG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAiC3B;;OAEG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI;IAU7C;;OAEG;IACH,OAAO,CAAC,kBAAkB;CAc3B"}

package/dist/core/websocket-server.js

@@ -1,5 +1,7 @@
 // src/core/websocket-server.ts
 import http from 'http';
+import fs from 'fs';
+import path from 'path';
 import polka from 'polka';
 import sirv from 'sirv';
 import { WebSocketServer as WSServer, WebSocket } from 'ws';
@@ -84,31 +86,38 @@ export class WebSocketServer {
         // Create polka app with HTML injection middleware
         const app = polka();
         // Middleware to inject reload script into HTML
+        // For HTML files, read directly to avoid sirv streaming issues
         app.use((req, res, next) => {
             // Only process GET requests for HTML files
             if (req.method !== 'GET' || !req.url?.endsWith('.html')) {
                 return serve(req, res, next);
             }
-            // For HTML files, we need to inject the script
-            // Override res.end to modify the response
-            const originalEnd = res.end.bind(res);
-            let body = '';
-            res.write = (chunk) => {
-                body += chunk.toString();
-                return true;
-            };
-            res.end = ((chunk) => {
-                if (chunk) {
-                    body += chunk.toString();
-                }
-                // Inject reload script before </body> or </html>
-                const injectedBody = this.injectReloadScript(body);
-                // Update Content-Length header
-                const contentLength = Buffer.byteLength(injectedBody, 'utf8');
-                res.setHeader('Content-Length', contentLength);
-                return originalEnd(injectedBody);
-            });
-            serve(req, res, next);
+            // Parse the URL and resolve the file path
+            const urlPath = req.url || '/index.html';
+            const filePath = path.join(this.options.root, urlPath);
+            // Check if file exists
+            if (!fs.existsSync(filePath)) {
+                // Let sirv handle 404
+                return serve(req, res, next);
+            }
+            try {
+                // Read HTML file directly
+                const html = fs.readFileSync(filePath, 'utf8');
+                // Inject reload script
+                const injectedHtml = this.injectReloadScript(html);
+                // Send response with proper headers
+                res.writeHead(200, {
+                    'Content-Type': 'text/html; charset=utf-8',
+                    'Content-Length': Buffer.byteLength(injectedHtml, 'utf8'),
+                    'Cache-Control': 'no-cache, no-store, must-revalidate',
+                });
+                res.end(injectedHtml);
+            }
+            catch (error) {
+                // On error, fall back to sirv
+                Logger.warn(`Failed to read HTML file: ${filePath}`);
+                serve(req, res, next);
+            }
         });
         // Create HTTP server
         this.httpServer = http.createServer(app.handler);
@@ -151,27 +160,31 @@ export class WebSocketServer {
     }
     /**
      * Stop the server
+     * Uses force termination to ensure immediate shutdown
      */
     async stop() {
-        // Close all WebSocket connections
+        // Force terminate all WebSocket clients (immediate disconnect)
+        // Use terminate() instead of close() to avoid waiting for graceful handshake
         for (const client of this.clients) {
             try {
-                client.close();
+                client.terminate();
             }
             catch {
-                // Ignore close errors
+                // Ignore termination errors
             }
         }
         this.clients.clear();
-        // Close WebSocket server
+        // Close WebSocket server (should be instant now that clients are terminated)
         if (this.wsServer) {
             await new Promise((resolve) => {
                 this.wsServer.close(() => resolve());
             });
             this.wsServer = null;
         }
-        // Close HTTP server
+        // Force close all HTTP connections before closing server
+        // closeAllConnections() requires Node.js >= 18.2.0
         if (this.httpServer) {
+            this.httpServer.closeAllConnections();
             await new Promise((resolve) => {
                 this.httpServer.close(() => resolve());
             });

package/package.json

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

package/dist/core/server.d.ts

@@ -1,18 +0,0 @@
-import { ServerConfig } from '../config/types.js';
-export interface ServerStartResult {
-    actualPort: number;
-    requestedPort: number;
-    portChanged: boolean;
-}
-export declare class LiveServer {
-    private config;
-    private running;
-    private actualPort;
-    constructor(config: ServerConfig);
-    start(htmlPath: string): Promise<ServerStartResult>;
-    stop(): Promise<void>;
-    openBrowser(url: string): Promise<void>;
-    getURL(): string;
-    getActualPort(): number;
-}
-//# sourceMappingURL=server.d.ts.map

package/dist/core/server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/core/server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAMlD,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,qBAAa,UAAU;IAIT,OAAO,CAAC,MAAM;IAH1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,UAAU,CAAS;gBAEP,MAAM,EAAE,YAAY;IAIlC,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA8DnD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAUrB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7C,MAAM,IAAI,MAAM;IAIhB,aAAa,IAAI,MAAM;CAGxB"}

package/dist/core/server.js

@@ -1,87 +0,0 @@
-// src/core/server.ts
-import liveServer from 'live-server';
-import { Logger } from '../utils/logger.js';
-import * as path from 'path';
-import open from 'open';
-export class LiveServer {
-    constructor(config) {
-        this.config = config;
-        this.running = false;
-        this.actualPort = config.port;
-    }
-    async start(htmlPath) {
-        const root = path.dirname(htmlPath);
-        const file = path.basename(htmlPath);
-        const params = {
-            port: this.config.port,
-            host: this.config.host,
-            root: root,
-            file: file,
-            open: false, // manually open
-            wait: 50,
-            logLevel: 0, // silent
-            watch: [root], // explicitly watch the root directory
-        };
-        try {
-            const server = liveServer.start(params);
-            // Wait for server to start and get actual port
-            const actualPort = await new Promise((resolve, reject) => {
-                const timeout = setTimeout(() => {
-                    reject(new Error('Server start timeout'));
-                }, 10000);
-                server.addListener('listening', () => {
-                    clearTimeout(timeout);
-                    const address = server.address();
-                    resolve(address.port);
-                });
-                server.addListener('error', (err) => {
-                    clearTimeout(timeout);
-                    reject(err);
-                });
-            });
-            this.actualPort = actualPort;
-            this.running = true;
-            const portChanged = actualPort !== this.config.port;
-            const url = `http://${this.config.host}:${actualPort}`;
-            if (portChanged) {
-                Logger.warn(`Port ${this.config.port} was unavailable, using port ${actualPort}`);
-            }
-            Logger.success(`Server started at ${url}`);
-            if (this.config.open) {
-                await this.openBrowser(url);
-            }
-            return {
-                actualPort,
-                requestedPort: this.config.port,
-                portChanged,
-            };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            throw new Error(`Failed to start server: ${errorMessage}`);
-        }
-    }
-    async stop() {
-        if (!this.running) {
-            return;
-        }
-        liveServer.shutdown();
-        this.running = false;
-        Logger.info('Server stopped');
-    }
-    async openBrowser(url) {
-        try {
-            await open(url);
-            Logger.info('Browser opened');
-        }
-        catch (error) {
-            Logger.warn('Failed to open browser automatically');
-        }
-    }
-    getURL() {
-        return `http://${this.config.host}:${this.actualPort}`;
-    }
-    getActualPort() {
-        return this.actualPort;
-    }
-}