diff --git a/src/main-layout.tsx b/src/main-layout.tsx index 124a94d..f8f07f3 100644 --- a/src/main-layout.tsx +++ b/src/main-layout.tsx @@ -6,6 +6,7 @@ import { Dialog, DialogContent, DialogDescription, + DialogFooter, DialogHeader, DialogTitle, DialogTrigger, @@ -85,65 +86,82 @@ export default function MainLayout() { /> Ephemeral {packageJson.version} - - Ephemeral is a powerful proxy with Ultraviolet and other - features, made by the z1g Project. -
- Ephemeral uses the following things: -
- - Developers: -
- -
- Copyright 2024 z1g Project.{" "} - {data.sha && data.commit ? ( - - Last commit was on{" "} + + + Ephemeral is a powerful proxy with Ultraviolet and other features, + made by the z1g Project. +
+ Ephemeral uses the following things: +
+ + Developers: +
+ +
+ Copyright 2024 z1g Project.{" "} + {data.sha && data.commit ? ( + + Last commit was on{" "} + + {new Date( + data?.commit?.committer.date, + ).toLocaleDateString()}{" "} + by {data?.commit?.author.name}. + +
+ Commit SHA: {data.sha.slice(0, 7)} + + ) : ( + "No commit information available." + )} +
+ This version of Ephemeral was built on{" "} + {__BUILD_DATE__.toLocaleString()} + + + + diff --git a/src/pages/settings/ProxySettings.tsx b/src/pages/settings/ProxySettings.tsx index 960d9c8..a916f06 100644 --- a/src/pages/settings/ProxySettings.tsx +++ b/src/pages/settings/ProxySettings.tsx @@ -20,6 +20,7 @@ import { SelectContent, SelectItem, } from "@/components/ui/select"; +import { unregisterServiceWorker } from "@/utils/swUtil"; export default function ProxySettings() { const { toast } = useToast(); const [config, reset, loading] = useConfig("proxy"); // Using the useConfig hook to get proxy settings @@ -35,6 +36,7 @@ export default function ProxySettings() { const handleSave = () => { if (wispServerRef.current) config && (config.wispServer = wispServerRef.current?.value); + unregisterServiceWorker(); toast({ title: "Proxy Settings have been saved", }); @@ -42,6 +44,7 @@ export default function ProxySettings() { }; const handleReset = () => { reset(); + unregisterServiceWorker(); toast({ title: "Proxy Settings have been reset", variant: "destructive", diff --git a/src/routes.tsx b/src/routes.tsx index c749f86..0f774b3 100644 --- a/src/routes.tsx +++ b/src/routes.tsx @@ -66,10 +66,10 @@ export default function AppRoutes() { const [config] = useConfig("proxy"); useEffect(() => { try { + registerRemoteListener(navigator.serviceWorker.controller!); SetTransport(transports[config.transport], { wisp: config.wispServer, }); - registerRemoteListener(navigator.serviceWorker.controller!); } catch (e) { console.error(e); }