Move schema and turnstile into sep files, rename stream method, remove utils

src/index.ts

@@ -1,4 +1,4 @@
-import { Context, Env, Hono } from 'hono';
+import { Hono } from 'hono';
 import { streamSSE } from 'hono/streaming';
 import {
   ScrapeMedia,
@@ -6,7 +6,9 @@ import {
   makeStandardFetcher,
   targets,
 } from '@movie-web/providers';
-import { ZodError, z } from 'zod';
+import { ZodError } from 'zod';
+import { mediaSchema } from '@/schema';
+import { validateTurnstile } from '@/turnstile';
 
 const app = new Hono();
 let eventId = 0;
@@ -18,84 +20,18 @@ const providers = makeProviders({
   target: targets.NATIVE,
 });
 
-async function outputEvent(
+async function writeSSEEvent(
   stream: Parameters<Parameters<typeof streamSSE>['1']>['0'],
   event: string,
-  data: any,
+  data: any | undefined,
 ) {
   return await stream.writeSSE({
     event,
-    data: JSON.stringify(data),
+    data: data ? JSON.stringify(data) : '',
     id: String(eventId++),
   });
 }
 
-const tmdbIdSchema = z.string().regex(/^\d+$/);
-
-const mediaSchema = z
-  .discriminatedUnion('type', [
-    z.object({
-      type: z.literal('movie'),
-      title: z.string().min(1),
-      releaseYear: z.coerce.number().int().gt(0),
-      tmdbId: tmdbIdSchema,
-    }),
-    z.object({
-      type: z.literal('show'),
-      title: z.string().min(1),
-      releaseYear: z.coerce.number().int().gt(0),
-      tmdbId: tmdbIdSchema,
-      episodeNumber: z.coerce.number().int(),
-      episodeTmdbId: tmdbIdSchema,
-      seasonNumber: z.coerce.number().int(),
-      seasonTmdbId: tmdbIdSchema,
-    }),
-  ])
-  .transform((query) => {
-    if (query.type == 'movie') return query;
-
-    return {
-      type: query.type,
-      title: query.title,
-      releaseYear: query.releaseYear,
-      tmdbId: query.tmdbId,
-      episode: {
-        number: query.episodeNumber,
-        tmdbId: query.episodeTmdbId,
-      },
-      season: {
-        number: query.seasonNumber,
-        tmdbId: query.seasonTmdbId,
-      },
-    };
-  });
-
-async function validateTurnstile(context: Context<Env>) {
-  const turnstileSecret = context.env?.TURNSTILE_SECRET as string | undefined;
-
-  const token = context.req.header('cf-turnstile-token') || '';
-
-  // TODO: Make this cross platform
-  const ip = context.req.header('CF-Connecting-IP') || '';
-
-  const formData = new FormData();
-  formData.append('secret', turnstileSecret || '');
-  formData.append('response', token);
-  formData.append('remoteip', ip);
-
-  const url = 'https://challenges.cloudflare.com/turnstile/v0/siteverify';
-  const result = await fetch(url, {
-    body: formData,
-    method: 'POST',
-  });
-
-  const outcome = await result.json<any>();
-  return {
-    success: outcome.success as boolean,
-    errorCodes: outcome['error-codes'] as string[],
-  };
-}
-
 app.get('/scrape', async (context) => {
   const queryParams = context.req.query();
 
@@ -131,25 +67,25 @@ app.get('/scrape', async (context) => {
       media,
       events: {
         discoverEmbeds(evt) {
-          outputEvent(stream, 'discoverEmbeds', evt);
+          writeSSEEvent(stream, 'discoverEmbeds', evt);
         },
         init(evt) {
-          outputEvent(stream, 'init', evt);
+          writeSSEEvent(stream, 'init', evt);
         },
         start(evt) {
-          outputEvent(stream, 'start', evt);
+          writeSSEEvent(stream, 'start', evt);
         },
         update(evt) {
-          outputEvent(stream, 'update', evt);
+          writeSSEEvent(stream, 'update', evt);
         },
       },
     });
 
     if (output) {
-      return await outputEvent(stream, 'completed', output);
+      return await writeSSEEvent(stream, 'completed', output);
     }
 
-    stream.writeSSE({ event: 'noOutput', data: '', id: String(eventId++) });
+    return await writeSSEEvent(stream, 'noOutput', '');
   });
 });