mirror of https://github.com/jetkvm/kvm.git
Compare commits
No commits in common. "9832be29ef76f9c2a1b7272d371019d285b30fb4" and "1bca0c5e264c3cb2b2e0735285dfb313bde443c0" have entirely different histories.
9832be29ef
...
1bca0c5e26
|
|
@ -152,12 +152,12 @@ func (s *State) doUpdate(ctx context.Context, params UpdateParams) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if shouldUpdateApp && appUpdate.available {
|
if shouldUpdateApp && (appUpdate.available || appUpdate.downgradeAvailable) {
|
||||||
appUpdate.pending = true
|
appUpdate.pending = true
|
||||||
s.triggerComponentUpdateState("app", appUpdate)
|
s.triggerComponentUpdateState("app", appUpdate)
|
||||||
}
|
}
|
||||||
|
|
||||||
if shouldUpdateSystem && systemUpdate.available {
|
if shouldUpdateSystem && (systemUpdate.available || systemUpdate.downgradeAvailable) {
|
||||||
systemUpdate.pending = true
|
systemUpdate.pending = true
|
||||||
s.triggerComponentUpdateState("system", systemUpdate)
|
s.triggerComponentUpdateState("system", systemUpdate)
|
||||||
}
|
}
|
||||||
|
|
@ -220,8 +220,6 @@ type UpdateParams struct {
|
||||||
ResetConfig bool `json:"resetConfig"`
|
ResetConfig bool `json:"resetConfig"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// getUpdateStatus gets the update status for the given components
|
|
||||||
// and updates the componentUpdateStatuses map
|
|
||||||
func (s *State) getUpdateStatus(
|
func (s *State) getUpdateStatus(
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
params UpdateParams,
|
params UpdateParams,
|
||||||
|
|
@ -241,7 +239,7 @@ func (s *State) getUpdateStatus(
|
||||||
systemUpdate = ¤tSystemUpdate
|
systemUpdate = ¤tSystemUpdate
|
||||||
}
|
}
|
||||||
|
|
||||||
err = s.checkUpdateStatus(ctx, params, appUpdate, systemUpdate)
|
err = s.doGetUpdateStatus(ctx, params, appUpdate, systemUpdate)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
@ -252,20 +250,21 @@ func (s *State) getUpdateStatus(
|
||||||
return appUpdate, systemUpdate, nil
|
return appUpdate, systemUpdate, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// checkUpdateStatus checks the update status for the given components
|
// doGetUpdateStatus is the internal function that gets the update status
|
||||||
func (s *State) checkUpdateStatus(
|
// it WON'T change the state of the OTA state
|
||||||
|
func (s *State) doGetUpdateStatus(
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
params UpdateParams,
|
params UpdateParams,
|
||||||
appUpdateStatus *componentUpdateStatus,
|
appUpdate *componentUpdateStatus,
|
||||||
systemUpdateStatus *componentUpdateStatus,
|
systemUpdate *componentUpdateStatus,
|
||||||
) error {
|
) error {
|
||||||
// Get local versions
|
// Get local versions
|
||||||
systemVersionLocal, appVersionLocal, err := s.getLocalVersion()
|
systemVersionLocal, appVersionLocal, err := s.getLocalVersion()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("error getting local version: %w", err)
|
return fmt.Errorf("error getting local version: %w", err)
|
||||||
}
|
}
|
||||||
appUpdateStatus.localVersion = appVersionLocal.String()
|
appUpdate.localVersion = appVersionLocal.String()
|
||||||
systemUpdateStatus.localVersion = systemVersionLocal.String()
|
systemUpdate.localVersion = systemVersionLocal.String()
|
||||||
|
|
||||||
// Get remote metadata
|
// Get remote metadata
|
||||||
remoteMetadata, err := s.fetchUpdateMetadata(ctx, params)
|
remoteMetadata, err := s.fetchUpdateMetadata(ctx, params)
|
||||||
|
|
@ -277,13 +276,13 @@ func (s *State) checkUpdateStatus(
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
appUpdateStatus.url = remoteMetadata.AppURL
|
appUpdate.url = remoteMetadata.AppURL
|
||||||
appUpdateStatus.hash = remoteMetadata.AppHash
|
appUpdate.hash = remoteMetadata.AppHash
|
||||||
appUpdateStatus.version = remoteMetadata.AppVersion
|
appUpdate.version = remoteMetadata.AppVersion
|
||||||
|
|
||||||
systemUpdateStatus.url = remoteMetadata.SystemURL
|
systemUpdate.url = remoteMetadata.SystemURL
|
||||||
systemUpdateStatus.hash = remoteMetadata.SystemHash
|
systemUpdate.hash = remoteMetadata.SystemHash
|
||||||
systemUpdateStatus.version = remoteMetadata.SystemVersion
|
systemUpdate.version = remoteMetadata.SystemVersion
|
||||||
|
|
||||||
// Get remote versions
|
// Get remote versions
|
||||||
systemVersionRemote, err := semver.NewVersion(remoteMetadata.SystemVersion)
|
systemVersionRemote, err := semver.NewVersion(remoteMetadata.SystemVersion)
|
||||||
|
|
@ -291,33 +290,26 @@ func (s *State) checkUpdateStatus(
|
||||||
err = fmt.Errorf("error parsing remote system version: %w", err)
|
err = fmt.Errorf("error parsing remote system version: %w", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
systemUpdateStatus.available = systemVersionRemote.GreaterThan(systemVersionLocal)
|
systemUpdate.available = systemVersionRemote.GreaterThan(systemVersionLocal)
|
||||||
|
systemUpdate.downgradeAvailable = systemVersionRemote.LessThan(systemVersionLocal)
|
||||||
|
|
||||||
appVersionRemote, err := semver.NewVersion(remoteMetadata.AppVersion)
|
appVersionRemote, err := semver.NewVersion(remoteMetadata.AppVersion)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
err = fmt.Errorf("error parsing remote app version: %w, %s", err, remoteMetadata.AppVersion)
|
err = fmt.Errorf("error parsing remote app version: %w, %s", err, remoteMetadata.AppVersion)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
appUpdateStatus.available = appVersionRemote.GreaterThan(appVersionLocal)
|
appUpdate.available = appVersionRemote.GreaterThan(appVersionLocal)
|
||||||
|
appUpdate.downgradeAvailable = appVersionRemote.LessThan(appVersionLocal)
|
||||||
|
|
||||||
// Handle pre-release updates
|
// Handle pre-release updates
|
||||||
isRemoteSystemPreRelease := systemVersionRemote.Prerelease() != ""
|
isRemoteSystemPreRelease := systemVersionRemote.Prerelease() != ""
|
||||||
isRemoteAppPreRelease := appVersionRemote.Prerelease() != ""
|
isRemoteAppPreRelease := appVersionRemote.Prerelease() != ""
|
||||||
|
|
||||||
if isRemoteSystemPreRelease && !params.IncludePreRelease {
|
if isRemoteSystemPreRelease && !params.IncludePreRelease {
|
||||||
systemUpdateStatus.available = false
|
systemUpdate.available = false
|
||||||
}
|
}
|
||||||
if isRemoteAppPreRelease && !params.IncludePreRelease {
|
if isRemoteAppPreRelease && !params.IncludePreRelease {
|
||||||
appUpdateStatus.available = false
|
appUpdate.available = false
|
||||||
}
|
|
||||||
|
|
||||||
// Handle custom target versions
|
|
||||||
if slices.Contains(params.Components, "app") && params.AppTargetVersion != "" {
|
|
||||||
appUpdateStatus.available = appVersionRemote.String() != appUpdateStatus.localVersion
|
|
||||||
}
|
|
||||||
|
|
||||||
if slices.Contains(params.Components, "system") && params.SystemTargetVersion != "" {
|
|
||||||
systemUpdateStatus.available = systemVersionRemote.String() != systemUpdateStatus.localVersion
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
@ -325,12 +317,12 @@ func (s *State) checkUpdateStatus(
|
||||||
|
|
||||||
// GetUpdateStatus returns the current update status (for backwards compatibility)
|
// GetUpdateStatus returns the current update status (for backwards compatibility)
|
||||||
func (s *State) GetUpdateStatus(ctx context.Context, params UpdateParams) (*UpdateStatus, error) {
|
func (s *State) GetUpdateStatus(ctx context.Context, params UpdateParams) (*UpdateStatus, error) {
|
||||||
appUpdateStatus := componentUpdateStatus{}
|
appUpdate := &componentUpdateStatus{}
|
||||||
systemUpdateStatus := componentUpdateStatus{}
|
systemUpdate := &componentUpdateStatus{}
|
||||||
err := s.checkUpdateStatus(ctx, params, &appUpdateStatus, &systemUpdateStatus)
|
err := s.doGetUpdateStatus(ctx, params, appUpdate, systemUpdate)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("error getting update status: %w", err)
|
return nil, fmt.Errorf("error getting update status: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return toUpdateStatus(&appUpdateStatus, &systemUpdateStatus, ""), nil
|
return toUpdateStatus(appUpdate, systemUpdate, ""), nil
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -28,10 +28,12 @@ type LocalMetadata struct {
|
||||||
|
|
||||||
// UpdateStatus represents the current update status
|
// UpdateStatus represents the current update status
|
||||||
type UpdateStatus struct {
|
type UpdateStatus struct {
|
||||||
Local *LocalMetadata `json:"local"`
|
Local *LocalMetadata `json:"local"`
|
||||||
Remote *UpdateMetadata `json:"remote"`
|
Remote *UpdateMetadata `json:"remote"`
|
||||||
SystemUpdateAvailable bool `json:"systemUpdateAvailable"`
|
SystemUpdateAvailable bool `json:"systemUpdateAvailable"`
|
||||||
AppUpdateAvailable bool `json:"appUpdateAvailable"`
|
SystemDowngradeAvailable bool `json:"systemDowngradeAvailable"`
|
||||||
|
AppUpdateAvailable bool `json:"appUpdateAvailable"`
|
||||||
|
AppDowngradeAvailable bool `json:"appDowngradeAvailable"`
|
||||||
|
|
||||||
// for backwards compatibility
|
// for backwards compatibility
|
||||||
Error string `json:"error,omitempty"`
|
Error string `json:"error,omitempty"`
|
||||||
|
|
@ -48,6 +50,7 @@ type PostRebootAction struct {
|
||||||
type componentUpdateStatus struct {
|
type componentUpdateStatus struct {
|
||||||
pending bool
|
pending bool
|
||||||
available bool
|
available bool
|
||||||
|
downgradeAvailable bool
|
||||||
version string
|
version string
|
||||||
localVersion string
|
localVersion string
|
||||||
targetVersion string
|
targetVersion string
|
||||||
|
|
@ -167,9 +170,11 @@ func toUpdateStatus(appUpdate *componentUpdateStatus, systemUpdate *componentUpd
|
||||||
SystemURL: systemUpdate.url,
|
SystemURL: systemUpdate.url,
|
||||||
SystemHash: systemUpdate.hash,
|
SystemHash: systemUpdate.hash,
|
||||||
},
|
},
|
||||||
SystemUpdateAvailable: systemUpdate.available,
|
SystemUpdateAvailable: systemUpdate.available,
|
||||||
AppUpdateAvailable: appUpdate.available,
|
SystemDowngradeAvailable: systemUpdate.downgradeAvailable,
|
||||||
Error: error,
|
AppUpdateAvailable: appUpdate.available,
|
||||||
|
AppDowngradeAvailable: appUpdate.downgradeAvailable,
|
||||||
|
Error: error,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1155,6 +1155,7 @@ var rpcHandlers = map[string]RPCHandler{
|
||||||
"getUpdateStatusChannel": {Func: rpcGetUpdateStatusChannel},
|
"getUpdateStatusChannel": {Func: rpcGetUpdateStatusChannel},
|
||||||
"tryUpdate": {Func: rpcTryUpdate},
|
"tryUpdate": {Func: rpcTryUpdate},
|
||||||
"tryUpdateComponents": {Func: rpcTryUpdateComponents, Params: []string{"params", "includePreRelease", "resetConfig"}},
|
"tryUpdateComponents": {Func: rpcTryUpdateComponents, Params: []string{"params", "includePreRelease", "resetConfig"}},
|
||||||
|
"cancelDowngrade": {Func: rpcCancelDowngrade},
|
||||||
"getDevModeState": {Func: rpcGetDevModeState},
|
"getDevModeState": {Func: rpcGetDevModeState},
|
||||||
"setDevModeState": {Func: rpcSetDevModeState, Params: []string{"enabled"}},
|
"setDevModeState": {Func: rpcSetDevModeState, Params: []string{"enabled"}},
|
||||||
"getSSHKeyState": {Func: rpcGetSSHKeyState},
|
"getSSHKeyState": {Func: rpcGetSSHKeyState},
|
||||||
|
|
|
||||||
14
ota.go
14
ota.go
|
|
@ -135,8 +135,8 @@ func rpcGetLocalVersion() (*ota.LocalMetadata, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
type updateParams struct {
|
type updateParams struct {
|
||||||
AppTargetVersion string `json:"appTargetVersion"`
|
AppTargetVersion string `json:"app"`
|
||||||
SystemTargetVersion string `json:"systemTargetVersion"`
|
SystemTargetVersion string `json:"system"`
|
||||||
Components string `json:"components,omitempty"` // components is a comma-separated list of components to update
|
Components string `json:"components,omitempty"` // components is a comma-separated list of components to update
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -194,3 +194,13 @@ func rpcTryUpdateComponents(params updateParams, includePreRelease bool, resetCo
|
||||||
}()
|
}()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func rpcCancelDowngrade() error {
|
||||||
|
if err := otaState.SetTargetVersion("app", ""); err != nil {
|
||||||
|
return fmt.Errorf("failed to set app target version: %w", err)
|
||||||
|
}
|
||||||
|
if err := otaState.SetTargetVersion("system", ""); err != nil {
|
||||||
|
return fmt.Errorf("failed to set system target version: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -554,6 +554,7 @@ export type UpdateModalViews =
|
||||||
| "updating"
|
| "updating"
|
||||||
| "upToDate"
|
| "upToDate"
|
||||||
| "updateAvailable"
|
| "updateAvailable"
|
||||||
|
| "updateDowngradeAvailable"
|
||||||
| "updateCompleted"
|
| "updateCompleted"
|
||||||
| "error";
|
| "error";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,9 @@ export interface SystemVersionInfo {
|
||||||
local: VersionInfo;
|
local: VersionInfo;
|
||||||
remote?: VersionInfo;
|
remote?: VersionInfo;
|
||||||
systemUpdateAvailable: boolean;
|
systemUpdateAvailable: boolean;
|
||||||
|
systemDowngradeAvailable: boolean;
|
||||||
appUpdateAvailable: boolean;
|
appUpdateAvailable: boolean;
|
||||||
|
appDowngradeAvailable: boolean;
|
||||||
error?: string;
|
error?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -185,10 +185,10 @@ export default function SettingsAdvancedRoute() {
|
||||||
setShowLoopbackWarning(false);
|
setShowLoopbackWarning(false);
|
||||||
}, [applyLoopbackOnlyMode, setShowLoopbackWarning]);
|
}, [applyLoopbackOnlyMode, setShowLoopbackWarning]);
|
||||||
|
|
||||||
const handleVersionUpdateError = useCallback((error?: JsonRpcError | string) => {
|
const handleVersionUpdateError = useCallback((error?: JsonRpcError) => {
|
||||||
notifications.error(
|
notifications.error(
|
||||||
m.advanced_error_version_update({
|
m.advanced_error_version_update({
|
||||||
error: typeof error === "string" ? error : (error?.data ?? error?.message ?? m.unknown_error())
|
error: error?.data ?? error?.message ?? m.unknown_error()
|
||||||
}),
|
}),
|
||||||
{ duration: 1000 * 15 } // 15 seconds
|
{ duration: 1000 * 15 } // 15 seconds
|
||||||
);
|
);
|
||||||
|
|
@ -204,40 +204,30 @@ export default function SettingsAdvancedRoute() {
|
||||||
setVersionUpdateLoading(true);
|
setVersionUpdateLoading(true);
|
||||||
versionInfo = await checkUpdateComponents({
|
versionInfo = await checkUpdateComponents({
|
||||||
components: components.join(","),
|
components: components.join(","),
|
||||||
appTargetVersion: appVersion,
|
app: appVersion,
|
||||||
systemTargetVersion: systemVersion,
|
system: systemVersion,
|
||||||
}, devChannel);
|
}, devChannel);
|
||||||
console.log("versionInfo", versionInfo);
|
console.log("versionInfo", versionInfo);
|
||||||
} catch (error: unknown) {
|
} catch (error: unknown) {
|
||||||
const jsonRpcError = error as JsonRpcError;
|
const jsonRpcError = error as JsonRpcError;
|
||||||
handleVersionUpdateError(jsonRpcError);
|
handleVersionUpdateError(jsonRpcError);
|
||||||
return;
|
return ;
|
||||||
}
|
}
|
||||||
|
|
||||||
console.debug("versionInfo", versionInfo, components.includes("app") && versionInfo.remote?.appVersion && versionInfo?.appUpdateAvailable, components.includes("system") && versionInfo.remote?.systemVersion && versionInfo?.systemUpdateAvailable);
|
if (!versionInfo) {
|
||||||
console.debug("components", components);
|
handleVersionUpdateError();
|
||||||
console.debug("versionInfo.remote?.appVersion", versionInfo.remote?.appVersion);
|
return;
|
||||||
console.debug("versionInfo.appUpdateAvailable", versionInfo?.appUpdateAvailable);
|
}
|
||||||
console.debug("versionInfo.remote?.systemVersion", versionInfo.remote?.systemVersion);
|
|
||||||
console.debug("versionInfo.systemUpdateAvailable", versionInfo?.systemUpdateAvailable);
|
|
||||||
|
|
||||||
let hasUpdate = false;
|
|
||||||
|
|
||||||
const pageParams = new URLSearchParams();
|
const pageParams = new URLSearchParams();
|
||||||
if (components.includes("app") && versionInfo.remote?.appVersion && versionInfo.appUpdateAvailable) {
|
pageParams.set("downgrade", "true");
|
||||||
hasUpdate = true;
|
if (components.includes("app") && versionInfo.remote?.appVersion && versionInfo.appDowngradeAvailable) {
|
||||||
pageParams.set("custom_app_version", versionInfo.remote?.appVersion);
|
pageParams.set("app", versionInfo.remote?.appVersion);
|
||||||
}
|
}
|
||||||
if (components.includes("system") && versionInfo.remote?.systemVersion && versionInfo.systemUpdateAvailable) {
|
if (components.includes("system") && versionInfo.remote?.systemVersion && versionInfo.systemDowngradeAvailable) {
|
||||||
hasUpdate = true;
|
pageParams.set("system", versionInfo.remote?.systemVersion);
|
||||||
pageParams.set("custom_system_version", versionInfo.remote?.systemVersion);
|
|
||||||
}
|
|
||||||
pageParams.set("reset_config", resetConfig.toString());
|
|
||||||
|
|
||||||
if (!hasUpdate) {
|
|
||||||
handleVersionUpdateError("No update available");
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
pageParams.set("resetConfig", resetConfig.toString());
|
||||||
|
|
||||||
// Navigate to update page
|
// Navigate to update page
|
||||||
navigateTo(`/settings/general/update?${pageParams.toString()}`);
|
navigateTo(`/settings/general/update?${pageParams.toString()}`);
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ import LoadingSpinner from "@components/LoadingSpinner";
|
||||||
import UpdatingStatusCard, { type UpdatePart } from "@components/UpdatingStatusCard";
|
import UpdatingStatusCard, { type UpdatePart } from "@components/UpdatingStatusCard";
|
||||||
import { m } from "@localizations/messages.js";
|
import { m } from "@localizations/messages.js";
|
||||||
import { sleep } from "@/utils";
|
import { sleep } from "@/utils";
|
||||||
import { checkUpdateComponents, SystemVersionInfo, updateParams } from "@/utils/jsonrpc";
|
import { SystemVersionInfo } from "@/utils/jsonrpc";
|
||||||
|
|
||||||
export default function SettingsGeneralUpdateRoute() {
|
export default function SettingsGeneralUpdateRoute() {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|
@ -22,9 +22,10 @@ export default function SettingsGeneralUpdateRoute() {
|
||||||
const { setModalView, otaState } = useUpdateStore();
|
const { setModalView, otaState } = useUpdateStore();
|
||||||
const { send } = useJsonRpc();
|
const { send } = useJsonRpc();
|
||||||
|
|
||||||
const customAppVersion = useMemo(() => searchParams.get("custom_app_version") || undefined, [searchParams]);
|
const downgrade = useMemo(() => searchParams.get("downgrade") === "true", [searchParams]);
|
||||||
const customSystemVersion = useMemo(() => searchParams.get("custom_system_version") || undefined, [searchParams]);
|
const customAppVersion = useMemo(() => searchParams.get("app") || "", [searchParams]);
|
||||||
const resetConfig = useMemo(() => searchParams.get("reset_config") === "true", [searchParams]);
|
const customSystemVersion = useMemo(() => searchParams.get("system") || "", [searchParams]);
|
||||||
|
const resetConfig = useMemo(() => searchParams.get("resetConfig") === "true", [searchParams]);
|
||||||
|
|
||||||
const onClose = useCallback(async () => {
|
const onClose = useCallback(async () => {
|
||||||
navigate(".."); // back to the devices.$id.settings page
|
navigate(".."); // back to the devices.$id.settings page
|
||||||
|
|
@ -38,16 +39,20 @@ export default function SettingsGeneralUpdateRoute() {
|
||||||
setModalView("updating");
|
setModalView("updating");
|
||||||
}, [send, setModalView]);
|
}, [send, setModalView]);
|
||||||
|
|
||||||
const onConfirmCustomUpdate = useCallback((appTargetVersion?: string, systemTargetVersion?: string) => {
|
const onConfirmDowngrade = useCallback(() => {
|
||||||
const components = [];
|
const components = [];
|
||||||
if (appTargetVersion) components.push("app");
|
if (customSystemVersion) {
|
||||||
if (systemTargetVersion) components.push("system");
|
components.push("system");
|
||||||
|
}
|
||||||
|
if (customAppVersion) {
|
||||||
|
components.push("app");
|
||||||
|
}
|
||||||
|
|
||||||
send("tryUpdateComponents", {
|
send("tryUpdateComponents", {
|
||||||
params: {
|
params: {
|
||||||
components: components.join(","),
|
components: components.join(","),
|
||||||
appTargetVersion,
|
app: customAppVersion,
|
||||||
systemTargetVersion,
|
system: customSystemVersion,
|
||||||
},
|
},
|
||||||
includePreRelease: false,
|
includePreRelease: false,
|
||||||
resetConfig,
|
resetConfig,
|
||||||
|
|
@ -55,7 +60,7 @@ export default function SettingsGeneralUpdateRoute() {
|
||||||
if ("error" in resp) return;
|
if ("error" in resp) return;
|
||||||
setModalView("updating");
|
setModalView("updating");
|
||||||
});
|
});
|
||||||
}, [send, setModalView, resetConfig]);
|
}, [send, setModalView, customAppVersion, customSystemVersion, resetConfig]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (otaState.updating) {
|
if (otaState.updating) {
|
||||||
|
|
@ -72,7 +77,8 @@ export default function SettingsGeneralUpdateRoute() {
|
||||||
return <Dialog
|
return <Dialog
|
||||||
onClose={onClose}
|
onClose={onClose}
|
||||||
onConfirmUpdate={onConfirmUpdate}
|
onConfirmUpdate={onConfirmUpdate}
|
||||||
onConfirmCustomUpdate={onConfirmCustomUpdate}
|
onConfirmDowngrade={onConfirmDowngrade}
|
||||||
|
downgrade={downgrade}
|
||||||
customAppVersion={customAppVersion}
|
customAppVersion={customAppVersion}
|
||||||
customSystemVersion={customSystemVersion}
|
customSystemVersion={customSystemVersion}
|
||||||
/>;
|
/>;
|
||||||
|
|
@ -81,13 +87,15 @@ export default function SettingsGeneralUpdateRoute() {
|
||||||
export function Dialog({
|
export function Dialog({
|
||||||
onClose,
|
onClose,
|
||||||
onConfirmUpdate,
|
onConfirmUpdate,
|
||||||
onConfirmCustomUpdate: onConfirmCustomUpdateCallback,
|
onConfirmDowngrade,
|
||||||
|
downgrade,
|
||||||
customAppVersion,
|
customAppVersion,
|
||||||
customSystemVersion,
|
customSystemVersion,
|
||||||
}: Readonly<{
|
}: Readonly<{
|
||||||
|
downgrade: boolean;
|
||||||
onClose: () => void;
|
onClose: () => void;
|
||||||
onConfirmUpdate: () => void;
|
onConfirmUpdate: () => void;
|
||||||
onConfirmCustomUpdate: (appVersion?: string, systemVersion?: string) => void;
|
onConfirmDowngrade: () => void;
|
||||||
customAppVersion?: string;
|
customAppVersion?: string;
|
||||||
customSystemVersion?: string;
|
customSystemVersion?: string;
|
||||||
}>) {
|
}>) {
|
||||||
|
|
@ -95,31 +103,32 @@ export function Dialog({
|
||||||
|
|
||||||
const [versionInfo, setVersionInfo] = useState<null | SystemVersionInfo>(null);
|
const [versionInfo, setVersionInfo] = useState<null | SystemVersionInfo>(null);
|
||||||
const { modalView, setModalView, otaState } = useUpdateStore();
|
const { modalView, setModalView, otaState } = useUpdateStore();
|
||||||
const forceCustomUpdate = customSystemVersion !== undefined || customAppVersion !== undefined;
|
const { send } = useJsonRpc();
|
||||||
const onConfirmCustomUpdate = useCallback(() => {
|
|
||||||
console.debug("onConfirmCustomUpdate", customAppVersion, customSystemVersion, versionInfo);
|
|
||||||
onConfirmCustomUpdateCallback(
|
|
||||||
customAppVersion !== undefined ? customAppVersion : versionInfo?.remote?.appVersion,
|
|
||||||
customSystemVersion !== undefined ? customSystemVersion : versionInfo?.remote?.systemVersion,
|
|
||||||
);
|
|
||||||
}, [onConfirmCustomUpdateCallback, customAppVersion, customSystemVersion, versionInfo]);
|
|
||||||
|
|
||||||
const onFinishedLoading = useCallback(
|
const onFinishedLoading = useCallback(
|
||||||
(versionInfo: SystemVersionInfo) => {
|
(versionInfo: SystemVersionInfo) => {
|
||||||
const hasUpdate =
|
const hasUpdate =
|
||||||
versionInfo?.systemUpdateAvailable || versionInfo?.appUpdateAvailable;
|
versionInfo?.systemUpdateAvailable || versionInfo?.appUpdateAvailable;
|
||||||
|
const hasDowngrade = customSystemVersion !== undefined || customAppVersion !== undefined;
|
||||||
|
|
||||||
setVersionInfo(versionInfo);
|
setVersionInfo(versionInfo);
|
||||||
|
|
||||||
if (hasUpdate || forceCustomUpdate) {
|
if (hasDowngrade && downgrade) {
|
||||||
|
setModalView("updateDowngradeAvailable");
|
||||||
|
} else if (hasUpdate) {
|
||||||
setModalView("updateAvailable");
|
setModalView("updateAvailable");
|
||||||
} else {
|
} else {
|
||||||
setModalView("upToDate");
|
setModalView("upToDate");
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[setModalView, forceCustomUpdate],
|
[setModalView, downgrade, customAppVersion, customSystemVersion],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const onCancelDowngrade = useCallback(() => {
|
||||||
|
send("cancelDowngrade", {});
|
||||||
|
onClose();
|
||||||
|
}, [onClose, send]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="pointer-events-auto relative mx-auto text-left">
|
<div className="pointer-events-auto relative mx-auto text-left">
|
||||||
<div>
|
<div>
|
||||||
|
|
@ -132,22 +141,24 @@ export function Dialog({
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{modalView === "loading" && (
|
{modalView === "loading" && (
|
||||||
<LoadingState
|
<LoadingState onFinished={onFinishedLoading} onCancelCheck={onClose} />
|
||||||
onFinished={onFinishedLoading}
|
|
||||||
onCancelCheck={onClose}
|
|
||||||
customAppVersion={customAppVersion}
|
|
||||||
customSystemVersion={customSystemVersion}
|
|
||||||
/>
|
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{modalView === "updateAvailable" && (
|
{modalView === "updateAvailable" && (
|
||||||
<UpdateAvailableState
|
<UpdateAvailableState
|
||||||
forceCustomUpdate={forceCustomUpdate}
|
onConfirmUpdate={onConfirmUpdate}
|
||||||
onConfirm={forceCustomUpdate ? onConfirmCustomUpdate : onConfirmUpdate}
|
|
||||||
onClose={onClose}
|
onClose={onClose}
|
||||||
versionInfo={versionInfo!}
|
versionInfo={versionInfo!}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
{modalView === "updateDowngradeAvailable" && (
|
||||||
|
<UpdateDowngradeAvailableState
|
||||||
|
appVersion={customAppVersion}
|
||||||
|
systemVersion={customSystemVersion}
|
||||||
|
onConfirmDowngrade={onConfirmDowngrade}
|
||||||
|
onCancelDowngrade={onCancelDowngrade}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
{modalView === "updating" && (
|
{modalView === "updating" && (
|
||||||
<UpdatingDeviceState
|
<UpdatingDeviceState
|
||||||
|
|
@ -172,13 +183,9 @@ export function Dialog({
|
||||||
function LoadingState({
|
function LoadingState({
|
||||||
onFinished,
|
onFinished,
|
||||||
onCancelCheck,
|
onCancelCheck,
|
||||||
customAppVersion,
|
|
||||||
customSystemVersion,
|
|
||||||
}: {
|
}: {
|
||||||
onFinished: (versionInfo: SystemVersionInfo) => void;
|
onFinished: (versionInfo: SystemVersionInfo) => void;
|
||||||
onCancelCheck: () => void;
|
onCancelCheck: () => void;
|
||||||
customAppVersion?: string;
|
|
||||||
customSystemVersion?: string;
|
|
||||||
}) {
|
}) {
|
||||||
const [progressWidth, setProgressWidth] = useState("0%");
|
const [progressWidth, setProgressWidth] = useState("0%");
|
||||||
const abortControllerRef = useRef<AbortController | null>(null);
|
const abortControllerRef = useRef<AbortController | null>(null);
|
||||||
|
|
@ -187,23 +194,6 @@ function LoadingState({
|
||||||
const { setModalView } = useUpdateStore();
|
const { setModalView } = useUpdateStore();
|
||||||
|
|
||||||
const progressBarRef = useRef<HTMLDivElement>(null);
|
const progressBarRef = useRef<HTMLDivElement>(null);
|
||||||
|
|
||||||
const checkUpdate = useCallback(async () => {
|
|
||||||
if (!customAppVersion && !customSystemVersion) {
|
|
||||||
return await getVersionInfo();
|
|
||||||
}
|
|
||||||
const params : updateParams = {
|
|
||||||
components: "",
|
|
||||||
appTargetVersion: customAppVersion,
|
|
||||||
systemTargetVersion: customSystemVersion,
|
|
||||||
};
|
|
||||||
if (customAppVersion) params.components += ",app";
|
|
||||||
if (customSystemVersion) params.components += ",system";
|
|
||||||
params.components = params.components?.replace(/^,+/, "");
|
|
||||||
|
|
||||||
return await checkUpdateComponents(params, false);
|
|
||||||
}, [customAppVersion, customSystemVersion, getVersionInfo]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
abortControllerRef.current = new AbortController();
|
abortControllerRef.current = new AbortController();
|
||||||
const signal = abortControllerRef.current.signal;
|
const signal = abortControllerRef.current.signal;
|
||||||
|
|
@ -213,7 +203,7 @@ function LoadingState({
|
||||||
setProgressWidth("100%");
|
setProgressWidth("100%");
|
||||||
}, 0);
|
}, 0);
|
||||||
|
|
||||||
checkUpdate()
|
getVersionInfo()
|
||||||
.then(async versionInfo => {
|
.then(async versionInfo => {
|
||||||
// Add a small delay to ensure it's not just flickering
|
// Add a small delay to ensure it's not just flickering
|
||||||
await sleep(600);
|
await sleep(600);
|
||||||
|
|
@ -235,7 +225,7 @@ function LoadingState({
|
||||||
clearTimeout(animationTimer);
|
clearTimeout(animationTimer);
|
||||||
abortControllerRef.current?.abort();
|
abortControllerRef.current?.abort();
|
||||||
};
|
};
|
||||||
}, [checkUpdate, onFinished, setModalView]);
|
}, [getVersionInfo, onFinished, setModalView]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col items-start justify-start space-y-4 text-left">
|
<div className="flex flex-col items-start justify-start space-y-4 text-left">
|
||||||
|
|
@ -443,12 +433,11 @@ function SystemUpToDateState({
|
||||||
|
|
||||||
function UpdateAvailableState({
|
function UpdateAvailableState({
|
||||||
versionInfo,
|
versionInfo,
|
||||||
onConfirm,
|
onConfirmUpdate,
|
||||||
onClose,
|
onClose,
|
||||||
}: {
|
}: {
|
||||||
versionInfo: SystemVersionInfo;
|
versionInfo: SystemVersionInfo;
|
||||||
forceCustomUpdate: boolean;
|
onConfirmUpdate: () => void;
|
||||||
onConfirm: () => void;
|
|
||||||
onClose: () => void;
|
onClose: () => void;
|
||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
|
|
@ -463,18 +452,18 @@ function UpdateAvailableState({
|
||||||
<p className="mb-4 text-sm text-slate-600 dark:text-slate-300">
|
<p className="mb-4 text-sm text-slate-600 dark:text-slate-300">
|
||||||
{versionInfo?.systemUpdateAvailable ? (
|
{versionInfo?.systemUpdateAvailable ? (
|
||||||
<>
|
<>
|
||||||
<span className="font-semibold">{m.general_update_system_type()}</span>: {versionInfo?.local?.systemVersion} <span className="text-slate-600 dark:text-slate-300">→</span> {versionInfo?.remote?.systemVersion}
|
<span className="font-semibold">{m.general_update_system_type()}</span>: {versionInfo?.remote?.systemVersion}
|
||||||
<br />
|
<br />
|
||||||
</>
|
</>
|
||||||
) : null}
|
) : null}
|
||||||
{versionInfo?.appUpdateAvailable ? (
|
{versionInfo?.appUpdateAvailable ? (
|
||||||
<>
|
<>
|
||||||
<span className="font-semibold">{m.general_update_application_type()}</span>: {versionInfo?.local?.appVersion} <span className="text-slate-600 dark:text-slate-300">→</span> {versionInfo?.remote?.appVersion}
|
<span className="font-semibold">{m.general_update_application_type()}</span>: {versionInfo?.remote?.appVersion}
|
||||||
</>
|
</>
|
||||||
) : null}
|
) : null}
|
||||||
</p>
|
</p>
|
||||||
<div className="flex items-center justify-start gap-x-2">
|
<div className="flex items-center justify-start gap-x-2">
|
||||||
<Button size="SM" theme="primary" text={m.general_update_now_button()} onClick={onConfirm} />
|
<Button size="SM" theme="primary" text={m.general_update_now_button()} onClick={onConfirmUpdate} />
|
||||||
<Button size="SM" theme="light" text={m.general_update_later_button()} onClick={onClose} />
|
<Button size="SM" theme="light" text={m.general_update_later_button()} onClick={onClose} />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -482,6 +471,51 @@ function UpdateAvailableState({
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function UpdateDowngradeAvailableState({
|
||||||
|
appVersion,
|
||||||
|
systemVersion,
|
||||||
|
onConfirmDowngrade,
|
||||||
|
onCancelDowngrade,
|
||||||
|
}: {
|
||||||
|
appVersion?: string;
|
||||||
|
systemVersion?: string;
|
||||||
|
onConfirmDowngrade: () => void;
|
||||||
|
onCancelDowngrade: () => void;
|
||||||
|
}) {
|
||||||
|
const confirmDowngrade = useCallback(() => {
|
||||||
|
onConfirmDowngrade();
|
||||||
|
}, [onConfirmDowngrade]);
|
||||||
|
return (
|
||||||
|
<div className="flex flex-col items-start justify-start space-y-4 text-left">
|
||||||
|
<div className="text-left">
|
||||||
|
<p className="text-base font-semibold text-black dark:text-white">
|
||||||
|
{m.general_update_downgrade_available_title()}
|
||||||
|
</p>
|
||||||
|
<p className="mb-2 text-sm text-slate-600 dark:text-slate-300">
|
||||||
|
{m.general_update_downgrade_available_description()}
|
||||||
|
</p>
|
||||||
|
<p className="mb-4 text-sm text-slate-600 dark:text-slate-300">
|
||||||
|
{systemVersion ? (
|
||||||
|
<>
|
||||||
|
<span className="font-semibold">{m.general_update_system_type()}</span>: {systemVersion}
|
||||||
|
<br />
|
||||||
|
</>
|
||||||
|
) : null}
|
||||||
|
{appVersion ? (
|
||||||
|
<>
|
||||||
|
<span className="font-semibold">{m.general_update_application_type()}</span>: {appVersion}
|
||||||
|
</>
|
||||||
|
) : null}
|
||||||
|
</p>
|
||||||
|
<div className="flex items-center justify-start gap-x-2">
|
||||||
|
<Button size="SM" theme="primary" text={m.general_update_downgrade_button()} onClick={confirmDowngrade} />
|
||||||
|
<Button size="SM" theme="light" text={m.general_update_keep_current_button()} onClick={onCancelDowngrade} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function UpdateCompletedState({ onClose }: { onClose: () => void }) {
|
function UpdateCompletedState({ onClose }: { onClose: () => void }) {
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col items-start justify-start space-y-4 text-left">
|
<div className="flex flex-col items-start justify-start space-y-4 text-left">
|
||||||
|
|
|
||||||
|
|
@ -220,7 +220,9 @@ export interface SystemVersionInfo {
|
||||||
local: VersionInfo;
|
local: VersionInfo;
|
||||||
remote?: VersionInfo;
|
remote?: VersionInfo;
|
||||||
systemUpdateAvailable: boolean;
|
systemUpdateAvailable: boolean;
|
||||||
|
systemDowngradeAvailable: boolean;
|
||||||
appUpdateAvailable: boolean;
|
appUpdateAvailable: boolean;
|
||||||
|
appDowngradeAvailable: boolean;
|
||||||
error?: string;
|
error?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -244,8 +246,8 @@ export async function getLocalVersion() {
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface updateParams {
|
export interface updateParams {
|
||||||
appTargetVersion?: string;
|
app?: string;
|
||||||
systemTargetVersion?: string;
|
system?: string;
|
||||||
components?: string;
|
components?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue