juxscript 1.0.67 → 1.0.69

package/machinery/server.js

@@ -4,11 +4,10 @@ import path from 'path';
 import fs from 'fs';
 import { fileURLToPath } from 'url';
 import { startWatcher } from './watcher.js';
-import { verifyRuntime } from './verifier.js'; // ✅ Import Verifier
+import { verifyRuntime } from './verifier.js';
 import { WebSocketServer } from 'ws';
 
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
 
 /**
  * Try to start a server on a port, with fallback to next port if busy
@@ -17,160 +16,65 @@ const __dirname = path.dirname(__filename);
 async function tryPort(startPort, maxAttempts = 5, reservedPorts = []) {
   for (let attempt = 0; attempt < maxAttempts; attempt++) {
     const port = startPort + attempt;
-
-    // Skip if this port is already reserved
-    if (reservedPorts.includes(port)) {
-      continue;
-    }
-
+    if (reservedPorts.includes(port)) continue;
     try {
-      // Test if port is available
       await new Promise((resolve, reject) => {
         const testServer = http.createServer();
         testServer.once('error', reject);
-        testServer.once('listening', () => {
-          testServer.close();
-          resolve(port);
-        });
+        testServer.once('listening', () => { testServer.close(); resolve(port); });
         testServer.listen(port);
       });
       return port;
-    } catch (err) {
-      if (err.code === 'EADDRINUSE') {
-        if (attempt < maxAttempts - 1) {
-          console.log(`   Port ${port} in use, trying ${port + 1}...`);
-        }
-        continue;
-      }
-      throw err;
-    }
+    } catch (err) { if (err.code !== 'EADDRINUSE') throw err; }
   }
-  throw new Error(`Could not find available port after ${maxAttempts} attempts starting from ${startPort}`);
+  throw new Error(`Could not find available port`);
 }
 
-// ✅ FIX: Added config parameter to serve function signature
 async function serve(httpPort = 3000, wsPort = 3001, distDir = './.jux-dist', config = {}) {
   const app = express();
   const absoluteDistDir = path.resolve(distDir);
   const projectRoot = path.resolve('.');
 
   app.use(express.json());
+  if (!fs.existsSync(absoluteDistDir)) { process.exit(1); }
 
-  if (!fs.existsSync(absoluteDistDir)) {
-    console.error(`❌ Error: ${path.basename(distDir)}/ directory not found at ${absoluteDistDir}`);
-    console.error('   Run: npx jux build\n');
-    process.exit(1);
-  }
-
-  // Strong cache prevention
-  app.use((req, res, next) => {
-    res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0');
-    res.setHeader('Pragma', 'no-cache');
-    res.setHeader('Expires', '0');
-    res.setHeader('ETag', 'W/"' + Date.now() + '"');
-    next();
-  });
-
-  // ✅ ADD: Explicit MIME type for JavaScript files
   app.use((req, res, next) => {
-    if (req.path.endsWith('.js')) {
-      res.setHeader('Content-Type', 'application/javascript; charset=utf-8');
-    }
+    res.setHeader('Cache-Control', 'no-store');
+    if (req.path.endsWith('.js')) res.setHeader('Content-Type', 'application/javascript; charset=utf-8');
     next();
   });
-
-  // ✅ SILENCE FAVICON: Return 204 (No Content) to stop browser 404 errors
   app.get('/favicon.ico', (req, res) => res.status(204).end());
-
-  // Serve static files
   app.use(express.static(absoluteDistDir));
-
-  // ✅ FIX: Only apply SPA fallback to routes, not static files
-  app.use((req, res, next) => {
-    // Skip SPA fallback for file extensions (static assets)
-    if (/\.[a-zA-Z0-9]+$/.test(req.path)) {
-      return res.status(404).send('File not found');
-    }
-
-    // SPA fallback for routes only
-    if (req.accepts('html')) {
-      const indexPath = path.join(absoluteDistDir, 'index.html');
-      if (fs.existsSync(indexPath)) {
-        res.sendFile(indexPath);
-      } else {
-        res.status(404).send('index.html not found. Run `npx jux build` first.');
-      }
-    } else {
-      res.status(404).send('Not found');
-    }
+  app.use((req, res) => {
+    if (/\.[a-zA-Z0-9]+$/.test(req.path)) return res.status(404).send('Not found');
+    if (req.accepts('html')) res.sendFile(path.join(absoluteDistDir, 'index.html'));
+    else res.status(404).send('Not found');
   });
 
-  // Find available ports sequentially to avoid collision
-  console.log('🔍 Finding available ports...');
-
-  // First, find HTTP port
   const availableHttpPort = await tryPort(httpPort);
-
-  // Then find WS port, excluding the HTTP port we just allocated
   const availableWsPort = await tryPort(wsPort, 5, [availableHttpPort]);
-
-  // Create HTTP server
   const server = http.createServer(app);
-
-  // WebSocket server for hot reload
   const wss = new WebSocketServer({ port: availableWsPort });
   const clients = [];
 
   wss.on('connection', (ws) => {
     clients.push(ws);
-    console.log('🔌 WebSocket client connected');
-
-    ws.on('close', () => {
-      console.log('🔌 WebSocket client disconnected');
-      const index = clients.indexOf(ws);
-      if (index > -1) clients.splice(index, 1);
-    });
-
-    ws.on('error', (error) => {
-      console.error('WebSocket error:', error);
-    });
+    ws.on('close', () => { const i = clients.indexOf(ws); if (i > -1) clients.splice(i, 1); });
   });
 
-  console.log(`🔌 WebSocket server running at ws://localhost:${availableWsPort}`);
-
-  // Start HTTP server
   server.listen(availableHttpPort, async () => {
-    console.log(`🚀 JUX dev server running at http://localhost:${availableHttpPort}`);
-    console.log(`   Serving: ${absoluteDistDir}`);
-    // console.log(`   Press Ctrl+C to stop\n`); removed to group logs
-
-    // ✅ NEW: Post-Startup Runtime Verification
-    // Detects "Served HTML as JS" errors immediately
+    console.log(`🚀 Server: http://localhost:${availableHttpPort}`);
     const isHealthy = await verifyRuntime(availableHttpPort);
-    if (!isHealthy) {
-      console.error('🛑 Server failed runtime verification. Shutting down due to critical errors.');
-      process.exit(1);
-    }
+    if (!isHealthy) { console.error('🛑 Runtime Check Failed.'); process.exit(1); }
   });
 
-  // Start file watcher
   const sourceName = config?.directories?.source || 'jux';
   const juxSource = path.join(projectRoot, sourceName);
-
   if (fs.existsSync(juxSource)) {
-    console.log(`👀 Watching: ${juxSource}\n`);
-    // ✅ Pass availableWsPort so we can regenerate index.html with correct port on rebuild
     startWatcher(juxSource, absoluteDistDir, clients, config, availableWsPort);
   }
 
-  // Graceful shutdown
-  const shutdown = async () => {
-    console.log('\n\n👋 Shutting down server...');
-    wss.close();
-    server.close();
-    process.exit(0);
-  };
-
+  const shutdown = async () => { wss.close(); server.close(); process.exit(0); };
   process.on('SIGINT', shutdown);
   process.on('SIGTERM', shutdown);
 

package/machinery/watcher.js

@@ -1,11 +1,7 @@
 import fs from 'fs';
 import path from 'path';
-import {
-  copyLibToOutput,
-  bundleJuxFilesToRouter,
-  generateIndexHtml
-} from './compiler.js';
-import { verifyStaticBuild } from './verifier.js'; // ✅ Import Verifier
+import { bundleJuxFilesToRouter, generateIndexHtml } from './compiler.js';
+import { verifyStaticBuild } from './verifier.js';
 
 let isRebuilding = false;
 let rebuildQueued = false;
@@ -15,22 +11,14 @@ let rebuildQueued = false;
  */
 function findJuxFiles(dir, fileList = []) {
   if (!fs.existsSync(dir)) return fileList;
-
-  const files = fs.readdirSync(dir);
-
-  files.forEach(file => {
+  fs.readdirSync(dir).forEach(file => {
     const filePath = path.join(dir, file);
-    const stat = fs.statSync(filePath);
-
-    if (stat.isDirectory()) {
-      if (file !== 'node_modules' && file !== 'jux-dist' && file !== '.git' && file !== 'server') {
-        findJuxFiles(filePath, fileList);
-      }
+    if (fs.statSync(filePath).isDirectory()) {
+      if (!['node_modules', 'jux-dist', '.git', 'server'].includes(file)) findJuxFiles(filePath, fileList);
     } else if (file.endsWith('.jux')) {
       fileList.push(filePath);
     }
   });
-
   return fileList;
 }
 
@@ -38,41 +26,13 @@ function findJuxFiles(dir, fileList = []) {
  * Full rebuild of the entire bundle
  */
 async function fullRebuild(juxSource, distDir, config, wsPort) {
-  const startTime = performance.now(); // ✅ Start timing
-  console.log('\n🔄 Rebuilding bundle...');
-
   try {
-    // Find all .jux files
-    const projectJuxFiles = findJuxFiles(juxSource);
-    console.log(`   Found ${projectJuxFiles.length} .jux file(s)`);
-    // ✅ Time the bundling step
-    const bundleStartTime = performance.now();
-    // Bundle all files
-
-    // ✅ Return bundleResult with vendor info
-    const bundleResult = await bundleJuxFilesToRouter(juxSource, distDir, {
-      routePrefix: '',
-      config
-    });
-
-    const bundleTime = performance.now() - bundleStartTime;
-    // ✅ Generate unified index.html (INJECT HOT RELOAD SCRIPT)
-    generateIndexHtml(distDir, bundleResult, {
-      isDev: true,
-      wsPort: wsPort || 3001
-    });
-
-    // ✅ NEW: Verify Rebuild Artifacts
-    if (!verifyStaticBuild(distDir)) {
-      console.error('⚠️  Rebuild failed validation! Skipped client reload to preserve state.');
-      return false; // Return false prevents WebSocket reload message
-    }
-
+    const bundleResult = await bundleJuxFilesToRouter(juxSource, distDir, { routePrefix: '', config });
+    generateIndexHtml(distDir, bundleResult, { isDev: true, wsPort: wsPort || 3001 });
+    if (!verifyStaticBuild(distDir)) return false;
     return true;
-
   } catch (err) {
-    const failTime = performance.now() - startTime;
-    console.error(`❌ Rebuild failed after ${failTime.toFixed(0)}ms:`, err.message);
+    console.error(`❌ Rebuild failed:`, err.message);
     return false;
   }
 }
@@ -81,80 +41,30 @@ async function fullRebuild(juxSource, distDir, config, wsPort) {
  * Start watching for file changes and rebuild on change
  */
 export function startWatcher(juxSource, distDir, wsClients, config, wsPort) {
-  console.log(`👀 Watching: ${juxSource}`);
+  console.log(`👀 Watching for changes...`);
 
   const watcher = fs.watch(juxSource, { recursive: true }, async (eventType, filename) => {
-
-    // Debounce: If already rebuilding, queue another rebuild
-    if (isRebuilding) {
-      rebuildQueued = true;
-      return;
-    }
-
+    if (isRebuilding) { rebuildQueued = true; return; }
     isRebuilding = true;
-    console.log(`\n📝 File changed: ${filename}`);
 
-    // Rebuild the entire bundle (PASS PORT)
+    process.stdout.write(`\n📝 Change: ${filename} -> Rebuilding...`);
     const success = await fullRebuild(juxSource, distDir, config, wsPort);
-
     isRebuilding = false;
 
-    // Notify all WebSocket clients to reload
     if (success && wsClients && wsClients.length > 0) {
-      console.log(`🔌 Notifying ${wsClients.length} client(s) to reload`);
-
-      // ✅ Add small delay to ensure file is fully written
+      console.log(' ✅ Reloaded.');
       setTimeout(() => {
-        wsClients.forEach(client => {
-          if (client.readyState === 1) { // OPEN
-            client.send(JSON.stringify({ type: 'reload' }));
-          }
-        });
+        wsClients.forEach(client => { if (client.readyState === 1) client.send(JSON.stringify({ type: 'reload' })); });
       }, 100);
+    } else if (!success) {
+      console.log(' ❌ Failed.');
     }
 
-    // Process queued rebuild if needed
     if (rebuildQueued) {
       rebuildQueued = false;
-      console.log('🔄 Processing queued rebuild...');
       setTimeout(() => watcher.emit('change', 'change', filename), 500);
     }
   });
 
   return watcher;
-}
-
-async function rebuildOnChange(filePath) {
-  const rebuildStart = performance.now();
-  console.log(`\n📝 File changed: ${path.relative(projectRoot, filePath)}\n`);
-  console.log('🔄 Rebuilding bundle...');
-
-  try {
-    // ✅ FIX: Capture bundleResult from bundleJuxFilesToRouter
-    const bundleResult = await bundleJuxFilesToRouter(projectRoot, distDir, {
-      routePrefix: ''
-    });
-
-    // ✅ FIX: Pass bundleResult to generateIndexHtml
-    generateIndexHtml(distDir, bundleResult);
-
-    const rebuildTime = performance.now() - rebuildStart;
-
-    console.log(`\n⏱️  Rebuild Performance:`);
-    console.log(`   Bundle generation: ${rebuildTime.toFixed(0)}ms`);
-    console.log(`   Route/index.html:  ${(performance.now() - rebuildStart - rebuildTime).toFixed(0)}ms`);
-    console.log(`   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━`);
-    console.log(`   Total rebuild:     ${(performance.now() - rebuildStart).toFixed(0)}ms`);
-
-    if (rebuildTime < 100) {
-      console.log(`   ✅ Lightning fast! ⚡`);
-    }
-
-    // ✅ FIX: Notify clients with bundleResult
-    notifyClients({ type: 'reload', bundleResult });
-
-  } catch (error) {
-    console.error('❌ Rebuild failed:', error.message);
-    notifyClients({ type: 'error', message: error.message });
-  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "juxscript",
-  "version": "1.0.67",
+  "version": "1.0.69",
   "type": "module",
   "description": "A JavaScript UX authorship platform",
   "main": "lib/jux.js",