gogcli-mcp-calendar 2.18.4 → 2.19.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/dist/index.js +84 -2
- package/manifest.json +1 -1
- package/package.json +1 -1
- package/src/index.ts +5 -1
package/dist/index.js
CHANGED
|
@@ -3644,7 +3644,12 @@ var require_fast_uri = __commonJS({
|
|
|
3644
3644
|
}
|
|
3645
3645
|
function resolve(baseURI, relativeURI, options) {
|
|
3646
3646
|
const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
|
|
3647
|
-
const
|
|
3647
|
+
const { parsed: baseParsed, malformedAuthorityOrPort: baseMalformed } = parseWithStatus(baseURI, schemelessOptions);
|
|
3648
|
+
const { parsed: relativeParsed, malformedAuthorityOrPort: relativeMalformed } = parseWithStatus(relativeURI, schemelessOptions);
|
|
3649
|
+
if (baseMalformed || relativeMalformed) {
|
|
3650
|
+
throw new Error(baseParsed.error || relativeParsed.error || "URI is malformed.");
|
|
3651
|
+
}
|
|
3652
|
+
const resolved = resolveComponent(baseParsed, relativeParsed, schemelessOptions, true);
|
|
3648
3653
|
schemelessOptions.skipEscape = true;
|
|
3649
3654
|
return serialize(resolved, schemelessOptions);
|
|
3650
3655
|
}
|
|
@@ -3770,6 +3775,7 @@ var require_fast_uri = __commonJS({
|
|
|
3770
3775
|
}
|
|
3771
3776
|
var URI_PARSE = /^(?:([^#/:?]+):)?(?:\/\/((?:([^#/?@]*)@)?(\[[^#/?\]]+\]|[^#/:?]*)(?::(\d*))?))?([^#?]*)(?:\?([^#]*))?(?:#((?:.|[\n\r])*))?/u;
|
|
3772
3777
|
var AUTHORITY_PREFIX = /^(?:[^#/:?]+:)?\/\/([^/?#]*)/;
|
|
3778
|
+
var AUTHORITY_INTRODUCER_REGION = /^(?:[^#/:?]+:)?([/\\\t\n\r]*)/;
|
|
3773
3779
|
function getParseError(parsed, matches) {
|
|
3774
3780
|
if (matches[2] !== void 0 && parsed.path && parsed.path[0] !== "/") {
|
|
3775
3781
|
return 'URI path must start with "/" when authority is present.';
|
|
@@ -3804,6 +3810,20 @@ var require_fast_uri = __commonJS({
|
|
|
3804
3810
|
parsed.error = "URI authority must not contain a literal backslash.";
|
|
3805
3811
|
malformedAuthorityOrPort = true;
|
|
3806
3812
|
}
|
|
3813
|
+
const introducerMatch = uri.match(AUTHORITY_INTRODUCER_REGION);
|
|
3814
|
+
if (introducerMatch !== null) {
|
|
3815
|
+
const region = introducerMatch[1];
|
|
3816
|
+
const normalizedRegion = region.replace(/[\t\n\r]/g, "");
|
|
3817
|
+
if (normalizedRegion.length >= 2) {
|
|
3818
|
+
if (normalizedRegion.slice(0, 2) !== "//") {
|
|
3819
|
+
parsed.error = parsed.error || "URI authority must not contain a literal backslash.";
|
|
3820
|
+
malformedAuthorityOrPort = true;
|
|
3821
|
+
} else if (region.length !== normalizedRegion.length) {
|
|
3822
|
+
parsed.error = parsed.error || "URI authority introducer must not contain whitespace.";
|
|
3823
|
+
malformedAuthorityOrPort = true;
|
|
3824
|
+
}
|
|
3825
|
+
}
|
|
3826
|
+
}
|
|
3807
3827
|
const matches = uri.match(URI_PARSE);
|
|
3808
3828
|
if (matches) {
|
|
3809
3829
|
parsed.scheme = matches[1];
|
|
@@ -31875,7 +31895,68 @@ var failIfNotEmptyParam = external_exports.boolean().optional().describe(
|
|
|
31875
31895
|
);
|
|
31876
31896
|
|
|
31877
31897
|
// ../gogcli-mcp/src/server.ts
|
|
31878
|
-
var VERSION = true ? "2.
|
|
31898
|
+
var VERSION = true ? "2.19.1" : "0.0.0";
|
|
31899
|
+
|
|
31900
|
+
// ../gogcli-mcp/src/connector-runtime.ts
|
|
31901
|
+
var DEFAULT_TIMEOUT_MS = 3e4;
|
|
31902
|
+
var DEADLINE_GRACE_MS = 5e3;
|
|
31903
|
+
var RUNNER_GOG_FAILED = 422;
|
|
31904
|
+
var RUNNER_DRAINING = 503;
|
|
31905
|
+
function makeFlyExecutor(endpoint, key) {
|
|
31906
|
+
return async (args, opts) => {
|
|
31907
|
+
const deadlineMs = (opts?.timeout ?? DEFAULT_TIMEOUT_MS) + DEADLINE_GRACE_MS;
|
|
31908
|
+
let res;
|
|
31909
|
+
try {
|
|
31910
|
+
res = await fetch(endpoint + "/run", {
|
|
31911
|
+
method: "POST",
|
|
31912
|
+
headers: {
|
|
31913
|
+
Authorization: "Bearer " + key,
|
|
31914
|
+
"Content-Type": "application/json"
|
|
31915
|
+
},
|
|
31916
|
+
body: JSON.stringify({ args }),
|
|
31917
|
+
signal: AbortSignal.timeout(deadlineMs)
|
|
31918
|
+
});
|
|
31919
|
+
} catch (err) {
|
|
31920
|
+
const name = err instanceof Error ? err.name : "";
|
|
31921
|
+
if (name === "TimeoutError" || name === "AbortError") {
|
|
31922
|
+
throw new Error(
|
|
31923
|
+
`gog-runner did not respond within ${deadlineMs}ms (${endpoint}) \u2014 the Fly backend may be cold or wedged`
|
|
31924
|
+
);
|
|
31925
|
+
}
|
|
31926
|
+
throw err;
|
|
31927
|
+
}
|
|
31928
|
+
if (!res.ok) {
|
|
31929
|
+
const body = await res.json().catch(() => null);
|
|
31930
|
+
const detail = body && typeof body.error === "string" ? body.stderr && body.stderr.trim() && body.stderr.trim() !== body.error.trim() ? `${body.error}
|
|
31931
|
+
${body.stderr}` : body.error : "";
|
|
31932
|
+
if (res.status === RUNNER_GOG_FAILED) {
|
|
31933
|
+
throw new Error(detail || "gog failed on the runner (no detail supplied)");
|
|
31934
|
+
}
|
|
31935
|
+
if (res.status === RUNNER_DRAINING || body?.retryable === true) {
|
|
31936
|
+
throw new Error(
|
|
31937
|
+
`gog-runner is restarting; retry this call.${detail ? ` ${detail}` : ""}`
|
|
31938
|
+
);
|
|
31939
|
+
}
|
|
31940
|
+
if (detail) {
|
|
31941
|
+
throw new Error(detail);
|
|
31942
|
+
}
|
|
31943
|
+
throw new Error(
|
|
31944
|
+
`gog-runner HTTP ${res.status}: the response did not come from the runner, so the request never reached gog. The backend Machine was most likely starting or shutting down \u2014 this is transient, retry the same call.`
|
|
31945
|
+
);
|
|
31946
|
+
}
|
|
31947
|
+
const { stdout } = await res.json();
|
|
31948
|
+
return stdout;
|
|
31949
|
+
};
|
|
31950
|
+
}
|
|
31951
|
+
|
|
31952
|
+
// ../gogcli-mcp/src/remote-runner.ts
|
|
31953
|
+
function useRemoteGogRunner(env = process.env) {
|
|
31954
|
+
const endpoint = readEnvVar("GOG_RUNNER_URL", { env });
|
|
31955
|
+
const key = readEnvVar("GOG_RUNNER_KEY", { env });
|
|
31956
|
+
if (!endpoint || !key) return false;
|
|
31957
|
+
runExecutor.enterWith({ executor: makeFlyExecutor(endpoint.replace(/\/+$/, ""), key) });
|
|
31958
|
+
return true;
|
|
31959
|
+
}
|
|
31879
31960
|
|
|
31880
31961
|
// src/tools/calendar-extra.ts
|
|
31881
31962
|
var meetAccess = external_exports.enum(["open", "trusted", "restricted"]);
|
|
@@ -32161,6 +32242,7 @@ function registerExtraCalendarTools(server) {
|
|
|
32161
32242
|
}
|
|
32162
32243
|
|
|
32163
32244
|
// src/index.ts
|
|
32245
|
+
useRemoteGogRunner();
|
|
32164
32246
|
await runMcp({
|
|
32165
32247
|
name: "gogcli-calendar",
|
|
32166
32248
|
version: VERSION,
|
package/manifest.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"manifest_version": "0.3",
|
|
4
4
|
"name": "gogcli-mcp-calendar",
|
|
5
5
|
"display_name": "gogcli (Calendar)",
|
|
6
|
-
"version": "2.
|
|
6
|
+
"version": "2.19.1",
|
|
7
7
|
"description": "Extended Google Calendar for Claude via gogcli — auth + Calendar events + Meet space management",
|
|
8
8
|
"author": {
|
|
9
9
|
"name": "Chris Hall",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "gogcli-mcp-calendar",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.19.1",
|
|
4
4
|
"mcpName": "io.github.chrischall/gogcli-mcp-calendar",
|
|
5
5
|
"description": "Extended Google Calendar + Meet MCP server via gogcli — auth + Calendar events + Meet space management",
|
|
6
6
|
"author": "Claude Code (AI) <https://www.anthropic.com/claude>",
|
package/src/index.ts
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { runMcp } from '@chrischall/mcp-utils';
|
|
3
|
-
import { VERSION, authToolsFor, registerCalendarTools } from '../../gogcli-mcp/src/lib.js';
|
|
3
|
+
import { VERSION, authToolsFor, registerCalendarTools, useRemoteGogRunner } from '../../gogcli-mcp/src/lib.js';
|
|
4
4
|
import { registerExtraCalendarTools } from './tools/calendar-extra.js';
|
|
5
5
|
|
|
6
|
+
// Execute `gog` on the Fly backend when the host points us at one; without
|
|
7
|
+
// it, nothing changes and we spawn the local binary as before.
|
|
8
|
+
useRemoteGogRunner();
|
|
9
|
+
|
|
6
10
|
await runMcp({
|
|
7
11
|
name: 'gogcli-calendar',
|
|
8
12
|
version: VERSION,
|