@forge/cli 13.4.0-next.5-experimental-c575574 → 13.4.0
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/CHANGELOG.md +160 -6
- package/npm-shrinkwrap.json +44 -94
- package/out/autocomplete/autocomplete-config.json +12 -3
- package/out/command-line/controller/install-controller.d.ts +3 -1
- package/out/command-line/controller/install-controller.d.ts.map +1 -1
- package/out/command-line/controller/install-controller.js +6 -1
- package/out/command-line/controller/install-controller.js.map +1 -1
- package/out/command-line/dependency-injection.d.ts.map +1 -1
- package/out/command-line/dependency-injection.js +2 -2
- package/out/command-line/dependency-injection.js.map +1 -1
- package/out/command-line/index.d.ts.map +1 -1
- package/out/command-line/index.js +13 -1
- package/out/command-line/index.js.map +1 -1
- package/out/command-line/proxy.d.ts +5 -0
- package/out/command-line/proxy.d.ts.map +1 -1
- package/out/command-line/proxy.js +41 -21
- package/out/command-line/proxy.js.map +1 -1
- package/out/command-line/register-app-commands.d.ts.map +1 -1
- package/out/command-line/register-app-commands.js +1 -1
- package/out/command-line/register-app-commands.js.map +1 -1
- package/out/command-line/register-log-commands.d.ts.map +1 -1
- package/out/command-line/register-log-commands.js +11 -4
- package/out/command-line/register-log-commands.js.map +1 -1
- package/out/command-line/view/deploy-view.d.ts.map +1 -1
- package/out/command-line/view/deploy-view.js +1 -1
- package/out/command-line/view/deploy-view.js.map +1 -1
- package/out/deploy/package-upload-deploy.d.ts.map +1 -1
- package/out/deploy/package-upload-deploy.js +5 -5
- package/out/deploy/package-upload-deploy.js.map +1 -1
- package/out/deploy/uploader/artifact-graphql-client.d.ts +2 -0
- package/out/deploy/uploader/artifact-graphql-client.d.ts.map +1 -1
- package/out/deploy/uploader/artifact-graphql-client.js +31 -0
- package/out/deploy/uploader/artifact-graphql-client.js.map +1 -1
- package/out/deploy/uploader/uploader.d.ts.map +1 -1
- package/out/deploy/uploader/uploader.js +3 -0
- package/out/deploy/uploader/uploader.js.map +1 -1
- package/out/service/cached-config-service.d.ts +1 -0
- package/out/service/cached-config-service.d.ts.map +1 -1
- package/out/service/cached-config-service.js +3 -2
- package/out/service/cached-config-service.js.map +1 -1
- package/out/site/site-service.d.ts +5 -2
- package/out/site/site-service.d.ts.map +1 -1
- package/out/site/site-service.js +32 -2
- package/out/site/site-service.js.map +1 -1
- package/package.json +7 -7
|
@@ -60,6 +60,37 @@ class ArtifactGraphQLClient {
|
|
|
60
60
|
}
|
|
61
61
|
return deploymentUrl;
|
|
62
62
|
}
|
|
63
|
+
async processCombinedBuild(appDetails, buildTag) {
|
|
64
|
+
const query = `
|
|
65
|
+
mutation forge_cli_processCombinedAppBuild($input: ProcessCombinedAppBuildInput!) {
|
|
66
|
+
processCombinedAppBuild(input: $input) {
|
|
67
|
+
success
|
|
68
|
+
errors {
|
|
69
|
+
message
|
|
70
|
+
extensions {
|
|
71
|
+
errorType
|
|
72
|
+
statusCode
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
buildTag
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
`;
|
|
79
|
+
const { response: { processCombinedAppBuild: { success, errors } }, requestId } = await this.graphqlClient.mutate(query, {
|
|
80
|
+
input: {
|
|
81
|
+
appId: appDetails.id,
|
|
82
|
+
buildTag
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
const error = (0, cli_shared_1.getError)(errors);
|
|
86
|
+
if (!success) {
|
|
87
|
+
throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, {
|
|
88
|
+
requestId,
|
|
89
|
+
code: error.code,
|
|
90
|
+
statusCode: error.statusCode
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
}
|
|
63
94
|
async getHostedResourcesUploadUrls(appDetails, resourceKeys, environmentKey, buildTag) {
|
|
64
95
|
const artifactQuery = `
|
|
65
96
|
mutation forge_cli_getHostedResourcesUploadUrls($input: CreateHostedResourceUploadUrlInput!) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifact-graphql-client.js","sourceRoot":"","sources":["../../../src/deploy/uploader/artifact-graphql-client.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"artifact-graphql-client.js","sourceRoot":"","sources":["../../../src/deploy/uploader/artifact-graphql-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../../src/deploy/uploader/uploader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,EAAmB,MAAM,mBAAmB,CAAC;AAC/G,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIvC,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvE,qBAAqB,CACnB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC/B,sBAAsB,CACpB,kBAAkB,EAAE,MAAM,EAC1B,iBAAiB,EAAE,gBAAgB,EACnC,OAAO,CAAC,EAAE,OAAO,EACjB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CAAC;CACpB;AAED,qBAAa,kBAAmB,YAAW,eAAe;IAEtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAPf,gBAAgB,EAAE,iBAAiB,EACnC,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,EACxC,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe;IAGtC,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAYtE,qBAAqB,CAChC,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA0BjB,sBAAsB,CACjC,kBAAkB,EAAE,MAAM,EAC1B,iBAAiB,EAAE,gBAAgB,EACnC,OAAO,CAAC,EAAE,OAAO,EACjB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../../src/deploy/uploader/uploader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,EAAmB,MAAM,mBAAmB,CAAC;AAC/G,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIvC,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvE,qBAAqB,CACnB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC/B,sBAAsB,CACpB,kBAAkB,EAAE,MAAM,EAC1B,iBAAiB,EAAE,gBAAgB,EACnC,OAAO,CAAC,EAAE,OAAO,EACjB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CAAC;CACpB;AAED,qBAAa,kBAAmB,YAAW,eAAe;IAEtD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAPf,gBAAgB,EAAE,iBAAiB,EACnC,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,EACxC,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe;IAGtC,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAYtE,qBAAqB,CAChC,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA0BjB,sBAAsB,CACjC,kBAAkB,EAAE,MAAM,EAC1B,iBAAiB,EAAE,gBAAgB,EACnC,OAAO,CAAC,EAAE,OAAO,EACjB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC;YAkDJ,sBAAsB;IAYpC,OAAO,CAAC,yBAAyB;IAcjC,OAAO,CAAC,IAAI;IAgBZ,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,aAAa;CAGtB"}
|
|
@@ -78,6 +78,9 @@ class AppArchiveUploader {
|
|
|
78
78
|
const combinedZipPath = await combinedArchive.finalise();
|
|
79
79
|
this.logger.debug(cli_shared_1.Text.deploy.taskUpload.uploadingArchive(uploadUrl));
|
|
80
80
|
await this.uploader.uploadFromPath(uploadUrl, combinedZipPath);
|
|
81
|
+
if (buildTag) {
|
|
82
|
+
await this.artifact.processCombinedBuild(appDetails, buildTag);
|
|
83
|
+
}
|
|
81
84
|
return uploadUrl;
|
|
82
85
|
}
|
|
83
86
|
async createDirectoryArchive(directoryAbsolutePath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploader.js","sourceRoot":"","sources":["../../../src/deploy/uploader/uploader.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"uploader.js","sourceRoot":"","sources":["../../../src/deploy/uploader/uploader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cached-config-service.d.ts","sourceRoot":"","sources":["../../src/service/cached-config-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"cached-config-service.d.ts","sourceRoot":"","sources":["../../src/service/cached-config-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAO/C,eAAO,MAAM,mBAAmB,gBAAgB,CAAC;AAIjD,qBAAa,mBAAmB;IAClB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAE5C,QAAQ,IAAI,MAAM,GAAG,SAAS;IAI9B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAIzC,WAAW,IAAI,IAAI;IAInB,uBAAuB,IAAI,OAAO,GAAG,SAAS;IAO9C,uBAAuB,CAAC,UAAU,EAAE,OAAO,GAAG,IAAI;IAIzD,OAAO,CAAC,sBAAsB;IAIvB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAMxD,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAM9D,gBAAgB,IAAI,MAAM,GAAG,IAAI;IAIjC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAQ3C,gBAAgB,IAAI,OAAO;IAS3B,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAGhD"}
|
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CachedConfigService = void 0;
|
|
3
|
+
exports.CachedConfigService = exports.FORGE_PROXY_ENV_VAR = void 0;
|
|
4
4
|
const ANALYTICS_PREFERENCES_KEY = 'analytics-preferences';
|
|
5
5
|
const DEFAULT_ENVIRONMENT_KEY = 'default-environment';
|
|
6
6
|
const ASSISTANT_NAME_KEY = 'assistant-name';
|
|
7
7
|
const CUSTOM_EFFECTS_KEY = 'seasonal-effects';
|
|
8
8
|
const PROXY_KEY = 'proxy';
|
|
9
|
+
exports.FORGE_PROXY_ENV_VAR = 'FORGE_PROXY';
|
|
9
10
|
class CachedConfigService {
|
|
10
11
|
cachedConf;
|
|
11
12
|
constructor(cachedConf) {
|
|
12
13
|
this.cachedConf = cachedConf;
|
|
13
14
|
}
|
|
14
15
|
getProxy() {
|
|
15
|
-
return this.cachedConf.get(PROXY_KEY);
|
|
16
|
+
return process.env[exports.FORGE_PROXY_ENV_VAR]?.trim() || this.cachedConf.get(PROXY_KEY);
|
|
16
17
|
}
|
|
17
18
|
setProxy(preference) {
|
|
18
19
|
this.cachedConf.set(PROXY_KEY, preference);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cached-config-service.js","sourceRoot":"","sources":["../../src/service/cached-config-service.ts"],"names":[],"mappings":";;;AAEA,MAAM,yBAAyB,GAAG,uBAAuB,CAAC;AAC1D,MAAM,uBAAuB,GAAG,qBAAqB,CAAC;AACtD,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AAC5C,MAAM,kBAAkB,GAAG,kBAAkB,CAAC;AAC9C,MAAM,SAAS,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"cached-config-service.js","sourceRoot":"","sources":["../../src/service/cached-config-service.ts"],"names":[],"mappings":";;;AAEA,MAAM,yBAAyB,GAAG,uBAAuB,CAAC;AAC1D,MAAM,uBAAuB,GAAG,qBAAqB,CAAC;AACtD,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AAC5C,MAAM,kBAAkB,GAAG,kBAAkB,CAAC;AAC9C,MAAM,SAAS,GAAG,OAAO,CAAC;AACb,QAAA,mBAAmB,GAAG,aAAa,CAAC;AAIjD,MAAa,mBAAmB;IACD;IAA7B,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEhD,QAAQ;QACb,OAAO,OAAO,CAAC,GAAG,CAAC,2BAAmB,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACpF,CAAC;IAEM,QAAQ,CAAC,UAAyB;QACvC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC7C,CAAC;IAEM,WAAW;QAChB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAEM,uBAAuB;QAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAAC;YACxC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACxD,CAAC;IAEM,uBAAuB,CAAC,UAAmB;QAChD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;IAC7D,CAAC;IAEO,sBAAsB;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAsB,uBAAuB,CAAC,IAAI,EAAE,CAAC;IACjF,CAAC;IAEM,qBAAqB,CAAC,KAAa;QACxC,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAE1D,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAEM,qBAAqB,CAAC,KAAa,EAAE,UAAkB;QAC5D,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC1D,mBAAmB,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;QACxC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAsB,uBAAuB,EAAE,mBAAmB,CAAC,CAAC;IACzF,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,IAAI,CAAC;IACzD,CAAC;IAEM,gBAAgB,CAAC,IAAmB;QACzC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAEM,gBAAgB;QAErB,IAAI,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,CAAC;YAC/C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,IAAI,CAAC;IACzD,CAAC;IAEM,gBAAgB,CAAC,OAAgB;QACtC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;CACF;AAlED,kDAkEC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { UserError } from '@forge/cli-shared';
|
|
1
|
+
import { Logger, UserError } from '@forge/cli-shared';
|
|
2
2
|
import { DemoSite, DemoSiteClient, DemoSiteProvisioning, DemoSiteProvisioningStatus, ProvisionDemoSiteResult } from './graphql-client';
|
|
3
3
|
export declare const DEFAULT_PROVISION_TIMEOUT_MS: number;
|
|
4
4
|
export declare const DEFAULT_PROVISION_POLL_INTERVAL_MS: number;
|
|
@@ -19,11 +19,14 @@ export type ProvisioningOutcome = {
|
|
|
19
19
|
kind: 'timeout';
|
|
20
20
|
taskId: string;
|
|
21
21
|
};
|
|
22
|
+
export declare const isActiveDemoSite: (site: DemoSite | undefined) => boolean;
|
|
22
23
|
export declare class SiteService {
|
|
23
24
|
private readonly client;
|
|
24
|
-
|
|
25
|
+
private readonly logger;
|
|
26
|
+
constructor(client: DemoSiteClient, logger?: Logger);
|
|
25
27
|
provision(): Promise<ProvisionDemoSiteResult>;
|
|
26
28
|
getExistingSite(): Promise<DemoSite | undefined>;
|
|
29
|
+
hasActiveDemoSite(): Promise<boolean>;
|
|
27
30
|
pollProvisioning(taskId: string, options?: PollOptions): Promise<ProvisioningOutcome>;
|
|
28
31
|
}
|
|
29
32
|
//# sourceMappingURL=site-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site-service.d.ts","sourceRoot":"","sources":["../../src/site/site-service.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"site-service.d.ts","sourceRoot":"","sources":["../../src/site/site-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA2B,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE/E,OAAO,EACL,QAAQ,EACR,cAAc,EACd,oBAAoB,EACpB,0BAA0B,EAC1B,uBAAuB,EACxB,MAAM,kBAAkB,CAAC;AAK1B,eAAO,MAAM,4BAA4B,QAAgB,CAAC;AAG1D,eAAO,MAAM,kCAAkC,QAAW,CAAC;AAE3D,qBAAa,2BAA4B,SAAQ,SAAS;CAAG;AAE7D,MAAM,WAAW,WAAW;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,0BAA0B,KAAK,IAAI,CAAC;CACzD;AAED,MAAM,MAAM,mBAAmB,GAC3B;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,YAAY,EAAE,oBAAoB,CAAA;CAAE,GACzD;IAAE,IAAI,EAAE,qBAAqB,CAAC;IAAC,YAAY,EAAE,oBAAoB,CAAA;CAAE,GACnE;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAQxC,eAAO,MAAM,gBAAgB,GAAI,MAAM,QAAQ,GAAG,SAAS,KAAG,OAiB7D,CAAC;AAEF,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,MAAM,EAAE,cAAc,EACtB,MAAM,GAAE,MAAmB;IAIjC,SAAS,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAQ7C,eAAe,IAAI,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IAKhD,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;IAsBrC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAsCvG"}
|
package/out/site/site-service.js
CHANGED
|
@@ -1,16 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SiteService = exports.SiteProvisioningFailedError = exports.DEFAULT_PROVISION_POLL_INTERVAL_MS = exports.DEFAULT_PROVISION_TIMEOUT_MS = void 0;
|
|
3
|
+
exports.SiteService = exports.isActiveDemoSite = exports.SiteProvisioningFailedError = exports.DEFAULT_PROVISION_POLL_INTERVAL_MS = exports.DEFAULT_PROVISION_TIMEOUT_MS = void 0;
|
|
4
4
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
5
|
+
const INACTIVE_SITE_STATUSES = ['EXPIRED', 'DEACTIVATED', 'DELETED', 'INACTIVE', 'FAILED'];
|
|
5
6
|
exports.DEFAULT_PROVISION_TIMEOUT_MS = 3 * 60 * 1000;
|
|
6
7
|
exports.DEFAULT_PROVISION_POLL_INTERVAL_MS = 5 * 1000;
|
|
7
8
|
class SiteProvisioningFailedError extends cli_shared_1.UserError {
|
|
8
9
|
}
|
|
9
10
|
exports.SiteProvisioningFailedError = SiteProvisioningFailedError;
|
|
11
|
+
const isActiveDemoSite = (site) => {
|
|
12
|
+
if (!site?.siteUrl) {
|
|
13
|
+
return false;
|
|
14
|
+
}
|
|
15
|
+
if (site.status && INACTIVE_SITE_STATUSES.includes(site.status.toUpperCase())) {
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
if (site.expiresAt) {
|
|
19
|
+
const expiresAt = Date.parse(site.expiresAt);
|
|
20
|
+
if (!Number.isNaN(expiresAt) && expiresAt <= Date.now()) {
|
|
21
|
+
return false;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
return true;
|
|
25
|
+
};
|
|
26
|
+
exports.isActiveDemoSite = isActiveDemoSite;
|
|
10
27
|
class SiteService {
|
|
11
28
|
client;
|
|
12
|
-
|
|
29
|
+
logger;
|
|
30
|
+
constructor(client, logger = cli_shared_1.NullLogger) {
|
|
13
31
|
this.client = client;
|
|
32
|
+
this.logger = logger;
|
|
14
33
|
}
|
|
15
34
|
async provision() {
|
|
16
35
|
return this.client.provisionDemoSite();
|
|
@@ -18,6 +37,17 @@ class SiteService {
|
|
|
18
37
|
async getExistingSite() {
|
|
19
38
|
return this.client.getDemoSite();
|
|
20
39
|
}
|
|
40
|
+
async hasActiveDemoSite() {
|
|
41
|
+
try {
|
|
42
|
+
const site = await this.client.getDemoSite();
|
|
43
|
+
this.logger.debug(cli_shared_1.Text.site.debug.demoSiteLookup(site?.siteUrl, site?.status, site?.expiresAt));
|
|
44
|
+
return (0, exports.isActiveDemoSite)(site);
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
this.logger.debug(cli_shared_1.Text.site.debug.demoSiteLookupFailed(error instanceof Error ? error.message : String(error)));
|
|
48
|
+
return true;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
21
51
|
async pollProvisioning(taskId, options = {}) {
|
|
22
52
|
const timeoutMs = options.timeoutMs ?? exports.DEFAULT_PROVISION_TIMEOUT_MS;
|
|
23
53
|
const intervalMs = options.intervalMs ?? exports.DEFAULT_PROVISION_POLL_INTERVAL_MS;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site-service.js","sourceRoot":"","sources":["../../src/site/site-service.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"site-service.js","sourceRoot":"","sources":["../../src/site/site-service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "13.4.0
|
|
3
|
+
"version": "13.4.0",
|
|
4
4
|
"description": "A command line interface for managing Atlassian-hosted apps",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
@@ -21,14 +21,14 @@
|
|
|
21
21
|
"generate:custom-scopes-types": "json2ts --input src/custom-scopes/validation/schema.json --output src/custom-scopes/generated-types.d.ts --style.singleQuote"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@forge/bundler": "7.2.0
|
|
25
|
-
"@forge/cli-shared": "9.4.0
|
|
24
|
+
"@forge/bundler": "7.2.0",
|
|
25
|
+
"@forge/cli-shared": "9.4.0",
|
|
26
26
|
"@forge/egress": "3.0.0",
|
|
27
|
-
"@forge/lint": "6.2.0
|
|
28
|
-
"@forge/manifest": "13.3.1
|
|
27
|
+
"@forge/lint": "6.2.0",
|
|
28
|
+
"@forge/manifest": "13.3.1",
|
|
29
29
|
"@forge/i18n": "1.0.0",
|
|
30
30
|
"@forge/runtime": "7.0.0",
|
|
31
|
-
"@forge/tunnel": "7.1.1
|
|
31
|
+
"@forge/tunnel": "7.1.1",
|
|
32
32
|
"@forge/util": "3.0.0",
|
|
33
33
|
"@sentry/node": "7.106.0",
|
|
34
34
|
"ajv": "^8.18.0",
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"semver": "^7.6.0",
|
|
61
61
|
"tmp": "^0.2.3",
|
|
62
62
|
"tslib": "^2.6.2",
|
|
63
|
-
"undici": "^7.
|
|
63
|
+
"undici": "^7.29.0",
|
|
64
64
|
"v8-compile-cache": "^2.4.0",
|
|
65
65
|
"yaml": "^2.3.4"
|
|
66
66
|
},
|