@airmoney-degn/airmoney-cli 0.20.0 → 0.22.0

package/dist/cli/dapp.js

@@ -8,16 +8,15 @@ const DappService_1 = require("../service/dapp/DappService");
 const network_1 = require("../util/network");
 async function dappStatusCommand() {
     try {
-        const { userId, apiKey, rpc } = (0, env_1.validateCredential)();
-        (0, LogService_1.log)(`User: ${(0, format_1.shortenString)(userId)}`).white();
-        (0, LogService_1.log)(`Network: ${rpc ? (rpc === 'devnet' ? 'devnet' : 'mainnet') : `<empty> (default: devnet)`}`).white();
-        const dappService = new DappService_1.DappService(userId, apiKey, rpc);
+        const { userId, apiKey, network } = (0, env_1.validateCredential)();
+        (0, format_1.logUserAndNetwork)(userId, network);
+        const dappService = new DappService_1.DappService(userId, apiKey, network);
         try {
             await dappService.validateApiKey();
         }
         catch (err) {
             (0, LogService_1.log)(`${err instanceof Error ? err.message : String(err)}`).red();
-            (0, LogService_1.log)(`Please setup your key at ${(0, network_1.networkToRpcUrl)(rpc)}`).red();
+            (0, LogService_1.log)(`Please setup your key at ${(0, network_1.networkToRpcUrl)(network)}`).red();
             return;
         }
         // Fetch dapp list

package/dist/cli/upload.js

@@ -41,11 +41,13 @@ const fs = __importStar(require("fs"));
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const md5_1 = __importDefault(require("md5"));
 const path_1 = __importDefault(require("path"));
+const inquirer_1 = __importDefault(require("inquirer"));
 const metadata_1 = require("../util/metadata");
 const tarball_1 = require("../util/tarball");
 const network_1 = require("../util/network");
 const env_1 = require("../util/env");
 const LogService_1 = require("../service/log/LogService");
+const format_1 = require("../util/format");
 /**
  * Gets the project path based on location folder
  */
@@ -55,6 +57,23 @@ function getProjectPath(locationFolder) {
     }
     return path_1.default.join(process.cwd(), locationFolder);
 }
+/**
+ * Prompts user for confirmation when uploading from current directory
+ */
+async function confirmUploadFromCurrentDirectory(projectPath) {
+    (0, LogService_1.log)('⚠️  WARNING: You are about to upload all files from the current directory!').red();
+    (0, LogService_1.log)(`Upload folder: ${path_1.default.resolve(projectPath)}`).white();
+    (0, LogService_1.log)('To upload a specific folder, use: airmoney-cli upload -f <folder-path>').white();
+    const answer = await inquirer_1.default.prompt([
+        {
+            type: 'confirm',
+            name: 'confirmed',
+            message: 'Do you want to continue with the upload?',
+            default: false,
+        },
+    ]);
+    return answer.confirmed;
+}
 /**
  * Loads and validates metadata
  */
@@ -102,51 +121,37 @@ async function preparePackage(meta, projectPath) {
 /**
  * Creates the JSON-RPC request body for upload
  */
-function createUploadRequestBody(userId, apiKey, meta, encodedFile) {
-    const metaJson = JSON.stringify(meta);
-    return JSON.stringify({
-        jsonrpc: '2.0',
-        id: 1,
-        method: 'uploadPackage',
-        params: [userId, apiKey, metaJson, encodedFile],
-    });
-}
+// no longer needed: JSON-RPC upload replaced by streaming HTTP upload
 /**
  * Handles the upload response
  */
-function handleUploadResponse(json) {
-    if (json.result === true) {
-        (0, LogService_1.log)('Package uploaded successfully').green();
-        (0, LogService_1.log)('Open : https://dash-devnet.degn.com/').white();
-        return;
-    }
-    (0, LogService_1.log)('Error uploding package').red();
-    if (json.error?.code === -32602) {
-        (0, LogService_1.log)('invalid api key, please visit https://dash-devnet.degn.com/ and setup env with the new key').red();
-        return;
-    }
-    (0, LogService_1.log)('unknow error, please contact support').red();
-    (0, LogService_1.log)(JSON.stringify(json.error)).red();
-}
+// handled inline with plain-text response from /upload
 /**
  * Uploads the package to the server
  */
-async function uploadPackageToServer(network, body) {
-    const rpcUrl = (0, network_1.networkToRpcUrl)(network);
-    const res = await (0, node_fetch_1.default)(rpcUrl, {
+async function uploadPackageToServer(network, userId, apiKey, meta, fileBuffer) {
+    const origin = (0, network_1.networkToRpcUrl)(network).replace(/\/+$/, '');
+    const metaParam = encodeURIComponent(JSON.stringify(meta));
+    const url = `${origin}/upload?user=${userId}&apiKey=${apiKey}&meta=${metaParam}`;
+    const res = await (0, node_fetch_1.default)(url, {
         method: 'POST',
-        body,
+        // raw bytes, no base64 overhead
+        body: fileBuffer,
         headers: {
-            'Content-Type': 'application/json',
+            'Content-Type': 'application/octet-stream',
         },
     });
+    const text = await res.text();
     if (!res.ok) {
-        const errorText = await res.text();
-        (0, LogService_1.log)(`Error uploading package: ${errorText}`).red();
-        throw new Error(`Upload failed: ${errorText}`);
+        (0, LogService_1.log)(`Error uploading package: ${text}`).red();
+        throw new Error(`Upload failed: ${text}`);
     }
-    const json = await res.json();
-    handleUploadResponse(json);
+    if (text.trim() === 'ok') {
+        (0, LogService_1.log)('Package uploaded successfully').green();
+        (0, LogService_1.log)('Open : https://dash-devnet.degn.com/').white();
+        return;
+    }
+    (0, LogService_1.log)(`Unexpected response: ${text}`);
 }
 /**
  * Cleans up the package file
@@ -163,19 +168,25 @@ function cleanupPackageFile(pkgPath) {
 async function uploadCommand({ network, locationFolder, }) {
     let packageData = null;
     try {
-        (0, network_1.validateNetwork)(network);
-        const effectiveNetwork = (network || 'devnet');
-        (0, LogService_1.log)(`Using network: ${effectiveNetwork}`).white();
         const credentials = (0, env_1.validateCredential)();
-        const { userId, apiKey } = credentials;
-        (0, LogService_1.log)(`User ID: ${userId}`).white();
+        const { userId, apiKey, network } = credentials;
+        (0, format_1.logUserAndNetwork)(userId, network);
         const projectPath = getProjectPath(locationFolder);
+        // Prompt for confirmation if uploading from current directory
+        if (!locationFolder) {
+            const confirmed = await confirmUploadFromCurrentDirectory(projectPath);
+            if (!confirmed) {
+                (0, LogService_1.log)('Upload cancelled by user').yellow();
+                return;
+            }
+        }
+        else {
+            (0, LogService_1.log)(`Upload folder: ${path_1.default.resolve(projectPath)}`).white();
+        }
         const meta = await loadAndValidateMetadata(locationFolder);
         packageData = await preparePackage(meta, projectPath);
         (0, LogService_1.log)('Publishing package to DEGN Dapp Store...').white();
-        const encoded = Buffer.from(packageData.fileBuffer).toString('base64');
-        const body = createUploadRequestBody(userId, apiKey, meta, encoded);
-        await uploadPackageToServer(effectiveNetwork, body);
+        await uploadPackageToServer(network || "devnet", userId, apiKey, meta, packageData.fileBuffer);
     }
     catch (err) {
         const errorMessage = err instanceof Error ? err.message : String(err);

package/dist/config.json

@@ -1,3 +1,3 @@
 {
-    "version": "0.20.0"
+    "version": "0.22.0"
 }

package/dist/service/log/LogService.js

@@ -49,6 +49,13 @@ class LogBuilder {
         this.color = 'white';
         this.execute();
     }
+    /**
+     * Sets the color to yellow and logs
+     */
+    yellow() {
+        this.color = 'yellow';
+        this.execute();
+    }
     /**
      * Executes the log with all formatting applied
      */
@@ -64,6 +71,9 @@ class LogBuilder {
         else if (this.color === 'green') {
             codes.push('32');
         }
+        else if (this.color === 'yellow') {
+            codes.push('33');
+        }
         else if (this.color === 'white') {
             // White is default, no color code needed
         }

package/dist/util/env.js

@@ -37,7 +37,7 @@ exports.configDir = configDir;
 exports.loadEnvFromConfig = loadEnvFromConfig;
 exports.getDeveloperAddress = getDeveloperAddress;
 exports.getApiKey = getApiKey;
-exports.getRpc = getRpc;
+exports.getNetwork = getNetwork;
 exports.validateCredential = validateCredential;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
@@ -74,7 +74,7 @@ function getApiKey() {
 /**
  * Gets the RPC/network from environment variables
  */
-function getRpc() {
+function getNetwork() {
     return process.env.RPC;
 }
 /**
@@ -84,17 +84,17 @@ function getRpc() {
 function validateCredential() {
     const userId = getDeveloperAddress();
     const apiKey = getApiKey();
-    const rpc = getRpc();
+    const network = getNetwork();
     if (!userId || !apiKey) {
         throw new Error(`Missing credentials. Please setup your key at ${(0, network_1.networkToRpcUrl)('devnet')} for devnet or ${(0, network_1.networkToRpcUrl)('mainnet')} for mainnet`);
     }
-    if ((0, network_1.validateNetwork)(rpc)) {
+    if ((0, network_1.validateNetwork)(network)) {
         return {
             userId,
             apiKey,
-            rpc,
+            network,
         };
     }
     throw new Error('Invalid network. Must be "devnet" or "mainnet". Your current network is: ' +
-        rpc);
+        network);
 }

package/dist/util/format.js

@@ -8,6 +8,7 @@ exports.padString = padString;
 exports.printTableRow = printTableRow;
 exports.printSeparator = printSeparator;
 exports.shortenString = shortenString;
+exports.logUserAndNetwork = logUserAndNetwork;
 const LogService_1 = require("../service/log/LogService");
 /**
  * Strips ANSI color codes from a string
@@ -72,3 +73,18 @@ function shortenString(str, maxLength = 14, prefixLength = 6, suffixLength = 6)
     }
     return str.substring(0, prefixLength) + '…' + str.substring(str.length - suffixLength);
 }
+/**
+ * Logs user and network information
+ * @param userId - The user ID to display (will be shortened)
+ * @param network - The network to display (optional, shows default message if undefined)
+ */
+function logUserAndNetwork(userId, network) {
+    const displayUserId = shortenString(userId);
+    (0, LogService_1.log)(`User: ${displayUserId}`).white();
+    if (network) {
+        (0, LogService_1.log)(`Network: ${network}`).white();
+    }
+    else {
+        (0, LogService_1.log)(`Network: <empty> (default: devnet)`).white();
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airmoney-degn/airmoney-cli",
-  "version": "0.20.0",
+  "version": "0.22.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"