@pulse-editor/react-api 0.1.1-beta.78 → 0.1.1-beta.80

package/dist/hooks/editor/use-action-effect.d.ts

@@ -17,7 +17,7 @@ import { DependencyList } from "react";
 export default function useActionEffect(params: {
     actionName: string;
     beforeAction?: (args: any) => Promise<any>;
-    afterAction?: (args: any, result: any) => Promise<any>;
+    afterAction?: (args: any) => Promise<any>;
 }, deps: DependencyList, isExtReady?: boolean): {
     isReady: boolean;
     runAppAction: ((args: any) => Promise<any>) | undefined;

package/dist/main.js

@@ -5651,9 +5651,21 @@ function useActionEffect(params, deps, isExtReady = true) {
     // Queue to hold commands until extension is ready
     const commandQueue = useRef([]);
     const isCommandExecuting = useRef(false);
+    const [remoteOrigin, setRemoteOrigin] = useState(undefined);
     const [beforeAction, setBeforeAction] = useState(params.beforeAction);
     const [afterAction, setAfterAction] = useState(params.afterAction);
-    const [handler, setHandler] = useState(undefined);
+    const [actionHandler, setActionHandler] = useState(undefined);
+    useEffect(() => {
+        async function fetchRemoteOrigin() {
+            const origin = await imc?.sendMessage(IMCMessageTypeEnum.EditorGetAppOrigin, {
+                actionName: params.actionName,
+            });
+            setRemoteOrigin(origin);
+        }
+        if (isReady) {
+            fetchRemoteOrigin();
+        }
+    }, [isReady]);
     // Flush queued commands when isExtReady becomes true
     useEffect(() => {
         async function runQueuedCommands() {
@@ -5690,14 +5702,18 @@ function useActionEffect(params, deps, isExtReady = true) {
             };
         }
         async function updateAction() {
+            if (!remoteOrigin) {
+                console.error("Remote origin is not set yet");
+                throw new Error("Remote origin is not set yet");
+            }
             // Register or update action.
             // This will only pass signature info to the editor.
             // The actual handler is stored in this hook,
             // so the execution happens inside the extension app.
             const { appId, version, actionInfo } = await getActionInfo(params.actionName);
             // Setup handler
-            const func = await loadAppAction(actionInfo.name, appId, "/", version);
-            setHandler(() => func);
+            const func = await loadAppAction(actionInfo.name, appId, remoteOrigin, version);
+            setActionHandler(() => func);
             await imc?.sendMessage(IMCMessageTypeEnum.EditorRegisterAction, {
                 name: actionInfo.name,
                 description: actionInfo.description,
@@ -5705,30 +5721,40 @@ function useActionEffect(params, deps, isExtReady = true) {
                 returns: actionInfo.returns,
             });
             // Update receiver
-            imc?.updateReceiverHandlerMap(getReceiverHandlerMap());
+            imc?.updateReceiverHandlerMap(getReceiverHandlerMap(func));
         }
-        if (isExtReady) {
+        if (isExtReady && remoteOrigin) {
             updateAction();
         }
-    }, [params.actionName, imc, isExtReady]);
+    }, [
+        params.actionName,
+        imc,
+        isExtReady,
+        remoteOrigin,
+        beforeAction,
+        afterAction,
+    ]);
     useEffect(() => {
         setBeforeAction(() => params.beforeAction ?? (async () => { }));
         setAfterAction(() => params.afterAction ?? (async () => { }));
     }, [...deps]);
-    async function executeAction(args) {
+    async function executeAction(args, actionHandlerFunc) {
+        const handler = actionHandlerFunc ?? actionHandler;
         if (!handler) {
             throw new Error("Action handler is not set");
         }
+        let beforeRes;
         if (beforeAction) {
-            args = await beforeAction(args);
+            beforeRes = await beforeAction(args);
         }
-        let res = await handler(args);
+        let res = await handler(beforeRes !== undefined ? beforeRes : args);
+        let afterRes;
         if (afterAction) {
-            res = await afterAction(args, res);
+            afterRes = await afterAction(res);
         }
-        return res;
+        return afterRes !== undefined ? afterRes : res;
     }
-    function getReceiverHandlerMap() {
+    function getReceiverHandlerMap(actionHandlerFunc) {
         const receiverHandlerMap = new Map([
             [
                 IMCMessageTypeEnum.EditorRunAppAction,
@@ -5773,7 +5799,7 @@ function useActionEffect(params, deps, isExtReady = true) {
                     } */
                     // If extension is ready, execute immediately
                     if (isExtReady) {
-                        const result = await executeAction(args);
+                        const result = await executeAction(args, actionHandlerFunc);
                         return result;
                     }
                     // Otherwise, queue the command and return when executed
@@ -5797,7 +5823,6 @@ function useActionEffect(params, deps, isExtReady = true) {
                 },
             ],
         });
-        console.log("Loaded remote from", `${remoteOrigin}/${appId}/${version}/client/remoteEntry.js`);
         const loadedFunc = 
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         (await instance.loadRemote(`${appId}_client/skill/${func}`)).default;
@@ -5805,7 +5830,7 @@ function useActionEffect(params, deps, isExtReady = true) {
     }
     return {
         isReady,
-        runAppAction: handler,
+        runAppAction: actionHandler,
     };
 }