add codecov & add more test & update README Labels

Author: IndexXuan

README.md

@@ -10,6 +10,9 @@
  <a href="https://circleci.com/gh/IndexXuan/v2ex-api-bridge/tree/master">
  <img src="https://circleci.com/gh/IndexXuan/v2ex-api-bridge/tree/master.svg?style=shield" alt="Build Status">
  </a>
+ <a href="https://codecov.io/github/IndexXuan/v2ex-api-bridge?branch=master">
+ <img src="https://codecov.io/github/IndexXuan/v2ex-api-bridge/coverage.svg?branch=master" alt="Code Coverage">
+ </a>
  <img src="https://img.shields.io/badge/Vim-Best%20Editor-green.svg" alt="Vim Best Editor" />
  <br>
  <br>
@@ -18,7 +21,6 @@
  </a>
 </p>
 
-
 ## Intro
 
 `V2EX API Bridge`: 提供论坛公开API的封装和私有API的挖掘实现，目前已支持 `登录，签到，发帖，回帖` 等非官方API功能.  

app/controller/auth.js

@@ -21,12 +21,12 @@ module.exports = app => {
  async login (ctx) {
  const { username, password } = ctx.query
  if (username == null) {
- throw new Error('请传入用户名！')
+ throw new Error('请传入用户名')
  }
  if (password == null) {
- throw new Error('请传入密码！')
+ throw new Error('请传入密码')
  }
- ctx.body = await ctx.service.auth.login(ctx.query)
+ ctx.body = await ctx.service.auth.login({username, password})
  }
 
  /**

app/extend/context.js

@@ -0,0 +1,48 @@
+/**
+ * @Extend Context
+ * ---------------------------------------------
+ * Author : IndexXuan(https://github.com/IndexXuan)
+ * Mail : indexxuan@gmail.com
+ * Date : Fri 24 Mar 2017 11:15:04 AM CST
+ */
+
+'use strict'
+
+// sessionid cookie name 
+const sessionCookieName = 'PB3_SESSION'
+
+// token cookie name 
+const tokenCookieName = 'A2'
+
+/* istanbul ignore next */
+module.exports = {
+ get sessionCookieName () {
+ return sessionCookieName 
+ },
+ get tokenCookieName () {
+ return tokenCookieName 
+ },
+ get sessionid () {
+ return `${sessionCookieName}=${this.cookies.get(sessionCookieName)}`
+ },
+ get token () {
+ return `${tokenCookieName}=${this.cookies.get(tokenCookieName)}`
+ },
+ // 公共请求头
+ get commonHeaders () {
+ return {
+ "Accept": "text/html,application/xhtml+xml,application/xml",
+ "Origin": "https://www.v2ex.com",
+ "Referer": "https://www.v2ex.com",
+ "User-Agent": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36"
+ }
+ },
+ get commonCookies () {
+ return {
+ // 千万注意大小写，V2EX对这些cookie校验很严格...
+ tab: 'V2EX_TAB="2|1:0|10:1489746039|8:V2EX_TAB|8:dGVjaA==|b72b63fabe0f8faeff147ac38e26299655d713ad1880feef6679b56d8d1e9f47"',
+ others: 'V2EX_LANG=zhcn; _ga=GA1.2.1254455933.1474272858; _gat=1'
+ }
+ }
+} // /.exports
+

app/router.js

@@ -43,8 +43,8 @@ module.exports = app => {
  // @repies
  app.get('v2ex', `${prefix}/replies/:topic_id`, 'replies.show')
  // auth required
- app.post('v2ex', `${prefix}/replies/:topic_id`, 'replies.create')
- // app.get('v2ex', `${prefix}/replies/:topic_id/new`, 'replies.create') // for test
+ app.post('v2ex', `${prefix}/replies/:topic_id/new`, 'replies.create')
+ app.get('v2ex', `${prefix}/replies/:topic_id/new`, 'replies.create') // for test
 
  /**
  * @examples

app/service/auth.js

@@ -116,15 +116,14 @@ module.exports = app => {
  * login获取签名主方法
  *
  * @param {Object} params - 请求参数
+ * - {String} username - 用户名
+ * - {String} password - 密码 
  */
- async login (params) {
- // @step1 获取提交的用户名密码
- const { username, password } = params
-
- // @step2 进入登录页，获取页面隐藏登录域以及once的值
+ async login ({username, password}) {
+ // @step1 进入登录页，获取页面隐藏登录域以及once的值
  await this.enterLoginPage()
 
- // @step3 设置请求参数
+ // @step2 设置请求参数
  const opts = {
  method: 'POST',
  headers: Object.assign({}, this.ctx.commonHeaders, { Cookie: this.sessionCookieStr }),
@@ -135,16 +134,16 @@ module.exports = app => {
  }
  }
 
- // @step4 发起请求
+ // @step3 发起请求
  const result = await this.request(this.loginUrl, opts)
 
- // @step5 更新session并设置在客户端
+ // @step4 更新session并设置在客户端
  await this.enterHomePage()
 
- // @step6 解析获取到的cookies
+ // @step5 解析获取到的cookies
  const cs = setCookieParser(result)
 
- // @step7 判断是否登录成功并种下客户端cookies
+ // @step6 判断是否登录成功并种下客户端cookies
  let success = false
  cs.forEach(c => {
  // 查看是否有令牌项的cookie，有就说明登录成功了
@@ -157,7 +156,7 @@ module.exports = app => {
  })
  })
 
- // @step8 设置API返回结果
+ // @step7 设置API返回结果
  return {
  result: success,
  msg: success ? 'ok' : '登录失败，请确认用户名密码无误！',

app/service/replies.js

@@ -20,6 +20,8 @@ module.exports = app => {
  constructor (ctx) {
  super(ctx)
  this.root = `${app.config.root}/replies`
+ // 默认有权限，后面会判断
+ this.auth = true
  // 请求需要的一次性签名
  this.once = ''
  }
@@ -81,7 +83,11 @@ module.exports = app => {
  // @step1 获取准备数据
  const session = this.ctx.sessionid
  const token = this.ctx.token
- const headers = Object.assign(this.ctx.commonHeaders, { Cookie: `${session}; ${token}` })
+ const headers = Object.assign({}, this.ctx.commonHeaders, { Cookie: `${session}; ${token}` })
+
+ if (session.includes('undefined')) {
+ this.auth = false 
+ }
 
  // @step2 进入创建页，获取once
  const url = `https://www.v2ex.com/t/${params.topic_id}`
@@ -92,6 +98,7 @@ module.exports = app => {
  dataType: 'text'
  })
 
+
  // @step3 获取once
  this.getOnce(r.data)
 
@@ -108,9 +115,10 @@ module.exports = app => {
 
  // @step6 设置API返回值
  const success = result && result.res && result.res.requestUrls && result.res.requestUrls[0]
+ const msg = !this.auth ? '请先登录再回帖' : success ? 'ok' : '回帖未知错误'
  return {
- result: !!success,
- msg: !!success ? 'ok' : 'error',
+ result: !!success && this.auth,
+ msg: msg,
  url: success
  } 
  }

app/service/topics.js

@@ -19,6 +19,8 @@ module.exports = app => {
  constructor (ctx) {
  super(ctx)
  this.root = `${app.config.root}/topics`
+ // 默认有权限，后面会判断
+ this.auth = true 
  // 请求需要的一次性签名
  this.once = ''
  }
@@ -123,7 +125,11 @@ module.exports = app => {
  // step1 获取准备数据
  const session = this.ctx.sessionid
  const token = this.ctx.token
- const headers = Object.assign(this.ctx.commonHeaders, { Cookie: `${session}; ${token}` })
+ const headers = Object.assign({}, this.ctx.commonHeaders, { Cookie: `${session}; ${token};` })
+
+ if (session.includes('undefined')) {
+ this.auth = false 
+ }
 
  // @step2 进入创建页，获取once
  const url = 'https://www.v2ex.com/new'
@@ -137,7 +143,7 @@ module.exports = app => {
  // @step3 解析得到once
  this.getOnce(r.data)
 
- // @step4 设置请求参数
+ // @step4 设置请求参数, 模仿真实的传送两遍content
  const data = Object.assign(params, { once: this.once }, { content: params.content })
 
  // @step5 发起请求
@@ -149,10 +155,11 @@ module.exports = app => {
  })
 
  // @step6 设置API返回值
- const success = result && result.res && result.res.requestUrls && result.res.requestUrls[0]
+ const success = this.auth && result && result.res && result.res.requestUrls && result.res.requestUrls[0]
+ const msg = !this.auth ? '请先登录再发帖' : success ? 'ok' : '发帖未知错误'
  return {
- result: !!success,
- msg: !!success ? 'ok' : 'error',
+ result: !!success && this.auth,
+ msg: msg,
  url: success
  } 
  }

ci.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+# copy from vue project
+
+set -e
+npm test
+
+# report coverage stats for non-PRs
+if [[ -z $CI_PULL_REQUEST ]]; then
+ cat ./coverage/lcov.info | ./node_modules/.bin/codecov
+fi

circle.yml

@@ -4,4 +4,4 @@ machine:
 
 test:
  override:
- - npm run test
+ - bash ci.sh

codecov.yml

@@ -0,0 +1,4 @@
+coverage:
+ parsers:
+ javascript:
+ enable_partials: no