migrate Joi schemas and validation utils to Zod

package.json

@@ -126,15 +126,15 @@
     "dotenv": "16.0.3",
     "express": "4.22.1",
     "helmet": "6.0.1",
-    "joi": "17.7.0",
     "js-yaml": "4.1.1",
     "knex": "2.4.2",
     "pg": "8.9.0",
     "pg-query-stream": "4.3.0",
     "ramda": "0.28.0",
     "redis": "4.5.1",
     "tor-control-ts": "^1.0.0",
-    "ws": "^8.18.0"
+    "ws": "^8.18.0",
+    "zod": "^3.22.4"
   },
   "config": {
     "commitizen": {

src/adapters/web-socket-adapter.ts

@@ -179,12 +179,8 @@ export class WebSocketAdapter extends EventEmitter implements IWebSocketAdapter
       if (error instanceof Error) {
         if (error.name === 'AbortError') {
           console.error(`web-socket-adapter: abort from client ${this.clientId} (${this.getClientAddress()})`)
-        } else if (error.name === 'SyntaxError' || error.name === 'ValidationError') {
-          if (typeof (error as any).annotate === 'function') {
-            debug('invalid message client %s (%s): %o', this.clientId, this.getClientAddress(), (error as any).annotate())
-          } else {
-            console.error(`web-socket-adapter: malformed message from client ${this.clientId} (${this.getClientAddress()}):`, error.message)
-          }
+        } else if (error.name === 'SyntaxError' || error.name === 'ZodError') {
+          debug('invalid message client %s (%s): %s', this.clientId, this.getClientAddress(), error.message)
           this.sendMessage(createNoticeMessage(`invalid: ${error.message}`))
         } else {
           console.error('web-socket-adapter: unable to handle message:', error)

src/schemas/base-schema.ts

@@ -1,23 +1,23 @@
-import Schema from 'joi'
+import { z } from 'zod'
 
-export const prefixSchema = Schema.string().case('lower').hex().min(4).max(64).label('prefix')
+const lowerHexRegex = /^[0-9a-f]+$/
 
-export const idSchema = Schema.string().case('lower').hex().length(64).label('id')
+export const prefixSchema = z.string().regex(lowerHexRegex).min(4).max(64)
 
-export const pubkeySchema = Schema.string().case('lower').hex().length(64).label('pubkey')
+export const idSchema = z.string().regex(lowerHexRegex).length(64)
 
-export const kindSchema = Schema.number().min(0).multiple(1).label('kind')
+export const pubkeySchema = z.string().regex(lowerHexRegex).length(64)
 
-export const signatureSchema = Schema.string().case('lower').hex().length(128).label('sig')
+export const kindSchema = z.number().int().min(0)
 
-export const subscriptionSchema = Schema.string().min(1).label('subscriptionId')
+export const signatureSchema = z.string().regex(lowerHexRegex).length(128)
 
-const seconds = (value: any, helpers: any) => (Number.isSafeInteger(value) && Math.log10(value) < 10) ? value : helpers.error('any.invalid')
+export const subscriptionSchema = z.string().min(1)
 
-export const createdAtSchema = Schema.number().min(0).multiple(1).custom(seconds)
+export const createdAtSchema = z.number().int().min(0).refine(
+  (value) => Number.isSafeInteger(value) && Math.log10(value) < 10,
+  { message: 'Invalid timestamp' }
+)
 
 // [<string>, <string> 0..*]
-export const tagSchema = Schema.array()
-  .ordered(Schema.string().required().label('identifier'))
-  .items(Schema.string().allow('').label('value'))
-  .label('tag')
+export const tagSchema = z.tuple([z.string().min(1)]).rest(z.string())

src/schemas/event-schema.ts

@@ -1,4 +1,4 @@
-import Schema from 'joi'
+import { z } from 'zod'
 
 import {
   createdAtSchema,
@@ -25,15 +25,13 @@ import {
  *   "sig": <64-bytes signature of the sha256 hash of the serialized event data, which is the same as the "id" field>,
  * }
  */
-export const eventSchema = Schema.object({
+export const eventSchema = z.object({
   // NIP-01
-  id: idSchema.required(),
-  pubkey: pubkeySchema.required(),
-  created_at: createdAtSchema.required(),
-  kind: kindSchema.required(),
-  tags: Schema.array().items(tagSchema).required(),
-  content: Schema.string()
-    .allow('')
-    .required(),
-  sig: signatureSchema.required(),
-}).unknown(false)
+  id: idSchema,
+  pubkey: pubkeySchema,
+  created_at: createdAtSchema,
+  kind: kindSchema,
+  tags: z.array(tagSchema),
+  content: z.string(),
+  sig: signatureSchema,
+}).strict()

src/schemas/filter-schema.ts

@@ -1,12 +1,24 @@
-import Schema from 'joi'
+import { z } from 'zod'
 
 import { createdAtSchema, kindSchema, prefixSchema } from './base-schema'
 
-export const filterSchema = Schema.object({
-  ids: Schema.array().items(prefixSchema.label('prefixOrId')),
-  authors: Schema.array().items(prefixSchema.label('prefixOrAuthor')),
-  kinds: Schema.array().items(kindSchema),
-  since: createdAtSchema,
-  until: createdAtSchema,
-  limit: Schema.number().min(0).multiple(1),
-}).pattern(/^#[a-z]$/, Schema.array().items(Schema.string().max(1024)))
+const knownFilterKeys = new Set(['ids', 'authors', 'kinds', 'since', 'until', 'limit'])
+
+export const filterSchema = z.object({
+  ids: z.array(prefixSchema).optional(),
+  authors: z.array(prefixSchema).optional(),
+  kinds: z.array(kindSchema).optional(),
+  since: createdAtSchema.optional(),
+  until: createdAtSchema.optional(),
+  limit: z.number().int().min(0).optional(),
+}).catchall(z.array(z.string().min(1).max(1024))).superRefine((data, ctx) => {
+  for (const key of Object.keys(data)) {
+    if (!knownFilterKeys.has(key) && !/^#[a-z]$/.test(key)) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: `Unknown key: ${key}`,
+        path: [key],
+      })
+    }
+  }
+})

src/schemas/message-schema.ts

@@ -1,40 +1,45 @@
-import Schema from 'joi'
+import { z } from 'zod'
 
 import { eventSchema } from './event-schema'
 import { filterSchema } from './filter-schema'
 import { MessageType } from '../@types/messages'
 import { subscriptionSchema } from './base-schema'
 
-export const eventMessageSchema = Schema.array().ordered(
-  Schema.string().valid('EVENT').required(),
-  eventSchema.required(),
-)
-  .label('EVENT message')
+export const eventMessageSchema = z.tuple([
+  z.literal(MessageType.EVENT),
+  eventSchema,
+])
 
-export const reqMessageSchema = Schema.array()
-  .ordered(Schema.string().valid('REQ').required(), Schema.string().max(256).required().label('subscriptionId'))
-  .items(filterSchema.required().label('filter')).max(12)
-  .label('REQ message')
+export const reqMessageSchema = z.tuple([
+  z.literal(MessageType.REQ),
+  z.string().max(256).min(1),
+]).rest(filterSchema).superRefine((val, ctx) => {
+  if (val.length < 3) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.too_small,
+      minimum: 3,
+      type: 'array',
+      inclusive: true,
+      message: 'REQ message must contain at least one filter',
+    })
+  } else if (val.length > 12) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.too_big,
+      maximum: 12,
+      type: 'array',
+      inclusive: true,
+      message: 'REQ message must contain at most 12 elements',
+    })
+  }
+})
 
-export const closeMessageSchema = Schema.array().ordered(
-  Schema.string().valid('CLOSE').required(),
-  subscriptionSchema.required().label('subscriptionId'),
-).label('CLOSE message')
+export const closeMessageSchema = z.tuple([
+  z.literal(MessageType.CLOSE),
+  subscriptionSchema,
+])
 
-export const messageSchema = Schema.alternatives()
-  .conditional(Schema.ref('.'), {
-    switch: [
-      {
-        is: Schema.array().ordered(Schema.string().equal(MessageType.EVENT)).items(Schema.any()),
-        then: eventMessageSchema,
-      },
-      {
-        is: Schema.array().ordered(Schema.string().equal(MessageType.REQ)).items(Schema.any()),
-        then: reqMessageSchema,
-      },
-      {
-        is: Schema.array().ordered(Schema.string().equal(MessageType.CLOSE)).items(Schema.any()),
-        then: closeMessageSchema,
-      },
-    ],
-  })
+export const messageSchema = z.union([
+  eventMessageSchema,
+  reqMessageSchema,
+  closeMessageSchema,
+])

src/utils/validation.ts

@@ -1,12 +1,11 @@
-import Joi from 'joi'
+import { z } from 'zod'
 
-const getValidationConfig = () => ({
-  abortEarly: true,
-  stripUnknown: false,
-  convert: false,
-})
+export const validateSchema = (schema: z.ZodTypeAny) => (input: unknown) => {
+  try {
+    return { value: schema.parse(input), error: undefined }
+  } catch (error) {
+    return { value: undefined, error: error as z.ZodError }
+  }
+}
 
-export const validateSchema = (schema: Joi.Schema) => (input: any) => schema.validate(input, getValidationConfig())
-
-export const attemptValidation = (schema: Joi.Schema) =>
-  (input: any) => Joi.attempt(input, schema, getValidationConfig())
+export const attemptValidation = (schema: z.ZodTypeAny) => (input: unknown) => schema.parse(input)

test/unit/schemas/event-schema.spec.ts

@@ -61,7 +61,7 @@ describe('NIP-01', () => {
     it('returns error if unknown key is provided', () => {
       Object.assign(event, { unknown: 1 })
 
-      expect(validateSchema(eventSchema)(event)).to.have.nested.property('error.message', '"unknown" is not allowed')
+      expect(validateSchema(eventSchema)(event)).to.have.property('error').that.is.not.undefined
     })
 
 
@@ -131,7 +131,7 @@ describe('NIP-01', () => {
         cases[prop].forEach(({ transform, message }) => {
           it(`${prop} ${message}`, () => expect(
             validateSchema(eventSchema)(transform(event))
-          ).to.have.nested.property('error.message', `"${prop}" ${message}`))
+          ).to.have.property('error').that.is.not.undefined)
         })
       })
     }

test/unit/schemas/filter-schema.spec.ts

@@ -99,7 +99,7 @@ describe('NIP-01', () => {
         cases[prop].forEach(({ transform, message }) => {
           it(`${prop} ${message}`, () => expect(
             validateSchema(filterSchema)(transform(filter))
-          ).to.have.nested.property('error.message', `"${prop}" ${message}`))
+          ).to.have.property('error').that.is.not.undefined)
         })
       })
     }