使用自有接口

Author: cenzhende

README.md

@@ -4,7 +4,7 @@
 [![Version](https://img.shields.io/npm/v/juejin-file-uploader.svg?style=flat-square)](https://www.npmjs.com/package/juejin-file-uploader)
 [![License](https://img.shields.io/npm/l/juejin-file-uploader.svg?style=flat-square)](LICENSE)
 
-[掘金](https://juejin.im) 浏览器端文件上传插件，基于 [七牛云存储](https://www.qiniu.com/) 。
+[掘金](https://juejin.im) 浏览器端文件上传插件。
 
 ## 安装
 
@@ -90,7 +90,3 @@ uploadTask.abort('不想上传了')
 ## 前置需求
 
 - 支持 [Promise](https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Promise)
-
-## 相关文档
-
-[直传文件](https://developer.qiniu.com/kodo/api/1312/upload)

dist/juejin-file-uploader.min.js

@@ -1,6 +1,6 @@
 {
   "name": "juejin-file-uploader",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "juejin file uploader",
   "main": "dist/juejin-file-uploader.min.js",
   "scripts": {

package.json

@@ -2,8 +2,7 @@ import UploadTask from './upload-task'
 
 const DEFAULT_CONFIG = {
   bucket: '',
-  tokenUrl: 'https://cdn-ms.xitu.io/v1/policy/info',
-  uploadUrl: 'https://up.qbox.me'
+  uploadUrl: 'https://cdn-ms.xitu.io/v1/upload'
 }
 
 export default class JuejinFileUploader {

src/juejin-file-uploader.js

@@ -1,69 +1,38 @@
 export default class UploadTask {
 
-  constructor (file, { bucket, tokenUrl, uploadUrl }) {
+  constructor (file, { bucket, uploadUrl }) {
     this.file = file
     this.bucket = bucket
-    this.tokenUrl = tokenUrl
     this.uploadUrl = uploadUrl
-
-    this.infoXhr = new XMLHttpRequest()
     this.uploadXhr = new XMLHttpRequest()
     this.abortError = null
   }
 
   start () {
-    return getUplaodInfo({
-      filename: this.file.name,
-      tokenUrl: this.tokenUrl,
+    return uploadFile({
+      file: this.file,
       bucket: this.bucket,
-      xhr: this.infoXhr
+      uploadUrl: this.uploadUrl,
+      xhr: this.uploadXhr
     })
-    .then(({ token, key, url }) =>
-      uploadFile({
-        key,
-        token,
-        file: this.file,
-        uploadUrl: this.uploadUrl,
-        xhr: this.uploadXhr
-      })
-      .then(() => url)
-    )
+    .then(res => res.d.url.https)
     .catch(error => Promise.reject(this.abortError || error))
   }
 
   abort (reason) {
     this.abortError = createAbortError(reason)
-    this.infoXhr.abort()
     this.uploadXhr.abort()
   }
 
 }
 
-function getUplaodInfo ({ filename, tokenUrl, bucket, xhr }) {
-  const url = `${tokenUrl}`
-    + `?bucket=${encodeURIComponent(bucket)}`
-    + `&filename=${encodeURIComponent(filename)}`
-  return sendRequest({
-    method: 'GET',
-    url,
-    xhr
-  })
-  .then(res => res.d)
-  .then(info => ({
-    token: info.token,
-    key: info.key,
-    url: info.url.https
-  }))
-}
-
-function uploadFile ({ file, key, token, uploadUrl, xhr }) {
+function uploadFile ({ file, bucket, uploadUrl, xhr }) {
   const form = new FormData()
-  form.append('token', token)
+  const queryPrefix = uploadUrl.indexOf('?') === -1 ? '?' : '&'
   form.append('file', file)
-  form.append('key', key)
   return sendRequest({
     method: 'POST',
-    url: uploadUrl,
+    url: `${uploadUrl}${queryPrefix}bucket=${bucket}`,
     data: form,
     xhr
   })