@airmoney-degn/airmoney-cli 0.16.1 → 0.17.0

package/dist/cli/create.js

@@ -38,21 +38,25 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const types_1 = require("../types");
 const child_process_1 = require("child_process");
-async function createCommand({ name, template, locationFolder, quiet, ignoreEnvValidation, }) {
+async function createCommand({ name, template, locationFolder, quiet,
+// ignoreEnvValidation,
+ }) {
     // read from env (the .env was placed in config by `setup`).
-    const userId = process.env.DEVELOPER_ADDRESS || '';
-    const apiKey = process.env.API_KEY || '';
-    if (!ignoreEnvValidation) {
-        if (!userId || !apiKey) {
-            console.error("Missing user or API key from env. Did you run 'airmoney-cli setup'?");
-            process.exit(1);
-        }
-    }
+    // const userId = process.env.DEVELOPER_ADDRESS || '';
+    // const apiKey = process.env.API_KEY || '';
+    // if (!ignoreEnvValidation) {
+    //   if (!userId || !apiKey) {
+    //     console.error(
+    //       "Missing user or API key from env. Did you run 'airmoney-cli setup'?"
+    //     );
+    //     process.exit(1);
+    //   }
+    // }
     const identifier = `com.degn.${name}`;
     console.log(`Initializing project: ${name}`);
-    if (!ignoreEnvValidation) {
-        console.log(`Using .env user: ${userId}`);
-    }
+    // if (!ignoreEnvValidation) {
+    //   console.log(`Using .env user: ${userId}`);
+    // }
     const folderName = locationFolder || name;
     const projectPath = path.join(process.cwd(), folderName);
     if (template) {

package/dist/cli/demo.js

@@ -47,7 +47,7 @@ async function demoCommand({ name, appPath }) {
         template: true,
         locationFolder: appPath,
         quiet: true,
-        ignoreEnvValidation: true,
+        // ignoreEnvValidation: true,
     });
     try {
         console.log('Installing dependencies...');

package/dist/cli/setup.js

@@ -32,11 +32,17 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupCommand = setupCommand;
+exports.statusCommand = statusCommand;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const node_fetch_1 = __importDefault(require("node-fetch"));
 const env_1 = require("../util/env");
+const network_1 = require("../util/network");
 async function setupCommand({ network, userId, apiKey, }) {
     const dir = (0, env_1.configDir)();
     if (!dir)
@@ -54,3 +60,94 @@ async function setupCommand({ network, userId, apiKey, }) {
         process.exit(1);
     }
 }
+async function statusCommand() {
+    // Read environment variables (already loaded by loadEnvFromConfig at startup)
+    const userId = process.env.DEVELOPER_ADDRESS || '';
+    const apiKey = process.env.API_KEY || '';
+    const rpc = process.env.RPC || 'devnet';
+    // Validate that we have both userId and apiKey
+    if (!userId || !apiKey) {
+        console.log('\x1b[31mRun "airmoney-cli setup" to configure your credentials\x1b[0m');
+        return;
+    }
+    console.log('User:', userId);
+    console.log('Network:', rpc);
+    console.log('');
+    // Check API key validity
+    // RPC should already be a URL (stored from setup), but handle network names for backward compatibility
+    let apiUrl = (0, network_1.networkToRpcUrl)(rpc);
+    const body = JSON.stringify({
+        jsonrpc: '2.0',
+        id: 1,
+        method: 'checkApiKey',
+        params: [userId, apiKey],
+    });
+    try {
+        const res = await (0, node_fetch_1.default)(apiUrl, {
+            method: 'POST',
+            body,
+            headers: {
+                'Content-Type': 'application/json',
+            },
+        });
+        if (!res.ok) {
+            console.log('\x1b[31mError: Failed to connect to API\x1b[0m');
+            console.log(`\x1b[31mMessage: HTTP ${res.status} - ${await res.text()}\x1b[0m`);
+            return;
+        }
+        const json = await res.json();
+        if (json.error) {
+            console.log('\x1b[31mError: Invalid API key\x1b[0m');
+            // Combine error message and data if both exist (message first, then data)
+            let errorMessageParts = [];
+            // Add message field first if it exists
+            if (json.error.message) {
+                errorMessageParts.push(json.error.message);
+            }
+            // Parse and add data field if it exists and is different from message
+            if (json.error.data !== undefined) {
+                let dataMessage = '';
+                if (typeof json.error.data === 'string') {
+                    try {
+                        const parsed = JSON.parse(json.error.data);
+                        dataMessage = parsed;
+                    }
+                    catch {
+                        dataMessage = json.error.data.replace(/^"|"$/g, '');
+                    }
+                }
+                else {
+                    dataMessage = String(json.error.data);
+                }
+                // Only add data if it's different from message
+                if (dataMessage && dataMessage !== json.error.message) {
+                    errorMessageParts.push(dataMessage);
+                }
+            }
+            // Combine into final error message
+            const combinedMessage = errorMessageParts.length > 0
+                ? errorMessageParts.join(' - ')
+                : 'Invalid API key';
+            console.log(`\x1b[31mMessage: ${combinedMessage}\x1b[0m`);
+            if (json.error.code === -32602) {
+                console.log('');
+                console.log('\x1b[3mPlease visit https://dash-devnet.degn.com/ to get a valid API key\x1b[0m');
+            }
+            return;
+        }
+        if (json.result === true) {
+            console.log('\x1b[32mStatus: Credentials are valid\x1b[0m');
+            console.log('\x1b[32mMessage: Your API key is active and ready to use\x1b[0m');
+        }
+        else {
+            console.log('\x1b[31mError: API key validation failed\x1b[0m');
+            console.log(`\x1b[31mMessage: ${JSON.stringify(json)}\x1b[0m`);
+        }
+    }
+    catch (err) {
+        console.log('\x1b[31mError: Failed to connect to API\x1b[0m');
+        console.log(`\x1b[31mMessage: ${err instanceof Error ? err.message : String(err)}\x1b[0m`);
+        console.log('');
+        console.log('\x1b[3mPlease check your internet connection and try again\x1b[0m');
+    }
+}

package/dist/cli/upload.js

@@ -42,6 +42,7 @@ const node_fetch_1 = __importDefault(require("node-fetch"));
 const md5_1 = __importDefault(require("md5")); // default import fixes TS call
 const metadata_1 = require("../util/metadata");
 const tarball_1 = require("../util/tarball");
+const network_1 = require("../util/network");
 const path_1 = __importDefault(require("path"));
 async function uploadCommand({ network, locationFolder, buttonImages, }) {
     console.log('Loading metadata...');
@@ -85,7 +86,8 @@ async function uploadCommand({ network, locationFolder, buttonImages, }) {
         params: [userId, apiKey, metaJson, encoded],
     });
     try {
-        const res = await (0, node_fetch_1.default)(network, {
+        const rpcUrl = (0, network_1.networkToRpcUrl)(network);
+        const res = await (0, node_fetch_1.default)(rpcUrl, {
             method: 'POST',
             body,
             headers: {

package/dist/config.json

@@ -1,3 +1,3 @@
 {
-    "version": "0.16.1"
+    "version": "0.17.0"
 }

package/dist/index.js

@@ -8,6 +8,7 @@ const create_1 = require("./cli/create");
 const serve_1 = require("./cli/serve");
 const upload_1 = require("./cli/upload");
 const setup_1 = require("./cli/setup");
+const network_1 = require("./util/network");
 const wallet_1 = require("./cli/wallet");
 const config_json_1 = require("./config.json");
 // Load environment from config
@@ -20,12 +21,31 @@ program
 program
     .command('setup')
     .description('Setup env with userAddress, apiKey, rpc')
-    .requiredOption('-u, --user <string>', 'developer user')
-    .requiredOption('-k, --key <string>', 'API key')
+    .option('-u, --user <string>', 'developer user')
+    .option('-k, --key <string>', 'API key')
     .option('-n, --network <string>', 'network devnet|mainnet', 'devnet')
+    .option('-s, --status', 'check current credential status')
     .action(opts => {
-    const { user, key, network } = opts;
-    (0, setup_1.setupCommand)({ network, userId: user, apiKey: key });
+    const { user, key, network, status } = opts;
+    if (status) {
+        (0, setup_1.statusCommand)();
+    }
+    else {
+        if (!user || !key) {
+            console.error('Error: --user and --key are required');
+            process.exit(1);
+        }
+        if (network) {
+            try {
+                (0, network_1.validateNetwork)(network);
+            }
+            catch (err) {
+                console.error('Error:', err instanceof Error ? err.message : String(err));
+                process.exit(1);
+            }
+        }
+        (0, setup_1.setupCommand)({ network, userId: user, apiKey: key });
+    }
 });
 program
     .command('create')
@@ -53,7 +73,11 @@ program
         console.error('both --index-app-path and --app-url must not be used simuntaniusly');
         return;
     }
-    await (0, serve_1.serveCommand)({ noBrowser: !browser, locationFolder: indexAppPath, appUrl });
+    await (0, serve_1.serveCommand)({
+        noBrowser: !browser,
+        locationFolder: indexAppPath,
+        appUrl,
+    });
 });
 program
     .command('wallet')
@@ -93,16 +117,28 @@ program
 program
     .command('upload')
     .description('Publish the app to the DEGN Dapp Store')
-    .option('-n, --network <string>', 'network devnet|mainnet', 'https://rpc-dev.air.fun')
+    .option('-n, --network <string>', 'network devnet|mainnet', 'devnet')
     .option('-f, --index-app-path <string>', 'path for the index.html', './')
     .option('-i, --button-image <string>', 'path for the button images', 'assets')
-    .action(async (opts) => {
+    .action(opts => {
     let { network, indexAppPath, buttonImage } = opts;
     if (indexAppPath == './') {
         indexAppPath = undefined;
     }
-    // user and key are read from store config within uploadCommand
-    await (0, upload_1.uploadCommand)({ network, locationFolder: indexAppPath, buttonImages: buttonImage });
+    if (network) {
+        try {
+            (0, network_1.validateNetwork)(network);
+        }
+        catch (err) {
+            console.error('Error:', err instanceof Error ? err.message : String(err));
+            process.exit(1);
+        }
+    }
+    (0, upload_1.uploadCommand)({
+        network,
+        locationFolder: indexAppPath,
+        buttonImages: buttonImage,
+    });
 });
 program
     .command('demo')

package/dist/util/network.js

@@ -0,0 +1,38 @@
+"use strict";
+/**
+ * Network utility functions
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateNetwork = validateNetwork;
+exports.networkToRpcUrl = networkToRpcUrl;
+/**
+ * Validates that the network is either "devnet" or "mainnet"
+ * @param network - The network string to validate
+ * @returns true if valid, throws error if invalid
+ * @throws Error if network is invalid
+ */
+function validateNetwork(network) {
+    const normalized = network.toLowerCase().trim();
+    if (normalized !== 'devnet' && normalized !== 'mainnet') {
+        throw new Error(`Invalid network: ${network}. Must be "devnet" or "mainnet"`);
+    }
+    return true;
+}
+/**
+ * Maps network name to RPC URL
+ * Only accepts "devnet" or "mainnet"
+ * @param network - The network name
+ * @returns The RPC URL for the network
+ * @throws Error if network is invalid
+ */
+function networkToRpcUrl(network) {
+    const normalized = network.toLowerCase().trim();
+    const networkMap = {
+        'devnet': 'https://rpc-dev.air.fun/',
+        'mainnet': 'https://rpc.air.fun/',
+    };
+    if (!(normalized in networkMap)) {
+        throw new Error(`Invalid network: ${network}. Must be "devnet" or "mainnet"`);
+    }
+    return networkMap[normalized];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airmoney-degn/airmoney-cli",
-  "version": "0.16.1",
+  "version": "0.17.0",
   "description": "airmoney-cli is a command-line interface tool designed to facilitate the development and management of decentralized applications (DApps) for Airmoney.",
   "publishConfig": {
     "access": "public"