@xyo-network/api-call-witness 3.2.2 → 3.2.4

package/src/Payload/types/ApiCallJsonResult.ts

@@ -5,6 +5,7 @@ import type { Payload } from '@xyo-network/payload-model'
 import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
 
 import { ApiCallResultSchema } from '../Schema.ts'
+import type { ApiCallResult } from './ApiCallResult.ts'
 
 export type ApiCallJsonResultType = JsonArray | JsonObject
 
@@ -18,6 +19,6 @@ export type ApiCallJsonResult<T extends ApiCallJsonResultType = ApiCallJsonResul
 >
 
 export const isApiCallJsonResult = <T extends ApiCallJsonResultType = ApiCallJsonResultType>(x?: unknown | null): x is ApiCallJsonResult<T> => {
-  return isPayloadOfSchemaType(ApiCallResultSchema)(x) && (x as ApiCallJsonResult)?.contentType === 'application/json'
+  return isPayloadOfSchemaType<ApiCallResult>(ApiCallResultSchema)(x) && (x as ApiCallJsonResult)?.contentType === 'application/json'
 }
 export const asApiCallJsonResult = AsObjectFactory.create(isApiCallJsonResult)

package/src/Payload/types/ApiUriCall.ts

@@ -3,7 +3,7 @@ import type { Payload } from '@xyo-network/payload-model'
 import type { ApiCallSchema } from '../Schema.ts'
 import type { ApiCallFields } from './ApiCallFields.ts'
 
-export type ApiUriCall = Payload<
+export type ApiUriCallPayload = Payload<
   ApiCallFields & {
     uri: string
   },

package/src/Payload/types/ApiUriTemplateCall.ts

@@ -3,7 +3,7 @@ import type { Payload } from '@xyo-network/payload-model'
 import type { ApiCallSchema } from '../Schema.ts'
 import type { ApiCallFields } from './ApiCallFields.ts'
 
-export type ApiUriTemplateCall = Payload<
+export type ApiUriTemplateCallPayload = Payload<
   ApiCallFields & {
     params?: Record<string, string>
     uriTemplate?: string

package/src/Witness/Config.ts

@@ -3,29 +3,29 @@ import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
 import type { WitnessConfig } from '@xyo-network/witness-model'
 
 import type {
-  ApiCall, ApiUriCall, ApiUriTemplateCall, MimeTypes,
+  ApiCallPayload, ApiUriCallPayload, ApiUriTemplateCallPayload, MimeTypes,
 } from '../Payload/index.ts'
 import { ApiCallWitnessConfigSchema } from './Schema.ts'
 
 export type ApiCallWitnessConfigBase = WitnessConfig<{
   accept?: MimeTypes
   headers?: Record<string, string | undefined>
-  queries?: ApiCall['queries']
+  queries?: ApiCallPayload['queries']
   schema: ApiCallWitnessConfigSchema
   timeout?: number
-  verb?: ApiCall['verb']
+  verb?: ApiCallPayload['verb']
 }>
 
 export type ApiUriCallWitnessConfig = WitnessConfig<
   ApiCallWitnessConfigBase & {
-    uri: ApiUriCall['uri']
+    uri: ApiUriCallPayload['uri']
   }
 >
 
 export type ApiUriTemplateCallWitnessConfig = WitnessConfig<
   ApiCallWitnessConfigBase & {
     params?: Record<string, string>
-    uriTemplate: ApiUriTemplateCall['uriTemplate']
+    uriTemplate: ApiUriTemplateCallPayload['uriTemplate']
   }
 >
 

package/src/Witness/Witness.ts

@@ -4,7 +4,6 @@ import { AxiosJson } from '@xylabs/axios'
 import type { Hash } from '@xylabs/hex'
 import { URL } from '@xylabs/url'
 import { AbstractWitness } from '@xyo-network/abstract-witness'
-import { PayloadHasher } from '@xyo-network/hash'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { Schema } from '@xyo-network/payload-model'
 import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
@@ -15,11 +14,11 @@ import fillTemplate from 'es6-dynamic-template'
 
 import { checkIpfsUrl } from '../lib/index.ts'
 import type {
-  ApiCall,
   ApiCallBase64Result,
   ApiCallErrorResult,
   ApiCallJsonResult,
   ApiCallJsonResultType,
+  ApiCallPayload,
   ApiCallResult,
   ApiCallXmlResult,
   MimeTypes,
@@ -27,14 +26,14 @@ import type {
 import {
   ApiCallResultSchema,
   ApiCallSchema,
-  asApiUriCall,
+  asApiUriCallPayload,
   asApiUriTemplateCall,
 } from '../Payload/index.ts'
 import { asApiUriCallWitnessConfig, asApiUriTemplateCallWitnessConfig } from './Config.ts'
 import type { ApiCallWitnessParams } from './Params.ts'
 import { ApiCallWitnessConfigSchema } from './Schema.ts'
 
-export class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnessParams> extends AbstractWitness<TParams, ApiCall, ApiCallResult> {
+export class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnessParams> extends AbstractWitness<TParams, ApiCallPayload, ApiCallResult> {
   static override readonly configSchemas: Schema[] = [...super.configSchemas, ApiCallWitnessConfigSchema]
   static override readonly defaultConfigSchema: Schema = ApiCallWitnessConfigSchema
 
@@ -50,8 +49,8 @@ export class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnes
     return this.config.timeout
   }
 
-  getFullUri(call?: ApiCall): string {
-    const { uri: callUri } = asApiUriCall(call) ?? {}
+  getFullUri(call?: ApiCallPayload): string {
+    const { uri: callUri } = asApiUriCallPayload(call) ?? {}
     const {
       uriTemplate: callUriTemplate, params: callParams, queries: callQueries,
     } = asApiUriTemplateCall(call) ?? {}
@@ -89,11 +88,11 @@ export class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnes
     }
   }
 
-  protected override async observeHandler(inPayloads: ApiCall[] = []): Promise<ApiCallResult[]> {
+  protected override async observeHandler(inPayloads: ApiCallPayload[] = []): Promise<ApiCallResult[]> {
     await this.started('throw')
     try {
       const observations = await Promise.all(
-        inPayloads.filter(isPayloadOfSchemaType(ApiCallSchema)).map(async (call) => {
+        inPayloads.filter(isPayloadOfSchemaType<ApiCallPayload>(ApiCallSchema)).map(async (call) => {
           const { verb: callVerb } = call
           const { verb: configVerb } = this.config
           const verb = callVerb ?? configVerb ?? 'get'
@@ -106,7 +105,7 @@ export class ApiCallWitness<TParams extends ApiCallWitnessParams = ApiCallWitnes
           }
 
           const observation: ApiCallResult = {
-            call: await PayloadHasher.hash(call),
+            call: await PayloadBuilder.hash(call),
             schema: ApiCallResultSchema,
           }
           return observation