@mhingston5/conduit 1.1.1 → 1.1.3
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/README.md +29 -5
- package/dist/assets/deno-shim.ts +93 -0
- package/dist/assets/python-shim.py +21 -0
- package/dist/executors/pyodide.worker.d.ts +2 -0
- package/dist/executors/pyodide.worker.js +163 -0
- package/dist/executors/pyodide.worker.js.map +1 -0
- package/dist/index.d.ts +2 -0
- package/dist/index.js +3250 -0
- package/dist/index.js.map +1 -0
- package/docs/ARCHITECTURE.md +2 -2
- package/docs/CODE_MODE.md +1 -1
- package/docs/SECURITY.md +1 -1
- package/package.json +6 -1
- package/src/assets/deno-shim.ts +2 -2
- package/src/auth.cmd.ts +95 -0
- package/src/core/config.service.ts +5 -2
- package/src/core/middleware/auth.middleware.ts +1 -1
- package/src/core/request.controller.ts +25 -9
- package/src/core/security.service.ts +3 -3
- package/src/executors/pyodide.worker.ts +2 -2
- package/src/gateway/auth.service.ts +19 -18
- package/src/gateway/gateway.service.ts +3 -3
- package/src/index.ts +52 -8
- package/src/transport/socket.transport.ts +8 -3
- package/tests/auth.service.test.ts +8 -13
- package/tests/config.service.test.ts +31 -0
- package/tests/contract.test.ts +2 -2
- package/tests/dynamic.tool.test.ts +5 -5
- package/tests/e2e_stdio_upstream.test.ts +3 -3
- package/tests/gateway.service.test.ts +5 -5
- package/tests/hardening.test.ts +3 -3
- package/tests/routing.test.ts +24 -4
- package/tests/socket.transport.test.ts +3 -3
- package/tests/vscode_e2e.test.ts +1 -1
|
@@ -149,7 +149,7 @@ describe('E2E: Stdio Upstream Integration', () => {
|
|
|
149
149
|
const response = await sendRequest({
|
|
150
150
|
jsonrpc: '2.0',
|
|
151
151
|
id: '1',
|
|
152
|
-
method: '
|
|
152
|
+
method: 'mcp_discover_tools',
|
|
153
153
|
params: {},
|
|
154
154
|
auth: { bearerToken: ipcToken },
|
|
155
155
|
});
|
|
@@ -169,7 +169,7 @@ describe('E2E: Stdio Upstream Integration', () => {
|
|
|
169
169
|
const discoverResponse = await sendRequest({
|
|
170
170
|
jsonrpc: '2.0',
|
|
171
171
|
id: '1',
|
|
172
|
-
method: '
|
|
172
|
+
method: 'mcp_discover_tools',
|
|
173
173
|
params: {},
|
|
174
174
|
auth: { bearerToken: ipcToken },
|
|
175
175
|
});
|
|
@@ -181,7 +181,7 @@ describe('E2E: Stdio Upstream Integration', () => {
|
|
|
181
181
|
const callResponse = await sendRequest({
|
|
182
182
|
jsonrpc: '2.0',
|
|
183
183
|
id: '2',
|
|
184
|
-
method: '
|
|
184
|
+
method: 'mcp_call_tool',
|
|
185
185
|
params: {
|
|
186
186
|
name: echoTool.name,
|
|
187
187
|
arguments: { message: 'Hello from E2E test!' },
|
|
@@ -32,17 +32,17 @@ describe('GatewayService', () => {
|
|
|
32
32
|
|
|
33
33
|
const tools = await gateway.discoverTools(context);
|
|
34
34
|
expect(tools.length).toBeGreaterThanOrEqual(3);
|
|
35
|
-
expect(tools.find(t => t.name === '
|
|
36
|
-
expect(tools.find(t => t.name === '
|
|
37
|
-
expect(tools.find(t => t.name === '
|
|
35
|
+
expect(tools.find(t => t.name === 'mcp_execute_typescript')).toBeDefined();
|
|
36
|
+
expect(tools.find(t => t.name === 'mcp_execute_python')).toBeDefined();
|
|
37
|
+
expect(tools.find(t => t.name === 'mcp_execute_isolate')).toBeDefined();
|
|
38
38
|
expect(tools.find(t => t.name === 'u1__t1')).toBeDefined();
|
|
39
39
|
expect(tools.find(t => t.name === 'u2__t2')).toBeDefined();
|
|
40
40
|
});
|
|
41
41
|
|
|
42
42
|
it('should return schema for built-in tools', async () => {
|
|
43
|
-
const schema = await gateway.getToolSchema('
|
|
43
|
+
const schema = await gateway.getToolSchema('mcp_execute_typescript', context);
|
|
44
44
|
expect(schema).toBeDefined();
|
|
45
|
-
expect(schema?.name).toBe('
|
|
45
|
+
expect(schema?.name).toBe('mcp_execute_typescript');
|
|
46
46
|
expect(schema?.inputSchema.required).toContain('code');
|
|
47
47
|
});
|
|
48
48
|
|
package/tests/hardening.test.ts
CHANGED
|
@@ -92,7 +92,7 @@ describe('V1 Hardening Tests', () => {
|
|
|
92
92
|
const response = await sendRequest({
|
|
93
93
|
jsonrpc: '2.0',
|
|
94
94
|
id: 1,
|
|
95
|
-
method: '
|
|
95
|
+
method: 'mcp_execute_typescript',
|
|
96
96
|
params: { code: 'console.log("hi")' },
|
|
97
97
|
auth: { bearerToken: sessionToken }
|
|
98
98
|
});
|
|
@@ -114,7 +114,7 @@ describe('V1 Hardening Tests', () => {
|
|
|
114
114
|
const response = await sendRequest({
|
|
115
115
|
jsonrpc: '2.0',
|
|
116
116
|
id: 2,
|
|
117
|
-
method: '
|
|
117
|
+
method: 'mcp_discover_tools',
|
|
118
118
|
params: {},
|
|
119
119
|
auth: { bearerToken: sessionToken }
|
|
120
120
|
});
|
|
@@ -127,7 +127,7 @@ describe('V1 Hardening Tests', () => {
|
|
|
127
127
|
const response = await sendRequest({
|
|
128
128
|
jsonrpc: '2.0',
|
|
129
129
|
id: 3,
|
|
130
|
-
method: '
|
|
130
|
+
method: 'mcp_execute_typescript',
|
|
131
131
|
params: { code: 'import * as os from "os"; console.log("hi")' },
|
|
132
132
|
auth: { bearerToken: 'master-token' }
|
|
133
133
|
});
|
package/tests/routing.test.ts
CHANGED
|
@@ -84,7 +84,7 @@ describe('RequestController Routing', () => {
|
|
|
84
84
|
const result = await controller.handleRequest({
|
|
85
85
|
jsonrpc: '2.0',
|
|
86
86
|
id: 1,
|
|
87
|
-
method: '
|
|
87
|
+
method: 'mcp_execute_typescript',
|
|
88
88
|
params: {
|
|
89
89
|
code: 'console.log("simple")',
|
|
90
90
|
limits: {}
|
|
@@ -101,7 +101,7 @@ describe('RequestController Routing', () => {
|
|
|
101
101
|
const result = await controller.handleRequest({
|
|
102
102
|
jsonrpc: '2.0',
|
|
103
103
|
id: 1,
|
|
104
|
-
method: '
|
|
104
|
+
method: 'mcp_execute_typescript',
|
|
105
105
|
params: {
|
|
106
106
|
code: 'import { foo } from "bar"; console.log(foo)',
|
|
107
107
|
limits: {}
|
|
@@ -118,7 +118,7 @@ describe('RequestController Routing', () => {
|
|
|
118
118
|
const result = await controller.handleRequest({
|
|
119
119
|
jsonrpc: '2.0',
|
|
120
120
|
id: 1,
|
|
121
|
-
method: '
|
|
121
|
+
method: 'mcp_execute_typescript',
|
|
122
122
|
params: {
|
|
123
123
|
code: 'export const foo = "bar"',
|
|
124
124
|
limits: {}
|
|
@@ -134,7 +134,7 @@ describe('RequestController Routing', () => {
|
|
|
134
134
|
const result = await controller.handleRequest({
|
|
135
135
|
jsonrpc: '2.0',
|
|
136
136
|
id: 1,
|
|
137
|
-
method: '
|
|
137
|
+
method: 'mcp_execute_typescript',
|
|
138
138
|
params: {
|
|
139
139
|
code: 'console.log(Deno.version)',
|
|
140
140
|
limits: {}
|
|
@@ -145,4 +145,24 @@ describe('RequestController Routing', () => {
|
|
|
145
145
|
expect(mockDenoExecutor.execute).toHaveBeenCalled();
|
|
146
146
|
expect(mockIsolateExecutor.execute).not.toHaveBeenCalled();
|
|
147
147
|
});
|
|
148
|
+
|
|
149
|
+
it('should route tools/call for built-in tools', async () => {
|
|
150
|
+
const result = await controller.handleRequest({
|
|
151
|
+
jsonrpc: '2.0',
|
|
152
|
+
id: 1,
|
|
153
|
+
method: 'tools/call',
|
|
154
|
+
params: {
|
|
155
|
+
name: 'mcp_execute_typescript',
|
|
156
|
+
arguments: {
|
|
157
|
+
code: 'console.log("via tools/call")',
|
|
158
|
+
limits: {}
|
|
159
|
+
}
|
|
160
|
+
},
|
|
161
|
+
auth: { bearerToken: 'master-token' }
|
|
162
|
+
}, mockContext);
|
|
163
|
+
|
|
164
|
+
expect(mockIsolateExecutor.execute).toHaveBeenCalled();
|
|
165
|
+
expect(result!.result.stdout).toBe('isolate');
|
|
166
|
+
});
|
|
167
|
+
|
|
148
168
|
});
|
|
@@ -100,7 +100,7 @@ describe('SocketTransport', () => {
|
|
|
100
100
|
});
|
|
101
101
|
}
|
|
102
102
|
|
|
103
|
-
it('should handle
|
|
103
|
+
it('should handle mcp_execute_typescript request', async () => {
|
|
104
104
|
transport = new SocketTransport(logger, requestController, concurrencyService);
|
|
105
105
|
const address = await transport.listen({ port: 0 });
|
|
106
106
|
const portMatch = address.match(/:(\d+)$/);
|
|
@@ -112,7 +112,7 @@ describe('SocketTransport', () => {
|
|
|
112
112
|
const request = {
|
|
113
113
|
jsonrpc: '2.0',
|
|
114
114
|
id: 1,
|
|
115
|
-
method: '
|
|
115
|
+
method: 'mcp_execute_typescript',
|
|
116
116
|
params: { code: 'console.log("hello E2E")' },
|
|
117
117
|
auth: { bearerToken: testToken }
|
|
118
118
|
};
|
|
@@ -153,7 +153,7 @@ describe('SocketTransport', () => {
|
|
|
153
153
|
const request = {
|
|
154
154
|
jsonrpc: '2.0',
|
|
155
155
|
id: 12345,
|
|
156
|
-
method: '
|
|
156
|
+
method: 'mcp_execute_typescript',
|
|
157
157
|
params: { code: 'console.log("hello")' },
|
|
158
158
|
auth: { bearerToken: testToken }
|
|
159
159
|
};
|
package/tests/vscode_e2e.test.ts
CHANGED
|
@@ -24,7 +24,7 @@ describe('E2E: Native Stdio Mode', () => {
|
|
|
24
24
|
const request = {
|
|
25
25
|
jsonrpc: '2.0',
|
|
26
26
|
id: '1',
|
|
27
|
-
method: '
|
|
27
|
+
method: 'mcp_discover_tools',
|
|
28
28
|
params: {},
|
|
29
29
|
// Use a dummy token, security service might reject if auth is enabled but
|
|
30
30
|
// the default config generates a random token.
|