@ricsam/r5d-worker 0.0.3 → 0.0.4

package/dist/cjs/main.cjs

@@ -37,6 +37,7 @@ const MAX_SYNC_DIFF_BYTES = 5 * 1024 * 1024;
 const activeProcesses = /* @__PURE__ */ new Map();
 const activePtys = /* @__PURE__ */ new Map();
 const branchLocks = /* @__PURE__ */ new Map();
+let containerRegistryCredential = null;
 function defaultConfigPath() {
   return import_node_path.default.join(import_node_os.default.homedir(), ".config", "r5d", "r5dctl", "config.json");
 }
@@ -447,6 +448,68 @@ function configureVisibleGitHubAuth(branchPath, remoteUrl, authHeader) {
   }
   runGit(["config", `${gitExtraHeaderConfigKey(gitExtraHeaderUrlForRemote(remoteUrl))}`, authHeader], { cwd: branchPath });
 }
+function dockerConfigPath() {
+  return import_node_path.default.join(import_node_os.default.homedir(), ".docker", "config.json");
+}
+function containersAuthPath() {
+  return import_node_path.default.join(import_node_os.default.homedir(), ".config", "containers", "auth.json");
+}
+function readJsonFile(filePath) {
+  if (!import_node_fs.default.existsSync(filePath)) {
+    return {};
+  }
+  try {
+    const parsed = JSON.parse(import_node_fs.default.readFileSync(filePath, "utf8"));
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+function writeRegistryAuthFile(filePath, credential) {
+  const config = readJsonFile(filePath);
+  const existingAuths = config.auths && typeof config.auths === "object" && !Array.isArray(config.auths) ? config.auths : {};
+  const auths = existingAuths;
+  auths[credential.registry] = {
+    username: credential.username,
+    password: credential.password,
+    auth: Buffer.from(`${credential.username}:${credential.password}`).toString("base64")
+  };
+  config.auths = auths;
+  import_node_fs.default.mkdirSync(import_node_path.default.dirname(filePath), { recursive: true });
+  import_node_fs.default.writeFileSync(filePath, `${JSON.stringify(config, null, 2)}
+`, { mode: 384 });
+  import_node_fs.default.chmodSync(filePath, 384);
+}
+function configureContainerRegistryAuth(credential) {
+  containerRegistryCredential = credential;
+  if (!credential) {
+    return;
+  }
+  writeRegistryAuthFile(dockerConfigPath(), credential);
+  writeRegistryAuthFile(containersAuthPath(), credential);
+  if (credential.missingScopes.length > 0) {
+    process.stderr.write(
+      `[r5d-worker] GitHub token is missing GHCR scope(s): ${credential.missingScopes.join(", ")}. Sign in with GitHub again if GHCR push/pull fails.
+`
+    );
+  } else {
+    process.stdout.write(`[r5d-worker] configured GHCR auth for ${credential.username}
+`);
+  }
+}
+function containerRegistryEnv() {
+  if (!containerRegistryCredential) {
+    return {};
+  }
+  return {
+    R5D_GHCR_REGISTRY: containerRegistryCredential.registry,
+    R5D_GHCR_NAMESPACE: containerRegistryCredential.username,
+    R5D_GHCR_AUTH_FILE: containersAuthPath(),
+    REGISTRY_AUTH_FILE: containersAuthPath(),
+    GHCR_REGISTRY: containerRegistryCredential.registry,
+    GHCR_NAMESPACE: containerRegistryCredential.username
+  };
+}
 function checkoutVisibleBranch(input) {
   const branchExists = tryGit(["show-ref", "--verify", "--quiet", `refs/heads/${input.branchName}`], { cwd: input.branchPath });
   const remoteBranchExists = tryGit(["show-ref", "--verify", "--quiet", `refs/remotes/origin/${input.branchName}`], {
@@ -888,6 +951,7 @@ async function executeCommand(input) {
       stderr: "pipe",
       env: {
         ...process.env,
+        ...containerRegistryEnv(),
         ...input.message.env ?? {}
       }
     });
@@ -1134,6 +1198,7 @@ function openPty(input) {
         cwd: branchPath.branchPath,
         env: {
           ...process.env,
+          ...containerRegistryEnv(),
           ...input.message.env ?? {},
           BUILD_IT_NOW_PROJECT_ID: input.projectId,
           BUILD_IT_NOW_BRANCH_NAME: input.message.branchName
@@ -1274,6 +1339,7 @@ async function startWorker(options) {
         return;
       }
       if (message.type === "project_manifest") {
+        configureContainerRegistryAuth(message.githubContainerRegistry);
         manifestByProjectId.clear();
         for (const project of message.projects) {
           manifestByProjectId.set(project.projectId, project);

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "type": "commonjs"
 }

package/dist/mjs/main.mjs

@@ -14,6 +14,7 @@ const MAX_SYNC_DIFF_BYTES = 5 * 1024 * 1024;
 const activeProcesses = /* @__PURE__ */ new Map();
 const activePtys = /* @__PURE__ */ new Map();
 const branchLocks = /* @__PURE__ */ new Map();
+let containerRegistryCredential = null;
 function defaultConfigPath() {
   return path.join(os.homedir(), ".config", "r5d", "r5dctl", "config.json");
 }
@@ -424,6 +425,68 @@ function configureVisibleGitHubAuth(branchPath, remoteUrl, authHeader) {
   }
   runGit(["config", `${gitExtraHeaderConfigKey(gitExtraHeaderUrlForRemote(remoteUrl))}`, authHeader], { cwd: branchPath });
 }
+function dockerConfigPath() {
+  return path.join(os.homedir(), ".docker", "config.json");
+}
+function containersAuthPath() {
+  return path.join(os.homedir(), ".config", "containers", "auth.json");
+}
+function readJsonFile(filePath) {
+  if (!fs.existsSync(filePath)) {
+    return {};
+  }
+  try {
+    const parsed = JSON.parse(fs.readFileSync(filePath, "utf8"));
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+function writeRegistryAuthFile(filePath, credential) {
+  const config = readJsonFile(filePath);
+  const existingAuths = config.auths && typeof config.auths === "object" && !Array.isArray(config.auths) ? config.auths : {};
+  const auths = existingAuths;
+  auths[credential.registry] = {
+    username: credential.username,
+    password: credential.password,
+    auth: Buffer.from(`${credential.username}:${credential.password}`).toString("base64")
+  };
+  config.auths = auths;
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
+  fs.writeFileSync(filePath, `${JSON.stringify(config, null, 2)}
+`, { mode: 384 });
+  fs.chmodSync(filePath, 384);
+}
+function configureContainerRegistryAuth(credential) {
+  containerRegistryCredential = credential;
+  if (!credential) {
+    return;
+  }
+  writeRegistryAuthFile(dockerConfigPath(), credential);
+  writeRegistryAuthFile(containersAuthPath(), credential);
+  if (credential.missingScopes.length > 0) {
+    process.stderr.write(
+      `[r5d-worker] GitHub token is missing GHCR scope(s): ${credential.missingScopes.join(", ")}. Sign in with GitHub again if GHCR push/pull fails.
+`
+    );
+  } else {
+    process.stdout.write(`[r5d-worker] configured GHCR auth for ${credential.username}
+`);
+  }
+}
+function containerRegistryEnv() {
+  if (!containerRegistryCredential) {
+    return {};
+  }
+  return {
+    R5D_GHCR_REGISTRY: containerRegistryCredential.registry,
+    R5D_GHCR_NAMESPACE: containerRegistryCredential.username,
+    R5D_GHCR_AUTH_FILE: containersAuthPath(),
+    REGISTRY_AUTH_FILE: containersAuthPath(),
+    GHCR_REGISTRY: containerRegistryCredential.registry,
+    GHCR_NAMESPACE: containerRegistryCredential.username
+  };
+}
 function checkoutVisibleBranch(input) {
   const branchExists = tryGit(["show-ref", "--verify", "--quiet", `refs/heads/${input.branchName}`], { cwd: input.branchPath });
   const remoteBranchExists = tryGit(["show-ref", "--verify", "--quiet", `refs/remotes/origin/${input.branchName}`], {
@@ -865,6 +928,7 @@ async function executeCommand(input) {
       stderr: "pipe",
       env: {
         ...process.env,
+        ...containerRegistryEnv(),
         ...input.message.env ?? {}
       }
     });
@@ -1111,6 +1175,7 @@ function openPty(input) {
         cwd: branchPath.branchPath,
         env: {
           ...process.env,
+          ...containerRegistryEnv(),
           ...input.message.env ?? {},
           BUILD_IT_NOW_PROJECT_ID: input.projectId,
           BUILD_IT_NOW_BRANCH_NAME: input.message.branchName
@@ -1251,6 +1316,7 @@ async function startWorker(options) {
         return;
       }
       if (message.type === "project_manifest") {
+        configureContainerRegistryAuth(message.githubContainerRegistry);
         manifestByProjectId.clear();
         for (const project of message.projects) {
           manifestByProjectId.set(project.projectId, project);

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "type": "module"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "type": "module",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/mjs/main.mjs",