@commandable/integration-data 0.0.1 → 0.0.4

package/integrations/trello/__tests__/write_and_admin_handlers.test.ts

@@ -1,6 +1,5 @@
-import { beforeAll, describe, expect, it } from 'vitest'
-import { IntegrationProxy } from '../../../src/integrations/proxy.js'
-import { loadIntegrationTools } from '../../../src/integrations/dataLoader.js'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { createCredentialStore, createIntegrationNode, createProxy, createToolbox, hasEnv, safeCleanup } from '../../__tests__/liveHarness.js'
 
 interface Ctx {
   boardId?: string
@@ -10,86 +9,69 @@ interface Ctx {
   memberId?: string
 }
 
-const env = process.env as Record<string, string>
-const hasEnv = (...keys: string[]) => keys.every(k => !!env[k] && env[k].trim().length > 0)
 const suite = hasEnv(
-  'COMMANDABLE_MANAGED_OAUTH_BASE_URL',
-  'COMMANDABLE_MANAGED_OAUTH_SECRET_KEY',
   'TRELLO_API_KEY',
-  'TRELLO_TEST_CONNECTION_ID',
+  'TRELLO_API_TOKEN',
 )
   ? describe
   : describe.skip
 
 suite('trello write handlers (live)', () => {
   const ctx: Ctx = {}
-  let buildWrite: (name: string) => ((input: any) => Promise<any>)
-  let buildRead: (name: string) => ((input: any) => Promise<any>)
+  let trello: ReturnType<typeof createToolbox>
 
   beforeAll(async () => {
-    const { COMMANDABLE_MANAGED_OAUTH_BASE_URL, COMMANDABLE_MANAGED_OAUTH_SECRET_KEY, TRELLO_API_KEY, TRELLO_TEST_CONNECTION_ID } = env
-
-    const proxy = new IntegrationProxy({
-      managedOAuthBaseUrl: COMMANDABLE_MANAGED_OAUTH_BASE_URL,
-      managedOAuthSecretKey: COMMANDABLE_MANAGED_OAUTH_SECRET_KEY,
-      trelloApiKey: TRELLO_API_KEY,
-    })
-    const integrationNode = { id: 'node-trello', type: 'trello', label: 'Trello', connectionId: TRELLO_TEST_CONNECTION_ID } as any
-
-    const tools = loadIntegrationTools('trello')
-    expect(tools).toBeTruthy()
-
-    buildWrite = (name: string) => {
-      const tool = tools!.write.find(t => t.name === name)
-      expect(tool, `write tool ${name} exists`).toBeTruthy()
-      const integration = { fetch: (path: string, init?: RequestInit) => proxy.call(integrationNode, path, init) }
-      const build = new Function('integration', `return (${tool!.handlerCode});`)
-      return build(integration) as (input: any) => Promise<any>
-    }
-
-    buildRead = (name: string) => {
-      const tool = tools!.read.find(t => t.name === name)
-      expect(tool, `read tool ${name} exists`).toBeTruthy()
-      const integration = { fetch: (path: string, init?: RequestInit) => proxy.call(integrationNode, path, init) }
-      const build = new Function('integration', `return (${tool!.handlerCode});`)
-      return build(integration) as (input: any) => Promise<any>
-    }
-
-    // Discover a board and list for tests
-    const get_member_boards = buildRead('get_member_boards')
-    const boards = await get_member_boards({})
-    ctx.boardId = boards?.[0]?.id
-    if (ctx.boardId) {
-      const get_board_lists = buildRead('get_board_lists')
-      const lists = await get_board_lists({ boardId: ctx.boardId })
-      ctx.listId = lists?.[0]?.id
-      ctx.listId2 = lists?.[1]?.id || ctx.listId
-    }
+    const env = process.env as Record<string, string | undefined>
+    const credentialStore = createCredentialStore(async () => ({ apiKey: env.TRELLO_API_KEY || '', apiToken: env.TRELLO_API_TOKEN || '' }))
+    const proxy = createProxy(credentialStore)
+    const node = createIntegrationNode('trello', { label: 'Trello', credentialId: 'trello-creds' })
+    trello = createToolbox('trello', proxy, node)
+
+    // Create an isolated board + two lists for this test run
+    const create_board = trello.write('create_board')
+    const board = await create_board({ name: `CmdTest Trello ${Date.now()}`, defaultLists: false })
+    ctx.boardId = board?.id
+    expect(ctx.boardId).toBeTruthy()
+
+    const create_list = trello.write('create_list')
+    const list1 = await create_list({ idBoard: ctx.boardId, name: 'CmdTest List A' })
+    const list2 = await create_list({ idBoard: ctx.boardId, name: 'CmdTest List B' })
+    ctx.listId = list1?.id
+    ctx.listId2 = list2?.id
+    expect(ctx.listId).toBeTruthy()
+    expect(ctx.listId2).toBeTruthy()
 
     // Discover a member to add to card (self)
-    const get_member = buildRead('get_member')
+    const get_member = trello.read('get_member')
     const me = await get_member({})
     ctx.memberId = me?.id
   }, 60000)
 
+  afterAll(async () => {
+    if (!ctx.boardId)
+      return
+    await safeCleanup(async () => trello.write('close_board')({ boardId: ctx.boardId }))
+    await safeCleanup(async () => trello.write('delete_board')({ boardId: ctx.boardId }))
+  }, 60_000)
+
   it('create_card -> get_card -> update_card -> move_card_to_list -> delete_card', async () => {
     if (!ctx.boardId || !ctx.listId || !ctx.memberId)
       return expect(true).toBe(true)
 
     // Create card
-    const create_card = buildWrite('create_card')
+    const create_card = trello.write('create_card')
     const created = await create_card({ idList: ctx.listId, name: `CmdCard ${Date.now()}`, desc: 'Initial desc' })
     const cardId = created?.id
     expect(cardId).toBeTruthy()
     ctx.cardId = cardId
 
     // Read card
-    const get_card = buildRead('get_card')
+    const get_card = trello.read('get_card')
     const got = await get_card({ cardId })
     expect(got?.id).toBe(cardId)
 
     // Update card
-    const update_card = buildWrite('update_card')
+    const update_card = trello.write('update_card')
     const updated = await update_card({ cardId, name: 'Updated Name', desc: 'Updated desc' })
     expect(updated?.id).toBe(cardId)
 
@@ -99,7 +81,7 @@ suite('trello write handlers (live)', () => {
 
     // Move card
     if (ctx.listId2 && ctx.listId2 !== ctx.listId) {
-      const move_card_to_list = buildWrite('move_card_to_list')
+      const move_card_to_list = trello.write('move_card_to_list')
       const moved = await move_card_to_list({ cardId, listId: ctx.listId2 })
       expect(moved?.id).toBe(cardId)
       const got3 = await get_card({ cardId })
@@ -107,7 +89,7 @@ suite('trello write handlers (live)', () => {
     }
 
     // Delete card
-    const delete_card = buildWrite('delete_card')
+    const delete_card = trello.write('delete_card')
     const del = await delete_card({ cardId })
     expect(Boolean(del === '' || del?.limits || del?.id === cardId || (del && typeof del === 'object'))).toBe(true)
   }, 120000)
@@ -117,26 +99,26 @@ suite('trello write handlers (live)', () => {
       return expect(true).toBe(true)
 
     // Create an isolated card for this test
-    const create_card = buildWrite('create_card')
+    const create_card = trello.write('create_card')
     const created = await create_card({ idList: ctx.listId, name: `CmdCard Members ${Date.now()}` })
     const cardId = created?.id
     expect(cardId).toBeTruthy()
 
-    const add_member_to_card = buildWrite('add_member_to_card')
+    const add_member_to_card = trello.write('add_member_to_card')
     const added = await add_member_to_card({ cardId, memberId: ctx.memberId })
     expect(added).toBeTruthy()
 
-    const get_card_members = buildRead('get_card_members')
+    const get_card_members = trello.read('get_card_members')
     const members = await get_card_members({ cardId })
     const hasMember = (members || []).some((m: any) => m?.id === ctx.memberId)
     expect(hasMember).toBe(true)
 
-    const remove_member_from_card = buildWrite('remove_member_from_card')
+    const remove_member_from_card = trello.write('remove_member_from_card')
     const removed = await remove_member_from_card({ cardId, memberId: ctx.memberId })
     expect(removed === '' || (removed && typeof removed === 'object')).toBe(true)
 
     // Cleanup
-    const delete_card = buildWrite('delete_card')
+    const delete_card = trello.write('delete_card')
     await delete_card({ cardId })
   }, 90000)
 
@@ -145,44 +127,44 @@ suite('trello write handlers (live)', () => {
       return expect(true).toBe(true)
 
     // Create an isolated card for this test
-    const create_card = buildWrite('create_card')
+    const create_card = trello.write('create_card')
     const createdCard = await create_card({ idList: ctx.listId, name: `CmdCard Checklist ${Date.now()}` })
     const cardId = createdCard?.id
     expect(cardId).toBeTruthy()
 
-    const add_checklist_to_card = buildWrite('add_checklist_to_card')
+    const add_checklist_to_card = trello.write('add_checklist_to_card')
     const created = await add_checklist_to_card({ cardId, name: `Checklist ${Date.now()}` })
     expect(created?.id).toBeTruthy()
 
-    const get_card_checklists = buildRead('get_card_checklists')
+    const get_card_checklists = trello.read('get_card_checklists')
     const lists = await get_card_checklists({ cardId })
     expect(Array.isArray(lists)).toBe(true)
 
     // Cleanup
-    const delete_card = buildWrite('delete_card')
+    const delete_card = trello.write('delete_card')
     await delete_card({ cardId })
   }, 60000)
 
   it('create_list -> get_list -> update_list -> archive_list', async () => {
     if (!ctx.boardId)
       return expect(true).toBe(true)
-    const create_list = buildWrite('create_list')
+    const create_list = trello.write('create_list')
     const created = await create_list({ idBoard: ctx.boardId, name: `CmdList ${Date.now()}` })
     const listId = created?.id
     expect(listId).toBeTruthy()
 
-    const get_list = buildRead('get_list')
+    const get_list = trello.read('get_list')
     const got = await get_list({ listId })
     expect(got?.id).toBe(listId)
 
-    const update_list = buildWrite('update_list')
+    const update_list = trello.write('update_list')
     const updated = await update_list({ listId, name: 'Updated List Name' })
     expect(updated?.id).toBe(listId)
 
     const got2 = await get_list({ listId })
     expect(got2?.name).toBe('Updated List Name')
 
-    const archive_list = buildWrite('archive_list')
+    const archive_list = trello.write('archive_list')
     const archived = await archive_list({ listId })
     expect(archived?.closed === true).toBe(true)
   }, 120000)

package/integrations/trello/credentials.json

@@ -1,26 +1,31 @@
 {
-  "schema": {
-    "type": "object",
-    "properties": {
-      "apiKey": {
-        "type": "string",
-        "title": "API Key",
-        "description": "Your Trello API key from https://trello.com/power-ups/admin"
+  "variants": {
+    "api_key_token": {
+      "label": "API Key + Token",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "apiKey": {
+            "type": "string",
+            "title": "API Key",
+            "description": "Your Trello API key from https://trello.com/power-ups/admin"
+          },
+          "apiToken": {
+            "type": "string",
+            "title": "API Token",
+            "description": "Your Trello API token (\"token\" param). Generate one via Trello's authorize flow."
+          }
+        },
+        "required": ["apiKey", "apiToken"],
+        "additionalProperties": false
       },
-      "apiToken": {
-        "type": "string",
-        "title": "API Token",
-        "description": "Your Trello API token (\"token\" param). Generate one via Trello's authorize flow."
+      "injection": {
+        "query": {
+          "key": "{{apiKey}}",
+          "token": "{{apiToken}}"
+        }
       }
-    },
-    "required": ["apiKey", "apiToken"],
-    "additionalProperties": false
-  },
-  "injection": {
-    "query": {
-      "key": "{{apiKey}}",
-      "token": "{{apiToken}}"
     }
-  }
+  },
+  "default": "api_key_token"
 }
-

package/integrations/trello/handlers/close_board.js

@@ -0,0 +1,6 @@
+async (input) => {
+  const params = new URLSearchParams({ closed: 'true' })
+  const res = await integration.fetch(`/boards/${encodeURIComponent(input.boardId)}?${params.toString()}`, { method: 'PUT' })
+  return await res.json()
+}
+

package/integrations/trello/handlers/create_board.js

@@ -0,0 +1,11 @@
+async (input) => {
+  const params = new URLSearchParams()
+  params.set('name', input.name)
+  if (input.defaultLists !== undefined && input.defaultLists !== null)
+    params.set('defaultLists', String(Boolean(input.defaultLists)))
+  if (input.desc !== undefined && input.desc !== null)
+    params.set('desc', String(input.desc))
+  const res = await integration.fetch(`/boards?${params.toString()}`, { method: 'POST' })
+  return await res.json()
+}
+

package/integrations/trello/handlers/delete_board.js

@@ -0,0 +1,13 @@
+async (input) => {
+  const res = await integration.fetch(`/boards/${encodeURIComponent(input.boardId)}`, { method: 'DELETE' })
+  if (res.status === 204)
+    return { success: true, status: 204 }
+  // Trello sometimes returns JSON on delete failures.
+  try {
+    return await res.json()
+  }
+  catch {
+    return { success: res.ok, status: res.status }
+  }
+}
+

package/integrations/trello/manifest.json

@@ -157,6 +157,27 @@
       "handler": "handlers/search.js",
       "scope": "read"
     },
+    {
+      "name": "create_board",
+      "description": "Create a new board.",
+      "inputSchema": "schemas/create_board.json",
+      "handler": "handlers/create_board.js",
+      "scope": "write"
+    },
+    {
+      "name": "close_board",
+      "description": "Close a board (set closed=true).",
+      "inputSchema": "schemas/close_board.json",
+      "handler": "handlers/close_board.js",
+      "scope": "write"
+    },
+    {
+      "name": "delete_board",
+      "description": "Permanently delete a closed board.",
+      "inputSchema": "schemas/delete_board.json",
+      "handler": "handlers/delete_board.js",
+      "scope": "write"
+    },
     {
       "name": "create_card",
       "description": "Create a new card in a list.",

package/integrations/trello/schemas/close_board.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "required": ["boardId"],
+  "additionalProperties": false,
+  "properties": {
+    "boardId": { "type": "string" }
+  }
+}
+

package/integrations/trello/schemas/create_board.json

@@ -0,0 +1,12 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "required": ["name"],
+  "additionalProperties": false,
+  "properties": {
+    "name": { "type": "string" },
+    "defaultLists": { "type": "boolean", "description": "Create the default lists on the board (default: true)" },
+    "desc": { "type": "string" }
+  }
+}
+

package/integrations/trello/schemas/delete_board.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "required": ["boardId"],
+  "additionalProperties": false,
+  "properties": {
+    "boardId": { "type": "string" }
+  }
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commandable/integration-data",
-  "version": "0.0.1",
+  "version": "0.0.4",
   "description": "Integration data (manifests, schemas, handlers, credential configs) for Commandable integrations.",
   "license": "AGPL-3.0-only",
   "repository": {