@limrun/ui 0.9.0-rc.7 → 0.9.0-rc.8

package/src/hooks/use-device-install.ts

@@ -20,6 +20,7 @@ import {
   parseProvisioningProfile,
   parseProvisioningProfileBase64,
   profileContainsDevice,
+  profileMatchesBundleID,
   proxyProvisioningRequest,
   putAppleGeneratedSigningAssets,
   putPairRecord,
@@ -158,7 +159,7 @@ export function useDeviceInstall({
   const [pairRecord, setPairRecord] = useState<StoredPairRecord | undefined>();
   const [signingAssets, setSigningAssets] = useState<StoredSigningAssets | undefined>();
   const [logs, setLogs] = useState<string[]>([
-    'Ready. Prepare signing assets, connect and pair the iPhone, build, then install.',
+    'Ready. Prepare signing assets, build, connect and pair the iPhone, then install.',
   ]);
   const [buildLogs, setBuildLogs] = useState<BuildLogLine[]>([]);
   const [buildStatus, setBuildStatus] = useState<DeviceInstallBuildStatus>('idle');
@@ -197,7 +198,7 @@ export function useDeviceInstall({
       setStepStatus('signing', ready ? 'complete' : 'active');
       if (ready) {
         setAppleSigningStatus('assets-ready');
-        setCurrentStep('connect');
+        setCurrentStep('build');
       }
       return next;
     });
@@ -212,7 +213,7 @@ export function useDeviceInstall({
       setAppleBundleID(stored.bundleID);
       setAppleSigningStatus('using-cached-profile');
       setStepStatus('signing', 'complete');
-      setCurrentStep('connect');
+      setCurrentStep('build');
       log('Using stored signing assets', stored.bundleID);
     });
     return () => {
@@ -274,13 +275,19 @@ export function useDeviceInstall({
 
   const resolveSigningAssetsForBuild = useCallback(async () => {
     const requestedBundleID = appleBundleID.trim();
+    if (!requestedBundleID || (signingAssets && profileMatchesBundleID(signingAssets.profile, requestedBundleID))) {
+      if (signingAssets) {
+        log('Using prepared signing assets', signingAssets.bundleID);
+        return signingAssets;
+      }
+    }
     const info = requestedBundleID ? undefined : apiUrl ? await fetchStoredBuildInfo(apiUrl, token).catch(() => undefined) : undefined;
     const bundleID = requestedBundleID || info?.lastBuildConfig?.bundleId;
     if (bundleID) {
       const cached = await getReusableAppleSigningAssets({
         bundleID,
         deviceUDID: selectedDevice?.hello.serialNumber,
-        teamID: selectedAppleTeamID,
+        teamID: selectedDeveloperTeamID(),
       });
       if (cached) {
         setAppleSigningStatus('using-cached-profile');
@@ -325,7 +332,7 @@ export function useDeviceInstall({
     setSigningAssets(storedAssets);
     log('Signing assets stored locally', storageBundleId);
     return storedAssets;
-  }, [apiUrl, appleBundleID, log, selectedAppleTeamID, selectedDevice?.hello.serialNumber, signingFiles, token]);
+  }, [apiUrl, appleBundleID, log, selectedDeveloperTeamID, selectedDevice?.hello.serialNumber, signingAssets, signingFiles, token]);
 
   const startAppleIDLogin = useCallback(
     async ({ accountName, password }: DeviceInstallAppleIDLoginInput) => {
@@ -559,7 +566,7 @@ export function useDeviceInstall({
         setSigningAssets(cached);
         setAppleSigningStatus('assets-ready');
         setStepStatus('signing', 'complete');
-        setCurrentStep('connect');
+        setCurrentStep('build');
         log('Using cached Apple signing assets', bundleID);
         return;
       }
@@ -577,7 +584,7 @@ export function useDeviceInstall({
       setSigningAssets(assets);
       setAppleSigningStatus('assets-ready');
       setStepStatus('signing', 'complete');
-      setCurrentStep('connect');
+      setCurrentStep('build');
       log('Apple signing assets stored locally', `${bundleID} for ${signingDeviceUDID}`);
     } catch (caught) {
       const message = errorMessage(caught);
@@ -636,7 +643,8 @@ export function useDeviceInstall({
           setBuildStatus(status);
           if (status === 'succeeded') {
             setStepStatus('build', 'complete');
-            setCurrentStep('install');
+            setStepStatus('connect', 'active');
+            setCurrentStep('connect');
           } else if (status === 'failed' || status === 'cancelled') {
             setStepStatus('build', 'error');
           }
@@ -656,26 +664,25 @@ export function useDeviceInstall({
     } finally {
       setBusyAction(undefined);
     }
-  }, [apiUrl, log, pairRecord, resolveSigningAssetsForBuild, setStepStatus, token]);
+  }, [apiUrl, log, resolveSigningAssetsForBuild, setStepStatus, token]);
 
   const requestUSBAccess = useCallback(async () => {
     setBusyAction('usb');
     setError(undefined);
     setCurrentStep('connect');
     setStepStatus('connect', 'active');
+    let target: DeviceRelayTarget | undefined;
     try {
       await cleanupDeviceAccess();
-      const target = await requestDeviceUSBAccess({ log });
-      setSelectedDevice(target);
+      target = await requestDeviceUSBAccess({ log });
       setPairConfirmationRequired(false);
       const storedPairRecord = await getPairRecord(target.hello.serialNumber);
-      setPairRecord(storedPairRecord);
-      const storedSigningAssets = manualSigningFilesReady ? undefined : await getLatestSigningAssets();
-      if (storedSigningAssets) {
-        if (!profileContainsDevice(storedSigningAssets.profile, target.hello.serialNumber)) {
+      const activeSigningAssets = signingAssets ?? (manualSigningFilesReady ? undefined : await getLatestSigningAssets());
+      if (activeSigningAssets) {
+        if (!profileContainsDevice(activeSigningAssets.profile, target.hello.serialNumber)) {
           throw new Error('Stored provisioning profile does not include the selected iPhone.');
         }
-        setSigningAssets(storedSigningAssets);
+        setSigningAssets(activeSigningAssets);
       }
       if (apiUrl && appleIDLoginRef.current) {
         const teamID = selectedDeveloperTeamID();
@@ -692,10 +699,15 @@ export function useDeviceInstall({
           });
         }
       }
+      setSelectedDevice(target);
+      setPairRecord(storedPairRecord);
       setStepStatus('connect', storedPairRecord ? 'complete' : 'active');
-      setCurrentStep(storedPairRecord ? 'build' : 'connect');
+      setCurrentStep(storedPairRecord ? 'install' : 'connect');
       log(storedPairRecord ? 'Pair record found' : 'No pair record found', target.hello.serialNumber);
     } catch (caught) {
+      await closeDeviceRelayTarget(target, log);
+      setSelectedDevice(undefined);
+      setPairRecord(undefined);
       const message = errorMessage(caught);
       setError(message);
       setStepStatus('connect', 'error');
@@ -703,7 +715,7 @@ export function useDeviceInstall({
     } finally {
       setBusyAction(undefined);
     }
-  }, [apiUrl, cleanupDeviceAccess, log, manualSigningFilesReady, selectedDeveloperTeamID, setStepStatus, token]);
+  }, [apiUrl, cleanupDeviceAccess, log, manualSigningFilesReady, selectedDeveloperTeamID, setStepStatus, signingAssets, token]);
 
   const pairBrowser = useCallback(async () => {
     if (!apiUrl || !selectedDevice) return;
@@ -728,7 +740,7 @@ export function useDeviceInstall({
       setPairRecord(stored);
       setPairConfirmationRequired(false);
       setStepStatus('connect', 'complete');
-      setCurrentStep('build');
+      setCurrentStep('install');
       log('Device paired', 'The pair record was stored locally in this browser.');
     } catch (caught) {
       await closeDeviceRelayTarget(selectedDevice, log);
@@ -803,10 +815,7 @@ export function useDeviceInstall({
     canBuild:
       !!apiUrl &&
       !busyAction &&
-      !!selectedDevice &&
-      !!pairRecord &&
-      signingInputsReady &&
-      connectedDeviceInProfile !== false,
+      signingInputsReady,
     canPrepareAppleSigningAssets:
       !!apiUrl &&
       !busyAction &&
@@ -815,9 +824,9 @@ export function useDeviceInstall({
       !!selectedDeveloperTeamID() &&
       selectedAppleDeviceIDs.length > 0 &&
       (!!reusableAppleCertificate || !!signingFiles.certificatePassword),
-    canRequestUSBAccess: !busyAction && signingInputsReady,
-    canPairBrowser: !!apiUrl && !busyAction && !!selectedDevice,
-    canInstall: !!apiUrl && !busyAction && !!selectedDevice && !!pairRecord,
+    canRequestUSBAccess: !busyAction && buildStatus === 'succeeded',
+    canPairBrowser: !!apiUrl && !busyAction && buildStatus === 'succeeded' && !!selectedDevice,
+    canInstall: !!apiUrl && !busyAction && buildStatus === 'succeeded' && !!selectedDevice && !!pairRecord,
     setSigningFiles,
     setAppleBundleID,
     setSelectedAppleDeviceIDs,

package/src/index.ts

@@ -1,7 +1,5 @@
 export { RemoteControl } from './components/remote-control';
 export type { RemoteControlHandle } from './components/remote-control';
-export { DeviceInstallDialog, DeviceInstallRelay } from './components/device-install';
-export { useDeviceInstall } from './hooks/use-device-install';
 
 // Accessibility / inspect-mode types and helpers. Exported so customers can
 // build their own side panels, search UIs, or agent-driven inspectors on top
@@ -9,10 +7,8 @@ export { useDeviceInstall } from './hooks/use-device-install';
 export type { AxSnapshot, AxElement, AxRect, AxSelectors, AxPlatform } from './core/ax-tree';
 export type { AxStatus } from './core/ax-fetcher';
 export {
-  axCliTapCommand,
   axElementAtPoint,
   axElementSelectorExpression,
-  axElementSelectorObject,
   axElementSummary,
   axElementsEqual,
   axSnapshotsEqual,
@@ -21,3 +17,6 @@ export {
   normalizeIosTree,
   AX_UNAVAILABLE_ERROR,
 } from './core/ax-tree';
+
+export { DeviceInstallDialog, DeviceInstallRelay } from './components/device-install';
+export { useDeviceInstall } from './hooks/use-device-install';

package/dist/device-install-dialog-86RDdoK9.js

@@ -1,2 +0,0 @@
-"use strict";require('./device-install-dialog.css');const e=require("react/jsx-runtime"),d=require("react"),w=require("./use-device-install-CbGVvwPp.js");function N(l){var t,a,n="";if(typeof l=="string"||typeof l=="number")n+=l;else if(typeof l=="object")if(Array.isArray(l)){var c=l.length;for(t=0;t<c;t++)l[t]&&(a=N(l[t]))&&(n&&(n+=" "),n+=a)}else for(a in l)l[a]&&(n&&(n+=" "),n+=a);return n}function u(){for(var l,t,a=0,n="",c=arguments.length;a<c;a++)(l=arguments[a])&&(t=N(l))&&(n&&(n+=" "),n+=t);return n}const P=[{id:"signing",title:"Prepare signing",description:"Choose Apple ID login or upload certificates, then confirm the target developer device."},{id:"connect",title:"Connect and pair",description:"Connect the iPhone with WebUSB, then pair this browser so installs can use the device."},{id:"build",title:"Check and build",description:"Verify the device and provisioning profile are ready, then start the signed build."},{id:"install",title:"Start installation",description:"Relay the last successful device build to the paired iPhone."}];function I({disabled:l,...t}){const[a,n]=d.useState(!1),[c,h]=d.useState("signing"),[o,j]=d.useState(),[m,S]=d.useState(""),[x,C]=d.useState(""),[_,A]=d.useState(""),f=d.useId(),i=w.useDeviceInstall(t);d.useEffect(()=>{h(i.currentStep)},[i.currentStep]);const y=(r,p)=>{i.setSigningFiles({[r]:p.currentTarget.files?.[0]})};return e.jsxs("div",{className:"lr-device-install",children:[e.jsx("button",{type:"button",className:"lr-device-install__trigger",disabled:l||!t.apiUrl,onClick:()=>n(!0),children:"Install to iPhone"}),a&&e.jsx("div",{className:"lr-device-install__backdrop",role:"presentation",children:e.jsxs("section",{"aria-labelledby":f,"aria-modal":"true",className:"lr-device-install__dialog",role:"dialog",children:[e.jsxs("header",{className:"lr-device-install__header",children:[e.jsxs("div",{children:[e.jsx("h2",{id:f,children:"Install to a real iPhone"}),e.jsx("p",{children:"Prepare signing, connect and pair the device, build, then install from this browser."})]}),e.jsx("button",{type:"button",className:"lr-device-install__icon-button",onClick:()=>n(!1),children:"Close"})]}),i.error&&e.jsx("div",{className:"lr-device-install__error",children:i.error}),e.jsx("div",{className:"lr-device-install__steps",children:P.map((r,p)=>e.jsxs(T,{index:p+1,step:r,active:i.currentStep===r.id,open:c===r.id,status:i.stepStatuses[r.id],onToggle:()=>h(r.id),children:[r.id==="signing"&&e.jsxs("div",{className:"lr-device-install__step-body",children:[e.jsxs("div",{className:"lr-device-install__choice-grid",children:[e.jsxs("button",{type:"button",className:u("lr-device-install__choice",o==="apple-id"&&"lr-device-install__choice--active"),onClick:()=>j("apple-id"),children:[e.jsx("strong",{children:"Apple ID login"}),e.jsx("span",{children:"Sign in, choose team, bundle ID, devices, then generate signing assets."})]}),e.jsxs("button",{type:"button",className:u("lr-device-install__choice",o==="upload"&&"lr-device-install__choice--active"),onClick:()=>j("upload"),children:[e.jsx("strong",{children:"Upload certificates"}),e.jsx("span",{children:"Use an existing .p12 certificate and provisioning profile."})]})]}),o==="apple-id"&&e.jsxs("div",{className:"lr-device-install__section-panel",children:[e.jsxs("div",{className:"lr-device-install__grid",children:[e.jsxs("label",{className:"lr-device-install__field",children:[e.jsx("span",{children:"Apple ID"}),e.jsx("input",{type:"email",autoComplete:"username",placeholder:"name@example.com",value:m,onChange:s=>S(s.currentTarget.value)})]}),e.jsxs("label",{className:"lr-device-install__field",children:[e.jsx("span",{children:"Apple ID password"}),e.jsx("input",{type:"password",autoComplete:"current-password",placeholder:"Password stays in this browser",value:x,onChange:s=>C(s.currentTarget.value)})]}),!i.hasReusableAppleCertificate&&e.jsxs("label",{className:"lr-device-install__field",children:[e.jsx("span",{children:"Generated .p12 password"}),e.jsx("input",{type:"password",placeholder:"Used when exporting Apple certificate",onChange:s=>i.setSigningFiles({certificatePassword:s.currentTarget.value})})]})]}),e.jsxs("div",{className:"lr-device-install__actions",children:[e.jsx("button",{type:"button",className:"lr-device-install__secondary",disabled:l||!t.apiUrl||!m||!x||i.busyAction==="signing",onClick:()=>void i.startAppleIDLogin({accountName:m,password:x}),children:i.appleSigningStatus==="authenticating"?"Signing in...":"Sign in with Apple ID"}),e.jsxs("span",{className:"lr-device-install__hint",children:["Apple password is used only by browser-side SRP. Status: ",i.appleSigningStatus]})]}),i.appleSigningStatus==="two-factor-required"&&e.jsxs("div",{className:"lr-device-install__grid",children:[e.jsxs("label",{className:"lr-device-install__field",children:[e.jsx("span",{children:"Two-factor code"}),e.jsx("input",{type:"text",inputMode:"numeric",autoComplete:"one-time-code",value:_,onChange:s=>A(s.currentTarget.value)})]}),e.jsx("button",{type:"button",className:"lr-device-install__secondary",disabled:!_||i.busyAction==="signing",onClick:()=>void i.submitAppleTwoFactorCode(_),children:"Submit Apple ID code"})]}),i.appleTeams.length>0&&e.jsxs("label",{className:"lr-device-install__field",children:[e.jsx("span",{children:"Apple Developer team"}),e.jsx("select",{value:i.selectedAppleTeamID??"",onChange:s=>i.setSelectedAppleTeamID(s.currentTarget.value||void 0),children:i.appleTeams.map((s,b)=>{const v=s.teamId??(s.providerId===void 0?void 0:String(s.providerId))??s.publicProviderId??"";return e.jsxs("option",{value:v,children:[s.name??"Apple Developer Team"," ",v?`(${v})`:""]},`${v}-${b}`)})})]}),i.appleDevices.length>0&&e.jsxs("label",{className:"lr-device-install__field",children:[e.jsx("span",{children:"Apple Developer devices"}),e.jsx("select",{multiple:!0,value:i.selectedAppleDeviceIDs,onChange:s=>i.setSelectedAppleDeviceIDs(Array.from(s.currentTarget.selectedOptions).map(b=>b.value)),children:i.appleDevices.map(s=>e.jsxs("option",{value:s.deviceId??"",children:[s.name??s.model??"Apple device"," ",s.deviceNumber??""]},s.deviceId??s.deviceNumber))})]}),i.applePortalSummary&&e.jsxs("p",{className:"lr-device-install__hint",children:["Found ",i.applePortalSummary.certificateCount," certificates and"," ",i.applePortalSummary.profileCount," provisioning profiles."]}),i.hasReusableAppleCertificate&&e.jsx("p",{className:"lr-device-install__hint",children:"Reusing the certificate and private key stored in this browser."}),e.jsx("button",{type:"button",className:"lr-device-install__primary",disabled:l||!i.canPrepareAppleSigningAssets,onClick:()=>void i.prepareAppleSigningAssets(),children:i.appleSigningStatus==="preparing-assets"?"Preparing signing assets...":"Generate certificate and profile"})]}),o==="upload"&&e.jsxs("div",{className:"lr-device-install__section-panel",children:[e.jsxs("div",{className:"lr-device-install__grid",children:[e.jsxs("label",{className:"lr-device-install__field",children:[e.jsx("span",{children:"Certificate (.p12)"}),e.jsx("input",{type:"file",accept:".p12,application/x-pkcs12",onChange:s=>y("certificateFile",s)})]}),e.jsxs("label",{className:"lr-device-install__field",children:[e.jsx("span",{children:"Provisioning profile"}),e.jsx("input",{type:"file",accept:".mobileprovision",onChange:s=>y("provisioningProfileFile",s)})]}),e.jsxs("label",{className:"lr-device-install__field",children:[e.jsx("span",{children:"Uploaded .p12 password"}),e.jsx("input",{type:"password",placeholder:"Export password",onChange:s=>i.setSigningFiles({certificatePassword:s.currentTarget.value})})]})]}),e.jsx("p",{className:"lr-device-install__hint",children:"The provisioning profile will be checked against the connected iPhone before the build starts."})]}),i.hasSigningAssets&&e.jsx("p",{children:"Signing assets are stored in this browser for the selected bundle and device."})]}),r.id==="connect"&&e.jsxs("div",{className:"lr-device-install__step-body",children:[e.jsx("p",{children:"WebUSB works in Chromium browsers on secure origins. Connect the iPhone over USB, approve the browser permission prompt, then pair this browser."}),e.jsxs("div",{className:"lr-device-install__actions",children:[e.jsx("button",{type:"button",className:"lr-device-install__primary",disabled:l||!i.canRequestUSBAccess,onClick:()=>void i.requestUSBAccess(),children:i.busyAction==="usb"?"Selecting iPhone...":"Allow USB access"}),e.jsx("button",{type:"button",className:"lr-device-install__secondary",disabled:l||!i.canPairBrowser,onClick:()=>void i.pairBrowser(),children:i.busyAction==="pair"?"Pairing...":i.pairConfirmationRequired?"Confirm pair record":"Pair browser"})]}),i.device&&e.jsx("div",{className:"lr-device-install__device",children:`${i.device.productName??"iPhone"} ${i.device.serialNumber??""}`.trim()}),i.pairConfirmationRequired&&e.jsxs("p",{children:["Unlock the iPhone and tap ",e.jsx("strong",{children:"Trust"})," in the system dialog, then confirm the pair record."]}),e.jsx("p",{children:i.hasPairRecord?"Pair record is stored locally. Continue to the build check.":"Pair this browser once before building and installing."})]}),r.id==="build"&&e.jsxs("div",{className:"lr-device-install__step-body",children:[e.jsxs("div",{className:"lr-device-install__checklist",children:[e.jsx(g,{label:"Signing assets",ready:i.hasSigningInputs,pendingText:"Ready to verify"}),e.jsx(g,{label:"USB device",ready:!!i.device}),e.jsx(g,{label:"Pair record",ready:i.hasPairRecord}),e.jsx(g,{label:"Profile includes connected device",ready:i.connectedDeviceInProfile,pendingText:"Checked when the build starts"})]}),i.device&&i.appleTeams.length>0&&!i.connectedAppleDeviceRegistered&&e.jsx("button",{type:"button",className:"lr-device-install__secondary",disabled:l||!!i.busyAction,onClick:()=>void i.registerConnectedAppleDevice(),children:"Register connected iPhone"}),e.jsx("button",{type:"button",className:"lr-device-install__primary",disabled:l||!i.canBuild,onClick:()=>void i.startDeviceBuild(),children:i.busyAction==="build"?"Starting build...":"Start device build"}),e.jsxs("details",{className:"lr-device-install__build-logs",open:i.buildLogPanelOpen,onToggle:s=>i.setBuildLogPanelOpen(s.currentTarget.open),children:[e.jsxs("summary",{children:["Build logs (",i.buildStatus,")"]}),e.jsx("pre",{children:i.buildLogs.length>0?i.buildLogs.filter(s=>s.type!=="meta").map(s=>s.data).join(`
-`):"Build logs will appear here while the device build is running."})]})]}),r.id==="install"&&e.jsxs("div",{className:"lr-device-install__step-body",children:[e.jsx("button",{type:"button",className:"lr-device-install__primary",disabled:l||!i.canInstall,onClick:()=>void i.startInstallation(),children:i.busyAction==="install"?"Installing...":"Install last build"}),e.jsx("button",{type:"button",className:"lr-device-install__secondary",onClick:i.stopRelay,children:"Stop relay"})]})]},r.id))}),e.jsxs("footer",{className:"lr-device-install__logs",children:[e.jsx("h3",{children:"Progress"}),e.jsx("ol",{children:i.logs.map((r,p)=>e.jsx("li",{children:r},`${p}-${r.slice(0,24)}`))})]})]})})]})}function T({index:l,step:t,active:a,open:n,status:c,onToggle:h,children:o}){return e.jsxs("article",{className:u("lr-device-install__step",a&&"lr-device-install__step--active"),children:[e.jsxs("button",{type:"button",className:"lr-device-install__step-header","aria-expanded":n,onClick:h,children:[e.jsx("div",{className:"lr-device-install__step-number",children:l}),e.jsxs("div",{children:[e.jsx("h3",{children:t.title}),e.jsx("p",{children:t.description})]}),e.jsx("span",{className:u("lr-device-install__status",`lr-device-install__status--${c}`),children:c==="complete"?"✓ Completed":c})]}),n&&o]})}function g({label:l,ready:t,pendingText:a="Not ready"}){const n=t===void 0?a:t?"Ready":"Needs attention";return e.jsxs("div",{className:"lr-device-install__check-row",children:[e.jsx("span",{children:l}),e.jsx("strong",{children:n})]})}exports.DeviceInstallDialog=I;exports.clsx=u;