@solana-mobile/dapp-store-cli 0.5.0 → 0.5.2

package/lib/CliUtils.js

@@ -159,7 +159,7 @@ export var Constants = function Constants() {
     "use strict";
     _class_call_check(this, Constants);
 };
-_define_property(Constants, "CLI_VERSION", "0.5.0");
+_define_property(Constants, "CLI_VERSION", "0.5.2");
 _define_property(Constants, "CONFIG_FILE_NAME", "config.yaml");
 _define_property(Constants, "DEFAULT_RPC_DEVNET", "https://api.devnet.solana.com");
 _define_property(Constants, "getConfigFilePath", function() {

package/lib/commands/create/CreateCliApp.js

@@ -218,13 +218,22 @@ export var createAppCommand = function() {
                     ];
                 case 2:
                     appAddress = _state.sent().appAddress;
-                    if (!dryRun) {
+                    if (!!dryRun) return [
+                        3,
+                        4
+                    ];
+                    return [
+                        4,
                         writeToPublishDetails({
                             app: {
                                 address: appAddress
                             }
-                        });
-                    }
+                        })
+                    ];
+                case 3:
+                    _state.sent();
+                    _state.label = 4;
+                case 4:
                     return [
                         2,
                         {

package/lib/commands/create/CreateCliPublisher.js

@@ -218,11 +218,16 @@ export var createPublisherCommand = function() {
                 case 2:
                     publisherAddress = _state.sent().publisherAddress;
                     // TODO(sdlaver): dry-run should not modify config
-                    writeToPublishDetails({
-                        publisher: {
-                            address: publisherAddress
-                        }
-                    });
+                    return [
+                        4,
+                        writeToPublishDetails({
+                            publisher: {
+                                address: publisherAddress
+                            }
+                        })
+                    ];
+                case 3:
+                    _state.sent();
                     return [
                         2,
                         {

package/lib/commands/create/CreateCliRelease.js

@@ -230,7 +230,7 @@ export var createReleaseCommand = function() {
                     _ref = _state.sent(), release = _ref.release, app = _ref.app, publisher = _ref.publisher;
                     if (!!dryRun) return [
                         3,
-                        3
+                        4
                     ];
                     return [
                         4,
@@ -246,18 +246,23 @@ export var createReleaseCommand = function() {
                     ];
                 case 2:
                     releaseAddress = _state.sent().releaseAddress;
-                    writeToPublishDetails({
-                        release: {
-                            address: releaseAddress
-                        }
-                    });
+                    return [
+                        4,
+                        writeToPublishDetails({
+                            release: {
+                                address: releaseAddress
+                            }
+                        })
+                    ];
+                case 3:
+                    _state.sent();
                     return [
                         2,
                         {
                             releaseAddress: releaseAddress
                         }
                     ];
-                case 3:
+                case 4:
                     return [
                         2
                     ];

package/lib/config/PublishDetails.js

@@ -507,7 +507,7 @@ var getAndroidDetails = function() {
                     ];
                 case 3:
                     e = _state.sent();
-                    throw new Error("There was an error parsing your APK. Please ensure you have provided a valid Android tools directory containing AAPT2.");
+                    throw new Error("There was an error parsing your APK. Please ensure you have installed Java and provided a valid Android tools directory containing AAPT2.\n" + e);
                 case 4:
                     return [
                         2
@@ -578,7 +578,9 @@ export var writeToPublishDetails = function() {
                         }),
                         solana_mobile_dapp_publisher_portal: currentConfig.solana_mobile_dapp_publisher_portal
                     };
-                    fs.writeFileSync(Constants.getConfigFilePath(), dump(newConfig));
+                    fs.writeFileSync(Constants.getConfigFilePath(), dump(newConfig, {
+                        lineWidth: -1
+                    }));
                     return [
                         2
                     ];

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-mobile/dapp-store-cli",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
@@ -53,7 +53,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.321.1",
     "@metaplex-foundation/js-plugin-aws": "^0.18.3",
-    "@solana-mobile/dapp-store-publishing-tools": "workspace:0.5.0",
+    "@solana-mobile/dapp-store-publishing-tools": "workspace:0.5.2",
     "@solana/web3.js": "1.68.0",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-mobile/dapp-store-cli",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
@@ -46,7 +46,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.321.1",
     "@metaplex-foundation/js-plugin-aws": "^0.18.3",
-    "@solana-mobile/dapp-store-publishing-tools": "0.5.0",
+    "@solana-mobile/dapp-store-publishing-tools": "0.5.2",
     "@solana/web3.js": "1.68.0",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.0",

package/src/CliSetup.ts

@@ -60,6 +60,7 @@ async function tryWithErrorMessage(block: () => Promise<any>) {
     const errorMsg = (e as Error | null)?.message ?? "";
 
     showMessage("Error", errorMsg, "error");
+    process.exit(-1)
   }
 }
 
@@ -72,7 +73,7 @@ export const initCliCmd = mainCli
   .command("init")
   .description("First-time initialization of tooling configuration")
   .action(async () => {
-    tryWithErrorMessage(async () => {
+    await tryWithErrorMessage(async () => {
       const msg = initScaffold();
 
       showMessage("Initialized", msg);
@@ -94,7 +95,7 @@ export const createPublisherCliCmd = createCliCmd
   .option("-d, --dry-run", "Flag for dry run. Doesn't mint an NFT")
   .option("-s, --storage-config <storage-config>", "Provide alternative storage configuration details")
   .action(async ({ keypair, url, dryRun, storageConfig }) => {
-    tryWithErrorMessage(async () => {
+    await tryWithErrorMessage(async () => {
       latestReleaseMessage();
       await checkForSelfUpdate();
 
@@ -125,7 +126,7 @@ export const createAppCliCmd = createCliCmd
   .option("-d, --dry-run", "Flag for dry run. Doesn't mint an NFT")
   .option("-s, --storage-config <storage-config>", "Provide alternative storage configuration details")
   .action(async ({ publisherMintAddress, keypair, url, dryRun, storageConfig }) => {
-    tryWithErrorMessage(async () => {
+    await tryWithErrorMessage(async () => {
       latestReleaseMessage();
       await checkForSelfUpdate();
 
@@ -172,7 +173,7 @@ export const createReleaseCliCmd = createCliCmd
   )
   .option("-s, --storage-config <storage-config>", "Provide alternative storage configuration details")
   .action(async ({ appMintAddress, keypair, url, dryRun, buildToolsPath, storageConfig }) => {
-      tryWithErrorMessage(async () => {
+    await tryWithErrorMessage(async () => {
         latestReleaseMessage();
         await checkForSelfUpdate();
 
@@ -218,7 +219,7 @@ mainCli
     "Path to Android build tools which contains AAPT2"
   )
   .action(async ({ keypair, buildToolsPath }) => {
-    tryWithErrorMessage(async () => {
+    await tryWithErrorMessage(async () => {
       latestReleaseMessage();
       await checkForSelfUpdate();
 
@@ -233,8 +234,6 @@ mainCli
           signer,
           buildToolsPath: resolvedBuildToolsPath,
         });
-
-        //TODO: Add pretty formatting here, but will require more work than other sections
       }
     });
   });
@@ -283,7 +282,7 @@ publishCommand
              requestorIsAuthorized,
              dryRun,
            }) => {
-      tryWithErrorMessage(async () => {
+      await tryWithErrorMessage(async () => {
         await checkForSelfUpdate();
         await checkSubmissionNetwork(url);
 
@@ -354,7 +353,7 @@ publishCommand
              critical,
              dryRun,
            }) => {
-      tryWithErrorMessage(async () => {
+      await tryWithErrorMessage(async () => {
         await checkForSelfUpdate();
         await checkSubmissionNetwork(url);
 
@@ -421,7 +420,7 @@ publishCommand
              critical,
              dryRun,
            }) => {
-      tryWithErrorMessage(async () => {
+      await tryWithErrorMessage(async () => {
         await checkForSelfUpdate();
         await checkSubmissionNetwork(url);
 
@@ -481,7 +480,7 @@ publishCommand
       requestDetails,
       { appMintAddress, releaseMintAddress, keypair, url, requestorIsAuthorized, dryRun }
     ) => {
-      tryWithErrorMessage(async () => {
+      await tryWithErrorMessage(async () => {
         await checkForSelfUpdate();
         await checkSubmissionNetwork(url);
 

package/src/CliUtils.ts

@@ -18,7 +18,7 @@ import { awsStorage } from "@metaplex-foundation/js-plugin-aws";
 import { S3StorageManager } from "./config/index.js";
 
 export class Constants {
-  static CLI_VERSION = "0.5.0";
+  static CLI_VERSION = "0.5.2";
   static CONFIG_FILE_NAME = "config.yaml";
   static DEFAULT_RPC_DEVNET = "https://api.devnet.solana.com";
 

package/src/commands/create/CreateCliApp.ts

@@ -88,7 +88,7 @@ export const createAppCommand = async ({
   );
 
   if (!dryRun) {
-    writeToPublishDetails({ app: { address: appAddress } });
+    await writeToPublishDetails({ app: { address: appAddress } });
   }
 
   return { appAddress };

package/src/commands/create/CreateCliPublisher.ts

@@ -78,7 +78,7 @@ export const createPublisherCommand = async ({
   );
 
   // TODO(sdlaver): dry-run should not modify config
-  writeToPublishDetails({ publisher: { address: publisherAddress } });
+  await writeToPublishDetails({ publisher: { address: publisherAddress } });
 
   return { publisherAddress };
 };

package/src/commands/create/CreateCliRelease.ts

@@ -99,9 +99,7 @@ export const createReleaseCommand = async ({
       storageParams: storageParams,
     });
 
-    writeToPublishDetails({
-      release: { address: releaseAddress },
-    });
+    await writeToPublishDetails({ release: { address: releaseAddress }, });
 
     return { releaseAddress };
   }

package/src/config/PublishDetails.ts

@@ -242,7 +242,7 @@ const getAndroidDetails = async (
       locales: localeArray
     };
   } catch (e) {
-    throw new Error("There was an error parsing your APK. Please ensure you have provided a valid Android tools directory containing AAPT2.");
+    throw new Error(`There was an error parsing your APK. Please ensure you have installed Java and provided a valid Android tools directory containing AAPT2.\n` + e);
   }
 };
 
@@ -281,5 +281,7 @@ export const writeToPublishDetails = async ({ publisher, app, release }: SaveToC
     solana_mobile_dapp_publisher_portal: currentConfig.solana_mobile_dapp_publisher_portal
   };
 
-  fs.writeFileSync(Constants.getConfigFilePath(), dump(newConfig));
+  fs.writeFileSync(Constants.getConfigFilePath(), dump(newConfig, {
+    lineWidth: -1
+  }));
 };