@microsoft/managed-apps-cli 0.9.1 → 0.9.2
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/Cli.d.ts.map +1 -1
- package/dist/Cli.js +2 -0
- package/dist/Cli.js.map +1 -1
- package/dist/Logger/LoggerSettings.d.ts +2 -3
- package/dist/Logger/LoggerSettings.d.ts.map +1 -1
- package/dist/Logger/LoggerSettings.js +3 -39
- package/dist/Logger/LoggerSettings.js.map +1 -1
- package/dist/Logger/OneDSWriter.d.ts.map +1 -1
- package/dist/Logger/OneDSWriter.js +3 -3
- package/dist/Logger/OneDSWriter.js.map +1 -1
- package/dist/Utils/BuildPolling.d.ts +27 -2
- package/dist/Utils/BuildPolling.d.ts.map +1 -1
- package/dist/Utils/BuildPolling.js +98 -22
- package/dist/Utils/BuildPolling.js.map +1 -1
- package/dist/Utils/NodeVersionChecker.d.ts +13 -0
- package/dist/Utils/NodeVersionChecker.d.ts.map +1 -0
- package/dist/Utils/NodeVersionChecker.js +38 -0
- package/dist/Utils/NodeVersionChecker.js.map +1 -0
- package/dist/Verbs/DeployMaafApp.d.ts.map +1 -1
- package/dist/Verbs/DeployMaafApp.js +15 -78
- package/dist/Verbs/DeployMaafApp.js.map +1 -1
- package/dist/Verbs/GetMaafBuildStatus.d.ts.map +1 -1
- package/dist/Verbs/GetMaafBuildStatus.js +4 -37
- package/dist/Verbs/GetMaafBuildStatus.js.map +1 -1
- package/package.json +6 -6
package/dist/Cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cli.d.ts","sourceRoot":"","sources":["../src/Cli.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Cli.d.ts","sourceRoot":"","sources":["../src/Cli.ts"],"names":[],"mappings":"AA+CA,wBAAsB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAwI1C"}
|
package/dist/Cli.js
CHANGED
|
@@ -9,6 +9,7 @@ import { CliHttpClient } from './HttpClient/CliHttpClient.js';
|
|
|
9
9
|
import { CliLogger } from './Logger/CliLogger.js';
|
|
10
10
|
import { printError, printJsonError } from './Utils/ConsoleOutput.js';
|
|
11
11
|
import { cliEnvVarFullName, getCliEnvVar, getCliEnvVarBool, getSystemEnvVar, setSystemEnvVar, } from './Utils/EnvVars.js';
|
|
12
|
+
import { warnIfNodeVersionUnsupported } from './Utils/NodeVersionChecker.js';
|
|
12
13
|
let logger;
|
|
13
14
|
function formatThrown(err) {
|
|
14
15
|
if (err instanceof Error)
|
|
@@ -44,6 +45,7 @@ export async function boot() {
|
|
|
44
45
|
if (process.argv.includes('--no-color')) {
|
|
45
46
|
setSystemEnvVar('NO_COLOR', '1');
|
|
46
47
|
}
|
|
48
|
+
warnIfNodeVersionUnsupported();
|
|
47
49
|
const isTestRun = getSystemEnvVar('CI') === 'true';
|
|
48
50
|
const hasNonInteractiveFlag = process.argv.includes('--non-interactive');
|
|
49
51
|
const origin = getCliEnvVar('ORIGIN')?.trim() || 'managed-apps-cli';
|
package/dist/Cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cli.js","sourceRoot":"","sources":["../src/Cli.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAItD,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,gBAAgB,EAChB,eAAe,EACf,eAAe,GAChB,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"Cli.js","sourceRoot":"","sources":["../src/Cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,9 +9,8 @@ import type { UserTelemetrySettings } from '../Types/Cli.types.js';
|
|
|
9
9
|
* 1. Environment variable overrides (applied last, take highest precedence):
|
|
10
10
|
* - MS_CLI_REMOTE_TELEMETRY=0/false/no/off forces `remote: false`; truthy forces `remote: true`
|
|
11
11
|
* - MS_CLI_CONSOLE_TELEMETRY=1/true/yes/on forces `console: true`; falsy forces `console: false`
|
|
12
|
-
* 2.
|
|
13
|
-
* 3.
|
|
14
|
-
* 4. Default values: `{ remote: true, console: false }`
|
|
12
|
+
* 2. CLI user settings file (~/.ms-cli/userSettings.json)
|
|
13
|
+
* 3. Default values: `{ remote: true, console: false }`
|
|
15
14
|
*
|
|
16
15
|
* @returns Resolved telemetry configuration
|
|
17
16
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoggerSettings.d.ts","sourceRoot":"","sources":["../../src/Logger/LoggerSettings.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"LoggerSettings.d.ts","sourceRoot":"","sources":["../../src/Logger/LoggerSettings.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AA4BhE;;;;;;;;;;;GAWG;AACH,wBAAgB,4BAA4B,IAAI,qBAAqB,CAqCpE"}
|
|
@@ -5,7 +5,7 @@ import * as fs from 'fs';
|
|
|
5
5
|
import * as path from 'path';
|
|
6
6
|
import { CLI_CONFIG_DIRECTORY, USER_SETTINGS_FILE } from '../Constants.js';
|
|
7
7
|
import { printWarning } from '../Utils/ConsoleOutput.js';
|
|
8
|
-
import { getCliEnvVar
|
|
8
|
+
import { getCliEnvVar } from '../Utils/EnvVars.js';
|
|
9
9
|
/**
|
|
10
10
|
* Checks if a string represents a truthy value (1, true, yes, on).
|
|
11
11
|
*/
|
|
@@ -26,37 +26,6 @@ function isFalsy(value) {
|
|
|
26
26
|
const normalized = value.trim().toLowerCase();
|
|
27
27
|
return (normalized === '0' || normalized === 'false' || normalized === 'no' || normalized === 'off');
|
|
28
28
|
}
|
|
29
|
-
/**
|
|
30
|
-
* Determines whether PAC CLI telemetry is enabled by checking environment variables and PAC CLI config.
|
|
31
|
-
*
|
|
32
|
-
* Checks in order:
|
|
33
|
-
* 1. PAC_CLI_TELEMETRY_OPTOUT environment variable (if truthy, returns false)
|
|
34
|
-
* 2. PAC CLI usersettings.json file in %LOCALAPPDATA%\Microsoft\PowerAppsCli
|
|
35
|
-
*
|
|
36
|
-
* @returns `false` if explicitly disabled, `true` if explicitly enabled, `undefined` if not configured
|
|
37
|
-
*/
|
|
38
|
-
function isPacCliTelemetryEnabled() {
|
|
39
|
-
if (isTruthy(getSystemEnvVar('PAC_CLI_TELEMETRY_OPTOUT'))) {
|
|
40
|
-
return false;
|
|
41
|
-
}
|
|
42
|
-
const localAppData = getSystemEnvVar('LOCALAPPDATA');
|
|
43
|
-
if (!localAppData) {
|
|
44
|
-
return undefined;
|
|
45
|
-
}
|
|
46
|
-
const userSettingsPath = path.join(localAppData, 'Microsoft', 'PowerAppsCli', 'usersettings.json');
|
|
47
|
-
if (!fs.existsSync(userSettingsPath)) {
|
|
48
|
-
return undefined;
|
|
49
|
-
}
|
|
50
|
-
try {
|
|
51
|
-
const raw = fs.readFileSync(userSettingsPath, 'utf-8');
|
|
52
|
-
const parsed = JSON.parse(raw);
|
|
53
|
-
return typeof parsed.telemetryEnabled === 'boolean' ? parsed.telemetryEnabled : undefined;
|
|
54
|
-
}
|
|
55
|
-
catch (error) {
|
|
56
|
-
printWarning(`Failed to read PAC CLI telemetry settings: ${error.message}`);
|
|
57
|
-
return undefined;
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
29
|
/**
|
|
61
30
|
* Resolves the effective user telemetry settings by merging defaults, user config file, and environment overrides.
|
|
62
31
|
*
|
|
@@ -64,9 +33,8 @@ function isPacCliTelemetryEnabled() {
|
|
|
64
33
|
* 1. Environment variable overrides (applied last, take highest precedence):
|
|
65
34
|
* - MS_CLI_REMOTE_TELEMETRY=0/false/no/off forces `remote: false`; truthy forces `remote: true`
|
|
66
35
|
* - MS_CLI_CONSOLE_TELEMETRY=1/true/yes/on forces `console: true`; falsy forces `console: false`
|
|
67
|
-
* 2.
|
|
68
|
-
* 3.
|
|
69
|
-
* 4. Default values: `{ remote: true, console: false }`
|
|
36
|
+
* 2. CLI user settings file (~/.ms-cli/userSettings.json)
|
|
37
|
+
* 3. Default values: `{ remote: true, console: false }`
|
|
70
38
|
*
|
|
71
39
|
* @returns Resolved telemetry configuration
|
|
72
40
|
*/
|
|
@@ -87,10 +55,6 @@ export function resolveUserTelemetrySettings() {
|
|
|
87
55
|
printWarning(`Failed to read CLI telemetry settings: ${error.message}`);
|
|
88
56
|
}
|
|
89
57
|
}
|
|
90
|
-
const pacCliSetting = isPacCliTelemetryEnabled();
|
|
91
|
-
if (typeof pacCliSetting === 'boolean' && pacCliSetting === false) {
|
|
92
|
-
resolved.remote = false;
|
|
93
|
-
}
|
|
94
58
|
const remoteTelemetry = getCliEnvVar('REMOTE_TELEMETRY');
|
|
95
59
|
if (remoteTelemetry !== undefined) {
|
|
96
60
|
if (isFalsy(remoteTelemetry)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoggerSettings.js","sourceRoot":"","sources":["../../src/Logger/LoggerSettings.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAExE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"LoggerSettings.js","sourceRoot":"","sources":["../../src/Logger/LoggerSettings.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAExE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;GAEG;AACH,SAAS,QAAQ,CAAC,KAAqB;IACrC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC9C,OAAO,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,KAAK,IAAI,UAAU,KAAK,IAAI,CAAC;AACpG,CAAC;AAED;;GAEG;AACH,SAAS,OAAO,CAAC,KAAqB;IACpC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC9C,OAAO,CACL,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,OAAO,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,KAAK,CAC5F,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,4BAA4B;IAC1C,MAAM,QAAQ,GAA0B;QACtC,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,KAAK;KACf,CAAC;IAEF,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,kBAAkB,CAAC,CAAC;IAChF,IAAI,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,EAAE,CAAC,YAAY,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;YACnE,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAmC,CAAC;YAC1E,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC;YACnD,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC;QACxD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,YAAY,CAAC,0CAA2C,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QACrF,CAAC;IACH,CAAC;IAED,MAAM,eAAe,GAAG,YAAY,CAAC,kBAAkB,CAAC,CAAC;IACzD,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAClC,IAAI,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;YAC7B,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC;QAC1B,CAAC;aAAM,IAAI,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;YACrC,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC;QACzB,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAG,YAAY,CAAC,mBAAmB,CAAC,CAAC;IAC3D,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACnC,IAAI,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC/B,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC;QAC1B,CAAC;aAAM,IAAI,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACrC,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OneDSWriter.d.ts","sourceRoot":"","sources":["../../src/Logger/OneDSWriter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,MAAM,EAA2B,MAAM,yCAAyC,CAAC;AAC/F,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,qBAAa,WAAY,YAAW,gBAAgB;IAClD,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,eAAe,CAAa;gBAGlC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM;IAoDZ,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAOnE,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAOhE,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAQ7D,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI;IASnE,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IAShE,0BAA0B,CAAC,YAAY,EAAE,MAAM,EAAE,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI;IAStF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAI7D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"OneDSWriter.d.ts","sourceRoot":"","sources":["../../src/Logger/OneDSWriter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,MAAM,EAA2B,MAAM,yCAAyC,CAAC;AAC/F,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,qBAAa,WAAY,YAAW,gBAAgB;IAClD,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,eAAe,CAAa;gBAGlC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM;IAoDZ,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAOnE,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAOhE,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAQ7D,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI;IASnE,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IAShE,0BAA0B,CAAC,YAAY,EAAE,MAAM,EAAE,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI;IAStF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAI7D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAqB;IAE1D,OAAO,CAAC,WAAW;CA0BpB"}
|
|
@@ -11,7 +11,7 @@ export class OneDSWriter {
|
|
|
11
11
|
const commonProperties = {
|
|
12
12
|
environmentId,
|
|
13
13
|
isOnePlayer: 'false',
|
|
14
|
-
webPlayerScenario: '
|
|
14
|
+
webPlayerScenario: 'ManagedApps_CLI_Authoring',
|
|
15
15
|
cloud: region === 'preview' ? 'prod' : region,
|
|
16
16
|
sessionStartTime: new Date().toISOString(),
|
|
17
17
|
station: 'Unknown',
|
|
@@ -26,7 +26,7 @@ export class OneDSWriter {
|
|
|
26
26
|
commonProperties.geoLocation = geoLocation;
|
|
27
27
|
}
|
|
28
28
|
this._provider = new OneDsTelemetryProvider({
|
|
29
|
-
clientType:
|
|
29
|
+
clientType: 'ManagedAppsCLI',
|
|
30
30
|
clusterCategory: regionToClusterCategory(region),
|
|
31
31
|
telemetryLocation,
|
|
32
32
|
commonProperties,
|
|
@@ -101,7 +101,7 @@ export class OneDSWriter {
|
|
|
101
101
|
setCustomDimension(_key, _value) {
|
|
102
102
|
this._provider.setDefaultProperty(_key, _value);
|
|
103
103
|
}
|
|
104
|
-
static _EVENT_PREFIX = '
|
|
104
|
+
static _EVENT_PREFIX = 'ManagedAppsCLI.';
|
|
105
105
|
_trackEvent(eventName, eventData) {
|
|
106
106
|
const operationName = eventData.operationName || '';
|
|
107
107
|
const scrubbed = getScrubbedCustomDimensions(eventName, operationName, eventData);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OneDSWriter.js","sourceRoot":"","sources":["../../src/Logger/OneDSWriter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAe,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAC/F,OAAO,EACL,sBAAsB,EACtB,eAAe,EACf,mBAAmB,GAEpB,MAAM,0CAA0C,CAAC;AAGlD,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAE/E,MAAM,OAAO,WAAW;IACd,SAAS,CAAyB;IAClC,eAAe,GAAW,CAAC,CAAC;IAEpC,YACE,SAAiB,EACjB,MAAc,EACd,iBAAoC,EACpC,aAAqB,EACrB,KAAa,EACb,WAA+B,EAC/B,UAAkB,EAClB,SAAiB;QAEjB,MAAM,gBAAgB,GAA2B;YAC/C,aAAa;YACb,WAAW,EAAE,OAAO;YACpB,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"OneDSWriter.js","sourceRoot":"","sources":["../../src/Logger/OneDSWriter.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,17 +2,42 @@
|
|
|
2
2
|
* Copyright (C) Microsoft Corporation. All rights reserved.
|
|
3
3
|
*/
|
|
4
4
|
import type { MaafBuildPollResult } from '@microsoft/managed-apps-actions';
|
|
5
|
+
export interface BuildErrorDetail {
|
|
6
|
+
errorMessage?: string;
|
|
7
|
+
buildOutput?: string;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* Extracts human-readable error detail from a `MaafBuildPollResult.result` value.
|
|
11
|
+
* Handles the documented `{ code, message }` structured shape, legacy plain-string
|
|
12
|
+
* results, and extended server fields (`error.message`, `error.buildOutput`,
|
|
13
|
+
* `buildOutput`) that may be present in actual responses beyond the typed contract.
|
|
14
|
+
*
|
|
15
|
+
* Shared between `build-status`, `build`, and `deploy` so all three commands
|
|
16
|
+
* surface identical error details when a server build fails.
|
|
17
|
+
*/
|
|
18
|
+
export declare function extractBuildErrorDetail(result: unknown): BuildErrorDetail;
|
|
5
19
|
export interface WaitForBuildStatusArgs {
|
|
6
20
|
appName: string;
|
|
7
21
|
commitSha: string;
|
|
8
22
|
initialWaitMs: number;
|
|
9
23
|
isJsonMode: boolean;
|
|
10
24
|
spinnerLabel?: string;
|
|
25
|
+
/** If set, polling throws after this many ms. No deadline by default. */
|
|
26
|
+
deadlineMs?: number;
|
|
27
|
+
/** Caps the server-provided Retry-After to prevent hanging for hours. No cap by default. */
|
|
28
|
+
maxIntervalMs?: number;
|
|
11
29
|
}
|
|
12
30
|
/**
|
|
13
31
|
* Polls `buildStatusAsync` for the given app + commit until the build reaches a
|
|
14
|
-
* terminal state. Shared between `ms app build
|
|
15
|
-
* so
|
|
32
|
+
* terminal state. Shared between `ms app build`, `ms app deploy`, and
|
|
33
|
+
* `ms app play --mode preview` so all verbs surface identical waiting/error UX.
|
|
34
|
+
*
|
|
35
|
+
* note: This function outputs to the console directly (e.g. spinner, error details).
|
|
36
|
+
*
|
|
37
|
+
* When `deadlineMs` is set, throws an `AppError` if the build hasn't completed
|
|
38
|
+
* within that many milliseconds (measured from when polling starts).
|
|
39
|
+
* When `maxIntervalMs` is set, clamps the server-provided `Retry-After` header
|
|
40
|
+
* to prevent a slow/hostile server from making the CLI hang for hours.
|
|
16
41
|
*/
|
|
17
42
|
export declare function waitForBuildStatusAsync(args: WaitForBuildStatusArgs): Promise<MaafBuildPollResult>;
|
|
18
43
|
//# sourceMappingURL=BuildPolling.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuildPolling.d.ts","sourceRoot":"","sources":["../../src/Utils/BuildPolling.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"BuildPolling.d.ts","sourceRoot":"","sources":["../../src/Utils/BuildPolling.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAU3E,MAAM,WAAW,gBAAgB;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,OAAO,GAAG,gBAAgB,CAuDzE;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yEAAyE;IACzE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4FAA4F;IAC5F,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAAC,mBAAmB,CAAC,CAyD9B"}
|
|
@@ -4,20 +4,88 @@
|
|
|
4
4
|
import { buildStatusAsync } from '@microsoft/managed-apps-actions';
|
|
5
5
|
import { getCliLogger } from '../CliSettings.js';
|
|
6
6
|
import { AppError } from '../Errors/CliError.js';
|
|
7
|
+
import { printInfo } from './ConsoleOutput.js';
|
|
7
8
|
import { CliSpinner } from './Spinner.js';
|
|
8
9
|
const MIN_POLL_INTERVAL_MS = 1000;
|
|
10
|
+
/**
|
|
11
|
+
* Extracts human-readable error detail from a `MaafBuildPollResult.result` value.
|
|
12
|
+
* Handles the documented `{ code, message }` structured shape, legacy plain-string
|
|
13
|
+
* results, and extended server fields (`error.message`, `error.buildOutput`,
|
|
14
|
+
* `buildOutput`) that may be present in actual responses beyond the typed contract.
|
|
15
|
+
*
|
|
16
|
+
* Shared between `build-status`, `build`, and `deploy` so all three commands
|
|
17
|
+
* surface identical error details when a server build fails.
|
|
18
|
+
*/
|
|
19
|
+
export function extractBuildErrorDetail(result) {
|
|
20
|
+
if (typeof result === 'string') {
|
|
21
|
+
const value = result.trim();
|
|
22
|
+
return value ? { errorMessage: value } : {};
|
|
23
|
+
}
|
|
24
|
+
if (!result || typeof result !== 'object') {
|
|
25
|
+
return {};
|
|
26
|
+
}
|
|
27
|
+
const maybeResult = result;
|
|
28
|
+
const topLevelCode = typeof maybeResult.code === 'string' && maybeResult.code.trim()
|
|
29
|
+
? maybeResult.code.trim()
|
|
30
|
+
: undefined;
|
|
31
|
+
if (typeof maybeResult.error === 'string') {
|
|
32
|
+
const value = maybeResult.error.trim();
|
|
33
|
+
const errorMessage = composeErrorMessage(topLevelCode, value || undefined);
|
|
34
|
+
return errorMessage ? { errorMessage } : {};
|
|
35
|
+
}
|
|
36
|
+
let errorCode;
|
|
37
|
+
let errorMessage;
|
|
38
|
+
let buildOutput;
|
|
39
|
+
if (maybeResult.error && typeof maybeResult.error === 'object') {
|
|
40
|
+
const code = maybeResult.error.code;
|
|
41
|
+
const message = maybeResult.error.message;
|
|
42
|
+
const nestedBuildOutput = maybeResult.error.buildOutput;
|
|
43
|
+
errorCode = typeof code === 'string' && code.trim() ? code.trim() : undefined;
|
|
44
|
+
errorMessage = typeof message === 'string' && message.trim() ? message.trim() : undefined;
|
|
45
|
+
buildOutput =
|
|
46
|
+
typeof nestedBuildOutput === 'string' && nestedBuildOutput.trim()
|
|
47
|
+
? nestedBuildOutput.trim()
|
|
48
|
+
: undefined;
|
|
49
|
+
}
|
|
50
|
+
if (!errorMessage && typeof maybeResult.message === 'string' && maybeResult.message.trim()) {
|
|
51
|
+
errorMessage = maybeResult.message.trim();
|
|
52
|
+
}
|
|
53
|
+
if (!buildOutput &&
|
|
54
|
+
typeof maybeResult.buildOutput === 'string' &&
|
|
55
|
+
maybeResult.buildOutput.trim()) {
|
|
56
|
+
buildOutput = maybeResult.buildOutput.trim();
|
|
57
|
+
}
|
|
58
|
+
const formattedErrorMessage = composeErrorMessage(errorCode ?? topLevelCode, errorMessage);
|
|
59
|
+
return formattedErrorMessage || buildOutput
|
|
60
|
+
? { errorMessage: formattedErrorMessage, buildOutput }
|
|
61
|
+
: {};
|
|
62
|
+
}
|
|
9
63
|
/**
|
|
10
64
|
* Polls `buildStatusAsync` for the given app + commit until the build reaches a
|
|
11
|
-
* terminal state. Shared between `ms app build
|
|
12
|
-
* so
|
|
65
|
+
* terminal state. Shared between `ms app build`, `ms app deploy`, and
|
|
66
|
+
* `ms app play --mode preview` so all verbs surface identical waiting/error UX.
|
|
67
|
+
*
|
|
68
|
+
* note: This function outputs to the console directly (e.g. spinner, error details).
|
|
69
|
+
*
|
|
70
|
+
* When `deadlineMs` is set, throws an `AppError` if the build hasn't completed
|
|
71
|
+
* within that many milliseconds (measured from when polling starts).
|
|
72
|
+
* When `maxIntervalMs` is set, clamps the server-provided `Retry-After` header
|
|
73
|
+
* to prevent a slow/hostile server from making the CLI hang for hours.
|
|
13
74
|
*/
|
|
14
75
|
export async function waitForBuildStatusAsync(args) {
|
|
15
76
|
const logger = getCliLogger();
|
|
16
|
-
|
|
77
|
+
const MIN_INTERVAL = MIN_POLL_INTERVAL_MS;
|
|
78
|
+
const MAX_INTERVAL = args.maxIntervalMs ?? Infinity;
|
|
79
|
+
let waitMs = Math.min(MAX_INTERVAL, Math.max(MIN_INTERVAL, args.initialWaitMs));
|
|
80
|
+
const deadline = args.deadlineMs != null ? Date.now() + args.deadlineMs : null;
|
|
17
81
|
const spinner = args.isJsonMode ? null : new CliSpinner();
|
|
18
82
|
spinner?.start(args.spinnerLabel ?? 'Waiting for build status...');
|
|
19
83
|
try {
|
|
20
84
|
for (;;) {
|
|
85
|
+
if (deadline !== null && Date.now() >= deadline) {
|
|
86
|
+
throw new AppError(`Build did not complete within ${Math.round(args.deadlineMs / 60_000)} minutes. ` +
|
|
87
|
+
`Commit SHA: ${args.commitSha}.`);
|
|
88
|
+
}
|
|
21
89
|
await sleep(waitMs);
|
|
22
90
|
const status = await buildStatusAsync({
|
|
23
91
|
logger,
|
|
@@ -27,14 +95,29 @@ export async function waitForBuildStatusAsync(args) {
|
|
|
27
95
|
case 'Succeeded':
|
|
28
96
|
return status;
|
|
29
97
|
case 'Failed':
|
|
30
|
-
case 'Canceled':
|
|
31
|
-
|
|
98
|
+
case 'Canceled': {
|
|
99
|
+
// Spinner.stop() is idempotent (no-op once stopped), so calling it
|
|
100
|
+
// here to clear the line before printing buildOutput is safe even
|
|
101
|
+
// though the finally block calls it again as the throw propagates.
|
|
102
|
+
spinner?.stop();
|
|
103
|
+
const errorDetail = extractBuildErrorDetail(status.result);
|
|
104
|
+
if (!args.isJsonMode && errorDetail.buildOutput) {
|
|
105
|
+
printInfo(errorDetail.buildOutput);
|
|
106
|
+
}
|
|
107
|
+
const statusDetail = errorDetail.errorMessage ?? '';
|
|
108
|
+
const statusMessage = statusDetail
|
|
109
|
+
? `Build ${status.status.toLowerCase()}: ${statusDetail}.`
|
|
110
|
+
: `Build ${status.status.toLowerCase()}.`;
|
|
111
|
+
throw new AppError(statusMessage + (args.commitSha ? ` Commit SHA: ${args.commitSha}.` : ''));
|
|
112
|
+
}
|
|
32
113
|
case 'NotStarted':
|
|
33
|
-
case 'Running':
|
|
34
|
-
|
|
114
|
+
case 'Running': {
|
|
115
|
+
const next = status.retryAfterMs ?? waitMs;
|
|
116
|
+
waitMs = Math.min(MAX_INTERVAL, Math.max(MIN_INTERVAL, next));
|
|
35
117
|
break;
|
|
118
|
+
}
|
|
36
119
|
default:
|
|
37
|
-
return status;
|
|
120
|
+
return assertUnreachableStatus(status.status);
|
|
38
121
|
}
|
|
39
122
|
}
|
|
40
123
|
}
|
|
@@ -42,20 +125,13 @@ export async function waitForBuildStatusAsync(args) {
|
|
|
42
125
|
spinner?.stop();
|
|
43
126
|
}
|
|
44
127
|
}
|
|
45
|
-
function
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
if (
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
parts.push(result.code);
|
|
53
|
-
if (typeof result.message === 'string' && result.message)
|
|
54
|
-
parts.push(result.message);
|
|
55
|
-
if (parts.length > 0)
|
|
56
|
-
return `: ${parts.join(' - ')}`;
|
|
57
|
-
}
|
|
58
|
-
return '';
|
|
128
|
+
function assertUnreachableStatus(status) {
|
|
129
|
+
throw new AppError(`Unexpected build status from server: ${String(status)}.`);
|
|
130
|
+
}
|
|
131
|
+
function composeErrorMessage(code, message) {
|
|
132
|
+
if (code && message)
|
|
133
|
+
return `${code}: ${message}`;
|
|
134
|
+
return code ?? message;
|
|
59
135
|
}
|
|
60
136
|
function sleep(ms) {
|
|
61
137
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuildPolling.js","sourceRoot":"","sources":["../../src/Utils/BuildPolling.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,MAAM,oBAAoB,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"BuildPolling.js","sourceRoot":"","sources":["../../src/Utils/BuildPolling.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/*!
|
|
2
|
+
* Copyright (C) Microsoft Corporation. All rights reserved.
|
|
3
|
+
*/
|
|
4
|
+
/**
|
|
5
|
+
* Best-effort guard: warn (never throw) when the running Node.js is older than the
|
|
6
|
+
* minimum declared in this package's `engines.node`. Mirrors `scripts/check-bun-version.ts`.
|
|
7
|
+
* Emits via `printWarning` — stderr, so it can't corrupt a `--json` stdout envelope, with
|
|
8
|
+
* NO_COLOR/TTY handled by `styleText`.
|
|
9
|
+
*/
|
|
10
|
+
export declare function warnIfNodeVersionUnsupported(): void;
|
|
11
|
+
/** Parse the leading `major.minor.patch` out of a version or range string (`>=24.5.0` → `[24, 5, 0]`). */
|
|
12
|
+
export declare function parseVersion(value: string): number[];
|
|
13
|
+
//# sourceMappingURL=NodeVersionChecker.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NodeVersionChecker.d.ts","sourceRoot":"","sources":["../../src/Utils/NodeVersionChecker.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH;;;;;GAKG;AACH,wBAAgB,4BAA4B,IAAI,IAAI,CAWnD;AAED,0GAA0G;AAC1G,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAGpD"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
/*!
|
|
2
|
+
* Copyright (C) Microsoft Corporation. All rights reserved.
|
|
3
|
+
*/
|
|
4
|
+
import packageJson from '../../package.json' with { type: 'json' };
|
|
5
|
+
import { printWarning } from './ConsoleOutput.js';
|
|
6
|
+
/**
|
|
7
|
+
* Best-effort guard: warn (never throw) when the running Node.js is older than the
|
|
8
|
+
* minimum declared in this package's `engines.node`. Mirrors `scripts/check-bun-version.ts`.
|
|
9
|
+
* Emits via `printWarning` — stderr, so it can't corrupt a `--json` stdout envelope, with
|
|
10
|
+
* NO_COLOR/TTY handled by `styleText`.
|
|
11
|
+
*/
|
|
12
|
+
export function warnIfNodeVersionUnsupported() {
|
|
13
|
+
const required = packageJson.engines?.node;
|
|
14
|
+
if (!required)
|
|
15
|
+
return;
|
|
16
|
+
const requiredParts = parseVersion(required);
|
|
17
|
+
if (requiredParts.length === 0)
|
|
18
|
+
return;
|
|
19
|
+
if (!isVersionLower(parseVersion(process.versions.node), requiredParts))
|
|
20
|
+
return;
|
|
21
|
+
printWarning(`Warning: Your Node.js version ${process.versions.node} doesn't match required version ${required}; please upgrade Node.js.`);
|
|
22
|
+
}
|
|
23
|
+
/** Parse the leading `major.minor.patch` out of a version or range string (`>=24.5.0` → `[24, 5, 0]`). */
|
|
24
|
+
export function parseVersion(value) {
|
|
25
|
+
const match = value.match(/(\d+)(?:\.(\d+))?(?:\.(\d+))?/);
|
|
26
|
+
return match ? [Number(match[1]), Number(match[2] ?? 0), Number(match[3] ?? 0)] : [];
|
|
27
|
+
}
|
|
28
|
+
/** True when `actual` is strictly older than `required`, compared by major, then minor, then patch. */
|
|
29
|
+
function isVersionLower(actual, required) {
|
|
30
|
+
for (let i = 0; i < 3; i++) {
|
|
31
|
+
const a = actual[i] ?? 0;
|
|
32
|
+
const r = required[i] ?? 0;
|
|
33
|
+
if (a !== r)
|
|
34
|
+
return a < r;
|
|
35
|
+
}
|
|
36
|
+
return false;
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=NodeVersionChecker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NodeVersionChecker.js","sourceRoot":"","sources":["../../src/Utils/NodeVersionChecker.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,WAAW,MAAM,oBAAoB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B;IAC1C,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC;IAC3C,IAAI,CAAC,QAAQ;QAAE,OAAO;IAEtB,MAAM,aAAa,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC7C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IACvC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC;QAAE,OAAO;IAEhF,YAAY,CACV,iCAAiC,OAAO,CAAC,QAAQ,CAAC,IAAI,mCAAmC,QAAQ,2BAA2B,CAC7H,CAAC;AACJ,CAAC;AAED,0GAA0G;AAC1G,MAAM,UAAU,YAAY,CAAC,KAAa;IACxC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAC3D,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACvF,CAAC;AAED,uGAAuG;AACvG,SAAS,cAAc,CAAC,MAAgB,EAAE,QAAkB;IAC1D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeployMaafApp.d.ts","sourceRoot":"","sources":["../../src/Verbs/DeployMaafApp.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"DeployMaafApp.d.ts","sourceRoot":"","sources":["../../src/Verbs/DeployMaafApp.ts"],"names":[],"mappings":"AAAA;;GAEG;AAoBH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AA4Y5D,wBAAsB,kBAAkB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqJ1F"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { promises as fs } from 'node:fs';
|
|
5
5
|
import * as path from 'node:path';
|
|
6
|
-
import { buildAsync,
|
|
6
|
+
import { buildAsync, deployAsync, MAX_BUILD_ARTIFACT_SIZE_BYTES, pushAsync, } from '@microsoft/managed-apps-actions';
|
|
7
7
|
import { AppConfigFileName } from '@microsoft/managed-apps-common/config';
|
|
8
8
|
import { BuildArtifactTooLargeError } from '@microsoft/managed-apps-common/errors';
|
|
9
9
|
import { HttpClientError } from '@microsoft/managed-apps-common/services';
|
|
@@ -11,20 +11,14 @@ import { getCliLogger, getSettings } from '../CliSettings.js';
|
|
|
11
11
|
import { promptConfirm, resolveAppNameAsync } from '../CliUtils.js';
|
|
12
12
|
import { HelpStrings } from '../Constants/HelpStrings.js';
|
|
13
13
|
import { AppError, ConfigurationError, UsageError } from '../Errors/CliError.js';
|
|
14
|
+
import { waitForBuildStatusAsync } from '../Utils/BuildPolling.js';
|
|
14
15
|
import { printInfo, printJsonLine, printJsonSuccess, printSuccess, printWarning, } from '../Utils/ConsoleOutput.js';
|
|
15
16
|
import { withGitHubDcfRecoveryAsync } from '../Utils/DcfRecovery.js';
|
|
16
17
|
import { hasUncommittedChanges, resolveGitDefaults } from '../Utils/GitUtils.js';
|
|
17
18
|
import { zipBuildArtifact } from '../Utils/zipBuildArtifact.js';
|
|
18
19
|
import { assertPackPreconditions, packAppArtifactAsync } from './Pack.js';
|
|
19
20
|
import { DeployMaafAppArguments } from './VerbConstants.js';
|
|
20
|
-
/**
|
|
21
|
-
* Polling parameters for the git-backed build flow. The deadline is the only true
|
|
22
|
-
* timeout; `MIN`/`MAX_INTERVAL_MS` clamp server-provided `Retry-After` values to a
|
|
23
|
-
* sane range so neither an unparseable header nor a hostile server can make the CLI
|
|
24
|
-
* busy-spin or hang for hours.
|
|
25
|
-
*/
|
|
26
21
|
const BUILD_POLL_DEADLINE_MS = 20 * 60 * 1000;
|
|
27
|
-
const MIN_POLL_INTERVAL_MS = 1000;
|
|
28
22
|
const MAX_POLL_INTERVAL_MS = 60_000;
|
|
29
23
|
const INITIAL_POLL_INTERVAL_MS = 2000;
|
|
30
24
|
const FEATURE_NOT_ENABLED_MESSAGE = `External artifact deployment is not enabled for this environment.
|
|
@@ -39,13 +33,6 @@ function formatBuildTooLargeMessage(bytes, capBytes) {
|
|
|
39
33
|
}
|
|
40
34
|
return `Build artifact exceeds the ${formatMb(capBytes)} limit.`;
|
|
41
35
|
}
|
|
42
|
-
function sleep(ms) {
|
|
43
|
-
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
44
|
-
}
|
|
45
|
-
function clampPollInterval(ms, fallback) {
|
|
46
|
-
const raw = ms ?? fallback;
|
|
47
|
-
return Math.min(MAX_POLL_INTERVAL_MS, Math.max(MIN_POLL_INTERVAL_MS, raw));
|
|
48
|
-
}
|
|
49
36
|
function toResultFromDefinition(def) {
|
|
50
37
|
// Swagger documents the app GUID as `name` while the client type and runtime
|
|
51
38
|
// historically use `id`. Prefer `id` (current runtime) and fall back to `name`
|
|
@@ -62,36 +49,6 @@ function toResultFromDefinition(def) {
|
|
|
62
49
|
appPlayUri: def.appPlayUri ?? null,
|
|
63
50
|
};
|
|
64
51
|
}
|
|
65
|
-
/**
|
|
66
|
-
* Formats `MaafBuildOperationResponse.result` into a colon-prefixed detail
|
|
67
|
-
* suffix for the terminal failure error message. Handles both the documented
|
|
68
|
-
* structured envelope (`{ code, message }`) and the legacy plain-string variant.
|
|
69
|
-
* Returns `''` when no useful detail is available.
|
|
70
|
-
*/
|
|
71
|
-
function formatPollFailureDetail(result) {
|
|
72
|
-
if (typeof result === 'string' && result.trim()) {
|
|
73
|
-
return `: ${result}`;
|
|
74
|
-
}
|
|
75
|
-
if (result && typeof result === 'object') {
|
|
76
|
-
const parts = [];
|
|
77
|
-
if (typeof result.code === 'string' && result.code)
|
|
78
|
-
parts.push(result.code);
|
|
79
|
-
if (typeof result.message === 'string' && result.message)
|
|
80
|
-
parts.push(result.message);
|
|
81
|
-
if (parts.length > 0)
|
|
82
|
-
return `: ${parts.join(' — ')}`;
|
|
83
|
-
}
|
|
84
|
-
return '';
|
|
85
|
-
}
|
|
86
|
-
/**
|
|
87
|
-
* Compile-time exhaustiveness check on a discriminated union. Throws an
|
|
88
|
-
* `AppError` at runtime if the server adds a status value the CLI doesn't yet
|
|
89
|
-
* know about; the `never` parameter ensures every `MaafBuildOperationStatus`
|
|
90
|
-
* branch is handled at the call site.
|
|
91
|
-
*/
|
|
92
|
-
function assertUnreachableStatus(status) {
|
|
93
|
-
throw new AppError(`Unexpected build status from server: ${String(status)}.`);
|
|
94
|
-
}
|
|
95
52
|
function toResultFromPush(res) {
|
|
96
53
|
return {
|
|
97
54
|
appId: res.appId,
|
|
@@ -270,12 +227,24 @@ async function runGitBackedDeployAsync(args) {
|
|
|
270
227
|
}
|
|
271
228
|
}
|
|
272
229
|
else {
|
|
273
|
-
|
|
230
|
+
if (!provider.isJsonMode()) {
|
|
231
|
+
printInfo('Build queued; waiting for completion...');
|
|
232
|
+
}
|
|
233
|
+
const pollResult = await waitForBuildStatusAsync({
|
|
274
234
|
appName,
|
|
275
235
|
commitSha,
|
|
276
236
|
initialWaitMs: submit.retryAfterMs ?? INITIAL_POLL_INTERVAL_MS,
|
|
277
237
|
isJsonMode: provider.isJsonMode(),
|
|
238
|
+
deadlineMs: BUILD_POLL_DEADLINE_MS,
|
|
239
|
+
maxIntervalMs: MAX_POLL_INTERVAL_MS,
|
|
240
|
+
spinnerLabel: 'Waiting for build...',
|
|
278
241
|
});
|
|
242
|
+
// Defence-in-depth: waitForBuildStatusAsync only returns on 'Succeeded'
|
|
243
|
+
// (other terminal states throw), but guard the deploy flow explicitly so a
|
|
244
|
+
// future change can't let an incomplete build proceed to deploy silently.
|
|
245
|
+
if (pollResult.status !== 'Succeeded') {
|
|
246
|
+
throw new AppError(`Unexpected terminal build status "${pollResult.status}". Commit SHA: ${commitSha}.`);
|
|
247
|
+
}
|
|
279
248
|
}
|
|
280
249
|
const def = await deployAsync({
|
|
281
250
|
logger,
|
|
@@ -283,38 +252,6 @@ async function runGitBackedDeployAsync(args) {
|
|
|
283
252
|
});
|
|
284
253
|
return toResultFromDefinition(def);
|
|
285
254
|
}
|
|
286
|
-
async function pollBuildToCompletionAsync(args) {
|
|
287
|
-
const logger = getCliLogger();
|
|
288
|
-
const deadline = Date.now() + BUILD_POLL_DEADLINE_MS;
|
|
289
|
-
let waitMs = clampPollInterval(args.initialWaitMs, INITIAL_POLL_INTERVAL_MS);
|
|
290
|
-
if (!args.isJsonMode) {
|
|
291
|
-
printInfo('Build queued; waiting for completion...');
|
|
292
|
-
}
|
|
293
|
-
while (Date.now() < deadline) {
|
|
294
|
-
await sleep(waitMs);
|
|
295
|
-
const status = await buildStatusAsync({
|
|
296
|
-
logger,
|
|
297
|
-
actionsParams: { appName: args.appName, commitSha: args.commitSha },
|
|
298
|
-
});
|
|
299
|
-
switch (status.status) {
|
|
300
|
-
case 'Succeeded':
|
|
301
|
-
return;
|
|
302
|
-
case 'Failed':
|
|
303
|
-
case 'Canceled': {
|
|
304
|
-
const detail = formatPollFailureDetail(status.result);
|
|
305
|
-
throw new AppError(`Build ${status.status.toLowerCase()}${detail}. Commit SHA: ${args.commitSha}.`);
|
|
306
|
-
}
|
|
307
|
-
case 'NotStarted':
|
|
308
|
-
case 'Running':
|
|
309
|
-
waitMs = clampPollInterval(status.retryAfterMs, waitMs);
|
|
310
|
-
break;
|
|
311
|
-
default:
|
|
312
|
-
return assertUnreachableStatus(status.status);
|
|
313
|
-
}
|
|
314
|
-
}
|
|
315
|
-
throw new AppError(`Build did not complete within ${Math.round(BUILD_POLL_DEADLINE_MS / 60_000)} minutes. ` +
|
|
316
|
-
`Commit SHA: ${args.commitSha}.`);
|
|
317
|
-
}
|
|
318
255
|
async function runArtifactDeployAsync(args) {
|
|
319
256
|
const resolved = path.resolve(args.artifactPath);
|
|
320
257
|
if (path.extname(resolved).toLowerCase() !== '.zip') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeployMaafApp.js","sourceRoot":"","sources":["../../src/Verbs/DeployMaafApp.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DeployMaafApp.js","sourceRoot":"","sources":["../../src/Verbs/DeployMaafApp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetMaafBuildStatus.d.ts","sourceRoot":"","sources":["../../src/Verbs/GetMaafBuildStatus.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"GetMaafBuildStatus.d.ts","sourceRoot":"","sources":["../../src/Verbs/GetMaafBuildStatus.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAU5D,wBAAsB,uBAAuB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgE/F"}
|
|
@@ -7,7 +7,8 @@ import { getCliLogger } from '../CliSettings.js';
|
|
|
7
7
|
import { resolveAppNameAsync } from '../CliUtils.js';
|
|
8
8
|
import { HelpStrings } from '../Constants/HelpStrings.js';
|
|
9
9
|
import { UsageError } from '../Errors/CliError.js';
|
|
10
|
-
import {
|
|
10
|
+
import { extractBuildErrorDetail } from '../Utils/BuildPolling.js';
|
|
11
|
+
import { printInfo, printJsonSuccess } from '../Utils/ConsoleOutput.js';
|
|
11
12
|
import { resolveGitDefaults } from '../Utils/GitUtils.js';
|
|
12
13
|
import { GetBuildStatusArguments } from './VerbConstants.js';
|
|
13
14
|
export async function getMaafBuildStatusAsync(argumentProvider) {
|
|
@@ -40,12 +41,12 @@ export async function getMaafBuildStatusAsync(argumentProvider) {
|
|
|
40
41
|
logger: getCliLogger(),
|
|
41
42
|
actionsParams: { appName, commitSha },
|
|
42
43
|
});
|
|
43
|
-
const errorDetail =
|
|
44
|
+
const errorDetail = extractBuildErrorDetail(result.result);
|
|
44
45
|
if (argumentProvider.isJsonMode()) {
|
|
45
46
|
printJsonSuccess(errorDetail.errorMessage || errorDetail.buildOutput ? { ...result, ...errorDetail } : result);
|
|
46
47
|
}
|
|
47
48
|
else {
|
|
48
|
-
|
|
49
|
+
printInfo(errorDetail.errorMessage
|
|
49
50
|
? `Build status: ${result.status}: ${errorDetail.errorMessage}`
|
|
50
51
|
: `Build status: ${result.status}`);
|
|
51
52
|
if (errorDetail.buildOutput) {
|
|
@@ -79,38 +80,4 @@ function createOptionSchema(argumentProvider) {
|
|
|
79
80
|
},
|
|
80
81
|
]);
|
|
81
82
|
}
|
|
82
|
-
function getBuildStatusErrorDetail(result) {
|
|
83
|
-
if (typeof result === 'string') {
|
|
84
|
-
const value = result.trim();
|
|
85
|
-
return value ? { errorMessage: value } : {};
|
|
86
|
-
}
|
|
87
|
-
if (!result || typeof result !== 'object') {
|
|
88
|
-
return {};
|
|
89
|
-
}
|
|
90
|
-
const maybeResult = result;
|
|
91
|
-
if (typeof maybeResult.error === 'string') {
|
|
92
|
-
const value = maybeResult.error.trim();
|
|
93
|
-
return value ? { errorMessage: value } : {};
|
|
94
|
-
}
|
|
95
|
-
let errorMessage;
|
|
96
|
-
let buildOutput;
|
|
97
|
-
if (maybeResult.error && typeof maybeResult.error === 'object') {
|
|
98
|
-
const message = maybeResult.error.message;
|
|
99
|
-
const nestedBuildOutput = maybeResult.error.buildOutput;
|
|
100
|
-
errorMessage = typeof message === 'string' && message.trim() ? message.trim() : undefined;
|
|
101
|
-
buildOutput =
|
|
102
|
-
typeof nestedBuildOutput === 'string' && nestedBuildOutput.trim()
|
|
103
|
-
? nestedBuildOutput.trim()
|
|
104
|
-
: undefined;
|
|
105
|
-
}
|
|
106
|
-
if (!errorMessage && typeof maybeResult.message === 'string' && maybeResult.message.trim()) {
|
|
107
|
-
errorMessage = maybeResult.message.trim();
|
|
108
|
-
}
|
|
109
|
-
if (!buildOutput &&
|
|
110
|
-
typeof maybeResult.buildOutput === 'string' &&
|
|
111
|
-
maybeResult.buildOutput.trim()) {
|
|
112
|
-
buildOutput = maybeResult.buildOutput.trim();
|
|
113
|
-
}
|
|
114
|
-
return errorMessage || buildOutput ? { errorMessage, buildOutput } : {};
|
|
115
|
-
}
|
|
116
83
|
//# sourceMappingURL=GetMaafBuildStatus.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetMaafBuildStatus.js","sourceRoot":"","sources":["../../src/Verbs/GetMaafBuildStatus.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAG1E,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"GetMaafBuildStatus.js","sourceRoot":"","sources":["../../src/Verbs/GetMaafBuildStatus.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/managed-apps-cli",
|
|
3
|
-
"version": "0.9.
|
|
3
|
+
"version": "0.9.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Command-line interface for building and managing Microsoft Apps",
|
|
6
6
|
"license": "See license in LICENSE file",
|
|
@@ -22,9 +22,9 @@
|
|
|
22
22
|
"clean": "bun ../../scripts/clean.ts dist .turbo tsconfig.tsbuildinfo tsconfig.build.tsbuildinfo"
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@microsoft/managed-apps-actions": "0.8.
|
|
26
|
-
"@microsoft/managed-apps-codegen": "0.2.
|
|
27
|
-
"@microsoft/managed-apps-common": "0.10.
|
|
25
|
+
"@microsoft/managed-apps-actions": "0.8.2",
|
|
26
|
+
"@microsoft/managed-apps-codegen": "0.2.9",
|
|
27
|
+
"@microsoft/managed-apps-common": "0.10.1",
|
|
28
28
|
"@azure/msal-node": "5.2.2",
|
|
29
29
|
"@azure/msal-node-extensions": "5.2.2",
|
|
30
30
|
"@clack/prompts": "1.4.0",
|
|
@@ -38,13 +38,13 @@
|
|
|
38
38
|
"open": "11.0.0"
|
|
39
39
|
},
|
|
40
40
|
"engines": {
|
|
41
|
-
"node": ">=
|
|
41
|
+
"node": ">=24.5.0"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"@repo/repo-config": "0.0.0",
|
|
45
45
|
"@types/archiver": "6.0.3",
|
|
46
46
|
"@types/bun": "1.3.13",
|
|
47
|
-
"@types/node": "
|
|
47
|
+
"@types/node": "24.13.1",
|
|
48
48
|
"memfs": "^4.57.2",
|
|
49
49
|
"tsc-esm-fix": "3.1.2",
|
|
50
50
|
"typescript": "5.9.3"
|