Merge pull request #133 from nimiq/fix/cron-sync-bundled-import

fix(sync): bundle validators and fail cron

Author: onmax

package.json

@@ -13,7 +13,7 @@
     "dev:testnet:prod": "nr dev:packages && nuxt dev --remote=production --dotenv .env.testnet",
     "dev:local": "nr dev:packages && nuxt dev --dotenv .env.local",
     "dev:packages": "nr -C packages -r dev",
-    "build": "nr -r build && nuxt build",
+    "build": "pnpm validators:bundle:generate && nr -r build && nuxt build",
     "generate": "nuxt generate",
     "preview": "npx wrangler --cwd .output dev",
     "postinstall": "nuxt prepare",
@@ -28,7 +28,8 @@
     "db:apply:cron-runs:mainnet": "wrangler d1 execute validators-api-mainnet --remote --yes --command \"CREATE TABLE IF NOT EXISTS cron_runs (id integer PRIMARY KEY AUTOINCREMENT NOT NULL, cron text NOT NULL, network text NOT NULL, git_branch text, started_at text NOT NULL, finished_at text, status text NOT NULL, error_message text, meta text);\" && wrangler d1 execute validators-api-mainnet --remote --yes --command \"CREATE INDEX IF NOT EXISTS idx_cron_runs_started_at ON cron_runs (started_at);\"",
     "db:apply:cron-runs:testnet": "wrangler d1 execute validators-api-testnet --remote --yes --command \"CREATE TABLE IF NOT EXISTS cron_runs (id integer PRIMARY KEY AUTOINCREMENT NOT NULL, cron text NOT NULL, network text NOT NULL, git_branch text, started_at text NOT NULL, finished_at text, status text NOT NULL, error_message text, meta text);\" && wrangler d1 execute validators-api-testnet --remote --yes --command \"CREATE INDEX IF NOT EXISTS idx_cron_runs_started_at ON cron_runs (started_at);\"",
     "release": "bumpp -r && nr -r publish",
-    "validate:json-files": "tsx scripts/validate-json-files.ts"
+    "validate:json-files": "tsx scripts/validate-json-files.ts",
+    "validators:bundle:generate": "tsx scripts/generate-validators-bundle.ts"
   },
   "dependencies": {
     "@nimiq/core": "catalog:",

scripts/generate-validators-bundle.ts

@@ -0,0 +1,73 @@
+import type { ValidatorJSON } from '../server/utils/schemas'
+import { mkdir, readdir, readFile, writeFile } from 'node:fs/promises'
+import { join, resolve } from 'node:path'
+import process from 'node:process'
+import { validatorSchema } from '../server/utils/schemas'
+
+const NETWORKS = ['main-albatross', 'test-albatross'] as const
+type Network = (typeof NETWORKS)[number]
+
+async function loadValidatorsForNetwork(rootDir: string, network: Network): Promise<ValidatorJSON[]> {
+  const validatorsDir = join(rootDir, 'public', 'validators', network)
+  const entries = await readdir(validatorsDir, { withFileTypes: true })
+  const files = entries
+    .filter(entry => entry.isFile())
+    .map(entry => entry.name)
+    .filter(name => name.endsWith('.json') && !name.endsWith('.example.json'))
+    .sort((a, b) => a.localeCompare(b))
+
+  if (files.length === 0)
+    throw new Error(`No validator files found in ${validatorsDir}`)
+
+  const validators: ValidatorJSON[] = []
+  for (const file of files) {
+    const filePath = join(validatorsDir, file)
+    const raw = await readFile(filePath, 'utf8')
+
+    let parsedJson: unknown
+    try {
+      parsedJson = JSON.parse(raw)
+    }
+    catch (error) {
+      throw new Error(`Invalid JSON at ${filePath}: ${String(error)}`)
+    }
+
+    const parsedValidator = validatorSchema.safeParse(parsedJson)
+    if (!parsedValidator.success)
+      throw new Error(`Invalid validator JSON at ${network}/${file}: ${parsedValidator.error}`)
+
+    validators.push(parsedValidator.data)
+  }
+
+  return validators
+}
+
+function createManifestSource(validatorsByNetwork: Record<Network, ValidatorJSON[]>): string {
+  const serialized = JSON.stringify(validatorsByNetwork, null, 2)
+  return `/* eslint-disable style/quotes, style/quote-props, style/comma-dangle */
+import type { ValidatorJSON } from '../utils/schemas'
+
+// This file is auto-generated by scripts/generate-validators-bundle.ts.
+// Do not edit manually.
+export const bundledValidatorsByNetwork = ${serialized} as unknown as Record<'main-albatross' | 'test-albatross', ValidatorJSON[]>
+`
+}
+
+async function main() {
+  const rootDir = resolve(process.cwd())
+  const outputDir = join(rootDir, 'server', 'generated')
+  const outputFile = join(outputDir, 'validators-bundle.generated.ts')
+
+  const entries = await Promise.all(NETWORKS.map(async network => [network, await loadValidatorsForNetwork(rootDir, network)] as const))
+  const validatorsByNetwork = Object.fromEntries(entries) as Record<Network, ValidatorJSON[]>
+
+  await mkdir(outputDir, { recursive: true })
+  await writeFile(outputFile, createManifestSource(validatorsByNetwork), 'utf8')
+  console.log(`[validators-bundle] generated ${outputFile}`)
+}
+
+main().catch((error) => {
+  console.error('[validators-bundle] failed to generate bundle')
+  console.error(error)
+  process.exitCode = 1
+})

server/generated/validators-bundle.generated.ts

@@ -3,9 +3,26 @@ import { consola } from 'consola'
 import { runTask } from 'nitropack/runtime'
 import { eq, tables, useDrizzle } from '~~/server/utils/drizzle'
 
-const CRON_EXPRESSION = '0 */12 * * *'
+const CRON_EXPRESSION = '0 * * * *'
 const TASKS: string[] = ['sync:epochs', 'sync:snapshot']
 
+interface FailedTask {
+  name: string
+  error: unknown
+}
+
+class CronTaskFailureError extends Error {
+  readonly failedTasks: FailedTask[]
+  readonly results: Record<string, unknown>
+
+  constructor(message: string, failedTasks: FailedTask[], results: Record<string, unknown>) {
+    super(message)
+    this.name = 'CronTaskFailureError'
+    this.failedTasks = failedTasks
+    this.results = results
+  }
+}
+
 function toErrorString(error: unknown) {
   if (error instanceof Error)
     return `${error.message}${error.stack ? `\n${error.stack}` : ''}`
@@ -58,6 +75,12 @@ export default defineTask({
           throw new Error(`${taskName} failed: ${result.error || 'unknown'}`)
       }
 
+      const failedTasks = Object.entries(results)
+        .filter(([, r]) => (r as any)?.success === false)
+        .map(([name, r]) => ({ name, error: (r as any)?.error ?? 'Unknown task failure' }))
+      if (failedTasks.length > 0)
+        throw new CronTaskFailureError(`Task failures: ${JSON.stringify(failedTasks)}`, failedTasks, results)
+
       if (cronRunId) {
         try {
           await useDrizzle()
@@ -85,6 +108,16 @@ export default defineTask({
     catch (error) {
       const errorMessage = toErrorString(error)
       consola.error('[cron:sync] failed', error)
+      const meta: Record<string, unknown> = {
+        cron: CRON_EXPRESSION,
+        network: nimiqNetwork,
+        tasks: TASKS,
+      }
+
+      if (error instanceof CronTaskFailureError) {
+        meta.results = error.results
+        meta.failedTasks = error.failedTasks
+      }
 
       if (cronRunId) {
         try {
@@ -94,11 +127,7 @@ export default defineTask({
               finishedAt: new Date().toISOString(),
               status: 'error',
               errorMessage,
-              meta: {
-                cron: CRON_EXPRESSION,
-                network: nimiqNetwork,
-                tasks: TASKS,
-              },
+              meta,
             })
             .where(eq(tables.cronRuns.id, cronRunId))
             .execute()

server/tasks/cron/sync.ts

@@ -20,7 +20,7 @@ export default defineTask({
 
       const [importSuccess, errorImport, importData] = await importValidatorsBundled(nimiqNetwork)
       if (!importSuccess || !importData) {
-        const error = new Error(errorImport || 'Unable to import validators')
+        const error = new Error(errorImport || 'Unable to import bundled validators')
         await sendSyncFailureNotification('snapshot', error)
         return { result: { success: false, error: errorImport } }
       }

server/tasks/sync/snapshot.ts

@@ -1,60 +1,33 @@
 import type { Result } from 'nimiq-validator-trustscore/types'
 import type { ValidatorJSON } from './schemas'
-import { readdirSync } from 'node:fs'
-import { join } from 'node:path'
-import process from 'node:process'
+import { bundledValidatorsByNetwork } from '../generated/validators-bundle.generated'
 import { validatorSchema } from './schemas'
 import { storeValidator } from './validators'
 
 interface ImportValidatorsBundledOptions {
   shouldStore?: boolean
 }
 
-// In dev, Nitro's asset storage doesn't enumerate files via getKeys().
-// We list them from the filesystem and then read via storage.
-function getValidatorKeys(nimiqNetwork: string): string[] {
-  if (import.meta.dev) {
-    try {
-      const dir = join(process.cwd(), 'server', 'assets', 'validators', nimiqNetwork)
-      return readdirSync(dir)
-        .filter(f => f.endsWith('.json') && !f.endsWith('.example.json'))
-        .map(f => `${nimiqNetwork}:${f}`)
-    }
-    catch { return [] }
-  }
-  return []
-}
-
 export async function importValidatorsBundled(nimiqNetwork?: string, options: ImportValidatorsBundledOptions = {}): Result<ValidatorJSON[]> {
   if (!nimiqNetwork)
     return [false, 'Nimiq network is required', undefined]
 
   const { shouldStore = true } = options
-  const storage = useStorage('assets:server:validators')
-
-  // Try storage getKeys first (works in production), fall back to filesystem (dev)
-  let keys = await storage.getKeys(`${nimiqNetwork}`)
-  if (keys.length === 0)
-    keys = getValidatorKeys(nimiqNetwork)
+  const bundledValidators = bundledValidatorsByNetwork[nimiqNetwork as keyof typeof bundledValidatorsByNetwork]
+  if (!bundledValidators || bundledValidators.length === 0)
+    return [false, `No bundled validators found for network: ${nimiqNetwork}`, undefined]
 
   const validators: ValidatorJSON[] = []
-  for (const key of keys) {
-    if (!key.endsWith('.json') || key.endsWith('.example.json'))
-      continue
-
-    const data = await storage.getItem(key)
+  for (const data of bundledValidators) {
     const parsed = validatorSchema.safeParse(data)
     if (!parsed.success)
-      return [false, `Invalid validator data at ${key}: ${parsed.error}`, undefined]
+      return [false, `Invalid bundled validator data: ${parsed.error}`, undefined]
     validators.push(parsed.data)
   }
 
   if (!shouldStore)
     return [true, undefined, validators]
 
-  if (validators.length === 0)
-    return [false, `No bundled validators found for network: ${nimiqNetwork}`, undefined]
-
   const results = await Promise.allSettled(validators.map(v => storeValidator(v.address, v, { upsert: true })))
   const failures = results.filter(r => r.status === 'rejected')
   if (failures.length > 0)