fix(utils): resolve circular deps and missing exports in lock utilities

- Moved `withTimeout` and `mergeRelayList` to `src/lock-utils.mjs` as the single source of truth.
- Updated `src/lock-ops.mjs` and `src/lock-publisher.mjs` to import from `src/lock-utils.mjs`.
- Fixed lint errors for duplicate declarations.
- Updated tests (`test/utils.test.mjs`, `test/utils-async.test.mjs`) to import from correct modules.
- Added `randomInt` import in `src/lock-publisher.mjs` to fix `no-undef`.

Co-authored-by: PR0M3TH3AN <[email protected]>

src/lock-ops.mjs

@@ -13,7 +13,6 @@ import { defaultHealthManager, buildRelayHealthConfig, RelayHealthManager } from
 import { publishLock, LockPublisher } from './lock-publisher.mjs';
 import {
   withTimeout,
-  relayListLabel,
   mergeRelayList,
   secureRandom,
 } from './lock-utils.mjs';
@@ -61,20 +60,6 @@ function filterActiveLocks(locks) {
   return locks.filter((lock) => !lock.expiresAt || lock.expiresAt > now);
 }
 
-function withTimeout(promise, timeoutMs, timeoutMessage) {
-  let timeoutHandle;
-  const timeoutPromise = new Promise((_, reject) => {
-    timeoutHandle = setTimeout(() => reject(new Error(timeoutMessage)), timeoutMs);
-  });
-  return Promise.race([promise, timeoutPromise]).finally(() => {
-    if (timeoutHandle) clearTimeout(timeoutHandle);
-  });
-}
-
-function mergeRelayList(primaryRelays, fallbackRelays) {
-  return [...new Set([...primaryRelays, ...fallbackRelays])];
-}
-
 /**
  * Queries relays for active lock events matching the criteria.
  * Uses a tiered approach: tries primary relays first, then falls back to others if needed.

src/lock-publisher.mjs

@@ -6,9 +6,9 @@ import {
   getRelayFallbacks,
   getMinActiveRelayPool,
 } from './torch-config.mjs';
-import { mergeRelayList } from './utils.mjs';
+import { randomInt } from 'node:crypto';
 import { defaultHealthManager, buildRelayHealthConfig } from './relay-health-manager.mjs';
-import { relayListLabel } from './utils.mjs';
+import { relayListLabel, mergeRelayList } from './utils.mjs';
 
 function withTimeout(promise, timeoutMs, timeoutMessage) {
   let timeoutHandle;
@@ -20,10 +20,6 @@ function withTimeout(promise, timeoutMs, timeoutMessage) {
   });
 }
 
-function mergeRelayList(primaryRelays, fallbackRelays) {
-  return [...new Set([...primaryRelays, ...fallbackRelays])];
-}
-
 const PUBLISH_ERROR_CODES = {
   TIMEOUT: 'publish_timeout',
   DNS: 'dns_resolution',

src/lock-utils.mjs

@@ -51,7 +51,15 @@ export async function getCompletedAgents(cadence, logDir, deps) {
   return completed;
 }
 
-export { withTimeout };
+export function withTimeout(promise, timeoutMs, timeoutMessage) {
+  let timeoutHandle;
+  const timeoutPromise = new Promise((_, reject) => {
+    timeoutHandle = setTimeout(() => reject(new Error(timeoutMessage)), timeoutMs);
+  });
+  return Promise.race([promise, timeoutPromise]).finally(() => {
+    if (timeoutHandle) clearTimeout(timeoutHandle);
+  });
+}
 
 export function mergeRelayList(primaryRelays, fallbackRelays) {
   return [...new Set([...primaryRelays, ...fallbackRelays])];

test/utils-async.test.mjs

@@ -1,6 +1,6 @@
 import { describe, it } from 'node:test';
 import assert from 'node:assert';
-import { withTimeout } from '../src/utils.mjs';
+import { withTimeout } from '../src/lock-utils.mjs';
 
 describe('Async Utilities', () => {
   describe('withTimeout', () => {

test/utils.test.mjs

@@ -2,7 +2,7 @@ import { describe, it, after } from 'node:test';
 import assert from 'node:assert';
 import fs from 'node:fs';
 import path from 'node:path';
-import { getIsoWeekStr, todayDateStr, nowUnix, ensureDir, detectPlatform, relayListLabel } from '../src/utils.mjs';
+import { getIsoWeekStr, todayDateStr, nowUnix, ensureDir, detectPlatform, relayListLabel, mergeRelayList } from '../src/utils.mjs';
 
 describe('Date Utilities', () => {
   describe('todayDateStr', () => {