Merge pull request #239 from OpenImaging/remove-bluebird

switch to native promises

client/package.json

@@ -17,7 +17,6 @@
     "@vue/composition-api": "^1.1.4",
     "@vue/eslint-config-typescript": "^7.0.0",
     "axios": "^0.21.4",
-    "bluebird": "^3.5.5",
     "direct-vuex": "^0.12.1",
     "gl-matrix": "^3.4.3",
     "idle-vue": "^2.0.5",
@@ -39,7 +38,6 @@
     "@babel/plugin-transform-block-scoping": "7.10.5",
     "@babel/runtime": "7.11.0",
     "@babel/runtime-corejs2": "7.11.0",
-    "@types/bluebird": "^3.5.36",
     "@types/lodash": "^4.14.172",
     "@types/uuid": "^8.3.1",
     "@vue/cli-plugin-babel": "^3.3.0",

client/src/store/index.ts

@@ -1,6 +1,5 @@
 /* eslint-disable no-use-before-define */
 
-import BluebirdPromise from 'bluebird';
 import { createDirectStore } from 'direct-vuex';
 import Vue from 'vue';
 import Vuex from 'vuex';
@@ -68,7 +67,7 @@ function getArrayName(filename) {
 }
 
 function getData(id, file, webWorker = null) {
-  return new BluebirdPromise((resolve, reject) => {
+  return new Promise((resolve, reject) => {
     if (frameCache.has(id)) {
       resolve({ frameData: frameCache.get(id), webWorker });
     } else {
@@ -121,13 +120,13 @@ function loadFileAndGetData(frameId) {
   return loadFile(frameId).fileP.then((file) => getData(frameId, file, savedWorker)
     .then(({ webWorker, frameData }) => {
       savedWorker = webWorker;
-      return BluebirdPromise.resolve({ frameData });
+      return Promise.resolve({ frameData });
     })
     .catch((error) => {
       const msg = 'loadFileAndGetData caught error getting data';
       console.log(msg);
       console.log(error);
-      return BluebirdPromise.reject(msg);
+      return Promise.reject(msg);
     })
     .finally(() => {
       if (savedWorker) {
@@ -138,7 +137,7 @@ function loadFileAndGetData(frameId) {
 }
 
 function poolFunction(webWorker, taskInfo) {
-  return new BluebirdPromise((resolve, reject) => {
+  return new Promise((resolve, reject) => {
     const { frameId } = taskInfo;
 
     let filePromise = null;

client/src/utils/ReaderFactory.js

@@ -1,11 +1,4 @@
 import { CancelToken } from 'axios';
-import Promise from 'bluebird';
-
-Promise.config({
-  longStackTraces: false,
-  warnings: false, // note, run node with --trace-warnings to see full stack traces for warnings,
-  cancellation: true,
-});
 
 const READER_MAPPING = {};
 
@@ -104,7 +97,7 @@ function loadFiles(files) {
 }
 
 function downloadFrame(axios, fileName, url) {
-  return new Promise((resolve, reject, onCancel) => {
+  return new Promise((resolve, reject) => {
     const readerMapping = getReader({ name: fileName });
     if (readerMapping) {
       const { readMethod } = readerMapping;
@@ -118,9 +111,6 @@ function downloadFrame(axios, fileName, url) {
           }
         })
         .catch(reject);
-      onCancel(() => {
-        source.cancel('navigated away');
-      });
     } else {
       throw new Error(`No reader found for ${fileName}`);
     }