Compare commits

..

1 Commits

Author SHA1 Message Date
github-actions[bot]
ad3847fb5e chore: add VERSION v0.5.0 2025-11-28 14:04:01 +00:00
6 changed files with 22 additions and 194 deletions

7
package-lock.json generated
View File

@@ -64,7 +64,6 @@
"@vitejs/plugin-react": "^5.1.1",
"@vitest/coverage-v8": "^4.0.14",
"@vitest/ui": "^4.0.14",
"baseline-browser-mapping": "^2.8.32",
"eslint": "^9.39.1",
"eslint-config-next": "^16.0.5",
"jsdom": "^27.2.0",
@@ -5204,9 +5203,9 @@
"license": "MIT"
},
"node_modules/baseline-browser-mapping": {
"version": "2.8.32",
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.32.tgz",
"integrity": "sha512-OPz5aBThlyLFgxyhdwf/s2+8ab3OvT7AdTNvKHBwpXomIYeXqpUUuT8LrdtxZSsWJ4R4CU1un4XGh5Ez3nlTpw==",
"version": "2.8.31",
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.31.tgz",
"integrity": "sha512-a28v2eWrrRWPpJSzxc+mKwm0ZtVx/G8SepdQZDArnXYU/XS+IF6mp8aB/4E+hH1tyGCoDo3KlUCdlSxGDsRkAw==",
"dev": true,
"license": "Apache-2.0",
"bin": {

View File

@@ -27,6 +27,7 @@
"dependencies": {
"@prisma/adapter-better-sqlite3": "^7.0.1",
"@prisma/client": "^7.0.1",
"better-sqlite3": "^12.4.6",
"@radix-ui/react-dropdown-menu": "^2.1.16",
"@radix-ui/react-slot": "^1.2.4",
"@t3-oss/env-nextjs": "^0.13.8",
@@ -42,7 +43,6 @@
"@xterm/xterm": "^5.5.0",
"axios": "^1.13.2",
"bcryptjs": "^3.0.3",
"better-sqlite3": "^12.4.6",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cron-validator": "^1.4.0",
@@ -80,7 +80,6 @@
"@vitejs/plugin-react": "^5.1.1",
"@vitest/coverage-v8": "^4.0.14",
"@vitest/ui": "^4.0.14",
"baseline-browser-mapping": "^2.8.32",
"eslint": "^9.39.1",
"eslint-config-next": "^16.0.5",
"jsdom": "^27.2.0",
@@ -89,9 +88,9 @@
"prettier-plugin-tailwindcss": "^0.7.1",
"prisma": "^7.0.1",
"tailwindcss": "^4.1.17",
"tsx": "^4.19.4",
"typescript": "^5.9.3",
"typescript-eslint": "^8.48.0",
"tsx": "^4.19.4",
"vitest": "^4.0.14"
},
"ct3aMetadata": {
@@ -104,4 +103,4 @@
"overrides": {
"prismjs": "^1.30.0"
}
}
}

View File

@@ -709,8 +709,6 @@ export function InstalledScriptsTab() {
return;
}
const containerType = script.is_vm ? "VM" : "LXC";
setConfirmationModal({
isOpen: true,
variant: "simple",
@@ -720,7 +718,7 @@ export function InstalledScriptsTab() {
setControllingScriptId(script.id);
setLoadingModal({
isOpen: true,
action: `${action === "start" ? "Starting" : "Stopping"} ${containerType}...`,
action: `${action === "start" ? "Starting" : "Stopping"} container ${script.container_id}...`,
});
void controlContainerMutation.mutate({ id: script.id, action });
setConfirmationModal(null);

View File

@@ -16,7 +16,7 @@ interface LoadingModalProps {
export function LoadingModal({
isOpen,
action,
action: _action,
logs = [],
isComplete = false,
title,
@@ -64,11 +64,6 @@ export function LoadingModal({
)}
</div>
{/* Action text - displayed prominently */}
{action && (
<p className="text-foreground text-base font-medium">{action}</p>
)}
{/* Static title text */}
{title && <p className="text-muted-foreground text-sm">{title}</p>}

View File

@@ -458,118 +458,14 @@ async function isVM(scriptId: number, containerId: string, serverId: number | nu
);
});
return false; // Always LXC since VM config doesn't exist
// If LXC config exists, it's an LXC container
return !lxcConfigExists; // Return true if it's a VM (neither config exists defaults to false/LXC)
} catch (error) {
console.error('Error determining container type:', error);
return false; // Default to LXC on error
}
}
// Helper function to batch detect container types for all containers on a server
// Returns a Map of container_id -> isVM (true for VM, false for LXC)
async function batchDetectContainerTypes(server: Server): Promise<Map<string, boolean>> {
const containerTypeMap = new Map<string, boolean>();
try {
// Import SSH services
const { default: SSHService } = await import('~/server/ssh-service');
const { default: SSHExecutionService } = await import('~/server/ssh-execution-service');
const sshService = new SSHService();
const sshExecutionService = new SSHExecutionService();
// Test SSH connection first
const connectionTest = await sshService.testSSHConnection(server);
if (!(connectionTest as any).success) {
console.warn(`SSH connection failed for server ${server.name}, skipping batch detection`);
return containerTypeMap; // Return empty map if SSH fails
}
// Helper function to parse list output and extract IDs
const parseListOutput = (output: string): string[] => {
const ids: string[] = [];
const lines = output.split('\n').filter(line => line.trim());
for (const line of lines) {
// Skip header lines
if (line.includes('VMID') || line.includes('CTID')) continue;
// Extract first column (ID)
const parts = line.trim().split(/\s+/);
if (parts.length > 0) {
const id = parts[0]?.trim();
// Validate ID format (3-4 digits typically)
if (id && /^\d{3,4}$/.test(id)) {
ids.push(id);
}
}
}
return ids;
};
// Get containers from pct list
let pctOutput = '';
await new Promise<void>((resolve, reject) => {
void sshExecutionService.executeCommand(
server,
'pct list',
(data: string) => {
pctOutput += data;
},
(error: string) => {
console.error(`pct list error for server ${server.name}:`, error);
// Don't reject, just continue - might be no containers
resolve();
},
(_exitCode: number) => {
resolve();
}
);
});
// Get VMs from qm list
let qmOutput = '';
await new Promise<void>((resolve, reject) => {
void sshExecutionService.executeCommand(
server,
'qm list',
(data: string) => {
qmOutput += data;
},
(error: string) => {
console.error(`qm list error for server ${server.name}:`, error);
// Don't reject, just continue - might be no VMs
resolve();
},
(_exitCode: number) => {
resolve();
}
);
});
// Parse IDs from both lists
const containerIds = parseListOutput(pctOutput);
const vmIds = parseListOutput(qmOutput);
// Mark all LXC containers as false (not VM)
for (const id of containerIds) {
containerTypeMap.set(id, false);
}
// Mark all VMs as true (is VM)
for (const id of vmIds) {
containerTypeMap.set(id, true);
}
} catch (error) {
console.error(`Error in batchDetectContainerTypes for server ${server.name}:`, error);
// Return empty map on error - individual checks will fall back to isVM()
}
return containerTypeMap;
}
export const installedScriptsRouter = createTRPCRouter({
// Get all installed scripts
@@ -579,52 +475,13 @@ export const installedScriptsRouter = createTRPCRouter({
const db = getDatabase();
const scripts = await db.getAllInstalledScripts();
// Group scripts by server_id for batch detection
const scriptsByServer = new Map<number, any[]>();
const serversMap = new Map<number, Server>();
for (const script of scripts) {
if (script.server_id && script.server) {
if (!scriptsByServer.has(script.server_id)) {
scriptsByServer.set(script.server_id, []);
serversMap.set(script.server_id, script.server as Server);
}
scriptsByServer.get(script.server_id)!.push(script);
}
}
// Batch detect container types for each server
const containerTypeMap = new Map<string, boolean>();
const batchDetectionPromises = Array.from(serversMap.entries()).map(async ([serverId, server]) => {
try {
const serverTypeMap = await batchDetectContainerTypes(server);
// Merge into main map with server-specific prefix to avoid collisions
// Actually, container IDs are unique across the cluster, so we can use them directly
for (const [containerId, isVM] of serverTypeMap.entries()) {
containerTypeMap.set(containerId, isVM);
}
} catch (error) {
console.error(`Error batch detecting types for server ${serverId}:`, error);
// Continue with other servers
}
});
await Promise.all(batchDetectionPromises);
// Transform scripts to flatten server data for frontend compatibility
const transformedScripts = scripts.map((script: any) => {
// Determine if it's a VM or LXC from batch detection map, fall back to isVM() if not found
const transformedScripts = await Promise.all(scripts.map(async (script: any) => {
// Determine if it's a VM or LXC
let is_vm = false;
if (script.container_id && script.server_id) {
// First check if we have it in the batch detection map
if (containerTypeMap.has(script.container_id)) {
is_vm = containerTypeMap.get(script.container_id) ?? false;
} else {
// Fall back to checking LXCConfig in database (fast, no SSH needed)
// If LXCConfig exists, it's an LXC container
const hasLXCConfig = script.lxc_config !== null && script.lxc_config !== undefined;
is_vm = !hasLXCConfig; // If no LXCConfig, might be VM, but default to false for safety
}
is_vm = await isVM(script.id, script.container_id, script.server_id);
}
return {
@@ -641,7 +498,7 @@ export const installedScriptsRouter = createTRPCRouter({
is_vm,
server: undefined // Remove nested server object
};
});
}));
return {
success: true,
@@ -665,31 +522,13 @@ export const installedScriptsRouter = createTRPCRouter({
const db = getDatabase();
const scripts = await db.getInstalledScriptsByServer(input.serverId);
// Batch detect container types for this server
let containerTypeMap = new Map<string, boolean>();
if (scripts.length > 0 && scripts[0]?.server) {
try {
containerTypeMap = await batchDetectContainerTypes(scripts[0].server as Server);
} catch (error) {
console.error(`Error batch detecting types for server ${input.serverId}:`, error);
// Continue with empty map, will fall back to LXCConfig check
}
}
// Transform scripts to flatten server data for frontend compatibility
const transformedScripts = scripts.map((script: any) => {
// Determine if it's a VM or LXC from batch detection map, fall back to LXCConfig check if not found
const transformedScripts = await Promise.all(scripts.map(async (script: any) => {
// Determine if it's a VM or LXC
let is_vm = false;
if (script.container_id && script.server_id) {
// First check if we have it in the batch detection map
if (containerTypeMap.has(script.container_id)) {
is_vm = containerTypeMap.get(script.container_id) ?? false;
} else {
// Fall back to checking LXCConfig in database (fast, no SSH needed)
// If LXCConfig exists, it's an LXC container
const hasLXCConfig = script.lxc_config !== null && script.lxc_config !== undefined;
is_vm = !hasLXCConfig; // If no LXCConfig, might be VM, but default to false for safety
}
is_vm = await isVM(script.id, script.container_id, script.server_id);
}
return {
@@ -706,7 +545,7 @@ export const installedScriptsRouter = createTRPCRouter({
is_vm,
server: undefined // Remove nested server object
};
});
}));
return {
success: true,

View File

@@ -281,8 +281,7 @@ class DatabaseServicePrisma {
async getAllInstalledScripts(): Promise<InstalledScriptWithServer[]> {
const result = await prisma.installedScript.findMany({
include: {
server: true,
lxc_config: true
server: true
},
orderBy: { installation_date: 'desc' }
});
@@ -303,8 +302,7 @@ class DatabaseServicePrisma {
const result = await prisma.installedScript.findMany({
where: { server_id },
include: {
server: true,
lxc_config: true
server: true
},
orderBy: { installation_date: 'desc' }
});