Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bcb2473cc5 | |||
| 689dcf295b | |||
| c1e14e9fc7 | |||
| d5fd57e2c3 | |||
| 079e6a64a9 | |||
| a04cf053db | |||
| ec0e377ccb | |||
| 3b3d0433cb | |||
| 5f876449ca | |||
| 8e781c7f9d | |||
| a3eefbe92c | |||
| 41679427c6 |
45
changelog.md
45
changelog.md
@@ -1,5 +1,50 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.19.2 - fix(docs)
|
||||||
|
remove outdated UI screenshot assets from project documentation
|
||||||
|
|
||||||
|
- Deletes multiple PNG screenshots that documented previous dashboard, service form, and hello-world states.
|
||||||
|
- Reduces repository clutter by removing obsolete image assets no longer needed in docs.
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.19.1 - fix(dashboard)
|
||||||
|
add updated dashboard screenshots for refresh and resource usage states
|
||||||
|
|
||||||
|
- Adds new dashboard screenshots covering post-refresh, resource usage, and populated data views.
|
||||||
|
- Updates visual assets to document current dashboard behavior and UI states.
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.19.1 - fix(dashboard)
|
||||||
|
add aggregated resource usage stats to the dashboard
|
||||||
|
|
||||||
|
- Aggregate CPU, memory, and network stats across all running user and platform service containers in getSystemStatus
|
||||||
|
- Extend ISystemStatus.docker interface with cpuUsage, memoryUsage, memoryTotal, networkIn, networkOut fields
|
||||||
|
- Fix getContainerStats to properly handle Swarm service IDs by catching exceptions and falling back to label-based container lookup
|
||||||
|
- Wire dashboard resource usage card to display real aggregated data from the backend
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.19.0 - feat(opsserver,web)
|
||||||
|
add real-time platform service log streaming to the dashboard
|
||||||
|
|
||||||
|
- stream running platform service container logs from the ops server to connected dashboard clients via TypedSocket
|
||||||
|
- parse Docker log timestamps and levels for both pushed and fetched platform service log entries
|
||||||
|
- enhance the platform service detail view with mapped statuses and predefined host, port, version, and config metadata
|
||||||
|
- add the typedsocket dependency and update the catalog package for dashboard support
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.18.5 - fix(platform-services)
|
||||||
|
fix platform service detail view navigation and log display
|
||||||
|
|
||||||
|
- Add back button to platform service detail view for returning to services list
|
||||||
|
- Fix DOM lifecycle when switching between platform services (destroy and recreate dees-chart-log)
|
||||||
|
- Fix timestamp format for log entries to use ISO 8601 for dees-chart-log compatibility
|
||||||
|
- Clear previous stats/logs state before fetching new platform service data
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.18.4 - fix(repo)
|
||||||
|
no changes to commit
|
||||||
|
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.18.3 - fix(deps)
|
||||||
|
bump @serve.zone/catalog to ^2.6.1
|
||||||
|
|
||||||
|
- Updates the @serve.zone/catalog runtime dependency from ^2.6.0 to ^2.6.1.
|
||||||
|
|
||||||
## 2026-03-16 - 1.18.2 - fix(repo)
|
## 2026-03-16 - 1.18.2 - fix(repo)
|
||||||
no changes to commit
|
no changes to commit
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 59 KiB |
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@serve.zone/onebox",
|
"name": "@serve.zone/onebox",
|
||||||
"version": "1.18.2",
|
"version": "1.19.2",
|
||||||
"exports": "./mod.ts",
|
"exports": "./mod.ts",
|
||||||
"tasks": {
|
"tasks": {
|
||||||
"test": "deno test --allow-all test/",
|
"test": "deno test --allow-all test/",
|
||||||
@@ -25,7 +25,8 @@
|
|||||||
"@api.global/typedrequest": "npm:@api.global/typedrequest@^3.2.6",
|
"@api.global/typedrequest": "npm:@api.global/typedrequest@^3.2.6",
|
||||||
"@api.global/typedserver": "npm:@api.global/typedserver@^8.3.1",
|
"@api.global/typedserver": "npm:@api.global/typedserver@^8.3.1",
|
||||||
"@push.rocks/smartguard": "npm:@push.rocks/smartguard@^3.1.0",
|
"@push.rocks/smartguard": "npm:@push.rocks/smartguard@^3.1.0",
|
||||||
"@push.rocks/smartjwt": "npm:@push.rocks/smartjwt@^2.2.1"
|
"@push.rocks/smartjwt": "npm:@push.rocks/smartjwt@^2.2.1",
|
||||||
|
"@api.global/typedsocket": "npm:@api.global/typedsocket@^4.1.2"
|
||||||
},
|
},
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"lib": [
|
"lib": [
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 49 KiB |
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@serve.zone/onebox",
|
"name": "@serve.zone/onebox",
|
||||||
"version": "1.18.2",
|
"version": "1.19.2",
|
||||||
"description": "Self-hosted container platform with automatic SSL and DNS - a mini Heroku for single servers",
|
"description": "Self-hosted container platform with automatic SSL and DNS - a mini Heroku for single servers",
|
||||||
"main": "mod.ts",
|
"main": "mod.ts",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -55,9 +55,10 @@
|
|||||||
"packageManager": "pnpm@10.18.1+sha512.77a884a165cbba2d8d1c19e3b4880eee6d2fcabd0d879121e282196b80042351d5eb3ca0935fa599da1dc51265cc68816ad2bddd2a2de5ea9fdf92adbec7cd34",
|
"packageManager": "pnpm@10.18.1+sha512.77a884a165cbba2d8d1c19e3b4880eee6d2fcabd0d879121e282196b80042351d5eb3ca0935fa599da1dc51265cc68816ad2bddd2a2de5ea9fdf92adbec7cd34",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@api.global/typedrequest-interfaces": "^3.0.19",
|
"@api.global/typedrequest-interfaces": "^3.0.19",
|
||||||
|
"@api.global/typedsocket": "^4.1.2",
|
||||||
"@design.estate/dees-catalog": "^3.43.3",
|
"@design.estate/dees-catalog": "^3.43.3",
|
||||||
"@design.estate/dees-element": "^2.1.6",
|
"@design.estate/dees-element": "^2.1.6",
|
||||||
"@serve.zone/catalog": "^2.6.0"
|
"@serve.zone/catalog": "^2.6.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@git.zone/tsbundle": "^2.9.0",
|
"@git.zone/tsbundle": "^2.9.0",
|
||||||
|
|||||||
13
pnpm-lock.yaml
generated
13
pnpm-lock.yaml
generated
@@ -11,6 +11,9 @@ importers:
|
|||||||
'@api.global/typedrequest-interfaces':
|
'@api.global/typedrequest-interfaces':
|
||||||
specifier: ^3.0.19
|
specifier: ^3.0.19
|
||||||
version: 3.0.19
|
version: 3.0.19
|
||||||
|
'@api.global/typedsocket':
|
||||||
|
specifier: ^4.1.2
|
||||||
|
version: 4.1.2(@push.rocks/smartserve@2.0.1)
|
||||||
'@design.estate/dees-catalog':
|
'@design.estate/dees-catalog':
|
||||||
specifier: ^3.43.3
|
specifier: ^3.43.3
|
||||||
version: 3.48.5(@tiptap/pm@2.27.2)
|
version: 3.48.5(@tiptap/pm@2.27.2)
|
||||||
@@ -18,8 +21,8 @@ importers:
|
|||||||
specifier: ^2.1.6
|
specifier: ^2.1.6
|
||||||
version: 2.2.3
|
version: 2.2.3
|
||||||
'@serve.zone/catalog':
|
'@serve.zone/catalog':
|
||||||
specifier: ^2.6.0
|
specifier: ^2.6.2
|
||||||
version: 2.6.0(@tiptap/pm@2.27.2)
|
version: 2.6.2(@tiptap/pm@2.27.2)
|
||||||
devDependencies:
|
devDependencies:
|
||||||
'@git.zone/tsbundle':
|
'@git.zone/tsbundle':
|
||||||
specifier: ^2.9.0
|
specifier: ^2.9.0
|
||||||
@@ -836,8 +839,8 @@ packages:
|
|||||||
'@sec-ant/readable-stream@0.4.1':
|
'@sec-ant/readable-stream@0.4.1':
|
||||||
resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==}
|
resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==}
|
||||||
|
|
||||||
'@serve.zone/catalog@2.6.0':
|
'@serve.zone/catalog@2.6.2':
|
||||||
resolution: {integrity: sha512-Gp91Ed0MMLMPSAZrH2/UimGxU9AaTu5IPUobPD49PSvh3UnUl+HEFiy81kpKJhW16V37N3/vcNgZrn2VI7/LxQ==}
|
resolution: {integrity: sha512-1XPdgkqjx80r3mjE03QOex0r48jz2SzQ8lwz/VBvPtwgJYH0DO5TBuMSgT56YeQ1c/e2vVpqdXIicbcJoreBYw==}
|
||||||
|
|
||||||
'@tempfix/idb@8.0.3':
|
'@tempfix/idb@8.0.3':
|
||||||
resolution: {integrity: sha512-hPJQKO7+oAIY+pDNImrZ9QAINbz9KmwT+yO4iRVwdPanok2YKpaUxdJzIvCUwY0YgAawlvYdffbLvRLV5hbs2g==}
|
resolution: {integrity: sha512-hPJQKO7+oAIY+pDNImrZ9QAINbz9KmwT+yO4iRVwdPanok2YKpaUxdJzIvCUwY0YgAawlvYdffbLvRLV5hbs2g==}
|
||||||
@@ -3474,7 +3477,7 @@ snapshots:
|
|||||||
|
|
||||||
'@sec-ant/readable-stream@0.4.1': {}
|
'@sec-ant/readable-stream@0.4.1': {}
|
||||||
|
|
||||||
'@serve.zone/catalog@2.6.0(@tiptap/pm@2.27.2)':
|
'@serve.zone/catalog@2.6.2(@tiptap/pm@2.27.2)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@design.estate/dees-catalog': 3.48.5(@tiptap/pm@2.27.2)
|
'@design.estate/dees-catalog': 3.48.5(@tiptap/pm@2.27.2)
|
||||||
'@design.estate/dees-domtools': 2.5.1
|
'@design.estate/dees-domtools': 2.5.1
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 52 KiB |
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@serve.zone/onebox',
|
name: '@serve.zone/onebox',
|
||||||
version: '1.18.2',
|
version: '1.19.2',
|
||||||
description: 'Self-hosted container platform with automatic SSL and DNS - a mini Heroku for single servers'
|
description: 'Self-hosted container platform with automatic SSL and DNS - a mini Heroku for single servers'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -596,18 +596,26 @@ export class OneboxDockerManager {
|
|||||||
async getContainerStats(containerID: string): Promise<IContainerStats | null> {
|
async getContainerStats(containerID: string): Promise<IContainerStats | null> {
|
||||||
try {
|
try {
|
||||||
// Try to get container directly first
|
// Try to get container directly first
|
||||||
let container = await this.dockerClient!.getContainerById(containerID);
|
let container: any = null;
|
||||||
|
try {
|
||||||
|
container = await this.dockerClient!.getContainerById(containerID);
|
||||||
|
} catch {
|
||||||
|
// Container not found by ID — might be a Swarm service ID
|
||||||
|
}
|
||||||
|
|
||||||
// If not found, it might be a service ID - try to get the actual container ID
|
// If not found, it might be a service ID - try to get the actual container ID
|
||||||
if (!container) {
|
if (!container) {
|
||||||
const serviceContainerId = await this.getContainerIdForService(containerID);
|
const serviceContainerId = await this.getContainerIdForService(containerID);
|
||||||
if (serviceContainerId) {
|
if (serviceContainerId) {
|
||||||
container = await this.dockerClient!.getContainerById(serviceContainerId);
|
try {
|
||||||
|
container = await this.dockerClient!.getContainerById(serviceContainerId);
|
||||||
|
} catch {
|
||||||
|
// Service container also not found
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!container) {
|
if (!container) {
|
||||||
// Container/service not found
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -291,10 +291,65 @@ export class Onebox {
|
|||||||
// Sort expiring domains by days remaining (ascending)
|
// Sort expiring domains by days remaining (ascending)
|
||||||
expiringDomains.sort((a, b) => a.daysRemaining - b.daysRemaining);
|
expiringDomains.sort((a, b) => a.daysRemaining - b.daysRemaining);
|
||||||
|
|
||||||
|
// Aggregate resource usage across all running service containers
|
||||||
|
let totalCpu = 0;
|
||||||
|
let totalMemoryUsed = 0;
|
||||||
|
let totalMemoryLimit = 0;
|
||||||
|
let totalNetworkIn = 0;
|
||||||
|
let totalNetworkOut = 0;
|
||||||
|
|
||||||
|
if (dockerRunning) {
|
||||||
|
const allServices = this.services.listServices();
|
||||||
|
const runningUserServices = allServices.filter((s) => s.status === 'running' && s.containerID);
|
||||||
|
logger.debug(`Resource stats: ${runningUserServices.length} running user services`);
|
||||||
|
|
||||||
|
const statsPromises = runningUserServices
|
||||||
|
.map((s) => {
|
||||||
|
logger.debug(`Fetching stats for user service: ${s.name} (${s.containerID})`);
|
||||||
|
return this.docker.getContainerStats(s.containerID!).catch((err) => {
|
||||||
|
logger.debug(`Stats failed for ${s.name}: ${(err as Error).message}`);
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Also get stats for platform service containers
|
||||||
|
const allPlatformServices = this.platformServices.getAllPlatformServices();
|
||||||
|
const runningPlatformServices = allPlatformServices.filter((s) => s.status === 'running' && s.containerId);
|
||||||
|
logger.debug(`Resource stats: ${runningPlatformServices.length} running platform services`);
|
||||||
|
|
||||||
|
const platformStatsPromises = runningPlatformServices
|
||||||
|
.map((s) => {
|
||||||
|
logger.debug(`Fetching stats for platform service: ${s.type} (${s.containerId})`);
|
||||||
|
return this.docker.getContainerStats(s.containerId!).catch((err) => {
|
||||||
|
logger.debug(`Stats failed for ${s.type}: ${(err as Error).message}`);
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
const allStats = await Promise.all([...statsPromises, ...platformStatsPromises]);
|
||||||
|
let successCount = 0;
|
||||||
|
for (const stats of allStats) {
|
||||||
|
if (stats) {
|
||||||
|
successCount++;
|
||||||
|
totalCpu += stats.cpuPercent;
|
||||||
|
totalMemoryUsed += stats.memoryUsed;
|
||||||
|
totalMemoryLimit = Math.max(totalMemoryLimit, stats.memoryLimit);
|
||||||
|
totalNetworkIn += stats.networkRx;
|
||||||
|
totalNetworkOut += stats.networkTx;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
logger.debug(`Resource stats: ${successCount}/${allStats.length} containers returned stats. CPU: ${totalCpu}, Mem: ${totalMemoryUsed}`);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
docker: {
|
docker: {
|
||||||
running: dockerRunning,
|
running: dockerRunning,
|
||||||
version: dockerRunning ? await this.docker.getDockerVersion() : null,
|
version: dockerRunning ? await this.docker.getDockerVersion() : null,
|
||||||
|
cpuUsage: Math.round(totalCpu * 10) / 10,
|
||||||
|
memoryUsage: totalMemoryUsed,
|
||||||
|
memoryTotal: totalMemoryLimit,
|
||||||
|
networkIn: totalNetworkIn,
|
||||||
|
networkOut: totalNetworkOut,
|
||||||
},
|
},
|
||||||
reverseProxy: proxyStatus,
|
reverseProxy: proxyStatus,
|
||||||
dns: {
|
dns: {
|
||||||
|
|||||||
@@ -6,10 +6,82 @@ import { requireValidIdentity } from '../helpers/guards.ts';
|
|||||||
|
|
||||||
export class PlatformHandler {
|
export class PlatformHandler {
|
||||||
public typedrouter = new plugins.typedrequest.TypedRouter();
|
public typedrouter = new plugins.typedrequest.TypedRouter();
|
||||||
|
private activeLogStreams = new Map<string, boolean>();
|
||||||
|
|
||||||
constructor(private opsServerRef: OpsServer) {
|
constructor(private opsServerRef: OpsServer) {
|
||||||
this.opsServerRef.typedrouter.addTypedRouter(this.typedrouter);
|
this.opsServerRef.typedrouter.addTypedRouter(this.typedrouter);
|
||||||
this.registerHandlers();
|
this.registerHandlers();
|
||||||
|
this.startLogStreaming();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Start streaming logs from all running platform service containers
|
||||||
|
* and push new entries to connected dashboard clients via TypedSocket
|
||||||
|
*/
|
||||||
|
private async startLogStreaming(): Promise<void> {
|
||||||
|
// Poll for running platform services every 10s and start streams for new ones
|
||||||
|
const checkAndStream = async () => {
|
||||||
|
const services = this.opsServerRef.oneboxRef.database.getAllPlatformServices();
|
||||||
|
for (const service of services) {
|
||||||
|
if (service.status !== 'running' || !service.containerId) continue;
|
||||||
|
if (this.activeLogStreams.has(service.type)) continue;
|
||||||
|
|
||||||
|
this.activeLogStreams.set(service.type, true);
|
||||||
|
logger.info(`Starting log stream for platform service: ${service.type}`);
|
||||||
|
|
||||||
|
try {
|
||||||
|
await this.opsServerRef.oneboxRef.docker.streamContainerLogs(
|
||||||
|
service.containerId,
|
||||||
|
(line: string, isError: boolean) => {
|
||||||
|
this.pushLogToClients(service.type as interfaces.data.TPlatformServiceType, line, isError);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
} catch (err) {
|
||||||
|
logger.warn(`Log stream failed for ${service.type}: ${(err as Error).message}`);
|
||||||
|
this.activeLogStreams.delete(service.type);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Initial check after a short delay (let services start first)
|
||||||
|
setTimeout(() => checkAndStream(), 5000);
|
||||||
|
// Re-check periodically for newly started services
|
||||||
|
setInterval(() => checkAndStream(), 15000);
|
||||||
|
}
|
||||||
|
|
||||||
|
private pushLogToClients(
|
||||||
|
serviceType: interfaces.data.TPlatformServiceType,
|
||||||
|
line: string,
|
||||||
|
isError: boolean,
|
||||||
|
): void {
|
||||||
|
const typedsocket = (this.opsServerRef.server as any)?.typedserver?.typedsocket;
|
||||||
|
if (!typedsocket) return;
|
||||||
|
|
||||||
|
// Parse timestamp from Docker log line
|
||||||
|
const tsMatch = line.match(/^(\d{4}-\d{2}-\d{2}T[\d:.]+Z?)\s+(.*)/);
|
||||||
|
const timestamp = tsMatch ? tsMatch[1] : new Date().toISOString();
|
||||||
|
const message = tsMatch ? tsMatch[2] : line;
|
||||||
|
const msgLower = message.toLowerCase();
|
||||||
|
const level = isError || msgLower.includes('error') || msgLower.includes('fatal')
|
||||||
|
? 'error'
|
||||||
|
: msgLower.includes('warn')
|
||||||
|
? 'warn'
|
||||||
|
: 'info';
|
||||||
|
|
||||||
|
// Find all dashboard clients and push
|
||||||
|
typedsocket.findAllTargetConnectionsByTag('role', 'ops_dashboard')
|
||||||
|
.then((connections: any[]) => {
|
||||||
|
for (const conn of connections) {
|
||||||
|
typedsocket.createTypedRequest<interfaces.requests.IReq_PushPlatformServiceLog>(
|
||||||
|
'pushPlatformServiceLog',
|
||||||
|
conn,
|
||||||
|
).fire({
|
||||||
|
serviceType,
|
||||||
|
entry: { timestamp, level, message },
|
||||||
|
}).catch(() => {}); // fire-and-forget
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(() => {}); // no connections, ignore
|
||||||
}
|
}
|
||||||
|
|
||||||
private registerHandlers(): void {
|
private registerHandlers(): void {
|
||||||
@@ -186,13 +258,18 @@ export class PlatformHandler {
|
|||||||
.filter((line: string) => line.trim());
|
.filter((line: string) => line.trim());
|
||||||
|
|
||||||
const logs = logLines.map((line: string, index: number) => {
|
const logs = logLines.map((line: string, index: number) => {
|
||||||
const isError = line.toLowerCase().includes('error') || line.toLowerCase().includes('fatal');
|
// Try to parse Docker timestamp from beginning of line
|
||||||
const isWarn = line.toLowerCase().includes('warn');
|
const tsMatch = line.match(/^(\d{4}-\d{2}-\d{2}T[\d:.]+Z?)\s+(.*)/);
|
||||||
|
const timestamp = tsMatch ? new Date(tsMatch[1]).getTime() : Date.now();
|
||||||
|
const message = tsMatch ? tsMatch[2] : line;
|
||||||
|
const msgLower = message.toLowerCase();
|
||||||
|
const isError = msgLower.includes('error') || msgLower.includes('fatal');
|
||||||
|
const isWarn = msgLower.includes('warn');
|
||||||
return {
|
return {
|
||||||
id: index,
|
id: index,
|
||||||
serviceId: 0,
|
serviceId: 0,
|
||||||
timestamp: Date.now(),
|
timestamp,
|
||||||
message: line,
|
message,
|
||||||
level: (isError ? 'error' : isWarn ? 'warn' : 'info') as 'info' | 'warn' | 'error' | 'debug',
|
level: (isError ? 'error' : isWarn ? 'warn' : 'info') as 'info' | 'warn' | 'error' | 'debug',
|
||||||
source: 'stdout' as const,
|
source: 'stdout' as const,
|
||||||
};
|
};
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -8,6 +8,11 @@ export interface ISystemStatus {
|
|||||||
docker: {
|
docker: {
|
||||||
running: boolean;
|
running: boolean;
|
||||||
version: unknown;
|
version: unknown;
|
||||||
|
cpuUsage: number;
|
||||||
|
memoryUsage: number;
|
||||||
|
memoryTotal: number;
|
||||||
|
networkIn: number;
|
||||||
|
networkOut: number;
|
||||||
};
|
};
|
||||||
reverseProxy: {
|
reverseProxy: {
|
||||||
http: { running: boolean; port: number };
|
http: { running: boolean; port: number };
|
||||||
|
|||||||
@@ -84,3 +84,19 @@ export interface IReq_GetPlatformServiceLogs extends plugins.typedrequestInterfa
|
|||||||
logs: data.ILogEntry[];
|
logs: data.ILogEntry[];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface IReq_PushPlatformServiceLog extends plugins.typedrequestInterfaces.implementsTR<
|
||||||
|
plugins.typedrequestInterfaces.ITypedRequest,
|
||||||
|
IReq_PushPlatformServiceLog
|
||||||
|
> {
|
||||||
|
method: 'pushPlatformServiceLog';
|
||||||
|
request: {
|
||||||
|
serviceType: data.TPlatformServiceType;
|
||||||
|
entry: {
|
||||||
|
timestamp: string;
|
||||||
|
level: string;
|
||||||
|
message: string;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
response: {};
|
||||||
|
}
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@serve.zone/onebox',
|
name: '@serve.zone/onebox',
|
||||||
version: '1.18.2',
|
version: '1.19.2',
|
||||||
description: 'Self-hosted container platform with automatic SSL and DNS - a mini Heroku for single servers'
|
description: 'Self-hosted container platform with automatic SSL and DNS - a mini Heroku for single servers'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -961,3 +961,73 @@ const startAutoRefresh = () => {
|
|||||||
uiStatePart.select((s) => s).subscribe(() => startAutoRefresh());
|
uiStatePart.select((s) => s).subscribe(() => startAutoRefresh());
|
||||||
loginStatePart.select((s) => s).subscribe(() => startAutoRefresh());
|
loginStatePart.select((s) => s).subscribe(() => startAutoRefresh());
|
||||||
startAutoRefresh();
|
startAutoRefresh();
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// TypedSocket — real-time server push (logs, events)
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
let socketClient: InstanceType<typeof plugins.typedsocket.TypedSocket> | null = null;
|
||||||
|
const socketRouter = new plugins.domtools.plugins.typedrequest.TypedRouter();
|
||||||
|
|
||||||
|
// Handle server-pushed platform service log entries
|
||||||
|
socketRouter.addTypedHandler(
|
||||||
|
new plugins.domtools.plugins.typedrequest.TypedHandler<interfaces.requests.IReq_PushPlatformServiceLog>(
|
||||||
|
'pushPlatformServiceLog',
|
||||||
|
async (dataArg) => {
|
||||||
|
const state = servicesStatePart.getState();
|
||||||
|
const entry: interfaces.data.ILogEntry = {
|
||||||
|
id: state.currentPlatformServiceLogs.length,
|
||||||
|
serviceId: 0,
|
||||||
|
timestamp: new Date(dataArg.entry.timestamp).getTime(),
|
||||||
|
message: dataArg.entry.message,
|
||||||
|
level: dataArg.entry.level as 'info' | 'warn' | 'error' | 'debug',
|
||||||
|
source: 'stdout',
|
||||||
|
};
|
||||||
|
const updated = [...state.currentPlatformServiceLogs, entry];
|
||||||
|
// Cap at 2000 entries
|
||||||
|
if (updated.length > 2000) {
|
||||||
|
updated.splice(0, updated.length - 2000);
|
||||||
|
}
|
||||||
|
servicesStatePart.setState({
|
||||||
|
...state,
|
||||||
|
currentPlatformServiceLogs: updated,
|
||||||
|
});
|
||||||
|
return {};
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
async function connectSocket() {
|
||||||
|
if (socketClient) return;
|
||||||
|
try {
|
||||||
|
socketClient = await plugins.typedsocket.TypedSocket.createClient(
|
||||||
|
socketRouter,
|
||||||
|
plugins.typedsocket.TypedSocket.useWindowLocationOriginUrl(),
|
||||||
|
);
|
||||||
|
await socketClient.setTag('role', 'ops_dashboard');
|
||||||
|
console.log('TypedSocket dashboard connection established');
|
||||||
|
} catch (err) {
|
||||||
|
console.error('TypedSocket connection failed:', err);
|
||||||
|
socketClient = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function disconnectSocket() {
|
||||||
|
if (socketClient) {
|
||||||
|
try {
|
||||||
|
await socketClient.disconnect();
|
||||||
|
} catch {
|
||||||
|
// ignore disconnect errors
|
||||||
|
}
|
||||||
|
socketClient = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Connect socket when logged in, disconnect when logged out
|
||||||
|
loginStatePart.select((s) => s).subscribe((loginState) => {
|
||||||
|
if (loginState.isLoggedIn) {
|
||||||
|
connectSocket();
|
||||||
|
} else {
|
||||||
|
disconnectSocket();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|||||||
@@ -110,8 +110,8 @@ export class ObViewDashboard extends DeesElement {
|
|||||||
cpu: status?.docker?.cpuUsage || 0,
|
cpu: status?.docker?.cpuUsage || 0,
|
||||||
memoryUsed: status?.docker?.memoryUsage || 0,
|
memoryUsed: status?.docker?.memoryUsage || 0,
|
||||||
memoryTotal: status?.docker?.memoryTotal || 0,
|
memoryTotal: status?.docker?.memoryTotal || 0,
|
||||||
networkIn: 0,
|
networkIn: status?.docker?.networkIn || 0,
|
||||||
networkOut: 0,
|
networkOut: status?.docker?.networkOut || 0,
|
||||||
topConsumers: [],
|
topConsumers: [],
|
||||||
},
|
},
|
||||||
platformServices: platformServices.map((ps) => ({
|
platformServices: platformServices.map((ps) => ({
|
||||||
|
|||||||
@@ -222,9 +222,20 @@ export class ObViewServices extends DeesElement {
|
|||||||
domain: s.domain || null,
|
domain: s.domain || null,
|
||||||
status: mapStatus(s.status),
|
status: mapStatus(s.status),
|
||||||
}));
|
}));
|
||||||
|
const displayStatus = (status: string) => {
|
||||||
|
switch (status) {
|
||||||
|
case 'running': return 'Running';
|
||||||
|
case 'stopped': return 'Stopped';
|
||||||
|
case 'starting': return 'Starting...';
|
||||||
|
case 'stopping': return 'Stopping...';
|
||||||
|
case 'failed': return 'Failed';
|
||||||
|
case 'not-deployed': return 'Not Deployed';
|
||||||
|
default: return status;
|
||||||
|
}
|
||||||
|
};
|
||||||
const mappedPlatformServices = this.servicesState.platformServices.map((ps) => ({
|
const mappedPlatformServices = this.servicesState.platformServices.map((ps) => ({
|
||||||
name: ps.displayName,
|
name: ps.displayName,
|
||||||
status: ps.status === 'running' ? `Running` : ps.status,
|
status: displayStatus(ps.status),
|
||||||
running: ps.status === 'running',
|
running: ps.status === 'running',
|
||||||
type: ps.type,
|
type: ps.type,
|
||||||
}));
|
}));
|
||||||
@@ -357,12 +368,26 @@ export class ObViewServices extends DeesElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private navigateToPlatformDetail(type: string): void {
|
private navigateToPlatformDetail(type: string): void {
|
||||||
|
// Reset to list first to force fresh DOM for dees-chart-log
|
||||||
|
this.currentView = 'list';
|
||||||
this.selectedPlatformType = type;
|
this.selectedPlatformType = type;
|
||||||
|
|
||||||
|
// Clear previous stats/logs before fetching new ones
|
||||||
|
appstate.servicesStatePart.setState({
|
||||||
|
...appstate.servicesStatePart.getState(),
|
||||||
|
currentPlatformServiceStats: null,
|
||||||
|
currentPlatformServiceLogs: [],
|
||||||
|
});
|
||||||
|
|
||||||
// Fetch stats and logs for this platform service
|
// Fetch stats and logs for this platform service
|
||||||
const serviceType = type as interfaces.data.TPlatformServiceType;
|
const serviceType = type as interfaces.data.TPlatformServiceType;
|
||||||
appstate.servicesStatePart.dispatchAction(appstate.fetchPlatformServiceStatsAction, { serviceType });
|
appstate.servicesStatePart.dispatchAction(appstate.fetchPlatformServiceStatsAction, { serviceType });
|
||||||
appstate.servicesStatePart.dispatchAction(appstate.fetchPlatformServiceLogsAction, { serviceType });
|
appstate.servicesStatePart.dispatchAction(appstate.fetchPlatformServiceLogsAction, { serviceType });
|
||||||
this.currentView = 'platform-detail';
|
|
||||||
|
// Switch to detail view on next microtask (ensures fresh DOM)
|
||||||
|
requestAnimationFrame(() => {
|
||||||
|
this.currentView = 'platform-detail';
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private renderPlatformDetailView(): TemplateResult {
|
private renderPlatformDetailView(): TemplateResult {
|
||||||
@@ -370,37 +395,60 @@ export class ObViewServices extends DeesElement {
|
|||||||
(ps) => ps.type === this.selectedPlatformType,
|
(ps) => ps.type === this.selectedPlatformType,
|
||||||
);
|
);
|
||||||
const stats = this.servicesState.currentPlatformServiceStats;
|
const stats = this.servicesState.currentPlatformServiceStats;
|
||||||
const metrics = stats
|
const metrics = {
|
||||||
? {
|
cpu: stats ? Math.round(stats.cpuPercent) : 0,
|
||||||
cpu: Math.round(stats.cpuPercent),
|
memory: stats ? Math.round(stats.memoryPercent) : 0,
|
||||||
memory: Math.round(stats.memoryPercent),
|
storage: 0,
|
||||||
storage: 0,
|
connections: undefined as number | undefined,
|
||||||
connections: 0,
|
};
|
||||||
}
|
|
||||||
: undefined;
|
// Real service info per platform type
|
||||||
|
const serviceInfo: Record<string, { host: string; port: number; version: string; config: Record<string, any> }> = {
|
||||||
|
mongodb: { host: 'onebox-mongodb', port: 27017, version: '4.4', config: { engine: 'WiredTiger', authEnabled: true } },
|
||||||
|
minio: { host: 'onebox-minio', port: 9000, version: 'latest', config: { consolePort: 9001, region: 'us-east-1' } },
|
||||||
|
clickhouse: { host: 'onebox-clickhouse', port: 8123, version: 'latest', config: { nativePort: 9000, httpPort: 8123 } },
|
||||||
|
caddy: { host: 'onebox-caddy', port: 80, version: '2-alpine', config: { httpsPort: 443, adminApi: 2019 } },
|
||||||
|
};
|
||||||
|
const info = platformService
|
||||||
|
? serviceInfo[platformService.type] || { host: 'unknown', port: 0, version: '', config: {} }
|
||||||
|
: { host: '', port: 0, version: '', config: {} };
|
||||||
|
|
||||||
|
// Map backend status to catalog-compatible status
|
||||||
|
const mapPlatformStatus = (status: string): 'running' | 'stopped' | 'error' => {
|
||||||
|
switch (status) {
|
||||||
|
case 'running': return 'running';
|
||||||
|
case 'failed': return 'error';
|
||||||
|
case 'starting':
|
||||||
|
case 'stopping':
|
||||||
|
case 'stopped':
|
||||||
|
case 'not-deployed':
|
||||||
|
default: return 'stopped';
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return html`
|
return html`
|
||||||
<ob-sectionheading>Platform Service</ob-sectionheading>
|
<ob-sectionheading>Platform Service</ob-sectionheading>
|
||||||
|
<div class="page-actions" style="justify-content: flex-start;">
|
||||||
|
<button class="deploy-button" style="background: transparent; border: 1px solid var(--ci-shade-2, #27272a); color: inherit;" @click=${() => { this.currentView = 'list'; }}>
|
||||||
|
← Back to Services
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
<sz-platform-service-detail-view
|
<sz-platform-service-detail-view
|
||||||
.service=${platformService
|
.service=${platformService
|
||||||
? {
|
? {
|
||||||
id: platformService.type,
|
id: platformService.type,
|
||||||
name: platformService.displayName,
|
name: platformService.displayName,
|
||||||
type: platformService.type,
|
type: platformService.type,
|
||||||
status: platformService.status === 'running'
|
status: mapPlatformStatus(platformService.status),
|
||||||
? 'running'
|
version: info.version,
|
||||||
: platformService.status === 'failed'
|
host: info.host,
|
||||||
? 'error'
|
port: info.port,
|
||||||
: 'stopped',
|
config: info.config,
|
||||||
version: '',
|
|
||||||
host: 'localhost',
|
|
||||||
port: 0,
|
|
||||||
config: {},
|
|
||||||
metrics,
|
metrics,
|
||||||
}
|
}
|
||||||
: null}
|
: null}
|
||||||
.logs=${this.servicesState.currentPlatformServiceLogs.map((log) => ({
|
.logs=${this.servicesState.currentPlatformServiceLogs.map((log) => ({
|
||||||
timestamp: new Date(log.timestamp).toLocaleString(),
|
timestamp: new Date(log.timestamp).toISOString(),
|
||||||
level: log.level,
|
level: log.level,
|
||||||
message: log.message,
|
message: log.message,
|
||||||
}))}
|
}))}
|
||||||
|
|||||||
@@ -5,9 +5,13 @@ import * as deesCatalog from '@design.estate/dees-catalog';
|
|||||||
// @serve.zone scope — side-effect import registers all sz-* custom elements
|
// @serve.zone scope — side-effect import registers all sz-* custom elements
|
||||||
import '@serve.zone/catalog';
|
import '@serve.zone/catalog';
|
||||||
|
|
||||||
|
// TypedSocket for real-time server push (logs, events)
|
||||||
|
import * as typedsocket from '@api.global/typedsocket';
|
||||||
|
|
||||||
export {
|
export {
|
||||||
deesElement,
|
deesElement,
|
||||||
deesCatalog,
|
deesCatalog,
|
||||||
|
typedsocket,
|
||||||
};
|
};
|
||||||
|
|
||||||
// domtools gives us TypedRequest, smartstate, smartrouter, and other utilities
|
// domtools gives us TypedRequest, smartstate, smartrouter, and other utilities
|
||||||
|
|||||||
Reference in New Issue
Block a user