@appland/scanner 1.74.2 → 1.74.4

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [@appland/scanner-v1.74.4](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.74.3...@appland/scanner-v1.74.4) (2023-01-04)
+
+
+### Bug Fixes
+
+* Make sure telemetry event aggregation doesn't prevent exit ([41b19ba](https://github.com/getappmap/appmap-js/commit/41b19ba27e64042b8e1b4757d41ee548c2710c9e))
+* Make sure to watch the correct directory in the scanner ([8f6f96a](https://github.com/getappmap/appmap-js/commit/8f6f96a5f79d0feaf0064a7ee363e82c1b7dfe22))
+
+# [@appland/scanner-v1.74.3](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.74.2...@appland/scanner-v1.74.3) (2022-12-21)
+
+
+### Bug Fixes
+
+* Examine errors based on error code instead of error message ([f2c15e8](https://github.com/getappmap/appmap-js/commit/f2c15e8e0b2dfce270fc3d92c2bd64fa775947d7))
+
 # [@appland/scanner-v1.74.2](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.74.1...@appland/scanner-v1.74.2) (2022-12-16)
 
 

package/built/cli/scan/watchScan.js

@@ -92,13 +92,13 @@ class Watcher {
             this.configWatcher
                 .on('add', this.reloadConfig.bind(this))
                 .on('change', this.reloadConfig.bind(this));
-            const appmapDir = path_1.default.resolve(this.options.appmapDir);
+            const cwd = process.cwd();
+            // note: sometimes path.resolve doesn't seem to use the correct cwd unless it's provided explicitly
+            const appmapDir = path_1.default.resolve(cwd, this.options.appmapDir);
             // If the appmap directory is a descendant of cwd, watch cwd (presumably project directory).
             // This ensures the watch will survive even if the appmap dir is removed and recreated.
             // Otherwise, make sure to use an existing directory. Chokidar struggles with missing directories.
-            const watchDir = isAncestorPath(process.cwd(), appmapDir)
-                ? process.cwd()
-                : yield existingParent(appmapDir);
+            const watchDir = isAncestorPath(cwd, appmapDir) ? cwd : yield existingParent(appmapDir);
             // Custom ignore function needed to cut down the watch tree to just what we need.
             const ignored = (targetPath) => {
                 // Ignore anything that isn't an ancestor or descendant of the appmap dir.
@@ -128,11 +128,14 @@ class Watcher {
                 .on('error', this.watcherErrorFunction.bind(this));
         });
     }
+    isError(error, code) {
+        const err = error;
+        return err.code === code;
+    }
     watcherErrorFunction(error) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.appmapWatcher &&
-                error.message.includes('ENOSPC: System limit for number of file watchers reached')) {
+            if (this.appmapWatcher && this.isError(error, 'ENOSPC')) {
                 console.warn(error.stack);
                 console.warn('Will disable file watching. File polling will stay enabled.');
                 yield ((_a = this.appmapWatcher) === null || _a === void 0 ? void 0 : _a.close());

package/built/lib/eventAggregator.js

@@ -8,7 +8,7 @@ class EventAggregator {
         this.callback = callback;
         this.maxMsBetween = maxMsBetween;
         this.pending = [];
-        process.on('exit', () => {
+        process.on('beforeExit', () => {
             if (this.timeout) {
                 clearTimeout(this.timeout);
                 this.emitPending();
@@ -22,7 +22,7 @@ class EventAggregator {
     refresh() {
         if (this.timeout)
             clearTimeout(this.timeout);
-        this.timeout = setTimeout(this.emitPending.bind(this), this.maxMsBetween);
+        this.timeout = setTimeout(this.emitPending.bind(this), this.maxMsBetween).unref();
     }
     emitPending() {
         this.callback(this.pending);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/scanner",
-  "version": "1.74.2",
+  "version": "1.74.4",
   "description": "Analyze AppMaps for code flaws",
   "bin": "built/cli.js",
   "files": [