@unwanted/matrix-sdk-mini 34.12.0 → 34.13.0

package/lib/rendezvous/transports/MSC4108RendezvousSession.d.ts

@@ -1,61 +0,0 @@
-import { ClientRendezvousFailureReason, MSC4108FailureReason, RendezvousFailureListener } from "../index.ts";
-import { MatrixClient } from "../../matrix.ts";
-/**
- * Prototype of the unstable [MSC4108](https://github.com/matrix-org/matrix-spec-proposals/pull/4108)
- * insecure rendezvous session protocol.
- * @experimental Note that this is UNSTABLE and may have breaking changes without notice.
- */
-export declare class MSC4108RendezvousSession {
-    url?: string;
-    private readonly client?;
-    private readonly fallbackRzServer?;
-    private readonly fetchFn?;
-    private readonly onFailure?;
-    private etag?;
-    private expiresAt?;
-    private expiresTimer?;
-    private _cancelled;
-    private _ready;
-    constructor({ onFailure, url, fetchFn, }: {
-        fetchFn?: typeof globalThis.fetch;
-        onFailure?: RendezvousFailureListener;
-        url: string;
-    });
-    constructor({ onFailure, client, fallbackRzServer, fetchFn, }: {
-        fetchFn?: typeof globalThis.fetch;
-        onFailure?: RendezvousFailureListener;
-        client?: MatrixClient;
-        fallbackRzServer?: string;
-    });
-    /**
-     * Returns whether the channel is ready to be used.
-     */
-    get ready(): boolean;
-    /**
-     * Returns whether the channel has been cancelled.
-     */
-    get cancelled(): boolean;
-    private fetch;
-    private getPostEndpoint;
-    /**
-     * Sends data via the rendezvous channel.
-     * @param data the payload to send
-     */
-    send(data: string): Promise<void>;
-    /**
-     * Receives data from the rendezvous channel.
-     * @return the returned promise won't resolve until new data is acquired or the channel is closed either by the server or the other party.
-     */
-    receive(): Promise<string | undefined>;
-    /**
-     * Cancels the rendezvous channel.
-     * If the reason is user_declined or user_cancelled then the channel will also be closed.
-     * @param reason the reason to cancel with
-     */
-    cancel(reason: MSC4108FailureReason | ClientRendezvousFailureReason): Promise<void>;
-    /**
-     * Closes the rendezvous channel.
-     */
-    close(): Promise<void>;
-}
-//# sourceMappingURL=MSC4108RendezvousSession.d.ts.map

package/lib/rendezvous/transports/MSC4108RendezvousSession.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MSC4108RendezvousSession.d.ts","sourceRoot":"","sources":["../../../src/rendezvous/transports/MSC4108RendezvousSession.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,6BAA6B,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAC7G,OAAO,EAAE,YAAY,EAAU,MAAM,iBAAiB,CAAC;AAGvD;;;;GAIG;AACH,qBAAa,wBAAwB;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAA0B;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAA4B;IACvD,OAAO,CAAC,IAAI,CAAC,CAAS;IACtB,OAAO,CAAC,SAAS,CAAC,CAAO;IACzB,OAAO,CAAC,YAAY,CAAC,CAAgC;IACrD,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAS;gBAEJ,EACf,SAAS,EACT,GAAG,EACH,OAAO,GACV,EAAE;QACC,OAAO,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;QAClC,SAAS,CAAC,EAAE,yBAAyB,CAAC;QACtC,GAAG,EAAE,MAAM,CAAC;KACf;gBACkB,EACf,SAAS,EACT,MAAM,EACN,gBAAgB,EAChB,OAAO,GACV,EAAE;QACC,OAAO,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;QAClC,SAAS,CAAC,EAAE,yBAAyB,CAAC;QACtC,MAAM,CAAC,EAAE,YAAY,CAAC;QACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC7B;IAqBD;;OAEG;IACH,IAAW,KAAK,IAAI,OAAO,CAE1B;IAED;;OAEG;IACH,IAAW,SAAS,IAAI,OAAO,CAE9B;IAED,OAAO,CAAC,KAAK;YAOC,eAAe;IAgB7B;;;OAGG;IACU,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuD9C;;;OAGG;IACU,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA6CnD;;;;OAIG;IACU,MAAM,CAAC,MAAM,EAAE,oBAAoB,GAAG,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBhG;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAatC"}

package/lib/rendezvous/transports/MSC4108RendezvousSession.js

@@ -1,253 +0,0 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-/*
-Copyright 2024 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { logger } from "../../logger.js";
-import { sleep } from "../../utils.js";
-import { ClientRendezvousFailureReason, MSC4108FailureReason } from "../index.js";
-import { Method } from "../../matrix.js";
-import { ClientPrefix } from "../../http-api/index.js";
-
-/**
- * Prototype of the unstable [MSC4108](https://github.com/matrix-org/matrix-spec-proposals/pull/4108)
- * insecure rendezvous session protocol.
- * @experimental Note that this is UNSTABLE and may have breaking changes without notice.
- */
-export class MSC4108RendezvousSession {
-  constructor(_ref) {
-    var {
-      fetchFn,
-      onFailure,
-      url,
-      client,
-      fallbackRzServer
-    } = _ref;
-    _defineProperty(this, "url", void 0);
-    _defineProperty(this, "client", void 0);
-    _defineProperty(this, "fallbackRzServer", void 0);
-    _defineProperty(this, "fetchFn", void 0);
-    _defineProperty(this, "onFailure", void 0);
-    _defineProperty(this, "etag", void 0);
-    _defineProperty(this, "expiresAt", void 0);
-    _defineProperty(this, "expiresTimer", void 0);
-    _defineProperty(this, "_cancelled", false);
-    _defineProperty(this, "_ready", false);
-    this.fetchFn = fetchFn;
-    this.onFailure = onFailure;
-    this.client = client;
-    this.fallbackRzServer = fallbackRzServer;
-    this.url = url;
-  }
-
-  /**
-   * Returns whether the channel is ready to be used.
-   */
-  get ready() {
-    return this._ready;
-  }
-
-  /**
-   * Returns whether the channel has been cancelled.
-   */
-  get cancelled() {
-    return this._cancelled;
-  }
-  fetch(resource, options) {
-    if (this.fetchFn) {
-      return this.fetchFn(resource, options);
-    }
-    return globalThis.fetch(resource, options);
-  }
-  getPostEndpoint() {
-    var _this = this;
-    return _asyncToGenerator(function* () {
-      if (_this.client) {
-        try {
-          if (yield _this.client.doesServerSupportUnstableFeature("org.matrix.msc4108")) {
-            return _this.client.http.getUrl("/org.matrix.msc4108/rendezvous", undefined, ClientPrefix.Unstable).toString();
-          }
-        } catch (err) {
-          logger.warn("Failed to get unstable features", err);
-        }
-      }
-      return _this.fallbackRzServer;
-    })();
-  }
-
-  /**
-   * Sends data via the rendezvous channel.
-   * @param data the payload to send
-   */
-  send(data) {
-    var _this2 = this;
-    return _asyncToGenerator(function* () {
-      var _this2$url, _res$headers$get;
-      if (_this2._cancelled) {
-        return;
-      }
-      var method = _this2.url ? Method.Put : Method.Post;
-      var uri = (_this2$url = _this2.url) !== null && _this2$url !== void 0 ? _this2$url : yield _this2.getPostEndpoint();
-      if (!uri) {
-        throw new Error("Invalid rendezvous URI");
-      }
-      var headers = {
-        "content-type": "text/plain"
-      };
-
-      // if we didn't create the rendezvous channel, we need to fetch the first etag if needed
-      if (!_this2.etag && _this2.url) {
-        yield _this2.receive();
-      }
-      if (_this2.etag) {
-        headers["if-match"] = _this2.etag;
-      }
-      logger.info("=> ".concat(method, " ").concat(uri, " with ").concat(data, " if-match: ").concat(_this2.etag));
-      var res = yield _this2.fetch(uri, {
-        method,
-        headers,
-        body: data,
-        redirect: "follow"
-      });
-      if (res.status === 404) {
-        return _this2.cancel(ClientRendezvousFailureReason.Unknown);
-      }
-      _this2.etag = (_res$headers$get = res.headers.get("etag")) !== null && _res$headers$get !== void 0 ? _res$headers$get : undefined;
-      logger.info("Received etag: ".concat(_this2.etag));
-      if (method === Method.Post) {
-        var expires = res.headers.get("expires");
-        if (expires) {
-          if (_this2.expiresTimer) {
-            clearTimeout(_this2.expiresTimer);
-            _this2.expiresTimer = undefined;
-          }
-          _this2.expiresAt = new Date(expires);
-          _this2.expiresTimer = setTimeout(() => {
-            _this2.expiresTimer = undefined;
-            _this2.cancel(ClientRendezvousFailureReason.Expired);
-          }, _this2.expiresAt.getTime() - Date.now());
-        }
-        // MSC4108: we expect a JSON response with a rendezvous URL
-        var json = yield res.json();
-        if (typeof json.url !== "string") {
-          throw new Error("No rendezvous URL given");
-        }
-        _this2.url = json.url;
-        _this2._ready = true;
-      }
-    })();
-  }
-
-  /**
-   * Receives data from the rendezvous channel.
-   * @return the returned promise won't resolve until new data is acquired or the channel is closed either by the server or the other party.
-   */
-  receive() {
-    var _this3 = this;
-    return _asyncToGenerator(function* () {
-      if (!_this3.url) {
-        throw new Error("Rendezvous not set up");
-      }
-      // eslint-disable-next-line no-constant-condition
-      while (true) {
-        var _poll$headers$get;
-        if (_this3._cancelled) {
-          return undefined;
-        }
-        var headers = {};
-        if (_this3.etag) {
-          headers["if-none-match"] = _this3.etag;
-        }
-        logger.info("=> GET ".concat(_this3.url, " if-none-match: ").concat(_this3.etag));
-        var poll = yield _this3.fetch(_this3.url, {
-          method: Method.Get,
-          headers
-        });
-        if (poll.status === 404) {
-          yield _this3.cancel(ClientRendezvousFailureReason.Unknown);
-          return undefined;
-        }
-
-        // rely on server expiring the channel rather than checking ourselves
-
-        var etag = (_poll$headers$get = poll.headers.get("etag")) !== null && _poll$headers$get !== void 0 ? _poll$headers$get : undefined;
-        if (poll.headers.get("content-type") !== "text/plain") {
-          _this3.etag = etag;
-        } else if (poll.status === 200) {
-          if (!etag) {
-            // Some browsers & extensions block the ETag header for anti-tracking purposes
-            // We try and detect this so the client can give the user a somewhat helpful message
-            yield _this3.cancel(ClientRendezvousFailureReason.ETagMissing);
-            return undefined;
-          }
-          _this3.etag = etag;
-          var text = yield poll.text();
-          logger.info("Received: ".concat(text, " with etag ").concat(_this3.etag));
-          return text;
-        }
-        yield sleep(1000);
-      }
-    })();
-  }
-
-  /**
-   * Cancels the rendezvous channel.
-   * If the reason is user_declined or user_cancelled then the channel will also be closed.
-   * @param reason the reason to cancel with
-   */
-  cancel(reason) {
-    var _this4 = this;
-    return _asyncToGenerator(function* () {
-      var _this4$onFailure;
-      if (_this4._cancelled) return;
-      if (_this4.expiresTimer) {
-        clearTimeout(_this4.expiresTimer);
-        _this4.expiresTimer = undefined;
-      }
-      if (reason === ClientRendezvousFailureReason.Unknown && _this4.expiresAt && _this4.expiresAt.getTime() < Date.now()) {
-        reason = ClientRendezvousFailureReason.Expired;
-      }
-      _this4._cancelled = true;
-      _this4._ready = false;
-      (_this4$onFailure = _this4.onFailure) === null || _this4$onFailure === void 0 || _this4$onFailure.call(_this4, reason);
-      if (reason === ClientRendezvousFailureReason.UserDeclined || reason === MSC4108FailureReason.UserCancelled) {
-        yield _this4.close();
-      }
-    })();
-  }
-
-  /**
-   * Closes the rendezvous channel.
-   */
-  close() {
-    var _this5 = this;
-    return _asyncToGenerator(function* () {
-      if (_this5.expiresTimer) {
-        clearTimeout(_this5.expiresTimer);
-        _this5.expiresTimer = undefined;
-      }
-      if (!_this5.url) return;
-      try {
-        yield _this5.fetch(_this5.url, {
-          method: Method.Delete
-        });
-      } catch (e) {
-        logger.warn(e);
-      }
-    })();
-  }
-}
-//# sourceMappingURL=MSC4108RendezvousSession.js.map

package/lib/rendezvous/transports/MSC4108RendezvousSession.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MSC4108RendezvousSession.js","names":["logger","sleep","ClientRendezvousFailureReason","MSC4108FailureReason","Method","ClientPrefix","MSC4108RendezvousSession","constructor","_ref","fetchFn","onFailure","url","client","fallbackRzServer","_defineProperty","ready","_ready","cancelled","_cancelled","fetch","resource","options","globalThis","getPostEndpoint","_this","_asyncToGenerator","doesServerSupportUnstableFeature","http","getUrl","undefined","Unstable","toString","err","warn","send","data","_this2","_this2$url","_res$headers$get","method","Put","Post","uri","Error","headers","etag","receive","info","concat","res","body","redirect","status","cancel","Unknown","get","expires","expiresTimer","clearTimeout","expiresAt","Date","setTimeout","Expired","getTime","now","json","_this3","_poll$headers$get","poll","Get","ETagMissing","text","reason","_this4","_this4$onFailure","call","UserDeclined","UserCancelled","close","_this5","Delete","e"],"sources":["../../../src/rendezvous/transports/MSC4108RendezvousSession.ts"],"sourcesContent":["/*\nCopyright 2024 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\nimport { logger } from \"../../logger.ts\";\nimport { sleep } from \"../../utils.ts\";\nimport { ClientRendezvousFailureReason, MSC4108FailureReason, RendezvousFailureListener } from \"../index.ts\";\nimport { MatrixClient, Method } from \"../../matrix.ts\";\nimport { ClientPrefix } from \"../../http-api/index.ts\";\n\n/**\n * Prototype of the unstable [MSC4108](https://github.com/matrix-org/matrix-spec-proposals/pull/4108)\n * insecure rendezvous session protocol.\n * @experimental Note that this is UNSTABLE and may have breaking changes without notice.\n */\nexport class MSC4108RendezvousSession {\n    public url?: string;\n    private readonly client?: MatrixClient;\n    private readonly fallbackRzServer?: string;\n    private readonly fetchFn?: typeof globalThis.fetch;\n    private readonly onFailure?: RendezvousFailureListener;\n    private etag?: string;\n    private expiresAt?: Date;\n    private expiresTimer?: ReturnType<typeof setTimeout>;\n    private _cancelled = false;\n    private _ready = false;\n\n    public constructor({\n        onFailure,\n        url,\n        fetchFn,\n    }: {\n        fetchFn?: typeof globalThis.fetch;\n        onFailure?: RendezvousFailureListener;\n        url: string;\n    });\n    public constructor({\n        onFailure,\n        client,\n        fallbackRzServer,\n        fetchFn,\n    }: {\n        fetchFn?: typeof globalThis.fetch;\n        onFailure?: RendezvousFailureListener;\n        client?: MatrixClient;\n        fallbackRzServer?: string;\n    });\n    public constructor({\n        fetchFn,\n        onFailure,\n        url,\n        client,\n        fallbackRzServer,\n    }: {\n        fetchFn?: typeof globalThis.fetch;\n        onFailure?: RendezvousFailureListener;\n        url?: string;\n        client?: MatrixClient;\n        fallbackRzServer?: string;\n    }) {\n        this.fetchFn = fetchFn;\n        this.onFailure = onFailure;\n        this.client = client;\n        this.fallbackRzServer = fallbackRzServer;\n        this.url = url;\n    }\n\n    /**\n     * Returns whether the channel is ready to be used.\n     */\n    public get ready(): boolean {\n        return this._ready;\n    }\n\n    /**\n     * Returns whether the channel has been cancelled.\n     */\n    public get cancelled(): boolean {\n        return this._cancelled;\n    }\n\n    private fetch(resource: URL | string, options?: RequestInit): ReturnType<typeof globalThis.fetch> {\n        if (this.fetchFn) {\n            return this.fetchFn(resource, options);\n        }\n        return globalThis.fetch(resource, options);\n    }\n\n    private async getPostEndpoint(): Promise<string | undefined> {\n        if (this.client) {\n            try {\n                if (await this.client.doesServerSupportUnstableFeature(\"org.matrix.msc4108\")) {\n                    return this.client.http\n                        .getUrl(\"/org.matrix.msc4108/rendezvous\", undefined, ClientPrefix.Unstable)\n                        .toString();\n                }\n            } catch (err) {\n                logger.warn(\"Failed to get unstable features\", err);\n            }\n        }\n\n        return this.fallbackRzServer;\n    }\n\n    /**\n     * Sends data via the rendezvous channel.\n     * @param data the payload to send\n     */\n    public async send(data: string): Promise<void> {\n        if (this._cancelled) {\n            return;\n        }\n        const method = this.url ? Method.Put : Method.Post;\n        const uri = this.url ?? (await this.getPostEndpoint());\n\n        if (!uri) {\n            throw new Error(\"Invalid rendezvous URI\");\n        }\n\n        const headers: Record<string, string> = { \"content-type\": \"text/plain\" };\n\n        // if we didn't create the rendezvous channel, we need to fetch the first etag if needed\n        if (!this.etag && this.url) {\n            await this.receive();\n        }\n\n        if (this.etag) {\n            headers[\"if-match\"] = this.etag;\n        }\n\n        logger.info(`=> ${method} ${uri} with ${data} if-match: ${this.etag}`);\n\n        const res = await this.fetch(uri, { method, headers, body: data, redirect: \"follow\" });\n        if (res.status === 404) {\n            return this.cancel(ClientRendezvousFailureReason.Unknown);\n        }\n        this.etag = res.headers.get(\"etag\") ?? undefined;\n\n        logger.info(`Received etag: ${this.etag}`);\n\n        if (method === Method.Post) {\n            const expires = res.headers.get(\"expires\");\n            if (expires) {\n                if (this.expiresTimer) {\n                    clearTimeout(this.expiresTimer);\n                    this.expiresTimer = undefined;\n                }\n                this.expiresAt = new Date(expires);\n                this.expiresTimer = setTimeout(() => {\n                    this.expiresTimer = undefined;\n                    this.cancel(ClientRendezvousFailureReason.Expired);\n                }, this.expiresAt.getTime() - Date.now());\n            }\n            // MSC4108: we expect a JSON response with a rendezvous URL\n            const json = await res.json();\n            if (typeof json.url !== \"string\") {\n                throw new Error(\"No rendezvous URL given\");\n            }\n            this.url = json.url;\n            this._ready = true;\n        }\n    }\n\n    /**\n     * Receives data from the rendezvous channel.\n     * @return the returned promise won't resolve until new data is acquired or the channel is closed either by the server or the other party.\n     */\n    public async receive(): Promise<string | undefined> {\n        if (!this.url) {\n            throw new Error(\"Rendezvous not set up\");\n        }\n        // eslint-disable-next-line no-constant-condition\n        while (true) {\n            if (this._cancelled) {\n                return undefined;\n            }\n\n            const headers: Record<string, string> = {};\n            if (this.etag) {\n                headers[\"if-none-match\"] = this.etag;\n            }\n\n            logger.info(`=> GET ${this.url} if-none-match: ${this.etag}`);\n            const poll = await this.fetch(this.url, { method: Method.Get, headers });\n\n            if (poll.status === 404) {\n                await this.cancel(ClientRendezvousFailureReason.Unknown);\n                return undefined;\n            }\n\n            // rely on server expiring the channel rather than checking ourselves\n\n            const etag = poll.headers.get(\"etag\") ?? undefined;\n            if (poll.headers.get(\"content-type\") !== \"text/plain\") {\n                this.etag = etag;\n            } else if (poll.status === 200) {\n                if (!etag) {\n                    // Some browsers & extensions block the ETag header for anti-tracking purposes\n                    // We try and detect this so the client can give the user a somewhat helpful message\n                    await this.cancel(ClientRendezvousFailureReason.ETagMissing);\n                    return undefined;\n                }\n\n                this.etag = etag;\n                const text = await poll.text();\n                logger.info(`Received: ${text} with etag ${this.etag}`);\n                return text;\n            }\n            await sleep(1000);\n        }\n    }\n\n    /**\n     * Cancels the rendezvous channel.\n     * If the reason is user_declined or user_cancelled then the channel will also be closed.\n     * @param reason the reason to cancel with\n     */\n    public async cancel(reason: MSC4108FailureReason | ClientRendezvousFailureReason): Promise<void> {\n        if (this._cancelled) return;\n        if (this.expiresTimer) {\n            clearTimeout(this.expiresTimer);\n            this.expiresTimer = undefined;\n        }\n\n        if (\n            reason === ClientRendezvousFailureReason.Unknown &&\n            this.expiresAt &&\n            this.expiresAt.getTime() < Date.now()\n        ) {\n            reason = ClientRendezvousFailureReason.Expired;\n        }\n\n        this._cancelled = true;\n        this._ready = false;\n        this.onFailure?.(reason);\n\n        if (reason === ClientRendezvousFailureReason.UserDeclined || reason === MSC4108FailureReason.UserCancelled) {\n            await this.close();\n        }\n    }\n\n    /**\n     * Closes the rendezvous channel.\n     */\n    public async close(): Promise<void> {\n        if (this.expiresTimer) {\n            clearTimeout(this.expiresTimer);\n            this.expiresTimer = undefined;\n        }\n\n        if (!this.url) return;\n        try {\n            await this.fetch(this.url, { method: Method.Delete });\n        } catch (e) {\n            logger.warn(e);\n        }\n    }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/rendezvous/transports/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./MSC4108RendezvousSession.ts";
-//# sourceMappingURL=index.d.ts.map

package/lib/rendezvous/transports/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rendezvous/transports/index.ts"],"names":[],"mappings":"AAgBA,cAAc,+BAA+B,CAAC"}

package/lib/rendezvous/transports/index.js

@@ -1,18 +0,0 @@
-/*
-Copyright 2022 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-export * from "./MSC4108RendezvousSession.js";
-//# sourceMappingURL=index.js.map

package/lib/rendezvous/transports/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../../src/rendezvous/transports/index.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\nexport * from \"./MSC4108RendezvousSession.ts\";\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,cAAc,+BAA+B","ignoreList":[]}

package/lib/rust-crypto/CrossSigningIdentity.d.ts

@@ -1,33 +0,0 @@
-import { OlmMachine } from "@matrix-org/matrix-sdk-crypto-wasm";
-import { BootstrapCrossSigningOpts } from "../crypto-api/index.ts";
-import { OutgoingRequestProcessor } from "./OutgoingRequestProcessor.ts";
-import { ServerSideSecretStorage } from "../secret-storage.ts";
-/** Manages the cross-signing keys for our own user.
- *
- * @internal
- */
-export declare class CrossSigningIdentity {
-    private readonly olmMachine;
-    private readonly outgoingRequestProcessor;
-    private readonly secretStorage;
-    constructor(olmMachine: OlmMachine, outgoingRequestProcessor: OutgoingRequestProcessor, secretStorage: ServerSideSecretStorage);
-    /**
-     * Initialise our cross-signing keys by creating new keys if they do not exist, and uploading to the server
-     */
-    bootstrapCrossSigning(opts: BootstrapCrossSigningOpts): Promise<void>;
-    /** Reset our cross-signing keys
-     *
-     * This method will:
-     *   * Tell the OlmMachine to create new keys
-     *   * Upload the new public keys and the device signature to the server
-     *   * Upload the private keys to SSSS, if it is set up
-     */
-    private resetCrossSigning;
-    /**
-     * Extract the cross-signing keys from the olm machine and save them to secret storage, if it is configured
-     *
-     * (If secret storage is *not* configured, we assume that the export will happen when it is set up)
-     */
-    private exportCrossSigningKeysToStorage;
-}
-//# sourceMappingURL=CrossSigningIdentity.d.ts.map

package/lib/rust-crypto/CrossSigningIdentity.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"CrossSigningIdentity.d.ts","sourceRoot":"","sources":["../../src/rust-crypto/CrossSigningIdentity.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAqD,MAAM,oCAAoC,CAAC;AAGnH,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAEnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;GAGG;AACH,qBAAa,oBAAoB;IAEzB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAFb,UAAU,EAAE,UAAU,EACtB,wBAAwB,EAAE,wBAAwB,EAClD,aAAa,EAAE,uBAAuB;IAG3D;;OAEG;IACU,qBAAqB,CAAC,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiFlF;;;;;;OAMG;YACW,iBAAiB;IA+B/B;;;;OAIG;YACW,+BAA+B;CAmBhD"}

package/lib/rust-crypto/CrossSigningIdentity.js

@@ -1,157 +0,0 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-/*
-Copyright 2023 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { logger } from "../logger.js";
-/** Manages the cross-signing keys for our own user.
- *
- * @internal
- */
-export class CrossSigningIdentity {
-  constructor(olmMachine, outgoingRequestProcessor, secretStorage) {
-    this.olmMachine = olmMachine;
-    this.outgoingRequestProcessor = outgoingRequestProcessor;
-    this.secretStorage = secretStorage;
-  }
-
-  /**
-   * Initialise our cross-signing keys by creating new keys if they do not exist, and uploading to the server
-   */
-  bootstrapCrossSigning(opts) {
-    var _this = this;
-    return _asyncToGenerator(function* () {
-      if (opts.setupNewCrossSigning) {
-        yield _this.resetCrossSigning(opts.authUploadDeviceSigningKeys);
-        return;
-      }
-      var olmDeviceStatus = yield _this.olmMachine.crossSigningStatus();
-
-      // Try to fetch cross signing keys from the secret storage
-      var masterKeyFromSecretStorage = yield _this.secretStorage.get("m.cross_signing.master");
-      var selfSigningKeyFromSecretStorage = yield _this.secretStorage.get("m.cross_signing.self_signing");
-      var userSigningKeyFromSecretStorage = yield _this.secretStorage.get("m.cross_signing.user_signing");
-      var privateKeysInSecretStorage = Boolean(masterKeyFromSecretStorage && selfSigningKeyFromSecretStorage && userSigningKeyFromSecretStorage);
-      var olmDeviceHasKeys = olmDeviceStatus.hasMaster && olmDeviceStatus.hasUserSigning && olmDeviceStatus.hasSelfSigning;
-
-      // Log all relevant state for easier parsing of debug logs.
-      logger.log("bootstrapCrossSigning: starting", {
-        setupNewCrossSigning: opts.setupNewCrossSigning,
-        olmDeviceHasMaster: olmDeviceStatus.hasMaster,
-        olmDeviceHasUserSigning: olmDeviceStatus.hasUserSigning,
-        olmDeviceHasSelfSigning: olmDeviceStatus.hasSelfSigning,
-        privateKeysInSecretStorage
-      });
-      if (olmDeviceHasKeys) {
-        if (!(yield _this.secretStorage.hasKey())) {
-          logger.warn("bootstrapCrossSigning: Olm device has private keys, but secret storage is not yet set up; doing nothing for now.");
-          // the keys should get uploaded to 4S once that is set up.
-        } else if (!privateKeysInSecretStorage) {
-          // the device has the keys but they are not in 4S, so update it
-          logger.log("bootstrapCrossSigning: Olm device has private keys: exporting to secret storage");
-          yield _this.exportCrossSigningKeysToStorage();
-        } else {
-          logger.log("bootstrapCrossSigning: Olm device has private keys and they are saved in secret storage; doing nothing");
-        }
-      } /* (!olmDeviceHasKeys) */else {
-        if (privateKeysInSecretStorage) {
-          // they are in 4S, so import from there
-          logger.log("bootstrapCrossSigning: Cross-signing private keys not found locally, but they are available " + "in secret storage, reading storage and caching locally");
-          yield _this.olmMachine.importCrossSigningKeys(masterKeyFromSecretStorage, selfSigningKeyFromSecretStorage, userSigningKeyFromSecretStorage);
-
-          // Get the current device
-          var device = yield _this.olmMachine.getDevice(_this.olmMachine.userId, _this.olmMachine.deviceId);
-          try {
-            // Sign the device with our cross-signing key and upload the signature
-            var request = yield device.verify();
-            yield _this.outgoingRequestProcessor.makeOutgoingRequest(request);
-          } finally {
-            device.free();
-          }
-        } else {
-          logger.log("bootstrapCrossSigning: Cross-signing private keys not found locally or in secret storage, creating new keys");
-          yield _this.resetCrossSigning(opts.authUploadDeviceSigningKeys);
-        }
-      }
-
-      // TODO: we might previously have bootstrapped cross-signing but not completed uploading the keys to the
-      //   server -- in which case we should call OlmDevice.bootstrap_cross_signing. How do we know?
-      logger.log("bootstrapCrossSigning: complete");
-    })();
-  }
-
-  /** Reset our cross-signing keys
-   *
-   * This method will:
-   *   * Tell the OlmMachine to create new keys
-   *   * Upload the new public keys and the device signature to the server
-   *   * Upload the private keys to SSSS, if it is set up
-   */
-  resetCrossSigning(authUploadDeviceSigningKeys) {
-    var _this2 = this;
-    return _asyncToGenerator(function* () {
-      // XXX: We must find a way to make this atomic, currently if the user does not remember his account password
-      // or 4S passphrase/key the process will fail in a bad state, with keys rotated but not uploaded or saved in 4S.
-      var outgoingRequests = yield _this2.olmMachine.bootstrapCrossSigning(true);
-
-      // If 4S is configured we need to update it.
-      if (!(yield _this2.secretStorage.hasKey())) {
-        logger.warn("resetCrossSigning: Secret storage is not yet set up; not exporting keys to secret storage yet.");
-        // the keys should get uploaded to 4S once that is set up.
-      } else {
-        // Update 4S before uploading cross-signing keys, to stay consistent with legacy that asks
-        // 4S passphrase before asking for account password.
-        // Ultimately should be made atomic and resistant to forgotten password/passphrase.
-        logger.log("resetCrossSigning: exporting private keys to secret storage");
-        yield _this2.exportCrossSigningKeysToStorage();
-      }
-      logger.log("resetCrossSigning: publishing public keys to server");
-      for (var req of [outgoingRequests.uploadKeysRequest, outgoingRequests.uploadSigningKeysRequest, outgoingRequests.uploadSignaturesRequest]) {
-        if (req) {
-          yield _this2.outgoingRequestProcessor.makeOutgoingRequest(req, authUploadDeviceSigningKeys);
-        }
-      }
-    })();
-  }
-
-  /**
-   * Extract the cross-signing keys from the olm machine and save them to secret storage, if it is configured
-   *
-   * (If secret storage is *not* configured, we assume that the export will happen when it is set up)
-   */
-  exportCrossSigningKeysToStorage() {
-    var _this3 = this;
-    return _asyncToGenerator(function* () {
-      var exported = yield _this3.olmMachine.exportCrossSigningKeys();
-      /* istanbul ignore else (this function is only called when we know the olm machine has keys) */
-      if (exported !== null && exported !== void 0 && exported.masterKey) {
-        yield _this3.secretStorage.store("m.cross_signing.master", exported.masterKey);
-      } else {
-        logger.error("Cannot export MSK to secret storage, private key unknown");
-      }
-      if (exported !== null && exported !== void 0 && exported.self_signing_key) {
-        yield _this3.secretStorage.store("m.cross_signing.self_signing", exported.self_signing_key);
-      } else {
-        logger.error("Cannot export SSK to secret storage, private key unknown");
-      }
-      if (exported !== null && exported !== void 0 && exported.userSigningKey) {
-        yield _this3.secretStorage.store("m.cross_signing.user_signing", exported.userSigningKey);
-      } else {
-        logger.error("Cannot export USK to secret storage, private key unknown");
-      }
-    })();
-  }
-}
-//# sourceMappingURL=CrossSigningIdentity.js.map

package/lib/rust-crypto/CrossSigningIdentity.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CrossSigningIdentity.js","names":["logger","CrossSigningIdentity","constructor","olmMachine","outgoingRequestProcessor","secretStorage","bootstrapCrossSigning","opts","_this","_asyncToGenerator","setupNewCrossSigning","resetCrossSigning","authUploadDeviceSigningKeys","olmDeviceStatus","crossSigningStatus","masterKeyFromSecretStorage","get","selfSigningKeyFromSecretStorage","userSigningKeyFromSecretStorage","privateKeysInSecretStorage","Boolean","olmDeviceHasKeys","hasMaster","hasUserSigning","hasSelfSigning","log","olmDeviceHasMaster","olmDeviceHasUserSigning","olmDeviceHasSelfSigning","hasKey","warn","exportCrossSigningKeysToStorage","importCrossSigningKeys","device","getDevice","userId","deviceId","request","verify","makeOutgoingRequest","free","_this2","outgoingRequests","req","uploadKeysRequest","uploadSigningKeysRequest","uploadSignaturesRequest","_this3","exported","exportCrossSigningKeys","masterKey","store","error","self_signing_key","userSigningKey"],"sources":["../../src/rust-crypto/CrossSigningIdentity.ts"],"sourcesContent":["/*\nCopyright 2023 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\nimport { OlmMachine, CrossSigningStatus, CrossSigningBootstrapRequests } from \"@matrix-org/matrix-sdk-crypto-wasm\";\nimport * as RustSdkCryptoJs from \"@matrix-org/matrix-sdk-crypto-wasm\";\n\nimport { BootstrapCrossSigningOpts } from \"../crypto-api/index.ts\";\nimport { logger } from \"../logger.ts\";\nimport { OutgoingRequestProcessor } from \"./OutgoingRequestProcessor.ts\";\nimport { UIAuthCallback } from \"../interactive-auth.ts\";\nimport { ServerSideSecretStorage } from \"../secret-storage.ts\";\n\n/** Manages the cross-signing keys for our own user.\n *\n * @internal\n */\nexport class CrossSigningIdentity {\n    public constructor(\n        private readonly olmMachine: OlmMachine,\n        private readonly outgoingRequestProcessor: OutgoingRequestProcessor,\n        private readonly secretStorage: ServerSideSecretStorage,\n    ) {}\n\n    /**\n     * Initialise our cross-signing keys by creating new keys if they do not exist, and uploading to the server\n     */\n    public async bootstrapCrossSigning(opts: BootstrapCrossSigningOpts): Promise<void> {\n        if (opts.setupNewCrossSigning) {\n            await this.resetCrossSigning(opts.authUploadDeviceSigningKeys);\n            return;\n        }\n\n        const olmDeviceStatus: CrossSigningStatus = await this.olmMachine.crossSigningStatus();\n\n        // Try to fetch cross signing keys from the secret storage\n        const masterKeyFromSecretStorage = await this.secretStorage.get(\"m.cross_signing.master\");\n        const selfSigningKeyFromSecretStorage = await this.secretStorage.get(\"m.cross_signing.self_signing\");\n        const userSigningKeyFromSecretStorage = await this.secretStorage.get(\"m.cross_signing.user_signing\");\n        const privateKeysInSecretStorage = Boolean(\n            masterKeyFromSecretStorage && selfSigningKeyFromSecretStorage && userSigningKeyFromSecretStorage,\n        );\n\n        const olmDeviceHasKeys =\n            olmDeviceStatus.hasMaster && olmDeviceStatus.hasUserSigning && olmDeviceStatus.hasSelfSigning;\n\n        // Log all relevant state for easier parsing of debug logs.\n        logger.log(\"bootstrapCrossSigning: starting\", {\n            setupNewCrossSigning: opts.setupNewCrossSigning,\n            olmDeviceHasMaster: olmDeviceStatus.hasMaster,\n            olmDeviceHasUserSigning: olmDeviceStatus.hasUserSigning,\n            olmDeviceHasSelfSigning: olmDeviceStatus.hasSelfSigning,\n            privateKeysInSecretStorage,\n        });\n\n        if (olmDeviceHasKeys) {\n            if (!(await this.secretStorage.hasKey())) {\n                logger.warn(\n                    \"bootstrapCrossSigning: Olm device has private keys, but secret storage is not yet set up; doing nothing for now.\",\n                );\n                // the keys should get uploaded to 4S once that is set up.\n            } else if (!privateKeysInSecretStorage) {\n                // the device has the keys but they are not in 4S, so update it\n                logger.log(\"bootstrapCrossSigning: Olm device has private keys: exporting to secret storage\");\n                await this.exportCrossSigningKeysToStorage();\n            } else {\n                logger.log(\n                    \"bootstrapCrossSigning: Olm device has private keys and they are saved in secret storage; doing nothing\",\n                );\n            }\n        } /* (!olmDeviceHasKeys) */ else {\n            if (privateKeysInSecretStorage) {\n                // they are in 4S, so import from there\n                logger.log(\n                    \"bootstrapCrossSigning: Cross-signing private keys not found locally, but they are available \" +\n                        \"in secret storage, reading storage and caching locally\",\n                );\n                await this.olmMachine.importCrossSigningKeys(\n                    masterKeyFromSecretStorage,\n                    selfSigningKeyFromSecretStorage,\n                    userSigningKeyFromSecretStorage,\n                );\n\n                // Get the current device\n                const device: RustSdkCryptoJs.Device = await this.olmMachine.getDevice(\n                    this.olmMachine.userId,\n                    this.olmMachine.deviceId,\n                );\n                try {\n                    // Sign the device with our cross-signing key and upload the signature\n                    const request: RustSdkCryptoJs.SignatureUploadRequest = await device.verify();\n                    await this.outgoingRequestProcessor.makeOutgoingRequest(request);\n                } finally {\n                    device.free();\n                }\n            } else {\n                logger.log(\n                    \"bootstrapCrossSigning: Cross-signing private keys not found locally or in secret storage, creating new keys\",\n                );\n                await this.resetCrossSigning(opts.authUploadDeviceSigningKeys);\n            }\n        }\n\n        // TODO: we might previously have bootstrapped cross-signing but not completed uploading the keys to the\n        //   server -- in which case we should call OlmDevice.bootstrap_cross_signing. How do we know?\n        logger.log(\"bootstrapCrossSigning: complete\");\n    }\n\n    /** Reset our cross-signing keys\n     *\n     * This method will:\n     *   * Tell the OlmMachine to create new keys\n     *   * Upload the new public keys and the device signature to the server\n     *   * Upload the private keys to SSSS, if it is set up\n     */\n    private async resetCrossSigning(authUploadDeviceSigningKeys?: UIAuthCallback<void>): Promise<void> {\n        // XXX: We must find a way to make this atomic, currently if the user does not remember his account password\n        // or 4S passphrase/key the process will fail in a bad state, with keys rotated but not uploaded or saved in 4S.\n        const outgoingRequests: CrossSigningBootstrapRequests = await this.olmMachine.bootstrapCrossSigning(true);\n\n        // If 4S is configured we need to update it.\n        if (!(await this.secretStorage.hasKey())) {\n            logger.warn(\n                \"resetCrossSigning: Secret storage is not yet set up; not exporting keys to secret storage yet.\",\n            );\n            // the keys should get uploaded to 4S once that is set up.\n        } else {\n            // Update 4S before uploading cross-signing keys, to stay consistent with legacy that asks\n            // 4S passphrase before asking for account password.\n            // Ultimately should be made atomic and resistant to forgotten password/passphrase.\n            logger.log(\"resetCrossSigning: exporting private keys to secret storage\");\n            await this.exportCrossSigningKeysToStorage();\n        }\n\n        logger.log(\"resetCrossSigning: publishing public keys to server\");\n        for (const req of [\n            outgoingRequests.uploadKeysRequest,\n            outgoingRequests.uploadSigningKeysRequest,\n            outgoingRequests.uploadSignaturesRequest,\n        ]) {\n            if (req) {\n                await this.outgoingRequestProcessor.makeOutgoingRequest(req, authUploadDeviceSigningKeys);\n            }\n        }\n    }\n\n    /**\n     * Extract the cross-signing keys from the olm machine and save them to secret storage, if it is configured\n     *\n     * (If secret storage is *not* configured, we assume that the export will happen when it is set up)\n     */\n    private async exportCrossSigningKeysToStorage(): Promise<void> {\n        const exported: RustSdkCryptoJs.CrossSigningKeyExport | null = await this.olmMachine.exportCrossSigningKeys();\n        /* istanbul ignore else (this function is only called when we know the olm machine has keys) */\n        if (exported?.masterKey) {\n            await this.secretStorage.store(\"m.cross_signing.master\", exported.masterKey);\n        } else {\n            logger.error(`Cannot export MSK to secret storage, private key unknown`);\n        }\n        if (exported?.self_signing_key) {\n            await this.secretStorage.store(\"m.cross_signing.self_signing\", exported.self_signing_key);\n        } else {\n            logger.error(`Cannot export SSK to secret storage, private key unknown`);\n        }\n        if (exported?.userSigningKey) {\n            await this.secretStorage.store(\"m.cross_signing.user_signing\", exported.userSigningKey);\n        } else {\n            logger.error(`Cannot export USK to secret storage, private key unknown`);\n        }\n    }\n}\n"],"mappings":"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","ignoreList":[]}