@granite-js/mpack 0.1.23 → 0.1.25

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @granite-js/mpack
 
+## 0.1.25
+
+### Patch Changes
+
+- @granite-js/devtools-frontend@0.1.25
+- @granite-js/plugin-core@0.1.25
+- @granite-js/utils@0.1.25
+
+## 0.1.24
+
+### Patch Changes
+
+- 6e42c3d: add inspectorProxy options
+- Updated dependencies [6e42c3d]
+  - @granite-js/plugin-core@0.1.24
+  - @granite-js/devtools-frontend@0.1.24
+  - @granite-js/utils@0.1.24
+
 ## 0.1.23
 
 ### Patch Changes

package/dist/operations/serve.js

@@ -80,7 +80,7 @@ async function runServer({
     }
   };
   const resolvedConfig = await (0, import_plugin_core.resolveConfig)(config);
-  const { middlewares = [], ...additionalMetroConfig } = resolvedConfig?.metro ?? {};
+  const { middlewares = [], inspectorProxy, ...additionalMetroConfig } = resolvedConfig?.metro ?? {};
   const baseConfig = await (0, import_getMetroConfig.getMetroConfig)({ rootPath: config.cwd }, additionalMetroConfig);
   const metroConfig = mergeConfig(baseConfig, {
     server: { port },
@@ -126,7 +126,8 @@ async function runServer({
   await driver.devServer.pre({ host, port });
   const serverInstance = await Metro.runServer(metroConfig, {
     host,
-    websocketEndpoints
+    websocketEndpoints,
+    inspectorProxyDelegate: inspectorProxy?.delegate
   });
   serverInstance.keepAliveTimeout = 3e4;
 }

package/dist/server/DevServer.js

@@ -99,7 +99,7 @@ class DevServer {
   async setup(app) {
     const baseRoot = this.devServerOptions.rootDir;
     const serverBaseUrl = this.getBaseUrl();
-    const debuggerEventHandler = new import_DebuggerEventHandler.DebuggerEventHandler();
+    const debuggerEventHandler = new import_DebuggerEventHandler.DebuggerEventHandler(this.devServerOptions.inspectorProxy?.delegate);
     const inspectorProxy = new import_dev_middleware.InspectorProxy({ root: baseRoot, serverBaseUrl });
     const inspectorProxyWss = inspectorProxy.createWebSocketServers({
       onDeviceWebSocketConnected: (socket) => {

package/dist/server/debugger/DebuggerEventHandler.d.ts

@@ -1,6 +1,9 @@
+import type { InspectorProxyConfig } from '@granite-js/plugin-core';
 import * as ws from 'ws';
 export declare class DebuggerEventHandler {
+    private delegate?;
     private networkResponseData;
+    constructor(delegate?: InspectorProxyConfig['delegate']);
     setDeviceWebSocketHandler(socket: ws.WebSocket): void;
     setDebuggerWebSocketHandler(socket: ws.WebSocket): void;
     /**

package/dist/server/debugger/DebuggerEventHandler.js

@@ -35,6 +35,9 @@ var import_debug = __toESM(require("debug"));
 var import_parseDomain = require("./parseDomain");
 const debug = (0, import_debug.default)("dev-server:debugger");
 class DebuggerEventHandler {
+  constructor(delegate) {
+    this.delegate = delegate;
+  }
   networkResponseData = /* @__PURE__ */ new Map();
   setDeviceWebSocketHandler(socket) {
     socket.on("message", (message) => this.handleDeviceMessage(socket, message));
@@ -92,12 +95,15 @@ class DebuggerEventHandler {
       return null;
     }
   }
-  handleDeviceMessage(_socket, message) {
+  handleDeviceMessage(socket, message) {
     const customEvent = this.safetyParseCustomEvent(message);
     if (customEvent == null) {
       return;
     }
     debug("handleDeviceMessage", customEvent);
+    if (this.delegate?.onDeviceMessage?.(customEvent, socket)) {
+      return;
+    }
     switch (customEvent.method) {
       case "Bedrock.networkResponseData":
       case "Granite.networkResponseData":
@@ -106,17 +112,22 @@ class DebuggerEventHandler {
     }
   }
   handleDebuggerMessage(socket, message) {
-    let handled = true;
+    let handled;
     const debuggerEvent = this.safetyParseDebuggerEvent(message);
     if (debuggerEvent == null) {
       return;
     }
-    switch (debuggerEvent.method) {
-      case "Network.getResponseBody":
-        this.handleGetResponseBody(socket, debuggerEvent);
-        break;
-      default:
-        handled = false;
+    if (this.delegate?.onDebuggerMessage?.(debuggerEvent, socket)) {
+      handled = true;
+    } else {
+      switch (debuggerEvent.method) {
+        case "Network.getResponseBody":
+          this.handleGetResponseBody(socket, debuggerEvent);
+          handled = true;
+          break;
+        default:
+          handled = false;
+      }
     }
     if (handled) {
       debug("handleDebuggerMessage", debuggerEvent);

package/dist/server/types.d.ts

@@ -1,4 +1,4 @@
-import type { Middleware, BuildConfig } from '@granite-js/plugin-core';
+import type { Middleware, BuildConfig, InspectorProxyConfig } from '@granite-js/plugin-core';
 import type { Bundler } from '../bundler';
 import type { BuildStatusProgressBar } from '../utils/progressBar';
 export type Platform = 'android' | 'ios';
@@ -8,6 +8,7 @@ export interface DevServerOptions {
     port?: number;
     buildConfig: Omit<BuildConfig, 'platform' | 'outfile'>;
     middlewares?: Middleware[];
+    inspectorProxy?: InspectorProxyConfig;
 }
 export interface DevServerContext {
     rootDir: string;

package/dist/vendors/metro/src/index.flow.js

@@ -94,6 +94,8 @@ exports.runServer = async (config, {
   // deprecated
   secureKey,
   // deprecated
+  inspectorProxyDelegate,
+  // MARK: - GRANITE
   waitForBundler = false,
   websocketEndpoints = {}
 }) => {
@@ -113,7 +115,7 @@ exports.runServer = async (config, {
   serverApp.use(middleware);
   let inspectorProxy = null;
   if (config.server.runInspectorProxy) {
-    inspectorProxy = new InspectorProxy(config.projectRoot);
+    inspectorProxy = new InspectorProxy(config.projectRoot, inspectorProxyDelegate);
   }
   let httpServer;
   if (secure || secureServerOptions != null) {

package/dist/vendors/metro-inspector-proxy/src/Device.js

@@ -55,15 +55,18 @@ class Device {
   // Root of the project used for relative to absolute source path conversion.
   _projectRoot;
   // MARK: - GRANITE
+  _delegate;
+  // MARK: - GRANITE
   // 네트워크 응답 데이터 저장하기 위한 변수 (key: requestId, value: { data: string, base64Encoded: bool })
   _networkResponseData = /* @__PURE__ */ new Map();
-  constructor(id, name, app, socket, projectRoot) {
+  constructor(id, name, app, socket, projectRoot, delegate) {
     this._id = id;
     this._name = name;
     this._app = app;
     this._pages = [];
     this._deviceSocket = socket;
     this._projectRoot = projectRoot;
+    this._delegate = delegate;
     this._deviceSocket.on("message", (message) => {
       const parsedMessage = JSON.parse(message);
       if (parsedMessage.event === "getPages") {
@@ -254,6 +257,9 @@ class Device {
   }
   // Allows to make changes in incoming message from device.
   _processMessageFromDevice(payload, debuggerInfo) {
+    if (this._delegate?.onDeviceMessage?.(payload, debuggerInfo.socket)) {
+      return;
+    }
     if (payload.method === "Debugger.scriptParsed") {
       const params = payload.params || {};
       if ("sourceMapURL" in params) {
@@ -314,6 +320,9 @@ class Device {
   // Allows to make changes in incoming messages from debugger.
   _interceptMessageFromDebugger(req, debuggerInfo) {
     let response = null;
+    if (this._delegate?.onDebuggerMessage?.(req, debuggerInfo.socket)) {
+      return null;
+    }
     if (req.method === "Debugger.setBreakpointByUrl") {
       this._processDebuggerSetBreakpointByUrl(req, debuggerInfo);
     } else if (req.method === "Debugger.getScriptSource") {
@@ -322,25 +331,22 @@ class Device {
         result: this._processDebuggerGetScriptSource(req)
       };
     } else if (req.method === "Network.getResponseBody") {
-      return this._processDebuggerGetResponseBody(req, debuggerInfo.socket);
+      response = this._processDebuggerGetResponseBody(req, debuggerInfo.socket);
     }
     return response;
   }
   // MARK: - GRANITE
-  _processDebuggerGetResponseBody(req, socket) {
+  _processDebuggerGetResponseBody(req) {
     const { requestId } = req.params;
     if (this._networkResponseData.has(requestId)) {
       const responseData = this._networkResponseData.get(requestId);
       this._networkResponseData.delete(requestId);
-      socket.send(
-        JSON.stringify({
-          id: req.id,
-          result: this._createNetworkResponseData(responseData)
-        })
-      );
-      return true;
+      return {
+        id: req.id,
+        result: this._createNetworkResponseData(responseData)
+      };
     }
-    return false;
+    return null;
   }
   // MARK: - GRANITE
   _createNetworkResponseData(responseData) {

package/dist/vendors/metro-inspector-proxy/src/InspectorProxy.js

@@ -12,6 +12,8 @@ const INTERNAL_ERROR_CODE = 1011;
 class InspectorProxy {
   // MARK: - GRANITE
   static devices;
+  // MARK: - GRANITE
+  _delegate;
   // Root of the project used for relative to absolute source path conversion.
   _projectRoot;
   // MARK: - GRANITE
@@ -24,8 +26,9 @@ class InspectorProxy {
   // (devtoolsFrontendUrl and webSocketDebuggerUrl) for page descriptions. These URLs are used
   // by debugger to know where to connect.
   _serverAddressWithPort = "";
-  constructor(projectRoot) {
+  constructor(projectRoot, delegate) {
     this._projectRoot = projectRoot;
+    this._delegate = delegate;
     InspectorProxy.devices = /* @__PURE__ */ new Map();
   }
   // Process HTTP request sent to server. We only respond to 2 HTTP requests:
@@ -106,7 +109,10 @@ class InspectorProxy {
         const deviceName = query.name || "Unknown";
         const appName = query.app || "Unknown";
         const deviceId = this._deviceCounter++;
-        InspectorProxy.devices.set(deviceId, new Device(deviceId, deviceName, appName, socket, this._projectRoot));
+        InspectorProxy.devices.set(
+          deviceId,
+          new Device(deviceId, deviceName, appName, socket, this._projectRoot, this._delegate)
+        );
         debug(`Got new connection: device=${deviceName}, app=${appName}`);
         socket.on("close", () => {
           InspectorProxy.devices.delete(deviceId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@granite-js/mpack",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "A bundler for Granite apps",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -84,9 +84,9 @@
     "@babel/traverse": "^7.14.0",
     "@babel/types": "^7.0.0",
     "@fastify/static": "7.0.1",
-    "@granite-js/devtools-frontend": "0.1.23",
-    "@granite-js/plugin-core": "0.1.23",
-    "@granite-js/utils": "0.1.23",
+    "@granite-js/devtools-frontend": "0.1.25",
+    "@granite-js/plugin-core": "0.1.25",
+    "@granite-js/utils": "0.1.25",
     "@inquirer/prompts": "^7.2.3",
     "@react-native-community/cli-plugin-metro": "11.3.7",
     "@react-native-community/cli-server-api": "11.3.7",