@appland/scanner 1.74.0 → 1.74.1

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+# [@appland/scanner-v1.74.1](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.74.0...@appland/scanner-v1.74.1) (2022-12-16)
+
+
+### Bug Fixes
+
+* Disable file watching on "ENOSPC: System limit for number of file watchers reached" ([e51b423](https://github.com/getappmap/appmap-js/commit/e51b4236384ae0ea2cde0bd79b739f7821ca30c1))
+* Enable scan:completed telemetry ([6e20d73](https://github.com/getappmap/appmap-js/commit/6e20d7305fd86bd077c88f674615edb31854a11a))
+* Send telemetry for scan:watcher_error:enospc and index:watcher_error:enospc ([989db4a](https://github.com/getappmap/appmap-js/commit/989db4a40db8338613afe182be25b0315df94316))
+
 # [@appland/scanner-v1.74.0](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.73.1...@appland/scanner-v1.74.0) (2022-12-07)
 
 

package/built/cli/scan/watchScan.js

@@ -47,6 +47,7 @@ const scanner_1 = __importDefault(require("./scanner"));
 const configurationProvider_1 = require("../../configuration/configurationProvider");
 const telemetry_1 = __importDefault(require("../../telemetry"));
 const events_1 = __importDefault(require("events"));
+const watchScanTelemetry_1 = require("./watchScanTelemetry");
 function isDir(targetPath) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -77,6 +78,7 @@ class Watcher {
         // do not remove callbackify, apparently on windows
         // passing plain async function doesn't work (?)
         this.queue = (0, async_1.queue)((0, node_util_1.callbackify)(this.scan.bind(this)), 2);
+        watchScanTelemetry_1.WatchScanTelemetry.watch(this.scanEventEmitter);
     }
     watch() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -118,8 +120,35 @@ class Watcher {
                 persistent: false,
             });
             const enqueue = (filePath) => path_1.default.basename(filePath) === 'mtime' && this.enqueue(filePath);
-            for (const ch of [this.appmapWatcher, this.appmapPoller])
-                ch.on('add', enqueue).on('change', enqueue);
+            this.appmapPoller.on('add', enqueue).on('change', enqueue);
+            this.appmapWatcher
+                .on('add', enqueue)
+                .on('change', enqueue)
+                .on('error', this.watcherErrorFunction.bind(this));
+        });
+    }
+    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')) {
+                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());
+                this.appmapWatcher = undefined;
+                console.warn('File watching disabled.');
+                telemetry_1.default.sendEvent({
+                    name: `scan:watcher_error:enospc`,
+                    properties: {
+                        errorMessage: error.message,
+                        errorStack: error.stack,
+                    },
+                });
+            }
+            else {
+                // let it crash if it's some other error, to learn what the error is
+                throw error;
+            }
         });
     }
     close() {

package/built/cli/scan/watchScanTelemetry.js

@@ -8,11 +8,20 @@ const eventAggregator_1 = __importDefault(require("../../lib/eventAggregator"));
 const scanResults_1 = require("../../report/scanResults");
 class WatchScanTelemetry {
     constructor(scanEvents) {
-        new eventAggregator_1.default((events) => {
+        this.cancelFn = new eventAggregator_1.default((events) => {
             const scanEvents = events.map((e) => e.arg);
             this.sendTelemetry(scanEvents);
         }).attach(scanEvents, 'scan');
     }
+    cancel() {
+        if (this.cancelFn)
+            this.cancelFn();
+        this.cancelFn = undefined;
+    }
+    static watch(scanEvents) {
+        const telemetry = new WatchScanTelemetry(scanEvents);
+        return () => telemetry.cancel();
+    }
     sendTelemetry(scanEvents) {
         const ruleIds = new Set();
         let elapsed = 0;

package/built/lib/eventAggregator.js

@@ -30,7 +30,11 @@ class EventAggregator {
         this.pending = [];
     }
     attach(emitter, event) {
-        emitter.on(event, (...args) => this.push(emitter, event, args[0]));
+        const listenerFn = (...args) => {
+            this.push(emitter, event, args[0]);
+        };
+        emitter.addListener(event, listenerFn);
+        return () => emitter.removeListener(event, listenerFn);
     }
 }
 exports.default = EventAggregator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/scanner",
-  "version": "1.74.0",
+  "version": "1.74.1",
   "description": "Analyze AppMaps for code flaws",
   "bin": "built/cli.js",
   "files": [
@@ -20,7 +20,8 @@
     "lint": "eslint src --ext .ts",
     "ci": "yarn lint && yarn build && yarn schema-up-to-date && yarn doc-up-to-date && yarn test",
     "test": "jest --filter=./test/testFilter.js",
-    "semantic-release": "semantic-release"
+    "semantic-release": "semantic-release",
+    "watch": "node bin/preBuild.js && tsc -p tsconfig.build.json --watch"
   },
   "author": "AppLand, Inc.",
   "license": "Commons Clause + MIT",
@@ -61,7 +62,7 @@
   "dependencies": {
     "@appland/client": "^1.5.0",
     "@appland/models": "^1.18.1",
-    "@appland/openapi": "1.2.0",
+    "@appland/openapi": "1.3.0",
     "@appland/sql-parser": "^1.5.0",
     "@types/cli-progress": "^3.9.2",
     "ajv": "^8.8.2",