@aomi-labs/client 0.1.10 → 0.1.12

package/dist/cli.js

@@ -729,6 +729,22 @@ function createSseSubscriber({
 // src/client.ts
 var SESSION_ID_HEADER = "X-Session-Id";
 var API_KEY_HEADER = "X-API-Key";
+function joinApiPath(baseUrl, path) {
+  const normalizedBase = baseUrl === "/" ? "" : baseUrl.replace(/\/+$/, "");
+  const normalizedPath = path.startsWith("/") ? path : `/${path}`;
+  return `${normalizedBase}${normalizedPath}` || normalizedPath;
+}
+function buildApiUrl(baseUrl, path, query) {
+  const url = joinApiPath(baseUrl, path);
+  if (!query) return url;
+  const params = new URLSearchParams();
+  for (const [key, value] of Object.entries(query)) {
+    if (value === void 0) continue;
+    params.set(key, value);
+  }
+  const queryString = params.toString();
+  return queryString ? `${url}?${queryString}` : url;
+}
 function toQueryString(payload) {
   const params = new URLSearchParams();
   for (const [key, value] of Object.entries(payload)) {
@@ -777,11 +793,10 @@ var AomiClient = class {
    * Fetch current session state (messages, processing status, title).
    */
   async fetchState(sessionId, userState) {
-    const url = new URL("/api/state", this.baseUrl);
-    if (userState) {
-      url.searchParams.set("user_state", JSON.stringify(userState));
-    }
-    const response = await fetch(url.toString(), {
+    const url = buildApiUrl(this.baseUrl, "/api/state", {
+      user_state: userState ? JSON.stringify(userState) : void 0
+    });
+    const response = await fetch(url, {
       headers: withSessionHeader(sessionId)
     });
     if (!response.ok) {
@@ -851,7 +866,9 @@ var AomiClient = class {
    * List all threads for a wallet address.
    */
   async listThreads(publicKey) {
-    const url = `${this.baseUrl}/api/sessions?public_key=${encodeURIComponent(publicKey)}`;
+    const url = buildApiUrl(this.baseUrl, "/api/sessions", {
+      public_key: publicKey
+    });
     const response = await fetch(url);
     if (!response.ok) {
       throw new Error(`Failed to fetch threads: HTTP ${response.status}`);
@@ -862,7 +879,10 @@ var AomiClient = class {
    * Get a single thread by ID.
    */
   async getThread(sessionId) {
-    const url = `${this.baseUrl}/api/sessions/${encodeURIComponent(sessionId)}`;
+    const url = buildApiUrl(
+      this.baseUrl,
+      `/api/sessions/${encodeURIComponent(sessionId)}`
+    );
     const response = await fetch(url, {
       headers: withSessionHeader(sessionId)
     });
@@ -877,7 +897,7 @@ var AomiClient = class {
   async createThread(threadId, publicKey) {
     const body = {};
     if (publicKey) body.public_key = publicKey;
-    const url = `${this.baseUrl}/api/sessions`;
+    const url = buildApiUrl(this.baseUrl, "/api/sessions");
     const response = await fetch(url, {
       method: "POST",
       headers: withSessionHeader(threadId, {
@@ -894,7 +914,10 @@ var AomiClient = class {
    * Delete a thread by ID.
    */
   async deleteThread(sessionId) {
-    const url = `${this.baseUrl}/api/sessions/${encodeURIComponent(sessionId)}`;
+    const url = buildApiUrl(
+      this.baseUrl,
+      `/api/sessions/${encodeURIComponent(sessionId)}`
+    );
     const response = await fetch(url, {
       method: "DELETE",
       headers: withSessionHeader(sessionId)
@@ -907,7 +930,10 @@ var AomiClient = class {
    * Rename a thread.
    */
   async renameThread(sessionId, newTitle) {
-    const url = `${this.baseUrl}/api/sessions/${encodeURIComponent(sessionId)}`;
+    const url = buildApiUrl(
+      this.baseUrl,
+      `/api/sessions/${encodeURIComponent(sessionId)}`
+    );
     const response = await fetch(url, {
       method: "PATCH",
       headers: withSessionHeader(sessionId, {
@@ -923,7 +949,10 @@ var AomiClient = class {
    * Archive a thread.
    */
   async archiveThread(sessionId) {
-    const url = `${this.baseUrl}/api/sessions/${encodeURIComponent(sessionId)}/archive`;
+    const url = buildApiUrl(
+      this.baseUrl,
+      `/api/sessions/${encodeURIComponent(sessionId)}/archive`
+    );
     const response = await fetch(url, {
       method: "POST",
       headers: withSessionHeader(sessionId)
@@ -936,7 +965,10 @@ var AomiClient = class {
    * Unarchive a thread.
    */
   async unarchiveThread(sessionId) {
-    const url = `${this.baseUrl}/api/sessions/${encodeURIComponent(sessionId)}/unarchive`;
+    const url = buildApiUrl(
+      this.baseUrl,
+      `/api/sessions/${encodeURIComponent(sessionId)}/unarchive`
+    );
     const response = await fetch(url, {
       method: "POST",
       headers: withSessionHeader(sessionId)
@@ -952,11 +984,10 @@ var AomiClient = class {
    * Get system events for a session.
    */
   async getSystemEvents(sessionId, count) {
-    const url = new URL("/api/events", this.baseUrl);
-    if (count !== void 0) {
-      url.searchParams.set("count", String(count));
-    }
-    const response = await fetch(url.toString(), {
+    const url = buildApiUrl(this.baseUrl, "/api/events", {
+      count: count !== void 0 ? String(count) : void 0
+    });
+    const response = await fetch(url, {
       headers: withSessionHeader(sessionId)
     });
     if (!response.ok) {
@@ -973,16 +1004,15 @@ var AomiClient = class {
    */
   async getApps(sessionId, options) {
     var _a3;
-    const url = new URL("/api/control/apps", this.baseUrl);
-    if (options == null ? void 0 : options.publicKey) {
-      url.searchParams.set("public_key", options.publicKey);
-    }
+    const url = buildApiUrl(this.baseUrl, "/api/control/apps", {
+      public_key: options == null ? void 0 : options.publicKey
+    });
     const apiKey = (_a3 = options == null ? void 0 : options.apiKey) != null ? _a3 : this.apiKey;
     const headers = new Headers(withSessionHeader(sessionId));
     if (apiKey) {
       headers.set(API_KEY_HEADER, apiKey);
     }
-    const response = await fetch(url.toString(), { headers });
+    const response = await fetch(url, { headers });
     if (!response.ok) {
       throw new Error(`Failed to get apps: HTTP ${response.status}`);
     }
@@ -993,13 +1023,13 @@ var AomiClient = class {
    */
   async getModels(sessionId, options) {
     var _a3;
-    const url = new URL("/api/control/models", this.baseUrl);
+    const url = buildApiUrl(this.baseUrl, "/api/control/models");
     const apiKey = (_a3 = options == null ? void 0 : options.apiKey) != null ? _a3 : this.apiKey;
     const headers = new Headers(withSessionHeader(sessionId));
     if (apiKey) {
       headers.set(API_KEY_HEADER, apiKey);
     }
-    const response = await fetch(url.toString(), {
+    const response = await fetch(url, {
       headers
     });
     if (!response.ok) {
@@ -1208,8 +1238,29 @@ function normalizeEip712Payload(payload) {
   const description = typeof args.description === "string" ? args.description : void 0;
   return { typed_data: typedData, description };
 }
+function toViemSignTypedDataArgs(payload) {
+  var _a3;
+  const typedData = payload.typed_data;
+  const primaryType = typeof (typedData == null ? void 0 : typedData.primaryType) === "string" && typedData.primaryType.trim().length > 0 ? typedData.primaryType : void 0;
+  if (!typedData || !primaryType) {
+    return null;
+  }
+  return {
+    domain: asRecord(typedData.domain),
+    types: Object.fromEntries(
+      Object.entries((_a3 = typedData.types) != null ? _a3 : {}).filter(
+        ([typeName]) => typeName !== "EIP712Domain"
+      )
+    ),
+    primaryType,
+    message: asRecord(typedData.message)
+  };
+}
 
 // src/session.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 function sortJson(value) {
   if (Array.isArray(value)) {
     return value.map((entry) => sortJson(entry));
@@ -1432,6 +1483,30 @@ var ClientSession = class extends TypedEventEmitter {
       this.publicKey = address;
     }
   }
+  addExtValue(key, value) {
+    var _a3;
+    const current = (_a3 = this.userState) != null ? _a3 : {};
+    const currentExt = isRecord(current["ext"]) ? current["ext"] : {};
+    this.resolveUserState(__spreadProps(__spreadValues({}, current), {
+      ext: __spreadProps(__spreadValues({}, currentExt), {
+        [key]: value
+      })
+    }));
+  }
+  removeExtValue(key) {
+    if (!this.userState) return;
+    const currentExt = this.userState["ext"];
+    if (!isRecord(currentExt)) return;
+    const nextExt = __spreadValues({}, currentExt);
+    delete nextExt[key];
+    const nextState = __spreadValues({}, this.userState);
+    if (Object.keys(nextExt).length === 0) {
+      delete nextState["ext"];
+    } else {
+      nextState["ext"] = nextExt;
+    }
+    this.resolveUserState(nextState);
+  }
   resolveWallet(address, chainId) {
     this.resolveUserState({ address, chainId: chainId != null ? chainId : 1, isConnected: true });
   }
@@ -3492,26 +3567,18 @@ async function signCommand(runtime) {
         chain,
         transport: http(resolvedRpcUrl)
       });
-      const typedData = pendingTx.payload.typed_data;
-      if (!typedData) {
+      const signArgs = toViemSignTypedDataArgs(
+        pendingTx.payload
+      );
+      if (!signArgs) {
         fatal("EIP-712 request is missing typed_data payload.");
       }
       if (pendingTx.description) {
         console.log(`Desc:    ${pendingTx.description}`);
       }
-      if (typedData.primaryType) {
-        console.log(`Type:    ${typedData.primaryType}`);
-      }
+      console.log(`Type:    ${signArgs.primaryType}`);
       console.log();
-      const { domain, types, primaryType, message } = typedData;
-      const sigTypes = __spreadValues({}, types);
-      delete sigTypes["EIP712Domain"];
-      const signature = await walletClient.signTypedData({
-        domain,
-        types: sigTypes,
-        primaryType,
-        message
-      });
+      const signature = await walletClient.signTypedData(signArgs);
       console.log(`\u2705 Signed! Signature: ${signature.slice(0, 20)}...`);
       signedRecords = [{
         id: pendingTx.id,

package/dist/index.cjs

@@ -72,6 +72,7 @@ __export(index_exports, {
   resolveAlchemyConfig: () => resolveAlchemyConfig,
   resolveDefaultProvider: () => resolveDefaultProvider,
   resolvePimlicoConfig: () => resolvePimlicoConfig,
+  toViemSignTypedDataArgs: () => toViemSignTypedDataArgs,
   unwrapSystemEvent: () => unwrapSystemEvent
 });
 module.exports = __toCommonJS(index_exports);
@@ -253,6 +254,22 @@ function createSseSubscriber({
 // src/client.ts
 var SESSION_ID_HEADER = "X-Session-Id";
 var API_KEY_HEADER = "X-API-Key";
+function joinApiPath(baseUrl, path) {
+  const normalizedBase = baseUrl === "/" ? "" : baseUrl.replace(/\/+$/, "");
+  const normalizedPath = path.startsWith("/") ? path : `/${path}`;
+  return `${normalizedBase}${normalizedPath}` || normalizedPath;
+}
+function buildApiUrl(baseUrl, path, query) {
+  const url = joinApiPath(baseUrl, path);
+  if (!query) return url;
+  const params = new URLSearchParams();
+  for (const [key, value] of Object.entries(query)) {
+    if (value === void 0) continue;
+    params.set(key, value);
+  }
+  const queryString = params.toString();
+  return queryString ? `${url}?${queryString}` : url;
+}
 function toQueryString(payload) {
   const params = new URLSearchParams();
   for (const [key, value] of Object.entries(payload)) {
@@ -301,11 +318,10 @@ var AomiClient = class {
    * Fetch current session state (messages, processing status, title).
    */
   async fetchState(sessionId, userState) {
-    const url = new URL("/api/state", this.baseUrl);
-    if (userState) {
-      url.searchParams.set("user_state", JSON.stringify(userState));
-    }
-    const response = await fetch(url.toString(), {
+    const url = buildApiUrl(this.baseUrl, "/api/state", {
+      user_state: userState ? JSON.stringify(userState) : void 0
+    });
+    const response = await fetch(url, {
       headers: withSessionHeader(sessionId)
     });
     if (!response.ok) {
@@ -375,7 +391,9 @@ var AomiClient = class {
    * List all threads for a wallet address.
    */
   async listThreads(publicKey) {
-    const url = `${this.baseUrl}/api/sessions?public_key=${encodeURIComponent(publicKey)}`;
+    const url = buildApiUrl(this.baseUrl, "/api/sessions", {
+      public_key: publicKey
+    });
     const response = await fetch(url);
     if (!response.ok) {
       throw new Error(`Failed to fetch threads: HTTP ${response.status}`);
@@ -386,7 +404,10 @@ var AomiClient = class {
    * Get a single thread by ID.
    */
   async getThread(sessionId) {
-    const url = `${this.baseUrl}/api/sessions/${encodeURIComponent(sessionId)}`;
+    const url = buildApiUrl(
+      this.baseUrl,
+      `/api/sessions/${encodeURIComponent(sessionId)}`
+    );
     const response = await fetch(url, {
       headers: withSessionHeader(sessionId)
     });
@@ -401,7 +422,7 @@ var AomiClient = class {
   async createThread(threadId, publicKey) {
     const body = {};
     if (publicKey) body.public_key = publicKey;
-    const url = `${this.baseUrl}/api/sessions`;
+    const url = buildApiUrl(this.baseUrl, "/api/sessions");
     const response = await fetch(url, {
       method: "POST",
       headers: withSessionHeader(threadId, {
@@ -418,7 +439,10 @@ var AomiClient = class {
    * Delete a thread by ID.
    */
   async deleteThread(sessionId) {
-    const url = `${this.baseUrl}/api/sessions/${encodeURIComponent(sessionId)}`;
+    const url = buildApiUrl(
+      this.baseUrl,
+      `/api/sessions/${encodeURIComponent(sessionId)}`
+    );
     const response = await fetch(url, {
       method: "DELETE",
       headers: withSessionHeader(sessionId)
@@ -431,7 +455,10 @@ var AomiClient = class {
    * Rename a thread.
    */
   async renameThread(sessionId, newTitle) {
-    const url = `${this.baseUrl}/api/sessions/${encodeURIComponent(sessionId)}`;
+    const url = buildApiUrl(
+      this.baseUrl,
+      `/api/sessions/${encodeURIComponent(sessionId)}`
+    );
     const response = await fetch(url, {
       method: "PATCH",
       headers: withSessionHeader(sessionId, {
@@ -447,7 +474,10 @@ var AomiClient = class {
    * Archive a thread.
    */
   async archiveThread(sessionId) {
-    const url = `${this.baseUrl}/api/sessions/${encodeURIComponent(sessionId)}/archive`;
+    const url = buildApiUrl(
+      this.baseUrl,
+      `/api/sessions/${encodeURIComponent(sessionId)}/archive`
+    );
     const response = await fetch(url, {
       method: "POST",
       headers: withSessionHeader(sessionId)
@@ -460,7 +490,10 @@ var AomiClient = class {
    * Unarchive a thread.
    */
   async unarchiveThread(sessionId) {
-    const url = `${this.baseUrl}/api/sessions/${encodeURIComponent(sessionId)}/unarchive`;
+    const url = buildApiUrl(
+      this.baseUrl,
+      `/api/sessions/${encodeURIComponent(sessionId)}/unarchive`
+    );
     const response = await fetch(url, {
       method: "POST",
       headers: withSessionHeader(sessionId)
@@ -476,11 +509,10 @@ var AomiClient = class {
    * Get system events for a session.
    */
   async getSystemEvents(sessionId, count) {
-    const url = new URL("/api/events", this.baseUrl);
-    if (count !== void 0) {
-      url.searchParams.set("count", String(count));
-    }
-    const response = await fetch(url.toString(), {
+    const url = buildApiUrl(this.baseUrl, "/api/events", {
+      count: count !== void 0 ? String(count) : void 0
+    });
+    const response = await fetch(url, {
       headers: withSessionHeader(sessionId)
     });
     if (!response.ok) {
@@ -497,16 +529,15 @@ var AomiClient = class {
    */
   async getApps(sessionId, options) {
     var _a;
-    const url = new URL("/api/control/apps", this.baseUrl);
-    if (options == null ? void 0 : options.publicKey) {
-      url.searchParams.set("public_key", options.publicKey);
-    }
+    const url = buildApiUrl(this.baseUrl, "/api/control/apps", {
+      public_key: options == null ? void 0 : options.publicKey
+    });
     const apiKey = (_a = options == null ? void 0 : options.apiKey) != null ? _a : this.apiKey;
     const headers = new Headers(withSessionHeader(sessionId));
     if (apiKey) {
       headers.set(API_KEY_HEADER, apiKey);
     }
-    const response = await fetch(url.toString(), { headers });
+    const response = await fetch(url, { headers });
     if (!response.ok) {
       throw new Error(`Failed to get apps: HTTP ${response.status}`);
     }
@@ -517,13 +548,13 @@ var AomiClient = class {
    */
   async getModels(sessionId, options) {
     var _a;
-    const url = new URL("/api/control/models", this.baseUrl);
+    const url = buildApiUrl(this.baseUrl, "/api/control/models");
     const apiKey = (_a = options == null ? void 0 : options.apiKey) != null ? _a : this.apiKey;
     const headers = new Headers(withSessionHeader(sessionId));
     if (apiKey) {
       headers.set(API_KEY_HEADER, apiKey);
     }
-    const response = await fetch(url.toString(), {
+    const response = await fetch(url, {
       headers
     });
     if (!response.ok) {
@@ -732,8 +763,29 @@ function normalizeEip712Payload(payload) {
   const description = typeof args.description === "string" ? args.description : void 0;
   return { typed_data: typedData, description };
 }
+function toViemSignTypedDataArgs(payload) {
+  var _a;
+  const typedData = payload.typed_data;
+  const primaryType = typeof (typedData == null ? void 0 : typedData.primaryType) === "string" && typedData.primaryType.trim().length > 0 ? typedData.primaryType : void 0;
+  if (!typedData || !primaryType) {
+    return null;
+  }
+  return {
+    domain: asRecord(typedData.domain),
+    types: Object.fromEntries(
+      Object.entries((_a = typedData.types) != null ? _a : {}).filter(
+        ([typeName]) => typeName !== "EIP712Domain"
+      )
+    ),
+    primaryType,
+    message: asRecord(typedData.message)
+  };
+}
 
 // src/session.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 function sortJson(value) {
   if (Array.isArray(value)) {
     return value.map((entry) => sortJson(entry));
@@ -956,6 +1008,30 @@ var ClientSession = class extends TypedEventEmitter {
       this.publicKey = address;
     }
   }
+  addExtValue(key, value) {
+    var _a;
+    const current = (_a = this.userState) != null ? _a : {};
+    const currentExt = isRecord(current["ext"]) ? current["ext"] : {};
+    this.resolveUserState(__spreadProps(__spreadValues({}, current), {
+      ext: __spreadProps(__spreadValues({}, currentExt), {
+        [key]: value
+      })
+    }));
+  }
+  removeExtValue(key) {
+    if (!this.userState) return;
+    const currentExt = this.userState["ext"];
+    if (!isRecord(currentExt)) return;
+    const nextExt = __spreadValues({}, currentExt);
+    delete nextExt[key];
+    const nextState = __spreadValues({}, this.userState);
+    if (Object.keys(nextExt).length === 0) {
+      delete nextState["ext"];
+    } else {
+      nextState["ext"] = nextExt;
+    }
+    this.resolveUserState(nextState);
+  }
   resolveWallet(address, chainId) {
     this.resolveUserState({ address, chainId: chainId != null ? chainId : 1, isConnected: true });
   }
@@ -1939,6 +2015,7 @@ async function createPimlicoAAState(options) {
   resolveAlchemyConfig,
   resolveDefaultProvider,
   resolvePimlicoConfig,
+  toViemSignTypedDataArgs,
   unwrapSystemEvent
 });
 //# sourceMappingURL=index.cjs.map