@forgehive/task 0.2.6 → 0.3.0

package/src/index.ts

@@ -156,9 +156,16 @@ export interface TaskInstanceType<Func extends BaseFunction = BaseFunction, B ex
 // Define a type for the accumulated boundary data
 type BoundaryData = Array<{input: unknown[], output?: unknown}>
 
-// Helper type to infer schema type
+// Helper type to infer schema type.
+// An empty schema infers to `{ [k: string]: never }` under zod 4; that falls back
+// to a loose record so tasks can still receive pass-through arguments that aren't
+// declared in the schema.
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type InferSchemaType<S> = S extends Schema<any> ? InferSchema<S> : Record<string, unknown>;
+export type InferSchemaType<S> = S extends Schema<any>
+  ? InferSchema<S> extends Record<string, never>
+    ? Record<string, unknown>
+    : InferSchema<S>
+  : Record<string, unknown>;
 
 // Type for execution record boundaries that are automatically injected
 // When adding new execution boundaries, add their types here
@@ -343,28 +350,17 @@ export const Task = class Task<
     return result.success ?? false
   }
 
-  // Helper method to check if schema is empty
+  // Helper method to check if schema is empty.
+  // Uses the schema's JSON Schema description (the public contract) rather than
+  // reaching into zod internals, so it stays correct across zod versions.
   public _isEmptySchema(): boolean {
     if (!this._schema) {
       return false
     }
 
-    // Access the underlying Zod schema and get the shape
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const zodSchema = (this._schema as any).schema
-    if (!zodSchema || !zodSchema._def) {
-      return false
-    }
-
-    const shapeFn = zodSchema._def.shape
-    if (typeof shapeFn !== 'function') {
-      return false
-    }
-
-    const shape = shapeFn()
-    const isEmpty = Object.keys(shape).length === 0
+    const properties = this._schema.describe().properties
 
-    return isEmpty
+    return !properties || Object.keys(properties).length === 0
   }
 
   // Posible improvement to handle multiple listeners, but so far its not needed
@@ -580,7 +576,7 @@ export const Task = class Task<
     if (this._schema) {
       const validation = this._schema.safeParse(normalizedInput)
       if (!validation.success) {
-        const errorDetails = validation.error?.errors.map(err =>
+        const errorDetails = validation.error?.issues.map(err =>
           `${err.path.join('.')}: ${err.message}`
         ).join(', ')
 
@@ -742,7 +738,7 @@ export const Task = class Task<
     if (this._schema) {
       const validation = this._schema.safeParse(argv)
       if (!validation.success) {
-        const errorDetails = validation.error?.errors.map(err =>
+        const errorDetails = validation.error?.issues.map(err =>
           `${err.path.join('.')}: ${err.message}`
         ).join(', ')
 
@@ -834,7 +830,7 @@ export const Task = class Task<
     if (this._schema) {
       const validation = this._schema.safeParse(eventArgs)
       if (!validation.success) {
-        const errorDetails = validation.error?.errors.map(err =>
+        const errorDetails = validation.error?.issues.map(err =>
           `${err.path.join('.')}: ${err.message}`
         ).join(', ')
 
@@ -846,7 +842,7 @@ export const Task = class Task<
           statusCode: 422,
           body: JSON.stringify({
             error: errorMessage,
-            details: validation.error?.errors
+            details: validation.error?.issues
           })
         }
       }
@@ -896,19 +892,58 @@ export const Task = class Task<
     const apiKey = process.env.HIVE_API_KEY
     const apiSecret = process.env.HIVE_API_SECRET
     const host = process.env.HIVE_HOST
-    const projectName = process.env.HIVE_PROJECT_NAME
-
 
     // If any required env vars are missing, do nothing
-    if (!apiKey || !apiSecret || !host || !projectName) {
+    if (!apiKey || !apiSecret || !host) {
+      // eslint-disable-next-line no-console
+      console.log('Missing required env vars for sending log to Hive:', { apiKey: !!apiKey, apiSecret: !!apiSecret, host })
+      return
+    }
+
+    // Load forge.json for UUID-based logging
+    let projectUuid: string | null = null
+    let taskUuid: string | null = null
+
+    try {
+      // eslint-disable-next-line @typescript-eslint/no-var-requires
+      const fs = require('fs')
+      const forgeJsonContent = fs.readFileSync('./forge.json', 'utf8')
+      const forgeConfig = JSON.parse(forgeJsonContent)
+
+      projectUuid = forgeConfig.project?.uuid
+
+      // Find task UUID by matching task name
+      const taskName = this._name || process.env.HIVE_TASK_NAME || 'unnamed-task'
+      if (forgeConfig.tasks && forgeConfig.tasks[taskName]) {
+        taskUuid = forgeConfig.tasks[taskName].uuid
+      }
+
+      // eslint-disable-next-line no-console
+      console.log('Loaded forge.json for logging:', { projectUuid: !!projectUuid, taskUuid: !!taskUuid, taskName })
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.log('Could not load forge.json, skipping log send:', error instanceof Error ? error.message : 'Unknown error')
+      return
+    }
+
+    // Require both UUIDs for logging
+    if (!projectUuid || !taskUuid) {
       // eslint-disable-next-line no-console
-      console.log('Missing required env vars for sending log to Hive:', { apiKey, apiSecret, host, projectName })
+      console.log('Missing project or task UUID, skipping log send')
       return
     }
 
-    // eslint-disable-next-line no-console
-    console.log('Sending log to Hive:', log)
+    await this._sendToHiveWithUuid(log, projectUuid, taskUuid, apiKey, apiSecret, host)
+  }
 
+  async _sendToHiveWithUuid(
+    log: ExecutionRecord<Parameters<Func>[0], ReturnType<Func>, B>,
+    projectUuid: string,
+    taskUuid: string,
+    apiKey: string,
+    apiSecret: string,
+    host: string
+  ): Promise<void> {
     return new Promise<void>((resolve) => {
       try {
         // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -917,17 +952,23 @@ export const Task = class Task<
         const http = require('http')
         // eslint-disable-next-line @typescript-eslint/no-var-requires
         const url = require('url')
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const { v7: uuidv7 } = require('uuid')
 
-        const logsUrl = `${host}/api/tasks/log-ingest`
-        // eslint-disable-next-line no-console
-        console.log('logsUrl', logsUrl)
+        const logsUrl = `${host}/api/log-ingest`
         const parsedUrl = url.parse(logsUrl)
         const authToken = `${apiKey}:${apiSecret}`
 
+        // Ensure log has UUID for the new endpoint
+        const logWithUuid = {
+          ...log,
+          uuid: log.uuid || uuidv7()
+        }
+
         const postData = JSON.stringify({
-          projectName,
-          taskName: process.env.HIVE_TASK_NAME || this._fn.name || 'unnamed-task',
-          logItem: JSON.stringify(log)
+          projectUuid,
+          taskUuid,
+          logItem: JSON.stringify(logWithUuid)
         })
 
         const options = {
@@ -947,12 +988,9 @@ export const Task = class Task<
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const req = client.request(options, (res: any) => {
           // eslint-disable-next-line no-console
-          console.log('Hive API response status:', res.statusCode)
-          // eslint-disable-next-line no-console
-          console.log('Hive API response headers:', res.headers)
+          console.log('Hive UUID API response status:', res.statusCode)
 
           let responseData = ''
-
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
           res.on('data', (chunk: any) => {
             responseData += chunk
@@ -960,33 +998,34 @@ export const Task = class Task<
 
           res.on('end', () => {
             // eslint-disable-next-line no-console
-            console.log('Hive API response body:', responseData)
+            console.log('Hive UUID API response body:', responseData)
             if (res.statusCode >= 200 && res.statusCode < 300) {
               // eslint-disable-next-line no-console
-              console.log('Successfully sent log to Hive')
+              console.log('Successfully sent log to Hive using UUID endpoint')
             } else {
               // eslint-disable-next-line no-console
-              console.error('Hive API error - Status:', res.statusCode, 'Body:', responseData)
+              console.error('Hive UUID API error - Status:', res.statusCode, 'Body:', responseData)
             }
-            resolve() // Resolve the promise when request completes
+            resolve()
           })
         })
 
         req.on('error', (error: Error) => {
           // eslint-disable-next-line no-console
-          console.error('Failed to send log to Hive - Request error:', error.message)
-          resolve() // Resolve even on error to not block the handler
+          console.error('Failed to send log to Hive UUID endpoint - Request error:', error.message)
+          resolve()
         })
 
         req.write(postData)
         req.end()
       } catch (error) {
         // eslint-disable-next-line no-console
-        console.error('Failed to send log to Hive:', error instanceof Error ? error.message : 'Unknown error')
-        resolve() // Resolve even on error to not block the handler
+        console.error('Failed to send log to Hive UUID endpoint:', error instanceof Error ? error.message : 'Unknown error')
+        resolve()
       }
     })
   }
+
 }
 
 /**

package/src/test/safe-replay.test.ts

@@ -1,4 +1,4 @@
-import { Schema } from '@forgehive/schema'
+import { Schema, z } from '@forgehive/schema'
 import { createTask, ExecutionRecord, getExecutionRecordType } from '../index'
 
 describe('safeReplay functionality tests', () => {
@@ -16,9 +16,8 @@ describe('safeReplay functionality tests', () => {
     fetchData: (ticker: string) => Promise<number>
   }
 
-  // ToDo: Add correct type for schema and getTickerPrice
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let schema: Schema<Record<string, any>>
+  // ToDo: Add correct type for getTickerPrice
+  let schema: Schema<{ ticker: z.ZodString }>
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let getTickerPrice: any // Using any temporarily until we implement safeReplay
 

package/src/test/validation.test.ts

@@ -36,7 +36,7 @@ describe('Validation tests', () => {
     } catch (e) {
       const error = e as Error
 
-      expect(error.message).toEqual('Invalid input on: value: Expected number, received null')
+      expect(error.message).toEqual('Invalid input on: value: Invalid input: expected number, received null')
     }
   })
 
@@ -49,7 +49,7 @@ describe('Validation tests', () => {
       const error = e as Error
 
       // Test the error message format
-      expect(error.message).toEqual('Invalid input on: value: Expected number, received string')
+      expect(error.message).toEqual('Invalid input on: value: Invalid input: expected number, received string')
     }
   })
 
@@ -93,7 +93,7 @@ describe('Validation tests on param', () => {
       expect('no error thrown').toBeUndefined()
     } catch (e) {
       const error = e as Error
-      expect(error.message).toEqual('Invalid input on: name: Expected string, received null')
+      expect(error.message).toEqual('Invalid input on: name: Invalid input: expected string, received null')
     }
   })
 
@@ -127,7 +127,7 @@ describe('Validation multiple values tests', () => {
       expect('no error thrown').toBeUndefined()
     } catch (e) {
       const error = e as Error
-      expect(error.message).toEqual('Invalid input on: value: Expected number, received null, increment: Required')
+      expect(error.message).toEqual('Invalid input on: value: Invalid input: expected number, received null, increment: Invalid input: expected number, received undefined')
     }
   })
 
@@ -138,7 +138,7 @@ describe('Validation multiple values tests', () => {
       expect('no error thrown').toBeUndefined()
     } catch (e) {
       const error = e as Error
-      expect(error.message).toEqual('Invalid input on: increment: Required')
+      expect(error.message).toEqual('Invalid input on: increment: Invalid input: expected number, received undefined')
     }
   })
 
@@ -163,7 +163,11 @@ describe('Get Schema', () => {
     const schema = add2.getSchema()
     const schemaDescription = schema?.describe() ?? {}
 
-    expect(JSON.stringify(schemaDescription)).toBe('{"value":{"type":"number"}}')
+    expect(schemaDescription).toMatchObject({
+      type: 'object',
+      properties: { value: { type: 'number' } },
+      required: ['value']
+    })
   })
 
   it('Empty object as string', async () => {
@@ -190,7 +194,11 @@ describe('Set Schema', () => {
     const schema = add2.getSchema()
     const schemaDescription = schema?.describe() ?? {}
 
-    expect(JSON.stringify(schemaDescription)).toBe('{"value":{"type":"number"}}')
+    expect(schemaDescription).toMatchObject({
+      type: 'object',
+      properties: { value: { type: 'number' } },
+      required: ['value']
+    })
   })
 
   it('Empty object as string', async () => {
@@ -230,9 +238,9 @@ describe('Multiple validation errors', () => {
       const error = e as Error
       // Test that multiple errors are reported
       expect(error.message).toContain('Invalid input on')
-      expect(error.message).toContain('name: Expected string, received number')
-      expect(error.message).toContain('age: Expected number, received string')
-      expect(error.message).toContain('email: Invalid email')
+      expect(error.message).toContain('name: Invalid input: expected string, received number')
+      expect(error.message).toContain('age: Invalid input: expected number, received string')
+      expect(error.message).toContain('email: Invalid email address')
     }
   })
 })
@@ -274,7 +282,7 @@ describe('Array validation tests', () => {
       expect('no error thrown').toBeUndefined()
     } catch (e) {
       const error = e as Error
-      expect(error.message).toEqual('Invalid input on: tags: Expected array, received string')
+      expect(error.message).toEqual('Invalid input on: tags: Invalid input: expected array, received string')
     }
   })
 
@@ -286,8 +294,8 @@ describe('Array validation tests', () => {
     } catch (e) {
       const error = e as Error
       expect(error.message).toContain('Invalid input on')
-      expect(error.message).toContain('tags.1: Expected string, received number')
-      expect(error.message).toContain('tags.2: Expected string, received boolean')
+      expect(error.message).toContain('tags.1: Invalid input: expected string, received number')
+      expect(error.message).toContain('tags.2: Invalid input: expected string, received boolean')
     }
   })
 
@@ -342,7 +350,7 @@ describe('MixedRecord validation tests', () => {
       expect('no error thrown').toBeUndefined()
     } catch (e) {
       const error = e as Error
-      expect(error.message).toEqual('Invalid input on: metadata: Expected object, received string')
+      expect(error.message).toEqual('Invalid input on: metadata: Invalid input: expected record, received string')
     }
   })
 

package/dist/test/integration-enhanced-records.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=integration-enhanced-records.test.d.ts.map

package/dist/test/integration-enhanced-records.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"integration-enhanced-records.test.d.ts","sourceRoot":"","sources":["../../src/test/integration-enhanced-records.test.ts"],"names":[],"mappings":""}