runline 0.29.0 → 0.30.0

package/dist/plugins/bitwarden/src/index.js

@@ -1,29 +1,4 @@
-let cachedToken = null;
-async function getAccessToken(clientId, clientSecret, tokenUrl) {
-    if (cachedToken && Date.now() < cachedToken.expiresAt)
-        return cachedToken.value;
-    const res = await fetch(tokenUrl, {
-        method: "POST",
-        headers: { "Content-Type": "application/x-www-form-urlencoded" },
-        body: new URLSearchParams({
-            client_id: clientId,
-            client_secret: clientSecret,
-            grant_type: "client_credentials",
-            scope: "api.organization",
-            deviceName: "runline",
-            deviceType: "2",
-            deviceIdentifier: "runline",
-        }),
-    });
-    if (!res.ok)
-        throw new Error(`Bitwarden token error ${res.status}: ${await res.text()}`);
-    const data = (await res.json());
-    cachedToken = {
-        value: data.access_token,
-        expiresAt: Date.now() + (data.expires_in - 60) * 1000,
-    };
-    return cachedToken.value;
-}
+import { coordinatedAccessToken, requestToken, } from "../../_shared/tokenRefresh.js";
 async function apiRequest(token, baseUrl, method, endpoint, body, qs) {
     const url = new URL(`${baseUrl}${endpoint}`);
     if (qs) {
@@ -57,8 +32,7 @@ async function apiRequest(token, baseUrl, method, endpoint, body, qs) {
         return res.json();
     return { success: true };
 }
-function getConn(ctx) {
-    const cfg = ctx.connection.config;
+function getConn(cfg) {
     const domain = cfg.domain?.replace(/\/$/, "");
     const env = cfg.environment;
     const baseUrl = env === "selfHosted" && domain
@@ -75,9 +49,17 @@ function getConn(ctx) {
     };
 }
 async function authedRequest(ctx, method, endpoint, body, qs) {
-    const { clientId, clientSecret, baseUrl, tokenUrl } = getConn(ctx);
-    const token = await getAccessToken(clientId, clientSecret, tokenUrl);
-    return apiRequest(token, baseUrl, method, endpoint, body, qs);
+    const token = await coordinatedAccessToken(ctx, (current) => {
+        const { clientId, clientSecret, tokenUrl } = getConn(current);
+        return requestToken({ url: tokenUrl, clientAuthentication: "client_secret_post" }, {
+            grant_type: "client_credentials",
+            scope: "api.organization",
+            deviceName: "runline",
+            deviceType: "2",
+            deviceIdentifier: "runline",
+        }, { clientId, clientSecret });
+    });
+    return apiRequest(token, getConn(ctx.connection.config).baseUrl, method, endpoint, body, qs);
 }
 export default function bitwarden(rl) {
     rl.setName("bitwarden");

package/dist/plugins/gmail/src/index.js

@@ -22,12 +22,8 @@
  */
 import * as t from "typebox";
 import { renderEmailJsx } from "../../_shared/emailJsx.js";
-import { googleAccessToken } from "../../_shared/googleAuth.js";
+import { googleJsonRequest } from "../../_shared/googleAuth.js";
 import { GoogleTimestamp, Id, NonEmptyString, stringEnum, } from "../../_shared/googleSchemas.js";
-// ─── Auth ────────────────────────────────────────────────────────
-async function accessToken(ctx) {
-    return googleAccessToken(ctx, "gmail", SCOPES);
-}
 // ─── Request ─────────────────────────────────────────────────────
 const API_BASE = "https://gmail.googleapis.com/gmail/v1/users/me";
 function sendFailureRetryHint(method, path) {
@@ -36,48 +32,15 @@ function sendFailureRetryHint(method, path) {
     return " Before retrying, check whether the email was already sent using gmail.message.list({ q: 'in:sent to:<recipient> subject:\"<subject>\"', maxResults: 10 }) and inspect likely matches with gmail.message.get({ id, format: 'metadata' }).";
 }
 async function gmailRequest(ctx, method, path, body, qs) {
-    const token = await accessToken(ctx);
-    const url = new URL(`${API_BASE}${path}`);
-    if (qs) {
-        for (const [k, v] of Object.entries(qs)) {
-            if (v === undefined || v === null)
-                continue;
-            if (Array.isArray(v)) {
-                for (const entry of v)
-                    url.searchParams.append(k, String(entry));
-            }
-            else {
-                url.searchParams.set(k, String(v));
-            }
-        }
-    }
-    const init = {
-        method,
-        headers: {
-            Authorization: `Bearer ${token}`,
-            Accept: "application/json",
-        },
-    };
-    if (body && Object.keys(body).length > 0) {
-        init.headers["Content-Type"] =
-            "application/json";
-        init.body = JSON.stringify(body);
-    }
-    let res;
     try {
-        res = await fetch(url.toString(), init);
-    }
-    catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        throw new Error(`gmail: ${method} ${path} failed: ${msg}.${sendFailureRetryHint(method, path)}`);
+        return await googleJsonRequest(ctx, "gmail", SCOPES, method, `${API_BASE}${path}`, body, qs);
     }
-    if (res.status === 204)
-        return { success: true };
-    const text = await res.text();
-    if (!res.ok) {
-        throw new Error(`gmail: ${method} ${path} → ${res.status} ${text}${sendFailureRetryHint(method, path)}`);
+    catch (error) {
+        const hint = sendFailureRetryHint(method, path);
+        if (!hint)
+            throw error;
+        throw new Error(`${error instanceof Error ? error.message : "gmail: request failed"}.${hint}`);
     }
-    return text ? JSON.parse(text) : { success: true };
 }
 async function paginateAll(ctx, path, key, qs) {
     const out = [];
@@ -672,6 +635,7 @@ export default function gmail(rl) {
         ],
     });
     rl.setConnectionSchema({
+        authMethod: { type: "string", required: false, description: "delegated or serviceAccount (legacy configs infer the method)" },
         clientId: {
             type: "string",
             required: false,

package/dist/plugins/googleAppsScript/src/index.js

@@ -1,5 +1,5 @@
 import * as t from "typebox";
-import { googleAccessToken } from "../../_shared/googleAuth.js";
+import { googleJsonRequest } from "../../_shared/googleAuth.js";
 import { Id, NonEmptyString, PositiveInteger, stringEnum, } from "../../_shared/googleSchemas.js";
 const SCRIPT_API = "https://script.googleapis.com/v1";
 const DRIVE_API = "https://www.googleapis.com/drive/v3";
@@ -33,36 +33,14 @@ const scriptFileSchema = t.Object({
     type: scriptFileTypeSchema,
     source: t.String(),
 }, { additionalProperties: false });
-function accessToken(ctx) {
-    return googleAccessToken(ctx, "googleAppsScript", SCOPES);
-}
 async function call(ctx, method, url, payload) {
-    const headers = { Authorization: `Bearer ${await accessToken(ctx)}` };
-    if (payload !== undefined)
-        headers["Content-Type"] = "application/json";
-    const res = await fetch(url, {
-        method,
-        headers,
-        body: payload !== undefined ? JSON.stringify(payload) : undefined,
-    });
-    const text = await res.text();
-    let json;
-    try {
-        json = text ? JSON.parse(text) : {};
-    }
-    catch {
-        json = { raw: text };
-    }
-    if (!res.ok) {
-        const msg = json?.error?.message || json?.error_description || text.slice(0, 300) || res.status;
-        throw new Error(`googleAppsScript: ${method} ${res.status}: ${msg}`);
-    }
-    return json;
+    return googleJsonRequest(ctx, "googleAppsScript", SCOPES, method, url, payload);
 }
 export default function googleAppsScript(rl) {
     rl.setName("googleAppsScript");
     rl.setVersion("1.0.0");
     rl.setConnectionSchema({
+        authMethod: { type: "string", required: false, description: "delegated or serviceAccount (legacy configs infer the method)" },
         clientId: { type: "string", required: false, description: "OAuth client ID", env: "GOOGLE_APPS_SCRIPT_CLIENT_ID" },
         clientSecret: { type: "string", required: false, description: "OAuth client secret", env: "GOOGLE_APPS_SCRIPT_CLIENT_SECRET" },
         refreshToken: { type: "string", required: false, description: "OAuth refresh token", env: "GOOGLE_APPS_SCRIPT_REFRESH_TOKEN" },

package/dist/plugins/googleCalendar/src/index.js

@@ -29,53 +29,14 @@
  */
 import rrulePkg from "rrule";
 import * as t from "typebox";
-import { googleAccessToken } from "../../_shared/googleAuth.js";
+import { googleJsonRequest } from "../../_shared/googleAuth.js";
 import { Id, NonEmptyString, NonEmptyStringArray, PositiveInteger, StringOrStringArray, stringEnum, } from "../../_shared/googleSchemas.js";
 // `rrule` ships as CJS; named imports fail under Node ESM.
 const { RRule } = rrulePkg;
-// ─── Auth ────────────────────────────────────────────────────────
-async function accessToken(ctx) {
-    return googleAccessToken(ctx, "googleCalendar", SCOPES);
-}
 // ─── Request ─────────────────────────────────────────────────────
 const API_BASE = "https://www.googleapis.com/calendar/v3";
 async function calRequest(ctx, method, path, body, qs) {
-    const token = await accessToken(ctx);
-    const url = new URL(`${API_BASE}${path}`);
-    if (qs) {
-        for (const [k, v] of Object.entries(qs)) {
-            if (v === undefined || v === null)
-                continue;
-            if (Array.isArray(v)) {
-                for (const entry of v)
-                    url.searchParams.append(k, String(entry));
-            }
-            else {
-                url.searchParams.set(k, String(v));
-            }
-        }
-    }
-    const init = {
-        method,
-        headers: {
-            Authorization: `Bearer ${token}`,
-            Accept: "application/json",
-        },
-    };
-    if (body && Object.keys(body).length > 0) {
-        init.headers["Content-Type"] = "application/json";
-        init.body = JSON.stringify(body);
-    }
-    const res = await fetch(url.toString(), init);
-    if (res.status === 204)
-        return { success: true };
-    const text = await res.text();
-    if (!res.ok) {
-        // 403/429 deserve a retry with exponential backoff — Calendar
-        // hands these out freely when you hit per-user quota.
-        throw new Error(`googleCalendar: ${method} ${path} → ${res.status} ${text}`);
-    }
-    return text ? JSON.parse(text) : { success: true };
+    return googleJsonRequest(ctx, "googleCalendar", SCOPES, method, `${API_BASE}${path}`, body, qs);
 }
 async function paginateAll(ctx, path, key, qs) {
     const out = [];
@@ -572,6 +533,7 @@ export default function googleCalendar(rl) {
         ],
     });
     rl.setConnectionSchema({
+        authMethod: { type: "string", required: false, description: "delegated or serviceAccount (legacy configs infer the method)" },
         clientId: {
             type: "string",
             required: false,

package/dist/plugins/googleContacts/src/index.js

@@ -23,7 +23,7 @@
  * convenience `contactId` field stripped from `resourceName`.
  */
 import * as t from "typebox";
-import { googleAccessToken } from "../../_shared/googleAuth.js";
+import { googleJsonRequest } from "../../_shared/googleAuth.js";
 import { Id, NonEmptyString, PositiveInteger, stringEnum, } from "../../_shared/googleSchemas.js";
 // ─── Fields ─────────────────────────────────────────────────────
 /**
@@ -81,44 +81,10 @@ const UPDATABLE_PERSON_FIELDS = new Set([
     "urls",
     "userDefined",
 ]);
-// ─── Auth ────────────────────────────────────────────────────────
-async function accessToken(ctx) {
-    return googleAccessToken(ctx, "googleContacts", SCOPES);
-}
 // ─── Request ─────────────────────────────────────────────────────
 const API_BASE = "https://people.googleapis.com/v1";
 async function peopleRequest(ctx, method, path, body, qs) {
-    const token = await accessToken(ctx);
-    const url = new URL(`${API_BASE}${path}`);
-    if (qs) {
-        for (const [k, v] of Object.entries(qs)) {
-            if (v === undefined || v === null)
-                continue;
-            if (Array.isArray(v)) {
-                for (const entry of v)
-                    url.searchParams.append(k, String(entry));
-            }
-            else {
-                url.searchParams.set(k, String(v));
-            }
-        }
-    }
-    const init = {
-        method,
-        headers: { Authorization: `Bearer ${token}`, Accept: "application/json" },
-    };
-    if (body && Object.keys(body).length > 0) {
-        init.headers["Content-Type"] = "application/json";
-        init.body = JSON.stringify(body);
-    }
-    const res = await fetch(url.toString(), init);
-    if (res.status === 204)
-        return { success: true };
-    const text = await res.text();
-    if (!res.ok) {
-        throw new Error(`googleContacts: ${method} ${path} → ${res.status} ${text}`);
-    }
-    return text ? JSON.parse(text) : { success: true };
+    return googleJsonRequest(ctx, "googleContacts", SCOPES, method, `${API_BASE}${path}`, body, qs);
 }
 async function paginateAll(ctx, path, key, qs) {
     const out = [];
@@ -438,6 +404,7 @@ export default function googleContacts(rl) {
         ],
     });
     rl.setConnectionSchema({
+        authMethod: { type: "string", required: false, description: "delegated or serviceAccount (legacy configs infer the method)" },
         clientId: { type: "string", required: false, env: "GOOGLE_CONTACTS_CLIENT_ID" },
         clientSecret: { type: "string", required: false, env: "GOOGLE_CONTACTS_CLIENT_SECRET" },
         refreshToken: { type: "string", required: false, env: "GOOGLE_CONTACTS_REFRESH_TOKEN" },

package/dist/plugins/googleDocs/src/index.js

@@ -51,6 +51,11 @@ export default function googleDocs(rl) {
         ],
     });
     rl.setConnectionSchema({
+        authMethod: {
+            type: "string",
+            required: false,
+            description: "delegated or serviceAccount (legacy configs infer the method)",
+        },
         clientId: { type: "string", required: false, env: "GOOGLE_DOCS_CLIENT_ID" },
         clientSecret: {
             type: "string",

package/dist/plugins/googleDocs/src/shared.js

@@ -1,5 +1,5 @@
 import * as t from "typebox";
-import { googleAccessToken } from "../../_shared/googleAuth.js";
+import { googleJsonRequest } from "../../_shared/googleAuth.js";
 import { RawGoogleObject } from "../../_shared/googleSchemas.js";
 export const SCOPES = [
     "https://www.googleapis.com/auth/documents",
@@ -60,36 +60,8 @@ export const WriteControl = t.Object({
     ],
 });
 export { RawGoogleObject };
-export async function accessToken(ctx) {
-    return googleAccessToken(ctx, "googleDocs", SCOPES);
-}
 export async function docsRequest(ctx, method, path, body, qs, baseOverride) {
-    const token = await accessToken(ctx);
-    const url = new URL(`${baseOverride ?? DOCS_BASE}${path}`);
-    if (qs) {
-        for (const [k, v] of Object.entries(qs)) {
-            if (v === undefined || v === null)
-                continue;
-            url.searchParams.set(k, String(v));
-        }
-    }
-    const init = {
-        method,
-        headers: { Authorization: `Bearer ${token}`, Accept: "application/json" },
-    };
-    if (body && Object.keys(body).length > 0) {
-        init.headers["Content-Type"] =
-            "application/json";
-        init.body = JSON.stringify(body);
-    }
-    const res = await fetch(url.toString(), init);
-    if (res.status === 204)
-        return { success: true };
-    const text = await res.text();
-    if (!res.ok) {
-        throw new Error(`googleDocs: ${method} ${path} → ${res.status} ${text}`);
-    }
-    return text ? JSON.parse(text) : { success: true };
+    return googleJsonRequest(ctx, "googleDocs", SCOPES, method, `${baseOverride ?? DOCS_BASE}${path}`, body, qs);
 }
 const DOC_URL_REGEX = /https:\/\/docs\.google\.com\/document\/d\/([a-zA-Z0-9-_]+)/;
 export function extractDocumentId(input) {