chore: move back to d1 and remove console.log

Author: atinux

docs/nuxt.config.ts

@@ -28,11 +28,11 @@ export default defineNuxtConfig({
 
   content: {
     database: {
-      // type: 'd1',
-      // binding: 'DB',
-      type: 'libsql',
-      url: process.env.TURSO_DATABASE_URL!,
-      authToken: process.env.TURSO_AUTH_TOKEN!,
+      type: 'd1',
+      binding: 'DB',
+      // type: 'libsql',
+      // url: process.env.TURSO_DATABASE_URL!,
+      // authToken: process.env.TURSO_AUTH_TOKEN!,
     },
   },
 

src/runtime/adapters/libsql.ts

@@ -12,15 +12,11 @@ export default createDatabaseAdapter<{ url: string, authToken: string }>((opts)
 
   return {
     async all<T>(sql: string, params?: Array<number | string | boolean>): Promise<T[]> {
-      const now = Date.now()
       const res = await client.execute({ sql, args: params || [] })
-      console.log(`[all] ${res.rows.length} rows in ${Date.now() - now}ms`)
       return res.rows as T[]
     },
     async first<T>(sql: string, params?: Array<number | string | boolean>) {
-      const now = Date.now()
       const res = await client.execute({ sql, args: params || [] })
-      console.log(`[first] ${JSON.stringify(res.rows[0])} in ${Date.now() - now}ms`)
       return res.rows[0] as T
     },
     async exec(sql: string): Promise<void> {

src/runtime/internal/database.client.ts

@@ -79,7 +79,7 @@ async function loadAdapter<T>(collection: T) {
           window.localStorage.setItem(`content_${dumpId}`, compressedDump!)
         }
         catch (error) {
-          console.log('Database integrity check failed, rebuilding database', error)
+          console.error('Database integrity check failed, rebuilding database', error)
         }
         perf.tick('Store Database')
       }
@@ -98,7 +98,7 @@ async function loadAdapter<T>(collection: T) {
         await db.exec(command)
       }
       catch (error) {
-        console.log('Error executing command', error)
+        console.error('Error executing command', error)
       }
     }
     perf.tick('Restore Dump')

src/runtime/internal/database.server.ts

@@ -46,7 +46,7 @@ export async function checkAndImportDatabaseIntegrity(event: H3Event, collection
     integrityCheckPromise[String(collection)] = integrityCheckPromise[String(collection)] || _checkAndImportDatabaseIntegrity(event, collection, checksums[String(collection)], config)
       .then((isValid) => { checkDatabaseIntegrity[String(collection)] = !isValid })
       .catch((error) => {
-        console.log('Database integrity check failed', error)
+        console.error('Database integrity check failed', error)
         checkDatabaseIntegrity[String(collection)] = true
         integrityCheckPromise[String(collection)] = null
       })
@@ -61,7 +61,6 @@ async function _checkAndImportDatabaseIntegrity(event: H3Event, collection: stri
   const db = await loadDatabaseAdapter(config)
 
   const before = await db.first<{ version: string }>(`select * from ${tables.info} where id = 'checksum_${collection}'`).catch(() => ({ version: '' }))
-  console.log(`checkAndImportDatabaseIntegrity: ${collection}, before: ${before?.version}, now: ${integrityVersion}`)
 
   if (before?.version) {
     if (before?.version === integrityVersion) {
@@ -71,16 +70,13 @@ async function _checkAndImportDatabaseIntegrity(event: H3Event, collection: stri
     await db.exec(`DELETE FROM ${tables.info} WHERE id = 'checksum_${collection}'`)
   }
 
-  const now = Date.now()
   const dump = await loadDatabaseDump(event, collection).then(decompressSQLDump)
-  console.log(`loadDatabaseDump: ${Date.now() - now}ms`)
 
   await dump.reduce(async (prev: Promise<void>, sql: string) => {
     await prev
     await db.exec(sql).catch((err: Error) => {
       const message = err.message || 'Unknown error'
-      // console.log('Failed to execute SQL', message.split(':').pop()?.trim())
-      console.log(`Failed to execute SQL ${sql}: ${message}`)
+      console.error(`Failed to execute SQL ${sql}: ${message}`)
       // throw error
     })
   }, Promise.resolve())