Skip to content
This repository has been archived by the owner on Nov 3, 2023. It is now read-only.

Commit

Permalink
feat: record selected proxy
Browse files Browse the repository at this point in the history
  • Loading branch information
zzzgydi committed Dec 27, 2021
1 parent 61b9670 commit 14bda4f
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 11 deletions.
20 changes: 20 additions & 0 deletions src/components/proxy-group.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import {
} from "@mui/icons-material";
import { updateProxy } from "../services/api";
import { ApiType } from "../services/types";
import { getProfiles, setProfiles } from "../services/cmds";
import noop from "../utils/noop";

interface ItemProps {
proxy: ApiType.ProxyItem;
Expand Down Expand Up @@ -86,6 +88,24 @@ const ProxyGroup = ({ group }: Props) => {
try {
setNow(name);
await updateProxy(group.name, name);

const profiles = await getProfiles().catch(console.error);
if (!profiles) return;
const profile = profiles.items![profiles.current!]!;
if (!profile) return;
if (!profile.selected) profile.selected = [];

const index = profile.selected.findIndex(
(item) => item.name === group.name
);

if (index < 0) {
profile.selected.push({ name: group.name, now: name });
} else {
profile.selected[index] = { name: group.name, now: name };
}

setProfiles(profiles.current!, profile).catch(console.error);
} catch {
setNow(oldValue);
// Todo
Expand Down
49 changes: 45 additions & 4 deletions src/pages/profile.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
import { useRef, useState } from "react";
import { useEffect, useRef, useState } from "react";
import useSWR, { useSWRConfig } from "swr";
import { Box, Button, Grid, TextField, Typography } from "@mui/material";
import { getProfiles, importProfile, putProfiles } from "../services/cmds";
import { getProxies } from "../services/api";
import {
getProfiles,
putProfiles,
setProfiles,
importProfile,
} from "../services/cmds";
import { getProxies, updateProxy } from "../services/api";
import ProfileItemComp from "../components/profile-item";
import useNotice from "../utils/use-notice";
import noop from "../utils/noop";
Expand All @@ -15,6 +20,43 @@ const ProfilePage = () => {
const { mutate } = useSWRConfig();
const { data: profiles = {} } = useSWR("getProfiles", getProfiles);

useEffect(() => {
if (profiles.current == null) return;

const profile = profiles.items![profiles.current];
if (!profile) return;

getProxies().then((proxiesData) => {
mutate("getProxies", proxiesData);
// init selected array
const { selected = [] } = profile;
const selectedMap = Object.fromEntries(
selected.map((each) => [each.name!, each.now!])
);
// todo: enhance error handle
let hasChange = false;
proxiesData.groups.forEach((group) => {
const { name, now } = group;

if (!now || selectedMap[name] === now) return;
if (selectedMap[name] == null) {
selectedMap[name] = now!;
} else {
hasChange = true;
updateProxy(name, selectedMap[name]);
}
});
// update profile selected list
profile.selected = Object.entries(selectedMap).map(([name, now]) => ({
name,
now,
}));
setProfiles(profiles.current!, profile).catch(console.error);
// update proxies cache
if (hasChange) mutate("getProxies", getProxies());
});
}, [profiles]);

const onImport = async () => {
if (!url) return;
setUrl("");
Expand All @@ -39,7 +81,6 @@ const ProfilePage = () => {
putProfiles(index)
.then(() => {
mutate("getProfiles", { ...profiles, current: index }, true);
mutate("getProxies", getProxies());
})
.catch((err) => {
console.error(err);
Expand Down
4 changes: 2 additions & 2 deletions src/pages/proxy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { getProxies } from "../services/api";
import ProxyGroup from "../components/proxy-group";

const ProxyPage = () => {
const { data } = useSWR("getProxies", getProxies);
const { groups = [] } = data ?? {};
const { data: proxiesData } = useSWR("getProxies", getProxies);
const { groups = [] } = proxiesData ?? {};

return (
<Box sx={{ width: 0.9, maxWidth: "850px", mx: "auto", mb: 2 }}>
Expand Down
7 changes: 2 additions & 5 deletions src/services/cmds.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,8 @@ export async function getProfiles() {
return (await invoke<CmdType.ProfilesConfig>("get_profiles")) ?? {};
}

export async function setProfiles(
current: number,
profile: CmdType.ProfileItem
) {
return invoke<void>("set_profiles", { current, profile });
export async function setProfiles(index: number, profile: CmdType.ProfileItem) {
return invoke<void>("set_profiles", { index, profile });
}

export async function putProfiles(current: number) {
Expand Down

0 comments on commit 14bda4f

Please sign in to comment.