@better-update/cli 0.7.1 → 0.8.1

package/dist/index.mjs

@@ -13,6 +13,7 @@ import os from "node:os";
 import plist from "@expo/plist";
 import { ExpoRunFormatter } from "@expo/xcpretty";
 import { getFormattedSerialNumber, getX509Certificate, parsePKCS12 } from "@expo/pkcs12";
+import { once } from "node:events";
 import { createServer } from "node:http";
 import { cancel, isCancel, password } from "@clack/prompts";
 
@@ -21,7 +22,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
 //#region package.json
-var version = "0.7.1";
+var version = "0.8.1";
 
 //#endregion
 //#region ../../packages/type-guards/src/index.ts
@@ -664,8 +665,20 @@ var Branch = class extends Schema.Class("Branch")({
 	id: Id,
 	projectId: Id,
 	name: Schema.String,
-	createdAt: DateTimeString
+	createdAt: DateTimeString,
+	updateCount: Schema.Number
 }) {};
+const BranchSortColumn = Schema.Literal("name", "createdAt", "updateCount");
+/**
+* Sort param: column name optionally prefixed with `-` for descending.
+* Example: `name` (asc), `-createdAt` (desc).
+*/
+const BranchSort = Schema.Union(BranchSortColumn, Schema.TemplateLiteral("-", BranchSortColumn));
+const ListBranchesParams = Schema.Struct({
+	projectId: Id,
+	...PaginationParams.fields,
+	sort: Schema.optional(BranchSort)
+});
 const CreateBranchBody = Schema.Struct({
 	projectId: Id,
 	name: Schema.String.pipe(Schema.minLength(1))
@@ -679,10 +692,12 @@ const idParam$8 = HttpApiSchema.param("id", Schema.String);
 var BranchesGroup = class extends HttpApiGroup.make("branches").add(HttpApiEndpoint.post("create", "/api/branches").setPayload(CreateBranchBody).addSuccess(Branch, { status: 201 }).annotateContext(OpenApi.annotations({
 	title: "Create branch",
 	description: "Create a new branch within a project"
-}))).add(HttpApiEndpoint.get("list", "/api/branches").setUrlParams(Schema.Struct({
-	projectId: Id,
-	...CursorPaginationParams.fields
-})).addSuccess(cursorPageResult(Branch)).annotateContext(OpenApi.annotations({
+}))).add(HttpApiEndpoint.get("list", "/api/branches").setUrlParams(ListBranchesParams).addSuccess(Schema.Struct({
+	items: Schema.Array(Branch),
+	total: Schema.Number,
+	page: Schema.Number,
+	limit: Schema.Number
+})).annotateContext(OpenApi.annotations({
 	title: "List branches",
 	description: "List all branches for a project"
 }))).add(HttpApiEndpoint.patch("rename")`/api/branches/${idParam$8}`.setPayload(UpdateBranchBody).addSuccess(Branch).addError(Conflict).annotateContext(OpenApi.annotations({
@@ -829,6 +844,21 @@ const CreateBuildBody = Schema.Union(Schema.Struct({
 	distribution: Schema.Literal("direct"),
 	artifactFormat: Schema.Literal("apk")
 }));
+const BuildSortColumn = Schema.Literal("createdAt", "platform", "distribution", "runtimeVersion", "appVersion");
+/**
+* Sort param: column name optionally prefixed with `-` for descending.
+* Example: `runtimeVersion` (asc), `-createdAt` (desc).
+*/
+const BuildSort = Schema.Union(BuildSortColumn, Schema.TemplateLiteral("-", BuildSortColumn));
+const ListBuildsParams = Schema.Struct({
+	projectId: Id,
+	platform: Schema.optional(Platform),
+	profile: Schema.optional(Schema.String),
+	runtimeVersion: Schema.optional(Schema.String),
+	distribution: Schema.optional(Distribution),
+	...PaginationParams.fields,
+	sort: Schema.optional(BuildSort)
+});
 const CompleteBuildBody = Schema.Struct({
 	sha256: Sha256Hex,
 	byteSize: Schema.Number.pipe(Schema.nonNegative())
@@ -892,13 +922,12 @@ var BuildsGroup = class extends HttpApiGroup.make("builds").add(HttpApiEndpoint.
 }))).add(HttpApiEndpoint.post("complete")`/api/builds/${idParam$7}/complete`.setPayload(CompleteBuildBody).addSuccess(BuildWithArtifact).addError(Conflict).annotateContext(OpenApi.annotations({
 	title: "Complete build",
 	description: "Finalize a build after artifact upload"
-}))).add(HttpApiEndpoint.get("list", "/api/builds").setUrlParams(Schema.Struct({
-	projectId: Id,
-	platform: Schema.optional(Platform),
-	profile: Schema.optional(Schema.String),
-	runtimeVersion: Schema.optional(Schema.String),
-	...CursorPaginationParams.fields
-})).addSuccess(cursorPageResult(BuildWithArtifact)).annotateContext(OpenApi.annotations({
+}))).add(HttpApiEndpoint.get("list", "/api/builds").setUrlParams(ListBuildsParams).addSuccess(Schema.Struct({
+	items: Schema.Array(BuildWithArtifact),
+	total: Schema.Number,
+	page: Schema.Number,
+	limit: Schema.Number
+})).annotateContext(OpenApi.annotations({
 	title: "List builds",
 	description: "List builds for a project with optional filters"
 }))).add(HttpApiEndpoint.get("compatibilityMatrix", "/api/builds/compatibility-matrix").setUrlParams(Schema.Struct({ projectId: Id })).addSuccess(BuildCompatibilityMatrixResult).annotateContext(OpenApi.annotations({
@@ -930,6 +959,17 @@ var Channel = class extends Schema.Class("Channel")({
 	isPaused: Schema.Boolean,
 	createdAt: DateTimeString
 }) {};
+const ChannelSortColumn = Schema.Literal("name", "createdAt");
+/**
+* Sort param: column name optionally prefixed with `-` for descending.
+* Example: `name` (asc), `-createdAt` (desc).
+*/
+const ChannelSort = Schema.Union(ChannelSortColumn, Schema.TemplateLiteral("-", ChannelSortColumn));
+const ListChannelsParams = Schema.Struct({
+	projectId: Id,
+	...PaginationParams.fields,
+	sort: Schema.optional(ChannelSort)
+});
 const CreateChannelBody = Schema.Struct({
 	projectId: Id,
 	name: Schema.String.pipe(Schema.minLength(1)),
@@ -951,10 +991,12 @@ var ChannelsGroup = class extends HttpApiGroup.make("channels").add(HttpApiEndpo
 }))).add(HttpApiEndpoint.patch("update")`/api/channels/${idParam$6}`.setPayload(UpdateChannelBody).addSuccess(Channel).annotateContext(OpenApi.annotations({
 	title: "Update channel",
 	description: "Relink channel to a different branch"
-}))).add(HttpApiEndpoint.get("list", "/api/channels").setUrlParams(Schema.Struct({
-	projectId: Id,
-	...CursorPaginationParams.fields
-})).addSuccess(cursorPageResult(Channel)).annotateContext(OpenApi.annotations({
+}))).add(HttpApiEndpoint.get("list", "/api/channels").setUrlParams(ListChannelsParams).addSuccess(Schema.Struct({
+	items: Schema.Array(Channel),
+	total: Schema.Number,
+	page: Schema.Number,
+	limit: Schema.Number
+})).annotateContext(OpenApi.annotations({
 	title: "List channels",
 	description: "List all channels for a project"
 }))).add(HttpApiEndpoint.post("pause")`/api/channels/${idParam$6}/pause`.addSuccess(Channel).annotateContext(OpenApi.annotations({
@@ -1014,11 +1056,18 @@ const UpdateDeviceBody = Schema.Struct({
 	appleTeamId: Schema.optional(Schema.NullOr(Id))
 });
 const DeleteDeviceResult = Schema.Struct({ deleted: Schema.Number });
+const DeviceSortColumn = Schema.Literal("name", "createdAt", "deviceClass");
+/**
+* Sort param: column name optionally prefixed with `-` for descending.
+* Example: `name` (asc), `-createdAt` (desc).
+*/
+const DeviceSort = Schema.Union(DeviceSortColumn, Schema.TemplateLiteral("-", DeviceSortColumn));
 const ListDevicesParams = Schema.Struct({
-	...CursorPaginationParams.fields,
+	...PaginationParams.fields,
 	deviceClass: Schema.optional(DeviceClass),
 	appleTeamId: Schema.optional(Id),
-	query: Schema.optional(Schema.String)
+	query: Schema.optional(Schema.String),
+	sort: Schema.optional(DeviceSort)
 });
 var DeviceRegistrationRequest = class extends Schema.Class("DeviceRegistrationRequest")({
 	id: Id,
@@ -1049,7 +1098,12 @@ const idParam$5 = HttpApiSchema.param("id", Schema.String);
 var DevicesGroup = class extends HttpApiGroup.make("devices").add(HttpApiEndpoint.post("register", "/api/devices").setPayload(RegisterDeviceBody).addSuccess(Device, { status: 201 }).annotateContext(OpenApi.annotations({
 	title: "Register device",
 	description: "Register an Apple device UDID in the caller's active organization"
-}))).add(HttpApiEndpoint.get("list", "/api/devices").setUrlParams(ListDevicesParams).addSuccess(cursorPageResult(Device)).annotateContext(OpenApi.annotations({
+}))).add(HttpApiEndpoint.get("list", "/api/devices").setUrlParams(ListDevicesParams).addSuccess(Schema.Struct({
+	items: Schema.Array(Device),
+	total: Schema.Number,
+	page: Schema.Number,
+	limit: Schema.Number
+})).annotateContext(OpenApi.annotations({
 	title: "List devices",
 	description: "List registered Apple devices in the caller's active organization"
 }))).add(HttpApiEndpoint.get("get")`/api/devices/${idParam$5}`.addSuccess(Device).annotateContext(OpenApi.annotations({
@@ -1256,7 +1310,12 @@ var Project = class extends Schema.Class("Project")({
 	channelCount: Schema.Number,
 	updateCount: Schema.Number
 }) {};
-const ProjectSort = Schema.Literal("lastActivityAt", "name");
+const ProjectSortColumn = Schema.Literal("lastActivityAt", "name", "createdAt", "branchCount", "channelCount", "updateCount");
+/**
+* Sort param: column name optionally prefixed with `-` for descending.
+* Example: `name` (asc), `-lastActivityAt` (desc).
+*/
+const ProjectSort = Schema.Union(ProjectSortColumn, Schema.TemplateLiteral("-", ProjectSortColumn));
 const ListProjectsParams = Schema.Struct({
 	...PaginationParams.fields,
 	query: Schema.optional(Schema.String),
@@ -1320,6 +1379,19 @@ var Update = class extends Schema.Class("Update")({
 	directiveBody: Schema.NullOr(Schema.String),
 	createdAt: DateTimeString
 }) {};
+const UpdateSortColumn = Schema.Literal("createdAt", "runtimeVersion", "platform", "rolloutPercentage");
+/**
+* Sort param: column name optionally prefixed with `-` for descending.
+* Example: `runtimeVersion` (asc), `-createdAt` (desc).
+*/
+const UpdateSort = Schema.Union(UpdateSortColumn, Schema.TemplateLiteral("-", UpdateSortColumn));
+const ListUpdatesParams = Schema.Struct({
+	projectId: Id,
+	branchId: Schema.optional(Id),
+	platform: Schema.optional(Platform),
+	...PaginationParams.fields,
+	sort: Schema.optional(UpdateSort)
+});
 const AssetRef = Schema.Struct({
 	hash: Schema.String,
 	key: Schema.String,
@@ -1372,12 +1444,12 @@ const groupIdParam = HttpApiSchema.param("groupId", Schema.String);
 var UpdatesGroup = class extends HttpApiGroup.make("updates").add(HttpApiEndpoint.post("create", "/api/updates").setPayload(CreateUpdateBody).addSuccess(Update, { status: 201 }).addError(Conflict).annotateContext(OpenApi.annotations({
 	title: "Create update",
 	description: "Publish a new update (manifest + directive) to a branch"
-}))).add(HttpApiEndpoint.get("list", "/api/updates").setUrlParams(Schema.Struct({
-	projectId: Id,
-	branchId: Schema.optional(Id),
-	platform: Schema.optional(Platform),
-	...CursorPaginationParams.fields
-})).addSuccess(cursorPageResult(Update)).annotateContext(OpenApi.annotations({
+}))).add(HttpApiEndpoint.get("list", "/api/updates").setUrlParams(ListUpdatesParams).addSuccess(Schema.Struct({
+	items: Schema.Array(Update),
+	total: Schema.Number,
+	page: Schema.Number,
+	limit: Schema.Number
+})).annotateContext(OpenApi.annotations({
 	title: "List updates",
 	description: "List updates for a project, optionally filtered by branch"
 }))).add(HttpApiEndpoint.del("deleteGroup")`/api/updates/${groupIdParam}`.addSuccess(DeleteUpdateResult).annotateContext(OpenApi.annotations({
@@ -2004,21 +2076,18 @@ const auditLogsCommand = defineCommand({
 
 //#endregion
 //#region src/lib/drain-cursor.ts
-const PAGE_SIZE = 100;
 const MAX_PAGES = 100;
 /**
-* Drain a cursor-paginated list endpoint into a single array. CLI commands
-* that resolve names → IDs (e.g. branch lookup) need the full set, not a
-* page slice.
+* Drain a page-numbered list endpoint into a single array. Used by CLI
+* commands that need the full set, not a page slice.
 */
-const drainCursor = (fetchPage) => {
-	const loop = (accumulator, cursor, pages) => fetchPage(cursor).pipe(Effect.flatMap((page) => {
-		const next = [...accumulator, ...page.items];
-		const { nextCursor } = page;
-		const reachedLimit = pages + 1 >= MAX_PAGES || next.length >= PAGE_SIZE * MAX_PAGES;
-		return nextCursor === null || reachedLimit ? Effect.succeed(next) : loop(next, nextCursor, pages + 1);
+const drainPages = (fetchPage) => {
+	const loop = (accumulator, page) => fetchPage(page).pipe(Effect.flatMap((response) => {
+		const next = [...accumulator, ...response.items];
+		const fetched = page * response.limit;
+		return page >= MAX_PAGES || next.length >= response.total || fetched >= response.total ? Effect.succeed(next) : loop(next, page + 1);
 	}));
-	return loop([], void 0, 0);
+	return loop([], 1);
 };
 
 //#endregion
@@ -2031,10 +2100,10 @@ const listCommand$6 = defineCommand({
 	run: async () => runEffect(Effect.gen(function* () {
 		const projectId = yield* readProjectId;
 		const api = yield* apiClient;
-		const items = yield* drainCursor((cursor) => api.branches.list({ urlParams: {
+		const items = yield* drainPages((page) => api.branches.list({ urlParams: {
 			projectId,
 			limit: 100,
-			...cursor ? { cursor } : {}
+			page
 		} }));
 		if (items.length === 0) {
 			yield* Console.log("No branches found.");
@@ -3686,10 +3755,10 @@ const createCommand$2 = defineCommand({
 		const projectId = yield* readProjectId;
 		const api = yield* apiClient;
 		const branchId = yield* resolveNamedResourceId$1({
-			items: yield* drainCursor((cursor) => api.branches.list({ urlParams: {
+			items: yield* drainPages((page) => api.branches.list({ urlParams: {
 				projectId,
 				limit: 100,
-				...cursor ? { cursor } : {}
+				page
 			} })),
 			kind: "Branch",
 			name: args.branch
@@ -3736,14 +3805,14 @@ const listCommand$4 = defineCommand({
 	run: async () => runEffect(Effect.gen(function* () {
 		const projectId = yield* readProjectId;
 		const api = yield* apiClient;
-		const [items, branches] = yield* Effect.all([drainCursor((cursor) => api.channels.list({ urlParams: {
+		const [items, branches] = yield* Effect.all([drainPages((page) => api.channels.list({ urlParams: {
 			projectId,
 			limit: 100,
-			...cursor ? { cursor } : {}
-		} })), drainCursor((cursor) => api.branches.list({ urlParams: {
+			page
+		} })), drainPages((page) => api.branches.list({ urlParams: {
 			projectId,
 			limit: 100,
-			...cursor ? { cursor } : {}
+			page
 		} }))]);
 		if (items.length === 0) {
 			yield* Console.log("No channels found.");
@@ -3851,10 +3920,10 @@ const createCommand$1 = defineCommand({
 		const projectId = yield* readProjectId;
 		const api = yield* apiClient;
 		const newBranchId = yield* resolveNamedResourceId$1({
-			items: yield* drainCursor((cursor) => api.branches.list({ urlParams: {
+			items: yield* drainPages((page) => api.branches.list({ urlParams: {
 				projectId,
 				limit: 100,
-				...cursor ? { cursor } : {}
+				page
 			} })),
 			kind: "Branch",
 			name: args.branch
@@ -3955,10 +4024,10 @@ const updateCommand$1 = defineCommand({
 		const projectId = yield* readProjectId;
 		const api = yield* apiClient;
 		const branchId = yield* resolveNamedResourceId$1({
-			items: yield* drainCursor((cursor) => api.branches.list({ urlParams: {
+			items: yield* drainPages((page) => api.branches.list({ urlParams: {
 				projectId,
 				limit: 100,
-				...cursor ? { cursor } : {}
+				page
 			} })),
 			kind: "Branch",
 			name: args.branch
@@ -4870,12 +4939,13 @@ const handleIncoming = async (req, res, session) => {
 		res.end("Local callback failed");
 	}
 };
-const createBrowserLoginServer = (options = {}) => {
+const createBrowserLoginServer = async (options = {}) => {
 	const session = createBrowserLoginSession(options);
 	const server = createServer((req, res) => {
 		handleIncoming(req, res, session).catch(() => void 0);
 	});
 	server.listen(0, "127.0.0.1");
+	await once(server, "listening");
 	const address = server.address();
 	return {
 		callbackUrl: `http://127.0.0.1:${address !== null && typeof address === "object" ? address.port : 0}${session.callbackPath}`,
@@ -4913,7 +4983,7 @@ const browserLogin = Effect.scoped(Effect.gen(function* () {
 	const configStore = yield* ConfigStore;
 	const authStore = yield* AuthStore;
 	const webUrl = yield* configStore.getWebUrl;
-	const loginServer = yield* Effect.acquireRelease(Effect.sync(createBrowserLoginServer), (server) => Effect.sync(server.stop));
+	const loginServer = yield* Effect.acquireRelease(Effect.promise(async () => createBrowserLoginServer()), (server) => Effect.sync(server.stop));
 	const loginUrl = `${webUrl}/auth/cli-login?callbackUrl=${encodeURIComponent(loginServer.callbackUrl)}`;
 	yield* Console.log("Opening browser for better-update login...");
 	yield* Console.log("");
@@ -5162,8 +5232,8 @@ const statusCommand = defineCommand({
 		yield* Console.log("");
 		yield* Console.log("Builds");
 		yield* Console.log("------");
-		const moreSuffix = builds.nextCursor === null ? "" : "+";
-		yield* printKeyValue([["Recent", `${String(builds.items.length)}${moreSuffix}`]]);
+		const moreSuffix = builds.items.length < builds.total ? "+" : "";
+		yield* printKeyValue([["Recent", `${String(builds.items.length)}${moreSuffix}`], ["Total", String(builds.total)]]);
 	}))
 });
 
@@ -5219,10 +5289,10 @@ const listCommand = defineCommand({
 		const limit = yield* parseLimit(args.limit, 20);
 		const projectId = yield* readProjectId;
 		const api = yield* apiClient;
-		const branches = yield* drainCursor((cursor) => api.branches.list({ urlParams: {
+		const branches = yield* drainPages((page) => api.branches.list({ urlParams: {
 			projectId,
 			limit: 100,
-			...cursor ? { cursor } : {}
+			page
 		} }));
 		const branchId = args.branch ? yield* resolveNamedResourceId({
 			items: branches,