Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ee05a73834 | |||
| 13dce0c20b | |||
| 41f06bfe54 | |||
| 0cadd83e45 |
@@ -1,6 +1,19 @@
|
|||||||
<a name="readme-top"></a>
|
<a name="readme-top"></a>
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.4.6](https://github.com/perfect-panel/ppanel-web/compare/v1.4.5...v1.4.6) (2025-09-17)
|
||||||
|
|
||||||
|
|
||||||
|
### 🎫 Chores
|
||||||
|
|
||||||
|
* Merge branch 'main' into develop ([41f06bf](https://github.com/perfect-panel/ppanel-web/commit/41f06bf))
|
||||||
|
|
||||||
|
|
||||||
|
### 🐛 Bug Fixes
|
||||||
|
|
||||||
|
* Add loaded state to node, server, and subscribe stores for better loading management ([13dce0c](https://github.com/perfect-panel/ppanel-web/commit/13dce0c))
|
||||||
|
* Removed node metadata fields in subscription schema to simplify structure ([0cadd83](https://github.com/perfect-panel/ppanel-web/commit/0cadd83))
|
||||||
|
|
||||||
## [1.4.5](https://github.com/perfect-panel/ppanel-web/compare/v1.4.4...v1.4.5) (2025-09-17)
|
## [1.4.5](https://github.com/perfect-panel/ppanel-web/compare/v1.4.4...v1.4.5) (2025-09-17)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -189,19 +189,6 @@ export const subscribeSchema = {
|
|||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
description: 'Whether this protocol is enabled',
|
description: 'Whether this protocol is enabled',
|
||||||
},
|
},
|
||||||
// Node metadata
|
|
||||||
Country: {
|
|
||||||
type: 'string',
|
|
||||||
description: 'Node country',
|
|
||||||
},
|
|
||||||
City: {
|
|
||||||
type: 'string',
|
|
||||||
description: 'Node city',
|
|
||||||
},
|
|
||||||
Ratio: {
|
|
||||||
type: 'number',
|
|
||||||
description: 'Traffic ratio multiplier',
|
|
||||||
},
|
|
||||||
// UUID for vmess/vless
|
// UUID for vmess/vless
|
||||||
UUID: {
|
UUID: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ interface NodeState {
|
|||||||
// Loading states
|
// Loading states
|
||||||
loading: boolean;
|
loading: boolean;
|
||||||
loadingTags: boolean;
|
loadingTags: boolean;
|
||||||
|
loaded: boolean;
|
||||||
|
loadedTags: boolean;
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
fetchNodes: () => Promise<void>;
|
fetchNodes: () => Promise<void>;
|
||||||
@@ -30,6 +32,8 @@ export const useNodeStore = create<NodeState>((set, get) => ({
|
|||||||
tags: [],
|
tags: [],
|
||||||
loading: false,
|
loading: false,
|
||||||
loadingTags: false,
|
loadingTags: false,
|
||||||
|
loaded: false,
|
||||||
|
loadedTags: false,
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
fetchNodes: async () => {
|
fetchNodes: async () => {
|
||||||
@@ -38,9 +42,13 @@ export const useNodeStore = create<NodeState>((set, get) => ({
|
|||||||
set({ loading: true });
|
set({ loading: true });
|
||||||
try {
|
try {
|
||||||
const { data } = await filterNodeList({ page: 1, size: 999999999 });
|
const { data } = await filterNodeList({ page: 1, size: 999999999 });
|
||||||
set({ nodes: data?.data?.list || [] });
|
set({
|
||||||
|
nodes: data?.data?.list || [],
|
||||||
|
loaded: true,
|
||||||
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Handle error silently
|
// Handle error silently
|
||||||
|
set({ loaded: true });
|
||||||
} finally {
|
} finally {
|
||||||
set({ loading: false });
|
set({ loading: false });
|
||||||
}
|
}
|
||||||
@@ -52,9 +60,13 @@ export const useNodeStore = create<NodeState>((set, get) => ({
|
|||||||
set({ loadingTags: true });
|
set({ loadingTags: true });
|
||||||
try {
|
try {
|
||||||
const { data } = await queryNodeTag();
|
const { data } = await queryNodeTag();
|
||||||
set({ tags: data?.data?.tags || [] });
|
set({
|
||||||
|
tags: data?.data?.tags || [],
|
||||||
|
loadedTags: true,
|
||||||
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Handle error silently
|
// Handle error silently
|
||||||
|
set({ loadedTags: true });
|
||||||
} finally {
|
} finally {
|
||||||
set({ loadingTags: false });
|
set({ loadingTags: false });
|
||||||
}
|
}
|
||||||
@@ -104,10 +116,10 @@ export const useNode = () => {
|
|||||||
const store = useNodeStore();
|
const store = useNodeStore();
|
||||||
|
|
||||||
// Auto-fetch nodes and tags
|
// Auto-fetch nodes and tags
|
||||||
if (store.nodes.length === 0 && !store.loading) {
|
if (!store.loaded && !store.loading) {
|
||||||
store.fetchNodes();
|
store.fetchNodes();
|
||||||
}
|
}
|
||||||
if (store.tags.length === 0 && !store.loadingTags) {
|
if (!store.loadedTags && !store.loadingTags) {
|
||||||
store.fetchTags();
|
store.fetchTags();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -116,6 +128,8 @@ export const useNode = () => {
|
|||||||
tags: store.tags,
|
tags: store.tags,
|
||||||
loading: store.loading,
|
loading: store.loading,
|
||||||
loadingTags: store.loadingTags,
|
loadingTags: store.loadingTags,
|
||||||
|
loaded: store.loaded,
|
||||||
|
loadedTags: store.loadedTags,
|
||||||
fetchNodes: store.fetchNodes,
|
fetchNodes: store.fetchNodes,
|
||||||
fetchTags: store.fetchTags,
|
fetchTags: store.fetchTags,
|
||||||
getNodeById: store.getNodeById,
|
getNodeById: store.getNodeById,
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ interface ServerState {
|
|||||||
|
|
||||||
// Loading states
|
// Loading states
|
||||||
loading: boolean;
|
loading: boolean;
|
||||||
|
loaded: boolean;
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
fetchServers: () => Promise<void>;
|
fetchServers: () => Promise<void>;
|
||||||
@@ -24,6 +25,7 @@ export const useServerStore = create<ServerState>((set, get) => ({
|
|||||||
// Initial state
|
// Initial state
|
||||||
servers: [],
|
servers: [],
|
||||||
loading: false,
|
loading: false,
|
||||||
|
loaded: false,
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
fetchServers: async () => {
|
fetchServers: async () => {
|
||||||
@@ -32,9 +34,13 @@ export const useServerStore = create<ServerState>((set, get) => ({
|
|||||||
set({ loading: true });
|
set({ loading: true });
|
||||||
try {
|
try {
|
||||||
const { data } = await filterServerList({ page: 1, size: 999999999 });
|
const { data } = await filterServerList({ page: 1, size: 999999999 });
|
||||||
set({ servers: data?.data?.list || [] });
|
set({
|
||||||
|
servers: data?.data?.list || [],
|
||||||
|
loaded: true,
|
||||||
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Handle error silently
|
// Handle error silently
|
||||||
|
set({ loaded: true });
|
||||||
} finally {
|
} finally {
|
||||||
set({ loading: false });
|
set({ loading: false });
|
||||||
}
|
}
|
||||||
@@ -84,13 +90,14 @@ export const useServer = () => {
|
|||||||
const store = useServerStore();
|
const store = useServerStore();
|
||||||
|
|
||||||
// Auto-fetch servers
|
// Auto-fetch servers
|
||||||
if (store.servers.length === 0 && !store.loading) {
|
if (!store.loaded && !store.loading) {
|
||||||
store.fetchServers();
|
store.fetchServers();
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
servers: store.servers,
|
servers: store.servers,
|
||||||
loading: store.loading,
|
loading: store.loading,
|
||||||
|
loaded: store.loaded,
|
||||||
fetchServers: store.fetchServers,
|
fetchServers: store.fetchServers,
|
||||||
getServerById: store.getServerById,
|
getServerById: store.getServerById,
|
||||||
getServerName: store.getServerName,
|
getServerName: store.getServerName,
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ interface SubscribeState {
|
|||||||
|
|
||||||
// Loading states
|
// Loading states
|
||||||
loading: boolean;
|
loading: boolean;
|
||||||
|
loaded: boolean;
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
fetchSubscribes: () => Promise<void>;
|
fetchSubscribes: () => Promise<void>;
|
||||||
@@ -20,6 +21,7 @@ export const useSubscribeStore = create<SubscribeState>((set, get) => ({
|
|||||||
// Initial state
|
// Initial state
|
||||||
subscribes: [],
|
subscribes: [],
|
||||||
loading: false,
|
loading: false,
|
||||||
|
loaded: false,
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
fetchSubscribes: async () => {
|
fetchSubscribes: async () => {
|
||||||
@@ -28,9 +30,13 @@ export const useSubscribeStore = create<SubscribeState>((set, get) => ({
|
|||||||
set({ loading: true });
|
set({ loading: true });
|
||||||
try {
|
try {
|
||||||
const { data } = await getSubscribeList({ page: 1, size: 999999999 });
|
const { data } = await getSubscribeList({ page: 1, size: 999999999 });
|
||||||
set({ subscribes: data?.data?.list || [] });
|
set({
|
||||||
|
subscribes: data?.data?.list || [],
|
||||||
|
loaded: true,
|
||||||
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Handle error silently
|
// Handle error silently
|
||||||
|
set({ loaded: true });
|
||||||
} finally {
|
} finally {
|
||||||
set({ loading: false });
|
set({ loading: false });
|
||||||
}
|
}
|
||||||
@@ -52,13 +58,14 @@ export const useSubscribe = () => {
|
|||||||
const store = useSubscribeStore();
|
const store = useSubscribeStore();
|
||||||
|
|
||||||
// Auto-fetch subscribes
|
// Auto-fetch subscribes
|
||||||
if (store.subscribes.length === 0 && !store.loading) {
|
if (!store.loaded && !store.loading) {
|
||||||
store.fetchSubscribes();
|
store.fetchSubscribes();
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
subscribes: store.subscribes,
|
subscribes: store.subscribes,
|
||||||
loading: store.loading,
|
loading: store.loading,
|
||||||
|
loaded: store.loaded,
|
||||||
fetchSubscribes: store.fetchSubscribes,
|
fetchSubscribes: store.fetchSubscribes,
|
||||||
getSubscribeName: store.getSubscribeName,
|
getSubscribeName: store.getSubscribeName,
|
||||||
getSubscribeById: store.getSubscribeById,
|
getSubscribeById: store.getSubscribeById,
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ppanel-web",
|
"name": "ppanel-web",
|
||||||
"version": "1.4.5",
|
"version": "1.4.6",
|
||||||
"private": true,
|
"private": true,
|
||||||
"homepage": "https://github.com/perfect-panel/ppanel-web",
|
"homepage": "https://github.com/perfect-panel/ppanel-web",
|
||||||
"bugs": {
|
"bugs": {
|
||||||
|
|||||||
Reference in New Issue
Block a user