v1.2.3

Author: a632079

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hitokoto",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Fast & Powerful Hitokoto API Framework.",
   "main": "core.js",
   "engines": {
@@ -40,7 +40,7 @@
     "colors": "^1.1.2",
     "cron": "^1.3.0",
     "humanize-number": "^0.0.2",
-    "iconv": "^2.3.0",
+    "iconv-lite": "^0.4.19",
     "kcors": "^2.2.1",
     "koa": "^2.4.1",
     "koa-bodyparser": "^4.2.0",
@@ -56,7 +56,7 @@
     "lodash.curry": "^4.1.1",
     "mysql2": "^1.5.1",
     "nconf": "^0.10.0",
-    "netease-music-sdk": "^0.3.0",
+    "netease-music-sdk": "^0.3.1",
     "nodemailer": "^4.4.2",
     "passthrough-counter": "^1.0.0",
     "pify": "^3.0.0",

readme.md

@@ -4,6 +4,11 @@
 同时更新了以下功能:
 * API 请求统计
 * callback 函数的支持
+* 返回 JS 的支持
+* 支持 GBK编码
+* 扩展
+  * 网易云音乐
+  * Bilibili API （待定）
 
 ## 依赖
 * Redis

routes.js

@@ -25,7 +25,10 @@ module.exports = (router, controller) => {
   router.get('/nm/redirect/music/:id', controller.netease.redirect)
   router.get('/nm/record/:uid', controller.netease.record)
   router.get('/nm/comment/music/:id', controller.netease.musicComment)
-  router.get('/nm/url/mv/:mvid', controller.netease.mv)
+  router.get('/nm/url/mv/:mvid', async (ctx) => {
+    ctx.redirect(301, `/nm/mv/${ctx.params.mvid}`)
+  })
+  router.get('/nm/mv/:mvid', controller.netease.mv)
   // router.get('/nm/dj/program/detail/:pid', controller.netease.djProgramInfo)
   router.get('/nm/user/dj/:uid', controller.netease.userDj)
   router.get('/nm/dj/:rid', controller.netease.djProgram)

shrinkwrap.yaml

@@ -8,7 +8,7 @@ dependencies:
   colors: 1.1.2
   cron: 1.3.0
   humanize-number: 0.0.2
-  iconv: 2.3.0
+  iconv-lite: 0.4.19
   kcors: 2.2.1
   koa: 2.5.0
   koa-bodyparser: 4.2.0
@@ -24,7 +24,7 @@ dependencies:
   lodash.curry: 4.1.1
   mysql2: 1.5.2
   nconf: 0.10.0
-  netease-music-sdk: 0.3.0
+  netease-music-sdk: 0.3.1
   nodemailer: 4.4.2
   passthrough-counter: 1.0.0
   pify: 3.0.0
@@ -1461,15 +1461,6 @@ packages:
     resolution:
       integrity: sha1-90aPYBNfXl2tM5nAqBvpoWA6CCs=
       tarball: 'http://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.19.tgz'
-  /iconv/2.3.0:
-    dependencies:
-      nan: 2.9.2
-    dev: false
-    engines:
-      node: '>=0.8.0'
-    resolution:
-      integrity: sha1-lzmIfCvUktml4jbdNmfFNYYBIBs=
-      tarball: 'http://registry.npm.taobao.org/iconv/download/iconv-2.3.0.tgz'
   /ienoopen/1.0.0:
     dev: false
     resolution:
@@ -2055,11 +2046,6 @@ packages:
     resolution:
       integrity: sha1-O3oNJiA910s6nfTJz7gnsvuQfmQ=
       tarball: 'http://registry.npm.taobao.org/named-placeholders/download/named-placeholders-1.1.1.tgz'
-  /nan/2.9.2:
-    dev: false
-    resolution:
-      integrity: sha1-9WTXX1+PNqbZRWzKemxP5IireGY=
-      tarball: 'http://registry.npm.taobao.org/nan/download/nan-2.9.2.tgz'
   /natural-compare/1.4.0:
     dev: true
     resolution:
@@ -2083,14 +2069,14 @@ packages:
     resolution:
       integrity: sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
       tarball: 'http://registry.npm.taobao.org/negotiator/download/negotiator-0.6.1.tgz'
-  /netease-music-sdk/0.3.0:
+  /netease-music-sdk/0.3.1:
     dependencies:
       axios: 0.17.1
       big-integer: 1.6.26
     dev: false
     resolution:
-      integrity: sha1-QXO6/EKOVUvwx04Y17K+otqpZ4k=
-      tarball: 'http://registry.npm.taobao.org/netease-music-sdk/download/netease-music-sdk-0.3.0.tgz'
+      integrity: sha1-naYWg3Tf1TzejnGuIret3U/+Scc=
+      tarball: 'http://registry.npm.taobao.org/netease-music-sdk/download/netease-music-sdk-0.3.1.tgz'
   /nocache/2.0.0:
     dev: false
     resolution:
@@ -3219,7 +3205,7 @@ specifiers:
   eslint-plugin-promise: ^3.6.0
   eslint-plugin-standard: ^3.0.1
   humanize-number: ^0.0.2
-  iconv: ^2.3.0
+  iconv-lite: ^0.4.19
   kcors: ^2.2.1
   koa: ^2.4.1
   koa-bodyparser: ^4.2.0
@@ -3237,7 +3223,7 @@ specifiers:
   mocha: ^5.0.0
   mysql2: ^1.5.1
   nconf: ^0.10.0
-  netease-music-sdk: ^0.3.0
+  netease-music-sdk: ^0.3.1
   nodemailer: ^4.4.2
   nyc: ^11.4.1
   passthrough-counter: ^1.0.0

src/controllers/hitokoto.js

@@ -1,5 +1,5 @@
 // Import necessary packages
-const Iconv = require('iconv').Iconv
+const iconv = require('iconv-lite')
 const path = require('path')
 const SrcDir = path.join('../../', './src/')
 const db = require(SrcDir + 'db')
@@ -30,7 +30,7 @@ async function hitokoto (ctx, next) {
     let js = false
     switch (encode) {
       case 'json':
-        response = Buffer.from(ret)
+        response = Buffer.from(JSON.stringify(ret))
         break
       case 'text':
         response = Buffer.from(ret.text)
@@ -42,7 +42,7 @@ async function hitokoto (ctx, next) {
         response = Buffer.from(`(function hitokoto(){var hitokoto="${ret.hitokoto}";var dom=document.querySelector('${select}');Array.isArray(dom)?dom[0].innerText=hitokoto:dom.innerText=hitokoto;})()`)
         break
       default:
-        response = Buffer.from(ret)
+        response = Buffer.from(JSON.stringify(ret))
         break
     }
     if (ctx.query && ctx.query.charset && ctx.query.charset.toLocaleLowerCase() === 'gbk') {
@@ -51,8 +51,7 @@ async function hitokoto (ctx, next) {
       } else {
         ctx.set('Content-Type', 'application/json; charset=gbk')
       }
-      const iconv = new Iconv('UTF-8', 'GBK')
-      ctx.body = iconv.convert(response)
+      ctx.body = iconv.encode(response, 'GBK')
     } else {
       if (js) {
         ctx.set('Content-Type', 'text/javascript; charset=utf-8')
@@ -74,7 +73,7 @@ async function hitokoto (ctx, next) {
     let js = false
     switch (encode) {
       case 'json':
-        response = Buffer.from(ret)
+        response = Buffer.from(JSON.stringify(ret))
         break
       case 'text':
         response = Buffer.from(ret.text)
@@ -86,7 +85,7 @@ async function hitokoto (ctx, next) {
         response = Buffer.from(`(function hitokoto(){var hitokoto="${ret.hitokoto}";var dom=document.querySelector('${select}');Array.isArray(dom)?dom[0].innerText=hitokoto:dom.innerText=hitokoto;})()`)
         break
       default:
-        response = Buffer.from(ret)
+        response = Buffer.from(JSON.stringify(ret))
         break
     }
     if (ctx.query && ctx.query.charset && ctx.query.charset.toLocaleLowerCase() === 'gbk') {
@@ -95,8 +94,7 @@ async function hitokoto (ctx, next) {
       } else {
         ctx.set('Content-Type', 'application/json; charset=gbk')
       }
-      const iconv = new Iconv('UTF-8', 'GBK')
-      ctx.body = iconv.convert(response)
+      ctx.body = iconv.encode(response, 'GBK')
     } else {
       if (js) {
         ctx.set('Content-Type', 'text/javascript; charset=utf-8')

src/controllers/netease.js

@@ -23,13 +23,22 @@ controllers.mv = async (ctx, next) => {
     }
     return
   }
-  // let result = await cache.get(`nm:mv:${mvid}`, false)
-  // if (result) {
-  //  ctx.set('Content-Type', 'application/json')
-  //  ctx.body = result
-  //  return
-  // }
-  ctx.redirect(`https://163music.a632079.me/mv?mvid=${mvid}`)
+  let result = await cache.get(`nm:mv:${mvid}`, false)
+  if (result) {
+    ctx.set('Content-Type', 'application/json')
+    ctx.body = result
+    return
+  }
+  try {
+    result = await sdk.getMvInfo(mvid)
+    cache.set(`nm:mv:${mvid}`, result, 60 * 60 * 2)
+    ctx.body = result
+  } catch (e) {
+    ctx.status = 404
+    ctx.body = {
+      status: 404
+    }
+  }
 }
 
 // Get DJ Program Info