@appland/appmap 3.54.0 → 3.55.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,23 @@
|
|
|
1
|
+
# [@appland/appmap-v3.55.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.54.1...@appland/appmap-v3.55.0) (2022-12-16)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* Don't crash on an 'UNKNOWN: unknown error, lstat' error ([15dfedf](https://github.com/getappmap/appmap-js/commit/15dfedf4fca08c7def63cf168a82ba37739cce40))
|
|
7
|
+
* When UNKNOWN errors are encountered, track the filenames and skip them when watching ([96104ae](https://github.com/getappmap/appmap-js/commit/96104ae42d99e6ff7c7ea46d1539070cfc489218))
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
### Features
|
|
11
|
+
|
|
12
|
+
* Add index:watcher_error:unknown telemetry event ([c9eaf83](https://github.com/getappmap/appmap-js/commit/c9eaf83c5d6132ad82fb5bf0b516bae6a410b915))
|
|
13
|
+
|
|
14
|
+
# [@appland/appmap-v3.54.1](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.54.0...@appland/appmap-v3.54.1) (2022-12-16)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Bug Fixes
|
|
18
|
+
|
|
19
|
+
* Send telemetry for scan:watcher_error:enospc and index:watcher_error:enospc ([989db4a](https://github.com/getappmap/appmap-js/commit/989db4a40db8338613afe182be25b0315df94316))
|
|
20
|
+
|
|
1
21
|
# [@appland/appmap-v3.54.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.53.1...@appland/appmap-v3.54.0) (2022-12-13)
|
|
2
22
|
|
|
3
23
|
|
|
@@ -13,10 +13,12 @@ const telemetry_1 = __importDefault(require("../telemetry"));
|
|
|
13
13
|
const utils_1 = require("../utils");
|
|
14
14
|
const fingerprintQueue_1 = __importDefault(require("./fingerprintQueue"));
|
|
15
15
|
const globber_1 = __importDefault(require("./globber"));
|
|
16
|
+
const path_2 = __importDefault(require("path"));
|
|
16
17
|
class FingerprintWatchCommand {
|
|
17
18
|
constructor(directory) {
|
|
18
19
|
this.directory = directory;
|
|
19
20
|
this._numProcessed = 0;
|
|
21
|
+
this.unreadableFiles = new Set();
|
|
20
22
|
this.pidfilePath = process.env.APPMAP_WRITE_PIDFILE && (0, path_1.join)(this.directory, 'index.pid');
|
|
21
23
|
this.fpQueue = new fingerprintQueue_1.default();
|
|
22
24
|
new eventAggregator_1.default((events) => {
|
|
@@ -38,6 +40,14 @@ class FingerprintWatchCommand {
|
|
|
38
40
|
this.pidfilePath = undefined;
|
|
39
41
|
}
|
|
40
42
|
}
|
|
43
|
+
getFilenameFromErrorMessage(errorMessage) {
|
|
44
|
+
// The errorMessage must contain the filename within single quotes
|
|
45
|
+
// and looks like this:
|
|
46
|
+
// Error: UNKNOWN: unknown error, lstat 'c:\Users\Test\Programming\MyProject'
|
|
47
|
+
let quoteStartIndex = errorMessage.indexOf(`'`);
|
|
48
|
+
let quoteEndIndex = errorMessage.indexOf(`'`, quoteStartIndex + 1);
|
|
49
|
+
return errorMessage.substring(quoteStartIndex + 1, quoteEndIndex);
|
|
50
|
+
}
|
|
41
51
|
async watcherErrorFunction(error) {
|
|
42
52
|
var _a;
|
|
43
53
|
if (this.watcher && error.message.includes("ENOSPC: System limit for number of file watchers reached")) {
|
|
@@ -46,6 +56,26 @@ class FingerprintWatchCommand {
|
|
|
46
56
|
await ((_a = this.watcher) === null || _a === void 0 ? void 0 : _a.close());
|
|
47
57
|
this.watcher = undefined;
|
|
48
58
|
console.warn("File watching disabled.");
|
|
59
|
+
telemetry_1.default.sendEvent({
|
|
60
|
+
name: `index:watcher_error:enospc`,
|
|
61
|
+
properties: {
|
|
62
|
+
errorMessage: error.message,
|
|
63
|
+
errorStack: error.stack,
|
|
64
|
+
},
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
else if (error.message.includes("UNKNOWN: unknown error, lstat")) {
|
|
68
|
+
console.warn(error.stack);
|
|
69
|
+
telemetry_1.default.sendEvent({
|
|
70
|
+
name: `index:watcher_error:unknown`,
|
|
71
|
+
properties: {
|
|
72
|
+
errorMessage: error.message,
|
|
73
|
+
errorStack: error.stack,
|
|
74
|
+
},
|
|
75
|
+
});
|
|
76
|
+
const filename = this.getFilenameFromErrorMessage(error.message);
|
|
77
|
+
this.unreadableFiles.add(filename);
|
|
78
|
+
console.warn("Will not read this file again.");
|
|
49
79
|
}
|
|
50
80
|
else {
|
|
51
81
|
// let it crash if it's some other error, to learn what the error is
|
|
@@ -53,6 +83,22 @@ class FingerprintWatchCommand {
|
|
|
53
83
|
}
|
|
54
84
|
}
|
|
55
85
|
;
|
|
86
|
+
// Custom ignore function needed to skip unreadableFiles because
|
|
87
|
+
// attempting to read them can block reading all files. It also
|
|
88
|
+
// cuts down the watch tree to just what we need.
|
|
89
|
+
ignored(targetPath) {
|
|
90
|
+
['/node_modules/', '/.git/'].forEach((pattern) => {
|
|
91
|
+
if (targetPath.includes(pattern)) {
|
|
92
|
+
return true;
|
|
93
|
+
}
|
|
94
|
+
});
|
|
95
|
+
if (this.unreadableFiles.has(targetPath)) {
|
|
96
|
+
return true;
|
|
97
|
+
}
|
|
98
|
+
// Also make sure to not try to recurse down node_modules or .git
|
|
99
|
+
const basename = path_2.default.basename(targetPath);
|
|
100
|
+
return basename === 'node_modules' || basename === '.git';
|
|
101
|
+
}
|
|
56
102
|
async execute() {
|
|
57
103
|
this.fpQueue.process().then(() => {
|
|
58
104
|
this.fpQueue.handler.checkVersion = false;
|
|
@@ -67,7 +113,7 @@ class FingerprintWatchCommand {
|
|
|
67
113
|
await pollReady;
|
|
68
114
|
this.watcher = (0, chokidar_1.watch)(glob, {
|
|
69
115
|
ignoreInitial: true,
|
|
70
|
-
ignored:
|
|
116
|
+
ignored: this.ignored.bind(this),
|
|
71
117
|
ignorePermissionErrors: true,
|
|
72
118
|
})
|
|
73
119
|
.on('add', this.added.bind(this))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fingerprintWatchCommand.js","sourceRoot":"","sources":["../../src/fingerprint/fingerprintWatchCommand.ts"],"names":[],"mappings":";;;;;AACA,uCAA4C;AAC5C,uCAAsD;AACtD,+BAAqC;AACrC,6EAAqD;AACrD,6EAAqD;AACrD,wDAAqD;AACrD,6DAAqC;AACrC,oCAAmC;AAEnC,0EAAkD;AAClD,wDAAgC;
|
|
1
|
+
{"version":3,"file":"fingerprintWatchCommand.js","sourceRoot":"","sources":["../../src/fingerprint/fingerprintWatchCommand.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appland/appmap",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.55.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"bin": "built/cli.js",
|
|
6
6
|
"publishConfig": {
|
|
@@ -69,9 +69,8 @@
|
|
|
69
69
|
"@appland/components": "2.19.1",
|
|
70
70
|
"@appland/diagrams": "1.5.3",
|
|
71
71
|
"@appland/models": "1.22.0",
|
|
72
|
-
"@appland/openapi": "1.
|
|
73
|
-
"@appland/sequence-diagram": "1.3.
|
|
74
|
-
"@datastructures-js/priority-queue": "^6.1.3",
|
|
72
|
+
"@appland/openapi": "1.3.0",
|
|
73
|
+
"@appland/sequence-diagram": "1.3.1",
|
|
75
74
|
"@sidvind/better-ajv-errors": "^0.9.1",
|
|
76
75
|
"@types/moo": "^0.5.5",
|
|
77
76
|
"JSONStream": "^1.3.5",
|
|
@@ -87,7 +86,7 @@
|
|
|
87
86
|
"console-table-printer": "^2.9.0",
|
|
88
87
|
"crypto-js": "^4.0.0",
|
|
89
88
|
"detect-indent": "^6.1.0",
|
|
90
|
-
"diff": "^5.
|
|
89
|
+
"diff": "^5.1.0",
|
|
91
90
|
"fs-extra": "^10.1.0",
|
|
92
91
|
"glob": "^7.2.3",
|
|
93
92
|
"graceful-fs": "^4.2.10",
|