metro 0.83.2 → 0.83.4

package/src/Server.js

@@ -51,7 +51,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,31 +58,42 @@ 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 };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const debug = require("debug")("Metro:Server");
 const { createActionStartEntry, createActionEndEntry, log } = _metroCore.Logger;
@@ -433,12 +443,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 +493,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.");
     }
@@ -784,6 +803,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 +1088,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 +1106,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 +1143,7 @@ class Server {
       }
       return null;
     };
+    let inputValidated = false;
     try {
       const symbolicatingLogEntry = log(
         createActionStartEntry("Symbolicating"),
@@ -1125,25 +1154,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");
+        }
+        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);
         }
-        return frame;
+        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 +1241,7 @@ class Server {
         stack,
         zip(urls.values(), sourceMaps),
         this._config,
-        parsedBody.extraData ?? {},
+        validatedBody.extraData ?? {},
       );
       debug("Symbolication done");
       res.end(
@@ -1183,7 +1255,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,

package/src/Server.js.flow

@@ -22,6 +22,7 @@ import type {
 } from './DeltaBundler/types';
 import type {RevisionId} from './IncrementalBundler';
 import type {GraphId} from './lib/getGraphId';
+import type {JsonData} from './lib/parseJsonBody';
 import type {Reporter} from './lib/reporting';
 import type {StackFrameInput, StackFrameOutput} from './Server/symbolicate';
 import type {
@@ -65,7 +66,6 @@ import symbolicate from './Server/symbolicate';
 import {SourcePathsMode} from './shared/types';
 import {codeFrameColumns} from '@babel/code-frame';
 import * as fs from 'graceful-fs';
-import invariant from 'invariant';
 import * as jscSafeUrl from 'jsc-safe-url';
 import {Logger} from 'metro-core';
 import mime from 'mime-types';
@@ -98,6 +98,7 @@ export type BundleMetadata = {
 };
 
 type ProcessStartContext = {
+  ...SplitBundleOptions,
   +buildNumber: number,
   +bundleOptions: BundleOptions,
   +graphId: GraphId,
@@ -107,7 +108,6 @@ type ProcessStartContext = {
   +revisionId?: ?RevisionId,
   +bundlePerfLogger: RootPerfLogger,
   +requestStartTimestamp: number,
-  ...SplitBundleOptions,
 };
 
 type ProcessDeleteContext = {
@@ -121,7 +121,7 @@ type ProcessEndContext<T> = {
   +result: T,
 };
 
-export type ServerOptions = $ReadOnly<{
+export type ServerOptions = Readonly<{
   hasReducedPerformance?: boolean,
   onBundleBuilt?: (bundlePath: string) => void,
   watch?: boolean,
@@ -140,8 +140,8 @@ export default class Server {
   _platforms: Set<string>;
   _reporter: Reporter;
   _serverOptions: ServerOptions | void;
-  _allowedSuffixesForSourceRequests: $ReadOnlyArray<string>;
-  _sourceRequestRoutingMap: $ReadOnlyArray<
+  _allowedSuffixesForSourceRequests: ReadonlyArray<string>;
+  _sourceRequestRoutingMap: ReadonlyArray<
     [pathnamePrefix: string, normalizedRootDir: string],
   >;
 
@@ -208,9 +208,9 @@ export default class Server {
     splitOptions,
     prepend,
     graph,
-  }: $ReadOnly<{
+  }: Readonly<{
     splitOptions: SplitBundleOptions,
-    prepend: $ReadOnlyArray<Module<>>,
+    prepend: ReadonlyArray<Module<>>,
     graph: ReadOnlyGraph<>,
   }>): Promise<{code: string, map: string}> {
     const {
@@ -299,7 +299,7 @@ export default class Server {
   ): Promise<{
     code: string,
     map: string,
-    assets?: $ReadOnlyArray<AssetData>,
+    assets?: ReadonlyArray<AssetData>,
     ...
   }> {
     const splitOptions = splitBundleOptions(bundleOptions);
@@ -403,7 +403,7 @@ export default class Server {
     });
   }
 
-  async getAssets(options: BundleOptions): Promise<$ReadOnlyArray<AssetData>> {
+  async getAssets(options: BundleOptions): Promise<ReadonlyArray<AssetData>> {
     const {entryFile, onProgress, resolverOptions, transformOptions} =
       splitBundleOptions(options);
 
@@ -423,7 +423,7 @@ export default class Server {
   async _getAssetsFromDependencies(
     dependencies: ReadOnlyDependencies<>,
     platform: ?string,
-  ): Promise<$ReadOnlyArray<AssetData>> {
+  ): Promise<ReadonlyArray<AssetData>> {
     return await getAssets(dependencies, {
       processModuleFilter: this._config.serializer.processModuleFilter,
       assetPlugins: this._config.transformer.assetPlugins,
@@ -549,12 +549,14 @@ export default class Server {
     );
 
     try {
+      const depGraph = await this._bundler.getBundler().getDependencyGraph();
       const data = await getAsset(
         assetPath,
         this._config.projectRoot,
         this._config.watchFolders,
         urlObj.searchParams.get('platform'),
         this._config.resolver.assetExts,
+        filePath => depGraph.doesFileExist(filePath),
       );
       // Tell clients to cache this for 1 year.
       // This is safe as the asset url contains a hash of the asset.
@@ -615,6 +617,13 @@ export default 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.');
     }
@@ -759,7 +768,7 @@ export default class Server {
     req: IncomingMessage,
     res: ServerResponse,
     bundleOptions: BundleOptions,
-    buildContext: $ReadOnly<{
+    buildContext: Readonly<{
       buildNumber: number,
       bundlePerfLogger: RootPerfLogger,
     }>,
@@ -769,7 +778,7 @@ export default class Server {
       req: IncomingMessage,
       res: ServerResponse,
       bundleOptions: BundleOptions,
-      buildContext: $ReadOnly<{
+      buildContext: Readonly<{
         buildNumber: number,
         bundlePerfLogger: RootPerfLogger,
       }>,
@@ -980,7 +989,7 @@ export default class Server {
     req: IncomingMessage,
     res: ServerResponse,
     bundleOptions: BundleOptions,
-    buildContext: $ReadOnly<{
+    buildContext: Readonly<{
       buildNumber: number,
       bundlePerfLogger: RootPerfLogger,
     }>,
@@ -990,6 +999,7 @@ export default 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),
@@ -1174,7 +1184,7 @@ export default class Server {
 
   // This function ensures that modules in source maps are sorted in the same
   // order as in a plain JS bundle.
-  _getSortedModules(graph: ReadOnlyGraph<>): $ReadOnlyArray<Module<>> {
+  _getSortedModules(graph: ReadOnlyGraph<>): ReadonlyArray<Module<>> {
     const modules = [...graph.dependencies.values()];
     // Assign IDs to modules in a consistent order
     for (const module of modules) {
@@ -1191,7 +1201,7 @@ export default class Server {
     req: IncomingMessage,
     res: ServerResponse,
     bundleOptions: BundleOptions,
-    buildContext: $ReadOnly<{
+    buildContext: Readonly<{
       buildNumber: number,
       bundlePerfLogger: RootPerfLogger,
     }>,
@@ -1263,7 +1273,7 @@ export default class Server {
     req: IncomingMessage,
     res: ServerResponse,
     bundleOptions: BundleOptions,
-    buildContext: $ReadOnly<{
+    buildContext: Readonly<{
       buildNumber: number,
       bundlePerfLogger: RootPerfLogger,
     }>,
@@ -1277,7 +1287,7 @@ export default class Server {
         bundler: 'delta',
       };
     },
-    createEndEntry(context: ProcessEndContext<$ReadOnlyArray<AssetData>>) {
+    createEndEntry(context: ProcessEndContext<ReadonlyArray<AssetData>>) {
       return {
         bundler: 'delta',
       };
@@ -1309,10 +1319,12 @@ export default class Server {
     },
   });
 
-  async _symbolicate(req: IncomingMessage, res: ServerResponse) {
+  async _symbolicate(req: IncomingMessage, res: ServerResponse): Promise<void> {
+    const depGraph = await this._bundler.getBundler().getDependencyGraph();
+
     const getCodeFrame = (
       urls: Set<string>,
-      symbolicatedStack: $ReadOnlyArray<StackFrameOutput>,
+      symbolicatedStack: ReadonlyArray<StackFrameOutput>,
     ) => {
       const allFramesCollapsed = symbolicatedStack.every(
         ({collapse}) => collapse,
@@ -1332,6 +1344,13 @@ export default class Server {
         }
 
         const fileAbsolute = path.resolve(this._config.projectRoot, file ?? '');
+        if (!depGraph.doesFileExist(fileAbsolute)) {
+          debug(
+            'Skipping code frame for file not in dependency graph.',
+            fileAbsolute,
+          );
+          continue;
+        }
         try {
           return {
             content: codeFrameColumns(
@@ -1361,6 +1380,7 @@ export default class Server {
       return null;
     };
 
+    let inputValidated = false;
     try {
       const symbolicatingLogEntry = log(
         createActionStartEntry('Symbolicating'),
@@ -1373,35 +1393,78 @@ export default class Server {
         // < 0.80 and Expo SDK < 53
         // $FlowFixMe[prop-missing] - rawBody assigned by legacy CLI integrations
         const body = await req.rawBody;
-        parsedBody = JSON.parse(body);
+        parsedBody = JSON.parse(body) as JsonData;
       } else {
-        parsedBody = (await parseJsonBody(req)) as {
-          stack: $ReadOnlyArray<StackFrameInput>,
-          extraData: {[string]: mixed},
-        };
+        parsedBody = await parseJsonBody(req, {strict: false});
       }
 
-      const rewriteAndNormalizeStackFrame = <T>(
-        frame: T,
-        lineNumber: number,
-      ): T => {
-        invariant(
-          frame != null && typeof frame === 'object',
-          'Bad stack frame at line %d, expected object, received: %s',
-          lineNumber,
-          typeof frame,
+      let validatedBody: {
+        stack: ReadonlyArray<JsonData>,
+        extraData?: JsonData,
+      };
+
+      if (
+        parsedBody != null &&
+        typeof parsedBody === 'object' &&
+        !Array.isArray(parsedBody) &&
+        Array.isArray(parsedBody['stack'])
+      ) {
+        const maybeStack: Array<JsonData> = 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: JsonData,
+      ): StackFrameInput => {
+        if (
+          frame == null ||
+          typeof frame !== 'object' ||
+          Array.isArray(frame)
+        ) {
+          throw new Error('Expected frame to be a JSON object');
+        }
+        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);
         }
-        return frame;
+        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;
       // In case of multiple bundles / HMR, some stack frames can have different URLs from others
       const urls = new Set<string>();
 
@@ -1433,7 +1496,7 @@ export default class Server {
         stack,
         zip(urls.values(), sourceMaps),
         this._config,
-        parsedBody.extraData ?? {},
+        validatedBody.extraData ?? {},
       );
 
       debug('Symbolication done');
@@ -1448,7 +1511,7 @@ export default 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}));
     }
   }
@@ -1518,7 +1581,7 @@ export default class Server {
       relativeTo,
       resolverOptions,
       transformOptions,
-    }: $ReadOnly<{
+    }: Readonly<{
       relativeTo: 'project' | 'server',
       resolverOptions: ResolverInputOptions,
       transformOptions: TransformInputOptions,
@@ -1543,15 +1606,15 @@ export default class Server {
     return this._nextBundleBuildNumber++;
   }
 
-  getPlatforms(): $ReadOnlyArray<string> {
+  getPlatforms(): ReadonlyArray<string> {
     return this._config.resolver.platforms;
   }
 
-  getWatchFolders(): $ReadOnlyArray<string> {
+  getWatchFolders(): ReadonlyArray<string> {
     return this._config.watchFolders;
   }
 
-  static DEFAULT_GRAPH_OPTIONS: $ReadOnly<{
+  static DEFAULT_GRAPH_OPTIONS: Readonly<{
     customResolverOptions: CustomResolverOptions,
     customTransformOptions: CustomTransformOptions,
     dev: boolean,

package/src/cli/parseKeyValueParamArray.js.flow

@@ -10,7 +10,7 @@
  */
 
 export default function coerceKeyValueArray(
-  keyValueArray: $ReadOnlyArray<string>,
+  keyValueArray: ReadonlyArray<string>,
 ): {
   [key: string]: string,
   __proto__: null,

package/src/cli-utils.js

@@ -6,7 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.watchFile = exports.makeAsyncCommand = void 0;
 var _fs = _interopRequireDefault(require("fs"));
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const watchFile = async function (filename, callback) {
   _fs.default.watchFile(filename, () => {

package/src/cli-utils.js.flow

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict
  * @format
  * @oncall react_native
  */
@@ -13,7 +13,7 @@ import fs from 'fs';
 
 export const watchFile = async function (
   filename: string,
-  callback: () => any,
+  callback: () => unknown,
 ): Promise<void> {
   fs.watchFile(filename, () => {
     callback();

package/src/commands/build.js

@@ -14,7 +14,11 @@ var _TerminalReporter = _interopRequireDefault(
 var _metroConfig = require("metro-config");
 var _metroCore = require("metro-core");
 function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
+  return e && e.__esModule
+    ? e
+    : {
+        default: e,
+      };
 }
 const term = new _metroCore.Terminal(process.stdout);
 const updateReporter = new _TerminalReporter.default(term);