Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

eos-version-compat

Browse Source
This commit is contained in:
Drew Ansbacher
2021-10-22 16:09:31 -06:00
committed by Aiden McClelland
parent bb72bdb9d1
commit 221d99bfee
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ui/src/app/pages/marketplace-routes/marketplace.service.ts
View File

@@ -4,6 +4,7 @@ import { ApiService } from 'src/app/services/api/embassy-api.service'
import { ConfigService } from 'src/app/services/config.service' import { ConfigService } from 'src/app/services/config.service'
import { Emver } from 'src/app/services/emver.service' import { Emver } from 'src/app/services/emver.service'
import { PackageDataEntry } from 'src/app/services/patch-db/data-model' import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
@@ -19,14 +20,14 @@ export class MarketplaceService {
constructor ( constructor (
private readonly api: ApiService, private readonly api: ApiService,
private readonly emver: Emver, private readonly emver: Emver,
private readonly config: ConfigService, private readonly patch: PatchDbService,
) { } ) { }
async load (): Promise<void> { async load (): Promise<void> {
const [data, eos, pkgs] = await Promise.all([ const [data, eos, pkgs] = await Promise.all([
this.api.getMarketplaceData({ }), this.api.getMarketplaceData({ }),
this.api.getEos({ this.api.getEos({
'eos-version': this.config.version, 'eos-version-compat': this.patch.data['server-info']['eos-version-compat'],
}), }),
this.getPkgs(1, 100), this.getPkgs(1, 100),
]) ])
@@ -39,7 +40,7 @@ export class MarketplaceService {
const idAndCurrentVersions = Object.keys(localPkgs).map(key => ({ id: key, version: localPkgs[key].manifest.version })) const idAndCurrentVersions = Object.keys(localPkgs).map(key => ({ id: key, version: localPkgs[key].manifest.version }))
const latestPkgs = await this.api.getMarketplacePkgs({ const latestPkgs = await this.api.getMarketplacePkgs({
ids: idAndCurrentVersions, ids: idAndCurrentVersions,
'eos-version': this.config.version, 'eos-version-compat': this.patch.data['server-info']['eos-version-compat'],
}) })
return latestPkgs.filter(latestPkg => { return latestPkgs.filter(latestPkg => {
@@ -52,7 +53,7 @@ export class MarketplaceService {
async getPkg (id: string, version?: string): Promise<MarketplacePkg> { async getPkg (id: string, version?: string): Promise<MarketplacePkg> {
const pkgs = await this.api.getMarketplacePkgs({ const pkgs = await this.api.getMarketplacePkgs({
ids: [{ id, version: version || '*' }], ids: [{ id, version: version || '*' }],
'eos-version': this.config.version, 'eos-version-compat': this.patch.data['server-info']['eos-version-compat'],
}) })
const pkg = pkgs.find(pkg => pkg.manifest.id == id) const pkg = pkgs.find(pkg => pkg.manifest.id == id)
@@ -71,7 +72,7 @@ export class MarketplaceService {
const pkgs = await this.api.getMarketplacePkgs({ const pkgs = await this.api.getMarketplacePkgs({
page: String(page), page: String(page),
'per-page': String(perPage), 'per-page': String(perPage),
'eos-version': this.config.version, 'eos-version-compat': this.patch.data['server-info']['eos-version-compat'],
}) })
return pkgs return pkgs

4
ui/src/app/services/api/api.types.ts
View File

@@ -194,14 +194,14 @@ export module RR {
export type GetMarketplaceDataRes = MarketplaceData export type GetMarketplaceDataRes = MarketplaceData
export type GetMarketplaceEOSReq = { export type GetMarketplaceEOSReq = {
'eos-version': string 'eos-version-compat': string
} }
export type GetMarketplaceEOSRes = MarketplaceEOS export type GetMarketplaceEOSRes = MarketplaceEOS
export type GetMarketplacePackagesReq = { export type GetMarketplacePackagesReq = {
ids?: { id: string, version: string }[] ids?: { id: string, version: string }[]
// iff !id // iff !id
'eos-version': string 'eos-version-compat': string
category?: string category?: string
query?: string query?: string
page?: string page?: string

1
ui/src/app/services/patch-db/data-model.ts
View File

@@ -30,6 +30,7 @@ export interface ServerInfo {
size: number size: number
downloaded: number downloaded: number
} }
'eos-version-compat': string
} }
export enum ServerStatus { export enum ServerStatus {

2
ui/src/app/services/startup-alerts.service.ts
View File

@@ -116,7 +116,7 @@ export class StartupAlertsService {
private async osUpdateCheck (): Promise<RR.GetMarketplaceEOSRes | undefined> { private async osUpdateCheck (): Promise<RR.GetMarketplaceEOSRes | undefined> {
const res = await this.api.getEos({ const res = await this.api.getEos({
'eos-version': this.config.version, 'eos-version-compat': this.patch.data['server-info']['eos-version-compat'],
}) })
if (this.emver.compare(this.config.version, res.version) === -1) { if (this.emver.compare(this.config.version, res.version) === -1) {