add subscription object validation logic before start scraping

Author: genkio

Diff for: src/handlers/scrape.js

@@ -2,14 +2,15 @@
 
 const cheerio = require('cheerio')
 const signale = require('signale')
+const Joi = require('joi')
 const { crawl } = require('../libs/spider')
+const { lambda: schema } = require('../validations/subscription')
 
 module.exports = (subscription, context, callback) => {
   context.callbackWaitsForEmptyEventLoop = false
-  const url = subscription.url
-  signale.info(`Start scraping: ${url}`)
 
-  crawl(subscription.url)
+  validate(subscription, schema)
+    .then(crawl)
     .then(load)
     .then($ => parse(subscription, $))
     .then(res => {
@@ -19,11 +20,16 @@ module.exports = (subscription, context, callback) => {
       callback(null)
     })
     .catch(err => {
-      signale.error(`Error scraping ${url}`, err)
+      signale.error(`Error scraping ${subscription.url}`, err)
       callback(err)
     })
 }
 
+function validate (subscription, schema) {
+  return Joi.validate(subscription, schema)
+    .then(({ url }) => url)
+}
+
 function load (htmlStr) {
   return new Promise((resolve, reject) => {
     if (!htmlStr || typeof htmlStr !== 'string') {

Diff for: src/libs/spider.js

@@ -6,8 +6,9 @@ const signale = require('signale')
 const BufferHelper = require('bufferhelper')
 
 function crawl (url) {
-  let charSet = ''
+  signale.info(`Start scraping: ${url}`)
 
+  let charSet = ''
   return new Promise((resolve, reject) => {
     const bufferHelper = new BufferHelper()
     request({ url })

Diff for: src/routers/subscription.js

@@ -3,7 +3,7 @@
 const express = require('express')
 const validate = require('express-validation')
 const { list, create, remove } = require('../handlers/subscription')
-const schema = require('../validations/subscription')
+const { express: schema } = require('../validations/subscription')
 const router = express.Router()
 
 router.get('/', list)

Diff for: src/validations/subscription.js

@@ -2,13 +2,20 @@
 
 const Joi = require('joi')
 
+const schema = {
+  url: Joi.string().regex(/^(http|https)/).required(),
+  targets: Joi.array().items(Joi.object({
+    label: Joi.string(),
+    selector: Joi.string().required()
+  })).required(),
+  interval: Joi.number().min(15).required()
+}
+
 module.exports = {
-  body: {
-    url: Joi.string().regex(/^(http|https)/).required(),
-    targets: Joi.array().items(Joi.object({
-      label: Joi.string(),
-      selector: Joi.string().required()
-    })).required(),
-    interval: Joi.number().required()
-  }
+  lambda: Object.assign({}, schema, {
+    id: Joi.string().required(),
+    createdAt: Joi.number().required(),
+    updatedAt: Joi.number().required()
+  }),
+  express: { body: schema }
 }