@limrun/ui 0.13.8 → 0.14.0-rc.1

package/dist/device-install/react.js

@@ -1,100 +1,104 @@
-import { useState as u, useRef as h, useCallback as l, useEffect as D } from "react";
-import { closeDeviceRelayTarget as d, requestUSBAccess as N, pairDevice as q, startDeviceInstall as C } from "./index.js";
-import { j as T, k as j } from "../browser-storage-Cx9eW-bm.mjs";
-function F({
-  apiUrl: a,
+import { useState as u, useRef as g, useCallback as l, useEffect as S } from "react";
+import { closeDeviceRelayTarget as d, requestUSBAccess as C, pairDevice as I, startDeviceInstall as T } from "./index.js";
+import { j, k as x } from "../browser-storage-Cx9eW-bm.mjs";
+function H({
+  apiUrl: c,
   token: v,
-  log: R = x
+  organizationId: f,
+  log: m = L
 }) {
-  const [e, m] = u(), [n, y] = u(), [g, s] = u(), [P, i] = u(), [S, f] = u(!1), w = h(void 0), b = h(void 0), r = h(R);
-  r.current = R;
-  const c = l(async () => {
-    w.current?.close(), w.current = void 0, await d(b.current, r.current);
+  const [e, D] = u(), [n, h] = u(), [p, s] = u(), [b, i] = u(), [A, w] = u(!1), y = g(void 0), P = g(void 0), r = g(m);
+  r.current = m;
+  const a = l(async () => {
+    y.current?.close(), y.current = void 0, await d(P.current, r.current);
   }, []);
-  D(() => {
-    b.current = e;
-  }, [e]), D(() => () => {
-    c();
-  }, [c]);
-  const A = l(async () => {
-    s("usb"), i(void 0), f(!1);
+  S(() => {
+    P.current = e;
+  }, [e]), S(() => () => {
+    a();
+  }, [a]);
+  const B = l(async () => {
+    s("usb"), i(void 0), w(!1);
     let t;
     try {
-      await c(), t = await N({ log: r.current });
-      const o = await T(t.hello.serialNumber);
-      return m(t), y(o), r.current(
+      await a(), t = await C({ log: r.current });
+      const o = await j(t.hello.serialNumber);
+      return D(t), h(o), r.current(
         o ? "Pair record found" : "No pair record found",
         t.hello.serialNumber
       ), t;
     } catch (o) {
-      await d(t, r.current), m(void 0), y(void 0), i(p(o));
+      await d(t, r.current), D(void 0), h(void 0), i(R(o));
       return;
     } finally {
       s(void 0);
     }
-  }, [c]), B = l(async () => {
-    if (!a || !e)
+  }, [a]), E = l(async () => {
+    if (!c || !e)
       throw new Error("Select a USB device before pairing.");
-    s("pair"), i(void 0), f(!1);
+    s("pair"), i(void 0), w(!1);
     try {
-      await c();
-      const t = await q({
-        limbuildApiUrl: a,
+      await a();
+      const t = await I({
+        registryApiUrl: c,
         token: v,
+        organizationId: f,
         log: r.current,
         target: e
-      }), o = await j(t.pairRecord, {
+      }), o = await x(t.pairRecord, {
         productName: e.hello.productName
       });
-      return t.relay.close(), await d(e, r.current), y(o), f(!1), r.current("Device paired", "The pair record was stored locally in this browser."), o;
+      return t.relay.close(), await d(e, r.current), h(o), w(!1), r.current("Device paired", "The pair record was stored locally in this browser."), o;
     } catch (t) {
-      await d(e, r.current), f(!0), i(p(t));
+      await d(e, r.current), w(!0), i(R(t));
       return;
     } finally {
       s(void 0);
     }
-  }, [a, c, e, v]), E = l(async () => {
-    if (!a || !e || !n)
+  }, [c, a, e, f, v]), N = l(async (t) => {
+    if (!c || !e || !n)
       throw new Error("Select and pair a USB device before starting installation.");
     s("install"), i(void 0);
     try {
-      return await c(), w.current = await C({
-        limbuildApiUrl: a,
+      return await a(), y.current = await T({
+        registryApiUrl: c,
         token: v,
+        organizationId: f,
         log: r.current,
         target: e,
-        pairRecord: n
-      }), r.current("Device install started", "Installation will continue through the connected iPhone."), w.current;
-    } catch (t) {
-      await d(e, r.current), i(p(t));
+        pairRecord: n,
+        installSource: t
+      }), r.current("Device install started", "Installation will continue through the connected iPhone."), y.current;
+    } catch (o) {
+      await d(e, r.current), i(R(o));
       return;
     } finally {
       s(void 0);
     }
-  }, [a, c, e, n, v]), I = l(() => {
-    c(), r.current("Device relay stopped");
-  }, [c]);
+  }, [c, a, e, f, n, v]), q = l(() => {
+    a(), r.current("Device relay stopped");
+  }, [a]);
   return {
     device: e,
     pairRecord: n,
-    busyAction: g,
-    error: P,
-    pairConfirmationRequired: S,
+    busyAction: p,
+    error: b,
+    pairConfirmationRequired: A,
     hasPairRecord: !!n,
-    canPair: !!a && !g && !!e,
-    canInstall: !!a && !g && !!e && !!n,
-    requestUSBAccess: A,
-    pairBrowser: B,
-    startInstallation: E,
-    stopRelay: I,
+    canPair: !!c && !p && !!e,
+    canInstall: !!c && !p && !!e && !!n,
+    requestUSBAccess: B,
+    pairBrowser: E,
+    startInstallation: N,
+    stopRelay: q,
     clearError: () => i(void 0)
   };
 }
-function x() {
+function L() {
 }
-function p(a) {
-  return a instanceof Error ? a.message : String(a);
+function R(c) {
+  return c instanceof Error ? c.message : String(c);
 }
 export {
-  F as useDeviceInstallRelay
+  H as useDeviceInstallRelay
 };

package/dist/limbuild-client-BagK_FWE.mjs

@@ -0,0 +1,83 @@
+async function u(r, t) {
+  const n = new URL(`${r}/info`);
+  t && n.searchParams.set("token", t);
+  const e = await fetch(n.toString(), {
+    headers: t ? { Authorization: `Bearer ${t}` } : void 0
+  });
+  if (!e.ok) {
+    const s = await e.text();
+    throw new Error(`Info request failed: HTTP ${e.status} ${s}`);
+  }
+  return await e.json();
+}
+async function l({
+  limbuildApiUrl: r,
+  token: t,
+  certificateP12Base64: n,
+  certificatePassword: e,
+  provisioningProfileBase64: s,
+  signedUploadUrl: i
+}) {
+  const d = new URL(`${r}/exec`);
+  t && d.searchParams.set("token", t);
+  const a = await fetch(d.toString(), {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      ...t ? { Authorization: `Bearer ${t}` } : {}
+    },
+    body: JSON.stringify({
+      command: "xcodebuild",
+      xcodebuild: { sdk: "iphoneos" },
+      ...i ? { signedUploadUrl: i } : {},
+      signing: {
+        certificateP12Base64: n,
+        ...e ? { certificatePassword: e } : {},
+        provisioningProfileBase64: s
+      }
+    })
+  });
+  if (!a.ok) {
+    const o = await a.text();
+    throw new Error(`Build request failed: HTTP ${a.status} ${o}`);
+  }
+  return await a.json();
+}
+async function f({ limbuildApiUrl: r, execId: t, token: n }) {
+  const e = new URL(`${r}/exec/${encodeURIComponent(t)}/ios/ota`);
+  n && e.searchParams.set("token", n);
+  const s = await fetch(e.toString(), {
+    headers: n ? { Authorization: `Bearer ${n}` } : void 0
+  });
+  if (!s.ok) {
+    const i = await s.text();
+    throw new Error(`OTA install metadata failed: HTTP ${s.status} ${i}`);
+  }
+  return await s.json();
+}
+function w({
+  limbuildApiUrl: r,
+  execId: t,
+  token: n,
+  onLine: e,
+  onStatus: s,
+  onError: i
+}) {
+  const d = new URL(`${r}/exec/${t}/events`);
+  n && d.searchParams.set("token", n);
+  const a = new EventSource(d.toString());
+  return s("running"), a.addEventListener("command", (o) => e({ type: "command", data: o.data })), a.addEventListener("stdout", (o) => e({ type: "stdout", data: o.data })), a.addEventListener("stderr", (o) => e({ type: "stderr", data: o.data })), a.addEventListener("exitCode", (o) => {
+    const c = parseInt(o.data, 10);
+    s(
+      c === 0 ? "succeeded" : c < 0 ? "cancelled" : "failed"
+    ), a.close();
+  }), a.onerror = () => {
+    a.close(), s("failed"), i?.(new Error("Build log stream closed before completion."));
+  }, () => a.close();
+}
+export {
+  u as f,
+  f as g,
+  l as s,
+  w
+};

package/dist/limbuild-client-CVDwq54z.js

@@ -0,0 +1 @@
+"use strict";async function u(r,t){const n=new URL(`${r}/info`);t&&n.searchParams.set("token",t);const e=await fetch(n.toString(),{headers:t?{Authorization:`Bearer ${t}`}:void 0});if(!e.ok){const s=await e.text();throw new Error(`Info request failed: HTTP ${e.status} ${s}`)}return await e.json()}async function l({limbuildApiUrl:r,token:t,certificateP12Base64:n,certificatePassword:e,provisioningProfileBase64:s,signedUploadUrl:i}){const d=new URL(`${r}/exec`);t&&d.searchParams.set("token",t);const a=await fetch(d.toString(),{method:"POST",headers:{"Content-Type":"application/json",...t?{Authorization:`Bearer ${t}`}:{}},body:JSON.stringify({command:"xcodebuild",xcodebuild:{sdk:"iphoneos"},...i?{signedUploadUrl:i}:{},signing:{certificateP12Base64:n,...e?{certificatePassword:e}:{},provisioningProfileBase64:s}})});if(!a.ok){const o=await a.text();throw new Error(`Build request failed: HTTP ${a.status} ${o}`)}return await a.json()}async function f({limbuildApiUrl:r,execId:t,token:n}){const e=new URL(`${r}/exec/${encodeURIComponent(t)}/ios/ota`);n&&e.searchParams.set("token",n);const s=await fetch(e.toString(),{headers:n?{Authorization:`Bearer ${n}`}:void 0});if(!s.ok){const i=await s.text();throw new Error(`OTA install metadata failed: HTTP ${s.status} ${i}`)}return await s.json()}function h({limbuildApiUrl:r,execId:t,token:n,onLine:e,onStatus:s,onError:i}){const d=new URL(`${r}/exec/${t}/events`);n&&d.searchParams.set("token",n);const a=new EventSource(d.toString());return s("running"),a.addEventListener("command",o=>e({type:"command",data:o.data})),a.addEventListener("stdout",o=>e({type:"stdout",data:o.data})),a.addEventListener("stderr",o=>e({type:"stderr",data:o.data})),a.addEventListener("exitCode",o=>{const c=parseInt(o.data,10);s(c===0?"succeeded":c<0?"cancelled":"failed"),a.close()}),a.onerror=()=>{a.close(),s("failed"),i?.(new Error("Build log stream closed before completion."))},()=>a.close()}exports.fetchLimbuildInfo=u;exports.getIOSOTAInstall=f;exports.startSignedDeviceBuild=l;exports.watchBuildLogEvents=h;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@limrun/ui",
-  "version": "0.13.8",
+  "version": "0.14.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

package/src/app-store-relay/index.test.ts

@@ -3,58 +3,48 @@
 import { afterEach, describe, expect, test, vi } from 'vitest';
 import { assertAppleDeveloperPortalResponseOK, deleteAppleProfile, listAppleTeams } from './index';
 
-describe('App Store relay primitives', () => {
+describe('Registry relay primitives', () => {
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
   test('sends explicit CRUD requests through the provisioning proxy', async () => {
-    const fetchMock = vi.spyOn(globalThis, 'fetch').mockResolvedValue(
-      new Response(JSON.stringify({ status: 200, body: { resultCode: 0 } }), {
-        status: 200,
-      }),
-    );
+    const relay = { request: vi.fn().mockResolvedValue({ status: 200, body: { resultCode: 0 } }) };
 
     await deleteAppleProfile({
-      apiUrl: 'https://limbuild.example',
-      token: 'token',
-      appleSessionId: 'apple-session',
+      relay,
       teamId: 'TEAM',
       profileId: 'PROFILE',
     });
 
-    expect(fetchMock).toHaveBeenCalledOnce();
-    const [url, init] = fetchMock.mock.calls[0];
-    expect(String(url)).toBe('https://limbuild.example/apple/provisioning?token=token');
-    expect(JSON.parse(String(init?.body))).toMatchObject({
-      appleSessionId: 'apple-session',
+    expect(relay.request).toHaveBeenCalledOnce();
+    expect(relay.request.mock.calls[0]).toMatchObject([
+      'provisioning',
+      {
       method: 'POST',
       path: '/account/ios/profile/deleteProvisioningProfile.action',
       payload: {
         teamId: 'TEAM',
         provisioningProfileId: 'PROFILE',
       },
-    });
+      },
+    ]);
   });
 
   test('maps team list responses to teams', async () => {
-    vi.spyOn(globalThis, 'fetch').mockResolvedValue(
-      new Response(
-        JSON.stringify({
-          status: 200,
-          body: {
-            resultCode: 0,
-            teams: [{ name: 'Team One', teamId: 'TEAM1' }],
-          },
-        }),
-        { status: 200 },
-      ),
-    );
+    const relay = {
+      request: vi.fn().mockResolvedValue({
+        status: 200,
+        body: {
+          resultCode: 0,
+          teams: [{ name: 'Team One', teamId: 'TEAM1' }],
+        },
+      }),
+    };
 
     await expect(
       listAppleTeams({
-        apiUrl: 'https://limbuild.example',
-        appleSessionId: 'apple-session',
+        relay,
       }),
     ).resolves.toEqual([{ name: 'Team One', teamId: 'TEAM1' }]);
   });

package/src/app-store-relay/index.ts

@@ -22,6 +22,7 @@ import {
   type AppleDeveloperPortalTeam,
   type AppleProvisioningRequest,
   type AppleRelayResponse,
+  type AppleRelayWebSocketClient,
 } from '../core/device-install/apple';
 
 export * from '../core/device-install/apple/client';
@@ -36,9 +37,9 @@ export type {
   AppleRelayResponse,
 } from '../core/device-install/apple';
 export {
-  createAppleRelaySession,
-  deleteAppleRelaySession,
+  AppleRelayWebSocketClient,
   fetchAppleAccountSession,
+  openAppleRelayWebSocket,
   proxyPhoneTwoFactorCode,
   proxySrpComplete,
   proxySrpInit,
@@ -48,9 +49,7 @@ export {
 } from '../core/device-install/apple';
 
 export type AppleRelayClientOptions = {
-  apiUrl: string;
-  token?: string;
-  appleSessionId: string;
+  relay: AppleRelayWebSocketClient;
 };
 
 export type AppleTeamScopedOptions = AppleRelayClientOptions & {
@@ -150,15 +149,13 @@ export function requestAppleProvisioning<T = AppleDeveloperPortalResponse>(
   options: RequestAppleProvisioningOptions<T>,
 ): Promise<AppleRelayResponse<T>>;
 export async function requestAppleProvisioning<T = AppleDeveloperPortalResponse>({
-  apiUrl,
-  token,
-  appleSessionId,
+  relay,
   request,
   label = 'Apple Developer Portal request',
   validatePortalResponse = true,
   mapBody,
 }: RequestAppleProvisioningOptions<T>) {
-  const response = await proxyProvisioningRequest<T>(apiUrl, appleSessionId, request, token);
+  const response = await proxyProvisioningRequest<T>(relay, request);
   if (validatePortalResponse) {
     assertAppleDeveloperPortalResponseOK(response.body as AppleDeveloperPortalResponse | undefined, label);
   }

package/src/app-store-relay/react.ts

@@ -6,7 +6,7 @@ import {
   type AppleRelayResponse,
 } from './index';
 
-export type UseAppleIDLoginOptions = Pick<AppleIDLoginInput, 'limbuildApiUrl' | 'token'>;
+export type UseAppleIDLoginOptions = Pick<AppleIDLoginInput, 'registryApiUrl' | 'token' | 'organizationId'>;
 
 export type AppleIDLoginStatus =
   | 'idle'
@@ -29,7 +29,7 @@ export type UseAppleIDLoginResult = {
   close: () => Promise<void>;
 };
 
-export function useAppleIDLogin({ limbuildApiUrl, token }: UseAppleIDLoginOptions): UseAppleIDLoginResult {
+export function useAppleIDLogin({ registryApiUrl, token, organizationId }: UseAppleIDLoginOptions): UseAppleIDLoginResult {
   const [status, setStatus] = useState<AppleIDLoginStatus>('idle');
   const [session, setSession] = useState<AppleIDLoginResult | undefined>();
   const [completeResponse, setCompleteResponse] = useState<AppleRelayResponse | undefined>();
@@ -63,8 +63,9 @@ export function useAppleIDLogin({ limbuildApiUrl, token }: UseAppleIDLoginOption
       await sessionRef.current?.close().catch(() => undefined);
       try {
         const next = await startBrowserOwnedAppleIDLogin({
-          limbuildApiUrl,
+          registryApiUrl,
           token,
+          organizationId,
           accountName,
           password,
         });
@@ -82,7 +83,7 @@ export function useAppleIDLogin({ limbuildApiUrl, token }: UseAppleIDLoginOption
         return undefined;
       }
     },
-    [limbuildApiUrl, token],
+    [registryApiUrl, organizationId, token],
   );
 
   const submitTwoFactorCode = useCallback(async (code: string) => {

package/src/core/device-install/apple/client.ts

@@ -1,7 +1,6 @@
 import { AppleGsaSrpClient } from './gsa-srp';
 import {
-  createAppleRelaySession,
-  deleteAppleRelaySession,
+  openAppleRelayWebSocket,
   fetchAppleAccountSession,
   proxyPhoneTwoFactorCode,
   proxySrpComplete,
@@ -9,18 +8,20 @@ import {
   proxyTwoFactorCode,
   triggerPhoneTwoFactor,
   triggerTrustedDeviceTwoFactor,
+  type AppleRelayWebSocketClient,
   type AppleRelayResponse,
 } from './relay';
 
 export type AppleIDLoginInput = {
-  limbuildApiUrl: string;
+  registryApiUrl: string;
   accountName: string;
   password: string;
   token?: string;
+  organizationId?: string;
 };
 
 export type AppleIDLoginResult = {
-  appleSessionId: string;
+  relay: AppleRelayWebSocketClient;
   completeResponse: AppleRelayResponse;
   twoFactorChallengeResponse?: AppleRelayResponse;
   requiresTwoFactor: boolean;
@@ -32,15 +33,16 @@ export type AppleIDLoginResult = {
 type TwoFactorMethod = { type: 'trustedDevice' } | { type: 'phone'; phoneNumberId: number; mode: string };
 
 export async function startBrowserOwnedAppleIDLogin({
-  limbuildApiUrl,
+  registryApiUrl,
   accountName,
   password,
   token,
+  organizationId,
 }: AppleIDLoginInput): Promise<AppleIDLoginResult> {
-  const { appleSessionId } = await createAppleRelaySession(limbuildApiUrl, token);
+  const relay = await openAppleRelayWebSocket(registryApiUrl, token, organizationId);
   try {
     const srp = new AppleGsaSrpClient(accountName);
-    const initResponse = await proxySrpInit(limbuildApiUrl, appleSessionId, await srp.init(), token);
+    const initResponse = await proxySrpInit(relay, await srp.init());
     if (initResponse.status < 200 || initResponse.status >= 300) {
       throw new Error(
         `Apple SRP init failed: HTTP ${initResponse.status} ${initResponse.rawBody ?? ''}`.trim(),
@@ -50,21 +52,16 @@ export async function startBrowserOwnedAppleIDLogin({
       throw new Error('Apple SRP init response did not include a body.');
     }
     const proof = await srp.complete(password, initResponse.body);
-    const completeResponse = await proxySrpComplete(
-      limbuildApiUrl,
-      appleSessionId,
-      {
-        ...proof,
-        rememberMe: false,
-        trustTokens: [],
-      },
-      token,
-    );
+    const completeResponse = await proxySrpComplete(relay, {
+      ...proof,
+      rememberMe: false,
+      trustTokens: [],
+    });
     const requiresTwoFactor = completeResponse.status === 409;
     let twoFactorChallengeResponse: AppleRelayResponse | undefined;
     let twoFactorMethod: TwoFactorMethod = { type: 'trustedDevice' };
     if (requiresTwoFactor) {
-      twoFactorChallengeResponse = await triggerTrustedDeviceTwoFactor(limbuildApiUrl, appleSessionId, token);
+      twoFactorChallengeResponse = await triggerTrustedDeviceTwoFactor(relay);
       const phone = trustedPhoneNumberFromChallenge(twoFactorChallengeResponse.body);
       // Only route codes through the phone/SMS endpoint when Apple actually
       // falls back to phone verification (HTTP 412). The trusted-device
@@ -80,13 +77,7 @@ export async function startBrowserOwnedAppleIDLogin({
           phoneNumberId: phone.id,
           mode: phone.pushMode ?? 'sms',
         };
-        twoFactorChallengeResponse = await triggerPhoneTwoFactor(
-          limbuildApiUrl,
-          appleSessionId,
-          phone.id,
-          phone.pushMode ?? 'sms',
-          token,
-        );
+        twoFactorChallengeResponse = await triggerPhoneTwoFactor(relay, phone.id, phone.pushMode ?? 'sms');
       }
       if (twoFactorChallengeResponse.status < 200 || twoFactorChallengeResponse.status >= 300) {
         throw new Error(
@@ -101,7 +92,7 @@ export async function startBrowserOwnedAppleIDLogin({
       );
     }
     return {
-      appleSessionId,
+      relay,
       completeResponse,
       twoFactorChallengeResponse,
       requiresTwoFactor,
@@ -109,14 +100,12 @@ export async function startBrowserOwnedAppleIDLogin({
         const response =
           twoFactorMethod.type === 'phone' ?
             await proxyPhoneTwoFactorCode(
-              limbuildApiUrl,
-              appleSessionId,
+              relay,
               twoFactorMethod.phoneNumberId,
               code,
               twoFactorMethod.mode,
-              token,
             )
-          : await proxyTwoFactorCode(limbuildApiUrl, appleSessionId, code, token);
+          : await proxyTwoFactorCode(relay, code);
         if (response.status < 200 || response.status >= 300) {
           throw new Error(
             `Apple two-factor code failed: HTTP ${response.status} ${response.rawBody ?? ''}`.trim(),
@@ -124,11 +113,11 @@ export async function startBrowserOwnedAppleIDLogin({
         }
         return response;
       },
-      finalize: async () => fetchAppleAccountSession(limbuildApiUrl, appleSessionId, token),
-      close: () => deleteAppleRelaySession(limbuildApiUrl, appleSessionId, token),
+      finalize: async () => fetchAppleAccountSession(relay),
+      close: async () => relay.close(),
     };
   } catch (error) {
-    await deleteAppleRelaySession(limbuildApiUrl, appleSessionId, token).catch(() => undefined);
+    relay.close();
     throw error;
   }
 }