secubox-openwrt/package/secubox/luci-app-secubox-admin/htdocs/luci-static/resources/view/secubox-admin/updates.js
CyberMind-FR 77dbd3d499 feat: Multi-source AppStore with version management and updates UI (Phases 1-3)
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>
2026-01-04 10:53:57 +01:00

353 lines
9.6 KiB
JavaScript

'use strict';
'require view';
'require secubox-admin.api as API';
'require secubox-admin.components as Components';
'require ui';
'require poll';
return view.extend({
load: function() {
return Promise.all([
API.checkUpdates(),
API.getApps(),
API.getModules()
]);
},
render: function(data) {
var updateData = data[0] || {};
var apps = data[1].apps || [];
var modules = data[2].modules || {};
var self = this;
// Filter apps that have updates available
var updatesAvailable = updateData.updates || [];
var totalUpdates = updatesAvailable.length;
var container = E('div', { 'class': 'secubox-updates' }, [
E('link', { 'rel': 'stylesheet',
'href': L.resource('secubox-admin/common.css') }),
E('link', { 'rel': 'stylesheet',
'href': L.resource('secubox-admin/admin.css') }),
E('h2', {}, 'Available Updates'),
E('p', {}, 'Review and install available updates for SecuBox applications'),
// Summary header
E('div', { 'class': 'updates-summary' }, [
E('div', { 'class': 'summary-card' }, [
E('div', { 'class': 'summary-icon' }, '📦'),
E('div', { 'class': 'summary-info' }, [
E('div', { 'class': 'summary-count' }, totalUpdates.toString()),
E('div', { 'class': 'summary-label' }, totalUpdates === 1 ? 'Update Available' : 'Updates Available')
])
]),
E('div', { 'class': 'summary-actions' }, [
totalUpdates > 0 ? E('button', {
'class': 'btn btn-primary',
'click': function() {
self.updateAllApps(updatesAvailable);
}
}, 'Update All') : null,
E('button', {
'class': 'btn btn-secondary',
'click': function() {
self.checkForUpdates();
}
}, 'Check for Updates')
])
]),
// Updates list
totalUpdates > 0 ?
E('div', { 'class': 'updates-list', 'id': 'updates-list' },
updatesAvailable.map(function(update) {
// Find full app details from catalog
var app = apps.find(function(a) { return a.id === update.app_id; });
return self.renderUpdateCard(update, app);
})
) :
E('div', { 'class': 'no-updates' }, [
E('div', { 'class': 'no-updates-icon' }, '✓'),
E('h3', {}, 'All applications are up to date'),
E('p', {}, 'Check back later for new updates or click "Check for Updates" to refresh.')
])
]);
// Auto-refresh every 60 seconds
poll.add(function() {
return API.checkUpdates().then(function(result) {
var updatesList = document.getElementById('updates-list');
if (updatesList && result.updates) {
// Only update if count changed
if (result.updates.length !== totalUpdates) {
window.location.reload();
}
}
});
}, 60);
return container;
},
renderUpdateCard: function(update, app) {
var self = this;
if (!app) {
// App not found in catalog, show minimal info
app = {
id: update.app_id,
name: update.app_id,
description: 'Application from catalog',
icon: '📦'
};
}
return E('div', { 'class': 'update-card', 'data-app-id': update.app_id }, [
// App header
E('div', { 'class': 'update-header' }, [
E('div', { 'class': 'app-icon-large' }, app.icon || '📦'),
E('div', { 'class': 'app-title' }, [
E('h3', {}, app.name),
E('p', { 'class': 'app-category' }, app.category || 'Application')
]),
E('div', { 'class': 'update-badge' }, [
E('span', { 'class': 'badge badge-warning' }, 'UPDATE AVAILABLE')
])
]),
// Version info
E('div', { 'class': 'version-info' }, [
E('div', { 'class': 'version-row' }, [
E('span', { 'class': 'version-label' }, 'Current Version:'),
E('span', { 'class': 'version-value current' }, update.installed_version || 'Unknown')
]),
E('div', { 'class': 'version-arrow' }, '→'),
E('div', { 'class': 'version-row' }, [
E('span', { 'class': 'version-label' }, 'New Version:'),
E('span', { 'class': 'version-value new' }, update.catalog_version || 'Unknown')
])
]),
// Changelog section
update.changelog ? E('div', { 'class': 'changelog-section' }, [
E('h4', {}, 'What\'s New'),
E('div', { 'class': 'changelog-content' },
this.renderChangelog(update.changelog)
)
]) : null,
// Update info
E('div', { 'class': 'update-meta' }, [
update.release_date ? E('div', { 'class': 'meta-item' }, [
E('span', { 'class': 'meta-label' }, 'Release Date:'),
E('span', { 'class': 'meta-value' }, update.release_date)
]) : null,
update.download_size ? E('div', { 'class': 'meta-item' }, [
E('span', { 'class': 'meta-label' }, 'Download Size:'),
E('span', { 'class': 'meta-value' }, API.formatBytes(update.download_size))
]) : null
]),
// Actions
E('div', { 'class': 'update-actions' }, [
E('button', {
'class': 'btn btn-primary',
'click': function() {
self.updateApp(update.app_id, app.name);
}
}, 'Update Now'),
E('button', {
'class': 'btn btn-secondary',
'click': function() {
self.viewFullChangelog(update.app_id, update.installed_version, update.catalog_version);
}
}, 'View Full Changelog'),
E('button', {
'class': 'btn btn-tertiary',
'click': function() {
self.skipUpdate(update.app_id);
}
}, 'Skip This Version')
])
]);
},
renderChangelog: function(changelog) {
if (typeof changelog === 'string') {
return E('p', {}, changelog);
}
if (Array.isArray(changelog)) {
return E('ul', { 'class': 'changelog-list' },
changelog.map(function(item) {
return E('li', {}, item);
})
);
}
// Object with version keys
var versions = Object.keys(changelog);
if (versions.length > 0) {
var latestVersion = versions[0];
var changes = changelog[latestVersion].changes || [];
return E('ul', { 'class': 'changelog-list' },
changes.map(function(item) {
return E('li', {}, item);
})
);
}
return E('p', {}, 'No changelog available');
},
updateApp: function(appId, appName) {
ui.showModal(_('Updating Application'), [
E('p', { 'class': 'spinning' }, _('Updating %s...').format(appName))
]);
API.installApp(appId).then(function(result) {
ui.hideModal();
if (result.success) {
ui.addNotification(null,
E('p', _('%s updated successfully').format(appName)),
'success'
);
// Refresh the page to show updated status
setTimeout(function() {
window.location.reload();
}, 1000);
} else {
ui.addNotification(null,
E('p', _('Update failed: %s').format(result.error || 'Unknown error')),
'error'
);
}
}).catch(function(err) {
ui.hideModal();
ui.addNotification(null,
E('p', _('Update error: %s').format(err.message)),
'error'
);
});
},
updateAllApps: function(updates) {
if (updates.length === 0) return;
ui.showModal(_('Updating Applications'), [
E('p', { 'class': 'spinning' }, _('Updating %d applications...').format(updates.length)),
E('p', { 'id': 'update-progress' }, _('Preparing...'))
]);
var self = this;
var currentIndex = 0;
function updateNext() {
if (currentIndex >= updates.length) {
ui.hideModal();
ui.addNotification(null,
E('p', _('All applications updated successfully')),
'success'
);
setTimeout(function() {
window.location.reload();
}, 1000);
return;
}
var update = updates[currentIndex];
var progressEl = document.getElementById('update-progress');
if (progressEl) {
progressEl.textContent = _('Updating %s (%d/%d)...')
.format(update.app_id, currentIndex + 1, updates.length);
}
API.installApp(update.app_id).then(function(result) {
currentIndex++;
updateNext();
}).catch(function(err) {
ui.hideModal();
ui.addNotification(null,
E('p', _('Failed to update %s: %s').format(update.app_id, err.message)),
'error'
);
});
}
updateNext();
},
viewFullChangelog: function(appId, fromVersion, toVersion) {
API.getChangelog(appId, fromVersion, toVersion).then(function(changelog) {
var content = E('div', { 'class': 'changelog-modal' }, [
E('h3', {}, _('Changelog for %s').format(appId)),
E('div', { 'class': 'version-range' },
_('Changes from %s to %s').format(fromVersion, toVersion)
),
E('div', { 'class': 'changelog-full' },
// Render full changelog
typeof changelog === 'string' ?
E('pre', {}, changelog) :
JSON.stringify(changelog, null, 2)
)
]);
ui.showModal(_('Full Changelog'), [
content,
E('div', { 'class': 'right' }, [
E('button', {
'class': 'btn',
'click': function() {
ui.hideModal();
}
}, _('Close'))
])
]);
}).catch(function(err) {
ui.addNotification(null,
E('p', _('Failed to load changelog: %s').format(err.message)),
'error'
);
});
},
skipUpdate: function(appId) {
// TODO: Implement skip version functionality
// This would mark the version as skipped in metadata
ui.addNotification(null,
E('p', _('Skipped update for: %s').format(appId)),
'info'
);
},
checkForUpdates: function() {
ui.showModal(_('Checking for Updates'), [
E('p', { 'class': 'spinning' }, _('Checking for available updates...'))
]);
// Sync catalog first, then check for updates
API.syncCatalog(null).then(function() {
return API.checkUpdates();
}).then(function(result) {
ui.hideModal();
ui.addNotification(null,
E('p', _('Update check complete. Found %d updates.')
.format((result.updates || []).length)),
'success'
);
window.location.reload();
}).catch(function(err) {
ui.hideModal();
ui.addNotification(null,
E('p', _('Update check failed: %s').format(err.message)),
'error'
);
});
},
handleSaveApply: null,
handleSave: null,
handleReset: null
});