@teardown/cli 1.2.29 → 1.2.31

package/dist/modules/dev/dev-server/dev-server.d.ts

@@ -2,6 +2,7 @@ import { type FastifyInstance } from "fastify";
 import type { TerminalReportableEvent } from "metro/src/lib/TerminalReporter";
 import { KeyboardHandlerManager } from "../dev-menu/keyboard-handler";
 import { TeardownTerminalReporter } from "../terminal/terminal.reporter";
+import { Inspector } from "./inspector/inspector";
 import { WebSocketApiServer } from "./plugins/wss/servers/web-socket-api.server";
 import { WebSocketEventsServer } from "./plugins/wss/servers/web-socket-events.server";
 import { WebSocketMessageServer } from "./plugins/wss/servers/web-socket-message.server";
@@ -24,22 +25,19 @@ export declare class DevServer {
     messageServer: WebSocketMessageServer;
     eventsServer: WebSocketEventsServer;
     keyboardHandler: KeyboardHandlerManager;
+    inspector: Inspector;
     constructor(config: DevServerOptions);
     onWrite(chunk: any, encoding: BufferEncoding, callback: (error?: Error | null) => void): Promise<void>;
     getDevServerUrl(): string;
     onInitializeDone(): void;
     reportMetroEvent(event: TerminalReportableEvent): void;
     private onBundleBuilt;
-    private onMessage;
     private onClientConnected;
     private loadMetroConfig;
     private _metroConfig;
     private getMetroConfig;
     private registerPlugins;
     private onSymbolicate;
-    private customInspectorMessageHandler;
-    private onDeviceMessage;
-    private onDebuggerMessage;
     private registerHooks;
     private registerRoutes;
     initialize(): Promise<void>;

package/dist/modules/dev/dev-server/dev-server.js

@@ -16,6 +16,7 @@ const metro_1 = __importDefault(require("metro"));
 const node_stream_1 = require("node:stream");
 const keyboard_handler_1 = require("../dev-menu/keyboard-handler");
 const terminal_reporter_1 = require("../terminal/terminal.reporter");
+const inspector_1 = require("./inspector/inspector");
 const devtools_plugin_1 = require("./plugins/devtools.plugin");
 const favicon_plugin_1 = require("./plugins/favicon.plugin");
 const multipart_plugin_1 = require("./plugins/multipart.plugin");
@@ -25,7 +26,6 @@ const web_socket_api_server_1 = require("./plugins/wss/servers/web-socket-api.se
 const web_socket_events_server_1 = require("./plugins/wss/servers/web-socket-events.server");
 const web_socket_message_server_1 = require("./plugins/wss/servers/web-socket-message.server");
 const sybmolicate_plugin_1 = require("./sybmolicate/sybmolicate.plugin");
-const inspector_1 = require("./inspector/inspector");
 class DevServer {
     config;
     terminalReporter;
@@ -35,6 +35,7 @@ class DevServer {
     messageServer;
     eventsServer;
     keyboardHandler;
+    inspector;
     constructor(config) {
         this.config = config;
         this.terminalReporter = new terminal_reporter_1.TeardownTerminalReporter(this);
@@ -55,13 +56,18 @@ class DevServer {
             webSocketMessageServer: this.messageServer,
         });
         this.keyboardHandler = new keyboard_handler_1.KeyboardHandlerManager(this);
+        this.inspector = new inspector_1.Inspector({
+            projectRoot: this.config.projectRoot,
+            serverBaseUrl: this.getDevServerUrl(),
+            // eventReporter: this.terminalReporter,
+        });
     }
     async onWrite(chunk, encoding, callback) {
         if (chunk == null) {
             return;
         }
         const log = JSON.parse(chunk.toString());
-        this.onMessage(log);
+        this.apiServer.send(log);
         callback();
     }
     getDevServerUrl() {
@@ -72,6 +78,10 @@ class DevServer {
         this.keyboardHandler.initialize();
     }
     reportMetroEvent(event) {
+        this.apiServer.send({
+            type: "metro_event",
+            event,
+        });
         switch (event.type) {
             case "client_log":
                 this.eventsServer.broadcastEvent(event);
@@ -80,16 +90,7 @@ class DevServer {
     }
     onBundleBuilt(bundlePath) {
         // console.log("onBundleBuilt", bundlePath);
-        this.messageServer.broadcast("reload");
-    }
-    onMessage(log) {
-        this.apiServer.send(log);
-        // console.log(log.msg, log.level);
-        // this.terminalReporter.update({
-        // 	type: "client_log",
-        // 	level: "info",
-        // 	data: [log.msg],
-        // });
+        // this.messageServer.broadcast("reload");
     }
     onClientConnected(platform, clientId) {
         // this.messageServer.broadcast("reload", undefined, []);
@@ -124,12 +125,7 @@ class DevServer {
             watch: true,
             onBundleBuilt: this.onBundleBuilt.bind(this),
         });
-        const inspector = new inspector_1.Inspector({
-            projectRoot: this.config.projectRoot,
-            serverBaseUrl: this.getDevServerUrl(),
-            // eventReporter: this.terminalReporter,
-        });
-        const websockets = inspector.createWebSocketServers();
+        const websockets = this.inspector.createWebSocketServers();
         // const devMiddleware = createDevMiddleware({
         // 	projectRoot: this.config.projectRoot,
         // 	serverBaseUrl: `http://${this.config.host}:${this.config.port}`,
@@ -195,36 +191,13 @@ class DevServer {
             watchFolders: [this.config.projectRoot],
         }));
         this.instance.use(serverInstance.metroServer.processRequest);
-        this.instance.use(inspector.handleHttpRequest);
+        this.instance.use((req, resp, next) => this.inspector.handleHttpRequest(req, resp, next));
     }
     onSymbolicate(request, reply) {
         const result = JSON.parse(request.rawBody);
         const { codeFrame, stack } = result;
         this.instance.log.info("onSymbolicate", { codeFrame, stack });
     }
-    customInspectorMessageHandler(connection) {
-        this.instance.log.info("Creating custom inspector message handler", {
-            connection,
-        });
-        return {
-            handleDeviceMessage: (message) => this.onDeviceMessage(connection, message),
-            handleDebuggerMessage: (message) => this.onDebuggerMessage(connection, message),
-        };
-    }
-    onDeviceMessage(connection, message) {
-        this.instance.log.info("Device -> Debugger", {
-            message,
-        });
-        connection.debugger.sendMessage(message);
-        return true;
-    }
-    onDebuggerMessage(connection, message) {
-        this.instance.log.info("Debugger -> Device", {
-            message,
-        });
-        connection.device.sendMessage(message);
-        return true;
-    }
     registerHooks() {
         this.instance.log.info("Registering hooks");
         this.instance = this.instance.addHook("onSend", async (request, reply, payload) => {

package/dist/modules/dev/dev-server/inspector/inspector.js

@@ -41,6 +41,7 @@ class Inspector {
     }
     handleHttpRequest(req, res, next) {
         const pathname = new node_url_1.URL(req.url || "", "http://localhost").pathname;
+        console.log("handleHttpRequest", { pathname });
         if (pathname === JSON_LIST_PATH || pathname === JSON_LIST_PATH_2) {
             this.sendJsonResponse(res, this.getPageDescriptions());
         }

package/dist/modules/dev/dev-server/plugins/favicon.plugin.js

@@ -4,15 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.faviconPlugin = void 0;
+const fastify_favicon_1 = __importDefault(require("fastify-favicon"));
 const fastify_plugin_1 = __importDefault(require("fastify-plugin"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_url_1 = require("node:url");
 // @ts-ignore
 const dirname = node_path_1.default.dirname((0, node_url_1.fileURLToPath)(import.meta.url));
+console.log("dirname", dirname);
 const pathToImgDir = node_path_1.default.join(dirname, "../img");
 exports.faviconPlugin = (0, fastify_plugin_1.default)(async (instance) => {
-    console.log("pathToImgDir", pathToImgDir);
-    // instance.register(fastifyFavicon, { path: pathToImgDir });
+    instance.register(fastify_favicon_1.default, { path: pathToImgDir });
 }, {
     name: "favicon-plugin",
 });

package/dist/modules/dev/dev-server/plugins/wss/servers/web-socket-api.server.d.ts

@@ -1,6 +1,11 @@
 import type { FastifyInstance } from "fastify";
+import type { TerminalReportableEvent } from "metro/src/lib/TerminalReporter";
 import type WebSocket from "ws";
 import { WebSocketServer } from "../web-socket-server";
+export type WebSocketApiEvent = {
+    type: "metro_event";
+    event: TerminalReportableEvent;
+};
 /**
  * Class for creating a WebSocket server for API clients.
  * Useful to listening for compilation events and new logs.
@@ -22,7 +27,7 @@ export declare class WebSocketApiServer extends WebSocketServer {
      *
      * @param event Event string or object to send.
      */
-    send(event: unknown): void;
+    send(event: unknown | WebSocketApiEvent): void;
     /**
      * Process new WebSocket connection from client application.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teardown/cli",
-  "version": "1.2.29",
+  "version": "1.2.31",
   "description": "Teardown CLI",
   "main": "dist/index.js",
   "bin": {