调整代码,增加请求重试

Author: kscript

package.json

@@ -1,6 +1,6 @@
 {
   "name": "markdown-downloader",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "markdown文章下载",
   "main": "dist/index.js",
   "scripts": {

src/broswer.js

@@ -1,19 +1,21 @@
 import convert from './'
 import download from './download'
+import * as downloadMarkdown from './markdown'
 import { configs as websiteConfigs } from './websites'
 
 export { convert, download, websiteConfigs }
 
-export const markdownDownload = (options, customOptions) => {
+export const downloader = (options, customOptions) => {
 	const {fileName, files} = convert(options, customOptions)
 	download(fileName, files)
 }
 
 if (typeof window !== 'undefined') {
-	markdownDownload.websiteConfigs = websiteConfigs
-	markdownDownload.convert = convert
-	markdownDownload.download = download
-	window.markdownDownload = markdownDownload
+	downloader.websiteConfigs = websiteConfigs
+	downloader.convert = convert
+	downloader.download = download
+	downloader.downloadMarkdown = downloadMarkdown
+	window.downloader = downloader
 }
 
-export default markdownDownload
+export default downloader

src/download.js

@@ -4,7 +4,8 @@ import FileSaver from 'jszip/vendor/FileSaver'
 
 const defaultOptions = {
   partLimit: 1e3,
-  requestLimit: 5
+  requestLimit: 5,
+  retry: 3
 }
 
 const options = Object.assign({}, defaultOptions)
@@ -19,30 +20,40 @@ export const noop = (func, defaultFunc) => {
 }
 
 export const ajax = (options) => {
-  var xhr = new XMLHttpRequest()
-  options.method = options.method || 'get'
-  xhr.responseType = options.dataType || 'json';
-  xhr.onreadystatechange = () => {
-    if (xhr.readyState == 4) {
-      try {
-        noop(options.success)(xhr.response, xhr)
-      } catch (err) {
+  options = Object.assign({}, defaultOptions, options)
+  const core = (retry = 3) => {
+    const xhr = new XMLHttpRequest()
+    options.method = options.method || 'get'
+    xhr.responseType = options.dataType || 'json';
+    xhr.onreadystatechange = () => {
+      if (xhr.readyState == 4) {
+        try {
+          noop(options.success)(xhr.response, xhr)
+        } catch (err) {
+          noop(options.error)(err, xhr)
+        }
+      }
+    }
+    xhr.error = (err) => {
+      if (retry--) {
+        console.log(err)
         noop(options.error)(err, xhr)
+      } else {
+        setTimeout(() => {
+          core(retry - 1)
+        }, 3e3)
       }
     }
+    if (/post/i.test(options.method)) {
+      xhr.open(options.method, options.url, options.async !== false)
+      xhr.setRequestHeader('Content-type', /json/i.test(options.dataType) ? 'application/json' : 'application/x-www-form-urlencoded')
+      xhr.send(options.data)
+    } else {
+      xhr.open(options.method, options.url, options.async !== false)
+      xhr.send()
+    }
   }
-  xhr.error = (err) => {
-    console.log(err)
-    noop(options.error)(err, xhr)
-  }
-  if (/post/i.test(options.method)) {
-    xhr.open(options.method, options.url, options.async !== false)
-    xhr.setRequestHeader('Content-type', /json/i.test(options.dataType) ? 'application/json' : 'application/x-www-form-urlencoded')
-    xhr.send(options.data)
-  } else {
-    xhr.open(options.method, options.url, options.async !== false)
-    xhr.send()
-  }
+  core(options.retry)
 }
 
 export const fetchBlobFile = (file) =>{

src/index.js

@@ -1,173 +1,13 @@
-import md5 from 'md5'
-import html2markdown from 'html-to-md'
-import { websites, hooks } from './websites'
-import merge from 'webpack-merge'
-import 'mathjax/es5/tex-svg'
+import { websites } from './websites'
 import { 
   isExtension,
-  getExt,
-  query,
-  getText,
-  getAttribute,
-  queryAll,
-  noop,
   sendMessage,
-  formatDate,
-  insertAfter,
-  getUrl
 } from './utils'
+import { downloadMarkdown } from './markdown'
 
-
-const setInfo = (data) => {
-  data = Object.assign({
-    date: formatDate('yyyy-MM-dd HH:mm:ss'),
-    coypright: false,
-    url: location.href,
-    description: '转载',
-  }, data instanceof Object ? data : {})
-  return `---
-  title: {{title}}
-  date: {{date}}
-  copyright: {{coypright}}
-  author: {{author}}
-  home: {{home}}
-  origin: {{origin}}
-  url: {{url}}
-  tag: {{tag}}
-  categories: {{categories}}
-  description: {{description}}
-  ---
-  `.replace(/\n\s+/g, '\n').replace(/\{\{(.*?)\}\}/g, (s, s1) => data[s1] === void 0 ? '' : data[s1])
-}
-
-const getMarkdown = (markdownBody) => {
-  return markdownBody.innerHTML
-  // .replace(/<(\/|)(pre|p|figcaption|figure)>/g, '')
-  // .replace(/(&lt;|&gt;)/g, (s, s1) => ({
-  //   '&lt;': '<', '&gt;': '>'
-  //   }[s1] || s))
-}
-
-const convert = async (options, customOptions) => {
-  const context = {}
-  const defaultOptions = {
-    origin: 'juejin',
-    // 处理链接
-    link: true,
-    // 处理换行
-    br: false,
-    // 处理代码块
-    code: false,
-    lazyKey: 'data-src',
-    selectors: {
-      title: '.article-title',
-      body: '.markdown-body',
-      copyBtn: '.copy-code-btn',
-      userName: '.username .name',
-      userLink: '.username',
-      invalid: 'style',
-      unpack: ''
-    }
-  }
-  customOptions = customOptions instanceof Object ? customOptions : {}
-  options = merge({}, defaultOptions, options instanceof Object ? options : {}, customOptions)
-  if (options.context) {
-    if (typeof options.context === 'string') {
-      const el = document.createElement('div')
-      el.innerHTML = options.context
-      options.context = el
-    } else {
-      options.context = options.context instanceof Node ? options.context : void 0
-    }
-  }
-  const {origin, selectors} = options
-  const hook = hooks[origin] || {}
-  const result = await noop(hook.beforeExtract)(Object.assign(context, {
-    options
-  }))
-  if (result instanceof Object) {
-    return result
-  }
-  const markdownBody = query(selectors.body, options.context).cloneNode(true)
-  const fileName = (getText(selectors.title) || document.title)
-  const realName = fileName.replace(/[\\\/\?<>:'\*\|]/g, '_')
-  noop(hook.extract)(context, { markdownBody, fileName, realName })
-  queryAll(selectors.copyBtn, markdownBody).map(item => item.parentElement.removeChild(item))
-  queryAll('[data-id]', markdownBody).map(item => item.removeAttribute('data-id'))
-  if (selectors.invalid) {
-    queryAll(selectors.invalid, markdownBody).map(item => item.parentElement.removeChild(item))
-  }
-  if (selectors.unpack) {
-    queryAll(selectors.unpack, markdownBody).map(item => {
-      const span = document.createElement('span')
-      span.innerHTML = item.innerHTML
-      insertAfter(document.createElement('br'), item)
-      item.parentElement.replaceChild(span, item)
-    })
-  }
-  if (options.link) {
-    queryAll('a', markdownBody).map(item => item.href = item.title)
-  }
-  if (options.code) {
-    queryAll('code', markdownBody).map(item => {
-      const br = options.br || /copyable/.test(item.className) ? '\n' : ''
-      const lang = item.getAttribute('lang') || (item.className.split('-') || {})[1] || ''
-      const text = '```' + (lang ? ' ' + lang : '') + br + item.innerText + br + '```' + br
-      item.parentElement.replaceChild(document.createTextNode(text), item)
-    })
-  }
-  const urls = []
-  const files = queryAll('img', markdownBody).map(item => {
-    const downloadName = item.getAttribute('downloadName')
-    const downloadUrl = item.getAttribute('downloadUrl')
-    if (downloadName && downloadUrl) {
-      item.src = './' + downloadName
-      options.urls !== false && urls.push(downloadUrl)
-      return {
-        name: downloadName,
-        downloadUrl
-      }
-    }
-    const src = item.getAttribute(options.lazyKey) || item.src
-    const url = src.replace(/\?$/, '')
-    const ext = getExt(url)
-    const name = realName + '/' + md5(url) + (ext ? '.' + ext : '')
-    item.src = './' + name
-    options.urls !== false && urls.push(url)
-    return {
-      name,
-      downloadUrl: url
-    }
-  })
-  const info = setInfo({
-    title: fileName,
-    origin: origin,
-    author: getText(selectors.userName),
-    home: getUrl(location.origin, getAttribute('href', selectors.userLink)),
-    description: markdownBody.innerText.replace(/^([\n\s]+)/g, '').replace(/\n/g, ' ').slice(0, 50) + '...',
-  })
-  const markdwonDoc = html2markdown(info + getMarkdown(markdownBody), {})
-  const copyright = '> 当前文档由 [markdown文档下载插件](https://github.com/kscript/markdown-download) 下载, 原文链接: [' + fileName + '](' + location.href + ')  '
-  const content = await noop(hook.formatContent)(context, { markdownBody, markdwonDoc })
-  files.push({
-    name: realName + '.md',
-    content:  (content && typeof content === 'string' ? content: markdwonDoc )+ '\n\n' + copyright
-  })
-  files.push({
-    name: realName + '/urls',
-    content: urls.join('\n')
-  })
-  noop(hook.afterExtract)(Object.assign(context, { files }))
-  return {
-    type: 'download',
-    fileName,
-    files
-  }
-}
-
-const extract = async (options, customOptions) => {
-  const datas = await convert(options, customOptions)
-  sendMessage(datas)
+const extract = async (options, customOptions, hook) => {
+  const datas = await downloadMarkdown(options, customOptions, hook)
+  datas && sendMessage(datas)
   return datas
 }
 
@@ -184,4 +24,4 @@ if (isExtension) {
   })
 }
 
-export default convert
+export default downloadMarkdown