@aomi-labs/react 0.3.1 → 0.3.2

package/dist/index.cjs

@@ -37,7 +37,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // packages/react/src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  AomiClient: () => import_client3.AomiClient,
+  AomiClient: () => import_client4.AomiClient,
   AomiRuntimeProvider: () => AomiRuntimeProvider,
   ControlContextProvider: () => ControlContextProvider,
   EventContextProvider: () => EventContextProvider,
@@ -50,6 +50,7 @@ __export(index_exports, {
   getChainInfo: () => getChainInfo,
   getNetworkName: () => getNetworkName,
   initThreadControl: () => initThreadControl,
+  toViemSignTypedDataArgs: () => import_client5.toViemSignTypedDataArgs,
   useAomiRuntime: () => useAomiRuntime,
   useControl: () => useControl,
   useCurrentThreadMessages: () => useCurrentThreadMessages,
@@ -62,11 +63,12 @@ __export(index_exports, {
   useWalletHandler: () => useWalletHandler
 });
 module.exports = __toCommonJS(index_exports);
-var import_client3 = require("@aomi-labs/client");
+var import_client4 = require("@aomi-labs/client");
+var import_client5 = require("@aomi-labs/client");
 
 // packages/react/src/runtime/aomi-runtime.tsx
 var import_react11 = require("react");
-var import_client2 = require("@aomi-labs/client");
+var import_client3 = require("@aomi-labs/client");
 
 // packages/react/src/contexts/control-context.tsx
 var import_react = require("react");
@@ -245,6 +247,16 @@ var ThreadStore = class {
 // packages/react/src/contexts/control-context.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
 var API_KEY_STORAGE_KEY = "aomi_api_key";
+function getDefaultApp(apps) {
+  var _a;
+  return apps.includes("default") ? "default" : (_a = apps[0]) != null ? _a : null;
+}
+function resolveAuthorizedApp(app, authorizedApps, defaultApp) {
+  if (app && authorizedApps.includes(app)) {
+    return app;
+  }
+  return defaultApp;
+}
 var ControlContext = (0, import_react.createContext)(null);
 function useControl() {
   const ctx = (0, import_react.useContext)(ControlContext);
@@ -307,13 +319,16 @@ function ControlContextProvider({
   }, [state.apiKey]);
   (0, import_react.useEffect)(() => {
     const fetchApps = async () => {
-      var _a2, _b2;
+      var _a2;
       try {
         const apps = await aomiClientRef.current.getApps(
           sessionIdRef.current,
-          { publicKey: publicKeyRef.current, apiKey: (_a2 = stateRef.current.apiKey) != null ? _a2 : void 0 }
+          {
+            publicKey: publicKeyRef.current,
+            apiKey: (_a2 = stateRef.current.apiKey) != null ? _a2 : void 0
+          }
         );
-        const defaultApp = apps.includes("default") ? "default" : (_b2 = apps[0]) != null ? _b2 : null;
+        const defaultApp = getDefaultApp(apps);
         setStateInternal((prev) => __spreadProps(__spreadValues({}, prev), {
           authorizedApps: apps,
           defaultApp
@@ -327,7 +342,7 @@ function ControlContextProvider({
       }
     };
     void fetchApps();
-  }, [state.apiKey]);
+  }, [state.apiKey, publicKey, sessionId]);
   (0, import_react.useEffect)(() => {
     const fetchModels = async () => {
       try {
@@ -373,13 +388,16 @@ function ControlContextProvider({
     }
   }, []);
   const getAuthorizedApps = (0, import_react.useCallback)(async () => {
-    var _a2, _b2;
+    var _a2;
     try {
       const apps = await aomiClientRef.current.getApps(
         sessionIdRef.current,
-        { publicKey: publicKeyRef.current, apiKey: (_a2 = stateRef.current.apiKey) != null ? _a2 : void 0 }
+        {
+          publicKey: publicKeyRef.current,
+          apiKey: (_a2 = stateRef.current.apiKey) != null ? _a2 : void 0
+        }
       );
-      const defaultApp = apps.includes("default") ? "default" : (_b2 = apps[0]) != null ? _b2 : null;
+      const defaultApp = getDefaultApp(apps);
       setStateInternal((prev) => __spreadProps(__spreadValues({}, prev), {
         authorizedApps: apps,
         defaultApp
@@ -399,8 +417,17 @@ function ControlContextProvider({
     const metadata = getThreadMetadataRef.current(sessionIdRef.current);
     return (_a2 = metadata == null ? void 0 : metadata.control) != null ? _a2 : initThreadControl();
   }, []);
+  const getCurrentThreadApp = (0, import_react.useCallback)(() => {
+    var _a2, _b2, _c;
+    const currentControl = (_b2 = (_a2 = getThreadMetadataRef.current(sessionIdRef.current)) == null ? void 0 : _a2.control) != null ? _b2 : initThreadControl();
+    return (_c = resolveAuthorizedApp(
+      currentControl.app,
+      stateRef.current.authorizedApps,
+      stateRef.current.defaultApp
+    )) != null ? _c : "default";
+  }, []);
   const onModelSelect = (0, import_react.useCallback)(async (model) => {
-    var _a2, _b2, _c, _d, _e;
+    var _a2, _b2, _c, _d;
     const threadId = sessionIdRef.current;
     const currentControl = (_b2 = (_a2 = getThreadMetadataRef.current(threadId)) == null ? void 0 : _a2.control) != null ? _b2 : initThreadControl();
     const isProcessing2 = currentControl.isProcessing;
@@ -413,7 +440,11 @@ function ControlContextProvider({
       console.warn("[control-context] Cannot switch model while processing");
       return;
     }
-    const app = (_d = (_c = currentControl.app) != null ? _c : stateRef.current.defaultApp) != null ? _d : "default";
+    const app = (_c = resolveAuthorizedApp(
+      currentControl.app,
+      stateRef.current.authorizedApps,
+      stateRef.current.defaultApp
+    )) != null ? _c : "default";
     console.log("[control-context] onModelSelect updating metadata", {
       threadId,
       model,
@@ -437,7 +468,7 @@ function ControlContextProvider({
       const result = await aomiClientRef.current.setModel(
         threadId,
         model,
-        { app, apiKey: (_e = stateRef.current.apiKey) != null ? _e : void 0 }
+        { app, apiKey: (_d = stateRef.current.apiKey) != null ? _d : void 0 }
       );
       console.log("[control-context] onModelSelect backend result", result);
     } catch (err) {
@@ -461,6 +492,10 @@ function ControlContextProvider({
       );
       return;
     }
+    if (stateRef.current.authorizedApps.length > 0 && !stateRef.current.authorizedApps.includes(app)) {
+      console.warn("[control-context] Cannot select unauthorized app", { app });
+      return;
+    }
     console.log("[control-context] onAppSelect updating metadata", {
       threadId,
       app,
@@ -517,6 +552,7 @@ function ControlContextProvider({
         getAvailableModels,
         getAuthorizedApps,
         getCurrentThreadControl,
+        getCurrentThreadApp,
         onModelSelect,
         onAppSelect,
         isProcessing,
@@ -1386,6 +1422,7 @@ function useAomiRuntime() {
 
 // packages/react/src/handlers/wallet-handler.ts
 var import_react8 = require("react");
+var import_client2 = require("@aomi-labs/client");
 
 // packages/react/src/state/wallet-buffer.ts
 function createWalletBuffer() {
@@ -1418,68 +1455,6 @@ function getAll(buffer) {
 }
 
 // packages/react/src/handlers/wallet-handler.ts
-function asRecord(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
-  return value;
-}
-function getToolArgs(payload) {
-  const root = asRecord(payload);
-  const nestedArgs = asRecord(root == null ? void 0 : root.args);
-  return nestedArgs != null ? nestedArgs : root != null ? root : {};
-}
-function parseChainId(value) {
-  if (typeof value === "number" && Number.isFinite(value)) return value;
-  if (typeof value !== "string") return void 0;
-  const trimmed = value.trim();
-  if (!trimmed) return void 0;
-  if (trimmed.startsWith("0x")) {
-    const parsedHex = Number.parseInt(trimmed.slice(2), 16);
-    return Number.isFinite(parsedHex) ? parsedHex : void 0;
-  }
-  const parsed = Number.parseInt(trimmed, 10);
-  return Number.isFinite(parsed) ? parsed : void 0;
-}
-function normalizeTxPayload(payload) {
-  var _a, _b, _c;
-  const root = asRecord(payload);
-  const args = getToolArgs(payload);
-  const ctx = asRecord(root == null ? void 0 : root.ctx);
-  const to = typeof args.to === "string" ? args.to : void 0;
-  if (!to) return null;
-  const valueRaw = args.value;
-  const value = typeof valueRaw === "string" ? valueRaw : typeof valueRaw === "number" && Number.isFinite(valueRaw) ? String(Math.trunc(valueRaw)) : void 0;
-  const data = typeof args.data === "string" ? args.data : void 0;
-  const chainId = (_c = (_b = (_a = parseChainId(args.chainId)) != null ? _a : parseChainId(args.chain_id)) != null ? _b : parseChainId(ctx == null ? void 0 : ctx.user_chain_id)) != null ? _c : parseChainId(ctx == null ? void 0 : ctx.userChainId);
-  return {
-    to,
-    value,
-    data,
-    chainId
-  };
-}
-function normalizeEip712Payload(payload) {
-  var _a;
-  const args = getToolArgs(payload);
-  const typedDataRaw = (_a = args.typed_data) != null ? _a : args.typedData;
-  let typedData;
-  if (typeof typedDataRaw === "string") {
-    try {
-      const parsed = JSON.parse(typedDataRaw);
-      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-        typedData = parsed;
-      }
-    } catch (e) {
-      typedData = void 0;
-    }
-  } else if (typedDataRaw && typeof typedDataRaw === "object" && !Array.isArray(typedDataRaw)) {
-    typedData = typedDataRaw;
-  }
-  const description = typeof args.description === "string" ? args.description : void 0;
-  return {
-    typed_data: typedData,
-    description
-  };
-}
 function useWalletHandler({
   sessionId,
   onRequestComplete
@@ -1494,7 +1469,7 @@ function useWalletHandler({
     const unsubscribe = subscribe2(
       "wallet_tx_request",
       (event) => {
-        const payload = normalizeTxPayload(event.payload);
+        const payload = (0, import_client2.normalizeTxPayload)(event.payload);
         if (!payload) {
           console.warn("[aomi][wallet] Ignoring tx request with invalid payload", event.payload);
           return;
@@ -1510,7 +1485,7 @@ function useWalletHandler({
       "wallet_eip712_request",
       (event) => {
         var _a;
-        const payload = normalizeEip712Payload((_a = event.payload) != null ? _a : {});
+        const payload = (0, import_client2.normalizeEip712Payload)((_a = event.payload) != null ? _a : {});
         enqueue(bufferRef.current, "eip712_sign", payload);
         syncState();
       }
@@ -1607,7 +1582,7 @@ function AomiRuntimeCore({
   const notificationContext = useNotification();
   const { dispatchInboundSystem: dispatchSystemEvents } = eventContext;
   const { user, onUserStateChange, getUserState } = useUser();
-  const { getControlState, getCurrentThreadControl } = useControl();
+  const { getControlState, getCurrentThreadApp } = useControl();
   const {
     backendStateRef,
     polling,
@@ -1620,10 +1595,7 @@ function AomiRuntimeCore({
     onSyncEvents: dispatchSystemEvents,
     getPublicKey: () => getUserState().address,
     getUserState,
-    getApp: () => {
-      var _a, _b;
-      return (_b = (_a = getCurrentThreadControl().app) != null ? _a : getControlState().defaultApp) != null ? _b : "default";
-    },
+    getApp: getCurrentThreadApp,
     getApiKey: () => getControlState().apiKey
   });
   (0, import_react9.useEffect)(() => {
@@ -1737,10 +1709,7 @@ function AomiRuntimeCore({
       polling,
       userAddress: user.address,
       setIsRunning,
-      getApp: () => {
-        var _a, _b;
-        return (_b = (_a = getCurrentThreadControl().app) != null ? _a : getControlState().defaultApp) != null ? _b : "default";
-      },
+      getApp: getCurrentThreadApp,
       getApiKey: () => getControlState().apiKey,
       getUserState
     }),
@@ -1754,6 +1723,7 @@ function AomiRuntimeCore({
       threadContext.currentThreadId,
       threadContext.allThreadsMetadata,
       getControlState,
+      getCurrentThreadApp,
       getUserState
     ]
   );
@@ -1959,7 +1929,7 @@ function AomiRuntimeProvider({
   children,
   backendUrl = "http://localhost:8080"
 }) {
-  const aomiClient = (0, import_react11.useMemo)(() => new import_client2.AomiClient({ baseUrl: backendUrl }), [backendUrl]);
+  const aomiClient = (0, import_react11.useMemo)(() => new import_client3.AomiClient({ baseUrl: backendUrl }), [backendUrl]);
   return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(ThreadContextProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(NotificationContextProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(UserContextProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(AomiRuntimeInner, { aomiClient, children }) }) }) });
 }
 function AomiRuntimeInner({
@@ -2045,6 +2015,7 @@ function useNotificationHandler({
   getChainInfo,
   getNetworkName,
   initThreadControl,
+  toViemSignTypedDataArgs,
   useAomiRuntime,
   useControl,
   useCurrentThreadMessages,