@jahia/jahia-cli 0.5.4 → 0.5.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/jahia/alive.d.ts +4 -0
- package/dist/commands/jahia/alive.d.ts.map +1 -1
- package/dist/commands/jahia/alive.js +26 -22
- package/dist/commands/jahia/alive.js.map +1 -1
- package/dist/commands/jahia/provision.d.ts.map +1 -1
- package/dist/commands/jahia/provision.js +11 -9
- package/dist/commands/jahia/provision.js.map +1 -1
- package/dist/commands/tests/run.d.ts +9 -0
- package/dist/commands/tests/run.d.ts.map +1 -1
- package/dist/commands/tests/run.js +42 -3
- package/dist/commands/tests/run.js.map +1 -1
- package/dist/lib/artifacts/collect-all.d.ts.map +1 -1
- package/dist/lib/artifacts/collect-all.js +13 -1
- package/dist/lib/artifacts/collect-all.js.map +1 -1
- package/dist/lib/components/cypress.d.ts.map +1 -1
- package/dist/lib/components/cypress.js +2 -1
- package/dist/lib/components/cypress.js.map +1 -1
- package/dist/lib/state/detect-docker-context.d.ts +18 -0
- package/dist/lib/state/detect-docker-context.d.ts.map +1 -0
- package/dist/lib/state/detect-docker-context.js +39 -0
- package/dist/lib/state/detect-docker-context.js.map +1 -0
- package/dist/lib/state/get-jahia-connection-defaults.d.ts +28 -2
- package/dist/lib/state/get-jahia-connection-defaults.d.ts.map +1 -1
- package/dist/lib/state/get-jahia-connection-defaults.js +47 -13
- package/dist/lib/state/get-jahia-connection-defaults.js.map +1 -1
- package/dist/lib/state/index.d.ts +5 -0
- package/dist/lib/state/index.d.ts.map +1 -1
- package/dist/lib/state/index.js +3 -0
- package/dist/lib/state/index.js.map +1 -1
- package/dist/lib/state/resolve-component-url.d.ts +34 -0
- package/dist/lib/state/resolve-component-url.d.ts.map +1 -0
- package/dist/lib/state/resolve-component-url.js +106 -0
- package/dist/lib/state/resolve-component-url.js.map +1 -0
- package/dist/lib/state/resolve-url-types.d.ts +24 -0
- package/dist/lib/state/resolve-url-types.d.ts.map +1 -0
- package/dist/lib/state/resolve-url-types.js +2 -0
- package/dist/lib/state/resolve-url-types.js.map +1 -0
- package/oclif.manifest.json +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import { Command } from '@oclif/core';
|
|
2
|
+
/**
|
|
3
|
+
* Formats a human-readable label describing where the URL came from.
|
|
4
|
+
*/
|
|
5
|
+
export declare const formatUrlSourceLabel: (source: string, networkMode: string) => string;
|
|
2
6
|
export default class JahiaAlive extends Command {
|
|
3
7
|
static description: string;
|
|
4
8
|
static examples: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alive.d.ts","sourceRoot":"","sources":["../../../src/commands/jahia/alive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAc7C,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,OAAO;IAC7C,OAAgB,WAAW,SAG+C;IAE1E,OAAgB,QAAQ,WAKtB;IAEF,OAAgB,KAAK;;;;;;;;;;MAqCnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"alive.d.ts","sourceRoot":"","sources":["../../../src/commands/jahia/alive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAc7C;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAAI,QAAQ,MAAM,EAAE,aAAa,MAAM,KAAG,MAK5B,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,OAAO;IAC7C,OAAgB,WAAW,SAG+C;IAE1E,OAAgB,QAAQ,WAKtB;IAEF,OAAgB,KAAK;;;;;;;;;;MAqCnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA6ElC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Command, Flags } from '@oclif/core';
|
|
2
2
|
import { getActiveEnvironment } from '../../lib/state/get-active-environment.js';
|
|
3
|
-
import {
|
|
3
|
+
import { resolveJahiaConnection } from '../../lib/state/get-jahia-connection-defaults.js';
|
|
4
4
|
import { stateFilePath } from '../../lib/state/state-file-path.js';
|
|
5
5
|
import { stateFlag } from '../../lib/state/state-flag.js';
|
|
6
6
|
import { waitForSam } from '../../lib/sam/wait-for-sam.js';
|
|
@@ -8,6 +8,14 @@ const DEFAULT_INTERVAL = 2;
|
|
|
8
8
|
const DEFAULT_TIMEOUT = 300;
|
|
9
9
|
const DEFAULT_COUNT = 5;
|
|
10
10
|
const DEFAULT_SEVERITY = 'MEDIUM';
|
|
11
|
+
/**
|
|
12
|
+
* Formats a human-readable label describing where the URL came from.
|
|
13
|
+
*/
|
|
14
|
+
export const formatUrlSourceLabel = (source, networkMode) => source === 'flag'
|
|
15
|
+
? 'source: --url flag'
|
|
16
|
+
: source === 'state'
|
|
17
|
+
? `source: state file, mode: ${networkMode}`
|
|
18
|
+
: `source: default, mode: ${networkMode}`;
|
|
11
19
|
export default class JahiaAlive extends Command {
|
|
12
20
|
static description = 'Wait until the Jahia environment is fully alive and responding GREEN. ' +
|
|
13
21
|
'Polls the Server Availability Manager (SAM) healthcheck endpoint and requires ' +
|
|
@@ -59,20 +67,16 @@ export default class JahiaAlive extends Command {
|
|
|
59
67
|
async run() {
|
|
60
68
|
const { flags } = await this.parse(JahiaAlive);
|
|
61
69
|
const stateOverride = flags.state;
|
|
62
|
-
//
|
|
63
|
-
|
|
64
|
-
const
|
|
65
|
-
const
|
|
66
|
-
const
|
|
67
|
-
const
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
const url = directUrl ?? defaults.url;
|
|
71
|
-
const username = flags.username ?? defaults.username;
|
|
72
|
-
const password = flags.password ?? defaults.password;
|
|
73
|
-
const envName = env?.name ?? (useDirectUrl ? 'direct' : 'unknown');
|
|
70
|
+
// Always load state for credential resolution — even with --url, password may come from config
|
|
71
|
+
const env = await getActiveEnvironment(stateOverride);
|
|
72
|
+
const connection = await resolveJahiaConnection(env, flags.url);
|
|
73
|
+
const url = connection.url;
|
|
74
|
+
const username = flags.username ?? connection.username;
|
|
75
|
+
const password = flags.password ?? connection.password;
|
|
76
|
+
const envName = flags.url !== undefined ? (env?.name ?? 'direct') : (env?.name ?? 'unknown');
|
|
77
|
+
const urlSourceLabel = formatUrlSourceLabel(connection.resolvedUrl.source, connection.resolvedUrl.networkMode);
|
|
74
78
|
if (!flags.json) {
|
|
75
|
-
if (
|
|
79
|
+
if (flags.url !== undefined) {
|
|
76
80
|
this.log(`Waiting for Jahia at "${url}" to become alive (direct URL mode — state file not used)...`);
|
|
77
81
|
}
|
|
78
82
|
else {
|
|
@@ -80,7 +84,7 @@ export default class JahiaAlive extends Command {
|
|
|
80
84
|
this.log(`Waiting for Jahia environment "${envName}" to become alive...`);
|
|
81
85
|
this.log(` State: ${statePath}`);
|
|
82
86
|
}
|
|
83
|
-
this.log(` URL: ${url}`);
|
|
87
|
+
this.log(` URL: ${url} (${urlSourceLabel})`);
|
|
84
88
|
this.log(` Requires: ${String(flags.count)} consecutive GREEN at ${String(flags.interval)}s interval`);
|
|
85
89
|
this.log(` Timeout: ${String(flags.timeout)}s`);
|
|
86
90
|
this.log('');
|
|
@@ -105,14 +109,14 @@ export default class JahiaAlive extends Command {
|
|
|
105
109
|
onPoll,
|
|
106
110
|
});
|
|
107
111
|
if (flags.json) {
|
|
108
|
-
const jsonBase =
|
|
109
|
-
? { ...result, url, mode: 'direct' }
|
|
110
|
-
: { ...result, environment: envName, stateFile: stateFilePath(stateOverride) };
|
|
112
|
+
const jsonBase = flags.url !== undefined
|
|
113
|
+
? { ...result, url, mode: 'direct', urlSource: connection.resolvedUrl.source, networkMode: connection.resolvedUrl.networkMode }
|
|
114
|
+
: { ...result, environment: envName, stateFile: stateFilePath(stateOverride), urlSource: connection.resolvedUrl.source, networkMode: connection.resolvedUrl.networkMode };
|
|
111
115
|
this.log(JSON.stringify(jsonBase, null, 2));
|
|
112
116
|
}
|
|
113
117
|
else {
|
|
114
118
|
this.log('');
|
|
115
|
-
const label =
|
|
119
|
+
const label = flags.url !== undefined ? `Jahia at "${url}"` : `Environment "${envName}"`;
|
|
116
120
|
this.log(`✓ ${label} is alive and responding GREEN`);
|
|
117
121
|
this.log(` Confirmed in ${String(result.elapsedSeconds)}s with ${String(result.consecutiveGreen)} consecutive checks`);
|
|
118
122
|
}
|
|
@@ -120,9 +124,9 @@ export default class JahiaAlive extends Command {
|
|
|
120
124
|
catch (error) {
|
|
121
125
|
const message = error instanceof Error ? error.message : String(error);
|
|
122
126
|
if (flags.json) {
|
|
123
|
-
const jsonBase =
|
|
124
|
-
? { success: false, url, mode: 'direct', error: 'timeout', message }
|
|
125
|
-
: { success: false, environment: envName, stateFile: stateFilePath(stateOverride), error: 'timeout', message };
|
|
127
|
+
const jsonBase = flags.url !== undefined
|
|
128
|
+
? { success: false, url, mode: 'direct', error: 'timeout', message, urlSource: connection.resolvedUrl.source, networkMode: connection.resolvedUrl.networkMode }
|
|
129
|
+
: { success: false, environment: envName, stateFile: stateFilePath(stateOverride), error: 'timeout', message, urlSource: connection.resolvedUrl.source, networkMode: connection.resolvedUrl.networkMode };
|
|
126
130
|
this.log(JSON.stringify(jsonBase, null, 2));
|
|
127
131
|
}
|
|
128
132
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alive.js","sourceRoot":"","sources":["../../../src/commands/jahia/alive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"alive.js","sourceRoot":"","sources":["../../../src/commands/jahia/alive.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../src/commands/jahia/provision.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAU7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../src/commands/jahia/provision.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAU7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAOhG;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,eAAe,GAC1B,WAAW,SAAS,MAAM,EAAE,KAC3B,OAAO,CAAC,SAAS,sBAAsB,EAAE,CAQ3C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,6BAA6B,GAAI,QAAQ;IACpD,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B,KAAG,MAkBH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,GAAI,QAAQ,gBAAgB,KAAG,MAIjE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,OAAO;IACzC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC,KAAG,aAqBH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,wBAAwB,GACnC,MAAM,aAAa,EACnB,OAAO;IACL,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAC7C,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC,KACA,IAYF,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,OAAO;IACjD,OAAgB,WAAW,SAMmE;IAE9F,OAAgB,QAAQ,WAQtB;IAEF,OAAgB,KAAK;;;;;;;;;;;;MA0CnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YAgDnB,eAAe;YAoHf,iBAAiB;IAgI/B;;;OAGG;YACW,wBAAwB;CAyCvC"}
|
|
@@ -9,9 +9,10 @@ import { resolveAssetPaths } from '../../lib/provisioning/resolve-asset-paths.js
|
|
|
9
9
|
import { submitFileAction } from '../../lib/provisioning/submit-file-action.js';
|
|
10
10
|
import { submitProvisioning } from '../../lib/provisioning/submit-provisioning.js';
|
|
11
11
|
import { getActiveEnvironment } from '../../lib/state/get-active-environment.js';
|
|
12
|
-
import {
|
|
12
|
+
import { resolveJahiaConnection } from '../../lib/state/get-jahia-connection-defaults.js';
|
|
13
13
|
import { stateFilePath } from '../../lib/state/state-file-path.js';
|
|
14
14
|
import { stateFlag } from '../../lib/state/state-flag.js';
|
|
15
|
+
import { formatUrlSourceLabel } from './alive.js';
|
|
15
16
|
/**
|
|
16
17
|
* Reads file attachments from disk and returns them as ProvisioningAttachment objects.
|
|
17
18
|
*/
|
|
@@ -151,10 +152,11 @@ export default class JahiaProvision extends Command {
|
|
|
151
152
|
const statePath = stateFilePath(flags.state);
|
|
152
153
|
const env = await getActiveEnvironment(flags.state);
|
|
153
154
|
const envName = env?.name ?? 'unknown';
|
|
154
|
-
const
|
|
155
|
-
const url =
|
|
156
|
-
const username = flags.username ??
|
|
157
|
-
const password = flags.password ??
|
|
155
|
+
const connection = await resolveJahiaConnection(env, flags.url);
|
|
156
|
+
const url = connection.url;
|
|
157
|
+
const username = flags.username ?? connection.username;
|
|
158
|
+
const password = flags.password ?? connection.password;
|
|
159
|
+
const urlSourceLabel = formatUrlSourceLabel(connection.resolvedUrl.source, connection.resolvedUrl.networkMode);
|
|
158
160
|
try {
|
|
159
161
|
const mode = detectProvisionMode({
|
|
160
162
|
manifest: flags.manifest,
|
|
@@ -167,7 +169,7 @@ export default class JahiaProvision extends Command {
|
|
|
167
169
|
filter: flags.filter,
|
|
168
170
|
});
|
|
169
171
|
if (mode === 'manifest') {
|
|
170
|
-
await this.runManifestMode(flags, { url, username, password, envName, statePath });
|
|
172
|
+
await this.runManifestMode(flags, { url, username, password, envName, statePath, urlSourceLabel });
|
|
171
173
|
}
|
|
172
174
|
else {
|
|
173
175
|
const dirPath = mode === 'modules' ? flags.modules : flags.scripts;
|
|
@@ -175,7 +177,7 @@ export default class JahiaProvision extends Command {
|
|
|
175
177
|
throw new Error(`Missing directory path for --${mode} mode.`);
|
|
176
178
|
}
|
|
177
179
|
const actionType = mode === 'modules' ? 'module' : 'script';
|
|
178
|
-
await this.runFileActionMode(dirPath, actionType, mode, flags, { url, username, password, envName });
|
|
180
|
+
await this.runFileActionMode(dirPath, actionType, mode, flags, { url, username, password, envName, urlSourceLabel });
|
|
179
181
|
}
|
|
180
182
|
}
|
|
181
183
|
catch (error) {
|
|
@@ -198,7 +200,7 @@ export default class JahiaProvision extends Command {
|
|
|
198
200
|
if (!flags.json) {
|
|
199
201
|
this.log(`Provisioning Jahia environment "${connection.envName}"...`);
|
|
200
202
|
this.log(` Manifest: ${manifest} (${source})`);
|
|
201
|
-
this.log(` URL: ${connection.url}`);
|
|
203
|
+
this.log(` URL: ${connection.url} (${connection.urlSourceLabel})`);
|
|
202
204
|
this.log(` State: ${connection.statePath}`);
|
|
203
205
|
if (flags.file && flags.file.length > 0) {
|
|
204
206
|
this.log(` Files: ${flags.file.join(', ')}`);
|
|
@@ -319,7 +321,7 @@ export default class JahiaProvision extends Command {
|
|
|
319
321
|
const modeLabel = mode === 'modules' ? 'module' : 'script';
|
|
320
322
|
if (!flags.json) {
|
|
321
323
|
this.log(`▶ Uploading ${String(filePaths.length)} ${modeLabel}(s) from "${dirPath}"...`);
|
|
322
|
-
this.log(` URL: ${connection.url}`);
|
|
324
|
+
this.log(` URL: ${connection.url} (${connection.urlSourceLabel})`);
|
|
323
325
|
if (flags.filter !== undefined) {
|
|
324
326
|
this.log(` Filter: ${flags.filter}`);
|
|
325
327
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../src/commands/jahia/provision.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../src/commands/jahia/provision.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,15 @@ export declare const buildStateMountArgs: (hostStatePath: string) => Promise<{
|
|
|
23
23
|
readonly bindMount: BindMount;
|
|
24
24
|
readonly envVar: readonly [string, string];
|
|
25
25
|
} | undefined>;
|
|
26
|
+
/**
|
|
27
|
+
* Persists the test container into the environment state file.
|
|
28
|
+
* Upserts by component name — replaces any existing entry with the same name.
|
|
29
|
+
* Uses `docker inspect` to resolve the real container ID.
|
|
30
|
+
*/
|
|
31
|
+
export declare const persistTestContainer: (statePath: string, name: string, image: string, tag: string, networkAliases: readonly string[], ports: readonly {
|
|
32
|
+
readonly container: number;
|
|
33
|
+
readonly host: number;
|
|
34
|
+
}[]) => Promise<void>;
|
|
26
35
|
export declare const formatRunComplete: (name: string, exitCode: number) => string;
|
|
27
36
|
/**
|
|
28
37
|
* Builds a ResolvedComponent for the cypress test runner using the component registry.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/commands/tests/run.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAI7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/commands/tests/run.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAI7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AASzE;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,OAAO,MAAM,EACb,SAAS,MAAM,EACf,MAAM,MAAM,EACZ,aAAa;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,KACjE,MAUW,CAAC;AAEf;;;GAGG;AACH,eAAO,MAAM,oBAAoB,0BAA0B,CAAC;AAc5D;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAC9B,eAAe,MAAM,KACpB,OAAO,CAAC;IAAE,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,SAAS,CAWnG,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAC/B,WAAW,MAAM,EACjB,MAAM,MAAM,EACZ,OAAO,MAAM,EACb,KAAK,MAAM,EACX,gBAAgB,SAAS,MAAM,EAAE,EACjC,OAAO,SAAS;IAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,KACtE,OAAO,CAAC,IAAI,CAiCd,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,MAAM,MAAM,EACZ,UAAU,MAAM,KACf,MAIF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,eAAe,SAAS,MAAM,EAAE,EAChC,iBAAiB,mBAAmB,GAAG,SAAS,EAChD,oBAAoB,MAAM,GAAG,SAAS,EACtC,UAAU,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KACzC,iBAgCF,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,OAAO;IAC3C,OAAgB,WAAW,SAG2E;IAEtG,OAAgB,QAAQ,WAItB;IAEF,OAAgB,KAAK;;;;;MAgBnB;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA2IlC"}
|
|
@@ -4,8 +4,10 @@ import { Command, Flags } from '@oclif/core';
|
|
|
4
4
|
import { execa } from 'execa';
|
|
5
5
|
import { applyEnvInjections, getComponent, resolveComponent } from '../../lib/components/index.js';
|
|
6
6
|
import { loadConfigFile } from '../../lib/config/parser.js';
|
|
7
|
-
import { buildRunArgs, containerName, removeContainer, stopContainer } from '../../lib/providers/docker/container.js';
|
|
7
|
+
import { buildRunArgs, containerName, inspectContainer, removeContainer, stopContainer } from '../../lib/providers/docker/container.js';
|
|
8
8
|
import { getActiveEnvironment } from '../../lib/state/get-active-environment.js';
|
|
9
|
+
import { loadState } from '../../lib/state/load-state.js';
|
|
10
|
+
import { saveState } from '../../lib/state/save-state.js';
|
|
9
11
|
import { stateFilePath } from '../../lib/state/state-file-path.js';
|
|
10
12
|
import { stateFlag } from '../../lib/state/state-flag.js';
|
|
11
13
|
import { DEFAULT_IMAGE_NAME, parseKeyValueArgs } from '../../lib/tests/build-image.js';
|
|
@@ -55,6 +57,41 @@ export const buildStateMountArgs = async (hostStatePath) => {
|
|
|
55
57
|
envVar: ['JAHIA_CLI_STATE', CONTAINER_STATE_PATH],
|
|
56
58
|
};
|
|
57
59
|
};
|
|
60
|
+
/**
|
|
61
|
+
* Persists the test container into the environment state file.
|
|
62
|
+
* Upserts by component name — replaces any existing entry with the same name.
|
|
63
|
+
* Uses `docker inspect` to resolve the real container ID.
|
|
64
|
+
*/
|
|
65
|
+
export const persistTestContainer = async (statePath, name, image, tag, networkAliases, ports) => {
|
|
66
|
+
const state = await loadState(statePath);
|
|
67
|
+
if (state?.environment === undefined) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
const inspection = await inspectContainer(name);
|
|
71
|
+
const containerId = inspection?.id ?? name;
|
|
72
|
+
const entry = {
|
|
73
|
+
name: 'cypress',
|
|
74
|
+
image,
|
|
75
|
+
tag,
|
|
76
|
+
containerId,
|
|
77
|
+
endpoints: {
|
|
78
|
+
aliases: [...networkAliases],
|
|
79
|
+
ports: ports.map((p) => ({ container: p.container, host: p.host })),
|
|
80
|
+
},
|
|
81
|
+
};
|
|
82
|
+
// Upsert: replace existing cypress entry or append
|
|
83
|
+
const existingIndex = state.environment.components.findIndex((c) => c.name === 'cypress');
|
|
84
|
+
const updatedComponents = existingIndex >= 0
|
|
85
|
+
? state.environment.components.map((c, i) => (i === existingIndex ? entry : c))
|
|
86
|
+
: [...state.environment.components, entry];
|
|
87
|
+
await saveState({
|
|
88
|
+
...state,
|
|
89
|
+
environment: {
|
|
90
|
+
...state.environment,
|
|
91
|
+
components: updatedComponents,
|
|
92
|
+
},
|
|
93
|
+
}, statePath);
|
|
94
|
+
};
|
|
58
95
|
export const formatRunComplete = (name, exitCode) => {
|
|
59
96
|
const icon = exitCode === 0 ? '✓' : '✗';
|
|
60
97
|
const status = exitCode === 0 ? 'passed' : `failed (exit code ${String(exitCode)})`;
|
|
@@ -174,9 +211,9 @@ export default class TestsRun extends Command {
|
|
|
174
211
|
// Register SIGINT handler to stop the container on Ctrl+C
|
|
175
212
|
const onSigint = () => {
|
|
176
213
|
process.stderr.write(`\n⚠ Interrupted — stopping container "${name}"...\n`);
|
|
177
|
-
void stopContainer(name).finally(() => {
|
|
214
|
+
void persistTestContainer(statePath, name, component.effectiveImage, component.effectiveTag, component.effectiveNetworkAliases, component.effectivePorts).catch(() => { }).then(() => stopContainer(name).finally(() => {
|
|
178
215
|
process.exit(130);
|
|
179
|
-
});
|
|
216
|
+
}));
|
|
180
217
|
};
|
|
181
218
|
process.on('SIGINT', onSigint);
|
|
182
219
|
const result = await execa('docker', [...args], {
|
|
@@ -184,6 +221,8 @@ export default class TestsRun extends Command {
|
|
|
184
221
|
reject: false,
|
|
185
222
|
});
|
|
186
223
|
process.removeListener('SIGINT', onSigint);
|
|
224
|
+
// Persist the test container into environment state for artifact collection
|
|
225
|
+
await persistTestContainer(statePath, name, component.effectiveImage, component.effectiveTag, component.effectiveNetworkAliases, component.effectivePorts);
|
|
187
226
|
const exitCode = result.exitCode ?? 1;
|
|
188
227
|
if (flags.json) {
|
|
189
228
|
this.log(JSON.stringify({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/tests/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAmB,MAAM,OAAO,CAAC;AAE/C,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEnG,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/commands/tests/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect-all.d.ts","sourceRoot":"","sources":["../../../src/lib/artifacts/collect-all.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"collect-all.d.ts","sourceRoot":"","sources":["../../../src/lib/artifacts/collect-all.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAI9D,OAAO,KAAK,EAAsB,gBAAgB,EAA6B,MAAM,YAAY,CAAC;AAElG;;;GAGG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,oBAAoB,KAAG,MAAM,GAAG,SAUpE,CAAC;AAkCF;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAU,QAAQ;IAChD,QAAQ,CAAC,GAAG,EAAE,oBAAoB,CAAC;IACnC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;CAC/D,KAAG,OAAO,CAAC,gBAAgB,CAuF3B,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { mkdir, writeFile } from 'node:fs/promises';
|
|
2
2
|
import { join } from 'node:path';
|
|
3
|
+
import { getComponent, resolveComponent } from '../components/index.js';
|
|
3
4
|
import { resolveConfigComponents } from '../config/parser.js';
|
|
4
5
|
import { copyContainerArtifacts } from './copy-container-artifacts.js';
|
|
5
6
|
import { fetchContainerLogs } from './fetch-container-logs.js';
|
|
@@ -54,7 +55,18 @@ export const collectAllArtifacts = async (params) => {
|
|
|
54
55
|
const resolvedComponents = resolveConfigComponents(env.config);
|
|
55
56
|
// Map persisted components by name for container ID lookup
|
|
56
57
|
const containerIdByName = new Map(env.components.map((c) => [c.name, c.containerId]));
|
|
57
|
-
|
|
58
|
+
// Build the list of targets: config-resolved components + any persisted components
|
|
59
|
+
// not in config (e.g. cypress test container added by tests:run)
|
|
60
|
+
const resolvedNames = new Set(resolvedComponents.map((r) => r.definition.name));
|
|
61
|
+
const extraComponents = env.components
|
|
62
|
+
.filter((c) => !resolvedNames.has(c.name))
|
|
63
|
+
.map((c) => {
|
|
64
|
+
const def = getComponent(c.name);
|
|
65
|
+
return def !== undefined ? resolveComponent(def) : undefined;
|
|
66
|
+
})
|
|
67
|
+
.filter((c) => c !== undefined);
|
|
68
|
+
const allTargets = [...resolvedComponents, ...extraComponents];
|
|
69
|
+
const componentResults = await allTargets.reduce(async (chainPromise, resolved) => {
|
|
58
70
|
const chain = await chainPromise;
|
|
59
71
|
const componentName = resolved.definition.name;
|
|
60
72
|
const containerId = containerIdByName.get(componentName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect-all.js","sourceRoot":"","sources":["../../../src/lib/artifacts/collect-all.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAG/D;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAyB,EAAsB,EAAE;IAC/E,MAAM,WAAW,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC;IAC1E,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,6CAA6C;IAC7C,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC;IAC9E,MAAM,YAAY,GAAG,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC;IACnF,MAAM,QAAQ,GAAG,YAAY,EAAE,IAAI,IAAI,IAAI,CAAC;IAC5C,OAAO,oBAAoB,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;AAChD,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,uBAAuB,GAAG,KAAK,EAAE,MAMtC,EAIE,EAAE;IACH,MAAM,WAAW,GAAG,GAAG,MAAM,CAAC,aAAa,MAAM,CAAC;IAClD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAExD,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC;YACzC,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,YAAY,EAAE,MAAM,CAAC,YAAY;SAClC,CAAC,CAAC;QACH,MAAM,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACzD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IACpF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IACzE,CAAC;AACH,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,MAIzC,EAA6B,EAAE;IAC9B,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAE9C,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,uEAAuE,GAAG,CAAC,QAAQ,KAAK,CAAC,CAAC;IAC5G,CAAC;IAED,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5C,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IAEtC,8DAA8D;IAC9D,MAAM,kBAAkB,GAAG,uBAAuB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAE/D,2DAA2D;IAC3D,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAEtF,MAAM,gBAAgB,GAAG,MAAM,kBAAkB,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"collect-all.js","sourceRoot":"","sources":["../../../src/lib/artifacts/collect-all.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress.d.ts","sourceRoot":"","sources":["../../../src/lib/components/cypress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"cypress.d.ts","sourceRoot":"","sources":["../../../src/lib/components/cypress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,OAAO,EAAE,mBAqBrB,CAAC"}
|
|
@@ -18,7 +18,7 @@ export const cypress = {
|
|
|
18
18
|
defaultTag: 'latest',
|
|
19
19
|
ports: [],
|
|
20
20
|
env: {
|
|
21
|
-
JAHIA_URL: 'http://jahia:8080',
|
|
21
|
+
JAHIA_URL: '${JAHIA_URL:-http://jahia:8080}',
|
|
22
22
|
SUPER_USER_PASSWORD: '${SUPER_USER_PASSWORD:-root1234}',
|
|
23
23
|
NEXUS_USERNAME: '${NEXUS_USERNAME:-}',
|
|
24
24
|
NEXUS_PASSWORD: '${NEXUS_PASSWORD:-}',
|
|
@@ -31,5 +31,6 @@ export const cypress = {
|
|
|
31
31
|
isTransparent: false,
|
|
32
32
|
multiInstance: false,
|
|
33
33
|
providerSupport: ['docker'],
|
|
34
|
+
artifacts: ['/home/jahians/results'],
|
|
34
35
|
};
|
|
35
36
|
//# sourceMappingURL=cypress.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress.js","sourceRoot":"","sources":["../../../src/lib/components/cypress.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,OAAO,GAAwB;IAC1C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,gCAAgC;IAC7C,KAAK,EAAE,aAAa;IACpB,UAAU,EAAE,QAAQ;IACpB,KAAK,EAAE,EAAE;IACT,GAAG,EAAE;QACH,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"cypress.js","sourceRoot":"","sources":["../../../src/lib/components/cypress.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,OAAO,GAAwB;IAC1C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,gCAAgC;IAC7C,KAAK,EAAE,aAAa;IACpB,UAAU,EAAE,QAAQ;IACpB,KAAK,EAAE,EAAE;IACT,GAAG,EAAE;QACH,SAAS,EAAE,iCAAiC;QAC5C,mBAAmB,EAAE,kCAAkC;QACvD,cAAc,EAAE,qBAAqB;QACrC,cAAc,EAAE,qBAAqB;QACrC,QAAQ,EAAE,eAAe;KAC1B;IACD,OAAO,EAAE,EAAE;IACX,SAAS,EAAE,CAAC,OAAO,CAAC;IACpB,cAAc,EAAE,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,aAAa;IACvB,aAAa,EAAE,KAAK;IACpB,aAAa,EAAE,KAAK;IACpB,eAAe,EAAE,CAAC,QAAQ,CAAC;IAC3B,SAAS,EAAE,CAAC,uBAAuB,CAAC;CACrC,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { NetworkMode } from './resolve-url-types.js';
|
|
2
|
+
/**
|
|
3
|
+
* Pure decision function: given environment signal and filesystem signal,
|
|
4
|
+
* determine the network mode.
|
|
5
|
+
*
|
|
6
|
+
* Priority: env var override > filesystem detection > default (host).
|
|
7
|
+
*/
|
|
8
|
+
export declare const resolveNetworkMode: (envOverride: string | undefined, dockerenvExists: boolean) => NetworkMode;
|
|
9
|
+
/**
|
|
10
|
+
* Detects whether the CLI is running on the host or inside a Docker container.
|
|
11
|
+
*
|
|
12
|
+
* Detection order:
|
|
13
|
+
* 1. `JAHIA_CLI_NETWORK_MODE` env var (`'host'` or `'docker-network'`) — authoritative override
|
|
14
|
+
* 2. Presence of `/.dockerenv` file — best-effort autodetection
|
|
15
|
+
* 3. Default: `'host'`
|
|
16
|
+
*/
|
|
17
|
+
export declare const detectDockerContext: () => Promise<NetworkMode>;
|
|
18
|
+
//# sourceMappingURL=detect-docker-context.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"detect-docker-context.d.ts","sourceRoot":"","sources":["../../../src/lib/state/detect-docker-context.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,aAAa,MAAM,GAAG,SAAS,EAAE,iBAAiB,OAAO,KAAG,WAM9F,CAAC;AAcF;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,QAAa,OAAO,CAAC,WAAW,CAI/D,CAAC"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { access } from 'node:fs/promises';
|
|
2
|
+
/**
|
|
3
|
+
* Pure decision function: given environment signal and filesystem signal,
|
|
4
|
+
* determine the network mode.
|
|
5
|
+
*
|
|
6
|
+
* Priority: env var override > filesystem detection > default (host).
|
|
7
|
+
*/
|
|
8
|
+
export const resolveNetworkMode = (envOverride, dockerenvExists) => {
|
|
9
|
+
if (envOverride === 'docker-network' || envOverride === 'host') {
|
|
10
|
+
return envOverride;
|
|
11
|
+
}
|
|
12
|
+
return dockerenvExists ? 'docker-network' : 'host';
|
|
13
|
+
};
|
|
14
|
+
/**
|
|
15
|
+
* Checks whether `/.dockerenv` exists on disk.
|
|
16
|
+
*/
|
|
17
|
+
const checkDockerenvExists = async () => {
|
|
18
|
+
try {
|
|
19
|
+
await access('/.dockerenv');
|
|
20
|
+
return true;
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
/**
|
|
27
|
+
* Detects whether the CLI is running on the host or inside a Docker container.
|
|
28
|
+
*
|
|
29
|
+
* Detection order:
|
|
30
|
+
* 1. `JAHIA_CLI_NETWORK_MODE` env var (`'host'` or `'docker-network'`) — authoritative override
|
|
31
|
+
* 2. Presence of `/.dockerenv` file — best-effort autodetection
|
|
32
|
+
* 3. Default: `'host'`
|
|
33
|
+
*/
|
|
34
|
+
export const detectDockerContext = async () => {
|
|
35
|
+
const envOverride = process.env['JAHIA_CLI_NETWORK_MODE'];
|
|
36
|
+
const dockerenvExists = await checkDockerenvExists();
|
|
37
|
+
return resolveNetworkMode(envOverride, dockerenvExists);
|
|
38
|
+
};
|
|
39
|
+
//# sourceMappingURL=detect-docker-context.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"detect-docker-context.js","sourceRoot":"","sources":["../../../src/lib/state/detect-docker-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI1C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,WAA+B,EAAE,eAAwB,EAAe,EAAE;IAC3G,IAAI,WAAW,KAAK,gBAAgB,IAAI,WAAW,KAAK,MAAM,EAAE,CAAC;QAC/D,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,OAAO,eAAe,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC;AACrD,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,oBAAoB,GAAG,KAAK,IAAsB,EAAE;IACxD,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,IAA0B,EAAE;IAClE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC1D,MAAM,eAAe,GAAG,MAAM,oBAAoB,EAAE,CAAC;IACrD,OAAO,kBAAkB,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;AAC1D,CAAC,CAAC"}
|
|
@@ -1,16 +1,42 @@
|
|
|
1
1
|
import type { PersistedEnvironment } from './types.js';
|
|
2
|
+
import type { NetworkMode, ResolvedUrl } from './resolve-url-types.js';
|
|
2
3
|
/**
|
|
3
4
|
* Connection details for a Jahia instance, derived from environment state.
|
|
5
|
+
* Backward-compatible interface — use `resolveJahiaConnection` for richer metadata.
|
|
4
6
|
*/
|
|
5
7
|
export interface JahiaConnectionDefaults {
|
|
6
8
|
readonly url: string;
|
|
7
9
|
readonly username: string;
|
|
8
10
|
readonly password: string;
|
|
9
11
|
}
|
|
12
|
+
/**
|
|
13
|
+
* Jahia connection with full provenance metadata for logging.
|
|
14
|
+
*/
|
|
15
|
+
export interface JahiaConnection {
|
|
16
|
+
readonly url: string;
|
|
17
|
+
readonly username: string;
|
|
18
|
+
readonly password: string;
|
|
19
|
+
readonly resolvedUrl: ResolvedUrl;
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Resolves the Jahia password from config overrides, component definition, or default.
|
|
23
|
+
*/
|
|
24
|
+
export declare const resolveJahiaPassword: (env: PersistedEnvironment | undefined) => string;
|
|
10
25
|
/**
|
|
11
26
|
* Extracts Jahia connection defaults from the persisted environment state.
|
|
12
|
-
*
|
|
13
|
-
*
|
|
27
|
+
* Backward-compatible wrapper — always resolves in 'host' mode.
|
|
28
|
+
*
|
|
29
|
+
* @deprecated Prefer `resolveJahiaConnection()` which is context-aware.
|
|
14
30
|
*/
|
|
15
31
|
export declare const getJahiaConnectionDefaults: (env: PersistedEnvironment | undefined) => JahiaConnectionDefaults;
|
|
32
|
+
/**
|
|
33
|
+
* Resolves a full Jahia connection with automatic network mode detection.
|
|
34
|
+
* Returns both the connection details and URL provenance metadata.
|
|
35
|
+
*
|
|
36
|
+
* When `urlFlag` is provided (user passed --url), it takes absolute priority
|
|
37
|
+
* and the result source is `'flag'`.
|
|
38
|
+
*
|
|
39
|
+
* When `networkModeOverride` is provided, it skips auto-detection.
|
|
40
|
+
*/
|
|
41
|
+
export declare const resolveJahiaConnection: (env: PersistedEnvironment | undefined, urlFlag?: string, networkModeOverride?: NetworkMode) => Promise<JahiaConnection>;
|
|
16
42
|
//# sourceMappingURL=get-jahia-connection-defaults.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-jahia-connection-defaults.d.ts","sourceRoot":"","sources":["../../../src/lib/state/get-jahia-connection-defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"get-jahia-connection-defaults.d.ts","sourceRoot":"","sources":["../../../src/lib/state/get-jahia-connection-defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAMvE;;;GAGG;AACH,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACnC;AAKD;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAAI,KAAK,oBAAoB,GAAG,SAAS,KAAG,MAa5E,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,GACrC,KAAK,oBAAoB,GAAG,SAAS,KACpC,uBAIF,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,GACjC,KAAK,oBAAoB,GAAG,SAAS,EACrC,UAAU,MAAM,EAChB,sBAAsB,WAAW,KAChC,OAAO,CAAC,eAAe,CAsBzB,CAAC"}
|
|
@@ -1,28 +1,62 @@
|
|
|
1
1
|
import { COMPONENT_REGISTRY } from '../components/index.js';
|
|
2
2
|
import { resolveEnvVars } from '../config/resolve-env-vars.js';
|
|
3
|
-
|
|
3
|
+
import { resolveComponentUrl } from './resolve-component-url.js';
|
|
4
|
+
import { detectDockerContext } from './detect-docker-context.js';
|
|
4
5
|
const DEFAULT_USERNAME = 'root';
|
|
5
6
|
const DEFAULT_PASSWORD = 'root1234';
|
|
6
7
|
/**
|
|
7
|
-
*
|
|
8
|
-
* Looks for a 'jahia' component to determine the host port and password.
|
|
9
|
-
* Falls back to hardcoded defaults when state is unavailable or incomplete.
|
|
8
|
+
* Resolves the Jahia password from config overrides, component definition, or default.
|
|
10
9
|
*/
|
|
11
|
-
export const
|
|
10
|
+
export const resolveJahiaPassword = (env) => {
|
|
12
11
|
if (env === undefined) {
|
|
13
|
-
return
|
|
12
|
+
return DEFAULT_PASSWORD;
|
|
14
13
|
}
|
|
15
14
|
const jahiaConfig = env.config.components.find((c) => c.name === 'jahia');
|
|
16
15
|
const jahiaDef = COMPONENT_REGISTRY['jahia'];
|
|
17
|
-
// Resolve the host port: override → definition default → 8080
|
|
18
|
-
const portMapping = jahiaConfig?.overrides?.ports?.[0] ?? jahiaDef?.ports[0];
|
|
19
|
-
const port = portMapping?.host ?? 8080;
|
|
20
|
-
const url = `http://localhost:${String(port)}`;
|
|
21
|
-
// Resolve password: override env → definition env (with env var resolution) → default
|
|
22
16
|
const rawPassword = jahiaConfig?.overrides?.env?.['SUPER_USER_PASSWORD'] ??
|
|
23
17
|
jahiaDef?.env['SUPER_USER_PASSWORD'] ??
|
|
24
18
|
DEFAULT_PASSWORD;
|
|
25
|
-
|
|
26
|
-
|
|
19
|
+
return resolveEnvVars(rawPassword);
|
|
20
|
+
};
|
|
21
|
+
/**
|
|
22
|
+
* Extracts Jahia connection defaults from the persisted environment state.
|
|
23
|
+
* Backward-compatible wrapper — always resolves in 'host' mode.
|
|
24
|
+
*
|
|
25
|
+
* @deprecated Prefer `resolveJahiaConnection()` which is context-aware.
|
|
26
|
+
*/
|
|
27
|
+
export const getJahiaConnectionDefaults = (env) => {
|
|
28
|
+
const resolved = resolveComponentUrl('jahia', env, 'host');
|
|
29
|
+
const password = resolveJahiaPassword(env);
|
|
30
|
+
return { url: resolved.url, username: DEFAULT_USERNAME, password };
|
|
31
|
+
};
|
|
32
|
+
/**
|
|
33
|
+
* Resolves a full Jahia connection with automatic network mode detection.
|
|
34
|
+
* Returns both the connection details and URL provenance metadata.
|
|
35
|
+
*
|
|
36
|
+
* When `urlFlag` is provided (user passed --url), it takes absolute priority
|
|
37
|
+
* and the result source is `'flag'`.
|
|
38
|
+
*
|
|
39
|
+
* When `networkModeOverride` is provided, it skips auto-detection.
|
|
40
|
+
*/
|
|
41
|
+
export const resolveJahiaConnection = async (env, urlFlag, networkModeOverride) => {
|
|
42
|
+
const password = resolveJahiaPassword(env);
|
|
43
|
+
// CLI flag takes absolute priority
|
|
44
|
+
if (urlFlag !== undefined) {
|
|
45
|
+
const networkMode = networkModeOverride ?? await detectDockerContext();
|
|
46
|
+
return {
|
|
47
|
+
url: urlFlag,
|
|
48
|
+
username: DEFAULT_USERNAME,
|
|
49
|
+
password,
|
|
50
|
+
resolvedUrl: { url: urlFlag, source: 'flag', networkMode },
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
const networkMode = networkModeOverride ?? await detectDockerContext();
|
|
54
|
+
const resolved = resolveComponentUrl('jahia', env, networkMode);
|
|
55
|
+
return {
|
|
56
|
+
url: resolved.url,
|
|
57
|
+
username: DEFAULT_USERNAME,
|
|
58
|
+
password,
|
|
59
|
+
resolvedUrl: resolved,
|
|
60
|
+
};
|
|
27
61
|
};
|
|
28
62
|
//# sourceMappingURL=get-jahia-connection-defaults.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-jahia-connection-defaults.js","sourceRoot":"","sources":["../../../src/lib/state/get-jahia-connection-defaults.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-jahia-connection-defaults.js","sourceRoot":"","sources":["../../../src/lib/state/get-jahia-connection-defaults.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAsBjE,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAChC,MAAM,gBAAgB,GAAG,UAAU,CAAC;AAEpC;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,GAAqC,EAAU,EAAE;IACpF,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;IAC1E,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAE7C,MAAM,WAAW,GACf,WAAW,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,qBAAqB,CAAC;QACpD,QAAQ,EAAE,GAAG,CAAC,qBAAqB,CAAC;QACpC,gBAAgB,CAAC;IACnB,OAAO,cAAc,CAAC,WAAW,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,GAAqC,EACZ,EAAE;IAC3B,MAAM,QAAQ,GAAG,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC3C,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC;AACrE,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EACzC,GAAqC,EACrC,OAAgB,EAChB,mBAAiC,EACP,EAAE;IAC5B,MAAM,QAAQ,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAE3C,mCAAmC;IACnC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,WAAW,GAAG,mBAAmB,IAAI,MAAM,mBAAmB,EAAE,CAAC;QACvE,OAAO;YACL,GAAG,EAAE,OAAO;YACZ,QAAQ,EAAE,gBAAgB;YAC1B,QAAQ;YACR,WAAW,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE;SAC3D,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,mBAAmB,IAAI,MAAM,mBAAmB,EAAE,CAAC;IACvE,MAAM,QAAQ,GAAG,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;IAChE,OAAO;QACL,GAAG,EAAE,QAAQ,CAAC,GAAG;QACjB,QAAQ,EAAE,gBAAgB;QAC1B,QAAQ;QACR,WAAW,EAAE,QAAQ;KACtB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export type { PersistedComponent, PersistedEnvironment, StateFile } from './types.js';
|
|
2
|
+
export type { NetworkMode, UrlSource, ResolvedUrl } from './resolve-url-types.js';
|
|
2
3
|
export { stateFilePath } from './state-file-path.js';
|
|
3
4
|
export { loadState } from './load-state.js';
|
|
4
5
|
export { saveState } from './save-state.js';
|
|
@@ -8,4 +9,8 @@ export { hasActiveEnvironment } from './has-active-environment.js';
|
|
|
8
9
|
export { reconcileWithDocker } from './reconcile-with-docker.js';
|
|
9
10
|
export type { ReconciledComponent, ReconciledEnvironment } from './reconcile-with-docker.js';
|
|
10
11
|
export { stateFlag } from './state-flag.js';
|
|
12
|
+
export { detectDockerContext, resolveNetworkMode } from './detect-docker-context.js';
|
|
13
|
+
export { resolveComponentUrl, extractPort, extractHostname } from './resolve-component-url.js';
|
|
14
|
+
export { resolveJahiaConnection, resolveJahiaPassword } from './get-jahia-connection-defaults.js';
|
|
15
|
+
export type { JahiaConnection } from './get-jahia-connection-defaults.js';
|
|
11
16
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/state/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,YAAY,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAC7F,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/state/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACtF,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,YAAY,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAC7F,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrF,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC/F,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAClG,YAAY,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC"}
|
package/dist/lib/state/index.js
CHANGED
|
@@ -6,4 +6,7 @@ export { getActiveEnvironment } from './get-active-environment.js';
|
|
|
6
6
|
export { hasActiveEnvironment } from './has-active-environment.js';
|
|
7
7
|
export { reconcileWithDocker } from './reconcile-with-docker.js';
|
|
8
8
|
export { stateFlag } from './state-flag.js';
|
|
9
|
+
export { detectDockerContext, resolveNetworkMode } from './detect-docker-context.js';
|
|
10
|
+
export { resolveComponentUrl, extractPort, extractHostname } from './resolve-component-url.js';
|
|
11
|
+
export { resolveJahiaConnection, resolveJahiaPassword } from './get-jahia-connection-defaults.js';
|
|
9
12
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/state/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/state/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrF,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC/F,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import type { ComponentEndpoints, PersistedEnvironment } from './types.js';
|
|
2
|
+
import type { NetworkMode, ResolvedUrl } from './resolve-url-types.js';
|
|
3
|
+
/**
|
|
4
|
+
* Extracts the appropriate port number from endpoints based on network mode.
|
|
5
|
+
* For host mode → host port; for docker-network → container port.
|
|
6
|
+
* Uses portIndex to select among multiple port mappings (default: 0 = first port).
|
|
7
|
+
*/
|
|
8
|
+
export declare const extractPort: (endpoints: ComponentEndpoints | undefined, networkMode: NetworkMode, portIndex: number) => number | undefined;
|
|
9
|
+
/**
|
|
10
|
+
* Extracts the hostname for the component based on network mode.
|
|
11
|
+
* For host mode → 'localhost'; for docker-network → first alias.
|
|
12
|
+
*/
|
|
13
|
+
export declare const extractHostname: (endpoints: ComponentEndpoints | undefined, networkMode: NetworkMode) => string;
|
|
14
|
+
/**
|
|
15
|
+
* Resolves a component URL from the persisted environment state.
|
|
16
|
+
*
|
|
17
|
+
* Fallback chain for port:
|
|
18
|
+
* 1. Persisted endpoints in state file (populated at environment create)
|
|
19
|
+
* 2. Config override ports from the environment config
|
|
20
|
+
* 3. Component definition defaults from the registry
|
|
21
|
+
* 4. Hardcoded FALLBACK_PORT (8080)
|
|
22
|
+
*
|
|
23
|
+
* Fallback chain for hostname (docker-network mode only):
|
|
24
|
+
* 1. Persisted endpoint aliases
|
|
25
|
+
* 2. Component definition networkAliases from the registry
|
|
26
|
+
* 3. 'localhost'
|
|
27
|
+
*
|
|
28
|
+
* @param componentName - The component to resolve (e.g. 'jahia', 'pgsql')
|
|
29
|
+
* @param env - The persisted environment (or undefined if no state)
|
|
30
|
+
* @param networkMode - Whether running on host or inside Docker network
|
|
31
|
+
* @param portIndex - Which port mapping to use (default: 0 = primary port)
|
|
32
|
+
*/
|
|
33
|
+
export declare const resolveComponentUrl: (componentName: string, env: PersistedEnvironment | undefined, networkMode: NetworkMode, portIndex?: number) => ResolvedUrl;
|
|
34
|
+
//# sourceMappingURL=resolve-component-url.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-component-url.d.ts","sourceRoot":"","sources":["../../../src/lib/state/resolve-component-url.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAQvE;;;;GAIG;AACH,eAAO,MAAM,WAAW,GACtB,WAAW,kBAAkB,GAAG,SAAS,EACzC,aAAa,WAAW,EACxB,WAAW,MAAM,KAChB,MAAM,GAAG,SAOX,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,eAAe,GAC1B,WAAW,kBAAkB,GAAG,SAAS,EACzC,aAAa,WAAW,KACvB,MAOF,CAAC;AAEF;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,mBAAmB,GAC9B,eAAe,MAAM,EACrB,KAAK,oBAAoB,GAAG,SAAS,EACrC,aAAa,WAAW,EACxB,kBAAa,KACZ,WAiEF,CAAC"}
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
import { COMPONENT_REGISTRY } from '../components/index.js';
|
|
2
|
+
/**
|
|
3
|
+
* Default HTTP port used when no port mapping is available.
|
|
4
|
+
*/
|
|
5
|
+
const FALLBACK_PORT = 8080;
|
|
6
|
+
/**
|
|
7
|
+
* Extracts the appropriate port number from endpoints based on network mode.
|
|
8
|
+
* For host mode → host port; for docker-network → container port.
|
|
9
|
+
* Uses portIndex to select among multiple port mappings (default: 0 = first port).
|
|
10
|
+
*/
|
|
11
|
+
export const extractPort = (endpoints, networkMode, portIndex) => {
|
|
12
|
+
const mapping = endpoints?.ports[portIndex];
|
|
13
|
+
if (mapping === undefined) {
|
|
14
|
+
return undefined;
|
|
15
|
+
}
|
|
16
|
+
return networkMode === 'host' ? mapping.host : mapping.container;
|
|
17
|
+
};
|
|
18
|
+
/**
|
|
19
|
+
* Extracts the hostname for the component based on network mode.
|
|
20
|
+
* For host mode → 'localhost'; for docker-network → first alias.
|
|
21
|
+
*/
|
|
22
|
+
export const extractHostname = (endpoints, networkMode) => {
|
|
23
|
+
if (networkMode === 'host') {
|
|
24
|
+
return 'localhost';
|
|
25
|
+
}
|
|
26
|
+
const alias = endpoints?.aliases[0];
|
|
27
|
+
return alias ?? 'localhost';
|
|
28
|
+
};
|
|
29
|
+
/**
|
|
30
|
+
* Resolves a component URL from the persisted environment state.
|
|
31
|
+
*
|
|
32
|
+
* Fallback chain for port:
|
|
33
|
+
* 1. Persisted endpoints in state file (populated at environment create)
|
|
34
|
+
* 2. Config override ports from the environment config
|
|
35
|
+
* 3. Component definition defaults from the registry
|
|
36
|
+
* 4. Hardcoded FALLBACK_PORT (8080)
|
|
37
|
+
*
|
|
38
|
+
* Fallback chain for hostname (docker-network mode only):
|
|
39
|
+
* 1. Persisted endpoint aliases
|
|
40
|
+
* 2. Component definition networkAliases from the registry
|
|
41
|
+
* 3. 'localhost'
|
|
42
|
+
*
|
|
43
|
+
* @param componentName - The component to resolve (e.g. 'jahia', 'pgsql')
|
|
44
|
+
* @param env - The persisted environment (or undefined if no state)
|
|
45
|
+
* @param networkMode - Whether running on host or inside Docker network
|
|
46
|
+
* @param portIndex - Which port mapping to use (default: 0 = primary port)
|
|
47
|
+
*/
|
|
48
|
+
export const resolveComponentUrl = (componentName, env, networkMode, portIndex = 0) => {
|
|
49
|
+
if (env === undefined) {
|
|
50
|
+
return {
|
|
51
|
+
url: `http://localhost:${String(FALLBACK_PORT)}`,
|
|
52
|
+
source: 'default',
|
|
53
|
+
networkMode,
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
const persisted = env.components.find((c) => c.name === componentName);
|
|
57
|
+
// Try persisted endpoints first
|
|
58
|
+
const endpointPort = extractPort(persisted?.endpoints, networkMode, portIndex);
|
|
59
|
+
const endpointHostname = extractHostname(persisted?.endpoints, networkMode);
|
|
60
|
+
if (endpointPort !== undefined) {
|
|
61
|
+
// In docker-network mode with no aliases, fall back to component name as hostname
|
|
62
|
+
const hostname = (networkMode === 'docker-network' && endpointHostname === 'localhost')
|
|
63
|
+
? componentName
|
|
64
|
+
: endpointHostname;
|
|
65
|
+
return {
|
|
66
|
+
url: `http://${hostname}:${String(endpointPort)}`,
|
|
67
|
+
source: 'state',
|
|
68
|
+
networkMode,
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
// Fallback: config override ports
|
|
72
|
+
const configComponent = env.config.components.find((c) => c.name === componentName);
|
|
73
|
+
const configPort = configComponent?.overrides?.ports?.[portIndex];
|
|
74
|
+
if (configPort !== undefined) {
|
|
75
|
+
const port = networkMode === 'host' ? configPort.host : configPort.container;
|
|
76
|
+
const hostname = networkMode === 'host' ? 'localhost' : (persisted?.endpoints?.aliases[0] ?? componentName);
|
|
77
|
+
return {
|
|
78
|
+
url: `http://${hostname}:${String(port)}`,
|
|
79
|
+
source: 'state',
|
|
80
|
+
networkMode,
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
// Fallback: component definition defaults from registry
|
|
84
|
+
const definition = COMPONENT_REGISTRY[componentName];
|
|
85
|
+
if (definition !== undefined) {
|
|
86
|
+
const defPort = definition.ports[portIndex];
|
|
87
|
+
if (defPort !== undefined) {
|
|
88
|
+
const port = networkMode === 'host' ? defPort.host : defPort.container;
|
|
89
|
+
const hostname = networkMode === 'host'
|
|
90
|
+
? 'localhost'
|
|
91
|
+
: (persisted?.endpoints?.aliases[0] ?? definition.networkAliases[0] ?? componentName);
|
|
92
|
+
return {
|
|
93
|
+
url: `http://${hostname}:${String(port)}`,
|
|
94
|
+
source: 'default',
|
|
95
|
+
networkMode,
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
// Final fallback
|
|
100
|
+
return {
|
|
101
|
+
url: `http://localhost:${String(FALLBACK_PORT)}`,
|
|
102
|
+
source: 'default',
|
|
103
|
+
networkMode,
|
|
104
|
+
};
|
|
105
|
+
};
|
|
106
|
+
//# sourceMappingURL=resolve-component-url.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-component-url.js","sourceRoot":"","sources":["../../../src/lib/state/resolve-component-url.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Network access mode — how the CLI reaches containers.
|
|
3
|
+
*
|
|
4
|
+
* - `'host'`: CLI runs on the host → use localhost:<hostPort>
|
|
5
|
+
* - `'docker-network'`: CLI runs inside a Docker container on the same network → use <alias>:<containerPort>
|
|
6
|
+
*/
|
|
7
|
+
export type NetworkMode = 'host' | 'docker-network';
|
|
8
|
+
/**
|
|
9
|
+
* Where the resolved URL originated.
|
|
10
|
+
*
|
|
11
|
+
* - `'flag'`: Explicitly provided via a CLI flag (e.g. --url)
|
|
12
|
+
* - `'state'`: Derived from the persisted state file endpoints
|
|
13
|
+
* - `'default'`: Hardcoded fallback (no state, no flag)
|
|
14
|
+
*/
|
|
15
|
+
export type UrlSource = 'flag' | 'state' | 'default';
|
|
16
|
+
/**
|
|
17
|
+
* Result of resolving a component URL from state + context.
|
|
18
|
+
*/
|
|
19
|
+
export interface ResolvedUrl {
|
|
20
|
+
readonly url: string;
|
|
21
|
+
readonly source: UrlSource;
|
|
22
|
+
readonly networkMode: NetworkMode;
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=resolve-url-types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-url-types.d.ts","sourceRoot":"","sources":["../../../src/lib/state/resolve-url-types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,gBAAgB,CAAC;AAEpD;;;;;;GAMG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACnC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-url-types.js","sourceRoot":"","sources":["../../../src/lib/state/resolve-url-types.ts"],"names":[],"mappings":""}
|
package/oclif.manifest.json
CHANGED