@airmoney-degn/airmoney-cli 0.9.0 → 0.10.1

package/dist/cli/serve.js

@@ -62,55 +62,62 @@ function getSimulatorDir() {
     const base = path_1.default.resolve(__dirname, '..', '..');
     return path_1.default.join(base, 'public', 'simulator');
 }
-async function serveCommand(port, noBrowser, locationFolder, appUrl) {
-    const actualPort = port || 3334;
-    // Attempt loading metadata (not strictly necessary for just sim, but we keep logic)
-    // locationFolder
+async function serveCommand(noBrowser, locationFolder, appUrl) {
+    const simulatorPort = 4041;
+    const simulatorExpress = (0, express_ws_1.default)((0, express_1.default)()).app;
+    simulatorExpress.use((0, cors_1.default)());
+    simulatorExpress.use(express_1.default.json());
+    let simulatorClient;
+    simulatorExpress.ws('/ws', function (ws, req) {
+        simulatorClient = ws;
+        ws.on('message', function (msg) {
+            console.log(msg);
+        });
+        console.log('socket', req.body);
+    });
+    const simulatorDir = getSimulatorDir();
+    simulatorExpress.use('/simulator', express_1.default.static(simulatorDir));
+    ////////////////////////////////////////////////////////////////
     let projectFolder = process.cwd();
     if (locationFolder != undefined) {
         projectFolder = path_1.default.join(process.cwd(), locationFolder);
     }
     const metadata = (0, metadata_1.loadMetadata)();
     if (!metadata) {
-        // Not a fatal exit, but let's log a note
         console.log('[Warning] No metadata found. Skipping some possible checks.');
     }
-    const ex = (0, express_1.default)();
-    const ws = (0, express_ws_1.default)(ex);
-    const app = ws.app;
-    app.use((0, cors_1.default)());
-    // We'll serve any local working directory as /app
-    if (locationFolder) {
-        app.use('/app', express_1.default.static(projectFolder));
-    }
-    app.use(express_1.default.json());
-    let simulatorClient;
-    app.ws('/ws', function (ws, req) {
-        simulatorClient = ws;
-        ws.on('message', function (msg) {
-            console.log(msg);
+    if (appUrl != undefined) {
+        const proxyMiddleware = (0, http_proxy_middleware_1.createProxyMiddleware)({
+            xfwd: true,
+            target: appUrl,
+            changeOrigin: true,
+            pathFilter: '/',
         });
-        console.log('socket', req.body);
-    });
-    const simulatorDir = getSimulatorDir();
-    // Our primary route is the simulator's index.html
-    app.get('/simulator', (_req, res) => {
-        const indexHtml = path_1.default.join(simulatorDir, 'index.html');
-        res.sendFile(indexHtml);
-    });
-    // Device image route
-    app.get('/assets/device.png', (_req, res) => {
-        const devicePngPath = path_1.default.join(simulatorDir, 'assets/device.png');
-        res.sendFile(devicePngPath);
-    });
-    // JS bundle route (the index.umd.js in assets)
-    app.get('/assets/device.umd.js', (_req, res) => {
-        const deviceUmdPath = path_1.default.join(simulatorDir, 'assets/index.umd.js');
-        res.sendFile(deviceUmdPath);
+        simulatorExpress.use('/', proxyMiddleware);
+    }
+    else {
+        simulatorExpress.use('/', express_1.default.static(projectFolder));
+    }
+    const simulatorServer = simulatorExpress.listen(simulatorPort, () => {
+        const url = `http://localhost:${simulatorPort}/simulator`;
+        console.log(`Starting simulator server at ${url}`);
+        if (!noBrowser) {
+            (0, open_1.default)(url)
+                .then(() => {
+                // success opening URL
+            })
+                .catch(err => {
+                console.error('Failed to open web browser', err);
+            });
+        }
     });
-    app.post('/', async (req, res) => {
+    ////////////////////////////////////////////////////////////////
+    const airmoneyServicePort = 4040;
+    const airmoneyServiceExpress = (0, express_1.default)();
+    airmoneyServiceExpress.use((0, cors_1.default)());
+    airmoneyServiceExpress.use(express_1.default.json());
+    airmoneyServiceExpress.post('/', async (req, res) => {
         let rpcReq = req.body;
-        console.log(rpcReq);
         let event;
         let simulator = true;
         switch (rpcReq.method) {
@@ -142,33 +149,11 @@ async function serveCommand(port, noBrowser, locationFolder, appUrl) {
             return;
         }
     });
-    if (appUrl != undefined) {
-        const proxyMiddleware = (0, http_proxy_middleware_1.createProxyMiddleware)({
-            xfwd: true,
-            target: appUrl,
-            changeOrigin: true,
-            pathFilter: '/',
-        });
-        app.use('/', proxyMiddleware);
-        app.use('/app', (req, res, next) => {
-            req.url = req.url.replace('/app', '/');
-            next('route');
-        });
-    }
-    // Start server
-    const server = app.listen(actualPort, () => {
-        const url = `http://localhost:${actualPort}/simulator`;
-        console.log(`Starting server at ${url}`);
-        if (!noBrowser) {
-            (0, open_1.default)(url)
-                .then(() => {
-                // success opening URL
-            })
-                .catch(err => {
-                console.error('Failed to open web browser', err);
-            });
-        }
+    const airmoneyServiceServer = airmoneyServiceExpress.listen(airmoneyServicePort, () => {
+        const url = `http://localhost:${airmoneyServicePort}`;
+        console.log(`Starting airmoney service server at ${url}`);
     });
+    ////////////////////////////////////////////////////////////////
     const cryptoServiceBin = `${process.platform}-${process.arch}`;
     const bin = path_1.default.join(__dirname, '..', 'bin', cryptoServiceBin);
     if (!(0, fs_1.existsSync)(bin)) {

package/dist/index.js

@@ -14,7 +14,7 @@ const program = new commander_1.Command();
 program
     .name('airmoney-cli')
     .description('airmoney-cli is a command-line interface tool designed to facilitate the development and management of decentralized applications (DApps) for Airmoney.')
-    .version('0.8.1');
+    .version("0.10.1");
 program
     .command('setup')
     .description('Setup env with userAddress, apiKey, rpc')
@@ -39,13 +39,11 @@ program
 program
     .command('serve')
     .description('Serve locally in the simulator')
-    .option('-p, --port <number>', 'Port', '4040')
     .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(async (opts) => {
-    let { portArg, indexAppPath, browser, appUrl } = opts;
-    const port = parseInt(portArg, 10) || 4040;
+    let { indexAppPath, browser, appUrl } = opts;
     if (indexAppPath == './') {
         indexAppPath = undefined;
     }
@@ -53,7 +51,7 @@ program
         console.error('both --index-app-path and --app-url must not be used simuntaniusly');
         return;
     }
-    await (0, serve_1.serveCommand)(port, !browser, indexAppPath, appUrl);
+    await (0, serve_1.serveCommand)(!browser, indexAppPath, appUrl);
 });
 program
     .command('wallet')

package/dist/package.json

@@ -0,0 +1,65 @@
+{
+    "name": "@airmoney-degn/airmoney-cli",
+    "version": "0.10.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"
+    },
+    "bin": {
+        "airmoney-cli": "./dist/index.js"
+    },
+    "scripts": {
+        "format": "prettier --write \"src/**/*\"",
+        "start": "tsc && cp -r bin/ dist/ && chmod -R +x dist && node dist/index.js",
+        "build": "tsc && cp -r bin/ dist/ && chmod -R +x dist",
+        "release": "npm run build && npm publish"
+    },
+    "keywords": [
+        "CLI"
+    ],
+    "author": "Hadi Hosseini <help@degn.com>",
+    "license": "MIT",
+    "files": [
+        "dist/**/*",
+        "public/simulator/**/*"
+    ],
+    "dependencies": {
+        "@solana/signers": "2.1.1",
+        "@solana/web3.js": "1.98.2",
+        "base64-js": "^1.5.1",
+        "bs58": "5.0.0",
+        "commander": "^11.0.0",
+        "cors": "^2.8.5",
+        "dotenv": "^16.3.1",
+        "ethers": "6.14.3",
+        "expres": "^0.0.5",
+        "express": "^4.21.2",
+        "express-http-proxy": "^2.1.1",
+        "express-ws": "^5.0.2",
+        "form-data": "^4.0.0",
+        "http-proxy-middleware": "^3.0.3",
+        "inquirer": "^8.0.0",
+        "md5": "^2.3.0",
+        "node-fetch": "^2.6.7",
+        "open": "^8.4.0",
+        "tar": "^6.1.13",
+        "websocket": "^1.0.35",
+        "ws": "^8.18.1"
+    },
+    "devDependencies": {
+        "@airmoney-degn/controller-sdk": "^5.4.1",
+        "@types/bs58": "5.0.0",
+        "@types/cors": "^2.8.17",
+        "@types/express": "^5.0.0",
+        "@types/express-http-proxy": "^1.6.6",
+        "@types/express-ws": "^3.0.5",
+        "@types/inquirer": "^8.1.3",
+        "@types/md5": "^2.3.2",
+        "@types/node": "^18.19.70",
+        "@types/node-fetch": "^2.6.12",
+        "@types/tar": "^6.1.13",
+        "@types/websocket": "^1.0.10",
+        "prettier": "^3.6.1",
+        "typescript": "^5.0.4"
+    }
+}

package/dist/src/cli/create.js

@@ -0,0 +1,105 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCommand = createCommand;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const types_1 = require("../types");
+const child_process_1 = require("child_process");
+/**
+ * Command for creating a new project.
+ * Now no longer requires userId + apiKey from caller;
+ * it will read them from environment variables:
+ *   process.env.DEVELOPER_ADDRESS
+ *   process.env.API_KEY
+ */
+async function createCommand(name, network, template, locationFolder) {
+    // read from env (the .env was placed in config by `setup`).
+    const userId = process.env.DEVELOPER_ADDRESS || '';
+    const apiKey = process.env.API_KEY || '';
+    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} (network=${network})`);
+    console.log(`Using .env user: ${userId}`);
+    const folderName = locationFolder || name;
+    const projectPath = path.join(process.cwd(), folderName);
+    if (template) {
+        console.log('cloning project');
+        (0, child_process_1.execSync)(`git clone --separate-git-dir=$(mktemp -u) https://github.com/Air-Money/airmoney-dapp-quickstart ${folderName}`);
+        if (fs.lstatSync(path.join(projectPath, '.git')).isDirectory()) {
+            fs.rmdirSync(path.join(projectPath, '.git'));
+        }
+        else {
+            fs.rmSync(path.join(projectPath, '.git'));
+        }
+    }
+    else {
+        fs.mkdirSync(projectPath, { recursive: true });
+        // replicate Rust logic
+        const indexHtml = `
+<html>
+<head>
+  <title>Sample ${name}</title>
+</head>
+<body>
+  <p>Hello from ${name}</p>
+</body>
+</html>
+`.trim();
+        fs.writeFileSync(path.join(projectPath, 'index.html'), indexHtml, 'utf8');
+        // assets
+        const assetsDir = path.join(projectPath, 'assets');
+        fs.mkdirSync(assetsDir, { recursive: true });
+        fs.writeFileSync(path.join(assetsDir, 'main.js'), '// sample main.js\n', 'utf8');
+        fs.writeFileSync(path.join(assetsDir, 'style.css'), '/* sample style.css */\n', 'utf8');
+    }
+    // metadata
+    const pkg = (0, types_1.createPackage)(name, identifier);
+    const metaStr = JSON.stringify(pkg, null, 2);
+    fs.writeFileSync(path.join(projectPath, 'metadata.json'), metaStr, 'utf8');
+    console.log(`Project '${name}' created successfully.`);
+    console.log(`\nNext steps:`);
+    console.log(`  cd ${name}`);
+    if (template) {
+        console.log('  npm install');
+        console.log(`  npm run serve`);
+    }
+    else {
+        console.log('  airmoney-cli serve');
+    }
+}

package/dist/src/cli/serve.js

@@ -0,0 +1,165 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serveCommand = serveCommand;
+const path_1 = __importDefault(require("path"));
+const open_1 = __importDefault(require("open"));
+// var cors = require('cors')
+// import * as cors from "cors"
+const cors_1 = __importDefault(require("cors"));
+const express_1 = __importDefault(require("express"));
+const express_ws_1 = __importDefault(require("express-ws"));
+const metadata_1 = require("../util/metadata");
+const server_1 = require("../util/server");
+const http_proxy_middleware_1 = require("http-proxy-middleware");
+const ChildProcess = __importStar(require("child_process"));
+const fs_1 = require("fs");
+const env_1 = require("../util/env");
+/**
+ * Helper to get the path to the "public/simulator" folder
+ * from the distributed code. We use __dirname, then move
+ * up two levels to the project root, then into public/simulator.
+ */
+function getSimulatorDir() {
+    // after tsc compile, serve.js is in dist/cli/
+    // we step up two dirs to get back to the project root
+    // then go into public/simulator
+    const base = path_1.default.resolve(__dirname, '..', '..');
+    return path_1.default.join(base, 'public', 'simulator');
+}
+async function serveCommand(noBrowser, locationFolder, appUrl) {
+    const simulatorPort = 4041;
+    const simulatorExpress = (0, express_ws_1.default)((0, express_1.default)()).app;
+    simulatorExpress.use((0, cors_1.default)());
+    simulatorExpress.use(express_1.default.json());
+    let simulatorClient;
+    simulatorExpress.ws('/ws', function (ws, req) {
+        simulatorClient = ws;
+        ws.on('message', function (msg) {
+            console.log(msg);
+        });
+        console.log('socket', req.body);
+    });
+    const simulatorDir = getSimulatorDir();
+    simulatorExpress.use('/simulator', express_1.default.static(simulatorDir));
+    ////////////////////////////////////////////////////////////////
+    let projectFolder = process.cwd();
+    if (locationFolder != undefined) {
+        projectFolder = path_1.default.join(process.cwd(), locationFolder);
+    }
+    const metadata = (0, metadata_1.loadMetadata)();
+    if (!metadata) {
+        console.log('[Warning] No metadata found. Skipping some possible checks.');
+    }
+    if (appUrl != undefined) {
+        const proxyMiddleware = (0, http_proxy_middleware_1.createProxyMiddleware)({
+            xfwd: true,
+            target: appUrl,
+            changeOrigin: true,
+            pathFilter: '/',
+        });
+        simulatorExpress.use('/', proxyMiddleware);
+    }
+    else {
+        simulatorExpress.use('/', express_1.default.static(projectFolder));
+    }
+    const simulatorServer = simulatorExpress.listen(simulatorPort, () => {
+        const url = `http://localhost:${simulatorPort}/simulator`;
+        console.log(`Starting simulator server at ${url}`);
+        if (!noBrowser) {
+            (0, open_1.default)(url)
+                .then(() => {
+                // success opening URL
+            })
+                .catch(err => {
+                console.error('Failed to open web browser', err);
+            });
+        }
+    });
+    ////////////////////////////////////////////////////////////////
+    const airmoneyServicePort = 4040;
+    const airmoneyServiceExpress = (0, express_1.default)();
+    airmoneyServiceExpress.use((0, cors_1.default)());
+    airmoneyServiceExpress.use(express_1.default.json());
+    airmoneyServiceExpress.post('/', async (req, res) => {
+        let rpcReq = req.body;
+        let event;
+        let simulator = true;
+        switch (rpcReq.method) {
+            case 'setImage':
+            case 'setAnimate':
+                event = (0, server_1.displayImage)(rpcReq, metadata.name);
+                break;
+        }
+        if (simulator) {
+            if (event != null) {
+                if (simulatorClient) {
+                    simulatorClient.send(JSON.stringify(event));
+                    res.status(200).json({ success: true });
+                    return;
+                }
+                else {
+                    console.log('Warning: No simulator client connected');
+                    res.status(503).json({ error: 'Simulator not connected' });
+                    return;
+                }
+            }
+            else {
+                res.status(500).json({ error: 'Failed to process request' });
+                return;
+            }
+        }
+        else {
+            res.json({ jsonrpc: '2.0', result: event, id: 1 });
+            return;
+        }
+    });
+    const airmoneyServiceServer = airmoneyServiceExpress.listen(airmoneyServicePort, () => {
+        const url = `http://localhost:${airmoneyServicePort}`;
+        console.log(`Starting airmoney service server at ${url}`);
+    });
+    ////////////////////////////////////////////////////////////////
+    const cryptoServiceBin = `${process.platform}-${process.arch}`;
+    const bin = path_1.default.join(__dirname, '..', 'bin', cryptoServiceBin);
+    if (!(0, fs_1.existsSync)(bin)) {
+        console.log('crypto service not found at ' + bin);
+    }
+    else {
+        ChildProcess.exec(bin, { env: { SECURE_STORAGE: (0, env_1.configDir)() } });
+    }
+}

package/dist/src/cli/setup.js

@@ -0,0 +1,56 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupCommand = setupCommand;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const env_1 = require("../util/env");
+async function setupCommand(network, userId, apiKey) {
+    const dir = (0, env_1.configDir)();
+    if (!dir)
+        return;
+    // ensure directory
+    fs.mkdirSync(dir, { recursive: true });
+    const envPath = path.join(dir, '.env');
+    try {
+        fs.writeFileSync(envPath, `DEVELOPER_ADDRESS=${userId}\nAPI_KEY=${apiKey}\nRPC=${network}\n`, 'utf8');
+        console.log(`.env created at ${envPath}`);
+    }
+    catch (err) {
+        console.error(`error when writing .env to ${envPath}`);
+        console.error(err);
+        process.exit(1);
+    }
+}