fix: Parse.File.cancel retry attempts

Author: dplewis

gulpfile.js

@@ -65,8 +65,8 @@ const FULL_HEADER = (
   ' */\n'
 );
 
-gulp.task('compile', function() {
-  return gulp.src('src/*.js')
+function compileTask(stream) {
+  return stream
     .pipe(babel({
       presets: PRESETS[BUILD],
       plugins: PLUGINS[BUILD],
@@ -76,6 +76,10 @@ gulp.task('compile', function() {
       plugins: ['minify-dead-code-elimination'],
     }))
     .pipe(gulp.dest(path.join('lib', BUILD)));
+}
+
+gulp.task('compile', function() {
+  return compileTask(gulp.src('src/*.js'));
 });
 
 gulp.task('browserify', function(cb) {
@@ -132,14 +136,15 @@ gulp.task('minify-weapp', function() {
 });
 
 gulp.task('watch', function() {
-  return watch('src/*.js', { ignoreInitial: false, verbose: true })
-    .pipe(babel({
-      presets: PRESETS[BUILD],
-      plugins: PLUGINS[BUILD],
-    }))
-    // Second pass to kill BUILD-switched code
-    .pipe(babel({
-      plugins: ['minify-dead-code-elimination'],
-    }))
-    .pipe(gulp.dest(path.join('lib', BUILD)));
+  if (BUILD === 'browser') {
+    const watcher = gulp.watch('src/*.js', { ignoreInitial: false }, gulp.series('compile', 'browserify', 'minify'));
+    watcher.on('add', function(path) {
+      console.log(`File ${path} was added`);
+    });
+    watcher.on('change', function(path) {
+      console.log(`File ${path} was changed`);
+    });
+    return watcher;
+  }
+  return compileTask(watch('src/*.js', { ignoreInitial: false, verbose: true }));
 });

integration/test/ParseDistTest.js

@@ -1,11 +1,17 @@
 const puppeteer = require('puppeteer');
+const { resolvingPromise } = require('../../lib/node/promiseUtils');
+
 let browser = null;
 let page = null;
 for (const fileName of ['parse.js', 'parse.min.js']) {
   describe(`Parse Dist Test ${fileName}`, () => {
     beforeEach(async () => {
-      browser = await puppeteer.launch();
-      page = await browser.newPage();
+      // Uncomment to test, setting a timeout with `done` to keep the browser open
+      // browser = await puppeteer.launch({ args: ['--disable-web-security'], headless:false, devtools: true, userDataDir: path.resolve(__dirname, './myUserDataDir') });
+      browser = await puppeteer.launch({ args: ['--disable-web-security'] });
+      const context = await browser.createIncognitoBrowserContext();
+      page = await context.newPage();
+      await page.setCacheEnabled(false);
       await page.goto(`http://localhost:1337/${fileName}`);
     });
 
@@ -35,5 +41,67 @@ for (const fileName of ['parse.js', 'parse.min.js']) {
       expect(obj).toBeDefined();
       expect(obj.id).toEqual(response);
     });
+
+    it('can cancel save file with uri', async () => {
+      let requestsCount = 0;
+      let abortedCount = 0;
+      const promise = resolvingPromise();
+      await page.setRequestInterception(true);
+      page.on('request', request => {
+        if (!request.url().includes('favicon.ico')) {
+          requestsCount += 1;
+        }
+        request.continue();
+      });
+      page.on('requestfailed', request => {
+        if (request.failure().errorText  === 'net::ERR_ABORTED' && !request.url().includes('favicon.ico')) {
+          abortedCount += 1;
+          promise.resolve();
+        }
+      });
+      await page.evaluate(async () => {
+        const parseLogo =
+        'https://raw.githubusercontent.com/parse-community/parse-server/master/.github/parse-server-logo.png';
+        const file = new Parse.File('parse-server-logo', { uri: parseLogo });
+        file.save().then(() => {});
+        file.cancel();
+      });
+      await promise;
+      expect(requestsCount).toBe(1);
+      expect(abortedCount).toBe(1);
+    });
+
+    it('can cancel save file with base64', async () => {
+      let requestsCount = 0;
+      let abortedCount = 0;
+      const promise = resolvingPromise();
+      await page.setRequestInterception(true);
+      page.on('request', request => {
+        if (!request.url().includes('favicon.ico')) {
+          requestsCount += 1;
+        }
+        request.continue();
+      });
+      page.on('requestfailed', request => {
+        if (request.failure().errorText  === 'net::ERR_ABORTED' && !request.url().includes('favicon.ico')) {
+          abortedCount += 1;
+          promise.resolve();
+        }
+      });
+      await page.evaluate(async () => {
+        const file = new Parse.File('parse-base64.txt', { base64: 'ParseA==' });
+        file.save().then(() => {});
+
+        const intervalId = setInterval(() => {
+          if (file._requestTask && typeof file._requestTask.abort === 'function') {
+            file.cancel();
+            clearInterval(intervalId);
+          }
+        }, 1);
+      });
+      await promise;
+      expect(requestsCount).toBe(1);
+      expect(abortedCount).toBe(1);
+    });
   });
 }

src/ParseFile.js

@@ -296,6 +296,7 @@ class ParseFile {
    */
   cancel() {
     if (this._requestTask && typeof this._requestTask.abort === 'function') {
+      this._requestTask._aborted = true;
       this._requestTask.abort();
     }
     this._requestTask = null;

src/RESTController.js

@@ -194,11 +194,10 @@ const RESTController = {
           xhr,
         });
       };
-      xhr.send(data);
-
       if (options && typeof options.requestTask === 'function') {
         options.requestTask(xhr);
       }
+      xhr.send(data);
     };
     dispatch();