jackherd 1.15.1 → 1.16.0

package/src/watch/watched-source.ts

@@ -0,0 +1,39 @@
+import { TONE_NAMES, type ToneName } from '../config/tones'
+import { isRecord } from '../shared/is-record'
+import { SOURCE_SHOW, type SourceSettings, type SourceShow } from './sources'
+
+/**
+ * What the herd needs of a source, as the watcher writes it into its state: its name, the `label` and `tone` it is
+ * drawn with, whether its entries are tickets, its lane and how it shows its entries; null where the config sets none.
+ */
+export type WatchedSource = {
+  name: string
+  label: string | null
+  tone: ToneName | null
+  ticket: boolean
+  lane: string | null
+  show: SourceShow | null
+}
+
+export const watchedSourceOf = ({ name, label, tone, ticket, lane, show }: SourceSettings): WatchedSource => ({
+  name,
+  label: label ?? null,
+  tone: tone ?? null,
+  ticket: ticket === true,
+  lane: lane ?? null,
+  show: show ?? null,
+})
+
+const isTextOrNull = (value: unknown): boolean => value === null || typeof value === 'string'
+
+const isOneOfOrNull = (values: readonly string[], value: unknown): boolean =>
+  value === null || (typeof value === 'string' && values.includes(value))
+
+export const isWatchedSource = (value: unknown): value is WatchedSource =>
+  isRecord(value) &&
+  typeof value.name === 'string' &&
+  isTextOrNull(value.label) &&
+  isOneOfOrNull(TONE_NAMES, value.tone) &&
+  typeof value.ticket === 'boolean' &&
+  isTextOrNull(value.lane) &&
+  isOneOfOrNull(Object.values(SOURCE_SHOW), value.show)

package/src/watch/watcher-lock.ts

@@ -85,6 +85,9 @@ export const repositoryKey = (root: string): string => {
 /** How long the herd trusts a command line `ps` gave for a process ID that is still alive. */
 const PS_CACHE_MS = 30_000
 
+/** Longest a `ps` call may take before it counts as no answer. */
+const PS_TIMEOUT_MS = 2000
+
 /** The command line from `/proc/<pid>/cmdline`, its arguments blank-separated; null where there is no `/proc` or no such process. */
 export const procCommandLine: CommandLineOf = (pid) => {
   try {
@@ -95,7 +98,11 @@ export const procCommandLine: CommandLineOf = (pid) => {
 }
 
 const psCommandLine: CommandLineOf = (pid) => {
-  const result = Bun.spawnSync(['ps', '-o', 'command=', '-p', String(pid)], { stdout: 'pipe', stderr: 'ignore' })
+  const result = Bun.spawnSync(['ps', '-o', 'command=', '-p', String(pid)], {
+    stdout: 'pipe',
+    stderr: 'ignore',
+    timeout: PS_TIMEOUT_MS,
+  })
   return result.exitCode === 0 ? result.stdout.toString().trim() || null : null
 }