@appland/scanner 1.79.0 → 1.80.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [@appland/scanner-v1.80.0](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.79.0...@appland/scanner-v1.80.0) (2023-07-19)
+
+
+### Bug Fixes
+
+* Make sure to not process the same appmap multiple times ([da0a0d8](https://github.com/getappmap/appmap-js/commit/da0a0d8826844b4bd92bb671a3ea1b74a5563cb1))
+
+
+### Features
+
+* upgrade @appland/models to 2.6.3 ([6e31f9c](https://github.com/getappmap/appmap-js/commit/6e31f9cc179ac0edfcde2861b937cd104ed4c687))
+
 # [@appland/scanner-v1.79.0](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.78.0...@appland/scanner-v1.79.0) (2023-06-23)
 
 

package/built/cli/scan/watchScan.js

@@ -49,6 +49,8 @@ const telemetry_1 = __importDefault(require("../../telemetry"));
 const events_1 = __importDefault(require("events"));
 const watchScanTelemetry_1 = require("./watchScanTelemetry");
 const isAncestorPath_1 = __importDefault(require("../../util/isAncestorPath"));
+const util_1 = require("util");
+const debug = (0, util_1.debuglog)('scanner:watch');
 function isDir(targetPath) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -76,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);
+        this.processing = new Set();
         watchScanTelemetry_1.WatchScanTelemetry.watch(this.scanEventEmitter, options.appmapDir);
         this.queue.error((error, task) => console.warn(`Problem processing ${task}:\n`, error));
     }
@@ -165,8 +168,9 @@ class Watcher {
         });
     }
     enqueue(mtimePath) {
-        if ([...this.queue].includes(mtimePath))
+        if (this.processing.has(mtimePath))
             return;
+        this.processing.add(mtimePath);
         this.queue.push(mtimePath);
     }
     scan(mtimePath) {
@@ -177,9 +181,11 @@ class Watcher {
             const [appmapStats, reportStats] = yield Promise.all([appmapFile, reportFile].map((f) => (0, promises_1.stat)(f).catch(() => null)));
             if (!appmapStats)
                 return;
+            const cut = (str) => str.substring(str.length - 8);
+            debug('%s: %s, findings: %s, config: %s', appmapFile, cut(appmapStats.mtimeMs.toFixed(3)), reportStats && cut(reportStats.mtimeMs.toFixed(3)), cut(this.config.timestampMs.toFixed(3)));
             if (reportStats &&
-                reportStats.mtimeMs > appmapStats.mtimeMs &&
-                reportStats.mtimeMs > this.config.timestampMs)
+                reportStats.mtimeMs > appmapStats.mtimeMs - 1000 &&
+                reportStats.mtimeMs > this.config.timestampMs - 1000)
                 return; // report is up to date
             const startTime = Date.now();
             const scanner = yield (0, scanner_1.default)(true, this.config, [appmapFile]);
@@ -188,6 +194,7 @@ class Watcher {
             this.scanEventEmitter.emit('scan', { scanResults: rawScanResults, elapsed });
             // Always report the raw data
             yield (0, promises_1.writeFile)(reportFile, (0, formatReport_1.formatReport)(rawScanResults));
+            this.processing.delete(mtimePath);
         });
     }
     reloadConfig() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/scanner",
-  "version": "1.79.0",
+  "version": "1.80.0",
   "description": "Analyze AppMaps for code flaws",
   "bin": "built/cli.js",
   "files": [
@@ -19,8 +19,7 @@
     "doc-up-to-date": "git diff --exit-code doc/",
     "lint": "eslint src --ext .ts",
     "ci": "yarn lint && yarn build && yarn schema-up-to-date && yarn doc-up-to-date && yarn test",
-    "test": "appmap-agent-js && jest -t @appmap-fixme --filter=./test/testFilter.js",
-    "test:no-appmap": "yarn jest",
+    "test": "jest --filter=./test/testFilter.js",
     "jest": "jest --filter=./test/testFilter.js",
     "semantic-release": "semantic-release",
     "watch": "node bin/preBuild.js && tsc -p tsconfig.build.json --watch"
@@ -64,17 +63,17 @@
   },
   "dependencies": {
     "@appland/client": "^1.5.0",
-    "@appland/models": "^2.6.2",
-    "@appland/openapi": "1.5.0",
+    "@appland/models": "^2.6.3",
+    "@appland/openapi": "1.6.0",
     "@appland/sql-parser": "^1.5.0",
     "@types/cli-progress": "^3.9.2",
     "ajv": "^8.8.2",
     "applicationinsights": "^2.1.4",
-    "async": "^3.2.3",
+    "async": "^3.2.4",
     "boxen": "^5.0.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.1",
-    "cli-progress": "^3.11.0",
+    "cli-progress": "^3.12.0",
     "conf": "10.2.0",
     "crypto-js": "^4.0.0",
     "glob": "7.2.3",