@limrun/api 0.28.8 → 0.28.10

package/src/resources/xcode-instances-helpers.ts

@@ -12,6 +12,7 @@ import {
 } from '../folder-sync';
 import { createIgnoreFn } from '../folder-sync-ignore';
 import { nodeProxyTransport } from '../internal/proxy-transport';
+import { directInstanceHttpError } from '../internal/direct-instance-errors';
 
 export type LogLevel = 'none' | 'error' | 'warn' | 'info' | 'debug';
 
@@ -89,6 +90,52 @@ export type XcodeBuildOptions = {
   reactNative?: ReactNativeBuildConfig;
 };
 
+export type SimulatorInstallState =
+  | 'notInstalled'
+  | 'installedOnAttachedSimulator'
+  | 'installedOnOtherSimulator';
+
+export type SimulatorDeviceInfo = {
+  arch: string;
+  model: string;
+  name: string;
+  osVersion: string;
+  platform: string;
+  screenHeight: number;
+  screenWidth: number;
+  udid: string;
+};
+
+export type SimulatorAttachment = {
+  apiUrl: string;
+  iosInstanceId?: string;
+  target?: SimulatorDeviceInfo;
+};
+
+export type SimulatorBuildStatus = {
+  buildId: string;
+  sdk: string;
+  bundleId?: string;
+  installState: SimulatorInstallState;
+  syncDurationMs?: number;
+  installDurationMs?: number;
+};
+
+export type SimulatorStatus = {
+  attached: boolean;
+  simulator?: SimulatorAttachment;
+  latestBuild?: SimulatorBuildStatus;
+};
+
+export type SimulatorAttachResult = {
+  attached: boolean;
+  alreadyAttached: boolean;
+  installedLastBuild: boolean;
+  simulator?: SimulatorAttachment;
+  latestBuild?: SimulatorBuildStatus;
+  installError?: string;
+};
+
 export type XcodeClient = {
   /**
    * Sync source code to the xcode instance. In watch mode, keeps syncing on changes.
@@ -110,7 +157,14 @@ export type XcodeClient = {
    * Attach a simulator to this xcode instance.
    * After attaching, builds will auto-install on the simulator.
    */
-  attachSimulator: (simulator: IosInstance | { apiUrl: string; token: string }) => Promise<void>;
+  attachSimulator: (
+    simulator: IosInstance | { apiUrl: string; token: string },
+  ) => Promise<SimulatorAttachResult>;
+
+  /**
+   * Return the currently attached simulator and latest installable build state.
+   */
+  getSimulator: () => Promise<SimulatorStatus>;
 };
 
 export type XcodeCreateClientParams =
@@ -156,11 +210,7 @@ async function fetchSandboxInfo(apiUrl: string, token: string): Promise<{ homeDi
       Authorization: `Bearer ${token}`,
     },
   });
-  const text = await res.text();
-  if (!res.ok) {
-    throw new Error(`GET /info failed: ${res.status} ${text}`);
-  }
-  const body = JSON.parse(text) as { homeDir?: string };
+  const body = await readJsonResponse<{ homeDir?: string }>(res, 'GET /info');
   if (!body.homeDir) {
     throw new Error('GET /info response is missing homeDir');
   }
@@ -169,6 +219,17 @@ async function fetchSandboxInfo(apiUrl: string, token: string): Promise<{ homeDi
   };
 }
 
+async function readJsonResponse<T>(res: Response, operation: string): Promise<T> {
+  const text = await res.text();
+  if (!res.ok) {
+    throw directInstanceHttpError(operation, res.status, text, res.headers);
+  }
+  if (!text.trim()) {
+    throw new Error(`${operation} returned an empty response`);
+  }
+  return JSON.parse(text) as T;
+}
+
 export class XcodeInstances extends GeneratedXcodeInstances {
   async createClient(params: XcodeCreateClientParams): Promise<XcodeClient> {
     let apiUrl: string;
@@ -186,7 +247,11 @@ export class XcodeInstances extends GeneratedXcodeInstances {
 
     const log = createLogger(params.logLevel ?? 'info');
     const client = this._client;
-    const sandboxInfo = await fetchSandboxInfo(apiUrl, token);
+    let sandboxInfoPromise: Promise<{ homeDir: string }> | undefined;
+    const getSandboxInfo = () => {
+      sandboxInfoPromise ??= fetchSandboxInfo(apiUrl, token);
+      return sandboxInfoPromise;
+    };
 
     return {
       async sync(localCodePath: string, opts?: SyncOptions): Promise<SyncResult> {
@@ -195,10 +260,12 @@ export class XcodeInstances extends GeneratedXcodeInstances {
         const hash = crypto.createHash('sha1').update(resolvedPath).digest('hex').slice(0, 8);
         const cacheKey = `limsync-cache-${folderName}-${hash}`;
         const basisCacheDir = opts?.basisCacheDir ?? path.join(os.tmpdir(), cacheKey);
+        const sandboxInfo =
+          opts?.additionalFiles && opts.additionalFiles.length > 0 ? await getSandboxInfo() : undefined;
         const additionalFiles = opts?.additionalFiles?.map((file) => ({
           localPath: file.localPath,
           remotePath:
-            file.remotePath.startsWith('~/') ?
+            sandboxInfo && file.remotePath.startsWith('~/') ?
               `${sandboxInfo.homeDir}/${file.remotePath.slice(2)}`
             : file.remotePath,
         }));
@@ -292,7 +359,19 @@ export class XcodeInstances extends GeneratedXcodeInstances {
         return exec(request, { apiUrl, token, log });
       },
 
-      async attachSimulator(simulator: IosInstance | { apiUrl: string; token: string }): Promise<void> {
+      async getSimulator(): Promise<SimulatorStatus> {
+        const res = await nodeProxyTransport.fetch(`${apiUrl}/simulator`, {
+          method: 'GET',
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        });
+        return readJsonResponse<SimulatorStatus>(res, 'GET /simulator');
+      },
+
+      async attachSimulator(
+        simulator: IosInstance | { apiUrl: string; token: string },
+      ): Promise<SimulatorAttachResult> {
         let simApiUrl: string;
         let simToken: string;
         if ('status' in simulator) {
@@ -314,10 +393,7 @@ export class XcodeInstances extends GeneratedXcodeInstances {
           },
           body: JSON.stringify({ apiUrl: simApiUrl, token: simToken }),
         });
-        if (!res.ok) {
-          const text = await res.text();
-          throw new Error(`POST /simulator failed: ${res.status} ${text}`);
-        }
+        return readJsonResponse<SimulatorAttachResult>(res, 'POST /simulator');
       },
     };
   }

package/src/version.ts

@@ -1 +1 @@
-export const VERSION = '0.28.8'; // x-release-please-version
+export const VERSION = '0.28.10'; // x-release-please-version

package/version.d.mts

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.28.8";
+export declare const VERSION = "0.28.10";
 //# sourceMappingURL=version.d.mts.map

package/version.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.mts","sourceRoot":"","sources":["src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,WAAW,CAAC"}
+{"version":3,"file":"version.d.mts","sourceRoot":"","sources":["src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,YAAY,CAAC"}

package/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.28.8";
+export declare const VERSION = "0.28.10";
 //# sourceMappingURL=version.d.ts.map

package/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,WAAW,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,YAAY,CAAC"}

package/version.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-exports.VERSION = '0.28.8'; // x-release-please-version
+exports.VERSION = '0.28.10'; // x-release-please-version
 //# sourceMappingURL=version.js.map

package/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,QAAQ,CAAC,CAAC,2BAA2B"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,SAAS,CAAC,CAAC,2BAA2B"}

package/version.mjs

@@ -1,2 +1,2 @@
-export const VERSION = '0.28.8'; // x-release-please-version
+export const VERSION = '0.28.10'; // x-release-please-version
 //# sourceMappingURL=version.mjs.map

package/version.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"version.mjs","sourceRoot":"","sources":["src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,2BAA2B"}
+{"version":3,"file":"version.mjs","sourceRoot":"","sources":["src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,2BAA2B"}