@arbium/enterprise-agent-connect 0.1.2-dev.d2aa5ca → 0.2.1-dev.fd7a648

package/dist/connectors/http/openapi.js

@@ -0,0 +1,342 @@
+// Drafts a connector.json for the http connector from an OpenAPI 3.x spec (JSON), for
+// scripts/openapi-to-connector.ts and the admin API's internal app drafts. The draft loads, but
+// a person finishes it: copy, capabilities, limits, answer limits.
+const METHODS = ["get", "post", "put", "patch", "delete"];
+const SCALARS = new Set(["string", "number", "integer", "boolean"]);
+const snake = (s) => s
+    .replace(/([a-z0-9])([A-Z])/g, "$1_$2")
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, "_")
+    .replace(/^[^a-z]+|_+$/g, "");
+const firstLine = (s) => typeof s === "string"
+    ? s
+        .trim()
+        .split(/\n\s*\n|\r?\n/)[0]
+        .slice(0, 300)
+    : "";
+export function draftConnector(spec, options) {
+    const notes = [];
+    if (typeof spec.openapi !== "string" || !spec.openapi.startsWith("3."))
+        throw new Error("This takes an OpenAPI 3.x spec (its openapi field starts with 3.)");
+    // Follows local $refs (#/components/...); other specs' refs are left out.
+    const resolve = (node, seen = 0) => {
+        if (!node || typeof node !== "object")
+            return {};
+        const ref = node.$ref;
+        if (typeof ref !== "string")
+            return node;
+        if (!ref.startsWith("#/") || seen > 20) {
+            notes.push(`Left out ${ref}: only references inside the spec are followed`);
+            return {};
+        }
+        const target = ref
+            .slice(2)
+            .split("/")
+            .reduce((at, key) => at?.[key.replace(/~1/g, "/").replace(/~0/g, "~")], spec);
+        return resolve(target, seen + 1);
+    };
+    const objectOf = (raw) => {
+        const s = resolve(raw);
+        const parts = Array.isArray(s.allOf) ? s.allOf.map((p) => objectOf(p)) : [];
+        return {
+            properties: Object.assign({}, ...parts.map((p) => p.properties), s.properties ?? {}),
+            required: [
+                ...parts.flatMap((p) => p.required),
+                ...(Array.isArray(s.required) ? s.required : []),
+            ],
+        };
+    };
+    const typeOf = (s) => (Array.isArray(s.type) ? s.type.find((t) => t !== "null") : s.type);
+    // The http connector's param fields for a schema, or null for one it cannot take (an object).
+    const shape = (raw) => {
+        const s = resolve(raw);
+        const type = typeOf(s);
+        const items = type === "array" ? resolve(s.items) : null;
+        const scalar = items ? typeOf(items) : type;
+        if (!scalar || !SCALARS.has(scalar))
+            return null;
+        const fits = (v) => scalar === "integer"
+            ? Number.isInteger(v)
+            : typeof v === (scalar === "integer" ? "number" : scalar);
+        const values = (items ?? s).enum;
+        const allowed = Array.isArray(values) && values.length && values.every(fits) ? values : undefined;
+        const ok = (v) => fits(v) && (!allowed || allowed.includes(v));
+        const noDefault = s.default === undefined ||
+            (items ? !Array.isArray(s.default) || !s.default.every(ok) : !ok(s.default));
+        return {
+            type: items ? "array" : scalar,
+            ...(items ? { items: scalar } : {}),
+            ...(allowed ? { enum: allowed } : {}),
+            ...(noDefault ? {} : { default: s.default }),
+        };
+    };
+    const scalarFields = (raw) => Object.entries(objectOf(raw).properties)
+        .filter(([, p]) => SCALARS.has(typeOf(resolve(p)) ?? ""))
+        .map(([k]) => k);
+    const resultOf = (op) => {
+        const responses = resolve(op.responses);
+        const ok = Object.keys(responses).find((code) => /^2/.test(code));
+        const schema = ok && resolve(resolve(resolve(responses[ok]).content)["application/json"]).schema;
+        if (!schema)
+            return undefined;
+        const s = resolve(schema);
+        if (typeOf(s) === "array") {
+            const fields = scalarFields(s.items);
+            return fields.length ? { fields } : undefined;
+        }
+        const props = objectOf(s).properties;
+        // A list of records inside an object is taken as the page, e.g. {issues: [...], next}.
+        const lists = Object.entries(props)
+            .filter(([, p]) => typeOf(resolve(p)) === "array")
+            .map(([k, p]) => [k, scalarFields(resolve(p).items)])
+            .filter(([, fields]) => fields.length);
+        if (lists.length === 1)
+            return { items: lists[0][0], fields: lists[0][1] };
+        const fields = scalarFields(s);
+        return fields.length ? { fields } : undefined;
+    };
+    const app = snake(options.id);
+    const info = resolve(spec.info);
+    const title = typeof info.title === "string" && info.title.trim() ? info.title.trim() : options.id;
+    const picked = [];
+    for (const [path, rawItem] of Object.entries(resolve(spec.paths))) {
+        const item = resolve(rawItem);
+        for (const method of METHODS) {
+            const op = item[method];
+            if (!op)
+                continue;
+            const tags = Array.isArray(op.tags) ? op.tags : [];
+            if (options.operations?.includes(op.operationId) ||
+                options.tags?.some((t) => tags.includes(t)))
+                picked.push({ path, method, op, shared: item.parameters ?? [] });
+        }
+    }
+    const missing = (options.operations ?? []).filter((id) => !picked.some((p) => p.op.operationId === id));
+    if (missing.length)
+        throw new Error(`No operation has the id ${missing.join(", ")}`);
+    if (!picked.length)
+        throw new Error("No operation matched: name operations or tags");
+    const tools = picked.map(({ path, method, op, shared }) => {
+        const opId = typeof op.operationId === "string" ? op.operationId : `${method} ${path}`;
+        const base = snake(opId);
+        const name = base.startsWith(`${app}_`) ? base : `${app}_${base}`;
+        const params = {};
+        const add = (key, param, why) => {
+            if (params[key])
+                notes.push(`${name}: left out ${why}, its name is taken by another param`);
+            else
+                params[key] = param;
+        };
+        const byPlace = new Map();
+        for (const raw of [...shared, ...(op.parameters ?? [])]) {
+            const p = resolve(raw);
+            byPlace.set(`${p.in}:${p.name}`, p);
+        }
+        let template = path;
+        for (const p of byPlace.values()) {
+            const wire = String(p.name);
+            if (p.in !== "path" && p.in !== "query") {
+                notes.push(`${name}: left out the ${p.in} param ${wire} (a fixed header goes in http.headers)`);
+                continue;
+            }
+            const fields = shape(p.schema);
+            if (!fields) {
+                notes.push(`${name}: left out ${wire}, whose type the http connector cannot take`);
+                continue;
+            }
+            const key = snake(wire) || "param";
+            if (p.in === "path")
+                template = template.replaceAll(`{${wire}}`, `{${key}}`);
+            if (p.in === "path")
+                delete fields.default;
+            const style = p.style ?? "form";
+            const join = fields.type === "array" && p.in === "query"
+                ? style === "spaceDelimited"
+                    ? " "
+                    : style === "pipeDelimited"
+                        ? "|"
+                        : p.explode === false
+                            ? ","
+                            : undefined
+                : undefined;
+            add(key, {
+                ...fields,
+                description: firstLine(p.description) || firstLine(resolve(p.schema).description) || wire,
+                in: p.in,
+                ...(key === wire || p.in === "path" ? {} : { name: wire }),
+                ...(p.in === "path" || p.required === true || fields.default !== undefined
+                    ? {}
+                    : { required: false }),
+                ...(join ? { join } : {}),
+            }, `query param ${wire}`);
+        }
+        const body = resolve(op.requestBody);
+        const content = resolve(body.content);
+        if (method === "get" && op.requestBody)
+            notes.push(`${name}: left out its request body (a GET)`);
+        else if (op.requestBody && !content["application/json"])
+            notes.push(`${name}: left out its request body, which is not JSON`);
+        else if (op.requestBody) {
+            const { properties, required } = objectOf(resolve(content["application/json"]).schema);
+            if (!Object.keys(properties).length)
+                notes.push(`${name}: its request body has no listed fields, so it sends none`);
+            for (const [wire, raw] of Object.entries(properties)) {
+                const prop = resolve(raw);
+                if (prop.readOnly)
+                    continue;
+                const fields = shape(prop);
+                if (!fields) {
+                    notes.push(`${name}: left out body field ${wire}, an object or a type not supported`);
+                    continue;
+                }
+                const key = snake(wire) || "field";
+                add(key, {
+                    ...fields,
+                    description: firstLine(prop.description) || wire,
+                    in: "body",
+                    ...(key === wire ? {} : { name: wire }),
+                    ...(required.includes(wire) || fields.default !== undefined ? {} : { required: false }),
+                }, `body field ${wire}`);
+            }
+        }
+        const result = method === "get" ? resultOf(op) : undefined;
+        if (result)
+            notes.push(`${name}: its answer is trimmed to fields guessed from the spec; check them`);
+        return {
+            name,
+            description: firstLine(op.summary) || firstLine(op.description) || `${method.toUpperCase()} ${path}`,
+            method: method.toUpperCase(),
+            path: template,
+            params,
+            ...(result ? { result } : {}),
+        };
+    });
+    const baseUrl = (() => {
+        const server = resolve(spec.servers?.[0]);
+        let url = typeof server.url === "string" ? server.url : "";
+        for (const [name, v] of Object.entries(resolve(server.variables)))
+            url = url.replaceAll(`{${name}}`, String(resolve(v).default ?? ""));
+        if (!url || !URL.canParse(url, options.source)) {
+            notes.push("The spec names no server address: set http.baseUrl");
+            return "https://app.example.com";
+        }
+        return new URL(url, options.source).href.replace(/\/+$/, "");
+    })();
+    const auth = authOf();
+    function authOf() {
+        const requirement = [
+            ...(picked[0].op.security ?? spec.security ?? []),
+        ][0];
+        const schemeName = requirement && Object.keys(requirement)[0];
+        const scheme = schemeName
+            ? resolve(resolve(resolve(spec.components).securitySchemes)[schemeName])
+            : {};
+        const secret = (id, label) => ({ id, label, secret: true });
+        const plain = (id, label) => ({ id, label, secret: false });
+        if (scheme.type === "apiKey" && scheme.in === "header") {
+            if (String(scheme.name).toLowerCase() === "authorization")
+                notes.push("The key goes in Authorization: add auth.prefix if a word comes before it");
+            return {
+                auth: { type: "header", header: scheme.name, value: "api_key" },
+                fields: [secret("api_key", "API key")],
+                credential: "an API key",
+            };
+        }
+        if (scheme.type === "apiKey" && scheme.in === "query")
+            return {
+                auth: { type: "query", param: scheme.name, value: "api_key" },
+                fields: [secret("api_key", "API key")],
+                credential: "an API key",
+            };
+        if (scheme.type === "http" && String(scheme.scheme).toLowerCase() === "basic")
+            return {
+                auth: { type: "basic", username: "username", password: "password" },
+                fields: [plain("username", "Username"), secret("password", "Password")],
+                credential: "a username and password",
+            };
+        const flow = resolve(resolve(scheme.flows).clientCredentials);
+        if (scheme.type === "oauth2" && typeof flow.tokenUrl === "string")
+            return {
+                auth: {
+                    type: "oauth2",
+                    tokenUrl: new URL(flow.tokenUrl, baseUrl).href,
+                    clientId: "client_id",
+                    clientSecret: "client_secret",
+                },
+                fields: [plain("client_id", "Client ID"), secret("client_secret", "Client secret")],
+                credential: "a client ID and secret",
+            };
+        if (!(scheme.type === "http" && String(scheme.scheme).toLowerCase() === "bearer"))
+            notes.push(schemeName
+                ? `Sign-in ${schemeName} (${String(scheme.type)}) does not map to one the http connector has; the draft uses a token, which may work if the app issues tokens for services`
+                : "The spec names no sign-in; the draft uses a token");
+        return {
+            auth: { type: "bearer", token: "token" },
+            fields: [secret("token", "Token")],
+            credential: "a token",
+        };
+    }
+    const insecure = !baseUrl.startsWith("https://");
+    if (insecure)
+        notes.push("The address is plain http: allowInsecureHttp is on, check that it must be");
+    const group = (label, id, description, list, destructive = false) => list.length
+        ? [
+            {
+                id,
+                label,
+                description,
+                ...(destructive ? { destructive: true } : {}),
+                scopes: [],
+                permissions: [],
+                tools: list.map((t) => t.name),
+            },
+        ]
+        : [];
+    const reads = tools.filter((t) => t.method === "GET");
+    const writes = tools.filter((t) => !["GET", "DELETE"].includes(t.method));
+    if (writes.length)
+        notes.push("Writes: mark any tool that overwrites data destructive, and move it with the deletes");
+    const check = reads.find((t) => Object.values(t.params).every((p) => p.required === false || p.default !== undefined));
+    if (!check)
+        notes.push("No read without required params to check the connection with: set verify.path");
+    const shown = check?.result?.fields?.[0] ?? "id";
+    const connector = {
+        id: options.id,
+        name: title,
+        description: firstLine(info.description) || `Let agents use ${title}.`,
+        logo: `/brand/registry/${options.id}.svg`,
+        identity: `${auth.credential.replace(/^\w/, (c) => c.toUpperCase())} for ${title}.`,
+        accountKey: "host",
+        connectionKind: "guided",
+        setup: [
+            {
+                title: "Create a credential for agents",
+                body: `In ${title}, create ${auth.credential} for agents, with only the access they need.`,
+            },
+        ],
+        afterConnect: [],
+        fields: auth.fields,
+        capabilities: [
+            ...group("Read", "read", `Look things up in ${title}.`, reads),
+            ...group("Make changes", "write", `Create and change things in ${title}.`, writes),
+            ...group("Delete", "delete", `Delete things in ${title}.`, tools.filter((t) => t.method === "DELETE"), true),
+        ],
+        limits: [],
+        verify: {
+            method: "GET",
+            path: check?.path ?? "/",
+            label: `${title} answers`,
+            show: shown,
+        },
+        revoke: `Delete the credential in ${title}.`,
+        http: {
+            baseUrl,
+            ...(insecure ? { allowInsecureHttp: true } : {}),
+            auth: auth.auth,
+            tools,
+        },
+    };
+    notes.push("Add limits (and answerLimits on reads by id) for the values agents may be narrowed to", "Add paging to list tools that take a cursor or page number", "Rewrite the name, description, setup and revoke copy in plain words for the admin");
+    return { connector, notes };
+}
+//# sourceMappingURL=openapi.js.map

package/dist/connectors/http/openapi.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openapi.js","sourceRoot":"","sources":["../../../connectors/http/openapi.ts"],"names":[],"mappings":"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"}

package/dist/connectors/intune/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("../../packages/connector-kit/src/connector.js").ConnectorModule;
+declare const _default: import("../microsoft/client.js").BuiltinModule;
 export default _default;

package/dist/connectors/jamf/vendor.js

@@ -58,7 +58,11 @@ export function jamfVendor(fetchImpl = fetch) {
                     throw new ConnectError("Jamf Pro refused reading sites. Add Read Sites to the API role, then check again.");
                 if (res.status !== 200 || !Array.isArray(res.data))
                     throw new ConnectError(`Jamf Pro answered ${res.status} for its sites`);
-                return { values: res.data.map((s) => String(s.id)) };
+                const sites = res.data;
+                return {
+                    values: sites.map((s) => String(s.id)),
+                    labels: Object.fromEntries(sites.map((s) => [String(s.id), s.name ?? String(s.id)])),
+                };
             },
         },
     };

package/dist/connectors/jamf/vendor.js.map

@@ -1 +1 @@
-{"version":3,"file":"vendor.js","sourceRoot":"","sources":["../../../connectors/jamf/vendor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vendor.js","sourceRoot":"","sources":["../../../connectors/jamf/vendor.ts"],"names":[],"mappings":"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"}

package/dist/connectors/jira/connector.json

@@ -59,9 +59,9 @@
     {
       "id": "read",
       "label": "Read issues",
-      "description": "Search and read issues and list projects.",
+      "description": "Search and read issues and list projects. It also reads who the service account is, so an agent's own changes start no trigger.",
       "required": true,
-      "scopes": ["read:jira-work"],
+      "scopes": ["read:jira-work", "read:jira-user"],
       "permissions": ["Browse projects"],
       "tools": ["jira_search_issues", "jira_get_issue", "jira_list_projects"]
     },
@@ -261,7 +261,7 @@
       "types": [
         {
           "type": "jira:issue_created",
-          "same": ["issue.fields.created", "issue.fields.updated"]
+          "since": "issue.fields.created"
         },
         {
           "type": "jira:issue_updated"

package/dist/connectors/jira/vendor.d.ts

@@ -1,3 +1,3 @@
 import { type Fetch, type Vendor } from "../../packages/connector-kit/src/types.js";
 export declare function normalizeSite(input: string): string;
-export declare function jiraVendor(fetchImpl?: Fetch): Vendor;
+export declare function jiraVendor(unguarded?: Fetch): Vendor;

package/dist/connectors/jira/vendor.js

@@ -1,4 +1,5 @@
 import { createHash } from "node:crypto";
+import { vendorFetch } from "../../packages/connector-kit/src/fetch.js";
 import { ConnectError, TokenCache, } from "../../packages/connector-kit/src/types.js";
 // Atlassian service account, OAuth 2.0 client credentials. Tokens last 60 minutes and
 // reach Jira through api.atlassian.com/ex/jira/{cloudId}.
@@ -18,7 +19,8 @@ export function normalizeSite(input) {
         throw new ConnectError("Enter the Jira site name, the part before .atlassian.net");
     return host;
 }
-export function jiraVendor(fetchImpl = fetch) {
+export function jiraVendor(unguarded = fetch) {
+    const fetchImpl = vendorFetch("Jira", unguarded);
     const tokens = new TokenCache();
     const token = (clientId, clientSecret) => tokens.get(createHash("sha256").update(`${clientId}\n${clientSecret}`).digest("hex"), async () => {
         const res = await fetchImpl(AUTH_URL, {
@@ -79,7 +81,11 @@ export function jiraVendor(fetchImpl = fetch) {
                 body: request.body === undefined ? undefined : JSON.stringify(request.body),
             });
             const raw = await res.text();
-            return { status: res.status, data: raw ? safeJson(raw) : null };
+            return {
+                status: res.status,
+                data: raw ? safeJson(raw) : null,
+                headers: Object.fromEntries(res.headers),
+            };
         },
     };
 }

package/dist/connectors/jira/vendor.js.map

@@ -1 +1 @@
-{"version":3,"file":"vendor.js","sourceRoot":"","sources":["../../../connectors/jira/vendor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EACL,YAAY,EACZ,UAAU,GAKX,MAAM,2CAA2C,CAAC;AAEnD,sFAAsF;AACtF,0DAA0D;AAE1D,MAAM,QAAQ,GAAG,wCAAwC,CAAC;AAC1D,MAAM,GAAG,GAAG,2BAA2B,CAAC;AACxC,0FAA0F;AAC1F,MAAM,OAAO,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;AACxE,MAAM,QAAQ,GAAG,gEAAgE,CAAC;AAElF,MAAM,UAAU,aAAa,CAAC,KAAa;IACzC,MAAM,IAAI,GAAG,KAAK;SACf,IAAI,EAAE;SACN,WAAW,EAAE;SACb,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;SAC3B,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;SACpB,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;IACpC,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC;QACzC,MAAM,IAAI,YAAY,CAAC,0DAA0D,CAAC,CAAC;IACrF,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,YAAmB,KAAK;IACjD,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;IAEhC,MAAM,KAAK,GAAG,CAAC,QAAgB,EAAE,YAAoB,EAAE,EAAE,CACvD,MAAM,CAAC,GAAG,CACR,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,QAAQ,KAAK,YAAY,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EACzE,KAAK,IAAI,EAAE;QACT,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE;YACpC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,UAAU,EAAE,oBAAoB;gBAChC,SAAS,EAAE,QAAQ;gBACnB,aAAa,EAAE,YAAY;aAC5B,CAAC;SACH,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,EAAE;YACT,MAAM,IAAI,YAAY,CACpB,GAAG,CAAC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG;gBACtC,CAAC,CAAC,mDAAmD;gBACrD,CAAC,CAAC,6BAA6B,GAAG,CAAC,MAAM,GAAG,CAC/C,CAAC;QACJ,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAiD,CAAC;QAChF,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;IAClE,CAAC,CACF,CAAC;IAEJ,OAAO;QACL,KAAK,CAAC,OAAO,CAAC,MAAM;YAClB,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;YAC1C,MAAM,YAAY,GAAG,MAAM,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC;YAClD,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY;gBAAE,MAAM,IAAI,YAAY,CAAC,gCAAgC,CAAC,CAAC;YACzF,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YACnD,mFAAmF;YACnF,+EAA+E;YAC/E,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,WAAW,IAAI,kCAAkC,CAAC,CAAC;YAClF,IAAI,CAAC,MAAM,CAAC,EAAE;gBAAE,MAAM,IAAI,YAAY,CAAC,GAAG,IAAI,mCAAmC,CAAC,CAAC;YACnF,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAyB,CAAC;YAClE,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;gBACrC,MAAM,IAAI,YAAY,CAAC,GAAG,IAAI,wCAAwC,CAAC,CAAC;YAC1E,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,GAAG,GAAG,YAAY,OAAO,wBAAwB,EAAE;gBAC9E,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,MAAM,EAAE,EAAE,GAAG,OAAO,EAAE;aAC3D,CAAC,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,EAAE;gBACV,MAAM,IAAI,YAAY,CACpB,oCAAoC,IAAI,mBAAmB,IAAI,CAAC,MAAM,wEAAwE,CAC/I,CAAC;YACJ,OAAO;gBACL,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;gBACzB,MAAM,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE;gBAC5D,YAAY,EAAE,GAAG,IAAI,gBAAgB;aACtC,CAAC;QACJ,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,UAA4B,EAAE,OAAsB;YAC7D,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC;YACtC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACrF,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YACzF,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,GAAG,GAAG,YAAY,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,EAAE;gBACtE,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE;oBACP,aAAa,EAAE,UAAU,MAAM,EAAE;oBACjC,GAAG,OAAO;oBACV,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC;iBAC9E;gBACD,IAAI,EAAE,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;aAC5E,CAAC,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YAC7B,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAClE,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW;IAC3B,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,GAAG,CAAC;IACb,CAAC;AACH,CAAC"}
+{"version":3,"file":"vendor.js","sourceRoot":"","sources":["../../../connectors/jira/vendor.ts"],"names":[],"mappings":"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"}

package/dist/connectors/microsoft/client.d.ts

@@ -1,5 +1,5 @@
 import type { Toolset } from "../../packages/connector-kit/src/common.js";
-import { type ConnectorModule } from "../../packages/connector-kit/src/connector.js";
+import { type ConnectorContext, type ConnectorModule } from "../../packages/connector-kit/src/connector.js";
 import { type CheckInput, type Fetch, type ProviderClient, type Vendor, type VendorConnection, type VendorRequest } from "../../packages/connector-kit/src/types.js";
 /** config.auth of a connection approved for the shared app. A value stored in existing rows
  *  (it predates the service's own name), so it never changes. */
@@ -18,11 +18,14 @@ export declare function tokenRoles(jwt: string): string[];
 export declare function compareRoles(granted: string[], input: CheckInput): string | undefined;
 export declare function microsoftClient(options: {
     sharedApp: SharedApp | null;
-}, fetchImpl?: Fetch, sleep?: (ms: number) => Promise<unknown>): {
+}, unguarded?: Fetch, sleep?: (ms: number) => Promise<unknown>): {
     provider: ProviderClient;
     call: (connection: VendorConnection, request: VendorRequest, origin?: string) => Promise<{
         status: number;
         data: unknown;
+        headers: {
+            [k: string]: string;
+        };
     }>;
     permissions: (connection: VendorConnection, input: CheckInput) => Promise<{
         values: string[];
@@ -49,10 +52,15 @@ export declare function microsoftClient(options: {
     };
 };
 export type MicrosoftClient = ReturnType<typeof microsoftClient>;
+/** What a built-in app's module is given: also the deployment's Microsoft client. */
+export type BuiltinContext = ConnectorContext & {
+    microsoft: MicrosoftClient;
+};
+export type BuiltinModule = ConnectorModule<BuiltinContext>;
 /** Apps that need only the Microsoft connection: Outlook mail and calendar (mailboxes are
  *  reached through the customer's Exchange role assignments to the app, scoped to the
  *  branding's mailbox group, never through Graph Mail or Calendars permissions), Teams, Entra ID
  *  and Intune. `keep`: the app's own choice fields kept in its config; nothing else the form
  *  sends is, so no field can shadow the provider's config. */
 export declare function mailboxVendor(ms: MicrosoftClient, keep?: readonly string[]): Vendor;
-export declare const microsoftApp: (id: string, toolset: Toolset) => ConnectorModule;
+export declare const microsoftApp: (id: string, toolset: Toolset) => BuiltinModule;

package/dist/connectors/microsoft/client.js

@@ -1,7 +1,8 @@
 import { createHash } from "node:crypto";
 import { brand } from "../../packages/connector-kit/src/branding.js";
 import { clientAssertion } from "../../packages/connector-kit/src/certificate.js";
-import { choiceFields } from "../../packages/connector-kit/src/connector.js";
+import { choiceFields, } from "../../packages/connector-kit/src/connector.js";
+import { vendorFetch, vendorUrl } from "../../packages/connector-kit/src/fetch.js";
 import { ConnectError, TokenCache, } from "../../packages/connector-kit/src/types.js";
 // One Microsoft connection per organization, shared by the Microsoft apps (mail, files).
 // Normally the customer's own single-tenant Entra app, signing in with a certificate the
@@ -72,7 +73,8 @@ function safeJson(raw) {
         return raw;
     }
 }
-export function microsoftClient(options, fetchImpl = fetch, sleep = (ms) => new Promise((r) => setTimeout(r, ms))) {
+export function microsoftClient(options, unguarded = fetch, sleep = (ms) => new Promise((r) => setTimeout(r, ms))) {
+    const fetchImpl = vendorFetch("Microsoft", unguarded, (s) => sleep(s * 1000));
     const { sharedApp } = options;
     const tokens = new TokenCache();
     async function requestToken(tenant, form) {
@@ -143,10 +145,44 @@ export function microsoftClient(options, fetchImpl = fetch, sleep = (ms) => new
         c.secret.client_secret,
     ].join("\n"))
         .digest("hex");
+    // A download read only up to `max` bytes: a file larger than its details said is stopped
+    // while it streams, never held whole.
+    async function readCapped(res, max) {
+        const tooLarge = () => new ConnectError(`The file is larger than ${max} bytes, so it was not downloaded`);
+        if (Number(res.headers.get("content-length") ?? 0) > max) {
+            await res.body?.cancel();
+            throw tooLarge();
+        }
+        const chunks = [];
+        let total = 0;
+        const reader = res.body?.getReader();
+        while (reader) {
+            const { done, value } = await reader.read();
+            if (done)
+                break;
+            total += value.byteLength;
+            if (total > max) {
+                await reader.cancel();
+                throw tooLarge();
+            }
+            chunks.push(value);
+        }
+        const data = new Uint8Array(total);
+        let at = 0;
+        for (const c of chunks) {
+            data.set(c, at);
+            at += c.byteLength;
+        }
+        return data;
+    }
     async function send(token, request, origin = GRAPH) {
         // Uploads send the file's bytes; everything else is JSON.
         const raw = request.body instanceof Uint8Array;
-        const res = await fetchImpl(`${origin}${request.path}`, {
+        // A file's content answers 302 to a pre-authenticated SharePoint download address, fetched
+        // without the token; any other redirect is refused.
+        const download = request.responseType ? unguarded : fetchImpl;
+        let res = await download(vendorUrl(origin, request.path), {
+            redirect: "manual",
             method: request.method,
             headers: {
                 authorization: `Bearer ${token}`,
@@ -162,9 +198,23 @@ export function microsoftClient(options, fetchImpl = fetch, sleep = (ms) => new
                     ? request.body
                     : JSON.stringify(request.body),
         });
+        if (download === unguarded && res.status >= 300 && res.status < 400) {
+            await res.body?.cancel();
+            res = await fetchImpl(sharePointUrl(res.headers.get("location") ?? ""));
+        }
+        if (request.responseType === "bytes" && res.ok)
+            return {
+                status: res.status,
+                data: await readCapped(res, request.maxBytes ?? Infinity),
+                headers: Object.fromEntries(res.headers),
+            };
         const text = await res.text();
         const asText = request.responseType === "text" && res.ok;
-        return { status: res.status, data: asText ? text : text ? safeJson(text) : null };
+        return {
+            status: res.status,
+            data: asText ? text : text ? safeJson(text) : null,
+            headers: Object.fromEntries(res.headers),
+        };
     }
     /** A request to Graph, or to `origin` with a token for it, re-minting the token once on a
      *  401. */
@@ -362,10 +412,7 @@ export function microsoftClient(options, fetchImpl = fetch, sleep = (ms) => new
     // Cancels an upload session. Its address is pre-authenticated, so no token is sent, and
     // only a SharePoint address is called.
     async function cancelUpload(uploadUrl) {
-        const url = new URL(uploadUrl);
-        if (url.protocol !== "https:" || !/\.sharepoint\.com$/i.test(url.hostname))
-            throw new Error(`Upload session address is not SharePoint: ${url.hostname}`);
-        return (await fetchImpl(url.toString(), { method: "DELETE" })).status;
+        return (await fetchImpl(sharePointUrl(uploadUrl), { method: "DELETE" })).status;
     }
     // An administrator signing in to the connection's own app, for what Microsoft allows only on
     // a person's behalf (publishing to the Teams app catalog). The token is used at once and
@@ -406,6 +453,13 @@ export function microsoftClient(options, fetchImpl = fetch, sleep = (ms) => new
     };
     return { provider, call, permissions, cancelUpload, delegated };
 }
+// Pre-authenticated addresses Graph hands out (downloads, upload sessions) are on SharePoint.
+function sharePointUrl(raw) {
+    const url = URL.parse(raw);
+    if (url?.protocol !== "https:" || !/\.sharepoint\.com$/i.test(url.hostname))
+        throw new ConnectError(`Microsoft pointed to an address that is not SharePoint: ${url?.hostname ?? "none"}`);
+    return url.toString();
+}
 /** Apps that need only the Microsoft connection: Outlook mail and calendar (mailboxes are
  *  reached through the customer's Exchange role assignments to the app, scoped to the
  *  branding's mailbox group, never through Graph Mail or Calendars permissions), Teams, Entra ID