create-yeow 0.2.66 → 0.2.68

package/package.json

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

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

@@ -1,7 +1,8 @@
 import * as esbuild from 'esbuild';
-import { readFileSync, writeFileSync, mkdirSync, existsSync, statSync, readdirSync } from 'fs';
-import { resolve } from 'path';
+import { readFileSync, writeFileSync, mkdirSync, existsSync, statSync, readdirSync, rmdirSync, copyFileSync } from 'fs';
+import { resolve, dirname, basename, extname } from 'path';
 import { fileURLToPath } from 'url';
+import { createHash } from 'crypto';
 import AdmZip from 'adm-zip';
 import { execSync } from 'child_process';
 
@@ -11,26 +12,103 @@ const { name, version } = cfg;
 const isTs = existsSync(resolve(root, 'src', 'index.ts'));
 const entry = isTs ? 'src/index.ts' : 'src/index.js';
 
-// Optional type check for TypeScript projects
 if (isTs && cfg.typecheck !== false) {
     try {
         execSync('npx -p typescript tsc --noEmit', { cwd: root, stdio: 'pipe' });
-        console.log('  ✓ Type check passed');
+        console.log('  \u2713 Type check passed');
     } catch (e) {
         const out = e.stdout?.toString().trim();
         const err = e.stderr?.toString().trim();
         if (out) console.error(out);
         if (err) console.error(err);
-        if (!out && !err) console.error('  ✗ Type check failed');
+        if (!out && !err) console.error('  \u2717 Type check failed');
         process.exit(1);
     }
 }
 
-const outDir = resolve(root, 'dist', '.yeow');
-mkdirSync(outDir, { recursive: true });
-
 const apiVer = cfg.api || '1.18';
 const isDev = process.env.YEOW_DEV === 'true';
+const outDir = isDev ? resolve(root, 'dist', '.dev') : resolve(root, 'dist', '.yeow');
+const assetsOutDir = resolve(outDir, '.assets');
+const srcAssetsDir = resolve(root, 'assets');
+
+// ── esbuild plugin: __yeow-assets virtual module ──
+// 目录级哈希：目录整体重命名 <name>.<dirHash>/，目录内文件保持原名（内部引用不断）
+// 根级文件独立哈希 <name>.<hash><ext>
+const ASSET_TREE = (() => {
+    if (!existsSync(srcAssetsDir)) return { children: {}, hash: null };
+    const buildTree = (absDir) => {
+        const children = {};
+        for (const e of readdirSync(absDir, { withFileTypes: true })) {
+            const p = resolve(absDir, e.name);
+            if (e.isDirectory()) {
+                children[e.name] = buildTree(p);
+            } else {
+                children[e.name] = { isFile: true, contentHash: createHash('md5').update(readFileSync(p)).digest('hex').slice(0, 8) };
+            }
+        }
+        const parts = Object.keys(children).sort().map(k => {
+            const c = children[k];
+            return k + ':' + (c.isFile ? c.contentHash : c.hash);
+        });
+        return { children, isFile: false, hash: createHash('md5').update(parts.join(',')).digest('hex').slice(0, 8) };
+    };
+    return buildTree(srcAssetsDir);
+})();
+
+const yeowAssetPlugin = {
+    name: 'yeow-assets',
+    setup(build) {
+        build.onResolve({ filter: /^__yeow-assets$/ }, args => ({
+            path: args.path,
+            namespace: 'yeow-assets',
+        }));
+        build.onLoad({ filter: /.*/, namespace: 'yeow-assets' }, async () => {
+            const map = {};
+            mkdirSync(assetsOutDir, { recursive: true });
+
+            const deploy = (node, absSrc, origRel, hashedRel) => {
+                if (!node.isFile && hashedRel) {
+                    mkdirSync(resolve(assetsOutDir, hashedRel), { recursive: true });
+                }
+                for (const [name, child] of Object.entries(node.children || {})) {
+                    if (child.isFile) {
+                        // 根级文件：独立哈希；目录内文件：保持原名
+                        if (hashedRel === '') {
+                            const ext = extname(name);
+                            const base = basename(name, ext);
+                            const dest = base + '.' + child.contentHash + ext;
+                            copyFileSync(resolve(absSrc, name), resolve(assetsOutDir, dest));
+                            map[name] = 'assets/' + dest;
+                        } else {
+                            copyFileSync(resolve(absSrc, name), resolve(assetsOutDir, hashedRel, name));
+                            map[origRel + name] = 'assets/' + hashedRel + name;
+                        }
+                    } else {
+                        const subHashed = (hashedRel === '' ? '' : hashedRel) + name + '.' + child.hash + '/';
+                        deploy(child, resolve(absSrc, name), origRel + name + '/', subHashed);
+                        map[origRel + name + '/'] = 'assets/' + subHashed;
+                    }
+                }
+            };
+
+            deploy(ASSET_TREE, srcAssetsDir, '', '');
+
+            return {
+                contents: 'const _map = ' + JSON.stringify(map) + ';\n' +
+                    'function _norm(p) { return p.endsWith("/") ? p.slice(0, -1) : p; }\n' +
+                    'export function getPath(p) {\n' +
+                    '  if (_map[p]) return _map[p];\n' +
+                    '  const n = _norm(p);\n' +
+                    '  if (_map[n]) return _map[n];\n' +
+                    '  if (_map[n + "/"]) return _map[n + "/"];\n' +
+                    '  return p;\n' +
+                    '}\n',
+                loader: 'js',
+            };
+        });
+    },
+};
 
 async function main() {
     await esbuild.build({
@@ -45,42 +123,52 @@ async function main() {
         treeShaking: true,
         minify: false,
         sourcemap: isDev ? 'linked' : false,
+        plugins: [yeowAssetPlugin],
     });
 
     const size = statSync(resolve(outDir, 'main.js')).size;
-    console.log(`  ✓ Bundled (${(size / 1024).toFixed(1)} KB)`);
+    console.log('  \u2713 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: '${apiVer}'\ndepend:\n  - Yeow-Runtime\n`));
+    zip.updateFile('plugin.yml', Buffer.from(
+        'name: ' + name + '\n' +
+        'version: ' + version + '\n' +
+        'main: yeow.template.Bootstrap\n' +
+        'api-version: \'' + apiVer + '\'\n' +
+        'depend:\n  - Yeow-Runtime\n'));
 
     if (isDev) {
         const devInfo = {
             name,
             codeFile: resolve(outDir, 'main.js').replace(/\\/g, '/'),
-            assetsDir: existsSync(resolve(root, 'assets')) ? resolve(root, 'assets').replace(/\\/g, '/') : null,
+            assetsDir: assetsOutDir.replace(/\\/g, '/'),
         };
         writeFileSync(resolve(outDir, 'dev.json'), JSON.stringify(devInfo, null, 2));
-        console.log(`  ✓ Dev info written`);
+        console.log('  \u2713 Dev info written');
         zip.addFile('.yeow/dev.json', readFileSync(resolve(outDir, 'dev.json')));
     } else {
         zip.addFile('.yeow/main.js', readFileSync(resolve(outDir, 'main.js')));
-        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));
-                }
+    }
+
+    // Pack hashed assets into JAR
+    if (existsSync(assetsOutDir)) {
+        const files = readdirSync(assetsOutDir, { recursive: true });
+        for (const f of files) {
+            const fp = resolve(assetsOutDir, f);
+            if (statSync(fp).isFile()) {
+                zip.addFile('assets/' + f.replace(/\\/g, '/'), readFileSync(fp));
             }
-            console.log('  ✓ Assets included');
         }
+        console.log('  \u2713 Assets included (' + files.filter(f => statSync(resolve(assetsOutDir, f)).isFile()).length + ' files)');
     }
 
     zip.addFile('yeow.json', Buffer.from(JSON.stringify(cfg)));
-    const outJar = resolve(root, 'dist', `${name}-${version}.jar`);
+    const outJar = isDev ? resolve(root, 'dist', 'plugins', name + '-' + version + '.jar')
+                          : resolve(root, 'dist', name + '-' + version + '.jar');
+    mkdirSync(dirname(outJar), { recursive: true });
     zip.writeZip(outJar);
-    console.log(`  ✓ Packaged ${outJar}\n`);
+    console.log('  \u2713 Packaged ' + outJar + '\n');
 }
 
 main().catch(e => { console.error(e); process.exit(1); });

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

@@ -76,27 +76,22 @@ let proc = null;
 let wss = null;
 
 // ── Graceful shutdown ────────────────────────────────────────────
+let cleaning = false;
 function cleanup() {
+  if (cleaning) return;
+  cleaning = true;
+  if (wss) { try { wss.close(); } catch {} }
   if (proc && !proc.killed) {
     try { proc.stdin.write('stop\n'); } catch {}
-    setTimeout(() => { if (proc && !proc.killed) try { proc.kill(); } catch {} }, 5000);
+    const killer = setTimeout(() => { if (proc && !proc.killed) try { proc.kill('SIGKILL'); } catch {} }, 10000);
+    proc.on('close', () => { clearTimeout(killer); process.exit(0); });
+  } else {
+    process.exit(0);
   }
-  if (wss) { try { wss.close(); } catch {} }
-  process.exit(0);
 }
 process.on('SIGINT', cleanup);
 process.on('SIGTERM', cleanup);
-process.on('exit', () => { if (proc && !proc.killed) try { proc.kill(); } catch {} });
-// Windows Ctrl+C in terminal
-if (process.platform === 'win32') {
-  import('readline').then(rl => {
-    rl.emitKeypressEvents(process.stdin);
-    if (process.stdin.isTTY) process.stdin.setRawMode(true);
-    process.stdin.on('keypress', (str, key) => {
-      if ((key.ctrl && key.name === 'c') || key.name === 'escape') cleanup();
-    });
-  });
-}
+process.on('beforeExit', () => { if (proc && !proc.killed) try { proc.kill(); } catch {} });
 
 // ── WebSocket Server ────────────────────────────────────────────
 function startWebSocket() {
@@ -236,13 +231,14 @@ function startHotReload() {
             info('Source changed, rebuilding...');
             try {
                 execSync('node .yeow/build.js', { cwd: ROOT, stdio: 'pipe', env: { ...process.env, YEOW_DEV: 'true' } });
-                const compiled = resolve(ROOT, 'dist', '.yeow', 'main.js');
+                const compiled = resolve(ROOT, 'dist', '.dev', 'main.js');
                 if (existsSync(compiled)) {
+                    const devAssets = resolve(ROOT, 'dist', '.dev', '.assets');
                     broadcast({
                         type: 'hot-reload',
                         plugin: cfg.name,
                         codeFile: compiled.replace(/\\/g, '/'),
-                        assetsDir: existsSync(assetsDir) ? assetsDir.replace(/\\/g, '/') : null,
+                        assetsDir: existsSync(devAssets) ? devAssets.replace(/\\/g, '/') : null,
                     });
                     _consumer = null;
                     ok('Hot reload sent via WebSocket');
@@ -294,7 +290,7 @@ async function printFormattedError(err) {
         consumer = await getSourceMapConsumer();
     }
     if (hasMainJs && !consumer) {
-        const mapFile = resolve(ROOT, 'dist', '.yeow', 'main.js.map');
+    const mapFile = resolve(ROOT, 'dist', '.dev', 'main.js.map');
         out += `  ${c.D}(source-map not found: ${existsSync(mapFile) ? 'exists but failed to parse' : 'missing at ' + mapFile})${c.r}\n`;
     }
 
@@ -365,6 +361,7 @@ function startServer() {
     info(`\nStarting Paper ${PAPER_VERSION} server...`);
     proc = spawn('java', [...jvmArgs, '-jar', resolve(SERVER, PAPER_JAR), '--nogui'], { cwd: SERVER, stdio: ['pipe', 'inherit', 'inherit'] });
     proc.on('exit', code => { warn(`Server exited (${code})`); if (wss) wss.close(); process.exit(0); });
+    process.stdin.on('data', d => { if (proc && !proc.killed) try { proc.stdin.write(d); } catch {} });
     if (STOP) { info(`Auto-stop in ${STOP}s`); setTimeout(() => { warn('Auto-stop'); cleanup(); }, STOP * 1000); }
 }
 
@@ -378,7 +375,7 @@ async function main() {
     await initServer();
     serverProps(cfg.dev?.port || 17367);
     buildPlugin();
-    copyToPlugins(resolve(ROOT, 'dist', `${cfg.name}-${cfg.version}.jar`), 'Plugin');
+    copyToPlugins(resolve(ROOT, 'dist', 'plugins', `${cfg.name}-${cfg.version}.jar`), 'Plugin');
     copyToPlugins(RUNTIME, 'Runtime');
 
     startHotReload();

package/templates/default/package.json

@@ -7,7 +7,7 @@
         "dev": "node .yeow/dev-server.js"
     },
     "dependencies": {
-        "yeow-api": "^0.2.54",
+        "yeow-api": "^0.2.57",
         "yeow-utils": "^0.1.14"
     },
     "devDependencies": {

package/templates/default/yeow.config.json

@@ -1,13 +1,14 @@
 {
     "name": "my-yeow-plugin",
     "version": "1.0.0",
-    "author": "Unknown",
+    "author": "",
     "description": "A Yeow plugin",
     "api": "1.18",
     "java": 21,
     "typecheck": true,
     "dev": {
         "port": 17367,
-        "memory": "4G"
+        "memory": "4G",
+        "paperJar": "https://fill-data.papermc.io/v1/objects/5ee4f542f628a14c644410b08c94ea42e772ef4d29fe92973636b6813d4eaffc/paper-1.21.4-232.jar"
     }
-}
+}