Merge branch 'develop'

Author: pcholuj

package-lock.json

@@ -18,7 +18,7 @@
 /**
  * @private
  */
-const PICKER_VERSION = '1.17.0';
+const PICKER_VERSION = '1.18.0';
 
 /**
  * @private

src/config.ts

@@ -21,6 +21,7 @@ import { Session, Security, Client } from './../client';
 import { PickerOptions } from './../picker';
 import { FsRequest } from '../request';
 import { cleanUpCallbacks } from './../utils';
+import cloneDeep from 'lodash.clonedeep';
 
 // const debug = Debug('fs:prefetch');
 
@@ -108,7 +109,7 @@ export class Prefetch {
 
     let pickerOptionsToSend;
     if (pickerOptions && Object.keys(pickerOptions).length) {
-      pickerOptionsToSend = cleanUpCallbacks({ ...pickerOptions });
+      pickerOptionsToSend = cleanUpCallbacks(cloneDeep({ ...pickerOptions }));
     }
 
     paramsToSend = {

src/lib/api/prefetch.ts

@@ -91,8 +91,10 @@ export class S3Uploader extends UploaderAbstract {
    * @memberof S3Uploader
    */
   public abort(msg?: string): void {
-    this.cancelToken.cancel(msg || 'Aborted by user');
+    this.partsQueue.pause();
     this.partsQueue.clear();
+
+    this.cancelToken.cancel(msg || 'Aborted by user');
   }
 
   /**

src/lib/api/upload/uploaders/s3.ts

@@ -179,6 +179,26 @@ export class HttpAdapter implements AdapterInterface {
           data: {},
         };
 
+        let cancelListener;
+
+        if (config.cancelToken) {
+          cancelListener = config.cancelToken.once('cancel', (reason) => {
+            // do nothing if promise is resolved by system
+            if (reason && reason.message === CANCEL_CLEAR) {
+              return;
+            }
+
+            /* istanbul ignore next: if request is done cancel token should not throw any error */
+            if (req) {
+              req.abort();
+              req = null;
+            }
+
+            debug('Request canceled by user %s, config: %O', reason, config);
+            return reject(new FsRequestError(`Request aborted. Reason: ${reason}`, config, null, FsRequestErrorCode.ABORTED));
+          });
+        }
+
         // we need to follow redirect so make same request with new location
         if ([301, 302].indexOf(res.statusCode) > -1) {
           debug('Redirect received %s', res.statusCode);
@@ -208,7 +228,7 @@ export class HttpAdapter implements AdapterInterface {
 
           // clear cancel token to avoid memory leak
           if (config.cancelToken) {
-            config.cancelToken.cancel(CANCEL_CLEAR);
+            config.cancelToken.removeListener(cancelListener);
           }
 
           return resolve(this.request(Object.assign({}, config, { url })));
@@ -261,28 +281,6 @@ export class HttpAdapter implements AdapterInterface {
         });
       });
 
-      if (config.cancelToken) {
-        config.cancelToken
-          .getSource()
-          .then(reason => {
-            // do nothing if promise is resolved by system
-            if (reason && reason.message === CANCEL_CLEAR) {
-              return;
-            }
-
-            /* istanbul ignore next: if request is done cancel token should not throw any error */
-            if (req) {
-              req.abort();
-              req = null;
-            }
-
-            debug('Request canceled by user %s, config: %O', reason, config);
-            return reject(new FsRequestError(`Request aborted. Reason: ${reason}`, config, null, FsRequestErrorCode.ABORTED));
-          })
-          /* istanbul ignore next: only for safety */
-          .catch(() => {/* empty */});
-      }
-
       if (config.timeout) {
         req.setTimeout(config.timeout, () => {
           req.abort();

src/lib/request/adapters/http.ts

@@ -69,6 +69,21 @@ export class XhrAdapter implements AdapterInterface {
     request.timeout = config.timeout;
 
     return new Promise<FsResponse>((resolve, reject) => {
+      let cancelListener;
+
+      if (config.cancelToken) {
+        cancelListener = config.cancelToken.once('cancel', (reason) => {
+          /* istanbul ignore next: if request is done cancel token should not throw any error */
+          if (request) {
+            request.abort();
+            request = null;
+          }
+
+          debug('Request canceled by user %s, config: %O', reason, config);
+          return reject(new FsRequestError(`Request aborted. Reason: ${reason}`, config, null, FsRequestErrorCode.ABORTED));
+        });
+      }
+
       request.onreadystatechange = async () => {
         if (!request || request.readyState !== 4) {
           return;
@@ -104,7 +119,7 @@ export class XhrAdapter implements AdapterInterface {
 
         // clear cancel token to avoid memory leak
         if (config.cancelToken) {
-          config.cancelToken.cancel(CANCEL_CLEAR);
+          config.cancelToken.removeListener(cancelListener);
         }
 
         return resolve(response);
@@ -158,28 +173,6 @@ export class XhrAdapter implements AdapterInterface {
         }
       }
 
-      if (config.cancelToken) {
-        config.cancelToken
-          .getSource()
-          .then(reason => {
-            // do nothing if promise is resolved by system
-            if (reason && reason.message === CANCEL_CLEAR) {
-              return;
-            }
-
-            /* istanbul ignore next: if request is done cancel token should not throw any error */
-            if (request) {
-              request.abort();
-              request = null;
-            }
-
-            debug('Request canceled by user %s, config: %O', reason, config);
-            return reject(new FsRequestError(`Request aborted. Reason: ${reason}`, config, null, FsRequestErrorCode.ABORTED));
-          })
-          /* istanbul ignore next: only for safety */
-          .catch(() => {/* empty */});
-      }
-
       if (data === undefined) {
         data = null;
       }

src/lib/request/adapters/xhr.ts

@@ -30,14 +30,11 @@ describe('Request/Token', () => {
   });
 
   describe('source token', () => {
-    it('source token should return called', done => {
+    it('Cancel event should be called', done => {
       const token = new FsCancelToken();
-      const source = token.getSource();
       const cancelSpy = jest.fn().mockName('cancelSpy');
-      const cancelSpyCatch = jest.fn().mockName('cancelSpyCatch');
-
-      source.then(cancelSpy).catch(cancelSpyCatch);
 
+      token.once('cancel', cancelSpy);
       token.cancel();
 
       setTimeout(() => {
@@ -46,4 +43,18 @@ describe('Request/Token', () => {
       }, 10);
     });
   });
+
+  it('Cancel event should be called with reason', done => {
+    const token = new FsCancelToken();
+    const cancelSpy = jest.fn().mockName('cancelSpy');
+    const cancelReason = 'test';
+
+    token.once('cancel', cancelSpy);
+    token.cancel(cancelReason);
+
+    setTimeout(() => {
+      expect(cancelSpy).toHaveBeenCalledWith(cancelReason);
+      done();
+    }, 10);
+  });
 });

src/lib/request/token.spec.ts

@@ -14,63 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { FsTokenInterface } from './types';
 import { EventEmitter } from 'eventemitter3';
 
-// token
-const token = data => new Promise(resolve => data.listeners.push(resolve));
-
-const tokenSource = () => {
-  const data = {
-    reason: null,
-    listeners: [],
-  };
-
-  const cancel = reason => {
-    reason = reason || 'Aborted';
-
-    if (typeof reason === 'string') {
-      reason = new Error(reason);
-    }
-
-    data.reason = reason;
-
-    // Only for security reason
-    /* istanbul ignore next */
-    setTimeout(function() {
-      for (let i = 0; i < data.listeners.length; i++) {
-        if (typeof data.listeners[i] === 'function') {
-          data.listeners[i](reason);
-          data.listeners.splice(i, 1);
-        }
-      }
-    }, 0);
-  };
-
-  return {
-    cancel: cancel,
-    token: token(data),
-  };
-};
-
 /**
  * Filestack token that allow pause, resume or cancel given upload
  *
  * @export
  * @class FsToken
  * @extends {EventEmitter}
- * @implements {FsTokenInterface}
  */
-export class FsCancelToken implements FsTokenInterface {
-  private source: any;
-  private cancelMethod: any;
-
-  constructor() {
-    const cancelable = tokenSource();
-
-    this.source = cancelable.token;
-    this.cancelMethod = cancelable.cancel;
-  }
+export class FsCancelToken extends EventEmitter {
 
   /**
    * Cancel request action
@@ -79,16 +32,9 @@ export class FsCancelToken implements FsTokenInterface {
    * @memberof Token
    */
   public cancel(reason?: string | Error) {
-    this.cancelMethod(reason);
-  }
+    this.emit('cancel', reason);
 
-  /**
-   * Returns cancel token promise
-   *
-   * @returns
-   * @memberof Token
-   */
-  public getSource(): Promise<string> {
-    return this.source;
+    this.removeAllListeners();
   }
+
 }

src/lib/request/token.ts

@@ -14,6 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { FsCancelToken } from './token';
+
 export enum FsHttpMethod {
   GET = 'GET',
   DELETE = 'DELETE',
@@ -32,11 +34,6 @@ export interface FsRetryConfig {
   retryFactor?: number;
 }
 
-export interface FsTokenInterface {
-  cancel: (reason?: string | Error) => void;
-  getSource: () => Promise<any>;
-}
-
 export interface FsAuthConfig {
   username: string;
   password: string;
@@ -69,7 +66,7 @@ export interface FsRequestOptions {
   filestackHeaders?: boolean;
   headers?: FsRequestHeaders;
   timeout?: number;
-  cancelToken?: FsTokenInterface;
+  cancelToken?: FsCancelToken;
   retry?: FsRetryConfig;
   onProgress?: (pr: ProgressEvent) => any;
   auth?: FsAuthConfig;

src/lib/request/types.ts

@@ -312,10 +312,11 @@ export const Map = {
   'application/vnd.anser-web-funds-transfer-initiation': ['fti'],
   'application/vnd.antix.game-component': ['atx'],
   'application/vnd.apple.installer+xml': ['mpkg'],
-  'application/vnd.apple.keynote': ['keynote'],
+  'application/vnd.apple.keynote': ['keynote', 'key'],
   'application/vnd.apple.mpegurl': ['m3u8'],
   'application/vnd.apple.numbers': ['numbers'],
   'application/vnd.apple.pages': ['pages'],
+  'application/vnd.apple.key': ['key'],
   'application/vnd.apple.pkpass': ['pkpass'],
   'application/vnd.aristanetworks.swi': ['swi'],
   'application/vnd.astraea-software.iota': ['iota'],