@airmoney-degn/airmoney-cli 0.18.0 → 0.19.0

package/dist/cli/upload.js

@@ -61,7 +61,7 @@ async function uploadCommand({ network, locationFolder, buttonImages, }) {
                 buttonImages = 'assets';
             }
             (0, LogService_1.log)(buttonImages).white();
-            const meta = (0, metadata_1.loadMetadata)();
+            const meta = await (0, metadata_1.loadMetadata)();
             if (!meta) {
                 (0, LogService_1.log)('No metadata.json found. Aborting.').red();
                 return;

package/dist/config.json

@@ -1,3 +1,3 @@
 {
-    "version": "0.18.0"
+    "version": "0.19.0"
 }

package/dist/service/airmoney/AirmoneyService.js

@@ -8,9 +8,12 @@ const express_1 = __importDefault(require("express"));
 const cors_1 = __importDefault(require("cors"));
 const server_1 = require("../../util/server");
 const LogService_1 = require("../log/LogService");
+const AIRMONEY_SERVICE_PORT = 4040;
 class AirmoneyService {
     constructor(config) {
+        this.server = null;
         this.simulatorClient = null;
+        this.appName = null;
         this.config = config;
         this.app = (0, express_1.default)();
         this.setupMiddleware();
@@ -30,7 +33,7 @@ class AirmoneyService {
         switch (rpcReq.method) {
             case 'setImage':
             case 'setAnimate':
-                event = (0, server_1.displayImage)(rpcReq, this.config.metadata?.name || '');
+                event = await (0, server_1.displayImage)(rpcReq, this.appName || '', this.config.appUrl);
                 break;
         }
         if (simulator) {
@@ -59,10 +62,13 @@ class AirmoneyService {
     setSimulatorClient(simulatorClient) {
         this.simulatorClient = simulatorClient;
     }
+    setAppName(appName) {
+        this.appName = appName;
+    }
     async start() {
         return new Promise(resolve => {
-            this.server = this.app.listen(this.config.port, () => {
-                const url = `http://localhost:${this.config.port}`;
+            this.server = this.app.listen(AIRMONEY_SERVICE_PORT, () => {
+                const url = `http://localhost:${AIRMONEY_SERVICE_PORT}`;
                 (0, LogService_1.log)(`Starting airmoney service server at ${url}`).green();
                 resolve();
             });

package/dist/service/serve/ServeOrchestrator.js

@@ -13,8 +13,8 @@ const AirmoneyService_1 = require("../airmoney/AirmoneyService");
 const LogService_1 = require("../log/LogService");
 class ServeOrchestrator {
     constructor(config) {
+        this.metadata = null;
         this.config = config;
-        this.metadata = (0, metadata_1.loadMetadata)();
         this.simulatorService = this.createSimulatorService();
         this.airmoneyService = this.createAirmoneyService();
     }
@@ -32,13 +32,16 @@ class ServeOrchestrator {
     }
     createAirmoneyService() {
         return new AirmoneyService_1.AirmoneyService({
-            port: 4040,
-            metadata: this.metadata ? { name: this.metadata.name } : undefined,
+            appUrl: this.config.appUrl,
         });
     }
     async start() {
         // Check for port conflicts first
         await PortManager_1.PortManager.checkPortConflicts();
+        // Load metadata (from remote URL if appUrl is provided, otherwise locally)
+        this.metadata = await (0, metadata_1.loadMetadata)('.', this.config.appUrl);
+        // Update AirmoneyService with loaded metadata
+        this.airmoneyService.setAppName(this.metadata?.name || null);
         // Validate metadata
         if (!this.metadata) {
             (0, LogService_1.log)('No metadata found. Skipping some possible checks.').white();
@@ -46,9 +49,9 @@ class ServeOrchestrator {
         // Start simulator service
         await this.simulatorService.start();
         // Set up callback to handle simulator client connections
-        this.simulatorService.setOnClientConnected((client) => {
+        this.simulatorService.onClientConnectedCallback = client => {
             this.airmoneyService.setSimulatorClient(client);
-        });
+        };
         // Start airmoney service
         await this.airmoneyService.start();
         // Start crypto service

package/dist/service/simulator/BaseSimulatorService.js

@@ -11,8 +11,10 @@ const cors_1 = __importDefault(require("cors"));
 const open_1 = __importDefault(require("open"));
 const http_proxy_middleware_1 = require("http-proxy-middleware");
 const LogService_1 = require("../log/LogService");
+const SIMULATOR_SERVICE_PORT = 4041;
 class BaseSimulatorService {
     constructor(config) {
+        this.server = null;
         this.simulatorClient = null;
         this.onClientConnectedCallback = null;
         this.config = config;
@@ -31,7 +33,7 @@ class BaseSimulatorService {
         return path_1.default.join(base, 'public', 'simulator');
     }
     setupWebSocket() {
-        this.app.ws('/ws', (ws, req) => {
+        this.app.ws('/ws', (ws) => {
             this.simulatorClient = ws;
             // Notify callback about new connection
             if (this.onClientConnectedCallback) {
@@ -77,7 +79,7 @@ class BaseSimulatorService {
     }
     async openBrowser() {
         if (!this.config.noBrowser) {
-            const url = `http://localhost:${this.config.port}/simulator`;
+            const url = `http://localhost:${SIMULATOR_SERVICE_PORT}/simulator`;
             try {
                 await (0, open_1.default)(url);
             }
@@ -105,16 +107,13 @@ class BaseSimulatorService {
         }
         return false;
     }
-    setOnClientConnected(callback) {
-        this.onClientConnectedCallback = callback;
-    }
     async start() {
         this.setupWebSocket();
         this.setupStaticFiles();
         this.setupProjectFiles();
         return new Promise(resolve => {
-            this.server = this.app.listen(this.config.port, () => {
-                const url = `http://localhost:${this.config.port}/simulator`;
+            this.server = this.app.listen(SIMULATOR_SERVICE_PORT, () => {
+                const url = `http://localhost:${SIMULATOR_SERVICE_PORT}/simulator`;
                 (0, LogService_1.log)(`Starting simulator server at ${url}`).green();
                 this.openBrowser();
                 resolve();

package/dist/service/simulator/SimulatorService.js

@@ -11,7 +11,6 @@ class SimulatorService extends BaseSimulatorService_1.BaseSimulatorService {
      */
     static create(config = {}) {
         const defaultConfig = {
-            port: 4041,
             noBrowser: false,
             ...config,
         };

package/dist/types.js

@@ -3,11 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPackage = createPackage;
 function createPackage(name, identifier) {
     return {
-        name,
-        identifier,
+        name: name,
+        identifier: identifier,
+        displayName: '',
         author: '',
-        version: '0.1.0',
         maintainer: '',
         url: '',
+        themeColor: '',
+        version: '0.0.1',
+        whatsNew: '',
+        buildNumber: '',
+        commitHash: '',
+        buildDate: '',
     };
 }

package/dist/util/metadata.js

@@ -39,14 +39,29 @@ exports.getPackageName = getPackageName;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const LogService_1 = require("../service/log/LogService");
-function loadMetadata(projectPath = '.') {
+const remote_1 = require("./remote");
+async function loadMetadata(projectPath = '.', appUrl) {
     try {
-        const filePath = path.join(projectPath, 'metadata.json');
-        if (!fs.existsSync(filePath)) {
-            (0, LogService_1.log)('Please run this command in Project directory').white();
-            return null;
+        let raw;
+        if (appUrl) {
+            // Fetch from remote URL
+            const url = (0, remote_1.buildRemoteUrl)(appUrl, 'metadata.json');
+            const fetchedRaw = await (0, remote_1.fetchRemoteText)(url);
+            if (fetchedRaw === null) {
+                (0, LogService_1.log)('Error loading metadata from remote URL').red();
+                return null;
+            }
+            raw = fetchedRaw;
+        }
+        else {
+            // Read from local file system
+            const filePath = path.join(projectPath, 'metadata.json');
+            if (!fs.existsSync(filePath)) {
+                (0, LogService_1.log)('Please run this command in Project directory').white();
+                return null;
+            }
+            raw = fs.readFileSync(filePath, 'utf8');
         }
-        const raw = fs.readFileSync(filePath, 'utf8');
         const data = JSON.parse(raw);
         return data;
     }

package/dist/util/remote.js

@@ -0,0 +1,55 @@
+"use strict";
+/**
+ * Utility functions for fetching resources from remote URLs
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeBaseUrl = normalizeBaseUrl;
+exports.buildRemoteUrl = buildRemoteUrl;
+exports.fetchRemoteText = fetchRemoteText;
+exports.fetchRemoteBase64 = fetchRemoteBase64;
+/**
+ * Normalizes a base URL by removing trailing slashes
+ */
+function normalizeBaseUrl(url) {
+    return url.endsWith('/') ? url.slice(0, -1) : url;
+}
+/**
+ * Builds a URL by combining base URL with a path, encoding path segments
+ */
+function buildRemoteUrl(baseUrl, path) {
+    const normalizedBase = normalizeBaseUrl(baseUrl);
+    const pathSegments = path.split('/').map(segment => encodeURIComponent(segment));
+    return `${normalizedBase}/${pathSegments.join('/')}`;
+}
+/**
+ * Fetches text content from a remote URL
+ */
+async function fetchRemoteText(url) {
+    try {
+        const response = await fetch(url);
+        if (!response.ok) {
+            return null;
+        }
+        return await response.text();
+    }
+    catch (error) {
+        return null;
+    }
+}
+/**
+ * Fetches binary content from a remote URL and returns as base64 string
+ */
+async function fetchRemoteBase64(url) {
+    try {
+        const response = await fetch(url);
+        if (!response.ok) {
+            return null;
+        }
+        const arrayBuffer = await response.arrayBuffer();
+        const buffer = Buffer.from(arrayBuffer);
+        return buffer.toString('base64');
+    }
+    catch (error) {
+        return null;
+    }
+}

package/dist/util/server.js

@@ -39,9 +39,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.displayImage = displayImage;
 const path_1 = __importDefault(require("path"));
 const fs = __importStar(require("fs"));
-function displayImage(request, appName) {
+const remote_1 = require("./remote");
+async function displayImage(request, appName, appUrl) {
     const f = request.params[0].replace(new RegExp(`^${appName}\\/`), '');
-    let file = fs.readFileSync(f, { encoding: 'base64' });
+    let file;
+    if (appUrl) {
+        // Fetch from remote URL
+        const url = (0, remote_1.buildRemoteUrl)(appUrl, f);
+        const base64Content = await (0, remote_1.fetchRemoteBase64)(url);
+        if (base64Content === null) {
+            return null;
+        }
+        file = base64Content;
+    }
+    else {
+        // Read from local file system
+        file = fs.readFileSync(f, { encoding: 'base64' });
+    }
     const fileType = path_1.default.extname(f);
     let mime = '';
     switch (fileType.replace('.', '')) {

package/package.json

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