update

index.js

@@ -1,90 +1,142 @@
-import { getFilemd5sum, getBase64 } from './testutil'
+import { getFilemd5sum } from './testutils'
 
 const IMAGE_MULTIPART = '/multipart/upload/'
 const VIDEO_MULTIPART = '/upload/'
 
+const IMAGE_TYPE_ERROR = 101
+const VIDOE_TYPE_ERROR = 102
+
+const UPLOAD_SUCCESS_CODE = 200
+const UPLOAD_FAILED_CODE = 400
+
 function FileFactory(file) {
   this.offset = 0; //用于断点续传，默认为 0
   this.BYTES_PER_CHUNK = 1024 * 1024
   this.file = file
   this.fileSize = file.size
-  this.fileType = file.type
+  this.fileType = (file.name.split('.')[1]).toLowerCase()
   this.chunkNum =  this.BYTES_PER_CHUNK > this.fileSize ? Math.ceil(this.fileSize / this.BYTES_PER_CHUNK):1
   this.chunkSize = this.BYTES_PER_CHUNK > this.fileSize ? this.fileSize:this.BYTES_PER_CHUNK
 }
 
+FileFactory.prototype.setOffset = function(offset) {
+  this.offset = offset
+}
+
 export default function UploadSdk(host, origin, token, file) {
   
   this.host = host
   this.origin = origin
   this.token = token
   this.file = file
-  this.fileFactory = new FileFactory(file)
 
   this.generateMd5 = function (callback) {
     getFilemd5sum(this.file).then(result => {callback(result)})
   }
-
-  this.generateBase64 = function (callback) {
-    getBase64(this.file).then(result => {callback(result)})
+  
+  this.imageUploadAction = function () {
+    return new Promise( (resolve, reject) => {
+      let fileFactory = new FileFactory(this.file)
+      if( !fileFactory.fileType.match('[(jpg)|(png)|(gif)]+$')) {
+        reject(IMAGE_TYPE_ERROR)
+      }
+      this.generateMd5( (md5) => {
+        this.md5 = md5
+        this.postImage(this.md5,fileFactory).then( res => {
+          resolve(res)
+        }).catch( (err) => {
+          reject(err)
+        })
+      }) 
+    })
   }
-  //上传
-  this.action = function() {
-    this.generateMd5( (md5) => {
-      this.md5 = md5
-      this.generateBase64( (base64) => {
-        this.base64Body = base64
-        this.post(this.md5,this.base64Body,this.fileFactory)
+
+  this.videoUploadAction = function () {
+    return new Promise( (resolve, reject) => {
+      if( !this.file.type.match('[(mp4)|(rmvb)|(flv)|(mpeg)|(avi)]+$')) {
+        reject(VIDOE_TYPE_ERROR)
+      }
+      this.postVideo().then( res => {
+        resolve(res)
+      }).catch( (err) => {
+        reject(err)
       })
     })
   }
-  //成功返回函数
-  this.onSuccess = function () {
-    return 'success'
-  }
-  //续传
-  this.onContinue = function() {
-    return 90
-  }
-  //错误
-  this.onError = function() {
-    return 200
+
+  this.postVideo = function() {
+    return new Promise( (resolve, reject) => {
+      let xhr = new XMLHttpRequest()
+      xhr.open('POST', 'http:'+this.host+VIDEO_MULTIPART+this.origin, true)
+      xhr.withCredentials = true;
+      xhr.setRequestHeader('Authorization', `Bearer ${this.token}`)
+      xhr.setRequestHeader('Content-type','application/json')
+      let fd = new FormData()
+      fd.append('file',this.file)
+      fd.append('code_rate','ld,sd,hd')
+      xhr.send(fd)
+      xhr.onreadystatechange = function () {
+        if (xhr.readyState === 4) {
+          let obj = JSON.parse(xhr.responseText)
+          if (xhr.status === 304 || (xhr.status >= 200 && xhr.status < 300)) {
+            resolve({
+              code: UPLOAD_SUCCESS_CODE,
+              url: obj.url,
+              msg: 'success'
+            })
+          } else {
+            reject({
+              code: UPLOAD_FAILED_CODE,
+              url:'',
+              msg:obj.message
+            })
+          }
+        }
+      }
+    })
   }
 
-  this.post = function(md5,base64,fileFactory) {
+  this.postImage = function(md5,fileFactory) {
+    const self = this
     return new Promise((resolve, reject) => {
       let xhr = new XMLHttpRequest()
-      xhr.open("POSt", this.host+IMAGE_MULTIPART+this.origin, true)
-        xhr.withCredentials = true;
-        xhr.setRequestHeader('Authorization', `Bearer ${this.token}`);
-        xhr.setRequestHeader('Content-Type', 'application/json; charset=utf-8');
-        xhr.setRequestHeader('Accept', 'application/json');
-        xhr.setRequestHeader('LINK_UPLOAD_FILE_SIZE',fileFactory.fileSize)
-        xhr.setRequestHeader('LINK_UPLOAD_CHUNK_INDEX',1+'')
-        xhr.setRequestHeader('LINK_UPLOAD_CHUNK_NUM',fileFactory.chunkNum)
-        xhr.setRequestHeader('LINK_UPLOAD_CHUNK_SIZE',fileFactory.chunkSize)
-        xhr.setRequestHeader('LINK_UPLOAD_OFFSET',fileFactory.offset+'')
-        xhr.setRequestHeader('LINK_UPLOAD_FILE_MD5',md5)
-        xhr.setRequestHeader('LINK_UPLOAD_FILE_TYPE','jepg')
-        xhr.send(JSON.stringify({body: base64}))
-        xhr.onreadystatechange = function () {
-          if (xhr.readyState === 4) {
-            if (xhr.status === 304 || (xhr.status >= 200 && xhr.status < 300)) {
-              resolve(xhr.responseText)
-            } else {
-              reject(xhr.status)
+      xhr.open('POSt', 'http:'+this.host+IMAGE_MULTIPART+this.origin, true)
+      xhr.withCredentials = true
+      xhr.setRequestHeader('Authorization', `Bearer ${this.token}`)
+      xhr.setRequestHeader('X-Upload-File-Size',fileFactory.fileSize)
+      xhr.setRequestHeader('X-Upload-Chunk-Index',1+'')
+      xhr.setRequestHeader('X-Upload-Chunk-Num',fileFactory.chunkNum)
+      xhr.setRequestHeader('X-Upload-Chunk-Size',fileFactory.chunkSize)
+      xhr.setRequestHeader('X-Upload-Offset',fileFactory.offset+'')
+      xhr.setRequestHeader('X-Upload-File-Md5',md5)
+      xhr.setRequestHeader('X-Upload-File-Type',fileFactory.fileType)
+      let fd = new FormData()
+      fd.append('file',this.file)
+      xhr.send(fd)
+      xhr.onreadystatechange = function () {
+        if (xhr.readyState === 4) {
+          let obj = JSON.parse(xhr.responseText)
+          if (xhr.status === 304 || (xhr.status >= 200 && xhr.status < 300)) {
+            
+            if(obj.status === 1) {
+              resolve({
+                code: UPLOAD_SUCCESS_CODE,
+                url: obj.url,
+                msg: 'success'
+              })
+            } else if (obj.status === 0) {
+              fileFactory.setOffset(obj.msg)
+              this.getAllResponseHeaders.postImage(md5,fileFactory)
             }
+          } else {
+            reject({
+              code: UPLOAD_FAILED_CODE,
+              url:'',
+              msg: obj.message
+            })
           }
         }
+      }
     })
   }
-}
-
-
-
-
-
-
-
-
-
+}

utils.js

@@ -1,110 +1,40 @@
-import { getFilemd5sum, getBase64 } from './testutil'
+import SparkMD5 from 'spark-md5'
 
-const IMAGE_MULTIPART = '/multipart/upload/'
-const VIDEO_MULTIPART = '/upload/'
-
-function FileFactory(file) {
-  this.offset = 0; //用于断点续传，默认为 0
-  this.BYTES_PER_CHUNK = 1024 * 1024
-  this.file = file
-  this.fileSize = file.size
-  this.fileType = file.type
-  this.chunkNum =  this.BYTES_PER_CHUNK > this.fileSize ? Math.ceil(this.fileSize / this.BYTES_PER_CHUNK):1
-  this.chunkSize = this.BYTES_PER_CHUNK > this.fileSize ? this.fileSize:this.BYTES_PER_CHUNK
-}
-
-export default function UploadSdk(host, origin, token, file) {
-  
-  this.host = host
-  this.origin = origin
-  this.token = token
-  this.file = file
+export function getFilemd5sum(ofile) {
+    return new Promise((resolve, reject) => {
+        let file = ofile;
+        let tmp_md5;
+        let blobSlice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice,
+            // file = this.files[0],
+            chunkSize = 8097152, // Read in chunks of 2MB
+            chunks = Math.ceil(file.size / chunkSize),
+            currentChunk = 0,
+            spark = new SparkMD5.ArrayBuffer(),
+            fileReader = new FileReader();
+
+        function loadNext()  {
+            var start = currentChunk * chunkSize,
+                end = ((start + chunkSize) >= file.size) ? file.size : start + chunkSize;
+            fileReader.readAsArrayBuffer(blobSlice.call(file, start, end));
+        }
 
-  this.generateMd5 = function (callback) {
-    getFilemd5sum(this.file).then(result => {callback(result)})
-  }
+        fileReader.onload = function (e) {
+            spark.append(e.target.result); // Append array buffer
+            currentChunk++;
 
-  this.generateBase64 = function (callback) {
-    getBase64(this.file).then(result => {callback(result)})
-  }
-  
-  this.imageUploadAction = function () {
-    return new Promise( (resolve, reject) => {
-      this.generateMd5( (md5) => {
-        this.md5 = md5
-        this.generateBase64( (base64) => {
-          this.base64Body = base64
-          let fileFactory = new FileFactory(file)
-            this.postImage(this.md5,this.base64Body,fileFactory).then( res => {
-              resolve(res)
-            }).catch( (err) => {
-              reject(err)
-            })
-        })
-      }) 
-    })
-  }
+            if (currentChunk < chunks) {
+                loadNext();
+            } else {
+                tmp_md5 = spark.end();
+                resolve(tmp_md5)
+            }
+        };
 
-  this.videoUploadAction = function () {
-    return new Promise( (resolve, reject) => {
-      this.postVideo().then( res => {
-        resolve(res)
-      }).catch( (err) => {
-        reject(err)
-      })
-    })
-  }
+        fileReader.onerror = function () {
+            reject('error');
+        };
 
-  this.postVideo = function() {
-    return new Promise( (resolve, reject) => {
-      let xhr = new XMLHttpRequest()
-      xhr.open("POSt", this.host+VIDEO_MULTIPART+this.origin, true)
-      xhr.open("POSt", this.host+IMAGE_MULTIPART+this.origin, true)
-      xhr.withCredentials = true;
-      xhr.setRequestHeader('Authorization', `Bearer ${this.token}`)
-      xhr.setRequestHeader('Content-Type', 'application/json; charset=utf-8')
-      xhr.setRequestHeader('Accept', 'application/json')
-      let fd = new FormData()
-      fd.append('file',this.file)
-      fd.append('code_rate','ld,sd,hd')
-      xhr.send(fd)
-      xhr.onreadystatechange = function () {
-        if (xhr.readyState === 4) {
-          if (xhr.status === 304 || (xhr.status >= 200 && xhr.status < 300)) {
-            resolve(xhr.responseText)
-          } else {
-            reject(xhr.status)
-          }
-        }
-      }
-    })
-  }
-
-  this.postImage = function(md5,base64,fileFactory) {
-    return new Promise((resolve, reject) => {
-      let xhr = new XMLHttpRequest()
-      xhr.open("POSt", this.host+IMAGE_MULTIPART+this.origin, true)
-      xhr.withCredentials = true
-      xhr.setRequestHeader('Authorization', `Bearer ${this.token}`)
-      xhr.setRequestHeader('Content-Type', 'application/json; charset=utf-8')
-      xhr.setRequestHeader('Accept', 'application/json')
-      xhr.setRequestHeader('LINK_UPLOAD_FILE_SIZE',fileFactory.fileSize)
-      xhr.setRequestHeader('LINK_UPLOAD_CHUNK_INDEX',1+'')
-      xhr.setRequestHeader('LINK_UPLOAD_CHUNK_NUM',fileFactory.chunkNum)
-      xhr.setRequestHeader('LINK_UPLOAD_CHUNK_SIZE',fileFactory.chunkSize)
-      xhr.setRequestHeader('LINK_UPLOAD_OFFSET',fileFactory.offset+'')
-      xhr.setRequestHeader('LINK_UPLOAD_FILE_MD5',md5)
-      xhr.setRequestHeader('LINK_UPLOAD_FILE_TYPE','jepg')
-      xhr.send(JSON.stringify({body: base64}))
-      xhr.onreadystatechange = function () {
-        if (xhr.readyState === 4) {
-          if (xhr.status === 304 || (xhr.status >= 200 && xhr.status < 300)) {
-            resolve(xhr.responseText)
-          } else {
-            reject(xhr.status)
-          }
-        }
-      }
+        
+        loadNext();
     })
-  }
 }