commit 996a3aba0dc2da6974281c5595e2bf6f07153004 · cduck.me/statusphere-example-app-fork

-35

src/lib/http.ts

···

       42
       42
        
         }

     

       43
       43
        
       }

     

       44
       44
        
       

     

       45
       45
       -
       export function formHandler<

     

       46
       46
       -
         Req extends IncomingMessage = IncomingMessage,

     

       47
       47
       -
         Res extends ServerResponse<Req & { body: unknown }> = ServerResponse<

     

       48
       48
       -
           Req & { body: unknown }

     

       49
       49
       -
         >,

     

       50
       50
       -
       >(fn: AsyncHandler<Req & { body: unknown }, Res>): Handler<Req, Res> {

     

       51
       51
       -
         return handler(async (req, res, next) => {

     

       52
       52
       -
           if (req.method !== 'POST') {

     

       53
       53
       -
             return void res.writeHead(405).end()

     

       54
       54
       -
           }

     

       55
       55
       -
           if (req.headers['content-type'] !== 'application/x-www-form-urlencoded') {

     

       56
       56
       -
             return void res.writeHead(415).end('Unsupported Media Type')

     

       57
       57
       -
           }

     

       58
       58
       -
       

     

       59
       59
       -
           // Read the request payload

     

       60
       60
       -
           const chunks: Uint8Array[] = []

     

       61
       61
       -
           for await (const chunk of req) chunks.push(chunk)

     

       62
       62
       -
           const payload = Buffer.concat(chunks).toString('utf-8')

     

       63
       63
       -
       

     

       64
       64
       -
           // Parse the Form URL-encoded payload

     

       65
       65
       -
           const body = payload ? Object.fromEntries(new URLSearchParams(payload)) : {}

     

       66
       66
       -
       

     

       67
       67
       -
           // Define the body property on the request object

     

       68
       68
       -
           Object.defineProperty(req, 'body', {

     

       69
       69
       -
             value: body,

     

       70
       70
       -
             writable: false,

     

       71
       71
       -
             enumerable: true,

     

       72
       72
       -
             configurable: true,

     

       73
       73
       -
           })

     

       74
       74
       -
       

     

       75
       75
       -
           // Call the provided async handler with the modified request

     

       76
       76
       -
           return fn(req as Req & { body: unknown }, res, next)

     

       77
       77
       -
         })

     

       78
       78
       -
       }

     

       79
       79
       -
       

     

       80
       45
        
       export async function startServer(

     

       81
       46
        
         requestListener: RequestListener,

     

       82
       47
        
         {

+9 -7

src/routes.ts

···

       16
       16
        
       import * as Profile from '#/lexicon/types/app/bsky/actor/profile'

     

       17
       17
        
       import * as Status from '#/lexicon/types/xyz/statusphere/status'

     

       18
       18
        
       import { env } from '#/env'

     

       19
       19
       -
       import { formHandler, handler } from '#/lib/http'

     

       19
       19
       +
       import { handler } from '#/lib/http'

     

       20
       20
        
       import { page } from '#/lib/view'

     

       21
       21
        
       import { home } from '#/pages/home'

     

       22
       22
        
       import { login } from '#/pages/login'

     
···

       53
       53
        
         // OAuth metadata

     

       54
       54
        
         app.get(

     

       55
       55
        
           '/oauth-client-metadata.json',

     

       56
       56
       -
           handler(async (req: Request, res: Response) => {

     

       56
       56
       +
           handler((req: Request, res: Response) => {

     

       57
       57
        
             res.json(ctx.oauthClient.clientMetadata)

     

       58
       58
        
           }),

     

       59
       59
        
         )

     
···

       61
       61
        
         // Public keys

     

       62
       62
        
         app.get(

     

       63
       63
        
           '/.well-known/jwks.json',

     

       64
       64
       -
           handler(async (req: Request, res: Response) => {

     

       64
       64
       +
           handler((req: Request, res: Response) => {

     

       65
       65
        
             res.json(ctx.oauthClient.jwks)

     

       66
       66
        
           }),

     

       67
       67
        
         )

     
···

       91
       91
        
         // Login page

     

       92
       92
        
         app.get(

     

       93
       93
        
           '/login',

     

       94
       94
       -
           handler(async (req: Request, res: Response) => {

     

       94
       94
       +
           handler((req: Request, res: Response) => {

     

       95
       95
        
             res.type('html').send(page(login({})))

     

       96
       96
        
           }),

     

       97
       97
        
         )

     
···

       99
       99
        
         // Login handler

     

       100
       100
        
         app.post(

     

       101
       101
        
           '/login',

     

       102
       102
       -
           formHandler(async (req: Request, res: Response) => {

     

       102
       102
       +
           express.urlencoded({ extended: true }),

     

       103
       103
       +
           handler(async (req: Request, res: Response) => {

     

       103
       104
        
             // Validate

     

       104
       105
        
             const handle = req.body?.handle

     

       105
       106
        
             if (typeof handle !== 'string' || !isValidHandle(handle)) {

     
···

       133
       134
        
         // Logout handler

     

       134
       135
        
         app.post(

     

       135
       136
        
           '/logout',

     

       136
       136
       -
           formHandler(async (req: Request, res: Response) => {

     

       137
       137
       +
           handler(async (req: Request, res: Response) => {

     

       137
       138
        
             const session = await getIronSession<Session>(req, res, {

     

       138
       139
        
               cookieName: 'sid',

     

       139
       140
        
               password: env.COOKIE_SECRET,

     
···

       223
       224
        
         // "Set status" handler

     

       224
       225
        
         app.post(

     

       225
       226
        
           '/status',

     

       226
       226
       -
           formHandler(async (req: Request, res: Response) => {

     

       227
       227
       +
           express.urlencoded({ extended: true }),

     

       228
       228
       +
           handler(async (req: Request, res: Response) => {

     

       227
       229
        
             // If the user is signed in, get an agent which communicates with their server

     

       228
       230
        
             const agent = await getSessionAgent(req, res, ctx)

     

       229
       231
        
             if (!agent) {