commit d6ee2bc3231898276d704e799f7be9cfa25a68e6 · mewsse.pet/pet.mewsse.link

+6 -1

package-lock.json

···

       14
        
               "@atcute/cbor": "^2.2.6",

     

       15
        
               "@atcute/client": "^4.0.4",

     

       16
        
               "@atcute/identity-resolver": "^1.1.4",

     

       17
       -
               "@atcute/lex-cli": "^2.2.2",

     

       18
        
               "@atcute/lexicons": "^1.2.2",

     

       19
        
               "@skyware/jetstream": "^0.2.5",

     

       20
        
               "better-sqlite3": "^12.4.1",

     
···

       22
        
               "kysely": "^0.28.7"

     

       23
        
             },

     

       24
        
             "devDependencies": {

     

       0
        
       
     

       25
        
               "@types/better-sqlite3": "^7.6.13",

     

       26
        
               "@types/node": "^24.7.1"

     

       27
        
             }

     
···

       118
        
             "version": "2.2.2",

     

       119
        
             "resolved": "https://registry.npmjs.org/@atcute/lex-cli/-/lex-cli-2.2.2.tgz",

     

       120
        
             "integrity": "sha512-5hScXu4i01WNLkmMmLtQgyOBwZh9M4nijhJ9BZExA+d33/rGlJ4Us1oclw/rbEWPAjqkhA38t30KGvOfKr3chw==",

     

       0
        
       
     

       121
        
             "license": "0BSD",

     

       122
        
             "dependencies": {

     

       123
        
               "@atcute/lexicon-doc": "^1.1.2",

     
···

       134
        
             "version": "1.1.2",

     

       135
        
             "resolved": "https://registry.npmjs.org/@atcute/lexicon-doc/-/lexicon-doc-1.1.2.tgz",

     

       136
        
             "integrity": "sha512-Q3ONR2635MTVWT5Fi01FFcYTfciav0ATnX5ZBon7160hiDyk4n1a9dl8dQYgx+st2/IB0ZCNvOMHPCMZacdktg==",

     

       0
        
       
     

       137
        
             "license": "0BSD",

     

       138
        
             "dependencies": {

     

       139
        
               "@badrap/valita": "^0.4.6"

     
···

       193
        
             "version": "0.3.0",

     

       194
        
             "resolved": "https://registry.npmjs.org/@externdefs/collider/-/collider-0.3.0.tgz",

     

       195
        
             "integrity": "sha512-x5CpeZ4c8n+1wMFthUMWSQKqCGcQo52/Qbda5ES+JFRRg/D8Ep6/JOvUUq5HExFuv/wW+6UYG2U/mXzw0IAd8Q==",

     

       0
        
       
     

       196
        
             "license": "MIT",

     

       197
        
             "peerDependencies": {

     

       198
        
               "@badrap/valita": "^0.4.4"

     
···

       522
        
             "version": "1.1.1",

     

       523
        
             "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",

     

       524
        
             "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",

     

       0
        
       
     

       525
        
             "license": "ISC"

     

       526
        
           },

     

       527
        
           "node_modules/prebuild-install": {

     
···

       554
        
             "version": "3.6.2",

     

       555
        
             "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",

     

       556
        
             "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",

     

       0
        
       
     

       557
        
             "license": "MIT",

     

       558
        
             "bin": {

     

       559
        
               "prettier": "bin/prettier.cjs"

···

       14
        
               "@atcute/cbor": "^2.2.6",

     

       15
        
               "@atcute/client": "^4.0.4",

     

       16
        
               "@atcute/identity-resolver": "^1.1.4",

     

       0
        
       
     

       17
        
               "@atcute/lexicons": "^1.2.2",

     

       18
        
               "@skyware/jetstream": "^0.2.5",

     

       19
        
               "better-sqlite3": "^12.4.1",

     
···

       21
        
               "kysely": "^0.28.7"

     

       22
        
             },

     

       23
        
             "devDependencies": {

     

       24
       +
               "@atcute/lex-cli": "^2.2.2",

     

       25
        
               "@types/better-sqlite3": "^7.6.13",

     

       26
        
               "@types/node": "^24.7.1"

     

       27
        
             }

     
···

       118
        
             "version": "2.2.2",

     

       119
        
             "resolved": "https://registry.npmjs.org/@atcute/lex-cli/-/lex-cli-2.2.2.tgz",

     

       120
        
             "integrity": "sha512-5hScXu4i01WNLkmMmLtQgyOBwZh9M4nijhJ9BZExA+d33/rGlJ4Us1oclw/rbEWPAjqkhA38t30KGvOfKr3chw==",

     

       121
       +
             "dev": true,

     

       122
        
             "license": "0BSD",

     

       123
        
             "dependencies": {

     

       124
        
               "@atcute/lexicon-doc": "^1.1.2",

     
···

       135
        
             "version": "1.1.2",

     

       136
        
             "resolved": "https://registry.npmjs.org/@atcute/lexicon-doc/-/lexicon-doc-1.1.2.tgz",

     

       137
        
             "integrity": "sha512-Q3ONR2635MTVWT5Fi01FFcYTfciav0ATnX5ZBon7160hiDyk4n1a9dl8dQYgx+st2/IB0ZCNvOMHPCMZacdktg==",

     

       138
       +
             "dev": true,

     

       139
        
             "license": "0BSD",

     

       140
        
             "dependencies": {

     

       141
        
               "@badrap/valita": "^0.4.6"

     
···

       195
        
             "version": "0.3.0",

     

       196
        
             "resolved": "https://registry.npmjs.org/@externdefs/collider/-/collider-0.3.0.tgz",

     

       197
        
             "integrity": "sha512-x5CpeZ4c8n+1wMFthUMWSQKqCGcQo52/Qbda5ES+JFRRg/D8Ep6/JOvUUq5HExFuv/wW+6UYG2U/mXzw0IAd8Q==",

     

       198
       +
             "dev": true,

     

       199
        
             "license": "MIT",

     

       200
        
             "peerDependencies": {

     

       201
        
               "@badrap/valita": "^0.4.4"

     
···

       525
        
             "version": "1.1.1",

     

       526
        
             "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",

     

       527
        
             "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",

     

       528
       +
             "dev": true,

     

       529
        
             "license": "ISC"

     

       530
        
           },

     

       531
        
           "node_modules/prebuild-install": {

     
···

       558
        
             "version": "3.6.2",

     

       559
        
             "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",

     

       560
        
             "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",

     

       561
       +
             "dev": true,

     

       562
        
             "license": "MIT",

     

       563
        
             "bin": {

     

       564
        
               "prettier": "bin/prettier.cjs"

+3 -2

package.json

···

       5
        
         "main": "src/index.ts",

     

       6
        
         "type": "module",

     

       7
        
         "scripts": {

     

       8
       -
           "start": "node src/index.ts"

     

       0
        
       
     

       9
        
         },

     

       10
        
         "author": "Mewsse",

     

       11
        
         "license": "WTFPL",

     
···

       15
        
           "@atcute/cbor": "^2.2.6",

     

       16
        
           "@atcute/client": "^4.0.4",

     

       17
        
           "@atcute/identity-resolver": "^1.1.4",

     

       18
       -
           "@atcute/lex-cli": "^2.2.2",

     

       19
        
           "@atcute/lexicons": "^1.2.2",

     

       20
        
           "@skyware/jetstream": "^0.2.5",

     

       21
        
           "better-sqlite3": "^12.4.1",

     
···

       23
        
           "kysely": "^0.28.7"

     

       24
        
         },

     

       25
        
         "devDependencies": {

     

       0
        
       
     

       26
        
           "@types/better-sqlite3": "^7.6.13",

     

       27
        
           "@types/node": "^24.7.1"

     

       28
        
         }

···

       5
        
         "main": "src/index.ts",

     

       6
        
         "type": "module",

     

       7
        
         "scripts": {

     

       8
       +
           "start": "node src/index.ts",

     

       9
       +
           "lexgen": "lex-cli generate -c lex.config.js"

     

       10
        
         },

     

       11
        
         "author": "Mewsse",

     

       12
        
         "license": "WTFPL",

     
···

       16
        
           "@atcute/cbor": "^2.2.6",

     

       17
        
           "@atcute/client": "^4.0.4",

     

       18
        
           "@atcute/identity-resolver": "^1.1.4",

     

       0
        
       
     

       19
        
           "@atcute/lexicons": "^1.2.2",

     

       20
        
           "@skyware/jetstream": "^0.2.5",

     

       21
        
           "better-sqlite3": "^12.4.1",

     
···

       23
        
           "kysely": "^0.28.7"

     

       24
        
         },

     

       25
        
         "devDependencies": {

     

       26
       +
           "@atcute/lex-cli": "^2.2.2",

     

       27
        
           "@types/better-sqlite3": "^7.6.13",

     

       28
        
           "@types/node": "^24.7.1"

     

       29
        
         }

+24 -9

src/index.ts

···

       6
        
       import type { Database } from './db.ts'

     

       7
        
       import { Jetstream } from '@skyware/jetstream'

     

       8
        
       import { logger } from './lib/logger.ts'

     

       0
        
       
     

       0
        
       
     

       9
        
       

     

       10
        
       dotenv.config()

     

       11
        
       

     

       12
        
       export type Context = {

     

       13
        
           db: Database

     

       14
       -
           jetstream: Jetstream

     

       0
        
       
     

       15
        
       }

     

       16
        
       

     

       17
        
       export class Server {

     
···

       24
        
           }

     

       25
        
       

     

       26
        
           static async create() {

     

       27
       -
               const db = createDb(process.env.DB_PATH || ":memory")

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       28
        
               await migrateToLatest(db)

     

       29
       -
               const ingester = createIngester(db)

     

       30
        
       

     

       0
        
       
     

       31
        
               await ingester.backfill()

     

       32
        
               const jetstream = await ingester.jetstream()

     

       33
        
       

     

       34
       -
               const ctx: Context= {

     

       35
       -
                   db,

     

       36
       -
                   jetstream

     

       37
       -
               }

     

       38
       -
       

     

       39
        
               jetstream.start()

     

       40
        
               logger.info("Starting jetstream client")

     

       41
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       42
        
               return new Server(ctx)

     

       43
        
           }

     

       44
        
           

     

       45
        
           async close() {

     

       46
        
               logger.info("Stopping jetstream client")

     

       47
        
               await this.ctx.jetstream.close()

     

       0
        
       
     

       48
        
       

     

       49
        
               return new Promise<void>((resolve) => {

     

       50
        
                   resolve()

     
···

       58
        
       

     

       59
        
           const onClose = async () => {

     

       60
        
               setTimeout(() => process.exit(1), 10000).unref()

     

       61
       -
               await server.close()

     

       62
        
               process.exit()

     

       63
        
           }

     

       64

···

       6
        
       import type { Database } from './db.ts'

     

       7
        
       import { Jetstream } from '@skyware/jetstream'

     

       8
        
       import { logger } from './lib/logger.ts'

     

       9
       +
       import { Router } from './lib/router.ts'

     

       10
       +
       import { createRoutes } from './routes.ts'

     

       11
        
       

     

       12
        
       dotenv.config()

     

       13
        
       

     

       14
        
       export type Context = {

     

       15
        
           db: Database

     

       16
       +
           jetstream: Jetstream,

     

       17
       +
           httpServer: Router

     

       18
        
       }

     

       19
        
       

     

       20
        
       export class Server {

     
···

       27
        
           }

     

       28
        
       

     

       29
        
           static async create() {

     

       30
       +
               const port = process.env.PORT || "8080"

     

       31
       +
               const dbPath = process.env.DB_PATH || ":memory"

     

       32
       +
       

     

       33
       +
               const db = createDb(dbPath)

     

       34
        
               await migrateToLatest(db)

     

       35
       +
               logger.info('Migrating db to latest version')

     

       36
        
       

     

       37
       +
               const ingester = createIngester(db)

     

       38
        
               await ingester.backfill()

     

       39
        
               const jetstream = await ingester.jetstream()

     

       40
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       41
        
               jetstream.start()

     

       42
        
               logger.info("Starting jetstream client")

     

       43
        
       

     

       44
       +
               const httpServer = new Router()

     

       45
       +
               createRoutes(httpServer)

     

       46
       +
       

     

       47
       +
               const ctx: Context = {

     

       48
       +
                   db,

     

       49
       +
                   jetstream,

     

       50
       +
                   httpServer

     

       51
       +
               }

     

       52
       +
               

     

       53
       +
               httpServer.start(port)

     

       54
       +
               logger.info(`Starting http server on port ${port}`)

     

       55
       +
               

     

       56
        
               return new Server(ctx)

     

       57
        
           }

     

       58
        
           

     

       59
        
           async close() {

     

       60
        
               logger.info("Stopping jetstream client")

     

       61
        
               await this.ctx.jetstream.close()

     

       62
       +
               await this.ctx.httpServer.close()

     

       63
        
       

     

       64
        
               return new Promise<void>((resolve) => {

     

       65
        
                   resolve()

     
···

       73
        
       

     

       74
        
           const onClose = async () => {

     

       75
        
               setTimeout(() => process.exit(1), 10000).unref()

     

       76
       +
               // await server.close()

     

       77
        
               process.exit()

     

       78
        
           }

     

       79

+6 -6

src/lib/logger.ts

···

       19
        
           FATAL: 1,

     

       20
        
       } as const

     

       21
        
       

     

       22
       -
       export function log(level: number, type: string, message: string): void {

     

       23
        
           const envLevel = process.env.LOG_LEVEL ? logLevel[process.env.LOG_LEVEL] : logLevel.INFO

     

       24
        
           if (level > envLevel) return

     

       25
        
       

     

       26
        
           console.log(`${type}  ${new Date().toISOString()}: ${message}`)

     

       27
        
       }

     

       28
        
       

     

       29
       -
       function logDebug(message: string): void {

     

       30
        
           log(logLevel.DEBUG, "[DEBUG]", message)

     

       31
        
       }

     

       32
        
       

     

       33
       -
       function logInfo(message: string): void {

     

       34
        
           log(logLevel.INFO, "[INFO]", message)

     

       35
        
       }

     

       36
        
       

     

       37
       -
       function logWarn(message: string): void {

     

       38
        
           log(logLevel.WARN, "[WARN]", message)

     

       39
        
       }

     

       40
        
       

     

       41
       -
       function logError(message: string): void {

     

       42
        
           log(logLevel.ERROR, "[WARN]", message)

     

       43
        
       }

     

       44
        
       

     

       45
       -
       function logFatal(message: string): void {

     

       46
        
           log(logLevel.ERROR, "[WARN]", message)

     

       47
        
       }

···

       19
        
           FATAL: 1,

     

       20
        
       } as const

     

       21
        
       

     

       22
       +
       export function log(level: number, type: string, message: any): void {

     

       23
        
           const envLevel = process.env.LOG_LEVEL ? logLevel[process.env.LOG_LEVEL] : logLevel.INFO

     

       24
        
           if (level > envLevel) return

     

       25
        
       

     

       26
        
           console.log(`${type}  ${new Date().toISOString()}: ${message}`)

     

       27
        
       }

     

       28
        
       

     

       29
       +
       function logDebug(message: any): void {

     

       30
        
           log(logLevel.DEBUG, "[DEBUG]", message)

     

       31
        
       }

     

       32
        
       

     

       33
       +
       function logInfo(message: any): void {

     

       34
        
           log(logLevel.INFO, "[INFO]", message)

     

       35
        
       }

     

       36
        
       

     

       37
       +
       function logWarn(message: any): void {

     

       38
        
           log(logLevel.WARN, "[WARN]", message)

     

       39
        
       }

     

       40
        
       

     

       41
       +
       function logError(message: any): void {

     

       42
        
           log(logLevel.ERROR, "[WARN]", message)

     

       43
        
       }

     

       44
        
       

     

       45
       +
       function logFatal(message: any): void {

     

       46
        
           log(logLevel.ERROR, "[WARN]", message)

     

       47
        
       }

+81

src/lib/router.ts

···

       1
       +
       import { createServer, Server, IncomingMessage, ServerResponse } from "node:http";

     

       2
       +
       import { logger } from "./logger.ts";

     

       3
       +
       

     

       4
       +
       interface Callback {

     

       5
       +
           (req: IncomingMessage, res: ServerResponse,  params?: {[key: string]: string}): void

     

       6
       +
       }

     

       7
       +
       

     

       8
       +
       interface Route {

     

       9
       +
           method: string,

     

       10
       +
           path: RegExp,

     

       11
       +
           callback: Callback

     

       12
       +
       }

     

       13
       +
       

     

       14
       +
       export class Router {

     

       15
       +
           private routes:Array<Route>

     

       16
       +
           private server:Server<typeof IncomingMessage, typeof ServerResponse> | null

     

       17
       +
       

     

       18
       +
           readonly ROUTE_MATCHER = /(?:{([a-z0-9-_]+):([a-z]+)})/ig

     

       19
       +
           readonly ROUTE_SUBSTITUTION = "(?<$1>$2)"

     

       20
       +
           readonly PARAM_TYPES: {[key:string]: string} = {

     

       21
       +
               all: "[a-z0-9-_]+",

     

       22
       +
               number: "[0-9]+",

     

       23
       +
               string: "[a-z-_]+"

     

       24
       +
           }

     

       25
       +
       

     

       26
       +
           constructor() {

     

       27
       +
               this.routes = []

     

       28
       +
               this.server = null

     

       29
       +
           }

     

       30
       +
       

     

       31
       +
           route(method:string, path:string, callback:Callback) {

     

       32
       +
               let replacedPath = `^${path.replace(this.ROUTE_MATCHER, this.ROUTE_SUBSTITUTION)}$`

     

       33
       +
       

     

       34
       +
               for (let type in this.PARAM_TYPES) {

     

       35
       +
                   if (replacedPath.includes(type)) {

     

       36
       +
                       replacedPath = replacedPath.replace(type, this.PARAM_TYPES[type])

     

       37
       +
                   }

     

       38
       +
               }

     

       39
       +
       

     

       40
       +
               this.routes.push({

     

       41
       +
                   method: method,

     

       42
       +
                   path: new RegExp(replacedPath, "i"),

     

       43
       +
                   callback

     

       44
       +
               })

     

       45
       +
           }

     

       46
       +
       

     

       47
       +
           get(path:string, callback:Callback) {

     

       48
       +
               this.route('GET', path, callback)

     

       49
       +
           }

     

       50
       +
       

     

       51
       +
           handleHttpRequest() {

     

       52
       +
               return (req:IncomingMessage, res:ServerResponse) => {

     

       53
       +
       

     

       54
       +
                   for (let route of this.routes) {

     

       55
       +
                       let match = req.url?.match(route.path)

     

       56
       +
                       console.log(route.path, req.url)

     

       57
       +
       

     

       58
       +
                       if (!match) continue;

     

       59
       +
       

     

       60
       +
                       route.callback(req, res, match.groups)

     

       61
       +
                       return

     

       62
       +
                   }

     

       63
       +
       

     

       64
       +
                   res.end('HTTP/1.1 400 Bad Request\r\n\r\n')

     

       65
       +
               }

     

       66
       +
           }

     

       67
       +
       

     

       68
       +
           start(port:string) {

     

       69
       +
               this.server = createServer(this.handleHttpRequest())

     

       70
       +
       

     

       71
       +
               this.server.on('clientError', (err, socket) => {

     

       72
       +
                   socket.end('HTTP/1.1 400 Bad Request\r\n\r\n')

     

       73
       +
               })

     

       74
       +
       

     

       75
       +
               this.server.listen(port)

     

       76
       +
           }

     

       77
       +
       

     

       78
       +
           async close() {

     

       79
       +
               this.server?.close()

     

       80
       +
           }

     

       81
       +
       }

+12

src/routes.ts

···

       1
       +
       import { Router } from "./lib/router.ts";

     

       2
       +
       

     

       3
       +
       export const createRoutes = (router:Router) => {

     

       4
       +
       

     

       5
       +
           router.get('/', (req, res) => {

     

       6
       +
               res.end()

     

       7
       +
           })

     

       8
       +
       

     

       9
       +
           router.get('/page/{page:number}', (req, res, params) => {

     

       10
       +
               res.end()

     

       11
       +
           })

     

       12
       +
       }