@mcp-z/mcp-sheets 2.5.1 → 2.6.0
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 +1 -1
- package/dist/cjs/lib/create-store.d.cts +2 -1
- package/dist/cjs/lib/create-store.d.ts +2 -1
- package/dist/cjs/lib/create-store.js +82 -7
- package/dist/cjs/lib/create-store.js.map +1 -1
- package/dist/cjs/mcp/tools/csv-get-columns.js +1 -1
- package/dist/cjs/mcp/tools/lib/dimension-operations.js +1 -1
- package/dist/cjs/mcp/tools/rows-csv-append.js +1 -1
- package/dist/cjs/setup/http.js +1 -1
- package/dist/cjs/setup/runtime.d.cts +2 -2
- package/dist/cjs/setup/runtime.d.ts +2 -2
- package/dist/cjs/setup/runtime.js +6 -6
- package/dist/cjs/setup/runtime.js.map +1 -1
- package/dist/cjs/setup/stdio.js +1 -1
- package/dist/cjs/spreadsheet/data-operations.js +1 -1
- package/dist/cjs/spreadsheet/markdown-runs.js +1 -1
- package/dist/cjs/spreadsheet/range-operations.js +1 -1
- package/dist/cjs/spreadsheet/sheet-operations.js +1 -1
- package/dist/esm/lib/create-store.d.ts +2 -1
- package/dist/esm/lib/create-store.js +22 -4
- package/dist/esm/lib/create-store.js.map +1 -1
- package/dist/esm/setup/runtime.d.ts +2 -2
- package/dist/esm/setup/runtime.js +6 -6
- package/dist/esm/setup/runtime.js.map +1 -1
- package/package.json +7 -7
package/README.md
CHANGED
|
@@ -250,7 +250,7 @@ npm install -g @mcp-z/mcp-sheets @keyv/redis
|
|
|
250
250
|
TOKEN_STORE_URI=redis://localhost:6379 mcp-sheets
|
|
251
251
|
```
|
|
252
252
|
|
|
253
|
-
A protocol whose adapter is missing fails at startup naming the package to install.
|
|
253
|
+
A protocol whose adapter is missing fails at startup naming the package to install. This release uses keyv 6, so adapters you install should be keyv 6 releases (`@keyv/redis` 6). Sign-ins saved by earlier versions are moved to the new format on first start.
|
|
254
254
|
|
|
255
255
|
## Documentation
|
|
256
256
|
|
|
@@ -10,7 +10,7 @@ Object.defineProperty(exports, // keyv-file is a direct dependency so the defaul
|
|
|
10
10
|
return createStore;
|
|
11
11
|
}
|
|
12
12
|
});
|
|
13
|
-
var _keyvregistry = /*#__PURE__*/
|
|
13
|
+
var _keyvregistry = /*#__PURE__*/ _interop_require_wildcard(require("keyv-registry"));
|
|
14
14
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
15
15
|
try {
|
|
16
16
|
var info = gen[key](arg);
|
|
@@ -37,10 +37,35 @@ function _async_to_generator(fn) {
|
|
|
37
37
|
});
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
|
-
function
|
|
41
|
-
|
|
40
|
+
function _getRequireWildcardCache(nodeInterop) {
|
|
41
|
+
if (typeof WeakMap !== "function") return null;
|
|
42
|
+
var cacheBabelInterop = new WeakMap();
|
|
43
|
+
var cacheNodeInterop = new WeakMap();
|
|
44
|
+
return (_getRequireWildcardCache = function(nodeInterop) {
|
|
45
|
+
return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
|
|
46
|
+
})(nodeInterop);
|
|
47
|
+
}
|
|
48
|
+
function _interop_require_wildcard(obj, nodeInterop) {
|
|
49
|
+
if (!nodeInterop && obj && obj.__esModule) return obj;
|
|
50
|
+
if (obj === null || typeof obj !== "object" && typeof obj !== "function") return {
|
|
42
51
|
default: obj
|
|
43
52
|
};
|
|
53
|
+
var cache = _getRequireWildcardCache(nodeInterop);
|
|
54
|
+
if (cache && cache.has(obj)) return cache.get(obj);
|
|
55
|
+
var newObj = {
|
|
56
|
+
__proto__: null
|
|
57
|
+
};
|
|
58
|
+
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
59
|
+
for(var key in obj){
|
|
60
|
+
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
61
|
+
var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
|
|
62
|
+
if (desc && (desc.get || desc.set)) Object.defineProperty(newObj, key, desc);
|
|
63
|
+
else newObj[key] = obj[key];
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
newObj.default = obj;
|
|
67
|
+
if (cache) cache.set(obj, newObj);
|
|
68
|
+
return newObj;
|
|
44
69
|
}
|
|
45
70
|
function _ts_generator(thisArg, body) {
|
|
46
71
|
var f, y, t, _ = {
|
|
@@ -141,19 +166,69 @@ function _ts_generator(thisArg, body) {
|
|
|
141
166
|
};
|
|
142
167
|
}
|
|
143
168
|
}
|
|
144
|
-
function createStore(uri) {
|
|
169
|
+
function createStore(uri, logger) {
|
|
145
170
|
return _async_to_generator(function() {
|
|
146
|
-
var store;
|
|
171
|
+
var protocol, store, cause, _$error, moved, error;
|
|
147
172
|
return _ts_generator(this, function(_state) {
|
|
148
173
|
switch(_state.label){
|
|
149
174
|
case 0:
|
|
175
|
+
// Errors name the protocol only: a redis URI can hold a password.
|
|
176
|
+
protocol = "".concat(uri.split(':')[0], ":");
|
|
177
|
+
_state.label = 1;
|
|
178
|
+
case 1:
|
|
179
|
+
_state.trys.push([
|
|
180
|
+
1,
|
|
181
|
+
3,
|
|
182
|
+
,
|
|
183
|
+
4
|
|
184
|
+
]);
|
|
150
185
|
return [
|
|
151
186
|
4,
|
|
152
187
|
(0, _keyvregistry.default)(uri)
|
|
153
188
|
];
|
|
154
|
-
case
|
|
189
|
+
case 2:
|
|
155
190
|
store = _state.sent();
|
|
156
|
-
|
|
191
|
+
return [
|
|
192
|
+
3,
|
|
193
|
+
4
|
|
194
|
+
];
|
|
195
|
+
case 3:
|
|
196
|
+
cause = _state.sent();
|
|
197
|
+
_$error = new Error("Failed to create store for ".concat(protocol));
|
|
198
|
+
_$error.cause = cause;
|
|
199
|
+
throw _$error;
|
|
200
|
+
case 4:
|
|
201
|
+
if (!store) throw new Error("Failed to create store for ".concat(protocol));
|
|
202
|
+
_state.label = 5;
|
|
203
|
+
case 5:
|
|
204
|
+
_state.trys.push([
|
|
205
|
+
5,
|
|
206
|
+
7,
|
|
207
|
+
,
|
|
208
|
+
9
|
|
209
|
+
]);
|
|
210
|
+
return [
|
|
211
|
+
4,
|
|
212
|
+
(0, _keyvregistry.migrateKeyv5Keys)(store)
|
|
213
|
+
];
|
|
214
|
+
case 6:
|
|
215
|
+
moved = _state.sent();
|
|
216
|
+
if (moved > 0) logger === null || logger === void 0 ? void 0 : logger.info("Moved ".concat(moved, " saved sign-in entries to the keyv 6 format"));
|
|
217
|
+
return [
|
|
218
|
+
3,
|
|
219
|
+
9
|
|
220
|
+
];
|
|
221
|
+
case 7:
|
|
222
|
+
error = _state.sent();
|
|
223
|
+
// Keep the migration error as the one reported, even if closing the store fails too.
|
|
224
|
+
return [
|
|
225
|
+
4,
|
|
226
|
+
store.disconnect().catch(function() {})
|
|
227
|
+
];
|
|
228
|
+
case 8:
|
|
229
|
+
_state.sent();
|
|
230
|
+
throw error;
|
|
231
|
+
case 9:
|
|
157
232
|
return [
|
|
158
233
|
2,
|
|
159
234
|
store
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-sheets/src/lib/create-store.ts"],"sourcesContent":["import type Keyv from 'keyv';\nimport keyvRegistry from 'keyv-registry';\n\n// keyv-file is a direct dependency so the default file:// URIs resolve; keyv-registry\n// loads adapters with require() rather than depending on any of them itself.\n\nexport default async function createStore<T>(uri: string): Promise<Keyv<T>> {\n const store = await keyvRegistry<T>(uri);\n if (!store) throw new Error(`Failed to create store for
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-sheets/src/lib/create-store.ts"],"sourcesContent":["import type { Logger } from '@mcp-z/server';\nimport type Keyv from 'keyv';\nimport keyvRegistry, { migrateKeyv5Keys } from 'keyv-registry';\n\n// keyv-file is a direct dependency so the default file:// URIs resolve; keyv-registry\n// loads adapters with require() rather than depending on any of them itself.\n\nexport default async function createStore<T>(uri: string, logger?: Logger): Promise<Keyv<T>> {\n // Errors name the protocol only: a redis URI can hold a password.\n const protocol = `${uri.split(':')[0]}:`;\n let store: Keyv<T> | undefined;\n try {\n store = await keyvRegistry<T>(uri);\n } catch (cause) {\n const error = new Error(`Failed to create store for ${protocol}`);\n (error as Error & { cause?: unknown }).cause = cause;\n throw error;\n }\n if (!store) throw new Error(`Failed to create store for ${protocol}`);\n try {\n // One-time move of sign-ins saved by keyv 5 versions of this server. Removed in the next major.\n const moved = await migrateKeyv5Keys(store as Keyv);\n if (moved > 0) logger?.info(`Moved ${moved} saved sign-in entries to the keyv 6 format`);\n } catch (error) {\n // Keep the migration error as the one reported, even if closing the store fails too.\n await store.disconnect().catch(() => {});\n throw error;\n }\n return store;\n}\n"],"names":["createStore","uri","logger","protocol","store","cause","error","moved","split","keyvRegistry","Error","migrateKeyv5Keys","info","disconnect","catch"],"mappings":";;;;+BAIA,sFAAsF;AACtF,6EAA6E;AAE7E;;;eAA8BA;;;oEALiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKhC,SAAeA,YAAeC,GAAW,EAAEC,MAAe;;YAEjEC,UACFC,OAGKC,OACDC,SAOAC,OAECD;;;;oBAfT,kEAAkE;oBAC5DH,WAAW,AAAC,GAAoB,OAAlBF,IAAIO,KAAK,CAAC,IAAI,CAAC,EAAE,EAAC;;;;;;;;;oBAG5B;;wBAAMC,IAAAA,qBAAY,EAAIR;;;oBAA9BG,QAAQ;;;;;;oBACDC;oBACDC,UAAQ,IAAII,MAAM,AAAC,8BAAsC,OAATP;oBACrDG,QAAsCD,KAAK,GAAGA;oBAC/C,MAAMC;;oBAER,IAAI,CAACF,OAAO,MAAM,IAAIM,MAAM,AAAC,8BAAsC,OAATP;;;;;;;;;oBAG1C;;wBAAMQ,IAAAA,8BAAgB,EAACP;;;oBAA/BG,QAAQ;oBACd,IAAIA,QAAQ,GAAGL,mBAAAA,6BAAAA,OAAQU,IAAI,CAAC,AAAC,SAAc,OAANL,OAAM;;;;;;oBACpCD;oBACP,qFAAqF;oBACrF;;wBAAMF,MAAMS,UAAU,GAAGC,KAAK,CAAC,YAAO;;;oBAAtC;oBACA,MAAMR;;oBAER;;wBAAOF;;;;IACT"}
|
|
@@ -169,7 +169,7 @@ function _unsupported_iterable_to_array(o, minLen) {
|
|
|
169
169
|
if (typeof o === "string") return _array_like_to_array(o, minLen);
|
|
170
170
|
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
171
171
|
if (n === "Object" && o.constructor) n = o.constructor.name;
|
|
172
|
-
if (n === "Map" || n === "Set") return Array.from(
|
|
172
|
+
if (n === "Map" || n === "Set") return Array.from(o);
|
|
173
173
|
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
|
|
174
174
|
}
|
|
175
175
|
var AuthRequiredBranchSchema = _oauthgoogle.schemas.AuthRequiredBranchSchema;
|
|
@@ -85,7 +85,7 @@ function _unsupported_iterable_to_array(o, minLen) {
|
|
|
85
85
|
if (typeof o === "string") return _array_like_to_array(o, minLen);
|
|
86
86
|
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
87
87
|
if (n === "Object" && o.constructor) n = o.constructor.name;
|
|
88
|
-
if (n === "Map" || n === "Set") return Array.from(
|
|
88
|
+
if (n === "Map" || n === "Set") return Array.from(o);
|
|
89
89
|
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
|
|
90
90
|
}
|
|
91
91
|
var DEFAULT_APPEND_COUNT = 1; // Default number of rows/columns to append
|
|
@@ -235,7 +235,7 @@ function _unsupported_iterable_to_array(o, minLen) {
|
|
|
235
235
|
if (typeof o === "string") return _array_like_to_array(o, minLen);
|
|
236
236
|
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
237
237
|
if (n === "Object" && o.constructor) n = o.constructor.name;
|
|
238
|
-
if (n === "Map" || n === "Set") return Array.from(
|
|
238
|
+
if (n === "Map" || n === "Set") return Array.from(o);
|
|
239
239
|
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
|
|
240
240
|
}
|
|
241
241
|
var AuthRequiredBranchSchema = _oauthgoogle.schemas.AuthRequiredBranchSchema;
|
package/dist/cjs/setup/http.js
CHANGED
|
@@ -166,7 +166,7 @@ function _unsupported_iterable_to_array(o, minLen) {
|
|
|
166
166
|
if (typeof o === "string") return _array_like_to_array(o, minLen);
|
|
167
167
|
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
168
168
|
if (n === "Object" && o.constructor) n = o.constructor.name;
|
|
169
|
-
if (n === "Map" || n === "Set") return Array.from(
|
|
169
|
+
if (n === "Map" || n === "Set") return Array.from(o);
|
|
170
170
|
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
|
|
171
171
|
}
|
|
172
172
|
function createHTTPServer(config, overrides) {
|
|
@@ -3,8 +3,8 @@ import type { Logger, MiddlewareLayer } from '@mcp-z/server';
|
|
|
3
3
|
import type { CommonRuntime, RuntimeOverrides, ServerConfig } from '../types.js';
|
|
4
4
|
import { type OAuthAdapters } from './oauth-google.js';
|
|
5
5
|
export declare function createLogger(config: ServerConfig): Logger;
|
|
6
|
-
export declare function createTokenStore(baseDir: string): Promise<import("keyv").Keyv<CachedToken>>;
|
|
7
|
-
export declare function createDcrStore(baseDir: string, required: boolean): Promise<import("keyv").Keyv<unknown> | undefined>;
|
|
6
|
+
export declare function createTokenStore(baseDir: string, logger?: Logger): Promise<import("keyv").Keyv<CachedToken>>;
|
|
7
|
+
export declare function createDcrStore(baseDir: string, required: boolean, logger?: Logger): Promise<import("keyv").Keyv<unknown> | undefined>;
|
|
8
8
|
export declare function createAuthLayer(authMiddleware: OAuthAdapters['middleware']): MiddlewareLayer;
|
|
9
9
|
export declare function createLoggingLayer(logger: Logger): MiddlewareLayer;
|
|
10
10
|
export declare function createDefaultRuntime(config: ServerConfig, overrides?: RuntimeOverrides): Promise<CommonRuntime>;
|
|
@@ -3,8 +3,8 @@ import type { Logger, MiddlewareLayer } from '@mcp-z/server';
|
|
|
3
3
|
import type { CommonRuntime, RuntimeOverrides, ServerConfig } from '../types.js';
|
|
4
4
|
import { type OAuthAdapters } from './oauth-google.js';
|
|
5
5
|
export declare function createLogger(config: ServerConfig): Logger;
|
|
6
|
-
export declare function createTokenStore(baseDir: string): Promise<import("keyv").Keyv<CachedToken>>;
|
|
7
|
-
export declare function createDcrStore(baseDir: string, required: boolean): Promise<import("keyv").Keyv<unknown> | undefined>;
|
|
6
|
+
export declare function createTokenStore(baseDir: string, logger?: Logger): Promise<import("keyv").Keyv<CachedToken>>;
|
|
7
|
+
export declare function createDcrStore(baseDir: string, required: boolean, logger?: Logger): Promise<import("keyv").Keyv<unknown> | undefined>;
|
|
8
8
|
export declare function createAuthLayer(authMiddleware: OAuthAdapters['middleware']): MiddlewareLayer;
|
|
9
9
|
export declare function createLoggingLayer(logger: Logger): MiddlewareLayer;
|
|
10
10
|
export declare function createDefaultRuntime(config: ServerConfig, overrides?: RuntimeOverrides): Promise<CommonRuntime>;
|
|
@@ -212,19 +212,19 @@ function createLogger(config) {
|
|
|
212
212
|
sync: false
|
|
213
213
|
}) : _pino.default.destination(1));
|
|
214
214
|
}
|
|
215
|
-
function createTokenStore(baseDir) {
|
|
215
|
+
function createTokenStore(baseDir, logger) {
|
|
216
216
|
return _async_to_generator(function() {
|
|
217
217
|
var tokenStoreUri;
|
|
218
218
|
return _ts_generator(this, function(_state) {
|
|
219
219
|
tokenStoreUri = process.env.TOKEN_STORE_URI || (0, _nodeurl.pathToFileURL)(_path.join(baseDir, 'tokens.json')).href;
|
|
220
220
|
return [
|
|
221
221
|
2,
|
|
222
|
-
(0, _createstorets.default)(tokenStoreUri)
|
|
222
|
+
(0, _createstorets.default)(tokenStoreUri, logger)
|
|
223
223
|
];
|
|
224
224
|
});
|
|
225
225
|
})();
|
|
226
226
|
}
|
|
227
|
-
function createDcrStore(baseDir, required) {
|
|
227
|
+
function createDcrStore(baseDir, required, logger) {
|
|
228
228
|
return _async_to_generator(function() {
|
|
229
229
|
var dcrStoreUri;
|
|
230
230
|
return _ts_generator(this, function(_state) {
|
|
@@ -235,7 +235,7 @@ function createDcrStore(baseDir, required) {
|
|
|
235
235
|
dcrStoreUri = process.env.DCR_STORE_URI || (0, _nodeurl.pathToFileURL)(_path.join(baseDir, 'dcr.json')).href;
|
|
236
236
|
return [
|
|
237
237
|
2,
|
|
238
|
-
(0, _createstorets.default)(dcrStoreUri)
|
|
238
|
+
(0, _createstorets.default)(dcrStoreUri, logger)
|
|
239
239
|
];
|
|
240
240
|
});
|
|
241
241
|
})();
|
|
@@ -267,14 +267,14 @@ function createDefaultRuntime(config, overrides) {
|
|
|
267
267
|
logger = createLogger(config);
|
|
268
268
|
return [
|
|
269
269
|
4,
|
|
270
|
-
createTokenStore(config.baseDir)
|
|
270
|
+
createTokenStore(config.baseDir, logger)
|
|
271
271
|
];
|
|
272
272
|
case 1:
|
|
273
273
|
tokenStore = _state.sent();
|
|
274
274
|
baseUrl = (_config_baseUrl = config.baseUrl) !== null && _config_baseUrl !== void 0 ? _config_baseUrl : config.transport.type === 'http' && config.transport.port ? "http://localhost:".concat(config.transport.port) : undefined;
|
|
275
275
|
return [
|
|
276
276
|
4,
|
|
277
|
-
createDcrStore(config.baseDir, config.auth === 'dcr')
|
|
277
|
+
createDcrStore(config.baseDir, config.auth === 'dcr', logger)
|
|
278
278
|
];
|
|
279
279
|
case 2:
|
|
280
280
|
dcrStore = _state.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-sheets/src/setup/runtime.ts"],"sourcesContent":["import { pathToFileURL } from 'node:url';\nimport { 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 tokenStoreUri = process.env.TOKEN_STORE_URI || pathToFileURL(path.join(baseDir, 'tokens.json')).href;\n return createStore<CachedToken>(tokenStoreUri);\n}\n\nexport async function createDcrStore(baseDir: string, required: boolean) {\n if (!required) return undefined;\n const dcrStoreUri = process.env.DCR_STORE_URI || pathToFileURL(path.join(baseDir, 'dcr.json')).href;\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","tokenStoreUri","process","env","TOKEN_STORE_URI","pathToFileURL","href","createStore","required","dcrStoreUri","undefined","DCR_STORE_URI","authMiddleware","withTool","withToolAuth","withResource","withResourceAuth","withPrompt","withPromptAuth","
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-sheets/src/setup/runtime.ts"],"sourcesContent":["import { pathToFileURL } from 'node:url';\nimport { 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, logger?: Logger) {\n const tokenStoreUri = process.env.TOKEN_STORE_URI || pathToFileURL(path.join(baseDir, 'tokens.json')).href;\n return createStore<CachedToken>(tokenStoreUri, logger);\n}\n\nexport async function createDcrStore(baseDir: string, required: boolean, logger?: Logger) {\n if (!required) return undefined;\n const dcrStoreUri = process.env.DCR_STORE_URI || pathToFileURL(path.join(baseDir, 'dcr.json')).href;\n return createStore<unknown>(dcrStoreUri, logger);\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, logger);\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', logger);\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","logger","tokenStoreUri","process","env","TOKEN_STORE_URI","pathToFileURL","href","createStore","required","dcrStoreUri","undefined","DCR_STORE_URI","authMiddleware","withTool","withToolAuth","withResource","withResourceAuth","withPrompt","withPromptAuth","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
|
@@ -159,7 +159,7 @@ function _unsupported_iterable_to_array(o, minLen) {
|
|
|
159
159
|
if (typeof o === "string") return _array_like_to_array(o, minLen);
|
|
160
160
|
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
161
161
|
if (n === "Object" && o.constructor) n = o.constructor.name;
|
|
162
|
-
if (n === "Map" || n === "Set") return Array.from(
|
|
162
|
+
if (n === "Map" || n === "Set") return Array.from(o);
|
|
163
163
|
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
|
|
164
164
|
}
|
|
165
165
|
function createStdioServer(config, overrides) {
|
|
@@ -200,7 +200,7 @@ function _unsupported_iterable_to_array(o, minLen) {
|
|
|
200
200
|
if (typeof o === "string") return _array_like_to_array(o, minLen);
|
|
201
201
|
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
202
202
|
if (n === "Object" && o.constructor) n = o.constructor.name;
|
|
203
|
-
if (n === "Map" || n === "Set") return Array.from(
|
|
203
|
+
if (n === "Map" || n === "Set") return Array.from(o);
|
|
204
204
|
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
|
|
205
205
|
}
|
|
206
206
|
function discoverHeader(sheets, spreadsheetId, sheetTitle) {
|
|
@@ -73,7 +73,7 @@ function _unsupported_iterable_to_array(o, minLen) {
|
|
|
73
73
|
if (typeof o === "string") return _array_like_to_array(o, minLen);
|
|
74
74
|
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
75
75
|
if (n === "Object" && o.constructor) n = o.constructor.name;
|
|
76
|
-
if (n === "Map" || n === "Set") return Array.from(
|
|
76
|
+
if (n === "Map" || n === "Set") return Array.from(o);
|
|
77
77
|
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
|
|
78
78
|
}
|
|
79
79
|
/**
|
|
@@ -130,7 +130,7 @@ function _unsupported_iterable_to_array(o, minLen) {
|
|
|
130
130
|
if (typeof o === "string") return _array_like_to_array(o, minLen);
|
|
131
131
|
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
132
132
|
if (n === "Object" && o.constructor) n = o.constructor.name;
|
|
133
|
-
if (n === "Map" || n === "Set") return Array.from(
|
|
133
|
+
if (n === "Map" || n === "Set") return Array.from(o);
|
|
134
134
|
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
|
|
135
135
|
}
|
|
136
136
|
var GOOGLE_SHEETS_LIMITS = {
|
|
@@ -178,7 +178,7 @@ function _unsupported_iterable_to_array(o, minLen) {
|
|
|
178
178
|
if (typeof o === "string") return _array_like_to_array(o, minLen);
|
|
179
179
|
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
180
180
|
if (n === "Object" && o.constructor) n = o.constructor.name;
|
|
181
|
-
if (n === "Map" || n === "Set") return Array.from(
|
|
181
|
+
if (n === "Map" || n === "Set") return Array.from(o);
|
|
182
182
|
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
|
|
183
183
|
}
|
|
184
184
|
function scanKeyColumnRows(sheets, spreadsheetId, sheetTitle, startCol, endCol, onRow) {
|
|
@@ -1,8 +1,26 @@
|
|
|
1
|
-
import keyvRegistry from 'keyv-registry';
|
|
1
|
+
import keyvRegistry, { migrateKeyv5Keys } from 'keyv-registry';
|
|
2
2
|
// keyv-file is a direct dependency so the default file:// URIs resolve; keyv-registry
|
|
3
3
|
// loads adapters with require() rather than depending on any of them itself.
|
|
4
|
-
export default async function createStore(uri) {
|
|
5
|
-
|
|
6
|
-
|
|
4
|
+
export default async function createStore(uri, logger) {
|
|
5
|
+
// Errors name the protocol only: a redis URI can hold a password.
|
|
6
|
+
const protocol = `${uri.split(':')[0]}:`;
|
|
7
|
+
let store;
|
|
8
|
+
try {
|
|
9
|
+
store = await keyvRegistry(uri);
|
|
10
|
+
} catch (cause) {
|
|
11
|
+
const error = new Error(`Failed to create store for ${protocol}`);
|
|
12
|
+
error.cause = cause;
|
|
13
|
+
throw error;
|
|
14
|
+
}
|
|
15
|
+
if (!store) throw new Error(`Failed to create store for ${protocol}`);
|
|
16
|
+
try {
|
|
17
|
+
// One-time move of sign-ins saved by keyv 5 versions of this server. Removed in the next major.
|
|
18
|
+
const moved = await migrateKeyv5Keys(store);
|
|
19
|
+
if (moved > 0) logger === null || logger === void 0 ? void 0 : logger.info(`Moved ${moved} saved sign-in entries to the keyv 6 format`);
|
|
20
|
+
} catch (error) {
|
|
21
|
+
// Keep the migration error as the one reported, even if closing the store fails too.
|
|
22
|
+
await store.disconnect().catch(()=>{});
|
|
23
|
+
throw error;
|
|
24
|
+
}
|
|
7
25
|
return store;
|
|
8
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-sheets/src/lib/create-store.ts"],"sourcesContent":["import type Keyv from 'keyv';\nimport keyvRegistry from 'keyv-registry';\n\n// keyv-file is a direct dependency so the default file:// URIs resolve; keyv-registry\n// loads adapters with require() rather than depending on any of them itself.\n\nexport default async function createStore<T>(uri: string): Promise<Keyv<T>> {\n const store = await keyvRegistry<T>(uri);\n if (!store) throw new Error(`Failed to create store for
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-sheets/src/lib/create-store.ts"],"sourcesContent":["import type { Logger } from '@mcp-z/server';\nimport type Keyv from 'keyv';\nimport keyvRegistry, { migrateKeyv5Keys } from 'keyv-registry';\n\n// keyv-file is a direct dependency so the default file:// URIs resolve; keyv-registry\n// loads adapters with require() rather than depending on any of them itself.\n\nexport default async function createStore<T>(uri: string, logger?: Logger): Promise<Keyv<T>> {\n // Errors name the protocol only: a redis URI can hold a password.\n const protocol = `${uri.split(':')[0]}:`;\n let store: Keyv<T> | undefined;\n try {\n store = await keyvRegistry<T>(uri);\n } catch (cause) {\n const error = new Error(`Failed to create store for ${protocol}`);\n (error as Error & { cause?: unknown }).cause = cause;\n throw error;\n }\n if (!store) throw new Error(`Failed to create store for ${protocol}`);\n try {\n // One-time move of sign-ins saved by keyv 5 versions of this server. Removed in the next major.\n const moved = await migrateKeyv5Keys(store as Keyv);\n if (moved > 0) logger?.info(`Moved ${moved} saved sign-in entries to the keyv 6 format`);\n } catch (error) {\n // Keep the migration error as the one reported, even if closing the store fails too.\n await store.disconnect().catch(() => {});\n throw error;\n }\n return store;\n}\n"],"names":["keyvRegistry","migrateKeyv5Keys","createStore","uri","logger","protocol","split","store","cause","error","Error","moved","info","disconnect","catch"],"mappings":"AAEA,OAAOA,gBAAgBC,gBAAgB,QAAQ,gBAAgB;AAE/D,sFAAsF;AACtF,6EAA6E;AAE7E,eAAe,eAAeC,YAAeC,GAAW,EAAEC,MAAe;IACvE,kEAAkE;IAClE,MAAMC,WAAW,GAAGF,IAAIG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACxC,IAAIC;IACJ,IAAI;QACFA,QAAQ,MAAMP,aAAgBG;IAChC,EAAE,OAAOK,OAAO;QACd,MAAMC,QAAQ,IAAIC,MAAM,CAAC,2BAA2B,EAAEL,UAAU;QAC/DI,MAAsCD,KAAK,GAAGA;QAC/C,MAAMC;IACR;IACA,IAAI,CAACF,OAAO,MAAM,IAAIG,MAAM,CAAC,2BAA2B,EAAEL,UAAU;IACpE,IAAI;QACF,gGAAgG;QAChG,MAAMM,QAAQ,MAAMV,iBAAiBM;QACrC,IAAII,QAAQ,GAAGP,mBAAAA,6BAAAA,OAAQQ,IAAI,CAAC,CAAC,MAAM,EAAED,MAAM,2CAA2C,CAAC;IACzF,EAAE,OAAOF,OAAO;QACd,qFAAqF;QACrF,MAAMF,MAAMM,UAAU,GAAGC,KAAK,CAAC,KAAO;QACtC,MAAML;IACR;IACA,OAAOF;AACT"}
|
|
@@ -3,8 +3,8 @@ import type { Logger, MiddlewareLayer } from '@mcp-z/server';
|
|
|
3
3
|
import type { CommonRuntime, RuntimeOverrides, ServerConfig } from '../types.js';
|
|
4
4
|
import { type OAuthAdapters } from './oauth-google.js';
|
|
5
5
|
export declare function createLogger(config: ServerConfig): Logger;
|
|
6
|
-
export declare function createTokenStore(baseDir: string): Promise<import("keyv").Keyv<CachedToken>>;
|
|
7
|
-
export declare function createDcrStore(baseDir: string, required: boolean): Promise<import("keyv").Keyv<unknown> | undefined>;
|
|
6
|
+
export declare function createTokenStore(baseDir: string, logger?: Logger): Promise<import("keyv").Keyv<CachedToken>>;
|
|
7
|
+
export declare function createDcrStore(baseDir: string, required: boolean, logger?: Logger): Promise<import("keyv").Keyv<unknown> | undefined>;
|
|
8
8
|
export declare function createAuthLayer(authMiddleware: OAuthAdapters['middleware']): MiddlewareLayer;
|
|
9
9
|
export declare function createLoggingLayer(logger: Logger): MiddlewareLayer;
|
|
10
10
|
export declare function createDefaultRuntime(config: ServerConfig, overrides?: RuntimeOverrides): Promise<CommonRuntime>;
|
|
@@ -22,14 +22,14 @@ export function createLogger(config) {
|
|
|
22
22
|
sync: false
|
|
23
23
|
}) : pino.destination(1));
|
|
24
24
|
}
|
|
25
|
-
export async function createTokenStore(baseDir) {
|
|
25
|
+
export async function createTokenStore(baseDir, logger) {
|
|
26
26
|
const tokenStoreUri = process.env.TOKEN_STORE_URI || pathToFileURL(path.join(baseDir, 'tokens.json')).href;
|
|
27
|
-
return createStore(tokenStoreUri);
|
|
27
|
+
return createStore(tokenStoreUri, logger);
|
|
28
28
|
}
|
|
29
|
-
export async function createDcrStore(baseDir, required) {
|
|
29
|
+
export async function createDcrStore(baseDir, required, logger) {
|
|
30
30
|
if (!required) return undefined;
|
|
31
31
|
const dcrStoreUri = process.env.DCR_STORE_URI || pathToFileURL(path.join(baseDir, 'dcr.json')).href;
|
|
32
|
-
return createStore(dcrStoreUri);
|
|
32
|
+
return createStore(dcrStoreUri, logger);
|
|
33
33
|
}
|
|
34
34
|
export function createAuthLayer(authMiddleware) {
|
|
35
35
|
return {
|
|
@@ -52,9 +52,9 @@ export async function createDefaultRuntime(config, overrides) {
|
|
|
52
52
|
var _config_baseUrl, _ref, _ref1;
|
|
53
53
|
if (config.auth === 'dcr' && config.transport.type !== 'http') throw new Error('DCR mode requires an HTTP transport');
|
|
54
54
|
const logger = createLogger(config);
|
|
55
|
-
const tokenStore = await createTokenStore(config.baseDir);
|
|
55
|
+
const tokenStore = await createTokenStore(config.baseDir, logger);
|
|
56
56
|
const baseUrl = (_config_baseUrl = config.baseUrl) !== null && _config_baseUrl !== void 0 ? _config_baseUrl : config.transport.type === 'http' && config.transport.port ? `http://localhost:${config.transport.port}` : undefined;
|
|
57
|
-
const dcrStore = await createDcrStore(config.baseDir, config.auth === 'dcr');
|
|
57
|
+
const dcrStore = await createDcrStore(config.baseDir, config.auth === 'dcr', logger);
|
|
58
58
|
const oauthAdapters = await createOAuthAdapters(config, {
|
|
59
59
|
logger,
|
|
60
60
|
tokenStore,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-sheets/src/setup/runtime.ts"],"sourcesContent":["import { pathToFileURL } from 'node:url';\nimport { 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 tokenStoreUri = process.env.TOKEN_STORE_URI || pathToFileURL(path.join(baseDir, 'tokens.json')).href;\n return createStore<CachedToken>(tokenStoreUri);\n}\n\nexport async function createDcrStore(baseDir: string, required: boolean) {\n if (!required) return undefined;\n const dcrStoreUri = process.env.DCR_STORE_URI || pathToFileURL(path.join(baseDir, 'dcr.json')).href;\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":["pathToFileURL","sanitizeForLoggingFormatter","createLoggingMiddleware","fs","path","pino","createStore","mcp","createOAuthAdapters","createLogger","config","hasStdio","transport","type","logsPath","join","baseDir","name","mkdirSync","dirname","recursive","level","logLevel","formatters","destination","dest","sync","createTokenStore","tokenStoreUri","process","env","TOKEN_STORE_URI","href","createDcrStore","required","undefined","dcrStoreUri","DCR_STORE_URI","createAuthLayer","authMiddleware","withTool","withToolAuth","withResource","withResourceAuth","withPrompt","withPromptAuth","createLoggingLayer","
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-sheets/src/setup/runtime.ts"],"sourcesContent":["import { pathToFileURL } from 'node:url';\nimport { 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, logger?: Logger) {\n const tokenStoreUri = process.env.TOKEN_STORE_URI || pathToFileURL(path.join(baseDir, 'tokens.json')).href;\n return createStore<CachedToken>(tokenStoreUri, logger);\n}\n\nexport async function createDcrStore(baseDir: string, required: boolean, logger?: Logger) {\n if (!required) return undefined;\n const dcrStoreUri = process.env.DCR_STORE_URI || pathToFileURL(path.join(baseDir, 'dcr.json')).href;\n return createStore<unknown>(dcrStoreUri, logger);\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, logger);\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', logger);\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":["pathToFileURL","sanitizeForLoggingFormatter","createLoggingMiddleware","fs","path","pino","createStore","mcp","createOAuthAdapters","createLogger","config","hasStdio","transport","type","logsPath","join","baseDir","name","mkdirSync","dirname","recursive","level","logLevel","formatters","destination","dest","sync","createTokenStore","logger","tokenStoreUri","process","env","TOKEN_STORE_URI","href","createDcrStore","required","undefined","dcrStoreUri","DCR_STORE_URI","createAuthLayer","authMiddleware","withTool","withToolAuth","withResource","withResourceAuth","withPrompt","withPromptAuth","createLoggingLayer","logging","withToolLogging","withResourceLogging","withPromptLogging","createDefaultRuntime","overrides","auth","Error","tokenStore","baseUrl","port","dcrStore","oauthAdapters","deps","createDomainModules","tools","Object","values","toolFactories","map","factory","resources","resourceFactories","prompts","promptFactories","middlewareFactories","middleware","close"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mcp-z/mcp-sheets",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.6.0",
|
|
4
4
|
"description": "MCP server for Google Sheets integration with OAuth authentication, spreadsheet management, batch operations, and advanced formatting",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"sheets",
|
|
@@ -71,28 +71,28 @@
|
|
|
71
71
|
"dependencies": {
|
|
72
72
|
"@googleapis/drive": "^27.1.0",
|
|
73
73
|
"@googleapis/sheets": "^18.0.0",
|
|
74
|
-
"@mcp-z/oauth": "^2.
|
|
75
|
-
"@mcp-z/oauth-google": "^2.0
|
|
74
|
+
"@mcp-z/oauth": "^2.2.0",
|
|
75
|
+
"@mcp-z/oauth-google": "^2.4.0",
|
|
76
76
|
"@mcp-z/server": "^2.3.0",
|
|
77
77
|
"cors": "^2.0.0",
|
|
78
78
|
"csv-parse": "^7.0.2",
|
|
79
79
|
"express": "^5.0.0",
|
|
80
80
|
"keyv-file": "5.3.3",
|
|
81
|
-
"keyv-registry": "^
|
|
81
|
+
"keyv-registry": "^3.0.0",
|
|
82
82
|
"module-root-sync": "^2.0.0",
|
|
83
83
|
"pino": "^10.0.0",
|
|
84
84
|
"zod": "^4.2.0"
|
|
85
85
|
},
|
|
86
86
|
"devDependencies": {
|
|
87
|
-
"@mcp-z/client": "^2.
|
|
87
|
+
"@mcp-z/client": "^2.5.0",
|
|
88
88
|
"@modelcontextprotocol/sdk": "^1.0.0",
|
|
89
89
|
"@types/cors": "^2.8.19",
|
|
90
90
|
"@types/express": "^5.0.6",
|
|
91
91
|
"@types/mocha": "^10.0.10",
|
|
92
|
-
"@types/node": "^
|
|
92
|
+
"@types/node": "^22.0.0",
|
|
93
93
|
"fs-remove-compat": "^1.0.4",
|
|
94
94
|
"get-port": "5.1.1",
|
|
95
|
-
"keyv": "^
|
|
95
|
+
"keyv": "^6.1.0",
|
|
96
96
|
"node-version-use": "^2.4.7",
|
|
97
97
|
"p-throttle": "^8.1.1",
|
|
98
98
|
"portable-env": "^1.4.0",
|