metro 0.83.3 → 0.83.5

package/src/Server.js

@@ -25,6 +25,7 @@ var _IncrementalBundler = _interopRequireDefault(
 var _ResourceNotFoundError = _interopRequireDefault(
   require("./IncrementalBundler/ResourceNotFoundError"),
 );
+var _bundleProgressUtils = require("./lib/bundleProgressUtils");
 var _bundleToString = _interopRequireDefault(require("./lib/bundleToString"));
 var _formatBundlingError = _interopRequireDefault(
   require("./lib/formatBundlingError"),
@@ -51,7 +52,6 @@ var _symbolicate = _interopRequireDefault(require("./Server/symbolicate"));
 var _types = require("./shared/types");
 var _codeFrame = require("@babel/code-frame");
 var fs = _interopRequireWildcard(require("graceful-fs"));
-var _invariant = _interopRequireDefault(require("invariant"));
 var jscSafeUrl = _interopRequireWildcard(require("jsc-safe-url"));
 var _metroCore = require("metro-core");
 var _mimeTypes = _interopRequireDefault(require("mime-types"));
@@ -59,28 +59,32 @@ var _nullthrows = _interopRequireDefault(require("nullthrows"));
 var _path = _interopRequireDefault(require("path"));
 var _perf_hooks = require("perf_hooks");
 var _querystring = _interopRequireDefault(require("querystring"));
-function _getRequireWildcardCache(e) {
-  if ("function" != typeof WeakMap) return null;
-  var r = new WeakMap(),
-    t = new WeakMap();
-  return (_getRequireWildcardCache = function (e) {
-    return e ? t : r;
-  })(e);
-}
-function _interopRequireWildcard(e, r) {
-  if (!r && e && e.__esModule) return e;
-  if (null === e || ("object" != typeof e && "function" != typeof e))
-    return { default: e };
-  var t = _getRequireWildcardCache(r);
-  if (t && t.has(e)) return t.get(e);
-  var n = { __proto__: null },
-    a = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var u in e)
-    if ("default" !== u && {}.hasOwnProperty.call(e, u)) {
-      var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;
-      i && (i.get || i.set) ? Object.defineProperty(n, u, i) : (n[u] = e[u]);
+function _interopRequireWildcard(e, t) {
+  if ("function" == typeof WeakMap)
+    var r = new WeakMap(),
+      n = new WeakMap();
+  return (_interopRequireWildcard = function (e, t) {
+    if (!t && e && e.__esModule) return e;
+    var o,
+      i,
+      f = { __proto__: null, default: e };
+    if (null === e || ("object" != typeof e && "function" != typeof e))
+      return f;
+    if ((o = t ? n : r)) {
+      if (o.has(e)) return o.get(e);
+      o.set(e, f);
     }
-  return ((n.default = e), t && t.set(e, n), n);
+    for (const t in e)
+      "default" !== t &&
+        {}.hasOwnProperty.call(e, t) &&
+        ((i =
+          (o = Object.defineProperty) &&
+          Object.getOwnPropertyDescriptor(e, t)) &&
+        (i.get || i.set)
+          ? o(f, t, i)
+          : (f[t] = e[t]));
+    return f;
+  })(e, t);
 }
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : { default: e };
@@ -126,6 +130,8 @@ class Server {
       ]),
     ];
     this._isEnded = false;
+    this._fetchTimings = [];
+    this._activeFetchCount = 0;
     this._createModuleId = config.serializer.createModuleIdFactory();
     this._bundler = new _IncrementalBundler.default(config, {
       hasReducedPerformance: options && options.hasReducedPerformance,
@@ -433,12 +439,14 @@ class Server {
       }),
     );
     try {
+      const depGraph = await this._bundler.getBundler().getDependencyGraph();
       const data = await (0, _Assets.getAsset)(
         assetPath,
         this._config.projectRoot,
         this._config.watchFolders,
         urlObj.searchParams.get("platform"),
         this._config.resolver.assetExts,
+        (filePath) => depGraph.doesFileExist(filePath),
       );
       if (process.env.REACT_NATIVE_ENABLE_ASSET_CACHING === true) {
         res.setHeader("Cache-Control", "max-age=31536000");
@@ -481,6 +489,13 @@ class Server {
       debug("Rewritten to:    %s", req.url);
     }
     const reqHost = req.headers["x-forwarded-host"] || req.headers["host"];
+    debug("Request host is:    %s", req.headers["host"]);
+    if (req.headers["x-forwarded-host"]) {
+      debug(
+        "Request x-forwarded-host is:    %s",
+        req.headers["x-forwarded-host"],
+      );
+    }
     if (!reqHost) {
       throw new Error("No host header was found.");
     }
@@ -665,14 +680,16 @@ class Server {
       }
       const mres = _MultipartResponse.default.wrapIfSupported(req, res);
       let onProgress = null;
-      let lastProgress = -1;
+      let lastRatio = -1;
       if (this._config.reporter) {
         onProgress = (transformedFileCount, totalFileCount) => {
-          const currentProgress = parseInt(
-            (transformedFileCount / totalFileCount) * 100,
-            10,
+          const newRatio = (0,
+          _bundleProgressUtils.calculateBundleProgressRatio)(
+            transformedFileCount,
+            totalFileCount,
+            lastRatio,
           );
-          if (currentProgress > lastProgress || totalFileCount < 10) {
+          if (newRatio > lastRatio) {
             if (mres instanceof _MultipartResponse.default) {
               mres.writeChunk(
                 {
@@ -681,13 +698,14 @@ class Server {
                 JSON.stringify({
                   done: transformedFileCount,
                   total: totalFileCount,
+                  percent: Math.floor(newRatio * 100),
                 }),
               );
             }
             if (res.socket != null && res.socket.uncork != null) {
               res.socket.uncork();
             }
-            lastProgress = currentProgress;
+            lastRatio = newRatio;
           }
           this._reporter.update({
             buildID: getBuildID(buildNumber),
@@ -729,8 +747,16 @@ class Server {
       const logEntry = log(
         createActionStartEntry(createStartEntry(startContext)),
       );
+      const fetchTiming = {
+        graphId,
+        startTime: requestStartTimestamp,
+        endTime: null,
+        isPrefetch: req.method === "HEAD",
+      };
       let result;
       try {
+        this._fetchTimings.push(fetchTiming);
+        this._activeFetchCount++;
         result = await build(startContext);
       } catch (error) {
         const formattedError = (0, _formatBundlingError.default)(error);
@@ -760,6 +786,31 @@ class Server {
         debug("Bundling error", error);
         buildContext.bundlePerfLogger.end("FAIL");
         return;
+      } finally {
+        fetchTiming.endTime =
+          _perf_hooks.performance.timeOrigin + _perf_hooks.performance.now();
+        if (!fetchTiming.isPrefetch) {
+          buildContext.bundlePerfLogger.annotate({
+            bool: {
+              had_competing_prefetch: this._fetchTimings
+                .filter((t) => t.isPrefetch && t.graphId !== graphId)
+                .some((prefetch) => {
+                  const prefetchEndTime =
+                    prefetch.endTime ?? Number.MAX_SAFE_INTEGER;
+                  const fetchEndTime =
+                    fetchTiming.endTime ?? Number.MAX_SAFE_INTEGER;
+                  return (
+                    prefetch.startTime < fetchEndTime &&
+                    prefetchEndTime > fetchTiming.startTime
+                  );
+                }),
+            },
+          });
+        }
+        this._activeFetchCount--;
+        if (this._activeFetchCount === 0) {
+          this._fetchTimings = [];
+        }
       }
       const endContext = {
         ...startContext,
@@ -784,6 +835,7 @@ class Server {
       return {
         action_name: "Requesting bundle",
         bundle_url: context.req.url,
+        bundle_original_url: context.req.originalUrl ?? "unknown",
         entry_point: context.entryFile,
         bundler: "delta",
         build_id: getBuildID(context.buildNumber),
@@ -1068,6 +1120,7 @@ class Server {
     },
   });
   async _symbolicate(req, res) {
+    const depGraph = await this._bundler.getBundler().getDependencyGraph();
     const getCodeFrame = (urls, symbolicatedStack) => {
       const allFramesCollapsed = symbolicatedStack.every(
         ({ collapse }) => collapse,
@@ -1085,6 +1138,13 @@ class Server {
           this._config.projectRoot,
           file ?? "",
         );
+        if (!depGraph.doesFileExist(fileAbsolute)) {
+          debug(
+            "Skipping code frame for file not in dependency graph.",
+            fileAbsolute,
+          );
+          continue;
+        }
         try {
           return {
             content: (0, _codeFrame.codeFrameColumns)(
@@ -1115,6 +1175,7 @@ class Server {
       }
       return null;
     };
+    let inputValidated = false;
     try {
       const symbolicatingLogEntry = log(
         createActionStartEntry("Symbolicating"),
@@ -1125,25 +1186,68 @@ class Server {
         const body = await req.rawBody;
         parsedBody = JSON.parse(body);
       } else {
-        parsedBody = await (0, _parseJsonBody.default)(req);
+        parsedBody = await (0, _parseJsonBody.default)(req, {
+          strict: false,
+        });
       }
-      const rewriteAndNormalizeStackFrame = (frame, lineNumber) => {
-        (0, _invariant.default)(
-          frame != null && typeof frame === "object",
-          "Bad stack frame at line %d, expected object, received: %s",
-          lineNumber,
-          typeof frame,
+      let validatedBody;
+      if (
+        parsedBody != null &&
+        typeof parsedBody === "object" &&
+        !Array.isArray(parsedBody) &&
+        Array.isArray(parsedBody["stack"])
+      ) {
+        const maybeStack = parsedBody["stack"];
+        const extraData = parsedBody["extraData"];
+        validatedBody = {
+          stack: maybeStack,
+          extraData,
+        };
+      } else {
+        throw new Error(
+          `Bad symbolication input, expected object with stack array, got: ${JSON.stringify(parsedBody)}`,
         );
-        const frameFile = frame.file;
-        if (typeof frameFile === "string" && frameFile.includes("://")) {
-          return {
-            ...frame,
-            file: this._rewriteAndNormalizeUrl(frameFile),
-          };
+      }
+      const validateAndNormalizeStackFrame = (frame) => {
+        if (
+          frame == null ||
+          typeof frame !== "object" ||
+          Array.isArray(frame)
+        ) {
+          throw new Error("Expected frame to be a JSON object");
         }
-        return frame;
+        if (frame.file != null && typeof frame.file !== "string") {
+          throw new Error("Expected file to be string or nullish");
+        }
+        let frameFile = frame.file;
+        if (frameFile != null && frameFile.includes("://")) {
+          frameFile = this._rewriteAndNormalizeUrl(frameFile);
+        }
+        if (frame.methodName != null && typeof frame.methodName !== "string") {
+          throw new Error("Expected methodName to be string or nullish");
+        }
+        if (frame.lineNumber != null && typeof frame.lineNumber !== "number") {
+          throw new Error("Expected lineNumber to be number or nullish");
+        }
+        if (frame.column != null && typeof frame.column !== "number") {
+          throw new Error("Expected column to be number or nullish");
+        }
+        return {
+          ...frame,
+          file: frameFile,
+          lineNumber: frame.lineNumber,
+          column: frame.column,
+          methodName: frame.methodName,
+        };
       };
-      const stack = parsedBody.stack.map(rewriteAndNormalizeStackFrame);
+      const stack = validatedBody.stack.map((frame, lineNumber) => {
+        try {
+          return validateAndNormalizeStackFrame(frame);
+        } catch (e) {
+          throw new Error(`Bad frame at line ${lineNumber}: ${e.message}`);
+        }
+      });
+      inputValidated = true;
       const urls = new Set();
       stack.forEach((frame) => {
         const sourceUrl = frame.file;
@@ -1169,7 +1273,7 @@ class Server {
         stack,
         zip(urls.values(), sourceMaps),
         this._config,
-        parsedBody.extraData ?? {},
+        validatedBody.extraData ?? {},
       );
       debug("Symbolication done");
       res.end(
@@ -1183,7 +1287,7 @@ class Server {
       });
     } catch (error) {
       debug("Symbolication failed", error.stack || error);
-      res.statusCode = 500;
+      res.statusCode = inputValidated ? 500 : 400;
       res.end(
         JSON.stringify({
           error: error.message,