Skip to content

Extract RootUrlMap, refactor path<-->URL mappings in Server #2015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robhogan merged 1 commit into from
Oct 5, 2026
Merged

Extract RootUrlMap, refactor path<-->URL mappings in Server #2015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 34 additions & 112 deletions packages/metro/src/Server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import formatBundlingError from './lib/formatBundlingError';
import getGraphId from './lib/getGraphId';
import parseBundleOptionsFromBundleRequestUrl from './lib/parseBundleOptionsFromBundleRequestUrl';
import parseJsonBody from './lib/parseJsonBody';
import RootUrlMap from './lib/RootUrlMap';
import splitBundleOptions from './lib/splitBundleOptions';
import * as transformHelpers from './lib/transformHelpers';
import {UnableToResolveError} from './node-haste/DependencyGraph/ModuleResolution';
Expand Down Expand Up @@ -149,9 +150,7 @@ export default class Server {
_reporter: Reporter;
_serverOptions: ServerOptions | void;
_allowedSuffixesForSourceRequests: ReadonlyArray<string>;
_sourceRequestRoutingMap: ReadonlyArray<
[pathnamePrefix: string, normalizedRootDir: string],
>;
_rootUrlMap: RootUrlMap;
_fetchTimings: Array<FetchTiming>;
_activeFetchCount: number;

Expand All @@ -178,13 +177,7 @@ export default class Server {
].map(ext => '.' + ext),
),
];
this._sourceRequestRoutingMap = [
['/[metro-project]/', path.resolve(this._config.projectRoot)],
...this._config.watchFolders.map((watchFolder, index) => [
`/[metro-watchFolders]/${index}/`,
path.resolve(watchFolder),
]),
];
this._rootUrlMap = new RootUrlMap(config);
this._isEnded = false;
this._fetchTimings = [];
this._activeFetchCount = 0;
Expand Down Expand Up @@ -260,8 +253,7 @@ export default class Server {
sourceMapUrl: serializerOptions.sourceMapUrl,
sourceUrl: serializerOptions.sourceUrl,
inlineSourceMap: serializerOptions.inlineSourceMap,
serverRoot:
this._config.server.unstable_serverRoot ?? this._config.projectRoot,
serverRoot: this._rootUrlMap.serverRootDir,
shouldAddToIgnoreList: (module: Module<>) =>
this._shouldAddModuleToIgnoreList(module),
getSourceUrl: (module: Module<>) =>
Expand Down Expand Up @@ -370,6 +362,8 @@ export default class Server {
transformOptions,
} = splitBundleOptions(options);

const entryPoint = this._getEntryPointAbsolutePath(entryFile);

const {prepend, graph} = await this._bundler.buildGraph(
entryFile,
transformOptions,
Expand All @@ -381,8 +375,6 @@ export default class Server {
},
);

const entryPoint = this._getEntryPointAbsolutePath(entryFile);

return await getRamBundleInfo(entryPoint, prepend, graph, {
asyncRequireModulePath: await this._resolveRelativePath(
this._config.transformer.asyncRequireModulePath,
Expand Down Expand Up @@ -411,8 +403,7 @@ export default class Server {
sourceMapUrl: serializerOptions.sourceMapUrl,
sourceUrl: serializerOptions.sourceUrl,
inlineSourceMap: serializerOptions.inlineSourceMap,
serverRoot:
this._config.server.unstable_serverRoot ?? this._config.projectRoot,
serverRoot: this._rootUrlMap.serverRootDir,
shouldAddToIgnoreList: (module: Module<>) =>
this._shouldAddModuleToIgnoreList(module),
getSourceUrl: (module: Module<>) =>
Expand Down Expand Up @@ -572,12 +563,9 @@ export default class Server {

try {
const depGraph = await this._bundler.getBundler().getDependencyGraph();
const resolvedAssetPath = this._resolveWatchFolderPrefix(
'./' + assetPath,
);
const data = await getAsset(
resolvedAssetPath?.filePath ?? assetPath,
resolvedAssetPath?.rootDir ?? this._config.projectRoot,
this._rootUrlMap.filePathOfUrlDecodedPathname(assetPath) ?? assetPath,
this._config.projectRoot,
this._config.watchFolders,
urlObj.searchParams.get('platform'),
this._config.resolver.assetExts,
Expand Down Expand Up @@ -712,52 +700,38 @@ export default class Server {
} else if (pathname === '/symbolicate') {
await this._symbolicate(req, res);
} else {
let handled = false;
for (const [pathnamePrefix, normalizedRootDir] of this
._sourceRequestRoutingMap) {
if (filePathname.startsWith(pathnamePrefix)) {
const relativeFilePathname = filePathname.substr(
pathnamePrefix.length,
);
await this._processSourceRequest(
relativeFilePathname,
normalizedRootDir,
res,
);
handled = true;
break;
}
}
if (!handled) {
const sourceFilePath =
this._rootUrlMap.filePathOfUrlDecodedPathname(filePathname);
if (sourceFilePath != null) {
await this._processSourceRequest(sourceFilePath, res);
} else {
next();
}
}
}

async _processSourceRequest(
relativeFilePathname: string,
rootDir: string,
filePath: string,
res: ServerResponse,
): Promise<void> {
if (
!this._allowedSuffixesForSourceRequests.some(suffix =>
relativeFilePathname.endsWith(suffix),
filePath.endsWith(suffix),
)
) {
res.writeHead(404);
res.end();
return;
}
const depGraph = await this._bundler.getBundler().getDependencyGraph();
const filePath = path.join(rootDir, relativeFilePathname);
try {
await depGraph.getOrComputeSha1(filePath);
} catch {
res.writeHead(404);
res.end();
return;
}
const mimeType = mime.contentType(path.basename(relativeFilePathname));
const mimeType = mime.contentType(path.basename(filePath));
res.setHeader('Content-Type', mimeType);
const stream = fs.createReadStream(filePath);
stream.pipe(res);
Expand Down Expand Up @@ -1165,8 +1139,7 @@ export default class Server {
sourceMapUrl: serializerOptions.sourceMapUrl,
sourceUrl: serializerOptions.sourceUrl,
inlineSourceMap: serializerOptions.inlineSourceMap,
serverRoot:
this._config.server.unstable_serverRoot ?? this._config.projectRoot,
serverRoot: this._rootUrlMap.serverRootDir,
shouldAddToIgnoreList: (module: Module<>) =>
this._shouldAddModuleToIgnoreList(module),
getSourceUrl: (module: Module<>) =>
Expand Down Expand Up @@ -1638,33 +1611,6 @@ export default class Server {
);
}

_resolveWatchFolderPrefix(
filePath: string,
): {rootDir: string, filePath: string} | null {
const watchFolderMatch = filePath.match(
/^\.\/\[metro-watchFolders\]\/(\d+)\/(.*)/,
);
if (watchFolderMatch != null) {
const index = parseInt(watchFolderMatch[1], 10);
const watchFolder = this._config.watchFolders[index];
if (watchFolder != null) {
return {
rootDir: path.resolve(watchFolder),
filePath:
'.' + path.sep + watchFolderMatch[2].split('/').join(path.sep),
};
}
}
const projectMatch = filePath.match(/^\.\/\[metro-project\]\/(.*)/);
if (projectMatch != null) {
return {
rootDir: path.resolve(this._config.projectRoot),
filePath: '.' + path.sep + projectMatch[1].split('/').join(path.sep),
};
}
return null;
}

async _resolveRelativePath(
filePath: string,
{
Expand All @@ -1682,14 +1628,17 @@ export default class Server {
transformOptions.platform,
resolverOptions,
);
const resolved = this._resolveWatchFolderPrefix(filePath);
const rootDir =
resolved != null
? resolved.rootDir
: relativeTo === 'server'
? this._getServerRootDir()
: this._config.projectRoot;
const resolvedFilePath = resolved != null ? resolved.filePath : filePath;
let rootDir;
let resolvedFilePath;
if (relativeTo === 'project') {
rootDir = this._config.projectRoot;
resolvedFilePath = filePath;
} else {
const absolutePath =
this._rootUrlMap.filePathOfUrlDecodedPathname(filePath);
rootDir = absolutePath != null ? '/' : this._rootUrlMap.serverRootDir;
resolvedFilePath = absolutePath ?? filePath;
}
return resolutionFn(`${rootDir}/.`, {
name: resolvedFilePath,
data: {
Expand Down Expand Up @@ -1753,16 +1702,11 @@ export default class Server {
sourcePaths: SourcePathsMode.Absolute,
};

_getServerRootDir(): string {
return this._config.server.unstable_serverRoot ?? this._config.projectRoot;
}

_getEntryPointAbsolutePath(entryFile: string): string {
const resolved = this._resolveWatchFolderPrefix(entryFile);
if (resolved != null) {
return path.resolve(resolved.rootDir, resolved.filePath);
}
return path.resolve(this._getServerRootDir(), entryFile);
return (
this._rootUrlMap.filePathOfUrlDecodedPathname(entryFile) ??
path.resolve(this._rootUrlMap.serverRootDir, entryFile)
);
}

// Wait for the server to finish initializing.
Expand All @@ -1787,29 +1731,7 @@ export default class Server {
_getModuleSourceUrl(module: Module<>, mode: SourcePathsMode): string {
switch (mode) {
case SourcePathsMode.ServerUrl:
for (const [pathnamePrefix, normalizedRootDir] of this
._sourceRequestRoutingMap) {
if (module.path.startsWith(normalizedRootDir + path.sep)) {
const relativePath = module.path.slice(
normalizedRootDir.length + 1,
);
const relativePathPosix = relativePath
.split(path.sep)
.map(segment => encodeURIComponent(segment))
.join('/');
return pathnamePrefix + relativePathPosix;
}
}
// Ordinarily all files should match one of the roots above. If they
// don't, try to preserve useful information, even if fetching the path
// from Metro might fail.
const modulePathPosix = module.path
.split(path.sep)
.map(segment => encodeURIComponent(segment))
.join('/');
return modulePathPosix.startsWith('/')
? modulePathPosix
: '/' + modulePathPosix;
return this._rootUrlMap.urlPathnameOfFilePath(module.path);
case SourcePathsMode.Absolute:
return module.path;
}
Expand Down
13 changes: 6 additions & 7 deletions packages/metro/src/Server/__tests__/Server-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ describe('processRequest', () => {
expect(response._getString()).toBe('i am image');

expect(getAsset).toBeCalledWith(
p('./imgs/a.png'),
p('/root/imgs/a.png'),
p('/root'),
[p('/root')],
'ios',
Expand All @@ -928,7 +928,7 @@ describe('processRequest', () => {
expect(response._getString()).toBe('i am image');

expect(getAsset).toBeCalledWith(
p('./imgs/a.png'),
p('/root/imgs/a.png'),
p('/root'),
[p('/root')],
'ios',
Expand Down Expand Up @@ -1629,13 +1629,12 @@ describe('processRequest', () => {
]);

// Mirrors how _processSingleAssetRequest resolves an incoming URL.
const resolved = watchFolderServer._resolveWatchFolderPrefix(
'./' + urlPath,
);
expect(
path.resolve(
resolved?.rootDir ?? p('/project'),
resolved?.filePath ?? urlPath,
p('/project'),
watchFolderServer._rootUrlMap.filePathOfUrlDecodedPathname(
urlPath,
) ?? urlPath,
),
).toBe(absolutePath);
},
Expand Down
Loading
Loading