commit 9f299071a4f41cce62adf0d2aef24b7f09b88fcf · mewsse.pet/pet.mewsse.link

+20 -20

src/lib/logger.ts

···

       1
       1
        
       interface logLevelgInterface {

     

       2
       2
       -
           [key:string]: number

     

       2
       2
       +
         [key: string]: number

     

       3
       3
        
       }

     

       4
       4
        
       

     

       5
       5
        
       

     

       6
       6
        
       export const logger = {

     

       7
       7
       -
           debug: logDebug,

     

       8
       8
       -
           info: logInfo,

     

       9
       9
       -
           warn: logWarn,

     

       10
       10
       -
           error: logError,

     

       11
       11
       -
           fatal: logFatal

     

       7
       7
       +
         debug: logDebug,

     

       8
       8
       +
         info: logInfo,

     

       9
       9
       +
         warn: logWarn,

     

       10
       10
       +
         error: logError,

     

       11
       11
       +
         fatal: logFatal

     

       12
       12
        
       }

     

       13
       13
        
       

     

       14
       14
       -
       export const logLevel:logLevelgInterface = {

     

       15
       15
       -
           DEBUG: 5,

     

       16
       16
       -
           INFO: 4,

     

       17
       17
       -
           WARN: 3,

     

       18
       18
       -
           ERROR: 2,

     

       19
       19
       -
           FATAL: 1,

     

       14
       14
       +
       export const logLevel: logLevelgInterface = {

     

       15
       15
       +
         DEBUG: 5,

     

       16
       16
       +
         INFO: 4,

     

       17
       17
       +
         WARN: 3,

     

       18
       18
       +
         ERROR: 2,

     

       19
       19
       +
         FATAL: 1,

     

       20
       20
        
       } as const

     

       21
       21
        
       

     

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

     

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

     

       24
       24
       -
           if (level > envLevel) return

     

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

     

       24
       24
       +
         if (level > envLevel) return

     

       25
       25
        
       

     

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

     

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

     

       27
       27
        
       }

     

       28
       28
        
       

     

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

     

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

     

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

     

       31
       31
        
       }

     

       32
       32
        
       

     

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

     

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

     

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

     

       35
       35
        
       }

     

       36
       36
        
       

     

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

     

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

     

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

     

       39
       39
        
       }

     

       40
       40
        
       

     

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

     

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

     

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

     

       43
       43
        
       }

     

       44
       44
        
       

     

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

     

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

     

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

     

       47
       47
        
       }

+45 -3

src/routes.ts

···

       3
       3
        
       import { Eta } from "eta"

     

       4
       4
        
       

     

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

     

       6
       6
       +
       import { IncomingMessage, ServerResponse } from "node:http"

     

       6
       7
        
       

     

       7
       8
        
       export const createRoutes = (router: Router, db: Database) => {

     

       8
       9
        
         const eta = new Eta({ views: path.join(import.meta.dirname, "views") })

     

       10
       10
       +
         const itemPerPages = parseInt(process.env.ITEM_PER_PAGES || "10", 10)

     

       9
       11
        
       

     

       10
       10
       -
         router.get('/', async (req, res) => {

     

       12
       12
       +
         async function renderPage (

     

       13
       13
       +
           req:IncomingMessage, 

     

       14
       14
       +
           res:ServerResponse<IncomingMessage>, 

     

       15
       15
       +
           params:{[key:string]: string} | undefined

     

       16
       16
       +
         ) {

     

       17
       17
       +
           const offset = params ? parseInt(params?.page, 10) - 1 : 0

     

       18
       18
       +
       

     

       11
       19
        
           const links = await db

     

       12
       20
        
             .selectFrom("links")

     

       13
       21
        
             .selectAll()

     

       14
       22
        
             .orderBy("createdAt", "desc")

     

       15
       15
       -
             .limit(10)

     

       23
       23
       +
             .offset(offset)

     

       24
       24
       +
             .limit(itemPerPages)

     

       16
       25
        
             .execute()

     

       17
       17
       -
           const body = eta.render("./main", { items: links, pages: [] })

     

       26
       26
       +
       

     

       27
       27
       +
           const totalLink = await db

     

       28
       28
       +
             .selectFrom("links")

     

       29
       29
       +
             .select(db.fn.countAll().as("count"))

     

       30
       30
       +
             .executeTakeFirstOrThrow()

     

       31
       31
       +
       

     

       32
       32
       +
           const pages = Math.ceil(parseInt(totalLink.count.toString(), 10) / itemPerPages)

     

       33
       33
       +
             

     

       34
       34
       +
           const body = eta.render("./main", { 

     

       35
       35
       +
             items: links, 

     

       36
       36
       +
             pages: Array.from(Array(pages).keys()),

     

       37
       37
       +
             selected: parseInt(params?.page || "0", 10)

     

       38
       38
       +
           })

     

       18
       39
        
       

     

       19
       40
        
           res.writeHead(200, { 'Content-Type': 'text/html' })

     

       20
       41
        
           res.end(body)

     

       42
       42
       +
         }

     

       43
       43
       +
       

     

       44
       44
       +
         router.get('/', async (req, res, params) => {

     

       45
       45
       +
           await renderPage(req, res, params)

     

       21
       46
        
         })

     

       22
       47
        
       

     

       23
       48
        
         router.get('/page/{page:number}', async (req, res, params) => {

     

       49
       49
       +
           await renderPage(req, res, params)

     

       50
       50
       +
         })

     

       51
       51
       +
       

     

       52
       52
       +
         router.get('/feed.atom', async (req, res, params) => {

     

       53
       53
       +
           const links = await db

     

       54
       54
       +
             .selectFrom("links")

     

       55
       55
       +
             .selectAll()

     

       56
       56
       +
             .orderBy("createdAt", "desc")

     

       57
       57
       +
             .limit(20)

     

       58
       58
       +
             .execute()

     

       59
       59
       +
       

     

       60
       60
       +
           const date = new Date(links[0].createdAt);

     

       61
       61
       +
       

     

       62
       62
       +
           const body = eta.render("./feed", { items: links, date })

     

       63
       63
       +
           res.writeHead(200, { 'Content-Type': 'application/atom+xml' })

     

       64
       64
       +
           res.end(body)

     

       65
       65
       +
       

     

       24
       66
        
           res.end()

     

       25
       67
        
         })

     

       26
       68
        
       }

+6 -6

src/views/feed.eta

···

       11
       11
        
         <% it.items.forEach(function (item) { %>

     

       12
       12
        
           <entry>

     

       13
       13
        
             <title><%= item.title  %></title>

     

       14
       14
       -
             <link rel="alternate" type="text/html" href="<%= item.url %>"/>

     

       15
       15
       -
             <id><%= item.url %></id>

     

       16
       16
       -
             <published><%= new Date(item.date).toISOString() %></published>

     

       17
       17
       -
             <updated><%= new Date(item.date).toISOString() %></updated>

     

       14
       14
       +
             <link rel="alternate" type="text/html" href="<%= item.link %>"/>

     

       15
       15
       +
             <id><%= item.link %></id>

     

       16
       16
       +
             <published><%= new Date(item.createdAt).toISOString() %></published>

     

       17
       17
       +
             <updated><%= new Date(item.createdAt).toISOString() %></updated>

     

       18
       18
        
             <content type="html">

     

       19
       19
        
               <![CDATA[

     

       20
       20
       -
                 <h2><a href="<%= item.url %>"><%= item.title  %></a></h2>

     

       20
       20
       +
                 <h2><a href="<%= item.link %>"><%= item.title  %></a></h2>

     

       21
       21
        
                 <% if (item.description) { %>

     

       22
       22
        
                 <p><%~ item.description %></p>

     

       23
       23
        
                 <% } %>

     

       24
       24
        
                 <% if (item.image) { %>

     

       25
       25
       -
                   <img src="<%= item.image %>" />

     

       25
       25
       +
                   <img src="<%= item.image %>" <% if (item.alt){ %>alt="<%= item.alt %>"<% } %> />

     

       26
       26
        
                 <% } %>

     

       27
       27
        
               ]]>

     

       28
       28
        
             </content>

+6 -6

src/views/link.eta

···

       1
       1
        
       <div class="item <% if (it.nsfw) { %>nsfw<% } %> <% if (it.big) { %>big<% } %>">

     

       2
       2
        
         <section>

     

       3
       3
       -
           <h2><a href="<%= it.url %>"><%= it.title  %></a></h2>

     

       3
       3
       +
           <h2><a href="<%= it.link %>"><%= it.title  %></a></h2>

     

       4
       4
        
           <% if (it.description) { %>

     

       5
       5
        
             <div class="description"><%~ it.description %></div>

     

       6
       6
        
           <% } %>

     

       7
       7
        
         </section>

     

       8
       8
        
         <% if (it.nsfw) { %>

     

       9
       9
       -
           <label class="aside <% if (!it.image) { %>empty<% } %>" target="<%= it.id %>">

     

       10
       10
       -
             <input type="checkbox" id="<%= it.id %>">

     

       9
       9
       +
           <label class="aside <% if (!it.image) { %>empty<% } %>" target="<%= it.rkey %>">

     

       10
       10
       +
             <input type="checkbox" id="<%= it.rkey %>">

     

       11
       11
        
             <% if (it.image) { %>

     

       12
       12
       -
               <img src="<%= it.image %>">

     

       12
       12
       +
               <img src="<%= it.image %>" <% if (it.alt) { %>alt="<%= it.alt %>"<% } %>>

     

       13
       13
        
             <% } %>

     

       14
       14
        
           </label>

     

       15
       15
        
         <% } else { %>

     

       16
       16
       -
           <a class="aside <% if (!it.image) { %>empty<% } %>" href="<%= it.url %>">

     

       16
       16
       +
           <a class="aside <% if (!it.image) { %>empty<% } %>" href="<%= it.link %>">

     

       17
       17
        
             <% if (it.image) { %>

     

       18
       18
       -
               <img src="<%= it.image %>">

     

       18
       18
       +
               <img src="<%= it.image %>" <% if (it.alt) { %>alt="<%= it.alt %>"<% } %>>

     

       19
       19
        
             <% } %>

     

       20
       20
        
           </a>

     

       21
       21
        
         <% } %>