splitwise-mcp 3.5.0 → 3.5.1

package/.claude-plugin/marketplace.json

@@ -7,7 +7,7 @@
   },
   "metadata": {
     "description": "MCP server for Splitwise — natural-language expense and group management via the Splitwise API",
-    "version": "3.5.0"
+    "version": "3.5.1"
   },
   "plugins": [
     {
@@ -15,7 +15,7 @@
       "displayName": "Splitwise",
       "source": "./",
       "description": "MCP server for Splitwise — manage expenses, groups, and friends via natural language",
-      "version": "3.5.0",
+      "version": "3.5.1",
       "author": {
         "name": "Chris Hall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "splitwise-mcp",
   "displayName": "Splitwise",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "MCP server for Splitwise — natural-language expense and group management via the Splitwise API",
   "author": {
     "name": "Chris Hall",

package/dist/bundle.js

@@ -2604,21 +2604,21 @@ var require_schemas = __commonJS({
     function stripTabAndNewline2(value) {
       return value.replace(asciiTabOrNewline2, "");
     }
-    function urlHostnameOk2(url5, hostname3) {
+    function urlHostnameOk2(url4, hostname3) {
       hostname3.lastIndex = 0;
-      return hostname3.test(url5.hostname);
+      return hostname3.test(url4.hostname);
     }
-    function urlProtocolOk2(url5, protocol) {
+    function urlProtocolOk2(url4, protocol) {
       protocol.lastIndex = 0;
-      return protocol.test(url5.protocol.endsWith(":") ? url5.protocol.slice(0, -1) : url5.protocol);
+      return protocol.test(url4.protocol.endsWith(":") ? url4.protocol.slice(0, -1) : url4.protocol);
     }
     exports.$ZodURL = core.$constructor("$ZodURL", (inst, def) => {
       exports.$ZodStringFormat.init(inst, def);
       inst._zod.check = (payload) => {
         try {
           const trimmed = payload.value.trim();
-          const url5 = validateURL2(trimmed, def);
-          if (url5 === exports.URL_BAD_FORMAT) {
+          const url4 = validateURL2(trimmed, def);
+          if (url4 === exports.URL_BAD_FORMAT) {
             payload.issues.push({
               code: "invalid_format",
               format: "url",
@@ -2629,7 +2629,7 @@ var require_schemas = __commonJS({
             });
             return;
           }
-          if (url5 === exports.URL_UNPARSEABLE) {
+          if (url4 === exports.URL_UNPARSEABLE) {
             payload.issues.push({
               code: "invalid_format",
               format: "url",
@@ -2639,11 +2639,11 @@ var require_schemas = __commonJS({
             });
             return;
           }
-          if (url5 === true) {
+          if (url4 === true) {
             payload.value = stripTabAndNewline2(trimmed);
             return;
           }
-          if (def.hostname && !urlHostnameOk2(url5, def.hostname)) {
+          if (def.hostname && !urlHostnameOk2(url4, def.hostname)) {
             payload.issues.push({
               code: "invalid_format",
               format: "url",
@@ -2654,7 +2654,7 @@ var require_schemas = __commonJS({
               continue: !def.abort
             });
           }
-          if (def.protocol && !urlProtocolOk2(url5, def.protocol)) {
+          if (def.protocol && !urlProtocolOk2(url4, def.protocol)) {
             payload.issues.push({
               code: "invalid_format",
               format: "url",
@@ -2665,7 +2665,7 @@ var require_schemas = __commonJS({
               continue: !def.abort
             });
           }
-          payload.value = def.normalize ? url5.href : stripTabAndNewline2(trimmed);
+          payload.value = def.normalize ? url4.href : stripTabAndNewline2(trimmed);
           return;
         } catch (_2) {
           payload.issues.push({
@@ -20109,7 +20109,7 @@ var require_schemas2 = __commonJS({
     exports.uuidv4 = uuidv42;
     exports.uuidv6 = uuidv62;
     exports.uuidv7 = uuidv72;
-    exports.url = url5;
+    exports.url = url4;
     exports.httpUrl = httpUrl2;
     exports.emoji = emoji3;
     exports.nanoid = nanoid3;
@@ -20590,7 +20590,7 @@ var require_schemas2 = __commonJS({
       core.$ZodURL.init(inst, def);
       exports.ZodStringFormat.init(inst, def);
     });
-    function url5(params) {
+    function url4(params) {
       return core._url(exports.ZodURL, params);
     }
     function httpUrl2(params) {
@@ -64155,8 +64155,8 @@ var SafeUrlSchema = z.url().superRefine((val, ctx) => {
     });
     return z.NEVER;
   }
-}).refine((url5) => {
-  const u2 = new URL(url5);
+}).refine((url4) => {
+  const u2 = new URL(url4);
   return u2.protocol !== "javascript:" && u2.protocol !== "data:" && u2.protocol !== "vbscript:";
 }, { message: "URL cannot use javascript:, data:, or vbscript: scheme" });
 var OAuthProtectedResourceMetadataSchema = z.looseObject({
@@ -81129,21 +81129,21 @@ var asciiTabOrNewline = /[\t\n\r]/g;
 function stripTabAndNewline(value) {
   return value.replace(asciiTabOrNewline, "");
 }
-function urlHostnameOk(url5, hostname3) {
+function urlHostnameOk(url4, hostname3) {
   hostname3.lastIndex = 0;
-  return hostname3.test(url5.hostname);
+  return hostname3.test(url4.hostname);
 }
-function urlProtocolOk(url5, protocol) {
+function urlProtocolOk(url4, protocol) {
   protocol.lastIndex = 0;
-  return protocol.test(url5.protocol.endsWith(":") ? url5.protocol.slice(0, -1) : url5.protocol);
+  return protocol.test(url4.protocol.endsWith(":") ? url4.protocol.slice(0, -1) : url4.protocol);
 }
 var $ZodURL = /* @__PURE__ */ $constructor("$ZodURL", (inst, def) => {
   $ZodStringFormat.init(inst, def);
   inst._zod.check = (payload) => {
     try {
       const trimmed = payload.value.trim();
-      const url5 = validateURL(trimmed, def);
-      if (url5 === URL_BAD_FORMAT) {
+      const url4 = validateURL(trimmed, def);
+      if (url4 === URL_BAD_FORMAT) {
         payload.issues.push({
           code: "invalid_format",
           format: "url",
@@ -81154,7 +81154,7 @@ var $ZodURL = /* @__PURE__ */ $constructor("$ZodURL", (inst, def) => {
         });
         return;
       }
-      if (url5 === URL_UNPARSEABLE) {
+      if (url4 === URL_UNPARSEABLE) {
         payload.issues.push({
           code: "invalid_format",
           format: "url",
@@ -81164,11 +81164,11 @@ var $ZodURL = /* @__PURE__ */ $constructor("$ZodURL", (inst, def) => {
         });
         return;
       }
-      if (url5 === true) {
+      if (url4 === true) {
         payload.value = stripTabAndNewline(trimmed);
         return;
       }
-      if (def.hostname && !urlHostnameOk(url5, def.hostname)) {
+      if (def.hostname && !urlHostnameOk(url4, def.hostname)) {
         payload.issues.push({
           code: "invalid_format",
           format: "url",
@@ -81179,7 +81179,7 @@ var $ZodURL = /* @__PURE__ */ $constructor("$ZodURL", (inst, def) => {
           continue: !def.abort
         });
       }
-      if (def.protocol && !urlProtocolOk(url5, def.protocol)) {
+      if (def.protocol && !urlProtocolOk(url4, def.protocol)) {
         payload.issues.push({
           code: "invalid_format",
           format: "url",
@@ -81190,7 +81190,7 @@ var $ZodURL = /* @__PURE__ */ $constructor("$ZodURL", (inst, def) => {
           continue: !def.abort
         });
       }
-      payload.value = def.normalize ? url5.href : stripTabAndNewline(trimmed);
+      payload.value = def.normalize ? url4.href : stripTabAndNewline(trimmed);
       return;
     } catch (_2) {
       payload.issues.push({
@@ -100161,19 +100161,19 @@ function createApiClient(opts) {
         `Refusing request to ${service}: path ${JSON.stringify(path.split(/[?#]/, 1)[0])} contains a ${hazard}, which URL normalisation would rewrite. Build paths with apiPath\`...\` so each value is one encoded segment.`
       );
     }
-    const url5 = `${base}${joinQuery(path, query)}`;
+    const url4 = `${base}${joinQuery(path, query)}`;
     if (baseOrigin === void 0)
-      return url5;
+      return url4;
     let parsed;
     try {
-      parsed = new URL(url5);
+      parsed = new URL(url4);
     } catch {
       throw new Error(`Refusing request to ${service}: path ${JSON.stringify(path)} does not form a valid URL.`);
     }
     if (parsed.origin !== baseOrigin || parsed.username !== baseParts?.username || parsed.password !== baseParts?.password) {
       throw new Error(`Refusing request to ${service}: path ${JSON.stringify(path)} resolves outside the base origin ${baseOrigin}. Paths must be relative to baseUrl (start them with "/").`);
     }
-    return url5;
+    return url4;
   }
   function resolveLocation(location, from) {
     try {
@@ -100197,7 +100197,7 @@ function createApiClient(opts) {
   async function send(method, path, opt, dispatch) {
     const { body: reqBody, contentType } = encodeBody(opt);
     const query = opt.query ? buildQueryString(opt.query) : "";
-    const url5 = resolveUrl(path, query);
+    const url4 = resolveUrl(path, query);
     const bodyInit = reqBody !== void 0 ? { body: reqBody } : {};
     const fetchHop = (hopUrl, hopMethod, withBody, token, signal, credentialed = true) => {
       if (!signal?.aborted)
@@ -100222,8 +100222,8 @@ function createApiClient(opts) {
     };
     const fetchWith = async (token, signal) => {
       if (!manualRedirects)
-        return fetchHop(url5, method, true, token, signal);
-      let hopUrl = url5;
+        return fetchHop(url4, method, true, token, signal);
+      let hopUrl = url4;
       let hopMethod = method;
       let withBody = true;
       let credentialed = true;
@@ -100502,10 +100502,10 @@ function isSplitwiseHost(hostname3) {
   const host = hostname3.toLowerCase();
   return host === SPLITWISE_DOMAIN || host.endsWith(`.${SPLITWISE_DOMAIN}`);
 }
-function parseAssetUrl(url5) {
+function parseAssetUrl(url4) {
   let parsed;
   try {
-    parsed = new URL(url5);
+    parsed = new URL(url4);
   } catch {
     throw new Error("Splitwise returned an asset URL that could not be parsed");
   }
@@ -100640,8 +100640,8 @@ var SplitwiseClient = class {
    * `maxBytes` overrides the client-wide body cap for this download; over it,
    * the read is refused (`ResponseTooLargeError`, `kind: 'too_large'`).
    */
-  async fetchAsset(url5, opts = {}) {
-    const target = parseAssetUrl(url5);
+  async fetchAsset(url4, opts = {}) {
+    const target = parseAssetUrl(url4);
     const authenticated = isSplitwiseHost(target.hostname);
     const cacheKey = `${target.origin}|${authenticated ? "auth" : "anon"}`;
     let api = this.assetClients.get(cacheKey);
@@ -101376,40 +101376,134 @@ function swUntrustedEnvelope(payload) {
 // src/tools/_receipt.ts
 import { createHash as createHash4 } from "crypto";
 
-// src/tools/_blob.ts
-import { createHmac as createHmac3 } from "crypto";
-function blobConfig() {
-  const baseUrl = readEnvVar("MCP_BLOB_BASE_URL");
-  const signingKey = readEnvVar("MCP_BLOB_SIGNING_KEY");
-  if (!baseUrl || !signingKey) return void 0;
+// node_modules/@chrischall/mcp-utils/dist/export/blob.js
+import { createHmac as createHmac3 } from "node:crypto";
+var BLOB_DEFAULT_TTL_MS = 60 * 60 * 1e3;
+var BLOB_MAX_TTL_MS = 24 * 60 * 60 * 1e3;
+var MAX_KEY_LENGTH = 1024;
+var SAFE_SEGMENT = /^[A-Za-z0-9._~-]+$/;
+function configError(reason) {
+  return new McpToolError(`MCP_BLOB_BASE_URL is not usable: ${reason}.`, {
+    hint: "It should look like https://<host>/b/<registrationId> \u2014 check the deployment's environment.",
+    kind: "unknown"
+  });
+}
+function parseBase(baseUrl) {
   let parsed;
   try {
     parsed = new URL(baseUrl);
   } catch {
-    throw new Error(`MCP_BLOB_BASE_URL is not a valid URL \u2014 it should look like https://<host>/b/<registrationId>`);
-  }
+    throw configError("not a valid URL");
+  }
+  if (parsed.protocol !== "https:" && parsed.protocol !== "http:")
+    throw configError("scheme must be http(s)");
+  if (parsed.username || parsed.password)
+    throw configError("must not contain credentials");
+  if (parsed.search || parsed.hash)
+    throw configError("must not contain a query or fragment");
   const path = parsed.pathname.replace(/^\/+|\/+$/g, "");
   const prefix = path.startsWith("b/") ? path.slice(2) : path;
-  return { base: baseUrl.replace(/\/+$/, ""), prefix, signingKey };
-}
-var sign2 = (cfg, payload) => createHmac3("sha256", cfg.signingKey).update(payload).digest("base64url");
-function url4(cfg, key, exp, sig) {
-  return `${cfg.base}/${key}?exp=${exp}&sig=${encodeURIComponent(sig)}`;
-}
-function signedPutUrl(cfg, key, contentType, exp) {
-  return url4(cfg, key, exp, sign2(cfg, `put\0${cfg.prefix}/${key}\0${contentType}\0${exp}`));
-}
-function signedGetUrl(cfg, key, exp) {
-  return url4(cfg, key, exp, sign2(cfg, `${cfg.prefix}/${key}
-${exp}`));
+  if (!prefix || prefix === "b")
+    throw configError("has no registration path");
+  return { base: `${parsed.origin}/${path}`, prefix };
+}
+function badInput(message) {
+  return new McpToolError(message, { kind: "unknown" });
+}
+function encodeKey(key) {
+  if (typeof key !== "string" || key.length === 0)
+    throw badInput("Blob key must be a non-empty string.");
+  if (key.length > MAX_KEY_LENGTH)
+    throw badInput(`Blob key is longer than ${MAX_KEY_LENGTH} characters.`);
+  const segments = key.split("/");
+  for (const seg of segments) {
+    if (seg === "" || seg === "." || seg === ".." || !SAFE_SEGMENT.test(seg)) {
+      throw badInput('Blob key must be relative, slash-separated segments of [A-Za-z0-9._~-] with no empty, "." or ".." segment.');
+    }
+  }
+  return segments.map(encodeURIComponent).join("/");
+}
+function checkContentType(contentType) {
+  if (typeof contentType !== "string" || contentType.length === 0 || /[\x00-\x1f\x7f]/.test(contentType)) {
+    throw badInput("Blob content type must be a non-empty string without control characters.");
+  }
+}
+function expiry(opts) {
+  const ttl = opts?.ttlMs ?? BLOB_DEFAULT_TTL_MS;
+  if (!Number.isFinite(ttl) || ttl <= 0 || ttl > BLOB_MAX_TTL_MS) {
+    throw badInput(`Blob link TTL must be between 1 ms and ${BLOB_MAX_TTL_MS} ms (24h); the gateway refuses longer.`);
+  }
+  return Math.floor((opts?.now ?? Date.now()) + ttl);
+}
+function toArrayBuffer(view) {
+  return view.slice().buffer;
+}
+function createBlobStore(opts) {
+  const { base, prefix } = parseBase(opts.baseUrl);
+  const signingKey = opts.signingKey;
+  const sign2 = (payload) => createHmac3("sha256", signingKey).update(payload).digest("base64url");
+  const link = (encodedKey, exp, sig) => `${base}/${encodedKey}?exp=${exp}&sig=${encodeURIComponent(sig)}`;
+  const signGetUrl = (key, o2) => {
+    const encoded = encodeKey(key);
+    const exp = expiry(o2);
+    return { url: link(encoded, exp, sign2(`${prefix}/${key}
+${exp}`)), expiresAtMs: exp };
+  };
+  const signPutUrl = (key, contentType, o2) => {
+    const encoded = encodeKey(key);
+    checkContentType(contentType);
+    const exp = expiry(o2);
+    return { url: link(encoded, exp, sign2(`put\0${prefix}/${key}\0${contentType}\0${exp}`)), expiresAtMs: exp };
+  };
+  const put = async (key, body, contentType, o2 = {}) => {
+    const { url: url4 } = signPutUrl(key, contentType, o2);
+    const bytes = typeof body === "string" ? new TextEncoder().encode(body) : body;
+    const doFetch = o2.fetchImpl ?? fetch;
+    let res;
+    try {
+      res = await doFetch(url4, {
+        method: "PUT",
+        headers: { "content-type": contentType },
+        body: toArrayBuffer(bytes),
+        ...o2.signal ? { signal: o2.signal } : {}
+      });
+    } catch (cause) {
+      if (o2.signal?.aborted)
+        throw cause;
+      throw new McpToolError(`Blob store upload of ${key} did not complete (network error).`, {
+        kind: "transport"
+      });
+    }
+    if (!res.ok) {
+      throw new McpToolError(`Blob store upload of ${key} failed (HTTP ${res.status}).`, {
+        kind: "http",
+        status: res.status
+      });
+    }
+    return { key, bytes: bytes.byteLength };
+  };
+  return { baseUrl: base, prefix, signGetUrl, signPutUrl, put };
 }
-var UPLOAD_ID_PATTERN = /^up\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\/[A-Za-z0-9_-][A-Za-z0-9._-]{0,99}$/;
-function safeKeyName(filename) {
-  const base = filename.split(/[\\/]/).pop() ?? "";
-  const cleaned = base.replace(/[^A-Za-z0-9._-]+/g, "_").replace(/^[._]+/, "").slice(0, 100);
-  return cleaned || "receipt";
+function blobStoreFromEnv(env = process.env) {
+  const baseUrl = readEnvVar("MCP_BLOB_BASE_URL", { env });
+  const signingKey = readEnvVar("MCP_BLOB_SIGNING_KEY", { env });
+  if (!baseUrl || !signingKey)
+    return void 0;
+  return createBlobStore({ baseUrl, signingKey });
 }
 
+// node_modules/@chrischall/mcp-utils/dist/export/zip.js
+var CRC_TABLE = (() => {
+  const table = new Uint32Array(256);
+  for (let n2 = 0; n2 < 256; n2++) {
+    let c2 = n2;
+    for (let k2 = 0; k2 < 8; k2++)
+      c2 = c2 & 1 ? 3988292384 ^ c2 >>> 1 : c2 >>> 1;
+    table[n2] = c2 >>> 0;
+  }
+  return table;
+})();
+
 // src/tools/_receipt.ts
 var MAX_RECEIPT_BYTES = 10 * 1024 * 1024;
 var LIMIT_LABEL = "10 MiB";
@@ -101485,17 +101579,23 @@ async function readSandboxed(requested) {
     await handle.close();
   }
 }
+var UPLOAD_ID_PATTERN = /^up\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\/[A-Za-z0-9_-][A-Za-z0-9._-]{0,99}$/;
+function safeKeyName(filename) {
+  const base = filename.split(/[\\/]/).pop() ?? "";
+  const cleaned = base.replace(/[^A-Za-z0-9._-]+/g, "_").replace(/^[._]+/, "").slice(0, 100);
+  return cleaned || "receipt";
+}
 var UPLOAD_READ_TTL_MS = 5 * 60 * 1e3;
 async function readUpload(uploadId, client2) {
   if (!UPLOAD_ID_PATTERN.test(uploadId)) {
     throw new Error("receipt.upload_id is not one sw_get_upload_url issued (expected up/<uuid>/<filename>)");
   }
-  const cfg = blobConfig();
-  if (!cfg || !client2) {
+  const store = blobStoreFromEnv();
+  if (!store || !client2) {
     throw new Error("receipt.upload_id only works on the hosted server; pass receipt.path or receipt.base64 here.");
   }
   try {
-    const asset = await client2.fetchAsset(signedGetUrl(cfg, uploadId, Date.now() + UPLOAD_READ_TTL_MS), {
+    const asset = await client2.fetchAsset(store.signGetUrl(uploadId, { ttlMs: UPLOAD_READ_TTL_MS }).url, {
       maxBytes: MAX_RECEIPT_BYTES
     });
     return Uint8Array.from(asset.bytes);
@@ -102319,12 +102419,12 @@ function registerReceiptTools(server, client2) {
       const fallback = wanted === "original" ? "large" : "original";
       const expense = await client2.request("GET", `/get_expense/${id}`);
       const receipt = expense?.expense?.receipt;
-      const url5 = receipt?.[wanted] || receipt?.[fallback];
-      if (!url5) {
+      const url4 = receipt?.[wanted] || receipt?.[fallback];
+      if (!url4) {
         throw new Error(`Splitwise expense ${id} has no receipt attached.`);
       }
       const served = receipt?.[wanted] ? wanted : fallback;
-      const asset = await client2.fetchAsset(url5, { maxBytes: MAX_RECEIPT_BYTES2 });
+      const asset = await client2.fetchAsset(url4, { maxBytes: MAX_RECEIPT_BYTES2 });
       if (asset.bytes.length === 0) {
         throw new Error(`Splitwise returned an empty receipt body for expense ${id}.`);
       }
@@ -102345,7 +102445,7 @@ function registerReceiptTools(server, client2) {
             baseName: `splitwise-receipt-${id}`,
             base64: base643,
             // The MIME type, else the receipt URL's own extension, else `bin`.
-            extension: extensionForMime(mimeType, { url: url5 }),
+            extension: extensionForMime(mimeType, { url: url4 }),
             mode: RECEIPT_FILE_MODE
           });
         } catch (err) {
@@ -102411,7 +102511,7 @@ function registerReceiptTools(server, client2) {
         bytes: asset.bytes.length,
         content_type: mimeType ?? "unknown",
         // The receipt URL itself is a signed capability, so report only its host.
-        source_host: new URL(url5).host,
+        source_host: new URL(url4).host,
         inline: inlined,
         ...inline === true && oversized ? {
           // The write outcome is already known, so don't advise `write:true`
@@ -102448,16 +102548,15 @@ function registerUploadTools(server, _client) {
       })
     },
     async ({ filename, content_type }) => {
-      const cfg = blobConfig();
-      if (!cfg) {
+      const store = blobStoreFromEnv();
+      if (!store) {
         throw new Error(
           "sw_get_upload_url only works on the hosted server (no blob store is configured here). Pass the file as receipt.path (a file inside SPLITWISE_INPUT_DIR) or receipt.base64 instead."
         );
       }
       const contentType = canonicalReceiptMime(content_type);
       const key = `up/${randomUUID()}/${safeKeyName(filename)}`;
-      const exp = Date.now() + UPLOAD_URL_TTL_MS;
-      const uploadUrl = signedPutUrl(cfg, key, contentType, exp);
+      const { url: uploadUrl, expiresAtMs: exp } = store.signPutUrl(key, contentType, { ttlMs: UPLOAD_URL_TTL_MS });
       return minifiedResult({
         upload_id: key,
         upload_url: uploadUrl,
@@ -102586,7 +102685,7 @@ function registerUtilityTools(server, client2) {
 // src/index.ts
 await runMcp({
   name: "splitwise-mcp",
-  version: "3.5.0",
+  version: "3.5.1",
   // x-release-please-version
   deps: client,
   banner: "[splitwise-mcp] This project was developed and is maintained by AI (Claude Sonnet 4.6). Use at your own discretion.",

package/dist/index.js

@@ -21,7 +21,7 @@ import { registerUtilityTools } from './tools/utilities.js';
 // client into the same registrars instead of this singleton.
 await runMcp({
     name: 'splitwise-mcp',
-    version: '3.5.0', // x-release-please-version
+    version: '3.5.1', // x-release-please-version
     deps: client,
     banner: '[splitwise-mcp] This project was developed and is maintained by AI (Claude Sonnet 4.6). Use at your own discretion.',
     tools: [

package/dist/tools/_receipt.js

@@ -1,6 +1,6 @@
 import { createHash } from 'crypto';
 import { ApiError, readEnvVar } from '@chrischall/mcp-utils';
-import { blobConfig, signedGetUrl, UPLOAD_ID_PATTERN } from './_blob.js';
+import { blobStoreFromEnv } from '@chrischall/mcp-utils/export';
 import { z } from 'zod';
 /**
  * Splitwise does not document an upload cap, so this is a conservative 10 MiB:
@@ -112,6 +112,18 @@ async function readSandboxed(requested) {
         await handle.close();
     }
 }
+/**
+ * The only keys `receipt.upload_id` may name: `up/<uuid>/<safe name>`, exactly
+ * what `sw_get_upload_url` mints. Anything else in this registration's space
+ * is not the caller's to read through a receipt.
+ */
+export const UPLOAD_ID_PATTERN = /^up\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\/[A-Za-z0-9_-][A-Za-z0-9._-]{0,99}$/;
+/** A filename made safe for a blob key segment: no separators, no dot-dot, no surprises. */
+export function safeKeyName(filename) {
+    const base = filename.split(/[\\/]/).pop() ?? '';
+    const cleaned = base.replace(/[^A-Za-z0-9._-]+/g, '_').replace(/^[._]+/, '').slice(0, 100);
+    return cleaned || 'receipt';
+}
 /** How long the server's own read link for an upload lives — it is used at once. */
 const UPLOAD_READ_TTL_MS = 5 * 60 * 1000;
 /**
@@ -122,12 +134,12 @@ async function readUpload(uploadId, client) {
     if (!UPLOAD_ID_PATTERN.test(uploadId)) {
         throw new Error('receipt.upload_id is not one sw_get_upload_url issued (expected up/<uuid>/<filename>)');
     }
-    const cfg = blobConfig();
-    if (!cfg || !client) {
+    const store = blobStoreFromEnv();
+    if (!store || !client) {
         throw new Error('receipt.upload_id only works on the hosted server; pass receipt.path or receipt.base64 here.');
     }
     try {
-        const asset = await client.fetchAsset(signedGetUrl(cfg, uploadId, Date.now() + UPLOAD_READ_TTL_MS), {
+        const asset = await client.fetchAsset(store.signGetUrl(uploadId, { ttlMs: UPLOAD_READ_TTL_MS }).url, {
             maxBytes: MAX_RECEIPT_BYTES,
         });
         return Uint8Array.from(asset.bytes);

package/dist/tools/uploads.js

@@ -1,8 +1,8 @@
 import { randomUUID } from 'crypto';
 import { z } from 'zod';
 import { minifiedResult } from '@chrischall/mcp-utils';
-import { blobConfig, safeKeyName, signedPutUrl } from './_blob.js';
-import { canonicalReceiptMime, MAX_RECEIPT_BYTES } from './_receipt.js';
+import { blobStoreFromEnv } from '@chrischall/mcp-utils/export';
+import { canonicalReceiptMime, MAX_RECEIPT_BYTES, safeKeyName } from './_receipt.js';
 /** Long enough to run a curl in the same turn, short enough that a leaked link is soon dead. */
 export const UPLOAD_URL_TTL_MS = 10 * 60 * 1000;
 /**
@@ -24,14 +24,13 @@ export function registerUploadTools(server, _client) {
                 .describe('The file\'s type: image/png, image/jpeg, image/gif or application/pdf. The upload must send exactly this Content-Type.'),
         }),
     }, async ({ filename, content_type }) => {
-        const cfg = blobConfig();
-        if (!cfg) {
+        const store = blobStoreFromEnv();
+        if (!store) {
             throw new Error('sw_get_upload_url only works on the hosted server (no blob store is configured here). Pass the file as receipt.path (a file inside SPLITWISE_INPUT_DIR) or receipt.base64 instead.');
         }
         const contentType = canonicalReceiptMime(content_type);
         const key = `up/${randomUUID()}/${safeKeyName(filename)}`;
-        const exp = Date.now() + UPLOAD_URL_TTL_MS;
-        const uploadUrl = signedPutUrl(cfg, key, contentType, exp);
+        const { url: uploadUrl, expiresAtMs: exp } = store.signPutUrl(key, contentType, { ttlMs: UPLOAD_URL_TTL_MS });
         return minifiedResult({
             upload_id: key,
             upload_url: uploadUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "splitwise-mcp",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "mcpName": "io.github.chrischall/splitwise-mcp",
   "description": "Splitwise MCP server for Claude — developed and maintained by AI (Claude Code)",
   "author": "Claude Code (AI) <https://www.anthropic.com/claude>",
@@ -45,7 +45,7 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@chrischall/mcp-utils": "^3.2.0",
+    "@chrischall/mcp-utils": "^3.3.0",
     "@modelcontextprotocol/server": "^2.3.0",
     "dotenv": "^18.0.2",
     "unpdf": "^1.8.1",

package/server.json

@@ -6,12 +6,12 @@
     "url": "https://github.com/chrischall/splitwise-mcp",
     "source": "github"
   },
-  "version": "3.5.0",
+  "version": "3.5.1",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "splitwise-mcp",
-      "version": "3.5.0",
+      "version": "3.5.1",
       "transport": {
         "type": "stdio"
       },

package/dist/tools/_blob.js

@@ -1,40 +0,0 @@
-import { createHmac } from 'crypto';
-import { readEnvVar } from '@chrischall/mcp-utils';
-export function blobConfig() {
-    const baseUrl = readEnvVar('MCP_BLOB_BASE_URL');
-    const signingKey = readEnvVar('MCP_BLOB_SIGNING_KEY');
-    if (!baseUrl || !signingKey)
-        return undefined;
-    let parsed;
-    try {
-        parsed = new URL(baseUrl);
-    }
-    catch {
-        throw new Error(`MCP_BLOB_BASE_URL is not a valid URL — it should look like https://<host>/b/<registrationId>`);
-    }
-    const path = parsed.pathname.replace(/^\/+|\/+$/g, '');
-    const prefix = path.startsWith('b/') ? path.slice(2) : path;
-    return { base: baseUrl.replace(/\/+$/, ''), prefix, signingKey };
-}
-const sign = (cfg, payload) => createHmac('sha256', cfg.signingKey).update(payload).digest('base64url');
-function url(cfg, key, exp, sig) {
-    return `${cfg.base}/${key}?exp=${exp}&sig=${encodeURIComponent(sig)}`;
-}
-export function signedPutUrl(cfg, key, contentType, exp) {
-    return url(cfg, key, exp, sign(cfg, `put\0${cfg.prefix}/${key}\0${contentType}\0${exp}`));
-}
-export function signedGetUrl(cfg, key, exp) {
-    return url(cfg, key, exp, sign(cfg, `${cfg.prefix}/${key}\n${exp}`));
-}
-/**
- * The only keys `receipt.upload_id` may name: `up/<uuid>/<safe name>`, exactly
- * what `sw_get_upload_url` mints. Anything else in this registration's space
- * is not the caller's to read through a receipt.
- */
-export const UPLOAD_ID_PATTERN = /^up\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\/[A-Za-z0-9_-][A-Za-z0-9._-]{0,99}$/;
-/** A filename made safe for a key segment: no separators, no dot-dot, no surprises. */
-export function safeKeyName(filename) {
-    const base = filename.split(/[\\/]/).pop() ?? '';
-    const cleaned = base.replace(/[^A-Za-z0-9._-]+/g, '_').replace(/^[._]+/, '').slice(0, 100);
-    return cleaned || 'receipt';
-}