serve.zone/onebox
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix(smartproxy): clean up legacy reverse proxy naming for SmartProxy

Browse Source
This commit is contained in:
Jürgen Kunz
2026-05-24 21:20:46 +00:00
parent 070c936a69
commit 3b2b806165
8 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelog.md
+7
View File
@@ -2,6 +2,13 @@
## Pending ## Pending
### Fixes
- reduce remaining reverse proxy wording to required legacy SmartProxy cleanup and migration identifiers
- clean up legacy reverse proxy naming for SmartProxy (smartproxy)
- Update legacy reverse proxy service naming and logs used during SmartProxy startup cleanup.
- Clarify migration and documentation wording for the legacy reverse proxy to SmartProxy transition.
- Bump @serve.zone/catalog to ^2.12.6 and add pnpm workspace build dependency settings.
## 2026-05-24 - 1.30.1 ## 2026-05-24 - 1.30.1
package.json
+1 -1
View File
@@ -58,7 +58,7 @@
"@api.global/typedsocket": "^4.1.3", "@api.global/typedsocket": "^4.1.3",
"@design.estate/dees-catalog": "^3.81.0", "@design.estate/dees-catalog": "^3.81.0",
"@design.estate/dees-element": "^2.2.4", "@design.estate/dees-element": "^2.2.4",
"@serve.zone/catalog": "^2.12.5" "@serve.zone/catalog": "^2.12.6"
}, },
"devDependencies": { "devDependencies": {
"@git.zone/tsbundle": "^2.10.4", "@git.zone/tsbundle": "^2.10.4",
pnpm-lock.yaml
Generated
+5 -5
View File
@@ -21,8 +21,8 @@ importers:
specifier: ^2.2.4 specifier: ^2.2.4
version: 2.2.4 version: 2.2.4
'@serve.zone/catalog': '@serve.zone/catalog':
specifier: ^2.12.5 specifier: ^2.12.6
version: 2.12.5(@tiptap/pm@2.27.2) version: 2.12.6(@tiptap/pm@2.27.2)
devDependencies: devDependencies:
'@git.zone/tsbundle': '@git.zone/tsbundle':
specifier: ^2.10.4 specifier: ^2.10.4
@@ -977,8 +977,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.12.5': '@serve.zone/catalog@2.12.6':
resolution: {integrity: sha512-0AgHnxonJ7xyYdA02s4tN9/aZG8yBYml4sAA7AUt9fYpRtKYMuZXUcUOS3Rz/FvUu1PrKe7QLtex9VK5IqZDPw==} resolution: {integrity: sha512-FjieZNCHTCHufMre8OSP8bFP9L4DPL9yNtd7UMwD1yQ8wublgAq6eWrx6Tfb+3k8Hyof33BBt4rbFyrvIEBk+A==}
'@tempfix/lenis@1.3.20': '@tempfix/lenis@1.3.20':
resolution: {integrity: sha512-ypeB0FuHLHOCQXW4d0RQ69txPJJH+1CHcpsZIUdcv2t1vR0IVyQr2vHihtde9UOXhjzqEnUphWon/UcJNsa0YA==} resolution: {integrity: sha512-ypeB0FuHLHOCQXW4d0RQ69txPJJH+1CHcpsZIUdcv2t1vR0IVyQr2vHihtde9UOXhjzqEnUphWon/UcJNsa0YA==}
@@ -3572,7 +3572,7 @@ snapshots:
'@sec-ant/readable-stream@0.4.1': {} '@sec-ant/readable-stream@0.4.1': {}
'@serve.zone/catalog@2.12.5(@tiptap/pm@2.27.2)': '@serve.zone/catalog@2.12.6(@tiptap/pm@2.27.2)':
dependencies: dependencies:
'@design.estate/dees-catalog': 3.81.0(@tiptap/pm@2.27.2) '@design.estate/dees-catalog': 3.81.0(@tiptap/pm@2.27.2)
'@design.estate/dees-domtools': 2.5.6 '@design.estate/dees-domtools': 2.5.6
pnpm-workspace.yaml
+4
View File
@@ -0,0 +1,4 @@
allowBuilds:
esbuild: true
ignoredBuiltDependencies:
- '@design.estate/dees-catalog'
readme.hints.md
+1 -1
View File
@@ -46,7 +46,7 @@ ts/database/
## Current Migration Version: 15 ## Current Migration Version: 15
Migration 15 renames the core reverse proxy platform service from `caddy` to `smartproxy`. Migration 15 renames the legacy core reverse proxy platform service type to `smartproxy`.
## Reverse Proxy (April 2026 - SmartProxy Docker Service) ## Reverse Proxy (April 2026 - SmartProxy Docker Service)
ts/classes/smartproxy.ts
+6 -4
View File
@@ -10,7 +10,7 @@ import { logger } from '../logging.ts';
import { getErrorMessage } from '../utils/error.ts'; import { getErrorMessage } from '../utils/error.ts';
const SMARTPROXY_SERVICE_NAME = 'onebox-smartproxy'; const SMARTPROXY_SERVICE_NAME = 'onebox-smartproxy';
const LEGACY_CADDY_SERVICE_NAME = 'onebox-caddy'; const LEGACY_REVERSE_PROXY_SERVICE_NAME = 'onebox-caddy';
const SMARTPROXY_IMAGE = 'code.foss.global/host.today/ht-docker-smartproxy:latest'; const SMARTPROXY_IMAGE = 'code.foss.global/host.today/ht-docker-smartproxy:latest';
const SMARTPROXY_ADMIN_CONTAINER_PORT = 3000; const SMARTPROXY_ADMIN_CONTAINER_PORT = 3000;
const SMARTPROXY_HTTP_CONTAINER_PORT = 80; const SMARTPROXY_HTTP_CONTAINER_PORT = 80;
@@ -102,10 +102,12 @@ export class SmartProxyManager {
logger.info('Starting SmartProxy Docker service...'); logger.info('Starting SmartProxy Docker service...');
const legacyService = await this.getExistingService(LEGACY_CADDY_SERVICE_NAME); const legacyService = await this.getExistingService(LEGACY_REVERSE_PROXY_SERVICE_NAME);
if (legacyService) { if (legacyService) {
logger.info('Legacy Caddy service exists, removing it before SmartProxy startup...'); logger.info(
await this.removeService(LEGACY_CADDY_SERVICE_NAME); `Legacy reverse proxy service ${LEGACY_REVERSE_PROXY_SERVICE_NAME} exists, removing it before SmartProxy startup...`,
);
await this.removeService(LEGACY_REVERSE_PROXY_SERVICE_NAME);
await new Promise((resolve) => setTimeout(resolve, 2000)); await new Promise((resolve) => setTimeout(resolve, 2000));
} }
ts/database/migrations/migration-015-smartproxy-platform-service.ts
+1 -1
View File
@@ -3,7 +3,7 @@ import type { TQueryFunction } from '../types.ts';
export class Migration015SmartProxyPlatformService extends BaseMigration { export class Migration015SmartProxyPlatformService extends BaseMigration {
readonly version = 15; readonly version = 15;
readonly description = 'Rename Caddy platform service to SmartProxy'; readonly description = 'Rename legacy reverse proxy platform service to SmartProxy';
up(query: TQueryFunction): void { up(query: TQueryFunction): void {
query( query(
ts_bundled/bundle.ts
+1 -1
View File
File diff suppressed because one or more lines are too long