github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-10 10:22:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Enable "curly" rule to avoid single-statement if confusion/errors.

Browse Source
This commit is contained in:
cpojer
2026-01-31 16:19:20 +09:00
parent 009b16fab8
commit 5ceff756e1
1266 changed files with 27871 additions and 9393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
src/infra/heartbeat-runner.ts
View File

@@ -115,13 +115,19 @@ function resolveActiveHoursTimezone(cfg: OpenClawConfig, raw?: string): string {
}
function parseActiveHoursTime(opts: { allow24: boolean }, raw?: string): number | null {
if (!raw || !ACTIVE_HOURS_TIME_PATTERN.test(raw)) return null;
if (!raw || !ACTIVE_HOURS_TIME_PATTERN.test(raw)) {
return null;
}
const [hourStr, minuteStr] = raw.split(":");
const hour = Number(hourStr);
const minute = Number(minuteStr);
if (!Number.isFinite(hour) || !Number.isFinite(minute)) return null;
if (!Number.isFinite(hour) || !Number.isFinite(minute)) {
return null;
}
if (hour === 24) {
if (!opts.allow24 || minute !== 0) return null;
if (!opts.allow24 || minute !== 0) {
return null;
}
return 24 * 60;
}
return hour * 60 + minute;
@@ -137,11 +143,15 @@ function resolveMinutesInTimeZone(nowMs: number, timeZone: string): number | nul
}).formatToParts(new Date(nowMs));
const map: Record<string, string> = {};
for (const part of parts) {
if (part.type !== "literal") map[part.type] = part.value;
if (part.type !== "literal") {
map[part.type] = part.value;
}
}
const hour = Number(map.hour);
const minute = Number(map.minute);
if (!Number.isFinite(hour) || !Number.isFinite(minute)) return null;
if (!Number.isFinite(hour) || !Number.isFinite(minute)) {
return null;
}
return hour * 60 + minute;
} catch {
return null;
@@ -154,16 +164,24 @@ function isWithinActiveHours(
nowMs?: number,
): boolean {
const active = heartbeat?.activeHours;
if (!active) return true;
if (!active) {
return true;
}
const startMin = parseActiveHoursTime({ allow24: false }, active.start);
const endMin = parseActiveHoursTime({ allow24: true }, active.end);
if (startMin === null || endMin === null) return true;
if (startMin === endMin) return true;
if (startMin === null || endMin === null) {
return true;
}
if (startMin === endMin) {
return true;
}
const timeZone = resolveActiveHoursTimezone(cfg, active.timezone);
const currentMin = resolveMinutesInTimeZone(nowMs ?? Date.now(), timeZone);
if (currentMin === null) return true;
if (currentMin === null) {
return true;
}
if (endMin > startMin) {
return currentMin >= startMin && currentMin < endMin;
@@ -206,9 +224,13 @@ function resolveHeartbeatConfig(
agentId?: string,
): HeartbeatConfig | undefined {
const defaults = cfg.agents?.defaults?.heartbeat;
if (!agentId) return defaults;
if (!agentId) {
return defaults;
}
const overrides = resolveAgentConfig(cfg, agentId)?.heartbeat;
if (!defaults && !overrides) return overrides;
if (!defaults && !overrides) {
return overrides;
}
return { ...defaults, ...overrides };
}
@@ -285,16 +307,22 @@ export function resolveHeartbeatIntervalMs(
heartbeat?.every ??
cfg.agents?.defaults?.heartbeat?.every ??
DEFAULT_HEARTBEAT_EVERY;
if (!raw) return null;
if (!raw) {
return null;
}
const trimmed = String(raw).trim();
if (!trimmed) return null;
if (!trimmed) {
return null;
}
let ms: number;
try {
ms = parseDurationMs(trimmed, { defaultUnit: "m" });
} catch {
return null;
}
if (ms <= 0) return null;
if (ms <= 0) {
return null;
}
return ms;
}
@@ -363,11 +391,17 @@ function resolveHeartbeatSession(
function resolveHeartbeatReplyPayload(
replyResult: ReplyPayload | ReplyPayload[] | undefined,
): ReplyPayload | undefined {
if (!replyResult) return undefined;
if (!Array.isArray(replyResult)) return replyResult;
if (!replyResult) {
return undefined;
}
if (!Array.isArray(replyResult)) {
return replyResult;
}
for (let idx = replyResult.length - 1; idx >= 0; idx -= 1) {
const payload = replyResult[idx];
if (!payload) continue;
if (!payload) {
continue;
}
if (payload.text || payload.mediaUrl || (payload.mediaUrls && payload.mediaUrls.length > 0)) {
return payload;
}
@@ -391,17 +425,27 @@ async function restoreHeartbeatUpdatedAt(params: {
updatedAt?: number;
}) {
const { storePath, sessionKey, updatedAt } = params;
if (typeof updatedAt !== "number") return;
if (typeof updatedAt !== "number") {
return;
}
const store = loadSessionStore(storePath);
const entry = store[sessionKey];
if (!entry) return;
if (!entry) {
return;
}
const nextUpdatedAt = Math.max(entry.updatedAt ?? 0, updatedAt);
if (entry.updatedAt === nextUpdatedAt) return;
if (entry.updatedAt === nextUpdatedAt) {
return;
}
await updateSessionStore(storePath, (nextStore) => {
const nextEntry = nextStore[sessionKey] ?? entry;
if (!nextEntry) return;
if (!nextEntry) {
return;
}
const resolvedUpdatedAt = Math.max(nextEntry.updatedAt ?? 0, updatedAt);
if (nextEntry.updatedAt === resolvedUpdatedAt) return;
if (nextEntry.updatedAt === resolvedUpdatedAt) {
return;
}
nextStore[sessionKey] = { ...nextEntry, updatedAt: resolvedUpdatedAt };
});
}
@@ -525,7 +569,9 @@ export async function runHeartbeatOnce(opts: {
visibility.showOk && delivery.channel !== "none" && delivery.to,
);
const maybeSendHeartbeatOk = async () => {
if (!canAttemptHeartbeatOk || delivery.channel === "none" || !delivery.to) return false;
if (!canAttemptHeartbeatOk || delivery.channel === "none" || !delivery.to) {
return false;
}
const heartbeatPlugin = getChannelPlugin(delivery.channel);
if (heartbeatPlugin?.heartbeat?.checkReady) {
const readiness = await heartbeatPlugin.heartbeat.checkReady({
@@ -533,7 +579,9 @@ export async function runHeartbeatOnce(opts: {
accountId: delivery.accountId,
deps: opts.deps,
});
if (!readiness.ok) return false;
if (!readiness.ok) {
return false;
}
}
await deliverOutboundPayloads({
cfg,
@@ -785,18 +833,26 @@ export function startHeartbeatRunner(opts: {
};
const scheduleNext = () => {
if (state.stopped) return;
if (state.stopped) {
return;
}
if (state.timer) {
clearTimeout(state.timer);
state.timer = null;
}
if (state.agents.size === 0) return;
if (state.agents.size === 0) {
return;
}
const now = Date.now();
let nextDue = Number.POSITIVE_INFINITY;
for (const agent of state.agents.values()) {
if (agent.nextDueMs < nextDue) nextDue = agent.nextDueMs;
if (agent.nextDueMs < nextDue) {
nextDue = agent.nextDueMs;
}
}
if (!Number.isFinite(nextDue)) {
return;
}
if (!Number.isFinite(nextDue)) return;
const delay = Math.max(0, nextDue - now);
state.timer = setTimeout(() => {
requestHeartbeatNow({ reason: "interval", coalesceMs: 0 });
@@ -805,7 +861,9 @@ export function startHeartbeatRunner(opts: {
};
const updateConfig = (cfg: OpenClawConfig) => {
if (state.stopped) return;
if (state.stopped) {
return;
}
const now = Date.now();
const prevAgents = state.agents;
const prevEnabled = prevAgents.size > 0;
@@ -813,7 +871,9 @@ export function startHeartbeatRunner(opts: {
const intervals: number[] = [];
for (const agent of resolveHeartbeatAgents(cfg)) {
const intervalMs = resolveHeartbeatIntervalMs(cfg, undefined, agent.heartbeat);
if (!intervalMs) continue;
if (!intervalMs) {
continue;
}
intervals.push(intervalMs);
const prevState = prevAgents.get(agent.agentId);
const nextDueMs = resolveNextDue(now, intervalMs, prevState);
@@ -880,11 +940,15 @@ export function startHeartbeatRunner(opts: {
agent.lastRunMs = now;
agent.nextDueMs = now + agent.intervalMs;
}
if (res.status === "ran") ran = true;
if (res.status === "ran") {
ran = true;
}
}
scheduleNext();
if (ran) return { status: "ran", durationMs: Date.now() - startedAt };
if (ran) {
return { status: "ran", durationMs: Date.now() - startedAt };
}
return { status: "skipped", reason: isInterval ? "not-due" : "disabled" };
};
@@ -894,7 +958,9 @@ export function startHeartbeatRunner(opts: {
const cleanup = () => {
state.stopped = true;
setHeartbeatWakeHandler(null);
if (state.timer) clearTimeout(state.timer);
if (state.timer) {
clearTimeout(state.timer);
}
state.timer = null;
};