runline 0.33.0 → 0.35.0

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

@@ -35,7 +35,8 @@
  * raw rows / objects and callers post-filter.
  */
 import * as t from "typebox";
-import { googleJsonRequest } from "../../_shared/googleAuth.js";
+import { pathSegment } from "../../_shared/credentials.js";
+import { googleCredential, googleJsonRequest, googleOAuth, } from "../../_shared/googleAuth.js";
 import { Id, JsonValue, NonEmptyString, NonNegativeInteger, PositiveInteger, RawGoogleObject, StringArray, stringEnum, } from "../../_shared/googleSchemas.js";
 const ROW_NUMBER = "row_number";
 const sheetReferenceSchema = t.Union([NonEmptyString, NonNegativeInteger]);
@@ -80,19 +81,16 @@ async function sheetsRequest(ctx, method, path, body, qs, baseOverride) {
 }
 // ─── A1 helpers ─────────────────────────────────────────────────
 /**
- * Encode a range like `Sheet1!A1:B5` for use in a URL. Google's
- * docs are explicit that the sheet-name portion needs URL-encoding
- * (for non-ASCII / spaces) but the range portion should not be, so
- * we split on `!` and encode only the left side. A bare sheet name
- * gets wrapped in single quotes so Sheets doesn't try to parse
- * something like `ABC` as an A1 range.
+ * A range like `Sheet1!A1:B5` as one encoded path segment, as Google's
+ * own clients send it. A bare sheet name is wrapped in single quotes so
+ * Sheets doesn't parse something like `ABC` as an A1 range.
  */
 function encodeA1(range) {
-    if (range.includes("!")) {
-        const [sheet, ranges] = range.split("!");
-        return `${encodeURIComponent(sheet)}!${ranges}`;
-    }
-    return encodeURIComponent(`'${range}'`);
+    return pathSegment(range.includes("!") ? range : `'${range}'`);
+}
+/** A spreadsheet's API path, its ID one path segment. */
+function spreadsheetPath(spreadsheetId) {
+    return `/v4/spreadsheets/${pathSegment(spreadsheetId)}`;
 }
 function columnNumberToLetter(n) {
     let s = "";
@@ -155,11 +153,11 @@ function rowsToObjects(rows, headerRow) {
 }
 // ─── Sheet operations (shared helpers) ──────────────────────────
 async function getValues(ctx, spreadsheetId, range, valueRenderOption = "FORMATTED_VALUE", dateTimeRenderOption = "FORMATTED_STRING") {
-    const res = (await sheetsRequest(ctx, "GET", `/v4/spreadsheets/${spreadsheetId}/values/${encodeA1(range)}`, undefined, { valueRenderOption, dateTimeRenderOption }));
+    const res = (await sheetsRequest(ctx, "GET", `${spreadsheetPath(spreadsheetId)}/values/${encodeA1(range)}`, undefined, { valueRenderOption, dateTimeRenderOption }));
     return res.values ?? [];
 }
 async function getSheetProperties(ctx, spreadsheetId) {
-    const res = (await sheetsRequest(ctx, "GET", `/v4/spreadsheets/${spreadsheetId}`, undefined, { fields: "sheets.properties" }));
+    const res = (await sheetsRequest(ctx, "GET", spreadsheetPath(spreadsheetId), undefined, { fields: "sheets.properties" }));
     return res.sheets.map((s) => s.properties);
 }
 async function resolveSheetId(ctx, spreadsheetId, sheetNameOrId) {
@@ -176,10 +174,10 @@ async function resolveSheetId(ctx, spreadsheetId, sheetNameOrId) {
     return match.sheetId;
 }
 async function batchValuesUpdate(ctx, spreadsheetId, data, valueInputOption) {
-    return sheetsRequest(ctx, "POST", `/v4/spreadsheets/${spreadsheetId}/values:batchUpdate`, { data, valueInputOption });
+    return sheetsRequest(ctx, "POST", `${spreadsheetPath(spreadsheetId)}/values:batchUpdate`, { data, valueInputOption });
 }
 async function spreadsheetBatchUpdate(ctx, spreadsheetId, requests) {
-    return sheetsRequest(ctx, "POST", `/v4/spreadsheets/${spreadsheetId}:batchUpdate`, { requests });
+    return sheetsRequest(ctx, "POST", `${spreadsheetPath(spreadsheetId)}:batchUpdate`, { requests });
 }
 async function appendEmptyRow(ctx, spreadsheetId, sheetId) {
     // Called before every non-API-append write to protect the
@@ -339,39 +337,8 @@ function a1RangeToGridRange(a1, sheetId) {
 export default function googleSheets(rl) {
     rl.setName("googleSheets");
     rl.setVersion("0.1.0");
-    rl.setOAuth({
-        authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
-        tokenUrl: "https://oauth2.googleapis.com/token",
-        scopes: SCOPES,
-        authParams: { access_type: "offline", prompt: "consent" },
-        setupHelp: [
-            "You need a Google Cloud OAuth client. Takes ~5 minutes, one time.",
-            "",
-            "1. Create or pick a Google Cloud project:",
-            "     https://console.cloud.google.com/projectcreate",
-            "",
-            "2. Enable the Google Sheets API (and Drive API, required for",
-            "   spreadsheet.delete):",
-            "     https://console.cloud.google.com/apis/library/sheets.googleapis.com",
-            "     https://console.cloud.google.com/apis/library/drive.googleapis.com",
-            "",
-            "3. Configure the OAuth consent screen:",
-            "     https://console.cloud.google.com/apis/credentials/consent",
-            "     • Audience: External",
-            "",
-            "4. Add yourself as a test user:",
-            "     https://console.cloud.google.com/auth/audience",
-            "",
-            "5. Create the OAuth client:",
-            "     https://console.cloud.google.com/apis/credentials",
-            "     • + Create credentials → OAuth client ID",
-            "     • Application type: Web application",
-            "     • Authorized redirect URIs → + Add URI: {{redirectUri}}",
-            "",
-            "6. Paste the Client ID and Client Secret below, or export",
-            "   GOOGLE_SHEETS_CLIENT_ID and GOOGLE_SHEETS_CLIENT_SECRET.",
-        ],
-    });
+    rl.setCredential(googleCredential("googleSheets", SCOPES));
+    rl.setOAuth(googleOAuth("googleSheets", SCOPES, "GOOGLE_SHEETS"));
     rl.setConnectionSchema({
         authMethod: { type: "string", required: false, description: "delegated or serviceAccount (legacy configs infer the method)" },
         clientId: {
@@ -464,7 +431,7 @@ export default function googleSheets(rl) {
                 qs.ranges = p.ranges;
             if (p.fields)
                 qs.fields = p.fields;
-            return sheetsRequest(ctx, "GET", `/v4/spreadsheets/${p.spreadsheetId}`, undefined, qs);
+            return sheetsRequest(ctx, "GET", spreadsheetPath(p.spreadsheetId), undefined, qs);
         },
     });
     rl.registerAction("spreadsheet.delete", {
@@ -473,7 +440,7 @@ export default function googleSheets(rl) {
         inputSchema: t.Object({ spreadsheetId: Id }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            await sheetsRequest(ctx, "DELETE", `/drive/v3/files/${p.spreadsheetId}`, undefined, undefined, "https://www.googleapis.com");
+            await sheetsRequest(ctx, "DELETE", `/drive/v3/files/${pathSegment(p.spreadsheetId)}`, undefined, undefined, "https://www.googleapis.com");
             return { success: true };
         },
     });
@@ -627,12 +594,12 @@ export default function googleSheets(rl) {
                 if (newCols.length > 0) {
                     headers = [...headers, ...newCols];
                     // Write the extended header row back to the sheet.
-                    await sheetsRequest(ctx, "PUT", `/v4/spreadsheets/${spreadsheetId}/values/${encodeA1(`${sheetName}!A${headerRowIdx + 1}`)}`, { range: `${sheetName}!A${headerRowIdx + 1}`, values: [headers] }, { valueInputOption });
+                    await sheetsRequest(ctx, "PUT", `${spreadsheetPath(spreadsheetId)}/values/${encodeA1(`${sheetName}!A${headerRowIdx + 1}`)}`, { range: `${sheetName}!A${headerRowIdx + 1}`, values: [headers] }, { valueInputOption });
                 }
                 values = objectsToRows(rows, headers);
             }
             if (p.useAppend) {
-                return sheetsRequest(ctx, "POST", `/v4/spreadsheets/${spreadsheetId}/values/${encodeA1(sheetName)}:append`, { range: sheetName, values }, { valueInputOption, insertDataOption: "INSERT_ROWS" });
+                return sheetsRequest(ctx, "POST", `${spreadsheetPath(spreadsheetId)}/values/${encodeA1(sheetName)}:append`, { range: sheetName, values }, { valueInputOption, insertDataOption: "INSERT_ROWS" });
             }
             // PUT at lastRow+1: calculate lastRow from current sheet contents.
             const existing = await getValues(ctx, spreadsheetId, sheetName, "UNFORMATTED_VALUE");
@@ -640,7 +607,7 @@ export default function googleSheets(rl) {
             const sheetId = await resolveSheetId(ctx, spreadsheetId, sheetName);
             await appendEmptyRow(ctx, spreadsheetId, sheetId);
             const targetRange = `${sheetName}!${lastRow + 1}:${lastRow + values.length}`;
-            return sheetsRequest(ctx, "PUT", `/v4/spreadsheets/${spreadsheetId}/values/${encodeA1(targetRange)}`, { range: targetRange, values }, { valueInputOption });
+            return sheetsRequest(ctx, "PUT", `${spreadsheetPath(spreadsheetId)}/values/${encodeA1(targetRange)}`, { range: targetRange, values }, { valueInputOption });
         },
     });
     // ── Update ────────────────────────────────────────────
@@ -782,13 +749,13 @@ export default function googleSheets(rl) {
             }
             if (mode === "wholeSheet" && p.keepFirstRow) {
                 const firstRow = await getValues(ctx, p.spreadsheetId, `${sheetName}!1:1`, "FORMATTED_VALUE");
-                await sheetsRequest(ctx, "POST", `/v4/spreadsheets/${p.spreadsheetId}/values/${encodeA1(range)}:clear`, {});
+                await sheetsRequest(ctx, "POST", `${spreadsheetPath(p.spreadsheetId)}/values/${encodeA1(range)}:clear`, {});
                 if (firstRow.length > 0) {
-                    await sheetsRequest(ctx, "PUT", `/v4/spreadsheets/${p.spreadsheetId}/values/${encodeA1(`${sheetName}!1:1`)}`, { range: `${sheetName}!1:1`, values: firstRow }, { valueInputOption: "RAW" });
+                    await sheetsRequest(ctx, "PUT", `${spreadsheetPath(p.spreadsheetId)}/values/${encodeA1(`${sheetName}!1:1`)}`, { range: `${sheetName}!1:1`, values: firstRow }, { valueInputOption: "RAW" });
                 }
                 return { success: true };
             }
-            return sheetsRequest(ctx, "POST", `/v4/spreadsheets/${p.spreadsheetId}/values/${encodeA1(range)}:clear`, {});
+            return sheetsRequest(ctx, "POST", `${spreadsheetPath(p.spreadsheetId)}/values/${encodeA1(range)}:clear`, {});
         },
     });
     // ── Delete rows/columns ───────────────────────────────
@@ -887,7 +854,7 @@ export default function googleSheets(rl) {
         // If we added new columns, extend the header row on the sheet first.
         if (prepared.newColumns.length > 0) {
             headers = [...headers, ...prepared.newColumns];
-            await sheetsRequest(ctx, "PUT", `/v4/spreadsheets/${spreadsheetId}/values/${encodeA1(`${sheetName}!${headerRowIdx + 1}:${headerRowIdx + 1}`)}`, {
+            await sheetsRequest(ctx, "PUT", `${spreadsheetPath(spreadsheetId)}/values/${encodeA1(`${sheetName}!${headerRowIdx + 1}:${headerRowIdx + 1}`)}`, {
                 range: `${sheetName}!${headerRowIdx + 1}:${headerRowIdx + 1}`,
                 values: [headers],
             }, { valueInputOption });
@@ -904,13 +871,13 @@ export default function googleSheets(rl) {
         if (upsert && prepared.appendData.length > 0) {
             const values = objectsToRows(prepared.appendData, headers);
             if (p.useAppend) {
-                await sheetsRequest(ctx, "POST", `/v4/spreadsheets/${spreadsheetId}/values/${encodeA1(sheetName)}:append`, { range: sheetName, values }, { valueInputOption, insertDataOption: "INSERT_ROWS" });
+                await sheetsRequest(ctx, "POST", `${spreadsheetPath(spreadsheetId)}/values/${encodeA1(sheetName)}:append`, { range: sheetName, values }, { valueInputOption, insertDataOption: "INSERT_ROWS" });
             }
             else {
                 const lastRow = sheetData.length;
                 await appendEmptyRow(ctx, spreadsheetId, sheetId);
                 const targetRange = `${sheetName}!${lastRow + 1}:${lastRow + values.length}`;
-                await sheetsRequest(ctx, "PUT", `/v4/spreadsheets/${spreadsheetId}/values/${encodeA1(targetRange)}`, { range: targetRange, values }, { valueInputOption });
+                await sheetsRequest(ctx, "PUT", `${spreadsheetPath(spreadsheetId)}/values/${encodeA1(targetRange)}`, { range: targetRange, values }, { valueInputOption });
             }
         }
         return {

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

@@ -21,7 +21,8 @@
  */
 import { writeFileSync } from "node:fs";
 import * as t from "typebox";
-import { googleJsonRequest, googleDownload } from "../../_shared/googleAuth.js";
+import { pathSegment } from "../../_shared/credentials.js";
+import { googleCredential, googleDownload, googleJsonRequest, googleOAuth, } from "../../_shared/googleAuth.js";
 import { Id, NonEmptyString, PositiveInteger, RawGoogleObject, StringArray, stringEnum, } from "../../_shared/googleSchemas.js";
 // ─── Request ─────────────────────────────────────────────────────
 const API_BASE = "https://slides.googleapis.com/v1";
@@ -38,44 +39,15 @@ function extractPresentationId(input) {
     if (!input)
         throw new Error("googleSlides: presentationId or URL is required");
     const m = input.match(PRES_URL_REGEX);
-    return m ? m[1] : input;
+    return pathSegment(m ? m[1] : input);
 }
 // ─── Plugin ──────────────────────────────────────────────────────
 const SCOPES = ["https://www.googleapis.com/auth/presentations"];
 export default function googleSlides(rl) {
     rl.setName("googleSlides");
     rl.setVersion("0.1.0");
-    rl.setOAuth({
-        authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
-        tokenUrl: "https://oauth2.googleapis.com/token",
-        scopes: SCOPES,
-        authParams: { access_type: "offline", prompt: "consent" },
-        setupHelp: [
-            "You need a Google Cloud OAuth client. Takes ~5 minutes, one time.",
-            "",
-            "1. Create or pick a Google Cloud project:",
-            "     https://console.cloud.google.com/projectcreate",
-            "",
-            "2. Enable the Google Slides API:",
-            "     https://console.cloud.google.com/apis/library/slides.googleapis.com",
-            "",
-            "3. Configure the OAuth consent screen:",
-            "     https://console.cloud.google.com/apis/credentials/consent",
-            "     • Audience: External",
-            "",
-            "4. Add yourself as a test user:",
-            "     https://console.cloud.google.com/auth/audience",
-            "",
-            "5. Create the OAuth client:",
-            "     https://console.cloud.google.com/apis/credentials",
-            "     • + Create credentials → OAuth client ID",
-            "     • Application type: Web application",
-            "     • Authorized redirect URIs → + Add URI: {{redirectUri}}",
-            "",
-            "6. Paste the Client ID and Client Secret below, or export",
-            "   GOOGLE_SLIDES_CLIENT_ID and GOOGLE_SLIDES_CLIENT_SECRET.",
-        ],
-    });
+    rl.setCredential(googleCredential("googleSlides", SCOPES));
+    rl.setOAuth(googleOAuth("googleSlides", SCOPES, "GOOGLE_SLIDES"));
     rl.setConnectionSchema({
         authMethod: { type: "string", required: false, description: "delegated or serviceAccount (legacy configs infer the method)" },
         clientId: {
@@ -224,7 +196,7 @@ export default function googleSlides(rl) {
         async execute(input, ctx) {
             const p = (input ?? {});
             const id = extractPresentationId(p.presentation);
-            return slidesRequest(ctx, "GET", `/presentations/${id}/pages/${p.pageObjectId}`);
+            return slidesRequest(ctx, "GET", `/presentations/${id}/pages/${pathSegment(p.pageObjectId)}`);
         },
     });
     rl.registerAction("page.getThumbnail", {
@@ -251,7 +223,7 @@ export default function googleSlides(rl) {
                 qs["thumbnailProperties.mimeType"] = p.mimeType;
             if (p.thumbnailSize)
                 qs["thumbnailProperties.thumbnailSize"] = p.thumbnailSize;
-            const res = (await slidesRequest(ctx, "GET", `/presentations/${id}/pages/${p.pageObjectId}/thumbnail`, undefined, qs));
+            const res = (await slidesRequest(ctx, "GET", `/presentations/${id}/pages/${pathSegment(p.pageObjectId)}/thumbnail`, undefined, qs));
             if (!p.savePath && !p.download)
                 return res;
             // contentUrl is a signed Google URL — fetch without auth headers.

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

@@ -20,7 +20,8 @@
  * normalize ISO input via `Date.toISOString()` when detected.
  */
 import * as t from "typebox";
-import { googleJsonRequest } from "../../_shared/googleAuth.js";
+import { pathSegment } from "../../_shared/credentials.js";
+import { googleCredential, googleJsonRequest, googleOAuth, } from "../../_shared/googleAuth.js";
 import { GoogleTimestamp, Id, stringEnum, } from "../../_shared/googleSchemas.js";
 // ─── Request ─────────────────────────────────────────────────────
 const API_BASE = "https://tasks.googleapis.com/tasks/v1";
@@ -69,37 +70,8 @@ const pageSizeSchema = t.Integer({ minimum: 1, maximum: 100 });
 export default function googleTasks(rl) {
     rl.setName("googleTasks");
     rl.setVersion("0.1.0");
-    rl.setOAuth({
-        authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
-        tokenUrl: "https://oauth2.googleapis.com/token",
-        scopes: SCOPES,
-        authParams: { access_type: "offline", prompt: "consent" },
-        setupHelp: [
-            "You need a Google Cloud OAuth client. Takes ~5 minutes, one time.",
-            "",
-            "1. Create or pick a Google Cloud project:",
-            "     https://console.cloud.google.com/projectcreate",
-            "",
-            "2. Enable the Google Tasks API:",
-            "     https://console.cloud.google.com/apis/library/tasks.googleapis.com",
-            "",
-            "3. Configure the OAuth consent screen:",
-            "     https://console.cloud.google.com/apis/credentials/consent",
-            "     • Audience: External",
-            "",
-            "4. Add yourself as a test user:",
-            "     https://console.cloud.google.com/auth/audience",
-            "",
-            "5. Create the OAuth client:",
-            "     https://console.cloud.google.com/apis/credentials",
-            "     • + Create credentials → OAuth client ID",
-            "     • Application type: Web application",
-            "     • Authorized redirect URIs → + Add URI: {{redirectUri}}",
-            "",
-            "6. Paste the Client ID and Client Secret below, or export",
-            "   GOOGLE_TASKS_CLIENT_ID and GOOGLE_TASKS_CLIENT_SECRET.",
-        ],
-    });
+    rl.setCredential(googleCredential("googleTasks", SCOPES));
+    rl.setOAuth(googleOAuth("googleTasks", SCOPES, "GOOGLE_TASKS"));
     rl.setConnectionSchema({
         authMethod: { type: "string", required: false, description: "delegated or serviceAccount (legacy configs infer the method)" },
         clientId: { type: "string", required: false, env: "GOOGLE_TASKS_CLIENT_ID" },
@@ -140,7 +112,7 @@ export default function googleTasks(rl) {
         inputSchema: t.Object({ taskListId: Id }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            return tasksRequest(ctx, "GET", `/users/@me/lists/${p.taskListId}`);
+            return tasksRequest(ctx, "GET", `/users/@me/lists/${pathSegment(p.taskListId)}`);
         },
     });
     rl.registerAction("taskList.create", {
@@ -161,7 +133,7 @@ export default function googleTasks(rl) {
         }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            return tasksRequest(ctx, "PATCH", `/users/@me/lists/${p.taskListId}`, {
+            return tasksRequest(ctx, "PATCH", `/users/@me/lists/${pathSegment(p.taskListId)}`, {
                 title: p.title,
             });
         },
@@ -172,7 +144,7 @@ export default function googleTasks(rl) {
         inputSchema: t.Object({ taskListId: Id }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            await tasksRequest(ctx, "DELETE", `/users/@me/lists/${p.taskListId}`);
+            await tasksRequest(ctx, "DELETE", `/users/@me/lists/${pathSegment(p.taskListId)}`);
             return { success: true };
         },
     });
@@ -217,7 +189,7 @@ export default function googleTasks(rl) {
                 qs.parent = p.parent;
             if (p.previous)
                 qs.previous = p.previous;
-            return tasksRequest(ctx, "POST", `/lists/${p.taskListId}/tasks`, body, qs);
+            return tasksRequest(ctx, "POST", `/lists/${pathSegment(p.taskListId)}/tasks`, body, qs);
         },
     });
     rl.registerAction("task.get", {
@@ -229,7 +201,7 @@ export default function googleTasks(rl) {
         }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            return tasksRequest(ctx, "GET", `/lists/${p.taskListId}/tasks/${p.taskId}`);
+            return tasksRequest(ctx, "GET", `/lists/${pathSegment(p.taskListId)}/tasks/${pathSegment(p.taskId)}`);
         },
     });
     rl.registerAction("task.list", {
@@ -263,7 +235,7 @@ export default function googleTasks(rl) {
             }
             if (p.pageToken)
                 qs.pageToken = p.pageToken;
-            const path = `/lists/${p.taskListId}/tasks`;
+            const path = `/lists/${pathSegment(p.taskListId)}/tasks`;
             if (p.returnAll)
                 return paginateAll(ctx, path, qs);
             if (p.maxResults)
@@ -315,7 +287,7 @@ export default function googleTasks(rl) {
             if (Object.keys(body).length === 0) {
                 throw new Error("googleTasks: nothing to update");
             }
-            return tasksRequest(ctx, "PATCH", `/lists/${p.taskListId}/tasks/${p.taskId}`, body);
+            return tasksRequest(ctx, "PATCH", `/lists/${pathSegment(p.taskListId)}/tasks/${pathSegment(p.taskId)}`, body);
         },
     });
     rl.registerAction("task.delete", {
@@ -327,7 +299,7 @@ export default function googleTasks(rl) {
         }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            await tasksRequest(ctx, "DELETE", `/lists/${p.taskListId}/tasks/${p.taskId}`);
+            await tasksRequest(ctx, "DELETE", `/lists/${pathSegment(p.taskListId)}/tasks/${pathSegment(p.taskId)}`);
             return { success: true };
         },
     });
@@ -347,7 +319,7 @@ export default function googleTasks(rl) {
                 qs.parent = p.parent;
             if (p.previous)
                 qs.previous = p.previous;
-            return tasksRequest(ctx, "POST", `/lists/${p.taskListId}/tasks/${p.taskId}/move`, undefined, qs);
+            return tasksRequest(ctx, "POST", `/lists/${pathSegment(p.taskListId)}/tasks/${pathSegment(p.taskId)}/move`, undefined, qs);
         },
     });
     rl.registerAction("task.clear", {
@@ -356,7 +328,7 @@ export default function googleTasks(rl) {
         inputSchema: t.Object({ taskListId: Id }, { additionalProperties: false }),
         async execute(input, ctx) {
             const p = (input ?? {});
-            await tasksRequest(ctx, "POST", `/lists/${p.taskListId}/clear`);
+            await tasksRequest(ctx, "POST", `/lists/${pathSegment(p.taskListId)}/clear`);
             return { success: true };
         },
     });

package/dist/plugins/gotify/src/credentials.js

@@ -0,0 +1,32 @@
+import { httpsBase, staticCredential } from "../../_shared/credentials.js";
+/**
+ * An application token that sends messages and a client token that reads
+ * and deletes them, each in the X-Gotify-Key header on its own target of
+ * the connection's HTTPS server.
+ */
+export const gotifyCredential = staticCredential({
+    id: "gotify",
+    auth: {
+        kind: "static",
+        parts: ["appToken", "clientToken"],
+        placements: [
+            {
+                in: "header",
+                part: "appToken",
+                name: "X-Gotify-Key",
+                targets: ["app"],
+            },
+            {
+                in: "header",
+                part: "clientToken",
+                name: "X-Gotify-Key",
+                targets: ["client"],
+            },
+        ],
+    },
+    local: { appToken: "appApiToken", clientToken: "clientApiToken" },
+    targets: (config) => ({
+        app: { baseUrl: httpsBase(config.url, ""), methods: ["POST"] },
+        client: { baseUrl: httpsBase(config.url, ""), methods: ["GET", "DELETE"] },
+    }),
+});

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

@@ -1,35 +1,19 @@
-async function apiRequest(url, token, method, endpoint, body, qs) {
-    const fullUrl = new URL(`${url}${endpoint}`);
-    if (qs) {
-        for (const [k, v] of Object.entries(qs)) {
-            if (v !== undefined && v !== null)
-                fullUrl.searchParams.set(k, String(v));
-        }
-    }
-    const opts = {
+import { credentialJson, pathSegment } from "../../_shared/credentials.js";
+import { gotifyCredential } from "./credentials.js";
+/** A Gotify call on the app target (sending) or the client target (reading, deleting). */
+function apiRequest(ctx, target, method, path, body, query) {
+    return credentialJson(ctx, gotifyCredential, "gotify", {
+        target,
+        path,
         method,
-        headers: {
-            "X-Gotify-Key": token,
-            Accept: "application/json",
-            "Content-Type": "application/json",
-        },
-    };
-    if (body &&
-        Object.keys(body).length > 0 &&
-        method !== "GET" &&
-        method !== "DELETE") {
-        opts.body = JSON.stringify(body);
-    }
-    const res = await fetch(fullUrl.toString(), opts);
-    if (!res.ok)
-        throw new Error(`Gotify API error ${res.status}: ${await res.text()}`);
-    if (res.status === 204)
-        return { success: true };
-    return res.json();
+        query,
+        json: body,
+    });
 }
 export default function gotify(rl) {
     rl.setName("gotify");
     rl.setVersion("0.1.0");
+    rl.setCredential(gotifyCredential);
     rl.setConnectionSchema({
         url: {
             type: "string",
@@ -69,8 +53,6 @@ export default function gotify(rl) {
         },
         async execute(input, ctx) {
             const { message, title, priority, contentType } = input;
-            const url = ctx.connection.config.url.replace(/\/$/, "");
-            const token = ctx.connection.config.appApiToken;
             const body = { message };
             if (title)
                 body.title = title;
@@ -78,7 +60,7 @@ export default function gotify(rl) {
                 body.priority = priority;
             if (contentType)
                 body.extras = { "client::display": { contentType } };
-            return apiRequest(url, token, "POST", "/message", body);
+            return apiRequest(ctx, "app", "POST", "message", body);
         },
     });
     rl.registerAction("message.delete", {
@@ -88,9 +70,7 @@ export default function gotify(rl) {
             messageId: { type: "string", required: true, description: "Message ID" },
         },
         async execute(input, ctx) {
-            const url = ctx.connection.config.url.replace(/\/$/, "");
-            const token = ctx.connection.config.clientApiToken;
-            await apiRequest(url, token, "DELETE", `/message/${input.messageId}`);
+            await apiRequest(ctx, "client", "DELETE", `message/${pathSegment(input.messageId)}`);
             return { success: true };
         },
     });
@@ -102,12 +82,10 @@ export default function gotify(rl) {
         },
         async execute(input, ctx) {
             const { limit } = (input ?? {});
-            const url = ctx.connection.config.url.replace(/\/$/, "");
-            const token = ctx.connection.config.clientApiToken;
             const qs = {};
             if (limit)
                 qs.limit = limit;
-            const data = (await apiRequest(url, token, "GET", "/message", undefined, qs));
+            const data = (await apiRequest(ctx, "client", "GET", "message", undefined, qs));
             return data.messages;
         },
     });

package/dist/plugins/gotowebinar/src/credentials.js

@@ -0,0 +1,13 @@
+import { staticCredential } from "../../_shared/credentials.js";
+/** An OAuth2 access token, sent as a bearer to GoTo's one API origin. */
+export const gotowebinarCredential = staticCredential({
+    id: "gotowebinar",
+    auth: { kind: "bearer" },
+    local: { secret: "accessToken" },
+    targets: {
+        api: {
+            baseUrl: "https://api.getgo.com/G2W/rest/v2/",
+            methods: ["GET", "POST", "PUT", "DELETE"],
+        },
+    },
+});