centralise dev branch path hashing

Author: carderne

packages/cli-v3/src/dev/lock.ts

@@ -5,21 +5,18 @@ import { devBranchPathSegment } from "../utilities/devBranch.js";
 import { logger } from "../utilities/logger.js";
 import { mkdir, writeFile } from "node:fs/promises";
 import { existsSync, unlinkSync } from "node:fs";
-import { createHash } from "node:crypto";
 import { onExit } from "signal-exit";
 
 const LOCK_FILE_NAME = "dev.lock";
 
 /**
  * Builds the lock file name for a given branch. The default branch keeps the
  * original `dev.lock` name (backwards compatible).
- * Throws in a SHA1 of the non-sanitized filename to prevent collision
  */
 function lockFileName(branch?: string) {
   const safeBranch = devBranchPathSegment(branch);
-  if (!safeBranch || !branch) return LOCK_FILE_NAME;
-  const branchHash = createHash("sha1").update(branch).digest("hex").slice(0, 8);
-  return `dev.${safeBranch}.${branchHash}.lock`;
+  if (!safeBranch) return LOCK_FILE_NAME;
+  return `dev.${safeBranch}.lock`;
 }
 
 export async function createLockFile(cwd: string, branch?: string) {

packages/cli-v3/src/utilities/devBranch.ts

@@ -1,3 +1,4 @@
+import { createHash } from "node:crypto";
 import { isDefaultDevBranch } from "@trigger.dev/core/v3/utils/gitBranch";
 
 /**
@@ -15,5 +16,7 @@ export function devBranchPathSegment(branch?: string): string | undefined {
   }
 
   // Branch names can contain filesystem-unsafe characters (e.g. "/"), so sanitize.
-  return branch.replace(/[^a-zA-Z0-9-_]/g, "-");
+  const sanitized = branch.replace(/[^a-zA-Z0-9-_]/g, "-");
+  const branchHash = createHash("sha1").update(branch).digest("hex").slice(0, 8);
+  return `${sanitized}-${branchHash}`;
 }