@airmoney-degn/airmoney-cli 0.19.1 → 0.19.3

package/dist/cli/create.js

@@ -47,7 +47,7 @@ async function createCommand({ name, template, locationFolder, quiet, }) {
         const projectPath = path.join(process.cwd(), folderName);
         if (template) {
             (0, LogService_1.log)('cloning project').white();
-            (0, child_process_1.execSync)(`git clone --separate-git-dir=$(mktemp -u) https://github.com/Air-Money/airmoney-dapp-quickstart ${folderName}`);
+            (0, child_process_1.execSync)(`git clone --separate-git-dir=$(mktemp -u) https://github.com/airmoney-degn/airmoney-dapp-quickstart ${folderName}`);
             if (fs.lstatSync(path.join(projectPath, '.git')).isDirectory()) {
                 fs.rmdirSync(path.join(projectPath, '.git'));
             }

package/dist/cli/upload.js

@@ -39,86 +39,136 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadCommand = uploadCommand;
 const fs = __importStar(require("fs"));
 const node_fetch_1 = __importDefault(require("node-fetch"));
-const md5_1 = __importDefault(require("md5")); // default import fixes TS call
+const md5_1 = __importDefault(require("md5"));
+const path_1 = __importDefault(require("path"));
 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 path_1 = __importDefault(require("path"));
-async function uploadCommand({ network, locationFolder, buttonImages, }) {
+/**
+ * Gets the project path based on location folder
+ */
+function getProjectPath(locationFolder) {
+    if (!locationFolder) {
+        return process.cwd();
+    }
+    return path_1.default.join(process.cwd(), locationFolder);
+}
+/**
+ * Loads and validates metadata
+ */
+async function loadAndValidateMetadata(locationFolder) {
+    (0, LogService_1.log)('Loading metadata...').white();
+    const meta = await (0, metadata_1.loadMetadata)(locationFolder);
+    if (!meta) {
+        throw new Error('No metadata.json found. Aborting.');
+    }
+    return meta;
+}
+/**
+ * Prepares the package by packing and reading it
+ */
+async function preparePackage(meta, projectPath) {
+    const pkgName = (0, metadata_1.getPackageName)(meta);
+    (0, LogService_1.log)(`Packing ${pkgName}...`).white();
+    await (0, tarball_1.packProject)(meta, projectPath);
+    const pkgPath = path_1.default.join(process.cwd(), pkgName);
+    if (!fs.existsSync(pkgPath)) {
+        throw new Error(`Package file not found at ${pkgPath}`);
+    }
+    const fileBuffer = fs.readFileSync(pkgPath);
+    const fileHash = (0, md5_1.default)(fileBuffer);
+    (0, LogService_1.log)(`Package Hash: ${fileHash}`).white();
+    return { fileBuffer, fileHash, pkgPath };
+}
+/**
+ * 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],
+    });
+}
+/**
+ * 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();
+}
+/**
+ * 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, {
+        method: 'POST',
+        body,
+        headers: {
+            'Content-Type': 'application/json',
+        },
+    });
+    if (!res.ok) {
+        const errorText = await res.text();
+        (0, LogService_1.log)(`Error uploading package: ${errorText}`).red();
+        throw new Error(`Upload failed: ${errorText}`);
+    }
+    const json = await res.json();
+    handleUploadResponse(json);
+}
+/**
+ * Cleans up the package file
+ */
+function cleanupPackageFile(pkgPath) {
+    if (fs.existsSync(pkgPath)) {
+        fs.rmSync(pkgPath);
+        (0, LogService_1.log)('Cleaned up package file').white();
+    }
+}
+/**
+ * Main upload command
+ */
+async function uploadCommand({ network, locationFolder, }) {
+    let packageData = null;
     try {
-        if ((0, network_1.validateNetwork)(network)) {
-            (0, LogService_1.log)('Loading metadata...').white();
-            const credentials = (0, env_1.validateCredential)();
-            const { userId, apiKey } = credentials;
-            (0, LogService_1.log)(`User ID: ${userId}`).white();
-            let projectPath = process.cwd();
-            if (locationFolder != undefined) {
-                projectPath = path_1.default.join(projectPath, locationFolder);
-            }
-            if (buttonImages === undefined) {
-                buttonImages = 'assets';
-            }
-            (0, LogService_1.log)(buttonImages).white();
-            const meta = await (0, metadata_1.loadMetadata)();
-            if (!meta) {
-                (0, LogService_1.log)('No metadata.json found. Aborting.').red();
-                return;
-            }
-            const pkgName = (0, metadata_1.getPackageName)(meta);
-            (0, LogService_1.log)(`Packing ${pkgName}...`).white();
-            await (0, tarball_1.packProject)(meta, projectPath, buttonImages);
-            const pkgPath = path_1.default.join(process.cwd(), pkgName);
-            // read tar
-            const fileBuffer = fs.readFileSync(pkgPath);
-            const fileHash = (0, md5_1.default)(fileBuffer);
-            (0, LogService_1.log)(`Package Hash: ${fileHash}`).white();
-            (0, LogService_1.log)('Publishing package to DEGN Dapp Store...').white();
-            // encode base64
-            const encoded = Buffer.from(fileBuffer).toString('base64');
-            // In Rust, we do a JSON-RPC call. Let's replicate:
-            const metaJson = JSON.stringify(meta);
-            const body = JSON.stringify({
-                jsonrpc: '2.0',
-                id: 1,
-                method: 'uploadPackage',
-                params: [userId, apiKey, metaJson, encoded],
-            });
-            try {
-                const rpcUrl = (0, network_1.networkToRpcUrl)(network);
-                const res = await (0, node_fetch_1.default)(rpcUrl, {
-                    method: 'POST',
-                    body,
-                    headers: {
-                        'Content-Type': 'application/json',
-                    },
-                });
-                if (!res.ok) {
-                    (0, LogService_1.log)(`Error uploading package: ${await res.text()}`).red();
-                    return;
-                }
-                const json = await res.json();
-                if (json.result === true) {
-                    (0, LogService_1.log)('Package uploaded successfully').green();
-                    (0, LogService_1.log)('Open : https://dash-devnet.air.fun/').white();
-                }
-                else {
-                    (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.air.fun/ 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();
-                }
-            }
-            catch (err) {
-                (0, LogService_1.log)(`Error: ${err}`).red();
-            }
-        }
+        (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 projectPath = getProjectPath(locationFolder);
+        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);
     }
     catch (err) {
-        (0, LogService_1.log)(`${err instanceof Error ? err.message : String(err)}`).red();
+        const errorMessage = err instanceof Error ? err.message : String(err);
+        (0, LogService_1.log)(`Upload failed: ${errorMessage}`).red();
+        throw err;
+    }
+    finally {
+        // Clean up package file if it was created
+        if (packageData) {
+            cleanupPackageFile(packageData.pkgPath);
+        }
     }
 }

package/dist/config.json

@@ -1,3 +1,3 @@
 {
-    "version": "0.19.1"
+    "version": "0.19.3"
 }

package/dist/index.js

@@ -25,9 +25,14 @@ program
     .requiredOption('-u, --user <string>', 'developer user')
     .requiredOption('-k, --key <string>', 'API key')
     .option('-n, --network <string>', 'network devnet|mainnet')
-    .action(opts => {
-    const { user, key, network } = opts;
-    (0, setup_1.setupCommand)({ network, userId: user, apiKey: key });
+    .action(async (opts) => {
+    try {
+        const { user, key, network } = opts;
+        await (0, setup_1.setupCommand)({ network, userId: user, apiKey: key });
+    }
+    catch (err) {
+        process.exit(1);
+    }
 });
 program
     .command('create')
@@ -35,9 +40,14 @@ program
     .requiredOption('-N, --name <string>', 'Project name')
     .option('-f, --app-path <string>', 'path where project will be created')
     .option('--template', 'initialize project based on git quickstart')
-    .action(opts => {
-    const { name, appPath, template } = opts;
-    (0, create_1.createCommand)({ name, template, locationFolder: appPath });
+    .action(async (opts) => {
+    try {
+        const { name, appPath, template } = opts;
+        await (0, create_1.createCommand)({ name, template, locationFolder: appPath });
+    }
+    catch (err) {
+        process.exit(1);
+    }
 });
 program
     .command('serve')
@@ -45,20 +55,25 @@ program
     .option('-f, --index-app-path <string>', 'path for the index.html', './')
     .option('--no-browser', 'stop browser from being open')
     .option('-u, --app-url <string>', 'url where the app is running')
-    .action(opts => {
-    let { indexAppPath, browser, appUrl } = opts;
-    if (indexAppPath == './') {
-        indexAppPath = undefined;
+    .action(async (opts) => {
+    try {
+        let { indexAppPath, browser, appUrl } = opts;
+        if (indexAppPath == './') {
+            indexAppPath = undefined;
+        }
+        if (indexAppPath && appUrl) {
+            (0, LogService_1.log)('both --index-app-path and --app-url must not be used simuntaniusly').red();
+            return;
+        }
+        await (0, serve_1.serveCommand)({
+            noBrowser: !browser,
+            locationFolder: indexAppPath,
+            appUrl,
+        });
     }
-    if (indexAppPath && appUrl) {
-        (0, LogService_1.log)('both --index-app-path and --app-url must not be used simuntaniusly').red();
-        return;
+    catch (err) {
+        process.exit(1);
     }
-    (0, serve_1.serveCommand)({
-        noBrowser: !browser,
-        locationFolder: indexAppPath,
-        appUrl,
-    });
 });
 program
     .command('wallet')
@@ -72,27 +87,32 @@ program
     .option('-gd, --get-default', 'get default wallet')
     .option('-c, --chain [evm | svm | btc]', 'chain name ', 'evm')
     .action(async (opts) => {
-    const { list, delete: del, import: importWallet, export: exportWallet, generate, setDefault, getDefault, chain, } = opts;
-    if (list) {
-        await (0, wallet_1.listWallet)(chain);
-    }
-    else if (del) {
-        await (0, wallet_1.deleteWallet)(del, chain);
-    }
-    else if (importWallet) {
-        await (0, wallet_1.importWalletSk)(importWallet, chain);
+    try {
+        const { list, delete: del, import: importWallet, export: exportWallet, generate, setDefault, getDefault, chain, } = opts;
+        if (list) {
+            await (0, wallet_1.listWallet)(chain);
+        }
+        else if (del) {
+            await (0, wallet_1.deleteWallet)(del, chain);
+        }
+        else if (importWallet) {
+            await (0, wallet_1.importWalletSk)(importWallet, chain);
+        }
+        else if (exportWallet) {
+            await (0, wallet_1.exportWalletSk)(exportWallet, chain);
+        }
+        else if (generate) {
+            await (0, wallet_1.generateWallet)(chain);
+        }
+        else if (setDefault) {
+            await (0, wallet_1.setDefaultWallet)(setDefault, chain);
+        }
+        else if (getDefault) {
+            await (0, wallet_1.getDefaultWallet)(chain);
+        }
     }
-    else if (exportWallet) {
-        await (0, wallet_1.exportWalletSk)(exportWallet, chain);
-    }
-    else if (generate) {
-        await (0, wallet_1.generateWallet)(chain);
-    }
-    else if (setDefault) {
-        await (0, wallet_1.setDefaultWallet)(setDefault, chain);
-    }
-    else if (getDefault) {
-        await (0, wallet_1.getDefaultWallet)(chain);
+    catch (err) {
+        process.exit(1);
     }
 });
 program
@@ -100,24 +120,32 @@ program
     .description('Publish the app to the DEGN Dapp Store')
     .option('-n, --network <string>', 'network devnet|mainnet')
     .option('-f, --index-app-path <string>', 'path for the index.html', './')
-    .option('-i, --button-image <string>', 'path for the button images', 'assets')
-    .action(opts => {
-    let { network, indexAppPath, buttonImage } = opts;
+    .action(async (opts) => {
+    let { network, indexAppPath } = opts;
     if (indexAppPath == './') {
         indexAppPath = undefined;
     }
-    (0, upload_1.uploadCommand)({
-        network,
-        locationFolder: indexAppPath,
-        buttonImages: buttonImage,
-    });
+    try {
+        await (0, upload_1.uploadCommand)({
+            network,
+            locationFolder: indexAppPath,
+        });
+    }
+    catch (err) {
+        process.exit(1);
+    }
 });
 program
     .command('dapp')
     .description('Manage dapps')
     .option('-s, --status', 'show all dapps list')
-    .action(() => {
-    (0, dapp_1.dappStatusCommand)();
+    .action(async () => {
+    try {
+        await (0, dapp_1.dappStatusCommand)();
+    }
+    catch (err) {
+        process.exit(1);
+    }
 });
 program
     .command('demo')
@@ -125,8 +153,13 @@ program
     .option('-f, --app-path <string>', 'path where project will be created')
     .description('serve the built-in demo app')
     .action(async (opts) => {
-    const { name = 'degn-demo', appPath } = opts;
-    await (0, demo_1.demoCommand)({ name, appPath });
+    try {
+        const { name = 'degn-demo', appPath } = opts;
+        await (0, demo_1.demoCommand)({ name, appPath });
+    }
+    catch (err) {
+        process.exit(1);
+    }
 });
-program.addHelpText('after', 'for more help access https://dash-devnet.air.fun/');
+program.addHelpText('after', 'for more help access https://dash-devnet.degn.com/');
 program.parse(process.argv);

package/dist/util/tarball.js

@@ -40,64 +40,109 @@ exports.packProject = packProject;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const tar = __importStar(require("tar"));
-const md5_1 = __importDefault(require("md5")); // default import
+const md5_1 = __importDefault(require("md5"));
 const metadata_1 = require("./metadata");
 const LogService_1 = require("../service/log/LogService");
+const REQUIRED_FILES = ['metadata.json', 'dapp-logo.png', 'index.html'];
 /**
- * Reproduces the `pack()` logic, creating a tar.gz from the project's assets
+ * Validates that the project path exists
  */
-async function packProject(pkg, projectPath, assetsPath) {
-    const outputFilename = (0, metadata_1.getPackageName)(pkg);
-    const absOutputPath = path.join(process.cwd(), outputFilename);
-    try {
-        let files = ['metadata.json', 'dapp-logo.png', '@projectFiles.tar.gz'];
-        let projectFiles = ['index.html'];
-        if (fs.existsSync(assetsPath)) {
-            const assetFiles = fs.readdirSync(assetsPath);
-            await tar.create({
-                file: 'assets.tar.gz',
-                gzip: false,
-                cwd: assetsPath,
-                prefix: 'assets',
-                portable: true,
-            }, assetFiles);
-            files.push('@assets.tar.gz');
+function validateProjectPath(projectPath) {
+    if (!fs.existsSync(projectPath)) {
+        throw new Error(`Project path does not exist: ${projectPath}`);
+    }
+}
+/**
+ * Validates that all required files exist at the root of the project
+ */
+function validateRequiredFiles(projectPath) {
+    const missingFiles = [];
+    REQUIRED_FILES.forEach(file => {
+        const filePath = path.join(projectPath, file);
+        if (!fs.existsSync(filePath)) {
+            missingFiles.push(file);
+        }
+    });
+    if (missingFiles.length > 0) {
+        throw new Error(`Missing required files at root: ${missingFiles.join(', ')}`);
+    }
+}
+/**
+ * Recursively gets all files from a directory
+ */
+function getAllFiles(dir, baseDir, fileList = []) {
+    const items = fs.readdirSync(dir);
+    items.forEach(item => {
+        const fullPath = path.join(dir, item);
+        const stat = fs.statSync(fullPath);
+        if (stat.isDirectory()) {
+            getAllFiles(fullPath, baseDir, fileList);
         }
         else {
-            (0, LogService_1.log)('No assets directory found.').white();
+            const relativePath = path.relative(baseDir, fullPath);
+            fileList.push(relativePath);
         }
-        // this is bad, but couldn't figure out how to get files from different folders without the absolute path messing with the tar file structure
-        await tar.create({
-            file: 'projectFiles.tar.gz',
-            gzip: false,
-            cwd: projectPath,
-            prefix: '',
-            portable: true,
-        }, projectFiles);
-        await tar.create({
-            file: absOutputPath,
-            gzip: true,
-            cwd: process.cwd(),
-            prefix: '',
-            portable: true,
-        }, files);
-        // read it in memory for MD5
-        const buffer = fs.readFileSync(absOutputPath);
-        const digest = (0, md5_1.default)(buffer);
-        (0, LogService_1.log)(`MD5: ${digest}`).white();
+    });
+    return fileList;
+}
+/**
+ * Collects all files from the project directory
+ */
+function collectProjectFiles(projectPath) {
+    const allFiles = getAllFiles(projectPath, projectPath);
+    if (allFiles.length === 0) {
+        throw new Error(`No files found in ${projectPath}`);
+    }
+    return allFiles;
+}
+/**
+ * Creates the tarball file
+ */
+async function createTarball(outputPath, projectPath, files) {
+    // Clean up any existing output file
+    if (fs.existsSync(outputPath)) {
+        fs.rmSync(outputPath);
+    }
+    await tar.create({
+        file: outputPath,
+        gzip: true,
+        cwd: projectPath,
+        prefix: '',
+        portable: true,
+    }, files);
+    if (!fs.existsSync(outputPath)) {
+        throw new Error('Tarball was not created successfully');
+    }
+}
+/**
+ * Calculates and logs the MD5 hash of the tarball
+ */
+function logTarballHash(outputPath) {
+    const buffer = fs.readFileSync(outputPath);
+    const digest = (0, md5_1.default)(buffer);
+    (0, LogService_1.log)(`MD5: ${digest}`).white();
+}
+/**
+ * Main function to pack a project into a tarball
+ */
+async function packProject(pkg, projectPath) {
+    const outputFilename = (0, metadata_1.getPackageName)(pkg);
+    const absOutputPath = path.join(process.cwd(), outputFilename);
+    try {
+        validateProjectPath(projectPath);
+        validateRequiredFiles(projectPath);
+        const allFiles = collectProjectFiles(projectPath);
+        (0, LogService_1.log)(`Found ${allFiles.length} files to pack`).white();
+        (0, LogService_1.log)('Creating tarball...').white();
+        await createTarball(absOutputPath, projectPath, allFiles);
+        logTarballHash(absOutputPath);
         (0, LogService_1.log)(`Tarball created at ${absOutputPath}`).white();
-        (0, LogService_1.log)('cleaning up...').white();
-        fs.rmSync('projectFiles.tar.gz');
-        fs.rmSync('assets.tar.gz');
     }
     catch (err) {
         (0, LogService_1.log)(`Failed to create tarball: ${err.message}`).red();
-        if (fs.existsSync('projectFiles.tar.gz'))
-            fs.rmSync('projectFiles.tar.gz');
-        if (fs.existsSync('assets.tar.gz'))
-            fs.rmSync('assets.tar.gz');
-        if (fs.existsSync(absOutputPath))
+        if (fs.existsSync(absOutputPath)) {
             fs.rmSync(absOutputPath);
-        process.exit(1);
+        }
+        throw err;
     }
 }

package/package.json

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