update ask access token login in service worker

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cinny",
-  "version": "4.2.1",
+  "version": "4.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cinny",
-      "version": "4.2.1",
+      "version": "4.1.0",
       "license": "AGPL-3.0-only",
       "dependencies": {
         "@atlaskit/pragmatic-drag-and-drop": "1.1.6",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cinny",
-  "version": "4.2.1",
+  "version": "4.1.0",
   "description": "Yet another matrix client",
   "main": "index.js",
   "type": "module",

src/app/components/message/Reply.tsx

@@ -48,7 +48,6 @@ export const ThreadIndicator = as<'div'>(({ ...props }, ref) => (
 type ReplyProps = {
   mx: MatrixClient;
   room: Room;
-  mxidColor?: boolean;
   timelineSet?: EventTimelineSet | undefined;
   replyEventId: string;
   threadRootId?: string | undefined;
@@ -56,7 +55,7 @@ type ReplyProps = {
 };
 
 export const Reply = as<'div', ReplyProps>((_, ref) => {
-  const { mx, room, mxidColor, timelineSet, replyEventId, threadRootId, onClick, ...props } = _;
+  const { mx, room, timelineSet, replyEventId, threadRootId, onClick, ...props } = _;
   const [replyEvent, setReplyEvent] = useState<MatrixEvent | null | undefined>(
     timelineSet?.findEventById(replyEventId)
   );
@@ -102,7 +101,7 @@ export const Reply = as<'div', ReplyProps>((_, ref) => {
       )}
       <ReplyLayout
         as="button"
-        userColor={sender && mxidColor ? colorMXID(sender) : undefined}
+        userColor={sender ? colorMXID(sender) : undefined}
         username={
           sender && (
             <Text size="T300" truncate>

src/app/features/message-search/MessageSearch.tsx

@@ -55,7 +55,6 @@ export function MessageSearch({
   const allRooms = useRooms(mx, allRoomsAtom, mDirects);
   const [mediaAutoLoad] = useSetting(settingsAtom, 'mediaAutoLoad');
   const [urlPreview] = useSetting(settingsAtom, 'urlPreview');
-  const [mxidColor] = useSetting(settingsAtom, 'mxidColor');
   const searchInputRef = useRef<HTMLInputElement>(null);
   const scrollTopAnchorRef = useRef<HTMLDivElement>(null);
   const [searchParams, setSearchParams] = useSearchParams();
@@ -297,7 +296,6 @@ export function MessageSearch({
                     items={group.items}
                     mediaAutoLoad={mediaAutoLoad}
                     urlPreview={urlPreview}
-                    mxidColor={mxidColor}
                     onOpen={navigateRoom}
                   />
                 </VirtualTile>

src/app/features/message-search/SearchResultGroup.tsx

@@ -46,7 +46,6 @@ type SearchResultGroupProps = {
   items: ResultItem[];
   mediaAutoLoad?: boolean;
   urlPreview?: boolean;
-  mxidColor?: boolean;
   onOpen: (roomId: string, eventId: string) => void;
 };
 export function SearchResultGroup({
@@ -55,7 +54,6 @@ export function SearchResultGroup({
   items,
   mediaAutoLoad,
   urlPreview,
-  mxidColor,
   onOpen,
 }: SearchResultGroupProps) {
   const mx = useMatrixClient();
@@ -83,15 +81,7 @@ export function SearchResultGroup({
         handleSpoilerClick: spoilerClickHandler,
         handleMentionClick: mentionClickHandler,
       }),
-    [
+    [mx, room, linkifyOpts, highlightRegex, mentionClickHandler, spoilerClickHandler, useAuthentication]
-      mx,
-      room,
-      linkifyOpts,
-      highlightRegex,
-      mentionClickHandler,
-      spoilerClickHandler,
-      useAuthentication,
-    ]
   );
 
   const renderMatrixEvent = useMatrixEventRenderer<[IEventWithRoomId, string, GetContentCallback]>(
@@ -222,14 +212,7 @@ export function SearchResultGroup({
                         userId={event.sender}
                         src={
                           senderAvatarMxc
-                            ? mxcUrlToHttp(
+                            ? mxcUrlToHttp(mx, senderAvatarMxc, useAuthentication, 48, 48, 'crop') ?? undefined
-                                mx,
-                                senderAvatarMxc,
-                                useAuthentication,
-                                48,
-                                48,
-                                'crop'
-                              ) ?? undefined
                             : undefined
                         }
                         alt={displayName}
@@ -241,7 +224,7 @@ export function SearchResultGroup({
               >
                 <Box gap="300" justifyContent="SpaceBetween" alignItems="Center" grow="Yes">
                   <Box gap="200" alignItems="Baseline">
-                    <Username style={{ color: mxidColor ? colorMXID(event.sender) : undefined }}>
+                    <Username style={{ color: colorMXID(event.sender) }}>
                       <Text as="span" truncate>
                         <b>{displayName}</b>
                       </Text>
@@ -263,7 +246,6 @@ export function SearchResultGroup({
                   <Reply
                     mx={mx}
                     room={room}
-                    mxidColor={mxidColor}
                     replyEventId={replyEventId}
                     threadRootId={threadRootId}
                     onClick={handleOpenClick}

src/app/features/room/RoomInput.tsx

@@ -56,13 +56,7 @@ import {
 } from '../../components/editor';
 import { EmojiBoard, EmojiBoardTab } from '../../components/emoji-board';
 import { UseStateProvider } from '../../components/UseStateProvider';
-import {
+import { TUploadContent, encryptFile, getImageInfo, getMxIdLocalPart, mxcUrlToHttp } from '../../utils/matrix';
-  TUploadContent,
-  encryptFile,
-  getImageInfo,
-  getMxIdLocalPart,
-  mxcUrlToHttp,
-} from '../../utils/matrix';
 import { useTypingStatusUpdater } from '../../hooks/useTypingStatusUpdater';
 import { useFilePicker } from '../../hooks/useFilePicker';
 import { useFilePasteHandler } from '../../hooks/useFilePasteHandler';
@@ -126,7 +120,6 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
   ({ editor, fileDropContainerRef, roomId, room }, ref) => {
     const mx = useMatrixClient();
     const useAuthentication = useMediaAuthentication();
-    const [mxidColor] = useSetting(settingsAtom, 'mxidColor');
     const [enterForNewline] = useSetting(settingsAtom, 'enterForNewline');
     const [isMarkdown] = useSetting(settingsAtom, 'isMarkdown');
     const commands = useCommands(mx, room);
@@ -506,7 +499,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
                   <Box direction="Column">
                     {replyDraft.relation?.rel_type === RelationType.Thread && <ThreadIndicator />}
                     <ReplyLayout
-                      userColor={mxidColor ? colorMXID(replyDraft.userId) : undefined}
+                      userColor={colorMXID(replyDraft.userId)}
                       username={
                         <Text size="T300" truncate>
                           <b>

src/app/features/room/RoomTimeline.tsx

@@ -424,7 +424,6 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
   const encryptedRoom = mx.isRoomEncrypted(room.roomId);
   const [messageLayout] = useSetting(settingsAtom, 'messageLayout');
   const [messageSpacing] = useSetting(settingsAtom, 'messageSpacing');
-  const [mxidColor] = useSetting(settingsAtom, 'mxidColor');
   const [hideMembershipEvents] = useSetting(settingsAtom, 'hideMembershipEvents');
   const [hideNickAvatarEvents] = useSetting(settingsAtom, 'hideNickAvatarEvents');
   const [mediaAutoLoad] = useSetting(settingsAtom, 'mediaAutoLoad');
@@ -979,7 +978,6 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
             mEvent={mEvent}
             messageSpacing={messageSpacing}
             messageLayout={messageLayout}
-            mxidColor={mxidColor}
             collapse={collapse}
             highlight={highlighted}
             edit={editId === mEventId}
@@ -997,7 +995,6 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
                 <Reply
                   mx={mx}
                   room={room}
-                  mxidColor={mxidColor}
                   timelineSet={timelineSet}
                   replyEventId={replyEventId}
                   threadRootId={threadRootId}
@@ -1053,7 +1050,6 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
             mEvent={mEvent}
             messageSpacing={messageSpacing}
             messageLayout={messageLayout}
-            mxidColor={mxidColor}
             collapse={collapse}
             highlight={highlighted}
             edit={editId === mEventId}
@@ -1071,7 +1067,6 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
                 <Reply
                   mx={mx}
                   room={room}
-                  mxidColor={mxidColor}
                   timelineSet={timelineSet}
                   replyEventId={replyEventId}
                   threadRootId={threadRootId}
@@ -1164,7 +1159,6 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
             mEvent={mEvent}
             messageSpacing={messageSpacing}
             messageLayout={messageLayout}
-            mxidColor={mxidColor}
             collapse={collapse}
             highlight={highlighted}
             canDelete={canRedact || mEvent.getSender() === mx.getUserId()}

src/app/features/room/message/Message.tsx

@@ -51,12 +51,7 @@ import {
   getMemberAvatarMxc,
   getMemberDisplayName,
 } from '../../../utils/room';
-import {
+import { getCanonicalAliasOrRoomId, getMxIdLocalPart, isRoomAlias, mxcUrlToHttp } from '../../../utils/matrix';
-  getCanonicalAliasOrRoomId,
-  getMxIdLocalPart,
-  isRoomAlias,
-  mxcUrlToHttp,
-} from '../../../utils/matrix';
 import { MessageLayout, MessageSpacing } from '../../../state/settings';
 import { useMatrixClient } from '../../../hooks/useMatrixClient';
 import { useRecentEmoji } from '../../../hooks/useRecentEmoji';
@@ -620,7 +615,6 @@ export type MessageProps = {
   relations?: Relations;
   messageLayout: MessageLayout;
   messageSpacing: MessageSpacing;
-  mxidColor?: boolean;
   onUserClick: MouseEventHandler<HTMLButtonElement>;
   onUsernameClick: MouseEventHandler<HTMLButtonElement>;
   onReplyClick: MouseEventHandler<HTMLButtonElement>;
@@ -644,7 +638,6 @@ export const Message = as<'div', MessageProps>(
       relations,
       messageLayout,
       messageSpacing,
-      mxidColor,
       onUserClick,
       onUsernameClick,
       onReplyClick,
@@ -680,7 +673,7 @@ export const Message = as<'div', MessageProps>(
       >
         <Username
           as="button"
-          style={mxidColor ? { color: colorMXID(senderId) } : undefined}
+          style={{ color: colorMXID(senderId) }}
           data-user-id={senderId}
           onContextMenu={onUserClick}
           onClick={onUsernameClick}

src/app/hooks/useMediaAuthentication.ts

@@ -1,11 +1,10 @@
 import { useSpecVersions } from './useSpecVersions';
 
 export const useMediaAuthentication = (): boolean => {
-  const { versions, unstable_features: unstableFeatures } = useSpecVersions();
+  const { versions } = useSpecVersions();
 
   // Media authentication is introduced in spec version 1.11
-  const authenticatedMedia =
+  const authenticatedMedia = versions.includes('v1.11');
-    unstableFeatures?.['org.matrix.msc3916.stable'] || versions.includes('v1.11');
 
   return authenticatedMedia;
 };

src/app/organisms/settings/Settings.jsx

@@ -54,7 +54,6 @@ function AppearanceSection() {
   const [enterForNewline, setEnterForNewline] = useSetting(settingsAtom, 'enterForNewline');
   const [messageLayout, setMessageLayout] = useSetting(settingsAtom, 'messageLayout');
   const [messageSpacing, setMessageSpacing] = useSetting(settingsAtom, 'messageSpacing');
-  const [mxidColor, setMXIDColor] = useSetting(settingsAtom, 'mxidColor');
   const [twitterEmoji, setTwitterEmoji] = useSetting(settingsAtom, 'twitterEmoji');
   const [pageZoom, setPageZoom] = useSetting(settingsAtom, 'pageZoom');
   const [isMarkdown, setIsMarkdown] = useSetting(settingsAtom, 'isMarkdown');
@@ -190,11 +189,6 @@ function AppearanceSection() {
             />
           }
         />
-        <SettingTile
-          title="Username Color"
-          options={<Toggle isActive={mxidColor} onToggle={() => setMXIDColor(!mxidColor)} />}
-          content={<Text variant="b3">Color username with matrix userID.</Text>}
-        />
         <SettingTile
           title="Use ENTER for Newline"
           options={

src/app/pages/auth/AuthFooter.tsx

@@ -15,7 +15,7 @@ export function AuthFooter() {
         target="_blank"
         rel="noreferrer"
       >
-        v4.2.1
+        v4.1.0
       </Text>
       <Text as="a" size="T300" href="https://twitter.com/cinnyapp" target="_blank" rel="noreferrer">
         Twitter

src/app/pages/client/WelcomePage.tsx

@@ -24,7 +24,7 @@ export function WelcomePage() {
                   target="_blank"
                   rel="noreferrer noopener"
                 >
-                  v4.2.1
+                  v4.1.0
                 </a>
               </span>
             }

src/app/pages/client/inbox/Notifications.tsx

@@ -182,7 +182,6 @@ type RoomNotificationsGroupProps = {
   notifications: INotification[];
   mediaAutoLoad?: boolean;
   urlPreview?: boolean;
-  mxidColor?: boolean;
   onOpen: (roomId: string, eventId: string) => void;
 };
 function RoomNotificationsGroupComp({
@@ -190,7 +189,6 @@ function RoomNotificationsGroupComp({
   notifications,
   mediaAutoLoad,
   urlPreview,
-  mxidColor,
   onOpen,
 }: RoomNotificationsGroupProps) {
   const mx = useMatrixClient();
@@ -429,14 +427,7 @@ function RoomNotificationsGroupComp({
                         userId={event.sender}
                         src={
                           senderAvatarMxc
-                            ? mxcUrlToHttp(
+                            ? mxcUrlToHttp(mx, senderAvatarMxc, useAuthentication, 48, 48, 'crop') ?? undefined
-                                mx,
-                                senderAvatarMxc,
-                                useAuthentication,
-                                48,
-                                48,
-                                'crop'
-                              ) ?? undefined
                             : undefined
                         }
                         alt={displayName}
@@ -448,7 +439,7 @@ function RoomNotificationsGroupComp({
               >
                 <Box gap="300" justifyContent="SpaceBetween" alignItems="Center" grow="Yes">
                   <Box gap="200" alignItems="Baseline">
-                    <Username style={{ color: mxidColor ? colorMXID(event.sender) : undefined }}>
+                    <Username style={{ color: colorMXID(event.sender) }}>
                       <Text as="span" truncate>
                         <b>{displayName}</b>
                       </Text>
@@ -470,7 +461,6 @@ function RoomNotificationsGroupComp({
                   <Reply
                     mx={mx}
                     room={room}
-                    mxidColor={mxidColor}
                     replyEventId={replyEventId}
                     threadRootId={threadRootId}
                     onClick={handleOpenClick}
@@ -502,7 +492,6 @@ export function Notifications() {
   const mx = useMatrixClient();
   const [mediaAutoLoad] = useSetting(settingsAtom, 'mediaAutoLoad');
   const [urlPreview] = useSetting(settingsAtom, 'urlPreview');
-  const [mxidColor] = useSetting(settingsAtom, 'mxidColor');
   const screenSize = useScreenSizeContext();
 
   const { navigateRoom } = useRoomNavigate();
@@ -659,7 +648,6 @@ export function Notifications() {
                         <RoomNotificationsGroupComp
                           room={groupRoom}
                           notifications={group.notifications}
-                          mxidColor={mxidColor}
                           mediaAutoLoad={mediaAutoLoad}
                           urlPreview={urlPreview}
                           onOpen={navigateRoom}

src/app/state/settings.ts

@@ -17,7 +17,6 @@ export interface Settings {
   enterForNewline: boolean;
   messageLayout: MessageLayout;
   messageSpacing: MessageSpacing;
-  mxidColor: boolean;
   hideMembershipEvents: boolean;
   hideNickAvatarEvents: boolean;
   mediaAutoLoad: boolean;
@@ -42,7 +41,6 @@ const defaultSettings: Settings = {
   enterForNewline: false,
   messageLayout: 0,
   messageSpacing: '400',
-  mxidColor: true,
   hideMembershipEvents: false,
   hideNickAvatarEvents: true,
   mediaAutoLoad: true,

src/client/state/cons.js

@@ -1,5 +1,5 @@
 const cons = {
-  version: '4.2.1',
+  version: '4.1.0',
   secretKey: {
     ACCESS_TOKEN: 'cinny_access_token',
     DEVICE_ID: 'cinny_device_id',

src/index.tsx

@@ -21,25 +21,30 @@ import './app/i18n';
 document.body.classList.add(configClass, varsClass);
 settings.applyTheme();
 
-// Register Service Worker
+const registerServiceWorker = async () => {
   if ('serviceWorker' in navigator) {
     const swUrl =
       import.meta.env.MODE === 'production'
         ? `${trimTrailingSlash(import.meta.env.BASE_URL)}/sw.js`
         : `/dev-sw.js?dev-sw`;
 
-  navigator.serviceWorker.register(swUrl);
+    await navigator.serviceWorker.register(swUrl);
+
+    navigator.serviceWorker.ready.then((registration) => {
       navigator.serviceWorker.addEventListener('message', (event) => {
-    if (event.data?.type === 'token' && event.data?.responseKey) {
+        if (event.data?.type === 'token' && event.data?.messageId) {
-      // Get the token for SW.
           const token = localStorage.getItem('cinny_access_token') ?? undefined;
-      event.source!.postMessage({
+          registration.active?.postMessage({
-        responseKey: event.data.responseKey,
+            messageId: event.data.messageId,
             token,
           });
         }
       });
+    });
   }
+};
+
+window.addEventListener('load', registerServiceWorker);
 
 const mountApp = () => {
   const rootContainer = document.getElementById('root');

src/sw.ts

@@ -3,16 +3,26 @@
 export type {};
 declare const self: ServiceWorkerGlobalScope;
 
+type Message = { messageId: string };
+type MessageListener = (message: Message) => void;
+const messageListeners = new Map<string, MessageListener>();
+
+self.addEventListener('message', (event) => {
+  const { messageId } = event.data;
+  if (typeof messageId === 'string') {
+    messageListeners.get(messageId)?.(event.data);
+    messageListeners.delete(messageId);
+  }
+});
+
+type TokenMessage = Message & {
+  token?: string;
+};
 async function askForAccessToken(client: Client): Promise<string | undefined> {
   return new Promise((resolve) => {
-    const responseKey = Math.random().toString(36);
+    const messageId = Math.random().toString(36);
-    const listener = (event: ExtendableMessageEvent) => {
+    messageListeners.set(messageId, (message: TokenMessage) => resolve(message.token));
-      if (event.data.responseKey !== responseKey) return;
+    client.postMessage({ messageId, type: 'token' });
-      resolve(event.data.token);
-      self.removeEventListener('message', listener);
-    };
-    self.addEventListener('message', listener);
-    client.postMessage({ responseKey, type: 'token' });
   });
 }