@asyncapi/cli 2.16.7 → 2.16.8

package/lib/core/models/Studio.js

@@ -6,10 +6,10 @@ const tslib_1 = require("tslib");
 const fs_1 = require("fs");
 const specification_file_1 = require("../errors/specification-file");
 const http_1 = require("http");
-const serve_handler_1 = tslib_1.__importDefault(require("serve-handler"));
 const ws_1 = require("ws");
 const chokidar_1 = tslib_1.__importDefault(require("chokidar"));
 const open_1 = tslib_1.__importDefault(require("open"));
+const next_1 = tslib_1.__importDefault(require("next"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const package_json_1 = require("@asyncapi/studio/package.json");
 const picocolors_1 = require("picocolors");
@@ -24,49 +24,16 @@ function start(filePath, port = exports.DEFAULT_PORT) {
     if (filePath && !isValidFilePath(filePath)) {
         throw new specification_file_1.SpecificationFileNotFound(filePath);
     }
-    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:deleted',
-                        filePath,
-                    }));
-                    sendQueuedMessages();
-                    break;
-            }
-        });
-    }
-    const server = (0, http_1.createServer)((request, response) => {
-        //not all CLI users use npm. Some package managers put dependencies in different weird places
-        //this is why we need to first figure out where exactly is the index.html located
-        //and then strip index.html from the path to point to directory with the rest of the studio
-        const indexLocation = require.resolve('@asyncapi/studio/build/index.html');
-        const hostFolder = indexLocation.substring(0, indexLocation.lastIndexOf(path_1.default.sep));
-        return (0, serve_handler_1.default)(request, response, {
-            public: hostFolder,
-        });
-    });
-    server.on('upgrade', (request, socket, head) => {
-        if (request.url === '/live-server') {
-            wsServer.handleUpgrade(request, socket, head, (sock) => {
-                wsServer.emit('connection', sock, request);
-            });
-        }
-        else {
-            socket.destroy();
-        }
+    // 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);
@@ -105,18 +72,55 @@ function start(filePath, port = exports.DEFAULT_PORT) {
     wsServer.on('close', (socket) => {
         sockets.splice(sockets.findIndex(s => s === socket));
     });
-    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.`);
+    app.prepare().then(() => {
         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.');
+            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:deleted',
+                            filePath,
+                        }));
+                        sendQueuedMessages();
+                        break;
+                }
+            });
         }
-        (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 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);
+        });
     });
 }
 function sendQueuedMessages() {

package/oclif.manifest.json

@@ -1785,5 +1785,5 @@
       ]
     }
   },
-  "version": "2.16.7"
+  "version": "2.16.8"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "2.16.7",
+  "version": "2.16.8",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run_bin"
@@ -19,7 +19,7 @@
     "@asyncapi/parser": "^3.3.0",
     "@asyncapi/protobuf-schema-parser": "^3.5.1",
     "@asyncapi/raml-dt-schema-parser": "^4.0.24",
-    "@asyncapi/studio": "^0.20.0",
+    "@asyncapi/studio": "^0.23.0",
     "@changesets/changelog-git": "^0.2.0",
     "@clack/prompts": "^0.7.0",
     "@oclif/core": "^4.2.9",
@@ -33,6 +33,8 @@
     "https-proxy-agent": "^7.0.6",
     "inquirer": "^8.2.0",
     "js-yaml": "^4.1.0",
+    "next": "^14.2.24",
+    "node-fetch": "^2.0.0",
     "oclif": "^4.17.34",
     "open": "^8.4.0",
     "picocolors": "^1.0.0",