fix merge conflict

regenerate package lock with npm i due to `Reason: Cannot find module @rollup/rollup-linux-x64-gnu. npm has a bug related to optional dependencies (npm/cli#4828). Please try `npm i` again after removing both package-lock.json and node_modules directory.`

Author: odelcroi

Cargo.lock

@@ -34,38 +34,6 @@ broken_intra_doc_links = "deny"
 [workspace.dependencies]
 
 # Workspace crates
-<<<<<<< HEAD
-mas-axum-utils = { path = "./crates/axum-utils/", version = "=1.0.0" }
-mas-cli = { path = "./crates/cli/", version = "=1.0.0" }
-mas-config = { path = "./crates/config/", version = "=1.0.0" }
-mas-context = { path = "./crates/context/", version = "=1.0.0" }
-mas-data-model = { path = "./crates/data-model/", version = "=1.0.0" }
-mas-email = { path = "./crates/email/", version = "=1.0.0" }
-mas-graphql = { path = "./crates/graphql/", version = "=1.0.0" }
-mas-handlers = { path = "./crates/handlers/", version = "=1.0.0" }
-mas-http = { path = "./crates/http/", version = "=1.0.0" }
-mas-i18n = { path = "./crates/i18n/", version = "=1.0.0" }
-mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=1.0.0" }
-mas-iana = { path = "./crates/iana/", version = "=1.0.0" }
-mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=1.0.0" }
-mas-jose = { path = "./crates/jose/", version = "=1.0.0" }
-mas-keystore = { path = "./crates/keystore/", version = "=1.0.0" }
-mas-listener = { path = "./crates/listener/", version = "=1.0.0" }
-mas-matrix = { path = "./crates/matrix/", version = "=1.0.0" }
-mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=1.0.0" }
-mas-oidc-client = { path = "./crates/oidc-client/", version = "=1.0.0" }
-mas-policy = { path = "./crates/policy/", version = "=1.0.0" }
-mas-router = { path = "./crates/router/", version = "=1.0.0" }
-mas-spa = { path = "./crates/spa/", version = "=1.0.0" }
-mas-storage = { path = "./crates/storage/", version = "=1.0.0" }
-mas-storage-pg = { path = "./crates/storage-pg/", version = "=1.0.0" }
-mas-tasks = { path = "./crates/tasks/", version = "=1.0.0" }
-mas-templates = { path = "./crates/templates/", version = "=1.0.0" }
-mas-tower = { path = "./crates/tower/", version = "=1.0.0" }
-oauth2-types = { path = "./crates/oauth2-types/", version = "=1.0.0" }
-syn2mas = { path = "./crates/syn2mas", version = "=1.0.0" }
-tchap = { path = "./crates/tchap", version = "=0.1.0" }
-=======
 mas-axum-utils = { path = "./crates/axum-utils/", version = "=1.2.0" }
 mas-cli = { path = "./crates/cli/", version = "=1.2.0" }
 mas-config = { path = "./crates/config/", version = "=1.2.0" }
@@ -95,7 +63,9 @@ mas-templates = { path = "./crates/templates/", version = "=1.2.0" }
 mas-tower = { path = "./crates/tower/", version = "=1.2.0" }
 oauth2-types = { path = "./crates/oauth2-types/", version = "=1.2.0" }
 syn2mas = { path = "./crates/syn2mas", version = "=1.2.0" }
->>>>>>> v1.2.0
+#:tchap:
+tchap = { path = "./crates/tchap", version = "=0.1.0" }
+#:tchap:
 
 # OpenAPI schema generation and validation
 [workspace.dependencies.aide]

Cargo.toml

@@ -7,8 +7,8 @@
  * - Please do NOT modify this file.
  */
 
-const PACKAGE_VERSION = '2.11.1'
-const INTEGRITY_CHECKSUM = 'f5825c521429caf22a4dd13b66e243af'
+const PACKAGE_VERSION = '2.11.2'
+const INTEGRITY_CHECKSUM = '4db4a41e972cec1b64cc569c66952d82'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()
 
@@ -71,11 +71,6 @@ addEventListener('message', async function (event) {
       break
     }
 
-    case 'MOCK_DEACTIVATE': {
-      activeClientIds.delete(clientId)
-      break
-    }
-
     case 'CLIENT_CLOSED': {
       activeClientIds.delete(clientId)
 
@@ -94,6 +89,8 @@ addEventListener('message', async function (event) {
 })
 
 addEventListener('fetch', function (event) {
+  const requestInterceptedAt = Date.now()
+
   // Bypass navigation requests.
   if (event.request.mode === 'navigate') {
     return
@@ -110,23 +107,29 @@ addEventListener('fetch', function (event) {
 
   // Bypass all requests when there are no active clients.
   // Prevents the self-unregistered worked from handling requests
-  // after it's been deleted (still remains active until the next reload).
+  // after it's been terminated (still remains active until the next reload).
   if (activeClientIds.size === 0) {
     return
   }
 
   const requestId = crypto.randomUUID()
-  event.respondWith(handleRequest(event, requestId))
+  event.respondWith(handleRequest(event, requestId, requestInterceptedAt))
 })
 
 /**
  * @param {FetchEvent} event
  * @param {string} requestId
+ * @param {number} requestInterceptedAt
  */
-async function handleRequest(event, requestId) {
+async function handleRequest(event, requestId, requestInterceptedAt) {
   const client = await resolveMainClient(event)
   const requestCloneForEvents = event.request.clone()
-  const response = await getResponse(event, client, requestId)
+  const response = await getResponse(
+    event,
+    client,
+    requestId,
+    requestInterceptedAt,
+  )
 
   // Send back the response clone for the "response:*" life-cycle events.
   // Ensure MSW is active and ready to handle the message, otherwise
@@ -204,7 +207,7 @@ async function resolveMainClient(event) {
  * @param {string} requestId
  * @returns {Promise<Response>}
  */
-async function getResponse(event, client, requestId) {
+async function getResponse(event, client, requestId, requestInterceptedAt) {
   // Clone the request because it might've been already used
   // (i.e. its body has been read and sent to the client).
   const requestClone = event.request.clone()
@@ -255,6 +258,7 @@ async function getResponse(event, client, requestId) {
       type: 'REQUEST',
       payload: {
         id: requestId,
+        interceptedAt: requestInterceptedAt,
         ...serializedRequest,
       },
     },