create-yeow 0.2.20 → 0.2.22

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-yeow",
-    "version": "0.2.20",
+    "version": "0.2.22",
     "description": "Scaffold a Yeow plugin project",
     "type": "module",
     "bin": {

package/templates/default/.yeow/build.js

@@ -12,40 +12,80 @@ const entry = existsSync(resolve(root, 'src', 'index.ts')) ? 'src/index.ts' : 's
 const outDir = resolve(root, 'dist', '.yeow');
 mkdirSync(outDir, { recursive: true });
 
-esbuild.build({
-    entryPoints: [resolve(root, entry)],
-    outfile: resolve(outDir, 'main.js'),
-    bundle: true,
-    format: 'iife',
-    target: 'es2023',
-    platform: 'neutral',
-    mainFields: ['module', 'main'],
-    conditions: ['import', 'browser'],
-    treeShaking: true,
-    minify: false,
-}).then(() => {
-    const size = statSync(resolve(outDir, 'main.js')).size;
-    console.log(`  ✓ Bundled (${(size / 1024).toFixed(1)} KB)`);
-
-    const tmplJar = resolve(root, '.yeow', 'assets', 'yeow-template-0.1.0.jar');
-    const zip = new AdmZip(tmplJar);
-    zip.updateFile('plugin.yml', Buffer.from(`name: ${name}\nversion: ${version}\nmain: yeow.template.Bootstrap\napi-version: '1.21'\ndepend:\n  - Yeow-Runtime\n`));
-    zip.addFile('.yeow/main.js', readFileSync(resolve(outDir, 'main.js')));
-    zip.addFile('yeow.json', Buffer.from(JSON.stringify(cfg)));
-
-    // Include assets/ directory
-    const assetsDir = resolve(root, 'assets');
-    if (existsSync(assetsDir)) {
-        for (const f of readdirSync(assetsDir, { recursive: true })) {
-            const fp = resolve(assetsDir, f);
-            if (statSync(fp).isFile()) {
-                zip.addFile('assets/' + f, readFileSync(fp));
+const isDev = process.env.YEOW_DEV === 'true';
+
+if (isDev) {
+    // Dev mode: bundle code into .yeow/main.js, write dev.json with paths
+    esbuild.build({
+        entryPoints: [resolve(root, entry)],
+        outfile: resolve(outDir, 'main.js'),
+        bundle: true,
+        format: 'iife',
+        target: 'es2023',
+        platform: 'neutral',
+        mainFields: ['module', 'main'],
+        conditions: ['import', 'browser'],
+        treeShaking: true,
+        minify: false,
+        sourcemap: 'linked',
+    }).then(() => {
+        const size = statSync(resolve(outDir, 'main.js')).size;
+        console.log(`  ✓ Bundled (${(size / 1024).toFixed(1)} KB)`);
+
+        const devInfo = {
+            name,
+            codeFile: resolve(outDir, 'main.js').replace(/\\/g, '/'),
+            assetsDir: existsSync(resolve(root, 'assets')) ? resolve(root, 'assets').replace(/\\/g, '/') : null,
+        };
+        writeFileSync(resolve(outDir, 'dev.json'), JSON.stringify(devInfo, null, 2));
+        console.log(`  ✓ Dev info written`);
+
+        const apiVer = cfg.api || '1.18';
+        const tmplJar = resolve(root, '.yeow', 'assets', 'yeow-template-0.1.0.jar');
+        const zip = new AdmZip(tmplJar);
+        zip.updateFile('plugin.yml', Buffer.from(`name: ${name}\nversion: ${version}\nmain: yeow.template.Bootstrap\napi-version: '${apiVer}'\ndepend:\n  - Yeow-Runtime\n`));
+        zip.addFile('.yeow/dev.json', readFileSync(resolve(outDir, 'dev.json')));
+        zip.addFile('yeow.json', Buffer.from(JSON.stringify(cfg)));
+        const outJar = resolve(root, 'dist', `${name}-${version}.jar`);
+        zip.writeZip(outJar);
+        console.log(`  ✓ Dev JAR packaged ${outJar}\n`);
+    }).catch(e => { console.error(e); process.exit(1); }); else {
+    // Production mode: bundle code into JAR
+    esbuild.build({
+        entryPoints: [resolve(root, entry)],
+        outfile: resolve(outDir, 'main.js'),
+        bundle: true,
+        format: 'iife',
+        target: 'es2023',
+        platform: 'neutral',
+        mainFields: ['module', 'main'],
+        conditions: ['import', 'browser'],
+        treeShaking: true,
+        minify: false,
+    }).then(() => {
+        const size = statSync(resolve(outDir, 'main.js')).size;
+        console.log(`  ✓ Bundled (${(size / 1024).toFixed(1)} KB)`);
+
+        const apiVer = cfg.api || '1.18';
+        const tmplJar = resolve(root, '.yeow', 'assets', 'yeow-template-0.1.0.jar');
+        const zip = new AdmZip(tmplJar);
+        zip.updateFile('plugin.yml', Buffer.from(`name: ${name}\nversion: ${version}\nmain: yeow.template.Bootstrap\napi-version: '${apiVer}'\ndepend:\n  - Yeow-Runtime\n`));
+        zip.addFile('.yeow/main.js', readFileSync(resolve(outDir, 'main.js')));
+        zip.addFile('yeow.json', Buffer.from(JSON.stringify(cfg)));
+
+        const assetsDir = resolve(root, 'assets');
+        if (existsSync(assetsDir)) {
+            for (const f of readdirSync(assetsDir, { recursive: true })) {
+                const fp = resolve(assetsDir, f);
+                if (statSync(fp).isFile()) {
+                    zip.addFile('assets/' + f, readFileSync(fp));
+                }
             }
+            console.log('  ✓ Assets included');
         }
-        console.log('  ✓ Assets included');
-    }
 
-    const outJar = resolve(root, 'dist', `${name}-${version}.jar`);
-    zip.writeZip(outJar);
-    console.log(`  ✓ Packaged ${outJar}\n`);
-}).catch(e => { console.error(e); process.exit(1); });
+        const outJar = resolve(root, 'dist', `${name}-${version}.jar`);
+        zip.writeZip(outJar);
+        console.log(`  ✓ Packaged ${outJar}\n`);
+    }).catch(e => { console.error(e); process.exit(1); });
+}

package/templates/default/.yeow/dev-server.js

@@ -1,8 +1,11 @@
-import { existsSync, mkdirSync, copyFileSync, writeFileSync, readFileSync, createWriteStream, statSync, watch } from 'fs';
-import { resolve, dirname, join, basename } from 'path';
+import { existsSync, mkdirSync, copyFileSync, writeFileSync, readFileSync, createWriteStream, statSync, watch, readdirSync } from 'fs';
+import { resolve, dirname } from 'path';
 import { spawn, execSync } from 'child_process';
 import { fileURLToPath } from 'url';
 import https from 'https';
+import { createServer } from 'http';
+import { WebSocketServer } from 'ws';
+import { SourceMapConsumer } from 'source-map';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const ROOT = resolve(__dirname, '..');
@@ -14,6 +17,7 @@ const BUILD = '232';
 const JAR = `paper-${PAPER}-${BUILD}.jar`;
 const URL = `https://fill-data.papermc.io/v1/objects/5ee4f542f628a14c644410b08c94ea42e772ef4d29fe92973636b6813d4eaffc/paper-1.21.4-232.jar`;
 const CACHEJAR = resolve(CACHE, JAR);
+const WS_PORT = 17368;
 
 const YES = process.argv.includes('-y') || process.env.CI === 'true';
 const PROXY = process.argv.find(a => a.startsWith('--proxy='))?.split('=').slice(1).join('=');
@@ -30,7 +34,38 @@ const info = msg => log(`${c.info} ${msg}`, c.C);
 const warn = msg => log(`${c.warn} ${msg}`, c.y);
 
 let proc = null;
+let wss = null;
 
+// ── WebSocket Server ────────────────────────────────────────────
+function startWebSocket() {
+    const server = createServer();
+    wss = new WebSocketServer({ server });
+    wss.on('connection', (ws) => {
+        info('Java runtime connected');
+        ws.on('message', async (data) => {
+            try {
+                const msg = JSON.parse(data.toString());
+                if (msg.type === 'js-error') {
+                    await printFormattedError(msg);
+                }
+            } catch (e) { /* ignore parse errors */ }
+        });
+        ws.on('close', () => info('Java runtime disconnected'));
+    });
+    server.listen(WS_PORT, () => {
+        info(`WebSocket server on port ${WS_PORT}`);
+    });
+}
+
+function broadcast(msg) {
+    if (!wss) return;
+    const data = JSON.stringify(msg);
+    wss.clients.forEach((ws) => {
+        if (ws.readyState === 1) ws.send(data);
+    });
+}
+
+// ── Download ────────────────────────────────────────────────────
 function download(url, dest, agent) {
     return new Promise((resolve, reject) => {
         const f = createWriteStream(dest);
@@ -59,7 +94,7 @@ async function ensurePaper() {
 
 function buildPlugin() {
     info('Building plugin...');
-    try { execSync('node .yeow/build.js', { cwd: ROOT, stdio: 'inherit' }); ok('Plugin built'); }
+    try { execSync('node .yeow/build.js', { cwd: ROOT, stdio: 'inherit', env: { ...process.env, YEOW_DEV: 'true' } }); ok('Plugin built'); }
     catch (e) { fail('Build failed: ' + e.message); process.exit(1); }
 }
 
@@ -96,39 +131,131 @@ function serverProps(port) {
     writeFileSync(f, out);
 }
 
+// ── Hot Reload via WebSocket ────────────────────────────────────
 function startHotReload() {
     const srcDir = resolve(ROOT, 'src');
+    const assetsDir = resolve(ROOT, 'assets');
     if (!existsSync(srcDir)) return;
-    const devDir = resolve(SERVER, 'plugins', 'Yeow-Dev', cfg.name);
-    mkdirSync(devDir, { recursive: true });
+
     let timer = null;
     let building = false;
     const ext = existsSync(resolve(srcDir, 'index.ts')) ? 'ts' : 'js';
-    watch(srcDir, { recursive: true }, (event, file) => {
-        if (!file || !file.endsWith('.' + ext) || building) return;
+
+    const rebuildAndNotify = () => {
         if (timer) clearTimeout(timer);
         timer = setTimeout(() => {
+            if (building) return;
             building = true;
             info('Source changed, rebuilding...');
             try {
-                execSync('node .yeow/build.js', { cwd: ROOT, stdio: 'pipe' });
+                execSync('node .yeow/build.js', { cwd: ROOT, stdio: 'pipe', env: { ...process.env, YEOW_DEV: 'true' } });
                 const compiled = resolve(ROOT, 'dist', '.yeow', 'main.js');
                 if (existsSync(compiled)) {
-                    copyFileSync(compiled, resolve(devDir, 'main.js'));
-                    ok('Hot reload updated');
+                    broadcast({
+                        type: 'hot-reload',
+                        plugin: cfg.name,
+                        codeFile: compiled.replace(/\\/g, '/'),
+                        assetsDir: existsSync(assetsDir) ? assetsDir.replace(/\\/g, '/') : null,
+                    });
+                    ok('Hot reload sent via WebSocket');
                 }
-            } catch (e) { fail('Build failed: ' + e.message); }
+            } catch (e) {
+                fail('Build failed: ' + e.message);
+                broadcast({ type: 'build-error', plugin: cfg.name, error: e.message });
+            }
             building = false;
-        }, 1000);
+        }, 300);
+    };
+
+    // Watch src/ for changes
+    watch(srcDir, { recursive: true }, (event, file) => {
+        if (!file || !file.endsWith('.' + ext)) return;
+        rebuildAndNotify();
     });
-    info(`Watching src/ for changes (hot reload)`);
+
+    // Watch assets/ for changes
+    if (existsSync(assetsDir)) {
+        watch(assetsDir, { recursive: true }, (event, file) => {
+            rebuildAndNotify();
+        });
+    }
+
+    info(`Watching src/ + assets/ for changes (WebSocket hot reload)`);
+}
+
+// ── Source-Mapped Error Display ─────────────────────────────────
+let _consumer = null;
+async function getSourceMapConsumer() {
+    if (_consumer) return _consumer;
+    const mapFile = resolve(ROOT, 'dist', '.yeow', 'main.js.map');
+    if (!existsSync(mapFile)) return null;
+    try {
+        const raw = JSON.parse(readFileSync(mapFile, 'utf-8'));
+        _consumer = await new SourceMapConsumer(raw);
+        return _consumer;
+    } catch { return null; }
+}
+
+async function printFormattedError(err) {
+    const c = { r: '\x1b[0m', R: '\x1b[31m', Y: '\x1b[33m', C: '\x1b[36m', B: '\x1b[1m', D: '\x1b[2m' };
+    console.log(`\n${c.R}${c.B}  ⛔ JS Error [${err.plugin}]${c.r}`);
+    console.log(`  ${c.Y}${err.message}${c.r}`);
+    console.log(`  ${c.D}at ${err.fileName}:${err.lineNumber}:${err.columnNumber}${c.r}`);
+
+    // Try source-map resolution
+    if (err.fileName === 'main.js' || err.stack) {
+        const consumer = await getSourceMapConsumer();
+        if (consumer) {
+            if (err.lineNumber > 0) {
+                const orig = consumer.originalPositionFor({ line: err.lineNumber, column: err.columnNumber || 0 });
+                if (orig.source && orig.line) {
+                    console.log(`  ${c.C}→ ${orig.source}:${orig.line}:${orig.column}${c.r}`);
+                    // Print source context
+                    const sources = consumer.sources;
+                    const idx = sources.indexOf(orig.source);
+                    if (idx >= 0) {
+                        const content = consumer.sourceContentFor(orig.source);
+                        if (content) {
+                            const lines = content.split('\n');
+                            const start = Math.max(0, orig.line - 3);
+                            const end = Math.min(lines.length, orig.line + 2);
+                            for (let i = start; i < end; i++) {
+                                const prefix = i === orig.line - 1 ? c.R + '  →' : '   ';
+                                console.log(`  ${prefix} ${c.D}${String(i + 1).padStart(4)}|${c.r} ${lines[i]}`);
+                            }
+                        }
+                    }
+                }
+            }
+            // Also resolve stack trace lines if present
+            if (err.stack) {
+                const stackLines = err.stack.split('\n');
+                for (let i = 0; i < Math.min(stackLines.length, 8); i++) {
+                    const line = stackLines[i].trim();
+                    const m = line.match(/at\s+(?:\S+\s+)?\(?(?:\/main\.js|[^:]+):(\d+):(\d+)\)?/);
+                    if (m) {
+                        const orig = consumer.originalPositionFor({ line: parseInt(m[1]), column: parseInt(m[2]) });
+                        if (orig.source) {
+                            const mapped = `    at ${orig.source}:${orig.line}:${orig.column}`;
+                            console.log(`  ${c.D}${mapped}${c.r}`);
+                            continue;
+                        }
+                    }
+                    console.log(`  ${c.D}  ${line}${c.r}`);
+                }
+            }
+        } else if (err.stack) {
+            err.stack.split('\n').slice(0, 5).forEach(l => console.log(`  ${c.D}  ${l.trim()}${c.r}`));
+        }
+    }
+    console.log();
 }
 
 function startServer() {
-    const jvmArgs = ['-Xmx4G', '-Xms4G', '-Dyeow.dev=true'];
+    const jvmArgs = ['-Xmx4G', '-Xms4G', '-Dyeow.dev=true', '-Dyeow.ws.port=' + WS_PORT];
     info(`\nStarting Paper ${PAPER} server...`);
     proc = spawn('java', [...jvmArgs, '-jar', resolve(SERVER, JAR), '--nogui'], { cwd: SERVER, stdio: ['pipe', 'inherit', 'inherit'] });
-    proc.on('exit', code => { warn(`Server exited (${code})`); process.exit(0); });
+    proc.on('exit', code => { warn(`Server exited (${code})`); if (wss) wss.close(); process.exit(0); });
     process.stdin.on('data', d => { if (proc && !proc.killed) proc.stdin.write(d); });
     if (STOP) { info(`Auto-stop in ${STOP}s`); setTimeout(() => { warn('Auto-stop'); if (proc && !proc.killed) proc.stdin.write('stop\n'); setTimeout(() => { if (proc && !proc.killed) proc.kill(); process.exit(0); }, 10000); }, STOP * 1000); }
 }
@@ -137,6 +264,7 @@ async function main() {
     console.log(`\n${c.b}${c.B}  Yeow Dev Server${c.r}\n`);
     if (!existsSync(RUNTIME)) { fail(`Runtime JAR not found: ${RUNTIME}`); process.exit(1); }
 
+    startWebSocket();
     await ensurePaper();
     mkdirSync(SERVER, { recursive: true });
     await initServer();
@@ -149,5 +277,5 @@ async function main() {
     startServer();
 }
 
-process.on('SIGINT', () => { if (proc) { proc.stdin.write('stop\n'); setTimeout(() => { if (proc && !proc.killed) proc.kill(); process.exit(0); }, 5000); } });
+process.on('SIGINT', () => { if (proc) { proc.stdin.write('stop\n'); setTimeout(() => { if (proc && !proc.killed) proc.kill(); if (wss) wss.close(); process.exit(0); }, 5000); } });
 main().catch(e => { fail(e.message); process.exit(1); });

package/templates/default/package.json

@@ -12,6 +12,8 @@
     "devDependencies": {
         "esbuild": "^0.25.0",
         "adm-zip": "^0.5.0",
-        "https-proxy-agent": "^9.0.0"
+        "https-proxy-agent": "^9.0.0",
+        "source-map": "^0.7.4",
+        "ws": "^8.0.0"
     }
 }

package/templates/default/yeow.config.json

@@ -3,6 +3,8 @@
     "version": "1.0.0",
     "author": "Unknown",
     "description": "A Yeow plugin",
+    "api": "1.18",
+    "java": 21,
     "dev": {
         "port": 17367,
         "memory": "4G"