@studiometa/forge-sdk 0.3.0 → 0.4.0

package/dist/index.js

@@ -1,6 +1,6 @@
-import { HttpClient } from "@studiometa/forge-api";
+import { HttpClient, unwrapDocument, unwrapDocument as unwrapDocument$1, unwrapListDocument, unwrapListDocument as unwrapListDocument$1, unwrapResource } from "@studiometa/forge-api";
 /**
-* Async paginated iterator that auto-fetches all pages.
+* Async paginated iterator that auto-fetches all pages using cursor-based pagination.
 *
 * @example
 * ```ts
@@ -15,19 +15,17 @@ import { HttpClient } from "@studiometa/forge-api";
 */
 var AsyncPaginatedIterator = class {
 	fetchPage;
-	perPage;
-	constructor(fetchPage, perPage = 200) {
+	constructor(fetchPage) {
 		this.fetchPage = fetchPage;
-		this.perPage = perPage;
 	}
 	async *[Symbol.asyncIterator]() {
-		let page = 1;
+		let cursor = null;
 		let hasMore = true;
 		while (hasMore) {
-			const items = await this.fetchPage(page);
+			const { items, nextCursor } = await this.fetchPage(cursor);
 			for (const item of items) yield item;
-			hasMore = items.length >= this.perPage;
-			page++;
+			if (nextCursor) cursor = nextCursor;
+			else hasMore = false;
 		}
 	}
 	/**
@@ -56,12 +54,14 @@ function matchByName(items, query, getName) {
 }
 /**
 * Abstract base class for resource collections.
-* Provides a shared `client` property to avoid duplication across all collection classes.
+* Provides shared `client` and `orgSlug` properties to avoid duplication across all collection classes.
 */
 var BaseCollection = class {
 	client;
-	constructor(client) {
+	orgSlug;
+	constructor(client, orgSlug) {
 		this.client = client;
+		this.orgSlug = orgSlug;
 	}
 };
 /**
@@ -76,13 +76,13 @@ var BaseCollection = class {
 */
 var DeploymentsCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId, siteId) {
-		super(client);
+	constructor(client, orgSlug, serverId, siteId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 		this.siteId = siteId;
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/sites/${this.siteId}/deployments`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/sites/${this.siteId}/deployments`;
 	}
 	/**
 	* List deployments for this site.
@@ -91,13 +91,14 @@ var DeploymentsCollection = class extends BaseCollection {
 	* ```ts
 	* const deployments = await forge.server(123).site(456).deployments.list();
 	*
-	* // Fetch a specific page:
-	* const page2 = await forge.server(123).site(456).deployments.list({ page: 2 });
+	* // Fetch a specific cursor page:
+	* const page2 = await forge.server(123).site(456).deployments.list({ cursor: 'next-cursor-value' });
 	* ```
 	*/
 	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`${this.basePath}${query}`)).deployments;
+		const params = new URLSearchParams({ sort: "-created_at" });
+		if (options.cursor !== void 0) params.set("page[cursor]", options.cursor);
+		return unwrapListDocument$1(await this.client.get(`${this.basePath}?${params.toString()}`));
 	}
 	/**
 	* Iterate over all deployments across all pages.
@@ -112,11 +113,15 @@ var DeploymentsCollection = class extends BaseCollection {
 	* const deployments = await forge.server(123).site(456).deployments.all().toArray();
 	* ```
 	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	all() {
+		return new AsyncPaginatedIterator(async (cursor) => {
+			const params = "?sort=-created_at" + (cursor !== null ? `&page[cursor]=${cursor}` : "");
+			const response = await this.client.get(`${this.basePath}${params}`);
+			return {
+				items: unwrapListDocument$1(response),
+				nextCursor: response.meta.next_cursor ?? null
+			};
+		});
 	}
 	/**
 	* Get a specific deployment.
@@ -127,7 +132,7 @@ var DeploymentsCollection = class extends BaseCollection {
 	* ```
 	*/
 	async get(deploymentId) {
-		return (await this.client.get(`${this.basePath}/${deploymentId}`)).deployment;
+		return unwrapDocument$1(await this.client.get(`${this.basePath}/${deploymentId}`));
 	}
 	/**
 	* Get the output of a deployment.
@@ -138,7 +143,7 @@ var DeploymentsCollection = class extends BaseCollection {
 	* ```
 	*/
 	async output(deploymentId) {
-		return this.client.get(`${this.basePath}/${deploymentId}/output`);
+		return unwrapDocument$1(await this.client.get(`${this.basePath}/${deploymentId}/output`)).output;
 	}
 	/**
 	* Get the deployment script.
@@ -149,7 +154,7 @@ var DeploymentsCollection = class extends BaseCollection {
 	* ```
 	*/
 	async script() {
-		return this.client.get(`/servers/${this.serverId}/sites/${this.siteId}/deployment/script`);
+		return unwrapDocument$1(await this.client.get(`/orgs/${this.orgSlug}/servers/${this.serverId}/sites/${this.siteId}/deployments/script`)).content;
 	}
 	/**
 	* Update the deployment script.
@@ -160,120 +165,77 @@ var DeploymentsCollection = class extends BaseCollection {
 	* ```
 	*/
 	async updateScript(content) {
-		await this.client.put(`/servers/${this.serverId}/sites/${this.siteId}/deployment/script`, { content });
+		await this.client.put(`/orgs/${this.orgSlug}/servers/${this.serverId}/sites/${this.siteId}/deployments/script`, { content });
 	}
 };
 /**
-* Collection of SSL certificates for a site.
+* SSL certificates for a site, accessed per-domain.
+*
+* In v2, certificates are a singular sub-resource of a domain:
+* `/orgs/{org}/servers/{server}/sites/{site}/domains/{domain}/certificate`
 *
 * Access via `forge.server(id).site(id).certificates`.
 *
 * @example
 * ```ts
-* const certs = await forge.server(123).site(456).certificates.list();
+* const cert = await forge.server(123).site(456).certificates.get(789);
 * ```
 */
 var CertificatesCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId, siteId) {
-		super(client);
+	constructor(client, orgSlug, serverId, siteId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 		this.siteId = siteId;
 	}
-	get basePath() {
-		return `/servers/${this.serverId}/sites/${this.siteId}/certificates`;
-	}
-	/**
-	* List certificates for this site.
-	*
-	* @example
-	* ```ts
-	* const certs = await forge.server(123).site(456).certificates.list();
-	*
-	* // Fetch a specific page:
-	* const page2 = await forge.server(123).site(456).certificates.list({ page: 2 });
-	* ```
-	*/
-	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`${this.basePath}${query}`)).certificates;
-	}
-	/**
-	* Iterate over all certificates across all pages.
-	*
-	* @example
-	* ```ts
-	* for await (const cert of forge.server(123).site(456).certificates.all()) {
-	*   console.log(cert);
-	* }
-	*
-	* // Or collect all at once:
-	* const certs = await forge.server(123).site(456).certificates.all().toArray();
-	* ```
-	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	domainPath(domainId) {
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/sites/${this.siteId}/domains/${domainId}/certificate`;
 	}
 	/**
-	* Get a specific certificate.
+	* Get the certificate for a domain.
 	*
 	* @example
 	* ```ts
 	* const cert = await forge.server(123).site(456).certificates.get(789);
 	* ```
 	*/
-	async get(certificateId) {
-		return (await this.client.get(`${this.basePath}/${certificateId}`)).certificate;
+	async get(domainId) {
+		return unwrapDocument$1(await this.client.get(this.domainPath(domainId)));
 	}
 	/**
-	* Create a new SSL certificate.
+	* Create a certificate for a domain.
 	*
 	* @example
 	* ```ts
-	* const cert = await forge.server(123).site(456).certificates.create({
-	*   type: 'new',
-	*   domain: 'example.com',
+	* const cert = await forge.server(123).site(456).certificates.create(789, {
+	*   type: 'letsencrypt',
 	* });
 	* ```
 	*/
-	async create(data) {
-		return (await this.client.post(this.basePath, data)).certificate;
+	async create(domainId, data) {
+		return unwrapDocument$1(await this.client.post(this.domainPath(domainId), data));
 	}
 	/**
-	* Install a Let's Encrypt certificate.
-	*
-	* @example
-	* ```ts
-	* await forge.server(123).site(456).certificates.letsEncrypt(['example.com', 'www.example.com']);
-	* ```
-	*/
-	async letsEncrypt(domains) {
-		return (await this.client.post(`${this.basePath}/letsencrypt`, { domains })).certificate;
-	}
-	/**
-	* Delete a certificate.
+	* Delete the certificate for a domain.
 	*
 	* @example
 	* ```ts
 	* await forge.server(123).site(456).certificates.delete(789);
 	* ```
 	*/
-	async delete(certificateId) {
-		await this.client.delete(`${this.basePath}/${certificateId}`);
+	async delete(domainId) {
+		await this.client.delete(this.domainPath(domainId));
 	}
 	/**
-	* Activate a certificate.
+	* Activate the certificate for a domain.
 	*
 	* @example
 	* ```ts
 	* await forge.server(123).site(456).certificates.activate(789);
 	* ```
 	*/
-	async activate(certificateId) {
-		await this.client.post(`${this.basePath}/${certificateId}/activate`);
+	async activate(domainId) {
+		await this.client.post(`${this.domainPath(domainId)}/actions`, { action: "activate" });
 	}
 };
 /**
@@ -288,13 +250,13 @@ var CertificatesCollection = class extends BaseCollection {
 */
 var CommandsCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId, siteId) {
-		super(client);
+	constructor(client, orgSlug, serverId, siteId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 		this.siteId = siteId;
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/sites/${this.siteId}/commands`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/sites/${this.siteId}/commands`;
 	}
 	/**
 	* List commands run on this site.
@@ -303,13 +265,13 @@ var CommandsCollection = class extends BaseCollection {
 	* ```ts
 	* const commands = await forge.server(123).site(456).commands.list();
 	*
-	* // Fetch a specific page:
-	* const page2 = await forge.server(123).site(456).commands.list({ page: 2 });
+	* // Fetch a specific cursor page:
+	* const page2 = await forge.server(123).site(456).commands.list({ cursor: 'next-cursor-value' });
 	* ```
 	*/
 	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`${this.basePath}${query}`)).commands;
+		const query = options.cursor !== void 0 ? `?page[cursor]=${options.cursor}` : "";
+		return unwrapListDocument$1(await this.client.get(`${this.basePath}${query}`));
 	}
 	/**
 	* Iterate over all commands across all pages.
@@ -324,11 +286,15 @@ var CommandsCollection = class extends BaseCollection {
 	* const commands = await forge.server(123).site(456).commands.all().toArray();
 	* ```
 	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	all() {
+		return new AsyncPaginatedIterator(async (cursor) => {
+			const query = cursor !== null ? `?page[cursor]=${cursor}` : "";
+			const response = await this.client.get(`${this.basePath}${query}`);
+			return {
+				items: unwrapListDocument$1(response),
+				nextCursor: response.meta.next_cursor ?? null
+			};
+		});
 	}
 	/**
 	* Get a specific command.
@@ -339,7 +305,7 @@ var CommandsCollection = class extends BaseCollection {
 	* ```
 	*/
 	async get(commandId) {
-		return (await this.client.get(`${this.basePath}/${commandId}`)).command;
+		return unwrapDocument$1(await this.client.get(`${this.basePath}/${commandId}`));
 	}
 	/**
 	* Run a command on this site.
@@ -352,7 +318,7 @@ var CommandsCollection = class extends BaseCollection {
 	* ```
 	*/
 	async create(data) {
-		return (await this.client.post(this.basePath, data)).command;
+		return unwrapDocument$1(await this.client.post(this.basePath, data));
 	}
 };
 /**
@@ -367,13 +333,13 @@ var CommandsCollection = class extends BaseCollection {
 */
 var SecurityRulesCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId, siteId) {
-		super(client);
+	constructor(client, orgSlug, serverId, siteId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 		this.siteId = siteId;
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/sites/${this.siteId}/security-rules`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/sites/${this.siteId}/security-rules`;
 	}
 	/**
 	* List security rules on this site.
@@ -382,13 +348,13 @@ var SecurityRulesCollection = class extends BaseCollection {
 	* ```ts
 	* const rules = await forge.server(123).site(456).securityRules.list();
 	*
-	* // Fetch a specific page:
-	* const page2 = await forge.server(123).site(456).securityRules.list({ page: 2 });
+	* // Fetch a specific cursor page:
+	* const page2 = await forge.server(123).site(456).securityRules.list({ cursor: 'next-cursor-value' });
 	* ```
 	*/
 	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`${this.basePath}${query}`)).security_rules;
+		const query = options.cursor !== void 0 ? `?page[cursor]=${options.cursor}` : "";
+		return unwrapListDocument$1(await this.client.get(`${this.basePath}${query}`));
 	}
 	/**
 	* Iterate over all security rules across all pages.
@@ -403,11 +369,15 @@ var SecurityRulesCollection = class extends BaseCollection {
 	* const rules = await forge.server(123).site(456).securityRules.all().toArray();
 	* ```
 	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	all() {
+		return new AsyncPaginatedIterator(async (cursor) => {
+			const query = cursor !== null ? `?page[cursor]=${cursor}` : "";
+			const response = await this.client.get(`${this.basePath}${query}`);
+			return {
+				items: unwrapListDocument$1(response),
+				nextCursor: response.meta.next_cursor ?? null
+			};
+		});
 	}
 	/**
 	* Get a specific security rule.
@@ -418,7 +388,7 @@ var SecurityRulesCollection = class extends BaseCollection {
 	* ```
 	*/
 	async get(ruleId) {
-		return (await this.client.get(`${this.basePath}/${ruleId}`)).security_rule;
+		return unwrapDocument$1(await this.client.get(`${this.basePath}/${ruleId}`));
 	}
 	/**
 	* Create a new security rule.
@@ -433,7 +403,7 @@ var SecurityRulesCollection = class extends BaseCollection {
 	* ```
 	*/
 	async create(data) {
-		return (await this.client.post(this.basePath, data)).security_rule;
+		return unwrapDocument$1(await this.client.post(this.basePath, data));
 	}
 	/**
 	* Delete a security rule.
@@ -459,13 +429,13 @@ var SecurityRulesCollection = class extends BaseCollection {
 */
 var RedirectRulesCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId, siteId) {
-		super(client);
+	constructor(client, orgSlug, serverId, siteId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 		this.siteId = siteId;
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/sites/${this.siteId}/redirect-rules`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/sites/${this.siteId}/redirect-rules`;
 	}
 	/**
 	* List redirect rules on this site.
@@ -474,13 +444,13 @@ var RedirectRulesCollection = class extends BaseCollection {
 	* ```ts
 	* const rules = await forge.server(123).site(456).redirectRules.list();
 	*
-	* // Fetch a specific page:
-	* const page2 = await forge.server(123).site(456).redirectRules.list({ page: 2 });
+	* // Fetch a specific cursor page:
+	* const page2 = await forge.server(123).site(456).redirectRules.list({ cursor: 'next-cursor-value' });
 	* ```
 	*/
 	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`${this.basePath}${query}`)).redirect_rules;
+		const query = options.cursor !== void 0 ? `?page[cursor]=${options.cursor}` : "";
+		return unwrapListDocument$1(await this.client.get(`${this.basePath}${query}`));
 	}
 	/**
 	* Iterate over all redirect rules across all pages.
@@ -495,11 +465,15 @@ var RedirectRulesCollection = class extends BaseCollection {
 	* const rules = await forge.server(123).site(456).redirectRules.all().toArray();
 	* ```
 	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	all() {
+		return new AsyncPaginatedIterator(async (cursor) => {
+			const query = cursor !== null ? `?page[cursor]=${cursor}` : "";
+			const response = await this.client.get(`${this.basePath}${query}`);
+			return {
+				items: unwrapListDocument$1(response),
+				nextCursor: response.meta.next_cursor ?? null
+			};
+		});
 	}
 	/**
 	* Get a specific redirect rule.
@@ -510,7 +484,7 @@ var RedirectRulesCollection = class extends BaseCollection {
 	* ```
 	*/
 	async get(ruleId) {
-		return (await this.client.get(`${this.basePath}/${ruleId}`)).redirect_rule;
+		return unwrapDocument$1(await this.client.get(`${this.basePath}/${ruleId}`));
 	}
 	/**
 	* Create a new redirect rule.
@@ -525,7 +499,7 @@ var RedirectRulesCollection = class extends BaseCollection {
 	* ```
 	*/
 	async create(data) {
-		return (await this.client.post(this.basePath, data)).redirect_rule;
+		return unwrapDocument$1(await this.client.post(this.basePath, data));
 	}
 	/**
 	* Delete a redirect rule.
@@ -551,12 +525,12 @@ var RedirectRulesCollection = class extends BaseCollection {
 */
 var SitesCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId) {
-		super(client);
+	constructor(client, orgSlug, serverId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/sites`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/sites`;
 	}
 	/**
 	* List sites on this server.
@@ -565,13 +539,13 @@ var SitesCollection = class extends BaseCollection {
 	* ```ts
 	* const sites = await forge.server(123).sites.list();
 	*
-	* // Fetch a specific page:
-	* const page2 = await forge.server(123).sites.list({ page: 2 });
+	* // Fetch a specific cursor page:
+	* const page2 = await forge.server(123).sites.list({ cursor: 'next-cursor-value' });
 	* ```
 	*/
 	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`${this.basePath}${query}`)).sites;
+		const query = options.cursor !== void 0 ? `?page[cursor]=${options.cursor}` : "";
+		return unwrapListDocument$1(await this.client.get(`${this.basePath}${query}`));
 	}
 	/**
 	* Iterate over all sites across all pages.
@@ -586,11 +560,15 @@ var SitesCollection = class extends BaseCollection {
 	* const sites = await forge.server(123).sites.all().toArray();
 	* ```
 	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	all() {
+		return new AsyncPaginatedIterator(async (cursor) => {
+			const query = cursor !== null ? `?page[cursor]=${cursor}` : "";
+			const response = await this.client.get(`${this.basePath}${query}`);
+			return {
+				items: unwrapListDocument$1(response),
+				nextCursor: response.meta.next_cursor ?? null
+			};
+		});
 	}
 	/**
 	* Get a specific site by ID.
@@ -601,7 +579,7 @@ var SitesCollection = class extends BaseCollection {
 	* ```
 	*/
 	async get(siteId) {
-		return (await this.client.get(`${this.basePath}/${siteId}`)).site;
+		return unwrapDocument$1(await this.client.get(`/orgs/${this.orgSlug}/sites/${siteId}`));
 	}
 	/**
 	* Create a new site on this server.
@@ -609,14 +587,14 @@ var SitesCollection = class extends BaseCollection {
 	* @example
 	* ```ts
 	* const site = await forge.server(123).sites.create({
-	*   domain: 'example.com',
-	*   project_type: 'php',
+	*   type: 'php',
+	*   name: 'example.com',
 	*   directory: '/public',
 	* });
 	* ```
 	*/
 	async create(data) {
-		return (await this.client.post(this.basePath, data)).site;
+		return unwrapDocument$1(await this.client.post(this.basePath, data));
 	}
 	/**
 	* Update a site.
@@ -627,7 +605,7 @@ var SitesCollection = class extends BaseCollection {
 	* ```
 	*/
 	async update(siteId, data) {
-		return (await this.client.put(`${this.basePath}/${siteId}`, data)).site;
+		return unwrapDocument$1(await this.client.put(`${this.basePath}/${siteId}`, data));
 	}
 	/**
 	* Delete a site.
@@ -699,20 +677,20 @@ var SiteResource = class extends BaseCollection {
 	/** Redirect rules for this site. */
 	redirectRules;
 	/** @internal */
-	constructor(client, serverId, siteId) {
-		super(client);
+	constructor(client, orgSlug, serverId, siteId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 		this.siteId = siteId;
-		this.deployments = new DeploymentsCollection(client, serverId, siteId);
-		this.certificates = new CertificatesCollection(client, serverId, siteId);
-		this.env = new SiteEnvResource(client, serverId, siteId);
-		this.nginx = new SiteNginxResource(client, serverId, siteId);
-		this.commands = new CommandsCollection(client, serverId, siteId);
-		this.securityRules = new SecurityRulesCollection(client, serverId, siteId);
-		this.redirectRules = new RedirectRulesCollection(client, serverId, siteId);
+		this.deployments = new DeploymentsCollection(client, orgSlug, serverId, siteId);
+		this.certificates = new CertificatesCollection(client, orgSlug, serverId, siteId);
+		this.env = new SiteEnvResource(client, orgSlug, serverId, siteId);
+		this.nginx = new SiteNginxResource(client, orgSlug, serverId, siteId);
+		this.commands = new CommandsCollection(client, orgSlug, serverId, siteId);
+		this.securityRules = new SecurityRulesCollection(client, orgSlug, serverId, siteId);
+		this.redirectRules = new RedirectRulesCollection(client, orgSlug, serverId, siteId);
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/sites/${this.siteId}`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/sites/${this.siteId}`;
 	}
 	/**
 	* Get this site's details.
@@ -723,7 +701,7 @@ var SiteResource = class extends BaseCollection {
 	* ```
 	*/
 	async get() {
-		return (await this.client.get(this.basePath)).site;
+		return unwrapDocument$1(await this.client.get(`/orgs/${this.orgSlug}/sites/${this.siteId}`));
 	}
 	/**
 	* Deploy this site.
@@ -734,7 +712,7 @@ var SiteResource = class extends BaseCollection {
 	* ```
 	*/
 	async deploy() {
-		await this.client.post(`${this.basePath}/deployment/deploy`);
+		await this.client.post(`${this.basePath}/deployments/deploy`);
 	}
 	/**
 	* Delete this site.
@@ -759,13 +737,13 @@ var SiteResource = class extends BaseCollection {
 */
 var SiteEnvResource = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId, siteId) {
-		super(client);
+	constructor(client, orgSlug, serverId, siteId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 		this.siteId = siteId;
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/sites/${this.siteId}/env`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/sites/${this.siteId}/environment`;
 	}
 	/**
 	* Get the environment file content.
@@ -795,13 +773,13 @@ var SiteEnvResource = class extends BaseCollection {
 */
 var SiteNginxResource = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId, siteId) {
-		super(client);
+	constructor(client, orgSlug, serverId, siteId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 		this.siteId = siteId;
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/sites/${this.siteId}/nginx`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/sites/${this.siteId}/nginx`;
 	}
 	/**
 	* Get the Nginx configuration.
@@ -832,12 +810,12 @@ var SiteNginxResource = class extends BaseCollection {
 */
 var DatabasesCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId) {
-		super(client);
+	constructor(client, orgSlug, serverId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/databases`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/database/schemas`;
 	}
 	/**
 	* List databases on this server.
@@ -846,13 +824,13 @@ var DatabasesCollection = class extends BaseCollection {
 	* ```ts
 	* const dbs = await forge.server(123).databases.list();
 	*
-	* // Fetch a specific page:
-	* const page2 = await forge.server(123).databases.list({ page: 2 });
+	* // Fetch a specific cursor page:
+	* const page2 = await forge.server(123).databases.list({ cursor: 'next-cursor-value' });
 	* ```
 	*/
 	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`${this.basePath}${query}`)).databases;
+		const query = options.cursor !== void 0 ? `?page[cursor]=${options.cursor}` : "";
+		return unwrapListDocument$1(await this.client.get(`${this.basePath}${query}`));
 	}
 	/**
 	* Iterate over all databases across all pages.
@@ -867,11 +845,15 @@ var DatabasesCollection = class extends BaseCollection {
 	* const dbs = await forge.server(123).databases.all().toArray();
 	* ```
 	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	all() {
+		return new AsyncPaginatedIterator(async (cursor) => {
+			const query = cursor !== null ? `?page[cursor]=${cursor}` : "";
+			const response = await this.client.get(`${this.basePath}${query}`);
+			return {
+				items: unwrapListDocument$1(response),
+				nextCursor: response.meta.next_cursor ?? null
+			};
+		});
 	}
 	/**
 	* Get a specific database.
@@ -882,7 +864,7 @@ var DatabasesCollection = class extends BaseCollection {
 	* ```
 	*/
 	async get(databaseId) {
-		return (await this.client.get(`${this.basePath}/${databaseId}`)).database;
+		return unwrapDocument$1(await this.client.get(`${this.basePath}/${databaseId}`));
 	}
 	/**
 	* Create a new database.
@@ -897,7 +879,7 @@ var DatabasesCollection = class extends BaseCollection {
 	* ```
 	*/
 	async create(data) {
-		return (await this.client.post(this.basePath, data)).database;
+		return unwrapDocument$1(await this.client.post(this.basePath, data));
 	}
 	/**
 	* Delete a database.
@@ -923,12 +905,12 @@ var DatabasesCollection = class extends BaseCollection {
 */
 var DatabaseUsersCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId) {
-		super(client);
+	constructor(client, orgSlug, serverId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/database-users`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/database/users`;
 	}
 	/**
 	* List database users on this server.
@@ -937,13 +919,13 @@ var DatabaseUsersCollection = class extends BaseCollection {
 	* ```ts
 	* const users = await forge.server(123).databaseUsers.list();
 	*
-	* // Fetch a specific page:
-	* const page2 = await forge.server(123).databaseUsers.list({ page: 2 });
+	* // Fetch a specific cursor page:
+	* const page2 = await forge.server(123).databaseUsers.list({ cursor: 'next-cursor-value' });
 	* ```
 	*/
 	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`${this.basePath}${query}`)).users;
+		const query = options.cursor !== void 0 ? `?page[cursor]=${options.cursor}` : "";
+		return unwrapListDocument$1(await this.client.get(`${this.basePath}${query}`));
 	}
 	/**
 	* Iterate over all database users across all pages.
@@ -958,11 +940,15 @@ var DatabaseUsersCollection = class extends BaseCollection {
 	* const users = await forge.server(123).databaseUsers.all().toArray();
 	* ```
 	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	all() {
+		return new AsyncPaginatedIterator(async (cursor) => {
+			const query = cursor !== null ? `?page[cursor]=${cursor}` : "";
+			const response = await this.client.get(`${this.basePath}${query}`);
+			return {
+				items: unwrapListDocument$1(response),
+				nextCursor: response.meta.next_cursor ?? null
+			};
+		});
 	}
 	/**
 	* Get a specific database user.
@@ -973,7 +959,7 @@ var DatabaseUsersCollection = class extends BaseCollection {
 	* ```
 	*/
 	async get(userId) {
-		return (await this.client.get(`${this.basePath}/${userId}`)).user;
+		return unwrapDocument$1(await this.client.get(`${this.basePath}/${userId}`));
 	}
 	/**
 	* Create a new database user.
@@ -988,7 +974,7 @@ var DatabaseUsersCollection = class extends BaseCollection {
 	* ```
 	*/
 	async create(data) {
-		return (await this.client.post(this.basePath, data)).user;
+		return unwrapDocument$1(await this.client.post(this.basePath, data));
 	}
 	/**
 	* Delete a database user.
@@ -1014,12 +1000,12 @@ var DatabaseUsersCollection = class extends BaseCollection {
 */
 var DaemonsCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId) {
-		super(client);
+	constructor(client, orgSlug, serverId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/daemons`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/background-processes`;
 	}
 	/**
 	* List daemons on this server.
@@ -1028,13 +1014,13 @@ var DaemonsCollection = class extends BaseCollection {
 	* ```ts
 	* const daemons = await forge.server(123).daemons.list();
 	*
-	* // Fetch a specific page:
-	* const page2 = await forge.server(123).daemons.list({ page: 2 });
+	* // Fetch a specific cursor page:
+	* const page2 = await forge.server(123).daemons.list({ cursor: 'next-cursor-value' });
 	* ```
 	*/
 	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`${this.basePath}${query}`)).daemons;
+		const query = options.cursor !== void 0 ? `?page[cursor]=${options.cursor}` : "";
+		return unwrapListDocument$1(await this.client.get(`${this.basePath}${query}`));
 	}
 	/**
 	* Iterate over all daemons across all pages.
@@ -1049,11 +1035,15 @@ var DaemonsCollection = class extends BaseCollection {
 	* const daemons = await forge.server(123).daemons.all().toArray();
 	* ```
 	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	all() {
+		return new AsyncPaginatedIterator(async (cursor) => {
+			const query = cursor !== null ? `?page[cursor]=${cursor}` : "";
+			const response = await this.client.get(`${this.basePath}${query}`);
+			return {
+				items: unwrapListDocument$1(response),
+				nextCursor: response.meta.next_cursor ?? null
+			};
+		});
 	}
 	/**
 	* Get a specific daemon.
@@ -1064,7 +1054,7 @@ var DaemonsCollection = class extends BaseCollection {
 	* ```
 	*/
 	async get(daemonId) {
-		return (await this.client.get(`${this.basePath}/${daemonId}`)).daemon;
+		return unwrapDocument$1(await this.client.get(`${this.basePath}/${daemonId}`));
 	}
 	/**
 	* Create a new daemon.
@@ -1078,7 +1068,7 @@ var DaemonsCollection = class extends BaseCollection {
 	* ```
 	*/
 	async create(data) {
-		return (await this.client.post(this.basePath, data)).daemon;
+		return unwrapDocument$1(await this.client.post(this.basePath, data));
 	}
 	/**
 	* Delete a daemon.
@@ -1115,12 +1105,12 @@ var DaemonsCollection = class extends BaseCollection {
 */
 var BackupsCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId) {
-		super(client);
+	constructor(client, orgSlug, serverId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/backup-configs`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/database/backups`;
 	}
 	/**
 	* List backup configurations on this server.
@@ -1129,13 +1119,13 @@ var BackupsCollection = class extends BaseCollection {
 	* ```ts
 	* const backups = await forge.server(123).backups.list();
 	*
-	* // Fetch a specific page:
-	* const page2 = await forge.server(123).backups.list({ page: 2 });
+	* // Fetch a specific cursor page:
+	* const page2 = await forge.server(123).backups.list({ cursor: 'next-cursor-value' });
 	* ```
 	*/
 	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`${this.basePath}${query}`)).backups;
+		const query = options.cursor !== void 0 ? `?page[cursor]=${options.cursor}` : "";
+		return unwrapListDocument$1(await this.client.get(`${this.basePath}${query}`));
 	}
 	/**
 	* Iterate over all backup configurations across all pages.
@@ -1150,11 +1140,15 @@ var BackupsCollection = class extends BaseCollection {
 	* const backups = await forge.server(123).backups.all().toArray();
 	* ```
 	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	all() {
+		return new AsyncPaginatedIterator(async (cursor) => {
+			const query = cursor !== null ? `?page[cursor]=${cursor}` : "";
+			const response = await this.client.get(`${this.basePath}${query}`);
+			return {
+				items: unwrapListDocument$1(response),
+				nextCursor: response.meta.next_cursor ?? null
+			};
+		});
 	}
 	/**
 	* Get a specific backup configuration.
@@ -1165,7 +1159,7 @@ var BackupsCollection = class extends BaseCollection {
 	* ```
 	*/
 	async get(backupId) {
-		return (await this.client.get(`${this.basePath}/${backupId}`)).backup;
+		return unwrapDocument$1(await this.client.get(`${this.basePath}/${backupId}`));
 	}
 	/**
 	* Create a new backup configuration.
@@ -1182,7 +1176,7 @@ var BackupsCollection = class extends BaseCollection {
 	* ```
 	*/
 	async create(data) {
-		return (await this.client.post(this.basePath, data)).backup;
+		return unwrapDocument$1(await this.client.post(this.basePath, data));
 	}
 	/**
 	* Delete a backup configuration.
@@ -1208,12 +1202,12 @@ var BackupsCollection = class extends BaseCollection {
 */
 var ScheduledJobsCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId) {
-		super(client);
+	constructor(client, orgSlug, serverId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/jobs`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/scheduled-jobs`;
 	}
 	/**
 	* List scheduled jobs on this server.
@@ -1222,13 +1216,13 @@ var ScheduledJobsCollection = class extends BaseCollection {
 	* ```ts
 	* const jobs = await forge.server(123).scheduledJobs.list();
 	*
-	* // Fetch a specific page:
-	* const page2 = await forge.server(123).scheduledJobs.list({ page: 2 });
+	* // Fetch a specific cursor page:
+	* const page2 = await forge.server(123).scheduledJobs.list({ cursor: 'next-cursor-value' });
 	* ```
 	*/
 	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`${this.basePath}${query}`)).jobs;
+		const query = options.cursor !== void 0 ? `?page[cursor]=${options.cursor}` : "";
+		return unwrapListDocument$1(await this.client.get(`${this.basePath}${query}`));
 	}
 	/**
 	* Iterate over all scheduled jobs across all pages.
@@ -1243,11 +1237,15 @@ var ScheduledJobsCollection = class extends BaseCollection {
 	* const jobs = await forge.server(123).scheduledJobs.all().toArray();
 	* ```
 	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	all() {
+		return new AsyncPaginatedIterator(async (cursor) => {
+			const query = cursor !== null ? `?page[cursor]=${cursor}` : "";
+			const response = await this.client.get(`${this.basePath}${query}`);
+			return {
+				items: unwrapListDocument$1(response),
+				nextCursor: response.meta.next_cursor ?? null
+			};
+		});
 	}
 	/**
 	* Get a specific scheduled job.
@@ -1258,7 +1256,7 @@ var ScheduledJobsCollection = class extends BaseCollection {
 	* ```
 	*/
 	async get(jobId) {
-		return (await this.client.get(`${this.basePath}/${jobId}`)).job;
+		return unwrapDocument$1(await this.client.get(`${this.basePath}/${jobId}`));
 	}
 	/**
 	* Create a new scheduled job.
@@ -1273,7 +1271,7 @@ var ScheduledJobsCollection = class extends BaseCollection {
 	* ```
 	*/
 	async create(data) {
-		return (await this.client.post(this.basePath, data)).job;
+		return unwrapDocument$1(await this.client.post(this.basePath, data));
 	}
 	/**
 	* Delete a scheduled job.
@@ -1299,12 +1297,12 @@ var ScheduledJobsCollection = class extends BaseCollection {
 */
 var MonitorsCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId) {
-		super(client);
+	constructor(client, orgSlug, serverId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/monitors`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/monitors`;
 	}
 	/**
 	* List monitors on this server.
@@ -1313,13 +1311,13 @@ var MonitorsCollection = class extends BaseCollection {
 	* ```ts
 	* const monitors = await forge.server(123).monitors.list();
 	*
-	* // Fetch a specific page:
-	* const page2 = await forge.server(123).monitors.list({ page: 2 });
+	* // Fetch a specific cursor page:
+	* const page2 = await forge.server(123).monitors.list({ cursor: 'next-cursor-value' });
 	* ```
 	*/
 	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`${this.basePath}${query}`)).monitors;
+		const query = options.cursor !== void 0 ? `?page[cursor]=${options.cursor}` : "";
+		return unwrapListDocument$1(await this.client.get(`${this.basePath}${query}`));
 	}
 	/**
 	* Iterate over all monitors across all pages.
@@ -1334,11 +1332,15 @@ var MonitorsCollection = class extends BaseCollection {
 	* const monitors = await forge.server(123).monitors.all().toArray();
 	* ```
 	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	all() {
+		return new AsyncPaginatedIterator(async (cursor) => {
+			const query = cursor !== null ? `?page[cursor]=${cursor}` : "";
+			const response = await this.client.get(`${this.basePath}${query}`);
+			return {
+				items: unwrapListDocument$1(response),
+				nextCursor: response.meta.next_cursor ?? null
+			};
+		});
 	}
 	/**
 	* Get a specific monitor.
@@ -1349,7 +1351,7 @@ var MonitorsCollection = class extends BaseCollection {
 	* ```
 	*/
 	async get(monitorId) {
-		return (await this.client.get(`${this.basePath}/${monitorId}`)).monitor;
+		return unwrapDocument$1(await this.client.get(`${this.basePath}/${monitorId}`));
 	}
 	/**
 	* Create a new monitor.
@@ -1365,7 +1367,7 @@ var MonitorsCollection = class extends BaseCollection {
 	* ```
 	*/
 	async create(data) {
-		return (await this.client.post(this.basePath, data)).monitor;
+		return unwrapDocument$1(await this.client.post(this.basePath, data));
 	}
 	/**
 	* Delete a monitor.
@@ -1391,12 +1393,12 @@ var MonitorsCollection = class extends BaseCollection {
 */
 var FirewallRulesCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId) {
-		super(client);
+	constructor(client, orgSlug, serverId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/firewall-rules`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/firewall-rules`;
 	}
 	/**
 	* List firewall rules on this server.
@@ -1405,13 +1407,13 @@ var FirewallRulesCollection = class extends BaseCollection {
 	* ```ts
 	* const rules = await forge.server(123).firewallRules.list();
 	*
-	* // Fetch a specific page:
-	* const page2 = await forge.server(123).firewallRules.list({ page: 2 });
+	* // Fetch a specific cursor page:
+	* const page2 = await forge.server(123).firewallRules.list({ cursor: 'next-cursor-value' });
 	* ```
 	*/
 	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`${this.basePath}${query}`)).rules;
+		const query = options.cursor !== void 0 ? `?page[cursor]=${options.cursor}` : "";
+		return unwrapListDocument$1(await this.client.get(`${this.basePath}${query}`));
 	}
 	/**
 	* Iterate over all firewall rules across all pages.
@@ -1426,11 +1428,15 @@ var FirewallRulesCollection = class extends BaseCollection {
 	* const rules = await forge.server(123).firewallRules.all().toArray();
 	* ```
 	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	all() {
+		return new AsyncPaginatedIterator(async (cursor) => {
+			const query = cursor !== null ? `?page[cursor]=${cursor}` : "";
+			const response = await this.client.get(`${this.basePath}${query}`);
+			return {
+				items: unwrapListDocument$1(response),
+				nextCursor: response.meta.next_cursor ?? null
+			};
+		});
 	}
 	/**
 	* Get a specific firewall rule.
@@ -1441,7 +1447,7 @@ var FirewallRulesCollection = class extends BaseCollection {
 	* ```
 	*/
 	async get(ruleId) {
-		return (await this.client.get(`${this.basePath}/${ruleId}`)).rule;
+		return unwrapDocument$1(await this.client.get(`${this.basePath}/${ruleId}`));
 	}
 	/**
 	* Create a new firewall rule.
@@ -1456,7 +1462,7 @@ var FirewallRulesCollection = class extends BaseCollection {
 	* ```
 	*/
 	async create(data) {
-		return (await this.client.post(this.basePath, data)).rule;
+		return unwrapDocument$1(await this.client.post(this.basePath, data));
 	}
 	/**
 	* Delete a firewall rule.
@@ -1482,12 +1488,12 @@ var FirewallRulesCollection = class extends BaseCollection {
 */
 var SshKeysCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId) {
-		super(client);
+	constructor(client, orgSlug, serverId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/keys`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/ssh-keys`;
 	}
 	/**
 	* List SSH keys on this server.
@@ -1496,13 +1502,13 @@ var SshKeysCollection = class extends BaseCollection {
 	* ```ts
 	* const keys = await forge.server(123).sshKeys.list();
 	*
-	* // Fetch a specific page:
-	* const page2 = await forge.server(123).sshKeys.list({ page: 2 });
+	* // Fetch a specific cursor page:
+	* const page2 = await forge.server(123).sshKeys.list({ cursor: 'next-cursor-value' });
 	* ```
 	*/
 	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`${this.basePath}${query}`)).keys;
+		const query = options.cursor !== void 0 ? `?page[cursor]=${options.cursor}` : "";
+		return unwrapListDocument$1(await this.client.get(`${this.basePath}${query}`));
 	}
 	/**
 	* Iterate over all SSH keys across all pages.
@@ -1517,11 +1523,15 @@ var SshKeysCollection = class extends BaseCollection {
 	* const keys = await forge.server(123).sshKeys.all().toArray();
 	* ```
 	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	all() {
+		return new AsyncPaginatedIterator(async (cursor) => {
+			const query = cursor !== null ? `?page[cursor]=${cursor}` : "";
+			const response = await this.client.get(`${this.basePath}${query}`);
+			return {
+				items: unwrapListDocument$1(response),
+				nextCursor: response.meta.next_cursor ?? null
+			};
+		});
 	}
 	/**
 	* Get a specific SSH key.
@@ -1532,7 +1542,7 @@ var SshKeysCollection = class extends BaseCollection {
 	* ```
 	*/
 	async get(keyId) {
-		return (await this.client.get(`${this.basePath}/${keyId}`)).key;
+		return unwrapDocument$1(await this.client.get(`${this.basePath}/${keyId}`));
 	}
 	/**
 	* Create a new SSH key.
@@ -1546,7 +1556,7 @@ var SshKeysCollection = class extends BaseCollection {
 	* ```
 	*/
 	async create(data) {
-		return (await this.client.post(this.basePath, data)).key;
+		return unwrapDocument$1(await this.client.post(this.basePath, data));
 	}
 	/**
 	* Delete an SSH key.
@@ -1572,12 +1582,12 @@ var SshKeysCollection = class extends BaseCollection {
 */
 var NginxTemplatesCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client, serverId) {
-		super(client);
+	constructor(client, orgSlug, serverId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
 	}
 	get basePath() {
-		return `/servers/${this.serverId}/nginx/templates`;
+		return `/orgs/${this.orgSlug}/servers/${this.serverId}/nginx/templates`;
 	}
 	/**
 	* List Nginx templates on this server.
@@ -1586,13 +1596,13 @@ var NginxTemplatesCollection = class extends BaseCollection {
 	* ```ts
 	* const templates = await forge.server(123).nginxTemplates.list();
 	*
-	* // Fetch a specific page:
-	* const page2 = await forge.server(123).nginxTemplates.list({ page: 2 });
+	* // Fetch a specific cursor page:
+	* const page2 = await forge.server(123).nginxTemplates.list({ cursor: 'next-cursor-value' });
 	* ```
 	*/
 	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`${this.basePath}${query}`)).templates;
+		const query = options.cursor !== void 0 ? `?page[cursor]=${options.cursor}` : "";
+		return unwrapListDocument$1(await this.client.get(`${this.basePath}${query}`));
 	}
 	/**
 	* Iterate over all Nginx templates across all pages.
@@ -1607,11 +1617,15 @@ var NginxTemplatesCollection = class extends BaseCollection {
 	* const templates = await forge.server(123).nginxTemplates.all().toArray();
 	* ```
 	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	all() {
+		return new AsyncPaginatedIterator(async (cursor) => {
+			const query = cursor !== null ? `?page[cursor]=${cursor}` : "";
+			const response = await this.client.get(`${this.basePath}${query}`);
+			return {
+				items: unwrapListDocument$1(response),
+				nextCursor: response.meta.next_cursor ?? null
+			};
+		});
 	}
 	/**
 	* Get a specific Nginx template.
@@ -1622,7 +1636,7 @@ var NginxTemplatesCollection = class extends BaseCollection {
 	* ```
 	*/
 	async get(templateId) {
-		return (await this.client.get(`${this.basePath}/${templateId}`)).template;
+		return unwrapDocument$1(await this.client.get(`${this.basePath}/${templateId}`));
 	}
 	/**
 	* Create a new Nginx template.
@@ -1636,7 +1650,7 @@ var NginxTemplatesCollection = class extends BaseCollection {
 	* ```
 	*/
 	async create(data) {
-		return (await this.client.post(this.basePath, data)).template;
+		return unwrapDocument$1(await this.client.post(this.basePath, data));
 	}
 	/**
 	* Update an existing Nginx template.
@@ -1650,7 +1664,7 @@ var NginxTemplatesCollection = class extends BaseCollection {
 	* ```
 	*/
 	async update(templateId, data) {
-		return (await this.client.put(`${this.basePath}/${templateId}`, data)).template;
+		return unwrapDocument$1(await this.client.put(`${this.basePath}/${templateId}`, data));
 	}
 	/**
 	* Delete a Nginx template.
@@ -1683,8 +1697,8 @@ var NginxTemplatesCollection = class extends BaseCollection {
 */
 var ServersCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client) {
-		super(client);
+	get basePath() {
+		return `/orgs/${this.orgSlug}/servers`;
 	}
 	/**
 	* List servers.
@@ -1693,13 +1707,13 @@ var ServersCollection = class extends BaseCollection {
 	* ```ts
 	* const servers = await forge.servers.list();
 	*
-	* // Fetch a specific page:
-	* const page2 = await forge.servers.list({ page: 2 });
+	* // Fetch a specific cursor page:
+	* const page2 = await forge.servers.list({ cursor: 'next-cursor-value' });
 	* ```
 	*/
 	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`/servers${query}`)).servers;
+		const query = options.cursor !== void 0 ? `?page[cursor]=${options.cursor}` : "";
+		return unwrapListDocument$1(await this.client.get(`${this.basePath}${query}`));
 	}
 	/**
 	* Iterate over all servers across all pages.
@@ -1714,11 +1728,15 @@ var ServersCollection = class extends BaseCollection {
 	* const servers = await forge.servers.all().toArray();
 	* ```
 	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	all() {
+		return new AsyncPaginatedIterator(async (cursor) => {
+			const query = cursor !== null ? `?page[cursor]=${cursor}` : "";
+			const response = await this.client.get(`${this.basePath}${query}`);
+			return {
+				items: unwrapListDocument$1(response),
+				nextCursor: response.meta.next_cursor ?? null
+			};
+		});
 	}
 	/**
 	* Get a specific server by ID.
@@ -1729,7 +1747,7 @@ var ServersCollection = class extends BaseCollection {
 	* ```
 	*/
 	async get(serverId) {
-		return (await this.client.get(`/servers/${serverId}`)).server;
+		return unwrapDocument$1(await this.client.get(`${this.basePath}/${serverId}`));
 	}
 	/**
 	* Create a new server.
@@ -1747,7 +1765,7 @@ var ServersCollection = class extends BaseCollection {
 	* ```
 	*/
 	async create(data) {
-		return (await this.client.post("/servers", data)).server;
+		return unwrapDocument$1(await this.client.post(this.basePath, data));
 	}
 	/**
 	* Update a server.
@@ -1758,7 +1776,7 @@ var ServersCollection = class extends BaseCollection {
 	* ```
 	*/
 	async update(serverId, data) {
-		return (await this.client.put(`/servers/${serverId}`, data)).server;
+		return unwrapDocument$1(await this.client.put(`${this.basePath}/${serverId}`, data));
 	}
 	/**
 	* Delete a server.
@@ -1769,7 +1787,7 @@ var ServersCollection = class extends BaseCollection {
 	* ```
 	*/
 	async delete(serverId) {
-		await this.client.delete(`/servers/${serverId}`);
+		await this.client.delete(`${this.basePath}/${serverId}`);
 	}
 	/**
 	* Reboot a server.
@@ -1780,7 +1798,7 @@ var ServersCollection = class extends BaseCollection {
 	* ```
 	*/
 	async reboot(serverId) {
-		await this.client.post(`/servers/${serverId}/reboot`);
+		await this.client.post(`${this.basePath}/${serverId}/reboot`);
 	}
 	/**
 	* Find servers by name using case-insensitive partial matching.
@@ -1852,19 +1870,19 @@ var ServerResource = class extends BaseCollection {
 	/** Nginx templates on this server. */
 	nginxTemplates;
 	/** @internal */
-	constructor(client, serverId) {
-		super(client);
+	constructor(client, orgSlug, serverId) {
+		super(client, orgSlug);
 		this.serverId = serverId;
-		this.sites = new SitesCollection(client, serverId);
-		this.databases = new DatabasesCollection(client, serverId);
-		this.databaseUsers = new DatabaseUsersCollection(client, serverId);
-		this.daemons = new DaemonsCollection(client, serverId);
-		this.backups = new BackupsCollection(client, serverId);
-		this.scheduledJobs = new ScheduledJobsCollection(client, serverId);
-		this.monitors = new MonitorsCollection(client, serverId);
-		this.firewallRules = new FirewallRulesCollection(client, serverId);
-		this.sshKeys = new SshKeysCollection(client, serverId);
-		this.nginxTemplates = new NginxTemplatesCollection(client, serverId);
+		this.sites = new SitesCollection(client, orgSlug, serverId);
+		this.databases = new DatabasesCollection(client, orgSlug, serverId);
+		this.databaseUsers = new DatabaseUsersCollection(client, orgSlug, serverId);
+		this.daemons = new DaemonsCollection(client, orgSlug, serverId);
+		this.backups = new BackupsCollection(client, orgSlug, serverId);
+		this.scheduledJobs = new ScheduledJobsCollection(client, orgSlug, serverId);
+		this.monitors = new MonitorsCollection(client, orgSlug, serverId);
+		this.firewallRules = new FirewallRulesCollection(client, orgSlug, serverId);
+		this.sshKeys = new SshKeysCollection(client, orgSlug, serverId);
+		this.nginxTemplates = new NginxTemplatesCollection(client, orgSlug, serverId);
 	}
 	/**
 	* Access a specific site on this server, with nested resources.
@@ -1879,7 +1897,7 @@ var ServerResource = class extends BaseCollection {
 	* ```
 	*/
 	site(siteId) {
-		return new SiteResource(this.client, this.serverId, siteId);
+		return new SiteResource(this.client, this.orgSlug, this.serverId, siteId);
 	}
 	/**
 	* Get this server's details.
@@ -1890,7 +1908,7 @@ var ServerResource = class extends BaseCollection {
 	* ```
 	*/
 	async get() {
-		return (await this.client.get(`/servers/${this.serverId}`)).server;
+		return unwrapDocument$1(await this.client.get(`/orgs/${this.orgSlug}/servers/${this.serverId}`));
 	}
 	/**
 	* Reboot this server.
@@ -1901,7 +1919,7 @@ var ServerResource = class extends BaseCollection {
 	* ```
 	*/
 	async reboot() {
-		await this.client.post(`/servers/${this.serverId}/reboot`);
+		await this.client.post(`/orgs/${this.orgSlug}/servers/${this.serverId}/reboot`);
 	}
 	/**
 	* Delete this server.
@@ -1912,7 +1930,7 @@ var ServerResource = class extends BaseCollection {
 	* ```
 	*/
 	async delete() {
-		await this.client.delete(`/servers/${this.serverId}`);
+		await this.client.delete(`/orgs/${this.orgSlug}/servers/${this.serverId}`);
 	}
 };
 /**
@@ -1927,11 +1945,8 @@ var ServerResource = class extends BaseCollection {
 */
 var RecipesCollection = class extends BaseCollection {
 	/** @internal */
-	constructor(client) {
-		super(client);
-	}
 	get basePath() {
-		return `/recipes`;
+		return `/orgs/${this.orgSlug}/recipes`;
 	}
 	/**
 	* List all recipes.
@@ -1940,13 +1955,13 @@ var RecipesCollection = class extends BaseCollection {
 	* ```ts
 	* const recipes = await forge.recipes.list();
 	*
-	* // Fetch a specific page:
-	* const page2 = await forge.recipes.list({ page: 2 });
+	* // Fetch a specific cursor page:
+	* const page2 = await forge.recipes.list({ cursor: 'next-cursor-value' });
 	* ```
 	*/
 	async list(options = {}) {
-		const query = options.page !== void 0 ? `?page=${options.page}` : "";
-		return (await this.client.get(`${this.basePath}${query}`)).recipes;
+		const query = options.cursor !== void 0 ? `?page[cursor]=${options.cursor}` : "";
+		return unwrapListDocument$1(await this.client.get(`${this.basePath}${query}`));
 	}
 	/**
 	* Iterate over all recipes across all pages.
@@ -1961,11 +1976,15 @@ var RecipesCollection = class extends BaseCollection {
 	* const recipes = await forge.recipes.all().toArray();
 	* ```
 	*/
-	all(options = {}) {
-		return new AsyncPaginatedIterator((page) => this.list({
-			...options,
-			page
-		}));
+	all() {
+		return new AsyncPaginatedIterator(async (cursor) => {
+			const query = cursor !== null ? `?page[cursor]=${cursor}` : "";
+			const response = await this.client.get(`${this.basePath}${query}`);
+			return {
+				items: unwrapListDocument$1(response),
+				nextCursor: response.meta.next_cursor ?? null
+			};
+		});
 	}
 	/**
 	* Get a specific recipe.
@@ -1976,7 +1995,7 @@ var RecipesCollection = class extends BaseCollection {
 	* ```
 	*/
 	async get(recipeId) {
-		return (await this.client.get(`${this.basePath}/${recipeId}`)).recipe;
+		return unwrapDocument$1(await this.client.get(`${this.basePath}/${recipeId}`));
 	}
 	/**
 	* Create a new recipe.
@@ -1991,7 +2010,7 @@ var RecipesCollection = class extends BaseCollection {
 	* ```
 	*/
 	async create(data) {
-		return (await this.client.post(this.basePath, data)).recipe;
+		return unwrapDocument$1(await this.client.post(this.basePath, data));
 	}
 	/**
 	* Delete a recipe.
@@ -2026,7 +2045,7 @@ var RecipesCollection = class extends BaseCollection {
 * ```ts
 * import { Forge } from '@studiometa/forge-sdk';
 *
-* const forge = new Forge('your-api-token');
+* const forge = new Forge('your-api-token', 'my-org');
 *
 * // List all servers
 * const servers = await forge.servers.list();
@@ -2044,6 +2063,8 @@ var RecipesCollection = class extends BaseCollection {
 var Forge = class {
 	/** @internal */
 	client;
+	/** The organization slug used for v2 API URL prefixing. */
+	organizationSlug;
 	/** Server operations (list, get, create, update, delete, reboot). */
 	servers;
 	/** Recipe operations (list, get, create, delete, run). */
@@ -2052,29 +2073,31 @@ var Forge = class {
 	* Create a new Forge SDK instance.
 	*
 	* @param token Your Laravel Forge API token.
+	* @param organizationSlug Your organization slug (used for v2 API URLs).
 	* @param options Optional configuration (custom fetch, base URL, rate limiting).
 	*
 	* @example
 	* ```ts
 	* // Basic usage
-	* const forge = new Forge('your-api-token');
+	* const forge = new Forge('your-api-token', 'my-org');
 	*
 	* // With custom options
-	* const forge = new Forge('your-api-token', {
-	*   baseUrl: 'https://custom-forge-instance.com/api/v1',
+	* const forge = new Forge('your-api-token', 'my-org', {
+	*   baseUrl: 'https://forge.laravel.com/api/v2',
 	* });
 	*
 	* // With mock fetch for testing
-	* const forge = new Forge('test-token', { fetch: mockFetch });
+	* const forge = new Forge('test-token', 'test-org', { fetch: mockFetch });
 	* ```
 	*/
-	constructor(token, options) {
+	constructor(token, organizationSlug, options) {
 		this.client = new HttpClient({
 			token,
 			...options
 		});
-		this.servers = new ServersCollection(this.client);
-		this.recipes = new RecipesCollection(this.client);
+		this.organizationSlug = organizationSlug;
+		this.servers = new ServersCollection(this.client, organizationSlug);
+		this.recipes = new RecipesCollection(this.client, organizationSlug);
 	}
 	/**
 	* Access a specific server by ID, with nested resources.
@@ -2100,7 +2123,7 @@ var Forge = class {
 	* ```
 	*/
 	server(serverId) {
-		return new ServerResource(this.client, serverId);
+		return new ServerResource(this.client, this.organizationSlug, serverId);
 	}
 	/**
 	* Get the currently authenticated user.
@@ -2112,9 +2135,9 @@ var Forge = class {
 	* ```
 	*/
 	async user() {
-		return (await this.client.get("/user")).user;
+		return unwrapDocument$1(await this.client.get("/user"));
 	}
 };
-export { AsyncPaginatedIterator, BackupsCollection, BaseCollection, CertificatesCollection, CommandsCollection, DaemonsCollection, DatabaseUsersCollection, DatabasesCollection, DeploymentsCollection, FirewallRulesCollection, Forge, MonitorsCollection, NginxTemplatesCollection, RecipesCollection, RedirectRulesCollection, ScheduledJobsCollection, SecurityRulesCollection, ServerResource, ServersCollection, SiteEnvResource, SiteNginxResource, SiteResource, SitesCollection, SshKeysCollection };
+export { AsyncPaginatedIterator, BackupsCollection, BaseCollection, CertificatesCollection, CommandsCollection, DaemonsCollection, DatabaseUsersCollection, DatabasesCollection, DeploymentsCollection, FirewallRulesCollection, Forge, MonitorsCollection, NginxTemplatesCollection, RecipesCollection, RedirectRulesCollection, ScheduledJobsCollection, SecurityRulesCollection, ServerResource, ServersCollection, SiteEnvResource, SiteNginxResource, SiteResource, SitesCollection, SshKeysCollection, unwrapDocument, unwrapListDocument, unwrapResource };
 
 //# sourceMappingURL=index.js.map