@llamaindex/llama-cloud-mcp 1.5.0 → 1.7.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/auth.d.mts +6 -0
- package/auth.d.mts.map +1 -0
- package/auth.d.ts +6 -0
- package/auth.d.ts.map +1 -0
- package/{headers.mjs → auth.js} +18 -2
- package/auth.js.map +1 -0
- package/{headers.js → auth.mjs} +13 -6
- package/auth.mjs.map +1 -0
- package/code-tool-paths.cjs +6 -0
- package/code-tool-paths.cjs.map +1 -0
- package/code-tool-paths.d.cts +2 -0
- package/code-tool-paths.d.cts.map +1 -0
- package/code-tool-types.d.mts.map +1 -1
- package/code-tool-types.d.ts.map +1 -1
- package/code-tool-worker.d.mts +5 -0
- package/code-tool-worker.d.mts.map +1 -0
- package/code-tool-worker.d.ts +5 -0
- package/code-tool-worker.d.ts.map +1 -0
- package/code-tool-worker.js +345 -0
- package/code-tool-worker.js.map +1 -0
- package/code-tool-worker.mjs +340 -0
- package/code-tool-worker.mjs.map +1 -0
- package/code-tool.d.mts +8 -2
- package/code-tool.d.mts.map +1 -1
- package/code-tool.d.ts +8 -2
- package/code-tool.d.ts.map +1 -1
- package/code-tool.js +264 -42
- package/code-tool.js.map +1 -1
- package/code-tool.mjs +229 -43
- package/code-tool.mjs.map +1 -1
- package/docs-search-tool.d.mts +9 -3
- package/docs-search-tool.d.mts.map +1 -1
- package/docs-search-tool.d.ts +9 -3
- package/docs-search-tool.d.ts.map +1 -1
- package/docs-search-tool.js +27 -4
- package/docs-search-tool.js.map +1 -1
- package/docs-search-tool.mjs +27 -4
- package/docs-search-tool.mjs.map +1 -1
- package/http.d.mts +3 -5
- package/http.d.mts.map +1 -1
- package/http.d.ts +3 -5
- package/http.d.ts.map +1 -1
- package/http.js +66 -43
- package/http.js.map +1 -1
- package/http.mjs +66 -43
- package/http.mjs.map +1 -1
- package/index.js +13 -12
- package/index.js.map +1 -1
- package/index.mjs +13 -12
- package/index.mjs.map +1 -1
- package/instructions.d.mts +2 -0
- package/instructions.d.mts.map +1 -0
- package/instructions.d.ts +2 -0
- package/instructions.d.ts.map +1 -0
- package/instructions.js +56 -0
- package/instructions.js.map +1 -0
- package/instructions.mjs +53 -0
- package/instructions.mjs.map +1 -0
- package/logger.d.mts +7 -0
- package/logger.d.mts.map +1 -0
- package/logger.d.ts +7 -0
- package/logger.d.ts.map +1 -0
- package/logger.js +29 -0
- package/logger.js.map +1 -0
- package/logger.mjs +22 -0
- package/logger.mjs.map +1 -0
- package/methods.d.mts.map +1 -1
- package/methods.d.ts.map +1 -1
- package/methods.js +1 -0
- package/methods.js.map +1 -1
- package/methods.mjs +1 -0
- package/methods.mjs.map +1 -1
- package/options.d.mts +5 -0
- package/options.d.mts.map +1 -1
- package/options.d.ts +5 -0
- package/options.d.ts.map +1 -1
- package/options.js +31 -0
- package/options.js.map +1 -1
- package/options.mjs +31 -0
- package/options.mjs.map +1 -1
- package/package.json +62 -15
- package/server.d.mts +8 -9
- package/server.d.mts.map +1 -1
- package/server.d.ts +8 -9
- package/server.d.ts.map +1 -1
- package/server.js +73 -75
- package/server.js.map +1 -1
- package/server.mjs +72 -71
- package/server.mjs.map +1 -1
- package/src/{headers.ts → auth.ts} +16 -1
- package/src/code-tool-paths.cts +3 -0
- package/src/code-tool-types.ts +1 -0
- package/src/code-tool-worker.ts +391 -0
- package/src/code-tool.ts +309 -56
- package/src/docs-search-tool.ts +46 -6
- package/src/http.ts +74 -45
- package/src/index.ts +15 -13
- package/src/instructions.ts +75 -0
- package/src/logger.ts +28 -0
- package/src/methods.ts +2 -0
- package/src/options.ts +43 -0
- package/src/server.ts +85 -92
- package/src/stdio.ts +4 -3
- package/src/types.ts +12 -4
- package/src/util.ts +25 -0
- package/stdio.d.mts.map +1 -1
- package/stdio.d.ts.map +1 -1
- package/stdio.js +4 -3
- package/stdio.js.map +1 -1
- package/stdio.mjs +4 -3
- package/stdio.mjs.map +1 -1
- package/types.d.mts +8 -1
- package/types.d.mts.map +1 -1
- package/types.d.ts +8 -1
- package/types.d.ts.map +1 -1
- package/types.js.map +1 -1
- package/types.mjs.map +1 -1
- package/util.d.mts +4 -0
- package/util.d.mts.map +1 -0
- package/util.d.ts +4 -0
- package/util.d.ts.map +1 -0
- package/util.js +30 -0
- package/util.js.map +1 -0
- package/util.mjs +24 -0
- package/util.mjs.map +1 -0
- package/headers.d.mts +0 -4
- package/headers.d.mts.map +0 -1
- package/headers.d.ts +0 -4
- package/headers.d.ts.map +0 -1
- package/headers.js.map +0 -1
- package/headers.mjs.map +0 -1
package/http.js
CHANGED
|
@@ -7,33 +7,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
exports.launchStreamableHTTPServer = exports.streamableHTTPApp = void 0;
|
|
8
8
|
const streamableHttp_js_1 = require("@modelcontextprotocol/sdk/server/streamableHttp.js");
|
|
9
9
|
const express_1 = __importDefault(require("express"));
|
|
10
|
-
const
|
|
11
|
-
const
|
|
10
|
+
const pino_1 = __importDefault(require("pino"));
|
|
11
|
+
const pino_http_1 = __importDefault(require("pino-http"));
|
|
12
|
+
const auth_1 = require("./auth.js");
|
|
13
|
+
const logger_1 = require("./logger.js");
|
|
12
14
|
const server_1 = require("./server.js");
|
|
13
|
-
const headers_1 = require("./headers.js");
|
|
14
15
|
const newServer = async ({ clientOptions, mcpOptions, req, res, }) => {
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
}
|
|
27
|
-
catch (error) {
|
|
28
|
-
res.status(401).json({
|
|
29
|
-
jsonrpc: '2.0',
|
|
30
|
-
error: {
|
|
31
|
-
code: -32000,
|
|
32
|
-
message: `Unauthorized: ${error instanceof Error ? error.message : error}`,
|
|
33
|
-
},
|
|
34
|
-
});
|
|
35
|
-
return null;
|
|
36
|
-
}
|
|
16
|
+
const stainlessApiKey = (0, auth_1.getStainlessApiKey)(req, mcpOptions);
|
|
17
|
+
const server = await (0, server_1.newMcpServer)(stainlessApiKey);
|
|
18
|
+
const authOptions = (0, auth_1.parseClientAuthHeaders)(req, false);
|
|
19
|
+
await (0, server_1.initMcpServer)({
|
|
20
|
+
server: server,
|
|
21
|
+
mcpOptions: mcpOptions,
|
|
22
|
+
clientOptions: {
|
|
23
|
+
...clientOptions,
|
|
24
|
+
...authOptions,
|
|
25
|
+
},
|
|
26
|
+
stainlessApiKey: stainlessApiKey,
|
|
27
|
+
});
|
|
37
28
|
return server;
|
|
38
29
|
};
|
|
39
30
|
const post = (options) => async (req, res) => {
|
|
@@ -63,21 +54,52 @@ const del = async (req, res) => {
|
|
|
63
54
|
},
|
|
64
55
|
});
|
|
65
56
|
};
|
|
66
|
-
const
|
|
57
|
+
const redactHeaders = (headers) => {
|
|
58
|
+
const hiddenHeaders = /auth|cookie|key|token/i;
|
|
59
|
+
const filtered = { ...headers };
|
|
60
|
+
Object.keys(filtered).forEach((key) => {
|
|
61
|
+
if (hiddenHeaders.test(key)) {
|
|
62
|
+
filtered[key] = '[REDACTED]';
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
return filtered;
|
|
66
|
+
};
|
|
67
|
+
const streamableHTTPApp = ({ clientOptions = {}, mcpOptions, }) => {
|
|
67
68
|
const app = (0, express_1.default)();
|
|
68
69
|
app.set('query parser', 'extended');
|
|
69
70
|
app.use(express_1.default.json());
|
|
70
|
-
|
|
71
|
-
(0,
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
71
|
+
app.use((0, pino_http_1.default)({
|
|
72
|
+
logger: (0, logger_1.getLogger)(),
|
|
73
|
+
customLogLevel: (req, res) => {
|
|
74
|
+
if (res.statusCode >= 500) {
|
|
75
|
+
return 'error';
|
|
76
|
+
}
|
|
77
|
+
else if (res.statusCode >= 400) {
|
|
78
|
+
return 'warn';
|
|
79
|
+
}
|
|
80
|
+
return 'info';
|
|
81
|
+
},
|
|
82
|
+
customSuccessMessage: function (req, res) {
|
|
83
|
+
return `Request ${req.method} to ${req.url} completed with status ${res.statusCode}`;
|
|
84
|
+
},
|
|
85
|
+
customErrorMessage: function (req, res, err) {
|
|
86
|
+
return `Request ${req.method} to ${req.url} errored with status ${res.statusCode}`;
|
|
87
|
+
},
|
|
88
|
+
serializers: {
|
|
89
|
+
req: pino_1.default.stdSerializers.wrapRequestSerializer((req) => {
|
|
90
|
+
return {
|
|
91
|
+
...req,
|
|
92
|
+
headers: redactHeaders(req.raw.headers),
|
|
93
|
+
};
|
|
94
|
+
}),
|
|
95
|
+
res: pino_1.default.stdSerializers.wrapResponseSerializer((res) => {
|
|
96
|
+
return {
|
|
97
|
+
...res,
|
|
98
|
+
headers: redactHeaders(res.headers),
|
|
99
|
+
};
|
|
100
|
+
}),
|
|
101
|
+
},
|
|
102
|
+
}));
|
|
81
103
|
app.get('/health', async (req, res) => {
|
|
82
104
|
res.status(200).send('OK');
|
|
83
105
|
});
|
|
@@ -87,18 +109,19 @@ const streamableHTTPApp = ({ clientOptions = {}, mcpOptions, debug, }) => {
|
|
|
87
109
|
return app;
|
|
88
110
|
};
|
|
89
111
|
exports.streamableHTTPApp = streamableHTTPApp;
|
|
90
|
-
const launchStreamableHTTPServer = async (
|
|
91
|
-
const app = (0, exports.streamableHTTPApp)({ mcpOptions
|
|
92
|
-
const server = app.listen(
|
|
112
|
+
const launchStreamableHTTPServer = async ({ mcpOptions, port, }) => {
|
|
113
|
+
const app = (0, exports.streamableHTTPApp)({ mcpOptions });
|
|
114
|
+
const server = app.listen(port);
|
|
93
115
|
const address = server.address();
|
|
116
|
+
const logger = (0, logger_1.getLogger)();
|
|
94
117
|
if (typeof address === 'string') {
|
|
95
|
-
|
|
118
|
+
logger.info(`MCP Server running on streamable HTTP at ${address}`);
|
|
96
119
|
}
|
|
97
120
|
else if (address !== null) {
|
|
98
|
-
|
|
121
|
+
logger.info(`MCP Server running on streamable HTTP on port ${address.port}`);
|
|
99
122
|
}
|
|
100
123
|
else {
|
|
101
|
-
|
|
124
|
+
logger.info(`MCP Server running on streamable HTTP on port ${port}`);
|
|
102
125
|
}
|
|
103
126
|
};
|
|
104
127
|
exports.launchStreamableHTTPServer = launchStreamableHTTPServer;
|
package/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["src/http.ts"],"names":[],"mappings":";AAAA,sFAAsF;;;;;;AAGtF,0FAAmG;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["src/http.ts"],"names":[],"mappings":"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"}
|
package/http.mjs
CHANGED
|
@@ -1,33 +1,24 @@
|
|
|
1
1
|
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
|
|
2
2
|
import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
|
|
3
3
|
import express from 'express';
|
|
4
|
-
import
|
|
5
|
-
import
|
|
4
|
+
import pino from 'pino';
|
|
5
|
+
import pinoHttp from 'pino-http';
|
|
6
|
+
import { getStainlessApiKey, parseClientAuthHeaders } from "./auth.mjs";
|
|
7
|
+
import { getLogger } from "./logger.mjs";
|
|
6
8
|
import { initMcpServer, newMcpServer } from "./server.mjs";
|
|
7
|
-
import { parseAuthHeaders } from "./headers.mjs";
|
|
8
9
|
const newServer = async ({ clientOptions, mcpOptions, req, res, }) => {
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
}
|
|
21
|
-
catch (error) {
|
|
22
|
-
res.status(401).json({
|
|
23
|
-
jsonrpc: '2.0',
|
|
24
|
-
error: {
|
|
25
|
-
code: -32000,
|
|
26
|
-
message: `Unauthorized: ${error instanceof Error ? error.message : error}`,
|
|
27
|
-
},
|
|
28
|
-
});
|
|
29
|
-
return null;
|
|
30
|
-
}
|
|
10
|
+
const stainlessApiKey = getStainlessApiKey(req, mcpOptions);
|
|
11
|
+
const server = await newMcpServer(stainlessApiKey);
|
|
12
|
+
const authOptions = parseClientAuthHeaders(req, false);
|
|
13
|
+
await initMcpServer({
|
|
14
|
+
server: server,
|
|
15
|
+
mcpOptions: mcpOptions,
|
|
16
|
+
clientOptions: {
|
|
17
|
+
...clientOptions,
|
|
18
|
+
...authOptions,
|
|
19
|
+
},
|
|
20
|
+
stainlessApiKey: stainlessApiKey,
|
|
21
|
+
});
|
|
31
22
|
return server;
|
|
32
23
|
};
|
|
33
24
|
const post = (options) => async (req, res) => {
|
|
@@ -57,21 +48,52 @@ const del = async (req, res) => {
|
|
|
57
48
|
},
|
|
58
49
|
});
|
|
59
50
|
};
|
|
60
|
-
|
|
51
|
+
const redactHeaders = (headers) => {
|
|
52
|
+
const hiddenHeaders = /auth|cookie|key|token/i;
|
|
53
|
+
const filtered = { ...headers };
|
|
54
|
+
Object.keys(filtered).forEach((key) => {
|
|
55
|
+
if (hiddenHeaders.test(key)) {
|
|
56
|
+
filtered[key] = '[REDACTED]';
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
return filtered;
|
|
60
|
+
};
|
|
61
|
+
export const streamableHTTPApp = ({ clientOptions = {}, mcpOptions, }) => {
|
|
61
62
|
const app = express();
|
|
62
63
|
app.set('query parser', 'extended');
|
|
63
64
|
app.use(express.json());
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
65
|
+
app.use(pinoHttp({
|
|
66
|
+
logger: getLogger(),
|
|
67
|
+
customLogLevel: (req, res) => {
|
|
68
|
+
if (res.statusCode >= 500) {
|
|
69
|
+
return 'error';
|
|
70
|
+
}
|
|
71
|
+
else if (res.statusCode >= 400) {
|
|
72
|
+
return 'warn';
|
|
73
|
+
}
|
|
74
|
+
return 'info';
|
|
75
|
+
},
|
|
76
|
+
customSuccessMessage: function (req, res) {
|
|
77
|
+
return `Request ${req.method} to ${req.url} completed with status ${res.statusCode}`;
|
|
78
|
+
},
|
|
79
|
+
customErrorMessage: function (req, res, err) {
|
|
80
|
+
return `Request ${req.method} to ${req.url} errored with status ${res.statusCode}`;
|
|
81
|
+
},
|
|
82
|
+
serializers: {
|
|
83
|
+
req: pino.stdSerializers.wrapRequestSerializer((req) => {
|
|
84
|
+
return {
|
|
85
|
+
...req,
|
|
86
|
+
headers: redactHeaders(req.raw.headers),
|
|
87
|
+
};
|
|
88
|
+
}),
|
|
89
|
+
res: pino.stdSerializers.wrapResponseSerializer((res) => {
|
|
90
|
+
return {
|
|
91
|
+
...res,
|
|
92
|
+
headers: redactHeaders(res.headers),
|
|
93
|
+
};
|
|
94
|
+
}),
|
|
95
|
+
},
|
|
96
|
+
}));
|
|
75
97
|
app.get('/health', async (req, res) => {
|
|
76
98
|
res.status(200).send('OK');
|
|
77
99
|
});
|
|
@@ -80,18 +102,19 @@ export const streamableHTTPApp = ({ clientOptions = {}, mcpOptions, debug, }) =>
|
|
|
80
102
|
app.delete('/', del);
|
|
81
103
|
return app;
|
|
82
104
|
};
|
|
83
|
-
export const launchStreamableHTTPServer = async (
|
|
84
|
-
const app = streamableHTTPApp({ mcpOptions
|
|
85
|
-
const server = app.listen(
|
|
105
|
+
export const launchStreamableHTTPServer = async ({ mcpOptions, port, }) => {
|
|
106
|
+
const app = streamableHTTPApp({ mcpOptions });
|
|
107
|
+
const server = app.listen(port);
|
|
86
108
|
const address = server.address();
|
|
109
|
+
const logger = getLogger();
|
|
87
110
|
if (typeof address === 'string') {
|
|
88
|
-
|
|
111
|
+
logger.info(`MCP Server running on streamable HTTP at ${address}`);
|
|
89
112
|
}
|
|
90
113
|
else if (address !== null) {
|
|
91
|
-
|
|
114
|
+
logger.info(`MCP Server running on streamable HTTP on port ${address.port}`);
|
|
92
115
|
}
|
|
93
116
|
else {
|
|
94
|
-
|
|
117
|
+
logger.info(`MCP Server running on streamable HTTP on port ${port}`);
|
|
95
118
|
}
|
|
96
119
|
};
|
|
97
120
|
//# sourceMappingURL=http.mjs.map
|
package/http.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.mjs","sourceRoot":"","sources":["src/http.ts"],"names":[],"mappings":"AAAA,sFAAsF;OAG/E,EAAE,6BAA6B,EAAE,MAAM,oDAAoD;
|
|
1
|
+
{"version":3,"file":"http.mjs","sourceRoot":"","sources":["src/http.ts"],"names":[],"mappings":"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"}
|
package/index.js
CHANGED
|
@@ -5,10 +5,15 @@ const server_1 = require("./server.js");
|
|
|
5
5
|
const options_1 = require("./options.js");
|
|
6
6
|
const stdio_1 = require("./stdio.js");
|
|
7
7
|
const http_1 = require("./http.js");
|
|
8
|
+
const logger_1 = require("./logger.js");
|
|
8
9
|
async function main() {
|
|
9
10
|
const options = parseOptionsOrError();
|
|
11
|
+
(0, logger_1.configureLogger)({
|
|
12
|
+
level: options.debug ? 'debug' : 'info',
|
|
13
|
+
pretty: options.logFormat === 'pretty',
|
|
14
|
+
});
|
|
10
15
|
const selectedTools = await selectToolsOrError(options);
|
|
11
|
-
|
|
16
|
+
(0, logger_1.getLogger)().info({ tools: selectedTools.map((e) => e.tool.name) }, `MCP Server starting with ${selectedTools.length} tools`);
|
|
12
17
|
switch (options.transport) {
|
|
13
18
|
case 'stdio':
|
|
14
19
|
await (0, stdio_1.launchStdioServer)(options);
|
|
@@ -16,15 +21,15 @@ async function main() {
|
|
|
16
21
|
case 'http':
|
|
17
22
|
await (0, http_1.launchStreamableHTTPServer)({
|
|
18
23
|
mcpOptions: options,
|
|
19
|
-
|
|
20
|
-
port: options.port ?? options.socket,
|
|
24
|
+
port: options.socket ?? options.port,
|
|
21
25
|
});
|
|
22
26
|
break;
|
|
23
27
|
}
|
|
24
28
|
}
|
|
25
29
|
if (require.main === module) {
|
|
26
30
|
main().catch((error) => {
|
|
27
|
-
|
|
31
|
+
// Logger might not be initialized yet
|
|
32
|
+
console.error('Fatal error in main()', error);
|
|
28
33
|
process.exit(1);
|
|
29
34
|
});
|
|
30
35
|
}
|
|
@@ -33,7 +38,8 @@ function parseOptionsOrError() {
|
|
|
33
38
|
return (0, options_1.parseCLIOptions)();
|
|
34
39
|
}
|
|
35
40
|
catch (error) {
|
|
36
|
-
|
|
41
|
+
// Logger is initialized after options, so use console.error here
|
|
42
|
+
console.error('Error parsing options', error);
|
|
37
43
|
process.exit(1);
|
|
38
44
|
}
|
|
39
45
|
}
|
|
@@ -41,18 +47,13 @@ async function selectToolsOrError(options) {
|
|
|
41
47
|
try {
|
|
42
48
|
const includedTools = (0, server_1.selectTools)(options);
|
|
43
49
|
if (includedTools.length === 0) {
|
|
44
|
-
|
|
50
|
+
(0, logger_1.getLogger)().error('No tools match the provided filters');
|
|
45
51
|
process.exit(1);
|
|
46
52
|
}
|
|
47
53
|
return includedTools;
|
|
48
54
|
}
|
|
49
55
|
catch (error) {
|
|
50
|
-
|
|
51
|
-
console.error('Error filtering tools:', error.message);
|
|
52
|
-
}
|
|
53
|
-
else {
|
|
54
|
-
console.error('Error filtering tools:', error);
|
|
55
|
-
}
|
|
56
|
+
(0, logger_1.getLogger)().error({ error }, 'Error filtering tools');
|
|
56
57
|
process.exit(1);
|
|
57
58
|
}
|
|
58
59
|
}
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":";;;AAEA,wCAAuC;AACvC,0CAAwD;AACxD,sCAA4C;AAC5C,oCAAoD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":";;;AAEA,wCAAuC;AACvC,0CAAwD;AACxD,sCAA4C;AAC5C,oCAAoD;AAEpD,wCAAsD;AAEtD,KAAK,UAAU,IAAI;IACjB,MAAM,OAAO,GAAG,mBAAmB,EAAE,CAAC;IACtC,IAAA,wBAAe,EAAC;QACd,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;QACvC,MAAM,EAAE,OAAO,CAAC,SAAS,KAAK,QAAQ;KACvC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAExD,IAAA,kBAAS,GAAE,CAAC,IAAI,CACd,EAAE,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAChD,4BAA4B,aAAa,CAAC,MAAM,QAAQ,CACzD,CAAC;IAEF,QAAQ,OAAO,CAAC,SAAS,EAAE,CAAC;QAC1B,KAAK,OAAO;YACV,MAAM,IAAA,yBAAiB,EAAC,OAAO,CAAC,CAAC;YACjC,MAAM;QACR,KAAK,MAAM;YACT,MAAM,IAAA,iCAA0B,EAAC;gBAC/B,UAAU,EAAE,OAAO;gBACnB,IAAI,EAAE,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI;aACrC,CAAC,CAAC;YACH,MAAM;IACV,CAAC;AACH,CAAC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;IAC5B,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACrB,sCAAsC;QACtC,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;QAC9C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB;IAC1B,IAAI,CAAC;QACH,OAAO,IAAA,yBAAe,GAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,iEAAiE;QACjE,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;QAC9C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,OAAmB;IACnD,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,IAAA,oBAAW,EAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,IAAA,kBAAS,GAAE,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;YACzD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAA,kBAAS,GAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,uBAAuB,CAAC,CAAC;QACtD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}
|
package/index.mjs
CHANGED
|
@@ -3,10 +3,15 @@ import { selectTools } from "./server.mjs";
|
|
|
3
3
|
import { parseCLIOptions } from "./options.mjs";
|
|
4
4
|
import { launchStdioServer } from "./stdio.mjs";
|
|
5
5
|
import { launchStreamableHTTPServer } from "./http.mjs";
|
|
6
|
+
import { configureLogger, getLogger } from "./logger.mjs";
|
|
6
7
|
async function main() {
|
|
7
8
|
const options = parseOptionsOrError();
|
|
9
|
+
configureLogger({
|
|
10
|
+
level: options.debug ? 'debug' : 'info',
|
|
11
|
+
pretty: options.logFormat === 'pretty',
|
|
12
|
+
});
|
|
8
13
|
const selectedTools = await selectToolsOrError(options);
|
|
9
|
-
|
|
14
|
+
getLogger().info({ tools: selectedTools.map((e) => e.tool.name) }, `MCP Server starting with ${selectedTools.length} tools`);
|
|
10
15
|
switch (options.transport) {
|
|
11
16
|
case 'stdio':
|
|
12
17
|
await launchStdioServer(options);
|
|
@@ -14,15 +19,15 @@ async function main() {
|
|
|
14
19
|
case 'http':
|
|
15
20
|
await launchStreamableHTTPServer({
|
|
16
21
|
mcpOptions: options,
|
|
17
|
-
|
|
18
|
-
port: options.port ?? options.socket,
|
|
22
|
+
port: options.socket ?? options.port,
|
|
19
23
|
});
|
|
20
24
|
break;
|
|
21
25
|
}
|
|
22
26
|
}
|
|
23
27
|
if (require.main === module) {
|
|
24
28
|
main().catch((error) => {
|
|
25
|
-
|
|
29
|
+
// Logger might not be initialized yet
|
|
30
|
+
console.error('Fatal error in main()', error);
|
|
26
31
|
process.exit(1);
|
|
27
32
|
});
|
|
28
33
|
}
|
|
@@ -31,7 +36,8 @@ function parseOptionsOrError() {
|
|
|
31
36
|
return parseCLIOptions();
|
|
32
37
|
}
|
|
33
38
|
catch (error) {
|
|
34
|
-
|
|
39
|
+
// Logger is initialized after options, so use console.error here
|
|
40
|
+
console.error('Error parsing options', error);
|
|
35
41
|
process.exit(1);
|
|
36
42
|
}
|
|
37
43
|
}
|
|
@@ -39,18 +45,13 @@ async function selectToolsOrError(options) {
|
|
|
39
45
|
try {
|
|
40
46
|
const includedTools = selectTools(options);
|
|
41
47
|
if (includedTools.length === 0) {
|
|
42
|
-
|
|
48
|
+
getLogger().error('No tools match the provided filters');
|
|
43
49
|
process.exit(1);
|
|
44
50
|
}
|
|
45
51
|
return includedTools;
|
|
46
52
|
}
|
|
47
53
|
catch (error) {
|
|
48
|
-
|
|
49
|
-
console.error('Error filtering tools:', error.message);
|
|
50
|
-
}
|
|
51
|
-
else {
|
|
52
|
-
console.error('Error filtering tools:', error);
|
|
53
|
-
}
|
|
54
|
+
getLogger().error({ error }, 'Error filtering tools');
|
|
54
55
|
process.exit(1);
|
|
55
56
|
}
|
|
56
57
|
}
|
package/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.mjs","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":";OAEO,EAAE,WAAW,EAAE;OACf,EAAc,eAAe,EAAE;OAC/B,EAAE,iBAAiB,EAAE;OACrB,EAAE,0BAA0B,EAAE;
|
|
1
|
+
{"version":3,"file":"index.mjs","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":";OAEO,EAAE,WAAW,EAAE;OACf,EAAc,eAAe,EAAE;OAC/B,EAAE,iBAAiB,EAAE;OACrB,EAAE,0BAA0B,EAAE;OAE9B,EAAE,eAAe,EAAE,SAAS,EAAE;AAErC,KAAK,UAAU,IAAI;IACjB,MAAM,OAAO,GAAG,mBAAmB,EAAE,CAAC;IACtC,eAAe,CAAC;QACd,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;QACvC,MAAM,EAAE,OAAO,CAAC,SAAS,KAAK,QAAQ;KACvC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAExD,SAAS,EAAE,CAAC,IAAI,CACd,EAAE,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAChD,4BAA4B,aAAa,CAAC,MAAM,QAAQ,CACzD,CAAC;IAEF,QAAQ,OAAO,CAAC,SAAS,EAAE,CAAC;QAC1B,KAAK,OAAO;YACV,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC;YACjC,MAAM;QACR,KAAK,MAAM;YACT,MAAM,0BAA0B,CAAC;gBAC/B,UAAU,EAAE,OAAO;gBACnB,IAAI,EAAE,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI;aACrC,CAAC,CAAC;YACH,MAAM;IACV,CAAC;AACH,CAAC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;IAC5B,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACrB,sCAAsC;QACtC,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;QAC9C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB;IAC1B,IAAI,CAAC;QACH,OAAO,eAAe,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,iEAAiE;QACjE,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;QAC9C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,OAAmB;IACnD,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,SAAS,EAAE,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;YACzD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,SAAS,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,uBAAuB,CAAC,CAAC;QACtD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"instructions.d.mts","sourceRoot":"","sources":["src/instructions.ts"],"names":[],"mappings":"AA2BA,wBAAsB,eAAe,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAW1F"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["src/instructions.ts"],"names":[],"mappings":"AA2BA,wBAAsB,eAAe,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAW1F"}
|
package/instructions.js
ADDED
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.getInstructions = getInstructions;
|
|
5
|
+
const util_1 = require("./util.js");
|
|
6
|
+
const logger_1 = require("./logger.js");
|
|
7
|
+
const INSTRUCTIONS_CACHE_TTL_MS = 15 * 60 * 1000; // 15 minutes
|
|
8
|
+
const instructionsCache = new Map();
|
|
9
|
+
// Periodically evict stale entries so the cache doesn't grow unboundedly.
|
|
10
|
+
const _cacheCleanupInterval = setInterval(() => {
|
|
11
|
+
const now = Date.now();
|
|
12
|
+
for (const [key, entry] of instructionsCache) {
|
|
13
|
+
if (now - entry.fetchedAt > INSTRUCTIONS_CACHE_TTL_MS) {
|
|
14
|
+
instructionsCache.delete(key);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}, INSTRUCTIONS_CACHE_TTL_MS);
|
|
18
|
+
// Don't keep the process alive just for cleanup.
|
|
19
|
+
_cacheCleanupInterval.unref();
|
|
20
|
+
async function getInstructions(stainlessApiKey) {
|
|
21
|
+
const cacheKey = stainlessApiKey ?? '';
|
|
22
|
+
const cached = instructionsCache.get(cacheKey);
|
|
23
|
+
if (cached && Date.now() - cached.fetchedAt <= INSTRUCTIONS_CACHE_TTL_MS) {
|
|
24
|
+
return cached.fetchedInstructions;
|
|
25
|
+
}
|
|
26
|
+
const fetchedInstructions = await fetchLatestInstructions(stainlessApiKey);
|
|
27
|
+
instructionsCache.set(cacheKey, { fetchedInstructions, fetchedAt: Date.now() });
|
|
28
|
+
return fetchedInstructions;
|
|
29
|
+
}
|
|
30
|
+
async function fetchLatestInstructions(stainlessApiKey) {
|
|
31
|
+
// Setting the stainless API key is optional, but may be required
|
|
32
|
+
// to authenticate requests to the Stainless API.
|
|
33
|
+
const response = await fetch((0, util_1.readEnv)('CODE_MODE_INSTRUCTIONS_URL') ?? 'https://api.stainless.com/api/ai/instructions/llamacloud-prod', {
|
|
34
|
+
method: 'GET',
|
|
35
|
+
headers: { ...(stainlessApiKey && { Authorization: stainlessApiKey }) },
|
|
36
|
+
});
|
|
37
|
+
let instructions;
|
|
38
|
+
if (!response.ok) {
|
|
39
|
+
(0, logger_1.getLogger)().warn('Warning: failed to retrieve MCP server instructions. Proceeding with default instructions...');
|
|
40
|
+
instructions = `
|
|
41
|
+
This is the llamacloud-prod MCP server. You will use Code Mode to help the user perform
|
|
42
|
+
actions. You can use search_docs tool to learn about how to take action with this server. Then,
|
|
43
|
+
you will write TypeScript code using the execute tool take action. It is CRITICAL that you be
|
|
44
|
+
thoughtful and deliberate when executing code. Always try to entirely solve the problem in code
|
|
45
|
+
block: it can be as long as you need to get the job done!
|
|
46
|
+
`;
|
|
47
|
+
}
|
|
48
|
+
instructions ??= (await response.json()).instructions;
|
|
49
|
+
instructions = `
|
|
50
|
+
If needed, you can get the current time by executing Date.now().
|
|
51
|
+
|
|
52
|
+
${instructions}
|
|
53
|
+
`;
|
|
54
|
+
return instructions;
|
|
55
|
+
}
|
|
56
|
+
//# sourceMappingURL=instructions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"instructions.js","sourceRoot":"","sources":["src/instructions.ts"],"names":[],"mappings":";AAAA,sFAAsF;;AA2BtF,0CAWC;AApCD,oCAAiC;AACjC,wCAAqC;AAErC,MAAM,yBAAyB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;AAO/D,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAkC,CAAC;AAEpE,0EAA0E;AAC1E,MAAM,qBAAqB,GAAG,WAAW,CAAC,GAAG,EAAE;IAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,iBAAiB,EAAE,CAAC;QAC7C,IAAI,GAAG,GAAG,KAAK,CAAC,SAAS,GAAG,yBAAyB,EAAE,CAAC;YACtD,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;AACH,CAAC,EAAE,yBAAyB,CAAC,CAAC;AAE9B,iDAAiD;AACjD,qBAAqB,CAAC,KAAK,EAAE,CAAC;AAEvB,KAAK,UAAU,eAAe,CAAC,eAAmC;IACvE,MAAM,QAAQ,GAAG,eAAe,IAAI,EAAE,CAAC;IACvC,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE/C,IAAI,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,SAAS,IAAI,yBAAyB,EAAE,CAAC;QACzE,OAAO,MAAM,CAAC,mBAAmB,CAAC;IACpC,CAAC;IAED,MAAM,mBAAmB,GAAG,MAAM,uBAAuB,CAAC,eAAe,CAAC,CAAC;IAC3E,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,mBAAmB,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAChF,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAED,KAAK,UAAU,uBAAuB,CAAC,eAAmC;IACxE,iEAAiE;IACjE,iDAAiD;IACjD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC1B,IAAA,cAAO,EAAC,4BAA4B,CAAC,IAAI,+DAA+D,EACxG;QACE,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,EAAE,GAAG,CAAC,eAAe,IAAI,EAAE,aAAa,EAAE,eAAe,EAAE,CAAC,EAAE;KACxE,CACF,CAAC;IAEF,IAAI,YAAgC,CAAC;IACrC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,IAAA,kBAAS,GAAE,CAAC,IAAI,CACd,8FAA8F,CAC/F,CAAC;QAEF,YAAY,GAAG;;;;;;KAMd,CAAC;IACJ,CAAC;IAED,YAAY,KAAM,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA8B,CAAC,YAAY,CAAC;IACpF,YAAY,GAAG;;;MAGX,YAAY;GACf,CAAC;IAEF,OAAO,YAAY,CAAC;AACtB,CAAC"}
|
package/instructions.mjs
ADDED
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
|
|
2
|
+
import { readEnv } from "./util.mjs";
|
|
3
|
+
import { getLogger } from "./logger.mjs";
|
|
4
|
+
const INSTRUCTIONS_CACHE_TTL_MS = 15 * 60 * 1000; // 15 minutes
|
|
5
|
+
const instructionsCache = new Map();
|
|
6
|
+
// Periodically evict stale entries so the cache doesn't grow unboundedly.
|
|
7
|
+
const _cacheCleanupInterval = setInterval(() => {
|
|
8
|
+
const now = Date.now();
|
|
9
|
+
for (const [key, entry] of instructionsCache) {
|
|
10
|
+
if (now - entry.fetchedAt > INSTRUCTIONS_CACHE_TTL_MS) {
|
|
11
|
+
instructionsCache.delete(key);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
}, INSTRUCTIONS_CACHE_TTL_MS);
|
|
15
|
+
// Don't keep the process alive just for cleanup.
|
|
16
|
+
_cacheCleanupInterval.unref();
|
|
17
|
+
export async function getInstructions(stainlessApiKey) {
|
|
18
|
+
const cacheKey = stainlessApiKey ?? '';
|
|
19
|
+
const cached = instructionsCache.get(cacheKey);
|
|
20
|
+
if (cached && Date.now() - cached.fetchedAt <= INSTRUCTIONS_CACHE_TTL_MS) {
|
|
21
|
+
return cached.fetchedInstructions;
|
|
22
|
+
}
|
|
23
|
+
const fetchedInstructions = await fetchLatestInstructions(stainlessApiKey);
|
|
24
|
+
instructionsCache.set(cacheKey, { fetchedInstructions, fetchedAt: Date.now() });
|
|
25
|
+
return fetchedInstructions;
|
|
26
|
+
}
|
|
27
|
+
async function fetchLatestInstructions(stainlessApiKey) {
|
|
28
|
+
// Setting the stainless API key is optional, but may be required
|
|
29
|
+
// to authenticate requests to the Stainless API.
|
|
30
|
+
const response = await fetch(readEnv('CODE_MODE_INSTRUCTIONS_URL') ?? 'https://api.stainless.com/api/ai/instructions/llamacloud-prod', {
|
|
31
|
+
method: 'GET',
|
|
32
|
+
headers: { ...(stainlessApiKey && { Authorization: stainlessApiKey }) },
|
|
33
|
+
});
|
|
34
|
+
let instructions;
|
|
35
|
+
if (!response.ok) {
|
|
36
|
+
getLogger().warn('Warning: failed to retrieve MCP server instructions. Proceeding with default instructions...');
|
|
37
|
+
instructions = `
|
|
38
|
+
This is the llamacloud-prod MCP server. You will use Code Mode to help the user perform
|
|
39
|
+
actions. You can use search_docs tool to learn about how to take action with this server. Then,
|
|
40
|
+
you will write TypeScript code using the execute tool take action. It is CRITICAL that you be
|
|
41
|
+
thoughtful and deliberate when executing code. Always try to entirely solve the problem in code
|
|
42
|
+
block: it can be as long as you need to get the job done!
|
|
43
|
+
`;
|
|
44
|
+
}
|
|
45
|
+
instructions ??= (await response.json()).instructions;
|
|
46
|
+
instructions = `
|
|
47
|
+
If needed, you can get the current time by executing Date.now().
|
|
48
|
+
|
|
49
|
+
${instructions}
|
|
50
|
+
`;
|
|
51
|
+
return instructions;
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=instructions.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"instructions.mjs","sourceRoot":"","sources":["src/instructions.ts"],"names":[],"mappings":"AAAA,sFAAsF;OAE/E,EAAE,OAAO,EAAE;OACX,EAAE,SAAS,EAAE;AAEpB,MAAM,yBAAyB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;AAO/D,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAkC,CAAC;AAEpE,0EAA0E;AAC1E,MAAM,qBAAqB,GAAG,WAAW,CAAC,GAAG,EAAE;IAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,iBAAiB,EAAE,CAAC;QAC7C,IAAI,GAAG,GAAG,KAAK,CAAC,SAAS,GAAG,yBAAyB,EAAE,CAAC;YACtD,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;AACH,CAAC,EAAE,yBAAyB,CAAC,CAAC;AAE9B,iDAAiD;AACjD,qBAAqB,CAAC,KAAK,EAAE,CAAC;AAE9B,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,eAAmC;IACvE,MAAM,QAAQ,GAAG,eAAe,IAAI,EAAE,CAAC;IACvC,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE/C,IAAI,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,SAAS,IAAI,yBAAyB,EAAE,CAAC;QACzE,OAAO,MAAM,CAAC,mBAAmB,CAAC;IACpC,CAAC;IAED,MAAM,mBAAmB,GAAG,MAAM,uBAAuB,CAAC,eAAe,CAAC,CAAC;IAC3E,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,mBAAmB,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAChF,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAED,KAAK,UAAU,uBAAuB,CAAC,eAAmC;IACxE,iEAAiE;IACjE,iDAAiD;IACjD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC1B,OAAO,CAAC,4BAA4B,CAAC,IAAI,+DAA+D,EACxG;QACE,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,EAAE,GAAG,CAAC,eAAe,IAAI,EAAE,aAAa,EAAE,eAAe,EAAE,CAAC,EAAE;KACxE,CACF,CAAC;IAEF,IAAI,YAAgC,CAAC;IACrC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,SAAS,EAAE,CAAC,IAAI,CACd,8FAA8F,CAC/F,CAAC;QAEF,YAAY,GAAG;;;;;;KAMd,CAAC;IACJ,CAAC;IAED,YAAY,KAAM,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA8B,CAAC,YAAY,CAAC;IACpF,YAAY,GAAG;;;MAGX,YAAY;GACf,CAAC;IAEF,OAAO,YAAY,CAAC;AACtB,CAAC"}
|
package/logger.d.mts
ADDED
package/logger.d.mts.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.d.mts","sourceRoot":"","sources":["src/logger.ts"],"names":[],"mappings":"OAEO,EAAQ,KAAK,KAAK,EAAE,KAAK,MAAM,EAAE,MAAM,MAAM;AAKpD,wBAAgB,eAAe,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAarG;AAED,wBAAgB,SAAS,IAAI,MAAM,CAKlC"}
|