shipthis 0.1.47 → 0.1.48

package/oclif.manifest.json

@@ -596,13 +596,14 @@
         "game_id": {
           "description": "The ID of the game to export (use \"list\" to get the ID)",
           "name": "game_id",
-          "required": true
+          "required": false
         }
       },
       "description": "Downloads the shipthis.json file for a given game into the current directory.",
       "examples": [
         "<%= config.bin %> <%= command.id %> abcd1234",
-        "<%= config.bin %> <%= command.id %> abcd1234 --force"
+        "<%= config.bin %> <%= command.id %> abcd1234 --force",
+        "<%= config.bin %> <%= command.id %> --current --force"
       ],
       "flags": {
         "force": {
@@ -610,6 +611,12 @@
           "name": "force",
           "allowNo": false,
           "type": "boolean"
+        },
+        "current": {
+          "description": "Use the project ID from the current shipthis.json config",
+          "name": "current",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -710,7 +717,8 @@
         "<%= config.bin %> <%= command.id %> --platform android --follow --downloadAPK game.apk",
         "<%= config.bin %> <%= command.id %> --platform ios --follow --verbose",
         "<%= config.bin %> <%= command.id %> --platform ios --useDemoCredentials --download game.ipa",
-        "<%= config.bin %> <%= command.id %> --platform android --gameEngineVersion 4.5.1 --skipPublish"
+        "<%= config.bin %> <%= command.id %> --platform android --gameEngineVersion 4.5.1 --skipPublish",
+        "<%= config.bin %> <%= command.id %> --platform android --dryRun"
       ],
       "flags": {
         "gameId": {
@@ -796,6 +804,13 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "dryRun": {
+          "description": "Dry run - lists the files that would be shipped without executing the build or publish steps",
+          "name": "dryRun",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -2962,5 +2977,5 @@
       ]
     }
   },
-  "version": "0.1.47"
+  "version": "0.1.48"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shipthis",
   "description": "Build and publish Godot games to the App Store and Google Play. Cloud builds for APK, AAB, and IPA - no Mac or Android Studio required.",
-  "version": "0.1.47",
+  "version": "0.1.48",
   "author": "Hello Invent Ltd",
   "bin": {
     "shipthis": "./bin/run.js"
@@ -257,8 +257,7 @@
   },
   "types": "dist/index.d.ts",
   "overrides": {
-    "serialize-javascript": "^7.0.3",
-    "fast-xml-parser": "^5.3.8",
+    "serialize-javascript": "^7.0.5",
     "cli-spinners": "2.9.2",
     "@alcalzone/ansi-tokenize": "^0.2.2"
   }

package/dist/JobProgress-C24YiJOA.js

@@ -1,252 +0,0 @@
-import fs__default from 'node:fs';
-import { useMutation } from '@tanstack/react-query';
-import fg from 'fast-glob';
-import { v4 } from 'uuid';
-import { I as queryClient, l as getProject, x as DEFAULT_SHIPPED_FILES_GLOBS, y as DEFAULT_IGNORED_FILES_GLOBS, a4 as getNewUploadTicket, a5 as startJobsFromUpload, a2 as LogLevel } from './baseCommand-B7pUDBYl.js';
-import { k as cacheKeys, v as getFileHash, w as getPlatformName, x as getMessageColor } from './baseGameCommand-BTC5XD8W.js';
-import { ZipFile } from 'yazl';
-import { g as getCWDGitInfo } from './git-BpsfNFZ_.js';
-import { Readable, Transform } from 'stream';
-import { jsxs, jsx } from 'react/jsx-runtime';
-import { Box, Text } from 'ink';
-import { useState } from 'react';
-import 'ink-spinner';
-import 'axios';
-import 'luxon';
-import 'socket.io-client';
-import { u as useJobWatching, a as JobLogLine } from './JobLogTail-D-IhoJDu.js';
-import 'fullscreen-ink';
-import 'open';
-import '@inkjs/ui';
-import 'node:path';
-import 'marked';
-import 'marked-terminal';
-import { P as ProgressSpinner } from './ProgressSpinner-Um6ARKlk.js';
-import 'qrcode';
-import 'string-length';
-import 'strip-ansi';
-import 'godot-export-presets';
-
-function formatProgressLog(label, data, bytesKey, totalKey, isEstimated = false) {
-  const elapsed = data.elapsedSeconds.toFixed(1);
-  const transferredMB = (data[bytesKey] / 1024 / 1024).toFixed(2);
-  const totalMB = (data[totalKey] / 1024 / 1024).toFixed(2);
-  const progressPercent = Math.round(data.progress * 100);
-  const speed = data.speedMBps.toFixed(2);
-  const totalPrefix = isEstimated ? "~" : "";
-  return `${label}: ${progressPercent}% (${transferredMB}MB / ${totalPrefix}${totalMB}MB) - ${elapsed}s - ${speed}MB/s`;
-}
-async function ship({ command, log = () => {
-}, shipFlags }) {
-  const commandFlags = command.getFlags();
-  const finalFlags = shipFlags || commandFlags;
-  const { verbose, useDemoCredentials } = finalFlags;
-  verbose && log("Fetching game config...");
-  const projectConfig = await command.getProjectConfig();
-  if (!projectConfig.project) throw new Error("No project found in project config");
-  const project = await getProject(projectConfig.project.id);
-  const projectUsesDemoCredentials = Boolean(project.details?.useDemoCredentials);
-  const isUsingDemoCredentials = useDemoCredentials ?? projectUsesDemoCredentials ?? false;
-  const hasConfiguredIos = Boolean(project.details?.iosBundleId);
-  const hasConfiguredAndroid = Boolean(project.details?.androidPackageName);
-  if (!isUsingDemoCredentials && !hasConfiguredAndroid && !hasConfiguredIos) {
-    throw new Error(
-      "No Android or iOS configuration found. Please run `shipthis game wizard android` or `shipthis game wizard ios` to configure your game."
-    );
-  }
-  verbose && log("Retrieving file globs...");
-  const shippedFilesGlobs = projectConfig.shippedFilesGlobs || DEFAULT_SHIPPED_FILES_GLOBS;
-  const ignoredFilesGlobs = projectConfig.ignoredFilesGlobs || DEFAULT_IGNORED_FILES_GLOBS;
-  verbose && log("Finding files to include in zip...");
-  const files = await fg(shippedFilesGlobs, { dot: true, ignore: ignoredFilesGlobs });
-  verbose && log(`Found ${files.length} files, adding to zip...`);
-  const tmpZipFileName = `shipthis-${v4()}.zip`;
-  const tmpZipFile = `${process.cwd()}/${tmpZipFileName}`;
-  log(`Creating zip file: ${tmpZipFileName}`);
-  await createZip({
-    files,
-    outputPath: tmpZipFile,
-    onProgress: (data) => {
-      log(formatProgressLog("Zipping", data, "writtenBytes", "estimatedTotalBytes", true));
-    }
-  });
-  const { size } = fs__default.statSync(tmpZipFile);
-  verbose && log("Requesting upload ticket...");
-  const uploadTicket = await getNewUploadTicket(projectConfig.project.id);
-  log("Uploading zip file...");
-  const zipStream = fs__default.createReadStream(tmpZipFile);
-  const response = await uploadZip({
-    url: uploadTicket.url,
-    zipStream,
-    zipSize: size,
-    onProgress: (data) => {
-      log(formatProgressLog("Uploading", data, "loadedBytes", "totalBytes", false));
-    }
-  });
-  verbose && log("Computing zip file hash...");
-  const zipFileMd5 = await getFileHash(tmpZipFile);
-  verbose && log("Cleaning up temporary zip file...");
-  fs__default.unlinkSync(tmpZipFile);
-  if (!response.ok) {
-    throw new Error(`Upload failed: ${response.status} ${response.statusText}`);
-  }
-  log(`Upload complete`);
-  verbose && log("Fetching Git info...");
-  const gitInfo = await getCWDGitInfo();
-  const uploadDetails = {
-    ...gitInfo,
-    zipFileMd5
-  };
-  verbose && log("Starting jobs from upload...");
-  const startJobsOptions = {
-    ...uploadDetails,
-    platform: finalFlags.platform?.toUpperCase(),
-    skipPublish: finalFlags.skipPublish,
-    verbose: finalFlags.verbose,
-    useDemoCredentials: isUsingDemoCredentials,
-    gameEngineVersion: finalFlags.gameEngineVersion
-  };
-  const jobs = await startJobsFromUpload(uploadTicket.id, startJobsOptions);
-  verbose && log("Job submission complete.");
-  if (jobs.length === 0) {
-    throw new Error("No jobs were created. Please check your game configuration and try again.");
-  }
-  if (finalFlags?.follow) {
-    log("Waiting for job to start...");
-  }
-  return jobs;
-}
-const useShip = () => useMutation({
-  mutationFn: ship,
-  async onSuccess(data) {
-    queryClient.invalidateQueries({
-      queryKey: cacheKeys.jobs({ pageNumber: 0, projectId: data[0].project.id })
-    });
-  }
-});
-
-const ON_PROGRESS_THROTTLE_MS = 2e3;
-function createProgressStream(totalSize, onProgress, throttleMs) {
-  let sent = 0;
-  let lastCallTime = 0;
-  return new Transform({
-    transform(chunk, encoding, callback) {
-      sent += chunk.length;
-      const now = Date.now();
-      if (now - lastCallTime >= throttleMs) {
-        onProgress(sent, totalSize);
-        lastCallTime = now;
-      }
-      callback(null, chunk);
-    }
-  });
-}
-function uploadZip({ url, zipStream, zipSize, onProgress }) {
-  const startTime = Date.now();
-  const progressStream = createProgressStream(zipSize, (sent, total) => {
-    const elapsedSeconds = (Date.now() - startTime) / 1e3;
-    const speedMBps = elapsedSeconds < 1e-3 ? 0 : sent / elapsedSeconds / 1024 / 1024;
-    onProgress({
-      progress: total ? sent / total : 0,
-      loadedBytes: sent,
-      totalBytes: total,
-      speedMBps,
-      elapsedSeconds
-    });
-  }, ON_PROGRESS_THROTTLE_MS);
-  const streamWithProgress = zipStream.pipe(progressStream);
-  const webStream = Readable.toWeb(streamWithProgress);
-  const response = fetch(url, {
-    method: "PUT",
-    headers: {
-      "Content-Type": "application/zip",
-      "Content-Length": zipSize.toString()
-    },
-    body: webStream,
-    duplex: "half"
-  });
-  return response;
-}
-
-const COMPRESSION_RATIO = 0.65;
-async function createZip({ files, outputPath, onProgress }) {
-  const startTime = Date.now();
-  const statPromises = files.map(async (file) => {
-    try {
-      return await fs__default.promises.stat(file);
-    } catch {
-      return null;
-    }
-  });
-  const statsResults = await Promise.all(statPromises);
-  let totalSourceSize = 0;
-  for (const stats of statsResults) {
-    if (stats) {
-      totalSourceSize += stats.size;
-    }
-  }
-  const estimatedZipSize = Math.max(Math.round(totalSourceSize * COMPRESSION_RATIO), 1);
-  const zipFile = new ZipFile();
-  for (const file of files) {
-    zipFile.addFile(file, file);
-  }
-  return new Promise((resolve, reject) => {
-    let settled = false;
-    const handleError = (error) => {
-      if (settled) return;
-      settled = true;
-      zipFile.outputStream.destroy();
-      progressStream.destroy();
-      outputStream.destroy();
-      reject(error);
-    };
-    const handleSuccess = () => {
-      if (settled) return;
-      settled = true;
-      resolve();
-    };
-    const outputStream = fs__default.createWriteStream(outputPath);
-    const progressStream = createProgressStream(estimatedZipSize, (written, total) => {
-      const elapsedSeconds = (Date.now() - startTime) / 1e3;
-      const speedMBps = elapsedSeconds < 1e-3 ? 0 : written / elapsedSeconds / 1024 / 1024;
-      onProgress({
-        progress: total ? Math.min(1, written / total) : 0,
-        writtenBytes: written,
-        estimatedTotalBytes: total,
-        sourceTotalBytes: totalSourceSize,
-        elapsedSeconds,
-        speedMBps
-      });
-    }, ON_PROGRESS_THROTTLE_MS);
-    zipFile.outputStream.on("error", handleError);
-    progressStream.on("error", handleError);
-    outputStream.on("error", handleError);
-    outputStream.on("close", handleSuccess);
-    zipFile.outputStream.pipe(progressStream).pipe(outputStream);
-    zipFile.end();
-  });
-}
-
-const JobProgress = (props) => {
-  const [lastWarningLog, setLastWarningLog] = useState(null);
-  const { progress } = useJobWatching({
-    isWatching: true,
-    jobId: props.job.id,
-    onComplete: props.onComplete,
-    onFailure: props.onFailure,
-    projectId: props.job.project.id,
-    onNewLogEntry: (logEntry) => {
-      if (logEntry.level == LogLevel.WARN) setLastWarningLog(logEntry);
-    }
-  });
-  const label = `${getPlatformName(props.job.type)} build progress...`;
-  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 0, children: [
-    /* @__PURE__ */ jsx(ProgressSpinner, { label, progress, spinnerType: "dots" }),
-    lastWarningLog && /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 1, marginLeft: 2, children: [
-      /* @__PURE__ */ jsx(Text, { color: getMessageColor(lastWarningLog.level), children: "WARNING" }),
-      /* @__PURE__ */ jsx(JobLogLine, { log: lastWarningLog, showTimestamp: false, showStage: false })
-    ] })
-  ] });
-};
-
-export { JobProgress as J, useShip as u };