@appland/appmap 3.169.1 → 3.169.2
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 +7 -0
- package/built/cmds/index/rpcServer.js +8 -15
- package/built/cmds/index/rpcServer.js.map +1 -1
- package/built/rpc/explain/explain.js +7 -8
- package/built/rpc/explain/explain.js.map +1 -1
- package/built/rpc/rpc.js +38 -56
- package/built/rpc/rpc.js.map +1 -1
- package/package.json +3 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
# [@appland/appmap-v3.169.2](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.169.1...@appland/appmap-v3.169.2) (2024-10-14)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* Bind the RPC server to localhost ([06b3791](https://github.com/getappmap/appmap-js/commit/06b3791d6f3a896c917e1d2827da53c2af22d5a0))
|
|
7
|
+
|
|
1
8
|
# [@appland/appmap-v3.169.1](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.169.0...@appland/appmap-v3.169.1) (2024-10-09)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -5,31 +5,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const connect_1 = __importDefault(require("connect"));
|
|
7
7
|
const body_parser_1 = require("body-parser");
|
|
8
|
-
const connect_cors_1 = __importDefault(require("connect-cors"));
|
|
9
8
|
const debug_1 = __importDefault(require("debug"));
|
|
10
9
|
const jayson_1 = __importDefault(require("jayson"));
|
|
11
10
|
const console_1 = require("console");
|
|
12
11
|
const assert_1 = __importDefault(require("assert"));
|
|
12
|
+
const cors_1 = __importDefault(require("cors"));
|
|
13
13
|
const rpc_1 = require("../../rpc/rpc");
|
|
14
|
-
const util_1 = require("util");
|
|
15
14
|
const debug = (0, debug_1.default)('appmap:rpcServer');
|
|
16
15
|
function handlerMiddleware(name, handler) {
|
|
17
16
|
return async (args, callback) => {
|
|
18
17
|
debug(`[RPCServer] Handling JSON-RPC request for ${name} (${JSON.stringify(args)})`);
|
|
19
|
-
let err, result;
|
|
20
18
|
try {
|
|
21
|
-
result = await handler(args);
|
|
19
|
+
const result = await handler(args);
|
|
20
|
+
debug(`[RPCServer] JSON-RPC response for ${name}: ${JSON.stringify(result)}`);
|
|
21
|
+
callback(null, result);
|
|
22
22
|
}
|
|
23
23
|
catch (error) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
if (err) {
|
|
27
|
-
(0, console_1.warn)(`[RPCServer] An error occurred handling ${name}: ${(0, util_1.inspect)(err)}`);
|
|
28
|
-
const error = rpc_1.RpcError.fromException(err);
|
|
29
|
-
callback(error);
|
|
30
|
-
}
|
|
31
|
-
else {
|
|
32
|
-
callback(null, result);
|
|
24
|
+
debug(`[RPCServer] JSON-RPC error for ${name}: ${JSON.stringify(error)}`);
|
|
25
|
+
callback((0, rpc_1.toJaysonRpcError)(error));
|
|
33
26
|
}
|
|
34
27
|
};
|
|
35
28
|
}
|
|
@@ -51,10 +44,10 @@ class RPCServer {
|
|
|
51
44
|
(0, console_1.warn)(`Consult @appland/rpc for request and response data types.`);
|
|
52
45
|
const server = new jayson_1.default.Server(rpcMethods);
|
|
53
46
|
const app = (0, connect_1.default)();
|
|
54
|
-
app.use((0,
|
|
47
|
+
app.use((0, cors_1.default)({ methods: ['POST'] }));
|
|
55
48
|
app.use((0, body_parser_1.json)());
|
|
56
49
|
app.use(server.middleware());
|
|
57
|
-
const listener = app.listen(this.bindPort);
|
|
50
|
+
const listener = app.listen(this.bindPort, 'localhost');
|
|
58
51
|
listener.on('listening', () => {
|
|
59
52
|
const address = listener.address();
|
|
60
53
|
if (address === null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpcServer.js","sourceRoot":"","sources":["../../../src/cmds/index/rpcServer.ts"],"names":[],"mappings":";;;;;AAAA,sDAA8B;AAC9B,6CAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"rpcServer.js","sourceRoot":"","sources":["../../../src/cmds/index/rpcServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,15 +55,14 @@ class Explain extends events_1.default {
|
|
|
55
55
|
});
|
|
56
56
|
navie.on('error', (err) => {
|
|
57
57
|
this.status.step = rpc_1.ExplainRpc.Step.ERROR;
|
|
58
|
-
const rpcError = rpc_2.RpcError.fromException(err);
|
|
59
58
|
if (!this.status.err)
|
|
60
59
|
this.status.err = {
|
|
61
|
-
code:
|
|
62
|
-
message:
|
|
60
|
+
code: 'code' in err ? Number(err.code) : 500,
|
|
61
|
+
message: err.message,
|
|
63
62
|
stack: err.stack,
|
|
64
63
|
cause: err.cause,
|
|
65
64
|
};
|
|
66
|
-
this.emit('error',
|
|
65
|
+
this.emit('error', err);
|
|
67
66
|
});
|
|
68
67
|
if (!this.status.threadId) {
|
|
69
68
|
const thread = await (0, report_fetch_error_1.default)('enrollConversationThread', () => this.enrollConversationThread(navie));
|
|
@@ -200,7 +199,7 @@ async function explain(navieProvider, question, codeSelection, appmaps, threadId
|
|
|
200
199
|
return false;
|
|
201
200
|
};
|
|
202
201
|
// TODO: These could be collected into status errors
|
|
203
|
-
explain.on('error', (err) => first() && reject(
|
|
202
|
+
explain.on('error', (err) => first() && reject(err));
|
|
204
203
|
explain.on('ack', (userMessageId, threadId) => {
|
|
205
204
|
status.threadId = threadId;
|
|
206
205
|
const cleanupFn = () => searchStatusByUserMessageId.delete(userMessageId);
|
|
@@ -213,11 +212,11 @@ async function explain(navieProvider, question, codeSelection, appmaps, threadId
|
|
|
213
212
|
// If the request completes here, consider it an error. This would mean that the
|
|
214
213
|
// remote server terminated our connection early.
|
|
215
214
|
explain.on('complete', () => {
|
|
216
|
-
var _a;
|
|
215
|
+
var _a, _b;
|
|
217
216
|
return first() &&
|
|
218
|
-
reject(
|
|
217
|
+
reject(new Error((_b = (_a = status.explanation) === null || _a === void 0 ? void 0 : _a.join('')) !== null && _b !== void 0 ? _b : 'The response completed unexpectedly'));
|
|
219
218
|
});
|
|
220
|
-
explain.explain(navie).catch((err) => first() && reject(
|
|
219
|
+
explain.explain(navie).catch((err) => first() && reject(err));
|
|
221
220
|
});
|
|
222
221
|
}
|
|
223
222
|
exports.explain = explain;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"explain.js","sourceRoot":"","sources":["../../../src/rpc/explain/explain.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAkC;AAClC,qCAA+B;AAC/B,+BAAgC;AAChC,4CAMyB;AACzB,0CAA8D;AAC9D,sCAA0C;AAE1C,gCAA8C;AAC9C,sEAA8C;AAE9C,qEAAkE;AAClE,+EAA+D;AAC/D,iEAAgD;AAChD,0DAA0D;AAC1D,yEAAuD;AACvD,oFAA0D;AAC1D,yCAAqC;AACrC,yDAA0D;AAC1D,+CAAqD;AAGrD,MAAM,2BAA2B,GAAG,IAAI,GAAG,EAA4C,CAAC;AAiB3E,QAAA,mBAAmB,GAAG,KAAK,CAAC;AAEzC,MAAa,OAAQ,SAAQ,gBAAY;IAGvC,YACS,iBAAoC,EACpC,kBAA4B,EAC5B,QAAgB,EAChB,aAAiC,EACjC,OAA6B,EAC7B,MAAwC,EACxC,UAAmB,EACnB,MAAe;QAEtB,KAAK,EAAE,CAAC;QATD,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,uBAAkB,GAAlB,kBAAkB,CAAU;QAC5B,aAAQ,GAAR,QAAQ,CAAQ;QAChB,kBAAa,GAAb,aAAa,CAAoB;QACjC,YAAO,GAAP,OAAO,CAAsB;QAC7B,WAAM,GAAN,MAAM,CAAkC;QACxC,eAAU,GAAV,UAAU,CAAS;QACnB,WAAM,GAAN,MAAM,CAAS;IAGxB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAa;QACzB,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,aAAa,EAAE,QAAQ,EAAE,EAAE;YAC1C,qEAAqE;YACrE,oFAAoF;YACpF,mCAAmC;YACnC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ;gBAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAE3D,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;;YACtC,MAAA,IAAI,CAAC,MAAM,EAAC,WAAW,QAAX,WAAW,GAAK,EAAE,EAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;YACxB,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,gBAAU,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC5C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,gBAAU,CAAC,IAAI,CAAC,KAAK,CAAC;YACzC,
|
|
1
|
+
{"version":3,"file":"explain.js","sourceRoot":"","sources":["../../../src/rpc/explain/explain.ts"],"names":[],"mappings":"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"}
|
package/built/rpc/rpc.js
CHANGED
|
@@ -1,67 +1,49 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
const console_1 = require("console");
|
|
5
|
-
const util_1 = require("util");
|
|
3
|
+
exports.toJaysonRpcError = exports.RpcError = void 0;
|
|
6
4
|
class RpcError extends Error {
|
|
7
|
-
|
|
8
|
-
let rpcError;
|
|
9
|
-
(0, console_1.warn)(`Handling exception: ${(0, util_1.inspect)(err)}`);
|
|
10
|
-
if (err.stack)
|
|
11
|
-
(0, console_1.warn)(`Stack trace: ${err.stack}`);
|
|
12
|
-
if (err.cause)
|
|
13
|
-
(0, console_1.warn)(`Cause: ${String(err.cause)}`);
|
|
14
|
-
if (isRpcError(err)) {
|
|
15
|
-
rpcError = { code: err.code, message: err.message };
|
|
16
|
-
const data = {};
|
|
17
|
-
if (err.data) {
|
|
18
|
-
(0, console_1.warn)(`Data: ${err.data}`);
|
|
19
|
-
try {
|
|
20
|
-
data.data = JSON.parse(JSON.stringify(err.data));
|
|
21
|
-
}
|
|
22
|
-
catch (_a) {
|
|
23
|
-
// fallthrough
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
if (err.cause) {
|
|
27
|
-
try {
|
|
28
|
-
data.cause = JSON.parse(JSON.stringify(err.cause));
|
|
29
|
-
}
|
|
30
|
-
catch (_b) {
|
|
31
|
-
// fallthrough
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
if (err.stack)
|
|
35
|
-
data.stack = err.stack;
|
|
36
|
-
if (Object.keys(data).length !== 0)
|
|
37
|
-
rpcError.data = data;
|
|
38
|
-
}
|
|
39
|
-
else {
|
|
40
|
-
rpcError = { code: 500, message: errorMessage(err) };
|
|
41
|
-
}
|
|
42
|
-
return rpcError;
|
|
43
|
-
}
|
|
44
|
-
constructor(code, message, data) {
|
|
5
|
+
constructor(code, message) {
|
|
45
6
|
super(message);
|
|
46
7
|
this.code = code;
|
|
47
|
-
this.data = data;
|
|
48
8
|
}
|
|
49
9
|
}
|
|
50
10
|
exports.RpcError = RpcError;
|
|
51
|
-
function
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
11
|
+
function toJaysonRpcError(error) {
|
|
12
|
+
const rpcError = { code: 500, message: errorMessage(error) };
|
|
13
|
+
if (error && typeof error === 'object') {
|
|
14
|
+
if ('code' in error && typeof error.code === 'number')
|
|
15
|
+
rpcError.code = error.code;
|
|
16
|
+
const data = {};
|
|
17
|
+
if ('data' in error)
|
|
18
|
+
try {
|
|
19
|
+
data.data = JSON.parse(JSON.stringify(error.data));
|
|
20
|
+
}
|
|
21
|
+
catch (_a) {
|
|
22
|
+
// fallthrough
|
|
23
|
+
}
|
|
24
|
+
if ('cause' in error)
|
|
25
|
+
try {
|
|
26
|
+
data.cause = JSON.parse(JSON.stringify(error.cause));
|
|
27
|
+
}
|
|
28
|
+
catch (_b) {
|
|
29
|
+
// fallthrough
|
|
30
|
+
}
|
|
31
|
+
if ('stack' in error)
|
|
32
|
+
data.stack = error.stack;
|
|
33
|
+
if (Object.keys(data).length !== 0)
|
|
34
|
+
rpcError.data = data;
|
|
64
35
|
}
|
|
36
|
+
return rpcError;
|
|
37
|
+
}
|
|
38
|
+
exports.toJaysonRpcError = toJaysonRpcError;
|
|
39
|
+
function errorMessage(error) {
|
|
40
|
+
if (typeof error === 'string')
|
|
41
|
+
return error;
|
|
42
|
+
if (typeof error === 'object' &&
|
|
43
|
+
error !== null &&
|
|
44
|
+
'message' in error &&
|
|
45
|
+
typeof error.message === 'string')
|
|
46
|
+
return error.message;
|
|
47
|
+
return String(error);
|
|
65
48
|
}
|
|
66
|
-
exports.errorMessage = errorMessage;
|
|
67
49
|
//# sourceMappingURL=rpc.js.map
|
package/built/rpc/rpc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../src/rpc/rpc.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../src/rpc/rpc.ts"],"names":[],"mappings":";;;AAOA,MAAa,QAAS,SAAQ,KAAK;IACjC,YAAmB,IAAY,EAAE,OAAe;QAC9C,KAAK,CAAC,OAAO,CAAC,CAAC;QADE,SAAI,GAAJ,IAAI,CAAQ;IAE/B,CAAC;CACF;AAJD,4BAIC;AAED,SAAgB,gBAAgB,CAAC,KAAc;IAC7C,MAAM,QAAQ,GAAwB,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;IAClF,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACtC,IAAI,MAAM,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;YAAE,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QAClF,MAAM,IAAI,GAA4B,EAAE,CAAC;QACzC,IAAI,MAAM,IAAI,KAAK;YACjB,IAAI;gBACF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;aACpD;YAAC,WAAM;gBACN,cAAc;aACf;QACH,IAAI,OAAO,IAAI,KAAK;YAClB,IAAI;gBACF,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;aACtD;YAAC,WAAM;gBACN,cAAc;aACf;QACH,IAAI,OAAO,IAAI,KAAK;YAAE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QAE/C,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;KAC1D;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAtBD,4CAsBC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,IACE,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,SAAS,IAAI,KAAK;QAClB,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;QAEjC,OAAO,KAAK,CAAC,OAAO,CAAC;IACvB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appland/appmap",
|
|
3
|
-
"version": "3.169.
|
|
3
|
+
"version": "3.169.2",
|
|
4
4
|
"description": "",
|
|
5
5
|
"bin": "built/cli.js",
|
|
6
6
|
"engines": {
|
|
@@ -39,6 +39,7 @@
|
|
|
39
39
|
"@octokit/types": "^11.1.0",
|
|
40
40
|
"@swc/core": "^1.3.76",
|
|
41
41
|
"@types/better-sqlite3": "^7.6.9",
|
|
42
|
+
"@types/cors": "^2.8.17",
|
|
42
43
|
"@types/fs-extra": "^9.0.13",
|
|
43
44
|
"@types/gitconfiglocal": "^2.0.1",
|
|
44
45
|
"@types/inquirer": "^9.0.3",
|
|
@@ -109,8 +110,8 @@
|
|
|
109
110
|
"cli-progress": "^3.12.0",
|
|
110
111
|
"conf": "<11",
|
|
111
112
|
"connect": "^3.7.0",
|
|
112
|
-
"connect-cors": "^0.5.6",
|
|
113
113
|
"console-table-printer": "^2.9.0",
|
|
114
|
+
"cors": "^2.8.5",
|
|
114
115
|
"crypto-js": "^4.0.0",
|
|
115
116
|
"debug": "^4.3.6",
|
|
116
117
|
"detect-indent": "^6.1.0",
|