@mcp-z/mcp-sheets 1.0.0 → 1.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +32 -3
- package/bin/server.js +1 -1
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/index.js +13 -13
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/lib/create-store.js.map +1 -1
- package/dist/cjs/mcp/index.js +6 -6
- package/dist/cjs/mcp/index.js.map +1 -1
- package/dist/cjs/mcp/prompts/a1-notation.js.map +1 -1
- package/dist/cjs/mcp/prompts/index.js +2 -2
- package/dist/cjs/mcp/prompts/index.js.map +1 -1
- package/dist/cjs/mcp/resources/index.js +2 -2
- package/dist/cjs/mcp/resources/index.js.map +1 -1
- package/dist/cjs/mcp/resources/spreadsheet.js.map +1 -1
- package/dist/cjs/mcp/tools/cells-format.js +8 -8
- package/dist/cjs/mcp/tools/cells-format.js.map +1 -1
- package/dist/cjs/mcp/tools/chart-create.js +8 -8
- package/dist/cjs/mcp/tools/chart-create.js.map +1 -1
- package/dist/cjs/mcp/tools/columns-get.js +3 -3
- package/dist/cjs/mcp/tools/columns-get.js.map +1 -1
- package/dist/cjs/mcp/tools/columns-update.js +10 -10
- package/dist/cjs/mcp/tools/columns-update.js.map +1 -1
- package/dist/cjs/mcp/tools/csv-get-columns.js +2 -2
- package/dist/cjs/mcp/tools/csv-get-columns.js.map +1 -1
- package/dist/cjs/mcp/tools/dimensions-batch-update.js +16 -16
- package/dist/cjs/mcp/tools/dimensions-batch-update.js.map +1 -1
- package/dist/cjs/mcp/tools/dimensions-move.js +5 -5
- package/dist/cjs/mcp/tools/dimensions-move.js.map +1 -1
- package/dist/cjs/mcp/tools/index.js +52 -52
- package/dist/cjs/mcp/tools/index.js.map +1 -1
- package/dist/cjs/mcp/tools/lib/dimension-operations.js.map +1 -1
- package/dist/cjs/mcp/tools/rows-append.js +10 -10
- package/dist/cjs/mcp/tools/rows-append.js.map +1 -1
- package/dist/cjs/mcp/tools/rows-csv-append.js +13 -13
- package/dist/cjs/mcp/tools/rows-csv-append.js.map +1 -1
- package/dist/cjs/mcp/tools/rows-get.js +4 -4
- package/dist/cjs/mcp/tools/rows-get.js.map +1 -1
- package/dist/cjs/mcp/tools/sheet-copy-to.js +4 -4
- package/dist/cjs/mcp/tools/sheet-copy-to.js.map +1 -1
- package/dist/cjs/mcp/tools/sheet-copy.js +5 -5
- package/dist/cjs/mcp/tools/sheet-copy.js.map +1 -1
- package/dist/cjs/mcp/tools/sheet-create.js +4 -4
- package/dist/cjs/mcp/tools/sheet-create.js.map +1 -1
- package/dist/cjs/mcp/tools/sheet-delete.js +4 -4
- package/dist/cjs/mcp/tools/sheet-delete.js.map +1 -1
- package/dist/cjs/mcp/tools/sheet-find.js +7 -7
- package/dist/cjs/mcp/tools/sheet-find.js.map +1 -1
- package/dist/cjs/mcp/tools/sheet-rename.js +5 -5
- package/dist/cjs/mcp/tools/sheet-rename.js.map +1 -1
- package/dist/cjs/mcp/tools/spreadsheet-copy.js +2 -2
- package/dist/cjs/mcp/tools/spreadsheet-copy.js.map +1 -1
- package/dist/cjs/mcp/tools/spreadsheet-create.js +2 -2
- package/dist/cjs/mcp/tools/spreadsheet-create.js.map +1 -1
- package/dist/cjs/mcp/tools/spreadsheet-find.js +6 -6
- package/dist/cjs/mcp/tools/spreadsheet-find.js.map +1 -1
- package/dist/cjs/mcp/tools/spreadsheet-rename.js +3 -3
- package/dist/cjs/mcp/tools/spreadsheet-rename.js.map +1 -1
- package/dist/cjs/mcp/tools/validation-set.js +8 -8
- package/dist/cjs/mcp/tools/validation-set.js.map +1 -1
- package/dist/cjs/mcp/tools/values-batch-update.js +8 -8
- package/dist/cjs/mcp/tools/values-batch-update.js.map +1 -1
- package/dist/cjs/mcp/tools/values-clear.js +6 -6
- package/dist/cjs/mcp/tools/values-clear.js.map +1 -1
- package/dist/cjs/mcp/tools/values-csv-update.js +8 -8
- package/dist/cjs/mcp/tools/values-csv-update.js.map +1 -1
- package/dist/cjs/mcp/tools/values-replace.js +8 -8
- package/dist/cjs/mcp/tools/values-replace.js.map +1 -1
- package/dist/cjs/mcp/tools/values-search.js +5 -5
- package/dist/cjs/mcp/tools/values-search.js.map +1 -1
- package/dist/cjs/schemas/index.js.map +1 -1
- package/dist/cjs/setup/config.js +11 -1
- package/dist/cjs/setup/config.js.map +1 -1
- package/dist/cjs/setup/http.js +6 -2
- package/dist/cjs/setup/http.js.map +1 -1
- package/dist/cjs/setup/index.js +9 -9
- package/dist/cjs/setup/index.js.map +1 -1
- package/dist/cjs/setup/oauth-google.d.cts +3 -2
- package/dist/cjs/setup/oauth-google.d.ts +3 -2
- package/dist/cjs/setup/oauth-google.js +15 -12
- package/dist/cjs/setup/oauth-google.js.map +1 -1
- package/dist/cjs/setup/runtime.js +9 -9
- package/dist/cjs/setup/runtime.js.map +1 -1
- package/dist/cjs/setup/stdio.js +2 -2
- package/dist/cjs/setup/stdio.js.map +1 -1
- package/dist/cjs/spreadsheet/column-utilities.js.map +1 -1
- package/dist/cjs/spreadsheet/csv-streaming.js.map +1 -1
- package/dist/cjs/spreadsheet/data-operations.js +9 -9
- package/dist/cjs/spreadsheet/data-operations.js.map +1 -1
- package/dist/cjs/spreadsheet/deduplication-utils.js.map +1 -1
- package/dist/cjs/spreadsheet/range-operations.js +2 -2
- package/dist/cjs/spreadsheet/range-operations.js.map +1 -1
- package/dist/cjs/spreadsheet/sheet-operations.js +3 -3
- package/dist/cjs/spreadsheet/sheet-operations.js.map +1 -1
- package/dist/cjs/spreadsheet/spreadsheet-management.js.map +1 -1
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/lib/create-store.js.map +1 -1
- package/dist/esm/mcp/index.js.map +1 -1
- package/dist/esm/mcp/prompts/a1-notation.js.map +1 -1
- package/dist/esm/mcp/prompts/index.js.map +1 -1
- package/dist/esm/mcp/resources/index.js.map +1 -1
- package/dist/esm/mcp/resources/spreadsheet.js.map +1 -1
- package/dist/esm/mcp/tools/cells-format.js.map +1 -1
- package/dist/esm/mcp/tools/chart-create.js.map +1 -1
- package/dist/esm/mcp/tools/columns-get.js.map +1 -1
- package/dist/esm/mcp/tools/columns-update.js.map +1 -1
- package/dist/esm/mcp/tools/csv-get-columns.js.map +1 -1
- package/dist/esm/mcp/tools/dimensions-batch-update.js.map +1 -1
- package/dist/esm/mcp/tools/dimensions-move.js.map +1 -1
- package/dist/esm/mcp/tools/index.js.map +1 -1
- package/dist/esm/mcp/tools/lib/dimension-operations.js.map +1 -1
- package/dist/esm/mcp/tools/rows-append.js.map +1 -1
- package/dist/esm/mcp/tools/rows-csv-append.js.map +1 -1
- package/dist/esm/mcp/tools/rows-get.js.map +1 -1
- package/dist/esm/mcp/tools/sheet-copy-to.js.map +1 -1
- package/dist/esm/mcp/tools/sheet-copy.js.map +1 -1
- package/dist/esm/mcp/tools/sheet-create.js.map +1 -1
- package/dist/esm/mcp/tools/sheet-delete.js.map +1 -1
- package/dist/esm/mcp/tools/sheet-find.js.map +1 -1
- package/dist/esm/mcp/tools/sheet-rename.js.map +1 -1
- package/dist/esm/mcp/tools/spreadsheet-copy.js.map +1 -1
- package/dist/esm/mcp/tools/spreadsheet-create.js.map +1 -1
- package/dist/esm/mcp/tools/spreadsheet-find.js.map +1 -1
- package/dist/esm/mcp/tools/spreadsheet-rename.js.map +1 -1
- package/dist/esm/mcp/tools/validation-set.js.map +1 -1
- package/dist/esm/mcp/tools/values-batch-update.js.map +1 -1
- package/dist/esm/mcp/tools/values-clear.js.map +1 -1
- package/dist/esm/mcp/tools/values-csv-update.js.map +1 -1
- package/dist/esm/mcp/tools/values-replace.js.map +1 -1
- package/dist/esm/mcp/tools/values-search.js.map +1 -1
- package/dist/esm/schemas/index.js.map +1 -1
- package/dist/esm/setup/config.js +12 -2
- package/dist/esm/setup/config.js.map +1 -1
- package/dist/esm/setup/http.js +4 -0
- package/dist/esm/setup/http.js.map +1 -1
- package/dist/esm/setup/index.js.map +1 -1
- package/dist/esm/setup/oauth-google.d.ts +3 -2
- package/dist/esm/setup/oauth-google.js +8 -11
- package/dist/esm/setup/oauth-google.js.map +1 -1
- package/dist/esm/setup/runtime.js.map +1 -1
- package/dist/esm/setup/stdio.js.map +1 -1
- package/dist/esm/spreadsheet/column-utilities.js.map +1 -1
- package/dist/esm/spreadsheet/csv-streaming.js.map +1 -1
- package/dist/esm/spreadsheet/data-operations.js.map +1 -1
- package/dist/esm/spreadsheet/deduplication-utils.js.map +1 -1
- package/dist/esm/spreadsheet/range-operations.js.map +1 -1
- package/dist/esm/spreadsheet/sheet-operations.js.map +1 -1
- package/dist/esm/spreadsheet/spreadsheet-management.js.map +1 -1
- package/dist/esm/types.js.map +1 -1
- package/package.json +1 -1
|
@@ -12,7 +12,7 @@ var _oauthgoogle = require("@mcp-z/oauth-google");
|
|
|
12
12
|
var _types = require("@modelcontextprotocol/sdk/types.js");
|
|
13
13
|
var _googleapis = require("googleapis");
|
|
14
14
|
var _zod = require("zod");
|
|
15
|
-
var
|
|
15
|
+
var _indexts = require("../../schemas/index.js");
|
|
16
16
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
17
17
|
try {
|
|
18
18
|
var info = gen[key](arg);
|
|
@@ -189,8 +189,8 @@ function columnIndexToLetter(index) {
|
|
|
189
189
|
return letter;
|
|
190
190
|
}
|
|
191
191
|
var inputSchema = _zod.z.object({
|
|
192
|
-
id:
|
|
193
|
-
gid:
|
|
192
|
+
id: _indexts.SpreadsheetIdSchema,
|
|
193
|
+
gid: _indexts.SheetGidSchema,
|
|
194
194
|
query: _zod.z.coerce.string().trim().optional().describe('Text to search for in sheet cells. If empty, returns all data at specified granularity.'),
|
|
195
195
|
select: _zod.z.enum([
|
|
196
196
|
'cells',
|
|
@@ -211,8 +211,8 @@ var successBranchSchema = _zod.z.object({
|
|
|
211
211
|
count: _zod.z.number().int().nonnegative().describe('Number of matches found'),
|
|
212
212
|
a1s: _zod.z.array(_zod.z.string()).optional().describe('A1 notation references for matches (e.g., "B5", "A5:D5", "B:B")'),
|
|
213
213
|
values: _zod.z.array(_zod.z.union([
|
|
214
|
-
_zod.z.array(
|
|
215
|
-
|
|
214
|
+
_zod.z.array(_indexts.SheetCellSchema),
|
|
215
|
+
_indexts.SheetCellSchema
|
|
216
216
|
])).optional().describe('Cell values for matches (arrays for rows/columns, single values for cells)')
|
|
217
217
|
});
|
|
218
218
|
var outputSchema = _zod.z.discriminatedUnion('type', [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/Projects/ai/mcp-z/servers/mcp-sheets/src/mcp/tools/values-search.ts"],"sourcesContent":["import type { EnrichedExtra } from '@mcp-z/oauth-google';\nimport { schemas } from '@mcp-z/oauth-google';\n\nconst { AuthRequiredBranchSchema } = schemas;\n\nimport type { ToolModule } from '@mcp-z/server';\nimport type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';\nimport { ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';\nimport { google } from 'googleapis';\nimport { z } from 'zod';\nimport { SheetCellSchema, SheetGidSchema, SpreadsheetIdSchema } from '../../schemas/index.js';\n\n// Helper to convert column index to letter (0 = A, 1 = B, etc.)\nfunction columnIndexToLetter(index: number): string {\n let letter = '';\n let num = index + 1;\n while (num > 0) {\n const remainder = (num - 1) % 26;\n letter = String.fromCharCode(65 + remainder) + letter;\n num = Math.floor((num - 1) / 26);\n }\n return letter;\n}\n\nconst inputSchema = z.object({\n id: SpreadsheetIdSchema,\n gid: SheetGidSchema,\n query: z.coerce.string().trim().optional().describe('Text to search for in sheet cells. If empty, returns all data at specified granularity.'),\n select: z.enum(['cells', 'rows', 'columns']).describe('Granularity: cells (individual matches), rows (full matching rows), columns (columns with matching headers)'),\n values: z.boolean().optional().describe('Include cell values in response'),\n a1s: z.boolean().optional().describe('Include A1 notation references in response'),\n render: z.enum(['FORMATTED_VALUE', 'UNFORMATTED_VALUE', 'FORMULA']).optional().describe('How to render cell values. FORMATTED_VALUE (default): calculated with formatting. UNFORMATTED_VALUE: calculated without formatting. FORMULA: show formula text instead of result.'),\n matchCase: z.boolean().optional().describe('Case-sensitive matching. Default is false (case-insensitive).'),\n});\n\nconst successBranchSchema = z.object({\n type: z.literal('success'),\n count: z.number().int().nonnegative().describe('Number of matches found'),\n a1s: z.array(z.string()).optional().describe('A1 notation references for matches (e.g., \"B5\", \"A5:D5\", \"B:B\")'),\n values: z\n .array(z.union([z.array(SheetCellSchema), SheetCellSchema]))\n .optional()\n .describe('Cell values for matches (arrays for rows/columns, single values for cells)'),\n});\n\nconst outputSchema = z.discriminatedUnion('type', [successBranchSchema, AuthRequiredBranchSchema]);\n\nconst config = {\n description: 'Search spreadsheet and return matches at cell, row, or column granularity. Use a1-notation prompt for range syntax.',\n inputSchema,\n outputSchema: z.object({\n result: outputSchema,\n }),\n} as const;\n\nexport type Input = z.infer<typeof inputSchema>;\nexport type Output = z.infer<typeof outputSchema>;\n\nasync function handler({ id, gid, query, select, values = false, a1s = false, render, matchCase = false }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n const logger = extra.logger;\n logger.info('sheets.values-search called', { id, gid, query, select, values, a1s, render, matchCase });\n\n try {\n const sheets = google.sheets({ version: 'v4', auth: extra.authContext.auth });\n\n // Get sheet details including grid dimensions\n const spreadsheetResponse = await sheets.spreadsheets.get({\n spreadsheetId: id,\n fields: 'sheets.properties.sheetId,sheets.properties.title,sheets.properties.gridProperties',\n });\n\n const sheet = spreadsheetResponse.data.sheets?.find((s) => String(s.properties?.sheetId) === gid);\n\n if (!sheet) {\n logger.info('sheets.values-search sheet not found', { id, gid, query });\n throw new McpError(ErrorCode.InvalidParams, 'Sheet not found');\n }\n\n const sheetTitle = sheet.properties?.title ?? '';\n\n // Use actual sheet dimensions from gridProperties, with sensible defaults\n // Google Sheets default for new sheets is 1000 rows x 26 columns\n const rowCount = sheet.properties?.gridProperties?.rowCount ?? 1000;\n const columnCount = sheet.properties?.gridProperties?.columnCount ?? 26;\n const endColumn = columnIndexToLetter(columnCount - 1);\n const fullRange = `${sheetTitle}!A1:${endColumn}${rowCount}`;\n\n logger.debug?.('sheets.values-search fetching range', { fullRange, rowCount, columnCount });\n\n const response = await sheets.spreadsheets.values.get({\n spreadsheetId: id,\n range: fullRange,\n valueRenderOption: render || 'FORMATTED_VALUE',\n });\n const res = response.data;\n const allRows = Array.isArray(res.values) ? (res.values as (string | number | boolean | null)[][]) : [];\n\n // Prepare query for matching (case-insensitive by default)\n const searchQuery = query ? (matchCase ? query : query.toLowerCase()) : null;\n\n let count = 0;\n const a1Array: string[] = [];\n const valuesArray: (string | number | boolean | null | (string | number | boolean | null)[])[] = [];\n\n // Helper to check if a cell matches the query\n const cellMatches = (cell: string | number | boolean | null): boolean => {\n if (!searchQuery) return true; // If no query, match all\n if (typeof cell !== 'string') return false;\n const cellValue = matchCase ? cell : cell.toLowerCase();\n return cellValue.includes(searchQuery);\n };\n\n if (select === 'cells') {\n for (let rowIdx = 0; rowIdx < allRows.length; rowIdx++) {\n const row = allRows[rowIdx];\n if (!row) continue;\n\n for (let colIdx = 0; colIdx < row.length; colIdx++) {\n const cell = row[colIdx];\n if (cellMatches(cell)) {\n count++;\n if (a1s) {\n const colLetter = columnIndexToLetter(colIdx);\n const rowNum = rowIdx + 1;\n a1Array.push(`${colLetter}${rowNum}`);\n }\n if (values) {\n valuesArray.push(cell ?? null);\n }\n }\n }\n }\n } else if (select === 'rows') {\n const matchingRows: number[] = [];\n for (let rowIdx = 0; rowIdx < allRows.length; rowIdx++) {\n const row = allRows[rowIdx];\n if (!row) continue;\n\n const matches = row.some((cell) => cellMatches(cell));\n if (matches) {\n matchingRows.push(rowIdx);\n }\n }\n\n count = matchingRows.length;\n for (const rowIdx of matchingRows) {\n const row = allRows[rowIdx];\n if (!row) continue; // Skip if row is undefined\n const rowNum = rowIdx + 1;\n\n if (a1s) {\n const colEnd = columnIndexToLetter(Math.max(0, row.length - 1));\n a1Array.push(`A${rowNum}:${colEnd}${rowNum}`);\n }\n if (values) {\n valuesArray.push(row);\n }\n }\n } else if (select === 'columns') {\n const headerRow = allRows[0] || [];\n const matchingCols: number[] = [];\n\n for (let colIdx = 0; colIdx < headerRow.length; colIdx++) {\n const header = headerRow[colIdx];\n if (cellMatches(header)) {\n matchingCols.push(colIdx);\n }\n }\n\n count = matchingCols.length;\n for (const colIdx of matchingCols) {\n const colLetter = columnIndexToLetter(colIdx);\n\n if (a1s) {\n a1Array.push(`${colLetter}:${colLetter}`);\n }\n if (values) {\n const columnValues = allRows.map((row) => (row && row[colIdx] !== undefined ? row[colIdx] : null));\n valuesArray.push(columnValues);\n }\n }\n }\n\n logger.info('sheets.values-search results', { count, select, hasA1s: a1s, hasValues: values });\n\n const result: Output = {\n type: 'success' as const,\n count,\n ...(a1s && a1Array.length > 0 && { a1s: a1Array }),\n ...(values && valuesArray.length > 0 && { values: valuesArray }),\n };\n\n return {\n content: [{ type: 'text' as const, text: JSON.stringify(result) }],\n structuredContent: { result },\n };\n } catch (error) {\n const message = error instanceof Error ? error.message : String(error);\n logger.error('sheets.values-search error', { error: message });\n\n throw new McpError(ErrorCode.InternalError, `Error searching spreadsheet: ${message}`, {\n stack: error instanceof Error ? error.stack : undefined,\n });\n }\n}\n\nexport default function createTool() {\n return {\n name: 'values-search',\n config,\n handler,\n } satisfies ToolModule;\n}\n"],"names":["createTool","AuthRequiredBranchSchema","schemas","columnIndexToLetter","index","letter","num","remainder","String","fromCharCode","Math","floor","inputSchema","z","object","id","SpreadsheetIdSchema","gid","SheetGidSchema","query","coerce","string","trim","optional","describe","select","enum","values","boolean","a1s","render","matchCase","successBranchSchema","type","literal","count","number","int","nonnegative","array","union","SheetCellSchema","outputSchema","discriminatedUnion","config","description","result","handler","extra","logger","spreadsheetResponse","sheet","sheets","sheetTitle","rowCount","columnCount","endColumn","fullRange","response","res","allRows","searchQuery","a1Array","valuesArray","cellMatches","rowIdx","row","colIdx","cell","colLetter","rowNum","matchingRows","matches","colEnd","headerRow","matchingCols","header","error","message","info","google","version","auth","authContext","spreadsheets","get","spreadsheetId","fields","data","find","s","properties","sheetId","McpError","ErrorCode","InvalidParams","title","gridProperties","debug","range","valueRenderOption","Array","isArray","toLowerCase","cellValue","includes","length","push","some","max","columnValues","map","undefined","hasA1s","hasValues","content","text","JSON","stringify","structuredContent","Error","InternalError","stack","name"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/Projects/mcp-z/mcp-sheets/src/mcp/tools/values-search.ts"],"sourcesContent":["import type { EnrichedExtra } from '@mcp-z/oauth-google';\nimport { schemas } from '@mcp-z/oauth-google';\n\nconst { AuthRequiredBranchSchema } = schemas;\n\nimport type { ToolModule } from '@mcp-z/server';\nimport type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';\nimport { ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';\nimport { google } from 'googleapis';\nimport { z } from 'zod';\nimport { SheetCellSchema, SheetGidSchema, SpreadsheetIdSchema } from '../../schemas/index.ts';\n\n// Helper to convert column index to letter (0 = A, 1 = B, etc.)\nfunction columnIndexToLetter(index: number): string {\n let letter = '';\n let num = index + 1;\n while (num > 0) {\n const remainder = (num - 1) % 26;\n letter = String.fromCharCode(65 + remainder) + letter;\n num = Math.floor((num - 1) / 26);\n }\n return letter;\n}\n\nconst inputSchema = z.object({\n id: SpreadsheetIdSchema,\n gid: SheetGidSchema,\n query: z.coerce.string().trim().optional().describe('Text to search for in sheet cells. If empty, returns all data at specified granularity.'),\n select: z.enum(['cells', 'rows', 'columns']).describe('Granularity: cells (individual matches), rows (full matching rows), columns (columns with matching headers)'),\n values: z.boolean().optional().describe('Include cell values in response'),\n a1s: z.boolean().optional().describe('Include A1 notation references in response'),\n render: z.enum(['FORMATTED_VALUE', 'UNFORMATTED_VALUE', 'FORMULA']).optional().describe('How to render cell values. FORMATTED_VALUE (default): calculated with formatting. UNFORMATTED_VALUE: calculated without formatting. FORMULA: show formula text instead of result.'),\n matchCase: z.boolean().optional().describe('Case-sensitive matching. Default is false (case-insensitive).'),\n});\n\nconst successBranchSchema = z.object({\n type: z.literal('success'),\n count: z.number().int().nonnegative().describe('Number of matches found'),\n a1s: z.array(z.string()).optional().describe('A1 notation references for matches (e.g., \"B5\", \"A5:D5\", \"B:B\")'),\n values: z\n .array(z.union([z.array(SheetCellSchema), SheetCellSchema]))\n .optional()\n .describe('Cell values for matches (arrays for rows/columns, single values for cells)'),\n});\n\nconst outputSchema = z.discriminatedUnion('type', [successBranchSchema, AuthRequiredBranchSchema]);\n\nconst config = {\n description: 'Search spreadsheet and return matches at cell, row, or column granularity. Use a1-notation prompt for range syntax.',\n inputSchema,\n outputSchema: z.object({\n result: outputSchema,\n }),\n} as const;\n\nexport type Input = z.infer<typeof inputSchema>;\nexport type Output = z.infer<typeof outputSchema>;\n\nasync function handler({ id, gid, query, select, values = false, a1s = false, render, matchCase = false }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n const logger = extra.logger;\n logger.info('sheets.values-search called', { id, gid, query, select, values, a1s, render, matchCase });\n\n try {\n const sheets = google.sheets({ version: 'v4', auth: extra.authContext.auth });\n\n // Get sheet details including grid dimensions\n const spreadsheetResponse = await sheets.spreadsheets.get({\n spreadsheetId: id,\n fields: 'sheets.properties.sheetId,sheets.properties.title,sheets.properties.gridProperties',\n });\n\n const sheet = spreadsheetResponse.data.sheets?.find((s) => String(s.properties?.sheetId) === gid);\n\n if (!sheet) {\n logger.info('sheets.values-search sheet not found', { id, gid, query });\n throw new McpError(ErrorCode.InvalidParams, 'Sheet not found');\n }\n\n const sheetTitle = sheet.properties?.title ?? '';\n\n // Use actual sheet dimensions from gridProperties, with sensible defaults\n // Google Sheets default for new sheets is 1000 rows x 26 columns\n const rowCount = sheet.properties?.gridProperties?.rowCount ?? 1000;\n const columnCount = sheet.properties?.gridProperties?.columnCount ?? 26;\n const endColumn = columnIndexToLetter(columnCount - 1);\n const fullRange = `${sheetTitle}!A1:${endColumn}${rowCount}`;\n\n logger.debug?.('sheets.values-search fetching range', { fullRange, rowCount, columnCount });\n\n const response = await sheets.spreadsheets.values.get({\n spreadsheetId: id,\n range: fullRange,\n valueRenderOption: render || 'FORMATTED_VALUE',\n });\n const res = response.data;\n const allRows = Array.isArray(res.values) ? (res.values as (string | number | boolean | null)[][]) : [];\n\n // Prepare query for matching (case-insensitive by default)\n const searchQuery = query ? (matchCase ? query : query.toLowerCase()) : null;\n\n let count = 0;\n const a1Array: string[] = [];\n const valuesArray: (string | number | boolean | null | (string | number | boolean | null)[])[] = [];\n\n // Helper to check if a cell matches the query\n const cellMatches = (cell: string | number | boolean | null): boolean => {\n if (!searchQuery) return true; // If no query, match all\n if (typeof cell !== 'string') return false;\n const cellValue = matchCase ? cell : cell.toLowerCase();\n return cellValue.includes(searchQuery);\n };\n\n if (select === 'cells') {\n for (let rowIdx = 0; rowIdx < allRows.length; rowIdx++) {\n const row = allRows[rowIdx];\n if (!row) continue;\n\n for (let colIdx = 0; colIdx < row.length; colIdx++) {\n const cell = row[colIdx];\n if (cellMatches(cell)) {\n count++;\n if (a1s) {\n const colLetter = columnIndexToLetter(colIdx);\n const rowNum = rowIdx + 1;\n a1Array.push(`${colLetter}${rowNum}`);\n }\n if (values) {\n valuesArray.push(cell ?? null);\n }\n }\n }\n }\n } else if (select === 'rows') {\n const matchingRows: number[] = [];\n for (let rowIdx = 0; rowIdx < allRows.length; rowIdx++) {\n const row = allRows[rowIdx];\n if (!row) continue;\n\n const matches = row.some((cell) => cellMatches(cell));\n if (matches) {\n matchingRows.push(rowIdx);\n }\n }\n\n count = matchingRows.length;\n for (const rowIdx of matchingRows) {\n const row = allRows[rowIdx];\n if (!row) continue; // Skip if row is undefined\n const rowNum = rowIdx + 1;\n\n if (a1s) {\n const colEnd = columnIndexToLetter(Math.max(0, row.length - 1));\n a1Array.push(`A${rowNum}:${colEnd}${rowNum}`);\n }\n if (values) {\n valuesArray.push(row);\n }\n }\n } else if (select === 'columns') {\n const headerRow = allRows[0] || [];\n const matchingCols: number[] = [];\n\n for (let colIdx = 0; colIdx < headerRow.length; colIdx++) {\n const header = headerRow[colIdx];\n if (cellMatches(header)) {\n matchingCols.push(colIdx);\n }\n }\n\n count = matchingCols.length;\n for (const colIdx of matchingCols) {\n const colLetter = columnIndexToLetter(colIdx);\n\n if (a1s) {\n a1Array.push(`${colLetter}:${colLetter}`);\n }\n if (values) {\n const columnValues = allRows.map((row) => (row && row[colIdx] !== undefined ? row[colIdx] : null));\n valuesArray.push(columnValues);\n }\n }\n }\n\n logger.info('sheets.values-search results', { count, select, hasA1s: a1s, hasValues: values });\n\n const result: Output = {\n type: 'success' as const,\n count,\n ...(a1s && a1Array.length > 0 && { a1s: a1Array }),\n ...(values && valuesArray.length > 0 && { values: valuesArray }),\n };\n\n return {\n content: [{ type: 'text' as const, text: JSON.stringify(result) }],\n structuredContent: { result },\n };\n } catch (error) {\n const message = error instanceof Error ? error.message : String(error);\n logger.error('sheets.values-search error', { error: message });\n\n throw new McpError(ErrorCode.InternalError, `Error searching spreadsheet: ${message}`, {\n stack: error instanceof Error ? error.stack : undefined,\n });\n }\n}\n\nexport default function createTool() {\n return {\n name: 'values-search',\n config,\n handler,\n } satisfies ToolModule;\n}\n"],"names":["createTool","AuthRequiredBranchSchema","schemas","columnIndexToLetter","index","letter","num","remainder","String","fromCharCode","Math","floor","inputSchema","z","object","id","SpreadsheetIdSchema","gid","SheetGidSchema","query","coerce","string","trim","optional","describe","select","enum","values","boolean","a1s","render","matchCase","successBranchSchema","type","literal","count","number","int","nonnegative","array","union","SheetCellSchema","outputSchema","discriminatedUnion","config","description","result","handler","extra","logger","spreadsheetResponse","sheet","sheets","sheetTitle","rowCount","columnCount","endColumn","fullRange","response","res","allRows","searchQuery","a1Array","valuesArray","cellMatches","rowIdx","row","colIdx","cell","colLetter","rowNum","matchingRows","matches","colEnd","headerRow","matchingCols","header","error","message","info","google","version","auth","authContext","spreadsheets","get","spreadsheetId","fields","data","find","s","properties","sheetId","McpError","ErrorCode","InvalidParams","title","gridProperties","debug","range","valueRenderOption","Array","isArray","toLowerCase","cellValue","includes","length","push","some","max","columnValues","map","undefined","hasA1s","hasValues","content","text","JSON","stringify","structuredContent","Error","InternalError","stack","name"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/Projects/
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/Projects/mcp-z/mcp-sheets/src/schemas/index.ts"],"sourcesContent":["import { z } from 'zod';\n\n// Spreadsheet and sheet reference schemas\nexport const SpreadsheetRefSchema = z.string().min(1).describe('Spreadsheet reference: full URL, exact name, or partial name (not ID - use spreadsheet-find to get ID)');\n\nexport const SheetRefSchema = z.string().min(1).describe('Sheet reference: exact title or partial name match (not ID - use sheet-find to get ID)');\n\n// Shared descriptions for consistency\nconst SPREADSHEET_ID_DESC = 'Spreadsheet ID (from URL d/{id})';\nconst SHEET_ID_DESC = 'Sheet ID (from URL gid={gid})';\n\n// Input schemas (with validation)\n// Note: z.coerce.string() converts numbers to strings, handling cases where MCP clients\n// pass gid: 0 (number) instead of gid: \"0\" (string). This is critical for gid=0 which\n// is the default sheet ID in new spreadsheets.\nexport const SpreadsheetIdSchema = z.string().min(1).describe(SPREADSHEET_ID_DESC);\nexport const SheetGidSchema = z.coerce.string().min(1).describe(SHEET_ID_DESC);\n\n// Output schemas (for use in output/response schemas)\nexport const SpreadsheetIdOutput = z.string().describe(SPREADSHEET_ID_DESC);\nexport const SheetGidOutput = z.string().describe(SHEET_ID_DESC);\n\n// Schema for individual sheet cells (can be string, number, boolean, or null)\n// null represents empty cells - JSON cannot represent undefined, and Google API uses null for empty cells\n// Infinity values are allowed as Google Sheets can contain them, but NaN is still rejected\nexport const SheetCellSchema = z.union([z.string(), z.number(), z.literal(Infinity), z.literal(-Infinity), z.boolean(), z.null()]);\n\n// Schema for a row in a sheet search result\nexport const SheetRowSchema = z.object({\n rowIndex: z.number().int().positive().describe('1-based row number in the sheet'),\n values: z.array(SheetCellSchema).optional().describe('Cell values for this row (included when includeData=true)'),\n range: z.string().optional().describe('A1 notation range for this row (e.g., A5:D5)'),\n});\n\n// A1 notation validation - simplified for zod compatibility\nexport const A1NotationSchema = z.string().min(1).describe('A1 notation for cell range (e.g., A1, A1:B2, A:B, 1:2)');\n"],"names":["A1NotationSchema","SheetCellSchema","SheetGidOutput","SheetGidSchema","SheetRefSchema","SheetRowSchema","SpreadsheetIdOutput","SpreadsheetIdSchema","SpreadsheetRefSchema","z","string","min","describe","SPREADSHEET_ID_DESC","SHEET_ID_DESC","coerce","union","number","literal","Infinity","boolean","null","object","rowIndex","int","positive","values","array","optional","range"],"mappings":";;;;;;;;;;;QAmCaA;eAAAA;;QAVAC;eAAAA;;QALAC;eAAAA;;QAJAC;eAAAA;;QAXAC;eAAAA;;QAuBAC;eAAAA;;QATAC;eAAAA;;QAJAC;eAAAA;;QAZAC;eAAAA;;;mBAHK;AAGX,IAAMA,uBAAuBC,MAAC,CAACC,MAAM,GAAGC,GAAG,CAAC,GAAGC,QAAQ,CAAC;AAExD,IAAMR,iBAAiBK,MAAC,CAACC,MAAM,GAAGC,GAAG,CAAC,GAAGC,QAAQ,CAAC;AAEzD,sCAAsC;AACtC,IAAMC,sBAAsB;AAC5B,IAAMC,gBAAgB;AAMf,IAAMP,sBAAsBE,MAAC,CAACC,MAAM,GAAGC,GAAG,CAAC,GAAGC,QAAQ,CAACC;AACvD,IAAMV,iBAAiBM,MAAC,CAACM,MAAM,CAACL,MAAM,GAAGC,GAAG,CAAC,GAAGC,QAAQ,CAACE;AAGzD,IAAMR,sBAAsBG,MAAC,CAACC,MAAM,GAAGE,QAAQ,CAACC;AAChD,IAAMX,iBAAiBO,MAAC,CAACC,MAAM,GAAGE,QAAQ,CAACE;AAK3C,IAAMb,kBAAkBQ,MAAC,CAACO,KAAK,CAAC;IAACP,MAAC,CAACC,MAAM;IAAID,MAAC,CAACQ,MAAM;IAAIR,MAAC,CAACS,OAAO,CAACC;IAAWV,MAAC,CAACS,OAAO,CAAC,CAACC;IAAWV,MAAC,CAACW,OAAO;IAAIX,MAAC,CAACY,IAAI;CAAG;AAG1H,IAAMhB,iBAAiBI,MAAC,CAACa,MAAM,CAAC;IACrCC,UAAUd,MAAC,CAACQ,MAAM,GAAGO,GAAG,GAAGC,QAAQ,GAAGb,QAAQ,CAAC;IAC/Cc,QAAQjB,MAAC,CAACkB,KAAK,CAAC1B,iBAAiB2B,QAAQ,GAAGhB,QAAQ,CAAC;IACrDiB,OAAOpB,MAAC,CAACC,MAAM,GAAGkB,QAAQ,GAAGhB,QAAQ,CAAC;AACxC;AAGO,IAAMZ,mBAAmBS,MAAC,CAACC,MAAM,GAAGC,GAAG,CAAC,GAAGC,QAAQ,CAAC"}
|
package/dist/cjs/setup/config.js
CHANGED
|
@@ -178,7 +178,17 @@ function parseConfig(args, env) {
|
|
|
178
178
|
// Parse repository URL from package.json, stripping git+ prefix and .git suffix
|
|
179
179
|
var rawRepoUrl = _type_of(pkg.repository) === 'object' ? pkg.repository.url : pkg.repository;
|
|
180
180
|
var repositoryUrl = (_ref = rawRepoUrl === null || rawRepoUrl === void 0 ? void 0 : rawRepoUrl.replace(/^git\+/, '').replace(/\.git$/, '')) !== null && _ref !== void 0 ? _ref : "https://github.com/mcp-z/".concat(name);
|
|
181
|
-
var rootDir =
|
|
181
|
+
var rootDir = (0, _os.homedir)();
|
|
182
|
+
try {
|
|
183
|
+
var configPath = (0, _server.findConfigPath)({
|
|
184
|
+
config: '.mcp.json',
|
|
185
|
+
cwd: process.cwd(),
|
|
186
|
+
stopDir: (0, _os.homedir)()
|
|
187
|
+
});
|
|
188
|
+
rootDir = _path.dirname(configPath);
|
|
189
|
+
} catch (unused) {
|
|
190
|
+
rootDir = (0, _os.homedir)();
|
|
191
|
+
}
|
|
182
192
|
var baseDir = _path.join(rootDir, '.mcp-z');
|
|
183
193
|
var cliLogLevel = typeof values['log-level'] === 'string' ? values['log-level'] : undefined;
|
|
184
194
|
var envLogLevel = env.LOG_LEVEL;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/Projects/
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/Projects/mcp-z/mcp-sheets/src/setup/config.ts"],"sourcesContent":["import { parseDcrConfig, parseConfig as parseOAuthConfig } from '@mcp-z/oauth-google';\nimport { findConfigPath, parseConfig as parseTransportConfig } from '@mcp-z/server';\nimport * as fs from 'fs';\nimport moduleRoot from 'module-root-sync';\nimport { homedir } from 'os';\nimport * as path from 'path';\nimport * as url from 'url';\nimport { parseArgs } from 'util';\nimport { GOOGLE_SCOPE } from '../constants.ts';\nimport type { ServerConfig } from '../types.ts';\n\nconst pkg = JSON.parse(fs.readFileSync(path.join(moduleRoot(url.fileURLToPath(import.meta.url)), 'package.json'), 'utf-8'));\n\nconst HELP_TEXT = `\nUsage: mcp-sheets [options]\n\nMCP server for Google Sheets spreadsheet management with OAuth authentication.\n\nOptions:\n --version Show version number\n --help Show this help message\n --auth=<mode> Authentication mode (default: loopback-oauth)\n Modes: loopback-oauth, service-account, dcr\n --headless Disable browser auto-open, return auth URL instead\n --redirect-uri=<uri> OAuth redirect URI (default: ephemeral loopback)\n --dcr-mode=<mode> DCR mode (self-hosted or external, default: self-hosted)\n --dcr-verify-url=<url> External verification endpoint (required for external mode)\n --dcr-store-uri=<uri> DCR client storage URI (required for self-hosted mode)\n --port=<port> Enable HTTP transport on specified port\n --stdio Enable stdio transport (default if no port)\n --log-level=<level> Logging level (default: info)\n\nEnvironment Variables:\n GOOGLE_CLIENT_ID OAuth client ID (REQUIRED)\n GOOGLE_CLIENT_SECRET OAuth client secret (optional)\n AUTH_MODE Default authentication mode (optional)\n HEADLESS Disable browser auto-open (optional)\n DCR_MODE DCR mode (optional, same format as --dcr-mode)\n DCR_VERIFY_URL External verification URL (optional, same as --dcr-verify-url)\n DCR_STORE_URI DCR storage URI (optional, same as --dcr-store-uri)\n PORT Default HTTP port (optional)\n LOG_LEVEL Default logging level (optional)\n\nOAuth Scopes:\n openid https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/spreadsheets https://www.googleapis.com/auth/drive\n\nExamples:\n mcp-sheets # Use default settings\n mcp-sheets --auth=service-account # Use service account auth\n mcp-sheets --port=3000 # HTTP transport on port 3000\n GOOGLE_CLIENT_ID=xxx mcp-sheets # Set client ID via env var\n`.trim();\n\n/**\n * Handle --version and --help flags before config parsing.\n * These should work without requiring any configuration.\n */\nexport function handleVersionHelp(args: string[]): { handled: boolean; output?: string } {\n const { values } = parseArgs({\n args,\n options: {\n version: { type: 'boolean' },\n help: { type: 'boolean' },\n },\n strict: false,\n });\n\n if (values.version) return { handled: true, output: pkg.version };\n if (values.help) return { handled: true, output: HELP_TEXT };\n return { handled: false };\n}\n\n/**\n * Parse Sheets server configuration from CLI arguments and environment.\n *\n * CLI Arguments (all optional):\n * - --auth=<mode> Authentication mode (default: loopback-oauth)\n * Modes: loopback-oauth, service-account, dcr\n * - --headless Disable browser auto-open, return auth URL instead\n * - --redirect-uri=<uri> OAuth redirect URI (default: ephemeral loopback)\n * - --dcr-mode=<mode> DCR mode (self-hosted or external, default: self-hosted)\n * - --dcr-verify-url=<url> External verification endpoint (required for external mode)\n * - --dcr-store-uri=<uri> DCR client storage URI (required for self-hosted mode)\n * - --port=<port> Enable HTTP transport on specified port\n * - --stdio Enable stdio transport (default if no port)\n * - --log-level=<level> Logging level (default: info)\n *\n * Environment Variables:\n * - GOOGLE_CLIENT_ID OAuth client ID (REQUIRED)\n * - GOOGLE_CLIENT_SECRET OAuth client secret (optional)\n * - AUTH_MODE Default authentication mode (optional)\n * - HEADLESS Disable browser auto-open (optional)\n * - DCR_MODE DCR mode (optional, same format as --dcr-mode)\n * - DCR_VERIFY_URL External verification URL (optional, same as --dcr-verify-url)\n * - DCR_STORE_URI DCR storage URI (optional, same as --dcr-store-uri)\n * - PORT Default HTTP port (optional)\n * - LOG_LEVEL Default logging level (optional)\n *\n * OAuth Scopes (from constants.ts):\n * openid https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/spreadsheets https://www.googleapis.com/auth/drive\n */\nexport function parseConfig(args: string[], env: Record<string, string | undefined>): ServerConfig {\n const transportConfig = parseTransportConfig(args, env);\n const oauthConfig = parseOAuthConfig(args, env);\n\n // Parse DCR configuration if DCR mode is enabled\n const dcrConfig = oauthConfig.auth === 'dcr' ? parseDcrConfig(args, env, GOOGLE_SCOPE) : undefined;\n\n // Parse application-level config (LOG_LEVEL)\n const { values } = parseArgs({\n args,\n options: {\n 'log-level': { type: 'string' },\n },\n strict: false, // Allow other arguments\n allowPositionals: true,\n });\n\n const name = pkg.name.replace(/^@[^/]+\\//, '');\n // Parse repository URL from package.json, stripping git+ prefix and .git suffix\n const rawRepoUrl = typeof pkg.repository === 'object' ? pkg.repository.url : pkg.repository;\n const repositoryUrl = rawRepoUrl?.replace(/^git\\+/, '').replace(/\\.git$/, '') ?? `https://github.com/mcp-z/${name}`;\n let rootDir = homedir();\n try {\n const configPath = findConfigPath({ config: '.mcp.json', cwd: process.cwd(), stopDir: homedir() });\n rootDir = path.dirname(configPath);\n } catch {\n rootDir = homedir();\n }\n const baseDir = path.join(rootDir, '.mcp-z');\n const cliLogLevel = typeof values['log-level'] === 'string' ? values['log-level'] : undefined;\n const envLogLevel = env.LOG_LEVEL;\n const logLevel = cliLogLevel ?? envLogLevel ?? 'info';\n\n // Combine configs\n return {\n ...oauthConfig, // Includes clientId, auth, headless, redirectUri\n transport: transportConfig.transport,\n logLevel,\n baseDir,\n name,\n version: pkg.version,\n repositoryUrl,\n ...(dcrConfig && { dcrConfig }),\n };\n}\n\n/**\n * Build production configuration from process globals.\n * Entry point for production server.\n */\nexport function createConfig(): ServerConfig {\n return parseConfig(process.argv, process.env);\n}\n"],"names":["createConfig","handleVersionHelp","parseConfig","pkg","JSON","parse","fs","readFileSync","path","join","moduleRoot","url","fileURLToPath","HELP_TEXT","trim","args","values","parseArgs","options","version","type","help","strict","handled","output","env","cliLogLevel","transportConfig","parseTransportConfig","oauthConfig","parseOAuthConfig","dcrConfig","auth","parseDcrConfig","GOOGLE_SCOPE","undefined","allowPositionals","name","replace","rawRepoUrl","repository","repositoryUrl","rootDir","homedir","configPath","findConfigPath","config","cwd","process","stopDir","dirname","baseDir","envLogLevel","LOG_LEVEL","logLevel","transport","argv"],"mappings":";;;;;;;;;;;QAuJgBA;eAAAA;;QA9FAC;eAAAA;;QA4CAC;eAAAA;;;2BArGgD;sBACI;0DAChD;qEACG;kBACC;4DACF;2DACD;oBACK;2BACG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG7B,IAAMC,MAAMC,KAAKC,KAAK,CAACC,IAAGC,YAAY,CAACC,MAAKC,IAAI,CAACC,IAAAA,uBAAU,EAACC,KAAIC,aAAa,CAAC,uDAAmB,iBAAiB;AAElH,IAAMC,YAAY,ghEAsChBC,IAAI;AAMC,SAASb,kBAAkBc,IAAc;IAC9C,IAAM,AAAEC,SAAWC,IAAAA,eAAS,EAAC;QAC3BF,MAAAA;QACAG,SAAS;YACPC,SAAS;gBAAEC,MAAM;YAAU;YAC3BC,MAAM;gBAAED,MAAM;YAAU;QAC1B;QACAE,QAAQ;IACV,GAPQN;IASR,IAAIA,OAAOG,OAAO,EAAE,OAAO;QAAEI,SAAS;QAAMC,QAAQrB,IAAIgB,OAAO;IAAC;IAChE,IAAIH,OAAOK,IAAI,EAAE,OAAO;QAAEE,SAAS;QAAMC,QAAQX;IAAU;IAC3D,OAAO;QAAEU,SAAS;IAAM;AAC1B;AA+BO,SAASrB,YAAYa,IAAc,EAAEU,GAAuC;cA+BhEC;IA9BjB,IAAMC,kBAAkBC,IAAAA,mBAAoB,EAACb,MAAMU;IACnD,IAAMI,cAAcC,IAAAA,wBAAgB,EAACf,MAAMU;IAE3C,iDAAiD;IACjD,IAAMM,YAAYF,YAAYG,IAAI,KAAK,QAAQC,IAAAA,2BAAc,EAAClB,MAAMU,KAAKS,yBAAY,IAAIC;IAEzF,6CAA6C;IAC7C,IAAM,AAAEnB,SAAWC,IAAAA,eAAS,EAAC;QAC3BF,MAAAA;QACAG,SAAS;YACP,aAAa;gBAAEE,MAAM;YAAS;QAChC;QACAE,QAAQ;QACRc,kBAAkB;IACpB,GAPQpB;IASR,IAAMqB,OAAOlC,IAAIkC,IAAI,CAACC,OAAO,CAAC,aAAa;IAC3C,gFAAgF;IAChF,IAAMC,aAAa,SAAOpC,IAAIqC,UAAU,MAAK,WAAWrC,IAAIqC,UAAU,CAAC7B,GAAG,GAAGR,IAAIqC,UAAU;IAC3F,IAAMC,wBAAgBF,uBAAAA,iCAAAA,WAAYD,OAAO,CAAC,UAAU,IAAIA,OAAO,CAAC,UAAU,0CAAO,AAAC,4BAAgC,OAALD;IAC7G,IAAIK,UAAUC,IAAAA,WAAO;IACrB,IAAI;QACF,IAAMC,aAAaC,IAAAA,sBAAc,EAAC;YAAEC,QAAQ;YAAaC,KAAKC,QAAQD,GAAG;YAAIE,SAASN,IAAAA,WAAO;QAAG;QAChGD,UAAUlC,MAAK0C,OAAO,CAACN;IACzB,EAAE,eAAM;QACNF,UAAUC,IAAAA,WAAO;IACnB;IACA,IAAMQ,UAAU3C,MAAKC,IAAI,CAACiC,SAAS;IACnC,IAAMhB,cAAc,OAAOV,MAAM,CAAC,YAAY,KAAK,WAAWA,MAAM,CAAC,YAAY,GAAGmB;IACpF,IAAMiB,cAAc3B,IAAI4B,SAAS;IACjC,IAAMC,YAAW5B,QAAAA,wBAAAA,yBAAAA,cAAe0B,yBAAf1B,mBAAAA,QAA8B;IAE/C,kBAAkB;IAClB,OAAO,uDACFG;QACH0B,WAAW5B,gBAAgB4B,SAAS;QACpCD,UAAAA;QACAH,SAAAA;QACAd,MAAAA;QACAlB,SAAShB,IAAIgB,OAAO;QACpBsB,eAAAA;QACIV,aAAa;QAAEA,WAAAA;IAAU;AAEjC;AAMO,SAAS/B;IACd,OAAOE,YAAY8C,QAAQQ,IAAI,EAAER,QAAQvB,GAAG;AAC9C"}
|
package/dist/cjs/setup/http.js
CHANGED
|
@@ -12,7 +12,7 @@ var _server = require("@mcp-z/server");
|
|
|
12
12
|
var _mcp = require("@modelcontextprotocol/sdk/server/mcp.js");
|
|
13
13
|
var _cors = /*#__PURE__*/ _interop_require_default(require("cors"));
|
|
14
14
|
var _express = /*#__PURE__*/ _interop_require_default(require("express"));
|
|
15
|
-
var
|
|
15
|
+
var _runtimets = require("./runtime.js");
|
|
16
16
|
function _array_like_to_array(arr, len) {
|
|
17
17
|
if (len == null || len > arr.length) len = arr.length;
|
|
18
18
|
for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
|
|
@@ -179,7 +179,7 @@ function createHTTPServer(config, overrides) {
|
|
|
179
179
|
case 0:
|
|
180
180
|
return [
|
|
181
181
|
4,
|
|
182
|
-
(0,
|
|
182
|
+
(0, _runtimets.createDefaultRuntime)(config, overrides)
|
|
183
183
|
];
|
|
184
184
|
case 1:
|
|
185
185
|
runtime = _state.sent();
|
|
@@ -205,6 +205,10 @@ function createHTTPServer(config, overrides) {
|
|
|
205
205
|
app.use(_express.default.json({
|
|
206
206
|
limit: '10mb'
|
|
207
207
|
}));
|
|
208
|
+
if (runtime.deps.oauthAdapters.loopbackRouter) {
|
|
209
|
+
app.use('/', runtime.deps.oauthAdapters.loopbackRouter);
|
|
210
|
+
logger.info('Mounted loopback OAuth callback router');
|
|
211
|
+
}
|
|
208
212
|
if (runtime.deps.oauthAdapters.dcrRouter) {
|
|
209
213
|
app.use('/', runtime.deps.oauthAdapters.dcrRouter);
|
|
210
214
|
logger.info('Mounted DCR router with OAuth endpoints');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/Projects/
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/Projects/mcp-z/mcp-sheets/src/setup/http.ts"],"sourcesContent":["import { composeMiddleware, connectHttp, registerPrompts, registerResources, registerTools } from '@mcp-z/server';\nimport { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';\nimport cors from 'cors';\nimport express from 'express';\nimport type { RuntimeOverrides, ServerConfig } from '../types.ts';\nimport { createDefaultRuntime } from './runtime.ts';\n\nexport async function createHTTPServer(config: ServerConfig, overrides?: RuntimeOverrides) {\n const runtime = await createDefaultRuntime(config, overrides);\n const modules = runtime.createDomainModules();\n const layers = runtime.middlewareFactories.map((factory) => factory(runtime.deps));\n const composed = composeMiddleware(modules, layers);\n const logger = runtime.deps.logger;\n const port = config.transport.port;\n if (!port) throw new Error('Port is required for HTTP transport');\n\n const tools = [...composed.tools, ...runtime.deps.oauthAdapters.accountTools];\n const prompts = [...composed.prompts, ...runtime.deps.oauthAdapters.accountPrompts];\n\n const mcpServer = new McpServer({ name: config.name, version: config.version });\n registerTools(mcpServer, tools);\n registerResources(mcpServer, composed.resources);\n registerPrompts(mcpServer, prompts);\n\n const app = express();\n app.use(cors());\n app.use(express.json({ limit: '10mb' }));\n\n if (runtime.deps.oauthAdapters.loopbackRouter) {\n app.use('/', runtime.deps.oauthAdapters.loopbackRouter);\n logger.info('Mounted loopback OAuth callback router');\n }\n\n if (runtime.deps.oauthAdapters.dcrRouter) {\n app.use('/', runtime.deps.oauthAdapters.dcrRouter);\n logger.info('Mounted DCR router with OAuth endpoints');\n }\n\n logger.info(`Starting ${config.name} MCP server (http)`);\n const { close, httpServer } = await connectHttp(mcpServer, { logger, app, port });\n logger.info('http transport ready');\n\n return {\n httpServer,\n mcpServer,\n logger,\n close: async () => {\n await close();\n await runtime.close();\n },\n };\n}\n"],"names":["createHTTPServer","config","overrides","runtime","modules","layers","composed","logger","port","tools","prompts","mcpServer","app","close","httpServer","createDefaultRuntime","createDomainModules","middlewareFactories","map","factory","deps","composeMiddleware","transport","Error","oauthAdapters","accountTools","accountPrompts","McpServer","name","version","registerTools","registerResources","resources","registerPrompts","express","use","cors","json","limit","loopbackRouter","info","dcrRouter","connectHttp"],"mappings":";;;;+BAOsBA;;;eAAAA;;;sBAP4E;mBACxE;2DACT;8DACG;yBAEiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE9B,SAAeA,iBAAiBC,MAAoB,EAAEC,SAA4B;;YACjFC,SACAC,SACAC,QACAC,UACAC,QACAC,MAGAC,OACAC,SAEAC,WAKAC,KAewB,MAAtBC,OAAOC;;;;oBA/BC;;wBAAMC,IAAAA,+BAAoB,EAACd,QAAQC;;;oBAA7CC,UAAU;oBACVC,UAAUD,QAAQa,mBAAmB;oBACrCX,SAASF,QAAQc,mBAAmB,CAACC,GAAG,CAAC,SAACC;+BAAYA,QAAQhB,QAAQiB,IAAI;;oBAC1Ed,WAAWe,IAAAA,yBAAiB,EAACjB,SAASC;oBACtCE,SAASJ,QAAQiB,IAAI,CAACb,MAAM;oBAC5BC,OAAOP,OAAOqB,SAAS,CAACd,IAAI;oBAClC,IAAI,CAACA,MAAM,MAAM,IAAIe,MAAM;oBAErBd,QAAQ,AAAC,qBAAGH,SAASG,KAAK,SAAE,qBAAGN,QAAQiB,IAAI,CAACI,aAAa,CAACC,YAAY;oBACtEf,UAAU,AAAC,qBAAGJ,SAASI,OAAO,SAAE,qBAAGP,QAAQiB,IAAI,CAACI,aAAa,CAACE,cAAc;oBAE5Ef,YAAY,IAAIgB,cAAS,CAAC;wBAAEC,MAAM3B,OAAO2B,IAAI;wBAAEC,SAAS5B,OAAO4B,OAAO;oBAAC;oBAC7EC,IAAAA,qBAAa,EAACnB,WAAWF;oBACzBsB,IAAAA,yBAAiB,EAACpB,WAAWL,SAAS0B,SAAS;oBAC/CC,IAAAA,uBAAe,EAACtB,WAAWD;oBAErBE,MAAMsB,IAAAA,gBAAO;oBACnBtB,IAAIuB,GAAG,CAACC,IAAAA,aAAI;oBACZxB,IAAIuB,GAAG,CAACD,gBAAO,CAACG,IAAI,CAAC;wBAAEC,OAAO;oBAAO;oBAErC,IAAInC,QAAQiB,IAAI,CAACI,aAAa,CAACe,cAAc,EAAE;wBAC7C3B,IAAIuB,GAAG,CAAC,KAAKhC,QAAQiB,IAAI,CAACI,aAAa,CAACe,cAAc;wBACtDhC,OAAOiC,IAAI,CAAC;oBACd;oBAEA,IAAIrC,QAAQiB,IAAI,CAACI,aAAa,CAACiB,SAAS,EAAE;wBACxC7B,IAAIuB,GAAG,CAAC,KAAKhC,QAAQiB,IAAI,CAACI,aAAa,CAACiB,SAAS;wBACjDlC,OAAOiC,IAAI,CAAC;oBACd;oBAEAjC,OAAOiC,IAAI,CAAC,AAAC,YAAuB,OAAZvC,OAAO2B,IAAI,EAAC;oBACN;;wBAAMc,IAAAA,mBAAW,EAAC/B,WAAW;4BAAEJ,QAAAA;4BAAQK,KAAAA;4BAAKJ,MAAAA;wBAAK;;;oBAAjD,OAAA,eAAtBK,QAAsB,KAAtBA,OAAOC,aAAe,KAAfA;oBACfP,OAAOiC,IAAI,CAAC;oBAEZ;;wBAAO;4BACL1B,YAAAA;4BACAH,WAAAA;4BACAJ,QAAAA;4BACAM,OAAO;;;;;gDACL;;oDAAMA;;;gDAAN;gDACA;;oDAAMV,QAAQU,KAAK;;;gDAAnB;;;;;;gCACF;;wBACF;;;;IACF"}
|
package/dist/cjs/setup/index.js
CHANGED
|
@@ -10,26 +10,26 @@ function _export(target, all) {
|
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
12
|
get createConfig () {
|
|
13
|
-
return
|
|
13
|
+
return _configts.createConfig;
|
|
14
14
|
},
|
|
15
15
|
get createHTTPServer () {
|
|
16
|
-
return
|
|
16
|
+
return _httpts.createHTTPServer;
|
|
17
17
|
},
|
|
18
18
|
get createOAuthAdapters () {
|
|
19
|
-
return
|
|
19
|
+
return _oauthgooglets.createOAuthAdapters;
|
|
20
20
|
},
|
|
21
21
|
get createStdioServer () {
|
|
22
|
-
return
|
|
22
|
+
return _stdiots.createStdioServer;
|
|
23
23
|
},
|
|
24
24
|
get parseConfig () {
|
|
25
|
-
return
|
|
25
|
+
return _configts.parseConfig;
|
|
26
26
|
}
|
|
27
27
|
});
|
|
28
|
-
var
|
|
29
|
-
var
|
|
30
|
-
var
|
|
28
|
+
var _configts = require("./config.js");
|
|
29
|
+
var _httpts = require("./http.js");
|
|
30
|
+
var _oauthgooglets = require("./oauth-google.js");
|
|
31
31
|
_export_star(require("./runtime.js"), exports);
|
|
32
|
-
var
|
|
32
|
+
var _stdiots = require("./stdio.js");
|
|
33
33
|
function _export_star(from, to) {
|
|
34
34
|
Object.keys(from).forEach(function(k) {
|
|
35
35
|
if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/Projects/
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/Projects/mcp-z/mcp-sheets/src/setup/index.ts"],"sourcesContent":["export { createConfig, parseConfig } from './config.ts';\nexport { createHTTPServer } from './http.ts';\nexport { createOAuthAdapters } from './oauth-google.ts';\nexport * from './runtime.ts';\nexport { createStdioServer } from './stdio.ts';\n"],"names":["createConfig","createHTTPServer","createOAuthAdapters","createStdioServer","parseConfig"],"mappings":";;;;;;;;;;;QAASA;eAAAA,sBAAY;;QACZC;eAAAA,wBAAgB;;QAChBC;eAAAA,kCAAmB;;QAEnBC;eAAAA,0BAAiB;;QAJHC;eAAAA,qBAAW;;;wBAAQ;sBACT;6BACG;qBACtB;uBACoB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type AccountAuthProvider } from '@mcp-z/oauth';
|
|
2
2
|
import type { CachedToken } from '@mcp-z/oauth-google';
|
|
3
3
|
import { DcrOAuthProvider, LoopbackOAuthProvider, ServiceAccountProvider } from '@mcp-z/oauth-google';
|
|
4
4
|
import type { Logger, PromptModule, ToolModule } from '@mcp-z/server';
|
|
@@ -40,10 +40,11 @@ export interface AuthMiddleware {
|
|
|
40
40
|
export interface OAuthAdapters {
|
|
41
41
|
primary: LoopbackOAuthProvider | ServiceAccountProvider | DcrOAuthProvider;
|
|
42
42
|
middleware: AuthMiddleware;
|
|
43
|
-
authAdapter:
|
|
43
|
+
authAdapter: AccountAuthProvider;
|
|
44
44
|
accountTools: ToolModule[];
|
|
45
45
|
accountPrompts: PromptModule[];
|
|
46
46
|
dcrRouter?: Router;
|
|
47
|
+
loopbackRouter?: Router;
|
|
47
48
|
}
|
|
48
49
|
/**
|
|
49
50
|
* Create Sheets OAuth adapters and helpers.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type AccountAuthProvider } from '@mcp-z/oauth';
|
|
2
2
|
import type { CachedToken } from '@mcp-z/oauth-google';
|
|
3
3
|
import { DcrOAuthProvider, LoopbackOAuthProvider, ServiceAccountProvider } from '@mcp-z/oauth-google';
|
|
4
4
|
import type { Logger, PromptModule, ToolModule } from '@mcp-z/server';
|
|
@@ -40,10 +40,11 @@ export interface AuthMiddleware {
|
|
|
40
40
|
export interface OAuthAdapters {
|
|
41
41
|
primary: LoopbackOAuthProvider | ServiceAccountProvider | DcrOAuthProvider;
|
|
42
42
|
middleware: AuthMiddleware;
|
|
43
|
-
authAdapter:
|
|
43
|
+
authAdapter: AccountAuthProvider;
|
|
44
44
|
accountTools: ToolModule[];
|
|
45
45
|
accountPrompts: PromptModule[];
|
|
46
46
|
dcrRouter?: Router;
|
|
47
|
+
loopbackRouter?: Router;
|
|
47
48
|
}
|
|
48
49
|
/**
|
|
49
50
|
* Create Sheets OAuth adapters and helpers.
|
|
@@ -53,6 +53,13 @@ function _define_property(obj, key, value) {
|
|
|
53
53
|
}
|
|
54
54
|
return obj;
|
|
55
55
|
}
|
|
56
|
+
function _instanceof(left, right) {
|
|
57
|
+
if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
|
|
58
|
+
return !!right[Symbol.hasInstance](left);
|
|
59
|
+
} else {
|
|
60
|
+
return left instanceof right;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
56
63
|
function _object_spread(target) {
|
|
57
64
|
for(var i = 1; i < arguments.length; i++){
|
|
58
65
|
var source = arguments[i] != null ? arguments[i] : {};
|
|
@@ -193,7 +200,7 @@ function _ts_generator(thisArg, body) {
|
|
|
193
200
|
}
|
|
194
201
|
function createOAuthAdapters(config, deps, baseUrl) {
|
|
195
202
|
return _async_to_generator(function() {
|
|
196
|
-
var logger, tokenStore, dcrStore, oauthStaticConfig, primary, dcrRouter, middleware, authAdapter, authAdapter1, middleware1, accountTools, accountPrompts, result;
|
|
203
|
+
var logger, tokenStore, dcrStore, oauthStaticConfig, primary, dcrRouter, middleware, authAdapter, authAdapter1, middleware1, accountTools, accountPrompts, result, loopbackRouter;
|
|
197
204
|
return _ts_generator(this, function(_state) {
|
|
198
205
|
logger = deps.logger, tokenStore = deps.tokenStore, dcrStore = deps.dcrStore;
|
|
199
206
|
oauthStaticConfig = _object_spread({
|
|
@@ -241,6 +248,9 @@ function createOAuthAdapters(config, deps, baseUrl) {
|
|
|
241
248
|
});
|
|
242
249
|
middleware = primary.authMiddleware();
|
|
243
250
|
authAdapter = {
|
|
251
|
+
getAccessToken: function() {
|
|
252
|
+
throw new Error('DCR mode does not support getAccessToken - tokens are provided via bearer auth');
|
|
253
|
+
},
|
|
244
254
|
getUserEmail: function() {
|
|
245
255
|
throw new Error('DCR mode does not support getUserEmail - tokens are provided via bearer auth');
|
|
246
256
|
}
|
|
@@ -285,16 +295,7 @@ function createOAuthAdapters(config, deps, baseUrl) {
|
|
|
285
295
|
redirectUri: oauthStaticConfig.redirectUri
|
|
286
296
|
}));
|
|
287
297
|
}
|
|
288
|
-
authAdapter1 =
|
|
289
|
-
getUserEmail: function(accountId) {
|
|
290
|
-
return primary.getUserEmail(accountId);
|
|
291
|
-
}
|
|
292
|
-
}, 'authenticateNewAccount' in primary && primary.authenticateNewAccount ? {
|
|
293
|
-
authenticateNewAccount: function() {
|
|
294
|
-
var _primary_authenticateNewAccount;
|
|
295
|
-
return (_primary_authenticateNewAccount = primary.authenticateNewAccount) === null || _primary_authenticateNewAccount === void 0 ? void 0 : _primary_authenticateNewAccount.call(primary);
|
|
296
|
-
}
|
|
297
|
-
} : {});
|
|
298
|
+
authAdapter1 = primary;
|
|
298
299
|
if (oauthStaticConfig.auth === 'service-account') {
|
|
299
300
|
middleware1 = primary.authMiddleware();
|
|
300
301
|
accountTools = [];
|
|
@@ -316,6 +317,7 @@ function createOAuthAdapters(config, deps, baseUrl) {
|
|
|
316
317
|
service: oauthStaticConfig.service
|
|
317
318
|
});
|
|
318
319
|
}
|
|
320
|
+
loopbackRouter = _instanceof(primary, _oauthgoogle.LoopbackOAuthProvider) && oauthStaticConfig.redirectUri ? (0, _oauthgoogle.createLoopbackCallbackRouter)(primary) : undefined;
|
|
319
321
|
return [
|
|
320
322
|
2,
|
|
321
323
|
{
|
|
@@ -323,7 +325,8 @@ function createOAuthAdapters(config, deps, baseUrl) {
|
|
|
323
325
|
middleware: middleware1,
|
|
324
326
|
authAdapter: authAdapter1,
|
|
325
327
|
accountTools: accountTools,
|
|
326
|
-
accountPrompts: accountPrompts
|
|
328
|
+
accountPrompts: accountPrompts,
|
|
329
|
+
loopbackRouter: loopbackRouter
|
|
327
330
|
}
|
|
328
331
|
];
|
|
329
332
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/Projects/ai/mcp-z/servers/mcp-sheets/src/setup/oauth-google.ts"],"sourcesContent":["import { AccountServer, type AuthEmailProvider } from '@mcp-z/oauth';\nimport type { CachedToken } from '@mcp-z/oauth-google';\nimport { createDcrRouter, DcrOAuthProvider, LoopbackOAuthProvider, ServiceAccountProvider } from '@mcp-z/oauth-google';\nimport type { Logger, PromptModule, ToolModule } from '@mcp-z/server';\nimport type { Router } from 'express';\nimport type { Keyv } from 'keyv';\nimport { GOOGLE_SCOPE } from '../constants.ts';\nimport type { ServerConfig } from '../types.js';\n\n/**\n * Gmail OAuth runtime dependencies.\n */\nexport interface OAuthRuntimeDeps {\n logger: Logger;\n tokenStore: Keyv<CachedToken>;\n dcrStore?: Keyv<unknown>;\n}\n\n/**\n * Auth middleware helpers used to wrap MCP modules.\n */\nexport interface AuthMiddleware {\n withToolAuth<T extends { name: string; config: unknown; handler: unknown }>(module: T): T;\n withResourceAuth<T extends { name: string; template?: unknown; config?: unknown; handler: unknown }>(module: T): T;\n withPromptAuth<T extends { name: string; config: unknown; handler: unknown }>(module: T): T;\n}\n\n/**\n * Result returned by createOAuthAdapters.\n */\nexport interface OAuthAdapters {\n primary: LoopbackOAuthProvider | ServiceAccountProvider | DcrOAuthProvider;\n middleware: AuthMiddleware;\n authAdapter: AuthEmailProvider;\n accountTools: ToolModule[];\n accountPrompts: PromptModule[];\n dcrRouter?: Router;\n}\n\n/**\n * Create Sheets OAuth adapters and helpers.\n *\n * @param config Sheets server configuration.\n * @param deps Runtime dependencies (logger, token store, optional DCR store).\n */\nexport async function createOAuthAdapters(config: ServerConfig, deps: OAuthRuntimeDeps, baseUrl?: string): Promise<OAuthAdapters> {\n const { logger, tokenStore, dcrStore } = deps;\n const oauthStaticConfig = {\n service: config.name,\n clientId: config.clientId,\n clientSecret: config.clientSecret,\n scope: GOOGLE_SCOPE,\n auth: config.auth,\n headless: config.headless,\n redirectUri: config.transport.type === 'stdio' ? undefined : config.redirectUri,\n ...(config.serviceAccountKeyFile && { serviceAccountKeyFile: config.serviceAccountKeyFile }),\n ...(baseUrl && { baseUrl }),\n };\n\n let primary: LoopbackOAuthProvider | ServiceAccountProvider | DcrOAuthProvider;\n\n if (oauthStaticConfig.auth === 'dcr') {\n logger.debug('Creating DCR provider', { service: oauthStaticConfig.service });\n\n if (!dcrStore) {\n throw new Error('DCR mode requires dcrStore to be configured');\n }\n if (!oauthStaticConfig.baseUrl) {\n throw new Error('DCR mode requires baseUrl to be configured');\n }\n\n primary = new DcrOAuthProvider({\n clientId: oauthStaticConfig.clientId,\n ...(oauthStaticConfig.clientSecret && { clientSecret: oauthStaticConfig.clientSecret }),\n scope: oauthStaticConfig.scope,\n verifyEndpoint: `${oauthStaticConfig.baseUrl}/oauth/verify`,\n logger,\n });\n\n const dcrRouter = createDcrRouter({\n store: dcrStore,\n issuerUrl: oauthStaticConfig.baseUrl,\n baseUrl: oauthStaticConfig.baseUrl,\n scopesSupported: oauthStaticConfig.scope.split(' '),\n clientConfig: {\n clientId: oauthStaticConfig.clientId,\n ...(oauthStaticConfig.clientSecret && { clientSecret: oauthStaticConfig.clientSecret }),\n },\n });\n\n const middleware = primary.authMiddleware();\n const authAdapter: AuthEmailProvider = {\n getUserEmail: () => {\n throw new Error('DCR mode does not support getUserEmail - tokens are provided via bearer auth');\n },\n };\n\n return {\n primary,\n middleware: middleware as unknown as AuthMiddleware,\n authAdapter,\n accountTools: [],\n accountPrompts: [],\n dcrRouter,\n };\n }\n\n if (oauthStaticConfig.auth === 'service-account') {\n if (!oauthStaticConfig.serviceAccountKeyFile) {\n throw new Error('Service account key file is required when auth mode is \"service-account\". Set GOOGLE_SERVICE_ACCOUNT_KEY_FILE environment variable or use --service-account-key-file flag.');\n }\n\n logger.debug('Creating service account provider', { service: oauthStaticConfig.service });\n primary = new ServiceAccountProvider({\n keyFilePath: oauthStaticConfig.serviceAccountKeyFile,\n scopes: oauthStaticConfig.scope.split(' '),\n logger,\n });\n } else {\n logger.debug('Creating loopback OAuth provider', { service: oauthStaticConfig.service });\n primary = new LoopbackOAuthProvider({\n service: oauthStaticConfig.service,\n clientId: oauthStaticConfig.clientId,\n clientSecret: oauthStaticConfig.clientSecret,\n scope: oauthStaticConfig.scope,\n headless: oauthStaticConfig.headless,\n logger,\n tokenStore,\n ...(oauthStaticConfig.redirectUri !== undefined && { redirectUri: oauthStaticConfig.redirectUri }),\n });\n }\n\n const authAdapter: AuthEmailProvider = {\n getUserEmail: (accountId) => primary.getUserEmail(accountId),\n ...('authenticateNewAccount' in primary && primary.authenticateNewAccount\n ? {\n authenticateNewAccount: () => primary.authenticateNewAccount?.(),\n }\n : {}),\n };\n\n let middleware: ReturnType<LoopbackOAuthProvider['authMiddleware']>;\n let accountTools: ToolModule[];\n let accountPrompts: PromptModule[];\n\n if (oauthStaticConfig.auth === 'service-account') {\n middleware = primary.authMiddleware();\n accountTools = [];\n accountPrompts = [];\n logger.debug('Service account mode - no account tools', { service: oauthStaticConfig.service });\n } else {\n middleware = primary.authMiddleware();\n\n const result = AccountServer.createLoopback({\n service: oauthStaticConfig.service,\n store: tokenStore,\n logger,\n auth: authAdapter,\n });\n accountTools = result.tools as ToolModule[];\n accountPrompts = result.prompts as PromptModule[];\n logger.debug('Loopback OAuth (multi-account mode)', { service: oauthStaticConfig.service });\n }\n\n return {\n primary,\n middleware: middleware as unknown as AuthMiddleware,\n authAdapter,\n accountTools,\n accountPrompts,\n };\n}\n"],"names":["createOAuthAdapters","config","deps","baseUrl","logger","tokenStore","dcrStore","oauthStaticConfig","primary","dcrRouter","middleware","authAdapter","accountTools","accountPrompts","result","service","name","clientId","clientSecret","scope","GOOGLE_SCOPE","auth","headless","redirectUri","transport","type","undefined","serviceAccountKeyFile","debug","Error","DcrOAuthProvider","verifyEndpoint","createDcrRouter","store","issuerUrl","scopesSupported","split","clientConfig","authMiddleware","getUserEmail","ServiceAccountProvider","keyFilePath","scopes","LoopbackOAuthProvider","accountId","authenticateNewAccount","AccountServer","createLoopback","tools","prompts"],"mappings":";;;;+BA6CsBA;;;eAAAA;;;qBA7CgC;2BAE2C;2BAIpE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuCtB,SAAeA,oBAAoBC,MAAoB,EAAEC,IAAsB,EAAEC,OAAgB;;YAC9FC,QAAQC,YAAYC,UACtBC,mBAYFC,SAoBIC,WAWAC,YACAC,aAyCFA,cASFD,aACAE,cACAC,gBAUIC;;YA3GAV,SAAiCF,KAAjCE,QAAQC,aAAyBH,KAAzBG,YAAYC,WAAaJ,KAAbI;YACtBC,oBAAoB;gBACxBQ,SAASd,OAAOe,IAAI;gBACpBC,UAAUhB,OAAOgB,QAAQ;gBACzBC,cAAcjB,OAAOiB,YAAY;gBACjCC,OAAOC,yBAAY;gBACnBC,MAAMpB,OAAOoB,IAAI;gBACjBC,UAAUrB,OAAOqB,QAAQ;gBACzBC,aAAatB,OAAOuB,SAAS,CAACC,IAAI,KAAK,UAAUC,YAAYzB,OAAOsB,WAAW;eAC3EtB,OAAO0B,qBAAqB,IAAI;gBAAEA,uBAAuB1B,OAAO0B,qBAAqB;YAAC,GACtFxB,WAAW;gBAAEA,SAAAA;YAAQ;YAK3B,IAAII,kBAAkBc,IAAI,KAAK,OAAO;gBACpCjB,OAAOwB,KAAK,CAAC,yBAAyB;oBAAEb,SAASR,kBAAkBQ,OAAO;gBAAC;gBAE3E,IAAI,CAACT,UAAU;oBACb,MAAM,IAAIuB,MAAM;gBAClB;gBACA,IAAI,CAACtB,kBAAkBJ,OAAO,EAAE;oBAC9B,MAAM,IAAI0B,MAAM;gBAClB;gBAEArB,UAAU,IAAIsB,6BAAgB,CAAC;oBAC7Bb,UAAUV,kBAAkBU,QAAQ;mBAChCV,kBAAkBW,YAAY,IAAI;oBAAEA,cAAcX,kBAAkBW,YAAY;gBAAC;oBACrFC,OAAOZ,kBAAkBY,KAAK;oBAC9BY,gBAAgB,AAAC,GAA4B,OAA1BxB,kBAAkBJ,OAAO,EAAC;oBAC7CC,QAAAA;;gBAGIK,YAAYuB,IAAAA,4BAAe,EAAC;oBAChCC,OAAO3B;oBACP4B,WAAW3B,kBAAkBJ,OAAO;oBACpCA,SAASI,kBAAkBJ,OAAO;oBAClCgC,iBAAiB5B,kBAAkBY,KAAK,CAACiB,KAAK,CAAC;oBAC/CC,cAAc;wBACZpB,UAAUV,kBAAkBU,QAAQ;uBAChCV,kBAAkBW,YAAY,IAAI;wBAAEA,cAAcX,kBAAkBW,YAAY;oBAAC;gBAEzF;gBAEMR,aAAaF,QAAQ8B,cAAc;gBACnC3B,cAAiC;oBACrC4B,cAAc;wBACZ,MAAM,IAAIV,MAAM;oBAClB;gBACF;gBAEA;;oBAAO;wBACLrB,SAAAA;wBACAE,YAAYA;wBACZC,aAAAA;wBACAC,YAAY;wBACZC,cAAc;wBACdJ,WAAAA;oBACF;;YACF;YAEA,IAAIF,kBAAkBc,IAAI,KAAK,mBAAmB;gBAChD,IAAI,CAACd,kBAAkBoB,qBAAqB,EAAE;oBAC5C,MAAM,IAAIE,MAAM;gBAClB;gBAEAzB,OAAOwB,KAAK,CAAC,qCAAqC;oBAAEb,SAASR,kBAAkBQ,OAAO;gBAAC;gBACvFP,UAAU,IAAIgC,mCAAsB,CAAC;oBACnCC,aAAalC,kBAAkBoB,qBAAqB;oBACpDe,QAAQnC,kBAAkBY,KAAK,CAACiB,KAAK,CAAC;oBACtChC,QAAAA;gBACF;YACF,OAAO;gBACLA,OAAOwB,KAAK,CAAC,oCAAoC;oBAAEb,SAASR,kBAAkBQ,OAAO;gBAAC;gBACtFP,UAAU,IAAImC,kCAAqB,CAAC;oBAClC5B,SAASR,kBAAkBQ,OAAO;oBAClCE,UAAUV,kBAAkBU,QAAQ;oBACpCC,cAAcX,kBAAkBW,YAAY;oBAC5CC,OAAOZ,kBAAkBY,KAAK;oBAC9BG,UAAUf,kBAAkBe,QAAQ;oBACpClB,QAAAA;oBACAC,YAAAA;mBACIE,kBAAkBgB,WAAW,KAAKG,aAAa;oBAAEH,aAAahB,kBAAkBgB,WAAW;gBAAC;YAEpG;YAEMZ,eAAiC;gBACrC4B,cAAc,SAACK;2BAAcpC,QAAQ+B,YAAY,CAACK;;eAC9C,4BAA4BpC,WAAWA,QAAQqC,sBAAsB,GACrE;gBACEA,wBAAwB;wBAAMrC;4BAAAA,kCAAAA,QAAQqC,sBAAsB,cAA9BrC,sDAAAA,qCAAAA;;YAChC,IACA,CAAC;YAOP,IAAID,kBAAkBc,IAAI,KAAK,mBAAmB;gBAChDX,cAAaF,QAAQ8B,cAAc;gBACnC1B;gBACAC;gBACAT,OAAOwB,KAAK,CAAC,2CAA2C;oBAAEb,SAASR,kBAAkBQ,OAAO;gBAAC;YAC/F,OAAO;gBACLL,cAAaF,QAAQ8B,cAAc;gBAE7BxB,SAASgC,oBAAa,CAACC,cAAc,CAAC;oBAC1ChC,SAASR,kBAAkBQ,OAAO;oBAClCkB,OAAO5B;oBACPD,QAAAA;oBACAiB,MAAMV;gBACR;gBACAC,eAAeE,OAAOkC,KAAK;gBAC3BnC,iBAAiBC,OAAOmC,OAAO;gBAC/B7C,OAAOwB,KAAK,CAAC,uCAAuC;oBAAEb,SAASR,kBAAkBQ,OAAO;gBAAC;YAC3F;YAEA;;gBAAO;oBACLP,SAAAA;oBACAE,YAAYA;oBACZC,aAAAA;oBACAC,cAAAA;oBACAC,gBAAAA;gBACF;;;IACF"}
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/Projects/mcp-z/mcp-sheets/src/setup/oauth-google.ts"],"sourcesContent":["import { type AccountAuthProvider, AccountServer } from '@mcp-z/oauth';\nimport type { CachedToken } from '@mcp-z/oauth-google';\nimport { createDcrRouter, createLoopbackCallbackRouter, DcrOAuthProvider, LoopbackOAuthProvider, ServiceAccountProvider } from '@mcp-z/oauth-google';\nimport type { Logger, PromptModule, ToolModule } from '@mcp-z/server';\nimport type { Router } from 'express';\nimport type { Keyv } from 'keyv';\nimport { GOOGLE_SCOPE } from '../constants.ts';\nimport type { ServerConfig } from '../types.ts';\n\n/**\n * Gmail OAuth runtime dependencies.\n */\nexport interface OAuthRuntimeDeps {\n logger: Logger;\n tokenStore: Keyv<CachedToken>;\n dcrStore?: Keyv<unknown>;\n}\n\n/**\n * Auth middleware helpers used to wrap MCP modules.\n */\nexport interface AuthMiddleware {\n withToolAuth<T extends { name: string; config: unknown; handler: unknown }>(module: T): T;\n withResourceAuth<T extends { name: string; template?: unknown; config?: unknown; handler: unknown }>(module: T): T;\n withPromptAuth<T extends { name: string; config: unknown; handler: unknown }>(module: T): T;\n}\n\n/**\n * Result returned by createOAuthAdapters.\n */\nexport interface OAuthAdapters {\n primary: LoopbackOAuthProvider | ServiceAccountProvider | DcrOAuthProvider;\n middleware: AuthMiddleware;\n authAdapter: AccountAuthProvider;\n accountTools: ToolModule[];\n accountPrompts: PromptModule[];\n dcrRouter?: Router;\n loopbackRouter?: Router;\n}\n\n/**\n * Create Sheets OAuth adapters and helpers.\n *\n * @param config Sheets server configuration.\n * @param deps Runtime dependencies (logger, token store, optional DCR store).\n */\nexport async function createOAuthAdapters(config: ServerConfig, deps: OAuthRuntimeDeps, baseUrl?: string): Promise<OAuthAdapters> {\n const { logger, tokenStore, dcrStore } = deps;\n const oauthStaticConfig = {\n service: config.name,\n clientId: config.clientId,\n clientSecret: config.clientSecret,\n scope: GOOGLE_SCOPE,\n auth: config.auth,\n headless: config.headless,\n redirectUri: config.transport.type === 'stdio' ? undefined : config.redirectUri,\n ...(config.serviceAccountKeyFile && { serviceAccountKeyFile: config.serviceAccountKeyFile }),\n ...(baseUrl && { baseUrl }),\n };\n\n let primary: LoopbackOAuthProvider | ServiceAccountProvider | DcrOAuthProvider;\n\n if (oauthStaticConfig.auth === 'dcr') {\n logger.debug('Creating DCR provider', { service: oauthStaticConfig.service });\n\n if (!dcrStore) {\n throw new Error('DCR mode requires dcrStore to be configured');\n }\n if (!oauthStaticConfig.baseUrl) {\n throw new Error('DCR mode requires baseUrl to be configured');\n }\n\n primary = new DcrOAuthProvider({\n clientId: oauthStaticConfig.clientId,\n ...(oauthStaticConfig.clientSecret && { clientSecret: oauthStaticConfig.clientSecret }),\n scope: oauthStaticConfig.scope,\n verifyEndpoint: `${oauthStaticConfig.baseUrl}/oauth/verify`,\n logger,\n });\n\n const dcrRouter = createDcrRouter({\n store: dcrStore,\n issuerUrl: oauthStaticConfig.baseUrl,\n baseUrl: oauthStaticConfig.baseUrl,\n scopesSupported: oauthStaticConfig.scope.split(' '),\n clientConfig: {\n clientId: oauthStaticConfig.clientId,\n ...(oauthStaticConfig.clientSecret && { clientSecret: oauthStaticConfig.clientSecret }),\n },\n });\n\n const middleware = primary.authMiddleware();\n const authAdapter: AccountAuthProvider = {\n getAccessToken: () => {\n throw new Error('DCR mode does not support getAccessToken - tokens are provided via bearer auth');\n },\n getUserEmail: () => {\n throw new Error('DCR mode does not support getUserEmail - tokens are provided via bearer auth');\n },\n };\n\n return {\n primary,\n middleware: middleware as unknown as AuthMiddleware,\n authAdapter,\n accountTools: [],\n accountPrompts: [],\n dcrRouter,\n };\n }\n\n if (oauthStaticConfig.auth === 'service-account') {\n if (!oauthStaticConfig.serviceAccountKeyFile) {\n throw new Error('Service account key file is required when auth mode is \"service-account\". Set GOOGLE_SERVICE_ACCOUNT_KEY_FILE environment variable or use --service-account-key-file flag.');\n }\n\n logger.debug('Creating service account provider', { service: oauthStaticConfig.service });\n primary = new ServiceAccountProvider({\n keyFilePath: oauthStaticConfig.serviceAccountKeyFile,\n scopes: oauthStaticConfig.scope.split(' '),\n logger,\n });\n } else {\n logger.debug('Creating loopback OAuth provider', { service: oauthStaticConfig.service });\n primary = new LoopbackOAuthProvider({\n service: oauthStaticConfig.service,\n clientId: oauthStaticConfig.clientId,\n clientSecret: oauthStaticConfig.clientSecret,\n scope: oauthStaticConfig.scope,\n headless: oauthStaticConfig.headless,\n logger,\n tokenStore,\n ...(oauthStaticConfig.redirectUri !== undefined && { redirectUri: oauthStaticConfig.redirectUri }),\n });\n }\n\n const authAdapter: AccountAuthProvider = primary;\n\n let middleware: ReturnType<LoopbackOAuthProvider['authMiddleware']>;\n let accountTools: ToolModule[];\n let accountPrompts: PromptModule[];\n\n if (oauthStaticConfig.auth === 'service-account') {\n middleware = primary.authMiddleware();\n accountTools = [];\n accountPrompts = [];\n logger.debug('Service account mode - no account tools', { service: oauthStaticConfig.service });\n } else {\n middleware = primary.authMiddleware();\n\n const result = AccountServer.createLoopback({\n service: oauthStaticConfig.service,\n store: tokenStore,\n logger,\n auth: authAdapter,\n });\n accountTools = result.tools as ToolModule[];\n accountPrompts = result.prompts as PromptModule[];\n logger.debug('Loopback OAuth (multi-account mode)', { service: oauthStaticConfig.service });\n }\n\n const loopbackRouter = primary instanceof LoopbackOAuthProvider && oauthStaticConfig.redirectUri ? createLoopbackCallbackRouter(primary) : undefined;\n\n return {\n primary,\n middleware: middleware as unknown as AuthMiddleware,\n authAdapter,\n accountTools,\n accountPrompts,\n loopbackRouter,\n };\n}\n"],"names":["createOAuthAdapters","config","deps","baseUrl","logger","tokenStore","dcrStore","oauthStaticConfig","primary","dcrRouter","middleware","authAdapter","accountTools","accountPrompts","result","loopbackRouter","service","name","clientId","clientSecret","scope","GOOGLE_SCOPE","auth","headless","redirectUri","transport","type","undefined","serviceAccountKeyFile","debug","Error","DcrOAuthProvider","verifyEndpoint","createDcrRouter","store","issuerUrl","scopesSupported","split","clientConfig","authMiddleware","getAccessToken","getUserEmail","ServiceAccountProvider","keyFilePath","scopes","LoopbackOAuthProvider","AccountServer","createLoopback","tools","prompts","createLoopbackCallbackRouter"],"mappings":"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"}
|
|
@@ -33,9 +33,9 @@ var _server = require("@mcp-z/server");
|
|
|
33
33
|
var _fs = /*#__PURE__*/ _interop_require_wildcard(require("fs"));
|
|
34
34
|
var _path = /*#__PURE__*/ _interop_require_wildcard(require("path"));
|
|
35
35
|
var _pino = /*#__PURE__*/ _interop_require_default(require("pino"));
|
|
36
|
-
var
|
|
37
|
-
var
|
|
38
|
-
var
|
|
36
|
+
var _createstorets = /*#__PURE__*/ _interop_require_default(require("../lib/create-store.js"));
|
|
37
|
+
var _indexts = /*#__PURE__*/ _interop_require_wildcard(require("../mcp/index.js"));
|
|
38
|
+
var _oauthgooglets = require("./oauth-google.js");
|
|
39
39
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
40
40
|
try {
|
|
41
41
|
var info = gen[key](arg);
|
|
@@ -232,7 +232,7 @@ function createTokenStore(baseDir) {
|
|
|
232
232
|
storeUri = process.env.STORE_URI || "file://".concat(_path.join(baseDir, 'tokens.json'));
|
|
233
233
|
return [
|
|
234
234
|
2,
|
|
235
|
-
(0,
|
|
235
|
+
(0, _createstorets.default)(storeUri)
|
|
236
236
|
];
|
|
237
237
|
});
|
|
238
238
|
})();
|
|
@@ -248,7 +248,7 @@ function createDcrStore(baseDir, required) {
|
|
|
248
248
|
dcrStoreUri = process.env.DCR_STORE_URI || "file://".concat(_path.join(baseDir, 'dcr.json'));
|
|
249
249
|
return [
|
|
250
250
|
2,
|
|
251
|
-
(0,
|
|
251
|
+
(0, _createstorets.default)(dcrStoreUri)
|
|
252
252
|
];
|
|
253
253
|
});
|
|
254
254
|
})();
|
|
@@ -293,7 +293,7 @@ function createDefaultRuntime(config, overrides) {
|
|
|
293
293
|
dcrStore = _state.sent();
|
|
294
294
|
return [
|
|
295
295
|
4,
|
|
296
|
-
(0,
|
|
296
|
+
(0, _oauthgooglets.createOAuthAdapters)(config, {
|
|
297
297
|
logger: logger,
|
|
298
298
|
tokenStore: tokenStore,
|
|
299
299
|
dcrStore: dcrStore
|
|
@@ -310,13 +310,13 @@ function createDefaultRuntime(config, overrides) {
|
|
|
310
310
|
};
|
|
311
311
|
createDomainModules = (_ref = overrides === null || overrides === void 0 ? void 0 : overrides.createDomainModules) !== null && _ref !== void 0 ? _ref : function() {
|
|
312
312
|
return {
|
|
313
|
-
tools: Object.values(
|
|
313
|
+
tools: Object.values(_indexts.toolFactories).map(function(factory) {
|
|
314
314
|
return factory();
|
|
315
315
|
}),
|
|
316
|
-
resources: Object.values(
|
|
316
|
+
resources: Object.values(_indexts.resourceFactories).map(function(factory) {
|
|
317
317
|
return factory();
|
|
318
318
|
}),
|
|
319
|
-
prompts: Object.values(
|
|
319
|
+
prompts: Object.values(_indexts.promptFactories).map(function(factory) {
|
|
320
320
|
return factory();
|
|
321
321
|
})
|
|
322
322
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/Projects/
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/Projects/mcp-z/mcp-sheets/src/setup/runtime.ts"],"sourcesContent":["import { sanitizeForLoggingFormatter } from '@mcp-z/oauth';\nimport type { CachedToken } from '@mcp-z/oauth-google';\nimport type { Logger, MiddlewareLayer } from '@mcp-z/server';\nimport { createLoggingMiddleware } from '@mcp-z/server';\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport pino from 'pino';\nimport createStore from '../lib/create-store.ts';\nimport * as mcp from '../mcp/index.ts';\nimport type { CommonRuntime, RuntimeDeps, RuntimeOverrides, ServerConfig } from '../types.ts';\nimport { createOAuthAdapters, type OAuthAdapters } from './oauth-google.ts';\n\nexport function createLogger(config: ServerConfig): Logger {\n const hasStdio = config.transport.type === 'stdio';\n const logsPath = path.join(config.baseDir, 'logs', `${config.name}.log`);\n if (hasStdio) fs.mkdirSync(path.dirname(logsPath), { recursive: true });\n return pino({ level: config.logLevel ?? 'info', formatters: sanitizeForLoggingFormatter() }, hasStdio ? pino.destination({ dest: logsPath, sync: false }) : pino.destination(1));\n}\n\nexport async function createTokenStore(baseDir: string) {\n const storeUri = process.env.STORE_URI || `file://${path.join(baseDir, 'tokens.json')}`;\n return createStore<CachedToken>(storeUri);\n}\n\nexport async function createDcrStore(baseDir: string, required: boolean) {\n if (!required) return undefined;\n const dcrStoreUri = process.env.DCR_STORE_URI || `file://${path.join(baseDir, 'dcr.json')}`;\n return createStore<unknown>(dcrStoreUri);\n}\n\nexport function createAuthLayer(authMiddleware: OAuthAdapters['middleware']): MiddlewareLayer {\n return {\n withTool: authMiddleware.withToolAuth,\n withResource: authMiddleware.withResourceAuth,\n withPrompt: authMiddleware.withPromptAuth,\n };\n}\n\nexport function createLoggingLayer(logger: Logger): MiddlewareLayer {\n const logging = createLoggingMiddleware({ logger });\n return {\n withTool: logging.withToolLogging,\n withResource: logging.withResourceLogging,\n withPrompt: logging.withPromptLogging,\n };\n}\n\nexport async function createDefaultRuntime(config: ServerConfig, overrides?: RuntimeOverrides): Promise<CommonRuntime> {\n if (config.auth === 'dcr' && config.transport.type !== 'http') throw new Error('DCR mode requires an HTTP transport');\n\n const logger = createLogger(config);\n const tokenStore = await createTokenStore(config.baseDir);\n const baseUrl = config.baseUrl ?? (config.transport.type === 'http' && config.transport.port ? `http://localhost:${config.transport.port}` : undefined);\n const dcrStore = await createDcrStore(config.baseDir, config.auth === 'dcr');\n const oauthAdapters = await createOAuthAdapters(config, { logger, tokenStore, dcrStore }, baseUrl);\n const deps: RuntimeDeps = { config, logger, tokenStore, oauthAdapters, baseUrl };\n const createDomainModules =\n overrides?.createDomainModules ??\n (() => ({\n tools: Object.values(mcp.toolFactories).map((factory) => factory()),\n resources: Object.values(mcp.resourceFactories).map((factory) => factory()),\n prompts: Object.values(mcp.promptFactories).map((factory) => factory()),\n }));\n const middlewareFactories = overrides?.middlewareFactories ?? [() => createAuthLayer(oauthAdapters.middleware), () => createLoggingLayer(logger)];\n\n return {\n deps,\n middlewareFactories,\n createDomainModules,\n close: async () => {},\n };\n}\n"],"names":["createAuthLayer","createDcrStore","createDefaultRuntime","createLogger","createLoggingLayer","createTokenStore","config","hasStdio","transport","type","logsPath","path","join","baseDir","name","fs","mkdirSync","dirname","recursive","pino","level","logLevel","formatters","sanitizeForLoggingFormatter","destination","dest","sync","storeUri","process","env","STORE_URI","createStore","required","dcrStoreUri","undefined","DCR_STORE_URI","authMiddleware","withTool","withToolAuth","withResource","withResourceAuth","withPrompt","withPromptAuth","logger","logging","createLoggingMiddleware","withToolLogging","withResourceLogging","withPromptLogging","overrides","tokenStore","baseUrl","dcrStore","oauthAdapters","deps","createDomainModules","middlewareFactories","auth","Error","port","createOAuthAdapters","tools","Object","values","mcp","toolFactories","map","factory","resources","resourceFactories","prompts","promptFactories","middleware","close"],"mappings":"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"}
|
package/dist/cjs/setup/stdio.js
CHANGED
|
@@ -10,7 +10,7 @@ Object.defineProperty(exports, "createStdioServer", {
|
|
|
10
10
|
});
|
|
11
11
|
var _server = require("@mcp-z/server");
|
|
12
12
|
var _mcp = require("@modelcontextprotocol/sdk/server/mcp.js");
|
|
13
|
-
var
|
|
13
|
+
var _runtimets = require("./runtime.js");
|
|
14
14
|
function _array_like_to_array(arr, len) {
|
|
15
15
|
if (len == null || len > arr.length) len = arr.length;
|
|
16
16
|
for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
|
|
@@ -172,7 +172,7 @@ function createStdioServer(config, overrides) {
|
|
|
172
172
|
case 0:
|
|
173
173
|
return [
|
|
174
174
|
4,
|
|
175
|
-
(0,
|
|
175
|
+
(0, _runtimets.createDefaultRuntime)(config, overrides)
|
|
176
176
|
];
|
|
177
177
|
case 1:
|
|
178
178
|
runtime = _state.sent();
|