Implement comprehensive multi-source catalog system with automatic fallback,
advanced version tracking, and rich update management interfaces.
## Phase 1: Backend Infrastructure (COMPLETE)
### UCI Configuration
- **New**: `/etc/config/secubox-appstore`
- 4 source types: GitHub (remote), local web (remote), USB (local), embedded (fallback)
- Priority-based fallback (1=highest, 999=embedded last resort)
- Settings: auto_sync, force_source, check_updates_on_boot, notify_updates
- Update checking with configurable intervals
### Catalog Sync Script
- **New**: `/usr/sbin/secubox-catalog-sync` (364 lines)
- Automatic multi-source fallback by priority
- Download tools: uclient-fetch, wget, curl (auto-detect)
- HTTP caching: ETag support, 304 Not Modified handling
- JSON validation before use
- Metadata tracking with jq
- Logging to syslog
- Source types: remote (HTTPS/HTTP), local (filesystem), embedded (ROM)
### CLI Enhancement
- **Modified**: `/usr/sbin/secubox-appstore`
- New commands: `sync [source]`, `check-updates [--json]`, `changelog <app> [version]`
- `get_active_catalog()`: Reads from cache or embedded
- `sync_catalog()`: Wrapper for secubox-catalog-sync
- `check_updates()`: Version comparison with opkg
- `get_changelog()`: Extracts from catalog JSON
### Metadata Structure
- **New**: `/usr/share/secubox/catalog-metadata.json.example`
- Active source tracking
- Source status (online/offline/error)
- ETag cache for HTTP sources
- Installed apps version tracking
- Update statistics
### Makefile Updates
- **Modified**: `secubox-core/Makefile`
- PKG_RELEASE: 5 → 6
- Added conffiles: `/etc/config/secubox-appstore`
- Install secubox-catalog-sync binary
- Install catalog-metadata.json.example
- Added dependency: +jq
- postinst: Create cache directories (/var/cache/secubox/catalogs, /var/lib/secubox)
## Phase 2: RPCD Backend (COMPLETE)
### New RPC Methods
- **Modified**: `/usr/libexec/rpcd/luci.secubox`
- `get_catalog_sources()`: List configured sources from UCI, status from metadata
- `set_catalog_source(source)`: Configure force_source in UCI
- `sync_catalog([source])`: Trigger catalog sync (auto-fallback or specific)
- `check_updates()`: Compare installed vs catalog versions
- `get_app_versions(app_id)`: Detailed version info (pkg, app, installed, catalog)
- `get_changelog(app_id, from, to)`: Extract changelog from catalog
- `get_widget_data(app_id)`: Widget metrics (Phase 5 prep)
All methods integrate with:
- UCI config parsing (`config_load`, `config_foreach`)
- Metadata file reading (`/var/lib/secubox/catalog-metadata.json`)
- Catalog reading (`/var/cache/secubox/catalogs/*.json` or embedded)
- opkg version checking
## Phase 3: Frontend LuCI Views (COMPLETE)
### API Module Enhancement
- **Modified**: `secubox-admin/api.js`
- New RPC declarations: 7 new methods
- Exports: `getCatalogSources`, `setCatalogSource`, `syncCatalog`,
`checkUpdates`, `getAppVersions`, `getChangelog`, `getWidgetData`
### Catalog Sources Management
- **New**: `view/secubox-admin/catalog-sources.js` (370 lines)
- Live source status display (online/offline/error)
- Priority-based ordering
- Active source indicator
- Per-source actions: Sync, Test, Set Active, Enable/Disable
- Summary stats: Total sources, active source, updates available
- Auto-refresh every 30 seconds
- Timestamp formatting (relative: "5 minutes ago", "2 days ago")
### Updates Manager
- **New**: `view/secubox-admin/updates.js` (380 lines)
- Available updates list with version comparison
- Changelog preview in update cards
- Version arrows: "0.3.0-1 → 0.4.0-2"
- Per-app actions: Update Now, View Full Changelog, Skip Version
- Batch update: "Update All" button
- Check for Updates: Sync + check flow
- Auto-refresh every 60 seconds
- No updates state: Checkmark with message
### Apps Manager Enhancement
- **Modified**: `view/secubox-admin/apps.js`
- Load update info on page load
- Update available badges (warning style)
- Version display with tooltip (installed → available)
- Visual indicators: `.has-update`, `.version-outdated` classes
- New filter: "Updates Available" / "Installed" / "Not Installed"
- Changelog button on all apps (installed or not)
- Update button for apps with available updates
- `updateApp()`: Shows changelog before update
- `viewChangelog()`: Modal with version history
- `filterByStatus()`: Filter by update/install status
### Menu Integration
- **Modified**: `menu.d/luci-app-secubox-admin.json`
- New entries:
- "Updates" (order: 25) → `/admin/secubox/admin/updates`
- "Catalog Sources" (order: 27) → `/admin/secubox/admin/catalog-sources`
- Placed between Apps Manager and App Settings
## Data Flow Architecture
```
User Action (Web UI)
↓
LuCI View (catalog-sources.js, updates.js, apps.js)
↓
API Module (api.js RPC calls)
↓
RPCD Backend (luci.secubox)
↓
CLI Scripts (secubox-appstore, secubox-catalog-sync)
↓
Data Layer
├── UCI Config (/etc/config/secubox-appstore)
├── Cache (/var/cache/secubox/catalogs/*.json)
├── Metadata (/var/lib/secubox/catalog-metadata.json)
└── Embedded (/usr/share/secubox/catalog.json)
```
## Fallback Logic
1. User triggers sync (or auto-sync)
2. secubox-catalog-sync reads UCI config
3. Sorts sources by priority (1 = GitHub, 2 = Local Web, 3 = USB, 999 = Embedded)
4. Attempts each source in order:
- GitHub HTTPS → timeout/fail → Next
- Local Web → unreachable → Next
- USB → not mounted → Next
- Embedded → Always succeeds (ROM)
5. First successful source becomes active
6. Metadata updated with status, ETag, timestamp
7. Cache written to `/var/cache/secubox/catalogs/<source>.json`
## Version Tracking
- **PKG_VERSION**: OpenWrt package version (e.g., "0.4.0")
- **PKG_RELEASE**: Build release number (e.g., "2")
- **pkg_version**: Full package string "0.4.0-2" (in catalog)
- **app_version**: Underlying app version (e.g., "0.4.0")
- **installed_version**: From `opkg list-installed`
- **catalog_version**: From active catalog JSON
- **Comparison**: Uses `opkg compare-versions` for semantic versioning
## Storage Layout
```
/etc/config/secubox-appstore # UCI configuration
/var/cache/secubox/catalogs/ # Downloaded catalogs (755/644)
├── github.json
├── local_web.json
└── usb.json
/var/lib/secubox/ # Runtime metadata (700/600)
└── catalog-metadata.json
/usr/share/secubox/catalog.json # Embedded fallback (ROM)
```
## Key Features
✅ **Multi-source support**: GitHub + Web + USB + Embedded
✅ **Automatic fallback**: Priority-based with retry logic
✅ **HTTP optimization**: ETag caching, 304 Not Modified
✅ **Version management**: PKG + App versions, changelog tracking
✅ **Update notifications**: Badges, filters, dedicated updates page
✅ **Offline capable**: USB and embedded sources work without internet
✅ **Live status**: Auto-refresh, real-time source health
✅ **User control**: Manual sync, force specific source, enable/disable sources
## Files Modified (8)
- package/secubox/secubox-core/Makefile
- package/secubox/secubox-core/root/usr/libexec/rpcd/luci.secubox
- package/secubox/secubox-core/root/usr/sbin/secubox-appstore
- package/secubox/luci-app-secubox-admin/htdocs/luci-static/resources/secubox-admin/api.js
- package/secubox/luci-app-secubox-admin/htdocs/luci-static/resources/view/secubox-admin/apps.js
- package/secubox/luci-app-secubox-admin/root/usr/share/luci/menu.d/luci-app-secubox-admin.json
## Files Created (4)
- package/secubox/secubox-core/root/etc/config/secubox-appstore
- package/secubox/secubox-core/root/usr/sbin/secubox-catalog-sync
- package/secubox/secubox-core/root/usr/share/secubox/catalog-metadata.json.example
- package/secubox/luci-app-secubox-admin/htdocs/luci-static/resources/view/secubox-admin/catalog-sources.js
- package/secubox/luci-app-secubox-admin/htdocs/luci-static/resources/view/secubox-admin/updates.js
## Next Steps (Phase 4-5)
- Phase 4: Enrich catalog.json with changelog sections
- Phase 5: Widget system (renderer + templates for security/network/monitoring)
- Phase 6: Auto-sync service with cron
- Phase 7: Optimizations (signature validation, compression, CDN)
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
192 lines
4.0 KiB
JavaScript
192 lines
4.0 KiB
JavaScript
'use strict';
|
|
'require baseclass';
|
|
'require rpc';
|
|
|
|
// App Management
|
|
var callGetApps = rpc.declare({
|
|
object: 'luci.secubox',
|
|
method: 'get_appstore_apps',
|
|
expect: { apps: [] }
|
|
});
|
|
|
|
var callInstallApp = rpc.declare({
|
|
object: 'luci.secubox',
|
|
method: 'install_appstore_app',
|
|
params: ['app_id'],
|
|
expect: { success: false }
|
|
});
|
|
|
|
var callRemoveApp = rpc.declare({
|
|
object: 'luci.secubox',
|
|
method: 'remove_appstore_app',
|
|
params: ['app_id'],
|
|
expect: { success: false }
|
|
});
|
|
|
|
// Module Management
|
|
var callGetModules = rpc.declare({
|
|
object: 'luci.secubox',
|
|
method: 'getModules',
|
|
expect: { modules: [] }
|
|
});
|
|
|
|
var callEnableModule = rpc.declare({
|
|
object: 'luci.secubox',
|
|
method: 'enable_module',
|
|
params: ['module'],
|
|
expect: { success: false }
|
|
});
|
|
|
|
var callDisableModule = rpc.declare({
|
|
object: 'luci.secubox',
|
|
method: 'disable_module',
|
|
params: ['module'],
|
|
expect: { success: false }
|
|
});
|
|
|
|
// System Health
|
|
var callGetHealth = rpc.declare({
|
|
object: 'luci.secubox',
|
|
method: 'get_system_health',
|
|
expect: { }
|
|
});
|
|
|
|
var callGetAlerts = rpc.declare({
|
|
object: 'luci.secubox',
|
|
method: 'get_alerts',
|
|
expect: { alerts: [] }
|
|
});
|
|
|
|
// Logs
|
|
var callGetLogs = rpc.declare({
|
|
object: 'luci.secubox',
|
|
method: 'getLogs',
|
|
params: ['service', 'lines'],
|
|
expect: { logs: '' }
|
|
});
|
|
|
|
// Catalog Sources
|
|
var callGetCatalogSources = rpc.declare({
|
|
object: 'luci.secubox',
|
|
method: 'get_catalog_sources',
|
|
expect: { sources: [] }
|
|
});
|
|
|
|
var callSetCatalogSource = rpc.declare({
|
|
object: 'luci.secubox',
|
|
method: 'set_catalog_source',
|
|
params: ['source'],
|
|
expect: { success: false }
|
|
});
|
|
|
|
var callSyncCatalog = rpc.declare({
|
|
object: 'luci.secubox',
|
|
method: 'sync_catalog',
|
|
params: ['source'],
|
|
expect: { success: false }
|
|
});
|
|
|
|
// Version Management
|
|
var callCheckUpdates = rpc.declare({
|
|
object: 'luci.secubox',
|
|
method: 'check_updates',
|
|
expect: { }
|
|
});
|
|
|
|
var callGetAppVersions = rpc.declare({
|
|
object: 'luci.secubox',
|
|
method: 'get_app_versions',
|
|
params: ['app_id'],
|
|
expect: { }
|
|
});
|
|
|
|
var callGetChangelog = rpc.declare({
|
|
object: 'luci.secubox',
|
|
method: 'get_changelog',
|
|
params: ['app_id', 'from_version', 'to_version'],
|
|
expect: { }
|
|
});
|
|
|
|
// Widget Data
|
|
var callGetWidgetData = rpc.declare({
|
|
object: 'luci.secubox',
|
|
method: 'get_widget_data',
|
|
params: ['app_id'],
|
|
expect: { }
|
|
});
|
|
|
|
// Utility functions
|
|
function formatBytes(bytes) {
|
|
if (bytes === 0) return '0 B';
|
|
var k = 1024;
|
|
var sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
|
|
var i = Math.floor(Math.log(bytes) / Math.log(k));
|
|
return Math.round(bytes / Math.pow(k, i) * 100) / 100 + ' ' + sizes[i];
|
|
}
|
|
|
|
function formatUptime(seconds) {
|
|
var days = Math.floor(seconds / 86400);
|
|
var hours = Math.floor((seconds % 86400) / 3600);
|
|
var mins = Math.floor((seconds % 3600) / 60);
|
|
return days + 'd ' + hours + 'h ' + mins + 'm';
|
|
}
|
|
|
|
function getAppStatus(app, modules) {
|
|
// Determine if app is installed by checking modules
|
|
var isInstalled = false;
|
|
var isRunning = false;
|
|
|
|
if (app.packages && app.packages.required) {
|
|
for (var i = 0; i < app.packages.required.length; i++) {
|
|
var pkg = app.packages.required[i];
|
|
if (modules[pkg]) {
|
|
isInstalled = true;
|
|
isRunning = modules[pkg].running || false;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
return {
|
|
installed: isInstalled,
|
|
running: isRunning,
|
|
status: isRunning ? 'running' : (isInstalled ? 'stopped' : 'available')
|
|
};
|
|
}
|
|
|
|
// Export API
|
|
return baseclass.extend({
|
|
// Apps
|
|
getApps: callGetApps,
|
|
installApp: callInstallApp,
|
|
removeApp: callRemoveApp,
|
|
|
|
// Modules
|
|
getModules: callGetModules,
|
|
enableModule: callEnableModule,
|
|
disableModule: callDisableModule,
|
|
|
|
// System
|
|
getHealth: callGetHealth,
|
|
getAlerts: callGetAlerts,
|
|
getLogs: callGetLogs,
|
|
|
|
// Catalog Sources
|
|
getCatalogSources: callGetCatalogSources,
|
|
setCatalogSource: callSetCatalogSource,
|
|
syncCatalog: callSyncCatalog,
|
|
|
|
// Version Management
|
|
checkUpdates: callCheckUpdates,
|
|
getAppVersions: callGetAppVersions,
|
|
getChangelog: callGetChangelog,
|
|
|
|
// Widget Data
|
|
getWidgetData: callGetWidgetData,
|
|
|
|
// Utilities
|
|
formatBytes: formatBytes,
|
|
formatUptime: formatUptime,
|
|
getAppStatus: getAppStatus
|
|
});
|