Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| eceb5d99c8 | |||
| 0631b7731f | |||
| 4c485cdc0a | |||
| 0f0da0f2ef |
15
changelog.md
15
changelog.md
@@ -1,5 +1,20 @@
|
||||
# Changelog
|
||||
|
||||
## 2026-03-03 - 1.11.0 - feat(services)
|
||||
map backend service data to UI components, add stats & logs parsing, fetch service stats, and fix logs request param
|
||||
|
||||
- Fix: rename service logs request property from 'lines' to 'tail' when calling typedRequest
|
||||
- Add data transformation helpers: formatBytes, parseImageString, mapStatus, toServiceDetail, toServiceStats, parseLogs
|
||||
- Transform service list and detail props to match @serve.zone/catalog component interfaces (map status, image, repo/tag, timestamps, registry)
|
||||
- Dispatch fetchServiceStatsAction on service click and surface transformed stats with default values to avoid nulls
|
||||
- Parse and normalize logs into timestamp/message pairs for the detail view
|
||||
|
||||
## 2026-03-02 - 1.10.3 - fix(bin)
|
||||
make bin/onebox-wrapper.js executable
|
||||
|
||||
- Metadata-only change: file mode updated for bin/onebox-wrapper.js to include the executable bit
|
||||
- No source or behavior changes to the code
|
||||
|
||||
## 2026-03-02 - 1.10.2 - fix(build)
|
||||
update build/watch configuration, switch to esbuild bundler and tswatch, and bump catalog and tooling dependencies
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@serve.zone/onebox",
|
||||
"version": "1.10.2",
|
||||
"version": "1.11.0",
|
||||
"exports": "./mod.ts",
|
||||
"nodeModulesDir": "auto",
|
||||
"tasks": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@serve.zone/onebox",
|
||||
"version": "1.10.2",
|
||||
"version": "1.11.0",
|
||||
"description": "Self-hosted container platform with automatic SSL and DNS - a mini Heroku for single servers",
|
||||
"main": "mod.ts",
|
||||
"type": "module",
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@serve.zone/onebox',
|
||||
version: '1.10.2',
|
||||
version: '1.11.0',
|
||||
description: 'Self-hosted container platform with automatic SSL and DNS - a mini Heroku for single servers'
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -3,6 +3,6 @@
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@serve.zone/onebox',
|
||||
version: '1.10.2',
|
||||
version: '1.11.0',
|
||||
description: 'Self-hosted container platform with automatic SSL and DNS - a mini Heroku for single servers'
|
||||
}
|
||||
|
||||
@@ -381,7 +381,7 @@ export const fetchServiceLogsAction = servicesStatePart.createAction<{
|
||||
const response = await typedRequest.fire({
|
||||
identity: context.identity!,
|
||||
serviceName: dataArg.name,
|
||||
lines: dataArg.lines || 200,
|
||||
tail: dataArg.lines || 200,
|
||||
});
|
||||
return { ...statePartArg.getState(), currentServiceLogs: response.logs };
|
||||
} catch (err) {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import * as plugins from '../plugins.js';
|
||||
import * as shared from './shared/index.js';
|
||||
import * as appstate from '../appstate.js';
|
||||
import * as interfaces from '../../ts_interfaces/index.js';
|
||||
import {
|
||||
DeesElement,
|
||||
customElement,
|
||||
@@ -11,6 +12,91 @@ import {
|
||||
type TemplateResult,
|
||||
} from '@design.estate/dees-element';
|
||||
|
||||
// ============================================================================
|
||||
// Data transformation helpers
|
||||
// Maps backend data shapes to @serve.zone/catalog component interfaces
|
||||
// ============================================================================
|
||||
|
||||
function formatBytes(bytes: number): string {
|
||||
if (!bytes || bytes === 0) return '0 B';
|
||||
const units = ['B', 'KB', 'MB', 'GB', 'TB'];
|
||||
const k = 1024;
|
||||
const i = Math.floor(Math.log(bytes) / Math.log(k));
|
||||
const value = bytes / Math.pow(k, i);
|
||||
return `${value.toFixed(1)} ${units[i]}`;
|
||||
}
|
||||
|
||||
function parseImageString(image: string): { repository: string; tag: string } {
|
||||
const lastColon = image.lastIndexOf(':');
|
||||
const lastSlash = image.lastIndexOf('/');
|
||||
if (lastColon > lastSlash && lastColon > 0) {
|
||||
return {
|
||||
repository: image.substring(0, lastColon),
|
||||
tag: image.substring(lastColon + 1),
|
||||
};
|
||||
}
|
||||
return { repository: image, tag: 'latest' };
|
||||
}
|
||||
|
||||
function mapStatus(status: string): 'running' | 'stopped' | 'starting' | 'error' {
|
||||
switch (status) {
|
||||
case 'running': return 'running';
|
||||
case 'starting': return 'starting';
|
||||
case 'failed': return 'error';
|
||||
case 'stopped':
|
||||
case 'stopping':
|
||||
default: return 'stopped';
|
||||
}
|
||||
}
|
||||
|
||||
function toServiceDetail(service: interfaces.data.IService) {
|
||||
const parsed = parseImageString(service.image);
|
||||
return {
|
||||
name: service.name,
|
||||
status: mapStatus(service.status),
|
||||
image: service.image,
|
||||
port: service.port,
|
||||
domain: service.domain || null,
|
||||
containerId: service.containerID || '',
|
||||
created: service.createdAt ? new Date(service.createdAt).toLocaleString() : '-',
|
||||
updated: service.updatedAt ? new Date(service.updatedAt).toLocaleString() : '-',
|
||||
registry: service.useOneboxRegistry ? 'Onebox Registry' : (service.registry || 'Docker Hub'),
|
||||
repository: service.registryRepository || parsed.repository,
|
||||
tag: service.registryImageTag || parsed.tag,
|
||||
};
|
||||
}
|
||||
|
||||
function toServiceStats(stats: interfaces.data.IContainerStats) {
|
||||
return {
|
||||
cpu: stats.cpuPercent,
|
||||
memory: formatBytes(stats.memoryUsed),
|
||||
memoryLimit: formatBytes(stats.memoryLimit),
|
||||
networkIn: formatBytes(stats.networkRx),
|
||||
networkOut: formatBytes(stats.networkTx),
|
||||
};
|
||||
}
|
||||
|
||||
function parseLogs(logs: any): Array<{ timestamp: string; message: string }> {
|
||||
if (Array.isArray(logs)) {
|
||||
return logs.map((entry: any) => ({
|
||||
timestamp: entry.timestamp ? String(entry.timestamp) : '',
|
||||
message: entry.message || String(entry),
|
||||
}));
|
||||
}
|
||||
if (typeof logs === 'string' && logs.trim()) {
|
||||
return logs.split('\n').filter((line: string) => line.trim()).map((line: string) => {
|
||||
const match = line.match(/^(\d{4}-\d{2}-\d{2}T[\d:.]+Z?)\s+(.*)/);
|
||||
if (match) {
|
||||
return { timestamp: match[1], message: match[2] };
|
||||
}
|
||||
return { timestamp: '', message: line };
|
||||
});
|
||||
}
|
||||
return [];
|
||||
}
|
||||
|
||||
const defaultStats = { cpu: 0, memory: '0 B', memoryLimit: '0 B', networkIn: '0 B', networkOut: '0 B' };
|
||||
|
||||
@customElement('ob-view-services')
|
||||
export class ObViewServices extends DeesElement {
|
||||
@state()
|
||||
@@ -86,10 +172,16 @@ export class ObViewServices extends DeesElement {
|
||||
}
|
||||
|
||||
private renderListView(): TemplateResult {
|
||||
const mappedServices = this.servicesState.services.map((s) => ({
|
||||
name: s.name,
|
||||
image: s.image,
|
||||
domain: s.domain || null,
|
||||
status: mapStatus(s.status),
|
||||
}));
|
||||
return html`
|
||||
<ob-sectionheading>Services</ob-sectionheading>
|
||||
<sz-services-list-view
|
||||
.services=${this.servicesState.services}
|
||||
.services=${mappedServices}
|
||||
@service-click=${(e: CustomEvent) => {
|
||||
this.selectedServiceName = e.detail.name || e.detail.service?.name;
|
||||
appstate.servicesStatePart.dispatchAction(appstate.fetchServiceAction, {
|
||||
@@ -98,6 +190,9 @@ export class ObViewServices extends DeesElement {
|
||||
appstate.servicesStatePart.dispatchAction(appstate.fetchServiceLogsAction, {
|
||||
name: this.selectedServiceName,
|
||||
});
|
||||
appstate.servicesStatePart.dispatchAction(appstate.fetchServiceStatsAction, {
|
||||
name: this.selectedServiceName,
|
||||
});
|
||||
this.currentView = 'detail';
|
||||
}}
|
||||
@service-action=${(e: CustomEvent) => this.handleServiceAction(e)}
|
||||
@@ -124,12 +219,19 @@ export class ObViewServices extends DeesElement {
|
||||
}
|
||||
|
||||
private renderDetailView(): TemplateResult {
|
||||
const service = this.servicesState.currentService;
|
||||
const transformedService = service ? toServiceDetail(service) : null;
|
||||
const transformedStats = this.servicesState.currentServiceStats
|
||||
? toServiceStats(this.servicesState.currentServiceStats)
|
||||
: defaultStats;
|
||||
const transformedLogs = parseLogs(this.servicesState.currentServiceLogs);
|
||||
|
||||
return html`
|
||||
<ob-sectionheading>Service Details</ob-sectionheading>
|
||||
<sz-service-detail-view
|
||||
.service=${this.servicesState.currentService}
|
||||
.logs=${this.servicesState.currentServiceLogs}
|
||||
.stats=${this.servicesState.currentServiceStats}
|
||||
.service=${transformedService}
|
||||
.logs=${transformedLogs}
|
||||
.stats=${transformedStats}
|
||||
@back=${() => {
|
||||
this.currentView = 'list';
|
||||
}}
|
||||
|
||||
Reference in New Issue
Block a user