@playdrop/playdrop-cli 0.6.6 → 0.6.7

package/config/client-meta.json

@@ -1,6 +1,6 @@
 {
-  "version": "0.6.6",
-  "build": 3,
+  "version": "0.6.7",
+  "build": 1,
   "platforms": {
     "ios": {
       "minimumVersion": "16.0"
@@ -26,12 +26,12 @@
   },
   "clients": {
     "web": {
-      "minimumVersion": "0.6.6",
-      "minimumBuild": 3
+      "minimumVersion": "0.6.7",
+      "minimumBuild": 1
     },
     "admin": {
-      "minimumVersion": "0.6.6",
-      "minimumBuild": 3
+      "minimumVersion": "0.6.7",
+      "minimumBuild": 1
     },
     "apple": {
       "minimumVersion": "0.3.10",
@@ -46,7 +46,7 @@
       "minimumBuild": 1
     },
     "cli": {
-      "minimumVersion": "0.6.6"
+      "minimumVersion": "0.6.7"
     }
   }
 }

package/dist/apps/launchCheck.js

@@ -13,6 +13,20 @@ const devRuntimeAssets_1 = require("../commands/devRuntimeAssets");
 const registration_1 = require("./registration");
 const DEFAULT_HOSTED_LAUNCH_TIMEOUT_MS = 15000;
 const POST_READY_SETTLE_MS = 750;
+const CAPTURE_SURFACE = 'DESKTOP';
+function resolvePostAuthHostedLaunchState(controllerMode) {
+    return controllerMode === 'REQUIRED' ? 'controller_required' : 'ready';
+}
+function resolveAnonymousHostedLaunchState(input) {
+    const surfaceTargets = Array.isArray(input.surfaceTargets) ? input.surfaceTargets : [];
+    if (!surfaceTargets.includes(CAPTURE_SURFACE)) {
+        return 'surface_unsupported';
+    }
+    if (input.authMode === 'REQUIRED') {
+        return 'login_required';
+    }
+    return resolvePostAuthHostedLaunchState(input.controllerMode);
+}
 function normalizeLaunchCheckMessage(message) {
     const normalized = typeof message === 'string' ? message.trim() : '';
     return normalized || 'Hosted app failed to launch.';
@@ -93,7 +107,11 @@ async function runHostedLaunchCheckWithCapture(options) {
         if (result.hostedLaunchState?.state !== expectedHostedLaunchState) {
             return buildFailedLaunchCheckResult('startup_failure', expectedHostedLaunchState === 'login_required'
                 ? 'Hosted app did not stop at the PlayDrop sign-in gate.'
-                : 'Hosted app never reported the ready state.', options.artifactFingerprint ?? null);
+                : expectedHostedLaunchState === 'controller_required'
+                    ? 'Hosted app did not stop at the PlayDrop controller gate.'
+                    : expectedHostedLaunchState === 'surface_unsupported'
+                        ? 'Hosted app did not stop at the PlayDrop unsupported-surface gate.'
+                        : 'Hosted app never reported the ready state.', options.artifactFingerprint ?? null);
         }
         return buildPassedLaunchCheckResult(options.artifactFingerprint ?? null);
     }
@@ -161,8 +179,9 @@ async function runLocalHostedLaunchCheck(input) {
             creatorUsername: input.creatorUsername,
             task: input.task,
         });
-        const authMode = mountedRuntime.runtimeAssetManifest.response.localAppMetadata.authMode;
-        if (authMode === 'REQUIRED') {
+        const localAppMetadata = mountedRuntime.runtimeAssetManifest.response.localAppMetadata;
+        const anonymousExpectedState = resolveAnonymousHostedLaunchState(localAppMetadata);
+        if (anonymousExpectedState === 'login_required') {
             const registeredApp = await (0, registration_1.fetchRegisteredAppShell)(input.client, input.creatorUsername, input.task.name);
             if (!registeredApp?.id) {
                 return buildRegistrationRequiredLaunchCheckFailure(input.task.name);
@@ -176,7 +195,7 @@ async function runLocalHostedLaunchCheck(input) {
                     launchCheck: true,
                 }),
                 timeoutMs: input.timeoutMs,
-                expectedHostedLaunchState: 'login_required',
+                expectedHostedLaunchState: anonymousExpectedState,
             });
             if (anonymousGateResult.status !== 'PASSED') {
                 return anonymousGateResult;
@@ -190,7 +209,7 @@ async function runLocalHostedLaunchCheck(input) {
                     launchCheck: true,
                 }),
                 timeoutMs: input.timeoutMs,
-                expectedHostedLaunchState: 'ready',
+                expectedHostedLaunchState: resolvePostAuthHostedLaunchState(localAppMetadata.controllerMode),
                 token: input.token ?? null,
                 user: input.currentUser ?? null,
                 savedSessionBootstrap: true,
@@ -205,6 +224,7 @@ async function runLocalHostedLaunchCheck(input) {
                 launchCheck: true,
             }),
             timeoutMs: input.timeoutMs,
+            expectedHostedLaunchState: anonymousExpectedState,
         });
     }
     finally {
@@ -215,9 +235,9 @@ async function runLocalHostedLaunchCheck(input) {
 }
 async function runUploadedHostedLaunchCheck(input) {
     const preview = await input.client.fetchAppUploadLaunchCheckPreview(input.creatorUsername, input.task.name, input.sessionId);
-    const authMode = preview.localAppMetadata.authMode;
+    const anonymousExpectedState = resolveAnonymousHostedLaunchState(preview.localAppMetadata);
     let result;
-    if (authMode === 'REQUIRED') {
+    if (anonymousExpectedState === 'login_required') {
         if (!preview.app?.id) {
             result = buildRegistrationRequiredLaunchCheckFailure(input.task.name);
         }
@@ -226,7 +246,7 @@ async function runUploadedHostedLaunchCheck(input) {
                 targetUrl: appendLaunchCheckParams(preview.launchUrl, 'anonymous'),
                 artifactFingerprint: preview.session.manifestHash,
                 timeoutMs: input.timeoutMs,
-                expectedHostedLaunchState: 'login_required',
+                expectedHostedLaunchState: anonymousExpectedState,
             });
             if (anonymousGateResult.status !== 'PASSED') {
                 result = anonymousGateResult;
@@ -236,7 +256,7 @@ async function runUploadedHostedLaunchCheck(input) {
                     targetUrl: appendLaunchCheckParams(preview.launchUrl, 'viewer'),
                     artifactFingerprint: preview.session.manifestHash,
                     timeoutMs: input.timeoutMs,
-                    expectedHostedLaunchState: 'ready',
+                    expectedHostedLaunchState: resolvePostAuthHostedLaunchState(preview.localAppMetadata.controllerMode),
                     token: input.token ?? null,
                     user: input.currentUser ?? null,
                     savedSessionBootstrap: true,
@@ -249,7 +269,7 @@ async function runUploadedHostedLaunchCheck(input) {
             targetUrl: appendLaunchCheckParams(preview.launchUrl, 'anonymous'),
             artifactFingerprint: preview.session.manifestHash,
             timeoutMs: input.timeoutMs,
-            expectedHostedLaunchState: 'ready',
+            expectedHostedLaunchState: anonymousExpectedState,
         });
     }
     const recorded = await input.client.recordAppUploadLaunchCheck(input.creatorUsername, input.task.name, input.sessionId, {

package/dist/captureRuntime.d.ts

@@ -23,12 +23,17 @@ export type RunCaptureOptions = {
     savedSessionBootstrap?: boolean;
     enableCaptureBridge?: boolean;
     requireHostedLaunchReady?: boolean;
-    expectedHostedLaunchState?: 'ready' | 'login_required';
+    expectedHostedLaunchState?: HostedLaunchExpectedState;
 };
+export type HostedLaunchExpectedState = 'ready' | 'login_required' | 'controller_required' | 'surface_unsupported';
 export type CaptureHostedLaunchState = {
     state: 'ready';
 } | {
     state: 'login_required';
+} | {
+    state: 'controller_required';
+} | {
+    state: 'surface_unsupported';
 } | {
     state: 'error';
     errorCode: string | null;

package/dist/captureRuntime.js

@@ -92,6 +92,12 @@ function normalizeHostedLaunchStatePayload(payload) {
     if (state === 'login_required') {
         return { state: 'login_required' };
     }
+    if (state === 'controller_required') {
+        return { state: 'controller_required' };
+    }
+    if (state === 'surface_unsupported') {
+        return { state: 'surface_unsupported' };
+    }
     if (state !== 'error') {
         return null;
     }
@@ -117,6 +123,24 @@ function formatHostedLaunchError(state) {
     }
     return parts.join(' ');
 }
+function formatHostedLaunchStateMismatch(actualState, expectedState) {
+    if (expectedState === "login_required") {
+        return `Hosted app reported ${actualState} instead of login_required.`;
+    }
+    if (expectedState === "controller_required") {
+        return `Hosted app reported ${actualState} instead of controller_required.`;
+    }
+    if (expectedState === "surface_unsupported") {
+        return `Hosted app reported ${actualState} instead of surface_unsupported.`;
+    }
+    return `Hosted app reported ${actualState} instead of ready.`;
+}
+function shouldSettleHostedLaunchWaiter(state, expectedState) {
+    if (state.state === "error" || !expectedState) {
+        return true;
+    }
+    return state.state === expectedState;
+}
 async function writeLogFile(logPath, lines) {
     if (!logPath || logPath.trim().length === 0) {
         return;
@@ -195,6 +219,9 @@ async function runCapture(options) {
                 if (!hostedLaunchWaiter || hostedLaunchWaiterSettled) {
                     return;
                 }
+                if (!shouldSettleHostedLaunchWaiter(state, expectedHostedLaunchState)) {
+                    return;
+                }
                 hostedLaunchWaiterSettled = true;
                 resolveHostedLaunchWaiter?.(state);
             };
@@ -442,24 +469,35 @@ async function runCapture(options) {
                 if (expectedHostedLaunchState === 'login_required' && frameCount > 0) {
                     throw new Error('The Playdrop auth gate booted the app frame unexpectedly.');
                 }
+                if (expectedHostedLaunchState === 'controller_required' && frameCount > 0) {
+                    throw new Error('The Playdrop controller gate booted the app frame unexpectedly.');
+                }
+                if (expectedHostedLaunchState === 'surface_unsupported' && frameCount > 0) {
+                    throw new Error('The Playdrop surface gate booted the app frame unexpectedly.');
+                }
                 return currentUrl;
             };
             if (hostedLaunchWaiter) {
                 const launchState = await Promise.race([
                     hostedLaunchWaiter,
                     page.waitForTimeout(options.timeoutMs).then(() => {
+                        if (hostedLaunchState && expectedHostedLaunchState && hostedLaunchState.state !== expectedHostedLaunchState) {
+                            throw new Error(formatHostedLaunchStateMismatch(hostedLaunchState.state, expectedHostedLaunchState));
+                        }
                         throw new Error(expectedHostedLaunchState === 'login_required'
                             ? 'Hosted app did not stop at the PlayDrop sign-in gate before the launch-check timeout.'
-                            : 'Hosted app did not reach the ready state before the launch-check timeout.');
+                            : expectedHostedLaunchState === 'controller_required'
+                                ? 'Hosted app did not stop at the PlayDrop controller gate before the launch-check timeout.'
+                                : expectedHostedLaunchState === 'surface_unsupported'
+                                    ? 'Hosted app did not stop at the PlayDrop unsupported-surface gate before the launch-check timeout.'
+                                    : 'Hosted app did not reach the ready state before the launch-check timeout.');
                     }),
                 ]);
                 if (launchState.state === 'error') {
                     throw new Error(formatHostedLaunchError(launchState));
                 }
                 if (expectedHostedLaunchState && launchState.state !== expectedHostedLaunchState) {
-                    throw new Error(expectedHostedLaunchState === 'login_required'
-                        ? 'Hosted app did not stop at the PlayDrop sign-in gate.'
-                        : `Hosted app reported ${launchState.state} instead of ready.`);
+                    throw new Error(formatHostedLaunchStateMismatch(launchState.state, expectedHostedLaunchState));
                 }
             }
             finalUrl = await assertPageState();

package/dist/clientInfo.js

@@ -13,15 +13,44 @@ const path_1 = __importDefault(require("path"));
 const fs_1 = require("fs");
 const config_1 = require("@playdrop/config");
 let cachedCliPackageVersion = null;
+function assertValidCliVersion(version) {
+    if (!/^\d+\.\d+\.\d+$/.test(version)) {
+        throw new Error(`invalid_cli_package_version:${version}`);
+    }
+    return version;
+}
+function readVersionFromJson(pathname, field) {
+    try {
+        const parsed = JSON.parse((0, fs_1.readFileSync)(pathname, 'utf8'));
+        const value = typeof parsed[field] === 'string' ? parsed[field].trim() : '';
+        if (!value) {
+            return null;
+        }
+        return assertValidCliVersion(value);
+    }
+    catch {
+        return null;
+    }
+}
 function readCliPackageVersion() {
     if (cachedCliPackageVersion) {
         return cachedCliPackageVersion;
     }
+    const candidateMetaPaths = [
+        path_1.default.resolve(__dirname, '..', 'config', 'client-meta.json'),
+        path_1.default.resolve(__dirname, '..', '..', '..', 'config', 'client-meta.json'),
+    ];
+    for (const candidatePath of candidateMetaPaths) {
+        const clientMetaVersion = readVersionFromJson(candidatePath, 'version');
+        if (clientMetaVersion) {
+            cachedCliPackageVersion = clientMetaVersion;
+            return clientMetaVersion;
+        }
+    }
     const packageJsonPath = path_1.default.resolve(__dirname, '..', 'package.json');
-    const packageJson = JSON.parse((0, fs_1.readFileSync)(packageJsonPath, 'utf8'));
-    const version = typeof packageJson.version === 'string' ? packageJson.version.trim() : '';
-    if (!/^\d+\.\d+\.\d+$/.test(version)) {
-        throw new Error(`invalid_cli_package_version:${version}`);
+    const version = readVersionFromJson(packageJsonPath, 'version');
+    if (!version) {
+        throw new Error(`invalid_cli_package_version:${packageJsonPath}`);
     }
     cachedCliPackageVersion = version;
     return version;

package/node_modules/@playdrop/config/client-meta.json

@@ -1,6 +1,6 @@
 {
-  "version": "0.6.6",
-  "build": 3,
+  "version": "0.6.7",
+  "build": 1,
   "platforms": {
     "ios": {
       "minimumVersion": "16.0"
@@ -26,12 +26,12 @@
   },
   "clients": {
     "web": {
-      "minimumVersion": "0.6.6",
-      "minimumBuild": 3
+      "minimumVersion": "0.6.7",
+      "minimumBuild": 1
     },
     "admin": {
-      "minimumVersion": "0.6.6",
-      "minimumBuild": 3
+      "minimumVersion": "0.6.7",
+      "minimumBuild": 1
     },
     "apple": {
       "minimumVersion": "0.3.10",
@@ -46,7 +46,7 @@
       "minimumBuild": 1
     },
     "cli": {
-      "minimumVersion": "0.6.6"
+      "minimumVersion": "0.6.7"
     }
   }
 }