End watchman client on calling MetroFileMap end method.

Summary: End watchman client on `MetroFileMap` end method. This will kill any stale child watchman process that is talking long time to execute.

Reviewed By: arushikesarwani94

Differential Revision: D37229202

fbshipit-source-id: ad4481f087309e42f286e48da280c58765f18b34

Author: jacdebug

packages/metro-file-map/package.json

@@ -13,6 +13,7 @@
   },
   "license": "MIT",
   "dependencies": {
+    "abort-controller": "^3.0.0",
     "anymatch": "^3.0.3",
     "debug": "^2.2.0",
     "fb-watchman": "^2.0.0",

packages/metro-file-map/src/crawlers/watchman.js

@@ -114,6 +114,7 @@ module.exports = async function watchmanCrawl(
 
   perfLogger?.point('watchmanCrawl_start');
   const client = new watchman.Client();
+  options.abortSignal?.addEventListener('abort', () => client.end());
 
   perfLogger?.point('watchmanCrawl/negotiateCapabilities_start');
   // https://facebook.github.io/watchman/docs/capabilities.html

packages/metro-file-map/src/flow-types.js

@@ -61,6 +61,7 @@ export type ChangeEvent = {
 export type Console = typeof global.console;
 
 export type CrawlerOptions = {
+  abortSignal: ?AbortSignal,
   computeSha1: boolean,
   enableSymlinks: boolean,
   data: InternalData,

packages/metro-file-map/src/index.js

@@ -56,6 +56,8 @@ import {escapePathForRegex} from 'jest-regex-util';
 // $FlowFixMe[untyped-import] - jest-worker
 import {Worker} from 'jest-worker';
 import * as path from 'path';
+// $FlowFixMe[untyped-import] - this is a polyfill
+import AbortController from 'abort-controller';
 
 const nodeCrawl = require('./crawlers/node');
 const watchmanCrawl = require('./crawlers/watchman');
@@ -237,6 +239,7 @@ export default class HasteMap extends EventEmitter {
   _watchers: Array<Watcher>;
   _worker: ?WorkerInterface;
   _cacheManager: CacheManager;
+  _crawlerAbortController: typeof AbortController;
 
   static create(options: InputOptions): HasteMap {
     return new HasteMap(options);
@@ -320,6 +323,7 @@ export default class HasteMap extends EventEmitter {
     this._watchers = [];
     this._worker = null;
     this._options.perfLogger?.point('constructor_end');
+    this._crawlerAbortController = new AbortController();
   }
 
   static getCacheFilePath(
@@ -781,6 +785,7 @@ export default class HasteMap extends EventEmitter {
     const crawl =
       canUseWatchman && this._options.useWatchman ? watchmanCrawl : nodeCrawl;
     const crawlerOptions: CrawlerOptions = {
+      abortSignal: this._crawlerAbortController.signal,
       computeSha1: options.computeSha1,
       data: hasteMap,
       enableSymlinks: options.enableSymlinks,
@@ -1118,6 +1123,7 @@ export default class HasteMap extends EventEmitter {
     await Promise.all(this._watchers.map(watcher => watcher.close()));
 
     this._watchers = [];
+    this._crawlerAbortController.abort();
   }
 
   /**

yarn.lock

@@ -1449,6 +1449,13 @@ abab@^2.0.3:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
   integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
 
+abort-controller@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
+  dependencies:
+    event-target-shim "^5.0.0"
+
 absolute-path@^0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7"
@@ -3312,6 +3319,11 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
+event-target-shim@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
+
 exec-sh@^0.3.2:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"