buddy-workbench 0.1.14 → 0.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "buddy-workbench",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "private": false,
   "type": "module",
   "bin": {
@@ -18,7 +18,8 @@
     "dev": "node --watch server.js",
     "build": "npm --prefix ui run build",
     "dev:ui": "npm --prefix ui run dev",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "version": "node -e \"const v=process.env.npm_package_version; const fs=require('fs'); ['ui/package.json', 'ui/package-lock.json'].forEach(p=>{if(fs.existsSync(p)){const j=JSON.parse(fs.readFileSync(p)); j.version=v; if(j.packages&&j.packages['']){j.packages[''].version=v;} fs.writeFileSync(p, JSON.stringify(j,null,2)+'\\n');}});\" && git add ui/package.json ui/package-lock.json"
   },
   "dependencies": {
     "axios": "^1.7.9",

package/server/routes/launchers.js

@@ -1,8 +1,8 @@
 import { Router } from 'express';
 import { listLaunchers, saveLaunchers } from '../repositories/launchers.js';
-import { runScript, runningErrorCounts, runningScripts, scriptErrorLogs, scriptLogs, stopScript } from '../services/process-manager.js';
+import { clearScriptLogs, runScript, runningErrorCounts, runningScripts, scriptErrorLogs, scriptLogs, stopScript } from '../services/process-manager.js';
 import { readPackageScripts } from '../services/package-scripts.js';
-import { currentGitBranch } from '../services/git.js';
+import { currentGitBranch, getGitRemoteUrl, toWebRepoUrl } from '../services/git.js';
 
 const router = Router();
 function validLauncher(body) {
@@ -17,7 +17,18 @@ const invalid = (res) => res.status(400).json({ error: 'Name, project folder, an
 
 router.get('/', async (_req, res) => {
   const launchers = listLaunchers();
-  const items = await Promise.all(launchers.map(async (launcher) => ({ ...launcher, packageScriptCount: readPackageScripts(launcher.folder).length, branch: await currentGitBranch(launcher.folder) })));
+  const items = await Promise.all(launchers.map(async (launcher) => {
+    const [branch, remoteUrl] = await Promise.all([
+      currentGitBranch(launcher.folder),
+      getGitRemoteUrl(launcher.folder)
+    ]);
+    return {
+      ...launcher,
+      packageScriptCount: readPackageScripts(launcher.folder).length,
+      branch,
+      repoUrl: toWebRepoUrl(remoteUrl)
+    };
+  }));
   res.json(items);
 });
 router.post('/', (req, res) => { const config = validLauncher(req.body); if (!config) return invalid(res); const launcher = { id: crypto.randomUUID(), ...config }; const launchers = listLaunchers(); saveLaunchers([...launchers, launcher]); res.status(201).json(launcher); });
@@ -39,8 +50,10 @@ router.post('/:id/install/run', (req, res) => { const launcher = listLaunchers()
 router.post('/:id/package-scripts/:scriptName/run', (req, res) => { const launcher = listLaunchers().find((item) => item.id === req.params.id); if (!launcher) return res.status(404).json({ error: 'Configuration not found.' }); const script = readPackageScripts(launcher.folder).find((item) => item.name === req.params.scriptName); if (!script) return res.status(404).json({ error: 'Package script not found.' }); try { runScript(launcher, { ...script, command: `${launcher.executor} run ${script.name}` }); res.json({ ok: true }); } catch (error) { res.status(error.message.includes('already') ? 409 : 400).json({ error: error.message }); } });
 router.get('/:id/package-scripts/:scriptName/logs', (req, res) => { const script = readPackageScripts(listLaunchers().find((item) => item.id === req.params.id)?.folder || '').find((item) => item.name === req.params.scriptName); if (!script) return res.status(404).json({ error: 'Package script not found.' }); res.json({ log: scriptLogs(req.params.id, script.id) }); });
 router.get('/:id/package-scripts/:scriptName/logs/error', (req, res) => { const script = readPackageScripts(listLaunchers().find((item) => item.id === req.params.id)?.folder || '').find((item) => item.name === req.params.scriptName); if (!script) return res.status(404).json({ error: 'Package script not found.' }); res.json({ log: scriptErrorLogs(req.params.id, script.id) }); });
+router.delete('/:id/package-scripts/:scriptName/logs', (req, res) => { const script = readPackageScripts(listLaunchers().find((item) => item.id === req.params.id)?.folder || '').find((item) => item.name === req.params.scriptName); if (!script) return res.status(404).json({ error: 'Package script not found.' }); clearScriptLogs(req.params.id, script.id); res.json({ ok: true }); });
 router.get('/:id/scripts/:scriptId/logs', (req, res) => res.json({ log: scriptLogs(req.params.id, req.params.scriptId) }));
 router.get('/:id/scripts/:scriptId/logs/error', (req, res) => res.json({ log: scriptErrorLogs(req.params.id, req.params.scriptId) }));
+router.delete('/:id/scripts/:scriptId/logs', (req, res) => { clearScriptLogs(req.params.id, req.params.scriptId); res.json({ ok: true }); });
 router.post('/:id/scripts/:scriptId/run', (req, res) => { const launcher = listLaunchers().find((item) => item.id === req.params.id); if (!launcher) return res.status(404).json({ error: 'Configuration not found.' }); const script = launcher.scripts.find((item) => item.id === req.params.scriptId); if (!script) return res.status(404).json({ error: 'Script not found.' }); try { runScript(launcher, script); res.json({ ok: true }); } catch (error) { res.status(error.message.includes('already') ? 409 : 400).json({ error: error.message }); } });
 router.post('/:id/scripts/:scriptId/stop', (req, res) => { try { stopScript(req.params.id, req.params.scriptId); res.json({ ok: true }); } catch (error) { res.status(404).json({ error: error.message }); } });
 

package/server/services/git.js

@@ -12,3 +12,79 @@ export async function currentGitBranch(folder) {
     return null;
   }
 }
+
+export async function getGitRemoteUrl(folder) {
+  if (!folder) return null;
+  try {
+    const { stdout } = await execFileAsync('git', ['config', '--get', 'remote.origin.url'], { cwd: folder, timeout: 1500 });
+    const url = stdout.trim();
+    if (url) return url;
+  } catch {}
+  try {
+    const { stdout } = await execFileAsync('git', ['remote', '-v'], { cwd: folder, timeout: 1500 });
+    const match = stdout.match(/\S+\s+(\S+)\s+\(fetch\)/);
+    if (match) return match[1].trim();
+  } catch {}
+  return null;
+}
+
+export function toWebRepoUrl(remoteUrl) {
+  if (!remoteUrl || typeof remoteUrl !== 'string') return null;
+  let raw = remoteUrl.trim();
+  if (!raw) return null;
+
+  // Remove trailing .git
+  raw = raw.replace(/\.git$/i, '');
+
+  // Handle SCP-like SSH syntax: git@host:owner/repo
+  const scpMatch = raw.match(/^([a-zA-Z0-9_.-]+@)?([^:]+):(.+)$/);
+  if (!raw.includes('://') && scpMatch) {
+    const host = scpMatch[2];
+    let path = scpMatch[3].replace(/^\/+/, '');
+
+    if (host.includes('bitbucket') && !host.includes('bitbucket.org')) {
+      const parts = path.split('/');
+      if (parts.length === 2 && parts[0] !== 'projects' && parts[0] !== 'users') {
+        const projKey = parts[0].startsWith('~') ? `users/${parts[0].slice(1)}` : `projects/${parts[0]}`;
+        path = `${projKey}/repos/${parts[1]}`;
+      } else if (parts.length === 3 && parts[0] === 'scm') {
+        const projKey = parts[1].startsWith('~') ? `users/${parts[1].slice(1)}` : `projects/${parts[1]}`;
+        path = `${projKey}/repos/${parts[2]}`;
+      }
+    }
+    return `https://${host}/${path}`;
+  }
+
+  // Handle URLs with protocols (ssh://, http://, https://)
+  try {
+    let urlStr = raw;
+    const isSshProto = urlStr.startsWith('ssh://');
+    if (isSshProto) {
+      urlStr = urlStr.replace(/^ssh:\/\//i, 'https://');
+    }
+    // Strip userinfo (e.g. git@ or user:pass@)
+    urlStr = urlStr.replace(/^(https?:\/\/)(([^/@]+)@)/i, '$1');
+
+    const urlObj = new URL(urlStr);
+    const host = urlObj.hostname;
+    let pathname = urlObj.pathname.replace(/^\/+/, '');
+
+    if (host.includes('bitbucket') && !host.includes('bitbucket.org')) {
+      const parts = pathname.split('/');
+      if (parts.length === 2 && parts[0] !== 'projects' && parts[0] !== 'users') {
+        const projKey = parts[0].startsWith('~') ? `users/${parts[0].slice(1)}` : `projects/${parts[0]}`;
+        pathname = `${projKey}/repos/${parts[1]}`;
+      } else if (parts.length === 3 && parts[0] === 'scm') {
+        const projKey = parts[1].startsWith('~') ? `users/${parts[1].slice(1)}` : `projects/${parts[1]}`;
+        pathname = `${projKey}/repos/${parts[2]}`;
+      }
+    }
+
+    const protocol = raw.startsWith('http://') ? 'http:' : 'https:';
+    const portStr = (urlObj.port && !isSshProto) ? `:${urlObj.port}` : '';
+    return `${protocol}//${host}${portStr}/${pathname}`;
+  } catch {
+    return null;
+  }
+}
+

package/server/services/process-manager.js

@@ -60,7 +60,6 @@ export function countErrorBlocks(text, isStderr = false) {
     }
 
     const isErrorLine =
-      isStderr ||
       isNewHeader ||
       /\b(error|failed|fatal|exception)\b/i.test(cleanLine) ||
       /^npm ERR!/i.test(cleanLine) ||
@@ -83,8 +82,11 @@ export function countErrorBlocks(text, isStderr = false) {
 const appendLog = (key, type, chunk) => {
   const current = logs.get(key) || { output: '', error: '', errorCount: 0 };
   const str = String(chunk || '');
-  current[type] = `${current[type]}${str}`.split(/\r?\n/).slice(-1000).join('\n');
-  current.errorCount = countErrorBlocks(current.error, true) + countErrorBlocks(current.output, false);
+  if (type === 'error' || type === 'stderr') {
+    current.error = `${current.error}${str}`.split(/\r?\n/).slice(-1000).join('\n');
+  }
+  current.output = `${current.output}${str}`.split(/\r?\n/).slice(-1000).join('\n');
+  current.errorCount = countErrorBlocks(current.output, false);
   logs.set(key, current);
 };
 
@@ -98,6 +100,7 @@ export function runningErrorCounts() {
 }
 export function scriptLogs(launcherId, scriptId) { return logs.get(keyFor(launcherId, scriptId))?.output || ''; }
 export function scriptErrorLogs(launcherId, scriptId) { return logs.get(keyFor(launcherId, scriptId))?.error || ''; }
+export function clearScriptLogs(launcherId, scriptId) { logs.set(keyFor(launcherId, scriptId), { output: '', error: '', errorCount: 0 }); }
 
 async function listeningProcesses() {
   if (process.platform === 'win32') return [];