Skip to content

Commit

Permalink
Merge pull request #40 from bleu/luiz/op-refactor-message-interface
Browse files Browse the repository at this point in the history
refactor: change message interface
  • Loading branch information
luizmuraro authored Sep 11, 2024
2 parents 893836d + b9c4121 commit cece6c4
Show file tree
Hide file tree
Showing 35 changed files with 896 additions and 587 deletions.
184 changes: 92 additions & 92 deletions www/public/mockServiceWorker.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,128 +8,128 @@
* - Please do NOT serve this file on production.
*/

const PACKAGE_VERSION = "2.3.5";
const INTEGRITY_CHECKSUM = "26357c79639bfa20d64c0efca2a87423";
const IS_MOCKED_RESPONSE = Symbol("isMockedResponse");
const activeClientIds = new Set();
const PACKAGE_VERSION = '2.4.1'
const INTEGRITY_CHECKSUM = '26357c79639bfa20d64c0efca2a87423'
const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
const activeClientIds = new Set()

self.addEventListener("install", () => {
self.skipWaiting();
});
self.addEventListener('install', function () {
self.skipWaiting()
})

self.addEventListener("activate", (event) => {
event.waitUntil(self.clients.claim());
});
self.addEventListener('activate', function (event) {
event.waitUntil(self.clients.claim())
})

self.addEventListener("message", async (event) => {
const clientId = event.source.id;
self.addEventListener('message', async function (event) {
const clientId = event.source.id

if (!clientId || !self.clients) {
return;
return
}

const client = await self.clients.get(clientId);
const client = await self.clients.get(clientId)

if (!client) {
return;
return
}

const allClients = await self.clients.matchAll({
type: "window",
});
type: 'window',
})

switch (event.data) {
case "KEEPALIVE_REQUEST": {
case 'KEEPALIVE_REQUEST': {
sendToClient(client, {
type: "KEEPALIVE_RESPONSE",
});
break;
type: 'KEEPALIVE_RESPONSE',
})
break
}

case "INTEGRITY_CHECK_REQUEST": {
case 'INTEGRITY_CHECK_REQUEST': {
sendToClient(client, {
type: "INTEGRITY_CHECK_RESPONSE",
type: 'INTEGRITY_CHECK_RESPONSE',
payload: {
packageVersion: PACKAGE_VERSION,
checksum: INTEGRITY_CHECKSUM,
},
});
break;
})
break
}

case "MOCK_ACTIVATE": {
activeClientIds.add(clientId);
case 'MOCK_ACTIVATE': {
activeClientIds.add(clientId)

sendToClient(client, {
type: "MOCKING_ENABLED",
type: 'MOCKING_ENABLED',
payload: true,
});
break;
})
break
}

case "MOCK_DEACTIVATE": {
activeClientIds.delete(clientId);
break;
case 'MOCK_DEACTIVATE': {
activeClientIds.delete(clientId)
break
}

case "CLIENT_CLOSED": {
activeClientIds.delete(clientId);
case 'CLIENT_CLOSED': {
activeClientIds.delete(clientId)

const remainingClients = allClients.filter((client) => {
return client.id !== clientId;
});
return client.id !== clientId
})

// Unregister itself when there are no more clients
if (remainingClients.length === 0) {
self.registration.unregister();
self.registration.unregister()
}

break;
break
}
}
});
})

self.addEventListener("fetch", (event) => {
const { request } = event;
self.addEventListener('fetch', function (event) {
const { request } = event

// Bypass navigation requests.
if (request.mode === "navigate") {
return;
if (request.mode === 'navigate') {
return
}

// Opening the DevTools triggers the "only-if-cached" request
// that cannot be handled by the worker. Bypass such requests.
if (request.cache === "only-if-cached" && request.mode !== "same-origin") {
return;
if (request.cache === 'only-if-cached' && request.mode !== 'same-origin') {
return
}

// 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).
if (activeClientIds.size === 0) {
return;
return
}

// Generate unique request ID.
const requestId = crypto.randomUUID();
event.respondWith(handleRequest(event, requestId));
});
const requestId = crypto.randomUUID()
event.respondWith(handleRequest(event, requestId))
})

async function handleRequest(event, requestId) {
const client = await resolveMainClient(event);
const response = await getResponse(event, client, requestId);
const client = await resolveMainClient(event)
const response = await getResponse(event, client, requestId)

// Send back the response clone for the "response:*" life-cycle events.
// Ensure MSW is active and ready to handle the message, otherwise
// this message will pend indefinitely.
if (client && activeClientIds.has(client.id)) {
(async () => {
const responseClone = response.clone();
;(async function () {
const responseClone = response.clone()

sendToClient(
client,
{
type: "RESPONSE",
type: 'RESPONSE',
payload: {
requestId,
isMockedResponse: IS_MOCKED_RESPONSE in response,
Expand All @@ -141,77 +141,77 @@ async function handleRequest(event, requestId) {
},
},
[responseClone.body],
);
})();
)
})()
}

return response;
return response
}

// Resolve the main client for the given event.
// Client that issues a request doesn't necessarily equal the client
// that registered the worker. It's with the latter the worker should
// communicate with during the response resolving phase.
async function resolveMainClient(event) {
const client = await self.clients.get(event.clientId);
const client = await self.clients.get(event.clientId)

if (client?.frameType === "top-level") {
return client;
if (client?.frameType === 'top-level') {
return client
}

const allClients = await self.clients.matchAll({
type: "window",
});
type: 'window',
})

return allClients
.filter((client) => {
// Get only those clients that are currently visible.
return client.visibilityState === "visible";
return client.visibilityState === 'visible'
})
.find((client) => {
// Find the client ID that's recorded in the
// set of clients that have registered the worker.
return activeClientIds.has(client.id);
});
return activeClientIds.has(client.id)
})
}

async function getResponse(event, client, requestId) {
const { request } = event;
const { request } = event

// Clone the request because it might've been already used
// (i.e. its body has been read and sent to the client).
const requestClone = request.clone();
const requestClone = request.clone()

function passthrough() {
const headers = Object.fromEntries(requestClone.headers.entries());
const headers = Object.fromEntries(requestClone.headers.entries())

// Remove internal MSW request header so the passthrough request
// complies with any potential CORS preflight checks on the server.
// Some servers forbid unknown request headers.
headers["x-msw-intention"] = undefined;
delete headers['x-msw-intention']

return fetch(requestClone, { headers });
return fetch(requestClone, { headers })
}

// Bypass mocking when the client is not active.
if (!client) {
return passthrough();
return passthrough()
}

// Bypass initial page load requests (i.e. static assets).
// The absence of the immediate/parent client in the map of the active clients
// means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet
// and is not ready to handle requests.
if (!activeClientIds.has(client.id)) {
return passthrough();
return passthrough()
}

// Notify the client that a request has been intercepted.
const requestBuffer = await request.arrayBuffer();
const requestBuffer = await request.arrayBuffer()
const clientMessage = await sendToClient(
client,
{
type: "REQUEST",
type: 'REQUEST',
payload: {
id: requestId,
url: request.url,
Expand All @@ -230,38 +230,38 @@ async function getResponse(event, client, requestId) {
},
},
[requestBuffer],
);
)

switch (clientMessage.type) {
case "MOCK_RESPONSE": {
return respondWithMock(clientMessage.data);
case 'MOCK_RESPONSE': {
return respondWithMock(clientMessage.data)
}

case "PASSTHROUGH": {
return passthrough();
case 'PASSTHROUGH': {
return passthrough()
}
}

return passthrough();
return passthrough()
}

function sendToClient(client, message, transferrables = []) {
return new Promise((resolve, reject) => {
const channel = new MessageChannel();
const channel = new MessageChannel()

channel.port1.onmessage = (event) => {
if (event.data?.error) {
return reject(event.data.error);
if (event.data && event.data.error) {
return reject(event.data.error)
}

resolve(event.data);
};
resolve(event.data)
}

client.postMessage(
message,
[channel.port2].concat(transferrables.filter(Boolean)),
);
});
)
})
}

async function respondWithMock(response) {
Expand All @@ -270,15 +270,15 @@ async function respondWithMock(response) {
// instance will have status code set to 0. Since it's not possible to create
// a Response instance with status code 0, handle that use-case separately.
if (response.status === 0) {
return Response.error();
return Response.error()
}

const mockedResponse = new Response(response.body, response);
const mockedResponse = new Response(response.body, response)

Reflect.defineProperty(mockedResponse, IS_MOCKED_RESPONSE, {
value: true,
enumerable: true,
});
})

return mockedResponse;
return mockedResponse
}
24 changes: 24 additions & 0 deletions www/src/app/chat/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
"use client";

import { ChatHeader } from "@/components/chat/chat-header";
import ChatSidebar from "@/components/chat/chat-sidebar";
import type React from "react";

export default function ChatLayout({
children,
}: {
children: React.ReactNode;
}) {
return (
<div className="flex-1">
<ChatHeader />
<div className="flex max-h-[calc(100dvh-4rem)] w-full overflow-hidden h-full">
<div className="hidden md:flex">
<ChatSidebar />
</div>

<main className="flex flex-1">{children}</main>
</div>
</div>
);
}
17 changes: 17 additions & 0 deletions www/src/app/chat/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
"use client";

import ChatBottombar from "@/components/chat/chat-bottombar";
import { ChatList } from "@/components/chat/chat-list";
import React from "react";

export default function Chat() {

return (
<div className="flex flex-col-reverse min-w-full">
<div className="mx-3 md:mx-12">
<ChatBottombar />
</div>
<ChatList />
</div>
);
}
Loading

0 comments on commit cece6c4

Please sign in to comment.