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

package/lib/{commands/publish/PublishCliRemove.js → cli/signer.js}

@@ -118,63 +118,42 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
-import { Connection } from "@solana/web3.js";
-import { publishRemove } from "@solana-mobile/dapp-store-publishing-tools";
-import { checkMintedStatus } from "../../CliUtils.js";
-import nacl from "tweetnacl";
-import { loadPublishDetailsWithChecks } from "../../config/PublishDetails.js";
-export var publishRemoveCommand = function(param) {
-    var 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_requestorIsAuthorized = param.requestorIsAuthorized, requestorIsAuthorized = _param_requestorIsAuthorized === void 0 ? false : _param_requestorIsAuthorized, _param_critical = param.critical, critical = _param_critical === void 0 ? false : _param_critical;
-    return _async_to_generator(function() {
-        var connection, _ref, publisherDetails, appDetails, releaseDetails, sign, appAddr, releaseAddr;
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    if (!requestorIsAuthorized) {
-                        console.error("ERROR: Cannot submit a request for which the requestor does not attest they are authorized to do so");
-                        return [
-                            2
-                        ];
-                    }
-                    connection = new Connection(url, {
-                        commitment: "confirmed"
-                    });
-                    return [
-                        4,
-                        loadPublishDetailsWithChecks()
-                    ];
-                case 1:
-                    _ref = _state.sent(), publisherDetails = _ref.publisher, appDetails = _ref.app, releaseDetails = _ref.release;
-                    sign = function(buf) {
-                        return nacl.sign(buf, signer.secretKey);
-                    };
-                    appAddr = appMintAddress !== null && appMintAddress !== void 0 ? appMintAddress : appDetails.address;
-                    releaseAddr = releaseMintAddress !== null && releaseMintAddress !== void 0 ? releaseMintAddress : releaseDetails.address;
-                    return [
-                        4,
-                        checkMintedStatus(connection, appAddr, releaseAddr)
-                    ];
-                case 2:
-                    _state.sent();
+import fs from 'node:fs';
+import { Keypair } from '@solana/web3.js';
+import nacl from 'tweetnacl';
+import { createPublicationSigner } from '@solana-mobile/dapp-store-publishing-tools';
+import { showMessage } from './messages.js';
+export var parseKeypair = function(pathToKeypairFile) {
+    try {
+        var keypairFile = fs.readFileSync(pathToKeypairFile, 'utf-8');
+        return Keypair.fromSecretKey(Buffer.from(JSON.parse(keypairFile)));
+    } catch (e) {
+        showMessage('KeyPair Error', 'Something went wrong when attempting to retrieve the keypair at ' + pathToKeypairFile, 'error');
+    }
+};
+export function createPublicationSignerFromKeypair(keypair) {
+    return createPublicationSigner({
+        publicKey: keypair.publicKey.toBase58(),
+        signTransaction: function(transaction) {
+            return _async_to_generator(function() {
+                return _ts_generator(this, function(_state) {
+                    transaction.partialSign(keypair);
                     return [
-                        4,
-                        publishRemove({
-                            connection: connection,
-                            sign: sign
-                        }, {
-                            appMintAddress: appMintAddress !== null && appMintAddress !== void 0 ? appMintAddress : appDetails.address,
-                            releaseMintAddress: releaseMintAddress !== null && releaseMintAddress !== void 0 ? releaseMintAddress : releaseDetails.address,
-                            publisherDetails: publisherDetails,
-                            requestorIsAuthorized: requestorIsAuthorized,
-                            criticalUpdate: critical
-                        }, dryRun)
+                        2,
+                        transaction
                     ];
-                case 3:
-                    _state.sent();
+                });
+            })();
+        },
+        signMessage: function(message) {
+            return _async_to_generator(function() {
+                return _ts_generator(this, function(_state) {
                     return [
-                        2
+                        2,
+                        nacl.sign.detached(message, keypair.secretKey)
                     ];
-            }
-        });
-    })();
-};
+                });
+            })();
+        }
+    });
+}

package/lib/index.js

@@ -27,6 +27,58 @@ function _async_to_generator(fn) {
         });
     };
 }
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
 function _ts_generator(thisArg, body) {
     var f, y, t, _ = {
         label: 0,
@@ -118,23 +170,62 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
+import { showMessage } from "./CliUtils.js";
 import { mainCli } from "./CliSetup.js";
-function main() {
+import { getCommanderUserFacingError, isCommanderLifecycleExit } from "./cli/parseErrors.js";
+export function main() {
     return _async_to_generator(function() {
+        var argv, outputConfig, error, userFacingError;
+        var _arguments = arguments;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
+                    argv = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : process.argv;
+                    mainCli.showHelpAfterError(false);
+                    mainCli.exitOverride();
+                    outputConfig = mainCli.configureOutput();
+                    mainCli.configureOutput(_object_spread_props(_object_spread({}, outputConfig), {
+                        outputError: function outputError() {}
+                    }));
+                    _state.label = 1;
+                case 1:
+                    _state.trys.push([
+                        1,
+                        3,
+                        ,
+                        4
+                    ]);
                     return [
                         4,
-                        mainCli.parseAsync(process.argv)
+                        mainCli.parseAsync(argv)
                     ];
-                case 1:
+                case 2:
                     _state.sent();
+                    return [
+                        3,
+                        4
+                    ];
+                case 3:
+                    error = _state.sent();
+                    if (isCommanderLifecycleExit(error)) {
+                        return [
+                            2
+                        ];
+                    }
+                    userFacingError = getCommanderUserFacingError(error);
+                    if (userFacingError) {
+                        showMessage("Error", userFacingError.message, "error");
+                        process.exitCode = userFacingError.exitCode;
+                        return [
+                            2
+                        ];
+                    }
+                    throw error;
+                case 4:
                     return [
                         2
                     ];
             }
         });
-    })();
+    }).apply(this, arguments);
 }
-main();

package/lib/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,49 +28,30 @@
   },
   "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"
   },
   "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": "workspace:0.16.0",
+    "@solana-mobile/dapp-store-publishing-tools": "workspace: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"
   }