@asyncapi/cli 3.4.0 → 3.4.2

package/lib/domains/models/Studio.js

@@ -16,111 +16,125 @@ const picocolors_1 = require("picocolors");
 const { readFile, writeFile } = fs_1.promises;
 const sockets = [];
 const messageQueue = [];
-exports.DEFAULT_PORT = 3210;
+exports.DEFAULT_PORT = 0;
 function isValidFilePath(filePath) {
     return (0, fs_1.existsSync)(filePath);
 }
 // eslint-disable-next-line sonarjs/cognitive-complexity
-function start(filePath, port = exports.DEFAULT_PORT) {
-    if (filePath && !isValidFilePath(filePath)) {
-        throw new specification_file_1.SpecificationFileNotFound(filePath);
-    }
-    // Locate @asyncapi/studio package
-    const studioPath = path_1.default.dirname(require.resolve('@asyncapi/studio/package.json'));
-    const app = (0, next_1.default)({
-        dev: false,
-        dir: studioPath,
-        conf: {
-            distDir: 'build',
-        },
-    });
-    const handle = app.getRequestHandler();
-    const wsServer = new ws_1.WebSocketServer({ noServer: true });
-    wsServer.on('connection', (socket) => {
-        sockets.push(socket);
-        if (filePath) {
-            getFileContent(filePath).then((code) => {
+function start(filePath_1) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* (filePath, port = exports.DEFAULT_PORT) {
+        if (filePath && !isValidFilePath(filePath)) {
+            throw new specification_file_1.SpecificationFileNotFound(filePath);
+        }
+        // Locate @asyncapi/studio package
+        const studioPath = path_1.default.dirname(require.resolve('@asyncapi/studio/package.json'));
+        const app = (0, next_1.default)({
+            dev: false,
+            dir: studioPath,
+            conf: {
+                distDir: 'build',
+            },
+        });
+        const handle = app.getRequestHandler();
+        const wsServer = new ws_1.WebSocketServer({ noServer: true });
+        wsServer.on('connection', (socket) => {
+            sockets.push(socket);
+            if (filePath) {
+                getFileContent(filePath).then((code) => {
+                    messageQueue.push(JSON.stringify({
+                        type: 'file:loaded',
+                        code,
+                    }));
+                    sendQueuedMessages();
+                });
+            }
+            else {
                 messageQueue.push(JSON.stringify({
                     type: 'file:loaded',
-                    code,
+                    code: '',
                 }));
                 sendQueuedMessages();
-            });
-        }
-        else {
-            messageQueue.push(JSON.stringify({
-                type: 'file:loaded',
-                code: '',
-            }));
-            sendQueuedMessages();
-        }
-        socket.on('message', (event) => {
-            try {
-                const json = JSON.parse(event);
-                if (filePath && json.type === 'file:update') {
-                    saveFileContent(filePath, json.code);
+            }
+            socket.on('message', (event) => {
+                try {
+                    const json = JSON.parse(event);
+                    if (filePath && json.type === 'file:update') {
+                        saveFileContent(filePath, json.code);
+                    }
+                    else {
+                        console.warn('Live Server: An unknown event has been received. See details:');
+                        console.log(json);
+                    }
                 }
-                else {
-                    console.warn('Live Server: An unknown event has been received. See details:');
-                    console.log(json);
+                catch (e) {
+                    console.error(`Live Server: An invalid event has been received. See details:\n${event}`);
                 }
-            }
-            catch (e) {
-                console.error(`Live Server: An invalid event has been received. See details:\n${event}`);
-            }
+            });
         });
-    });
-    wsServer.on('close', (socket) => {
-        sockets.splice(sockets.findIndex((s) => s === socket));
-    });
-    app.prepare().then(() => {
-        if (filePath) {
-            chokidar_1.default.watch(filePath).on('all', (event, path) => {
-                switch (event) {
-                    case 'add':
-                    case 'change':
-                        getFileContent(path).then((code) => {
+        wsServer.on('close', (socket) => {
+            sockets.splice(sockets.findIndex((s) => s === socket));
+        });
+        app.prepare().then(() => {
+            if (filePath) {
+                chokidar_1.default.watch(filePath).on('all', (event, path) => {
+                    switch (event) {
+                        case 'add':
+                        case 'change':
+                            getFileContent(path).then((code) => {
+                                messageQueue.push(JSON.stringify({
+                                    type: 'file:changed',
+                                    code,
+                                }));
+                                sendQueuedMessages();
+                            });
+                            break;
+                        case 'unlink':
                             messageQueue.push(JSON.stringify({
-                                type: 'file:changed',
-                                code,
+                                type: 'file:deleted',
+                                filePath,
                             }));
                             sendQueuedMessages();
-                        });
-                        break;
-                    case 'unlink':
-                        messageQueue.push(JSON.stringify({
-                            type: 'file:deleted',
-                            filePath,
-                        }));
-                        sendQueuedMessages();
-                        break;
-                }
-            });
-        }
-        const server = (0, http_1.createServer)((req, res) => handle(req, res));
-        server.on('upgrade', (request, socket, head) => {
-            if (request.url === '/live-server') {
-                console.log('🔗 WebSocket connection established.');
-                wsServer.handleUpgrade(request, socket, head, (sock) => {
-                    wsServer.emit('connection', sock, request);
+                            break;
+                    }
                 });
             }
-            else {
-                socket.destroy();
-            }
-        });
-        server.listen(port, () => {
-            const url = `http://localhost:${port}?liveServer=${port}&studio-version=${package_json_1.version}`;
-            console.log(`🎉 Connected to Live Server running at ${(0, picocolors_1.blueBright)(url)}.`);
-            console.log(`🌐 Open this URL in your web browser: ${(0, picocolors_1.blueBright)(url)}`);
-            console.log(`🛑 If needed, press ${(0, picocolors_1.redBright)('Ctrl + C')} to stop the process.`);
-            if (filePath) {
-                console.log(`👁️ Watching changes on file ${(0, picocolors_1.blueBright)(filePath)}`);
-            }
-            else {
-                console.warn('Warning: No file was provided, and we couldn\'t find a default file (like "asyncapi.yaml" or "asyncapi.json") in the current folder. Starting Studio with a blank workspace.');
-            }
-            (0, open_1.default)(url);
+            const server = (0, http_1.createServer)((req, res) => handle(req, res));
+            server.on('upgrade', (request, socket, head) => {
+                if (request.url === '/live-server') {
+                    console.log('🔗 WebSocket connection established.');
+                    wsServer.handleUpgrade(request, socket, head, (sock) => {
+                        wsServer.emit('connection', sock, request);
+                    });
+                }
+                else {
+                    socket.destroy();
+                }
+            });
+            server.listen(port, () => {
+                const addr = server.address();
+                const listenPort = (addr && typeof addr === 'object' && 'port' in addr) ? addr.port : port;
+                const url = `http://localhost:${listenPort}?liveServer=${listenPort}&studio-version=${package_json_1.version}`;
+                console.log(`🎉 Connected to Live Server running at ${(0, picocolors_1.blueBright)(url)}.`);
+                console.log(`🌐 Open this URL in your web browser: ${(0, picocolors_1.blueBright)(url)}`);
+                console.log(`🛑 If needed, press ${(0, picocolors_1.redBright)('Ctrl + C')} to stop the process.`);
+                if (filePath) {
+                    console.log(`👁️ Watching changes on file ${(0, picocolors_1.blueBright)(filePath)}`);
+                }
+                else {
+                    console.warn('Warning: No file was provided, and we couldn\'t find a default file (like "asyncapi.yaml" or "asyncapi.json") in the current folder. Starting Studio with a blank workspace.');
+                }
+                (0, open_1.default)(url);
+            }).on('error', (error) => {
+                if (error.message.includes('EADDRINUSE')) {
+                    console.log(error);
+                    console.error((0, picocolors_1.redBright)(`Error: Port ${port} is already in use.`));
+                    // eslint-disable-next-line no-process-exit
+                    process.exit(2);
+                }
+                else {
+                    console.error(`Failed to start server on port ${port}`);
+                }
+            });
         });
     });
 }

package/lib/utils/logger.js

@@ -6,7 +6,7 @@ const config_1 = tslib_1.__importDefault(require("config"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const winston_1 = tslib_1.__importDefault(require("winston"));
-const logDir = path_1.default.join(__dirname, config_1.default.get('log.dir'));
+const logDir = path_1.default.join(__dirname, config_1.default.has('log.dir') ? config_1.default.get('log.dir') : 'logs');
 if (!fs_1.default.existsSync(logDir)) {
     fs_1.default.mkdirSync(logDir);
 }

package/lib/utils/temp-dir.js

@@ -14,6 +14,7 @@ function createTempDirectory() {
 function removeTempDirectory(tmpDir) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         try {
+            // eslint-disable-next-line no-unused-expressions
             tmpDir &&
                 fs_1.default.existsSync(tmpDir) &&
                 (yield fs_1.promises.rm(tmpDir, { recursive: true }));

package/oclif.manifest.json

@@ -1978,5 +1978,5 @@
       ]
     }
   },
-  "version": "3.4.0"
+  "version": "3.4.2"
 }