git-watchtower 2.3.15 → 2.3.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-watchtower",
-  "version": "2.3.15",
+  "version": "2.3.16",
   "description": "Terminal-based Git branch monitor with activity sparklines and optional dev server with live reload",
   "main": "bin/git-watchtower.js",
   "bin": {

package/src/git/remote.js

@@ -3,6 +3,11 @@
  * @module git/remote
  */
 
+// Branch-URL building lives in the pure module so it can be inlined into
+// the web dashboard bundle. We re-export it here so existing Node callers
+// keep working without an extra hop.
+const { buildBranchUrl } = require('../server/web-ui/pure');
+
 /**
  * Parse a git remote URL into { host, path } components.
  * Supports SSH (git@host:path), HTTPS, and ssh:// protocol formats.
@@ -27,42 +32,6 @@ function parseRemoteUrl(remoteUrl) {
   return null;
 }
 
-/**
- * Build a branch URL for the appropriate git hosting service.
- * Each service has its own URL format for viewing branches.
- * @param {string} baseUrl - Repository base URL (e.g., https://github.com/user/repo)
- * @param {string} host - Hostname of the git hosting service
- * @param {string} branchName - Name of the branch
- * @returns {string}
- */
-function buildBranchUrl(baseUrl, host, branchName) {
-  const branch = encodeURIComponent(branchName);
-
-  // Azure DevOps: dev.azure.com/org/project/_git/repo or org.visualstudio.com
-  if (host === 'dev.azure.com' || host.endsWith('.visualstudio.com')) {
-    return `${baseUrl}?version=GB${branch}`;
-  }
-
-  // Bitbucket Cloud
-  if (host === 'bitbucket.org') {
-    return `${baseUrl}/src/${branch}`;
-  }
-
-  // AWS CodeCommit
-  if (host.match(/codecommit\..+\.amazonaws\.com/)) {
-    return `${baseUrl}/browse/refs/heads/${branch}`;
-  }
-
-  // SourceHut
-  if (host === 'git.sr.ht') {
-    return `${baseUrl}/tree/${branch}`;
-  }
-
-  // GitHub, GitLab, Codeberg, Gitea, Forgejo, Gogs, and self-hosted instances
-  // All use /tree/<branch>
-  return `${baseUrl}/tree/${branch}`;
-}
-
 /**
  * Detect the git hosting platform from a web URL.
  * @param {string|null} webUrl - Web URL of the repository

package/src/server/web-ui/js.js

@@ -198,26 +198,34 @@ function getDashboardJs() {
   }
 
   // ── URL Building Helpers ──────────────────────────────────────
+  // state.repoWebUrl is the server-built BASE url (no /tree/...). Extract
+  // the host once per call and let the buildXxxUrl helpers — inlined from
+  // pure.js — branch on platform. The previous getBranchUrl/getCommitUrl/
+  // getPrUrl hardcoded GitHub paths and produced broken links for
+  // Bitbucket (/src/), Azure DevOps (?version=GB), AWS CodeCommit
+  // (/browse/refs/heads/), self-hosted GitLab, etc.
   function getRepoUrl() {
-    return (state && state.repoWebUrl) ? state.repoWebUrl.replace(/\\/tree\\/.*$/, '') : null;
+    return (state && state.repoWebUrl) ? state.repoWebUrl : null;
+  }
+  function getRepoHost() {
+    var base = getRepoUrl();
+    if (!base) return null;
+    try { return new URL(base).hostname; } catch (e) { return null; }
   }
   function getBranchUrl(branchName) {
-    const base = getRepoUrl();
+    var base = getRepoUrl();
     if (!base) return null;
-    return base + '/tree/' + encodeURIComponent(branchName);
+    return buildBranchUrl(base, getRepoHost(), branchName);
   }
   function getCommitUrl(hash) {
-    const base = getRepoUrl();
-    if (!base || !hash) return null;
-    return base + '/commit/' + hash;
+    var base = getRepoUrl();
+    if (!base) return null;
+    return buildCommitUrl(base, getRepoHost(), hash);
   }
   function getPrUrl(prNumber) {
-    const base = getRepoUrl();
-    if (!base || !prNumber) return null;
-    if (base.indexOf('gitlab') !== -1) {
-      return base + '/-/merge_requests/' + prNumber;
-    }
-    return base + '/pull/' + prNumber;
+    var base = getRepoUrl();
+    if (!base) return null;
+    return buildPrUrl(base, getRepoHost(), prNumber);
   }
 
   // ── SSE Connection ─────────────────────────────────────────────

package/src/server/web-ui/pure.js

@@ -134,4 +134,83 @@ function getDisplayBranches(branches, options) {
   return result;
 }
 
-module.exports = { escHtml, timeAgo, renderSparklineBars, fmtCompact, getDisplayBranches };
+/**
+ * Build a branch URL for the appropriate git hosting service.
+ * Pure / browser-safe — duplicated logic lives in src/git/remote.js for
+ * Node-side callers, but THIS function is the canonical implementation
+ * that the web dashboard inlines into its bundle.
+ *
+ * @param {string} baseUrl - Repository base URL (e.g., https://github.com/user/repo)
+ * @param {string} host - Hostname of the git hosting service
+ * @param {string} branchName - Name of the branch
+ * @returns {string}
+ */
+function buildBranchUrl(baseUrl, host, branchName) {
+  var branch = encodeURIComponent(branchName);
+  var h = String(host || '').toLowerCase();
+
+  // Azure DevOps: dev.azure.com/org/project/_git/repo or org.visualstudio.com
+  if (h === 'dev.azure.com' || /\.visualstudio\.com$/.test(h)) {
+    return baseUrl + '?version=GB' + branch;
+  }
+  // Bitbucket Cloud
+  if (h === 'bitbucket.org') return baseUrl + '/src/' + branch;
+  // AWS CodeCommit
+  if (/codecommit\..+\.amazonaws\.com/.test(h)) {
+    return baseUrl + '/browse/refs/heads/' + branch;
+  }
+  // GitHub, GitLab, SourceHut, Codeberg, Gitea, Forgejo, Gogs, self-hosted
+  return baseUrl + '/tree/' + branch;
+}
+
+/**
+ * Build a commit URL for the appropriate git hosting service.
+ * @param {string} baseUrl - Repository base URL
+ * @param {string} host - Hostname
+ * @param {string} sha - Commit SHA (full or short)
+ * @returns {string|null}
+ */
+function buildCommitUrl(baseUrl, host, sha) {
+  if (!sha) return null;
+  var h = String(host || '').toLowerCase();
+  // Bitbucket uses /commits/ (plural)
+  if (h === 'bitbucket.org') return baseUrl + '/commits/' + sha;
+  // GitHub, GitLab, Gitea, Forgejo, Codeberg, Azure (best-effort), self-hosted
+  return baseUrl + '/commit/' + sha;
+}
+
+/**
+ * Build a pull/merge-request URL for the appropriate git hosting service.
+ * @param {string} baseUrl - Repository base URL
+ * @param {string} host - Hostname
+ * @param {string|number} prNumber - PR / MR number
+ * @returns {string|null}
+ */
+function buildPrUrl(baseUrl, host, prNumber) {
+  if (!prNumber) return null;
+  var h = String(host || '').toLowerCase();
+  if (h === 'bitbucket.org') return baseUrl + '/pull-requests/' + prNumber;
+  // GitLab.com or any host containing "gitlab" (self-hosted gitlab.example.com)
+  if (h === 'gitlab.com' || h.split('.').indexOf('gitlab') !== -1) {
+    return baseUrl + '/-/merge_requests/' + prNumber;
+  }
+  if (h === 'dev.azure.com' || /\.visualstudio\.com$/.test(h)) {
+    return baseUrl + '/pullrequest/' + prNumber;
+  }
+  if (/codecommit\..+\.amazonaws\.com/.test(h)) {
+    return baseUrl + '/pull-requests/' + prNumber;
+  }
+  // GitHub, Gitea, Codeberg, Forgejo, Gogs, self-hosted
+  return baseUrl + '/pull/' + prNumber;
+}
+
+module.exports = {
+  escHtml,
+  timeAgo,
+  renderSparklineBars,
+  fmtCompact,
+  getDisplayBranches,
+  buildBranchUrl,
+  buildCommitUrl,
+  buildPrUrl,
+};