@solana-mobile/dapp-store-cli 0.1.1-0 → 0.1.1-1

package/src/index.ts

@@ -75,30 +75,33 @@ async function main() {
     .option("-u, --url", "RPC URL", "https://devnet.genesysgo.net")
     .option("-d, --dry-run", "Flag for dry run. Doesn't mint an NFT")
     .action(async ({ publisherMintAddress, keypair, url, dryRun }) => {
-      const config = await getConfigFile();
-      if (!config.isValid) return;
+      try {
+        const config = await getConfigFile();
 
-      if (!hasAddressInConfig(config.publisher) && !publisherMintAddress) {
-        showUserErrorMessage(
-          "Either specify an publisher mint address in the config file, or specify as a CLI argument to this command."
-        );
-        createCommand.showHelpAfterError();
-        return;
-      }
+        if (!hasAddressInConfig(config.publisher) && !publisherMintAddress) {
+          showUserErrorMessage(
+            "Either specify an publisher mint address in the config file, or specify as a CLI argument to this command."
+          );
+          createCommand.showHelpAfterError();
+          return;
+        }
 
-      const signer = parseKeypair(keypair);
-      if (signer) {
-        await createAppCommand({
-          publisherMintAddress: publisherMintAddress,
-          signer,
-          url,
-          dryRun,
-        });
+        const signer = parseKeypair(keypair);
+        if (signer) {
+          await createAppCommand({
+            publisherMintAddress: publisherMintAddress,
+            signer,
+            url,
+            dryRun,
+          });
+        }
+      } catch (e) {
+        showUserErrorMessage((e as Error | null)?.message ?? "");
       }
     });
 
   createCommand
-    .command("release <version>")
+    .command("release")
     .description("Create a release")
     .requiredOption(
       "-k, --keypair <path-to-keypair-file>",
@@ -114,48 +117,46 @@ async function main() {
       "-b, --build-tools-path <build-tools-path>",
       "Path to Android build tools which contains AAPT2"
     )
-    .action(
-      async (
-        version,
-        { appMintAddress, keypair, url, dryRun, buildToolsPath }
-      ) => {
-        const toolsEnvDir = process.env.ANDROID_TOOLS_DIR ?? "";
-
-        let buildTools = "";
-        if (toolsEnvDir && toolsEnvDir.length > 0) {
-          buildTools = toolsEnvDir;
-        } else if (buildToolsPath) {
-          buildTools = buildToolsPath;
-        } else {
-          showUserErrorMessage(
-            "\n\n::: Please specify an Android build tools directory in the .env file or via the command line argument. :::\n\n"
-          );
-          createCommand.showHelpAfterError();
-          return;
-        }
-
-        const config = await getConfigFile();
-        if (!config.isValid) return;
-
-        if (!hasAddressInConfig(config.app) && !appMintAddress) {
-          showUserErrorMessage(
-            "\n\n::: Either specify an app mint address in the config file, or specify as a CLI argument to this command. :::\n\n"
-          );
-          createCommand.showHelpAfterError();
-          return;
-        }
-
-        const signer = parseKeypair(keypair);
-
-        if (signer) {
-          const result = await createReleaseCommand({
-            appMintAddress: appMintAddress,
-            version,
-            buildToolsPath: buildTools,
-            signer,
-            url,
-            dryRun,
-          });
+    .action(async ({ appMintAddress, keypair, url, dryRun, buildToolsPath }) => {
+        try {
+          const toolsEnvDir = process.env.ANDROID_TOOLS_DIR ?? "";
+
+          let buildTools = "";
+          if (toolsEnvDir && toolsEnvDir.length > 0) {
+            buildTools = toolsEnvDir;
+          } else if (buildToolsPath) {
+            buildTools = buildToolsPath;
+          } else {
+            showUserErrorMessage(
+              "\n\n::: Please specify an Android build tools directory in the .env file or via the command line argument. :::\n\n"
+            );
+            createCommand.showHelpAfterError();
+            return;
+          }
+
+          const config = await getConfigFile();
+
+          if (!hasAddressInConfig(config.app) && !appMintAddress) {
+            showUserErrorMessage(
+              "\n\n::: Either specify an app mint address in the config file, or specify as a CLI argument to this command. :::\n\n"
+            );
+            createCommand.showHelpAfterError();
+            return;
+          }
+
+          const signer = parseKeypair(keypair);
+
+          if (signer) {
+            const result = await createReleaseCommand({
+              appMintAddress: appMintAddress,
+              buildToolsPath: buildTools,
+              signer,
+              url,
+              dryRun,
+            });
+          }
+        } catch (e) {
+          showUserErrorMessage((e as Error | null)?.message ?? "");
         }
       }
     );
@@ -230,27 +231,30 @@ async function main() {
         requestorIsAuthorized,
         dryRun,
       }) => {
-        const config = await getConfigFile();
-        if (!config.isValid) return;
-
-        if (!hasAddressInConfig(config.publisher) && !releaseMintAddress) {
-          showUserErrorMessage(
-            "\n\n::: Either specify an release mint address in the config file, or specify as a CLI argument to this command. :::\n\n"
-          );
-          publishCommand.showHelpAfterError();
-          return;
-        }
-
-        const signer = parseKeypair(keypair);
-        if (signer) {
-          await publishSubmitCommand({
-            releaseMintAddress,
-            signer,
-            url,
-            dryRun,
-            compliesWithSolanaDappStorePolicies,
-            requestorIsAuthorized,
-          });
+        try {
+          const config = await getConfigFile();
+
+          if (!hasAddressInConfig(config.publisher) && !releaseMintAddress) {
+            showUserErrorMessage(
+              "\n\n::: Either specify an release mint address in the config file, or specify as a CLI argument to this command. :::\n\n"
+            );
+            publishCommand.showHelpAfterError();
+            return;
+          }
+
+          const signer = parseKeypair(keypair);
+          if (signer) {
+            await publishSubmitCommand({
+              releaseMintAddress,
+              signer,
+              url,
+              dryRun,
+              compliesWithSolanaDappStorePolicies,
+              requestorIsAuthorized,
+            });
+          }
+        } catch (e) {
+          showUserErrorMessage((e as Error | null)?.message ?? "");
         }
       }
     );
@@ -292,29 +296,32 @@ async function main() {
         critical,
         dryRun,
       }) => {
-        const config = await getConfigFile();
-        if (!config.isValid) return;
-
-        if (!hasAddressInConfig(config.publisher) && !releaseMintAddress) {
-          showUserErrorMessage(
-            "\n\n::: Either specify an release mint address in the config file, or specify as a CLI argument to this command. :::\n\n"
-          );
-          publishCommand.showHelpAfterError();
-          return;
-        }
-
-        const signer = parseKeypair(keypair);
-
-        if (signer) {
-          await publishUpdateCommand({
-            releaseMintAddress,
-            signer,
-            url,
-            dryRun,
-            compliesWithSolanaDappStorePolicies,
-            requestorIsAuthorized,
-            critical,
-          });
+        try {
+          const config = await getConfigFile();
+
+          if (!hasAddressInConfig(config.publisher) && !releaseMintAddress) {
+            showUserErrorMessage(
+              "\n\n::: Either specify an release mint address in the config file, or specify as a CLI argument to this command. :::\n\n"
+            );
+            publishCommand.showHelpAfterError();
+            return;
+          }
+
+          const signer = parseKeypair(keypair);
+
+          if (signer) {
+            await publishUpdateCommand({
+              releaseMintAddress,
+              signer,
+              url,
+              dryRun,
+              compliesWithSolanaDappStorePolicies,
+              requestorIsAuthorized,
+              critical,
+            });
+          }
+        } catch (e) {
+          showUserErrorMessage((e as Error | null)?.message ?? "");
         }
       }
     );
@@ -351,28 +358,31 @@ async function main() {
         critical,
         dryRun,
       }) => {
-        const config = await getConfigFile();
-        if (!config.isValid) return;
-
-        if (!hasAddressInConfig(config.publisher) && !releaseMintAddress) {
-          showUserErrorMessage(
-            "\n\n::: Either specify an release mint address in the config file, or specify as a CLI argument to this command. :::\n\n"
-          );
-          publishCommand.showHelpAfterError();
-          return;
-        }
-
-        const signer = parseKeypair(keypair);
-
-        if (signer) {
-          await publishRemoveCommand({
-            releaseMintAddress,
-            signer,
-            url,
-            dryRun,
-            requestorIsAuthorized,
-            critical,
-          });
+        try {
+          const config = await getConfigFile();
+
+          if (!hasAddressInConfig(config.publisher) && !releaseMintAddress) {
+            showUserErrorMessage(
+              "\n\n::: Either specify an release mint address in the config file, or specify as a CLI argument to this command. :::\n\n"
+            );
+            publishCommand.showHelpAfterError();
+            return;
+          }
+
+          const signer = parseKeypair(keypair);
+
+          if (signer) {
+            await publishRemoveCommand({
+              releaseMintAddress,
+              signer,
+              url,
+              dryRun,
+              requestorIsAuthorized,
+              critical,
+            });
+          }
+        } catch (e) {
+          showUserErrorMessage((e as Error | null)?.message ?? "");
         }
       }
     );
@@ -404,28 +414,31 @@ async function main() {
         requestDetails,
         { releaseMintAddress, keypair, url, requestorIsAuthorized, dryRun }
       ) => {
-        const config = await getConfigFile();
-        if (!config.isValid) return;
-
-        if (!hasAddressInConfig(config.publisher) && !releaseMintAddress) {
-          showUserErrorMessage(
-            "\n\n::: Either specify an release mint address in the config file, or specify as a CLI argument to this command. :::\n\n"
-          );
-          publishCommand.showHelpAfterError();
-          return;
-        }
-
-        const signer = parseKeypair(keypair);
-
-        if (signer) {
-          await publishSupportCommand({
-            releaseMintAddress,
-            signer,
-            url,
-            dryRun,
-            requestorIsAuthorized,
-            requestDetails,
-          });
+        try {
+          const config = await getConfigFile();
+
+          if (!hasAddressInConfig(config.publisher) && !releaseMintAddress) {
+            showUserErrorMessage(
+              "\n\n::: Either specify an release mint address in the config file, or specify as a CLI argument to this command. :::\n\n"
+            );
+            publishCommand.showHelpAfterError();
+            return;
+          }
+
+          const signer = parseKeypair(keypair);
+
+          if (signer) {
+            await publishSupportCommand({
+              releaseMintAddress,
+              signer,
+              url,
+              dryRun,
+              requestorIsAuthorized,
+              requestDetails,
+            });
+          }
+        } catch (e) {
+          showUserErrorMessage((e as Error | null)?.message ?? "");
         }
       }
     );

package/src/upload/CachedStorageDriver.ts

@@ -19,7 +19,10 @@ export type AssetManifestSchema = {
 
 // TODO(jon): We need to manage the removal / replacement of assets in the manifest
 export class CachedStorageDriver implements StorageDriver {
-  static readonly SCHEMA_VERSION = "0.2.2";
+  // NOTE: this schema version is independent of the publishing JSON schema. It should be updated
+  // when the AssetManifestSchema or Asset types are updated.
+  static readonly SCHEMA_VERSION = "0.1";
+
   assetManifest: AssetManifestSchema;
   assetManifestPath: string;
   storageDriver: StorageDriver;

package/src/utils.ts

@@ -1,10 +1,5 @@
 import fs from "fs";
-import type {
-  AndroidDetails,
-  App,
-  Publisher,
-  Release,
-} from "@solana-mobile/dapp-store-publishing-tools";
+import type { AndroidDetails, App, Publisher, Release } from "@solana-mobile/dapp-store-publishing-tools";
 import type { Connection } from "@solana/web3.js";
 import { Keypair } from "@solana/web3.js";
 import type { CLIConfig } from "./config/index.js";
@@ -14,12 +9,7 @@ import { dump } from "js-yaml";
 import * as util from "util";
 import { exec } from "child_process";
 import * as path from "path";
-import {
-  BundlrStorageDriver,
-  keypairIdentity,
-  Metaplex,
-  toMetaplexFile,
-} from "@metaplex-foundation/js";
+import { BundlrStorageDriver, keypairIdentity, Metaplex, toMetaplexFile } from "@metaplex-foundation/js";
 import { imageSize } from "image-size";
 
 import { CachedStorageDriver } from "./upload/CachedStorageDriver.js";
@@ -53,11 +43,10 @@ const AaptPrefixes = {
 
 export const getConfigFile = async (
   buildToolsDir: string | null = null
-): Promise<CLIConfig & { isValid: boolean }> => {
+): Promise<CLIConfig> => {
   const configFilePath = `${process.cwd()}/config.yaml`;
 
   const config = await getConfig(configFilePath);
-  config.isValid = true;
 
   console.info(`Pulling details from ${configFilePath}`);
 
@@ -68,9 +57,7 @@ export const getConfigFile = async (
     )!;
     const apkPath = path.join(process.cwd(), apkEntry?.uri);
     if (!fs.existsSync(apkPath)) {
-      showUserErrorMessage("Invalid path to APK file.");
-      config.isValid = false;
-      return config;
+      throw new Error("Invalid path to APK file.");
     }
 
     config.release.android_details = await getAndroidDetails(
@@ -85,27 +72,16 @@ export const getConfigFile = async (
   if (publisherIcon) {
     const iconPath = path.join(process.cwd(), publisherIcon);
     if (!fs.existsSync(iconPath) || !checkImageExtension(iconPath)) {
-      showUserErrorMessage(
-        "Please check the path to your Publisher icon ensure the file is a jpeg, png, or webp file."
-      );
-      config.isValid = false;
-      return config;
+      throw new Error("Please check the path to your Publisher icon and ensure the file is a jpeg, png, or webp file.");
     }
 
     const iconBuffer = await fs.promises.readFile(iconPath);
 
     if (await checkIconDimensions(iconPath)) {
-      showUserErrorMessage(
-        "Icons must have square dimensions and be no greater than 512px by 512px."
-      );
-      config.isValid = false;
-      return config;
+      throw new Error("Icons must have square dimensions and be no greater than 512px by 512px.")
     }
 
-    config.publisher.icon = toMetaplexFile(
-      iconBuffer,
-      path.join("media", publisherIcon)
-    );
+    config.publisher.icon = toMetaplexFile(iconBuffer, publisherIcon);
   }
 
   const appIcon = config.app.media?.find(
@@ -114,34 +90,22 @@ export const getConfigFile = async (
   if (appIcon) {
     const iconPath = path.join(process.cwd(), appIcon);
     if (!fs.existsSync(iconPath) || !checkImageExtension(iconPath)) {
-      showUserErrorMessage(
-        "Please check the path to your App icon ensure the file is a jpeg, png, or webp file."
-      );
-      config.isValid = false;
-      return config;
+      throw new Error("Please check the path to your App icon and ensure the file is a jpeg, png, or webp file.")
     }
 
     const iconBuffer = await fs.promises.readFile(iconPath);
 
     if (await checkIconDimensions(iconPath)) {
-      showUserErrorMessage(
-        "Icons must have square dimensions and be no greater than 512px by 512px."
-      );
-      config.isValid = false;
-      return config;
+      throw new Error("Icons must have square dimensions and be no greater than 512px by 512px.")
     }
 
-    config.app.icon = toMetaplexFile(iconBuffer, path.join("media", appIcon));
+    config.app.icon = toMetaplexFile(iconBuffer, appIcon);
   }
 
   config.release.media.forEach((item: CLIConfig["release"]["media"][0]) => {
     const imagePath = path.join(process.cwd(), item.uri);
     if (!fs.existsSync(imagePath) || !checkImageExtension(imagePath)) {
-      showUserErrorMessage(
-        `Invalid media path or file type: ${item.uri}. Please ensure the file is a jpeg, png, or webp file.`
-      );
-      config.isValid = false;
-      return config;
+      throw new Error(`Invalid media path or file type: ${item.uri}. Please ensure the file is a jpeg, png, or webp file.`)
     }
   });
 
@@ -182,8 +146,9 @@ const getAndroidDetails = async (
   const versionCode = new RegExp(
     AaptPrefixes.verCodePrefix + AaptPrefixes.quoteRegex
   ).exec(stdout);
-  //TODO: Return this and use automatically replacing command line arg
-  //const versionName = new RegExp(prefixes.verNamePrefix + prefixes.quoteRegex).exec(stdout);
+  const versionName = new RegExp(
+    AaptPrefixes.verNamePrefix + AaptPrefixes.quoteRegex
+  ).exec(stdout);
   const minSdk = new RegExp(
     AaptPrefixes.sdkPrefix + AaptPrefixes.quoteRegex
   ).exec(stdout);
@@ -209,6 +174,7 @@ const getAndroidDetails = async (
     android_package: appPackage?.[1] ?? "",
     min_sdk: parseInt(minSdk?.[1] ?? "0", 10),
     version_code: parseInt(versionCode?.[1] ?? "0", 10),
+    version: versionName?.[1] ?? "0",
     permissions: permissionArray,
     locales: localeArray,
   };
@@ -217,7 +183,7 @@ const getAndroidDetails = async (
 type SaveToConfigArgs = {
   publisher?: Pick<Publisher, "address">;
   app?: Pick<App, "address">;
-  release?: Pick<Release, "address" | "version">;
+  release?: Pick<Release, "address">;
 };
 
 export const saveToConfig = async ({
@@ -242,11 +208,9 @@ export const saveToConfig = async ({
     release: {
       ...currentConfig.release,
       address: release?.address ?? currentConfig.release.address,
-      version: release?.version ?? currentConfig.release.version,
     },
     solana_mobile_dapp_publisher_portal:
       currentConfig.solana_mobile_dapp_publisher_portal,
-    isValid: currentConfig.isValid,
   };
 
   // TODO(jon): Verify the contents of the YAML file