@better-update/cli 0.31.0 → 0.32.0

package/dist/index.mjs

@@ -34,7 +34,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
 //#region package.json
-var version = "0.31.0";
+var version = "0.32.0";
 
 //#endregion
 //#region src/lib/interactive-mode.ts
@@ -1297,8 +1297,8 @@ var ChannelsGroup = class extends HttpApiGroup.make("channels").add(HttpApiEndpo
 //#endregion
 //#region ../../packages/api/src/domain/device.ts
 const DeviceClass = Schema.Literal("IPHONE", "IPAD", "MAC", "UNKNOWN");
-const IDENTIFIER_PATTERN = /^(?:[A-Fa-f0-9]{40}|[A-Fa-f0-9]{8}-[A-Fa-f0-9]{16}|[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12})$/u;
-const DeviceIdentifier = Schema.String.pipe(Schema.pattern(IDENTIFIER_PATTERN, { message: () => "Identifier must be an Apple UDID: 40 hex chars, 8-16 hex, or UUID (8-4-4-4-12 hex)" }));
+const IDENTIFIER_PATTERN$1 = /^(?:[A-Fa-f0-9]{40}|[A-Fa-f0-9]{8}-[A-Fa-f0-9]{16}|[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12})$/u;
+const DeviceIdentifier = Schema.String.pipe(Schema.pattern(IDENTIFIER_PATTERN$1, { message: () => "Identifier must be an Apple UDID: 40 hex chars, 8-16 hex, or UUID (8-4-4-4-12 hex)" }));
 var Device = class extends Schema.Class("Device")({
 	id: Id,
 	organizationId: Id,
@@ -1324,6 +1324,34 @@ const UpdateDeviceBody = Schema.Struct({
 	enabled: Schema.optional(Schema.Boolean),
 	appleTeamId: Schema.optional(Schema.NullOr(Id))
 });
+/**
+* One device in an App Store Connect snapshot, as reconciled by `syncDevices`.
+* `appleDevicePortalId` is the device's id on Apple's portal — its presence is
+* what the dashboard surfaces as "synced".
+*/
+const SyncDeviceEntry = Schema.Struct({
+	identifier: DeviceIdentifier,
+	name: Name120,
+	deviceClass: DeviceClass,
+	appleDevicePortalId: Schema.String
+});
+/**
+* Reconcile the org's device roster for one Apple team against a snapshot of
+* App Store Connect devices: link portal ids onto existing rows and import any
+* device that only exists on Apple. `appleTeamId` is the internal team Id (UUID).
+*/
+const SyncDevicesBody = Schema.Struct({
+	appleTeamId: Id,
+	devices: Schema.Array(SyncDeviceEntry)
+});
+const SyncDevicesResult = Schema.Struct({
+	/** Devices that existed only on Apple and were imported locally. */
+	created: Schema.Number,
+	/** Local devices that gained (or changed) their Apple portal id. */
+	linked: Schema.Number,
+	/** Local devices already in sync — nothing to do. */
+	unchanged: Schema.Number
+});
 const DeleteDeviceResult = DeletedResult;
 const DeviceSortColumn = Schema.Literal("name", "createdAt", "deviceClass");
 const DeviceSort = sortParam(DeviceSortColumn);
@@ -1374,6 +1402,9 @@ var DevicesGroup = class extends HttpApiGroup.make("devices").add(HttpApiEndpoin
 }))).add(HttpApiEndpoint.del("delete")`/api/devices/${idParam}`.addSuccess(DeleteDeviceResult).annotateContext(OpenApi.annotations({
 	title: "Delete device",
 	description: "Remove a registered device from the organization"
+}))).add(HttpApiEndpoint.post("syncDevices", "/api/devices/sync").setPayload(SyncDevicesBody).addSuccess(SyncDevicesResult).annotateContext(OpenApi.annotations({
+	title: "Sync devices with App Store Connect",
+	description: "Reconcile the org's device roster for one Apple team against an App Store Connect snapshot: link Apple portal ids onto existing devices and import devices that only exist on Apple"
 }))).add(HttpApiEndpoint.post("createRegistrationRequest", "/api/devices/registration-requests").setPayload(CreateRegistrationRequestBody).addSuccess(DeviceRegistrationRequest, { status: 201 }).annotateContext(OpenApi.annotations({
 	title: "Create device registration request",
 	description: "Generate a URL + QR code for self-service device enrollment via Safari on iOS"
@@ -19357,12 +19388,13 @@ const toAscDevice = (value) => {
 	if (!isRecord$1(value)) return null;
 	const { id, attributes } = value;
 	if (typeof id !== "string" || !isRecord$1(attributes)) return null;
-	const { udid, name } = attributes;
+	const { udid, name, deviceClass } = attributes;
 	if (typeof udid !== "string" || typeof name !== "string") return null;
 	return {
 		id,
 		udid,
-		name
+		name,
+		deviceClass: typeof deviceClass === "string" ? deviceClass : null
 	};
 };
 const extractList = (body, map) => {
@@ -19373,6 +19405,18 @@ const extractSingle = (body, map) => {
 	if (!isRecord$1(body)) return null;
 	return map(body["data"]);
 };
+/**
+* App Store Connect paginates list responses (default 200/page) and returns the
+* absolute URL of the next page under `links.next`. Strip the base so it can be
+* fed back into `fetchRaw`; return null when there is no further page.
+*/
+const nextPagePath = (body) => {
+	if (!isRecord$1(body)) return null;
+	const { links } = body;
+	if (!isRecord$1(links) || typeof links["next"] !== "string") return null;
+	const { next } = links;
+	return next.startsWith(API_BASE) ? next.slice(37) : next;
+};
 const malformed = (resource) => new AscApiError({
 	status: 500,
 	message: `Malformed ${resource} response`,
@@ -19420,7 +19464,29 @@ const createBundleId = (credentials, params) => withJwt(credentials, (jwt) => Ef
 	return resource;
 }));
 const listDevices = (credentials) => withJwt(credentials, (jwt) => Effect.gen(function* () {
-	return extractList(yield* fetchRaw(jwt, "/v1/devices?limit=200"), toAscDevice);
+	const devices = [];
+	let path = "/v1/devices?limit=200";
+	while (path !== null) {
+		const body = yield* fetchRaw(jwt, path);
+		devices.push(...extractList(body, toAscDevice));
+		path = nextPagePath(body);
+	}
+	return devices;
+}));
+const createDevice = (credentials, params) => withJwt(credentials, (jwt) => Effect.gen(function* () {
+	const resource = extractSingle(yield* fetchRaw(jwt, "/v1/devices", {
+		method: "POST",
+		body: JSON.stringify({ data: {
+			type: "devices",
+			attributes: {
+				name: params.name,
+				udid: params.udid,
+				platform: "IOS"
+			}
+		} })
+	}), toAscDevice);
+	if (resource === null) return yield* malformed("device");
+	return resource;
 }));
 const createProvisioningProfile = (credentials, params) => withJwt(credentials, (jwt) => Effect.gen(function* () {
 	const relationships = {
@@ -29943,7 +30009,7 @@ const addDeviceCommand = defineCommand({
 		},
 		"apple-team-id": {
 			type: "string",
-			description: "Apple team to assign"
+			description: "Internal team Id (UUID from `credentials list`), not the Apple Team Identifier (e.g. 233P57T2L4)"
 		},
 		invite: {
 			type: "boolean",
@@ -30101,7 +30167,7 @@ const listDevicesCommand = defineCommand({
 		},
 		"apple-team-id": {
 			type: "string",
-			description: "Filter by Apple team ID"
+			description: "Filter by internal team Id (UUID), not the Apple Team Identifier"
 		},
 		query: {
 			type: "string",
@@ -30143,6 +30209,7 @@ const listDevicesCommand = defineCommand({
 			"Class",
 			"UDID",
 			"Team",
+			"Synced",
 			"Enabled"
 		], items.map((device) => [
 			device.id,
@@ -30150,6 +30217,7 @@ const listDevicesCommand = defineCommand({
 			device.deviceClass,
 			device.identifier,
 			device.appleTeamId ?? "—",
+			device.appleDevicePortalId === null ? "no" : "yes",
 			device.enabled ? "yes" : "no"
 		]));
 		return {
@@ -30190,6 +30258,150 @@ const renameDeviceCommand = defineCommand({
 	}))
 });
 
+//#endregion
+//#region src/commands/devices/sync.ts
+const IDENTIFIER_PATTERN = /^(?:[A-Fa-f0-9]{40}|[A-Fa-f0-9]{8}-[A-Fa-f0-9]{16}|[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12})$/u;
+const APPLE_DEVICE_CLASS = {
+	IPHONE: "IPHONE",
+	IPAD: "IPAD",
+	MAC: "MAC"
+};
+const toDeviceClass = (raw) => raw === null ? "UNKNOWN" : APPLE_DEVICE_CLASS[raw] ?? "UNKNOWN";
+const ascErrorMessage = (error) => error._tag === "AscApiError" ? error.message : `Apple request failed: ${String(error.cause)}`;
+const LIST_LIMIT = 100;
+/**
+* Resolve which ASC key authenticates the sync and which internal team it
+* targets. Either flag suffices: an ASC key already carries its team, and a team
+* resolves to the ASC key uploaded for it.
+*/
+const resolveTarget = (api, args) => Effect.gen(function* () {
+	const keyArg = args["asc-api-key-id"];
+	const teamArg = args["apple-team-id"];
+	const ascKeys = yield* api.ascApiKeys.list();
+	if (keyArg !== void 0) {
+		const match = ascKeys.items.find((key) => key.id === keyArg);
+		if (match === void 0) return yield* new InvalidArgumentError({ message: `ASC API key "${keyArg}" not found in this organization.` });
+		const appleTeamId = teamArg ?? match.appleTeamId;
+		if (!appleTeamId) return yield* new InvalidArgumentError({ message: `ASC API key "${keyArg}" is not linked to an Apple team; pass --apple-team-id <uuid>.` });
+		return {
+			ascApiKeyId: keyArg,
+			appleTeamId
+		};
+	}
+	if (teamArg !== void 0) {
+		const match = ascKeys.items.find((key) => key.appleTeamId === teamArg);
+		if (match === void 0) return yield* new InvalidArgumentError({ message: `No ASC API key found for team "${teamArg}". Upload one with \`better-update credentials upload-asc-key\`.` });
+		return {
+			ascApiKeyId: match.id,
+			appleTeamId: teamArg
+		};
+	}
+	return yield* new InvalidArgumentError({ message: "Pass --apple-team-id <uuid> or --asc-api-key-id <id> to choose what to sync." });
+});
+const listAllLocalDevices = (api, appleTeamId) => Effect.gen(function* () {
+	const items = [];
+	let page = 1;
+	let total = Number.POSITIVE_INFINITY;
+	while (items.length < total) {
+		const result = yield* api.devices.list({ urlParams: {
+			appleTeamId,
+			page,
+			limit: LIST_LIMIT
+		} });
+		({total} = result);
+		if (result.items.length === 0) break;
+		items.push(...result.items);
+		page += 1;
+	}
+	return items;
+});
+const syncDeviceCommand = defineCommand({
+	meta: {
+		name: "sync",
+		description: "Sync devices with Apple App Store Connect: register local-only devices on Apple and import devices already registered there"
+	},
+	args: {
+		"apple-team-id": {
+			type: "string",
+			description: "Internal team Id (UUID) to sync; derived from --asc-api-key-id if omitted"
+		},
+		"asc-api-key-id": {
+			type: "string",
+			description: "ASC API key to authenticate with; derived from --apple-team-id if omitted"
+		},
+		push: {
+			type: "boolean",
+			default: true,
+			description: "Register local-only devices on Apple",
+			negativeDescription: "Skip registering local devices on Apple (--no-push)"
+		},
+		pull: {
+			type: "boolean",
+			default: true,
+			description: "Import Apple-registered devices into better-update",
+			negativeDescription: "Skip importing Apple devices (--no-pull)"
+		}
+	},
+	run: async ({ args }) => runEffect(Effect.gen(function* () {
+		const api = yield* apiClient;
+		const target = yield* resolveTarget(api, args);
+		const creds = yield* fetchAscCredentials(api, target.ascApiKeyId);
+		const ascCreds = {
+			keyId: creds.keyId,
+			issuerId: creds.issuerId,
+			p8Pem: creds.p8Pem
+		};
+		const appleDevices = yield* listDevices(ascCreds);
+		const local = yield* listAllLocalDevices(api, target.appleTeamId);
+		const localUdids = new Set(local.map((device) => device.identifier.toLowerCase()));
+		const pushed = [];
+		const pushFailures = [];
+		if (args.push) {
+			const appleUdids = new Set(appleDevices.map((device) => device.udid.toLowerCase()));
+			const toPush = local.filter((device) => !appleUdids.has(device.identifier.toLowerCase()));
+			for (const device of toPush) {
+				const result = yield* Effect.either(createDevice(ascCreds, {
+					name: device.name,
+					udid: device.identifier
+				}));
+				if (Either.isRight(result)) pushed.push(result.right);
+				else pushFailures.push({
+					identifier: device.identifier,
+					message: ascErrorMessage(result.left)
+				});
+			}
+		}
+		const reconcileEntries = [...appleDevices, ...pushed].filter((device) => args.pull || localUdids.has(device.udid.toLowerCase())).filter((device) => IDENTIFIER_PATTERN.test(device.udid) && device.name.length > 0).map((device) => ({
+			identifier: device.udid,
+			name: device.name.slice(0, 120),
+			deviceClass: toDeviceClass(device.deviceClass),
+			appleDevicePortalId: device.id
+		}));
+		const summary = reconcileEntries.length > 0 ? yield* api.devices.syncDevices({ payload: {
+			appleTeamId: target.appleTeamId,
+			devices: reconcileEntries
+		} }) : {
+			created: 0,
+			linked: 0,
+			unchanged: 0
+		};
+		yield* printHumanKeyValue([
+			["Apple devices", String(appleDevices.length + pushed.length)],
+			["Pushed to Apple", String(pushed.length)],
+			["Imported locally", String(summary.created)],
+			["Linked (portal id set)", String(summary.linked)],
+			["Already synced", String(summary.unchanged)]
+		]);
+		for (const failure of pushFailures) yield* printHuman(`⚠ Could not push ${failure.identifier} to Apple: ${failure.message}`);
+		return {
+			appleTeamId: target.appleTeamId,
+			pushed: pushed.length,
+			...summary,
+			pushFailures
+		};
+	}), { json: "value" })
+});
+
 //#endregion
 //#region src/commands/devices/view.ts
 const viewDeviceCommand = defineCommand({
@@ -30230,6 +30442,7 @@ const devicesCommand = defineCommand({
 		add: addDeviceCommand,
 		list: listDevicesCommand,
 		view: viewDeviceCommand,
+		sync: syncDeviceCommand,
 		rename: renameDeviceCommand,
 		enable: enableDeviceCommand,
 		disable: disableDeviceCommand,