mjpic 1.0.3 → 1.0.4

package/api/cli.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
 import express from 'express';
+import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import open from 'open';
@@ -11,21 +12,15 @@ const __dirname = path.dirname(__filename);
 
 const program = new Command();
 
-program
-  .name('mjpic')
-  .description('敏捷图片 - 轻量级图片处理工具')
-  .version('1.0.2')
-  .option('-p, --port <number>', 'server port', '3000')
-  .option('--host <string>', 'server host', 'localhost')
-  .argument('[file]', 'image file to open')
-  .action(async (file, options) => {
-    const port = parseInt(options.port, 10);
-    const host = options.host;
-
-    if (file) {
-      const absPath = path.resolve(file);
+const startServer = async (options: { port: string; host: string }, file?: string) => {
+  const port = parseInt(options.port, 10);
+  const host = options.host;
+
+  if (file) {
+    const absPath = path.resolve(file);
+    if (fs.existsSync(absPath)) {
       console.log(`Opening file: ${absPath}`);
-      
+
       app.get('/api/current-image', (req, res) => {
         res.json({ path: absPath });
       });
@@ -33,29 +28,61 @@ program
       app.get('/api/image-content', (req, res) => {
         res.sendFile(absPath);
       });
+    } else {
+      console.warn(`File not found: ${absPath}`);
     }
+  }
 
-    // Serve static files
-    // In production (dist), client is in ../client
-    const clientPath = path.join(__dirname, '../client');
-    
-    app.use(express.static(clientPath));
+  const clientPath = path.join(__dirname, '../client');
+  app.use(express.static(clientPath));
 
-    // API 404 handler - Ensure API requests don't fall through to index.html
-    app.use('/api/*', (req, res) => {
-      res.status(404).json({ success: false, error: 'API not found' });
-    });
+  app.use('/api/*', (req, res) => {
+    res.status(404).json({ success: false, error: 'API not found' });
+  });
 
-    // SPA fallback
-    app.get('*', (req, res) => {
-      res.sendFile(path.join(clientPath, 'index.html'));
-    });
+  app.get('*', (req, res) => {
+    res.sendFile(path.join(clientPath, 'index.html'));
+  });
 
-    app.listen(port, host, () => {
-      const url = `http://${host}:${port}`;
-      console.log(`敏捷图片 is running at ${url}`);
-      open(url);
-    });
+  app.listen(port, host, () => {
+    const url = `http://${host}:${port}`;
+    console.log(`敏捷图片 is running at ${url}`);
+    open(url);
   });
+};
+
+program
+  .name('mjpic')
+  .description('敏捷图片 - 轻量级图片处理工具')
+  .version('1.0.4');
+
+const attachServeOptions = (cmd: Command) => {
+  cmd
+    .option('-p, --port <number>', 'server port', '3000')
+    .option('--host <string>', 'server host', 'localhost')
+    .argument('[file]', 'image file to open')
+    .action(async (file, options) => {
+      const opts = (options as any)?.opts?.() || options || {};
+      await startServer(opts, file);
+    });
+};
+
+attachServeOptions(
+  program
+    .command('start', { isDefault: true })
+    .description('Start mjpic server'),
+);
+
+attachServeOptions(
+  program
+    .command('dev')
+    .description('Start mjpic server (alias)'),
+);
+
+attachServeOptions(
+  program
+    .command('build')
+    .description('Start mjpic server (alias)'),
+);
 
 program.parse();

package/dist/cli/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
 import express from 'express';
+import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import open from 'open';
@@ -8,35 +9,29 @@ import app from './app.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const program = new Command();
-program
-    .name('mjpic')
-    .description('敏捷图片 - 轻量级图片处理工具')
-    .version('1.0.2')
-    .option('-p, --port <number>', 'server port', '3000')
-    .option('--host <string>', 'server host', 'localhost')
-    .argument('[file]', 'image file to open')
-    .action(async (file, options) => {
+const startServer = async (options, file) => {
     const port = parseInt(options.port, 10);
     const host = options.host;
     if (file) {
         const absPath = path.resolve(file);
-        console.log(`Opening file: ${absPath}`);
-        app.get('/api/current-image', (req, res) => {
-            res.json({ path: absPath });
-        });
-        app.get('/api/image-content', (req, res) => {
-            res.sendFile(absPath);
-        });
+        if (fs.existsSync(absPath)) {
+            console.log(`Opening file: ${absPath}`);
+            app.get('/api/current-image', (req, res) => {
+                res.json({ path: absPath });
+            });
+            app.get('/api/image-content', (req, res) => {
+                res.sendFile(absPath);
+            });
+        }
+        else {
+            console.warn(`File not found: ${absPath}`);
+        }
     }
-    // Serve static files
-    // In production (dist), client is in ../client
     const clientPath = path.join(__dirname, '../client');
     app.use(express.static(clientPath));
-    // API 404 handler - Ensure API requests don't fall through to index.html
     app.use('/api/*', (req, res) => {
         res.status(404).json({ success: false, error: 'API not found' });
     });
-    // SPA fallback
     app.get('*', (req, res) => {
         res.sendFile(path.join(clientPath, 'index.html'));
     });
@@ -45,5 +40,28 @@ program
         console.log(`敏捷图片 is running at ${url}`);
         open(url);
     });
-});
+};
+program
+    .name('mjpic')
+    .description('敏捷图片 - 轻量级图片处理工具')
+    .version('1.0.4');
+const attachServeOptions = (cmd) => {
+    cmd
+        .option('-p, --port <number>', 'server port', '3000')
+        .option('--host <string>', 'server host', 'localhost')
+        .argument('[file]', 'image file to open')
+        .action(async (file, options) => {
+        const opts = options?.opts?.() || options || {};
+        await startServer(opts, file);
+    });
+};
+attachServeOptions(program
+    .command('start', { isDefault: true })
+    .description('Start mjpic server'));
+attachServeOptions(program
+    .command('dev')
+    .description('Start mjpic server (alias)'));
+attachServeOptions(program
+    .command('build')
+    .description('Start mjpic server (alias)'));
 program.parse();