Pulled GDrive, Tus10, and Webcam functionality out to uppy-base

src/plugins/GoogleDrive/index.js

@@ -3,7 +3,7 @@ import Plugin from '../Plugin'
 import 'whatwg-fetch'
 import html from '../../core/html'
 
-import {Provider} from 'uppy-thin'
+import {Provider} from 'uppy-base'
 
 import AuthView from './AuthView'
 import Browser from './Browser'

src/plugins/Tus10.js

@@ -1,6 +1,5 @@
 import Plugin from './Plugin'
-import tus from 'tus-js-client'
-import UppySocket from '../core/UppySocket'
+import { Tus10 as Uploader } from 'uppy-base'
 
 /**
  * Tus resumable file uploader
@@ -21,236 +20,21 @@ export default class Tus10 extends Plugin {
 
     // merge default options with the ones set by user
     this.opts = Object.assign({}, defaultOptions, opts)
-  }
-
-  pauseResume (action, fileID) {
-    const updatedFiles = Object.assign({}, this.core.getState().files)
-    const inProgressUpdatedFiles = Object.keys(updatedFiles).filter((file) => {
-      return !updatedFiles[file].progress.uploadComplete &&
-             updatedFiles[file].progress.uploadStarted
-    })
-
-    switch (action) {
-      case 'toggle':
-        const wasPaused = updatedFiles[fileID].isPaused || false
-        const isPaused = !wasPaused
-        let updatedFile
-        if (wasPaused) {
-          updatedFile = Object.assign({}, updatedFiles[fileID], {
-            isPaused: false
-          })
-        } else {
-          updatedFile = Object.assign({}, updatedFiles[fileID], {
-            isPaused: true
-          })
-        }
-        updatedFiles[fileID] = updatedFile
-        this.core.setState({files: updatedFiles})
-        return isPaused
-      case 'pauseAll':
-        inProgressUpdatedFiles.forEach((file) => {
-          const updatedFile = Object.assign({}, updatedFiles[file], {
-            isPaused: true
-          })
-          updatedFiles[file] = updatedFile
-        })
-        this.core.setState({files: updatedFiles})
-        return
-      case 'resumeAll':
-        inProgressUpdatedFiles.forEach((file) => {
-          const updatedFile = Object.assign({}, updatedFiles[file], {
-            isPaused: false
-          })
-          updatedFiles[file] = updatedFile
-        })
-        this.core.setState({files: updatedFiles})
-        return
-    }
-  }
-
-  // pauseResumeAll (action) {
-  //   let updatedFiles = Object.assign({}, this.core.getState().files)
-  //   updatedFiles = Object.keys(updatedFiles).map((file) => {
-  //     return Object.assign({}, updatedFiles[file], {
-  //       isPaused: action
-  //     })
-  //   })
-  //   this.core.setState({files: updatedFiles})
-  // }
-
-/**
- * Create a new Tus upload
- *
- * @param {object} file for use with upload
- * @param {integer} current file in a queue
- * @param {integer} total number of files in a queue
- * @returns {Promise}
- */
-  upload (file, current, total) {
-    this.core.log(`uploading ${current} of ${total}`)
-
-    // Create a new tus upload
-    return new Promise((resolve, reject) => {
-      const upload = new tus.Upload(file.data, {
-
-        // TODO merge this.opts or this.opts.tus here
-        metadata: file.meta,
-        resume: this.opts.resume,
-        endpoint: this.opts.endpoint,
-
-        onError: (err) => {
-          this.core.log(err)
-          reject('Failed because: ' + err)
-        },
-        onProgress: (bytesUploaded, bytesTotal) => {
-          // Dispatch progress event
-          this.core.emitter.emit('upload-progress', {
-            uploader: this,
-            id: file.id,
-            bytesUploaded: bytesUploaded,
-            bytesTotal: bytesTotal
-          })
-        },
-        onSuccess: () => {
-          this.core.emitter.emit('upload-success', file.id, upload.url)
-
-          this.core.log(`Download ${upload.file.name} from ${upload.url}`)
-          resolve(upload)
-        }
-      })
-
-      this.core.emitter.on('file-remove', (fileID) => {
-        if (fileID === file.id) {
-          console.log('removing file: ', fileID)
-          upload.abort()
-          resolve(`upload ${fileID} was removed`)
-        }
-      })
-
-      this.core.emitter.on('core:upload-pause', (fileID) => {
-        if (fileID === file.id) {
-          const isPaused = this.pauseResume('toggle', fileID)
-          isPaused ? upload.abort() : upload.start()
-        }
-      })
-
-      this.core.emitter.on('core:pause-all', () => {
-        const files = this.core.getState().files
-        if (!files[file.id]) return
-        upload.abort()
-      })
-
-      this.core.emitter.on('core:resume-all', () => {
-        const files = this.core.getState().files
-        if (!files[file.id]) return
-        upload.start()
-      })
 
-      upload.start()
-      this.core.emitter.emit('core:file-upload-started', file.id, upload)
-    })
+    this.uploader = new Uploader(this.opts)
   }
 
-  uploadRemote (file, current, total) {
-    return new Promise((resolve, reject) => {
-      this.core.log(file.remote.url)
-      fetch(file.remote.url, {
-        method: 'post',
-        credentials: 'include',
-        headers: {
-          'Accept': 'application/json',
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(Object.assign({}, file.remote.body, {
-          target: this.opts.endpoint,
-          protocol: 'tus'
-        }))
-      })
-      .then((res) => {
-        if (res.status < 200 && res.status > 300) {
-          return reject(res.statusText)
-        }
-
-        res.json()
-        .then((data) => {
-          // get the host domain
-          var regex = /^(?:https?:\/\/)?(?:[^@\/\n]+@)?(?:www\.)?([^:\/\n]+)/
-          var host = regex.exec(file.remote.host)[1]
-
-          var token = data.token
-          var socket = new UppySocket({
-            target: `ws://${host}:3020/api/${token}`
-          })
-
-          socket.on('progress', (progressData) => {
-            const {progress, bytesUploaded, bytesTotal} = progressData
-
-            if (progress) {
-              this.core.log(`Upload progress: ${progress}`)
-
-              // Dispatch progress event
-              this.core.emitter.emit('upload-progress', {
-                uploader: this,
-                id: file.id,
-                bytesUploaded: bytesUploaded,
-                bytesTotal: bytesTotal
-              })
-
-              if (progress === '100.00') {
-                socket.close()
-                return resolve()
-              }
-            }
-          })
-        })
-      })
-    })
-  }
-
-  uploadFiles (files) {
-    const uploaders = []
-    files.forEach((file, index) => {
-      const current = parseInt(index, 10) + 1
-      const total = files.length
-
-      if (!file.isRemote) {
-        uploaders.push(this.upload(file, current, total))
-      } else {
-        uploaders.push(this.uploadRemote(file, current, total))
-      }
-    })
-
-    return Promise.all(uploaders).then(() => {
-      return {
-        uploadedCount: files.length
-      }
-    })
-  }
-
-  selectForUpload (files) {
-    // TODO: replace files[file].isRemote with some logic
-    //
-    // filter files that are now yet being uploaded / haven’t been uploaded
-    // and remote too
-    const filesForUpload = Object.keys(files).filter((file) => {
-      if (files[file].progress.percentage === 0 || files[file].isRemote) {
-        return true
-      }
-      return false
-    }).map((file) => {
-      return files[file]
-    })
-
-    this.uploadFiles(filesForUpload)
+  start (files) {
+    this.uploader.start(files)
   }
 
   actions () {
     this.core.emitter.on('core:pause-all', () => {
-      this.pauseResume('pauseAll')
+      this.uploader.pauseResume('pauseAll')
     })
 
     this.core.emitter.on('core:resume-all', () => {
-      this.pauseResume('resumeAll')
+      this.uploader.pauseResume('resumeAll')
     })
   }
 
@@ -260,8 +44,9 @@ export default class Tus10 extends Plugin {
     const bus = this.core.emitter
     bus.on('core:upload', () => {
       this.core.log('Tus is uploading...')
+
       const files = this.core.getState().files
-      this.selectForUpload(files)
+      this.uploader.selectForUpload(files)
     })
   }
 }

src/plugins/Webcam/index.js

@@ -1,5 +1,5 @@
 import Plugin from '../Plugin'
-import { Webcam as WebcamProvider } from 'uppy-thin'
+import { Webcam as WebcamProvider } from 'uppy-base'
 import { extend } from '../../core/Utils'
 import WebcamIcon from './WebcamIcon'
 import CameraScreen from './CameraScreen'