commit 91bd8592238d38e2ff40533541480f6db1bbef40 · cduck.me/statusphere-example-app-fork

+3 -2

src/context.ts

···

       3
        
       import { pino } from 'pino'

     

       4
        
       

     

       5
        
       import { createOAuthClient } from '#/auth/client'

     

       6
       -
       import { createDb, Database } from '#/db'

     

       7
        
       import { createIngester } from '#/ingester'

     

       8
        
       import { env } from '#/env'

     

       9
        
       

     
···

       19
        
       }

     

       20
        
       

     

       21
        
       export async function createAppContext(): Promise<AppContext> {

     

       22
       -
         const db = await createDb()

     

       0
        
       
     

       23
        
         const oauthClient = await createOAuthClient(db)

     

       24
        
         const ingester = createIngester(db)

     

       25
        
         const logger = pino({ name: 'server', level: env.LOG_LEVEL })

···

       3
        
       import { pino } from 'pino'

     

       4
        
       

     

       5
        
       import { createOAuthClient } from '#/auth/client'

     

       6
       +
       import { createDb, Database, migrateToLatest } from '#/db'

     

       7
        
       import { createIngester } from '#/ingester'

     

       8
        
       import { env } from '#/env'

     

       9
        
       

     
···

       19
        
       }

     

       20
        
       

     

       21
        
       export async function createAppContext(): Promise<AppContext> {

     

       22
       +
         const db = createDb(env.DB_PATH)

     

       23
       +
         await migrateToLatest(db)

     

       24
        
         const oauthClient = await createOAuthClient(db)

     

       25
        
         const ingester = createIngester(db)

     

       26
        
         const logger = pino({ name: 'server', level: env.LOG_LEVEL })

+10 -17

src/db.ts

···

       1
        
       import SqliteDb from 'better-sqlite3'

     

       2
        
       import {

     

       3
        
         Kysely,

     

       4
       -
         Migration,

     

       5
       -
         MigrationProvider,

     

       6
        
         Migrator,

     

       7
        
         SqliteDialect,

     

       0
        
       
     

       0
        
       
     

       8
        
       } from 'kysely'

     

       9
       -
       

     

       10
       -
       import { env } from '#/env'

     

       11
        
       

     

       12
        
       // Types

     

       13
        
       

     
···

       79
        
       

     

       80
        
       // APIs

     

       81
        
       

     

       82
       -
       export async function createDb(options?: {

     

       83
       -
         /** @default true */

     

       84
       -
         migrate?: boolean

     

       85
       -
       }): Promise<Database> {

     

       86
       -
         const db = new Kysely<DatabaseSchema>({

     

       87
        
           dialect: new SqliteDialect({

     

       88
       -
             database: new SqliteDb(env.DB_PATH),

     

       89
        
           }),

     

       90
        
         })

     

       0
        
       
     

       91
        
       

     

       92
       -
         if (options?.migrate !== false) {

     

       93
       -
           const migrator = new Migrator({ db, provider: migrationProvider })

     

       94
       -
           const { error } = await migrator.migrateToLatest()

     

       95
       -
           if (error) throw error

     

       96
       -
         }

     

       97
       -
       

     

       98
       -
         return db

     

       99
        
       }

     

       100
        
       

     

       101
        
       export type Database = Kysely<DatabaseSchema>

···

       1
        
       import SqliteDb from 'better-sqlite3'

     

       2
        
       import {

     

       3
        
         Kysely,

     

       0
        
       
     

       0
        
       
     

       4
        
         Migrator,

     

       5
        
         SqliteDialect,

     

       6
       +
         Migration,

     

       7
       +
         MigrationProvider,

     

       8
        
       } from 'kysely'

     

       0
        
       
     

       0
        
       
     

       9
        
       

     

       10
        
       // Types

     

       11
        
       

     
···

       77
        
       

     

       78
        
       // APIs

     

       79
        
       

     

       80
       +
       export const createDb = (location: string): Database => {

     

       81
       +
         return new Kysely<DatabaseSchema>({

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       82
        
           dialect: new SqliteDialect({

     

       83
       +
             database: new SqliteDb(location),

     

       84
        
           }),

     

       85
        
         })

     

       86
       +
       }

     

       87
        
       

     

       88
       +
       export const migrateToLatest = async (db: Database) => {

     

       89
       +
         const migrator = new Migrator({ db, provider: migrationProvider })

     

       90
       +
         const { error } = await migrator.migrateToLatest()

     

       91
       +
         if (error) throw error

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       92
        
       }

     

       93
        
       

     

       94
        
       export type Database = Kysely<DatabaseSchema>