@solana-mobile/dapp-store-cli 0.6.1 → 0.7.1

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.6.1");
+_define_property(Constants, "CLI_VERSION", "0.7.1");
 _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/publish/PublishCliSubmit.js

@@ -125,7 +125,7 @@ function _ts_generator(thisArg, body) {
 import { Connection } from "@solana/web3.js";
 import { publishSubmit } from "@solana-mobile/dapp-store-publishing-tools";
 import nacl from "tweetnacl";
-import { checkMintedStatus } from "../../CliUtils.js";
+import { checkMintedStatus, showMessage } from "../../CliUtils.js";
 import { loadPublishDetailsWithChecks } from "../../config/PublishDetails.js";
 export var publishSubmitCommand = function() {
     var _ref = _async_to_generator(function(param) {
@@ -134,6 +134,7 @@ export var publishSubmitCommand = function() {
             switch(_state.label){
                 case 0:
                     appMintAddress = param.appMintAddress, releaseMintAddress = param.releaseMintAddress, signer = param.signer, url = param.url, _param_dryRun = param.dryRun, dryRun = _param_dryRun === void 0 ? false : _param_dryRun, _param_compliesWithSolanaDappStorePolicies = param.compliesWithSolanaDappStorePolicies, compliesWithSolanaDappStorePolicies = _param_compliesWithSolanaDappStorePolicies === void 0 ? false : _param_compliesWithSolanaDappStorePolicies, _param_requestorIsAuthorized = param.requestorIsAuthorized, requestorIsAuthorized = _param_requestorIsAuthorized === void 0 ? false : _param_requestorIsAuthorized;
+                    showMessage("Publishing Estimates", "New app submissions take around 3-4 business days for review.", "warning");
                     if (!compliesWithSolanaDappStorePolicies) {
                         console.error("ERROR: Cannot submit a request for which the requestor does not attest that it complies with Solana dApp Store policies");
                         return [

package/lib/commands/publish/PublishCliUpdate.js

@@ -124,7 +124,7 @@ function _ts_generator(thisArg, body) {
 }
 import { Connection } from "@solana/web3.js";
 import { publishUpdate } from "@solana-mobile/dapp-store-publishing-tools";
-import { checkMintedStatus } from "../../CliUtils.js";
+import { checkMintedStatus, showMessage } from "../../CliUtils.js";
 import nacl from "tweetnacl";
 import { loadPublishDetailsWithChecks } from "../../config/PublishDetails.js";
 export var publishUpdateCommand = function() {
@@ -134,6 +134,7 @@ export var publishUpdateCommand = function() {
             switch(_state.label){
                 case 0:
                     appMintAddress = param.appMintAddress, releaseMintAddress = param.releaseMintAddress, signer = param.signer, url = param.url, _param_dryRun = param.dryRun, dryRun = _param_dryRun === void 0 ? false : _param_dryRun, _param_compliesWithSolanaDappStorePolicies = param.compliesWithSolanaDappStorePolicies, compliesWithSolanaDappStorePolicies = _param_compliesWithSolanaDappStorePolicies === void 0 ? false : _param_compliesWithSolanaDappStorePolicies, _param_requestorIsAuthorized = param.requestorIsAuthorized, requestorIsAuthorized = _param_requestorIsAuthorized === void 0 ? false : _param_requestorIsAuthorized, _param_critical = param.critical, critical = _param_critical === void 0 ? false : _param_critical;
+                    showMessage("Publishing Estimates", "App update approvals take around 1-2 business days for review.", "warning");
                     if (!compliesWithSolanaDappStorePolicies) {
                         console.error("ERROR: Cannot submit a request for which the requestor does not attest that it complies with Solana dApp Store policies");
                         return [

package/lib/config/PublishDetails.js

@@ -48,6 +48,13 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
 function _iterable_to_array(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -221,6 +228,7 @@ var AaptPrefixes = {
     verCodePrefix: "versionCode=",
     verNamePrefix: "versionName=",
     sdkPrefix: "sdkVersion:",
+    debuggableApkPrefix: "application-debuggable",
     localePrefix: "locales: "
 };
 var ajv = new Ajv({
@@ -456,7 +464,7 @@ var checkIconDimensions = function() {
 }();
 var getAndroidDetails = function() {
     var _ref = _async_to_generator(function(aaptDir, apkPath) {
-        var stdout, appPackage, versionCode, versionName, minSdk, permissions, locales, _locales_values, localeArray, localesSrc, _appPackage_, _minSdk_, _versionCode_, _versionName_, _tmp, e;
+        var stdout, appPackage, versionCode, versionName, minSdk, permissions, locales, isDebuggable, _locales_values, localeArray, localesSrc, _appPackage_, _minSdk_, _versionCode_, _versionName_, _tmp, e;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -478,6 +486,10 @@ var getAndroidDetails = function() {
                     minSdk = new RegExp(AaptPrefixes.sdkPrefix + AaptPrefixes.quoteRegex).exec(stdout);
                     permissions = _to_consumable_array(stdout.matchAll(/uses-permission: name='(.*)'/g));
                     locales = new RegExp(AaptPrefixes.localePrefix + AaptPrefixes.quoteNonLazyRegex).exec(stdout);
+                    isDebuggable = new RegExp(AaptPrefixes.debuggableApkPrefix).exec(stdout);
+                    if (isDebuggable != null) {
+                        throw new TypeError("Debug apks are not supported on Solana dApp store.\nSubmit a signed release apk");
+                    }
                     localeArray = Array.from((_locales_values = locales === null || locales === void 0 ? void 0 : locales.values()) !== null && _locales_values !== void 0 ? _locales_values : []);
                     if (localeArray.length == 2) {
                         localesSrc = localeArray[1];
@@ -507,7 +519,15 @@ var getAndroidDetails = function() {
                     ];
                 case 3:
                     e = _state.sent();
-                    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);
+                    if (_instanceof(e, TypeError)) {
+                        throw e;
+                    } else {
+                        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);
+                    }
+                    return [
+                        3,
+                        4
+                    ];
                 case 4:
                     return [
                         2

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-mobile/dapp-store-cli",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "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.6.1",
+    "@solana-mobile/dapp-store-publishing-tools": "workspace:0.7.1",
     "@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.6.1",
+  "version": "0.7.1",
   "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.6.1",
+    "@solana-mobile/dapp-store-publishing-tools": "0.7.1",
     "@solana/web3.js": "1.68.0",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.0",

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.6.1";
+  static CLI_VERSION = "0.7.1";
   static CONFIG_FILE_NAME = "config.yaml";
   static DEFAULT_RPC_DEVNET = "https://api.devnet.solana.com";
 

package/src/commands/publish/PublishCliSubmit.ts

@@ -2,7 +2,7 @@ import { AccountInfo, Connection, Keypair, PublicKey } from "@solana/web3.js";
 import type { SignWithPublisherKeypair } from "@solana-mobile/dapp-store-publishing-tools";
 import { publishSubmit } from "@solana-mobile/dapp-store-publishing-tools";
 import nacl from "tweetnacl";
-import { checkMintedStatus } from "../../CliUtils.js";
+import { checkMintedStatus, showMessage } from "../../CliUtils.js";
 import { Buffer } from "buffer";
 import { loadPublishDetailsWithChecks } from "../../config/PublishDetails.js";
 
@@ -25,6 +25,12 @@ export const publishSubmitCommand = async ({
   compliesWithSolanaDappStorePolicies = false,
   requestorIsAuthorized = false,
 }: PublishSubmitCommandInput) => {
+  showMessage(
+    `Publishing Estimates`,
+    "New app submissions take around 3-4 business days for review.",
+    "warning"
+  );
+
   if (!compliesWithSolanaDappStorePolicies) {
     console.error(
       "ERROR: Cannot submit a request for which the requestor does not attest that it complies with Solana dApp Store policies"

package/src/commands/publish/PublishCliUpdate.ts

@@ -1,7 +1,7 @@
 import { Connection, Keypair } from "@solana/web3.js";
 import type { SignWithPublisherKeypair } from "@solana-mobile/dapp-store-publishing-tools";
 import { publishUpdate } from "@solana-mobile/dapp-store-publishing-tools";
-import { checkMintedStatus } from "../../CliUtils.js";
+import { checkMintedStatus, showMessage } from "../../CliUtils.js";
 import nacl from "tweetnacl";
 import { loadPublishDetailsWithChecks } from "../../config/PublishDetails.js";
 
@@ -26,6 +26,13 @@ export const publishUpdateCommand = async ({
   requestorIsAuthorized = false,
   critical = false,
 }: PublishUpdateCommandInput) => {
+
+  showMessage(
+    `Publishing Estimates`,
+    "App update approvals take around 1-2 business days for review.",
+    "warning"
+  );
+
   if (!compliesWithSolanaDappStorePolicies) {
     console.error(
       "ERROR: Cannot submit a request for which the requestor does not attest that it complies with Solana dApp Store policies"

package/src/config/PublishDetails.ts

@@ -34,6 +34,7 @@ const AaptPrefixes = {
   verCodePrefix: "versionCode=",
   verNamePrefix: "versionName=",
   sdkPrefix: "sdkVersion:",
+  debuggableApkPrefix: "application-debuggable",
   localePrefix: "locales: ",
 };
 
@@ -214,6 +215,13 @@ const getAndroidDetails = async (
     const locales = new RegExp(
       AaptPrefixes.localePrefix + AaptPrefixes.quoteNonLazyRegex
     ).exec(stdout);
+    const isDebuggable = new RegExp(
+      AaptPrefixes.debuggableApkPrefix
+    ).exec(stdout);
+
+    if (isDebuggable != null) {
+      throw new TypeError("Debug apks are not supported on Solana dApp store.\nSubmit a signed release apk")
+    }
 
     let localeArray = Array.from(locales?.values() ?? []);
     if (localeArray.length == 2) {
@@ -242,7 +250,11 @@ const getAndroidDetails = async (
       locales: localeArray
     };
   } catch (e) {
-    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);
+    if (e instanceof TypeError) {
+      throw e
+    } else {
+      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);
+    }
   }
 };