@uppy/transloadit: migrate to TS

[Murderlon]

No description provided.

[github-actions]

Diff output files

diff --git a/packages/@uppy/transloadit/lib/Assembly.js b/packages/@uppy/transloadit/lib/Assembly.js
index 98b9e5e..6a731c0 100644
--- a/packages/@uppy/transloadit/lib/Assembly.js
+++ b/packages/@uppy/transloadit/lib/Assembly.js
@@ -105,10 +105,6 @@ function _connectServerSentEvents2() {
     `${this.status.websocket_url}?assembly=${this.status.assembly_id}`,
   );
   _classPrivateFieldLooseBase(this, _sse)[_sse].addEventListener("open", () => {
-    if (this.socket) {
-      this.socket.disconnect();
-      this.socket = null;
-    }
     clearInterval(this.pollInterval);
     this.pollInterval = null;
   });
@@ -147,17 +143,15 @@ function _connectServerSentEvents2() {
     try {
       _classPrivateFieldLooseBase(this, _onError)[_onError](JSON.parse(e.data));
     } catch {
-      _classPrivateFieldLooseBase(this, _onError)[_onError]({
-        msg: e.data,
-      });
+      _classPrivateFieldLooseBase(this, _onError)[_onError](new Error(e.data));
     }
     _classPrivateFieldLooseBase(this, _fetchStatus)[_fetchStatus]({
       diff: false,
     });
   });
 }
-function _onError2(status) {
-  this.emit("error", Object.assign(new Error(status.msg), status));
+function _onError2(assemblyOrError) {
+  this.emit("error", Object.assign(new Error(assemblyOrError.message), assemblyOrError));
   this.close();
 }
 function _beginPolling2() {
diff --git a/packages/@uppy/transloadit/lib/AssemblyWatcher.js b/packages/@uppy/transloadit/lib/AssemblyWatcher.js
index 35a3d18..b39780f 100644
--- a/packages/@uppy/transloadit/lib/AssemblyWatcher.js
+++ b/packages/@uppy/transloadit/lib/AssemblyWatcher.js
@@ -10,9 +10,9 @@ function _classPrivateFieldLooseKey(name) {
 }
 import Emitter from "component-emitter";
 var _assemblyIDs = _classPrivateFieldLooseKey("assemblyIDs");
-var _reject = _classPrivateFieldLooseKey("reject");
 var _remaining = _classPrivateFieldLooseKey("remaining");
 var _resolve = _classPrivateFieldLooseKey("resolve");
+var _reject = _classPrivateFieldLooseKey("reject");
 var _uppy = _classPrivateFieldLooseKey("uppy");
 var _watching = _classPrivateFieldLooseKey("watching");
 var _onAssemblyComplete = _classPrivateFieldLooseKey("onAssemblyComplete");
@@ -41,15 +41,15 @@ class TransloaditAssemblyWatcher extends Emitter {
       writable: true,
       value: void 0,
     });
-    Object.defineProperty(this, _reject, {
+    Object.defineProperty(this, _remaining, {
       writable: true,
       value: void 0,
     });
-    Object.defineProperty(this, _remaining, {
+    Object.defineProperty(this, _resolve, {
       writable: true,
       value: void 0,
     });
-    Object.defineProperty(this, _resolve, {
+    Object.defineProperty(this, _reject, {
       writable: true,
       value: void 0,
     });
diff --git a/packages/@uppy/transloadit/lib/Client.js b/packages/@uppy/transloadit/lib/Client.js
index c663704..798d3da 100644
--- a/packages/@uppy/transloadit/lib/Client.js
+++ b/packages/@uppy/transloadit/lib/Client.js
@@ -10,15 +10,19 @@ function _classPrivateFieldLooseKey(name) {
 }
 import fetchWithNetworkError from "@uppy/utils/lib/fetchWithNetworkError";
 const ASSEMBLIES_ENDPOINT = "/assemblies";
+export class AssemblyError extends Error {
+  constructor(message, details, assembly) {
+    super(message);
+    this.details = details;
+    this.assembly = assembly;
+  }
+}
 var _headers = _classPrivateFieldLooseKey("headers");
 var _fetchWithNetworkError = _classPrivateFieldLooseKey("fetchWithNetworkError");
 var _fetchJSON = _classPrivateFieldLooseKey("fetchJSON");
 var _reportError = _classPrivateFieldLooseKey("reportError");
 export default class Client {
   constructor(_opts) {
-    if (_opts === void 0) {
-      _opts = {};
-    }
     Object.defineProperty(this, _fetchJSON, {
       value: _fetchJSON2,
     });
@@ -57,7 +61,7 @@ export default class Client {
     _classPrivateFieldLooseBase(this, _fetchWithNetworkError)[_fetchWithNetworkError] = this.opts.rateLimitedQueue
       .wrapPromiseFunction(fetchWithNetworkError);
   }
-  createAssembly(_ref) {
+  async createAssembly(_ref) {
     let {
       params,
       fields,
@@ -70,9 +74,9 @@ export default class Client {
       data.append("signature", signature);
     }
     Object.keys(fields).forEach(key => {
-      data.append(key, fields[key]);
+      data.append(key, String(fields[key]));
     });
-    data.append("num_expected_upload_files", expectedFiles);
+    data.append("num_expected_upload_files", String(expectedFiles));
     const url = new URL(ASSEMBLIES_ENDPOINT, `${this.opts.service}`).href;
     return _classPrivateFieldLooseBase(this, _fetchJSON)[_fetchJSON](url, {
       method: "POST",
@@ -85,7 +89,7 @@ export default class Client {
       })
     );
   }
-  reserveFile(assembly, file) {
+  async reserveFile(assembly, file) {
     const size = encodeURIComponent(file.size);
     const url = `${assembly.assembly_ssl_url}/reserve_file?size=${size}`;
     return _classPrivateFieldLooseBase(this, _fetchJSON)[_fetchJSON](url, {
@@ -100,7 +104,7 @@ export default class Client {
       })
     );
   }
-  addFile(assembly, file) {
+  async addFile(assembly, file) {
     if (!file.uploadURL) {
       return Promise.reject(new Error("File does not have an `uploadURL`."));
     }
@@ -122,7 +126,7 @@ export default class Client {
       })
     );
   }
-  updateNumberOfFilesInAssembly(assembly, num_expected_upload_files) {
+  async updateNumberOfFilesInAssembly(assembly, num_expected_upload_files) {
     const url = new URL(assembly.assembly_ssl_url);
     url.pathname = "/update_assemblies";
     const body = JSON.stringify({
@@ -142,7 +146,7 @@ export default class Client {
       })
     );
   }
-  cancelAssembly(assembly) {
+  async cancelAssembly(assembly) {
     const url = assembly.assembly_ssl_url;
     return _classPrivateFieldLooseBase(this, _fetchJSON)[_fetchJSON](url, {
       method: "DELETE",
@@ -154,7 +158,7 @@ export default class Client {
       })
     );
   }
-  getAssemblyStatus(url) {
+  async getAssemblyStatus(url) {
     return _classPrivateFieldLooseBase(this, _fetchJSON)[_fetchJSON](url, {
       headers: _classPrivateFieldLooseBase(this, _headers)[_headers],
     }).catch(err =>
@@ -164,7 +168,7 @@ export default class Client {
       })
     );
   }
-  submitError(err, _temp) {
+  async submitError(err, _temp) {
     let {
       endpoint,
       instance,
@@ -184,33 +188,31 @@ export default class Client {
     });
   }
 }
-function _fetchJSON2() {
-  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-    args[_key] = arguments[_key];
+async function _fetchJSON2() {
+  const response = await _classPrivateFieldLooseBase(this, _fetchWithNetworkError)[_fetchWithNetworkError](
+    ...arguments,
+  );
+  if (response.status === 429) {
+    this.opts.rateLimitedQueue.rateLimit(2000);
+    return _classPrivateFieldLooseBase(this, _fetchJSON)[_fetchJSON](...arguments);
   }
-  return _classPrivateFieldLooseBase(this, _fetchWithNetworkError)[_fetchWithNetworkError](...args).then(response => {
-    if (response.status === 429) {
-      this.opts.rateLimitedQueue.rateLimit(2000);
-      return _classPrivateFieldLooseBase(this, _fetchJSON)[_fetchJSON](...args);
-    }
-    if (!response.ok) {
-      const serverError = new Error(response.statusText);
-      serverError.statusCode = response.status;
-      if (!`${args[0]}`.endsWith(ASSEMBLIES_ENDPOINT)) return Promise.reject(serverError);
-      return response.json().then(assembly => {
-        if (!assembly.error) throw serverError;
-        const error = new Error(assembly.error);
-        error.details = assembly.message;
-        error.assembly = assembly;
-        if (assembly.assembly_id) {
-          error.details += ` Assembly ID: ${assembly.assembly_id}`;
-        }
-        throw error;
-      }, err => {
-        err.cause = serverError;
-        throw err;
-      });
+  if (!response.ok) {
+    const serverError = new Error(response.statusText);
+    serverError.statusCode = response.status;
+    if (!`${arguments.length <= 0 ? undefined : arguments[0]}`.endsWith(ASSEMBLIES_ENDPOINT)) {
+      return Promise.reject(serverError);
     }
-    return response.json();
-  });
+    return response.json().then(assembly => {
+      if (!assembly.error) throw serverError;
+      const error = new AssemblyError(assembly.error, assembly.message, assembly);
+      if (assembly.assembly_id) {
+        error.details += ` Assembly ID: ${assembly.assembly_id}`;
+      }
+      throw error;
+    }, err => {
+      err.cause = serverError;
+      throw err;
+    });
+  }
+  return response.json();
 }
diff --git a/packages/@uppy/transloadit/lib/index.js b/packages/@uppy/transloadit/lib/index.js
index 991403e..6c45b7e 100644
--- a/packages/@uppy/transloadit/lib/index.js
+++ b/packages/@uppy/transloadit/lib/index.js
@@ -14,7 +14,7 @@ import ErrorWithCause from "@uppy/utils/lib/ErrorWithCause";
 import hasProperty from "@uppy/utils/lib/hasProperty";
 import { RateLimitedQueue } from "@uppy/utils/lib/RateLimitedQueue";
 import Assembly from "./Assembly.js";
-import AssemblyOptions, { validateParams } from "./AssemblyOptions.js";
+import AssemblyOptionsBuilder, { validateParams } from "./AssemblyOptions.js";
 import AssemblyWatcher from "./AssemblyWatcher.js";
 import Client from "./Client.js";
 import locale from "./locale.js";
@@ -30,6 +30,21 @@ const sendErrorToConsole = originalErr => err => {
 const COMPANION_URL = "https://api2.transloadit.com/companion";
 const COMPANION_ALLOWED_HOSTS = /\.transloadit\.com$/;
 const TL_COMPANION = /https?:\/\/api2(?:-\w+)?\.transloadit\.com\/companion/;
+const defaultOptions = {
+  service: "https://api2.transloadit.com",
+  errorReporting: true,
+  waitForEncoding: false,
+  waitForMetadata: false,
+  alwaysRunAssembly: false,
+  importFromUploadURLs: false,
+  signature: null,
+  params: null,
+  fields: null,
+  getAssemblyOptions: null,
+  limit: 20,
+  retryDelays: [7000, 10000, 15000, 20000],
+  clientName: null,
+};
 var _rateLimitedQueue = _classPrivateFieldLooseKey("rateLimitedQueue");
 var _getClientVersion = _classPrivateFieldLooseKey("getClientVersion");
 var _attachAssemblyMetadata = _classPrivateFieldLooseKey("attachAssemblyMetadata");
@@ -55,7 +70,10 @@ var _onTusError = _classPrivateFieldLooseKey("onTusError");
 export default class Transloadit extends BasePlugin {
   constructor(uppy, opts) {
     var _this, _this$opts, _this$opts$assemblyOp, _this$opts$getAssembl;
-    super(uppy, opts);
+    super(uppy, {
+      ...defaultOptions,
+      ...opts,
+    });
     _this = this;
     Object.defineProperty(this, _connectAssembly, {
       value: _connectAssembly2,
@@ -224,7 +242,7 @@ export default class Transloadit extends BasePlugin {
         this.restored = Promise.resolve().then(() => {
           restoreState(previousAssemblies);
           restoreAssemblies();
-          return updateAssemblies();
+          updateAssemblies();
         });
         this.restored.then(() => {
           this.restored = null;
@@ -233,7 +251,7 @@ export default class Transloadit extends BasePlugin {
     });
     Object.defineProperty(this, _prepareUpload, {
       writable: true,
-      value: (fileIDs, uploadID) => {
+      value: async (fileIDs, uploadID) => {
         const files = fileIDs.map(id => this.uppy.getFile(id));
         const filesWithoutErrors = files.filter(file => {
           if (!file.error) {
@@ -282,8 +300,8 @@ export default class Transloadit extends BasePlugin {
             [uploadID]: [],
           },
         });
-        const assemblyOptions = new AssemblyOptions(filesWithoutErrors, this.opts);
-        return assemblyOptions.build().then(assemblies => Promise.all(assemblies.map(createAssembly))).then(
+        const assemblyOptions = new AssemblyOptionsBuilder(filesWithoutErrors, this.opts);
+        await assemblyOptions.build().then(assemblies => Promise.all(assemblies.map(createAssembly))).then(
           maybeCreatedAssemblies => {
             const createdAssemblies = maybeCreatedAssemblies.filter(Boolean);
             const assemblyIDs = createdAssemblies.map(assembly => assembly.status.assembly_id);
@@ -364,20 +382,14 @@ export default class Transloadit extends BasePlugin {
       writable: true,
       value: assemblyID => {
         var _this$activeAssemblie;
+        if (!assemblyID) return;
         (_this$activeAssemblie = this.activeAssemblies[assemblyID]) == null || _this$activeAssemblie.close();
       },
     });
     Object.defineProperty(this, _onError, {
       writable: true,
-      value: function(err, uploadID) {
-        if (err === void 0) {
-          err = null;
-        }
-        const state = _this.getPluginState();
-        const assemblyIDs = state.uploadsAssemblies[uploadID];
-        assemblyIDs == null
-          || assemblyIDs.forEach(_classPrivateFieldLooseBase(_this, _closeAssemblyIfExists)[_closeAssemblyIfExists]);
-        _this.client.submitError(err).catch(sendErrorToConsole(err));
+      value: err => {
+        this.client.submitError(err).catch(sendErrorToConsole(err));
       },
     });
     Object.defineProperty(this, _onTusError, {
@@ -388,41 +400,20 @@ export default class Transloadit extends BasePlugin {
           file == null || (_file$transloadit2 = file.transloadit) == null ? void 0 : _file$transloadit2.assembly,
         );
         if (err != null && (_err$message = err.message) != null && _err$message.startsWith("tus: ")) {
-          var _err$originalRequest;
-          const endpoint = (_err$originalRequest = err.originalRequest) == null
-              || (_err$originalRequest = _err$originalRequest.getUnderlyingObject()) == null
+          var _originalRequest;
+          const endpoint = (_originalRequest = err.originalRequest) == null
+              || (_originalRequest = _originalRequest.getUnderlyingObject()) == null
             ? void 0
-            : _err$originalRequest.responseURL;
+            : _originalRequest.responseURL;
           this.client.submitError(err, {
             endpoint,
-            type: "TUS_ERROR",
           }).catch(sendErrorToConsole(err));
         }
       },
     });
     this.type = "uploader";
     this.id = this.opts.id || "Transloadit";
-    this.title = "Transloadit";
     this.defaultLocale = locale;
-    const defaultOptions = {
-      service: "https://api2.transloadit.com",
-      errorReporting: true,
-      waitForEncoding: false,
-      waitForMetadata: false,
-      alwaysRunAssembly: false,
-      importFromUploadURLs: false,
-      signature: null,
-      params: null,
-      fields: null,
-      getAssemblyOptions: null,
-      limit: 20,
-      retryDelays: [7000, 10000, 15000, 20000],
-      clientName: null,
-    };
-    this.opts = {
-      ...defaultOptions,
-      ...opts,
-    };
     (_this$opts$assemblyOp = (_this$opts = this.opts).assemblyOptions) != null
       ? _this$opts$assemblyOp
       : _this$opts.assemblyOptions = (_this$opts$getAssembl = this.opts.getAssemblyOptions) != null
@@ -679,8 +670,9 @@ function _createAssembly2(fileIDs, uploadID, assemblyOptions) {
     throw wrapped;
   });
 }
-function _createAssemblyWatcher2(assemblyID, uploadID) {
-  const watcher = new AssemblyWatcher(this.uppy, assemblyID);
+function _createAssemblyWatcher2(idOrArrayOfIds, uploadID) {
+  const ids = Array.isArray(idOrArrayOfIds) ? idOrArrayOfIds : [idOrArrayOfIds];
+  const watcher = new AssemblyWatcher(this.uppy, ids);
   watcher.on("assembly-complete", id => {
     const files = this.getAssemblyFiles(id);
     files.forEach(file => {

[aduh95]

I didn't have time to go through Client.ts and index.ts yet

[aduh95]

Well technically we could, but of course TS is not going to like this. I don't think it's a random string though, since it's returned by Object.keys

[Murderlon]

It's a bit mysterious, going through how things move through the code and what we get over the network, next.uploads has to be an array. But in our tests we pass objects.