From fc8af30731e1e672701ea243efb488a2b5286fbb Mon Sep 17 00:00:00 2001
From: d1y <chenhonzhou@gmail.com>
Date: Sat, 22 Aug 2020 00:14:01 +0800
Subject: [PATCH] add getCount method..
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 添加获取 count 的方法
2. 用更安全的方式获取端口号🙂
---
 index.js | 42 ++++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/index.js b/index.js
index 81d7364..34d4e2c 100644
--- a/index.js
+++ b/index.js
@@ -11,6 +11,7 @@ const themify = require('./utils/themify')
 const PLACES = 7
 
 const app = express()
+
 app.use(express.static('assets'))
 app.use(compression())
 app.set('view engine', 'pug')
@@ -19,6 +20,21 @@ app.get('/', (req, res) => {
   res.render('index')
 });
 
+const getCountByName = async name=> {
+  if (name === 'demo') return '0123456789'
+  // console.log(name)
+  try {
+    const counter = await db.getNum(name) || { name, num: 0 }
+    const r = counter.num + 1
+    db.setNum(counter.name, r)
+    return r
+  } catch (error) {
+    console.log("get count by name is error: ", error)
+    const errorDefaultCount = 0
+    return  errorDefaultCount
+  }
+}
+
 // get the image
 app.get('/get/@:name', async (req, res) => {
   const name = req.params.name
@@ -31,23 +47,18 @@ app.get('/get/@:name', async (req, res) => {
     'cache-control': 'max-age=0, no-cache, no-store, must-revalidate'
   })
 
+  count = await getCountByName(name)
+
   if (name === 'demo') {
     res.set({
       'cache-control': 'max-age=31536000'
     })
-    count = '0123456789'
     length = 10
-
-  } else {
-    const counter = await db.getNum(name) || { name, num: 0 }
-    count = counter.num + 1
-
-    db.setNum(counter.name, count)
-    console.log(counter, `theme: ${theme}`)
   }
 
   // Send the generated SVG as the result
-  res.send(themify.getCountImage({ count, theme, length }))
+  const renderSvg = themify.getCountImage({ count, theme, length })
+  res.send(renderSvg)
 })
 
 app.get('/heart-beat', (req, res) => {
@@ -59,6 +70,17 @@ app.get('/heart-beat', (req, res) => {
   console.log('heart-beat')
 });
 
-const listener = app.listen(config.app.port, () => {
+let port = 3000
+
+try {
+  let configPort = config.app.port
+  if (configPort) {
+    port = configPort
+  }
+} catch (error) {
+  throw new Error(error)
+}
+
+const listener = app.listen(port, () => {
   console.log('Your app is listening on port ' + listener.address().port)
 })