serve-sim 0.1.44-beta.99.3 → 0.1.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serve-sim",
-  "version": "0.1.44-beta.99.3",
+  "version": "0.1.44",
   "type": "module",
   "author": {
     "name": "Evan Bacon",
@@ -46,10 +46,8 @@
     "Sources/SimAXSettings/build.sh",
     "dist/native/serve-sim-native.node",
     "Package.swift",
-    "Sources/SimNative/sim-module.swift",
-    "Sources/SimNative/sim-capture.swift",
-    "Sources/SimNative/build.sh",
-    "Sources/SimStreamHelper/*.swift"
+    "Sources/SimNative/*.swift",
+    "Sources/SimNative/build.sh"
   ],
   "exports": {
     "./middleware": {
@@ -76,11 +74,10 @@
     "commander": "^14.0.1",
     "debug": "^4.4.3",
     "lucide-react": "^1.20.0",
-    "node-swift": "1.4.0",
+    "node-swift": "1.5.1",
     "preact": "^10.29.1",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "serve-sim-client": "workspace:*",
     "tailwindcss": "^4.1.7",
     "typescript": "^5.7.0"
   },

package/src/middleware.ts

@@ -302,6 +302,29 @@ function queryDevice(rawUrl: string): string | null {
   return new URLSearchParams(rawUrl.slice(qIndex + 1)).get("device");
 }
 
+/**
+ * Parse `/grid/api` pagination params. `limit` absent → return the whole list
+ * (back-compat for embedded mounts that expect every device in one response).
+ * The full DeviceKit `chrome` descriptor is only resolved for the returned
+ * page, so a remote viewer over a tunnel fetches a small first page instead of
+ * the whole simulator catalog (~150KB) up front.
+ */
+export function parseGridPaging(rawUrl: string): { limit: number | null; offset: number } {
+  const qIndex = rawUrl.indexOf("?");
+  if (qIndex === -1) return { limit: null, offset: 0 };
+  const params = new URLSearchParams(rawUrl.slice(qIndex + 1));
+  const rawLimit = params.get("limit");
+  const rawOffset = params.get("offset");
+  // Clamp to sane bounds; ignore non-numeric/negative input rather than erroring.
+  const limit =
+    rawLimit == null || !/^\d+$/.test(rawLimit)
+      ? null
+      : Math.min(Math.max(Number(rawLimit), 1), 1000);
+  const offset =
+    rawOffset == null || !/^\d+$/.test(rawOffset) ? 0 : Math.max(Number(rawOffset), 0);
+  return { limit, offset };
+}
+
 function hostForRequest(req: SimReq): string | undefined {
   const host = req.headers?.host;
   if (host) return host;
@@ -1263,32 +1286,14 @@ export function simMiddleware(options?: SimMiddlewareOptions): SimMiddleware {
       const states = readServeSimStates();
       const helperByUdid = new Map(states.map((s) => [s.device, s] as const));
       const sims = listAllSimulators();
-      const devices = sims.map((d) => {
-        const helper = helperByUdid.get(d.udid);
-        const remoteHelper = helper ? rewriteStateForRequestHost(helper, hostForRequest(req), base, httpProtocolForRequest(req), proxyHelpers) : null;
-        return {
-          device: d.udid,
-          name: d.name,
-          runtime: d.runtime,
-          state: d.state,
-          chrome: resolveDeviceKitChrome(d),
-          placeholderAsset: resolveDevicePlaceholderAsset(d),
-          helper: remoteHelper
-            ? {
-                port: remoteHelper.port,
-                url: remoteHelper.url,
-                streamUrl: remoteHelper.streamUrl,
-                wsUrl: remoteHelper.wsUrl,
-              }
-            : null,
-        };
-      });
       // Order mirrors Xcode's Devices window: the devices the user is actually
       // using float to the top — streaming first, then booted, then the
       // simulator they last opened in Simulator.app — and everything else falls
       // back to a stable family / newest-OS / name grouping. This surfaces the
       // handful of relevant devices instead of burying them in an alphabetical
-      // wall of near-identical names.
+      // wall of near-identical names. Sort on the cheap metadata BEFORE
+      // resolving the DeviceKit chrome descriptor, so pagination resolves chrome
+      // only for the page actually returned.
       const preferredUdid = getPreferredDeviceUdid();
       const familyRank = (name: string): number => {
         if (/iphone/i.test(name)) return 0;
@@ -1298,9 +1303,18 @@ export function simMiddleware(options?: SimMiddlewareOptions): SimMiddleware {
         if (/vision|reality/i.test(name)) return 4;
         return 5;
       };
-      // Lower is higher in the list: streaming > booted > last-opened > rest.
-      const stateRank = (x: typeof devices[number]) =>
-        x.helper ? 0 : x.state === "Booted" ? 1 : x.device === preferredUdid ? 2 : 3;
+      // Lower is higher in the list: streaming > selected > booted > last-opened
+      // > rest. The active `?device=` selection is ranked near the top so it's
+      // always inside the first page — otherwise a paginated client that selected
+      // a shut-down device deep in the catalog would get no chrome/placeholder
+      // for the view it's actually showing.
+      const stateRank = (d: (typeof sims)[number]) => {
+        if (helperByUdid.has(d.udid)) return 0;
+        if (selectedDevice && d.udid === selectedDevice) return 1;
+        if (d.state === "Booted") return 2;
+        if (d.udid === preferredUdid) return 3;
+        return 4;
+      };
       // Newest runtime first, so "iPhone 17 Pro (27.0)" sorts above its 26.x twins.
       const runtimeRank = (runtime: string): number => {
         const m = runtime.match(/-(\d+)-(\d+)/);
@@ -1308,17 +1322,43 @@ export function simMiddleware(options?: SimMiddlewareOptions): SimMiddleware {
         const minor = m ? Number(m[2]) : 0;
         return -(major * 1000 + minor);
       };
-      devices.sort((a, b) =>
+      sims.sort((a, b) =>
         stateRank(a) - stateRank(b) ||
         familyRank(a.name) - familyRank(b.name) ||
         a.name.localeCompare(b.name) ||
         runtimeRank(a.runtime) - runtimeRank(b.runtime),
       );
+
+      const total = sims.length;
+      const { limit, offset } = parseGridPaging(rawUrl);
+      const page = limit == null ? sims : sims.slice(offset, offset + limit);
+      const devices = page.map((d) => {
+        const helper = helperByUdid.get(d.udid);
+        const remoteHelper = helper ? rewriteStateForRequestHost(helper, hostForRequest(req), base, httpProtocolForRequest(req), proxyHelpers) : null;
+        return {
+          device: d.udid,
+          name: d.name,
+          runtime: d.runtime,
+          state: d.state,
+          chrome: resolveDeviceKitChrome(d),
+          placeholderAsset: resolveDevicePlaceholderAsset(d),
+          helper: remoteHelper
+            ? {
+                port: remoteHelper.port,
+                url: remoteHelper.url,
+                streamUrl: remoteHelper.streamUrl,
+                wsUrl: remoteHelper.wsUrl,
+              }
+            : null,
+        };
+      });
       res.writeHead(200, {
         "Content-Type": "application/json",
         "Cache-Control": "no-store",
       });
-      res.end(JSON.stringify({ devices }));
+      // `total` lets the client show "X of Y" and know when to stop paging;
+      // older clients that read only `devices` are unaffected.
+      res.end(JSON.stringify({ devices, total, offset: limit == null ? 0 : offset, limit: limit ?? total }));
       return;
     }