From 9eadab7ff106706ca94414845915c35c773aff51 Mon Sep 17 00:00:00 2001 From: David Dal Busco Date: Thu, 5 Jun 2025 09:56:25 +0200 Subject: [PATCH 1/2] feat: use ENV container URL --- .env.development | 1 - src/api/actor.api.ts | 3 ++- src/env.ts | 6 ++++-- src/services/functions/upgrade/upgrade.cdn.services.ts | 3 ++- src/utils/domain.utils.ts | 6 ++++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.env.development b/.env.development index ff6e9e9c..a960cac6 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,2 @@ JUNO_URL=http://localhost:5173 -CONTAINER_URL=http://127.0.0.1:5987 CLI_PROJECT_NAME=juno-dev \ No newline at end of file diff --git a/src/api/actor.api.ts b/src/api/actor.api.ts index 1cb66126..38cb9b70 100644 --- a/src/api/actor.api.ts +++ b/src/api/actor.api.ts @@ -3,6 +3,7 @@ import {isNullish, nonNullish} from '@dfinity/utils'; import {type ActorParameters} from '@junobuild/admin'; import {red} from 'kleur'; import {getToken} from '../configs/cli.config'; +import {ENV} from '../env'; import {getProcessToken} from '../utils/process.utils'; import {initAgent} from './agent.api'; @@ -20,7 +21,7 @@ export const actorParameters = async (): Promise< const params: Omit = { identity, - ...(nonNullish(process.env.CONTAINER_URL) && {container: process.env.CONTAINER_URL}) + ...(nonNullish(ENV.containerUrl) && {container: ENV.containerUrl}) }; const agent = await initAgent(params); diff --git a/src/env.ts b/src/env.ts index 785d6a01..92928bf2 100644 --- a/src/env.ts +++ b/src/env.ts @@ -2,7 +2,7 @@ import {nextArg} from '@junobuild/cli-tools'; import type {JunoConfigEnv} from '@junobuild/config'; export type JunoCliEnv = JunoConfigEnv & { - containerUrl?: string; + containerUrl: string | undefined; }; const loadEnv = (): JunoCliEnv => { @@ -13,8 +13,10 @@ const loadEnv = (): JunoCliEnv => { return { mode: mode ?? 'production', - containerUrl: containerUrl ?? (mode === 'development' ? 'http://127.0.0.1:5987' : '') + containerUrl: containerUrl ?? (mode === 'development' ? 'http://127.0.0.1:5987' : undefined) }; }; export const ENV = loadEnv(); + +export const DEV = ENV.mode === 'development'; diff --git a/src/services/functions/upgrade/upgrade.cdn.services.ts b/src/services/functions/upgrade/upgrade.cdn.services.ts index 8772c9b3..645cd0d2 100644 --- a/src/services/functions/upgrade/upgrade.cdn.services.ts +++ b/src/services/functions/upgrade/upgrade.cdn.services.ts @@ -8,6 +8,7 @@ import {defaultSatelliteDomain} from '../../../utils/domain.utils'; import {logUpgradeResult} from '../../../utils/upgrade.utils'; import {upgradeSatelliteWithCdn} from '../../modules/upgrade/upgrade.satellite.services'; import {listCdnAssets} from './upgrade.cdn.list.services'; +import {ENV} from '../../../env'; export const upgradeWithCdn = async ({ args, @@ -29,7 +30,7 @@ export const upgradeWithCdn = async ({ const customHost = URL.parse(defaultSatelliteDomain(satellite.satelliteId))?.hostname; const cdn = { - url: process.env.CONTAINER_URL ?? defaultSatelliteDomain(satellite.satelliteId), + url: ENV.containerUrl ?? defaultSatelliteDomain(satellite.satelliteId), path: fullPath, ...(nonNullish(customHost) && {customHost}) }; diff --git a/src/utils/domain.utils.ts b/src/utils/domain.utils.ts index 558780e7..3fd5465f 100644 --- a/src/utils/domain.utils.ts +++ b/src/utils/domain.utils.ts @@ -1,9 +1,11 @@ import {nonNullish} from '@dfinity/utils'; import {CONSOLE_SATELLITE_URL} from '../constants/constants'; +import {DEV, ENV} from '../env'; export const defaultSatelliteDomain = (satelliteId: string): string => { - if (nonNullish(process.env.CONTAINER_URL)) { - return `http://${satelliteId}.${process.env.CONTAINER_URL.replace('http://127.0.0.1', 'localhost')}`; + if (DEV && nonNullish(ENV.containerUrl)) { + const url = URL.parse(ENV.containerUrl); + return `${url?.protocol ?? 'http:'}//${satelliteId}.${(url?.host ?? '127.0.0.1:5987').replace('127.0.0.1', 'localhost')}`; } return `https://${satelliteId}.icp0.io`; From c5cc43f4e60233921225d6b41014433f2240a61e Mon Sep 17 00:00:00 2001 From: David Dal Busco Date: Thu, 5 Jun 2025 09:57:24 +0200 Subject: [PATCH 2/2] chore: fmt --- src/services/functions/upgrade/upgrade.cdn.services.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/functions/upgrade/upgrade.cdn.services.ts b/src/services/functions/upgrade/upgrade.cdn.services.ts index 645cd0d2..59b54cde 100644 --- a/src/services/functions/upgrade/upgrade.cdn.services.ts +++ b/src/services/functions/upgrade/upgrade.cdn.services.ts @@ -3,12 +3,12 @@ import {assertAnswerCtrlC, hasArgs, nextArg} from '@junobuild/cli-tools'; import {yellow} from 'kleur'; import prompts from 'prompts'; import {CDN_RELEASES_FULL_PATH} from '../../../constants/functions.constants'; +import {ENV} from '../../../env'; import {type SatelliteParametersWithId} from '../../../types/satellite'; import {defaultSatelliteDomain} from '../../../utils/domain.utils'; import {logUpgradeResult} from '../../../utils/upgrade.utils'; import {upgradeSatelliteWithCdn} from '../../modules/upgrade/upgrade.satellite.services'; import {listCdnAssets} from './upgrade.cdn.list.services'; -import {ENV} from '../../../env'; export const upgradeWithCdn = async ({ args,