matrix-js-sdk 41.8.0 → 41.9.0

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

@@ -1 +1 @@
-{"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, type RendezvousFailureListener } from \"../index.ts\";\nimport { type 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    public 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            const method = Method.Delete;\n            logger.info(`=> ${method} ${this.url}`);\n            await this.fetch(this.url, { method });\n        } catch (e) {\n            logger.warn(e);\n        }\n    }\n}\n"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,MAAM,QAAQ,iBAAiB;AACxC,SAASC,KAAK,QAAQ,gBAAgB;AACtC,SAASC,6BAA6B,EAAEC,oBAAoB,QAAwC,aAAa;AACjH,SAA4BC,MAAM,QAAQ,iBAAiB;AAC3D,SAASC,YAAY,QAAQ,yBAAyB;;AAEtD;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,wBAAwB,CAAC;EAgC3BC,WAAWA,CAAAC,IAAA,EAYf;IAAA,IAXCC,OAAO,GAAAD,IAAA,CAAPC,OAAO;MACPC,SAAS,GAAAF,IAAA,CAATE,SAAS;MACTC,GAAG,GAAAH,IAAA,CAAHG,GAAG;MACHC,MAAM,GAAAJ,IAAA,CAANI,MAAM;MACNC,gBAAgB,GAAAL,IAAA,CAAhBK,gBAAgB;IAAAC,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA,qBA5BC,KAAK;IAAAA,eAAA,iBACT,KAAK;IAmClB,IAAI,CAACL,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,SAAS,GAAGA,SAAS;IAC1B,IAAI,CAACE,MAAM,GAAGA,MAAM;IACpB,IAAI,CAACC,gBAAgB,GAAGA,gBAAgB;IACxC,IAAI,CAACF,GAAG,GAAGA,GAAG;EAClB;;EAEA;AACJ;AACA;EACI,IAAWI,KAAKA,CAAA,EAAY;IACxB,OAAO,IAAI,CAACC,MAAM;EACtB;;EAEA;AACJ;AACA;EACI,IAAWC,SAASA,CAAA,EAAY;IAC5B,OAAO,IAAI,CAACC,UAAU;EAC1B;EAEQC,KAAKA,CAACC,QAAsB,EAAEC,OAAqB,EAAuC;IAC9F,IAAI,IAAI,CAACZ,OAAO,EAAE;MACd,OAAO,IAAI,CAACA,OAAO,CAACW,QAAQ,EAAEC,OAAO,CAAC;IAC1C;IACA,OAAOC,UAAU,CAACH,KAAK,CAACC,QAAQ,EAAEC,OAAO,CAAC;EAC9C;EAEcE,eAAeA,CAAA,EAAgC;IAAA,IAAAC,KAAA;IAAA,OAAAC,iBAAA;MACzD,IAAID,KAAI,CAACZ,MAAM,EAAE;QACb,IAAI;UACA,UAAUY,KAAI,CAACZ,MAAM,CAACc,gCAAgC,CAAC,oBAAoB,CAAC,EAAE;YAC1E,OAAOF,KAAI,CAACZ,MAAM,CAACe,IAAI,CAClBC,MAAM,CAAC,gCAAgC,EAAEC,SAAS,EAAExB,YAAY,CAACyB,QAAQ,CAAC,CAC1EC,QAAQ,CAAC,CAAC;UACnB;QACJ,CAAC,CAAC,OAAOC,GAAG,EAAE;UACVhC,MAAM,CAACiC,IAAI,CAAC,iCAAiC,EAAED,GAAG,CAAC;QACvD;MACJ;MAEA,OAAOR,KAAI,CAACX,gBAAgB;IAAC;EACjC;;EAEA;AACJ;AACA;AACA;EACiBqB,IAAIA,CAACC,IAAY,EAAiB;IAAA,IAAAC,MAAA;IAAA,OAAAX,iBAAA;MAAA,IAAAY,UAAA,EAAAC,gBAAA;MAC3C,IAAIF,MAAI,CAAClB,UAAU,EAAE;QACjB;MACJ;MACA,IAAMqB,MAAM,GAAGH,MAAI,CAACzB,GAAG,GAAGP,MAAM,CAACoC,GAAG,GAAGpC,MAAM,CAACqC,IAAI;MAClD,IAAMC,GAAG,IAAAL,UAAA,GAAGD,MAAI,CAACzB,GAAG,cAAA0B,UAAA,cAAAA,UAAA,SAAWD,MAAI,CAACb,eAAe,CAAC,CAAE;MAEtD,IAAI,CAACmB,GAAG,EAAE;QACN,MAAM,IAAIC,KAAK,CAAC,wBAAwB,CAAC;MAC7C;MAEA,IAAMC,OAA+B,GAAG;QAAE,cAAc,EAAE;MAAa,CAAC;;MAExE;MACA,IAAI,CAACR,MAAI,CAACS,IAAI,IAAIT,MAAI,CAACzB,GAAG,EAAE;QACxB,MAAMyB,MAAI,CAACU,OAAO,CAAC,CAAC;MACxB;MAEA,IAAIV,MAAI,CAACS,IAAI,EAAE;QACXD,OAAO,CAAC,UAAU,CAAC,GAAGR,MAAI,CAACS,IAAI;MACnC;MAEA7C,MAAM,CAAC+C,IAAI,OAAAC,MAAA,CAAOT,MAAM,OAAAS,MAAA,CAAIN,GAAG,YAAAM,MAAA,CAASb,IAAI,iBAAAa,MAAA,CAAcZ,MAAI,CAACS,IAAI,CAAE,CAAC;MAEtE,IAAMI,GAAG,SAASb,MAAI,CAACjB,KAAK,CAACuB,GAAG,EAAE;QAAEH,MAAM;QAAEK,OAAO;QAAEM,IAAI,EAAEf,IAAI;QAAEgB,QAAQ,EAAE;MAAS,CAAC,CAAC;MACtF,IAAIF,GAAG,CAACG,MAAM,KAAK,GAAG,EAAE;QACpB,OAAOhB,MAAI,CAACiB,MAAM,CAACnD,6BAA6B,CAACoD,OAAO,CAAC;MAC7D;MACAlB,MAAI,CAACS,IAAI,IAAAP,gBAAA,GAAGW,GAAG,CAACL,OAAO,CAACW,GAAG,CAAC,MAAM,CAAC,cAAAjB,gBAAA,cAAAA,gBAAA,GAAIT,SAAS;MAEhD7B,MAAM,CAAC+C,IAAI,mBAAAC,MAAA,CAAmBZ,MAAI,CAACS,IAAI,CAAE,CAAC;MAE1C,IAAIN,MAAM,KAAKnC,MAAM,CAACqC,IAAI,EAAE;QACxB,IAAMe,OAAO,GAAGP,GAAG,CAACL,OAAO,CAACW,GAAG,CAAC,SAAS,CAAC;QAC1C,IAAIC,OAAO,EAAE;UACT,IAAIpB,MAAI,CAACqB,YAAY,EAAE;YACnBC,YAAY,CAACtB,MAAI,CAACqB,YAAY,CAAC;YAC/BrB,MAAI,CAACqB,YAAY,GAAG5B,SAAS;UACjC;UACAO,MAAI,CAACuB,SAAS,GAAG,IAAIC,IAAI,CAACJ,OAAO,CAAC;UAClCpB,MAAI,CAACqB,YAAY,GAAGI,UAAU,CAAC,MAAM;YACjCzB,MAAI,CAACqB,YAAY,GAAG5B,SAAS;YAC7BO,MAAI,CAACiB,MAAM,CAACnD,6BAA6B,CAAC4D,OAAO,CAAC;UACtD,CAAC,EAAE1B,MAAI,CAACuB,SAAS,CAACI,OAAO,CAAC,CAAC,GAAGH,IAAI,CAACI,GAAG,CAAC,CAAC,CAAC;QAC7C;QACA;QACA,IAAMC,IAAI,SAAShB,GAAG,CAACgB,IAAI,CAAC,CAAC;QAC7B,IAAI,OAAOA,IAAI,CAACtD,GAAG,KAAK,QAAQ,EAAE;UAC9B,MAAM,IAAIgC,KAAK,CAAC,yBAAyB,CAAC;QAC9C;QACAP,MAAI,CAACzB,GAAG,GAAGsD,IAAI,CAACtD,GAAG;QACnByB,MAAI,CAACpB,MAAM,GAAG,IAAI;MACtB;IAAC;EACL;;EAEA;AACJ;AACA;AACA;EACiB8B,OAAOA,CAAA,EAAgC;IAAA,IAAAoB,MAAA;IAAA,OAAAzC,iBAAA;MAChD,IAAI,CAACyC,MAAI,CAACvD,GAAG,EAAE;QACX,MAAM,IAAIgC,KAAK,CAAC,uBAAuB,CAAC;MAC5C;MACA;MACA,OAAO,IAAI,EAAE;QAAA,IAAAwB,iBAAA;QACT,IAAID,MAAI,CAAChD,UAAU,EAAE;UACjB,OAAOW,SAAS;QACpB;QAEA,IAAMe,OAA+B,GAAG,CAAC,CAAC;QAC1C,IAAIsB,MAAI,CAACrB,IAAI,EAAE;UACXD,OAAO,CAAC,eAAe,CAAC,GAAGsB,MAAI,CAACrB,IAAI;QACxC;QAEA7C,MAAM,CAAC+C,IAAI,WAAAC,MAAA,CAAWkB,MAAI,CAACvD,GAAG,sBAAAqC,MAAA,CAAmBkB,MAAI,CAACrB,IAAI,CAAE,CAAC;QAC7D,IAAMuB,IAAI,SAASF,MAAI,CAAC/C,KAAK,CAAC+C,MAAI,CAACvD,GAAG,EAAE;UAAE4B,MAAM,EAAEnC,MAAM,CAACiE,GAAG;UAAEzB;QAAQ,CAAC,CAAC;QAExE,IAAIwB,IAAI,CAAChB,MAAM,KAAK,GAAG,EAAE;UACrB,MAAMc,MAAI,CAACb,MAAM,CAACnD,6BAA6B,CAACoD,OAAO,CAAC;UACxD,OAAOzB,SAAS;QACpB;;QAEA;;QAEA,IAAMgB,IAAI,IAAAsB,iBAAA,GAAGC,IAAI,CAACxB,OAAO,CAACW,GAAG,CAAC,MAAM,CAAC,cAAAY,iBAAA,cAAAA,iBAAA,GAAItC,SAAS;QAClD,IAAIuC,IAAI,CAACxB,OAAO,CAACW,GAAG,CAAC,cAAc,CAAC,KAAK,YAAY,EAAE;UACnDW,MAAI,CAACrB,IAAI,GAAGA,IAAI;QACpB,CAAC,MAAM,IAAIuB,IAAI,CAAChB,MAAM,KAAK,GAAG,EAAE;UAC5B,IAAI,CAACP,IAAI,EAAE;YACP;YACA;YACA,MAAMqB,MAAI,CAACb,MAAM,CAACnD,6BAA6B,CAACoE,WAAW,CAAC;YAC5D,OAAOzC,SAAS;UACpB;UAEAqC,MAAI,CAACrB,IAAI,GAAGA,IAAI;UAChB,IAAM0B,IAAI,SAASH,IAAI,CAACG,IAAI,CAAC,CAAC;UAC9BvE,MAAM,CAAC+C,IAAI,cAAAC,MAAA,CAAcuB,IAAI,iBAAAvB,MAAA,CAAckB,MAAI,CAACrB,IAAI,CAAE,CAAC;UACvD,OAAO0B,IAAI;QACf;QACA,MAAMtE,KAAK,CAAC,IAAI,CAAC;MACrB;IAAC;EACL;;EAEA;AACJ;AACA;AACA;AACA;EACiBoD,MAAMA,CAACmB,MAA4D,EAAiB;IAAA,IAAAC,MAAA;IAAA,OAAAhD,iBAAA;MAAA,IAAAiD,gBAAA;MAC7F,IAAID,MAAI,CAACvD,UAAU,EAAE;MACrB,IAAIuD,MAAI,CAAChB,YAAY,EAAE;QACnBC,YAAY,CAACe,MAAI,CAAChB,YAAY,CAAC;QAC/BgB,MAAI,CAAChB,YAAY,GAAG5B,SAAS;MACjC;MAEA,IACI2C,MAAM,KAAKtE,6BAA6B,CAACoD,OAAO,IAChDmB,MAAI,CAACd,SAAS,IACdc,MAAI,CAACd,SAAS,CAACI,OAAO,CAAC,CAAC,GAAGH,IAAI,CAACI,GAAG,CAAC,CAAC,EACvC;QACEQ,MAAM,GAAGtE,6BAA6B,CAAC4D,OAAO;MAClD;MAEAW,MAAI,CAACvD,UAAU,GAAG,IAAI;MACtBuD,MAAI,CAACzD,MAAM,GAAG,KAAK;MACnB,CAAA0D,gBAAA,GAAAD,MAAI,CAAC/D,SAAS,cAAAgE,gBAAA,eAAdA,gBAAA,CAAAC,IAAA,CAAAF,MAAI,EAAaD,MAAM,CAAC;MAExB,IAAIA,MAAM,KAAKtE,6BAA6B,CAAC0E,YAAY,IAAIJ,MAAM,KAAKrE,oBAAoB,CAAC0E,aAAa,EAAE;QACxG,MAAMJ,MAAI,CAACK,KAAK,CAAC,CAAC;MACtB;IAAC;EACL;;EAEA;AACJ;AACA;EACiBA,KAAKA,CAAA,EAAkB;IAAA,IAAAC,MAAA;IAAA,OAAAtD,iBAAA;MAChC,IAAIsD,MAAI,CAACtB,YAAY,EAAE;QACnBC,YAAY,CAACqB,MAAI,CAACtB,YAAY,CAAC;QAC/BsB,MAAI,CAACtB,YAAY,GAAG5B,SAAS;MACjC;MAEA,IAAI,CAACkD,MAAI,CAACpE,GAAG,EAAE;MACf,IAAI;QACA,IAAM4B,MAAM,GAAGnC,MAAM,CAAC4E,MAAM;QAC5BhF,MAAM,CAAC+C,IAAI,OAAAC,MAAA,CAAOT,MAAM,OAAAS,MAAA,CAAI+B,MAAI,CAACpE,GAAG,CAAE,CAAC;QACvC,MAAMoE,MAAI,CAAC5D,KAAK,CAAC4D,MAAI,CAACpE,GAAG,EAAE;UAAE4B;QAAO,CAAC,CAAC;MAC1C,CAAC,CAAC,OAAO0C,CAAC,EAAE;QACRjF,MAAM,CAACiC,IAAI,CAACgD,CAAC,CAAC;MAClB;IAAC;EACL;AACJ","ignoreList":[]}
+{"version":3,"file":"MSC4108RendezvousSession.js","names":[],"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, type RendezvousFailureListener } from \"../index.ts\";\nimport { type 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    public 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                    void 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     * @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.\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            const method = Method.Delete;\n            logger.info(`=> ${method} ${this.url}`);\n            await this.fetch(this.url, { method });\n        } catch (e) {\n            logger.warn(e);\n        }\n    }\n}\n"],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAAS,MAAM,QAAQ,iBAAiB;AACxC,SAAS,KAAK,QAAQ,gBAAgB;AACtC,SAAS,6BAA6B,EAAE,oBAAoB,QAAwC,aAAa;AACjH,SAA4B,MAAM,QAAQ,iBAAiB;AAC3D,SAAS,YAAY,QAAQ,yBAAyB;;AAEtD;AACA;AACA;AACA;AACA;AACA,OAAO,MAAM,wBAAwB,CAAC;EAgC3B,WAAW,CAAC;IACf,OAAO;IACP,SAAS;IACT,GAAG;IACH,MAAM;IACN;EAOJ,CAAC,EAAE;IAAA;IAAA;IAAA;IAAA;IAAA;IAAA;IAAA;IAAA;IAAA,oCAnCkB,KAAK;IAAA,gCACT,KAAK;IAmClB,IAAI,CAAC,OAAO,GAAG,OAAO;IACtB,IAAI,CAAC,SAAS,GAAG,SAAS;IAC1B,IAAI,CAAC,MAAM,GAAG,MAAM;IACpB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB;IACxC,IAAI,CAAC,GAAG,GAAG,GAAG;EAClB;;EAEA;AACJ;AACA;EACI,IAAW,KAAK,GAAY;IACxB,OAAO,IAAI,CAAC,MAAM;EACtB;;EAEA;AACJ;AACA;EACI,IAAW,SAAS,GAAY;IAC5B,OAAO,IAAI,CAAC,UAAU;EAC1B;EAEQ,KAAK,CAAC,QAAsB,EAAE,OAAqB,EAAuC;IAC9F,IAAI,IAAI,CAAC,OAAO,EAAE;MACd,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC1C;IACA,OAAO,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC;EAC9C;EAEA,MAAc,eAAe,GAAgC;IACzD,IAAI,IAAI,CAAC,MAAM,EAAE;MACb,IAAI;QACA,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,gCAAgC,CAAC,oBAAoB,CAAC,EAAE;UAC1E,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAClB,MAAM,CAAC,gCAAgC,EAAE,SAAS,EAAE,YAAY,CAAC,QAAQ,CAAC,CAC1E,QAAQ,CAAC,CAAC;QACnB;MACJ,CAAC,CAAC,OAAO,GAAG,EAAE;QACV,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE,GAAG,CAAC;MACvD;IACJ;IAEA,OAAO,IAAI,CAAC,gBAAgB;EAChC;;EAEA;AACJ;AACA;AACA;EACI,MAAa,IAAI,CAAC,IAAY,EAAiB;IAC3C,IAAI,IAAI,CAAC,UAAU,EAAE;MACjB;IACJ;IACA,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,IAAI;IAClD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,KAAK,MAAM,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;IAEtD,IAAI,CAAC,GAAG,EAAE;MACN,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC;IAC7C;IAEA,MAAM,OAA+B,GAAG;MAAE,cAAc,EAAE;IAAa,CAAC;;IAExE;IACA,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE;MACxB,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;IACxB;IAEA,IAAI,IAAI,CAAC,IAAI,EAAE;MACX,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,IAAI;IACnC;IAEA,MAAM,CAAC,IAAI,CAAC,MAAM,MAAM,IAAI,GAAG,SAAS,IAAI,cAAc,IAAI,CAAC,IAAI,EAAE,CAAC;IAEtE,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;MAAE,MAAM;MAAE,OAAO;MAAE,IAAI,EAAE,IAAI;MAAE,QAAQ,EAAE;IAAS,CAAC,CAAC;IACtF,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE;MACpB,OAAO,IAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,OAAO,CAAC;IAC7D;IACA,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,SAAS;IAEhD,MAAM,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,IAAI,EAAE,CAAC;IAE1C,IAAI,MAAM,KAAK,MAAM,CAAC,IAAI,EAAE;MACxB,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;MAC1C,IAAI,OAAO,EAAE;QACT,IAAI,IAAI,CAAC,YAAY,EAAE;UACnB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC;UAC/B,IAAI,CAAC,YAAY,GAAG,SAAS;QACjC;QACA,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC;QAClC,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,MAAM;UACjC,IAAI,CAAC,YAAY,GAAG,SAAS;UAC7B,KAAK,IAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,OAAO,CAAC;QAC3D,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;MAC7C;MACA;MACA,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC;MAC7B,IAAI,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ,EAAE;QAC9B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC;MAC9C;MACA,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG;MACnB,IAAI,CAAC,MAAM,GAAG,IAAI;IACtB;EACJ;;EAEA;AACJ;AACA;AACA;EACI,MAAa,OAAO,GAAgC;IAChD,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;MACX,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC;IAC5C;IACA;IACA,OAAO,IAAI,EAAE;MACT,IAAI,IAAI,CAAC,UAAU,EAAE;QACjB,OAAO,SAAS;MACpB;MAEA,MAAM,OAA+B,GAAG,CAAC,CAAC;MAC1C,IAAI,IAAI,CAAC,IAAI,EAAE;QACX,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,IAAI;MACxC;MAEA,MAAM,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,GAAG,mBAAmB,IAAI,CAAC,IAAI,EAAE,CAAC;MAC7D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC,GAAG;QAAE;MAAQ,CAAC,CAAC;MAExE,IAAI,IAAI,CAAC,MAAM,KAAK,GAAG,EAAE;QACrB,MAAM,IAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,OAAO,CAAC;QACxD,OAAO,SAAS;MACpB;;MAEA;;MAEA,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,SAAS;MAClD,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,YAAY,EAAE;QACnD,IAAI,CAAC,IAAI,GAAG,IAAI;MACpB,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,GAAG,EAAE;QAC5B,IAAI,CAAC,IAAI,EAAE;UACP;UACA;UACA,MAAM,IAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,WAAW,CAAC;UAC5D,OAAO,SAAS;QACpB;QAEA,IAAI,CAAC,IAAI,GAAG,IAAI;QAChB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,cAAc,IAAI,CAAC,IAAI,EAAE,CAAC;QACvD,OAAO,IAAI;MACf;MACA,MAAM,KAAK,CAAC,IAAI,CAAC;IACrB;EACJ;;EAEA;AACJ;AACA;AACA;AACA;EACI,MAAa,MAAM,CAAC,MAA4D,EAAiB;IAC7F,IAAI,IAAI,CAAC,UAAU,EAAE;IACrB,IAAI,IAAI,CAAC,YAAY,EAAE;MACnB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC;MAC/B,IAAI,CAAC,YAAY,GAAG,SAAS;IACjC;IAEA,IACI,MAAM,KAAK,6BAA6B,CAAC,OAAO,IAChD,IAAI,CAAC,SAAS,IACd,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EACvC;MACE,MAAM,GAAG,6BAA6B,CAAC,OAAO;IAClD;IAEA,IAAI,CAAC,UAAU,GAAG,IAAI;IACtB,IAAI,CAAC,MAAM,GAAG,KAAK;IACnB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;IAExB,IAAI,MAAM,KAAK,6BAA6B,CAAC,YAAY,IAAI,MAAM,KAAK,oBAAoB,CAAC,aAAa,EAAE;MACxG,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC;IACtB;EACJ;;EAEA;AACJ;AACA;EACI,MAAa,KAAK,GAAkB;IAChC,IAAI,IAAI,CAAC,YAAY,EAAE;MACnB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC;MAC/B,IAAI,CAAC,YAAY,GAAG,SAAS;IACjC;IAEA,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;IACf,IAAI;MACA,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM;MAC5B,MAAM,CAAC,IAAI,CAAC,MAAM,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;MACvC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;QAAE;MAAO,CAAC,CAAC;IAC1C,CAAC,CAAC,OAAO,CAAC,EAAE;MACR,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAClB;EACJ;AACJ","ignoreList":[]}

package/lib/retentionPolicy.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.
@@ -23,20 +22,18 @@ import { ClientPrefix, Method } from "./http-api/index.js";
  */
 export class RetentionPolicyService extends CapabilityPoller {
   constructor(logger, http) {
-    var _this;
     super(logger, http, "retention policy");
-    _this = this;
     /**
      * Fetches the latest server capabilities from the homeserver and returns them, or rejects
      * on failure.
      */
-    _defineProperty(this, "fetch", /*#__PURE__*/_asyncToGenerator(function* () {
-      var resp = yield _this.http.authedRequest(Method.Get, "/retention/configuration", undefined, undefined, {
-        prefix: "".concat(ClientPrefix.Unstable, "/org.matrix.msc1763")
+    _defineProperty(this, "fetch", async () => {
+      const resp = await this.http.authedRequest(Method.Get, "/retention/configuration", undefined, undefined, {
+        prefix: `${ClientPrefix.Unstable}/org.matrix.msc1763`
       });
-      _this.cached = resp;
-      return _this.cached;
-    }));
+      this.cached = resp;
+      return this.cached;
+    });
   }
 }
 //# sourceMappingURL=retentionPolicy.js.map

package/lib/retentionPolicy.js.map

@@ -1 +1 @@
-{"version":3,"file":"retentionPolicy.js","names":["CapabilityPoller","ClientPrefix","Method","RetentionPolicyService","constructor","logger","http","_this","this","_defineProperty","_asyncToGenerator","resp","authedRequest","Get","undefined","prefix","concat","Unstable","cached"],"sources":["../src/retentionPolicy.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 { CapabilityPoller } from \"./capabilityPoller.ts\";\nimport { ClientPrefix, type IHttpOpts, type MatrixHttpApi, Method } from \"./http-api/index.ts\";\nimport type { Logger } from \"./logger.ts\";\n\nexport interface RetentionConfigurationResponse {\n    policies?: Record<\n        string,\n        {\n            max_lifetime?: number;\n            min_lifetime?: number;\n        }\n    >;\n    limits?: {\n        min_lifetime?: {\n            min?: number;\n            max?: number;\n        };\n        max_lifetime?: {\n            min?: number;\n            max?: number;\n        };\n    };\n}\n\n/**\n * Manages storing and periodically refreshing the server capabilities.\n */\nexport class RetentionPolicyService extends CapabilityPoller<RetentionConfigurationResponse> {\n    public constructor(logger: Logger, http: MatrixHttpApi<IHttpOpts & { onlyData: true }>) {\n        super(logger, http, \"retention policy\");\n    }\n    /**\n     * Fetches the latest server capabilities from the homeserver and returns them, or rejects\n     * on failure.\n     */\n    public fetch = async (): Promise<RetentionConfigurationResponse> => {\n        const resp = await this.http.authedRequest<RetentionConfigurationResponse>(\n            Method.Get,\n            \"/retention/configuration\",\n            undefined,\n            undefined,\n            {\n                prefix: `${ClientPrefix.Unstable}/org.matrix.msc1763`,\n            },\n        );\n        this.cached = resp;\n        return this.cached;\n    };\n}\n"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,gBAAgB,QAAQ,uBAAuB;AACxD,SAASC,YAAY,EAAsCC,MAAM,QAAQ,qBAAqB;AAuB9F;AACA;AACA;AACA,OAAO,MAAMC,sBAAsB,SAASH,gBAAgB,CAAiC;EAClFI,WAAWA,CAACC,MAAc,EAAEC,IAAmD,EAAE;IAAA,IAAAC,KAAA;IACpF,KAAK,CAACF,MAAM,EAAEC,IAAI,EAAE,kBAAkB,CAAC;IAAAC,KAAA,GAAAC,IAAA;IAE3C;AACJ;AACA;AACA;IAHIC,eAAA,6BAAAC,iBAAA,CAIe,aAAqD;MAChE,IAAMC,IAAI,SAASJ,KAAI,CAACD,IAAI,CAACM,aAAa,CACtCV,MAAM,CAACW,GAAG,EACV,0BAA0B,EAC1BC,SAAS,EACTA,SAAS,EACT;QACIC,MAAM,KAAAC,MAAA,CAAKf,YAAY,CAACgB,QAAQ;MACpC,CACJ,CAAC;MACDV,KAAI,CAACW,MAAM,GAAGP,IAAI;MAClB,OAAOJ,KAAI,CAACW,MAAM;IACtB,CAAC;EAjBD;AAkBJ","ignoreList":[]}
+{"version":3,"file":"retentionPolicy.js","names":[],"sources":["../src/retentionPolicy.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 { CapabilityPoller } from \"./capabilityPoller.ts\";\nimport { ClientPrefix, type IHttpOpts, type MatrixHttpApi, Method } from \"./http-api/index.ts\";\nimport type { Logger } from \"./logger.ts\";\n\nexport interface RetentionConfigurationResponse {\n    policies?: Record<\n        string,\n        {\n            max_lifetime?: number;\n            min_lifetime?: number;\n        }\n    >;\n    limits?: {\n        min_lifetime?: {\n            min?: number;\n            max?: number;\n        };\n        max_lifetime?: {\n            min?: number;\n            max?: number;\n        };\n    };\n}\n\n/**\n * Manages storing and periodically refreshing the server capabilities.\n */\nexport class RetentionPolicyService extends CapabilityPoller<RetentionConfigurationResponse> {\n    public constructor(logger: Logger, http: MatrixHttpApi<IHttpOpts & { onlyData: true }>) {\n        super(logger, http, \"retention policy\");\n    }\n    /**\n     * Fetches the latest server capabilities from the homeserver and returns them, or rejects\n     * on failure.\n     */\n    public fetch = async (): Promise<RetentionConfigurationResponse> => {\n        const resp = await this.http.authedRequest<RetentionConfigurationResponse>(\n            Method.Get,\n            \"/retention/configuration\",\n            undefined,\n            undefined,\n            {\n                prefix: `${ClientPrefix.Unstable}/org.matrix.msc1763`,\n            },\n        );\n        this.cached = resp;\n        return this.cached;\n    };\n}\n"],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAAS,gBAAgB,QAAQ,uBAAuB;AACxD,SAAS,YAAY,EAAsC,MAAM,QAAQ,qBAAqB;AAuB9F;AACA;AACA;AACA,OAAO,MAAM,sBAAsB,SAAS,gBAAgB,CAAiC;EAClF,WAAW,CAAC,MAAc,EAAE,IAAmD,EAAE;IACpF,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,kBAAkB,CAAC;IAE3C;AACJ;AACA;AACA;IAHI,+BAIe,YAAqD;MAChE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,CACtC,MAAM,CAAC,GAAG,EACV,0BAA0B,EAC1B,SAAS,EACT,SAAS,EACT;QACI,MAAM,EAAE,GAAG,YAAY,CAAC,QAAQ;MACpC,CACJ,CAAC;MACD,IAAI,CAAC,MAAM,GAAG,IAAI;MAClB,OAAO,IAAI,CAAC,MAAM;IACtB,CAAC;EAjBD;AAkBJ","ignoreList":[]}

package/lib/room-hierarchy.js

@@ -1,4 +1,3 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /*
 Copyright 2021 The Matrix.org Foundation C.I.C.
@@ -28,12 +27,7 @@ export class RoomHierarchy {
    * @param maxDepth - the maximum depth to traverse the hierarchy to
    * @param suggestedOnly - whether to only return rooms with suggested=true.
    */
-  constructor(root, pageSize, maxDepth) {
-    var suggestedOnly = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-    this.root = root;
-    this.pageSize = pageSize;
-    this.maxDepth = maxDepth;
-    this.suggestedOnly = suggestedOnly;
+  constructor(root, pageSize, maxDepth, suggestedOnly = false) {
     // Map from room id to list of servers which are listed as a via somewhere in the loaded hierarchy
     _defineProperty(this, "viaMap", new Map());
     // Map from room id to list of rooms which claim this room as their child
@@ -44,6 +38,10 @@ export class RoomHierarchy {
     _defineProperty(this, "nextBatch", void 0);
     _defineProperty(this, "_rooms", void 0);
     _defineProperty(this, "serverSupportError", void 0);
+    this.root = root;
+    this.pageSize = pageSize;
+    this.maxDepth = maxDepth;
+    this.suggestedOnly = suggestedOnly;
   }
   get noSupport() {
     return !!this.serverSupportError;
@@ -57,76 +55,70 @@ export class RoomHierarchy {
   get rooms() {
     return this._rooms;
   }
-  load() {
-    var _arguments = arguments,
-      _this = this;
-    return _asyncToGenerator(function* () {
-      var pageSize = _arguments.length > 0 && _arguments[0] !== undefined ? _arguments[0] : _this.pageSize;
-      if (_this.loadRequest) return _this.loadRequest.then(r => r.rooms);
-      _this.loadRequest = _this.root.client.getRoomHierarchy(_this.root.roomId, pageSize, _this.maxDepth, _this.suggestedOnly, _this.nextBatch);
-      var rooms;
-      try {
-        var _yield$_this$loadRequ = yield _this.loadRequest;
-        rooms = _yield$_this$loadRequ.rooms;
-        _this.nextBatch = _yield$_this$loadRequ.next_batch;
-      } catch (e) {
-        if (e.errcode === "M_UNRECOGNIZED") {
-          _this.serverSupportError = e;
-        } else {
-          throw e;
-        }
-        return [];
-      } finally {
-        _this.loadRequest = undefined;
-      }
-      if (_this._rooms) {
-        _this._rooms = _this._rooms.concat(rooms);
+  async load(pageSize = this.pageSize) {
+    if (this.loadRequest) return this.loadRequest.then(r => r.rooms);
+    this.loadRequest = this.root.client.getRoomHierarchy(this.root.roomId, pageSize, this.maxDepth, this.suggestedOnly, this.nextBatch);
+    let rooms;
+    try {
+      ({
+        rooms,
+        next_batch: this.nextBatch
+      } = await this.loadRequest);
+    } catch (e) {
+      if (e.errcode === "M_UNRECOGNIZED") {
+        this.serverSupportError = e;
       } else {
-        _this._rooms = rooms;
+        throw e;
       }
-      rooms.forEach(room => {
-        _this.roomMap.set(room.room_id, room);
-        room.children_state.forEach(ev => {
-          if (ev.type !== EventType.SpaceChild) return;
-          var childRoomId = ev.state_key;
+      return [];
+    } finally {
+      this.loadRequest = undefined;
+    }
+    if (this._rooms) {
+      this._rooms = this._rooms.concat(rooms);
+    } else {
+      this._rooms = rooms;
+    }
+    rooms.forEach(room => {
+      this.roomMap.set(room.room_id, room);
+      room.children_state.forEach(ev => {
+        if (ev.type !== EventType.SpaceChild) return;
+        const childRoomId = ev.state_key;
 
-          // track backrefs for quicker hierarchy navigation
-          if (!_this.backRefs.has(childRoomId)) {
-            _this.backRefs.set(childRoomId, []);
-          }
-          _this.backRefs.get(childRoomId).push(room.room_id);
+        // track backrefs for quicker hierarchy navigation
+        if (!this.backRefs.has(childRoomId)) {
+          this.backRefs.set(childRoomId, []);
+        }
+        this.backRefs.get(childRoomId).push(room.room_id);
 
-          // fill viaMap
-          if (Array.isArray(ev.content.via)) {
-            if (!_this.viaMap.has(childRoomId)) {
-              _this.viaMap.set(childRoomId, new Set());
-            }
-            var vias = _this.viaMap.get(childRoomId);
-            ev.content.via.forEach(via => vias.add(via));
+        // fill viaMap
+        if (Array.isArray(ev.content.via)) {
+          if (!this.viaMap.has(childRoomId)) {
+            this.viaMap.set(childRoomId, new Set());
           }
-        });
+          const vias = this.viaMap.get(childRoomId);
+          ev.content.via.forEach(via => vias.add(via));
+        }
       });
-      return rooms;
-    })();
+    });
+    return rooms;
   }
   getRelation(parentId, childId) {
-    var _this$roomMap$get;
-    return (_this$roomMap$get = this.roomMap.get(parentId)) === null || _this$roomMap$get === void 0 ? void 0 : _this$roomMap$get.children_state.find(e => e.state_key === childId);
+    return this.roomMap.get(parentId)?.children_state.find(e => e.state_key === childId);
   }
   isSuggested(parentId, childId) {
-    var _this$getRelation;
-    return (_this$getRelation = this.getRelation(parentId, childId)) === null || _this$getRelation === void 0 ? void 0 : _this$getRelation.content.suggested;
+    return this.getRelation(parentId, childId)?.content.suggested;
   }
 
   // locally remove a relation as a form of local echo
   removeRelation(parentId, childId) {
-    var backRefs = this.backRefs.get(childId);
-    if ((backRefs === null || backRefs === void 0 ? void 0 : backRefs.length) === 1) {
+    const backRefs = this.backRefs.get(childId);
+    if (backRefs?.length === 1) {
       this.backRefs.delete(childId);
-    } else if (backRefs !== null && backRefs !== void 0 && backRefs.length) {
+    } else if (backRefs?.length) {
       this.backRefs.set(childId, backRefs.filter(ref => ref !== parentId));
     }
-    var room = this.roomMap.get(parentId);
+    const room = this.roomMap.get(parentId);
     if (room) {
       room.children_state = room.children_state.filter(ev => ev.state_key !== childId);
     }

package/lib/room-hierarchy.js.map

@@ -1 +1 @@
-{"version":3,"file":"room-hierarchy.js","names":["EventType","RoomHierarchy","constructor","root","pageSize","maxDepth","suggestedOnly","arguments","length","undefined","_defineProperty","Map","noSupport","serverSupportError","canLoadMore","nextBatch","_rooms","loading","loadRequest","rooms","load","_arguments","_this","_asyncToGenerator","then","r","client","getRoomHierarchy","roomId","_yield$_this$loadRequ","next_batch","e","errcode","concat","forEach","room","roomMap","set","room_id","children_state","ev","type","SpaceChild","childRoomId","state_key","backRefs","has","get","push","Array","isArray","content","via","viaMap","Set","vias","add","getRelation","parentId","childId","_this$roomMap$get","find","isSuggested","_this$getRelation","suggested","removeRelation","delete","filter","ref"],"sources":["../src/room-hierarchy.ts"],"sourcesContent":["/*\nCopyright 2021 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 Room } from \"./models/room.ts\";\nimport { type IHierarchyRoom, type IHierarchyRelation } from \"./@types/spaces.ts\";\nimport { type MatrixClient } from \"./client.ts\";\nimport { EventType } from \"./@types/event.ts\";\nimport { type MatrixError } from \"./http-api/index.ts\";\n\nexport class RoomHierarchy {\n    // Map from room id to list of servers which are listed as a via somewhere in the loaded hierarchy\n    public readonly viaMap = new Map<string, Set<string>>();\n    // Map from room id to list of rooms which claim this room as their child\n    public readonly backRefs = new Map<string, string[]>();\n    // Map from room id to object\n    public readonly roomMap = new Map<string, IHierarchyRoom>();\n    private loadRequest?: ReturnType<MatrixClient[\"getRoomHierarchy\"]>;\n    private nextBatch?: string;\n    private _rooms?: IHierarchyRoom[];\n    private serverSupportError?: Error;\n\n    /**\n     * Construct a new RoomHierarchy\n     *\n     * A RoomHierarchy instance allows you to easily make use of the /hierarchy API and paginate it.\n     *\n     * @param root - the root of this hierarchy\n     * @param pageSize - the maximum number of rooms to return per page, can be overridden per load request.\n     * @param maxDepth - the maximum depth to traverse the hierarchy to\n     * @param suggestedOnly - whether to only return rooms with suggested=true.\n     */\n    public constructor(\n        public readonly root: Room,\n        private readonly pageSize?: number,\n        private readonly maxDepth?: number,\n        private readonly suggestedOnly = false,\n    ) {}\n\n    public get noSupport(): boolean {\n        return !!this.serverSupportError;\n    }\n\n    public get canLoadMore(): boolean {\n        return !!this.serverSupportError || !!this.nextBatch || !this._rooms;\n    }\n\n    public get loading(): boolean {\n        return !!this.loadRequest;\n    }\n\n    public get rooms(): IHierarchyRoom[] | undefined {\n        return this._rooms;\n    }\n\n    public async load(pageSize = this.pageSize): Promise<IHierarchyRoom[]> {\n        if (this.loadRequest) return this.loadRequest.then((r) => r.rooms);\n\n        this.loadRequest = this.root.client.getRoomHierarchy(\n            this.root.roomId,\n            pageSize,\n            this.maxDepth,\n            this.suggestedOnly,\n            this.nextBatch,\n        );\n\n        let rooms: IHierarchyRoom[];\n        try {\n            ({ rooms, next_batch: this.nextBatch } = await this.loadRequest);\n        } catch (e) {\n            if ((<MatrixError>e).errcode === \"M_UNRECOGNIZED\") {\n                this.serverSupportError = <MatrixError>e;\n            } else {\n                throw e;\n            }\n\n            return [];\n        } finally {\n            this.loadRequest = undefined;\n        }\n\n        if (this._rooms) {\n            this._rooms = this._rooms.concat(rooms);\n        } else {\n            this._rooms = rooms;\n        }\n\n        rooms.forEach((room) => {\n            this.roomMap.set(room.room_id, room);\n\n            room.children_state.forEach((ev) => {\n                if (ev.type !== EventType.SpaceChild) return;\n                const childRoomId = ev.state_key;\n\n                // track backrefs for quicker hierarchy navigation\n                if (!this.backRefs.has(childRoomId)) {\n                    this.backRefs.set(childRoomId, []);\n                }\n                this.backRefs.get(childRoomId)!.push(room.room_id);\n\n                // fill viaMap\n                if (Array.isArray(ev.content.via)) {\n                    if (!this.viaMap.has(childRoomId)) {\n                        this.viaMap.set(childRoomId, new Set());\n                    }\n                    const vias = this.viaMap.get(childRoomId)!;\n                    ev.content.via.forEach((via) => vias.add(via));\n                }\n            });\n        });\n\n        return rooms;\n    }\n\n    public getRelation(parentId: string, childId: string): IHierarchyRelation | undefined {\n        return this.roomMap.get(parentId)?.children_state.find((e) => e.state_key === childId);\n    }\n\n    public isSuggested(parentId: string, childId: string): boolean | undefined {\n        return this.getRelation(parentId, childId)?.content.suggested;\n    }\n\n    // locally remove a relation as a form of local echo\n    public removeRelation(parentId: string, childId: string): void {\n        const backRefs = this.backRefs.get(childId);\n        if (backRefs?.length === 1) {\n            this.backRefs.delete(childId);\n        } else if (backRefs?.length) {\n            this.backRefs.set(\n                childId,\n                backRefs.filter((ref) => ref !== parentId),\n            );\n        }\n\n        const room = this.roomMap.get(parentId);\n        if (room) {\n            room.children_state = room.children_state.filter((ev) => ev.state_key !== childId);\n        }\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"room-hierarchy.js","names":[],"sources":["../src/room-hierarchy.ts"],"sourcesContent":["/*\nCopyright 2021 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 Room } from \"./models/room.ts\";\nimport { type IHierarchyRoom, type IHierarchyRelation } from \"./@types/spaces.ts\";\nimport { type MatrixClient } from \"./client.ts\";\nimport { EventType } from \"./@types/event.ts\";\nimport { type MatrixError } from \"./http-api/index.ts\";\n\nexport class RoomHierarchy {\n    // Map from room id to list of servers which are listed as a via somewhere in the loaded hierarchy\n    public readonly viaMap = new Map<string, Set<string>>();\n    // Map from room id to list of rooms which claim this room as their child\n    public readonly backRefs = new Map<string, string[]>();\n    // Map from room id to object\n    public readonly roomMap = new Map<string, IHierarchyRoom>();\n    private loadRequest?: ReturnType<MatrixClient[\"getRoomHierarchy\"]>;\n    private nextBatch?: string;\n    private _rooms?: IHierarchyRoom[];\n    private serverSupportError?: Error;\n\n    /**\n     * Construct a new RoomHierarchy\n     *\n     * A RoomHierarchy instance allows you to easily make use of the /hierarchy API and paginate it.\n     *\n     * @param root - the root of this hierarchy\n     * @param pageSize - the maximum number of rooms to return per page, can be overridden per load request.\n     * @param maxDepth - the maximum depth to traverse the hierarchy to\n     * @param suggestedOnly - whether to only return rooms with suggested=true.\n     */\n    public constructor(\n        public readonly root: Room,\n        private readonly pageSize?: number,\n        private readonly maxDepth?: number,\n        private readonly suggestedOnly = false,\n    ) {}\n\n    public get noSupport(): boolean {\n        return !!this.serverSupportError;\n    }\n\n    public get canLoadMore(): boolean {\n        return !!this.serverSupportError || !!this.nextBatch || !this._rooms;\n    }\n\n    public get loading(): boolean {\n        return !!this.loadRequest;\n    }\n\n    public get rooms(): IHierarchyRoom[] | undefined {\n        return this._rooms;\n    }\n\n    public async load(pageSize = this.pageSize): Promise<IHierarchyRoom[]> {\n        if (this.loadRequest) return this.loadRequest.then((r) => r.rooms);\n\n        this.loadRequest = this.root.client.getRoomHierarchy(\n            this.root.roomId,\n            pageSize,\n            this.maxDepth,\n            this.suggestedOnly,\n            this.nextBatch,\n        );\n\n        let rooms: IHierarchyRoom[];\n        try {\n            ({ rooms, next_batch: this.nextBatch } = await this.loadRequest);\n        } catch (e) {\n            if ((<MatrixError>e).errcode === \"M_UNRECOGNIZED\") {\n                this.serverSupportError = <MatrixError>e;\n            } else {\n                throw e;\n            }\n\n            return [];\n        } finally {\n            this.loadRequest = undefined;\n        }\n\n        if (this._rooms) {\n            this._rooms = this._rooms.concat(rooms);\n        } else {\n            this._rooms = rooms;\n        }\n\n        rooms.forEach((room) => {\n            this.roomMap.set(room.room_id, room);\n\n            room.children_state.forEach((ev) => {\n                if (ev.type !== EventType.SpaceChild) return;\n                const childRoomId = ev.state_key;\n\n                // track backrefs for quicker hierarchy navigation\n                if (!this.backRefs.has(childRoomId)) {\n                    this.backRefs.set(childRoomId, []);\n                }\n                this.backRefs.get(childRoomId)!.push(room.room_id);\n\n                // fill viaMap\n                if (Array.isArray(ev.content.via)) {\n                    if (!this.viaMap.has(childRoomId)) {\n                        this.viaMap.set(childRoomId, new Set());\n                    }\n                    const vias = this.viaMap.get(childRoomId)!;\n                    ev.content.via.forEach((via) => vias.add(via));\n                }\n            });\n        });\n\n        return rooms;\n    }\n\n    public getRelation(parentId: string, childId: string): IHierarchyRelation | undefined {\n        return this.roomMap.get(parentId)?.children_state.find((e) => e.state_key === childId);\n    }\n\n    public isSuggested(parentId: string, childId: string): boolean | undefined {\n        return this.getRelation(parentId, childId)?.content.suggested;\n    }\n\n    // locally remove a relation as a form of local echo\n    public removeRelation(parentId: string, childId: string): void {\n        const backRefs = this.backRefs.get(childId);\n        if (backRefs?.length === 1) {\n            this.backRefs.delete(childId);\n        } else if (backRefs?.length) {\n            this.backRefs.set(\n                childId,\n                backRefs.filter((ref) => ref !== parentId),\n            );\n        }\n\n        const room = this.roomMap.get(parentId);\n        if (room) {\n            room.children_state = room.children_state.filter((ev) => ev.state_key !== childId);\n        }\n    }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/rust-crypto/CrossSigningIdentity.js

@@ -1,4 +1,3 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 /*
 Copyright 2023 The Matrix.org Foundation C.I.C.
 
@@ -30,72 +29,69 @@ export class CrossSigningIdentity {
   /**
    * 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();
+  async bootstrapCrossSigning(opts) {
+    if (opts.setupNewCrossSigning) {
+      await this.resetCrossSigning(opts.authUploadDeviceSigningKeys);
+      return;
+    }
+    const olmDeviceStatus = await 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;
+    // Try to fetch cross signing keys from the secret storage
+    const masterKeyFromSecretStorage = await this.secretStorage.get("m.cross_signing.master");
+    const selfSigningKeyFromSecretStorage = await this.secretStorage.get("m.cross_signing.self_signing");
+    const userSigningKeyFromSecretStorage = await this.secretStorage.get("m.cross_signing.user_signing");
+    const privateKeysInSecretStorage = Boolean(masterKeyFromSecretStorage && selfSigningKeyFromSecretStorage && userSigningKeyFromSecretStorage);
+    const olmDeviceHasKeys = olmDeviceStatus.hasMaster && olmDeviceStatus.hasUserSigning && olmDeviceStatus.hasSelfSigning;
 
-      // Log all relevant state for easier parsing of debug logs.
-      _this.logger.debug("bootstrapCrossSigning: starting", {
-        setupNewCrossSigning: opts.setupNewCrossSigning,
-        olmDeviceHasMaster: olmDeviceStatus.hasMaster,
-        olmDeviceHasUserSigning: olmDeviceStatus.hasUserSigning,
-        olmDeviceHasSelfSigning: olmDeviceStatus.hasSelfSigning,
-        privateKeysInSecretStorage
-      });
-      if (olmDeviceHasKeys) {
-        if (!(yield _this.secretStorage.hasKey())) {
-          _this.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
-          _this.logger.debug("bootstrapCrossSigning: Olm device has private keys: exporting to secret storage");
-          yield _this.exportCrossSigningKeysToStorage();
-        } else {
-          _this.logger.debug("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
-          _this.logger.debug("bootstrapCrossSigning: Cross-signing private keys not found locally, but they are available " + "in secret storage, reading storage and caching locally");
-          var status = yield _this.olmMachine.importCrossSigningKeys(masterKeyFromSecretStorage, selfSigningKeyFromSecretStorage, userSigningKeyFromSecretStorage);
+    // Log all relevant state for easier parsing of debug logs.
+    this.logger.debug("bootstrapCrossSigning: starting", {
+      setupNewCrossSigning: opts.setupNewCrossSigning,
+      olmDeviceHasMaster: olmDeviceStatus.hasMaster,
+      olmDeviceHasUserSigning: olmDeviceStatus.hasUserSigning,
+      olmDeviceHasSelfSigning: olmDeviceStatus.hasSelfSigning,
+      privateKeysInSecretStorage
+    });
+    if (olmDeviceHasKeys) {
+      if (!(await this.secretStorage.hasKey())) {
+        this.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
+        this.logger.debug("bootstrapCrossSigning: Olm device has private keys: exporting to secret storage");
+        await this.exportCrossSigningKeysToStorage();
+      } else {
+        this.logger.debug("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
+        this.logger.debug("bootstrapCrossSigning: Cross-signing private keys not found locally, but they are available " + "in secret storage, reading storage and caching locally");
+        const status = await this.olmMachine.importCrossSigningKeys(masterKeyFromSecretStorage, selfSigningKeyFromSecretStorage, userSigningKeyFromSecretStorage);
 
-          // Check that `importCrossSigningKeys` worked correctly (for example, it will fail silently if the
-          // public keys are not available).
-          if (!status.hasMaster || !status.hasSelfSigning || !status.hasUserSigning) {
-            throw new Error("importCrossSigningKeys failed to import the keys");
-          }
+        // Check that `importCrossSigningKeys` worked correctly (for example, it will fail silently if the
+        // public keys are not available).
+        if (!status.hasMaster || !status.hasSelfSigning || !status.hasUserSigning) {
+          throw new Error("importCrossSigningKeys failed to import the keys");
+        }
 
-          // 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 {
-          _this.logger.debug("bootstrapCrossSigning: Cross-signing private keys not found locally or in secret storage, creating new keys");
-          yield _this.resetCrossSigning(opts.authUploadDeviceSigningKeys);
+        // Get the current device
+        const device = await this.olmMachine.getDevice(this.olmMachine.userId, this.olmMachine.deviceId);
+        try {
+          // Sign the device with our cross-signing key and upload the signature
+          const request = await device.verify();
+          await this.outgoingRequestProcessor.makeOutgoingRequest(request);
+        } finally {
+          device.free();
         }
+      } else {
+        this.logger.debug("bootstrapCrossSigning: Cross-signing private keys not found locally or in secret storage, creating new keys");
+        await 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?
-      _this.logger.debug("bootstrapCrossSigning: complete");
-    })();
+    // 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?
+    this.logger.debug("bootstrapCrossSigning: complete");
   }
 
   /** Reset our cross-signing keys
@@ -105,31 +101,28 @@ export class CrossSigningIdentity {
    *   * 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);
+  async resetCrossSigning(authUploadDeviceSigningKeys) {
+    // 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.
+    const outgoingRequests = await this.olmMachine.bootstrapCrossSigning(true);
 
-      // If 4S is configured we need to update it.
-      if (!(yield _this2.secretStorage.hasKey())) {
-        _this2.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.
-        _this2.logger.debug("resetCrossSigning: exporting private keys to secret storage");
-        yield _this2.exportCrossSigningKeysToStorage();
+    // If 4S is configured we need to update it.
+    if (!(await this.secretStorage.hasKey())) {
+      this.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.
+      this.logger.debug("resetCrossSigning: exporting private keys to secret storage");
+      await this.exportCrossSigningKeysToStorage();
+    }
+    this.logger.debug("resetCrossSigning: publishing public keys to server");
+    for (const req of [outgoingRequests.uploadKeysRequest, outgoingRequests.uploadSigningKeysRequest, outgoingRequests.uploadSignaturesRequest]) {
+      if (req) {
+        await this.outgoingRequestProcessor.makeOutgoingRequest(req, authUploadDeviceSigningKeys);
       }
-      _this2.logger.debug("resetCrossSigning: publishing public keys to server");
-      for (var req of [outgoingRequests.uploadKeysRequest, outgoingRequests.uploadSigningKeysRequest, outgoingRequests.uploadSignaturesRequest]) {
-        if (req) {
-          yield _this2.outgoingRequestProcessor.makeOutgoingRequest(req, authUploadDeviceSigningKeys);
-        }
-      }
-    })();
+    }
   }
 
   /**
@@ -137,27 +130,24 @@ export class CrossSigningIdentity {
    *
    * (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 {
-        _this3.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 {
-        _this3.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 {
-        _this3.logger.error("Cannot export USK to secret storage, private key unknown");
-      }
-    })();
+  async exportCrossSigningKeysToStorage() {
+    const exported = await this.olmMachine.exportCrossSigningKeys();
+    /* istanbul ignore else (this function is only called when we know the olm machine has keys) */
+    if (exported?.masterKey) {
+      await this.secretStorage.store("m.cross_signing.master", exported.masterKey);
+    } else {
+      this.logger.error(`Cannot export MSK to secret storage, private key unknown`);
+    }
+    if (exported?.self_signing_key) {
+      await this.secretStorage.store("m.cross_signing.self_signing", exported.self_signing_key);
+    } else {
+      this.logger.error(`Cannot export SSK to secret storage, private key unknown`);
+    }
+    if (exported?.userSigningKey) {
+      await this.secretStorage.store("m.cross_signing.user_signing", exported.userSigningKey);
+    } else {
+      this.logger.error(`Cannot export USK to secret storage, private key unknown`);
+    }
   }
 }
 //# sourceMappingURL=CrossSigningIdentity.js.map