@studiometa/forge-cli 0.5.4 → 0.5.6

package/README.md

@@ -218,7 +218,7 @@ A worker or a scheduled job matches the file when its command, directory, proces
 - Without the `workers` key, no worker is read or deleted. With `"workers": []`, all the workers of the site are deleted. The same applies to `schedule`.
 - The site, its aliases, its database and its `.env` keys are never deleted.
 
-`loadBalancer` sends the traffic of the load balancer to the server of the file. The site of the load balancer is the one named `domain` or one of the `aliases`. When no site matches, `--check` and `apply` exit `3` before any change. When two sites match, they exit `3` too. The Forge API cannot create a site on a load balancer: create it in Forge (New site on the load balancer), with its certificate. To move a site to another server, change `server`: `apply` creates the site there, then moves the node, with no DNS change. It does not delete the site on the old server.
+`loadBalancer` sends the traffic of the load balancer to the server of the file. The site of the load balancer is the one named `domain` or one of the `aliases`. When no site matches, `--check` and `apply` exit `3` before any change. When two sites match, they exit `3` too. The Forge API cannot create a site on a load balancer: create it in Forge (New site on the load balancer), with its certificate. The DNS points to the load balancer, so a change of node needs no DNS change. To move a site to another server, do not only change `server`: `apply` would send the traffic to the new site at once, before its first deployment and without its data. Declare the new server in a second site file without `loadBalancer`, deploy and test it, then move `loadBalancer` to that file. Only one site file declares `loadBalancer` for a site: with the key in two files, each `apply` replaces the node of the other.
 
 With `--check`, `apply` prints the plan and changes nothing. It exits `0` when Forge matches the file, `1` when it differs, and another code on an error (`3` for an invalid file). Every deletion shows its ID and full command. The plan gives `.env` key names only, never values, and shows a generated password as `<generated>`. With `--format json`, it prints `{ "inSync": false, "changes": [...], "warnings": [...] }`.
 

package/dist/cli.js

@@ -5365,20 +5365,27 @@ var REPOSITORY_HINT = (serverId) => `Check that the git host accepts the key of
 var defaultSleep = (ms) => new Promise((resolve) => {
 	setTimeout(resolve, ms);
 });
-async function waitForSite(file, serverId, siteId, ctx, options) {
+/**
+* Read a new resource until Forge has installed it. Throw the error of `fail` when its status is
+* `failed` or when it is not installed in time.
+*/
+async function waitForInstalled(read, fail, options) {
 	const sleep = options.sleep ?? defaultSleep;
 	const interval = options.pollIntervalMs ?? 5e3;
 	const timeout = options.timeoutMs ?? 6e5;
 	for (let waited = 0;; waited += interval) {
-		const site = (await getSite({
-			server_id: serverId,
-			site_id: siteId
-		}, ctx)).data;
-		if (site.status === "installed") return;
-		if (waited >= timeout) throw new ApplyError(`Site ${site.name} is still ${site.status} on Forge`, ["Run forge sites apply again once the site is installed", ...file.repository ? [REPOSITORY_HINT(serverId)] : []]);
+		const resource = await read();
+		if (resource.status === "installed") return;
+		if (resource.status === "failed" || waited >= timeout) throw fail(resource);
 		await sleep(interval);
 	}
 }
+async function waitForSite(file, serverId, siteId, ctx, options) {
+	await waitForInstalled(async () => (await getSite({
+		server_id: serverId,
+		site_id: siteId
+	}, ctx)).data, (site) => new ApplyError(`Site ${site.name} is still ${site.status} on Forge`, ["Run forge sites apply again once the site is installed", ...file.repository ? [REPOSITORY_HINT(serverId)] : []]), options);
+}
 /**
 * Create the database and its user. Returns their IDs and the .env values to write.
 */
@@ -5392,10 +5399,15 @@ async function applyDatabase(file, plan, state, serverId, ctx, options) {
 	let databaseId = state.databases?.find((db) => db.name === file.database.name)?.id;
 	for (const change of plan.changes) if (change.action === "create-database") {
 		options.onChange?.(change);
-		databaseId = (await createDatabase({
+		const id = (await createDatabase({
 			server_id: serverId,
 			name: change.name
 		}, ctx)).data.id;
+		await waitForInstalled(async () => (await getDatabase({
+			server_id: serverId,
+			id: String(id)
+		}, ctx)).data, (database) => new ApplyError(`Database ${change.name} is ${database.status} on Forge, not installed`, ["Run forge sites apply again once the database is installed"]), options);
+		databaseId = id;
 	} else if (change.action === "create-database-user") {
 		options.onChange?.(change);
 		const password = (options.generatePassword ?? generatePassword)();
@@ -5405,6 +5417,10 @@ async function applyDatabase(file, plan, state, serverId, ctx, options) {
 			password,
 			...databaseId === void 0 ? {} : { database_ids: [databaseId] }
 		}, ctx);
+		await waitForInstalled(async () => (await getDatabaseUser({
+			server_id: serverId,
+			id: String(user.data.id)
+		}, ctx)).data, (created) => new ApplyError(`Database user ${change.name} is ${created.status} on Forge, not installed`, [`The database user ${change.name} exists on Forge, but its password was not saved`, `Delete the database user ${change.name} on Forge before you run forge sites apply again`]), options);
 		ids.database_user_id = String(user.data.id);
 		const keys = databaseEnvKeys(file.database);
 		env.set(keys.name, change.database);
@@ -5566,6 +5582,9 @@ async function applySiteFile(file, serverId, ctx, options = {}) {
 			server_id: serverId,
 			type: file.type,
 			name: file.domain,
+			domain_mode: "custom",
+			www_redirect_type: "none",
+			allow_wildcard_subdomains: false,
 			...settings.php_version ? { php_version: settings.php_version } : {},
 			...settings.web_directory ? { web_directory: settings.web_directory } : {},
 			...settings.source_control_provider ? { source_control_provider: settings.source_control_provider } : {},
@@ -6796,7 +6815,7 @@ function isVersionRequest({ command, options }) {
 }
 //#endregion
 //#region src/cli.ts
-var VERSION = "0.5.4";
+var VERSION = "0.5.6";
 function showHelp() {
 	console.log(`
 ${colors.bold("forge")} v${VERSION}