@solana-mobile/dapp-store-cli 0.16.0 → 0.16.1

package/lib/publication/fundingPreflight.js

@@ -0,0 +1,246 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _async_to_generator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
+function _ts_generator(thisArg, body) {
+    var f, y, t, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(g && (g = 0, op[0] && (_ = 0)), _)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+}
+import { Connection, LAMPORTS_PER_SOL, PublicKey } from "@solana/web3.js";
+var BALANCE_CHECK_COMMITMENT = "confirmed";
+var DEFAULT_MAINNET_RPC_URL = "https://api.mainnet-beta.solana.com";
+// Release NFT minting currently needs roughly ~0.015 SOL in rent plus fees.
+// Keep a small buffer so the CLI fails before uploading the APK.
+export var MIN_PUBLICATION_SIGNER_BALANCE_LAMPORTS = 16000000;
+function createBalanceClient(rpcUrl) {
+    var connection = new Connection(rpcUrl, BALANCE_CHECK_COMMITMENT);
+    return {
+        getBalance: function getBalance(publicKey) {
+            return _async_to_generator(function() {
+                return _ts_generator(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            return [
+                                4,
+                                connection.getBalance(publicKey, BALANCE_CHECK_COMMITMENT)
+                            ];
+                        case 1:
+                            return [
+                                2,
+                                _state.sent()
+                            ];
+                    }
+                });
+            })();
+        }
+    };
+}
+function trimOptional(value) {
+    var trimmed = value === null || value === void 0 ? void 0 : value.trim();
+    return trimmed ? trimmed : undefined;
+}
+export function resolveFundingPreflightRpcUrl(input) {
+    var explicitRpcUrl = trimOptional(input.rpcUrl);
+    if (explicitRpcUrl) {
+        return explicitRpcUrl;
+    }
+    if (input.localDev) {
+        return undefined;
+    }
+    return DEFAULT_MAINNET_RPC_URL;
+}
+function formatSolAmount(lamports) {
+    return (lamports / LAMPORTS_PER_SOL).toFixed(6);
+}
+function buildInsufficientBalanceMessage(input) {
+    return "Signer ".concat(input.publicKey, " has ").concat(formatSolAmount(input.balanceLamports), " SOL, but publishing needs at least ").concat(formatSolAmount(input.requiredLamports), " SOL available before it starts.");
+}
+function buildRpcWarningMessage(rpcUrl, error) {
+    var detail = _instanceof(error, Error) ? error.message : String(error);
+    return [
+        "Unable to confirm the signer balance via ".concat(rpcUrl, "."),
+        "Continuing without a SOL preflight check: ".concat(detail, ".")
+    ].join(" ");
+}
+export function ensurePublicationSignerBalance(_0) {
+    return _async_to_generator(function(input) {
+        var clientFactory, rpcUrl, publicKey, detail, balanceLamports, error;
+        var _arguments = arguments;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    clientFactory = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : createBalanceClient;
+                    rpcUrl = resolveFundingPreflightRpcUrl(input);
+                    if (!rpcUrl) {
+                        return [
+                            2,
+                            undefined
+                        ];
+                    }
+                    try {
+                        publicKey = new PublicKey(input.publicKey);
+                    } catch (error) {
+                        detail = _instanceof(error, Error) ? error.message : String(error);
+                        throw new Error("Invalid signer public key for balance preflight: ".concat(input.publicKey, ". ").concat(detail));
+                    }
+                    _state.label = 1;
+                case 1:
+                    _state.trys.push([
+                        1,
+                        3,
+                        ,
+                        4
+                    ]);
+                    return [
+                        4,
+                        clientFactory(rpcUrl).getBalance(publicKey)
+                    ];
+                case 2:
+                    balanceLamports = _state.sent();
+                    if (balanceLamports < MIN_PUBLICATION_SIGNER_BALANCE_LAMPORTS) {
+                        throw new Error(buildInsufficientBalanceMessage({
+                            balanceLamports: balanceLamports,
+                            publicKey: input.publicKey,
+                            requiredLamports: MIN_PUBLICATION_SIGNER_BALANCE_LAMPORTS
+                        }));
+                    }
+                    return [
+                        2,
+                        undefined
+                    ];
+                case 3:
+                    error = _state.sent();
+                    if (_instanceof(error, Error) && error.message.includes("publishing needs at least")) {
+                        throw error;
+                    }
+                    return [
+                        2,
+                        buildRpcWarningMessage(rpcUrl, error)
+                    ];
+                case 4:
+                    return [
+                        2
+                    ];
+            }
+        });
+    }).apply(this, arguments);
+}

package/lib/publication/publicationSummary.js

@@ -0,0 +1,99 @@
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_with_holes(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+function _iterable_to_array_limit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
+}
+function _non_iterable_rest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _sliced_to_array(arr, i) {
+    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
+}
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
+function isRecord(value) {
+    return (typeof value === "undefined" ? "undefined" : _type_of(value)) === 'object' && value !== null;
+}
+export function extractPublicationSummaryLines(result) {
+    var lines = [
+        'This app is now in review.'
+    ];
+    if (!isRecord(result)) {
+        return lines;
+    }
+    var keys = [
+        [
+            'releaseMintAddress',
+            'Release mint address'
+        ],
+        [
+            'collectionMintAddress',
+            'Collection mint address'
+        ],
+        [
+            'hubspotTicketId',
+            'Ticket ID'
+        ]
+    ];
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = keys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _step_value = _sliced_to_array(_step.value, 2), key = _step_value[0], label = _step_value[1];
+            var value = result[key];
+            if (typeof value === 'string' && value.length > 0) {
+                lines.push("".concat(label, ": ").concat(value));
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return lines;
+}

package/lib/{commands/utils.js → publication/runPublicationWorkflow.js}

@@ -27,13 +27,6 @@ function _async_to_generator(fn) {
         });
     };
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
 function _ts_generator(thisArg, body) {
     var f, y, t, _ = {
         label: 0,
@@ -125,61 +118,38 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
-import { FailedToConfirmTransactionError } from "@metaplex-foundation/js";
-import { TransactionExpiredBlockheightExceededError } from "@solana/web3.js";
-export function sendAndConfirmTransaction(metaplex, builder) {
+import { createPublicationWorkflow } from '@solana-mobile/dapp-store-publishing-tools';
+export function runPublicationWorkflow(request) {
     return _async_to_generator(function() {
-        var i, e;
+        var workflow;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    i = 0;
-                    _state.label = 1;
-                case 1:
-                    if (!(i < 10)) return [
+                    workflow = createPublicationWorkflow(request.client, request.options);
+                    if (!(request.mode === 'new-version')) return [
                         3,
-                        6
+                        2
                     ];
-                    _state.label = 2;
-                case 2:
-                    _state.trys.push([
-                        2,
-                        4,
-                        ,
-                        5
-                    ]);
                     return [
                         4,
-                        builder.sendAndConfirm(metaplex)
+                        workflow.startPublication(request.input)
                     ];
-                case 3:
+                case 1:
                     return [
                         2,
                         _state.sent()
                     ];
-                case 4:
-                    e = _state.sent();
-                    if (isTransientError(e)) {
-                        return [
-                            3,
-                            5
-                        ];
-                    }
-                    throw e;
-                case 5:
-                    i++;
+                case 2:
                     return [
-                        3,
-                        1
+                        4,
+                        workflow.resumePublication(request.input)
+                    ];
+                case 3:
+                    return [
+                        2,
+                        _state.sent()
                     ];
-                case 6:
-                    throw new Error("Unable to send transaction. Please try later.");
             }
         });
     })();
 }
-function isTransientError(e) {
-    var _e_cause;
-    var _e_cause_message;
-    return _instanceof(e, FailedToConfirmTransactionError) && (_instanceof(e.cause, TransactionExpiredBlockheightExceededError) || /blockhash not found/i.test((_e_cause_message = (_e_cause = e.cause) === null || _e_cause === void 0 ? void 0 : _e_cause.message) !== null && _e_cause_message !== void 0 ? _e_cause_message : ""));
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-mobile/dapp-store-cli",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
@@ -28,48 +28,29 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
-    "@jest/types": "^29.5.0",
-    "@metaplex-foundation/js": "0.20.0",
+    "@metaplex-foundation/mpl-token-metadata": "2.13.0",
     "@swc/jest": "^0.2.26",
-    "@types/commander": "^2.12.2",
-    "@types/debug": "^4.1.7",
     "@types/jest": "^29.5.1",
-    "@types/js-yaml": "^4.0.5",
-    "@types/terminal-link": "^1.2.0",
     "@types/update-notifier": "^6.0.1",
     "jest": "^29.5.0",
-    "jest-transform-stub": "^2.0.0",
-    "shx": "^0.3.4",
-    "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1"
+    "shx": "^0.3.4"
   },
   "dependencies": {
-    "@ardrive/turbo-sdk": "^1.41.0",
-    "@aws-sdk/client-s3": "^3.321.1",
-    "@metaplex-foundation/js-plugin-aws": "^0.20.0",
-    "@solana-mobile/dapp-store-publishing-tools": "0.16.0",
+    "@solana-mobile/dapp-store-publishing-tools": "0.16.1",
     "@solana/web3.js": "1.92.1",
     "@types/semver": "^7.3.13",
-    "ajv": "^8.11.0",
     "boxen": "^7.0.1",
-    "bs58": "^5.0.0",
-    "chokidar": "^3.5.3",
     "commander": "^9.4.1",
-    "debug": "^4.3.4",
     "dotenv": "^16.0.3",
-    "esm": "^3.2.25",
-    "generate-schema": "^2.6.0",
     "get-video-dimensions": "^1.0.0",
     "image-size": "^1.0.2",
-    "js-yaml": "^4.1.0",
     "semver": "^7.3.8",
-    "terminal-link": "^3.0.0",
     "tweetnacl": "1.0.3",
     "update-notifier": "^6.0.2"
   },
   "scripts": {
     "clean": "shx mkdir -p lib && shx rm -rf lib",
-    "prebuild": "pnpm run clean && node src/prebuild_schema/schemagen.js",
+    "prebuild": "pnpm run clean",
     "build": "swc src -d lib --copy-files",
     "watch": "swc src --out-dir lib -w",
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"