@mintmcp/hosted-cli 0.0.19 → 0.0.20
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/dist/api.d.ts +36 -13
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js +13 -3
- package/dist/api.js.map +1 -1
- package/dist/containerBuilder.js +19 -18
- package/dist/containerBuilder.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +134 -11
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/src/api.ts +14 -3
- package/src/containerBuilder.ts +30 -21
- package/src/index.ts +199 -25
package/dist/api.d.ts
CHANGED
|
@@ -117,7 +117,6 @@ export declare const UserConfigUpdateSchema: z.ZodObject<{
|
|
|
117
117
|
name: string;
|
|
118
118
|
}>, "many">;
|
|
119
119
|
}, "strip", z.ZodTypeAny, {
|
|
120
|
-
userGivenName: string;
|
|
121
120
|
image: string;
|
|
122
121
|
transport: {
|
|
123
122
|
path: string;
|
|
@@ -125,6 +124,7 @@ export declare const UserConfigUpdateSchema: z.ZodObject<{
|
|
|
125
124
|
} | {
|
|
126
125
|
type: "stdio";
|
|
127
126
|
};
|
|
127
|
+
userGivenName: string;
|
|
128
128
|
cpu: number;
|
|
129
129
|
memoryMiB: number;
|
|
130
130
|
urlPath: string;
|
|
@@ -140,8 +140,8 @@ export declare const UserConfigUpdateSchema: z.ZodObject<{
|
|
|
140
140
|
};
|
|
141
141
|
name: string;
|
|
142
142
|
}[];
|
|
143
|
-
command?: string | string[] | undefined;
|
|
144
143
|
secretDataZipGcsPath?: string | undefined;
|
|
144
|
+
command?: string | string[] | undefined;
|
|
145
145
|
}, {
|
|
146
146
|
userGivenName: string;
|
|
147
147
|
replaceEnv: {
|
|
@@ -156,17 +156,17 @@ export declare const UserConfigUpdateSchema: z.ZodObject<{
|
|
|
156
156
|
name: string;
|
|
157
157
|
}[];
|
|
158
158
|
image?: string | undefined;
|
|
159
|
-
command?: string | string[] | undefined;
|
|
160
159
|
transport?: {
|
|
161
160
|
path: string;
|
|
162
161
|
type: "http";
|
|
163
162
|
} | {
|
|
164
163
|
type: "stdio";
|
|
165
164
|
} | undefined;
|
|
165
|
+
secretDataZipGcsPath?: string | undefined;
|
|
166
|
+
command?: string | string[] | undefined;
|
|
166
167
|
cpu?: number | undefined;
|
|
167
168
|
memoryMiB?: number | undefined;
|
|
168
169
|
urlPath?: string | undefined;
|
|
169
|
-
secretDataZipGcsPath?: string | undefined;
|
|
170
170
|
startupProbe?: "startupProbeOn" | "startupProbeOff" | undefined;
|
|
171
171
|
}>;
|
|
172
172
|
declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
@@ -197,17 +197,17 @@ declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
197
197
|
name: string;
|
|
198
198
|
}[];
|
|
199
199
|
image?: string | undefined;
|
|
200
|
-
command?: string | string[] | undefined;
|
|
201
200
|
transport?: {
|
|
202
201
|
path: string;
|
|
203
202
|
type: "http";
|
|
204
203
|
} | {
|
|
205
204
|
type: "stdio";
|
|
206
205
|
} | undefined;
|
|
206
|
+
secretDataZipGcsPath?: string | undefined;
|
|
207
|
+
command?: string | string[] | undefined;
|
|
207
208
|
cpu?: number | undefined;
|
|
208
209
|
memoryMiB?: number | undefined;
|
|
209
210
|
urlPath?: string | undefined;
|
|
210
|
-
secretDataZipGcsPath?: string | undefined;
|
|
211
211
|
startupProbe?: "startupProbeOn" | "startupProbeOff" | undefined;
|
|
212
212
|
};
|
|
213
213
|
};
|
|
@@ -219,11 +219,8 @@ declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
219
219
|
}>;
|
|
220
220
|
partialUpdateServer: import("@trpc/server").TRPCMutationProcedure<{
|
|
221
221
|
input: {
|
|
222
|
-
hostedId: string;
|
|
223
222
|
update: {
|
|
224
|
-
userGivenName?: string | undefined;
|
|
225
223
|
image?: string | undefined;
|
|
226
|
-
command?: string | string[] | null | undefined;
|
|
227
224
|
transport?: {
|
|
228
225
|
path: string;
|
|
229
226
|
type: "http";
|
|
@@ -231,9 +228,23 @@ declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
231
228
|
type: "stdio";
|
|
232
229
|
} | undefined;
|
|
233
230
|
secretDataZipGcsPath?: string | undefined;
|
|
231
|
+
userGivenName?: string | undefined;
|
|
232
|
+
command?: string | string[] | null | undefined;
|
|
234
233
|
};
|
|
234
|
+
hostedId?: string | undefined;
|
|
235
|
+
gatewayId?: string | undefined;
|
|
235
236
|
};
|
|
236
237
|
output: {
|
|
238
|
+
config: {
|
|
239
|
+
transport: {
|
|
240
|
+
path: string;
|
|
241
|
+
type: "http";
|
|
242
|
+
} | {
|
|
243
|
+
type: "stdio";
|
|
244
|
+
};
|
|
245
|
+
image?: string | undefined;
|
|
246
|
+
secretDataZipGcsPath?: string | undefined;
|
|
247
|
+
};
|
|
237
248
|
hostedId: string & z.BRAND<"HostedId">;
|
|
238
249
|
gatewayId?: string | undefined;
|
|
239
250
|
};
|
|
@@ -241,7 +252,8 @@ declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
241
252
|
}>;
|
|
242
253
|
createRegistryPushSession: import("@trpc/server").TRPCMutationProcedure<{
|
|
243
254
|
input: {
|
|
244
|
-
hostedId
|
|
255
|
+
hostedId?: string | undefined;
|
|
256
|
+
gatewayId?: string | undefined;
|
|
245
257
|
};
|
|
246
258
|
output: {
|
|
247
259
|
registryHost: string;
|
|
@@ -250,6 +262,16 @@ declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
250
262
|
password: string;
|
|
251
263
|
imageTag: string;
|
|
252
264
|
finalizeToken: string;
|
|
265
|
+
currentConfig: {
|
|
266
|
+
transport: {
|
|
267
|
+
path: string;
|
|
268
|
+
type: "http";
|
|
269
|
+
} | {
|
|
270
|
+
type: "stdio";
|
|
271
|
+
};
|
|
272
|
+
image?: string | undefined;
|
|
273
|
+
secretDataZipGcsPath?: string | undefined;
|
|
274
|
+
};
|
|
253
275
|
};
|
|
254
276
|
meta: object;
|
|
255
277
|
}>;
|
|
@@ -267,8 +289,9 @@ declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
267
289
|
}>;
|
|
268
290
|
finalizeRegistryPush: import("@trpc/server").TRPCMutationProcedure<{
|
|
269
291
|
input: {
|
|
270
|
-
hostedId: string;
|
|
271
292
|
finalizeToken: string;
|
|
293
|
+
hostedId?: string | undefined;
|
|
294
|
+
gatewayId?: string | undefined;
|
|
272
295
|
};
|
|
273
296
|
output: {
|
|
274
297
|
hostedId: string & z.BRAND<"HostedId">;
|
|
@@ -291,17 +314,17 @@ declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
|
|
|
291
314
|
};
|
|
292
315
|
name: string;
|
|
293
316
|
}[];
|
|
294
|
-
command?: string | string[] | undefined;
|
|
295
317
|
transport?: {
|
|
296
318
|
path: string;
|
|
297
319
|
type: "http";
|
|
298
320
|
} | {
|
|
299
321
|
type: "stdio";
|
|
300
322
|
} | undefined;
|
|
323
|
+
secretDataZipGcsPath?: string | undefined;
|
|
324
|
+
command?: string | string[] | undefined;
|
|
301
325
|
cpu?: number | undefined;
|
|
302
326
|
memoryMiB?: number | undefined;
|
|
303
327
|
urlPath?: string | undefined;
|
|
304
|
-
secretDataZipGcsPath?: string | undefined;
|
|
305
328
|
startupProbe?: "startupProbeOn" | "startupProbeOff" | undefined;
|
|
306
329
|
};
|
|
307
330
|
finalizeToken: string;
|
package/dist/api.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAQA,OAAO,CAAC,MAAM,KAAK,CAAC;AAKpB,eAAO,MAAM,gBAAgB,EAAG,SAAkB,CAAC;AACnD,eAAO,MAAM,cAAc,qEAOL,CAAC;AACvB,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAEtD,eAAO,MAAM,eAAe,aAAoB,CAAC;AACjD,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,eAAO,MAAM,qBAAqB,aAA2C,CAAC;AAC9E,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;IAU/B,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAElE,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;KAWQ,CAAC;AAC3C,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAQA,OAAO,CAAC,MAAM,KAAK,CAAC;AAKpB,eAAO,MAAM,gBAAgB,EAAG,SAAkB,CAAC;AACnD,eAAO,MAAM,cAAc,qEAOL,CAAC;AACvB,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAEtD,eAAO,MAAM,eAAe,aAAoB,CAAC;AACjD,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,eAAO,MAAM,qBAAqB,aAA2C,CAAC;AAC9E,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;IAU/B,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAElE,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;KAWQ,CAAC;AAC3C,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAQpE,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmBjC,CAAC;AAKH,QAAA,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuHb,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC"}
|
package/dist/api.js
CHANGED
|
@@ -38,6 +38,11 @@ export const HostedTransportSchema = z
|
|
|
38
38
|
}),
|
|
39
39
|
])
|
|
40
40
|
.default({ type: "http", path: "/mcp" });
|
|
41
|
+
const HostedConfigSummarySchema = z.object({
|
|
42
|
+
image: z.string().optional(),
|
|
43
|
+
transport: HostedTransportSchema,
|
|
44
|
+
secretDataZipGcsPath: z.string().optional(),
|
|
45
|
+
});
|
|
41
46
|
export const UserConfigUpdateSchema = z.object({
|
|
42
47
|
userGivenName: z.string().min(1),
|
|
43
48
|
image: z
|
|
@@ -66,7 +71,8 @@ const appRouter = router({
|
|
|
66
71
|
}),
|
|
67
72
|
partialUpdateServer: procedure
|
|
68
73
|
.input(z.object({
|
|
69
|
-
hostedId: HostedIdSchema,
|
|
74
|
+
hostedId: HostedIdSchema.optional(),
|
|
75
|
+
gatewayId: GatewayIdSchema.optional(),
|
|
70
76
|
update: z.object({
|
|
71
77
|
userGivenName: z.string().optional(),
|
|
72
78
|
image: z.string().optional(),
|
|
@@ -81,13 +87,15 @@ const appRouter = router({
|
|
|
81
87
|
.output(z.object({
|
|
82
88
|
hostedId: HostedIdSchema,
|
|
83
89
|
gatewayId: GatewayIdSchema.optional(),
|
|
90
|
+
config: HostedConfigSummarySchema,
|
|
84
91
|
}))
|
|
85
92
|
.mutation(() => {
|
|
86
93
|
throw new Error("stub");
|
|
87
94
|
}),
|
|
88
95
|
createRegistryPushSession: procedure
|
|
89
96
|
.input(z.object({
|
|
90
|
-
hostedId: HostedIdSchema,
|
|
97
|
+
hostedId: HostedIdSchema.optional(),
|
|
98
|
+
gatewayId: GatewayIdSchema.optional(),
|
|
91
99
|
}))
|
|
92
100
|
.output(z.object({
|
|
93
101
|
registryHost: z.string(),
|
|
@@ -96,6 +104,7 @@ const appRouter = router({
|
|
|
96
104
|
password: z.string(),
|
|
97
105
|
imageTag: ManagedImageTagSchema,
|
|
98
106
|
finalizeToken: z.string(),
|
|
107
|
+
currentConfig: HostedConfigSummarySchema,
|
|
99
108
|
}))
|
|
100
109
|
.mutation(() => {
|
|
101
110
|
throw new Error("stub");
|
|
@@ -115,7 +124,8 @@ const appRouter = router({
|
|
|
115
124
|
}),
|
|
116
125
|
finalizeRegistryPush: procedure
|
|
117
126
|
.input(z.object({
|
|
118
|
-
hostedId: HostedIdSchema,
|
|
127
|
+
hostedId: HostedIdSchema.optional(),
|
|
128
|
+
gatewayId: GatewayIdSchema.optional(),
|
|
119
129
|
finalizeToken: z.string(),
|
|
120
130
|
}))
|
|
121
131
|
.output(z.object({
|
package/dist/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}
|
package/dist/containerBuilder.js
CHANGED
|
@@ -222,33 +222,34 @@ function captureContainerLogs(container) {
|
|
|
222
222
|
}
|
|
223
223
|
async function mcpSmokeTest(params, deps) {
|
|
224
224
|
const deadline = Date.now() + params.probeTimeoutMs;
|
|
225
|
+
const requiredSessions = 2;
|
|
225
226
|
while (Date.now() < deadline) {
|
|
226
227
|
const exitInfo = deps.getExitInfo();
|
|
227
228
|
if (exitInfo) {
|
|
228
229
|
throw new Error(`Container exited before responding to the MCP probe (code=${String(exitInfo.code)}, signal=${String(exitInfo.signal)}).`);
|
|
229
230
|
}
|
|
230
|
-
const client = new Client({
|
|
231
|
-
name: "MintMCP Local Probe",
|
|
232
|
-
version: "1.0.0",
|
|
233
|
-
});
|
|
234
|
-
const transport = new StreamableHTTPClientTransport(new URL(params.url), {
|
|
235
|
-
fetch: deps.fetch,
|
|
236
|
-
});
|
|
237
231
|
try {
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
232
|
+
for (let sessionIndex = 0; sessionIndex < requiredSessions; sessionIndex++) {
|
|
233
|
+
const client = new Client({
|
|
234
|
+
name: "MintMCP Local Probe",
|
|
235
|
+
version: "1.0.0",
|
|
236
|
+
});
|
|
237
|
+
const transport = new StreamableHTTPClientTransport(new URL(params.url), {
|
|
238
|
+
fetch: deps.fetch,
|
|
239
|
+
});
|
|
240
|
+
try {
|
|
241
|
+
await client.connect(transport);
|
|
242
|
+
console.log(`Local MCP initialize succeeded (${sessionIndex + 1}/${requiredSessions}): ${params.url}`);
|
|
243
|
+
const toolsResult = await client.listTools();
|
|
244
|
+
console.log(`Local tools/list succeeded (${sessionIndex + 1}/${requiredSessions}): ${toolsResult.tools.length} tool(s) found`);
|
|
245
|
+
}
|
|
246
|
+
finally {
|
|
247
|
+
await client.close();
|
|
248
|
+
}
|
|
249
|
+
}
|
|
243
250
|
return;
|
|
244
251
|
}
|
|
245
252
|
catch {
|
|
246
|
-
try {
|
|
247
|
-
await client.close();
|
|
248
|
-
}
|
|
249
|
-
catch {
|
|
250
|
-
// Ignore close errors during retry
|
|
251
|
-
}
|
|
252
253
|
const exitInfo = deps.getExitInfo();
|
|
253
254
|
if (exitInfo) {
|
|
254
255
|
throw new Error(`Container exited before responding to the MCP probe (code=${String(exitInfo.code)}, signal=${String(exitInfo.signal)}).`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"containerBuilder.js","sourceRoot":"","sources":["../src/containerBuilder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"containerBuilder.js","sourceRoot":"","sources":["../src/containerBuilder.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAS1E,OAAO,EACL,KAAK,SAAS,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAS1E,OAAO,EACL,KAAK,SAAS,EAMf,MAAM,UAAU,CAAC;AA4ClB,MAAM,MAAM,wBAAwB,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;AACpE,MAAM,MAAM,yBAAyB,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -9,7 +9,7 @@ import { dirname, join } from "path";
|
|
|
9
9
|
import superjson from "superjson";
|
|
10
10
|
import { fileURLToPath } from "url";
|
|
11
11
|
import z, { ZodSchema } from "zod";
|
|
12
|
-
import { HostedIdSchema, UserConfigUpdateSchema, } from "./api.js";
|
|
12
|
+
import { GatewayIdSchema, HostedIdSchema, UserConfigUpdateSchema, } from "./api.js";
|
|
13
13
|
import { clearAllAuth, clearSelectedAuth, EnvSchema, formatAuthSummary, getAuth, getCurrentAuthAccount, getSelectedAuth, getTokenClaims, listAuthRecords, requestAndStoreAuth, sameStoredAuthAccount, useAuth, } from "./auth.js";
|
|
14
14
|
import { assertImageSupportsPlatform, buildImage, defaultBuildPlatform, defaultLocalTestImageRef, ensureDockerAvailable, ensureDockerBuildxAvailable, ensureImageAvailableLocally, loginToRegistry, pushImage, smokeTestImage, } from "./containerBuilder.js";
|
|
15
15
|
import { buildPartialUpdate, toHostedTransport, } from "./updateBuilder.js";
|
|
@@ -34,6 +34,9 @@ const HOSTED_CONFIG_PATHS = {
|
|
|
34
34
|
};
|
|
35
35
|
const HostedConfigBaseSchema = z.object({
|
|
36
36
|
hostedId: HostedIdSchema,
|
|
37
|
+
// Gateway ID for this hosted server. Newer config files include this;
|
|
38
|
+
// older ones may omit it. Eventually this becomes the primary identifier.
|
|
39
|
+
gatewayId: GatewayIdSchema.optional(),
|
|
37
40
|
// Organization that owns this hosted server. Older config files may omit it.
|
|
38
41
|
organizationId: z.string().optional(),
|
|
39
42
|
});
|
|
@@ -53,6 +56,12 @@ const HostedConfigSchema = z.union([
|
|
|
53
56
|
function storedTransport(config) {
|
|
54
57
|
return "mode" in config ? config.transport : undefined;
|
|
55
58
|
}
|
|
59
|
+
function localTransportFromHostedTransport(transport) {
|
|
60
|
+
return transport.type;
|
|
61
|
+
}
|
|
62
|
+
function rejectBuildAndPushTransportChange(transport) {
|
|
63
|
+
throw new Error(`--transport ${transport} is only supported when creating a new managed connector with build-and-push. To change transport on an existing connector, use deploy or build-and-deploy.`);
|
|
64
|
+
}
|
|
56
65
|
function canUseDirectImageStartup(params) {
|
|
57
66
|
return params.transport === "http" && params.mntDataDir == undefined;
|
|
58
67
|
}
|
|
@@ -200,6 +209,7 @@ async function createNew(client, base, organizationId, options) {
|
|
|
200
209
|
return {
|
|
201
210
|
config: HostedConfigSchema.parse({
|
|
202
211
|
hostedId: createdServer.hostedId,
|
|
212
|
+
gatewayId: createdServer.gatewayId,
|
|
203
213
|
...(image != undefined
|
|
204
214
|
? { mode: "container", image, transport }
|
|
205
215
|
: {}),
|
|
@@ -209,7 +219,7 @@ async function createNew(client, base, organizationId, options) {
|
|
|
209
219
|
gatewayId: createdServer.gatewayId,
|
|
210
220
|
};
|
|
211
221
|
}
|
|
212
|
-
async function updateExisting(client, base, config, organizationId, options) {
|
|
222
|
+
async function updateExisting(client, base, config, organizationId, options, gatewayId) {
|
|
213
223
|
if (config.organizationId != undefined &&
|
|
214
224
|
config.organizationId !== organizationId) {
|
|
215
225
|
throw new Error(`Hosted config belongs to organization ${config.organizationId}, but the selected credentials are for ${organizationId}. Switch organizations with "hosted auth use --organization-id ${config.organizationId}" before deploying.`);
|
|
@@ -253,12 +263,18 @@ async function updateExisting(client, base, config, organizationId, options) {
|
|
|
253
263
|
: undefined;
|
|
254
264
|
const updatedServer = await client.mcpHost.partialUpdateServer.mutate({
|
|
255
265
|
hostedId: config.hostedId,
|
|
266
|
+
...(gatewayId != undefined ? { gatewayId } : {}),
|
|
256
267
|
update: buildPartialUpdate(options, upload?.secretDataZipGcsPath, {
|
|
257
268
|
clearCommand,
|
|
258
269
|
}),
|
|
259
270
|
});
|
|
260
271
|
return {
|
|
261
|
-
config:
|
|
272
|
+
config: HostedConfigSchema.parse({
|
|
273
|
+
...newConfig,
|
|
274
|
+
...(updatedServer.gatewayId != undefined
|
|
275
|
+
? { gatewayId: updatedServer.gatewayId }
|
|
276
|
+
: {}),
|
|
277
|
+
}),
|
|
262
278
|
...(updatedServer.gatewayId != undefined
|
|
263
279
|
? { gatewayId: updatedServer.gatewayId }
|
|
264
280
|
: {}),
|
|
@@ -298,6 +314,7 @@ async function buildAndPushManagedImage(params) {
|
|
|
298
314
|
}
|
|
299
315
|
const session = await params.client.mcpHost.createRegistryPushSession.mutate({
|
|
300
316
|
hostedId: params.config.hostedId,
|
|
317
|
+
...(params.gatewayId != undefined ? { gatewayId: params.gatewayId } : {}),
|
|
301
318
|
});
|
|
302
319
|
const deployImageRef = managedRegistryImageRef(session);
|
|
303
320
|
const buildResult = buildImage({
|
|
@@ -312,10 +329,17 @@ async function buildAndPushManagedImage(params) {
|
|
|
312
329
|
pushImage(buildResult.imageRef);
|
|
313
330
|
const finalized = await params.client.mcpHost.finalizeRegistryPush.mutate({
|
|
314
331
|
hostedId: params.config.hostedId,
|
|
332
|
+
...(params.gatewayId != undefined ? { gatewayId: params.gatewayId } : {}),
|
|
315
333
|
finalizeToken: session.finalizeToken,
|
|
316
334
|
});
|
|
335
|
+
const updatedConfig = updateConfigAfterManagedPush(params.config, params.organizationId, deployImageRef);
|
|
317
336
|
return {
|
|
318
|
-
config:
|
|
337
|
+
config: HostedConfigSchema.parse({
|
|
338
|
+
...updatedConfig,
|
|
339
|
+
...(finalized.gatewayId != undefined
|
|
340
|
+
? { gatewayId: finalized.gatewayId }
|
|
341
|
+
: {}),
|
|
342
|
+
}),
|
|
319
343
|
...(finalized.gatewayId != undefined
|
|
320
344
|
? { gatewayId: finalized.gatewayId }
|
|
321
345
|
: {}),
|
|
@@ -366,6 +390,7 @@ async function buildAndPushManagedImageForCreate(params) {
|
|
|
366
390
|
return {
|
|
367
391
|
config: HostedConfigSchema.parse({
|
|
368
392
|
hostedId: finalized.hostedId,
|
|
393
|
+
gatewayId: finalized.gatewayId,
|
|
369
394
|
organizationId: params.organizationId,
|
|
370
395
|
mode: "container",
|
|
371
396
|
image: deployImageRef,
|
|
@@ -376,15 +401,54 @@ async function buildAndPushManagedImageForCreate(params) {
|
|
|
376
401
|
gatewayId: finalized.gatewayId,
|
|
377
402
|
};
|
|
378
403
|
}
|
|
379
|
-
async function deployWithOptions(env, base, options) {
|
|
404
|
+
async function deployWithOptions(env, base, options, gatewayId) {
|
|
380
405
|
const auth = await getAuth(env);
|
|
381
406
|
await withAuthRetry(env, async (client) => {
|
|
382
407
|
const configPath = path.join(base, HOSTED_CONFIG_PATHS[env]);
|
|
408
|
+
const hasExistingConfig = fs.existsSync(configPath);
|
|
383
409
|
let result;
|
|
384
|
-
if (
|
|
385
|
-
console.log("Updating existing server...");
|
|
410
|
+
if (hasExistingConfig) {
|
|
386
411
|
const configData = fs.readFileSync(configPath, "utf8");
|
|
387
|
-
|
|
412
|
+
const config = HostedConfigSchema.parse(JSON.parse(configData));
|
|
413
|
+
if (gatewayId != undefined &&
|
|
414
|
+
config.gatewayId != undefined &&
|
|
415
|
+
config.gatewayId !== gatewayId) {
|
|
416
|
+
throw new Error(`--gateway-id ${gatewayId} does not match the gatewayId in ${configPath} (${config.gatewayId}). Remove ${configPath} or omit --gateway-id.`);
|
|
417
|
+
}
|
|
418
|
+
console.log("Updating existing server...");
|
|
419
|
+
result = await updateExisting(client, base, config, auth.organizationId, options, gatewayId);
|
|
420
|
+
logDeployResult(env, "Updated", result);
|
|
421
|
+
}
|
|
422
|
+
else if (gatewayId != undefined) {
|
|
423
|
+
console.log(`Updating existing server via gateway ${gatewayId}...`);
|
|
424
|
+
const upload = options.mntDataDir != undefined
|
|
425
|
+
? await uploadData(client, path.join(base, options.mntDataDir))
|
|
426
|
+
: undefined;
|
|
427
|
+
const updatedServer = await client.mcpHost.partialUpdateServer.mutate({
|
|
428
|
+
gatewayId,
|
|
429
|
+
update: buildPartialUpdate(options, upload?.secretDataZipGcsPath),
|
|
430
|
+
});
|
|
431
|
+
const resolvedGatewayId = updatedServer.gatewayId ?? gatewayId;
|
|
432
|
+
const finalImage = updatedServer.config.image;
|
|
433
|
+
const finalTransport = localTransportFromHostedTransport(updatedServer.config.transport);
|
|
434
|
+
result = {
|
|
435
|
+
config: HostedConfigSchema.parse({
|
|
436
|
+
hostedId: updatedServer.hostedId,
|
|
437
|
+
gatewayId: resolvedGatewayId,
|
|
438
|
+
organizationId: auth.organizationId,
|
|
439
|
+
...(finalImage != undefined
|
|
440
|
+
? {
|
|
441
|
+
mode: "container",
|
|
442
|
+
image: finalImage,
|
|
443
|
+
transport: finalTransport,
|
|
444
|
+
}
|
|
445
|
+
: {}),
|
|
446
|
+
...(options.mntDataDir != undefined
|
|
447
|
+
? { mntDataDir: options.mntDataDir }
|
|
448
|
+
: {}),
|
|
449
|
+
}),
|
|
450
|
+
gatewayId: resolvedGatewayId,
|
|
451
|
+
};
|
|
388
452
|
logDeployResult(env, "Updated", result);
|
|
389
453
|
}
|
|
390
454
|
else {
|
|
@@ -485,9 +549,10 @@ program
|
|
|
485
549
|
.option("-t, --transport <transport>", `Transport (stdio or http). Defaults to 'http' for image-based creates. ${makeDefaultMessage("transport")}`, argParser(TransportSchema))
|
|
486
550
|
.option("--startup-command <command>", `Command that runs on hosted container to start the server (runs in bash). Required for stdio and zip-backed image deploys. ${makeDefaultMessage("startupCommand")}`)
|
|
487
551
|
.option("--mnt-data-dir <directory>", `Directory to copy to /mnt on the server. ${makeDefaultMessage("mntDataDir")}`)
|
|
552
|
+
.option("--gateway-id <id>", "Gateway ID of an existing connector to update. Use when no local hosted config exists.", argParser(GatewayIdSchema))
|
|
488
553
|
.action(async (options) => {
|
|
489
554
|
const { env, base } = program.opts();
|
|
490
|
-
await deployWithOptions(env, base, options);
|
|
555
|
+
await deployWithOptions(env, base, options, options.gatewayId);
|
|
491
556
|
});
|
|
492
557
|
program
|
|
493
558
|
.command("test-image")
|
|
@@ -538,6 +603,7 @@ program
|
|
|
538
603
|
.option("--name <name>", "Connector name when creating a new hosted connector")
|
|
539
604
|
.option("--transport <transport>", "Transport to configure when creating a new managed connector", parseTransport)
|
|
540
605
|
.option("--startup-command <command>", "Startup command to configure when creating a new managed connector")
|
|
606
|
+
.option("--gateway-id <id>", "Gateway ID of an existing connector to update. Use when no local hosted config exists.", argParser(GatewayIdSchema))
|
|
541
607
|
.action(async (options) => {
|
|
542
608
|
const { env, base } = program.opts();
|
|
543
609
|
ensureDockerAvailable();
|
|
@@ -550,11 +616,22 @@ program
|
|
|
550
616
|
const hasExistingConfig = fs.existsSync(configPath);
|
|
551
617
|
const result = await withAuthRetry(env, async (client) => {
|
|
552
618
|
if (hasExistingConfig) {
|
|
619
|
+
if (options.transport != undefined) {
|
|
620
|
+
rejectBuildAndPushTransportChange(options.transport);
|
|
621
|
+
}
|
|
553
622
|
const config = HostedConfigSchema.parse(JSON.parse(fs.readFileSync(configPath, "utf8")));
|
|
623
|
+
if (options.gatewayId != undefined &&
|
|
624
|
+
config.gatewayId != undefined &&
|
|
625
|
+
config.gatewayId !== options.gatewayId) {
|
|
626
|
+
throw new Error(`--gateway-id ${options.gatewayId} does not match the gatewayId in ${configPath} (${config.gatewayId}). Remove ${configPath} or omit --gateway-id.`);
|
|
627
|
+
}
|
|
554
628
|
return await buildAndPushManagedImage({
|
|
555
629
|
client,
|
|
556
630
|
organizationId: auth.organizationId,
|
|
557
631
|
config,
|
|
632
|
+
...(options.gatewayId != undefined
|
|
633
|
+
? { gatewayId: options.gatewayId }
|
|
634
|
+
: {}),
|
|
558
635
|
dockerfile: options.dockerfile,
|
|
559
636
|
context: options.context,
|
|
560
637
|
buildArg: options.buildArg,
|
|
@@ -562,6 +639,42 @@ program
|
|
|
562
639
|
platform: options.platform,
|
|
563
640
|
});
|
|
564
641
|
}
|
|
642
|
+
if (options.gatewayId != undefined) {
|
|
643
|
+
if (options.transport != undefined) {
|
|
644
|
+
rejectBuildAndPushTransportChange(options.transport);
|
|
645
|
+
}
|
|
646
|
+
const gwId = options.gatewayId;
|
|
647
|
+
const session = await client.mcpHost.createRegistryPushSession.mutate({
|
|
648
|
+
gatewayId: gwId,
|
|
649
|
+
});
|
|
650
|
+
const deployImageRef = managedRegistryImageRef(session);
|
|
651
|
+
const buildResult = buildImage({
|
|
652
|
+
dockerfile: options.dockerfile,
|
|
653
|
+
context: options.context,
|
|
654
|
+
buildArgs: options.buildArg,
|
|
655
|
+
...(options.target != undefined ? { target: options.target } : {}),
|
|
656
|
+
platform: options.platform,
|
|
657
|
+
imageRef: deployImageRef,
|
|
658
|
+
});
|
|
659
|
+
loginToRegistry(session.registryHost, session.username, session.password);
|
|
660
|
+
pushImage(buildResult.imageRef);
|
|
661
|
+
const finalized = await client.mcpHost.finalizeRegistryPush.mutate({
|
|
662
|
+
gatewayId: gwId,
|
|
663
|
+
finalizeToken: session.finalizeToken,
|
|
664
|
+
});
|
|
665
|
+
const resolvedGatewayId = finalized.gatewayId ?? gwId;
|
|
666
|
+
return {
|
|
667
|
+
config: HostedConfigSchema.parse({
|
|
668
|
+
hostedId: finalized.hostedId,
|
|
669
|
+
gatewayId: resolvedGatewayId,
|
|
670
|
+
organizationId: auth.organizationId,
|
|
671
|
+
mode: "container",
|
|
672
|
+
image: deployImageRef,
|
|
673
|
+
transport: localTransportFromHostedTransport(session.currentConfig.transport),
|
|
674
|
+
}),
|
|
675
|
+
gatewayId: resolvedGatewayId,
|
|
676
|
+
};
|
|
677
|
+
}
|
|
565
678
|
return await buildAndPushManagedImageForCreate({
|
|
566
679
|
client,
|
|
567
680
|
organizationId: auth.organizationId,
|
|
@@ -596,6 +709,7 @@ program
|
|
|
596
709
|
.option("-t, --transport <transport>", `Transport (stdio or http). Defaults to 'http' for image-based creates. ${makeDefaultMessage("transport")}`, argParser(TransportSchema))
|
|
597
710
|
.option("--startup-command <command>", `Command that runs on hosted container to start the server (runs in bash). Required for stdio and zip-backed image deploys. ${makeDefaultMessage("startupCommand")}`)
|
|
598
711
|
.option("--mnt-data-dir <directory>", `Directory to copy to /mnt on the server. ${makeDefaultMessage("mntDataDir")}`)
|
|
712
|
+
.option("--gateway-id <id>", "Gateway ID of an existing connector to update. Use when no local hosted config exists.", argParser(GatewayIdSchema))
|
|
599
713
|
.action(async (options) => {
|
|
600
714
|
const { env, base } = program.opts();
|
|
601
715
|
ensureDockerAvailable();
|
|
@@ -625,7 +739,7 @@ program
|
|
|
625
739
|
...(options.mntDataDir != undefined
|
|
626
740
|
? { mntDataDir: options.mntDataDir }
|
|
627
741
|
: {}),
|
|
628
|
-
});
|
|
742
|
+
}, options.gatewayId);
|
|
629
743
|
});
|
|
630
744
|
program
|
|
631
745
|
.command("logout")
|
|
@@ -659,5 +773,14 @@ program
|
|
|
659
773
|
console.log(logoutUrl);
|
|
660
774
|
}
|
|
661
775
|
});
|
|
662
|
-
|
|
776
|
+
function cliErrorMessage(error) {
|
|
777
|
+
if (error instanceof Error) {
|
|
778
|
+
return error.message;
|
|
779
|
+
}
|
|
780
|
+
return String(error);
|
|
781
|
+
}
|
|
782
|
+
void program.parseAsync(process.argv).catch((error) => {
|
|
783
|
+
console.error(cliErrorMessage(error));
|
|
784
|
+
process.exitCode = 1;
|
|
785
|
+
});
|
|
663
786
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/api.ts
CHANGED
|
@@ -55,6 +55,12 @@ export const HostedTransportSchema = z
|
|
|
55
55
|
.default({ type: "http", path: "/mcp" });
|
|
56
56
|
export type HostedTransport = z.infer<typeof HostedTransportSchema>;
|
|
57
57
|
|
|
58
|
+
const HostedConfigSummarySchema = z.object({
|
|
59
|
+
image: z.string().optional(),
|
|
60
|
+
transport: HostedTransportSchema,
|
|
61
|
+
secretDataZipGcsPath: z.string().optional(),
|
|
62
|
+
});
|
|
63
|
+
|
|
58
64
|
export const UserConfigUpdateSchema = z.object({
|
|
59
65
|
userGivenName: z.string().min(1),
|
|
60
66
|
image: z
|
|
@@ -92,7 +98,8 @@ const appRouter = router({
|
|
|
92
98
|
partialUpdateServer: procedure
|
|
93
99
|
.input(
|
|
94
100
|
z.object({
|
|
95
|
-
hostedId: HostedIdSchema,
|
|
101
|
+
hostedId: HostedIdSchema.optional(),
|
|
102
|
+
gatewayId: GatewayIdSchema.optional(),
|
|
96
103
|
update: z.object({
|
|
97
104
|
userGivenName: z.string().optional(),
|
|
98
105
|
image: z.string().optional(),
|
|
@@ -109,6 +116,7 @@ const appRouter = router({
|
|
|
109
116
|
z.object({
|
|
110
117
|
hostedId: HostedIdSchema,
|
|
111
118
|
gatewayId: GatewayIdSchema.optional(),
|
|
119
|
+
config: HostedConfigSummarySchema,
|
|
112
120
|
}),
|
|
113
121
|
)
|
|
114
122
|
.mutation(() => {
|
|
@@ -117,7 +125,8 @@ const appRouter = router({
|
|
|
117
125
|
createRegistryPushSession: procedure
|
|
118
126
|
.input(
|
|
119
127
|
z.object({
|
|
120
|
-
hostedId: HostedIdSchema,
|
|
128
|
+
hostedId: HostedIdSchema.optional(),
|
|
129
|
+
gatewayId: GatewayIdSchema.optional(),
|
|
121
130
|
}),
|
|
122
131
|
)
|
|
123
132
|
.output(
|
|
@@ -128,6 +137,7 @@ const appRouter = router({
|
|
|
128
137
|
password: z.string(),
|
|
129
138
|
imageTag: ManagedImageTagSchema,
|
|
130
139
|
finalizeToken: z.string(),
|
|
140
|
+
currentConfig: HostedConfigSummarySchema,
|
|
131
141
|
}),
|
|
132
142
|
)
|
|
133
143
|
.mutation(() => {
|
|
@@ -151,7 +161,8 @@ const appRouter = router({
|
|
|
151
161
|
finalizeRegistryPush: procedure
|
|
152
162
|
.input(
|
|
153
163
|
z.object({
|
|
154
|
-
hostedId: HostedIdSchema,
|
|
164
|
+
hostedId: HostedIdSchema.optional(),
|
|
165
|
+
gatewayId: GatewayIdSchema.optional(),
|
|
155
166
|
finalizeToken: z.string(),
|
|
156
167
|
}),
|
|
157
168
|
)
|
package/src/containerBuilder.ts
CHANGED
|
@@ -433,6 +433,7 @@ async function mcpSmokeTest(
|
|
|
433
433
|
},
|
|
434
434
|
): Promise<void> {
|
|
435
435
|
const deadline = Date.now() + params.probeTimeoutMs;
|
|
436
|
+
const requiredSessions = 2;
|
|
436
437
|
|
|
437
438
|
while (Date.now() < deadline) {
|
|
438
439
|
const exitInfo = deps.getExitInfo();
|
|
@@ -442,32 +443,40 @@ async function mcpSmokeTest(
|
|
|
442
443
|
);
|
|
443
444
|
}
|
|
444
445
|
|
|
445
|
-
const client = new Client({
|
|
446
|
-
name: "MintMCP Local Probe",
|
|
447
|
-
version: "1.0.0",
|
|
448
|
-
});
|
|
449
|
-
const transport = new StreamableHTTPClientTransport(new URL(params.url), {
|
|
450
|
-
fetch: deps.fetch,
|
|
451
|
-
});
|
|
452
|
-
|
|
453
446
|
try {
|
|
454
|
-
|
|
455
|
-
|
|
447
|
+
for (
|
|
448
|
+
let sessionIndex = 0;
|
|
449
|
+
sessionIndex < requiredSessions;
|
|
450
|
+
sessionIndex++
|
|
451
|
+
) {
|
|
452
|
+
const client = new Client({
|
|
453
|
+
name: "MintMCP Local Probe",
|
|
454
|
+
version: "1.0.0",
|
|
455
|
+
});
|
|
456
|
+
const transport = new StreamableHTTPClientTransport(
|
|
457
|
+
new URL(params.url),
|
|
458
|
+
{
|
|
459
|
+
fetch: deps.fetch,
|
|
460
|
+
},
|
|
461
|
+
);
|
|
456
462
|
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
463
|
+
try {
|
|
464
|
+
await client.connect(transport as Transport);
|
|
465
|
+
console.log(
|
|
466
|
+
`Local MCP initialize succeeded (${sessionIndex + 1}/${requiredSessions}): ${params.url}`,
|
|
467
|
+
);
|
|
468
|
+
|
|
469
|
+
const toolsResult = await client.listTools();
|
|
470
|
+
console.log(
|
|
471
|
+
`Local tools/list succeeded (${sessionIndex + 1}/${requiredSessions}): ${toolsResult.tools.length} tool(s) found`,
|
|
472
|
+
);
|
|
473
|
+
} finally {
|
|
474
|
+
await client.close();
|
|
475
|
+
}
|
|
476
|
+
}
|
|
461
477
|
|
|
462
|
-
await client.close();
|
|
463
478
|
return;
|
|
464
479
|
} catch {
|
|
465
|
-
try {
|
|
466
|
-
await client.close();
|
|
467
|
-
} catch {
|
|
468
|
-
// Ignore close errors during retry
|
|
469
|
-
}
|
|
470
|
-
|
|
471
480
|
const exitInfo = deps.getExitInfo();
|
|
472
481
|
if (exitInfo) {
|
|
473
482
|
throw new Error(
|
package/src/index.ts
CHANGED
|
@@ -14,6 +14,7 @@ import z, { ZodSchema } from "zod";
|
|
|
14
14
|
import {
|
|
15
15
|
type AppRouter,
|
|
16
16
|
type GatewayId,
|
|
17
|
+
GatewayIdSchema,
|
|
17
18
|
HostedIdSchema,
|
|
18
19
|
type HostedTransport,
|
|
19
20
|
UserConfigUpdateSchema,
|
|
@@ -86,6 +87,10 @@ const HOSTED_CONFIG_PATHS: Record<Env, string> = {
|
|
|
86
87
|
const HostedConfigBaseSchema = z.object({
|
|
87
88
|
hostedId: HostedIdSchema,
|
|
88
89
|
|
|
90
|
+
// Gateway ID for this hosted server. Newer config files include this;
|
|
91
|
+
// older ones may omit it. Eventually this becomes the primary identifier.
|
|
92
|
+
gatewayId: GatewayIdSchema.optional(),
|
|
93
|
+
|
|
89
94
|
// Organization that owns this hosted server. Older config files may omit it.
|
|
90
95
|
organizationId: z.string().optional(),
|
|
91
96
|
});
|
|
@@ -112,11 +117,27 @@ type DeployResult = {
|
|
|
112
117
|
|
|
113
118
|
type RegistryPushSession =
|
|
114
119
|
CliClientAppRouterOutputs["mcpHost"]["createRegistryPushSession"];
|
|
120
|
+
type RegistryPushImageRefInput = Pick<
|
|
121
|
+
RegistryPushSession,
|
|
122
|
+
"registryHost" | "repository" | "imageTag"
|
|
123
|
+
>;
|
|
115
124
|
|
|
116
125
|
function storedTransport(config: HostedConfig): Transport | undefined {
|
|
117
126
|
return "mode" in config ? config.transport : undefined;
|
|
118
127
|
}
|
|
119
128
|
|
|
129
|
+
function localTransportFromHostedTransport(
|
|
130
|
+
transport: HostedTransport,
|
|
131
|
+
): Transport {
|
|
132
|
+
return transport.type;
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
function rejectBuildAndPushTransportChange(transport: Transport): never {
|
|
136
|
+
throw new Error(
|
|
137
|
+
`--transport ${transport} is only supported when creating a new managed connector with build-and-push. To change transport on an existing connector, use deploy or build-and-deploy.`,
|
|
138
|
+
);
|
|
139
|
+
}
|
|
140
|
+
|
|
120
141
|
function canUseDirectImageStartup(params: {
|
|
121
142
|
transport: Transport | undefined;
|
|
122
143
|
mntDataDir: string | undefined;
|
|
@@ -316,6 +337,7 @@ async function createNew(
|
|
|
316
337
|
return {
|
|
317
338
|
config: HostedConfigSchema.parse({
|
|
318
339
|
hostedId: createdServer.hostedId,
|
|
340
|
+
gatewayId: createdServer.gatewayId,
|
|
319
341
|
...(image != undefined
|
|
320
342
|
? { mode: "container" as const, image, transport }
|
|
321
343
|
: {}),
|
|
@@ -332,6 +354,7 @@ async function updateExisting(
|
|
|
332
354
|
config: HostedConfig,
|
|
333
355
|
organizationId: string,
|
|
334
356
|
options: DeployOptions,
|
|
357
|
+
gatewayId?: GatewayId,
|
|
335
358
|
): Promise<DeployResult> {
|
|
336
359
|
if (
|
|
337
360
|
config.organizationId != undefined &&
|
|
@@ -390,12 +413,18 @@ async function updateExisting(
|
|
|
390
413
|
: undefined;
|
|
391
414
|
const updatedServer = await client.mcpHost.partialUpdateServer.mutate({
|
|
392
415
|
hostedId: config.hostedId,
|
|
416
|
+
...(gatewayId != undefined ? { gatewayId } : {}),
|
|
393
417
|
update: buildPartialUpdate(options, upload?.secretDataZipGcsPath, {
|
|
394
418
|
clearCommand,
|
|
395
419
|
}),
|
|
396
420
|
});
|
|
397
421
|
return {
|
|
398
|
-
config:
|
|
422
|
+
config: HostedConfigSchema.parse({
|
|
423
|
+
...newConfig,
|
|
424
|
+
...(updatedServer.gatewayId != undefined
|
|
425
|
+
? { gatewayId: updatedServer.gatewayId }
|
|
426
|
+
: {}),
|
|
427
|
+
}),
|
|
399
428
|
...(updatedServer.gatewayId != undefined
|
|
400
429
|
? { gatewayId: updatedServer.gatewayId }
|
|
401
430
|
: {}),
|
|
@@ -437,7 +466,7 @@ function updateConfigAfterManagedPush(
|
|
|
437
466
|
});
|
|
438
467
|
}
|
|
439
468
|
|
|
440
|
-
function managedRegistryImageRef(session:
|
|
469
|
+
function managedRegistryImageRef(session: RegistryPushImageRefInput): string {
|
|
441
470
|
return `${session.registryHost}/${session.repository}:${session.imageTag}`;
|
|
442
471
|
}
|
|
443
472
|
|
|
@@ -445,6 +474,7 @@ async function buildAndPushManagedImage(params: {
|
|
|
445
474
|
client: AuthenticatedClient;
|
|
446
475
|
organizationId: string;
|
|
447
476
|
config: HostedConfig;
|
|
477
|
+
gatewayId?: GatewayId;
|
|
448
478
|
dockerfile: string;
|
|
449
479
|
context: string;
|
|
450
480
|
buildArg: string[];
|
|
@@ -462,6 +492,7 @@ async function buildAndPushManagedImage(params: {
|
|
|
462
492
|
|
|
463
493
|
const session = await params.client.mcpHost.createRegistryPushSession.mutate({
|
|
464
494
|
hostedId: params.config.hostedId,
|
|
495
|
+
...(params.gatewayId != undefined ? { gatewayId: params.gatewayId } : {}),
|
|
465
496
|
});
|
|
466
497
|
|
|
467
498
|
const deployImageRef = managedRegistryImageRef(session);
|
|
@@ -479,15 +510,22 @@ async function buildAndPushManagedImage(params: {
|
|
|
479
510
|
|
|
480
511
|
const finalized = await params.client.mcpHost.finalizeRegistryPush.mutate({
|
|
481
512
|
hostedId: params.config.hostedId,
|
|
513
|
+
...(params.gatewayId != undefined ? { gatewayId: params.gatewayId } : {}),
|
|
482
514
|
finalizeToken: session.finalizeToken,
|
|
483
515
|
});
|
|
484
516
|
|
|
517
|
+
const updatedConfig = updateConfigAfterManagedPush(
|
|
518
|
+
params.config,
|
|
519
|
+
params.organizationId,
|
|
520
|
+
deployImageRef,
|
|
521
|
+
);
|
|
485
522
|
return {
|
|
486
|
-
config:
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
523
|
+
config: HostedConfigSchema.parse({
|
|
524
|
+
...updatedConfig,
|
|
525
|
+
...(finalized.gatewayId != undefined
|
|
526
|
+
? { gatewayId: finalized.gatewayId }
|
|
527
|
+
: {}),
|
|
528
|
+
}),
|
|
491
529
|
...(finalized.gatewayId != undefined
|
|
492
530
|
? { gatewayId: finalized.gatewayId }
|
|
493
531
|
: {}),
|
|
@@ -567,6 +605,7 @@ async function buildAndPushManagedImageForCreate(params: {
|
|
|
567
605
|
return {
|
|
568
606
|
config: HostedConfigSchema.parse({
|
|
569
607
|
hostedId: finalized.hostedId,
|
|
608
|
+
gatewayId: finalized.gatewayId,
|
|
570
609
|
organizationId: params.organizationId,
|
|
571
610
|
mode: "container" as const,
|
|
572
611
|
image: deployImageRef,
|
|
@@ -582,24 +621,71 @@ async function deployWithOptions(
|
|
|
582
621
|
env: Env,
|
|
583
622
|
base: string,
|
|
584
623
|
options: DeployOptions,
|
|
624
|
+
gatewayId?: GatewayId,
|
|
585
625
|
): Promise<void> {
|
|
586
626
|
const auth = await getAuth(env);
|
|
587
627
|
|
|
588
628
|
await withAuthRetry(env, async (client) => {
|
|
589
629
|
const configPath = path.join(base, HOSTED_CONFIG_PATHS[env]);
|
|
630
|
+
const hasExistingConfig = fs.existsSync(configPath);
|
|
590
631
|
|
|
591
632
|
let result: DeployResult;
|
|
592
|
-
if (
|
|
593
|
-
console.log("Updating existing server...");
|
|
633
|
+
if (hasExistingConfig) {
|
|
594
634
|
const configData = fs.readFileSync(configPath, "utf8");
|
|
635
|
+
const config = HostedConfigSchema.parse(JSON.parse(configData));
|
|
636
|
+
if (
|
|
637
|
+
gatewayId != undefined &&
|
|
638
|
+
config.gatewayId != undefined &&
|
|
639
|
+
config.gatewayId !== gatewayId
|
|
640
|
+
) {
|
|
641
|
+
throw new Error(
|
|
642
|
+
`--gateway-id ${gatewayId} does not match the gatewayId in ${configPath} (${config.gatewayId}). Remove ${configPath} or omit --gateway-id.`,
|
|
643
|
+
);
|
|
644
|
+
}
|
|
645
|
+
console.log("Updating existing server...");
|
|
595
646
|
result = await updateExisting(
|
|
596
647
|
client,
|
|
597
648
|
base,
|
|
598
|
-
|
|
649
|
+
config,
|
|
599
650
|
auth.organizationId,
|
|
600
651
|
options,
|
|
652
|
+
gatewayId,
|
|
601
653
|
);
|
|
602
654
|
logDeployResult(env, "Updated", result);
|
|
655
|
+
} else if (gatewayId != undefined) {
|
|
656
|
+
console.log(`Updating existing server via gateway ${gatewayId}...`);
|
|
657
|
+
const upload =
|
|
658
|
+
options.mntDataDir != undefined
|
|
659
|
+
? await uploadData(client, path.join(base, options.mntDataDir))
|
|
660
|
+
: undefined;
|
|
661
|
+
const updatedServer = await client.mcpHost.partialUpdateServer.mutate({
|
|
662
|
+
gatewayId,
|
|
663
|
+
update: buildPartialUpdate(options, upload?.secretDataZipGcsPath),
|
|
664
|
+
});
|
|
665
|
+
const resolvedGatewayId = updatedServer.gatewayId ?? gatewayId;
|
|
666
|
+
const finalImage = updatedServer.config.image;
|
|
667
|
+
const finalTransport = localTransportFromHostedTransport(
|
|
668
|
+
updatedServer.config.transport,
|
|
669
|
+
);
|
|
670
|
+
result = {
|
|
671
|
+
config: HostedConfigSchema.parse({
|
|
672
|
+
hostedId: updatedServer.hostedId,
|
|
673
|
+
gatewayId: resolvedGatewayId,
|
|
674
|
+
organizationId: auth.organizationId,
|
|
675
|
+
...(finalImage != undefined
|
|
676
|
+
? {
|
|
677
|
+
mode: "container" as const,
|
|
678
|
+
image: finalImage,
|
|
679
|
+
transport: finalTransport,
|
|
680
|
+
}
|
|
681
|
+
: {}),
|
|
682
|
+
...(options.mntDataDir != undefined
|
|
683
|
+
? { mntDataDir: options.mntDataDir }
|
|
684
|
+
: {}),
|
|
685
|
+
}),
|
|
686
|
+
gatewayId: resolvedGatewayId,
|
|
687
|
+
};
|
|
688
|
+
logDeployResult(env, "Updated", result);
|
|
603
689
|
} else {
|
|
604
690
|
console.log("Creating new server...");
|
|
605
691
|
result = await createNew(client, base, auth.organizationId, options);
|
|
@@ -750,9 +836,14 @@ program
|
|
|
750
836
|
"--mnt-data-dir <directory>",
|
|
751
837
|
`Directory to copy to /mnt on the server. ${makeDefaultMessage("mntDataDir")}`,
|
|
752
838
|
)
|
|
839
|
+
.option(
|
|
840
|
+
"--gateway-id <id>",
|
|
841
|
+
"Gateway ID of an existing connector to update. Use when no local hosted config exists.",
|
|
842
|
+
argParser(GatewayIdSchema),
|
|
843
|
+
)
|
|
753
844
|
.action(async (options) => {
|
|
754
845
|
const { env, base } = program.opts();
|
|
755
|
-
await deployWithOptions(env, base, options);
|
|
846
|
+
await deployWithOptions(env, base, options, options.gatewayId);
|
|
756
847
|
});
|
|
757
848
|
|
|
758
849
|
program
|
|
@@ -858,6 +949,11 @@ program
|
|
|
858
949
|
"--startup-command <command>",
|
|
859
950
|
"Startup command to configure when creating a new managed connector",
|
|
860
951
|
)
|
|
952
|
+
.option(
|
|
953
|
+
"--gateway-id <id>",
|
|
954
|
+
"Gateway ID of an existing connector to update. Use when no local hosted config exists.",
|
|
955
|
+
argParser(GatewayIdSchema),
|
|
956
|
+
)
|
|
861
957
|
.action(async (options) => {
|
|
862
958
|
const { env, base } = program.opts();
|
|
863
959
|
|
|
@@ -876,13 +972,28 @@ program
|
|
|
876
972
|
|
|
877
973
|
const result = await withAuthRetry(env, async (client) => {
|
|
878
974
|
if (hasExistingConfig) {
|
|
975
|
+
if (options.transport != undefined) {
|
|
976
|
+
rejectBuildAndPushTransportChange(options.transport);
|
|
977
|
+
}
|
|
879
978
|
const config = HostedConfigSchema.parse(
|
|
880
979
|
JSON.parse(fs.readFileSync(configPath, "utf8")),
|
|
881
980
|
);
|
|
981
|
+
if (
|
|
982
|
+
options.gatewayId != undefined &&
|
|
983
|
+
config.gatewayId != undefined &&
|
|
984
|
+
config.gatewayId !== options.gatewayId
|
|
985
|
+
) {
|
|
986
|
+
throw new Error(
|
|
987
|
+
`--gateway-id ${options.gatewayId} does not match the gatewayId in ${configPath} (${config.gatewayId}). Remove ${configPath} or omit --gateway-id.`,
|
|
988
|
+
);
|
|
989
|
+
}
|
|
882
990
|
return await buildAndPushManagedImage({
|
|
883
991
|
client,
|
|
884
992
|
organizationId: auth.organizationId,
|
|
885
993
|
config,
|
|
994
|
+
...(options.gatewayId != undefined
|
|
995
|
+
? { gatewayId: options.gatewayId }
|
|
996
|
+
: {}),
|
|
886
997
|
dockerfile: options.dockerfile,
|
|
887
998
|
context: options.context,
|
|
888
999
|
buildArg: options.buildArg,
|
|
@@ -891,6 +1002,49 @@ program
|
|
|
891
1002
|
});
|
|
892
1003
|
}
|
|
893
1004
|
|
|
1005
|
+
if (options.gatewayId != undefined) {
|
|
1006
|
+
if (options.transport != undefined) {
|
|
1007
|
+
rejectBuildAndPushTransportChange(options.transport);
|
|
1008
|
+
}
|
|
1009
|
+
const gwId = options.gatewayId;
|
|
1010
|
+
const session = await client.mcpHost.createRegistryPushSession.mutate({
|
|
1011
|
+
gatewayId: gwId,
|
|
1012
|
+
});
|
|
1013
|
+
const deployImageRef = managedRegistryImageRef(session);
|
|
1014
|
+
const buildResult = buildImage({
|
|
1015
|
+
dockerfile: options.dockerfile,
|
|
1016
|
+
context: options.context,
|
|
1017
|
+
buildArgs: options.buildArg,
|
|
1018
|
+
...(options.target != undefined ? { target: options.target } : {}),
|
|
1019
|
+
platform: options.platform,
|
|
1020
|
+
imageRef: deployImageRef,
|
|
1021
|
+
});
|
|
1022
|
+
loginToRegistry(
|
|
1023
|
+
session.registryHost,
|
|
1024
|
+
session.username,
|
|
1025
|
+
session.password,
|
|
1026
|
+
);
|
|
1027
|
+
pushImage(buildResult.imageRef);
|
|
1028
|
+
const finalized = await client.mcpHost.finalizeRegistryPush.mutate({
|
|
1029
|
+
gatewayId: gwId,
|
|
1030
|
+
finalizeToken: session.finalizeToken,
|
|
1031
|
+
});
|
|
1032
|
+
const resolvedGatewayId = finalized.gatewayId ?? gwId;
|
|
1033
|
+
return {
|
|
1034
|
+
config: HostedConfigSchema.parse({
|
|
1035
|
+
hostedId: finalized.hostedId,
|
|
1036
|
+
gatewayId: resolvedGatewayId,
|
|
1037
|
+
organizationId: auth.organizationId,
|
|
1038
|
+
mode: "container" as const,
|
|
1039
|
+
image: deployImageRef,
|
|
1040
|
+
transport: localTransportFromHostedTransport(
|
|
1041
|
+
session.currentConfig.transport,
|
|
1042
|
+
),
|
|
1043
|
+
}),
|
|
1044
|
+
gatewayId: resolvedGatewayId,
|
|
1045
|
+
};
|
|
1046
|
+
}
|
|
1047
|
+
|
|
894
1048
|
return await buildAndPushManagedImageForCreate({
|
|
895
1049
|
client,
|
|
896
1050
|
organizationId: auth.organizationId,
|
|
@@ -954,6 +1108,11 @@ program
|
|
|
954
1108
|
"--mnt-data-dir <directory>",
|
|
955
1109
|
`Directory to copy to /mnt on the server. ${makeDefaultMessage("mntDataDir")}`,
|
|
956
1110
|
)
|
|
1111
|
+
.option(
|
|
1112
|
+
"--gateway-id <id>",
|
|
1113
|
+
"Gateway ID of an existing connector to update. Use when no local hosted config exists.",
|
|
1114
|
+
argParser(GatewayIdSchema),
|
|
1115
|
+
)
|
|
957
1116
|
.action(async (options) => {
|
|
958
1117
|
const { env, base } = program.opts();
|
|
959
1118
|
|
|
@@ -978,19 +1137,24 @@ program
|
|
|
978
1137
|
pushImage(buildResult.imageRef);
|
|
979
1138
|
assertImageSupportsPlatform(buildResult.imageRef, options.platform);
|
|
980
1139
|
|
|
981
|
-
await deployWithOptions(
|
|
982
|
-
|
|
983
|
-
|
|
984
|
-
|
|
985
|
-
|
|
986
|
-
: {}),
|
|
987
|
-
|
|
988
|
-
|
|
989
|
-
|
|
990
|
-
|
|
991
|
-
|
|
992
|
-
|
|
993
|
-
|
|
1140
|
+
await deployWithOptions(
|
|
1141
|
+
env,
|
|
1142
|
+
base,
|
|
1143
|
+
{
|
|
1144
|
+
image: buildResult.imageRef,
|
|
1145
|
+
...(options.name != undefined ? { name: options.name } : {}),
|
|
1146
|
+
...(options.transport != undefined
|
|
1147
|
+
? { transport: options.transport }
|
|
1148
|
+
: {}),
|
|
1149
|
+
...(options.startupCommand != undefined
|
|
1150
|
+
? { startupCommand: options.startupCommand }
|
|
1151
|
+
: {}),
|
|
1152
|
+
...(options.mntDataDir != undefined
|
|
1153
|
+
? { mntDataDir: options.mntDataDir }
|
|
1154
|
+
: {}),
|
|
1155
|
+
},
|
|
1156
|
+
options.gatewayId,
|
|
1157
|
+
);
|
|
994
1158
|
});
|
|
995
1159
|
|
|
996
1160
|
program
|
|
@@ -1031,4 +1195,14 @@ program
|
|
|
1031
1195
|
}
|
|
1032
1196
|
});
|
|
1033
1197
|
|
|
1034
|
-
|
|
1198
|
+
function cliErrorMessage(error: unknown): string {
|
|
1199
|
+
if (error instanceof Error) {
|
|
1200
|
+
return error.message;
|
|
1201
|
+
}
|
|
1202
|
+
return String(error);
|
|
1203
|
+
}
|
|
1204
|
+
|
|
1205
|
+
void program.parseAsync(process.argv).catch((error: unknown) => {
|
|
1206
|
+
console.error(cliErrorMessage(error));
|
|
1207
|
+
process.exitCode = 1;
|
|
1208
|
+
});
|