@forge/cli 13.4.0-next.1-experimental-0b00ed8 → 13.4.0-next.18

package/out/site/site-service.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SiteService = exports.isActiveDemoSite = exports.SiteProvisioningFailedError = exports.DEFAULT_PROVISION_POLL_INTERVAL_MS = exports.DEFAULT_PROVISION_TIMEOUT_MS = void 0;
+const cli_shared_1 = require("@forge/cli-shared");
+const INACTIVE_SITE_STATUSES = ['EXPIRED', 'DEACTIVATED', 'DELETED', 'INACTIVE', 'FAILED'];
+exports.DEFAULT_PROVISION_TIMEOUT_MS = 3 * 60 * 1000;
+exports.DEFAULT_PROVISION_POLL_INTERVAL_MS = 5 * 1000;
+class SiteProvisioningFailedError extends cli_shared_1.UserError {
+}
+exports.SiteProvisioningFailedError = SiteProvisioningFailedError;
+const isActiveDemoSite = (site) => {
+    if (!site?.siteUrl) {
+        return false;
+    }
+    if (site.status && INACTIVE_SITE_STATUSES.includes(site.status.toUpperCase())) {
+        return false;
+    }
+    if (site.expiresAt) {
+        const expiresAt = Date.parse(site.expiresAt);
+        if (!Number.isNaN(expiresAt) && expiresAt <= Date.now()) {
+            return false;
+        }
+    }
+    return true;
+};
+exports.isActiveDemoSite = isActiveDemoSite;
+class SiteService {
+    client;
+    logger;
+    constructor(client, logger = cli_shared_1.NullLogger) {
+        this.client = client;
+        this.logger = logger;
+    }
+    async provision() {
+        return this.client.provisionDemoSite();
+    }
+    async getExistingSite() {
+        return this.client.getDemoSite();
+    }
+    async hasActiveDemoSite() {
+        try {
+            const site = await this.client.getDemoSite();
+            this.logger.debug(cli_shared_1.Text.site.debug.demoSiteLookup(site?.siteUrl, site?.status, site?.expiresAt));
+            return (0, exports.isActiveDemoSite)(site);
+        }
+        catch (error) {
+            this.logger.debug(cli_shared_1.Text.site.debug.demoSiteLookupFailed(error instanceof Error ? error.message : String(error)));
+            return true;
+        }
+    }
+    async pollProvisioning(taskId, options = {}) {
+        const timeoutMs = options.timeoutMs ?? exports.DEFAULT_PROVISION_TIMEOUT_MS;
+        const intervalMs = options.intervalMs ?? exports.DEFAULT_PROVISION_POLL_INTERVAL_MS;
+        const deadline = Date.now() + timeoutMs;
+        let lastStatus;
+        while (true) {
+            const provisioning = await this.client.getDemoSiteProvisioning(taskId);
+            const status = provisioning?.status;
+            if (status && status !== lastStatus) {
+                lastStatus = status;
+                options.onStatus?.(status);
+            }
+            if (status === 'COMPLETED' && provisioning) {
+                return { kind: 'completed', provisioning };
+            }
+            if (status === 'COMPLETED_WITH_ERRORS' && provisioning?.site) {
+                return { kind: 'completedWithErrors', provisioning };
+            }
+            if (status === 'FAILED' || status === 'COMPLETED_WITH_ERRORS') {
+                throw new SiteProvisioningFailedError(`Demo site provisioning ${status === 'FAILED' ? 'failed' : 'completed with errors'} (taskId: ${taskId}).`);
+            }
+            if (Date.now() >= deadline) {
+                return { kind: 'timeout', taskId };
+            }
+            await (0, cli_shared_1.pause)(intervalMs);
+        }
+    }
+}
+exports.SiteService = SiteService;
+//# sourceMappingURL=site-service.js.map

package/out/site/site-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"site-service.js","sourceRoot":"","sources":["../../src/site/site-service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "13.4.0-next.1-experimental-0b00ed8",
+  "version": "13.4.0-next.18",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -21,14 +21,14 @@
     "generate:custom-scopes-types": "json2ts --input src/custom-scopes/validation/schema.json --output src/custom-scopes/generated-types.d.ts --style.singleQuote"
   },
   "dependencies": {
-    "@forge/bundler": "7.1.1-next.1-experimental-0b00ed8",
-    "@forge/cli-shared": "9.3.1-next.1-experimental-0b00ed8",
+    "@forge/bundler": "7.2.0-next.16",
+    "@forge/cli-shared": "9.4.0-next.13",
     "@forge/egress": "3.0.0",
-    "@forge/lint": "6.1.1-next.1-experimental-0b00ed8",
-    "@forge/manifest": "13.3.0-experimental-0b00ed8",
+    "@forge/lint": "6.2.0-next.16",
+    "@forge/manifest": "13.3.1-next.4",
     "@forge/i18n": "1.0.0",
     "@forge/runtime": "7.0.0",
-    "@forge/tunnel": "7.1.1-next.1-experimental-0b00ed8",
+    "@forge/tunnel": "7.1.1-next.16",
     "@forge/util": "3.0.0",
     "@sentry/node": "7.106.0",
     "ajv": "^8.18.0",
@@ -49,9 +49,9 @@
     "fs-extra": "^11.2.0",
     "hidefile": "^3.0.0",
     "http-proxy-agent": "^7.0.2",
+    "https-proxy-agent": "^7.0.6",
     "latest-version": "^7.0.0",
     "lodash": "^4.17.21",
-    "node-fetch": "2.7.0",
     "node-machine-id": "^1.1.12",
     "omelette": "^0.4.17",
     "ora": "^5.4.1",
@@ -60,6 +60,7 @@
     "semver": "^7.6.0",
     "tmp": "^0.2.3",
     "tslib": "^2.6.2",
+    "undici": "^7.29.0",
     "v8-compile-cache": "^2.4.0",
     "yaml": "^2.3.4"
   },
@@ -75,7 +76,6 @@
     "@types/jest": "^29.5.14",
     "@types/jws": "^3.2.10",
     "@types/node": "20.19.1",
-    "@types/node-fetch": "^2.6.12",
     "@types/omelette": "^0.4.5",
     "@types/semver": "^7.5.8",
     "@types/tmp": "^0.2.6",
@@ -92,12 +92,9 @@
     "typescript": "5.9.2"
   },
   "engines": {
-    "node": ">=20.18.1 <22.23.1 || >22.23.1 <24.17.0 || >24.17.0"
-  },
-  "engines_why": {
-    "22.23.1": "ECO-1586: Includes bug https://github.com/nodejs/node/issues/63989 triggering 'Premature close' on node-fetch",
-    "24.17.0": "ECO-1586: Includes bug https://github.com/nodejs/node/issues/63989 triggering 'Premature close' on node-fetch"
+    "node": ">=20.18.1"
   },
+  "engines_why": {},
   "publishConfig": {
     "registry": "https://packages.atlassian.com/api/npm/npm-public/"
   },