shipthis 0.1.3 → 0.1.4

package/dist/commands/game/ios/app/addTester.js

@@ -2,7 +2,7 @@ import { jsx } from 'react/jsx-runtime';
 import { render } from 'ink';
 import { Flags } from '@oclif/core';
 import 'react';
-import { C as Command } from '../../../../Command-Cl-JfhTy.js';
+import { C as Command } from '../../../../Command-1YAl_0zS.js';
 import { c as BaseGameCommand, i as BetaGroup } from '../../../../index-BQRxiyqn.js';
 import 'ink-spinner';
 import 'axios';

package/dist/commands/game/ios/app/create.js

@@ -2,7 +2,7 @@ import { jsx } from 'react/jsx-runtime';
 import { render } from 'ink';
 import { Flags } from '@oclif/core';
 import 'react';
-import { C as Command } from '../../../../Command-Cl-JfhTy.js';
+import { C as Command } from '../../../../Command-1YAl_0zS.js';
 import { c as BaseGameCommand, d as getGodotAppleBundleIdentifier, e as BundleId, f as App } from '../../../../index-BQRxiyqn.js';
 import 'ink-spinner';
 import 'axios';

package/dist/commands/game/ios/app/status.js

@@ -2,7 +2,7 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { render } from 'ink';
 import { Flags } from '@oclif/core';
 import 'react';
-import { C as Command } from '../../../../Command-Cl-JfhTy.js';
+import { C as Command } from '../../../../Command-1YAl_0zS.js';
 import { c as BaseGameCommand } from '../../../../index-BQRxiyqn.js';
 import 'ink-spinner';
 import 'axios';
@@ -26,7 +26,7 @@ import { N as NextSteps } from '../../../../NextSteps-CK9zHOCt.js';
 import 'qrcode';
 import 'string-length';
 import 'strip-ansi';
-import { A as AppleAppDetails, a as AppleBundleIdDetails } from '../../../../AppleBundleIdDetails-C0XqjxKJ.js';
+import { A as AppleAppDetails, a as AppleBundleIdDetails } from '../../../../AppleBundleIdDetails-Dxo99Sgu.js';
 import '../../../../index-B6V7vGOj.js';
 import '../../../../useAndroidServiceAccountTestResult-D_30xIJA.js';
 import 'marked';

package/dist/commands/game/ios/app/sync.js

@@ -2,7 +2,7 @@ import { jsx } from 'react/jsx-runtime';
 import { render } from 'ink';
 import { Flags } from '@oclif/core';
 import 'react';
-import { C as Command } from '../../../../Command-Cl-JfhTy.js';
+import { C as Command } from '../../../../Command-1YAl_0zS.js';
 import { c as BaseGameCommand, h as CapabilityTypeOption } from '../../../../index-BQRxiyqn.js';
 import 'ink-spinner';
 import 'axios';

package/dist/commands/game/ios/profile/create.js

@@ -3,7 +3,7 @@ import { render } from 'ink';
 import { Flags } from '@oclif/core';
 import axios from 'axios';
 import 'react';
-import { C as Command } from '../../../../Command-Cl-JfhTy.js';
+import { C as Command } from '../../../../Command-1YAl_0zS.js';
 import { c as BaseGameCommand, P as Platform, C as CredentialsType, l as Certificate, m as CertificateType, n as Profile, o as ProfileType } from '../../../../index-BQRxiyqn.js';
 import 'ink-spinner';
 import 'crypto-js';

package/dist/commands/game/ios/profile/export.js

@@ -5,7 +5,7 @@ import * as fs from 'fs';
 import { c as BaseGameCommand, P as Platform, C as CredentialsType } from '../../../../index-BQRxiyqn.js';
 import { a as getProjectCredentials } from '../../../../index-BuZmCvZh.js';
 import 'react';
-import { C as Command } from '../../../../Command-Cl-JfhTy.js';
+import { C as Command } from '../../../../Command-1YAl_0zS.js';
 import 'ink-spinner';
 import 'axios';
 import 'crypto-js';

package/dist/commands/game/ios/profile/import.js

@@ -5,7 +5,7 @@ import * as fs from 'fs';
 import { c as BaseGameCommand, P as Platform, C as CredentialsType } from '../../../../index-BQRxiyqn.js';
 import { a as getProjectCredentials } from '../../../../index-BuZmCvZh.js';
 import 'react';
-import { C as Command } from '../../../../Command-Cl-JfhTy.js';
+import { C as Command } from '../../../../Command-1YAl_0zS.js';
 import 'ink-spinner';
 import 'axios';
 import 'crypto-js';

package/dist/commands/game/ios/profile/status.js

@@ -2,7 +2,7 @@ import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import { Box, Text, render } from 'ink';
 import { Flags } from '@oclif/core';
 import 'react';
-import { C as Command } from '../../../../Command-Cl-JfhTy.js';
+import { C as Command } from '../../../../Command-1YAl_0zS.js';
 import { b as getShortDate, n as Profile, o as ProfileType, C as CredentialsType, P as Platform, c as BaseGameCommand } from '../../../../index-BQRxiyqn.js';
 import Spinner from 'ink-spinner';
 import 'axios';

package/dist/commands/game/ios/status.js

@@ -2,7 +2,7 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { render } from 'ink';
 import { Flags } from '@oclif/core';
 import 'react';
-import { C as Command } from '../../../Command-Cl-JfhTy.js';
+import { C as Command } from '../../../Command-1YAl_0zS.js';
 import { c as BaseGameCommand, k as getProjectPlatformProgress, P as Platform, b as getShortDate } from '../../../index-BQRxiyqn.js';
 import 'ink-spinner';
 import '@inkjs/ui';
@@ -15,7 +15,7 @@ import 'qrcode';
 import { S as StatusTable } from '../../../StatusTable-Dm5St4g-.js';
 import 'string-length';
 import 'strip-ansi';
-import { A as AppleAppDetails, a as AppleBundleIdDetails } from '../../../AppleBundleIdDetails-C0XqjxKJ.js';
+import { A as AppleAppDetails, a as AppleBundleIdDetails } from '../../../AppleBundleIdDetails-Dxo99Sgu.js';
 import 'luxon';
 import 'uuid';
 import 'fast-glob';

package/dist/commands/game/job/list.js

@@ -3,7 +3,7 @@ import { render, Box, Text } from 'ink';
 import { Flags } from '@oclif/core';
 import { c as BaseGameCommand, F as getProjectJobs } from '../../../index-BQRxiyqn.js';
 import 'react';
-import { g as getJobSummary, C as Command } from '../../../Command-Cl-JfhTy.js';
+import { g as getJobSummary, C as Command } from '../../../Command-1YAl_0zS.js';
 import 'ink-spinner';
 import '@inkjs/ui';
 import 'axios';

package/dist/commands/game/job/status.js

@@ -3,7 +3,7 @@ import { Args, Flags } from '@oclif/core';
 import { measureElement, Box, Text, render } from 'ink';
 import { p as getAuthedHeaders, q as API_URL, J as castArrayObjectDates, O as castObjectDates, a3 as getShortTime, K as JobStatus, c as BaseGameCommand, a4 as getJob } from '../../../index-BQRxiyqn.js';
 import { useState, useEffect, useRef } from 'react';
-import { g as getJobSummary, c as getBuildSummary, C as Command } from '../../../Command-Cl-JfhTy.js';
+import { g as getJobSummary, c as getBuildSummary, C as Command } from '../../../Command-1YAl_0zS.js';
 import Spinner from 'ink-spinner';
 import '@inkjs/ui';
 import axios from 'axios';
@@ -30,7 +30,7 @@ import 'crypto-js';
 import { c as cacheKeys } from '../../../useAndroidServiceAccountTestResult-D_30xIJA.js';
 import { u as useWebSocket } from '../../../useWebSocket-DoImIdTy.js';
 import { T as Title } from '../../../Title-BCQtayg6.js';
-import { u as useJobWatching } from '../../../useJobWatching-Bz1e6xOv.js';
+import { u as useJobWatching } from '../../../useJobWatching-BcBJ5dy1.js';
 import { a as StatusRow, b as StatusRowLabel } from '../../../StatusTable-Dm5St4g-.js';
 import 'path';
 import '@expo/apple-utils/build/index.js';

package/dist/commands/game/list.js

@@ -3,7 +3,7 @@ import { render, Text, Box } from 'ink';
 import { Flags } from '@oclif/core';
 import { B as BaseAuthenticatedCommand, g as getProjects, b as getShortDate } from '../../index-BQRxiyqn.js';
 import 'react';
-import { C as Command } from '../../Command-Cl-JfhTy.js';
+import { C as Command } from '../../Command-1YAl_0zS.js';
 import 'ink-spinner';
 import '@inkjs/ui';
 import 'axios';

package/dist/commands/game/status.js

@@ -2,7 +2,7 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { render } from 'ink';
 import { Flags } from '@oclif/core';
 import 'react';
-import { C as Command } from '../../Command-Cl-JfhTy.js';
+import { C as Command } from '../../Command-1YAl_0zS.js';
 import { B as BaseAuthenticatedCommand, H as getProject, P as Platform, k as getProjectPlatformProgress, b as getShortDate } from '../../index-BQRxiyqn.js';
 import 'ink-spinner';
 import '@inkjs/ui';

package/dist/commands/status.js

@@ -2,7 +2,7 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { render } from 'ink';
 import { X as BaseCommand, j as isCWDGodotGame } from '../index-BQRxiyqn.js';
 import 'react';
-import { C as Command } from '../Command-Cl-JfhTy.js';
+import { C as Command } from '../Command-1YAl_0zS.js';
 import 'ink-spinner';
 import 'axios';
 import 'crypto-js';

package/dist/index-DE2Hvx2o.js

@@ -0,0 +1,122 @@
+import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
+import { Text, useInput, Box } from 'ink';
+import open from 'open';
+import { useState, useEffect, useContext } from 'react';
+import { S as getGoogleStatus, a1 as getShortAuthRequiredUrl, a2 as getGoogleAuthUrl, Z as WEB_URL } from './index-BQRxiyqn.js';
+import 'crypto';
+import 'fs';
+import 'readline-sync';
+import 'node:readline';
+import 'node:path';
+import 'node:url';
+import 'axios';
+import { useQuery } from '@tanstack/react-query';
+import 'crypto-js';
+import 'uuid';
+import 'luxon';
+import 'fast-glob';
+import 'yazl';
+import 'socket.io-client';
+import { u as useWebSocket } from './useWebSocket-DoImIdTy.js';
+import { c as cacheKeys } from './useAndroidServiceAccountTestResult-D_30xIJA.js';
+import 'isomorphic-git';
+import '@oclif/core';
+import { a as GameContext, M as Markdown } from './Command-1YAl_0zS.js';
+import 'ink-spinner';
+import '@inkjs/ui';
+import qrcode from 'qrcode';
+import 'string-length';
+import 'strip-ansi';
+
+const useGoogleStatus = () => {
+  return useQuery({
+    queryKey: cacheKeys.googleStatus(),
+    queryFn: getGoogleStatus
+  });
+};
+
+function useGoogleStatusWatching({
+  projectId,
+  isWatching,
+  onGoogleStatusUpdate
+}) {
+  const [wsGoogleStatus, setWsGoogleStatus] = useState(null);
+  const listener = {
+    getPattern: () => `project.${projectId}:google-status`,
+    eventHandler: async (pattern, data2) => {
+      setWsGoogleStatus(data2);
+      if (onGoogleStatusUpdate) onGoogleStatusUpdate(data2);
+    }
+  };
+  useWebSocket([listener] );
+  const { isLoading, data: googleStatus } = useGoogleStatus();
+  useEffect(() => {
+    setWsGoogleStatus(null);
+  }, [projectId, isWatching, googleStatus]);
+  const fetchedGoogleStatus = googleStatus ? googleStatus : null;
+  const data = wsGoogleStatus ? wsGoogleStatus : fetchedGoogleStatus;
+  return {
+    isLoading,
+    data
+  };
+}
+
+const QRCodeTerminal = ({ url }) => {
+  const [code, setCode] = useState(null);
+  const handleLoad = async () => {
+    const codeString = await qrcode.toString(url, { type: "terminal", errorCorrectionLevel: "L", small: true });
+    setCode(codeString);
+  };
+  useEffect(() => {
+    handleLoad();
+  }, []);
+  return /* @__PURE__ */ jsx(Fragment, { children: code && /* @__PURE__ */ jsx(Text, { children: code }) });
+};
+
+async function getConnectUrl(gameId, helpPage) {
+  const helpPagePath = `/docs/android?gameId=${gameId}#2-connect-shipthis-with-google`;
+  const url = helpPage ? await getShortAuthRequiredUrl(helpPagePath) : await getGoogleAuthUrl(gameId);
+  return url;
+}
+const GoogleAuthQRCode = ({ gameId, helpPage }) => {
+  const [url, setUrl] = useState(null);
+  const handleLoad = async () => {
+    const url2 = await getConnectUrl(gameId, helpPage);
+    setUrl(url2);
+  };
+  useEffect(() => {
+    handleLoad();
+  }, []);
+  return /* @__PURE__ */ jsx(Fragment, { children: url && /* @__PURE__ */ jsx(QRCodeTerminal, { url }) });
+};
+
+const ConnectGoogle = (props) => {
+  const { gameId } = useContext(GameContext);
+  return /* @__PURE__ */ jsx(Fragment, { children: gameId && /* @__PURE__ */ jsx(ConnectForGame, { gameId, ...props }) });
+};
+const ConnectForGame = ({ onComplete, onError, helpPage, gameId, ...boxProps }) => {
+  useGoogleStatusWatching({
+    projectId: gameId,
+    isWatching: true,
+    onGoogleStatusUpdate: (status) => {
+      if (status.isAuthenticated) return onComplete();
+    }
+  });
+  useInput(async (input) => {
+    if (!gameId) return;
+    if (input !== "d") return;
+    const url = await getConnectUrl(gameId, true);
+    await open(url);
+  });
+  const templateVars = {
+    privacyURL: new URL("/privacy", WEB_URL).toString()
+  };
+  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, ...boxProps, children: [
+    /* @__PURE__ */ jsx(Markdown, { filename: "privacy-notification.md", templateVars }),
+    /* @__PURE__ */ jsx(Text, { children: "Scan the QR code below to connect your Google account to ShipThis:" }),
+    gameId && /* @__PURE__ */ jsx(GoogleAuthQRCode, { gameId, helpPage: !!helpPage }),
+    /* @__PURE__ */ jsx(Text, { children: "Or press D to sign-in using your browser" })
+  ] });
+};
+
+export { ConnectGoogle as C };

package/dist/index-X__XH_Fd.js

@@ -0,0 +1,144 @@
+import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
+import { Box, Text } from 'ink';
+import { useState, useRef, useEffect, useContext } from 'react';
+import Spinner from 'ink-spinner';
+import { a as GameContext } from './Command-1YAl_0zS.js';
+import { p as getAuthedHeaders, q as API_URL, O as castObjectDates, P as Platform, C as CredentialsType, S as getGoogleStatus } from './index-BQRxiyqn.js';
+import axios from 'axios';
+import 'crypto-js';
+import 'uuid';
+import 'luxon';
+import 'fs';
+import { ProgressBar } from '@inkjs/ui';
+import { useQuery, useQueryClient } from '@tanstack/react-query';
+import 'open';
+import 'crypto';
+import 'readline-sync';
+import 'node:readline';
+import 'node:path';
+import 'node:url';
+import { c as cacheKeys } from './useAndroidServiceAccountTestResult-D_30xIJA.js';
+import 'fast-glob';
+import 'yazl';
+import 'socket.io-client';
+import 'isomorphic-git';
+import '@oclif/core';
+import { u as useWebSocket } from './useWebSocket-DoImIdTy.js';
+import { u as useProjectCredentials } from './useProjectCredentials-B5ZmpIxL.js';
+import 'qrcode';
+import 'string-length';
+import 'strip-ansi';
+
+async function fetchStatus({ projectId }) {
+  try {
+    if (!projectId) throw new Error("projectId is required");
+    const headers = getAuthedHeaders();
+    const url = `${API_URL}/projects/${projectId}/credentials/android/key/status/`;
+    const response = await axios.get(url, { headers });
+    return castObjectDates(response.data);
+  } catch (error) {
+    console.warn("fetchStatus Error", error);
+    throw error;
+  }
+}
+const useAndroidServiceAccountSetupStatus = (props) => {
+  return useQuery({
+    queryKey: cacheKeys.androidSetupStatus(props),
+    queryFn: () => fetchStatus(props),
+    // Status changes frequently, so we want to keep it fresh
+    refetchInterval: 1e3 * 5,
+    staleTime: 1e3 * 5
+  });
+};
+
+const ERR_NOT_AUTHENTICATED = "You must be connected to Google to create a Service Account Key";
+const useHasServiceAccountKey = (projectId) => {
+  const { data, isSuccess } = useProjectCredentials({ projectId, platform: Platform.ANDROID });
+  return isSuccess && data.data.some((cred) => cred.isActive && cred.platform === Platform.ANDROID && cred.type == CredentialsType.KEY);
+};
+const useAndroidServiceAccount = ({ projectId, onError, onComplete }) => {
+  const queryClient = useQueryClient();
+  const [isStarting, setIsStarting] = useState(false);
+  const hasServiceAccountKey = useHasServiceAccountKey(projectId);
+  const listener = {
+    getPattern: () => `project.${projectId}:android-setup-status`,
+    eventHandler: async (pattern, data) => {
+      const key = cacheKeys.androidSetupStatus({ projectId });
+      queryClient.setQueryData(key, () => data);
+    }
+  };
+  useWebSocket([listener]);
+  const { data: setupStatus } = useAndroidServiceAccountSetupStatus({ projectId });
+  const prevSetupStatusRef = useRef("unknown");
+  useEffect(() => {
+    if (["running", "queued"].includes(prevSetupStatusRef.current)) {
+      if (setupStatus?.status === "complete") onComplete();
+      if (setupStatus?.status === "error") onError(new Error(setupStatus.errorMessage));
+    }
+    prevSetupStatusRef.current = setupStatus?.status || "unknown";
+  }, [setupStatus]);
+  const handleStart = async () => {
+    try {
+      setIsStarting(true);
+      const currentStatus = await getGoogleStatus();
+      if (!currentStatus.isAuthenticated) throw new Error(ERR_NOT_AUTHENTICATED);
+      const headers = getAuthedHeaders();
+      const androidKeyApiBase = `${API_URL}/projects/${projectId}/credentials/android/key`;
+      const startUrl = `${androidKeyApiBase}/setup/`;
+      const { data: updatedStatus } = await axios.post(startUrl, {}, { headers });
+      queryClient.invalidateQueries({
+        queryKey: cacheKeys.projectCredentials({ projectId, pageNumber: 0 })
+      });
+      await queryClient.setQueryData(cacheKeys.androidSetupStatus({ projectId }), (_) => updatedStatus);
+      setIsStarting(false);
+      return true;
+    } catch (error) {
+      setIsStarting(false);
+      console.warn("useAndroidServiceAccount.handleStart Error", error);
+      onError(error);
+      return false;
+    }
+  };
+  const isCreating = isStarting || setupStatus?.status === "queued" || setupStatus?.status === "running";
+  return {
+    handleStart,
+    setupStatus,
+    isCreating,
+    hasServiceAccountKey
+  };
+};
+
+const ProgressSpinner = ({ progress, label, spinnerType, labelProps, boxProps }) => /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(Box, { flexDirection: "column", gap: 1, ...boxProps, children: /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
+  label && label != "" && /* @__PURE__ */ jsx(Text, { ...labelProps, children: label }),
+  /* @__PURE__ */ jsx(ProgressBar, { value: progress || 0 }),
+  /* @__PURE__ */ jsxs(Text, { children: [
+    Math.floor(progress || 0),
+    "%"
+  ] }),
+  /* @__PURE__ */ jsx(Spinner, { type: spinnerType })
+] }) }) });
+
+const CreateServiceAccountKey = (props) => {
+  const { gameId } = useContext(GameContext);
+  return /* @__PURE__ */ jsx(Fragment, { children: gameId && /* @__PURE__ */ jsx(CreateForGame, { gameId, ...props }) });
+};
+const CreateForGame = ({ onComplete, onError, gameId, ...boxProps }) => {
+  const [didStart, setDidStart] = useState(false);
+  const { handleStart, setupStatus, isCreating } = useAndroidServiceAccount({
+    projectId: gameId,
+    onError,
+    onComplete
+  });
+  useEffect(() => {
+    handleStart().then(() => setDidStart(true));
+  }, [gameId]);
+  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, ...boxProps, children: [
+    /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
+      /* @__PURE__ */ jsx(Text, { children: "Creating a Service Account and API Key..." }),
+      isCreating && /* @__PURE__ */ jsx(Spinner, { type: "dots" })
+    ] }),
+    didStart && /* @__PURE__ */ jsx(ProgressSpinner, { progress: (setupStatus?.progress || 0) * 100, spinnerType: "dots" })
+  ] }) });
+};
+
+export { CreateServiceAccountKey as C, ProgressSpinner as P };

package/dist/useJobWatching-BcBJ5dy1.js

@@ -0,0 +1,43 @@
+import { u as useJob } from './Command-1YAl_0zS.js';
+import { useState, useEffect } from 'react';
+import { u as useWebSocket } from './useWebSocket-DoImIdTy.js';
+import { N as castJobDates, O as castObjectDates } from './index-BQRxiyqn.js';
+
+function useJobWatching({ projectId, jobId, isWatching, onJobUpdate }) {
+  const [websocketJob, setWebsocketJob] = useState(null);
+  const [mostRecentLog, setMostRecentLog] = useState(null);
+  const jobStatusListener = {
+    getPattern: () => [`project.${projectId}:job:created`, `project.${projectId}:job:updated`],
+    eventHandler: async (pattern, rawJob) => {
+      if (rawJob.id !== jobId) return;
+      const job2 = castJobDates(rawJob);
+      setWebsocketJob(job2);
+      if (onJobUpdate) onJobUpdate(job2);
+    }
+  };
+  const jobProgressListener = {
+    getPattern: () => `project.${projectId}:job.${jobId}:log`,
+    eventHandler: async (pattern, rawLogEntry) => {
+      const logEntry = castObjectDates(rawLogEntry, ["sentAt", "createdAt"]);
+      setMostRecentLog(logEntry);
+    }
+  };
+  useWebSocket(isWatching ? [jobStatusListener, jobProgressListener] : []);
+  const { isLoading, data: job } = useJob({
+    projectId,
+    jobId
+  });
+  useEffect(() => {
+    setWebsocketJob(null);
+  }, [jobId, projectId, isWatching, job]);
+  const fetchedJob = job ? job : null;
+  const data = websocketJob ? websocketJob : fetchedJob;
+  const progress = mostRecentLog?.progress || null;
+  return {
+    isLoading,
+    data,
+    progress
+  };
+}
+
+export { useJobWatching as u };

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "shipthis",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "shipthis",
-      "version": "0.1.3",
+      "version": "0.1.4",
       "license": "MIT",
       "dependencies": {
         "@expo/apple-utils": "2.0.3",