@textrp/briij-js-sdk 41.0.1 → 43.0.0

package/lib/rust-crypto/OutgoingRequestsManager.js

@@ -1,26 +1,26 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-/*
-Copyright 2023 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+/*
+Copyright 2023 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import { logDuration } from "../utils.js";
 
-/**
- * OutgoingRequestsManager: responsible for processing outgoing requests from the OlmMachine.
- * Ensure that only one loop is going on at once, and that the requests are processed in order.
+/**
+ * OutgoingRequestsManager: responsible for processing outgoing requests from the OlmMachine.
+ * Ensure that only one loop is going on at once, and that the requests are processed in order.
  */
 export class OutgoingRequestsManager {
   constructor(logger, olmMachine, outgoingRequestProcessor) {
@@ -31,33 +31,33 @@ export class OutgoingRequestsManager {
     _defineProperty(this, "stopped", false);
     /** whether {@link outgoingRequestLoop} is currently running */
     _defineProperty(this, "outgoingRequestLoopRunning", false);
-    /**
-     * If there are additional calls to doProcessOutgoingRequests() while there is a current call running
-     * we need to remember in order to call `doProcessOutgoingRequests` again (as there could be new requests).
-     *
-     * If this is defined, it is an indication that we need to do another iteration; in this case the deferred
-     * will resolve once that next iteration completes. If it is undefined, there have been no new calls
-     * to `doProcessOutgoingRequests` since the current iteration started.
+    /**
+     * If there are additional calls to doProcessOutgoingRequests() while there is a current call running
+     * we need to remember in order to call `doProcessOutgoingRequests` again (as there could be new requests).
+     *
+     * If this is defined, it is an indication that we need to do another iteration; in this case the deferred
+     * will resolve once that next iteration completes. If it is undefined, there have been no new calls
+     * to `doProcessOutgoingRequests` since the current iteration started.
      */
     _defineProperty(this, "nextLoopDeferred", void 0);
   }
 
-  /**
-   * Shut down as soon as possible the current loop of outgoing requests processing.
+  /**
+   * Shut down as soon as possible the current loop of outgoing requests processing.
    */
   stop() {
     this.stopped = true;
   }
 
-  /**
-   * Process the OutgoingRequests from the OlmMachine.
-   *
-   * This should be called at the end of each sync, to process any OlmMachine OutgoingRequests created by the rust sdk.
-   * In some cases if OutgoingRequests need to be sent immediately, this can be called directly.
-   *
-   * Calls to doProcessOutgoingRequests() are processed synchronously, one after the other, in order.
-   * If doProcessOutgoingRequests() is called while another call is still being processed, it will be queued.
-   * Multiple calls to doProcessOutgoingRequests() when a call is already processing will be batched together.
+  /**
+   * Process the OutgoingRequests from the OlmMachine.
+   *
+   * This should be called at the end of each sync, to process any OlmMachine OutgoingRequests created by the rust sdk.
+   * In some cases if OutgoingRequests need to be sent immediately, this can be called directly.
+   *
+   * Calls to doProcessOutgoingRequests() are processed synchronously, one after the other, in order.
+   * If doProcessOutgoingRequests() is called while another call is still being processed, it will be queued.
+   * Multiple calls to doProcessOutgoingRequests() when a call is already processing will be batched together.
    */
   doProcessOutgoingRequests() {
     // Flag that we need at least one more iteration of the loop.
@@ -115,8 +115,8 @@ export class OutgoingRequestsManager {
     })();
   }
 
-  /**
-   * Make a single request to `olmMachine.outgoingRequests` and do the corresponding requests.
+  /**
+   * Make a single request to `olmMachine.outgoingRequests` and do the corresponding requests.
    */
   processOutgoingRequests() {
     var _this2 = this;

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

@@ -1 +1 @@
-{"version":3,"file":"OutgoingRequestsManager.js","names":["logDuration","OutgoingRequestsManager","constructor","logger","olmMachine","outgoingRequestProcessor","_defineProperty","stop","stopped","doProcessOutgoingRequests","nextLoopDeferred","Promise","withResolvers","result","promise","outgoingRequestLoopRunning","outgoingRequestLoop","catch","e","error","_this","_asyncToGenerator","Error","loopTickResolvers","undefined","processOutgoingRequests","then","resolve","reject","_this2","outgoingRequests","successes","_loop","request","v","concat","type","makeOutgoingRequest","_ret","warn"],"sources":["../../src/rust-crypto/OutgoingRequestsManager.ts"],"sourcesContent":["/*\r\nCopyright 2023 The Matrix.org Foundation C.I.C.\r\n\r\nLicensed under the Apache License, Version 2.0 (the \"License\");\r\nyou may not use this file except in compliance with the License.\r\nYou may obtain a copy of the License at\r\n\r\n    http://www.apache.org/licenses/LICENSE-2.0\r\n\r\nUnless required by applicable law or agreed to in writing, software\r\ndistributed under the License is distributed on an \"AS IS\" BASIS,\r\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\nSee the License for the specific language governing permissions and\r\nlimitations under the License.\r\n*/\r\n\r\nimport { type OlmMachine, type OutgoingRequest } from \"@matrix-org/matrix-sdk-crypto-wasm\";\r\n\r\nimport { type OutgoingRequestProcessor } from \"./OutgoingRequestProcessor.ts\";\r\nimport { type Logger } from \"../logger.ts\";\r\nimport { logDuration } from \"../utils.ts\";\r\n\r\n/**\r\n * OutgoingRequestsManager: responsible for processing outgoing requests from the OlmMachine.\r\n * Ensure that only one loop is going on at once, and that the requests are processed in order.\r\n */\r\nexport class OutgoingRequestsManager {\r\n    /** whether {@link stop} has been called */\r\n    private stopped = false;\r\n\r\n    /** whether {@link outgoingRequestLoop} is currently running */\r\n    private outgoingRequestLoopRunning = false;\r\n\r\n    /**\r\n     * If there are additional calls to doProcessOutgoingRequests() while there is a current call running\r\n     * we need to remember in order to call `doProcessOutgoingRequests` again (as there could be new requests).\r\n     *\r\n     * If this is defined, it is an indication that we need to do another iteration; in this case the deferred\r\n     * will resolve once that next iteration completes. If it is undefined, there have been no new calls\r\n     * to `doProcessOutgoingRequests` since the current iteration started.\r\n     */\r\n    private nextLoopDeferred?: PromiseWithResolvers<void>;\r\n\r\n    public constructor(\r\n        private readonly logger: Logger,\r\n        private readonly olmMachine: OlmMachine,\r\n        public readonly outgoingRequestProcessor: OutgoingRequestProcessor,\r\n    ) {}\r\n\r\n    /**\r\n     * Shut down as soon as possible the current loop of outgoing requests processing.\r\n     */\r\n    public stop(): void {\r\n        this.stopped = true;\r\n    }\r\n\r\n    /**\r\n     * Process the OutgoingRequests from the OlmMachine.\r\n     *\r\n     * This should be called at the end of each sync, to process any OlmMachine OutgoingRequests created by the rust sdk.\r\n     * In some cases if OutgoingRequests need to be sent immediately, this can be called directly.\r\n     *\r\n     * Calls to doProcessOutgoingRequests() are processed synchronously, one after the other, in order.\r\n     * If doProcessOutgoingRequests() is called while another call is still being processed, it will be queued.\r\n     * Multiple calls to doProcessOutgoingRequests() when a call is already processing will be batched together.\r\n     */\r\n    public doProcessOutgoingRequests(): Promise<void> {\r\n        // Flag that we need at least one more iteration of the loop.\r\n        //\r\n        // It is important that we do this even if the loop is currently running. There is potential for a race whereby\r\n        // a request is added to the queue *after* `OlmMachine.outgoingRequests` checks the queue, but *before* it\r\n        // returns. In such a case, the item could sit there unnoticed for some time.\r\n        //\r\n        // In order to circumvent the race, we set a flag which tells the loop to go round once again even if the\r\n        // queue appears to be empty.\r\n        if (!this.nextLoopDeferred) {\r\n            this.nextLoopDeferred = Promise.withResolvers();\r\n        }\r\n\r\n        // ... and wait for it to complete.\r\n        const result = this.nextLoopDeferred.promise;\r\n\r\n        // set the loop going if it is not already.\r\n        if (!this.outgoingRequestLoopRunning) {\r\n            this.outgoingRequestLoop().catch((e) => {\r\n                // this should not happen; outgoingRequestLoop should return any errors via `nextLoopDeferred`.\r\n                /* istanbul ignore next */\r\n                this.logger.error(\"Uncaught error in outgoing request loop\", e);\r\n            });\r\n        }\r\n        return result;\r\n    }\r\n\r\n    private async outgoingRequestLoop(): Promise<void> {\r\n        /* istanbul ignore if */\r\n        if (this.outgoingRequestLoopRunning) {\r\n            throw new Error(\"Cannot run two outgoing request loops\");\r\n        }\r\n        this.outgoingRequestLoopRunning = true;\r\n        try {\r\n            while (!this.stopped && this.nextLoopDeferred) {\r\n                const loopTickResolvers = this.nextLoopDeferred;\r\n\r\n                // reset `nextLoopDeferred` so that any future calls to `doProcessOutgoingRequests` are queued\r\n                // for another additional iteration.\r\n                this.nextLoopDeferred = undefined;\r\n\r\n                // make the requests and feed the results back to the `nextLoopDeferred`\r\n                await this.processOutgoingRequests().then(loopTickResolvers.resolve, loopTickResolvers.reject);\r\n            }\r\n        } finally {\r\n            this.outgoingRequestLoopRunning = false;\r\n        }\r\n\r\n        if (this.nextLoopDeferred) {\r\n            // the loop was stopped, but there was a call to `doProcessOutgoingRequests`. Make sure that\r\n            // we reject the promise in case anything is waiting for it.\r\n            this.nextLoopDeferred.reject(new Error(\"OutgoingRequestsManager was stopped\"));\r\n        }\r\n    }\r\n\r\n    /**\r\n     * Make a single request to `olmMachine.outgoingRequests` and do the corresponding requests.\r\n     */\r\n    private async processOutgoingRequests(): Promise<void> {\r\n        if (this.stopped) return;\r\n\r\n        const outgoingRequests: OutgoingRequest[] = await this.olmMachine.outgoingRequests();\r\n\r\n        let successes = 0;\r\n        for (const request of outgoingRequests) {\r\n            if (this.stopped) return;\r\n            try {\r\n                await logDuration(this.logger, `Make outgoing request ${request.type}`, async () => {\r\n                    await this.outgoingRequestProcessor.makeOutgoingRequest(request);\r\n                    successes++;\r\n                });\r\n            } catch (e) {\r\n                // as part of the loop we silently ignore errors, but log them.\r\n                // The rust sdk will retry the request later as it won't have been marked as sent.\r\n                this.logger.error(`Failed to process outgoing request ${request.type}: ${e}`);\r\n            }\r\n        }\r\n\r\n        // If we successfully handled any requests this time, more may have been queued as\r\n        // part of that handling.\r\n        //\r\n        // For example, we may have processed a `/keys/claim` request, which\r\n        // meant the rust side could establish an Olm session and is now ready to\r\n        // send out an `m.secret.send` message.\r\n        // (See https://github.com/element-hq/element-web/issues/30988.)\r\n        //\r\n        // So, if we have successfully processed any requests, flag that we need to make another\r\n        // pass around the outgoing-requests loop, to make sure we handle any\r\n        // pending requests immediately.\r\n        //\r\n        // If all requests failed (or there weren't any) we don't want to retry them in a tight\r\n        // loop. They will be retried after the next sync.\r\n        // (See https://github.com/element-hq/element-web/issues/31790.)\r\n        if (successes > 0) {\r\n            // We call doProcessOutgoingRequests but since we expect that we are\r\n            // already processing outgoing requests, this call will not kick off\r\n            // the processing loop, but just set `nextLoopDeferred` and return,\r\n            // which will mean we loop one more time.\r\n            this.doProcessOutgoingRequests().catch((e) => {\r\n                this.logger.warn(\"processOutgoingRequests: Error re-checking outgoing requests\", e);\r\n            });\r\n        }\r\n    }\r\n}\r\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"OutgoingRequestsManager.js","names":["logDuration","OutgoingRequestsManager","constructor","logger","olmMachine","outgoingRequestProcessor","_defineProperty","stop","stopped","doProcessOutgoingRequests","nextLoopDeferred","Promise","withResolvers","result","promise","outgoingRequestLoopRunning","outgoingRequestLoop","catch","e","error","_this","_asyncToGenerator","Error","loopTickResolvers","undefined","processOutgoingRequests","then","resolve","reject","_this2","outgoingRequests","successes","_loop","request","v","concat","type","makeOutgoingRequest","_ret","warn"],"sources":["../../src/rust-crypto/OutgoingRequestsManager.ts"],"sourcesContent":["/*\nCopyright 2023 The Matrix.org Foundation C.I.C.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n*/\n\nimport { type OlmMachine, type OutgoingRequest } from \"@matrix-org/matrix-sdk-crypto-wasm\";\n\nimport { type OutgoingRequestProcessor } from \"./OutgoingRequestProcessor.ts\";\nimport { type Logger } from \"../logger.ts\";\nimport { logDuration } from \"../utils.ts\";\n\n/**\n * OutgoingRequestsManager: responsible for processing outgoing requests from the OlmMachine.\n * Ensure that only one loop is going on at once, and that the requests are processed in order.\n */\nexport class OutgoingRequestsManager {\n    /** whether {@link stop} has been called */\n    private stopped = false;\n\n    /** whether {@link outgoingRequestLoop} is currently running */\n    private outgoingRequestLoopRunning = false;\n\n    /**\n     * If there are additional calls to doProcessOutgoingRequests() while there is a current call running\n     * we need to remember in order to call `doProcessOutgoingRequests` again (as there could be new requests).\n     *\n     * If this is defined, it is an indication that we need to do another iteration; in this case the deferred\n     * will resolve once that next iteration completes. If it is undefined, there have been no new calls\n     * to `doProcessOutgoingRequests` since the current iteration started.\n     */\n    private nextLoopDeferred?: PromiseWithResolvers<void>;\n\n    public constructor(\n        private readonly logger: Logger,\n        private readonly olmMachine: OlmMachine,\n        public readonly outgoingRequestProcessor: OutgoingRequestProcessor,\n    ) {}\n\n    /**\n     * Shut down as soon as possible the current loop of outgoing requests processing.\n     */\n    public stop(): void {\n        this.stopped = true;\n    }\n\n    /**\n     * Process the OutgoingRequests from the OlmMachine.\n     *\n     * This should be called at the end of each sync, to process any OlmMachine OutgoingRequests created by the rust sdk.\n     * In some cases if OutgoingRequests need to be sent immediately, this can be called directly.\n     *\n     * Calls to doProcessOutgoingRequests() are processed synchronously, one after the other, in order.\n     * If doProcessOutgoingRequests() is called while another call is still being processed, it will be queued.\n     * Multiple calls to doProcessOutgoingRequests() when a call is already processing will be batched together.\n     */\n    public doProcessOutgoingRequests(): Promise<void> {\n        // Flag that we need at least one more iteration of the loop.\n        //\n        // It is important that we do this even if the loop is currently running. There is potential for a race whereby\n        // a request is added to the queue *after* `OlmMachine.outgoingRequests` checks the queue, but *before* it\n        // returns. In such a case, the item could sit there unnoticed for some time.\n        //\n        // In order to circumvent the race, we set a flag which tells the loop to go round once again even if the\n        // queue appears to be empty.\n        if (!this.nextLoopDeferred) {\n            this.nextLoopDeferred = Promise.withResolvers();\n        }\n\n        // ... and wait for it to complete.\n        const result = this.nextLoopDeferred.promise;\n\n        // set the loop going if it is not already.\n        if (!this.outgoingRequestLoopRunning) {\n            this.outgoingRequestLoop().catch((e) => {\n                // this should not happen; outgoingRequestLoop should return any errors via `nextLoopDeferred`.\n                /* istanbul ignore next */\n                this.logger.error(\"Uncaught error in outgoing request loop\", e);\n            });\n        }\n        return result;\n    }\n\n    private async outgoingRequestLoop(): Promise<void> {\n        /* istanbul ignore if */\n        if (this.outgoingRequestLoopRunning) {\n            throw new Error(\"Cannot run two outgoing request loops\");\n        }\n        this.outgoingRequestLoopRunning = true;\n        try {\n            while (!this.stopped && this.nextLoopDeferred) {\n                const loopTickResolvers = this.nextLoopDeferred;\n\n                // reset `nextLoopDeferred` so that any future calls to `doProcessOutgoingRequests` are queued\n                // for another additional iteration.\n                this.nextLoopDeferred = undefined;\n\n                // make the requests and feed the results back to the `nextLoopDeferred`\n                await this.processOutgoingRequests().then(loopTickResolvers.resolve, loopTickResolvers.reject);\n            }\n        } finally {\n            this.outgoingRequestLoopRunning = false;\n        }\n\n        if (this.nextLoopDeferred) {\n            // the loop was stopped, but there was a call to `doProcessOutgoingRequests`. Make sure that\n            // we reject the promise in case anything is waiting for it.\n            this.nextLoopDeferred.reject(new Error(\"OutgoingRequestsManager was stopped\"));\n        }\n    }\n\n    /**\n     * Make a single request to `olmMachine.outgoingRequests` and do the corresponding requests.\n     */\n    private async processOutgoingRequests(): Promise<void> {\n        if (this.stopped) return;\n\n        const outgoingRequests: OutgoingRequest[] = await this.olmMachine.outgoingRequests();\n\n        let successes = 0;\n        for (const request of outgoingRequests) {\n            if (this.stopped) return;\n            try {\n                await logDuration(this.logger, `Make outgoing request ${request.type}`, async () => {\n                    await this.outgoingRequestProcessor.makeOutgoingRequest(request);\n                    successes++;\n                });\n            } catch (e) {\n                // as part of the loop we silently ignore errors, but log them.\n                // The rust sdk will retry the request later as it won't have been marked as sent.\n                this.logger.error(`Failed to process outgoing request ${request.type}: ${e}`);\n            }\n        }\n\n        // If we successfully handled any requests this time, more may have been queued as\n        // part of that handling.\n        //\n        // For example, we may have processed a `/keys/claim` request, which\n        // meant the rust side could establish an Olm session and is now ready to\n        // send out an `m.secret.send` message.\n        // (See https://github.com/element-hq/element-web/issues/30988.)\n        //\n        // So, if we have successfully processed any requests, flag that we need to make another\n        // pass around the outgoing-requests loop, to make sure we handle any\n        // pending requests immediately.\n        //\n        // If all requests failed (or there weren't any) we don't want to retry them in a tight\n        // loop. They will be retried after the next sync.\n        // (See https://github.com/element-hq/element-web/issues/31790.)\n        if (successes > 0) {\n            // We call doProcessOutgoingRequests but since we expect that we are\n            // already processing outgoing requests, this call will not kick off\n            // the processing loop, but just set `nextLoopDeferred` and return,\n            // which will mean we loop one more time.\n            this.doProcessOutgoingRequests().catch((e) => {\n                this.logger.warn(\"processOutgoingRequests: Error re-checking outgoing requests\", e);\n            });\n        }\n    }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/rust-crypto/device-converter.js

@@ -1,27 +1,27 @@
-/*
-Copyright 2023 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+/*
+Copyright 2023 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import * as RustSdkCryptoJs from "@matrix-org/matrix-sdk-crypto-wasm";
 import { Device, DeviceVerification } from "../models/device.js";
-/**
- * Convert a {@link RustSdkCryptoJs.Device} to a {@link Device}
- * @param device - Rust Sdk device
- * @param userId - owner of the device
- *
- * @internal
+/**
+ * Convert a {@link RustSdkCryptoJs.Device} to a {@link Device}
+ * @param device - Rust Sdk device
+ * @param userId - owner of the device
+ *
+ * @internal
  */
 export function rustDeviceToJsDevice(device, userId) {
   // Copy rust device keys to Device.keys
@@ -79,11 +79,11 @@ export function rustDeviceToJsDevice(device, userId) {
   });
 }
 
-/**
- * Convert {@link DeviceKeys}  from `/keys/query` request to a `Map<string, Device>`
- * @param deviceKeys - Device keys object to convert
- *
- * @internal
+/**
+ * Convert {@link DeviceKeys}  from `/keys/query` request to a `Map<string, Device>`
+ * @param deviceKeys - Device keys object to convert
+ *
+ * @internal
  */
 export function deviceKeysToDeviceMap(deviceKeys) {
   return new Map(Object.entries(deviceKeys).map(_ref => {
@@ -94,11 +94,11 @@ export function deviceKeysToDeviceMap(deviceKeys) {
 
 // Device from `/keys/query` request
 
-/**
- * Convert `/keys/query` {@link QueryDevice} device to {@link Device}
- * @param device - Device from `/keys/query` request
- *
- * @internal
+/**
+ * Convert `/keys/query` {@link QueryDevice} device to {@link Device}
+ * @param device - Device from `/keys/query` request
+ *
+ * @internal
  */
 export function downloadDeviceToJsDevice(device) {
   var _device$unsigned;

package/lib/rust-crypto/device-converter.js.map

@@ -1 +1 @@
-{"version":3,"file":"device-converter.js","names":["RustSdkCryptoJs","Device","DeviceVerification","rustDeviceToJsDevice","device","userId","keys","Map","keyId","key","entries","set","toString","toBase64","verified","Unverified","isBlacklisted","Blocked","isVerified","Verified","signatures","mayBeSignatureMap","get","convertedSignatures","value","isValid","signature","rustAlgorithms","algorithms","Set","forEach","algorithm","EncryptionAlgorithm","MegolmV1AesSha2","add","OlmV1Curve25519AesSha2","deviceId","Array","from","displayName","dehydrated","isDehydrated","deviceKeysToDeviceMap","deviceKeys","Object","map","_ref","downloadDeviceToJsDevice","_device$unsigned","unsigned","device_display_name","device_id","user_id"],"sources":["../../src/rust-crypto/device-converter.ts"],"sourcesContent":["/*\r\nCopyright 2023 The Matrix.org Foundation C.I.C.\r\n\r\nLicensed under the Apache License, Version 2.0 (the \"License\");\r\nyou may not use this file except in compliance with the License.\r\nYou may obtain a copy of the License at\r\n\r\n    http://www.apache.org/licenses/LICENSE-2.0\r\n\r\nUnless required by applicable law or agreed to in writing, software\r\ndistributed under the License is distributed on an \"AS IS\" BASIS,\r\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\nSee the License for the specific language governing permissions and\r\nlimitations under the License.\r\n*/\r\n\r\nimport * as RustSdkCryptoJs from \"@matrix-org/matrix-sdk-crypto-wasm\";\r\n\r\nimport { Device, DeviceVerification } from \"../models/device.ts\";\r\nimport { type DeviceKeys } from \"../client.ts\";\r\n\r\n/**\r\n * Convert a {@link RustSdkCryptoJs.Device} to a {@link Device}\r\n * @param device - Rust Sdk device\r\n * @param userId - owner of the device\r\n *\r\n * @internal\r\n */\r\nexport function rustDeviceToJsDevice(device: RustSdkCryptoJs.Device, userId: RustSdkCryptoJs.UserId): Device {\r\n    // Copy rust device keys to Device.keys\r\n    const keys = new Map<string, string>();\r\n    for (const [keyId, key] of device.keys.entries()) {\r\n        keys.set(keyId.toString(), key.toBase64());\r\n    }\r\n\r\n    // Compute verified from device state\r\n    let verified: DeviceVerification = DeviceVerification.Unverified;\r\n    if (device.isBlacklisted()) {\r\n        verified = DeviceVerification.Blocked;\r\n    } else if (device.isVerified()) {\r\n        verified = DeviceVerification.Verified;\r\n    }\r\n\r\n    // Convert rust signatures to Device.signatures\r\n    const signatures = new Map<string, Map<string, string>>();\r\n    const mayBeSignatureMap: Map<string, RustSdkCryptoJs.MaybeSignature> | undefined = device.signatures.get(userId);\r\n    if (mayBeSignatureMap) {\r\n        const convertedSignatures = new Map<string, string>();\r\n        // Convert maybeSignatures map to a Map<string, string>\r\n        for (const [key, value] of mayBeSignatureMap.entries()) {\r\n            if (value.isValid() && value.signature) {\r\n                convertedSignatures.set(key, value.signature.toBase64());\r\n            }\r\n        }\r\n\r\n        signatures.set(userId.toString(), convertedSignatures);\r\n    }\r\n\r\n    // Convert rust algorithms to algorithms\r\n    const rustAlgorithms: RustSdkCryptoJs.EncryptionAlgorithm[] = device.algorithms;\r\n    // Use set to ensure that algorithms are not duplicated\r\n    const algorithms = new Set<string>();\r\n    rustAlgorithms.forEach((algorithm) => {\r\n        switch (algorithm) {\r\n            case RustSdkCryptoJs.EncryptionAlgorithm.MegolmV1AesSha2:\r\n                algorithms.add(\"m.megolm.v1.aes-sha2\");\r\n                break;\r\n            case RustSdkCryptoJs.EncryptionAlgorithm.OlmV1Curve25519AesSha2:\r\n            default:\r\n                algorithms.add(\"m.olm.v1.curve25519-aes-sha2\");\r\n                break;\r\n        }\r\n    });\r\n\r\n    return new Device({\r\n        deviceId: device.deviceId.toString(),\r\n        userId: userId.toString(),\r\n        keys,\r\n        algorithms: Array.from(algorithms),\r\n        verified,\r\n        signatures,\r\n        displayName: device.displayName,\r\n        dehydrated: device.isDehydrated,\r\n    });\r\n}\r\n\r\n/**\r\n * Convert {@link DeviceKeys}  from `/keys/query` request to a `Map<string, Device>`\r\n * @param deviceKeys - Device keys object to convert\r\n *\r\n * @internal\r\n */\r\nexport function deviceKeysToDeviceMap(deviceKeys: DeviceKeys): Map<string, Device> {\r\n    return new Map(\r\n        Object.entries(deviceKeys).map(([deviceId, device]) => [deviceId, downloadDeviceToJsDevice(device)]),\r\n    );\r\n}\r\n\r\n// Device from `/keys/query` request\r\ntype QueryDevice = DeviceKeys[keyof DeviceKeys];\r\n\r\n/**\r\n * Convert `/keys/query` {@link QueryDevice} device to {@link Device}\r\n * @param device - Device from `/keys/query` request\r\n *\r\n * @internal\r\n */\r\nexport function downloadDeviceToJsDevice(device: QueryDevice): Device {\r\n    const keys = new Map(Object.entries(device.keys));\r\n    const displayName = device.unsigned?.device_display_name;\r\n\r\n    const signatures = new Map<string, Map<string, string>>();\r\n    if (device.signatures) {\r\n        for (const userId in device.signatures) {\r\n            signatures.set(userId, new Map(Object.entries(device.signatures[userId])));\r\n        }\r\n    }\r\n\r\n    return new Device({\r\n        deviceId: device.device_id,\r\n        userId: device.user_id,\r\n        keys,\r\n        algorithms: device.algorithms,\r\n        verified: DeviceVerification.Unverified,\r\n        signatures,\r\n        displayName,\r\n    });\r\n}\r\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"device-converter.js","names":["RustSdkCryptoJs","Device","DeviceVerification","rustDeviceToJsDevice","device","userId","keys","Map","keyId","key","entries","set","toString","toBase64","verified","Unverified","isBlacklisted","Blocked","isVerified","Verified","signatures","mayBeSignatureMap","get","convertedSignatures","value","isValid","signature","rustAlgorithms","algorithms","Set","forEach","algorithm","EncryptionAlgorithm","MegolmV1AesSha2","add","OlmV1Curve25519AesSha2","deviceId","Array","from","displayName","dehydrated","isDehydrated","deviceKeysToDeviceMap","deviceKeys","Object","map","_ref","downloadDeviceToJsDevice","_device$unsigned","unsigned","device_display_name","device_id","user_id"],"sources":["../../src/rust-crypto/device-converter.ts"],"sourcesContent":["/*\nCopyright 2023 The Matrix.org Foundation C.I.C.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n*/\n\nimport * as RustSdkCryptoJs from \"@matrix-org/matrix-sdk-crypto-wasm\";\n\nimport { Device, DeviceVerification } from \"../models/device.ts\";\nimport { type DeviceKeys } from \"../client.ts\";\n\n/**\n * Convert a {@link RustSdkCryptoJs.Device} to a {@link Device}\n * @param device - Rust Sdk device\n * @param userId - owner of the device\n *\n * @internal\n */\nexport function rustDeviceToJsDevice(device: RustSdkCryptoJs.Device, userId: RustSdkCryptoJs.UserId): Device {\n    // Copy rust device keys to Device.keys\n    const keys = new Map<string, string>();\n    for (const [keyId, key] of device.keys.entries()) {\n        keys.set(keyId.toString(), key.toBase64());\n    }\n\n    // Compute verified from device state\n    let verified: DeviceVerification = DeviceVerification.Unverified;\n    if (device.isBlacklisted()) {\n        verified = DeviceVerification.Blocked;\n    } else if (device.isVerified()) {\n        verified = DeviceVerification.Verified;\n    }\n\n    // Convert rust signatures to Device.signatures\n    const signatures = new Map<string, Map<string, string>>();\n    const mayBeSignatureMap: Map<string, RustSdkCryptoJs.MaybeSignature> | undefined = device.signatures.get(userId);\n    if (mayBeSignatureMap) {\n        const convertedSignatures = new Map<string, string>();\n        // Convert maybeSignatures map to a Map<string, string>\n        for (const [key, value] of mayBeSignatureMap.entries()) {\n            if (value.isValid() && value.signature) {\n                convertedSignatures.set(key, value.signature.toBase64());\n            }\n        }\n\n        signatures.set(userId.toString(), convertedSignatures);\n    }\n\n    // Convert rust algorithms to algorithms\n    const rustAlgorithms: RustSdkCryptoJs.EncryptionAlgorithm[] = device.algorithms;\n    // Use set to ensure that algorithms are not duplicated\n    const algorithms = new Set<string>();\n    rustAlgorithms.forEach((algorithm) => {\n        switch (algorithm) {\n            case RustSdkCryptoJs.EncryptionAlgorithm.MegolmV1AesSha2:\n                algorithms.add(\"m.megolm.v1.aes-sha2\");\n                break;\n            case RustSdkCryptoJs.EncryptionAlgorithm.OlmV1Curve25519AesSha2:\n            default:\n                algorithms.add(\"m.olm.v1.curve25519-aes-sha2\");\n                break;\n        }\n    });\n\n    return new Device({\n        deviceId: device.deviceId.toString(),\n        userId: userId.toString(),\n        keys,\n        algorithms: Array.from(algorithms),\n        verified,\n        signatures,\n        displayName: device.displayName,\n        dehydrated: device.isDehydrated,\n    });\n}\n\n/**\n * Convert {@link DeviceKeys}  from `/keys/query` request to a `Map<string, Device>`\n * @param deviceKeys - Device keys object to convert\n *\n * @internal\n */\nexport function deviceKeysToDeviceMap(deviceKeys: DeviceKeys): Map<string, Device> {\n    return new Map(\n        Object.entries(deviceKeys).map(([deviceId, device]) => [deviceId, downloadDeviceToJsDevice(device)]),\n    );\n}\n\n// Device from `/keys/query` request\ntype QueryDevice = DeviceKeys[keyof DeviceKeys];\n\n/**\n * Convert `/keys/query` {@link QueryDevice} device to {@link Device}\n * @param device - Device from `/keys/query` request\n *\n * @internal\n */\nexport function downloadDeviceToJsDevice(device: QueryDevice): Device {\n    const keys = new Map(Object.entries(device.keys));\n    const displayName = device.unsigned?.device_display_name;\n\n    const signatures = new Map<string, Map<string, string>>();\n    if (device.signatures) {\n        for (const userId in device.signatures) {\n            signatures.set(userId, new Map(Object.entries(device.signatures[userId])));\n        }\n    }\n\n    return new Device({\n        deviceId: device.device_id,\n        userId: device.user_id,\n        keys,\n        algorithms: device.algorithms,\n        verified: DeviceVerification.Unverified,\n        signatures,\n        displayName,\n    });\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/rust-crypto/secret-storage.js

@@ -1,41 +1,41 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-/*
-Copyright 2023 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+/*
+Copyright 2023 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
-/**
- * Check that the private cross signing keys (master, self signing, user signing) are stored in the secret storage and encrypted with the default secret storage key.
- *
- * @param secretStorage - The secret store using account data
- * @returns True if the cross-signing keys are all stored and encrypted with the same secret storage key.
- *
- * @internal
+/**
+ * Check that the private cross signing keys (master, self signing, user signing) are stored in the secret storage and encrypted with the default secret storage key.
+ *
+ * @param secretStorage - The secret store using account data
+ * @returns True if the cross-signing keys are all stored and encrypted with the same secret storage key.
+ *
+ * @internal
  */
 export function secretStorageContainsCrossSigningKeys(_x) {
   return _secretStorageContainsCrossSigningKeys.apply(this, arguments);
 }
 
-/**
- *
- * Check that the secret storage can access the given secrets using the default key.
- *
- * @param secretStorage - The secret store using account data
- * @param secretNames - The secret names to check
- * @returns True if all the given secrets are accessible and encrypted with the given key.
- *
- * @internal
+/**
+ *
+ * Check that the secret storage can access the given secrets using the default key.
+ *
+ * @param secretStorage - The secret store using account data
+ * @param secretNames - The secret names to check
+ * @returns True if all the given secrets are accessible and encrypted with the given key.
+ *
+ * @internal
  */
 function _secretStorageContainsCrossSigningKeys() {
   _secretStorageContainsCrossSigningKeys = _asyncToGenerator(function* (secretStorage) {

package/lib/rust-crypto/secret-storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"secret-storage.js","names":["secretStorageContainsCrossSigningKeys","_x","_secretStorageContainsCrossSigningKeys","apply","arguments","_asyncToGenerator","secretStorage","secretStorageCanAccessSecrets","_x2","_x3","_secretStorageCanAccessSecrets","secretNames","defaultKeyId","getDefaultKeyId","secretName","record","isStored"],"sources":["../../src/rust-crypto/secret-storage.ts"],"sourcesContent":["/*\r\nCopyright 2023 The Matrix.org Foundation C.I.C.\r\n\r\nLicensed under the Apache License, Version 2.0 (the \"License\");\r\nyou may not use this file except in compliance with the License.\r\nYou may obtain a copy of the License at\r\n\r\n    http://www.apache.org/licenses/LICENSE-2.0\r\n\r\nUnless required by applicable law or agreed to in writing, software\r\ndistributed under the License is distributed on an \"AS IS\" BASIS,\r\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\nSee the License for the specific language governing permissions and\r\nlimitations under the License.\r\n*/\r\n\r\nimport { type SecretStorageKey, type ServerSideSecretStorage } from \"../secret-storage.ts\";\r\n\r\n/**\r\n * Check that the private cross signing keys (master, self signing, user signing) are stored in the secret storage and encrypted with the default secret storage key.\r\n *\r\n * @param secretStorage - The secret store using account data\r\n * @returns True if the cross-signing keys are all stored and encrypted with the same secret storage key.\r\n *\r\n * @internal\r\n */\r\nexport async function secretStorageContainsCrossSigningKeys(secretStorage: ServerSideSecretStorage): Promise<boolean> {\r\n    return secretStorageCanAccessSecrets(secretStorage, [\r\n        \"m.cross_signing.master\",\r\n        \"m.cross_signing.user_signing\",\r\n        \"m.cross_signing.self_signing\",\r\n    ]);\r\n}\r\n\r\n/**\r\n *\r\n * Check that the secret storage can access the given secrets using the default key.\r\n *\r\n * @param secretStorage - The secret store using account data\r\n * @param secretNames - The secret names to check\r\n * @returns True if all the given secrets are accessible and encrypted with the given key.\r\n *\r\n * @internal\r\n */\r\nexport async function secretStorageCanAccessSecrets(\r\n    secretStorage: ServerSideSecretStorage,\r\n    secretNames: SecretStorageKey[],\r\n): Promise<boolean> {\r\n    const defaultKeyId = await secretStorage.getDefaultKeyId();\r\n    if (!defaultKeyId) return false;\r\n\r\n    for (const secretName of secretNames) {\r\n        // check which keys this particular secret is encrypted with\r\n        const record = (await secretStorage.isStored(secretName)) || {};\r\n        // if it's not encrypted with the right key, there is no point continuing\r\n        if (!(defaultKeyId in record)) return false;\r\n    }\r\n\r\n    return true;\r\n}\r\n"],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,gBAAsBA,qCAAqCA,CAAAC,EAAA;EAAA,OAAAC,sCAAA,CAAAC,KAAA,OAAAC,SAAA;AAAA;;AAQ3D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AATA,SAAAF,uCAAA;EAAAA,sCAAA,GAAAG,iBAAA,CARO,WAAqDC,aAAsC,EAAoB;IAClH,OAAOC,6BAA6B,CAACD,aAAa,EAAE,CAChD,wBAAwB,EACxB,8BAA8B,EAC9B,8BAA8B,CACjC,CAAC;EACN,CAAC;EAAA,OAAAJ,sCAAA,CAAAC,KAAA,OAAAC,SAAA;AAAA;AAYD,gBAAsBG,6BAA6BA,CAAAC,GAAA,EAAAC,GAAA;EAAA,OAAAC,8BAAA,CAAAP,KAAA,OAAAC,SAAA;AAAA;AAelD,SAAAM,+BAAA;EAAAA,8BAAA,GAAAL,iBAAA,CAfM,WACHC,aAAsC,EACtCK,WAA+B,EACf;IAChB,IAAMC,YAAY,SAASN,aAAa,CAACO,eAAe,CAAC,CAAC;IAC1D,IAAI,CAACD,YAAY,EAAE,OAAO,KAAK;IAE/B,KAAK,IAAME,UAAU,IAAIH,WAAW,EAAE;MAClC;MACA,IAAMI,MAAM,GAAG,OAAOT,aAAa,CAACU,QAAQ,CAACF,UAAU,CAAC,KAAK,CAAC,CAAC;MAC/D;MACA,IAAI,EAAEF,YAAY,IAAIG,MAAM,CAAC,EAAE,OAAO,KAAK;IAC/C;IAEA,OAAO,IAAI;EACf,CAAC;EAAA,OAAAL,8BAAA,CAAAP,KAAA,OAAAC,SAAA;AAAA","ignoreList":[]}
+{"version":3,"file":"secret-storage.js","names":["secretStorageContainsCrossSigningKeys","_x","_secretStorageContainsCrossSigningKeys","apply","arguments","_asyncToGenerator","secretStorage","secretStorageCanAccessSecrets","_x2","_x3","_secretStorageCanAccessSecrets","secretNames","defaultKeyId","getDefaultKeyId","secretName","record","isStored"],"sources":["../../src/rust-crypto/secret-storage.ts"],"sourcesContent":["/*\nCopyright 2023 The Matrix.org Foundation C.I.C.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n*/\n\nimport { type SecretStorageKey, type ServerSideSecretStorage } from \"../secret-storage.ts\";\n\n/**\n * Check that the private cross signing keys (master, self signing, user signing) are stored in the secret storage and encrypted with the default secret storage key.\n *\n * @param secretStorage - The secret store using account data\n * @returns True if the cross-signing keys are all stored and encrypted with the same secret storage key.\n *\n * @internal\n */\nexport async function secretStorageContainsCrossSigningKeys(secretStorage: ServerSideSecretStorage): Promise<boolean> {\n    return secretStorageCanAccessSecrets(secretStorage, [\n        \"m.cross_signing.master\",\n        \"m.cross_signing.user_signing\",\n        \"m.cross_signing.self_signing\",\n    ]);\n}\n\n/**\n *\n * Check that the secret storage can access the given secrets using the default key.\n *\n * @param secretStorage - The secret store using account data\n * @param secretNames - The secret names to check\n * @returns True if all the given secrets are accessible and encrypted with the given key.\n *\n * @internal\n */\nexport async function secretStorageCanAccessSecrets(\n    secretStorage: ServerSideSecretStorage,\n    secretNames: SecretStorageKey[],\n): Promise<boolean> {\n    const defaultKeyId = await secretStorage.getDefaultKeyId();\n    if (!defaultKeyId) return false;\n\n    for (const secretName of secretNames) {\n        // check which keys this particular secret is encrypted with\n        const record = (await secretStorage.isStored(secretName)) || {};\n        // if it's not encrypted with the right key, there is no point continuing\n        if (!(defaultKeyId in record)) return false;\n    }\n\n    return true;\n}\n"],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,gBAAsBA,qCAAqCA,CAAAC,EAAA;EAAA,OAAAC,sCAAA,CAAAC,KAAA,OAAAC,SAAA;AAAA;;AAQ3D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AATA,SAAAF,uCAAA;EAAAA,sCAAA,GAAAG,iBAAA,CARO,WAAqDC,aAAsC,EAAoB;IAClH,OAAOC,6BAA6B,CAACD,aAAa,EAAE,CAChD,wBAAwB,EACxB,8BAA8B,EAC9B,8BAA8B,CACjC,CAAC;EACN,CAAC;EAAA,OAAAJ,sCAAA,CAAAC,KAAA,OAAAC,SAAA;AAAA;AAYD,gBAAsBG,6BAA6BA,CAAAC,GAAA,EAAAC,GAAA;EAAA,OAAAC,8BAAA,CAAAP,KAAA,OAAAC,SAAA;AAAA;AAelD,SAAAM,+BAAA;EAAAA,8BAAA,GAAAL,iBAAA,CAfM,WACHC,aAAsC,EACtCK,WAA+B,EACf;IAChB,IAAMC,YAAY,SAASN,aAAa,CAACO,eAAe,CAAC,CAAC;IAC1D,IAAI,CAACD,YAAY,EAAE,OAAO,KAAK;IAE/B,KAAK,IAAME,UAAU,IAAIH,WAAW,EAAE;MAClC;MACA,IAAMI,MAAM,GAAG,OAAOT,aAAa,CAACU,QAAQ,CAACF,UAAU,CAAC,KAAK,CAAC,CAAC;MAC/D;MACA,IAAI,EAAEF,YAAY,IAAIG,MAAM,CAAC,EAAE,OAAO,KAAK;IAC/C;IAEA,OAAO,IAAI;EACf,CAAC;EAAA,OAAAL,8BAAA,CAAAP,KAAA,OAAAC,SAAA;AAAA","ignoreList":[]}

package/lib/service-types.js

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

package/lib/service-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-types.js","names":["SERVICE_TYPES"],"sources":["../src/service-types.ts"],"sourcesContent":["/*\r\nCopyright 2019 - 2021 The Matrix.org Foundation C.I.C.\r\n\r\nLicensed under the Apache License, Version 2.0 (the \"License\");\r\nyou may not use this file except in compliance with the License.\r\nYou may obtain a copy of the License at\r\n\r\n    http://www.apache.org/licenses/LICENSE-2.0\r\n\r\nUnless required by applicable law or agreed to in writing, software\r\ndistributed under the License is distributed on an \"AS IS\" BASIS,\r\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\nSee the License for the specific language governing permissions and\r\nlimitations under the License.\r\n*/\r\n\r\nexport enum SERVICE_TYPES {\r\n    IS = \"SERVICE_TYPE_IS\", // An identity server\r\n    IM = \"SERVICE_TYPE_IM\", // An integration manager\r\n}\r\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,WAAYA,aAAa,0BAAbA,aAAa;EAAbA,aAAa;EACG;EADhBA,aAAa,4BAEG;EAAA,OAFhBA,aAAa;AAAA","ignoreList":[]}
+{"version":3,"file":"service-types.js","names":["SERVICE_TYPES"],"sources":["../src/service-types.ts"],"sourcesContent":["/*\nCopyright 2019 - 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\nexport enum SERVICE_TYPES {\n    IS = \"SERVICE_TYPE_IS\", // An identity server\n    IM = \"SERVICE_TYPE_IM\", // An integration manager\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,WAAYA,aAAa,0BAAbA,aAAa;EAAbA,aAAa;EACG;EADhBA,aAAa,4BAEG;EAAA,OAFhBA,aAAa;AAAA","ignoreList":[]}

package/lib/store/local-storage-events-emitter.js

@@ -1,17 +1,17 @@
-/*
-Copyright 2021 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import { TypedEventEmitter } from "../models/typed-event-emitter.js";
@@ -24,13 +24,13 @@ export var LocalStorageErrors = /*#__PURE__*/function (LocalStorageErrors) {
   LocalStorageErrors["QuotaExceededError"] = "QuotaExceededError";
   return LocalStorageErrors;
 }({});
-/**
- * Used in element-web as a temporary hack to handle all the localStorage errors on the highest level possible
- * As of 15.11.2021 (DD/MM/YYYY) we're not properly handling local storage exceptions anywhere.
- * This store, as an event emitter, is used to re-emit local storage exceptions so that we can handle them
- * and show some kind of a "It's dead Jim" modal to the users, telling them that hey,
- * maybe you should check out your disk, as it's probably dying and your session may die with it.
- * See: https://github.com/vector-im/element-web/issues/18423
+/**
+ * Used in element-web as a temporary hack to handle all the localStorage errors on the highest level possible
+ * As of 15.11.2021 (DD/MM/YYYY) we're not properly handling local storage exceptions anywhere.
+ * This store, as an event emitter, is used to re-emit local storage exceptions so that we can handle them
+ * and show some kind of a "It's dead Jim" modal to the users, telling them that hey,
+ * maybe you should check out your disk, as it's probably dying and your session may die with it.
+ * See: https://github.com/vector-im/element-web/issues/18423
  */
 class LocalStorageErrorsEventsEmitter extends TypedEventEmitter {}
 export var localStorageErrorsEventsEmitter = new LocalStorageErrorsEventsEmitter();

package/lib/store/local-storage-events-emitter.js.map

@@ -1 +1 @@
-{"version":3,"file":"local-storage-events-emitter.js","names":["TypedEventEmitter","LocalStorageErrors","LocalStorageErrorsEventsEmitter","localStorageErrorsEventsEmitter"],"sources":["../../src/store/local-storage-events-emitter.ts"],"sourcesContent":["/*\r\nCopyright 2021 The Matrix.org Foundation C.I.C.\r\n\r\nLicensed under the Apache License, Version 2.0 (the \"License\");\r\nyou may not use this file except in compliance with the License.\r\nYou may obtain a copy of the License at\r\n\r\n    http://www.apache.org/licenses/LICENSE-2.0\r\n\r\nUnless required by applicable law or agreed to in writing, software\r\ndistributed under the License is distributed on an \"AS IS\" BASIS,\r\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\nSee the License for the specific language governing permissions and\r\nlimitations under the License.\r\n*/\r\n\r\nimport { TypedEventEmitter } from \"../models/typed-event-emitter.ts\";\r\n\r\nexport enum LocalStorageErrors {\r\n    Global = \"Global\",\r\n    SetItemError = \"setItem\",\r\n    GetItemError = \"getItem\",\r\n    RemoveItemError = \"removeItem\",\r\n    ClearError = \"clear\",\r\n    QuotaExceededError = \"QuotaExceededError\",\r\n}\r\n\r\ntype EventHandlerMap = {\r\n    [LocalStorageErrors.Global]: (error: Error) => void;\r\n    [LocalStorageErrors.SetItemError]: (error: Error) => void;\r\n    [LocalStorageErrors.GetItemError]: (error: Error) => void;\r\n    [LocalStorageErrors.RemoveItemError]: (error: Error) => void;\r\n    [LocalStorageErrors.ClearError]: (error: Error) => void;\r\n    [LocalStorageErrors.QuotaExceededError]: (error: Error) => void;\r\n};\r\n\r\n/**\r\n * Used in element-web as a temporary hack to handle all the localStorage errors on the highest level possible\r\n * As of 15.11.2021 (DD/MM/YYYY) we're not properly handling local storage exceptions anywhere.\r\n * This store, as an event emitter, is used to re-emit local storage exceptions so that we can handle them\r\n * and show some kind of a \"It's dead Jim\" modal to the users, telling them that hey,\r\n * maybe you should check out your disk, as it's probably dying and your session may die with it.\r\n * See: https://github.com/vector-im/element-web/issues/18423\r\n */\r\nclass LocalStorageErrorsEventsEmitter extends TypedEventEmitter<LocalStorageErrors, EventHandlerMap> {}\r\nexport const localStorageErrorsEventsEmitter = new LocalStorageErrorsEventsEmitter();\r\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,iBAAiB,QAAQ,kCAAkC;AAEpE,WAAYC,kBAAkB,0BAAlBA,kBAAkB;EAAlBA,kBAAkB;EAAlBA,kBAAkB;EAAlBA,kBAAkB;EAAlBA,kBAAkB;EAAlBA,kBAAkB;EAAlBA,kBAAkB;EAAA,OAAlBA,kBAAkB;AAAA;AAkB9B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,+BAA+B,SAASF,iBAAiB,CAAsC;AACrG,OAAO,IAAMG,+BAA+B,GAAG,IAAID,+BAA+B,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"local-storage-events-emitter.js","names":["TypedEventEmitter","LocalStorageErrors","LocalStorageErrorsEventsEmitter","localStorageErrorsEventsEmitter"],"sources":["../../src/store/local-storage-events-emitter.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 { TypedEventEmitter } from \"../models/typed-event-emitter.ts\";\n\nexport enum LocalStorageErrors {\n    Global = \"Global\",\n    SetItemError = \"setItem\",\n    GetItemError = \"getItem\",\n    RemoveItemError = \"removeItem\",\n    ClearError = \"clear\",\n    QuotaExceededError = \"QuotaExceededError\",\n}\n\ntype EventHandlerMap = {\n    [LocalStorageErrors.Global]: (error: Error) => void;\n    [LocalStorageErrors.SetItemError]: (error: Error) => void;\n    [LocalStorageErrors.GetItemError]: (error: Error) => void;\n    [LocalStorageErrors.RemoveItemError]: (error: Error) => void;\n    [LocalStorageErrors.ClearError]: (error: Error) => void;\n    [LocalStorageErrors.QuotaExceededError]: (error: Error) => void;\n};\n\n/**\n * Used in element-web as a temporary hack to handle all the localStorage errors on the highest level possible\n * As of 15.11.2021 (DD/MM/YYYY) we're not properly handling local storage exceptions anywhere.\n * This store, as an event emitter, is used to re-emit local storage exceptions so that we can handle them\n * and show some kind of a \"It's dead Jim\" modal to the users, telling them that hey,\n * maybe you should check out your disk, as it's probably dying and your session may die with it.\n * See: https://github.com/vector-im/element-web/issues/18423\n */\nclass LocalStorageErrorsEventsEmitter extends TypedEventEmitter<LocalStorageErrors, EventHandlerMap> {}\nexport const localStorageErrorsEventsEmitter = new LocalStorageErrorsEventsEmitter();\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,iBAAiB,QAAQ,kCAAkC;AAEpE,WAAYC,kBAAkB,0BAAlBA,kBAAkB;EAAlBA,kBAAkB;EAAlBA,kBAAkB;EAAlBA,kBAAkB;EAAlBA,kBAAkB;EAAlBA,kBAAkB;EAAlBA,kBAAkB;EAAA,OAAlBA,kBAAkB;AAAA;AAkB9B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,+BAA+B,SAASF,iBAAiB,CAAsC;AACrG,OAAO,IAAMG,+BAA+B,GAAG,IAAID,+BAA+B,CAAC,CAAC","ignoreList":[]}