diff --git a/package-lock.json b/package-lock.json index 9158f17d7..14cc316bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@dfinity/identity": "^0.20.2", "@dfinity/principal": "^0.20.2", "@dfinity/utils": "next", - "@junobuild/admin": "^0.0.44-next-2024-02-01", + "@junobuild/admin": "^0.0.44-next-2024-02-02.1", "@junobuild/ledger": "^0.0.28-next-2024-01-30", "@junobuild/utils": "^0.0.17-next-2024-01-30", "buffer": "^6.0.3", @@ -712,9 +712,9 @@ } }, "node_modules/@junobuild/admin": { - "version": "0.0.44-next-2024-02-01", - "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-0.0.44-next-2024-02-01.tgz", - "integrity": "sha512-kpxi1s7LfTo4g5nWHQfzbmC0dYMt2hAn+A1pGKi3Vods1L+bH2ibb9AYnBvpxYS4U4DYQ9GQFlodiqazPqiMUw==", + "version": "0.0.44-next-2024-02-02.1", + "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-0.0.44-next-2024-02-02.1.tgz", + "integrity": "sha512-jTKtIjXI7W/8WvZYwcM1V/Yei5iC/6UKxv5Z8Kw8BGEwZbZ9HW85o1PzTCZtM3YsJzTyVD5RWZm11lalSM58ww==", "peerDependencies": { "@dfinity/agent": "*", "@dfinity/identity": "*", @@ -4973,9 +4973,9 @@ } }, "@junobuild/admin": { - "version": "0.0.44-next-2024-02-01", - "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-0.0.44-next-2024-02-01.tgz", - "integrity": "sha512-kpxi1s7LfTo4g5nWHQfzbmC0dYMt2hAn+A1pGKi3Vods1L+bH2ibb9AYnBvpxYS4U4DYQ9GQFlodiqazPqiMUw==", + "version": "0.0.44-next-2024-02-02.1", + "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-0.0.44-next-2024-02-02.1.tgz", + "integrity": "sha512-jTKtIjXI7W/8WvZYwcM1V/Yei5iC/6UKxv5Z8Kw8BGEwZbZ9HW85o1PzTCZtM3YsJzTyVD5RWZm11lalSM58ww==", "requires": {} }, "@junobuild/ledger": { diff --git a/package.json b/package.json index 2a59c720a..fd7e56ef1 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "@dfinity/identity": "^0.20.2", "@dfinity/principal": "^0.20.2", "@dfinity/utils": "next", - "@junobuild/admin": "^0.0.44-next-2024-02-01", + "@junobuild/admin": "^0.0.44-next-2024-02-02.1", "@junobuild/ledger": "^0.0.28-next-2024-01-30", "@junobuild/utils": "^0.0.17-next-2024-01-30", "buffer": "^6.0.3", diff --git a/src/declarations/satellite/satellite.did.d.ts b/src/declarations/satellite/satellite.did.d.ts index 616cfcafe..af683b8ec 100644 --- a/src/declarations/satellite/satellite.did.d.ts +++ b/src/declarations/satellite/satellite.did.d.ts @@ -198,6 +198,7 @@ export interface UploadChunkResult { chunk_id: bigint; } export interface _SERVICE { + build_version: ActorMethod<[], string>; commit_asset_upload: ActorMethod<[CommitBatch], undefined>; count_assets: ActorMethod<[string], bigint>; count_docs: ActorMethod<[string], bigint>; @@ -236,6 +237,5 @@ export interface _SERVICE { set_rule: ActorMethod<[RulesType, string, SetRule], undefined>; upload_asset_chunk: ActorMethod<[UploadChunk], UploadChunkResult>; version: ActorMethod<[], string>; - version_build: ActorMethod<[], string>; } export declare const idlFactory: IDL.InterfaceFactory; diff --git a/src/declarations/satellite/satellite.factory.did.js b/src/declarations/satellite/satellite.factory.did.js index 941413a8e..69dd5816a 100644 --- a/src/declarations/satellite/satellite.factory.did.js +++ b/src/declarations/satellite/satellite.factory.did.js @@ -194,6 +194,7 @@ export const idlFactory = ({ IDL }) => { }); const UploadChunkResult = IDL.Record({ chunk_id: IDL.Nat }); return IDL.Service({ + build_version: IDL.Func([], [IDL.Text], ['query']), commit_asset_upload: IDL.Func([CommitBatch], [], []), count_assets: IDL.Func([IDL.Text], [IDL.Nat64], ['query']), count_docs: IDL.Func([IDL.Text], [IDL.Nat64], ['query']), @@ -252,8 +253,7 @@ export const idlFactory = ({ IDL }) => { ), set_rule: IDL.Func([RulesType, IDL.Text, SetRule], [], []), upload_asset_chunk: IDL.Func([UploadChunk], [UploadChunkResult], []), - version: IDL.Func([], [IDL.Text], ['query']), - version_build: IDL.Func([], [IDL.Text], ['query']) + version: IDL.Func([], [IDL.Text], ['query']) }); }; // @ts-ignore diff --git a/src/declarations/satellite/satellite.factory.did.mjs b/src/declarations/satellite/satellite.factory.did.mjs index 941413a8e..69dd5816a 100644 --- a/src/declarations/satellite/satellite.factory.did.mjs +++ b/src/declarations/satellite/satellite.factory.did.mjs @@ -194,6 +194,7 @@ export const idlFactory = ({ IDL }) => { }); const UploadChunkResult = IDL.Record({ chunk_id: IDL.Nat }); return IDL.Service({ + build_version: IDL.Func([], [IDL.Text], ['query']), commit_asset_upload: IDL.Func([CommitBatch], [], []), count_assets: IDL.Func([IDL.Text], [IDL.Nat64], ['query']), count_docs: IDL.Func([IDL.Text], [IDL.Nat64], ['query']), @@ -252,8 +253,7 @@ export const idlFactory = ({ IDL }) => { ), set_rule: IDL.Func([RulesType, IDL.Text, SetRule], [], []), upload_asset_chunk: IDL.Func([UploadChunk], [UploadChunkResult], []), - version: IDL.Func([], [IDL.Text], ['query']), - version_build: IDL.Func([], [IDL.Text], ['query']) + version: IDL.Func([], [IDL.Text], ['query']) }); }; // @ts-ignore diff --git a/src/frontend/src/lib/api/satellites.api.ts b/src/frontend/src/lib/api/satellites.api.ts index e048661be..4a759f88b 100644 --- a/src/frontend/src/lib/api/satellites.api.ts +++ b/src/frontend/src/lib/api/satellites.api.ts @@ -141,15 +141,15 @@ export const satelliteVersion = async ({ return version(); }; -export const satelliteVersionBuild = async ({ +export const satelliteBuildVersion = async ({ satelliteId, identity }: { satelliteId: Principal; identity: OptionIdentity; }): Promise => { - const { version_build } = await getSatelliteActor({ satelliteId, identity }); - return version_build(); + const { build_version } = await getSatelliteActor({ satelliteId, identity }); + return build_version(); }; export const setCustomDomain = async ({ diff --git a/src/frontend/src/lib/services/console.services.ts b/src/frontend/src/lib/services/console.services.ts index 6fd5bbc68..b72f73a11 100644 --- a/src/frontend/src/lib/services/console.services.ts +++ b/src/frontend/src/lib/services/console.services.ts @@ -2,7 +2,7 @@ import type { Orbiter } from '$declarations/mission_control/mission_control.did' import { initMissionControl as initMissionControlApi, releasesVersion } from '$lib/api/console.api'; import { missionControlVersion } from '$lib/api/mission-control.api'; import { orbiterVersion } from '$lib/api/orbiter.api'; -import { satelliteVersion, satelliteVersionBuild } from '$lib/api/satellites.api'; +import { satelliteBuildVersion, satelliteVersion } from '$lib/api/satellites.api'; import { authStore } from '$lib/stores/auth.store'; import { toasts } from '$lib/stores/toasts.store'; import { versionStore, type ReleaseVersionSatellite } from '$lib/stores/version.store'; @@ -100,18 +100,17 @@ export const loadVersion = async ({ satelliteId: Principal ): Promise | undefined> => { // Backwards compatibility for Satellite <= 0.0.14 which did not expose the end point "version_build" - const queryVersionBuild = async (): Promise => { + const queryBuildVersion = async (): Promise => { try { - const version = await satelliteVersionBuild({ satelliteId, identity }); - return version; + return await satelliteBuildVersion({ satelliteId, identity }); } catch (_: unknown) { return undefined; } }; - const [version, versionBuild, metadataBuild] = await Promise.allSettled([ + const [version, buildVersion, buildType] = await Promise.allSettled([ satelliteVersion({ satelliteId, identity }), - queryVersionBuild(), + queryBuildVersion(), satelliteBuildType({ satellite: { satelliteId: satelliteId.toText(), @@ -129,9 +128,9 @@ export const loadVersion = async ({ return { current, - ...(versionBuild.status === 'fulfilled' && - nonNullish(versionBuild.value) && { currentBuild: versionBuild.value }), - build: metadataBuild.status === 'fulfilled' ? metadataBuild.value ?? 'stock' : 'stock' + ...(buildVersion.status === 'fulfilled' && + nonNullish(buildVersion.value) && { currentBuild: buildVersion.value }), + build: buildType.status === 'fulfilled' ? buildType.value ?? 'stock' : 'stock' }; }; diff --git a/src/libs/satellite/src/lib.rs b/src/libs/satellite/src/lib.rs index bb8bfe64a..549163999 100644 --- a/src/libs/satellite/src/lib.rs +++ b/src/libs/satellite/src/lib.rs @@ -292,7 +292,7 @@ macro_rules! include_satellite { }; #[ic_cdk::query] - pub fn version_build() -> String { + pub fn build_version() -> String { env!("CARGO_PKG_VERSION").to_string() } diff --git a/src/satellite/satellite.did b/src/satellite/satellite.did index f17fac782..5ea0e5aaa 100644 --- a/src/satellite/satellite.did +++ b/src/satellite/satellite.did @@ -209,5 +209,5 @@ service : () -> { set_rule : (RulesType, text, SetRule) -> (); upload_asset_chunk : (UploadChunk) -> (UploadChunkResult); version : () -> (text) query; - version_build : () -> (text) query; + build_version : () -> (text) query }