调整hook

Author: kscript

package.json

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

src/index.js

@@ -148,8 +148,7 @@ const getUrl = (prefix, link) => {
   }
   return prefix + link
 }
-
-const convert = (options, customOptions) => {
+const convert = async (options, customOptions) => {
   const context = {}
   const defaultOptions = {
     origin: 'juejin',
@@ -170,9 +169,8 @@ const convert = (options, customOptions) => {
       unpack: ''
     }
   }
-  options = options instanceof Object ? options : {}
   customOptions = customOptions instanceof Object ? customOptions : {}
-  options = merge({}, defaultOptions, options, customOptions)
+  options = merge({}, defaultOptions, options instanceof Object ? options : {}, customOptions)
   if (options.context) {
     if (typeof options.context === 'string') {
       const el = document.createElement('div')
@@ -183,13 +181,14 @@ const convert = (options, customOptions) => {
     }
   }
   const {origin, selectors} = options
-  const markdownBody = query(selectors.body, options.context).cloneNode(true)
   const hook = hooks[origin] || {}
-
-  noop(hook.beforeExtract)(Object.assign(context, {
-    options,
-    markdownBody
+  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)
   queryAll(selectors.copyBtn, markdownBody).map(item => item.parentElement.removeChild(item))
   queryAll('[data-id]', markdownBody).map(item => item.removeAttribute('data-id'))
   if (selectors.invalid) {
@@ -246,27 +245,27 @@ const convert = (options, customOptions) => {
     name: realName + '/urls',
     content: urls.join('\n')
   })
-  noop(hook.extractAfter)(Object.assign(context, { files }))
+  noop(hook.afterExtract)(Object.assign(context, { files }))
   return {
     type: 'download',
     fileName,
     files
   }
 }
 
-const extract = (options, customOptions) => {
-  const datas = convert(options, customOptions)
+const extract = async (options, customOptions) => {
+  const datas = await convert(options, customOptions)
   sendMessage(datas)
   return datas
 }
 
 if (isBroswer) {
   if (isExtension) {
-    chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
+    chrome.runtime.onMessage.addListener(async (message, sender, sendResponse) => {
       if (message instanceof Object) {
         if (message.type === 'download') {
           if (typeof websites[message.website] === 'function') {
-            websites[message.website](extract)
+            await websites[message.website](extract)
           }
         }
       }

src/websites/default.js

@@ -0,0 +1,31 @@
+export const hosts = [/./]
+
+export const options = {
+  origin: 'default'
+}
+
+export const hook = {
+  beforeExtract () {
+    const fileName = document.title
+    const name = document.title.replace(/(\/\\:\*\?\|<>")/g, '_') + '.html'
+    const downloadUrl = location.href
+    return {
+      type: 'download',
+      fileName,
+      files: [
+        {
+          name,
+          downloadUrl
+        }
+      ]
+    }
+  }
+}
+
+export const config = {
+  hosts,
+  options,
+  hook
+}
+
+export default config

src/websites/index.js

@@ -2,20 +2,32 @@ export const websites = {}
 export const hooks = {}
 export const configs = []
 const files = require.context('./', true, /\.js/)
+const assigns = {
+  index: {},
+  default: {}
+}
+
 files.keys().forEach(key => {
   const website = (key.split('/').pop().split('.') || {}) [0]
   if (![
     'index'
   ].includes(website)) {
     const config = files(key)
-    const { hook, options } = config
-    websites[website] = (extract) => extract(options)
+    const { hook, options, customOptions = {} } = config
+    websites[website] = (extract) => extract(options, customOptions)
     hooks[website] = hook instanceof Object ? hook : {}
-    configs.push(Object.assign({
-      website
-    }, config))
+    if (assigns[website]) {
+      assigns[website] = Object.assign({
+        website
+      }, config)
+    } else {
+      configs.push(Object.assign({
+        website
+      }, config))
+    }
   }
 })
+configs.push(assigns.default)
 
 export default {
   websites,