refactor: extract better-auth and emitter packages

apps/chat/app/login-github.tsx

@@ -1,10 +1,12 @@
 import { Home } from '@tamagui/lucide-icons'
 import { useEffect } from 'react'
-import { githubSignIn } from '~/better-auth/githubSignIn'
+import { authClient } from '~/better-auth/authClient'
 
 export default function () {
   useEffect(() => {
-    githubSignIn()
+    authClient.signIn.social({
+      provider: 'github',
+    })
   }, [])
 
   return <Home />

apps/chat/package.json

@@ -43,7 +43,8 @@
     "@tauri-apps/plugin-shell": "^2",
     "@uiw/react-md-editor": "^4.0.5",
     "@vxrn/color-scheme": "workspace:*",
-    "better-auth": "1.0.10",
+    "@vxrn/emitter": "workspace:*",
+    "better-auth": "1.0.23-beta.3",
     "flexsearch": "^0.7.43",
     "one": "workspace:*",
     "pg": "^8.13.1",

apps/chat/src/better-auth/AuthEffects.tsx

@@ -2,8 +2,7 @@ import { onOpenUrl } from '@tauri-apps/plugin-deep-link'
 import { useEffect } from 'react'
 import { isTauri } from '~/tauri/constants'
 import { setZeroAuth } from '../zero/zero'
-import { setAuth } from './authClient'
-import { useAuth } from './useAuth'
+import { setAuthClientToken, useAuth } from './authClient'
 
 export const AuthEffects = () => {
   useAuthPassTokenToTauriEffect()
@@ -39,7 +38,7 @@ const useAuthPassTokenToTauriEffect = () => {
             const session = url.searchParams.get('session')
 
             if (token && session) {
-              setAuth({
+              setAuthClientToken({
                 token,
                 session,
               })

apps/chat/src/better-auth/authClient.ts

@@ -1,35 +1,3 @@
-import { createAuthClient } from 'better-auth/client'
-import { createEmitter } from '~/helpers/emitter'
+import { createBetterAuthClient } from '@vxrn/better-auth'
 
-const keys = {
-  token: 'TOKEN_KEY',
-  session: 'SESSION_KEY',
-}
-
-const existingSession =
-  typeof localStorage !== 'undefined' ? localStorage.getItem(keys.session) : ''
-
-export let authClient = existingSession
-  ? createAuthClientWithSession(existingSession)
-  : createAuthClient()
-
-export const [emit, _, useRefreshAuthClient] = createEmitter<number>()
-
-globalThis['authClient'] = authClient
-
-function createAuthClientWithSession(session: string) {
-  return createAuthClient({
-    fetchOptions: {
-      headers: {
-        Authorization: `Bearer ${session}`,
-      },
-    },
-  })
-}
-
-export const setAuth = ({ token, session }: { token: string; session: string }) => {
-  localStorage.setItem(keys.token, token)
-  localStorage.setItem(keys.session, session)
-  authClient = createAuthClientWithSession(session)
-  emit(Math.random())
-}
+export const { authClient, setAuthClientToken, useAuth } = createBetterAuthClient()

apps/chat/src/interface/SearchableList.tsx

@@ -6,6 +6,7 @@ import {
   useListNavigation,
   useRole,
 } from '@floating-ui/react'
+import { createEmitter } from '@vxrn/emitter'
 import { createContext, forwardRef, useContext, useMemo, useRef, useState } from 'react'
 import {
   type Input,
@@ -15,7 +16,6 @@ import {
   useGet,
   usePropsAndStyle,
 } from 'tamagui'
-import { createEmitter } from '~/helpers/emitter'
 
 type ContextType = {
   getItemProps: (index: number) => any
@@ -30,7 +30,7 @@ type ContextType = {
 
 const Context = createContext<null | ContextType>(null)
 
-const [activeIndexEmit, _, useActiveIndex] = createEmitter<number>()
+const emitter = createEmitter<number>()
 
 export function SearchableList<A>({
   items,
@@ -52,7 +52,7 @@ export function SearchableList<A>({
     onNavigate: (index) => {
       if (typeof index === 'number') {
         setActiveIndex(index)
-        activeIndexEmit(index)
+        emitter.emit(index)
       }
     },
   })
@@ -128,7 +128,7 @@ export const SearchableListItem = ({
   const context = useContext(Context)
   const [active, setActive] = useState(false)
 
-  useActiveIndex((cur) => {
+  emitter.use((cur) => {
     setActive(index === cur)
   })
 

apps/chat/src/interface/TopBar.tsx

@@ -2,8 +2,7 @@ import { ChevronLeft, Search, Settings2, UserCircle } from '@tamagui/lucide-icon
 import { memo, useRef } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { H1, Input, TooltipSimple, XStack } from 'tamagui'
-import { githubSignIn } from '~/better-auth/githubSignIn'
-import { useAuth } from '~/better-auth/useAuth'
+import { authClient, useAuth } from '~/better-auth/authClient'
 import { HotMenu } from '~/interface/hotmenu/HotMenu'
 import { useCurrentChannel, useCurrentServer } from '~/state/server'
 import { updateUserState, useUserState } from '~/state/user'
@@ -116,7 +115,9 @@ const UserButton = () => {
 
           if (!isTauri) {
             e.preventDefault()
-            githubSignIn()
+            authClient.signIn.social({
+              provider: 'github',
+            })
             return
           }
         }}

apps/chat/src/interface/dialogs/DialogAddFriend.tsx

@@ -1,32 +1,32 @@
 import { UserCheck, UserPlus, UserX } from '@tamagui/lucide-icons'
+import { createEmitter } from '@vxrn/emitter'
 import { useEffect, useRef, useState } from 'react'
 import { Dialog, Input, TooltipSimple, XStack, YStack } from 'tamagui'
+import { useAuth } from '~/better-auth/authClient'
 import type { Friendship, User } from '~/zero/schema'
-import { useAuth } from '~/better-auth/useAuth'
 import { mutate, useQuery } from '~/zero/zero'
-import { createEmitter } from '~/helpers/emitter'
 import { Avatar } from '../Avatar'
 import { Row } from '../Row'
 import { dialogConfirm } from './DialogConfirm'
 import { DialogContent, dialogEmit, DialogOverlay, useDialogEmit } from './shared'
 
-const [emit, listen] = createEmitter<boolean>()
+const emitter = createEmitter<boolean>()
 
 export const dialogAddFriend = async () => {
   dialogEmit({
     type: 'add-friend',
   })
 
   return new Promise((res) => {
-    const dispose = listen((val) => {
+    const dispose = emitter.listen((val) => {
       dispose()
       res(val)
     })
   })
 }
 
-const success = () => emit(true)
-const cancel = () => emit(false)
+const success = () => emitter.emit(true)
+const cancel = () => emitter.emit(false)
 
 export const DialogAddFriend = () => {
   const [show, setShow] = useState(false)

apps/chat/src/interface/dialogs/DialogConfirm.tsx

@@ -1,11 +1,11 @@
 import { useState } from 'react'
 import { Dialog, H3, Paragraph, XStack, YStack } from 'tamagui'
-import { createEmitter } from '~/helpers/emitter'
+import { createEmitter } from '@vxrn/emitter'
 import { ButtonSimple } from '../ButtonSimple'
 import { DialogContent, dialogEmit, DialogOverlay, useDialogEmit } from './shared'
 import type { DialogConfirmType } from './types'
 
-const [emit, listen] = createEmitter<boolean>()
+const emitter = createEmitter<boolean>()
 
 export const dialogConfirm = async (props: Omit<DialogConfirmType, 'type'>) => {
   dialogEmit({
@@ -14,7 +14,7 @@ export const dialogConfirm = async (props: Omit<DialogConfirmType, 'type'>) => {
   })
 
   return new Promise((res) => {
-    const dispose = listen((val) => {
+    const dispose = emitter.listen((val) => {
       dispose()
       res(val)
     })
@@ -49,7 +49,7 @@ export const DialogConfirm = () => {
             <Dialog.Close asChild>
               <ButtonSimple
                 onPress={() => {
-                  emit(false)
+                  emitter.emit(false)
                   setState(null)
                 }}
               >
@@ -59,7 +59,7 @@ export const DialogConfirm = () => {
 
             <ButtonSimple
               onPress={() => {
-                emit(true)
+                emitter.emit(true)
                 setState(null)
               }}
             >

apps/chat/src/interface/dialogs/DialogCreateJoinServer.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useRef, useState } from 'react'
 import { Button, Dialog, Input, ScrollView, XStack, YStack } from 'tamagui'
 import { insertServer } from '~/state/mutateServer'
-import { createEmitter } from '~/helpers/emitter'
+import { createEmitter } from '@vxrn/emitter'
 import { LabeledRow } from '../forms/LabeledRow'
 import { Tabs } from '../tabs/Tabs'
 import { AvatarUpload } from '../upload/AvatarUpload'
@@ -10,14 +10,14 @@ import { DialogJoinServerContent } from './DialogJoinServerContent'
 import { DialogContent, dialogEmit, DialogOverlay, useDialogEmit } from './shared'
 import type { TabContentPaneProps } from './types'
 
-const [emit, listen] = createEmitter<boolean>()
+const serverDialogEmitter = createEmitter<boolean>()
 
 export const dialogCreateServer = async () => {
   dialogEmit({
     type: 'create-server',
   })
   return new Promise((res) => {
-    const dispose = listen((val) => {
+    const dispose = serverDialogEmitter.listen((val) => {
       dispose()
       res(val)
     })
@@ -29,15 +29,15 @@ export const dialogJoinServer = async () => {
     type: 'join-server',
   })
   return new Promise((res) => {
-    const dispose = listen((val) => {
+    const dispose = serverDialogEmitter.listen((val) => {
       dispose()
       res(val)
     })
   })
 }
 
-const success = () => emit(true)
-const cancel = () => emit(false)
+const success = () => serverDialogEmitter.emit(true)
+const cancel = () => serverDialogEmitter.emit(false)
 
 export const DialogCreateJoinServer = () => {
   const [show, setShow] = useState(false)

apps/chat/src/interface/dialogs/DialogJoinServerContent.tsx

@@ -1,7 +1,7 @@
 import { Check, DoorOpen } from '@tamagui/lucide-icons'
 import { useEffect, useRef, useState } from 'react'
 import { TooltipSimple, XStack, YStack } from 'tamagui'
-import { useAuth } from '~/better-auth/useAuth'
+import { useAuth } from '~/better-auth/authClient'
 import { mutate, useQuery } from '~/zero/zero'
 import { Avatar } from '../Avatar'
 import { Row } from '../Row'

apps/chat/src/interface/dialogs/shared.tsx

@@ -1,8 +1,10 @@
-import { createEmitter } from '~/helpers/emitter'
+import { createEmitter } from '@vxrn/emitter'
 import type { DialogType } from './types'
 import { Dialog, styled } from 'tamagui'
 
-export const [dialogEmit, dialogListen, useDialogEmit] = createEmitter<DialogType>()
+export const dialogEmitter = createEmitter<DialogType>()
+export const dialogEmit = dialogEmitter.emit
+export const useDialogEmit = dialogEmitter.use
 
 export const DialogOverlay = styled(Dialog.Overlay, {
   // @ts-ignore

apps/chat/src/interface/messages/MessageInput.tsx

@@ -1,11 +1,11 @@
 import { useEffect, useRef } from 'react'
 import { Input, YStack } from 'tamagui'
-import { useAuth } from '~/better-auth/useAuth'
+import { useAuth } from '~/better-auth/authClient'
 import { useCurrentChannel, useCurrentServer } from '~/state/server'
 import { getDerivedUserState, updateUserCurrentChannel, useCurrentThread } from '~/state/user'
 import { randomID } from '~/helpers/randomID'
 import { mutate } from '~/zero/zero'
-import { messagesListEmit } from './MessagesList'
+import { messagesListEmitter } from './MessagesList'
 import { Editor } from '~/editor/Editor'
 
 let mainInputRef: Input | null = null
@@ -34,23 +34,23 @@ export const MessageInput = ({ inThread }: { inThread?: boolean }) => {
           const key = e.key
           switch (key) {
             case 'ArrowUp': {
-              messagesListEmit({
+              messagesListEmitter.emit({
                 type: 'move',
                 value: 'up',
               })
               break
             }
 
             case 'ArrowDown': {
-              messagesListEmit({
+              messagesListEmitter.emit({
                 type: 'move',
                 value: 'down',
               })
               break
             }
 
             case 'Enter': {
-              messagesListEmit({
+              messagesListEmitter.emit({
                 type: 'select',
               })
               break

apps/chat/src/interface/messages/MessageItem.tsx

@@ -11,7 +11,7 @@ import {
   YStack,
 } from 'tamagui'
 import type { Channel, Message, MessageWithRelations, Reaction, Thread, User } from '~/zero/schema'
-import { useAuth } from '~/better-auth/useAuth'
+import { useAuth } from '~/better-auth/authClient'
 import { currentUser, updateUserOpenThread, useUserCurrentChannelState } from '~/state/user'
 import { randomID } from '~/helpers/randomID'
 import { mutate, useQuery } from '~/zero/zero'