matrix-js-sdk 41.8.0 → 41.9.0

package/lib/rendezvous/channels/MSC4108SecureChannel.js.map

@@ -1 +1 @@
-{"version":3,"file":"MSC4108SecureChannel.js","names":["Ecies","QrCodeData","QrCodeIntent","ClientRendezvousFailureReason","MSC4108FailureReason","RendezvousError","logger","MSC4108SecureChannel","constructor","rendezvousSession","theirPublicKey","onFailure","_defineProperty","secureChannel","generateCode","mode","serverName","_this","_asyncToGenerator","url","Error","public_key","Reciprocate","undefined","toBytes","getCheckCode","_this$establishedChan","x","establishedChannel","check_code","Array","from","as_bytes","map","b","concat","join","connect","_this2","connected","result","establish_outbound_channel","channel","info","send","initial_message","ciphertext","receive","UnexpectedMessageReceived","candidateLoginOkMessage","decrypt","InsecureChannelDetected","loginInitiateMessage","_this2$secureChannel$","establish_inbound_channel","candidateLoginInitiateMessage","message","loginOkMessage","encrypt","_this3","plaintext","_this4","secureSend","payload","_this5","stringifiedPayload","JSON","stringify","debug","type","secureReceive","_this6","json","parse","close","_this7","cancel","reason","_this8","_this8$onFailure","call","UserDeclined","UserCancelled","cancelled"],"sources":["../../../src/rendezvous/channels/MSC4108SecureChannel.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 {\n    type Curve25519PublicKey,\n    Ecies,\n    type EstablishedEcies,\n    QrCodeData,\n    QrCodeIntent,\n} from \"@matrix-org/matrix-sdk-crypto-wasm\";\n\nimport {\n    ClientRendezvousFailureReason,\n    MSC4108FailureReason,\n    type MSC4108Payload,\n    RendezvousError,\n    type RendezvousFailureListener,\n} from \"../index.ts\";\nimport { type MSC4108RendezvousSession } from \"../transports/MSC4108RendezvousSession.ts\";\nimport { logger } from \"../../logger.ts\";\n\n/**\n * Prototype of the unstable [MSC4108](https://github.com/matrix-org/matrix-spec-proposals/pull/4108)\n * secure rendezvous session protocol.\n * @experimental Note that this is UNSTABLE and may have breaking changes without notice.\n * Imports @matrix-org/matrix-sdk-crypto-wasm so should be async-imported to avoid bundling the WASM into the main bundle.\n */\nexport class MSC4108SecureChannel {\n    private readonly secureChannel: Ecies;\n    private establishedChannel?: EstablishedEcies;\n    private connected = false;\n\n    public constructor(\n        private rendezvousSession: MSC4108RendezvousSession,\n        private theirPublicKey?: Curve25519PublicKey,\n        public onFailure?: RendezvousFailureListener,\n    ) {\n        this.secureChannel = new Ecies();\n    }\n\n    /**\n     * Generate a QR code for the current session.\n     * @param mode the mode to generate the QR code in, either `Login` or `Reciprocate`.\n     * @param serverName the name of the homeserver to connect to, as defined by server discovery in the spec, required for `Reciprocate` mode.\n     */\n    public async generateCode(mode: QrCodeIntent.Login): Promise<Uint8Array>;\n    public async generateCode(mode: QrCodeIntent.Reciprocate, serverName: string): Promise<Uint8Array>;\n    public async generateCode(mode: QrCodeIntent, serverName?: string): Promise<Uint8Array> {\n        const { url } = this.rendezvousSession;\n\n        if (!url) {\n            throw new Error(\"No rendezvous session URL\");\n        }\n\n        return new QrCodeData(\n            this.secureChannel.public_key(),\n            url,\n            mode === QrCodeIntent.Reciprocate ? serverName : undefined,\n        ).toBytes();\n    }\n\n    /**\n     * Returns the check code for the secure channel or undefined if not generated yet.\n     */\n    public getCheckCode(): string | undefined {\n        const x = this.establishedChannel?.check_code();\n\n        if (!x) {\n            return undefined;\n        }\n        return Array.from(x.as_bytes())\n            .map((b) => `${b % 10}`)\n            .join(\"\");\n    }\n\n    /**\n     * Connects and establishes a secure channel with the other device.\n     */\n    public async connect(): Promise<void> {\n        if (this.connected) {\n            throw new Error(\"Channel already connected\");\n        }\n\n        if (this.theirPublicKey) {\n            // We are the scanning device\n            const result = this.secureChannel.establish_outbound_channel(\n                this.theirPublicKey,\n                \"MATRIX_QR_CODE_LOGIN_INITIATE\",\n            );\n            this.establishedChannel = result.channel;\n\n            /*\n             Secure Channel step 4. Device S sends the initial message\n\n             Nonce := 0\n             SH := ECDH(Ss, Gp)\n             EncKey := HKDF_SHA256(SH, \"MATRIX_QR_CODE_LOGIN|\" || Gp || \"|\" || Sp, 0, 32)\n             TaggedCiphertext := ChaCha20Poly1305_Encrypt(EncKey, Nonce, \"MATRIX_QR_CODE_LOGIN_INITIATE\")\n             Nonce := Nonce + 2\n             LoginInitiateMessage := UnpaddedBase64(TaggedCiphertext) || \"|\" || UnpaddedBase64(Sp)\n             */\n            {\n                logger.info(\"Sending LoginInitiateMessage\");\n                await this.rendezvousSession.send(result.initial_message);\n            }\n\n            /*\n            Secure Channel step 6. Verification by Device S\n\n            Nonce_G := 1\n            (TaggedCiphertext, Sp) := Unpack(Message)\n            Plaintext := ChaCha20Poly1305_Decrypt(EncKey, Nonce_G, TaggedCiphertext)\n            Nonce_G := Nonce_G + 2\n\n            unless Plaintext == \"MATRIX_QR_CODE_LOGIN_OK\":\n                FAIL\n             */\n            {\n                logger.info(\"Waiting for LoginOkMessage\");\n                const ciphertext = await this.rendezvousSession.receive();\n\n                if (!ciphertext) {\n                    throw new RendezvousError(\n                        \"No response from other device\",\n                        MSC4108FailureReason.UnexpectedMessageReceived,\n                    );\n                }\n                const candidateLoginOkMessage = await this.decrypt(ciphertext);\n\n                if (candidateLoginOkMessage !== \"MATRIX_QR_CODE_LOGIN_OK\") {\n                    throw new RendezvousError(\n                        \"Invalid response from other device\",\n                        ClientRendezvousFailureReason.InsecureChannelDetected,\n                    );\n                }\n\n                // Step 6 is now complete. We trust the channel\n            }\n        } else {\n            /*\n            Secure Channel step 5. Device G confirms\n\n            Nonce_S := 0\n            (TaggedCiphertext, Sp) := Unpack(LoginInitiateMessage)\n            SH := ECDH(Gs, Sp)\n            EncKey := HKDF_SHA256(SH, \"MATRIX_QR_CODE_LOGIN|\" || Gp || \"|\" || Sp, 0, 32)\n            Plaintext := ChaCha20Poly1305_Decrypt(EncKey, Nonce_S, TaggedCiphertext)\n            Nonce_S := Nonce_S + 2\n             */\n            // wait for the other side to send us their public key\n            logger.info(\"Waiting for LoginInitiateMessage\");\n            const loginInitiateMessage = await this.rendezvousSession.receive();\n            if (!loginInitiateMessage) {\n                throw new RendezvousError(\n                    \"No response from other device\",\n                    MSC4108FailureReason.UnexpectedMessageReceived,\n                );\n            }\n\n            const { channel, message: candidateLoginInitiateMessage } =\n                this.secureChannel.establish_inbound_channel(loginInitiateMessage);\n            this.establishedChannel = channel;\n\n            if (candidateLoginInitiateMessage !== \"MATRIX_QR_CODE_LOGIN_INITIATE\") {\n                throw new RendezvousError(\n                    \"Invalid response from other device\",\n                    ClientRendezvousFailureReason.InsecureChannelDetected,\n                );\n            }\n            logger.info(\"LoginInitiateMessage received\");\n\n            logger.info(\"Sending LoginOkMessage\");\n            const loginOkMessage = await this.encrypt(\"MATRIX_QR_CODE_LOGIN_OK\");\n            await this.rendezvousSession.send(loginOkMessage);\n\n            // Step 5 is complete. We don't yet trust the channel\n\n            // next step will be for the user to confirm the check code on the other device\n        }\n\n        this.connected = true;\n    }\n\n    private async decrypt(ciphertext: string): Promise<string> {\n        if (!this.establishedChannel) {\n            throw new Error(\"Channel closed\");\n        }\n\n        return this.establishedChannel.decrypt(ciphertext);\n    }\n\n    private async encrypt(plaintext: string): Promise<string> {\n        if (!this.establishedChannel) {\n            throw new Error(\"Channel closed\");\n        }\n\n        return this.establishedChannel.encrypt(plaintext);\n    }\n\n    /**\n     * Sends a payload securely to the other device.\n     * @param payload the payload to encrypt and send\n     */\n    public async secureSend<T extends MSC4108Payload>(payload: T): Promise<void> {\n        if (!this.connected) {\n            throw new Error(\"Channel closed\");\n        }\n\n        const stringifiedPayload = JSON.stringify(payload);\n        logger.debug(`=> {\"type\": ${JSON.stringify(payload.type)}, ...}`);\n\n        await this.rendezvousSession.send(await this.encrypt(stringifiedPayload));\n    }\n\n    /**\n     * Receives an encrypted payload from the other device and decrypts it.\n     */\n    public async secureReceive<T extends MSC4108Payload>(): Promise<Partial<T> | undefined> {\n        if (!this.establishedChannel) {\n            throw new Error(\"Channel closed\");\n        }\n\n        const ciphertext = await this.rendezvousSession.receive();\n        if (!ciphertext) {\n            return undefined;\n        }\n        const plaintext = await this.decrypt(ciphertext);\n        const json = JSON.parse(plaintext);\n\n        logger.debug(`<= {\"type\": ${JSON.stringify(json.type)}, ...}`);\n        return json as Partial<T> | undefined;\n    }\n\n    /**\n     * Closes the secure channel.\n     */\n    public async close(): Promise<void> {\n        await this.rendezvousSession.close();\n    }\n\n    /**\n     * Cancels the secure channel.\n     * @param reason the reason for the cancellation\n     */\n    public async cancel(reason: MSC4108FailureReason | ClientRendezvousFailureReason): Promise<void> {\n        try {\n            await this.rendezvousSession.cancel(reason);\n            this.onFailure?.(reason);\n        } finally {\n            if (\n                reason !== ClientRendezvousFailureReason.UserDeclined &&\n                reason !== MSC4108FailureReason.UserCancelled\n            ) {\n                await this.close();\n            }\n        }\n    }\n\n    /**\n     * Returns whether the rendezvous session has been cancelled.\n     */\n    public get cancelled(): boolean {\n        return this.rendezvousSession.cancelled;\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"MSC4108SecureChannel.js","names":[],"sources":["../../../src/rendezvous/channels/MSC4108SecureChannel.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 {\n    type Curve25519PublicKey,\n    Ecies,\n    type EstablishedEcies,\n    QrCodeData,\n    QrCodeIntent,\n} from \"@matrix-org/matrix-sdk-crypto-wasm\";\n\nimport {\n    ClientRendezvousFailureReason,\n    MSC4108FailureReason,\n    type MSC4108Payload,\n    RendezvousError,\n    type RendezvousFailureListener,\n} from \"../index.ts\";\nimport { type MSC4108RendezvousSession } from \"../transports/MSC4108RendezvousSession.ts\";\nimport { logger } from \"../../logger.ts\";\n\n/**\n * Prototype of the unstable [MSC4108](https://github.com/matrix-org/matrix-spec-proposals/pull/4108)\n * secure rendezvous session protocol.\n * @experimental Note that this is UNSTABLE and may have breaking changes without notice.\n * Imports @matrix-org/matrix-sdk-crypto-wasm so should be async-imported to avoid bundling the WASM into the main bundle.\n */\nexport class MSC4108SecureChannel {\n    private readonly secureChannel: Ecies;\n    private establishedChannel?: EstablishedEcies;\n    private connected = false;\n\n    public constructor(\n        private rendezvousSession: MSC4108RendezvousSession,\n        private theirPublicKey?: Curve25519PublicKey,\n        public onFailure?: RendezvousFailureListener,\n    ) {\n        this.secureChannel = new Ecies();\n    }\n\n    /**\n     * Generate a QR code for the current session.\n     * @param mode the mode to generate the QR code in, either `Login` or `Reciprocate`.\n     * @param serverName the name of the homeserver to connect to, as defined by server discovery in the spec, required for `Reciprocate` mode.\n     */\n    public async generateCode(mode: QrCodeIntent.Login): Promise<Uint8Array>;\n    public async generateCode(mode: QrCodeIntent.Reciprocate, serverName: string): Promise<Uint8Array>;\n    public async generateCode(mode: QrCodeIntent, serverName?: string): Promise<Uint8Array> {\n        const { url } = this.rendezvousSession;\n\n        if (!url) {\n            throw new Error(\"No rendezvous session URL\");\n        }\n\n        return new QrCodeData(\n            this.secureChannel.public_key(),\n            url,\n            mode === QrCodeIntent.Reciprocate ? serverName : undefined,\n        ).toBytes();\n    }\n\n    /**\n     * Returns the check code for the secure channel or undefined if not generated yet.\n     */\n    public getCheckCode(): string | undefined {\n        const x = this.establishedChannel?.check_code();\n\n        if (!x) {\n            return undefined;\n        }\n        return Array.from(x.as_bytes())\n            .map((b) => `${b % 10}`)\n            .join(\"\");\n    }\n\n    /**\n     * Connects and establishes a secure channel with the other device.\n     */\n    public async connect(): Promise<void> {\n        if (this.connected) {\n            throw new Error(\"Channel already connected\");\n        }\n\n        if (this.theirPublicKey) {\n            // We are the scanning device\n            const result = this.secureChannel.establish_outbound_channel(\n                this.theirPublicKey,\n                \"MATRIX_QR_CODE_LOGIN_INITIATE\",\n            );\n            this.establishedChannel = result.channel;\n\n            /*\n             Secure Channel step 4. Device S sends the initial message\n\n             Nonce := 0\n             SH := ECDH(Ss, Gp)\n             EncKey := HKDF_SHA256(SH, \"MATRIX_QR_CODE_LOGIN|\" || Gp || \"|\" || Sp, 0, 32)\n             TaggedCiphertext := ChaCha20Poly1305_Encrypt(EncKey, Nonce, \"MATRIX_QR_CODE_LOGIN_INITIATE\")\n             Nonce := Nonce + 2\n             LoginInitiateMessage := UnpaddedBase64(TaggedCiphertext) || \"|\" || UnpaddedBase64(Sp)\n             */\n            {\n                logger.info(\"Sending LoginInitiateMessage\");\n                await this.rendezvousSession.send(result.initial_message);\n            }\n\n            /*\n            Secure Channel step 6. Verification by Device S\n\n            Nonce_G := 1\n            (TaggedCiphertext, Sp) := Unpack(Message)\n            Plaintext := ChaCha20Poly1305_Decrypt(EncKey, Nonce_G, TaggedCiphertext)\n            Nonce_G := Nonce_G + 2\n\n            unless Plaintext == \"MATRIX_QR_CODE_LOGIN_OK\":\n                FAIL\n             */\n            {\n                logger.info(\"Waiting for LoginOkMessage\");\n                const ciphertext = await this.rendezvousSession.receive();\n\n                if (!ciphertext) {\n                    throw new RendezvousError(\n                        \"No response from other device\",\n                        MSC4108FailureReason.UnexpectedMessageReceived,\n                    );\n                }\n                const candidateLoginOkMessage = await this.decrypt(ciphertext);\n\n                if (candidateLoginOkMessage !== \"MATRIX_QR_CODE_LOGIN_OK\") {\n                    throw new RendezvousError(\n                        \"Invalid response from other device\",\n                        ClientRendezvousFailureReason.InsecureChannelDetected,\n                    );\n                }\n\n                // Step 6 is now complete. We trust the channel\n            }\n        } else {\n            /*\n            Secure Channel step 5. Device G confirms\n\n            Nonce_S := 0\n            (TaggedCiphertext, Sp) := Unpack(LoginInitiateMessage)\n            SH := ECDH(Gs, Sp)\n            EncKey := HKDF_SHA256(SH, \"MATRIX_QR_CODE_LOGIN|\" || Gp || \"|\" || Sp, 0, 32)\n            Plaintext := ChaCha20Poly1305_Decrypt(EncKey, Nonce_S, TaggedCiphertext)\n            Nonce_S := Nonce_S + 2\n             */\n            // wait for the other side to send us their public key\n            logger.info(\"Waiting for LoginInitiateMessage\");\n            const loginInitiateMessage = await this.rendezvousSession.receive();\n            if (!loginInitiateMessage) {\n                throw new RendezvousError(\n                    \"No response from other device\",\n                    MSC4108FailureReason.UnexpectedMessageReceived,\n                );\n            }\n\n            const { channel, message: candidateLoginInitiateMessage } =\n                this.secureChannel.establish_inbound_channel(loginInitiateMessage);\n            this.establishedChannel = channel;\n\n            if (candidateLoginInitiateMessage !== \"MATRIX_QR_CODE_LOGIN_INITIATE\") {\n                throw new RendezvousError(\n                    \"Invalid response from other device\",\n                    ClientRendezvousFailureReason.InsecureChannelDetected,\n                );\n            }\n            logger.info(\"LoginInitiateMessage received\");\n\n            logger.info(\"Sending LoginOkMessage\");\n            const loginOkMessage = await this.encrypt(\"MATRIX_QR_CODE_LOGIN_OK\");\n            await this.rendezvousSession.send(loginOkMessage);\n\n            // Step 5 is complete. We don't yet trust the channel\n\n            // next step will be for the user to confirm the check code on the other device\n        }\n\n        this.connected = true;\n    }\n\n    private async decrypt(ciphertext: string): Promise<string> {\n        if (!this.establishedChannel) {\n            throw new Error(\"Channel closed\");\n        }\n\n        return this.establishedChannel.decrypt(ciphertext);\n    }\n\n    private async encrypt(plaintext: string): Promise<string> {\n        if (!this.establishedChannel) {\n            throw new Error(\"Channel closed\");\n        }\n\n        return this.establishedChannel.encrypt(plaintext);\n    }\n\n    /**\n     * Sends a payload securely to the other device.\n     * @param payload the payload to encrypt and send\n     */\n    public async secureSend<T extends MSC4108Payload>(payload: T): Promise<void> {\n        if (!this.connected) {\n            throw new Error(\"Channel closed\");\n        }\n\n        const stringifiedPayload = JSON.stringify(payload);\n        logger.debug(`=> {\"type\": ${JSON.stringify(payload.type)}, ...}`);\n\n        await this.rendezvousSession.send(await this.encrypt(stringifiedPayload));\n    }\n\n    /**\n     * Receives an encrypted payload from the other device and decrypts it.\n     */\n    public async secureReceive<T extends MSC4108Payload>(): Promise<Partial<T> | undefined> {\n        if (!this.establishedChannel) {\n            throw new Error(\"Channel closed\");\n        }\n\n        const ciphertext = await this.rendezvousSession.receive();\n        if (!ciphertext) {\n            return undefined;\n        }\n        const plaintext = await this.decrypt(ciphertext);\n        const json = JSON.parse(plaintext);\n\n        logger.debug(`<= {\"type\": ${JSON.stringify(json.type)}, ...}`);\n        return json as Partial<T> | undefined;\n    }\n\n    /**\n     * Closes the secure channel.\n     */\n    public async close(): Promise<void> {\n        await this.rendezvousSession.close();\n    }\n\n    /**\n     * Cancels the secure channel.\n     * @param reason the reason for the cancellation\n     */\n    public async cancel(reason: MSC4108FailureReason | ClientRendezvousFailureReason): Promise<void> {\n        try {\n            await this.rendezvousSession.cancel(reason);\n            this.onFailure?.(reason);\n        } finally {\n            if (\n                reason !== ClientRendezvousFailureReason.UserDeclined &&\n                reason !== MSC4108FailureReason.UserCancelled\n            ) {\n                await this.close();\n            }\n        }\n    }\n\n    /**\n     * Returns whether the rendezvous session has been cancelled.\n     */\n    public get cancelled(): boolean {\n        return this.rendezvousSession.cancelled;\n    }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/rendezvous/index.js

@@ -1,4 +1,3 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 /*
 Copyright 2022 The Matrix.org Foundation C.I.C.
 
@@ -35,8 +34,22 @@ export * from "./channels/index.js";
  * @param client the client to check for sign-in with QR support
  * @returns true if the homeserver that the client is connected to supports a variant of sign-in with QR that we can use, false otherwise.
  */
-export function isSignInWithQRAvailable(_x) {
-  return _isSignInWithQRAvailable.apply(this, arguments);
+export async function isSignInWithQRAvailable(client) {
+  let metadata;
+  try {
+    metadata = await client.getAuthMetadata();
+  } catch (e) {
+    logger.warn("Failed to fetch auth metadata, assuming sign-in with QR is unavailable", e);
+    return false;
+  }
+
+  // check for support of device authorization grant
+  if (!metadata.grant_types_supported.includes(OAuthGrantType.DeviceAuthorization)) {
+    return false;
+  }
+
+  // check for unstable support for MSC4108 2024 version
+  return client.doesServerSupportUnstableFeature("org.matrix.msc4108");
 }
 
 /**
@@ -51,28 +64,9 @@ export function isSignInWithQRAvailable(_x) {
  *   This will unbind the {@link onFailure} callback and prevent any further steps in the flow from being executed.
  * @returns a promise that resolves to an instance of the linking flow
  */
-function _isSignInWithQRAvailable() {
-  _isSignInWithQRAvailable = _asyncToGenerator(function* (client) {
-    var metadata;
-    try {
-      metadata = yield client.getAuthMetadata();
-    } catch (e) {
-      logger.warn("Failed to fetch auth metadata, assuming sign-in with QR is unavailable", e);
-      return false;
-    }
-
-    // check for support of device authorization grant
-    if (!metadata.grant_types_supported.includes(OAuthGrantType.DeviceAuthorization)) {
-      return false;
-    }
-
-    // check for unstable support for MSC4108 2024 version
-    return client.doesServerSupportUnstableFeature("org.matrix.msc4108");
-  });
-  return _isSignInWithQRAvailable.apply(this, arguments);
-}
-export function linkNewDeviceByGeneratingQR(_x2, _x3, _x4) {
-  return _linkNewDeviceByGeneratingQR.apply(this, arguments);
+export async function linkNewDeviceByGeneratingQR(client, onFailure, abortSignal) {
+  // we assume rust crypto is already initialised
+  return initGenerateQrFlow(RendezvousIntent.RECIPROCATE_LOGIN_ON_EXISTING_DEVICE, client, onFailure, abortSignal);
 }
 
 /**
@@ -87,52 +81,33 @@ export function linkNewDeviceByGeneratingQR(_x2, _x3, _x4) {
  *   This will unbind the {@link onFailure} callback and prevent any further steps in the flow from being executed.
  * @returns a promise that resolves to an instance of the sign-in flow
  */
-function _linkNewDeviceByGeneratingQR() {
-  _linkNewDeviceByGeneratingQR = _asyncToGenerator(function* (client, onFailure, abortSignal) {
-    // we assume rust crypto is already initialised
-    return initGenerateQrFlow(RendezvousIntent.RECIPROCATE_LOGIN_ON_EXISTING_DEVICE, client, onFailure, abortSignal);
-  });
-  return _linkNewDeviceByGeneratingQR.apply(this, arguments);
-}
-export function signInByGeneratingQR(_x5, _x6, _x7) {
-  return _signInByGeneratingQR.apply(this, arguments);
+export async function signInByGeneratingQR(tempClient, onFailure, abortSignal) {
+  // ensure rust crypto is initialized as needed for the secure channel
+  const RustSdkCryptoJs = await import("@matrix-org/matrix-sdk-crypto-wasm");
+  await RustSdkCryptoJs.initAsync();
+  return initGenerateQrFlow(RendezvousIntent.LOGIN_ON_NEW_DEVICE, tempClient, onFailure, abortSignal);
 }
-function _signInByGeneratingQR() {
-  _signInByGeneratingQR = _asyncToGenerator(function* (tempClient, onFailure, abortSignal) {
-    // ensure rust crypto is initialized as needed for the secure channel
-    var RustSdkCryptoJs = yield import("@matrix-org/matrix-sdk-crypto-wasm");
-    yield RustSdkCryptoJs.initAsync();
-    return initGenerateQrFlow(RendezvousIntent.LOGIN_ON_NEW_DEVICE, tempClient, onFailure, abortSignal);
+async function initGenerateQrFlow(intent, client, onFailure, abortSignal) {
+  const session = new MSC4108RendezvousSession({
+    onFailure,
+    client
   });
-  return _signInByGeneratingQR.apply(this, arguments);
-}
-function initGenerateQrFlow(_x8, _x9, _x0, _x1) {
-  return _initGenerateQrFlow.apply(this, arguments);
-}
-function _initGenerateQrFlow() {
-  _initGenerateQrFlow = _asyncToGenerator(function* (intent, client, onFailure, abortSignal) {
-    var session = new MSC4108RendezvousSession({
-      onFailure,
-      client
-    });
-    var channel = new MSC4108SecureChannel(session, undefined, onFailure);
-    var flow = new MSC4108SignInWithQR(channel, false, intent === RendezvousIntent.LOGIN_ON_NEW_DEVICE ? undefined : client, onFailure);
-    if (abortSignal.aborted) return flow;
-    abortSignal.onabort = () => {
-      // Detach failure handlers
-      session.onFailure = undefined;
-      channel.onFailure = undefined;
-      flow.onFailure = undefined;
-      // Cancel the session
-      flow.cancel(MSC4108FailureReason.UserCancelled);
-    };
-    yield session.send(""); // open channel
+  const channel = new MSC4108SecureChannel(session, undefined, onFailure);
+  const flow = new MSC4108SignInWithQR(channel, false, intent === RendezvousIntent.LOGIN_ON_NEW_DEVICE ? undefined : client, onFailure);
+  if (abortSignal.aborted) return flow;
+  abortSignal.onabort = () => {
+    // Detach failure handlers
+    session.onFailure = undefined;
+    channel.onFailure = undefined;
+    flow.onFailure = undefined;
+    // Cancel the session
+    void flow.cancel(MSC4108FailureReason.UserCancelled);
+  };
+  await session.send(""); // open channel
 
-    if (!abortSignal.aborted) {
-      yield flow.generateCode();
-    }
-    return flow;
-  });
-  return _initGenerateQrFlow.apply(this, arguments);
+  if (!abortSignal.aborted) {
+    await flow.generateCode();
+  }
+  return flow;
 }
 //# sourceMappingURL=index.js.map

package/lib/rendezvous/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["OAuthGrantType","MSC4108FailureReason","MSC4108SignInWithQR","MSC4108RendezvousSession","MSC4108SecureChannel","RendezvousIntent","logger","isSignInWithQRAvailable","_x","_isSignInWithQRAvailable","apply","arguments","_asyncToGenerator","client","metadata","getAuthMetadata","e","warn","grant_types_supported","includes","DeviceAuthorization","doesServerSupportUnstableFeature","linkNewDeviceByGeneratingQR","_x2","_x3","_x4","_linkNewDeviceByGeneratingQR","onFailure","abortSignal","initGenerateQrFlow","RECIPROCATE_LOGIN_ON_EXISTING_DEVICE","signInByGeneratingQR","_x5","_x6","_x7","_signInByGeneratingQR","tempClient","RustSdkCryptoJs","initAsync","LOGIN_ON_NEW_DEVICE","_x8","_x9","_x0","_x1","_initGenerateQrFlow","intent","session","channel","undefined","flow","aborted","onabort","cancel","UserCancelled","send","generateCode"],"sources":["../../src/rendezvous/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\nimport { type MatrixClient, OAuthGrantType, type OidcClientConfig } from \"../matrix.ts\";\nimport { MSC4108FailureReason, type RendezvousFailureListener } from \"./RendezvousFailureReason.ts\";\nimport { MSC4108SignInWithQR } from \"./MSC4108SignInWithQR.ts\";\nimport { MSC4108RendezvousSession } from \"./transports/MSC4108RendezvousSession.ts\";\nimport { MSC4108SecureChannel } from \"./channels/MSC4108SecureChannel.ts\";\nimport { RendezvousIntent } from \"./RendezvousIntent.ts\";\nimport { logger } from \"../logger.ts\";\n\nexport * from \"./MSC4108SignInWithQR.ts\";\nexport type * from \"./RendezvousChannel.ts\";\nexport type * from \"./RendezvousCode.ts\";\nexport * from \"./RendezvousError.ts\";\nexport * from \"./RendezvousFailureReason.ts\";\nexport * from \"./RendezvousIntent.ts\";\nexport type * from \"./RendezvousTransport.ts\";\nexport * from \"./transports/index.ts\";\nexport * from \"./channels/index.ts\";\n\n/**\n * Check if the homeserver that the client is connected to supports a variant of sign-in with QR that we can use.\n *\n * @param client the client to check for sign-in with QR support\n * @returns true if the homeserver that the client is connected to supports a variant of sign-in with QR that we can use, false otherwise.\n */\nexport async function isSignInWithQRAvailable(client: MatrixClient): Promise<boolean> {\n    let metadata: OidcClientConfig;\n    try {\n        metadata = await client.getAuthMetadata();\n    } catch (e) {\n        logger.warn(\"Failed to fetch auth metadata, assuming sign-in with QR is unavailable\", e);\n        return false;\n    }\n\n    // check for support of device authorization grant\n    if (!metadata.grant_types_supported.includes(OAuthGrantType.DeviceAuthorization)) {\n        return false;\n    }\n\n    // check for unstable support for MSC4108 2024 version\n    return client.doesServerSupportUnstableFeature(\"org.matrix.msc4108\");\n}\n\n/**\n * Start a linking flow from an existing authenticated client by generating a QR code that can be scanned by the new device.\n * The new device will then authenticate with the server and link itself to the same account as the existing client and\n * share the end-to-end encryption keys.\n *\n * @param client the existing client\n * @param onFailure callback for when the linking process fails\n * @param abortSignal an AbortSignal that can be used to cancel the linking process,\n *   for example when the user cancels out of the flow.\n *   This will unbind the {@link onFailure} callback and prevent any further steps in the flow from being executed.\n * @returns a promise that resolves to an instance of the linking flow\n */\nexport async function linkNewDeviceByGeneratingQR(\n    client: MatrixClient,\n    onFailure: RendezvousFailureListener,\n    abortSignal: AbortSignal,\n): Promise<MSC4108SignInWithQR> {\n    // we assume rust crypto is already initialised\n    return initGenerateQrFlow(RendezvousIntent.RECIPROCATE_LOGIN_ON_EXISTING_DEVICE, client, onFailure, abortSignal);\n}\n\n/**\n * Start a sign-in flow by generating a QR code that can be scanned by an existing authenticated client.\n * The existing client will then help complete the authentication of the new device and link it to the same account,\n * sharing the end-to-end encryption keys.\n *\n * @param tempClient temporary client used during the flow for the rendezvous channel\n * @param onFailure callback for when the sign-in process fails\n * @param abortSignal an AbortSignal that can be used to cancel the linking process,\n *   for example when the user cancels out of the flow.\n *   This will unbind the {@link onFailure} callback and prevent any further steps in the flow from being executed.\n * @returns a promise that resolves to an instance of the sign-in flow\n */\nexport async function signInByGeneratingQR(\n    tempClient: MatrixClient,\n    onFailure: RendezvousFailureListener,\n    abortSignal: AbortSignal,\n): Promise<MSC4108SignInWithQR> {\n    // ensure rust crypto is initialized as needed for the secure channel\n    const RustSdkCryptoJs = await import(\"@matrix-org/matrix-sdk-crypto-wasm\");\n    await RustSdkCryptoJs.initAsync();\n\n    return initGenerateQrFlow(RendezvousIntent.LOGIN_ON_NEW_DEVICE, tempClient, onFailure, abortSignal);\n}\n\nasync function initGenerateQrFlow(\n    intent: RendezvousIntent,\n    client: MatrixClient,\n    onFailure: RendezvousFailureListener,\n    abortSignal: AbortSignal,\n): Promise<MSC4108SignInWithQR> {\n    const session = new MSC4108RendezvousSession({\n        onFailure,\n        client,\n    });\n    const channel = new MSC4108SecureChannel(session, undefined, onFailure);\n    const flow = new MSC4108SignInWithQR(\n        channel,\n        false,\n        intent === RendezvousIntent.LOGIN_ON_NEW_DEVICE ? undefined : client,\n        onFailure,\n    );\n\n    if (abortSignal.aborted) return flow;\n\n    abortSignal.onabort = (): void => {\n        // Detach failure handlers\n        session.onFailure = undefined;\n        channel.onFailure = undefined;\n        flow.onFailure = undefined;\n        // Cancel the session\n        flow.cancel(MSC4108FailureReason.UserCancelled);\n    };\n\n    await session.send(\"\"); // open channel\n\n    if (!abortSignal.aborted) {\n        await flow.generateCode();\n    }\n\n    return flow;\n}\n"],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAA4BA,cAAc,QAA+B,cAAc;AACvF,SAASC,oBAAoB,QAAwC,8BAA8B;AACnG,SAASC,mBAAmB,QAAQ,0BAA0B;AAC9D,SAASC,wBAAwB,QAAQ,0CAA0C;AACnF,SAASC,oBAAoB,QAAQ,oCAAoC;AACzE,SAASC,gBAAgB,QAAQ,uBAAuB;AACxD,SAASC,MAAM,QAAQ,cAAc;AAErC,cAAc,0BAA0B;AAGxC,cAAc,sBAAsB;AACpC,cAAc,8BAA8B;AAC5C,cAAc,uBAAuB;AAErC,cAAc,uBAAuB;AACrC,cAAc,qBAAqB;;AAEnC;AACA;AACA;AACA;AACA;AACA;AACA,gBAAsBC,uBAAuBA,CAAAC,EAAA;EAAA,OAAAC,wBAAA,CAAAC,KAAA,OAAAC,SAAA;AAAA;;AAkB7C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAXA,SAAAF,yBAAA;EAAAA,wBAAA,GAAAG,iBAAA,CAlBO,WAAuCC,MAAoB,EAAoB;IAClF,IAAIC,QAA0B;IAC9B,IAAI;MACAA,QAAQ,SAASD,MAAM,CAACE,eAAe,CAAC,CAAC;IAC7C,CAAC,CAAC,OAAOC,CAAC,EAAE;MACRV,MAAM,CAACW,IAAI,CAAC,wEAAwE,EAAED,CAAC,CAAC;MACxF,OAAO,KAAK;IAChB;;IAEA;IACA,IAAI,CAACF,QAAQ,CAACI,qBAAqB,CAACC,QAAQ,CAACnB,cAAc,CAACoB,mBAAmB,CAAC,EAAE;MAC9E,OAAO,KAAK;IAChB;;IAEA;IACA,OAAOP,MAAM,CAACQ,gCAAgC,CAAC,oBAAoB,CAAC;EACxE,CAAC;EAAA,OAAAZ,wBAAA,CAAAC,KAAA,OAAAC,SAAA;AAAA;AAcD,gBAAsBW,2BAA2BA,CAAAC,GAAA,EAAAC,GAAA,EAAAC,GAAA;EAAA,OAAAC,4BAAA,CAAAhB,KAAA,OAAAC,SAAA;AAAA;;AASjD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAXA,SAAAe,6BAAA;EAAAA,4BAAA,GAAAd,iBAAA,CATO,WACHC,MAAoB,EACpBc,SAAoC,EACpCC,WAAwB,EACI;IAC5B;IACA,OAAOC,kBAAkB,CAACxB,gBAAgB,CAACyB,oCAAoC,EAAEjB,MAAM,EAAEc,SAAS,EAAEC,WAAW,CAAC;EACpH,CAAC;EAAA,OAAAF,4BAAA,CAAAhB,KAAA,OAAAC,SAAA;AAAA;AAcD,gBAAsBoB,oBAAoBA,CAAAC,GAAA,EAAAC,GAAA,EAAAC,GAAA;EAAA,OAAAC,qBAAA,CAAAzB,KAAA,OAAAC,SAAA;AAAA;AAUzC,SAAAwB,sBAAA;EAAAA,qBAAA,GAAAvB,iBAAA,CAVM,WACHwB,UAAwB,EACxBT,SAAoC,EACpCC,WAAwB,EACI;IAC5B;IACA,IAAMS,eAAe,SAAS,MAAM,CAAC,oCAAoC,CAAC;IAC1E,MAAMA,eAAe,CAACC,SAAS,CAAC,CAAC;IAEjC,OAAOT,kBAAkB,CAACxB,gBAAgB,CAACkC,mBAAmB,EAAEH,UAAU,EAAET,SAAS,EAAEC,WAAW,CAAC;EACvG,CAAC;EAAA,OAAAO,qBAAA,CAAAzB,KAAA,OAAAC,SAAA;AAAA;AAAA,SAEckB,kBAAkBA,CAAAW,GAAA,EAAAC,GAAA,EAAAC,GAAA,EAAAC,GAAA;EAAA,OAAAC,mBAAA,CAAAlC,KAAA,OAAAC,SAAA;AAAA;AAAA,SAAAiC,oBAAA;EAAAA,mBAAA,GAAAhC,iBAAA,CAAjC,WACIiC,MAAwB,EACxBhC,MAAoB,EACpBc,SAAoC,EACpCC,WAAwB,EACI;IAC5B,IAAMkB,OAAO,GAAG,IAAI3C,wBAAwB,CAAC;MACzCwB,SAAS;MACTd;IACJ,CAAC,CAAC;IACF,IAAMkC,OAAO,GAAG,IAAI3C,oBAAoB,CAAC0C,OAAO,EAAEE,SAAS,EAAErB,SAAS,CAAC;IACvE,IAAMsB,IAAI,GAAG,IAAI/C,mBAAmB,CAChC6C,OAAO,EACP,KAAK,EACLF,MAAM,KAAKxC,gBAAgB,CAACkC,mBAAmB,GAAGS,SAAS,GAAGnC,MAAM,EACpEc,SACJ,CAAC;IAED,IAAIC,WAAW,CAACsB,OAAO,EAAE,OAAOD,IAAI;IAEpCrB,WAAW,CAACuB,OAAO,GAAG,MAAY;MAC9B;MACAL,OAAO,CAACnB,SAAS,GAAGqB,SAAS;MAC7BD,OAAO,CAACpB,SAAS,GAAGqB,SAAS;MAC7BC,IAAI,CAACtB,SAAS,GAAGqB,SAAS;MAC1B;MACAC,IAAI,CAACG,MAAM,CAACnD,oBAAoB,CAACoD,aAAa,CAAC;IACnD,CAAC;IAED,MAAMP,OAAO,CAACQ,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;;IAExB,IAAI,CAAC1B,WAAW,CAACsB,OAAO,EAAE;MACtB,MAAMD,IAAI,CAACM,YAAY,CAAC,CAAC;IAC7B;IAEA,OAAON,IAAI;EACf,CAAC;EAAA,OAAAL,mBAAA,CAAAlC,KAAA,OAAAC,SAAA;AAAA","ignoreList":[]}
+{"version":3,"file":"index.js","names":[],"sources":["../../src/rendezvous/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\nimport { type MatrixClient, OAuthGrantType, type OidcClientConfig } from \"../matrix.ts\";\nimport { MSC4108FailureReason, type RendezvousFailureListener } from \"./RendezvousFailureReason.ts\";\nimport { MSC4108SignInWithQR } from \"./MSC4108SignInWithQR.ts\";\nimport { MSC4108RendezvousSession } from \"./transports/MSC4108RendezvousSession.ts\";\nimport { MSC4108SecureChannel } from \"./channels/MSC4108SecureChannel.ts\";\nimport { RendezvousIntent } from \"./RendezvousIntent.ts\";\nimport { logger } from \"../logger.ts\";\n\nexport * from \"./MSC4108SignInWithQR.ts\";\nexport type * from \"./RendezvousChannel.ts\";\nexport type * from \"./RendezvousCode.ts\";\nexport * from \"./RendezvousError.ts\";\nexport * from \"./RendezvousFailureReason.ts\";\nexport * from \"./RendezvousIntent.ts\";\nexport type * from \"./RendezvousTransport.ts\";\nexport * from \"./transports/index.ts\";\nexport * from \"./channels/index.ts\";\n\n/**\n * Check if the homeserver that the client is connected to supports a variant of sign-in with QR that we can use.\n *\n * @param client the client to check for sign-in with QR support\n * @returns true if the homeserver that the client is connected to supports a variant of sign-in with QR that we can use, false otherwise.\n */\nexport async function isSignInWithQRAvailable(client: MatrixClient): Promise<boolean> {\n    let metadata: OidcClientConfig;\n    try {\n        metadata = await client.getAuthMetadata();\n    } catch (e) {\n        logger.warn(\"Failed to fetch auth metadata, assuming sign-in with QR is unavailable\", e);\n        return false;\n    }\n\n    // check for support of device authorization grant\n    if (!metadata.grant_types_supported.includes(OAuthGrantType.DeviceAuthorization)) {\n        return false;\n    }\n\n    // check for unstable support for MSC4108 2024 version\n    return client.doesServerSupportUnstableFeature(\"org.matrix.msc4108\");\n}\n\n/**\n * Start a linking flow from an existing authenticated client by generating a QR code that can be scanned by the new device.\n * The new device will then authenticate with the server and link itself to the same account as the existing client and\n * share the end-to-end encryption keys.\n *\n * @param client the existing client\n * @param onFailure callback for when the linking process fails\n * @param abortSignal an AbortSignal that can be used to cancel the linking process,\n *   for example when the user cancels out of the flow.\n *   This will unbind the {@link onFailure} callback and prevent any further steps in the flow from being executed.\n * @returns a promise that resolves to an instance of the linking flow\n */\nexport async function linkNewDeviceByGeneratingQR(\n    client: MatrixClient,\n    onFailure: RendezvousFailureListener,\n    abortSignal: AbortSignal,\n): Promise<MSC4108SignInWithQR> {\n    // we assume rust crypto is already initialised\n    return initGenerateQrFlow(RendezvousIntent.RECIPROCATE_LOGIN_ON_EXISTING_DEVICE, client, onFailure, abortSignal);\n}\n\n/**\n * Start a sign-in flow by generating a QR code that can be scanned by an existing authenticated client.\n * The existing client will then help complete the authentication of the new device and link it to the same account,\n * sharing the end-to-end encryption keys.\n *\n * @param tempClient temporary client used during the flow for the rendezvous channel\n * @param onFailure callback for when the sign-in process fails\n * @param abortSignal an AbortSignal that can be used to cancel the linking process,\n *   for example when the user cancels out of the flow.\n *   This will unbind the {@link onFailure} callback and prevent any further steps in the flow from being executed.\n * @returns a promise that resolves to an instance of the sign-in flow\n */\nexport async function signInByGeneratingQR(\n    tempClient: MatrixClient,\n    onFailure: RendezvousFailureListener,\n    abortSignal: AbortSignal,\n): Promise<MSC4108SignInWithQR> {\n    // ensure rust crypto is initialized as needed for the secure channel\n    const RustSdkCryptoJs = await import(\"@matrix-org/matrix-sdk-crypto-wasm\");\n    await RustSdkCryptoJs.initAsync();\n\n    return initGenerateQrFlow(RendezvousIntent.LOGIN_ON_NEW_DEVICE, tempClient, onFailure, abortSignal);\n}\n\nasync function initGenerateQrFlow(\n    intent: RendezvousIntent,\n    client: MatrixClient,\n    onFailure: RendezvousFailureListener,\n    abortSignal: AbortSignal,\n): Promise<MSC4108SignInWithQR> {\n    const session = new MSC4108RendezvousSession({\n        onFailure,\n        client,\n    });\n    const channel = new MSC4108SecureChannel(session, undefined, onFailure);\n    const flow = new MSC4108SignInWithQR(\n        channel,\n        false,\n        intent === RendezvousIntent.LOGIN_ON_NEW_DEVICE ? undefined : client,\n        onFailure,\n    );\n\n    if (abortSignal.aborted) return flow;\n\n    abortSignal.onabort = (): void => {\n        // Detach failure handlers\n        session.onFailure = undefined;\n        channel.onFailure = undefined;\n        flow.onFailure = undefined;\n        // Cancel the session\n        void flow.cancel(MSC4108FailureReason.UserCancelled);\n    };\n\n    await session.send(\"\"); // open channel\n\n    if (!abortSignal.aborted) {\n        await flow.generateCode();\n    }\n\n    return flow;\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -44,7 +44,7 @@ export declare class MSC4108RendezvousSession {
     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.
+     * @returns 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>;
     /**

package/lib/rendezvous/transports/MSC4108RendezvousSession.js

@@ -1,4 +1,3 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /*
 Copyright 2024 The Matrix.org Foundation C.I.C.
@@ -28,12 +27,13 @@ import { ClientPrefix } from "../../http-api/index.js";
  * @experimental Note that this is UNSTABLE and may have breaking changes without notice.
  */
 export class MSC4108RendezvousSession {
-  constructor(_ref) {
-    var fetchFn = _ref.fetchFn,
-      onFailure = _ref.onFailure,
-      url = _ref.url,
-      client = _ref.client,
-      fallbackRzServer = _ref.fallbackRzServer;
+  constructor({
+    fetchFn,
+    onFailure,
+    url,
+    client,
+    fallbackRzServer
+  }) {
     _defineProperty(this, "url", void 0);
     _defineProperty(this, "client", void 0);
     _defineProperty(this, "fallbackRzServer", void 0);
@@ -70,135 +70,124 @@ export class MSC4108RendezvousSession {
     }
     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);
+  async getPostEndpoint() {
+    if (this.client) {
+      try {
+        if (await 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;
-    })();
+    }
+    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"
-      };
+  async send(data) {
+    if (this._cancelled) {
+      return;
+    }
+    const method = this.url ? Method.Put : Method.Post;
+    const uri = this.url ?? (await this.getPostEndpoint());
+    if (!uri) {
+      throw new Error("Invalid rendezvous URI");
+    }
+    const 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");
+    // if we didn't create the rendezvous channel, we need to fetch the first etag if needed
+    if (!this.etag && this.url) {
+      await this.receive();
+    }
+    if (this.etag) {
+      headers["if-match"] = this.etag;
+    }
+    logger.info(`=> ${method} ${uri} with ${data} if-match: ${this.etag}`);
+    const res = await this.fetch(uri, {
+      method,
+      headers,
+      body: data,
+      redirect: "follow"
+    });
+    if (res.status === 404) {
+      return this.cancel(ClientRendezvousFailureReason.Unknown);
+    }
+    this.etag = res.headers.get("etag") ?? undefined;
+    logger.info(`Received etag: ${this.etag}`);
+    if (method === Method.Post) {
+      const expires = res.headers.get("expires");
+      if (expires) {
+        if (this.expiresTimer) {
+          clearTimeout(this.expiresTimer);
+          this.expiresTimer = undefined;
         }
-        _this2.url = json.url;
-        _this2._ready = true;
+        this.expiresAt = new Date(expires);
+        this.expiresTimer = setTimeout(() => {
+          this.expiresTimer = undefined;
+          void this.cancel(ClientRendezvousFailureReason.Expired);
+        }, this.expiresAt.getTime() - Date.now());
+      }
+      // MSC4108: we expect a JSON response with a rendezvous URL
+      const json = await res.json();
+      if (typeof json.url !== "string") {
+        throw new Error("No rendezvous URL given");
       }
-    })();
+      this.url = json.url;
+      this._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.
+   * @returns 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");
+  async receive() {
+    if (!this.url) {
+      throw new Error("Rendezvous not set up");
+    }
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+      if (this._cancelled) {
+        return undefined;
+      }
+      const headers = {};
+      if (this.etag) {
+        headers["if-none-match"] = this.etag;
+      }
+      logger.info(`=> GET ${this.url} if-none-match: ${this.etag}`);
+      const poll = await this.fetch(this.url, {
+        method: Method.Get,
+        headers
+      });
+      if (poll.status === 404) {
+        await this.cancel(ClientRendezvousFailureReason.Unknown);
+        return undefined;
       }
-      // 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
+      // 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;
+      const etag = poll.headers.get("etag") ?? undefined;
+      if (poll.headers.get("content-type") !== "text/plain") {
+        this.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
+          await this.cancel(ClientRendezvousFailureReason.ETagMissing);
+          return undefined;
         }
-        yield sleep(1000);
+        this.etag = etag;
+        const text = await poll.text();
+        logger.info(`Received: ${text} with etag ${this.etag}`);
+        return text;
       }
-    })();
+      await sleep(1000);
+    }
   }
 
   /**
@@ -206,48 +195,41 @@ export class MSC4108RendezvousSession {
    * 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();
-      }
-    })();
+  async cancel(reason) {
+    if (this._cancelled) return;
+    if (this.expiresTimer) {
+      clearTimeout(this.expiresTimer);
+      this.expiresTimer = undefined;
+    }
+    if (reason === ClientRendezvousFailureReason.Unknown && this.expiresAt && this.expiresAt.getTime() < Date.now()) {
+      reason = ClientRendezvousFailureReason.Expired;
+    }
+    this._cancelled = true;
+    this._ready = false;
+    this.onFailure?.(reason);
+    if (reason === ClientRendezvousFailureReason.UserDeclined || reason === MSC4108FailureReason.UserCancelled) {
+      await this.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 {
-        var method = Method.Delete;
-        logger.info("=> ".concat(method, " ").concat(_this5.url));
-        yield _this5.fetch(_this5.url, {
-          method
-        });
-      } catch (e) {
-        logger.warn(e);
-      }
-    })();
+  async close() {
+    if (this.expiresTimer) {
+      clearTimeout(this.expiresTimer);
+      this.expiresTimer = undefined;
+    }
+    if (!this.url) return;
+    try {
+      const method = Method.Delete;
+      logger.info(`=> ${method} ${this.url}`);
+      await this.fetch(this.url, {
+        method
+      });
+    } catch (e) {
+      logger.warn(e);
+    }
   }
 }
 //# sourceMappingURL=MSC4108RendezvousSession.js.map