ework-web 0.4.0 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-web",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "type": "module",
   "description": "ework-web — standalone multi-project issue tracker. Local SQLite-backed, no external API dependency. Bun + TypeScript + SSR HTML.",
   "license": "MIT",

package/src/index.ts

@@ -240,8 +240,16 @@ function daemonEnvPath(): string | null {
     const p = join(dataDir, ".env");
     return existsSync(p) ? p : null;
   }
-  const conventional = join(homedir(), ".local", "share", "ework-daemon", ".env");
-  return existsSync(conventional) ? conventional : null;
+  // Conventional paths: standalone install, then ework-aio managed layout
+  // (~/.local/share/ework-aio/ework-daemon/.env).
+  const candidates = [
+    join(homedir(), ".local", "share", "ework-daemon", ".env"),
+    join(homedir(), ".local", "share", "ework-aio", "ework-daemon", ".env"),
+  ];
+  for (const c of candidates) {
+    if (existsSync(c)) return c;
+  }
+  return null;
 }
 
 function spawnDaemonRestart(): void {
@@ -370,6 +378,7 @@ function chunkTextTTS(text: string, max = 120): string[] {
 
 async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean; user: UserRow | null }): Promise<Response> {
   if (url.pathname === "/static/app.js") return staticAsset("app.js", "text/javascript; charset=utf-8", req);
+  if (url.pathname === "/static/db-wizard.js") return staticAsset("db-wizard.js", "text/javascript; charset=utf-8", req);
   if (url.pathname === "/static/session.js") return staticAsset("session.js", "text/javascript; charset=utf-8", req);
   if (url.pathname === "/static/file.js") return staticAsset("file.js", "text/javascript; charset=utf-8", req);
   if (url.pathname === "/static/tts.js") return staticAsset("tts.js", "text/javascript; charset=utf-8", req);

package/src/static/db-wizard.js

@@ -0,0 +1,106 @@
+// DB-backend migration wizard (settings page). External file because CSP
+// script-src 'self' blocks inline scripts — see index.ts SEC_HEADERS.
+(function () {
+  if (!document.getElementById('db-test')) return;
+  var R = document.getElementById('db-result');
+
+  function get(id) { return document.getElementById(id).value; }
+  function gather() {
+    return JSON.stringify({
+      host: get('db-host').trim(),
+      port: Number(get('db-port')),
+      user: get('db-user').trim(),
+      password: get('db-password'),
+      database: get('db-database').trim(),
+      prefix: get('db-prefix').trim()
+    });
+  }
+  function setBtns(d) {
+    document.querySelectorAll('.db-controls button').forEach(function (b) { b.disabled = d; });
+  }
+
+  async function act(action) {
+    if (action === 'enable' && !confirm('确认启用 MySQL 并重启？确保已完成 ① 测试 + ② 迁移。')) return;
+    setBtns(true);
+    R.className = 'db-result db-loading';
+    R.textContent = action === 'enable' ? '正在写入 .env，进程即将重启…' : '处理中…';
+    try {
+      var res = await fetch('/api/db/' + action, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: gather()
+      });
+      var data = await res.json();
+      if (action === 'enable' && data.ok) {
+        R.className = 'db-result db-ok';
+        R.textContent = '✓ .env 已写入。进程重启中，等待恢复…';
+        setTimeout(poll, 3000);
+        return;
+      }
+      if (action === 'daemon-config') {
+        R.className = 'db-result ' + (data.configured ? 'db-ok' : 'db-err');
+        R.textContent = data.configured
+          ? '✓ daemon 已写入 .env 并重启:\n  ' + data.envPath
+          : '⚠ daemon 无法自动配置（.env 未找到）。请手动操作:\n\n' + (data.manual || data.error || '');
+        return;
+      }
+      R.className = 'db-result ' + (data.ok ? 'db-ok' : 'db-err');
+      if (!data.ok) {
+        var m = '✗ ' + (data.error || '未知错误');
+        if (data.hint) m += '\n💡 ' + data.hint;
+        R.textContent = m;
+      } else if (data.tables) {
+        R.textContent = '✓ 迁移完成（' + data.tables.length + ' 张表）:\n' +
+          data.tables.map(function (t) { return '  ' + t.table + ': ' + t.rows + ' 行'; }).join('\n');
+      } else if (data.serverVersion) {
+        R.textContent = '✓ 连接成功 · MySQL ' + data.serverVersion +
+          (data.databaseExists ? '' : '（库不存在，迁移时自动创建）');
+      }
+    } catch (e) {
+      R.className = 'db-result db-err';
+      R.textContent = '✗ ' + (e.message || String(e));
+    } finally {
+      if (action !== 'enable') setBtns(false);
+    }
+  }
+
+  async function poll() {
+    try { await fetch('/'); location.href = '/settings?saved=1'; }
+    catch (e) { setTimeout(poll, 2000); }
+  }
+
+  document.getElementById('db-test').onclick = function () { act('test'); };
+  document.getElementById('db-migrate').onclick = function () { act('migrate'); };
+  document.getElementById('db-daemon').onclick = function () { act('daemon-config'); };
+  document.getElementById('db-enable').onclick = function () { act('enable'); };
+
+  var revertBtn = document.getElementById('db-revert');
+  if (revertBtn) {
+    revertBtn.onclick = async function () {
+      if (!confirm('确认切回 SQLite？将创建新的 SQLite 文件并迁移数据，然后重启。')) return;
+      var Rr = document.getElementById('db-revert-result');
+      Rr.className = 'db-result db-loading';
+      Rr.textContent = '正在迁移到 SQLite…';
+      try {
+        var res = await fetch('/api/db/revert', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: '{}'
+        });
+        var data = await res.json();
+        if (data.ok) {
+          Rr.className = 'db-result db-ok';
+          Rr.textContent = '✓ 已迁移到 ' + data.targetPath + '。进程重启中…';
+          setTimeout(poll, 3000);
+        } else {
+          Rr.className = 'db-result db-err';
+          Rr.textContent = '✗ ' + (data.error || '未知错误') +
+            (data.partial ? '\n部分完成: ' + data.partial.join(', ') : '');
+        }
+      } catch (e) {
+        Rr.className = 'db-result db-err';
+        Rr.textContent = '✗ ' + (e.message || String(e));
+      }
+    };
+  }
+})();

package/src/views/settings.ts

@@ -63,49 +63,7 @@ function buildDbSection(viewer: UserRow): string {
 </div>
 <div id="db-result" class="db-result"></div>
 ${isMysql ? `<hr style="border:0;border-top:1px solid var(--border);margin:1rem 0"><div class="db-controls"><button type="button" id="db-revert" class="secondary">⚠ 切回 SQLite（安全网）</button></div><div id="db-revert-result" class="db-result"></div>` : ""}
-<script>
-(function(){
-var R=document.getElementById('db-result');
-function get(id){return document.getElementById(id).value;}
-function gather(){return JSON.stringify({host:get('db-host').trim(),port:Number(get('db-port')),user:get('db-user').trim(),password:get('db-password'),database:get('db-database').trim(),prefix:get('db-prefix').trim()});}
-function setBtns(d){document.querySelectorAll('.db-controls button').forEach(function(b){b.disabled=d;});}
-async function act(action){
-if(action==='enable'&&!confirm('确认启用 MySQL 并重启？确保已完成 ① 测试 + ② 迁移。'))return;
-setBtns(true);
-R.className='db-result db-loading';
-R.textContent=action==='enable'?'正在写入 .env，进程即将重启…':'处理中…';
-try{
-var res=await fetch('/api/db/'+action,{method:'POST',headers:{'Content-Type':'application/json'},body:gather()});
-var data=await res.json();
-if(action==='enable'&&data.ok){R.className='db-result db-ok';R.textContent='✓ .env 已写入。进程重启中，等待恢复…';setTimeout(poll,3000);return;}
-if(action==='daemon-config'){R.className='db-result '+(data.configured?'db-ok':'db-err');R.textContent=data.configured?'✓ daemon 已写入 .env 并重启:\\n  '+data.envPath:'⚠ daemon 无法自动配置（.env 未找到）。请手动操作:\\n\\n'+(data.manual||data.error||'');return;}
-R.className='db-result '+(data.ok?'db-ok':'db-err');
-if(!data.ok){var m='✗ '+(data.error||'未知错误');if(data.hint)m+='\\n💡 '+data.hint;R.textContent=m;}
-else if(data.tables){R.textContent='✓ 迁移完成（'+data.tables.length+' 张表）:\\n'+data.tables.map(function(t){return'  '+t.table+': '+t.rows+' 行';}).join('\\n');}
-else if(data.serverVersion){R.textContent='✓ 连接成功 · MySQL '+data.serverVersion+(data.databaseExists?'':'（库不存在，迁移时自动创建）');}
-}catch(e){R.className='db-result db-err';R.textContent='✗ '+(e.message||String(e));}
-finally{if(action!=='enable')setBtns(false);}
-}
-async function poll(){try{await fetch('/');location.href='/settings?saved=1';}catch(e){setTimeout(poll,2000);}}
-document.getElementById('db-test').onclick=function(){act('test');};
-document.getElementById('db-migrate').onclick=function(){act('migrate');};
-document.getElementById('db-daemon').onclick=function(){act('daemon-config');};
-document.getElementById('db-enable').onclick=function(){act('enable');};
-if(document.getElementById('db-revert')){
-document.getElementById('db-revert').onclick=async function(){
-if(!confirm('确认切回 SQLite？将创建新的 SQLite 文件并迁移数据，然后重启。'))return;
-var R=document.getElementById('db-revert-result');
-R.className='db-result db-loading';R.textContent='正在迁移到 SQLite…';
-try{
-var res=await fetch('/api/db/revert',{method:'POST',headers:{'Content-Type':'application/json'},body:'{}'});
-var data=await res.json();
-if(data.ok){R.className='db-result db-ok';R.textContent='✓ 已迁移到 '+data.targetPath+'。进程重启中…';setTimeout(poll,3000);}
-else{R.className='db-result db-err';R.textContent='✗ '+(data.error||'未知错误')+(data.partial?'\\n部分完成: '+data.partial.join(', '):'');}
-}catch(e){R.className='db-result db-err';R.textContent='✗ '+(e.message||String(e));}
-};
-}
-})();
-</script>
+<script src="/static/db-wizard.js"></script>
 </section>`;
 }