mirror of
https://github.com/samanhappy/mcphub.git
synced 2026-01-06 22:58:11 -05:00
feat: implement pagination for server list with customizable items pe… (#534)
This commit is contained in:
@@ -1,16 +1,20 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
interface PaginationProps {
|
interface PaginationProps {
|
||||||
currentPage: number;
|
currentPage: number;
|
||||||
totalPages: number;
|
totalPages: number;
|
||||||
onPageChange: (page: number) => void;
|
onPageChange: (page: number) => void;
|
||||||
|
disabled?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const Pagination: React.FC<PaginationProps> = ({
|
const Pagination: React.FC<PaginationProps> = ({
|
||||||
currentPage,
|
currentPage,
|
||||||
totalPages,
|
totalPages,
|
||||||
onPageChange
|
onPageChange,
|
||||||
|
disabled = false
|
||||||
}) => {
|
}) => {
|
||||||
|
const { t } = useTranslation();
|
||||||
// Generate page buttons
|
// Generate page buttons
|
||||||
const getPageButtons = () => {
|
const getPageButtons = () => {
|
||||||
const buttons = [];
|
const buttons = [];
|
||||||
@@ -95,26 +99,26 @@ const Pagination: React.FC<PaginationProps> = ({
|
|||||||
<div className="flex justify-center items-center my-6">
|
<div className="flex justify-center items-center my-6">
|
||||||
<button
|
<button
|
||||||
onClick={() => onPageChange(Math.max(1, currentPage - 1))}
|
onClick={() => onPageChange(Math.max(1, currentPage - 1))}
|
||||||
disabled={currentPage === 1}
|
disabled={disabled || currentPage === 1}
|
||||||
className={`px-3 py-1 rounded mr-2 ${currentPage === 1
|
className={`px-3 py-1 rounded mr-2 ${disabled || currentPage === 1
|
||||||
? 'bg-gray-100 text-gray-400 cursor-not-allowed'
|
? 'bg-gray-100 text-gray-400 cursor-not-allowed'
|
||||||
: 'bg-gray-200 hover:bg-gray-300 text-gray-700 btn-secondary'
|
: 'bg-gray-200 hover:bg-gray-300 text-gray-700 btn-secondary'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
« Prev
|
« {t('common.previous')}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div className="flex">{getPageButtons()}</div>
|
<div className="flex">{getPageButtons()}</div>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
onClick={() => onPageChange(Math.min(totalPages, currentPage + 1))}
|
onClick={() => onPageChange(Math.min(totalPages, currentPage + 1))}
|
||||||
disabled={currentPage === totalPages}
|
disabled={disabled || currentPage === totalPages}
|
||||||
className={`px-3 py-1 rounded ml-2 ${currentPage === totalPages
|
className={`px-3 py-1 rounded ml-2 ${disabled || currentPage === totalPages
|
||||||
? 'bg-gray-100 text-gray-400 cursor-not-allowed'
|
? 'bg-gray-100 text-gray-400 cursor-not-allowed'
|
||||||
: 'bg-gray-200 hover:bg-gray-300 text-gray-700 btn-secondary'
|
: 'bg-gray-200 hover:bg-gray-300 text-gray-700 btn-secondary'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
Next »
|
{t('common.next')} »
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -17,6 +17,16 @@ const CONFIG = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Pagination info type
|
||||||
|
interface PaginationInfo {
|
||||||
|
page: number;
|
||||||
|
limit: number;
|
||||||
|
total: number;
|
||||||
|
totalPages: number;
|
||||||
|
hasNextPage: boolean;
|
||||||
|
hasPrevPage: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
// Context type definition
|
// Context type definition
|
||||||
interface ServerContextType {
|
interface ServerContextType {
|
||||||
servers: Server[];
|
servers: Server[];
|
||||||
@@ -24,6 +34,11 @@ interface ServerContextType {
|
|||||||
setError: (error: string | null) => void;
|
setError: (error: string | null) => void;
|
||||||
isLoading: boolean;
|
isLoading: boolean;
|
||||||
fetchAttempts: number;
|
fetchAttempts: number;
|
||||||
|
pagination: PaginationInfo | null;
|
||||||
|
currentPage: number;
|
||||||
|
serversPerPage: number;
|
||||||
|
setCurrentPage: (page: number) => void;
|
||||||
|
setServersPerPage: (limit: number) => void;
|
||||||
triggerRefresh: () => void;
|
triggerRefresh: () => void;
|
||||||
refreshIfNeeded: () => void; // Smart refresh with debounce
|
refreshIfNeeded: () => void; // Smart refresh with debounce
|
||||||
handleServerAdd: () => void;
|
handleServerAdd: () => void;
|
||||||
@@ -45,6 +60,9 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
const [refreshKey, setRefreshKey] = useState(0);
|
const [refreshKey, setRefreshKey] = useState(0);
|
||||||
const [isInitialLoading, setIsInitialLoading] = useState(true);
|
const [isInitialLoading, setIsInitialLoading] = useState(true);
|
||||||
const [fetchAttempts, setFetchAttempts] = useState(0);
|
const [fetchAttempts, setFetchAttempts] = useState(0);
|
||||||
|
const [pagination, setPagination] = useState<PaginationInfo | null>(null);
|
||||||
|
const [currentPage, setCurrentPage] = useState(1);
|
||||||
|
const [serversPerPage, setServersPerPage] = useState(10);
|
||||||
|
|
||||||
// Timer reference for polling
|
// Timer reference for polling
|
||||||
const intervalRef = useRef<NodeJS.Timeout | null>(null);
|
const intervalRef = useRef<NodeJS.Timeout | null>(null);
|
||||||
@@ -73,18 +91,31 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
const fetchServers = async () => {
|
const fetchServers = async () => {
|
||||||
try {
|
try {
|
||||||
console.log('[ServerContext] Fetching servers from API...');
|
console.log('[ServerContext] Fetching servers from API...');
|
||||||
const data = await apiGet('/servers');
|
// Build query parameters for pagination
|
||||||
|
const params = new URLSearchParams();
|
||||||
|
params.append('page', currentPage.toString());
|
||||||
|
params.append('limit', serversPerPage.toString());
|
||||||
|
const data = await apiGet(`/servers?${params.toString()}`);
|
||||||
|
|
||||||
// Update last fetch time
|
// Update last fetch time
|
||||||
lastFetchTimeRef.current = Date.now();
|
lastFetchTimeRef.current = Date.now();
|
||||||
|
|
||||||
if (data && data.success && Array.isArray(data.data)) {
|
if (data && data.success && Array.isArray(data.data)) {
|
||||||
setServers(data.data);
|
setServers(data.data);
|
||||||
|
// Update pagination info if available
|
||||||
|
if (data.pagination) {
|
||||||
|
setPagination(data.pagination);
|
||||||
|
} else {
|
||||||
|
setPagination(null);
|
||||||
|
}
|
||||||
} else if (data && Array.isArray(data)) {
|
} else if (data && Array.isArray(data)) {
|
||||||
|
// Compatibility handling for non-paginated responses
|
||||||
setServers(data);
|
setServers(data);
|
||||||
|
setPagination(null);
|
||||||
} else {
|
} else {
|
||||||
console.error('Invalid server data format:', data);
|
console.error('Invalid server data format:', data);
|
||||||
setServers([]);
|
setServers([]);
|
||||||
|
setPagination(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reset error state
|
// Reset error state
|
||||||
@@ -114,7 +145,7 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
// Set up regular polling
|
// Set up regular polling
|
||||||
intervalRef.current = setInterval(fetchServers, CONFIG.normal.pollingInterval);
|
intervalRef.current = setInterval(fetchServers, CONFIG.normal.pollingInterval);
|
||||||
},
|
},
|
||||||
[t],
|
[t, currentPage, serversPerPage],
|
||||||
);
|
);
|
||||||
|
|
||||||
// Watch for authentication status changes
|
// Watch for authentication status changes
|
||||||
@@ -150,7 +181,11 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
const fetchInitialData = async () => {
|
const fetchInitialData = async () => {
|
||||||
try {
|
try {
|
||||||
console.log('[ServerContext] Initial fetch - attempt', attemptsRef.current + 1);
|
console.log('[ServerContext] Initial fetch - attempt', attemptsRef.current + 1);
|
||||||
const data = await apiGet('/servers');
|
// Build query parameters for pagination
|
||||||
|
const params = new URLSearchParams();
|
||||||
|
params.append('page', currentPage.toString());
|
||||||
|
params.append('limit', serversPerPage.toString());
|
||||||
|
const data = await apiGet(`/servers?${params.toString()}`);
|
||||||
|
|
||||||
// Update last fetch time
|
// Update last fetch time
|
||||||
lastFetchTimeRef.current = Date.now();
|
lastFetchTimeRef.current = Date.now();
|
||||||
@@ -158,6 +193,12 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
// Handle API response wrapper object, extract data field
|
// Handle API response wrapper object, extract data field
|
||||||
if (data && data.success && Array.isArray(data.data)) {
|
if (data && data.success && Array.isArray(data.data)) {
|
||||||
setServers(data.data);
|
setServers(data.data);
|
||||||
|
// Update pagination info if available
|
||||||
|
if (data.pagination) {
|
||||||
|
setPagination(data.pagination);
|
||||||
|
} else {
|
||||||
|
setPagination(null);
|
||||||
|
}
|
||||||
setIsInitialLoading(false);
|
setIsInitialLoading(false);
|
||||||
// Initialization successful, start normal polling (skip immediate to avoid duplicate fetch)
|
// Initialization successful, start normal polling (skip immediate to avoid duplicate fetch)
|
||||||
startNormalPolling({ immediate: false });
|
startNormalPolling({ immediate: false });
|
||||||
@@ -165,6 +206,7 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
} else if (data && Array.isArray(data)) {
|
} else if (data && Array.isArray(data)) {
|
||||||
// Compatibility handling, if API directly returns array
|
// Compatibility handling, if API directly returns array
|
||||||
setServers(data);
|
setServers(data);
|
||||||
|
setPagination(null);
|
||||||
setIsInitialLoading(false);
|
setIsInitialLoading(false);
|
||||||
// Initialization successful, start normal polling (skip immediate to avoid duplicate fetch)
|
// Initialization successful, start normal polling (skip immediate to avoid duplicate fetch)
|
||||||
startNormalPolling({ immediate: false });
|
startNormalPolling({ immediate: false });
|
||||||
@@ -173,6 +215,7 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
// If data format is not as expected, set to empty array
|
// If data format is not as expected, set to empty array
|
||||||
console.error('Invalid server data format:', data);
|
console.error('Invalid server data format:', data);
|
||||||
setServers([]);
|
setServers([]);
|
||||||
|
setPagination(null);
|
||||||
setIsInitialLoading(false);
|
setIsInitialLoading(false);
|
||||||
// Initialization successful but data is empty, start normal polling (skip immediate)
|
// Initialization successful but data is empty, start normal polling (skip immediate)
|
||||||
startNormalPolling({ immediate: false });
|
startNormalPolling({ immediate: false });
|
||||||
@@ -227,7 +270,7 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
return () => {
|
return () => {
|
||||||
clearTimer();
|
clearTimer();
|
||||||
};
|
};
|
||||||
}, [refreshKey, t, isInitialLoading, startNormalPolling]);
|
}, [refreshKey, t, isInitialLoading, startNormalPolling, currentPage, serversPerPage]);
|
||||||
|
|
||||||
// Manually trigger refresh (always refreshes)
|
// Manually trigger refresh (always refreshes)
|
||||||
const triggerRefresh = useCallback(() => {
|
const triggerRefresh = useCallback(() => {
|
||||||
@@ -383,12 +426,28 @@ export const ServerProvider: React.FC<{ children: React.ReactNode }> = ({ childr
|
|||||||
[t, triggerRefresh],
|
[t, triggerRefresh],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Handle page change
|
||||||
|
const handlePageChange = useCallback((page: number) => {
|
||||||
|
setCurrentPage(page);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
// Handle servers per page change
|
||||||
|
const handleServersPerPageChange = useCallback((limit: number) => {
|
||||||
|
setServersPerPage(limit);
|
||||||
|
setCurrentPage(1); // Reset to first page when changing page size
|
||||||
|
}, []);
|
||||||
|
|
||||||
const value: ServerContextType = {
|
const value: ServerContextType = {
|
||||||
servers,
|
servers,
|
||||||
error,
|
error,
|
||||||
setError,
|
setError,
|
||||||
isLoading: isInitialLoading,
|
isLoading: isInitialLoading,
|
||||||
fetchAttempts,
|
fetchAttempts,
|
||||||
|
pagination,
|
||||||
|
currentPage,
|
||||||
|
serversPerPage,
|
||||||
|
setCurrentPage: handlePageChange,
|
||||||
|
setServersPerPage: handleServersPerPageChange,
|
||||||
triggerRefresh,
|
triggerRefresh,
|
||||||
refreshIfNeeded,
|
refreshIfNeeded,
|
||||||
handleServerAdd,
|
handleServerAdd,
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import EditServerForm from '@/components/EditServerForm';
|
|||||||
import { useServerData } from '@/hooks/useServerData';
|
import { useServerData } from '@/hooks/useServerData';
|
||||||
import DxtUploadForm from '@/components/DxtUploadForm';
|
import DxtUploadForm from '@/components/DxtUploadForm';
|
||||||
import JSONImportForm from '@/components/JSONImportForm';
|
import JSONImportForm from '@/components/JSONImportForm';
|
||||||
|
import Pagination from '@/components/ui/Pagination';
|
||||||
|
|
||||||
const ServersPage: React.FC = () => {
|
const ServersPage: React.FC = () => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
@@ -17,6 +18,11 @@ const ServersPage: React.FC = () => {
|
|||||||
error,
|
error,
|
||||||
setError,
|
setError,
|
||||||
isLoading,
|
isLoading,
|
||||||
|
pagination,
|
||||||
|
currentPage,
|
||||||
|
serversPerPage,
|
||||||
|
setCurrentPage,
|
||||||
|
setServersPerPage,
|
||||||
handleServerAdd,
|
handleServerAdd,
|
||||||
handleServerEdit,
|
handleServerEdit,
|
||||||
handleServerRemove,
|
handleServerRemove,
|
||||||
@@ -151,6 +157,7 @@ const ServersPage: React.FC = () => {
|
|||||||
<p className="text-gray-600">{t('app.noServers')}</p>
|
<p className="text-gray-600">{t('app.noServers')}</p>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
|
<>
|
||||||
<div className="space-y-6">
|
<div className="space-y-6">
|
||||||
{servers.map((server, index) => (
|
{servers.map((server, index) => (
|
||||||
<ServerCard
|
<ServerCard
|
||||||
@@ -164,6 +171,52 @@ const ServersPage: React.FC = () => {
|
|||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center mb-4">
|
||||||
|
<div className="flex-[2] text-sm text-gray-500">
|
||||||
|
{pagination ? (
|
||||||
|
t('common.showing', {
|
||||||
|
start: (pagination.page - 1) * pagination.limit + 1,
|
||||||
|
end: Math.min(pagination.page * pagination.limit, pagination.total),
|
||||||
|
total: pagination.total
|
||||||
|
})
|
||||||
|
) : (
|
||||||
|
t('common.showing', {
|
||||||
|
start: 1,
|
||||||
|
end: servers.length,
|
||||||
|
total: servers.length
|
||||||
|
})
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="flex-[4] flex justify-center">
|
||||||
|
{pagination && pagination.totalPages > 1 && (
|
||||||
|
<Pagination
|
||||||
|
currentPage={currentPage}
|
||||||
|
totalPages={pagination.totalPages}
|
||||||
|
onPageChange={setCurrentPage}
|
||||||
|
disabled={isLoading}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="flex-[2] flex items-center justify-end space-x-2">
|
||||||
|
<label htmlFor="perPage" className="text-sm text-gray-600">
|
||||||
|
{t('common.itemsPerPage')}:
|
||||||
|
</label>
|
||||||
|
<select
|
||||||
|
id="perPage"
|
||||||
|
value={serversPerPage}
|
||||||
|
onChange={(e) => setServersPerPage(Number(e.target.value))}
|
||||||
|
disabled={isLoading}
|
||||||
|
className="border rounded p-1 text-sm btn-secondary outline-none disabled:opacity-50 disabled:cursor-not-allowed"
|
||||||
|
>
|
||||||
|
<option value={5}>5</option>
|
||||||
|
<option value={10}>10</option>
|
||||||
|
<option value={20}>20</option>
|
||||||
|
<option value={50}>50</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{editingServer && (
|
{editingServer && (
|
||||||
|
|||||||
@@ -248,6 +248,10 @@
|
|||||||
"wechat": "WeChat",
|
"wechat": "WeChat",
|
||||||
"discord": "Discord",
|
"discord": "Discord",
|
||||||
"required": "Required",
|
"required": "Required",
|
||||||
|
"itemsPerPage": "Items per page",
|
||||||
|
"showing": "Showing {{start}}-{{end}} of {{total}}",
|
||||||
|
"previous": "Previous",
|
||||||
|
"next": "Next",
|
||||||
"secret": "Secret",
|
"secret": "Secret",
|
||||||
"default": "Default",
|
"default": "Default",
|
||||||
"value": "Value",
|
"value": "Value",
|
||||||
|
|||||||
@@ -248,6 +248,10 @@
|
|||||||
"github": "GitHub",
|
"github": "GitHub",
|
||||||
"wechat": "WeChat",
|
"wechat": "WeChat",
|
||||||
"discord": "Discord",
|
"discord": "Discord",
|
||||||
|
"itemsPerPage": "Éléments par page",
|
||||||
|
"showing": "Affichage de {{start}}-{{end}} sur {{total}}",
|
||||||
|
"previous": "Précédent",
|
||||||
|
"next": "Suivant",
|
||||||
"required": "Requis",
|
"required": "Requis",
|
||||||
"secret": "Secret",
|
"secret": "Secret",
|
||||||
"default": "Défaut",
|
"default": "Défaut",
|
||||||
|
|||||||
@@ -248,6 +248,10 @@
|
|||||||
"github": "GitHub",
|
"github": "GitHub",
|
||||||
"wechat": "WeChat",
|
"wechat": "WeChat",
|
||||||
"discord": "Discord",
|
"discord": "Discord",
|
||||||
|
"itemsPerPage": "Sayfa başına öğe",
|
||||||
|
"showing": "{{total}} öğeden {{start}}-{{end}} gösteriliyor",
|
||||||
|
"previous": "Önceki",
|
||||||
|
"next": "Sonraki",
|
||||||
"required": "Gerekli",
|
"required": "Gerekli",
|
||||||
"secret": "Gizli",
|
"secret": "Gizli",
|
||||||
"default": "Varsayılan",
|
"default": "Varsayılan",
|
||||||
|
|||||||
@@ -248,6 +248,10 @@
|
|||||||
"dismiss": "忽略",
|
"dismiss": "忽略",
|
||||||
"github": "GitHub",
|
"github": "GitHub",
|
||||||
"wechat": "微信",
|
"wechat": "微信",
|
||||||
|
"itemsPerPage": "每页显示",
|
||||||
|
"showing": "显示第 {{start}}-{{end}} 条,共 {{total}} 条",
|
||||||
|
"previous": "上一页",
|
||||||
|
"next": "下一页",
|
||||||
"discord": "Discord",
|
"discord": "Discord",
|
||||||
"required": "必填",
|
"required": "必填",
|
||||||
"secret": "敏感",
|
"secret": "敏感",
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import {
|
|||||||
BatchCreateServersResponse,
|
BatchCreateServersResponse,
|
||||||
BatchServerResult,
|
BatchServerResult,
|
||||||
ServerConfig,
|
ServerConfig,
|
||||||
|
ServerInfo,
|
||||||
} from '../types/index.js';
|
} from '../types/index.js';
|
||||||
import {
|
import {
|
||||||
getServersInfo,
|
getServersInfo,
|
||||||
@@ -24,13 +25,66 @@ import { createSafeJSON } from '../utils/serialization.js';
|
|||||||
import { cloneDefaultOAuthServerConfig } from '../constants/oauthServerDefaults.js';
|
import { cloneDefaultOAuthServerConfig } from '../constants/oauthServerDefaults.js';
|
||||||
import { getServerDao, getGroupDao, getSystemConfigDao } from '../dao/DaoFactory.js';
|
import { getServerDao, getGroupDao, getSystemConfigDao } from '../dao/DaoFactory.js';
|
||||||
import { getBearerKeyDao } from '../dao/DaoFactory.js';
|
import { getBearerKeyDao } from '../dao/DaoFactory.js';
|
||||||
|
import { UserContextService } from '../services/userContextService.js';
|
||||||
|
|
||||||
export const getAllServers = async (_: Request, res: Response): Promise<void> => {
|
export const getAllServers = async (req: Request, res: Response): Promise<void> => {
|
||||||
try {
|
try {
|
||||||
const serversInfo = await getServersInfo();
|
// Parse pagination parameters from query string
|
||||||
|
const page = req.query.page ? parseInt(req.query.page as string, 10) : 1;
|
||||||
|
const limit = req.query.limit ? parseInt(req.query.limit as string, 10) : undefined;
|
||||||
|
|
||||||
|
// Validate pagination parameters
|
||||||
|
if (page < 1) {
|
||||||
|
res.status(400).json({
|
||||||
|
success: false,
|
||||||
|
message: 'Page number must be greater than 0',
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (limit !== undefined && (limit < 1 || limit > 1000)) {
|
||||||
|
res.status(400).json({
|
||||||
|
success: false,
|
||||||
|
message: 'Limit must be between 1 and 1000',
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get current user for filtering
|
||||||
|
const currentUser = UserContextService.getInstance().getCurrentUser();
|
||||||
|
const isAdmin = !currentUser || currentUser.isAdmin;
|
||||||
|
|
||||||
|
// Get servers info with pagination if limit is specified
|
||||||
|
let serversInfo: Omit<ServerInfo, 'client' | 'transport'>[];
|
||||||
|
let pagination = undefined;
|
||||||
|
|
||||||
|
if (limit !== undefined) {
|
||||||
|
// Use DAO layer pagination with proper filtering
|
||||||
|
const serverDao = getServerDao();
|
||||||
|
const paginatedResult = isAdmin
|
||||||
|
? await serverDao.findAllPaginated(page, limit)
|
||||||
|
: await serverDao.findByOwnerPaginated(currentUser!.username, page, limit);
|
||||||
|
|
||||||
|
// Get runtime info for paginated servers
|
||||||
|
serversInfo = await getServersInfo(page, limit, currentUser);
|
||||||
|
|
||||||
|
pagination = {
|
||||||
|
page: paginatedResult.page,
|
||||||
|
limit: paginatedResult.limit,
|
||||||
|
total: paginatedResult.total,
|
||||||
|
totalPages: paginatedResult.totalPages,
|
||||||
|
hasNextPage: paginatedResult.page < paginatedResult.totalPages,
|
||||||
|
hasPrevPage: paginatedResult.page > 1,
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
// No pagination, get all servers (will be filtered by mcpService)
|
||||||
|
serversInfo = await getServersInfo();
|
||||||
|
}
|
||||||
|
|
||||||
const response: ApiResponse = {
|
const response: ApiResponse = {
|
||||||
success: true,
|
success: true,
|
||||||
data: createSafeJSON(serversInfo),
|
data: createSafeJSON(serversInfo),
|
||||||
|
...(pagination && { pagination }),
|
||||||
};
|
};
|
||||||
res.json(response);
|
res.json(response);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -564,10 +618,9 @@ export const updateServer = async (req: Request, res: Response): Promise<void> =
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to update server:', error);
|
|
||||||
res.status(500).json({
|
res.status(500).json({
|
||||||
success: false,
|
success: false,
|
||||||
message: error instanceof Error ? error.message : 'Internal server error',
|
message: 'Internal server error',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,10 +2,31 @@ import { ServerConfig } from '../types/index.js';
|
|||||||
import { BaseDao } from './base/BaseDao.js';
|
import { BaseDao } from './base/BaseDao.js';
|
||||||
import { JsonFileBaseDao } from './base/JsonFileBaseDao.js';
|
import { JsonFileBaseDao } from './base/JsonFileBaseDao.js';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pagination result interface
|
||||||
|
*/
|
||||||
|
export interface PaginatedResult<T> {
|
||||||
|
data: T[];
|
||||||
|
total: number;
|
||||||
|
page: number;
|
||||||
|
limit: number;
|
||||||
|
totalPages: number;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Server DAO interface with server-specific operations
|
* Server DAO interface with server-specific operations
|
||||||
*/
|
*/
|
||||||
export interface ServerDao extends BaseDao<ServerConfigWithName, string> {
|
export interface ServerDao extends BaseDao<ServerConfigWithName, string> {
|
||||||
|
/**
|
||||||
|
* Find all servers with pagination
|
||||||
|
*/
|
||||||
|
findAllPaginated(page: number, limit: number): Promise<PaginatedResult<ServerConfigWithName>>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find servers by owner with pagination
|
||||||
|
*/
|
||||||
|
findByOwnerPaginated(owner: string, page: number, limit: number): Promise<PaginatedResult<ServerConfigWithName>>;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Find servers by owner
|
* Find servers by owner
|
||||||
*/
|
*/
|
||||||
@@ -176,6 +197,61 @@ export class ServerDaoImpl extends JsonFileBaseDao implements ServerDao {
|
|||||||
return servers.length;
|
return servers.length;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async findAllPaginated(page: number, limit: number): Promise<PaginatedResult<ServerConfigWithName>> {
|
||||||
|
const allServers = await this.getAll();
|
||||||
|
// Sort: enabled servers first, then by creation time
|
||||||
|
const sortedServers = allServers.sort((a, b) => {
|
||||||
|
const aEnabled = a.enabled !== false;
|
||||||
|
const bEnabled = b.enabled !== false;
|
||||||
|
if (aEnabled !== bEnabled) {
|
||||||
|
return aEnabled ? -1 : 1;
|
||||||
|
}
|
||||||
|
return 0; // Keep original order for same enabled status
|
||||||
|
});
|
||||||
|
|
||||||
|
const total = sortedServers.length;
|
||||||
|
const totalPages = Math.ceil(total / limit);
|
||||||
|
const startIndex = (page - 1) * limit;
|
||||||
|
const endIndex = startIndex + limit;
|
||||||
|
const data = sortedServers.slice(startIndex, endIndex);
|
||||||
|
|
||||||
|
return {
|
||||||
|
data,
|
||||||
|
total,
|
||||||
|
page,
|
||||||
|
limit,
|
||||||
|
totalPages,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async findByOwnerPaginated(owner: string, page: number, limit: number): Promise<PaginatedResult<ServerConfigWithName>> {
|
||||||
|
const allServers = await this.getAll();
|
||||||
|
const filteredServers = allServers.filter((server) => server.owner === owner);
|
||||||
|
// Sort: enabled servers first, then by creation time
|
||||||
|
const sortedServers = filteredServers.sort((a, b) => {
|
||||||
|
const aEnabled = a.enabled !== false;
|
||||||
|
const bEnabled = b.enabled !== false;
|
||||||
|
if (aEnabled !== bEnabled) {
|
||||||
|
return aEnabled ? -1 : 1;
|
||||||
|
}
|
||||||
|
return 0; // Keep original order for same enabled status
|
||||||
|
});
|
||||||
|
|
||||||
|
const total = sortedServers.length;
|
||||||
|
const totalPages = Math.ceil(total / limit);
|
||||||
|
const startIndex = (page - 1) * limit;
|
||||||
|
const endIndex = startIndex + limit;
|
||||||
|
const data = sortedServers.slice(startIndex, endIndex);
|
||||||
|
|
||||||
|
return {
|
||||||
|
data,
|
||||||
|
total,
|
||||||
|
page,
|
||||||
|
limit,
|
||||||
|
totalPages,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
async findByOwner(owner: string): Promise<ServerConfigWithName[]> {
|
async findByOwner(owner: string): Promise<ServerConfigWithName[]> {
|
||||||
const servers = await this.getAll();
|
const servers = await this.getAll();
|
||||||
return servers.filter((server) => server.owner === owner);
|
return servers.filter((server) => server.owner === owner);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { ServerDao, ServerConfigWithName } from './index.js';
|
import { ServerDao, ServerConfigWithName, PaginatedResult } from './index.js';
|
||||||
import { ServerRepository } from '../db/repositories/ServerRepository.js';
|
import { ServerRepository } from '../db/repositories/ServerRepository.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -16,6 +16,32 @@ export class ServerDaoDbImpl implements ServerDao {
|
|||||||
return servers.map((s) => this.mapToServerConfig(s));
|
return servers.map((s) => this.mapToServerConfig(s));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async findAllPaginated(page: number, limit: number): Promise<PaginatedResult<ServerConfigWithName>> {
|
||||||
|
const { data, total } = await this.repository.findAllPaginated(page, limit);
|
||||||
|
const totalPages = Math.ceil(total / limit);
|
||||||
|
|
||||||
|
return {
|
||||||
|
data: data.map((s) => this.mapToServerConfig(s)),
|
||||||
|
total,
|
||||||
|
page,
|
||||||
|
limit,
|
||||||
|
totalPages,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async findByOwnerPaginated(owner: string, page: number, limit: number): Promise<PaginatedResult<ServerConfigWithName>> {
|
||||||
|
const { data, total } = await this.repository.findByOwnerPaginated(owner, page, limit);
|
||||||
|
const totalPages = Math.ceil(total / limit);
|
||||||
|
|
||||||
|
return {
|
||||||
|
data: data.map((s) => this.mapToServerConfig(s)),
|
||||||
|
total,
|
||||||
|
page,
|
||||||
|
limit,
|
||||||
|
totalPages,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
async findById(name: string): Promise<ServerConfigWithName | null> {
|
async findById(name: string): Promise<ServerConfigWithName | null> {
|
||||||
const server = await this.repository.findByName(name);
|
const server = await this.repository.findByName(name);
|
||||||
return server ? this.mapToServerConfig(server) : null;
|
return server ? this.mapToServerConfig(server) : null;
|
||||||
|
|||||||
@@ -69,6 +69,41 @@ export class ServerRepository {
|
|||||||
return await this.repository.count();
|
return await this.repository.count();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find servers with pagination
|
||||||
|
*/
|
||||||
|
async findAllPaginated(page: number, limit: number): Promise<{ data: Server[]; total: number }> {
|
||||||
|
const skip = (page - 1) * limit;
|
||||||
|
const [data, total] = await this.repository.findAndCount({
|
||||||
|
order: {
|
||||||
|
enabled: 'DESC', // Enabled servers first
|
||||||
|
createdAt: 'ASC' // Then by creation time
|
||||||
|
},
|
||||||
|
skip,
|
||||||
|
take: limit,
|
||||||
|
});
|
||||||
|
|
||||||
|
return { data, total };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find servers by owner with pagination
|
||||||
|
*/
|
||||||
|
async findByOwnerPaginated(owner: string, page: number, limit: number): Promise<{ data: Server[]; total: number }> {
|
||||||
|
const skip = (page - 1) * limit;
|
||||||
|
const [data, total] = await this.repository.findAndCount({
|
||||||
|
where: { owner },
|
||||||
|
order: {
|
||||||
|
enabled: 'DESC', // Enabled servers first
|
||||||
|
createdAt: 'ASC' // Then by creation time
|
||||||
|
},
|
||||||
|
skip,
|
||||||
|
take: limit,
|
||||||
|
});
|
||||||
|
|
||||||
|
return { data, total };
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Find servers by owner
|
* Find servers by owner
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -772,10 +772,20 @@ export const registerAllTools = async (isInit: boolean, serverName?: string): Pr
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Get all server information
|
// Get all server information
|
||||||
export const getServersInfo = async (): Promise<Omit<ServerInfo, 'client' | 'transport'>[]> => {
|
export const getServersInfo = async (
|
||||||
const allServers: ServerConfigWithName[] = await getServerDao().findAll();
|
page?: number,
|
||||||
|
limit?: number,
|
||||||
|
user?: any,
|
||||||
|
): Promise<Omit<ServerInfo, 'client' | 'transport'>[]> => {
|
||||||
const dataService = getDataService();
|
const dataService = getDataService();
|
||||||
|
|
||||||
|
// Get paginated or all server configurations from DAO
|
||||||
|
// If pagination is used with a non-admin user, filtering is already done at DAO level
|
||||||
|
const isPaginated = limit !== undefined && page !== undefined;
|
||||||
|
const allServers: ServerConfigWithName[] = isPaginated
|
||||||
|
? (await getServerDao().findAllPaginated(page, limit)).data
|
||||||
|
: await getServerDao().findAll();
|
||||||
|
|
||||||
// Ensure that servers recently added via DAO but not yet initialized in serverInfos
|
// Ensure that servers recently added via DAO but not yet initialized in serverInfos
|
||||||
// are still visible in the servers list. This avoids a race condition where
|
// are still visible in the servers list. This avoids a race condition where
|
||||||
// a POST /api/servers immediately followed by GET /api/servers would not
|
// a POST /api/servers immediately followed by GET /api/servers would not
|
||||||
@@ -783,10 +793,19 @@ export const getServersInfo = async (): Promise<Omit<ServerInfo, 'client' | 'tra
|
|||||||
const combinedServerInfos: ServerInfo[] = [...serverInfos];
|
const combinedServerInfos: ServerInfo[] = [...serverInfos];
|
||||||
const existingNames = new Set(combinedServerInfos.map((s) => s.name));
|
const existingNames = new Set(combinedServerInfos.map((s) => s.name));
|
||||||
|
|
||||||
|
// Create a set of server names we're interested in (for pagination)
|
||||||
|
const requestedServerNames = new Set(allServers.map((s) => s.name));
|
||||||
|
|
||||||
|
// Filter serverInfos to only include requested servers if pagination is used
|
||||||
|
const filteredServerInfos = isPaginated
|
||||||
|
? combinedServerInfos.filter((s) => requestedServerNames.has(s.name))
|
||||||
|
: combinedServerInfos;
|
||||||
|
|
||||||
|
// Add servers from DAO that don't have runtime info yet
|
||||||
for (const server of allServers) {
|
for (const server of allServers) {
|
||||||
if (!existingNames.has(server.name)) {
|
if (!existingNames.has(server.name)) {
|
||||||
const isEnabled = server.enabled === undefined ? true : server.enabled;
|
const isEnabled = server.enabled === undefined ? true : server.enabled;
|
||||||
combinedServerInfos.push({
|
filteredServerInfos.push({
|
||||||
name: server.name,
|
name: server.name,
|
||||||
owner: server.owner,
|
owner: server.owner,
|
||||||
// Newly created servers that are enabled should appear as "connecting"
|
// Newly created servers that are enabled should appear as "connecting"
|
||||||
@@ -802,12 +821,16 @@ export const getServersInfo = async (): Promise<Omit<ServerInfo, 'client' | 'tra
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const filterServerInfos: ServerInfo[] = dataService.filterData
|
// Apply user filtering only when NOT using pagination (pagination already filtered at DAO level)
|
||||||
? dataService.filterData(combinedServerInfos)
|
// Or when no pagination parameters provided (backward compatibility)
|
||||||
: combinedServerInfos;
|
const shouldApplyUserFilter = !isPaginated;
|
||||||
|
const filterServerInfos: ServerInfo[] = shouldApplyUserFilter && dataService.filterData
|
||||||
|
? dataService.filterData(filteredServerInfos, user)
|
||||||
|
: filteredServerInfos;
|
||||||
|
|
||||||
const infos = filterServerInfos.map(
|
const infos = filterServerInfos
|
||||||
({ name, status, tools, prompts, createTime, error, oauth }) => {
|
.filter((info) => requestedServerNames.has(info.name)) // Only include requested servers
|
||||||
|
.map(({ name, status, tools, prompts, createTime, error, oauth }) => {
|
||||||
const serverConfig = allServers.find((server) => server.name === name);
|
const serverConfig = allServers.find((server) => server.name === name);
|
||||||
const enabled = serverConfig ? serverConfig.enabled !== false : true;
|
const enabled = serverConfig ? serverConfig.enabled !== false : true;
|
||||||
|
|
||||||
@@ -846,12 +869,8 @@ export const getServersInfo = async (): Promise<Omit<ServerInfo, 'client' | 'tra
|
|||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
};
|
};
|
||||||
},
|
|
||||||
);
|
|
||||||
infos.sort((a, b) => {
|
|
||||||
if (a.enabled === b.enabled) return 0;
|
|
||||||
return a.enabled ? -1 : 1;
|
|
||||||
});
|
});
|
||||||
|
// Sorting is now handled at DAO layer for consistent pagination results
|
||||||
return infos;
|
return infos;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user