Compare commits
28 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1b6de75097 | |||
| 497f8f59a7 | |||
| 0c7d65e4ad | |||
| 3f2cd074ce | |||
| 59ed7233bd | |||
| 01e3ba16c4 | |||
| f5c1d5fcda | |||
| 45b0971f2f | |||
| 178f440d7e | |||
| 7fff15a90c | |||
| 69e23f667e | |||
| a2bf4df7c2 | |||
| 9e0a0b5a89 | |||
| 3a227bd838 | |||
| f5a7fccfc2 | |||
| a30d2029a5 | |||
| 88727dd47d | |||
| 9a5ed2220e | |||
| decd39e7c4 | |||
| ad2e228208 | |||
| cf06019d79 | |||
| cf44b0047d | |||
| 260b5364e6 | |||
| 51c1962042 | |||
| d3b78054ad | |||
| d2ae35f0ce | |||
| a605477663 | |||
| ba98086548 |
78
changelog.md
78
changelog.md
@@ -1,5 +1,83 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.17.0 - feat(web/services)
|
||||||
|
add deploy service action to the services view
|
||||||
|
|
||||||
|
- Adds a prominent "Deploy Service" button to the services page header.
|
||||||
|
- Routes users into the create service view directly from the services listing.
|
||||||
|
- Includes a new service creation form screenshot asset for the updated interface.
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.16.0 - feat(services)
|
||||||
|
add platform service navigation and stats in the services UI
|
||||||
|
|
||||||
|
- add platform service stats state and fetch action
|
||||||
|
- show platform services in the services list and open a platform detail view
|
||||||
|
- enable dashboard clicks to jump directly to the selected platform service
|
||||||
|
- refresh platform service stats after start and restart actions
|
||||||
|
- bump @serve.zone/catalog to ^2.6.0 for the new platform service UI components
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.15.3 - fix(install)
|
||||||
|
refresh systemd service configuration before restarting previously running installations
|
||||||
|
|
||||||
|
- Re-enable the systemd service during updates so unit file changes are applied before restart
|
||||||
|
- Add a log message indicating the service configuration is being refreshed
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.15.2 - fix(systemd)
|
||||||
|
set HOME and DENO_DIR for the systemd service environment
|
||||||
|
|
||||||
|
- Adds HOME=/root to the generated onebox systemd unit
|
||||||
|
- Adds DENO_DIR=/root/.cache/deno so Deno cache paths are available when running as a service
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.15.1 - fix(systemd)
|
||||||
|
move Docker installation and swarm initialization to systemd enable flow
|
||||||
|
|
||||||
|
- Ensures Docker is installed before writing and enabling the systemd unit that depends on docker.service.
|
||||||
|
- Removes Docker auto-installation from Onebox initialization so setup happens in the service management path.
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.15.0 - feat(systemd)
|
||||||
|
replace smartdaemon-based service management with native systemd commands
|
||||||
|
|
||||||
|
- adds a dedicated OneboxSystemd manager for enabling, disabling, starting, stopping, checking status, and following logs
|
||||||
|
- introduces a new `onebox systemd` CLI command set and updates install and help output to use it
|
||||||
|
- removes the smartdaemon dependency and related service management code
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.14.10 - fix(services)
|
||||||
|
stop auto-update monitoring during shutdown
|
||||||
|
|
||||||
|
- Track the auto-update polling interval in the services manager
|
||||||
|
- Clear the auto-update interval when Onebox shuts down to prevent background checks after shutdown
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.14.9 - fix(repo)
|
||||||
|
no changes to commit
|
||||||
|
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.14.8 - fix(repo)
|
||||||
|
no changes to commit
|
||||||
|
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.14.7 - fix(repo)
|
||||||
|
no changes to commit
|
||||||
|
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.14.6 - fix(project)
|
||||||
|
no changes to commit
|
||||||
|
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.14.5 - fix(onebox)
|
||||||
|
move Docker auto-install and swarm initialization into Onebox startup flow
|
||||||
|
|
||||||
|
- removes Docker setup from daemon service installation
|
||||||
|
- ensures Docker is installed before Docker initialization during Onebox startup
|
||||||
|
- preserves automatic Docker Swarm initialization on fresh servers
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.14.4 - fix(repo)
|
||||||
|
no changes to commit
|
||||||
|
|
||||||
|
|
||||||
|
## 2026-03-16 - 1.14.3 - fix(repo)
|
||||||
|
no changes to commit
|
||||||
|
|
||||||
|
|
||||||
## 2026-03-16 - 1.14.2 - fix(repo)
|
## 2026-03-16 - 1.14.2 - fix(repo)
|
||||||
no changes to commit
|
no changes to commit
|
||||||
|
|
||||||
|
|||||||
BIN
create-service-form.png
Normal file
BIN
create-service-form.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 59 KiB |
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@serve.zone/onebox",
|
"name": "@serve.zone/onebox",
|
||||||
"version": "1.14.2",
|
"version": "1.17.0",
|
||||||
"exports": "./mod.ts",
|
"exports": "./mod.ts",
|
||||||
"tasks": {
|
"tasks": {
|
||||||
"test": "deno test --allow-all test/",
|
"test": "deno test --allow-all test/",
|
||||||
@@ -15,7 +15,6 @@
|
|||||||
"@std/assert": "jsr:@std/assert@^1.0.15",
|
"@std/assert": "jsr:@std/assert@^1.0.15",
|
||||||
"@std/encoding": "jsr:@std/encoding@^1.0.10",
|
"@std/encoding": "jsr:@std/encoding@^1.0.10",
|
||||||
"@db/sqlite": "jsr:@db/sqlite@0.12.0",
|
"@db/sqlite": "jsr:@db/sqlite@0.12.0",
|
||||||
"@push.rocks/smartdaemon": "npm:@push.rocks/smartdaemon@^2.1.0",
|
|
||||||
"@apiclient.xyz/docker": "npm:@apiclient.xyz/docker@^5.1.1",
|
"@apiclient.xyz/docker": "npm:@apiclient.xyz/docker@^5.1.1",
|
||||||
"@apiclient.xyz/cloudflare": "npm:@apiclient.xyz/cloudflare@6.4.3",
|
"@apiclient.xyz/cloudflare": "npm:@apiclient.xyz/cloudflare@6.4.3",
|
||||||
"@push.rocks/smartacme": "npm:@push.rocks/smartacme@^8.0.0",
|
"@push.rocks/smartacme": "npm:@push.rocks/smartacme@^8.0.0",
|
||||||
|
|||||||
16
install.sh
16
install.sh
@@ -23,7 +23,7 @@ SPECIFIED_VERSION=""
|
|||||||
INSTALL_DIR="/opt/onebox"
|
INSTALL_DIR="/opt/onebox"
|
||||||
GITEA_BASE_URL="https://code.foss.global"
|
GITEA_BASE_URL="https://code.foss.global"
|
||||||
GITEA_REPO="serve.zone/onebox"
|
GITEA_REPO="serve.zone/onebox"
|
||||||
SERVICE_NAME="smartdaemon_onebox"
|
SERVICE_NAME="onebox"
|
||||||
|
|
||||||
# Parse command line arguments
|
# Parse command line arguments
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
@@ -250,8 +250,10 @@ echo ""
|
|||||||
mkdir -p /var/lib/onebox
|
mkdir -p /var/lib/onebox
|
||||||
mkdir -p /var/www/certbot
|
mkdir -p /var/www/certbot
|
||||||
|
|
||||||
# Restart service if it was running before update
|
# Re-enable and restart service if it was previously running (refreshes unit file)
|
||||||
if [ $SERVICE_WAS_RUNNING -eq 1 ]; then
|
if [ $SERVICE_WAS_RUNNING -eq 1 ]; then
|
||||||
|
echo "Refreshing systemd service..."
|
||||||
|
onebox systemd enable
|
||||||
echo "Restarting Onebox service..."
|
echo "Restarting Onebox service..."
|
||||||
systemctl restart "$SERVICE_NAME"
|
systemctl restart "$SERVICE_NAME"
|
||||||
echo "Service restarted successfully."
|
echo "Service restarted successfully."
|
||||||
@@ -276,7 +278,7 @@ if [ -f "/var/lib/onebox/onebox.db" ]; then
|
|||||||
if [ $SERVICE_WAS_RUNNING -eq 1 ]; then
|
if [ $SERVICE_WAS_RUNNING -eq 1 ]; then
|
||||||
echo "The service has been restarted with your current settings."
|
echo "The service has been restarted with your current settings."
|
||||||
else
|
else
|
||||||
echo "Start the service with: onebox daemon start"
|
echo "Start the service with: onebox systemd start"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Get started:"
|
echo "Get started:"
|
||||||
@@ -293,11 +295,11 @@ else
|
|||||||
echo " 2. Configure ACME email:"
|
echo " 2. Configure ACME email:"
|
||||||
echo " onebox config set acmeEmail <your@email.com>"
|
echo " onebox config set acmeEmail <your@email.com>"
|
||||||
echo ""
|
echo ""
|
||||||
echo " 3. Install daemon:"
|
echo " 3. Enable systemd service:"
|
||||||
echo " onebox daemon install"
|
echo " onebox systemd enable"
|
||||||
echo ""
|
echo ""
|
||||||
echo " 4. Start daemon:"
|
echo " 4. Start service:"
|
||||||
echo " onebox daemon start"
|
echo " onebox systemd start"
|
||||||
echo ""
|
echo ""
|
||||||
echo " 5. Deploy your first service:"
|
echo " 5. Deploy your first service:"
|
||||||
echo " onebox service add myapp --image nginx:latest --domain app.example.com"
|
echo " onebox service add myapp --image nginx:latest --domain app.example.com"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@serve.zone/onebox",
|
"name": "@serve.zone/onebox",
|
||||||
"version": "1.14.2",
|
"version": "1.17.0",
|
||||||
"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",
|
||||||
@@ -57,7 +57,7 @@
|
|||||||
"@api.global/typedrequest-interfaces": "^3.0.19",
|
"@api.global/typedrequest-interfaces": "^3.0.19",
|
||||||
"@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.5.0"
|
"@serve.zone/catalog": "^2.6.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@git.zone/tsbundle": "^2.9.0",
|
"@git.zone/tsbundle": "^2.9.0",
|
||||||
|
|||||||
10
pnpm-lock.yaml
generated
10
pnpm-lock.yaml
generated
@@ -18,8 +18,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.5.0
|
specifier: ^2.6.0
|
||||||
version: 2.5.0(@tiptap/pm@2.27.2)
|
version: 2.6.0(@tiptap/pm@2.27.2)
|
||||||
devDependencies:
|
devDependencies:
|
||||||
'@git.zone/tsbundle':
|
'@git.zone/tsbundle':
|
||||||
specifier: ^2.9.0
|
specifier: ^2.9.0
|
||||||
@@ -836,8 +836,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.5.0':
|
'@serve.zone/catalog@2.6.0':
|
||||||
resolution: {integrity: sha512-bRwk7pbDxUB471wUAS7p22MTOOBCHlMWijsE43K9tDAPcxlRarhtf2Dgx0Y25s/dFXqj2JHwe6jjE84S80jFzg==}
|
resolution: {integrity: sha512-Gp91Ed0MMLMPSAZrH2/UimGxU9AaTu5IPUobPD49PSvh3UnUl+HEFiy81kpKJhW16V37N3/vcNgZrn2VI7/LxQ==}
|
||||||
|
|
||||||
'@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 +3474,7 @@ snapshots:
|
|||||||
|
|
||||||
'@sec-ant/readable-stream@0.4.1': {}
|
'@sec-ant/readable-stream@0.4.1': {}
|
||||||
|
|
||||||
'@serve.zone/catalog@2.5.0(@tiptap/pm@2.27.2)':
|
'@serve.zone/catalog@2.6.0(@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
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@serve.zone/onebox',
|
name: '@serve.zone/onebox',
|
||||||
version: '1.14.2',
|
version: '1.17.0',
|
||||||
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'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,9 +4,7 @@
|
|||||||
* Handles background monitoring, metrics collection, and automatic tasks
|
* Handles background monitoring, metrics collection, and automatic tasks
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import * as plugins from '../plugins.ts';
|
|
||||||
import { logger } from '../logging.ts';
|
import { logger } from '../logging.ts';
|
||||||
import { projectInfo } from '../info.ts';
|
|
||||||
import { getErrorMessage } from '../utils/error.ts';
|
import { getErrorMessage } from '../utils/error.ts';
|
||||||
import type { Onebox } from './onebox.ts';
|
import type { Onebox } from './onebox.ts';
|
||||||
|
|
||||||
@@ -18,7 +16,6 @@ const FALLBACK_PID_FILE = `${FALLBACK_PID_DIR}/onebox.pid`;
|
|||||||
|
|
||||||
export class OneboxDaemon {
|
export class OneboxDaemon {
|
||||||
private oneboxRef: Onebox;
|
private oneboxRef: Onebox;
|
||||||
private smartdaemon: plugins.smartdaemon.SmartDaemon | null = null;
|
|
||||||
private running = false;
|
private running = false;
|
||||||
private monitoringInterval: number | null = null;
|
private monitoringInterval: number | null = null;
|
||||||
private statsInterval: number | null = null;
|
private statsInterval: number | null = null;
|
||||||
@@ -46,124 +43,6 @@ export class OneboxDaemon {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Ensure Docker is installed, installing it if necessary
|
|
||||||
*/
|
|
||||||
private async ensureDocker(): Promise<void> {
|
|
||||||
try {
|
|
||||||
const cmd = new Deno.Command('docker', {
|
|
||||||
args: ['--version'],
|
|
||||||
stdout: 'piped',
|
|
||||||
stderr: 'piped',
|
|
||||||
});
|
|
||||||
const result = await cmd.output();
|
|
||||||
if (result.success) {
|
|
||||||
const version = new TextDecoder().decode(result.stdout).trim();
|
|
||||||
logger.info(`Docker found: ${version}`);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
// docker command not found
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info('Docker not found. Installing Docker...');
|
|
||||||
const installCmd = new Deno.Command('bash', {
|
|
||||||
args: ['-c', 'curl -fsSL https://get.docker.com | sh'],
|
|
||||||
stdin: 'inherit',
|
|
||||||
stdout: 'inherit',
|
|
||||||
stderr: 'inherit',
|
|
||||||
});
|
|
||||||
const installResult = await installCmd.output();
|
|
||||||
if (!installResult.success) {
|
|
||||||
throw new Error('Failed to install Docker. Please install it manually: curl -fsSL https://get.docker.com | sh');
|
|
||||||
}
|
|
||||||
logger.success('Docker installed successfully');
|
|
||||||
|
|
||||||
// Initialize Docker Swarm
|
|
||||||
logger.info('Initializing Docker Swarm...');
|
|
||||||
const swarmCmd = new Deno.Command('docker', {
|
|
||||||
args: ['swarm', 'init'],
|
|
||||||
stdout: 'piped',
|
|
||||||
stderr: 'piped',
|
|
||||||
});
|
|
||||||
const swarmResult = await swarmCmd.output();
|
|
||||||
if (swarmResult.success) {
|
|
||||||
logger.success('Docker Swarm initialized');
|
|
||||||
} else {
|
|
||||||
const stderr = new TextDecoder().decode(swarmResult.stderr);
|
|
||||||
if (stderr.includes('already part of a swarm')) {
|
|
||||||
logger.info('Docker Swarm already initialized');
|
|
||||||
} else {
|
|
||||||
logger.warn(`Docker Swarm init warning: ${stderr.trim()}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Install systemd service
|
|
||||||
*/
|
|
||||||
async installService(): Promise<void> {
|
|
||||||
try {
|
|
||||||
logger.info('Installing Onebox daemon service...');
|
|
||||||
|
|
||||||
// Ensure Docker is installed
|
|
||||||
await this.ensureDocker();
|
|
||||||
|
|
||||||
// Initialize smartdaemon if needed
|
|
||||||
if (!this.smartdaemon) {
|
|
||||||
this.smartdaemon = new plugins.smartdaemon.SmartDaemon();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get installation directory
|
|
||||||
const execPath = Deno.execPath();
|
|
||||||
|
|
||||||
const service = await this.smartdaemon.addService({
|
|
||||||
name: 'onebox',
|
|
||||||
version: projectInfo.version,
|
|
||||||
command: `${execPath} run --allow-all ${Deno.cwd()}/mod.ts daemon start`,
|
|
||||||
description: 'Onebox - Self-hosted container platform',
|
|
||||||
workingDir: Deno.cwd(),
|
|
||||||
});
|
|
||||||
|
|
||||||
await service.save();
|
|
||||||
await service.enable();
|
|
||||||
|
|
||||||
logger.success('Onebox daemon service installed');
|
|
||||||
logger.info('Start with: sudo systemctl start smartdaemon_onebox');
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(`Failed to install daemon service: ${getErrorMessage(error)}`);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Uninstall systemd service
|
|
||||||
*/
|
|
||||||
async uninstallService(): Promise<void> {
|
|
||||||
try {
|
|
||||||
logger.info('Uninstalling Onebox daemon service...');
|
|
||||||
|
|
||||||
// Initialize smartdaemon if needed
|
|
||||||
if (!this.smartdaemon) {
|
|
||||||
this.smartdaemon = new plugins.smartdaemon.SmartDaemon();
|
|
||||||
}
|
|
||||||
|
|
||||||
const services = await this.smartdaemon.systemdManager.getServices();
|
|
||||||
const service = services.find(s => s.name === 'onebox');
|
|
||||||
|
|
||||||
if (service) {
|
|
||||||
await service.stop();
|
|
||||||
await service.disable();
|
|
||||||
await service.delete();
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.success('Onebox daemon service uninstalled');
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(`Failed to uninstall daemon service: ${getErrorMessage(error)}`);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Start daemon mode (background monitoring)
|
* Start daemon mode (background monitoring)
|
||||||
*/
|
*/
|
||||||
@@ -538,36 +417,7 @@ export class OneboxDaemon {
|
|||||||
static async ensureNoDaemon(): Promise<void> {
|
static async ensureNoDaemon(): Promise<void> {
|
||||||
const running = await OneboxDaemon.isDaemonRunning();
|
const running = await OneboxDaemon.isDaemonRunning();
|
||||||
if (running) {
|
if (running) {
|
||||||
throw new Error('Daemon is already running. Please stop it first with: onebox daemon stop');
|
throw new Error('Daemon is already running. Please stop it first with: onebox systemd stop');
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get service status from systemd
|
|
||||||
*/
|
|
||||||
async getServiceStatus(): Promise<string> {
|
|
||||||
try {
|
|
||||||
// Don't need smartdaemon to check status, just use systemctl directly
|
|
||||||
const command = new Deno.Command('systemctl', {
|
|
||||||
args: ['status', 'smartdaemon_onebox'],
|
|
||||||
stdout: 'piped',
|
|
||||||
stderr: 'piped',
|
|
||||||
});
|
|
||||||
|
|
||||||
const { code, stdout } = await command.output();
|
|
||||||
const output = new TextDecoder().decode(stdout);
|
|
||||||
|
|
||||||
if (code === 0 || output.includes('active (running)')) {
|
|
||||||
return 'running';
|
|
||||||
} else if (output.includes('inactive') || output.includes('dead')) {
|
|
||||||
return 'stopped';
|
|
||||||
} else if (output.includes('failed')) {
|
|
||||||
return 'failed';
|
|
||||||
} else {
|
|
||||||
return 'unknown';
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
return 'not-installed';
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import { OneboxReverseProxy } from './reverseproxy.ts';
|
|||||||
import { OneboxDnsManager } from './dns.ts';
|
import { OneboxDnsManager } from './dns.ts';
|
||||||
import { OneboxSslManager } from './ssl.ts';
|
import { OneboxSslManager } from './ssl.ts';
|
||||||
import { OneboxDaemon } from './daemon.ts';
|
import { OneboxDaemon } from './daemon.ts';
|
||||||
|
import { OneboxSystemd } from './systemd.ts';
|
||||||
import { OneboxHttpServer } from './httpserver.ts';
|
import { OneboxHttpServer } from './httpserver.ts';
|
||||||
import { CloudflareDomainSync } from './cloudflare-sync.ts';
|
import { CloudflareDomainSync } from './cloudflare-sync.ts';
|
||||||
import { CertRequirementManager } from './cert-requirement-manager.ts';
|
import { CertRequirementManager } from './cert-requirement-manager.ts';
|
||||||
@@ -33,6 +34,7 @@ export class Onebox {
|
|||||||
public dns: OneboxDnsManager;
|
public dns: OneboxDnsManager;
|
||||||
public ssl: OneboxSslManager;
|
public ssl: OneboxSslManager;
|
||||||
public daemon: OneboxDaemon;
|
public daemon: OneboxDaemon;
|
||||||
|
public systemd: OneboxSystemd;
|
||||||
public httpServer: OneboxHttpServer;
|
public httpServer: OneboxHttpServer;
|
||||||
public cloudflareDomainSync: CloudflareDomainSync;
|
public cloudflareDomainSync: CloudflareDomainSync;
|
||||||
public certRequirementManager: CertRequirementManager;
|
public certRequirementManager: CertRequirementManager;
|
||||||
@@ -57,6 +59,7 @@ export class Onebox {
|
|||||||
this.dns = new OneboxDnsManager(this);
|
this.dns = new OneboxDnsManager(this);
|
||||||
this.ssl = new OneboxSslManager(this);
|
this.ssl = new OneboxSslManager(this);
|
||||||
this.daemon = new OneboxDaemon(this);
|
this.daemon = new OneboxDaemon(this);
|
||||||
|
this.systemd = new OneboxSystemd();
|
||||||
this.httpServer = new OneboxHttpServer(this);
|
this.httpServer = new OneboxHttpServer(this);
|
||||||
this.registry = new RegistryManager({
|
this.registry = new RegistryManager({
|
||||||
dataDir: './.nogit/registry-data',
|
dataDir: './.nogit/registry-data',
|
||||||
@@ -320,20 +323,6 @@ export class Onebox {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Start daemon mode
|
|
||||||
*/
|
|
||||||
async startDaemon(): Promise<void> {
|
|
||||||
await this.daemon.start();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stop daemon mode
|
|
||||||
*/
|
|
||||||
async stopDaemon(): Promise<void> {
|
|
||||||
await this.daemon.stop();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Start OpsServer (TypedRequest-based, serves new UI)
|
* Start OpsServer (TypedRequest-based, serves new UI)
|
||||||
*/
|
*/
|
||||||
@@ -355,6 +344,9 @@ export class Onebox {
|
|||||||
try {
|
try {
|
||||||
logger.info('Shutting down Onebox...');
|
logger.info('Shutting down Onebox...');
|
||||||
|
|
||||||
|
// Stop auto-update monitoring
|
||||||
|
this.services.stopAutoUpdateMonitoring();
|
||||||
|
|
||||||
// Stop backup scheduler
|
// Stop backup scheduler
|
||||||
await this.backupScheduler.stop();
|
await this.backupScheduler.stop();
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ export class OneboxServicesManager {
|
|||||||
private oneboxRef: any; // Will be Onebox instance
|
private oneboxRef: any; // Will be Onebox instance
|
||||||
private database: OneboxDatabase;
|
private database: OneboxDatabase;
|
||||||
private docker: OneboxDockerManager;
|
private docker: OneboxDockerManager;
|
||||||
|
private autoUpdateIntervalId: number | null = null;
|
||||||
|
|
||||||
constructor(oneboxRef: any) {
|
constructor(oneboxRef: any) {
|
||||||
this.oneboxRef = oneboxRef;
|
this.oneboxRef = oneboxRef;
|
||||||
@@ -681,7 +682,7 @@ export class OneboxServicesManager {
|
|||||||
*/
|
*/
|
||||||
startAutoUpdateMonitoring(): void {
|
startAutoUpdateMonitoring(): void {
|
||||||
// Check every 30 seconds
|
// Check every 30 seconds
|
||||||
setInterval(async () => {
|
this.autoUpdateIntervalId = setInterval(async () => {
|
||||||
try {
|
try {
|
||||||
await this.checkForRegistryUpdates();
|
await this.checkForRegistryUpdates();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -692,6 +693,17 @@ export class OneboxServicesManager {
|
|||||||
logger.info('Auto-update monitoring started (30s interval)');
|
logger.info('Auto-update monitoring started (30s interval)');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stop auto-update monitoring
|
||||||
|
*/
|
||||||
|
stopAutoUpdateMonitoring(): void {
|
||||||
|
if (this.autoUpdateIntervalId !== null) {
|
||||||
|
clearInterval(this.autoUpdateIntervalId);
|
||||||
|
this.autoUpdateIntervalId = null;
|
||||||
|
logger.debug('Auto-update monitoring stopped');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check all services using onebox registry for updates
|
* Check all services using onebox registry for updates
|
||||||
*/
|
*/
|
||||||
|
|||||||
243
ts/classes/systemd.ts
Normal file
243
ts/classes/systemd.ts
Normal file
@@ -0,0 +1,243 @@
|
|||||||
|
/**
|
||||||
|
* Systemd Service Manager for Onebox
|
||||||
|
*
|
||||||
|
* Handles systemd unit file installation, enabling, starting, stopping,
|
||||||
|
* and status checking. Modeled on nupst's direct systemctl approach —
|
||||||
|
* no external library dependencies.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { logger } from '../logging.ts';
|
||||||
|
import { getErrorMessage } from '../utils/error.ts';
|
||||||
|
|
||||||
|
const SERVICE_NAME = 'onebox';
|
||||||
|
const SERVICE_FILE_PATH = '/etc/systemd/system/onebox.service';
|
||||||
|
|
||||||
|
const SERVICE_UNIT_TEMPLATE = `[Unit]
|
||||||
|
Description=Onebox - Self-hosted container platform
|
||||||
|
After=network-online.target docker.service
|
||||||
|
Wants=network-online.target
|
||||||
|
Requires=docker.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
ExecStart=/usr/local/bin/onebox systemd start-daemon
|
||||||
|
Restart=always
|
||||||
|
RestartSec=10
|
||||||
|
WorkingDirectory=/var/lib/onebox
|
||||||
|
Environment=PATH=/usr/bin:/usr/local/bin
|
||||||
|
Environment=HOME=/root
|
||||||
|
Environment=DENO_DIR=/root/.cache/deno
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
`;
|
||||||
|
|
||||||
|
export class OneboxSystemd {
|
||||||
|
/**
|
||||||
|
* Install and enable the systemd service
|
||||||
|
*/
|
||||||
|
async enable(): Promise<void> {
|
||||||
|
try {
|
||||||
|
// Ensure Docker is installed before writing unit file (it requires docker.service)
|
||||||
|
await this.ensureDocker();
|
||||||
|
|
||||||
|
// Write the unit file
|
||||||
|
logger.info('Writing systemd unit file...');
|
||||||
|
await Deno.writeTextFile(SERVICE_FILE_PATH, SERVICE_UNIT_TEMPLATE);
|
||||||
|
logger.info(`Unit file written to ${SERVICE_FILE_PATH}`);
|
||||||
|
|
||||||
|
// Reload systemd daemon
|
||||||
|
await this.runSystemctl(['daemon-reload']);
|
||||||
|
|
||||||
|
// Enable the service
|
||||||
|
const result = await this.runSystemctl(['enable', `${SERVICE_NAME}.service`]);
|
||||||
|
if (!result.success) {
|
||||||
|
throw new Error(`Failed to enable service: ${result.stderr}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.success('Onebox systemd service enabled');
|
||||||
|
logger.info('Start with: onebox systemd start');
|
||||||
|
} catch (error) {
|
||||||
|
logger.error(`Failed to enable service: ${getErrorMessage(error)}`);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stop, disable, and remove the systemd service
|
||||||
|
*/
|
||||||
|
async disable(): Promise<void> {
|
||||||
|
try {
|
||||||
|
// Stop the service (ignore errors if not running)
|
||||||
|
await this.runSystemctl(['stop', `${SERVICE_NAME}.service`]);
|
||||||
|
|
||||||
|
// Disable the service
|
||||||
|
await this.runSystemctl(['disable', `${SERVICE_NAME}.service`]);
|
||||||
|
|
||||||
|
// Remove the unit file
|
||||||
|
try {
|
||||||
|
await Deno.remove(SERVICE_FILE_PATH);
|
||||||
|
logger.info(`Removed ${SERVICE_FILE_PATH}`);
|
||||||
|
} catch {
|
||||||
|
// File might not exist
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reload systemd daemon
|
||||||
|
await this.runSystemctl(['daemon-reload']);
|
||||||
|
|
||||||
|
logger.success('Onebox systemd service disabled and removed');
|
||||||
|
} catch (error) {
|
||||||
|
logger.error(`Failed to disable service: ${getErrorMessage(error)}`);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Start the service via systemctl
|
||||||
|
*/
|
||||||
|
async start(): Promise<void> {
|
||||||
|
const result = await this.runSystemctl(['start', `${SERVICE_NAME}.service`]);
|
||||||
|
if (!result.success) {
|
||||||
|
logger.error(`Failed to start service: ${result.stderr}`);
|
||||||
|
throw new Error(`Failed to start onebox service`);
|
||||||
|
}
|
||||||
|
logger.success('Onebox service started');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stop the service via systemctl
|
||||||
|
*/
|
||||||
|
async stop(): Promise<void> {
|
||||||
|
const result = await this.runSystemctl(['stop', `${SERVICE_NAME}.service`]);
|
||||||
|
if (!result.success) {
|
||||||
|
logger.error(`Failed to stop service: ${result.stderr}`);
|
||||||
|
throw new Error(`Failed to stop onebox service`);
|
||||||
|
}
|
||||||
|
logger.success('Onebox service stopped');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get and display service status
|
||||||
|
*/
|
||||||
|
async getStatus(): Promise<string> {
|
||||||
|
const result = await this.runSystemctl(['status', `${SERVICE_NAME}.service`]);
|
||||||
|
const output = result.stdout;
|
||||||
|
|
||||||
|
let status: string;
|
||||||
|
if (output.includes('active (running)')) {
|
||||||
|
status = 'running';
|
||||||
|
} else if (output.includes('inactive') || output.includes('dead')) {
|
||||||
|
status = 'stopped';
|
||||||
|
} else if (output.includes('failed')) {
|
||||||
|
status = 'failed';
|
||||||
|
} else if (!result.success && result.stderr.includes('could not be found')) {
|
||||||
|
status = 'not-installed';
|
||||||
|
} else {
|
||||||
|
status = 'unknown';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Print the raw systemctl output for full details
|
||||||
|
if (output.trim()) {
|
||||||
|
console.log(output);
|
||||||
|
}
|
||||||
|
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show service logs via journalctl
|
||||||
|
*/
|
||||||
|
async showLogs(): Promise<void> {
|
||||||
|
const cmd = new Deno.Command('journalctl', {
|
||||||
|
args: ['-u', `${SERVICE_NAME}.service`, '-f'],
|
||||||
|
stdout: 'inherit',
|
||||||
|
stderr: 'inherit',
|
||||||
|
});
|
||||||
|
await cmd.output();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the service unit file is installed
|
||||||
|
*/
|
||||||
|
async isInstalled(): Promise<boolean> {
|
||||||
|
try {
|
||||||
|
await Deno.stat(SERVICE_FILE_PATH);
|
||||||
|
return true;
|
||||||
|
} catch {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ensure Docker is installed, installing it if necessary
|
||||||
|
*/
|
||||||
|
private async ensureDocker(): Promise<void> {
|
||||||
|
try {
|
||||||
|
const cmd = new Deno.Command('docker', {
|
||||||
|
args: ['--version'],
|
||||||
|
stdout: 'piped',
|
||||||
|
stderr: 'piped',
|
||||||
|
});
|
||||||
|
const result = await cmd.output();
|
||||||
|
if (result.success) {
|
||||||
|
const version = new TextDecoder().decode(result.stdout).trim();
|
||||||
|
logger.info(`Docker found: ${version}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// docker command not found
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.info('Docker not found. Installing Docker...');
|
||||||
|
const installCmd = new Deno.Command('bash', {
|
||||||
|
args: ['-c', 'curl -fsSL https://get.docker.com | sh'],
|
||||||
|
stdin: 'inherit',
|
||||||
|
stdout: 'inherit',
|
||||||
|
stderr: 'inherit',
|
||||||
|
});
|
||||||
|
const installResult = await installCmd.output();
|
||||||
|
if (!installResult.success) {
|
||||||
|
throw new Error('Failed to install Docker. Please install it manually: curl -fsSL https://get.docker.com | sh');
|
||||||
|
}
|
||||||
|
logger.success('Docker installed successfully');
|
||||||
|
|
||||||
|
// Initialize Docker Swarm
|
||||||
|
logger.info('Initializing Docker Swarm...');
|
||||||
|
const swarmCmd = new Deno.Command('docker', {
|
||||||
|
args: ['swarm', 'init'],
|
||||||
|
stdout: 'piped',
|
||||||
|
stderr: 'piped',
|
||||||
|
});
|
||||||
|
const swarmResult = await swarmCmd.output();
|
||||||
|
if (swarmResult.success) {
|
||||||
|
logger.success('Docker Swarm initialized');
|
||||||
|
} else {
|
||||||
|
const stderr = new TextDecoder().decode(swarmResult.stderr);
|
||||||
|
if (stderr.includes('already part of a swarm')) {
|
||||||
|
logger.info('Docker Swarm already initialized');
|
||||||
|
} else {
|
||||||
|
logger.warn(`Docker Swarm init warning: ${stderr.trim()}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run a systemctl command and return results
|
||||||
|
*/
|
||||||
|
private async runSystemctl(
|
||||||
|
args: string[]
|
||||||
|
): Promise<{ success: boolean; stdout: string; stderr: string }> {
|
||||||
|
const cmd = new Deno.Command('systemctl', {
|
||||||
|
args,
|
||||||
|
stdout: 'piped',
|
||||||
|
stderr: 'piped',
|
||||||
|
});
|
||||||
|
|
||||||
|
const result = await cmd.output();
|
||||||
|
return {
|
||||||
|
success: result.success,
|
||||||
|
stdout: new TextDecoder().decode(result.stdout),
|
||||||
|
stderr: new TextDecoder().decode(result.stderr),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
89
ts/cli.ts
89
ts/cli.ts
@@ -7,6 +7,7 @@ import { projectInfo } from './info.ts';
|
|||||||
import { getErrorMessage } from './utils/error.ts';
|
import { getErrorMessage } from './utils/error.ts';
|
||||||
import { Onebox } from './classes/onebox.ts';
|
import { Onebox } from './classes/onebox.ts';
|
||||||
import { OneboxDaemon } from './classes/daemon.ts';
|
import { OneboxDaemon } from './classes/daemon.ts';
|
||||||
|
import { OneboxSystemd } from './classes/systemd.ts';
|
||||||
|
|
||||||
export async function runCli(): Promise<void> {
|
export async function runCli(): Promise<void> {
|
||||||
const args = Deno.args;
|
const args = Deno.args;
|
||||||
@@ -25,6 +26,19 @@ export async function runCli(): Promise<void> {
|
|||||||
const subcommand = args[1];
|
const subcommand = args[1];
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
// === LIGHTWEIGHT COMMANDS (no init()) ===
|
||||||
|
if (command === 'systemd') {
|
||||||
|
await handleSystemdCommand(subcommand, args.slice(2));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (command === 'upgrade') {
|
||||||
|
await handleUpgradeCommand();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// === HEAVY COMMANDS (require full init()) ===
|
||||||
|
|
||||||
// Server command has special handling (doesn't shut down)
|
// Server command has special handling (doesn't shut down)
|
||||||
if (command === 'server') {
|
if (command === 'server') {
|
||||||
const onebox = new Onebox();
|
const onebox = new Onebox();
|
||||||
@@ -60,10 +74,6 @@ export async function runCli(): Promise<void> {
|
|||||||
await handleNginxCommand(onebox, subcommand, args.slice(2));
|
await handleNginxCommand(onebox, subcommand, args.slice(2));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'daemon':
|
|
||||||
await handleDaemonCommand(onebox, subcommand, args.slice(2));
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'config':
|
case 'config':
|
||||||
await handleConfigCommand(onebox, subcommand, args.slice(2));
|
await handleConfigCommand(onebox, subcommand, args.slice(2));
|
||||||
break;
|
break;
|
||||||
@@ -72,10 +82,6 @@ export async function runCli(): Promise<void> {
|
|||||||
await handleStatusCommand(onebox);
|
await handleStatusCommand(onebox);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'upgrade':
|
|
||||||
await handleUpgradeCommand();
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
logger.error(`Unknown command: ${command}`);
|
logger.error(`Unknown command: ${command}`);
|
||||||
printHelp();
|
printHelp();
|
||||||
@@ -282,7 +288,7 @@ async function handleServerCommand(onebox: Onebox, args: string[]) {
|
|||||||
await OneboxDaemon.ensureNoDaemon();
|
await OneboxDaemon.ensureNoDaemon();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error('Cannot start in ephemeral mode: Daemon is already running');
|
logger.error('Cannot start in ephemeral mode: Daemon is already running');
|
||||||
logger.info('Stop the daemon first: onebox daemon stop');
|
logger.info('Stop the daemon first: onebox systemd stop');
|
||||||
logger.info('Or run without --ephemeral to use the existing daemon');
|
logger.info('Or run without --ephemeral to use the existing daemon');
|
||||||
Deno.exit(1);
|
Deno.exit(1);
|
||||||
}
|
}
|
||||||
@@ -326,39 +332,49 @@ async function handleServerCommand(onebox: Onebox, args: string[]) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Daemon commands
|
// Systemd service commands (lightweight — no Onebox init)
|
||||||
async function handleDaemonCommand(onebox: Onebox, subcommand: string, _args: string[]) {
|
async function handleSystemdCommand(subcommand: string, _args: string[]) {
|
||||||
|
const systemd = new OneboxSystemd();
|
||||||
|
|
||||||
switch (subcommand) {
|
switch (subcommand) {
|
||||||
case 'install':
|
case 'enable':
|
||||||
await onebox.daemon.installService();
|
await systemd.enable();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'disable':
|
||||||
|
await systemd.disable();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'start':
|
case 'start':
|
||||||
await onebox.startDaemon();
|
await systemd.start();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'stop':
|
case 'stop':
|
||||||
await onebox.stopDaemon();
|
await systemd.stop();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'logs': {
|
case 'status': {
|
||||||
const command = new Deno.Command('journalctl', {
|
const status = await systemd.getStatus();
|
||||||
args: ['-u', 'smartdaemon_onebox', '-f'],
|
logger.info(`Service status: ${status}`);
|
||||||
stdout: 'inherit',
|
|
||||||
stderr: 'inherit',
|
|
||||||
});
|
|
||||||
await command.output();
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case 'status': {
|
case 'logs':
|
||||||
const status = await onebox.daemon.getServiceStatus();
|
await systemd.showLogs();
|
||||||
logger.info(`Daemon status: ${status}`);
|
break;
|
||||||
|
|
||||||
|
case 'start-daemon': {
|
||||||
|
// This is what systemd's ExecStart calls — full init + daemon loop
|
||||||
|
const onebox = new Onebox();
|
||||||
|
await onebox.init();
|
||||||
|
await onebox.daemon.start();
|
||||||
|
// start() blocks (keepAlive loop) until SIGTERM/SIGINT
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
logger.error(`Unknown daemon subcommand: ${subcommand}`);
|
logger.error(`Unknown systemd subcommand: ${subcommand}`);
|
||||||
|
logger.info('Available: enable, disable, start, stop, status, logs');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -506,11 +522,12 @@ Commands:
|
|||||||
nginx test
|
nginx test
|
||||||
nginx status
|
nginx status
|
||||||
|
|
||||||
daemon install
|
systemd enable Install and enable systemd service
|
||||||
daemon start
|
systemd disable Stop, disable, and remove systemd service
|
||||||
daemon stop
|
systemd start Start onebox via systemctl
|
||||||
daemon logs
|
systemd stop Stop onebox via systemctl
|
||||||
daemon status
|
systemd status Show systemd service status
|
||||||
|
systemd logs Follow service logs (journalctl)
|
||||||
|
|
||||||
config show
|
config show
|
||||||
config set <key> <value>
|
config set <key> <value>
|
||||||
@@ -530,15 +547,15 @@ Development Workflow:
|
|||||||
onebox service add ... # In another terminal
|
onebox service add ... # In another terminal
|
||||||
|
|
||||||
Production Workflow:
|
Production Workflow:
|
||||||
onebox daemon install # Install systemd service
|
onebox systemd enable # Install and enable systemd service
|
||||||
onebox daemon start # Start daemon
|
onebox systemd start # Start via systemctl
|
||||||
onebox service add ... # CLI uses daemon
|
onebox service add ... # CLI manages services
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
onebox server --ephemeral # Start dev server
|
onebox server --ephemeral # Start dev server
|
||||||
onebox service add myapp --image nginx:latest --domain app.example.com --port 80
|
onebox service add myapp --image nginx:latest --domain app.example.com --port 80
|
||||||
onebox registry add --url registry.example.com --username user --password pass
|
onebox registry add --url registry.example.com --username user --password pass
|
||||||
onebox daemon install
|
onebox systemd enable
|
||||||
onebox daemon start
|
onebox systemd start
|
||||||
`);
|
`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ export { OneboxReverseProxy } from './classes/reverseproxy.ts';
|
|||||||
export { OneboxDnsManager } from './classes/dns.ts';
|
export { OneboxDnsManager } from './classes/dns.ts';
|
||||||
export { OneboxSslManager } from './classes/ssl.ts';
|
export { OneboxSslManager } from './classes/ssl.ts';
|
||||||
export { OneboxDaemon } from './classes/daemon.ts';
|
export { OneboxDaemon } from './classes/daemon.ts';
|
||||||
|
export { OneboxSystemd } from './classes/systemd.ts';
|
||||||
export { OneboxHttpServer } from './classes/httpserver.ts';
|
export { OneboxHttpServer } from './classes/httpserver.ts';
|
||||||
export { OneboxApiClient } from './classes/apiclient.ts';
|
export { OneboxApiClient } from './classes/apiclient.ts';
|
||||||
|
|
||||||
|
|||||||
@@ -17,10 +17,6 @@ export { path, fs, http, encoding };
|
|||||||
import { Database } from '@db/sqlite';
|
import { Database } from '@db/sqlite';
|
||||||
export const sqlite = { DB: Database };
|
export const sqlite = { DB: Database };
|
||||||
|
|
||||||
// Systemd Daemon Integration
|
|
||||||
import * as smartdaemon from '@push.rocks/smartdaemon';
|
|
||||||
export { smartdaemon };
|
|
||||||
|
|
||||||
// Docker API Client
|
// Docker API Client
|
||||||
import { DockerHost } from '@apiclient.xyz/docker';
|
import { DockerHost } from '@apiclient.xyz/docker';
|
||||||
export const docker = { Docker: DockerHost };
|
export const docker = { Docker: DockerHost };
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@serve.zone/onebox',
|
name: '@serve.zone/onebox',
|
||||||
version: '1.14.2',
|
version: '1.17.0',
|
||||||
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'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ export interface IServicesState {
|
|||||||
currentServiceStats: interfaces.data.IContainerStats | null;
|
currentServiceStats: interfaces.data.IContainerStats | null;
|
||||||
platformServices: interfaces.data.IPlatformService[];
|
platformServices: interfaces.data.IPlatformService[];
|
||||||
currentPlatformService: interfaces.data.IPlatformService | null;
|
currentPlatformService: interfaces.data.IPlatformService | null;
|
||||||
|
currentPlatformServiceStats: interfaces.data.IContainerStats | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface INetworkState {
|
export interface INetworkState {
|
||||||
@@ -88,6 +89,7 @@ export const servicesStatePart = await appState.getStatePart<IServicesState>(
|
|||||||
currentServiceStats: null,
|
currentServiceStats: null,
|
||||||
platformServices: [],
|
platformServices: [],
|
||||||
currentPlatformService: null,
|
currentPlatformService: null,
|
||||||
|
currentPlatformServiceStats: null,
|
||||||
},
|
},
|
||||||
'soft',
|
'soft',
|
||||||
);
|
);
|
||||||
@@ -476,6 +478,25 @@ export const stopPlatformServiceAction = servicesStatePart.createAction<{
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const fetchPlatformServiceStatsAction = servicesStatePart.createAction<{
|
||||||
|
serviceType: interfaces.data.TPlatformServiceType;
|
||||||
|
}>(async (statePartArg, dataArg) => {
|
||||||
|
const context = getActionContext();
|
||||||
|
try {
|
||||||
|
const typedRequest = new plugins.domtools.plugins.typedrequest.TypedRequest<
|
||||||
|
interfaces.requests.IReq_GetPlatformServiceStats
|
||||||
|
>('/typedrequest', 'getPlatformServiceStats');
|
||||||
|
const response = await typedRequest.fire({
|
||||||
|
identity: context.identity!,
|
||||||
|
serviceType: dataArg.serviceType,
|
||||||
|
});
|
||||||
|
return { ...statePartArg.getState(), currentPlatformServiceStats: response.stats };
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to fetch platform service stats:', err);
|
||||||
|
return { ...statePartArg.getState(), currentPlatformServiceStats: null };
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// Network Actions
|
// Network Actions
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ export class ObViewDashboard extends DeesElement {
|
|||||||
currentServiceStats: null,
|
currentServiceStats: null,
|
||||||
platformServices: [],
|
platformServices: [],
|
||||||
currentPlatformService: null,
|
currentPlatformService: null,
|
||||||
|
currentPlatformServiceStats: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
@state()
|
@state()
|
||||||
@@ -149,6 +150,7 @@ export class ObViewDashboard extends DeesElement {
|
|||||||
],
|
],
|
||||||
}}
|
}}
|
||||||
@action-click=${(e: CustomEvent) => this.handleQuickAction(e)}
|
@action-click=${(e: CustomEvent) => this.handleQuickAction(e)}
|
||||||
|
@service-click=${(e: CustomEvent) => this.handlePlatformServiceClick(e)}
|
||||||
></sz-dashboard-view>
|
></sz-dashboard-view>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
@@ -161,4 +163,21 @@ export class ObViewDashboard extends DeesElement {
|
|||||||
appstate.uiStatePart.dispatchAction(appstate.setActiveViewAction, { view: 'network' });
|
appstate.uiStatePart.dispatchAction(appstate.setActiveViewAction, { view: 'network' });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private handlePlatformServiceClick(e: CustomEvent) {
|
||||||
|
// Find the platform service type from the click event
|
||||||
|
const name = e.detail?.name;
|
||||||
|
const ps = this.servicesState.platformServices.find(
|
||||||
|
(p) => p.displayName === name,
|
||||||
|
);
|
||||||
|
if (ps) {
|
||||||
|
// Navigate to services tab — the ObViewServices component will pick up the type
|
||||||
|
// Store the selected platform type so the services view can open it
|
||||||
|
appstate.servicesStatePart.setState({
|
||||||
|
...appstate.servicesStatePart.getState(),
|
||||||
|
currentPlatformService: ps,
|
||||||
|
});
|
||||||
|
appstate.uiStatePart.dispatchAction(appstate.setActiveViewAction, { view: 'services' });
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -107,6 +107,7 @@ export class ObViewServices extends DeesElement {
|
|||||||
currentServiceStats: null,
|
currentServiceStats: null,
|
||||||
platformServices: [],
|
platformServices: [],
|
||||||
currentPlatformService: null,
|
currentPlatformService: null,
|
||||||
|
currentPlatformServiceStats: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
@state()
|
@state()
|
||||||
@@ -145,7 +146,37 @@ export class ObViewServices extends DeesElement {
|
|||||||
public static styles = [
|
public static styles = [
|
||||||
cssManager.defaultStyles,
|
cssManager.defaultStyles,
|
||||||
shared.viewHostCss,
|
shared.viewHostCss,
|
||||||
css``,
|
css`
|
||||||
|
.page-actions {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.deploy-button {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 10px 20px;
|
||||||
|
background: ${cssManager.bdTheme('#18181b', '#fafafa')};
|
||||||
|
color: ${cssManager.bdTheme('#fafafa', '#18181b')};
|
||||||
|
border: none;
|
||||||
|
border-radius: 6px;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 500;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: opacity 200ms ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.deploy-button:hover {
|
||||||
|
opacity: 0.9;
|
||||||
|
}
|
||||||
|
|
||||||
|
.deploy-button svg {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
}
|
||||||
|
`,
|
||||||
];
|
];
|
||||||
|
|
||||||
async connectedCallback() {
|
async connectedCallback() {
|
||||||
@@ -154,6 +185,18 @@ export class ObViewServices extends DeesElement {
|
|||||||
appstate.servicesStatePart.dispatchAction(appstate.fetchServicesAction, null),
|
appstate.servicesStatePart.dispatchAction(appstate.fetchServicesAction, null),
|
||||||
appstate.servicesStatePart.dispatchAction(appstate.fetchPlatformServicesAction, null),
|
appstate.servicesStatePart.dispatchAction(appstate.fetchPlatformServicesAction, null),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
// If a platform service was selected from the dashboard, navigate to its detail
|
||||||
|
const state = appstate.servicesStatePart.getState();
|
||||||
|
if (state.currentPlatformService) {
|
||||||
|
const type = state.currentPlatformService.type;
|
||||||
|
// Clear the selection so it doesn't persist on next visit
|
||||||
|
appstate.servicesStatePart.setState({
|
||||||
|
...appstate.servicesStatePart.getState(),
|
||||||
|
currentPlatformService: null,
|
||||||
|
});
|
||||||
|
this.navigateToPlatformDetail(type);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public render(): TemplateResult {
|
public render(): TemplateResult {
|
||||||
@@ -178,8 +221,23 @@ export class ObViewServices extends DeesElement {
|
|||||||
domain: s.domain || null,
|
domain: s.domain || null,
|
||||||
status: mapStatus(s.status),
|
status: mapStatus(s.status),
|
||||||
}));
|
}));
|
||||||
|
const mappedPlatformServices = this.servicesState.platformServices.map((ps) => ({
|
||||||
|
name: ps.displayName,
|
||||||
|
status: ps.status === 'running' ? `Running` : ps.status,
|
||||||
|
running: ps.status === 'running',
|
||||||
|
type: ps.type,
|
||||||
|
}));
|
||||||
return html`
|
return html`
|
||||||
<ob-sectionheading>Services</ob-sectionheading>
|
<ob-sectionheading>Services</ob-sectionheading>
|
||||||
|
<div class="page-actions">
|
||||||
|
<button class="deploy-button" @click=${() => { this.currentView = 'create'; }}>
|
||||||
|
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||||
|
<line x1="12" y1="5" x2="12" y2="19"></line>
|
||||||
|
<line x1="5" y1="12" x2="19" y2="12"></line>
|
||||||
|
</svg>
|
||||||
|
Deploy Service
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
<sz-services-list-view
|
<sz-services-list-view
|
||||||
.services=${mappedServices}
|
.services=${mappedServices}
|
||||||
@service-click=${(e: CustomEvent) => {
|
@service-click=${(e: CustomEvent) => {
|
||||||
@@ -197,6 +255,20 @@ export class ObViewServices extends DeesElement {
|
|||||||
}}
|
}}
|
||||||
@service-action=${(e: CustomEvent) => this.handleServiceAction(e)}
|
@service-action=${(e: CustomEvent) => this.handleServiceAction(e)}
|
||||||
></sz-services-list-view>
|
></sz-services-list-view>
|
||||||
|
<ob-sectionheading style="margin-top: 32px;">Platform Services</ob-sectionheading>
|
||||||
|
<div style="max-width: 500px;">
|
||||||
|
<sz-platform-services-card
|
||||||
|
.services=${mappedPlatformServices}
|
||||||
|
@service-click=${(e: CustomEvent) => {
|
||||||
|
const type = e.detail.type || this.servicesState.platformServices.find(
|
||||||
|
(ps) => ps.displayName === e.detail.name,
|
||||||
|
)?.type;
|
||||||
|
if (type) {
|
||||||
|
this.navigateToPlatformDetail(type);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
></sz-platform-services-card>
|
||||||
|
</div>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -206,8 +278,26 @@ export class ObViewServices extends DeesElement {
|
|||||||
<sz-service-create-view
|
<sz-service-create-view
|
||||||
.registries=${[]}
|
.registries=${[]}
|
||||||
@create-service=${async (e: CustomEvent) => {
|
@create-service=${async (e: CustomEvent) => {
|
||||||
|
const formConfig = e.detail;
|
||||||
|
const serviceConfig: interfaces.data.IServiceCreate = {
|
||||||
|
name: formConfig.name,
|
||||||
|
image: formConfig.image,
|
||||||
|
port: formConfig.ports?.[0]?.containerPort
|
||||||
|
? parseInt(formConfig.ports[0].containerPort, 10)
|
||||||
|
: 80,
|
||||||
|
envVars: formConfig.envVars?.reduce(
|
||||||
|
(acc: Record<string, string>, ev: { key: string; value: string }) => {
|
||||||
|
if (ev.key) acc[ev.key] = ev.value;
|
||||||
|
return acc;
|
||||||
|
},
|
||||||
|
{} as Record<string, string>,
|
||||||
|
),
|
||||||
|
enableMongoDB: formConfig.enableMongoDB || false,
|
||||||
|
enableS3: formConfig.enableS3 || false,
|
||||||
|
enableClickHouse: formConfig.enableClickHouse || false,
|
||||||
|
};
|
||||||
await appstate.servicesStatePart.dispatchAction(appstate.createServiceAction, {
|
await appstate.servicesStatePart.dispatchAction(appstate.createServiceAction, {
|
||||||
config: e.detail,
|
config: serviceConfig,
|
||||||
});
|
});
|
||||||
this.currentView = 'list';
|
this.currentView = 'list';
|
||||||
}}
|
}}
|
||||||
@@ -265,10 +355,29 @@ export class ObViewServices extends DeesElement {
|
|||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private navigateToPlatformDetail(type: string): void {
|
||||||
|
this.selectedPlatformType = type;
|
||||||
|
// Fetch stats for this platform service
|
||||||
|
appstate.servicesStatePart.dispatchAction(appstate.fetchPlatformServiceStatsAction, {
|
||||||
|
serviceType: type as interfaces.data.TPlatformServiceType,
|
||||||
|
});
|
||||||
|
this.currentView = 'platform-detail';
|
||||||
|
}
|
||||||
|
|
||||||
private renderPlatformDetailView(): TemplateResult {
|
private renderPlatformDetailView(): TemplateResult {
|
||||||
const platformService = this.servicesState.platformServices.find(
|
const platformService = this.servicesState.platformServices.find(
|
||||||
(ps) => ps.type === this.selectedPlatformType,
|
(ps) => ps.type === this.selectedPlatformType,
|
||||||
);
|
);
|
||||||
|
const stats = this.servicesState.currentPlatformServiceStats;
|
||||||
|
const metrics = stats
|
||||||
|
? {
|
||||||
|
cpu: Math.round(stats.cpuPercent),
|
||||||
|
memory: Math.round(stats.memoryPercent),
|
||||||
|
storage: 0,
|
||||||
|
connections: 0,
|
||||||
|
}
|
||||||
|
: undefined;
|
||||||
|
|
||||||
return html`
|
return html`
|
||||||
<ob-sectionheading>Platform Service</ob-sectionheading>
|
<ob-sectionheading>Platform Service</ob-sectionheading>
|
||||||
<sz-platform-service-detail-view
|
<sz-platform-service-detail-view
|
||||||
@@ -277,22 +386,45 @@ export class ObViewServices extends DeesElement {
|
|||||||
id: platformService.type,
|
id: platformService.type,
|
||||||
name: platformService.displayName,
|
name: platformService.displayName,
|
||||||
type: platformService.type,
|
type: platformService.type,
|
||||||
status: platformService.status,
|
status: platformService.status === 'running'
|
||||||
|
? 'running'
|
||||||
|
: platformService.status === 'failed'
|
||||||
|
? 'error'
|
||||||
|
: 'stopped',
|
||||||
version: '',
|
version: '',
|
||||||
host: 'localhost',
|
host: 'localhost',
|
||||||
port: 0,
|
port: 0,
|
||||||
config: {},
|
config: {},
|
||||||
|
metrics,
|
||||||
}
|
}
|
||||||
: null}
|
: null}
|
||||||
.logs=${[]}
|
.logs=${[]}
|
||||||
@start=${() => {
|
@back=${() => {
|
||||||
appstate.servicesStatePart.dispatchAction(appstate.startPlatformServiceAction, {
|
this.currentView = 'list';
|
||||||
serviceType: this.selectedPlatformType as any,
|
}}
|
||||||
|
@start=${async () => {
|
||||||
|
await appstate.servicesStatePart.dispatchAction(appstate.startPlatformServiceAction, {
|
||||||
|
serviceType: this.selectedPlatformType as interfaces.data.TPlatformServiceType,
|
||||||
|
});
|
||||||
|
// Refresh stats after starting
|
||||||
|
appstate.servicesStatePart.dispatchAction(appstate.fetchPlatformServiceStatsAction, {
|
||||||
|
serviceType: this.selectedPlatformType as interfaces.data.TPlatformServiceType,
|
||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
@stop=${() => {
|
@stop=${async () => {
|
||||||
appstate.servicesStatePart.dispatchAction(appstate.stopPlatformServiceAction, {
|
await appstate.servicesStatePart.dispatchAction(appstate.stopPlatformServiceAction, {
|
||||||
serviceType: this.selectedPlatformType as any,
|
serviceType: this.selectedPlatformType as interfaces.data.TPlatformServiceType,
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
@restart=${async () => {
|
||||||
|
await appstate.servicesStatePart.dispatchAction(appstate.stopPlatformServiceAction, {
|
||||||
|
serviceType: this.selectedPlatformType as interfaces.data.TPlatformServiceType,
|
||||||
|
});
|
||||||
|
await appstate.servicesStatePart.dispatchAction(appstate.startPlatformServiceAction, {
|
||||||
|
serviceType: this.selectedPlatformType as interfaces.data.TPlatformServiceType,
|
||||||
|
});
|
||||||
|
appstate.servicesStatePart.dispatchAction(appstate.fetchPlatformServiceStatsAction, {
|
||||||
|
serviceType: this.selectedPlatformType as interfaces.data.TPlatformServiceType,
|
||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
></sz-platform-service-detail-view>
|
></sz-platform-service-detail-view>
|
||||||
|
|||||||
Reference in New Issue
Block a user