0.4

Author: zmh-program

cache.js

@@ -1,9 +1,10 @@
-// 类似于 Service Worker 缓存机制
-
+const logger = (require("log4js")).getLogger("Cache");
 const axios = require("axios");
-const token = process.env.CODE_STATISTIC || "";
 
-class ApiCache {
+logger.level = "debug";
+axios.defaults.baseURL = "https://api.github.com";
+
+class LightCache {
   constructor() {
       this.caches = {};
   }
@@ -15,7 +16,7 @@ class ApiCache {
     return value;
   }
   getCache(key) {
-    if (! key in this.caches) {
+    if (!(key in this.caches)) {
       return undefined;
     }
     const memory = this.caches[key];
@@ -24,27 +25,42 @@ class ApiCache {
     }
     return memory.value;
   }
-  
+  getOrSet(key, sync, expiration) {
+    const cache = this.getCache(key);
+    return cache === undefined ? this.setCache(key, sync(), expiration) : cache;
+  }
+  async asyncGetOrSet(key, async, expiration) {
+    const cache = this.getCache(key);
+    return cache === undefined ? this.setCache(key, await async(), expiration) : cache;
+  }
+}
+
+class ApiCache extends LightCache {
+  constructor(token) {
+    super();
+    this.token = token;
+  }
   async syncAxios(url) {
+    logger.debug("Request GitHub API address:", url);
     return (await axios.get(url, {
       headers: {
         Accept: "application/json",
-        Authorization: `Bearer ${token}`,
+        Authorization: `Bearer ${this.token}`,
       }
     })).data;
   }
 
   async requestWithCache(url, expiration=3600) {
-    const cache = this.getCache(url);
-    if ( ! cache === undefined ) {
-      const resp = await this.syncAxios(url);
-      return this.setCache(url, resp, expiration);
-    }
-    return cache;
+    // 类似于 Service Worker 缓存机制
+    return this.asyncGetOrSet(
+      url,
+      async () => (await this.syncAxios(url)),
+      expiration,
+    );
   }
 }
 
-module.exports = [
-  token,
-  ApiCache
-]
+module.exports = {
+  LightCache: LightCache,
+  ApiCache: ApiCache,
+}

index.js

@@ -1,10 +1,9 @@
 const express = require('express');
-const axios = require('axios');
+const cache = new (require('./cache').ApiCache)(process.env.CODE_STATISTIC || "");
 const app = express();
 
-
 async function getLanguage(user, repo) {
-    return await syncAxios(`https://api.github.com/repos/${user}/${repo}/languages`);
+    return await cache.requestWithCache(`/repos/${user}/${repo}/languages`);
 }
 
 async function langStatistics(queue) {
@@ -25,7 +24,7 @@ async function langStatistics(queue) {
 
 app.get('/user/:user/', async function (req, res) {
     const username = req.params.user;
-    const response = await syncAxios(`https://api.github.com/users/${username}/repos`);
+    const response = await cache.requestWithCache(`/users/${username}/repos`);
     const result = await langStatistics(Object.values(response).map(async (resp) => {
         return await getLanguage(username, resp['name']);
     }));

package.json

@@ -21,6 +21,7 @@
   "homepage": "https://github.com/zmh-program/codeline-statistic#readme",
   "dependencies": {
     "axios": "^1.3.2",
-    "express": "^4.18.2"
+    "express": "^4.18.2",
+    "log4js": "^6.7.1"
   }
 }