shipthis 0.1.23 → 0.1.25

package/README.md

@@ -23,11 +23,35 @@
   </picture>
 </p>
 
----
 
 > [!IMPORTANT]
 > ShipThis is in open beta. While in beta, it is completely free to use.
 
+---
+
+
+<details>
+<summary><strong>Watch: Set up ShipThis for iOS</strong></summary>
+
+<p align="center">
+  <a href="https://www.youtube.com/watch?v=ijTUFVk1duw" target="_blank">
+    <img src="https://img.youtube.com/vi/ijTUFVk1duw/0.jpg" alt="Watch the iOS setup video" width="640" height="480">
+  </a>
+</p>
+
+</details>
+<details>
+<summary><strong>Watch: Set up ShipThis for Android</strong></summary>
+
+<p align="center">
+  <picture>
+    <img height="431" width="672" alt="ShipThis Command - Android Wizard - published game" src="docs/assets/wizard-android-existingx0.5.gif">
+  </picture>
+</p>
+
+</details>
+
+
 ## ❓ Why use ShipThis?
 
 - **✅ Always a free tier** – Enough usage for most solo devs.
@@ -73,21 +97,6 @@ Next, run the [wizard command](https://shipth.is/docs/reference/game/wizard) to
 shipthis game wizard android
 ```
 
-<details>
-<summary>Watch: Android wizard run for a published Google Play game</summary>
-
-<p align="center">
-  <picture>
-    <img height="431" width="672" alt="ShipThis Command - Android Wizard - published game" src="docs/assets/wizard-android-existingx0.5.gif">
-  </picture>
-</p>
-
-The wizard will ask if you would like to import an existing Keystore. You will need the password and path to the JKS file.
-
-If your game is already published on Google Play, the wizard will skip the initial build upload step. Once you have connected ShipThis with Google, the wizard will be able to determine if the game exists in Google Play.
-
-</details>
-
 ### Set up an iOS game
 
 ```bash

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shipthis",
   "description": "ShipThis manages building and uploading your Godot games to the App Store and Google Play.",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "author": "Hello Invent Ltd",
   "bin": {
     "shipthis": "./bin/run.js"

package/bin/readme.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-scriptDir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-cd $scriptDir/..
-
-# We want to avoid overwriting the docs we have manually written
-
-bin/dev.js internal readme docs/ -d 2 --only docs/game --notDryRun --overWrite
-bin/dev.js internal readme docs/ -d 2 --only docs/apple/apiKey --notDryRun --overWrite
-bin/dev.js internal readme docs/ -d 2 --only docs/apple/certificate --notDryRun --overWrite
-bin/dev.js internal readme docs/ -d 2 --only docs/login.md --notDryRun --overWrite
-bin/dev.js internal readme docs/ -d 2 --only docs/status.md --notDryRun --overWrite
-bin/dev.js internal readme docs/ -d 2 --only docs/dashboard.md --notDryRun --overWrite
-bin/dev.js internal readme docs/ -d 2 --only docs/help.md --notDryRun --overWrite

package/dist/AppleBundleIdDetails-C9C5WSPR.js

@@ -1,76 +0,0 @@
-import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
-import { Box, Text } from 'ink';
-import Spinner from 'ink-spinner';
-import './index-DkNQs11R.js';
-import 'axios';
-import '@tanstack/react-query';
-import 'crypto';
-import 'fs';
-import 'readline-sync';
-import 'node:readline';
-import 'node:path';
-import 'node:url';
-import 'luxon';
-import 'isomorphic-git';
-import '@oclif/core';
-import 'react';
-import 'crypto-js';
-import 'uuid';
-import 'socket.io-client';
-import { u as useAppleApp } from './useAppleApp-B16WbUxJ.js';
-import 'fast-glob';
-import 'yazl';
-import '@inkjs/ui';
-import './index-vMXsdSCy.js';
-import 'open';
-import { T as Table } from './Table-CvM6pccN.js';
-import { T as Title } from './Title-BCQtayg6.js';
-import 'string-length';
-import 'strip-ansi';
-import 'marked';
-import 'marked-terminal';
-import 'path';
-import 'qrcode';
-import { u as useAppleBundleId } from './useAppleBundleId-DobPATan.js';
-
-const AppleAppDetails = (props) => {
-  const { data, isLoading } = useAppleApp(props);
-  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [
-    /* @__PURE__ */ jsx(Title, { children: "App Details (in the Apple Developer Portal)" }),
-    isLoading && /* @__PURE__ */ jsx(Spinner, { type: "dots" }),
-    data && data.summary && /* @__PURE__ */ jsx(Table, { data: [data.summary] })
-  ] });
-};
-
-const AppleBundleIdDetails = (props) => {
-  const { data, isLoading } = useAppleBundleId(props);
-  const { bundleIdSummary, capabilitiesTable, shouldSyncCapabilities, capabilities } = data || {};
-  return /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [
-      /* @__PURE__ */ jsx(Title, { children: "BundleId Details (in the Apple Developer Portal)" }),
-      isLoading && /* @__PURE__ */ jsx(Spinner, { type: "dots" }),
-      bundleIdSummary && /* @__PURE__ */ jsx(Table, { data: [bundleIdSummary] })
-    ] }),
-    capabilities && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [
-      /* @__PURE__ */ jsx(Title, { children: "Capabilities enabled in the BundleId" }),
-      /* @__PURE__ */ jsx(
-        Table,
-        {
-          data: capabilities.map((c) => {
-            return { capability: `${c}` };
-          })
-        }
-      )
-    ] }),
-    capabilitiesTable && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [
-      /* @__PURE__ */ jsx(Title, { children: "BundleId Capability Check" }),
-      /* @__PURE__ */ jsx(Table, { data: capabilitiesTable })
-    ] }),
-    shouldSyncCapabilities && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx(Text, { bold: true, children: "The capabilities are out of sync with the Apple Developer Portal." }),
-      /* @__PURE__ */ jsx(Text, { bold: true, children: "Run shipthis game ios app sync" })
-    ] })
-  ] });
-};
-
-export { AppleAppDetails as A, AppleBundleIdDetails as a };

package/dist/Command-BQCJ9Wf-.js

@@ -1,28 +0,0 @@
-import { jsx } from 'react/jsx-runtime';
-import { Box } from 'ink';
-import { QueryClientProvider } from '@tanstack/react-query';
-import { M as queryClient } from './index-DkNQs11R.js';
-import 'axios';
-import 'crypto';
-import 'fs';
-import 'readline-sync';
-import 'node:readline';
-import 'node:path';
-import 'node:url';
-import 'luxon';
-import 'isomorphic-git';
-import '@oclif/core';
-import 'react';
-import 'crypto-js';
-import 'uuid';
-import 'socket.io-client';
-import 'fast-glob';
-import 'yazl';
-import { C as CommandProvider } from './index-vMXsdSCy.js';
-
-const Command = ({ children, command }) => {
-  const width = process.stdout.columns || 80;
-  return /* @__PURE__ */ jsx(QueryClientProvider, { client: queryClient, children: /* @__PURE__ */ jsx(CommandProvider, { command, children: /* @__PURE__ */ jsx(Box, { width, flexDirection: "column", children }) }) });
-};
-
-export { Command as C };

package/dist/CommandGame-CkGqTno0.js

@@ -1,9 +0,0 @@
-import { jsx } from 'react/jsx-runtime';
-import { G as GameProvider } from './index-vMXsdSCy.js';
-import { C as Command } from './Command-BQCJ9Wf-.js';
-
-const CommandGame = ({ children, command }) => {
-  return /* @__PURE__ */ jsx(Command, { command, children: /* @__PURE__ */ jsx(GameProvider, { children }) });
-};
-
-export { CommandGame as C };

package/dist/Create-t_E231OA.js

@@ -1,59 +0,0 @@
-import { jsx } from 'react/jsx-runtime';
-import { Box } from 'ink';
-import axios from 'axios';
-import { useContext } from 'react';
-import { useQueryClient } from '@tanstack/react-query';
-import { p as getAuthedHeaders, q as API_URL } from './index-DkNQs11R.js';
-import { c as cacheKeys } from './useAndroidServiceAccountTestResult-DcYDam-p.js';
-import { b as GameContext } from './index-vMXsdSCy.js';
-import 'ink-spinner';
-import '@inkjs/ui';
-import 'fs';
-import 'uuid';
-import 'yazl';
-import 'crypto';
-import 'readline-sync';
-import 'node:readline';
-import 'node:path';
-import 'node:url';
-import 'luxon';
-import 'isomorphic-git';
-import '@oclif/core';
-import 'fast-glob';
-import 'socket.io-client';
-import 'open';
-import 'marked';
-import 'marked-terminal';
-import 'path';
-import 'qrcode';
-import { R as RunWithSpinner } from './RunWithSpinner-BVXNWGD3.js';
-import 'string-length';
-import 'strip-ansi';
-
-const CreateKeystore = ({ onComplete, onError, ...boxProps }) => {
-  const { gameId } = useContext(GameContext);
-  const queryClient = useQueryClient();
-  const handleCreate = async () => {
-    try {
-      if (!gameId) throw new Error("No game");
-      const headers = await getAuthedHeaders();
-      await axios.post(`${API_URL}/projects/${gameId}/credentials/android/certificate`, null, {
-        headers
-      });
-      queryClient.invalidateQueries({ queryKey: cacheKeys.projectCredentials({ projectId: gameId, pageNumber: 0 }) });
-    } catch (err) {
-      onError(err);
-    }
-  };
-  return /* @__PURE__ */ jsx(Box, { flexDirection: "column", gap: 1, ...boxProps, children: gameId && /* @__PURE__ */ jsx(
-    RunWithSpinner,
-    {
-      executeMethod: handleCreate,
-      msgInProgress: "Creating Keystore...",
-      msgComplete: "Keystore created",
-      onComplete
-    }
-  ) });
-};
-
-export { CreateKeystore as C };

package/dist/Import-Ljz1gxXd.js

@@ -1,110 +0,0 @@
-import { jsxs, jsx } from 'react/jsx-runtime';
-import { useContext, useState, useEffect } from 'react';
-import { Box, Text } from 'ink';
-import Spinner from 'ink-spinner';
-import { b as GameContext } from './index-vMXsdSCy.js';
-import { M as queryClient, P as Platform, C as CredentialsType } from './index-DkNQs11R.js';
-import 'axios';
-import 'crypto-js';
-import { v4 } from 'uuid';
-import fs__default from 'fs';
-import 'luxon';
-import '@inkjs/ui';
-import { useMutation } from '@tanstack/react-query';
-import yazl from 'yazl';
-import { c as cacheKeys } from './useAndroidServiceAccountTestResult-DcYDam-p.js';
-import { i as importCredential } from './import-Ch5O7xfN.js';
-import 'crypto';
-import 'readline-sync';
-import 'node:readline';
-import 'node:path';
-import 'node:url';
-import 'isomorphic-git';
-import '@oclif/core';
-import 'fast-glob';
-import 'socket.io-client';
-import 'open';
-import 'marked';
-import 'marked-terminal';
-import 'path';
-import 'qrcode';
-import 'string-length';
-import 'strip-ansi';
-
-async function importKeystore({ log = () => {
-}, ...opt }) {
-  if (!opt.zipFilePath && !opt.jksFilePath) {
-    throw new Error("You must provide either a zipFilePath or a jksFilePath");
-  }
-  if (opt.zipFilePath && opt.jksFilePath) {
-    throw new Error("You cannot provide both a zipFilePath and a jksFilePath");
-  }
-  if (opt.jksFilePath && (!opt.keystorePassword || !opt.keyPassword)) {
-    throw new Error("You must provide both keystorePassword and keyPassword when importing a jks file");
-  }
-  const toDelete = [];
-  if (opt.jksFilePath) {
-    log("Creating zip file from jks file...");
-    const outputZipToFile = (zip, fileName) => new Promise((resolve) => {
-      const outputStream = fs__default.createWriteStream(fileName);
-      zip.outputStream.pipe(outputStream).on("close", () => resolve());
-      zip.end();
-    });
-    const zipFile = new yazl.ZipFile();
-    log("Adding keyStore.jks to zip file...");
-    zipFile.addFile(opt.jksFilePath, "keyStore.jks");
-    log("Adding password.txt and keyPassword.txt to zip file...");
-    zipFile.addBuffer(Buffer.from(`${opt.keystorePassword}`), "password.txt");
-    zipFile.addBuffer(Buffer.from(`${opt.keyPassword}`), "keyPassword.txt");
-    const tmpZipFile = `${process.cwd()}/shipthis-keyStore-${v4()}.zip`;
-    log(`Writing zip file: ${tmpZipFile}`);
-    await outputZipToFile(zipFile, tmpZipFile);
-    toDelete.push(tmpZipFile);
-    opt.zipFilePath = tmpZipFile;
-  }
-  log("Uploading and importing zip file...");
-  const keyStore = await importCredential({
-    projectId: opt.gameId,
-    zipPath: `${opt.zipFilePath}`,
-    type: CredentialsType.CERTIFICATE,
-    platform: Platform.ANDROID
-  });
-  log("Imported successfully");
-  toDelete.forEach((file) => {
-    log(`Deleting temporary file: ${file}`);
-    fs__default.unlinkSync(file);
-  });
-  return keyStore;
-}
-const useImportKeystore = () => {
-  return useMutation({
-    mutationFn: importKeystore,
-    onSuccess: async (data) => {
-      const projectId = data.projectId;
-      queryClient.invalidateQueries({
-        queryKey: cacheKeys.projectCredentials({ projectId, pageNumber: 0 })
-      });
-    }
-  });
-};
-
-const ImportKeystore = ({ onComplete, onError, importKeystoreProps }) => {
-  const { gameId } = useContext(GameContext);
-  const importMutation = useImportKeystore();
-  const [log, setLog] = useState(null);
-  useEffect(() => {
-    if (!gameId) return;
-    const importOpts = {
-      ...importKeystoreProps,
-      gameId,
-      log: setLog
-    };
-    importMutation.mutateAsync(importOpts).catch(onError).then(onComplete);
-  }, [gameId]);
-  return /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, children: [
-    /* @__PURE__ */ jsx(Spinner, { type: "dots" }),
-    log && /* @__PURE__ */ jsx(Text, { children: log })
-  ] });
-};
-
-export { ImportKeystore as I };

package/dist/JobProgress-D9tHgBvi.js

@@ -1,121 +0,0 @@
-import { v4 } from 'uuid';
-import axios from 'axios';
-import fg from 'fast-glob';
-import fs__default from 'fs';
-import yazl from 'yazl';
-import { useMutation } from '@tanstack/react-query';
-import { c as cacheKeys } from './useAndroidServiceAccountTestResult-DcYDam-p.js';
-import { M as queryClient, x as DEFAULT_SHIPPED_FILES_GLOBS, w as DEFAULT_IGNORED_FILES_GLOBS, a1 as getNewUploadTicket, a2 as startJobsFromUpload, J as JobStatus } from './index-DkNQs11R.js';
-import { e as getFileHash, f as getPlatformName } from './index-BB00V5oF.js';
-import { g as getCWDGitInfo } from './git-DREGq-jc.js';
-import { jsx, Fragment } from 'react/jsx-runtime';
-import { useRef } from 'react';
-import 'ink';
-import './index-vMXsdSCy.js';
-import 'ink-spinner';
-import 'crypto-js';
-import 'luxon';
-import '@inkjs/ui';
-import 'open';
-import 'marked';
-import 'marked-terminal';
-import 'path';
-import { P as ProgressSpinner } from './ProgressSpinner-6pw1T8Iw.js';
-import 'qrcode';
-import 'string-length';
-import 'strip-ansi';
-import 'socket.io-client';
-import { u as useJobWatching } from './useJobWatching-BZSUa8E-.js';
-
-async function ship({ command, log = () => {
-} }) {
-  log("Fetching project config...");
-  const projectConfig = await command.getProjectConfig();
-  if (!projectConfig.project) throw new Error("No project found in project config");
-  log("Retrieving file globs...");
-  const shippedFilesGlobs = projectConfig.shippedFilesGlobs || DEFAULT_SHIPPED_FILES_GLOBS;
-  const ignoredFilesGlobs = projectConfig.ignoredFilesGlobs || DEFAULT_IGNORED_FILES_GLOBS;
-  log("Finding files to include in zip...");
-  const files = await fg(shippedFilesGlobs, { dot: true, ignore: ignoredFilesGlobs });
-  log(`Found ${files.length} files, adding to zip...`);
-  const zipFile = new yazl.ZipFile();
-  for (const file of files) {
-    zipFile.addFile(file, file);
-  }
-  const outputZipToFile = (zip, fileName) => new Promise((resolve) => {
-    const outputStream = fs__default.createWriteStream(fileName);
-    zip.outputStream.pipe(outputStream).on("close", () => resolve());
-    zip.end();
-  });
-  const tmpZipFile = `${process.cwd()}/shipthis-${v4()}.zip`;
-  log(`Creating zip file: ${tmpZipFile}`);
-  await outputZipToFile(zipFile, tmpZipFile);
-  log("Reading zip file buffer...");
-  const zipBuffer = fs__default.readFileSync(tmpZipFile);
-  const { size } = fs__default.statSync(tmpZipFile);
-  log("Requesting upload ticket...");
-  const uploadTicket = await getNewUploadTicket(projectConfig.project.id);
-  log("Uploading zip file...");
-  await axios.put(uploadTicket.url, zipBuffer, {
-    headers: {
-      "Content-length": size,
-      "Content-Type": "application/zip"
-    }
-  });
-  log("Fetching Git info...");
-  const gitInfo = await getCWDGitInfo();
-  log("Computing file hash...");
-  const zipFileMd5 = await getFileHash(tmpZipFile);
-  const uploadDetails = {
-    ...gitInfo,
-    zipFileMd5
-  };
-  log("Starting jobs from upload...");
-  const commandFlags = command.getFlags();
-  const startJobsOptions = {
-    ...uploadDetails,
-    skipPublish: commandFlags.skipPublish,
-    platform: commandFlags.platform?.toUpperCase()
-  };
-  const jobs = await startJobsFromUpload(uploadTicket.id, startJobsOptions);
-  log("Cleaning up temporary zip file...");
-  fs__default.unlinkSync(tmpZipFile);
-  log("Job submission complete.");
-  return jobs;
-}
-const useShip = () => {
-  return useMutation({
-    mutationFn: ship,
-    onSuccess: async (data) => {
-      queryClient.invalidateQueries({
-        queryKey: cacheKeys.jobs({ projectId: data[0].project.id, pageNumber: 0 })
-      });
-    }
-  });
-};
-
-const JobProgress = (props) => {
-  const prevJobStatus = useRef(props.job.status);
-  const handleJobUpdate = (job) => {
-    const completed = [JobStatus.COMPLETED, JobStatus.FAILED];
-    const wasRunning = !completed.includes(prevJobStatus.current);
-    if (completed.includes(job.status) && wasRunning) {
-      if (job.status === JobStatus.FAILED) {
-        props.onFailure(job);
-      } else {
-        props.onComplete(job);
-      }
-    }
-    prevJobStatus.current = job.status;
-  };
-  const { progress } = useJobWatching({
-    projectId: props.job.project.id,
-    jobId: props.job.id,
-    isWatching: true,
-    onJobUpdate: handleJobUpdate
-  });
-  const label = `${getPlatformName(props.job.type)} build progress...`;
-  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(ProgressSpinner, { progress, label, spinnerType: "dots" }) });
-};
-
-export { JobProgress as J, useShip as u };