@mastra/connect 1.0.4-alpha.0 → 1.1.0-alpha.1
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/channels.d.ts.map +1 -1
- package/dist/client.d.ts +6 -0
- package/dist/client.d.ts.map +1 -1
- package/dist/index.cjs +30 -9
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +30 -9
- package/dist/index.js.map +1 -1
- package/dist/providers/channels.d.ts +3 -4
- package/dist/providers/channels.d.ts.map +1 -1
- package/dist/tools.d.ts.map +1 -1
- package/package.json +4 -4
package/dist/channels.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channels.d.ts","sourceRoot":"","sources":["../src/channels.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"channels.d.ts","sourceRoot":"","sources":["../src/channels.ts"],"names":[],"mappings":"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"}
|
package/dist/client.d.ts
CHANGED
|
@@ -9,6 +9,12 @@ export interface ConnectClientOptions {
|
|
|
9
9
|
accessToken?: string;
|
|
10
10
|
/** Organization id. Falls back to MASTRA_ORG_ID; the x-organization-id header is omitted when absent. */
|
|
11
11
|
orgId?: string;
|
|
12
|
+
/**
|
|
13
|
+
* Project id, sent as the x-mastra-project-id header so the platform can
|
|
14
|
+
* attribute proxy activity to this project. Falls back to MASTRA_PROJECT_ID;
|
|
15
|
+
* the header is omitted when absent.
|
|
16
|
+
*/
|
|
17
|
+
projectId?: string;
|
|
12
18
|
/**
|
|
13
19
|
* Integrations service base URL. Falls back to MASTRA_INTEGRATIONS_API_URL,
|
|
14
20
|
* then the regional default from MASTRA_PLATFORM_REGION ('us' | 'eu'),
|
package/dist/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAUxB;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC,0GAA0G;IAC1G,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yGAAyG;IACzG,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,4FAA4F;IAC5F,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACjC;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,KAAK,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;CACrB;AA2BD,wBAAgB,aAAa,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,cAAc,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/dist/index.cjs
CHANGED
|
@@ -3,6 +3,7 @@ let _mastra_mcp = require("@mastra/mcp");
|
|
|
3
3
|
let zod = require("zod");
|
|
4
4
|
let _mastra_core_observability = require("@mastra/core/observability");
|
|
5
5
|
let _mastra_core_tools = require("@mastra/core/tools");
|
|
6
|
+
let crypto = require("crypto");
|
|
6
7
|
//#region src/errors.ts
|
|
7
8
|
const MAX_DETAIL_LENGTH = 2e3;
|
|
8
9
|
var MastraConnectError = class extends Error {
|
|
@@ -245,6 +246,8 @@ function resolveClient(options) {
|
|
|
245
246
|
};
|
|
246
247
|
const orgId = options?.orgId?.trim() || process.env.MASTRA_ORG_ID?.trim();
|
|
247
248
|
if (orgId) headers["x-organization-id"] = orgId;
|
|
249
|
+
const projectId = options?.projectId?.trim() || process.env.MASTRA_PROJECT_ID?.trim();
|
|
250
|
+
if (projectId) headers["x-mastra-project-id"] = projectId;
|
|
248
251
|
return {
|
|
249
252
|
baseUrl,
|
|
250
253
|
headers,
|
|
@@ -1027,7 +1030,6 @@ const CHANNELS$1 = [
|
|
|
1027
1030
|
integrationId: "microsoft-teams",
|
|
1028
1031
|
async create(options, runtime) {
|
|
1029
1032
|
const mod = await import("@mastra/teams");
|
|
1030
|
-
if (!process.env.MASTRA_ENCRYPTION_KEY) throw new MastraConnectError("invalid_options", "Microsoft Teams channel: MASTRA_ENCRYPTION_KEY is not set. The Teams install store persists per-agent bot secrets and requires an at-rest encryption key (a 32-byte value, base64-encoded).");
|
|
1031
1033
|
const safeOptions = stripReservedOptions("microsoft-teams", options);
|
|
1032
1034
|
const tokenResolver = async (scope) => {
|
|
1033
1035
|
const fresh = await runtime.getCredential();
|
|
@@ -1036,10 +1038,22 @@ const CHANNELS$1 = [
|
|
|
1036
1038
|
if (!token) throw new MastraConnectError("no_active_connection", `Teams connection ${runtime.getConnectionId()} has no Dev Portal token on its credential. Reconnect with an integration that requests the ${mod.TEAMS_DEV_PORTAL_SCOPE} scope.`);
|
|
1037
1039
|
return token;
|
|
1038
1040
|
};
|
|
1039
|
-
|
|
1041
|
+
const config = {
|
|
1040
1042
|
tokenResolver,
|
|
1041
1043
|
...safeOptions ?? {}
|
|
1042
|
-
}
|
|
1044
|
+
};
|
|
1045
|
+
const usingDerivedKey = !process.env.MASTRA_ENCRYPTION_KEY;
|
|
1046
|
+
if (usingDerivedKey) config.encryptionKey = Buffer.from((0, crypto.hkdfSync)("sha256", runtime.client.accessToken, "mastra-connect", "microsoft-teams-install-store", 32)).toString("base64");
|
|
1047
|
+
let warnedDerivedKey = false;
|
|
1048
|
+
return {
|
|
1049
|
+
provider: new mod.TeamsProvider(config),
|
|
1050
|
+
async sync() {
|
|
1051
|
+
if (usingDerivedKey && !warnedDerivedKey) {
|
|
1052
|
+
warnedDerivedKey = true;
|
|
1053
|
+
console.warn("[@mastra/connect] MASTRA_ENCRYPTION_KEY is not set: encrypting the Microsoft Teams install store with a key derived from the platform access token. Set MASTRA_ENCRYPTION_KEY to use a dedicated key — otherwise rotating the platform access token makes stored bot credentials unreadable (disconnect and reconnect the channel to re-provision).");
|
|
1054
|
+
}
|
|
1055
|
+
}
|
|
1056
|
+
};
|
|
1043
1057
|
}
|
|
1044
1058
|
}
|
|
1045
1059
|
];
|
|
@@ -75095,7 +75109,11 @@ function tools(options = {}) {
|
|
|
75095
75109
|
if (!projectId) throw new MastraConnectError("missing_project_id", "Missing project id: set MASTRA_PROJECT_ID or pass projectId.");
|
|
75096
75110
|
if (options.ttlMs !== void 0 && (!Number.isFinite(options.ttlMs) || options.ttlMs < 0)) throw new MastraConnectError("invalid_options", `Invalid ttlMs (${options.ttlMs}): expected a finite number of milliseconds >= 0.`);
|
|
75097
75111
|
const ttlMs = options.ttlMs ?? DEFAULT_TTL_MS$1;
|
|
75098
|
-
const
|
|
75112
|
+
const clientOptions = {
|
|
75113
|
+
...options.client,
|
|
75114
|
+
projectId
|
|
75115
|
+
};
|
|
75116
|
+
const client = resolveClient(clientOptions);
|
|
75099
75117
|
const resolverId = ++nextResolverId;
|
|
75100
75118
|
const mcpClients = /* @__PURE__ */ new Map();
|
|
75101
75119
|
const normalizedProviders = normalizeProviderOverrides(options.providers);
|
|
@@ -75143,7 +75161,7 @@ function tools(options = {}) {
|
|
|
75143
75161
|
if (!inflight) inflight = (async () => {
|
|
75144
75162
|
try {
|
|
75145
75163
|
const { connections, catalog, catalogAvailable } = await loadSnapshotInputs();
|
|
75146
|
-
const snapshot = await mapTools(connections, buildRequests(normalizedProviders, catalog, catalogAvailable), options, client, mcpClients, resolverId);
|
|
75164
|
+
const snapshot = await mapTools(connections, buildRequests(normalizedProviders, catalog, catalogAvailable), options, clientOptions, client, mcpClients, resolverId);
|
|
75147
75165
|
cache = {
|
|
75148
75166
|
snapshot,
|
|
75149
75167
|
fetchedAt: Date.now()
|
|
@@ -75324,7 +75342,7 @@ function buildRequests(providers, catalog, catalogAvailable) {
|
|
|
75324
75342
|
return requests;
|
|
75325
75343
|
}
|
|
75326
75344
|
/** Maps one platform connection list snapshot to a flat tool record without allowing ambiguous tool ownership. */
|
|
75327
|
-
async function mapTools(connections, requests, options, client, mcpClients, resolverId) {
|
|
75345
|
+
async function mapTools(connections, requests, options, clientOptions, client, mcpClients, resolverId) {
|
|
75328
75346
|
const byIntegrationId = groupByIntegrationId(connections);
|
|
75329
75347
|
const activeMcpKeys = /* @__PURE__ */ new Set();
|
|
75330
75348
|
const result = {};
|
|
@@ -75357,7 +75375,7 @@ async function mapTools(connections, requests, options, client, mcpClients, reso
|
|
|
75357
75375
|
} else {
|
|
75358
75376
|
providerTools = request.registration.createTools({
|
|
75359
75377
|
connectionId: resolution.connectionId,
|
|
75360
|
-
client:
|
|
75378
|
+
client: clientOptions,
|
|
75361
75379
|
...providerFilterOptions(request.options)
|
|
75362
75380
|
});
|
|
75363
75381
|
applyProxyRequireApproval(providerTools, integrationId, request.options.requireApproval);
|
|
@@ -75380,7 +75398,7 @@ async function mapTools(connections, requests, options, client, mcpClients, reso
|
|
|
75380
75398
|
connections: resolution.connections,
|
|
75381
75399
|
allowTools: request.options.allowTools,
|
|
75382
75400
|
disallowTools: request.options.disallowTools,
|
|
75383
|
-
client:
|
|
75401
|
+
client: clientOptions
|
|
75384
75402
|
});
|
|
75385
75403
|
applyProxyRequireApproval(providerTools, integrationId, request.options.requireApproval, [listConnectionsToolKey(integrationId)]);
|
|
75386
75404
|
}
|
|
@@ -75582,7 +75600,10 @@ async function channels(options = {}) {
|
|
|
75582
75600
|
const unknownChannelIds = Object.keys(providerOverrides).filter((integrationId) => !knownChannelIds.has(integrationId) && !providerOverrides[integrationId]?.disabled);
|
|
75583
75601
|
if (unknownChannelIds.length > 0) throw new MastraConnectError("invalid_options", `Unknown channel${unknownChannelIds.length > 1 ? "s" : ""} in the providers option: ${unknownChannelIds.map((id) => `'${id}'`).join(", ")}. Known channels: ${[...knownChannelIds].join(", ")}.`);
|
|
75584
75602
|
const ttlMs = options.ttlMs ?? DEFAULT_TTL_MS;
|
|
75585
|
-
const client = resolveClient(
|
|
75603
|
+
const client = resolveClient({
|
|
75604
|
+
...options.client,
|
|
75605
|
+
projectId
|
|
75606
|
+
});
|
|
75586
75607
|
const states = [];
|
|
75587
75608
|
for (const registration of CHANNELS) {
|
|
75588
75609
|
if (only !== void 0 && !only.has(registration.integrationId)) continue;
|