@uppy/companion-client: migrate to TS

[Murderlon]

No description provided.

[arturi]

Title is wrong, right? It should be @uppy/companion-client, not @uppy/provider-views?

[github-actions]

Diff output files

diff --git a/packages/@uppy/companion-client/lib/Provider.js b/packages/@uppy/companion-client/lib/Provider.js
index 720d03b..0a71eb2 100644
--- a/packages/@uppy/companion-client/lib/Provider.js
+++ b/packages/@uppy/companion-client/lib/Provider.js
@@ -1,5 +1,3 @@
-"use strict";
-
 function _classPrivateFieldLooseBase(receiver, privateKey) {
   if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) {
     throw new TypeError("attempted to use private field on non-instance");
@@ -35,10 +33,14 @@ function isOriginAllowed(origin, allowedOrigin) {
 }
 var _refreshingTokenPromise = _classPrivateFieldLooseKey("refreshingTokenPromise");
 var _getAuthToken = _classPrivateFieldLooseKey("getAuthToken");
+var _getPlugin = _classPrivateFieldLooseKey("getPlugin");
 export default class Provider extends RequestClient {
   constructor(uppy, opts) {
     var _opts$supportsRefresh;
     super(uppy, opts);
+    Object.defineProperty(this, _getPlugin, {
+      value: _getPlugin2,
+    });
     Object.defineProperty(this, _getAuthToken, {
       value: _getAuthToken2,
     });
@@ -78,7 +80,7 @@ export default class Provider extends RequestClient {
   }
   onReceiveResponse(response) {
     super.onReceiveResponse(response);
-    const plugin = this.uppy.getPlugin(this.pluginId);
+    const plugin = _classPrivateFieldLooseBase(this, _getPlugin)[_getPlugin]();
     const oldAuthenticated = plugin.getPluginState().authenticated;
     const authenticated = oldAuthenticated ? response.status !== authErrorStatusCode : response.status < 400;
     plugin.setPluginState({
@@ -87,10 +89,10 @@ export default class Provider extends RequestClient {
     return response;
   }
   async setAuthToken(token) {
-    return this.uppy.getPlugin(this.pluginId).storage.setItem(this.tokenKey, token);
+    return _classPrivateFieldLooseBase(this, _getPlugin)[_getPlugin]().storage.setItem(this.tokenKey, token);
   }
   async removeAuthToken() {
-    return this.uppy.getPlugin(this.pluginId).storage.removeItem(this.tokenKey);
+    return _classPrivateFieldLooseBase(this, _getPlugin)[_getPlugin]().storage.removeItem(this.tokenKey);
   }
   async ensurePreAuth() {
     if (this.companionKeysParams && !this.preAuthToken) {
@@ -100,14 +102,14 @@ export default class Provider extends RequestClient {
       }
     }
   }
-  authQuery() {
+  authQuery(data) {
     return {};
   }
-  authUrl(_temp) {
+  authUrl(_ref) {
     let {
       authFormData,
       query,
-    } = _temp === void 0 ? {} : _temp;
+    } = _ref;
     const params = new URLSearchParams({
       ...query,
       state: btoa(JSON.stringify({
@@ -122,12 +124,12 @@ export default class Provider extends RequestClient {
     }
     return `${this.hostname}/${this.id}/connect?${params}`;
   }
-  async loginSimpleAuth(_ref) {
+  async loginSimpleAuth(_ref2) {
     let {
       uppyVersions,
       authFormData,
       signal,
-    } = _ref;
+    } = _ref2;
     const response = await this.post(`${this.id}/simple-auth`, {
       form: authFormData,
     }, {
@@ -138,12 +140,12 @@ export default class Provider extends RequestClient {
     });
     this.setAuthToken(response.uppyAuthToken);
   }
-  async loginOAuth(_ref2) {
+  async loginOAuth(_ref3) {
     let {
       uppyVersions,
       authFormData,
       signal,
-    } = _ref2;
+    } = _ref3;
     await this.ensurePreAuth();
     signal.throwIfAborted();
     return new Promise((resolve, reject) => {
@@ -166,7 +168,7 @@ export default class Provider extends RequestClient {
         }
         const {
           companionAllowedHosts,
-        } = this.uppy.getPlugin(this.pluginId).opts;
+        } = _classPrivateFieldLooseBase(this, _getPlugin)[_getPlugin]().opts;
         if (!isOriginAllowed(e.origin, companionAllowedHosts)) {
           reject(new Error(`rejecting event from ${e.origin} vs allowed pattern ${companionAllowedHosts}`));
           return;
@@ -195,7 +197,7 @@ export default class Provider extends RequestClient {
         resolve(this.setAuthToken(data.token));
       };
       cleanup = () => {
-        authWindow.close();
+        authWindow == null || authWindow.close();
         window.removeEventListener("message", handleToken);
         signal.removeEventListener("abort", cleanup);
       };
@@ -203,12 +205,12 @@ export default class Provider extends RequestClient {
       window.addEventListener("message", handleToken);
     });
   }
-  async login(_ref3) {
+  async login(_ref4) {
     let {
       uppyVersions,
       authFormData,
       signal,
-    } = _ref3;
+    } = _ref4;
     return this.loginOAuth({
       uppyVersions,
       authFormData,
@@ -305,5 +307,10 @@ export default class Provider extends RequestClient {
   }
 }
 async function _getAuthToken2() {
-  return this.uppy.getPlugin(this.pluginId).storage.getItem(this.tokenKey);
+  return _classPrivateFieldLooseBase(this, _getPlugin)[_getPlugin]().storage.getItem(this.tokenKey);
+}
+function _getPlugin2() {
+  const plugin = this.uppy.getPlugin(this.pluginId);
+  if (plugin == null) throw new Error("Plugin was nullish");
+  return plugin;
 }
diff --git a/packages/@uppy/companion-client/lib/RequestClient.js b/packages/@uppy/companion-client/lib/RequestClient.js
index 4edc0fa..010fcaf 100644
--- a/packages/@uppy/companion-client/lib/RequestClient.js
+++ b/packages/@uppy/companion-client/lib/RequestClient.js
@@ -34,7 +34,6 @@ class HttpError extends Error {
       message,
     } = _ref;
     super(message);
-    this.statusCode = void 0;
     this.name = "HttpError";
     this.statusCode = statusCode;
   }
@@ -85,18 +84,21 @@ export default class RequestClient {
     Object.defineProperty(this, _requestSocketToken, {
       writable: true,
       value: async _ref2 => {
+        var _file$remote;
         let {
           file,
           postBody,
           signal,
         } = _ref2;
-        if (file.remote.url == null) {
+        if (((_file$remote = file.remote) == null ? void 0 : _file$remote.url) == null) {
           throw new Error("Cannot connect to an undefined URL");
         }
         const res = await this.post(file.remote.url, {
           ...file.remote.body,
           ...postBody,
-        }, signal);
+        }, {
+          signal,
+        });
         return res.token;
       },
     });
@@ -135,10 +137,10 @@ export default class RequestClient {
       ..._classPrivateFieldLooseBase(this, _companionHeaders)[_companionHeaders],
     };
   }
-  onReceiveResponse(_ref3) {
-    let {
+  onReceiveResponse(res) {
+    const {
       headers,
-    } = _ref3;
+    } = res;
     const state = this.uppy.getState();
     const companion = state.companion || {};
     const host = this.opts.companionUrl;
@@ -151,14 +153,14 @@ export default class RequestClient {
       });
     }
   }
-  async request(_ref4) {
+  async request(_ref3) {
     let {
       path,
       method = "GET",
       data,
       skipPostResponse,
       signal,
-    } = _ref4;
+    } = _ref3;
     try {
       const headers = await this.headers(!data);
       const response = await fetchWithNetworkError(_classPrivateFieldLooseBase(this, _getUrl)[_getUrl](path), {
@@ -178,9 +180,6 @@ export default class RequestClient {
     }
   }
   async get(path, options) {
-    if (options === void 0) {
-      options = undefined;
-    }
     if (typeof options === "boolean") {
       options = {
         skipPostResponse: options,
@@ -192,9 +191,6 @@ export default class RequestClient {
     });
   }
   async post(path, data, options) {
-    if (options === void 0) {
-      options = undefined;
-    }
     if (typeof options === "boolean") {
       options = {
         skipPostResponse: options,
@@ -208,9 +204,6 @@ export default class RequestClient {
     });
   }
   async delete(path, data, options) {
-    if (data === void 0) {
-      data = undefined;
-    }
     if (typeof options === "boolean") {
       options = {
         skipPostResponse: options,
@@ -225,14 +218,11 @@ export default class RequestClient {
   }
   async uploadRemoteFile(file, reqBody, options) {
     var _this = this;
-    if (options === void 0) {
-      options = {};
-    }
     try {
       const {
         signal,
         getQueue,
-      } = options;
+      } = options || {};
       return await pRetry(async () => {
         var _this$uppy$getFile;
         const existingServerToken = (_this$uppy$getFile = this.uppy.getFile(file.id)) == null
@@ -296,12 +286,12 @@ function _getUrl2(url) {
   }
   return `${this.hostname}/${url}`;
 }
-async function _awaitRemoteFileUpload2(_ref5) {
+async function _awaitRemoteFileUpload2(_ref4) {
   let {
     file,
     queue,
     signal,
-  } = _ref5;
+  } = _ref4;
   let removeEventHandlers;
   const {
     capabilities,
@@ -360,7 +350,7 @@ async function _awaitRemoteFileUpload2(_ref5) {
         try {
           await queue.wrapPromiseFunction(async () => {
             const reconnectWebsocket = async () =>
-              new Promise((resolveSocket, rejectSocket) => {
+              new Promise((_, rejectSocket) => {
                 socket = new WebSocket(`${host}/api/${token}`);
                 resetActivityTimeout();
                 socket.addEventListener("close", () => {
@@ -368,8 +358,9 @@ async function _awaitRemoteFileUpload2(_ref5) {
                   rejectSocket(new Error("Socket closed unexpectedly"));
                 });
                 socket.addEventListener("error", error => {
+                  var _socket2;
                   this.uppy.log(`Companion socket error ${JSON.stringify(error)}, closing socket`, "warning");
-                  socket.close();
+                  (_socket2 = socket) == null || _socket2.close();
                 });
                 socket.addEventListener("open", () => {
                   sendState();
@@ -457,11 +448,11 @@ async function _awaitRemoteFileUpload2(_ref5) {
         this.uppy.log(`upload ${file.id} was removed`, "info");
         resolve();
       };
-      const onCancelAll = _ref6 => {
+      const onCancelAll = _ref5 => {
         var _socketAbortControlle5;
         let {
           reason,
-        } = _ref6;
+        } = _ref5;
         if (reason === "user") {
           socketSend("cancel");
         }