@hasna/recordings 0.3.8 → 0.3.10

package/dist/server/index.js

@@ -22,7 +22,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@hasna/recordings",
-    version: "0.3.8",
+    version: "0.3.10",
     type: "module",
     description: "Speech-to-text recording tool with MCP and CLI \u2014 records, transcribes, and optionally enhances text using AI",
     repository: {
@@ -106,7 +106,7 @@ var init_package = __esm(() => {
       "LICENSE"
     ],
     dependencies: {
-      "@hasna/contracts": "0.13.3",
+      "@hasna/contracts": "0.13.4",
       "@hasna/events": "0.1.11",
       "@modelcontextprotocol/sdk": "^1.12.1",
       chalk: "^5.4.1",
@@ -6791,6 +6791,11 @@ var init_feedback = __esm(() => {
 });
 
 // src/http/client.ts
+import { createClientTransport } from "@hasna/contracts/client";
+import {
+  createHasnaStorageClient,
+  resolveStorageClient
+} from "@hasna/contracts/client/storage";
 function envToken(name) {
   return name.toUpperCase().replace(/-/g, "_");
 }
@@ -6892,199 +6897,38 @@ function resolveTransport(name, env = process.env) {
   }
   return { transport: "http", requested, modeSource, baseUrl, apiKeyPresent: true, misconfigured: false, warning: null };
 }
-function appendQuery(path, query) {
-  if (!query)
-    return path;
-  const params = new URLSearchParams;
-  for (const [key, value] of Object.entries(query)) {
-    if (value === null || value === undefined)
-      continue;
-    if (Array.isArray(value))
-      for (const v of value)
-        params.append(key, String(v));
-    else
-      params.append(key, String(value));
-  }
-  const qs = params.toString();
-  return qs ? `${path}${path.includes("?") ? "&" : "?"}${qs}` : path;
-}
-function createHttpTransport(options) {
-  const fetchImpl = options.fetchImpl ?? ((input, init) => fetch(input, init));
-  const base = options.baseUrl.replace(/\/+$/, "");
-  const timeoutMs = options.timeoutMs ?? 30000;
-  const sleep = options.sleepImpl ?? defaultSleep;
-  async function once(method, rel, url, body, opts) {
-    const headers = {
-      "x-api-key": options.apiKey,
-      Authorization: `Bearer ${options.apiKey}`,
-      Accept: "application/json",
-      ...opts.headers ?? {}
-    };
-    if (opts.idempotencyKey)
-      headers["Idempotency-Key"] = opts.idempotencyKey;
-    const init = { method, headers };
-    if (body !== undefined) {
-      headers["Content-Type"] = "application/json";
-      init.body = JSON.stringify(body);
-    }
-    const controller = new AbortController;
-    const onAbort = () => controller.abort();
-    if (opts.signal) {
-      if (opts.signal.aborted)
-        controller.abort();
-      else
-        opts.signal.addEventListener("abort", onAbort, { once: true });
-    }
-    const timer = setTimeout(() => controller.abort(), opts.timeoutMs ?? timeoutMs);
-    init.signal = controller.signal;
-    let response;
-    try {
-      response = await fetchImpl(url, init);
-    } catch (error2) {
-      const err = error2 instanceof Error ? error2 : new Error(String(error2));
-      if (opts.signal?.aborted)
-        return { ok: false, retryable: false, error: err };
-      return { ok: false, retryable: true, error: err };
-    } finally {
-      clearTimeout(timer);
-      if (opts.signal)
-        opts.signal.removeEventListener("abort", onAbort);
-    }
-    const text = await response.text();
-    let parsed = undefined;
-    if (text.length > 0) {
-      try {
-        parsed = JSON.parse(text);
-      } catch {
-        parsed = text;
-      }
-    }
-    if (!response.ok) {
-      return { ok: false, retryable: RETRY_STATUSES.has(response.status), error: new HasnaHttpError(method, rel, response.status, parsed) };
-    }
-    return { ok: true, value: parsed };
-  }
-  async function request(method, path, body, opts = {}) {
-    const upper = method.toUpperCase();
-    const rel = appendQuery(path.startsWith("/") ? path : `/${path}`, opts.query);
-    const url = `${base}${rel}`;
-    const methodRetryable = IDEMPOTENT.has(upper) || Boolean(opts.idempotencyKey);
-    const maxRetries = opts.retries ?? 2;
-    const maxAttempts = methodRetryable ? maxRetries + 1 : 1;
-    let last = null;
-    for (let attempt = 1;attempt <= maxAttempts; attempt++) {
-      const result = await once(upper, rel, url, body, opts);
-      if (result.ok)
-        return result.value;
-      last = result;
-      const canRetry = methodRetryable && result.retryable && attempt < maxAttempts;
-      if (!canRetry)
-        break;
-      const backoff = Math.min(2000, 200 * 2 ** (attempt - 1));
-      const jitter = Math.floor(Math.random() * (backoff / 2 + 1));
-      await sleep(backoff + jitter);
-    }
-    if (last === null)
-      throw new Error(`Request to ${rel} completed without a result`);
-    throw last.error;
-  }
-  return {
-    baseUrl: base,
-    request,
-    get: (path, opts) => request("GET", path, undefined, opts),
-    post: (path, body, opts) => request("POST", path, body, opts),
-    patch: (path, body, opts) => request("PATCH", path, body, opts),
-    put: (path, body, opts) => request("PUT", path, body, opts),
-    del: (path, body, opts) => request("DELETE", path, body, opts)
-  };
-}
-function newIdempotencyKey() {
-  const g = globalThis;
-  if (g.crypto?.randomUUID)
-    return g.crypto.randomUUID();
-  return `idmp_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 12)}`;
-}
-function extractItems(raw, extraKeys = []) {
-  if (Array.isArray(raw))
-    return raw;
-  if (raw && typeof raw === "object") {
-    const obj = raw;
-    for (const key of [...extraKeys, "items", "data", "results", "rows", "records"]) {
-      if (Array.isArray(obj[key]))
-        return obj[key];
-    }
-  }
-  return [];
-}
-function createStorageClient(name, transport) {
-  const rp = (r) => `/${r.replace(/^\/+|\/+$/g, "")}`;
-  const ep = (r, id) => `${rp(r)}/${encodeURIComponent(String(id))}`;
-  return {
-    name,
-    baseUrl: transport.baseUrl,
-    transport,
-    async list(resource, query) {
-      const raw = await transport.get(rp(resource), { query });
-      return { items: extractItems(raw, [resource]), raw };
-    },
-    async get(resource, id) {
-      try {
-        return await transport.get(ep(resource, id));
-      } catch (error2) {
-        if (error2 instanceof HasnaHttpError && error2.status === 404)
-          return null;
-        throw error2;
-      }
-    },
-    async create(resource, body, idempotencyKey) {
-      return transport.post(rp(resource), body, { idempotencyKey: idempotencyKey ?? newIdempotencyKey() });
-    },
-    async update(resource, id, patch, method = "PATCH") {
-      const call = method === "PUT" ? transport.put : transport.patch;
-      return call(ep(resource, id), patch);
-    },
-    async delete(resource, id) {
-      try {
-        await transport.del(ep(resource, id));
-      } catch (error2) {
-        if (error2 instanceof HasnaHttpError && error2.status === 404)
-          return;
-        throw error2;
-      }
-    }
-  };
-}
-function resolveStorageClient(name, env = process.env, fetchImpl) {
+function resolveStoreClient(name, env = process.env) {
   const resolution = resolveTransport(name, env);
   if (resolution.misconfigured) {
+    const wired2 = createClientTransport(name, env);
+    if (wired2.transport === "http") {
+      return {
+        transport: "http",
+        client: createHasnaStorageClient(name, wired2.client),
+        resolution: {
+          transport: "http",
+          requested: "http",
+          modeSource: resolution.modeSource === "default" ? "auto:api-url+seam-credential" : resolution.modeSource,
+          baseUrl: wired2.resolution.baseUrl,
+          apiKeyPresent: true,
+          misconfigured: false,
+          warning: null
+        }
+      };
+    }
     throw new Error(resolution.warning ?? `Client for '${name}' is misconfigured for the /v1 API.`);
   }
   if (resolution.transport === "sqlite" || !resolution.baseUrl) {
     return { transport: "sqlite", client: null, resolution };
   }
-  const keys = envKeys(name);
-  const apiKey = firstEnv(env, keys.apiKeyKeys)?.value;
-  if (!apiKey)
+  const wired = createClientTransport(name, env);
+  if (wired.transport !== "http") {
     throw new Error(`Client for '${name}' resolved to the /v1 API without an API key.`);
-  const transport = createHttpTransport({ name, baseUrl: resolution.baseUrl, apiKey, ...fetchImpl ? { fetchImpl } : {} });
-  return { transport: "http", client: createStorageClient(name, transport), resolution };
+  }
+  return { transport: "http", client: createHasnaStorageClient(name, wired.client), resolution };
 }
-var HasnaHttpError, RETRY_STATUSES, IDEMPOTENT, defaultSleep = (ms) => new Promise((r) => setTimeout(r, ms));
+var RETRY_STATUSES, IDEMPOTENT;
 var init_client = __esm(() => {
-  HasnaHttpError = class HasnaHttpError extends Error {
-    status;
-    method;
-    path;
-    body;
-    constructor(method, path, status, body) {
-      super(`Hasna request failed: ${method} ${path} -> ${status}`);
-      this.name = "HasnaHttpError";
-      this.status = status;
-      this.method = method;
-      this.path = path;
-      this.body = body;
-    }
-  };
   RETRY_STATUSES = new Set([408, 425, 429, 500, 502, 503, 504]);
   IDEMPOTENT = new Set(["GET", "HEAD", "PUT", "DELETE", "OPTIONS"]);
 });
@@ -7116,6 +6960,22 @@ function unwrap(res, key) {
   }
   return res;
 }
+async function listResource(client, resource, query) {
+  const raw = await client.transport.get(`/${resource}`, query ? { query } : undefined);
+  return { items: extractEnvelopeItems(raw, resource), raw };
+}
+function extractEnvelopeItems(raw, resource) {
+  if (Array.isArray(raw))
+    return raw;
+  if (raw && typeof raw === "object") {
+    const obj = raw;
+    for (const key of [resource, "items", "data", "results", "rows", "records"]) {
+      if (Array.isArray(obj[key]))
+        return obj[key];
+    }
+  }
+  return [];
+}
 function apiStore(client) {
   return {
     mode: "http",
@@ -7123,7 +6983,7 @@ function apiStore(client) {
     async createRecording(input, idempotencyKey) {
       const keyCandidate = idempotencyKey === undefined && (input.id === undefined || input.id === null) ? randomUUID2() : idempotencyKey;
       const identity = recordingCreateIdentity(input, keyCandidate, { bindIdempotencyKeyToId: false });
-      const res = await client.create("recordings", identity.input, identity.idempotencyKey);
+      const res = await client.create("recordings", identity.input, { idempotencyKey: identity.idempotencyKey });
       return unwrap(res, "recording");
     },
     async getRecording(id) {
@@ -7131,7 +6991,7 @@ function apiStore(client) {
       return res ? unwrap(res, "recording") : null;
     },
     async listRecordings(filter) {
-      const { items } = await client.list("recordings", listQuery(filter));
+      const { items } = await listResource(client, "recordings", listQuery(filter));
       return items;
     },
     async countRecordings(filter) {
@@ -7142,7 +7002,7 @@ function apiStore(client) {
       const seenPageKeys = new Set;
       while (pageRequests < maxPageRequests) {
         pageRequests += 1;
-        const { items, raw } = await client.list("recordings", {
+        const { items, raw } = await listResource(client, "recordings", {
           ...listQuery(filter),
           limit: pageLimit,
           offset
@@ -7165,7 +7025,7 @@ function apiStore(client) {
       throw new Error(`Recordings API exceeded ${maxPageRequests} pages while counting legacy results`);
     },
     async searchRecordings(query, filter) {
-      const { items } = await client.list("recordings", listQuery({ ...filter ?? {}, search: query }));
+      const { items } = await listResource(client, "recordings", listQuery({ ...filter ?? {}, search: query }));
       return items;
     },
     async deleteRecording(id) {
@@ -7197,7 +7057,7 @@ function apiStore(client) {
       return res ? unwrap(res, "agent") : null;
     },
     async listAgents() {
-      const { items } = await client.list("agents");
+      const { items } = await listResource(client, "agents");
       return items;
     },
     async heartbeatAgent(idOrName) {
@@ -7237,7 +7097,7 @@ function apiStore(client) {
       return res ? unwrap(res, "project") : null;
     },
     async listProjects() {
-      const { items } = await client.list("projects");
+      const { items } = await listResource(client, "projects");
       return items;
     },
     async saveFeedback(input) {
@@ -7284,7 +7144,7 @@ async function countStoreRecordings(store, filter) {
 function getStore(env = process.env) {
   if (env === process.env && cached)
     return cached;
-  const resolved = resolveStorageClient(APP, env);
+  const resolved = resolveStoreClient(APP, env);
   const store = resolved.transport === "http" ? apiStore(resolved.client) : localStore;
   if (env === process.env)
     cached = store;