matrix-js-sdk 41.8.0 → 41.9.0

package/lib/http-api/fetch.js

@@ -1,7 +1,5 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _objectSpread from "@babel/runtime/helpers/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /*
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
@@ -30,16 +28,15 @@ import { anySignal, parseErrorResponse, timeoutSignal } from "./utils.js";
 import { TokenRefresher, TokenRefreshOutcome } from "./refresh.js";
 export class FetchHttpApi {
   constructor(eventEmitter, opts) {
-    var _opts$useAuthorizatio;
-    this.eventEmitter = eventEmitter;
-    this.opts = opts;
     _defineProperty(this, "abortController", new AbortController());
     _defineProperty(this, "tokenRefresher", void 0);
+    this.eventEmitter = eventEmitter;
+    this.opts = opts;
     checkObjectHasKeys(opts, ["baseUrl", "prefix"]);
     if (!opts.onlyData) {
       throw new Error("Constructing FetchHttpApi without `onlyData=true` is no longer supported.");
     }
-    opts.useAuthorizationHeader = (_opts$useAuthorizatio = opts.useAuthorizationHeader) !== null && _opts$useAuthorizatio !== void 0 ? _opts$useAuthorizatio : true;
+    opts.useAuthorizationHeader = opts.useAuthorizationHeader ?? true;
     this.tokenRefresher = new TokenRefresher(opts);
   }
   abort() {
@@ -64,20 +61,20 @@ export class FetchHttpApi {
     if (!this.opts.idBaseUrl) {
       throw new Error("No identity server base URL set");
     }
-    var queryParams = undefined;
-    var body = undefined;
+    let queryParams = undefined;
+    let body = undefined;
     if (method === Method.Get) {
       queryParams = params;
     } else {
       body = params;
     }
-    var fullUri = this.getUrl(path, queryParams, prefix, this.opts.idBaseUrl);
-    var opts = {
+    const fullUri = this.getUrl(path, queryParams, prefix, this.opts.idBaseUrl);
+    const opts = {
       json: true,
       headers: {}
     };
     if (accessToken) {
-      opts.headers.Authorization = "Bearer ".concat(accessToken);
+      opts.headers.Authorization = `Bearer ${accessToken}`;
     }
     return this.requestOtherUrl(method, fullUri, body, opts);
   }
@@ -100,66 +97,58 @@ export class FetchHttpApi {
    * @returns The parsed response.
    * @throws Error if a problem occurred. This includes network problems and Matrix-specific error JSON.
    */
-  authedRequest(method, path) {
-    var queryParams = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    var body = arguments.length > 3 ? arguments[3] : undefined;
-    var paramOpts = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+  authedRequest(method, path, queryParams = {}, body, paramOpts = {}) {
     return this.doAuthedRequest(1, method, path, queryParams, body, paramOpts);
   }
 
   // Wrapper around public method authedRequest to allow for tracking retry attempt counts
-  doAuthedRequest(attempt, method, path, queryParams, body) {
-    var _arguments = arguments,
-      _this = this;
-    return _asyncToGenerator(function* () {
-      var paramOpts = _arguments.length > 5 && _arguments[5] !== undefined ? _arguments[5] : {};
-      // avoid mutating paramOpts so they can be used on retry
-      var opts = deepCopy(paramOpts);
-      // we have to manually copy the abortSignal over as it is not a plain object
-      opts.abortSignal = paramOpts.abortSignal;
+  async doAuthedRequest(attempt, method, path, queryParams, body, paramOpts = {}) {
+    // avoid mutating paramOpts so they can be used on retry
+    const opts = deepCopy(paramOpts);
+    // we have to manually copy the abortSignal over as it is not a plain object
+    opts.abortSignal = paramOpts.abortSignal;
 
-      // Take a snapshot of the current token state before we start the request so we can reference it if we error
-      var requestSnapshot = yield _this.tokenRefresher.prepareForRequest();
-      if (requestSnapshot.accessToken) {
-        if (_this.opts.useAuthorizationHeader) {
-          if (!opts.headers) {
-            opts.headers = {};
-          }
-          if (!opts.headers.Authorization) {
-            opts.headers.Authorization = "Bearer ".concat(requestSnapshot.accessToken);
-          }
-          if (queryParams.access_token) {
-            delete queryParams.access_token;
-          }
-        } else if (!queryParams.access_token) {
-          queryParams.access_token = requestSnapshot.accessToken;
+    // Take a snapshot of the current token state before we start the request so we can reference it if we error
+    const requestSnapshot = await this.tokenRefresher.prepareForRequest();
+    if (requestSnapshot.accessToken) {
+      if (this.opts.useAuthorizationHeader) {
+        if (!opts.headers) {
+          opts.headers = {};
         }
-      }
-      try {
-        var response = yield _this.request(method, path, queryParams, body, opts);
-        return response;
-      } catch (error) {
-        if (!(error instanceof MatrixError)) {
-          throw error;
+        if (!opts.headers.Authorization) {
+          opts.headers.Authorization = `Bearer ${requestSnapshot.accessToken}`;
         }
-        if (error.errcode === "M_UNKNOWN_TOKEN") {
-          var outcome = yield _this.tokenRefresher.handleUnknownToken(requestSnapshot, attempt);
-          if (outcome === TokenRefreshOutcome.Success) {
-            // if we got a new token retry the request
-            return _this.doAuthedRequest(attempt + 1, method, path, queryParams, body, paramOpts);
-          }
-          if (outcome === TokenRefreshOutcome.Failure) {
-            throw new TokenRefreshError(error);
-          }
-          if (!(opts !== null && opts !== void 0 && opts.inhibitLogoutEmit)) {
-            _this.eventEmitter.emit(HttpApiEvent.SessionLoggedOut, error);
-          }
-        } else if (error.errcode == "M_CONSENT_NOT_GIVEN") {
-          _this.eventEmitter.emit(HttpApiEvent.NoConsent, error.message, error.data.consent_uri);
+        if (queryParams.access_token) {
+          delete queryParams.access_token;
         }
+      } else if (!queryParams.access_token) {
+        queryParams.access_token = requestSnapshot.accessToken;
+      }
+    }
+    try {
+      const response = await this.request(method, path, queryParams, body, opts);
+      return response;
+    } catch (error) {
+      if (!(error instanceof MatrixError)) {
         throw error;
       }
-    })();
+      if (error.errcode === "M_UNKNOWN_TOKEN") {
+        const outcome = await this.tokenRefresher.handleUnknownToken(requestSnapshot, attempt);
+        if (outcome === TokenRefreshOutcome.Success) {
+          // if we got a new token retry the request
+          return this.doAuthedRequest(attempt + 1, method, path, queryParams, body, paramOpts);
+        }
+        if (outcome === TokenRefreshOutcome.Failure) {
+          throw new TokenRefreshError(error);
+        }
+        if (!opts?.inhibitLogoutEmit) {
+          this.eventEmitter.emit(HttpApiEvent.SessionLoggedOut, error);
+        }
+      } else if (error.errcode == "M_CONSENT_NOT_GIVEN") {
+        this.eventEmitter.emit(HttpApiEvent.NoConsent, error.message, error.data.consent_uri);
+      }
+      throw error;
+    }
   }
 
   /**
@@ -179,7 +168,7 @@ export class FetchHttpApi {
    * @throws Error if a problem occurred. This includes network problems and Matrix-specific error JSON.
    */
   request(method, path, queryParams, body, opts) {
-    var fullUri = this.getUrl(path, queryParams, opts === null || opts === void 0 ? void 0 : opts.prefix, opts === null || opts === void 0 ? void 0 : opts.baseUrl);
+    const fullUri = this.getUrl(path, queryParams, opts?.prefix, opts?.baseUrl);
     return this.requestOtherUrl(method, fullUri, body, opts);
   }
 
@@ -195,115 +184,108 @@ export class FetchHttpApi {
    * @returns The parsed response.
    * @throws Error if a problem occurred. This includes network problems and Matrix-specific error JSON.
    */
-  requestOtherUrl(method, url, body) {
-    var _arguments2 = arguments,
-      _this2 = this;
-    return _asyncToGenerator(function* () {
-      var _this2$opts$logger, _opts$localTimeoutMs, _opts$keepAlive, _body$constructor;
-      var opts = _arguments2.length > 3 && _arguments2[3] !== undefined ? _arguments2[3] : {};
-      if (opts.json !== undefined && opts.rawResponseBody !== undefined) {
-        throw new Error("Invalid call to `FetchHttpApi` sets both `opts.json` and `opts.rawResponseBody`");
-      }
-      var urlForLogs = _this2.sanitizeUrlForLogs(url);
-      (_this2$opts$logger = _this2.opts.logger) === null || _this2$opts$logger === void 0 || _this2$opts$logger.debug("FetchHttpApi: --> ".concat(method, " ").concat(urlForLogs));
-      var headers = Object.assign({}, opts.headers || {});
-      var jsonResponse = !opts.rawResponseBody && opts.json !== false;
-      if (jsonResponse) {
-        if (!headers["Accept"]) {
-          headers["Accept"] = "application/json";
-        }
-      }
-      var timeout = (_opts$localTimeoutMs = opts.localTimeoutMs) !== null && _opts$localTimeoutMs !== void 0 ? _opts$localTimeoutMs : _this2.opts.localTimeoutMs;
-      var keepAlive = (_opts$keepAlive = opts.keepAlive) !== null && _opts$keepAlive !== void 0 ? _opts$keepAlive : false;
-      var signals = [_this2.abortController.signal];
-      if (timeout !== undefined) {
-        signals.push(timeoutSignal(timeout));
-      }
-      if (opts.abortSignal) {
-        signals.push(opts.abortSignal);
+  async requestOtherUrl(method, url, body, opts = {}) {
+    if (opts.json !== undefined && opts.rawResponseBody !== undefined) {
+      throw new Error("Invalid call to `FetchHttpApi` sets both `opts.json` and `opts.rawResponseBody`");
+    }
+    const urlForLogs = this.sanitizeUrlForLogs(url);
+    this.opts.logger?.debug(`FetchHttpApi: --> ${method} ${urlForLogs}`);
+    const headers = Object.assign({}, opts.headers || {});
+    const jsonResponse = !opts.rawResponseBody && opts.json !== false;
+    if (jsonResponse) {
+      if (!headers["Accept"]) {
+        headers["Accept"] = "application/json";
       }
+    }
+    const timeout = opts.localTimeoutMs ?? this.opts.localTimeoutMs;
+    const keepAlive = opts.keepAlive ?? false;
+    const signals = [this.abortController.signal];
+    if (timeout !== undefined) {
+      signals.push(timeoutSignal(timeout));
+    }
+    if (opts.abortSignal) {
+      signals.push(opts.abortSignal);
+    }
 
-      // If the body is an object, encode it as JSON and set the `Content-Type` header,
-      // unless that has been explicitly inhibited by setting `opts.json: false`.
-      // We can't use getPrototypeOf here as objects made in other contexts e.g. over postMessage won't have same ref
-      var data;
-      if (opts.json !== false && (body === null || body === void 0 || (_body$constructor = body.constructor) === null || _body$constructor === void 0 ? void 0 : _body$constructor.name) === Object.name) {
-        data = JSON.stringify(body);
-        if (!headers["Content-Type"]) {
-          headers["Content-Type"] = "application/json";
-        }
-      } else {
-        data = body;
+    // If the body is an object, encode it as JSON and set the `Content-Type` header,
+    // unless that has been explicitly inhibited by setting `opts.json: false`.
+    // We can't use getPrototypeOf here as objects made in other contexts e.g. over postMessage won't have same ref
+    let data;
+    if (opts.json !== false && body?.constructor?.name === Object.name) {
+      data = JSON.stringify(body);
+      if (!headers["Content-Type"]) {
+        headers["Content-Type"] = "application/json";
       }
-      var _anySignal = anySignal(signals),
-        signal = _anySignal.signal,
-        cleanup = _anySignal.cleanup;
+    } else {
+      data = body;
+    }
+    const {
+      signal,
+      cleanup
+    } = anySignal(signals);
 
-      // Set cache mode based on presence of Authorization header.
-      // Browsers/proxies do not cache responses to requests with Authorization headers.
-      // So specifying "no-cache" is redundant, and actually prevents caching
-      // of preflight requests in CORS scenarios. As such, we only set "no-cache"
-      // when there is no Authorization header.
-      var cacheMode = "Authorization" in headers ? undefined : "no-cache";
-      var res;
-      var start = Date.now();
-      try {
-        var _this2$opts$logger2;
-        res = yield _this2.fetch(url, {
-          signal,
-          method,
-          body: data,
-          headers,
-          mode: "cors",
-          redirect: "follow",
-          referrer: "",
-          referrerPolicy: "no-referrer",
-          cache: cacheMode,
-          credentials: "omit",
-          // we send credentials via headers
-          keepalive: keepAlive,
-          priority: opts.priority
-        });
-        (_this2$opts$logger2 = _this2.opts.logger) === null || _this2$opts$logger2 === void 0 || _this2$opts$logger2.debug("FetchHttpApi: <-- ".concat(method, " ").concat(urlForLogs, " [").concat(Date.now() - start, "ms ").concat(res.status, "]"));
-      } catch (e) {
-        var _this2$opts$logger3;
-        (_this2$opts$logger3 = _this2.opts.logger) === null || _this2$opts$logger3 === void 0 || _this2$opts$logger3.debug("FetchHttpApi: <-- ".concat(method, " ").concat(urlForLogs, " [").concat(Date.now() - start, "ms ").concat(e, "]"));
-        if (e.name === "AbortError") {
-          throw e;
-        }
-        throw new ConnectionError("fetch failed", e);
-      } finally {
-        cleanup();
-      }
-      if (!res.ok) {
-        throw parseErrorResponse(res, yield res.text());
-      }
-      if (opts.rawResponseBody) {
-        return yield res.blob();
-      } else if (jsonResponse) {
-        return yield res.json();
-      } else {
-        return yield res.text();
+    // Set cache mode based on presence of Authorization header.
+    // Browsers/proxies do not cache responses to requests with Authorization headers.
+    // So specifying "no-cache" is redundant, and actually prevents caching
+    // of preflight requests in CORS scenarios. As such, we only set "no-cache"
+    // when there is no Authorization header.
+    const cacheMode = "Authorization" in headers ? undefined : "no-cache";
+    let res;
+    const start = Date.now();
+    try {
+      res = await this.fetch(url, {
+        signal,
+        method,
+        body: data,
+        headers,
+        mode: "cors",
+        redirect: "follow",
+        referrer: "",
+        referrerPolicy: "no-referrer",
+        cache: cacheMode,
+        credentials: "omit",
+        // we send credentials via headers
+        keepalive: keepAlive,
+        priority: opts.priority
+      });
+      this.opts.logger?.debug(`FetchHttpApi: <-- ${method} ${urlForLogs} [${Date.now() - start}ms ${res.status}]`);
+    } catch (e) {
+      this.opts.logger?.debug(`FetchHttpApi: <-- ${method} ${urlForLogs} [${Date.now() - start}ms ${e}]`);
+      if (e.name === "AbortError") {
+        throw e;
       }
-    })();
+      throw new ConnectionError("fetch failed", e);
+    } finally {
+      cleanup();
+    }
+    if (!res.ok) {
+      throw parseErrorResponse(res, await res.text());
+    }
+    if (opts.rawResponseBody) {
+      return await res.blob();
+    } else if (jsonResponse) {
+      return await res.json();
+    } else {
+      return await res.text();
+    }
   }
   sanitizeUrlForLogs(url) {
     try {
-      var asUrl;
+      let asUrl;
       if (typeof url === "string") {
         asUrl = new URL(url);
       } else {
         asUrl = url;
       }
       // Remove the values of any URL params that could contain potential secrets
-      var sanitizedQs = new URLSearchParams();
-      for (var key of asUrl.searchParams.keys()) {
+      const sanitizedQs = new URLSearchParams();
+      for (const key of asUrl.searchParams.keys()) {
         sanitizedQs.append(key, "xxx");
       }
-      var sanitizedQsString = sanitizedQs.toString();
-      var sanitizedQsUrlPiece = sanitizedQsString ? "?".concat(sanitizedQsString) : "";
+      const sanitizedQsString = sanitizedQs.toString();
+      const sanitizedQsUrlPiece = sanitizedQsString ? `?${sanitizedQsString}` : "";
       return asUrl.origin + asUrl.pathname + sanitizedQsUrlPiece;
-    } catch (_unused) {
+    } catch {
       // defensive coding for malformed url
       return "??";
     }
@@ -317,12 +299,12 @@ export class FetchHttpApi {
    * @returns URL
    */
   getUrl(path, queryParams, prefix, baseUrl) {
-    var baseUrlWithFallback = baseUrl !== null && baseUrl !== void 0 ? baseUrl : this.opts.baseUrl;
-    var baseUrlWithoutTrailingSlash = baseUrlWithFallback.endsWith("/") ? baseUrlWithFallback.slice(0, -1) : baseUrlWithFallback;
-    var url = new URL(baseUrlWithoutTrailingSlash + (prefix !== null && prefix !== void 0 ? prefix : this.opts.prefix) + path);
+    const baseUrlWithFallback = baseUrl ?? this.opts.baseUrl;
+    const baseUrlWithoutTrailingSlash = baseUrlWithFallback.endsWith("/") ? baseUrlWithFallback.slice(0, -1) : baseUrlWithFallback;
+    const url = new URL(baseUrlWithoutTrailingSlash + (prefix ?? this.opts.prefix) + path);
     // If there are any params, encode and append them to the URL.
     if (this.opts.extraParams || queryParams) {
-      var mergedParams = _objectSpread(_objectSpread({}, this.opts.extraParams), queryParams);
+      const mergedParams = _objectSpread(_objectSpread({}, this.opts.extraParams), queryParams);
       encodeParams(mergedParams, url.searchParams);
     }
     return url;

package/lib/http-api/fetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.js","names":["checkObjectHasKeys","deepCopy","encodeParams","Method","ConnectionError","MatrixError","TokenRefreshError","HttpApiEvent","anySignal","parseErrorResponse","timeoutSignal","TokenRefresher","TokenRefreshOutcome","FetchHttpApi","constructor","eventEmitter","opts","_opts$useAuthorizatio","_defineProperty","AbortController","onlyData","Error","useAuthorizationHeader","tokenRefresher","abort","abortController","fetch","resource","options","fetchFn","globalThis","setIdBaseUrl","url","idBaseUrl","idServerRequest","method","path","params","prefix","accessToken","queryParams","undefined","body","Get","fullUri","getUrl","json","headers","Authorization","concat","requestOtherUrl","authedRequest","arguments","length","paramOpts","doAuthedRequest","attempt","_arguments","_this","_asyncToGenerator","abortSignal","requestSnapshot","prepareForRequest","access_token","response","request","error","errcode","outcome","handleUnknownToken","Success","Failure","inhibitLogoutEmit","emit","SessionLoggedOut","NoConsent","message","data","consent_uri","baseUrl","_arguments2","_this2","_this2$opts$logger","_opts$localTimeoutMs","_opts$keepAlive","_body$constructor","rawResponseBody","urlForLogs","sanitizeUrlForLogs","logger","debug","Object","assign","jsonResponse","timeout","localTimeoutMs","keepAlive","signals","signal","push","name","JSON","stringify","_anySignal","cleanup","cacheMode","res","start","Date","now","_this2$opts$logger2","mode","redirect","referrer","referrerPolicy","cache","credentials","keepalive","priority","status","e","_this2$opts$logger3","ok","text","blob","asUrl","URL","sanitizedQs","URLSearchParams","key","searchParams","keys","append","sanitizedQsString","toString","sanitizedQsUrlPiece","origin","pathname","_unused","baseUrlWithFallback","baseUrlWithoutTrailingSlash","endsWith","slice","extraParams","mergedParams","_objectSpread"],"sources":["../../src/http-api/fetch.ts"],"sourcesContent":["/*\nCopyright 2022 The Matrix.org Foundation C.I.C.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n*/\n\n/**\n * This is an internal module. See {@link MatrixHttpApi} for the public class.\n */\n\nimport { checkObjectHasKeys, deepCopy, encodeParams } from \"../utils.ts\";\nimport { type TypedEventEmitter } from \"../models/typed-event-emitter.ts\";\nimport { Method } from \"./method.ts\";\nimport { ConnectionError, MatrixError, TokenRefreshError } from \"./errors.ts\";\nimport {\n    type BaseRequestOpts,\n    HttpApiEvent,\n    type HttpApiEventHandlerMap,\n    type IHttpOpts,\n    type IRequestOpts,\n    type Body,\n} from \"./interface.ts\";\nimport { anySignal, parseErrorResponse, timeoutSignal } from \"./utils.ts\";\nimport { type QueryDict } from \"../utils.ts\";\nimport { TokenRefresher, TokenRefreshOutcome } from \"./refresh.ts\";\n\nexport class FetchHttpApi<O extends IHttpOpts> {\n    private abortController = new AbortController();\n    private readonly tokenRefresher: TokenRefresher;\n\n    public constructor(\n        private eventEmitter: TypedEventEmitter<HttpApiEvent, HttpApiEventHandlerMap>,\n        public readonly opts: O,\n    ) {\n        checkObjectHasKeys(opts, [\"baseUrl\", \"prefix\"]);\n        if (!opts.onlyData) {\n            throw new Error(\"Constructing FetchHttpApi without `onlyData=true` is no longer supported.\");\n        }\n        opts.useAuthorizationHeader = opts.useAuthorizationHeader ?? true;\n\n        this.tokenRefresher = new TokenRefresher(opts);\n    }\n\n    public abort(): void {\n        this.abortController.abort();\n        this.abortController = new AbortController();\n    }\n\n    public fetch(resource: URL | string, options?: RequestInit): ReturnType<typeof globalThis.fetch> {\n        if (this.opts.fetchFn) {\n            return this.opts.fetchFn(resource, options);\n        }\n        return globalThis.fetch(resource, options);\n    }\n\n    /**\n     * Sets the base URL for the identity server\n     * @param url - The new base url\n     */\n    public setIdBaseUrl(url?: string): void {\n        this.opts.idBaseUrl = url;\n    }\n\n    public idServerRequest<T extends object = Record<string, unknown>>(\n        method: Method,\n        path: string,\n        params: Record<string, string | string[]> | undefined,\n        prefix: string,\n        accessToken?: string,\n    ): Promise<T> {\n        if (!this.opts.idBaseUrl) {\n            throw new Error(\"No identity server base URL set\");\n        }\n\n        let queryParams: QueryDict | undefined = undefined;\n        let body: Record<string, string | string[]> | undefined = undefined;\n        if (method === Method.Get) {\n            queryParams = params;\n        } else {\n            body = params;\n        }\n\n        const fullUri = this.getUrl(path, queryParams, prefix, this.opts.idBaseUrl);\n\n        const opts: IRequestOpts = {\n            json: true,\n            headers: {},\n        };\n        if (accessToken) {\n            opts.headers!.Authorization = `Bearer ${accessToken}`;\n        }\n\n        return this.requestOtherUrl(method, fullUri, body, opts);\n    }\n\n    /**\n     * Perform an authorised request to the homeserver.\n     * @param method - The HTTP method e.g. \"GET\".\n     * @param path - The HTTP path <b>after</b> the supplied prefix e.g.\n     * \"/createRoom\".\n     *\n     * @param queryParams - A dict of query params (these will NOT be\n     * urlencoded). If unspecified, there will be no query params.\n     *\n     * @param body - The HTTP JSON body.\n     *\n     * @param paramOpts - additional options.\n     * When `paramOpts.doNotAttemptTokenRefresh` is true, token refresh will not be attempted\n     * when an expired token is encountered. Used to only attempt token refresh once.\n     *\n     * @returns The parsed response.\n     * @throws Error if a problem occurred. This includes network problems and Matrix-specific error JSON.\n     */\n    public authedRequest<T>(\n        method: Method,\n        path: string,\n        queryParams: QueryDict = {},\n        body?: Body,\n        paramOpts: IRequestOpts = {},\n    ): Promise<T> {\n        return this.doAuthedRequest<T>(1, method, path, queryParams, body, paramOpts);\n    }\n\n    // Wrapper around public method authedRequest to allow for tracking retry attempt counts\n    private async doAuthedRequest<T>(\n        attempt: number,\n        method: Method,\n        path: string,\n        queryParams: QueryDict,\n        body?: Body,\n        paramOpts: IRequestOpts = {},\n    ): Promise<T> {\n        // avoid mutating paramOpts so they can be used on retry\n        const opts = deepCopy(paramOpts);\n        // we have to manually copy the abortSignal over as it is not a plain object\n        opts.abortSignal = paramOpts.abortSignal;\n\n        // Take a snapshot of the current token state before we start the request so we can reference it if we error\n        const requestSnapshot = await this.tokenRefresher.prepareForRequest();\n        if (requestSnapshot.accessToken) {\n            if (this.opts.useAuthorizationHeader) {\n                if (!opts.headers) {\n                    opts.headers = {};\n                }\n                if (!opts.headers.Authorization) {\n                    opts.headers.Authorization = `Bearer ${requestSnapshot.accessToken}`;\n                }\n                if (queryParams.access_token) {\n                    delete queryParams.access_token;\n                }\n            } else if (!queryParams.access_token) {\n                queryParams.access_token = requestSnapshot.accessToken;\n            }\n        }\n\n        try {\n            const response = await this.request<T>(method, path, queryParams, body, opts);\n            return response;\n        } catch (error) {\n            if (!(error instanceof MatrixError)) {\n                throw error;\n            }\n\n            if (error.errcode === \"M_UNKNOWN_TOKEN\") {\n                const outcome = await this.tokenRefresher.handleUnknownToken(requestSnapshot, attempt);\n                if (outcome === TokenRefreshOutcome.Success) {\n                    // if we got a new token retry the request\n                    return this.doAuthedRequest(attempt + 1, method, path, queryParams, body, paramOpts);\n                }\n                if (outcome === TokenRefreshOutcome.Failure) {\n                    throw new TokenRefreshError(error);\n                }\n\n                if (!opts?.inhibitLogoutEmit) {\n                    this.eventEmitter.emit(HttpApiEvent.SessionLoggedOut, error);\n                }\n            } else if (error.errcode == \"M_CONSENT_NOT_GIVEN\") {\n                this.eventEmitter.emit(HttpApiEvent.NoConsent, error.message, error.data.consent_uri);\n            }\n\n            throw error;\n        }\n    }\n\n    /**\n     * Perform a request to the homeserver without any credentials.\n     * @param method - The HTTP method e.g. \"GET\".\n     * @param path - The HTTP path <b>after</b> the supplied prefix e.g.\n     * \"/createRoom\".\n     *\n     * @param queryParams - A dict of query params (these will NOT be\n     * urlencoded). If unspecified, there will be no query params.\n     *\n     * @param body - The HTTP JSON body.\n     *\n     * @param opts - additional options\n     *\n     * @returns The parsed response.\n     * @throws Error if a problem occurred. This includes network problems and Matrix-specific error JSON.\n     */\n    public request<T>(\n        method: Method,\n        path: string,\n        queryParams?: QueryDict,\n        body?: Body,\n        opts?: IRequestOpts,\n    ): Promise<T> {\n        const fullUri = this.getUrl(path, queryParams, opts?.prefix, opts?.baseUrl);\n        return this.requestOtherUrl<T>(method, fullUri, body, opts);\n    }\n\n    /**\n     * Perform a request to an arbitrary URL.\n     * @param method - The HTTP method e.g. \"GET\".\n     * @param url - The HTTP URL object.\n     *\n     * @param body - The HTTP JSON body.\n     *\n     * @param opts - additional options\n     *\n     * @returns The parsed response.\n     * @throws Error if a problem occurred. This includes network problems and Matrix-specific error JSON.\n     */\n    public async requestOtherUrl<T>(\n        method: Method,\n        url: URL | string,\n        body?: Body,\n        opts: BaseRequestOpts = {},\n    ): Promise<T> {\n        if (opts.json !== undefined && opts.rawResponseBody !== undefined) {\n            throw new Error(\"Invalid call to `FetchHttpApi` sets both `opts.json` and `opts.rawResponseBody`\");\n        }\n\n        const urlForLogs = this.sanitizeUrlForLogs(url);\n\n        this.opts.logger?.debug(`FetchHttpApi: --> ${method} ${urlForLogs}`);\n\n        const headers = Object.assign({}, opts.headers || {});\n\n        const jsonResponse = !opts.rawResponseBody && opts.json !== false;\n        if (jsonResponse) {\n            if (!headers[\"Accept\"]) {\n                headers[\"Accept\"] = \"application/json\";\n            }\n        }\n\n        const timeout = opts.localTimeoutMs ?? this.opts.localTimeoutMs;\n        const keepAlive = opts.keepAlive ?? false;\n        const signals = [this.abortController.signal];\n        if (timeout !== undefined) {\n            signals.push(timeoutSignal(timeout));\n        }\n        if (opts.abortSignal) {\n            signals.push(opts.abortSignal);\n        }\n\n        // If the body is an object, encode it as JSON and set the `Content-Type` header,\n        // unless that has been explicitly inhibited by setting `opts.json: false`.\n        // We can't use getPrototypeOf here as objects made in other contexts e.g. over postMessage won't have same ref\n        let data: BodyInit;\n        if (opts.json !== false && body?.constructor?.name === Object.name) {\n            data = JSON.stringify(body);\n            if (!headers[\"Content-Type\"]) {\n                headers[\"Content-Type\"] = \"application/json\";\n            }\n        } else {\n            data = body as BodyInit;\n        }\n\n        const { signal, cleanup } = anySignal(signals);\n\n        // Set cache mode based on presence of Authorization header.\n        // Browsers/proxies do not cache responses to requests with Authorization headers.\n        // So specifying \"no-cache\" is redundant, and actually prevents caching\n        // of preflight requests in CORS scenarios. As such, we only set \"no-cache\"\n        // when there is no Authorization header.\n        const cacheMode = \"Authorization\" in headers ? undefined : \"no-cache\";\n\n        let res: Response;\n        const start = Date.now();\n        try {\n            res = await this.fetch(url, {\n                signal,\n                method,\n                body: data,\n                headers,\n                mode: \"cors\",\n                redirect: \"follow\",\n                referrer: \"\",\n                referrerPolicy: \"no-referrer\",\n                cache: cacheMode,\n                credentials: \"omit\", // we send credentials via headers\n                keepalive: keepAlive,\n                priority: opts.priority,\n            });\n\n            this.opts.logger?.debug(\n                `FetchHttpApi: <-- ${method} ${urlForLogs} [${Date.now() - start}ms ${res.status}]`,\n            );\n        } catch (e) {\n            this.opts.logger?.debug(`FetchHttpApi: <-- ${method} ${urlForLogs} [${Date.now() - start}ms ${e}]`);\n            if ((<Error>e).name === \"AbortError\") {\n                throw e;\n            }\n            throw new ConnectionError(\"fetch failed\", <Error>e);\n        } finally {\n            cleanup();\n        }\n\n        if (!res.ok) {\n            throw parseErrorResponse(res, await res.text());\n        }\n\n        if (opts.rawResponseBody) {\n            return (await res.blob()) as T;\n        } else if (jsonResponse) {\n            return await res.json();\n        } else {\n            return (await res.text()) as T;\n        }\n    }\n\n    private sanitizeUrlForLogs(url: URL | string): string {\n        try {\n            let asUrl: URL;\n            if (typeof url === \"string\") {\n                asUrl = new URL(url);\n            } else {\n                asUrl = url;\n            }\n            // Remove the values of any URL params that could contain potential secrets\n            const sanitizedQs = new URLSearchParams();\n            for (const key of asUrl.searchParams.keys()) {\n                sanitizedQs.append(key, \"xxx\");\n            }\n            const sanitizedQsString = sanitizedQs.toString();\n            const sanitizedQsUrlPiece = sanitizedQsString ? `?${sanitizedQsString}` : \"\";\n\n            return asUrl.origin + asUrl.pathname + sanitizedQsUrlPiece;\n        } catch {\n            // defensive coding for malformed url\n            return \"??\";\n        }\n    }\n    /**\n     * Form and return a homeserver request URL based on the given path params and prefix.\n     * @param path - The HTTP path <b>after</b> the supplied prefix e.g. \"/createRoom\".\n     * @param queryParams - A dict of query params (these will NOT be urlencoded).\n     * @param prefix - The full prefix to use e.g. \"/_matrix/client/v2_alpha\", defaulting to this.opts.prefix.\n     * @param baseUrl - The baseUrl to use e.g. \"https://matrix.org\", defaulting to this.opts.baseUrl.\n     * @returns URL\n     */\n    public getUrl(path: string, queryParams?: QueryDict, prefix?: string, baseUrl?: string): URL {\n        const baseUrlWithFallback = baseUrl ?? this.opts.baseUrl;\n        const baseUrlWithoutTrailingSlash = baseUrlWithFallback.endsWith(\"/\")\n            ? baseUrlWithFallback.slice(0, -1)\n            : baseUrlWithFallback;\n        const url = new URL(baseUrlWithoutTrailingSlash + (prefix ?? this.opts.prefix) + path);\n        // If there are any params, encode and append them to the URL.\n        if (this.opts.extraParams || queryParams) {\n            const mergedParams = { ...this.opts.extraParams, ...queryParams };\n            encodeParams(mergedParams, url.searchParams);\n        }\n\n        return url;\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"fetch.js","names":[],"sources":["../../src/http-api/fetch.ts"],"sourcesContent":["/*\nCopyright 2022 The Matrix.org Foundation C.I.C.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n*/\n\n/**\n * This is an internal module. See {@link MatrixHttpApi} for the public class.\n */\n\nimport { checkObjectHasKeys, deepCopy, encodeParams } from \"../utils.ts\";\nimport { type TypedEventEmitter } from \"../models/typed-event-emitter.ts\";\nimport { Method } from \"./method.ts\";\nimport { ConnectionError, MatrixError, TokenRefreshError } from \"./errors.ts\";\nimport {\n    type BaseRequestOpts,\n    HttpApiEvent,\n    type HttpApiEventHandlerMap,\n    type IHttpOpts,\n    type IRequestOpts,\n    type Body,\n} from \"./interface.ts\";\nimport { anySignal, parseErrorResponse, timeoutSignal } from \"./utils.ts\";\nimport { type QueryDict } from \"../utils.ts\";\nimport { TokenRefresher, TokenRefreshOutcome } from \"./refresh.ts\";\n\nexport class FetchHttpApi<O extends IHttpOpts> {\n    private abortController = new AbortController();\n    private readonly tokenRefresher: TokenRefresher;\n\n    public constructor(\n        private eventEmitter: TypedEventEmitter<HttpApiEvent, HttpApiEventHandlerMap>,\n        public readonly opts: O,\n    ) {\n        checkObjectHasKeys(opts, [\"baseUrl\", \"prefix\"]);\n        if (!opts.onlyData) {\n            throw new Error(\"Constructing FetchHttpApi without `onlyData=true` is no longer supported.\");\n        }\n        opts.useAuthorizationHeader = opts.useAuthorizationHeader ?? true;\n\n        this.tokenRefresher = new TokenRefresher(opts);\n    }\n\n    public abort(): void {\n        this.abortController.abort();\n        this.abortController = new AbortController();\n    }\n\n    public fetch(resource: URL | string, options?: RequestInit): ReturnType<typeof globalThis.fetch> {\n        if (this.opts.fetchFn) {\n            return this.opts.fetchFn(resource, options);\n        }\n        return globalThis.fetch(resource, options);\n    }\n\n    /**\n     * Sets the base URL for the identity server\n     * @param url - The new base url\n     */\n    public setIdBaseUrl(url?: string): void {\n        this.opts.idBaseUrl = url;\n    }\n\n    public idServerRequest<T extends object = Record<string, unknown>>(\n        method: Method,\n        path: string,\n        params: Record<string, string | string[]> | undefined,\n        prefix: string,\n        accessToken?: string,\n    ): Promise<T> {\n        if (!this.opts.idBaseUrl) {\n            throw new Error(\"No identity server base URL set\");\n        }\n\n        let queryParams: QueryDict | undefined = undefined;\n        let body: Record<string, string | string[]> | undefined = undefined;\n        if (method === Method.Get) {\n            queryParams = params;\n        } else {\n            body = params;\n        }\n\n        const fullUri = this.getUrl(path, queryParams, prefix, this.opts.idBaseUrl);\n\n        const opts: IRequestOpts = {\n            json: true,\n            headers: {},\n        };\n        if (accessToken) {\n            opts.headers!.Authorization = `Bearer ${accessToken}`;\n        }\n\n        return this.requestOtherUrl(method, fullUri, body, opts);\n    }\n\n    /**\n     * Perform an authorised request to the homeserver.\n     * @param method - The HTTP method e.g. \"GET\".\n     * @param path - The HTTP path <b>after</b> the supplied prefix e.g.\n     * \"/createRoom\".\n     *\n     * @param queryParams - A dict of query params (these will NOT be\n     * urlencoded). If unspecified, there will be no query params.\n     *\n     * @param body - The HTTP JSON body.\n     *\n     * @param paramOpts - additional options.\n     * When `paramOpts.doNotAttemptTokenRefresh` is true, token refresh will not be attempted\n     * when an expired token is encountered. Used to only attempt token refresh once.\n     *\n     * @returns The parsed response.\n     * @throws Error if a problem occurred. This includes network problems and Matrix-specific error JSON.\n     */\n    public authedRequest<T>(\n        method: Method,\n        path: string,\n        queryParams: QueryDict = {},\n        body?: Body,\n        paramOpts: IRequestOpts = {},\n    ): Promise<T> {\n        return this.doAuthedRequest<T>(1, method, path, queryParams, body, paramOpts);\n    }\n\n    // Wrapper around public method authedRequest to allow for tracking retry attempt counts\n    private async doAuthedRequest<T>(\n        attempt: number,\n        method: Method,\n        path: string,\n        queryParams: QueryDict,\n        body?: Body,\n        paramOpts: IRequestOpts = {},\n    ): Promise<T> {\n        // avoid mutating paramOpts so they can be used on retry\n        const opts = deepCopy(paramOpts);\n        // we have to manually copy the abortSignal over as it is not a plain object\n        opts.abortSignal = paramOpts.abortSignal;\n\n        // Take a snapshot of the current token state before we start the request so we can reference it if we error\n        const requestSnapshot = await this.tokenRefresher.prepareForRequest();\n        if (requestSnapshot.accessToken) {\n            if (this.opts.useAuthorizationHeader) {\n                if (!opts.headers) {\n                    opts.headers = {};\n                }\n                if (!opts.headers.Authorization) {\n                    opts.headers.Authorization = `Bearer ${requestSnapshot.accessToken}`;\n                }\n                if (queryParams.access_token) {\n                    delete queryParams.access_token;\n                }\n            } else if (!queryParams.access_token) {\n                queryParams.access_token = requestSnapshot.accessToken;\n            }\n        }\n\n        try {\n            const response = await this.request<T>(method, path, queryParams, body, opts);\n            return response;\n        } catch (error) {\n            if (!(error instanceof MatrixError)) {\n                throw error;\n            }\n\n            if (error.errcode === \"M_UNKNOWN_TOKEN\") {\n                const outcome = await this.tokenRefresher.handleUnknownToken(requestSnapshot, attempt);\n                if (outcome === TokenRefreshOutcome.Success) {\n                    // if we got a new token retry the request\n                    return this.doAuthedRequest(attempt + 1, method, path, queryParams, body, paramOpts);\n                }\n                if (outcome === TokenRefreshOutcome.Failure) {\n                    throw new TokenRefreshError(error);\n                }\n\n                if (!opts?.inhibitLogoutEmit) {\n                    this.eventEmitter.emit(HttpApiEvent.SessionLoggedOut, error);\n                }\n            } else if (error.errcode == \"M_CONSENT_NOT_GIVEN\") {\n                this.eventEmitter.emit(HttpApiEvent.NoConsent, error.message, error.data.consent_uri);\n            }\n\n            throw error;\n        }\n    }\n\n    /**\n     * Perform a request to the homeserver without any credentials.\n     * @param method - The HTTP method e.g. \"GET\".\n     * @param path - The HTTP path <b>after</b> the supplied prefix e.g.\n     * \"/createRoom\".\n     *\n     * @param queryParams - A dict of query params (these will NOT be\n     * urlencoded). If unspecified, there will be no query params.\n     *\n     * @param body - The HTTP JSON body.\n     *\n     * @param opts - additional options\n     *\n     * @returns The parsed response.\n     * @throws Error if a problem occurred. This includes network problems and Matrix-specific error JSON.\n     */\n    public request<T>(\n        method: Method,\n        path: string,\n        queryParams?: QueryDict,\n        body?: Body,\n        opts?: IRequestOpts,\n    ): Promise<T> {\n        const fullUri = this.getUrl(path, queryParams, opts?.prefix, opts?.baseUrl);\n        return this.requestOtherUrl<T>(method, fullUri, body, opts);\n    }\n\n    /**\n     * Perform a request to an arbitrary URL.\n     * @param method - The HTTP method e.g. \"GET\".\n     * @param url - The HTTP URL object.\n     *\n     * @param body - The HTTP JSON body.\n     *\n     * @param opts - additional options\n     *\n     * @returns The parsed response.\n     * @throws Error if a problem occurred. This includes network problems and Matrix-specific error JSON.\n     */\n    public async requestOtherUrl<T>(\n        method: Method,\n        url: URL | string,\n        body?: Body,\n        opts: BaseRequestOpts = {},\n    ): Promise<T> {\n        if (opts.json !== undefined && opts.rawResponseBody !== undefined) {\n            throw new Error(\"Invalid call to `FetchHttpApi` sets both `opts.json` and `opts.rawResponseBody`\");\n        }\n\n        const urlForLogs = this.sanitizeUrlForLogs(url);\n\n        this.opts.logger?.debug(`FetchHttpApi: --> ${method} ${urlForLogs}`);\n\n        const headers = Object.assign({}, opts.headers || {});\n\n        const jsonResponse = !opts.rawResponseBody && opts.json !== false;\n        if (jsonResponse) {\n            if (!headers[\"Accept\"]) {\n                headers[\"Accept\"] = \"application/json\";\n            }\n        }\n\n        const timeout = opts.localTimeoutMs ?? this.opts.localTimeoutMs;\n        const keepAlive = opts.keepAlive ?? false;\n        const signals = [this.abortController.signal];\n        if (timeout !== undefined) {\n            signals.push(timeoutSignal(timeout));\n        }\n        if (opts.abortSignal) {\n            signals.push(opts.abortSignal);\n        }\n\n        // If the body is an object, encode it as JSON and set the `Content-Type` header,\n        // unless that has been explicitly inhibited by setting `opts.json: false`.\n        // We can't use getPrototypeOf here as objects made in other contexts e.g. over postMessage won't have same ref\n        let data: BodyInit;\n        if (opts.json !== false && body?.constructor?.name === Object.name) {\n            data = JSON.stringify(body);\n            if (!headers[\"Content-Type\"]) {\n                headers[\"Content-Type\"] = \"application/json\";\n            }\n        } else {\n            data = body as BodyInit;\n        }\n\n        const { signal, cleanup } = anySignal(signals);\n\n        // Set cache mode based on presence of Authorization header.\n        // Browsers/proxies do not cache responses to requests with Authorization headers.\n        // So specifying \"no-cache\" is redundant, and actually prevents caching\n        // of preflight requests in CORS scenarios. As such, we only set \"no-cache\"\n        // when there is no Authorization header.\n        const cacheMode = \"Authorization\" in headers ? undefined : \"no-cache\";\n\n        let res: Response;\n        const start = Date.now();\n        try {\n            res = await this.fetch(url, {\n                signal,\n                method,\n                body: data,\n                headers,\n                mode: \"cors\",\n                redirect: \"follow\",\n                referrer: \"\",\n                referrerPolicy: \"no-referrer\",\n                cache: cacheMode,\n                credentials: \"omit\", // we send credentials via headers\n                keepalive: keepAlive,\n                priority: opts.priority,\n            });\n\n            this.opts.logger?.debug(\n                `FetchHttpApi: <-- ${method} ${urlForLogs} [${Date.now() - start}ms ${res.status}]`,\n            );\n        } catch (e) {\n            this.opts.logger?.debug(`FetchHttpApi: <-- ${method} ${urlForLogs} [${Date.now() - start}ms ${e}]`);\n            if ((<Error>e).name === \"AbortError\") {\n                throw e;\n            }\n            throw new ConnectionError(\"fetch failed\", <Error>e);\n        } finally {\n            cleanup();\n        }\n\n        if (!res.ok) {\n            throw parseErrorResponse(res, await res.text());\n        }\n\n        if (opts.rawResponseBody) {\n            return (await res.blob()) as T;\n        } else if (jsonResponse) {\n            return await res.json();\n        } else {\n            return (await res.text()) as T;\n        }\n    }\n\n    private sanitizeUrlForLogs(url: URL | string): string {\n        try {\n            let asUrl: URL;\n            if (typeof url === \"string\") {\n                asUrl = new URL(url);\n            } else {\n                asUrl = url;\n            }\n            // Remove the values of any URL params that could contain potential secrets\n            const sanitizedQs = new URLSearchParams();\n            for (const key of asUrl.searchParams.keys()) {\n                sanitizedQs.append(key, \"xxx\");\n            }\n            const sanitizedQsString = sanitizedQs.toString();\n            const sanitizedQsUrlPiece = sanitizedQsString ? `?${sanitizedQsString}` : \"\";\n\n            return asUrl.origin + asUrl.pathname + sanitizedQsUrlPiece;\n        } catch {\n            // defensive coding for malformed url\n            return \"??\";\n        }\n    }\n    /**\n     * Form and return a homeserver request URL based on the given path params and prefix.\n     * @param path - The HTTP path <b>after</b> the supplied prefix e.g. \"/createRoom\".\n     * @param queryParams - A dict of query params (these will NOT be urlencoded).\n     * @param prefix - The full prefix to use e.g. \"/_matrix/client/v2_alpha\", defaulting to this.opts.prefix.\n     * @param baseUrl - The baseUrl to use e.g. \"https://matrix.org\", defaulting to this.opts.baseUrl.\n     * @returns URL\n     */\n    public getUrl(path: string, queryParams?: QueryDict, prefix?: string, baseUrl?: string): URL {\n        const baseUrlWithFallback = baseUrl ?? this.opts.baseUrl;\n        const baseUrlWithoutTrailingSlash = baseUrlWithFallback.endsWith(\"/\")\n            ? baseUrlWithFallback.slice(0, -1)\n            : baseUrlWithFallback;\n        const url = new URL(baseUrlWithoutTrailingSlash + (prefix ?? this.opts.prefix) + path);\n        // If there are any params, encode and append them to the URL.\n        if (this.opts.extraParams || queryParams) {\n            const mergedParams = { ...this.opts.extraParams, ...queryParams };\n            encodeParams(mergedParams, url.searchParams);\n        }\n\n        return url;\n    }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/http-api/index.js

@@ -28,8 +28,8 @@ export * from "./errors.js";
 export * from "./method.js";
 export * from "./utils.js";
 export class MatrixHttpApi extends FetchHttpApi {
-  constructor() {
-    super(...arguments);
+  constructor(...args) {
+    super(...args);
     _defineProperty(this, "uploads", []);
   }
   /**
@@ -45,30 +45,28 @@ export class MatrixHttpApi extends FetchHttpApi {
    * @throws May throw a `MatrixSafetyError` if content is deemed unsafe.
    * @see MatrixSafetyError
    */
-  uploadContent(file) {
-    var _opts$includeFilename, _opts$abortController, _opts$type, _opts$name;
-    var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    var includeFilename = (_opts$includeFilename = opts.includeFilename) !== null && _opts$includeFilename !== void 0 ? _opts$includeFilename : true;
-    var abortController = (_opts$abortController = opts.abortController) !== null && _opts$abortController !== void 0 ? _opts$abortController : new AbortController();
+  uploadContent(file, opts = {}) {
+    const includeFilename = opts.includeFilename ?? true;
+    const abortController = opts.abortController ?? new AbortController();
 
     // If the file doesn't have a mime type, use a default since the HS errors if we don't supply one.
-    var contentType = ((_opts$type = opts.type) !== null && _opts$type !== void 0 ? _opts$type : file.type) || "application/octet-stream";
-    var fileName = (_opts$name = opts.name) !== null && _opts$name !== void 0 ? _opts$name : file.name;
-    var upload = {
+    const contentType = (opts.type ?? file.type) || "application/octet-stream";
+    const fileName = opts.name ?? file.name;
+    const upload = {
       loaded: 0,
       total: 0,
       abortController
     };
-    var uploadResolvers = Promise.withResolvers();
+    const uploadResolvers = Promise.withResolvers();
     if (globalThis.XMLHttpRequest) {
-      var xhr = new globalThis.XMLHttpRequest();
-      var timeoutFn = function timeoutFn() {
+      const xhr = new globalThis.XMLHttpRequest();
+      const timeoutFn = function () {
         xhr.abort();
         uploadResolvers.reject(new Error("Timeout"));
       };
 
       // set an initial timeout of 30s; we'll advance it each time we get a progress notification
-      var timeoutTimer = callbacks.setTimeout(timeoutFn, 30000);
+      let timeoutTimer = callbacks.setTimeout(timeoutFn, 30000);
       xhr.onreadystatechange = function () {
         switch (xhr.readyState) {
           case globalThis.XMLHttpRequest.DONE:
@@ -96,17 +94,16 @@ export class MatrixHttpApi extends FetchHttpApi {
         }
       };
       xhr.upload.onprogress = ev => {
-        var _opts$progressHandler;
         callbacks.clearTimeout(timeoutTimer);
         upload.loaded = ev.loaded;
         upload.total = ev.total;
         timeoutTimer = callbacks.setTimeout(timeoutFn, 30000);
-        (_opts$progressHandler = opts.progressHandler) === null || _opts$progressHandler === void 0 || _opts$progressHandler.call(opts, {
+        opts.progressHandler?.({
           loaded: ev.loaded,
           total: ev.total
         });
       };
-      var url = this.getUrl("/upload", undefined, MediaPrefix.V3);
+      const url = this.getUrl("/upload", undefined, MediaPrefix.V3);
       if (includeFilename && fileName) {
         url.searchParams.set("filename", encodeURIComponent(fileName));
       }
@@ -123,11 +120,11 @@ export class MatrixHttpApi extends FetchHttpApi {
         xhr.abort();
       });
     } else {
-      var queryParams = {};
+      const queryParams = {};
       if (includeFilename && fileName) {
         queryParams.filename = fileName;
       }
-      var headers = {
+      const headers = {
         "Content-Type": contentType
       };
       this.authedRequest(Method.Post, "/upload", queryParams, file, {
@@ -149,7 +146,7 @@ export class MatrixHttpApi extends FetchHttpApi {
     return upload.promise;
   }
   cancelUpload(promise) {
-    var upload = this.uploads.find(u => u.promise === promise);
+    const upload = this.uploads.find(u => u.promise === promise);
     if (upload) {
       upload.abortController.abort();
       return true;