@resistdesign/voltra 3.0.0-alpha.51 → 3.0.0-alpha.52

package/app/index.js

@@ -98,6 +98,7 @@ var ApplicationStateProvider = ({
 };
 
 // src/app/utils/Service.ts
+var activeRequestControllers = /* @__PURE__ */ new Map();
 var getFullUrl = (protocol, domain, basePath = "", path = "", port) => {
   const normalizedProtocol = protocol.endsWith(":") ? protocol.slice(0, -1) : protocol;
   const normalizedDomain = domain.replace(/\/+$/, "");
@@ -113,39 +114,56 @@ var getFullUrl = (protocol, domain, basePath = "", path = "", port) => {
   const normalizedPath = fullPath ? fullPath.startsWith(PATH_DELIMITER) ? fullPath : `${PATH_DELIMITER}${fullPath}` : PATH_DELIMITER;
   return `${normalizedProtocol}://${normalizedDomain}${portString}${normalizedPath}`;
 };
-var sendServiceRequest = async (config, path = "", args = []) => {
+var sendServiceRequest = async (config, path = "", args = [], requestConfig = {}) => {
   const { protocol, domain, port, basePath = "", authorization = "" } = config;
+  const { cancelPendingOnNewRequest = false } = requestConfig;
   const fullUrl = getFullUrl(protocol, domain, basePath, path, port);
+  const abortController = new AbortController();
+  const previousRequestController = activeRequestControllers.get(fullUrl);
+  if (cancelPendingOnNewRequest) {
+    previousRequestController?.abort();
+    activeRequestControllers.set(fullUrl, abortController);
+  }
   const requestHeaders = {
     "Content-Type": "application/json",
     ...!!authorization ? {
       Authorization: `Bearer ${authorization}`
     } : {}
   };
-  const response = await fetch(fullUrl, {
-    headers: requestHeaders,
-    credentials: "same-origin",
-    method: "POST",
-    body: JSON.stringify(args)
-  });
-  const { ok: responseIsOk } = response;
-  const textData = await response.text();
-  let data = textData;
   try {
-    data = JSON.parse(textData);
-  } catch (error) {
-  }
-  if (typeof data === "object") {
-    if (responseIsOk) {
-      return data;
-    } else {
-      throw data;
+    const response = await fetch(fullUrl, {
+      headers: requestHeaders,
+      credentials: "same-origin",
+      method: "POST",
+      body: JSON.stringify(args),
+      signal: abortController.signal
+    });
+    const { ok: responseIsOk } = response;
+    const textData = await response.text();
+    let data = textData;
+    try {
+      data = JSON.parse(textData);
+    } catch (error) {
     }
-  } else {
-    if (responseIsOk) {
-      return { data };
+    if (typeof data === "object") {
+      if (responseIsOk) {
+        return data;
+      } else {
+        throw data;
+      }
     } else {
-      throw { message: data };
+      if (responseIsOk) {
+        return { data };
+      } else {
+        throw { message: data };
+      }
+    }
+  } finally {
+    if (cancelPendingOnNewRequest) {
+      const activeRequestController = activeRequestControllers.get(fullUrl);
+      if (activeRequestController === abortController) {
+        activeRequestControllers.delete(fullUrl);
+      }
     }
   }
 };
@@ -155,10 +173,12 @@ var useApplicationStateLoader = (config) => {
     remoteProcedureCall,
     resetOnError = false,
     onLoadComplete,
-    manual = false
+    manual = false,
+    cancelPendingOnNewRequest = false
   } = config;
   const { args = [] } = remoteProcedureCall;
   const argsRef = useRef(args);
+  const requestSequenceRef = useRef(0);
   argsRef.current = args;
   const [cacheValidity, setCacheValidity] = useState({});
   const [loading, setLoading] = useState(false);
@@ -170,6 +190,7 @@ var useApplicationStateLoader = (config) => {
   }, []);
   const makeRemoteProcedureCall = useCallback(
     async (...directArgs) => {
+      const requestSequence = ++requestSequenceRef.current;
       let success = false;
       setLoading(true);
       setLatestError(void 0);
@@ -178,23 +199,43 @@ var useApplicationStateLoader = (config) => {
         const result = await sendServiceRequest(
           serviceConfig,
           path,
-          directArgs
+          directArgs,
+          {
+            cancelPendingOnNewRequest
+          }
         );
+        if (requestSequence !== requestSequenceRef.current) {
+          return;
+        }
         success = true;
         onChange(result);
         setModified(false);
       } catch (error) {
+        if (requestSequence !== requestSequenceRef.current) {
+          return;
+        }
         success = false;
         setLatestError(error);
         if (resetOnError) {
           onChange(void 0);
           setModified(false);
         }
+      } finally {
+        if (requestSequence !== requestSequenceRef.current) {
+          return;
+        }
+        setLoading(false);
+        onLoadComplete?.(success);
       }
-      setLoading(false);
-      onLoadComplete?.(success);
     },
-    [remoteProcedureCall, onChange, setModified, resetOnError, onLoadComplete]
+    [
+      remoteProcedureCall,
+      onChange,
+      setModified,
+      resetOnError,
+      onLoadComplete,
+      cancelPendingOnNewRequest
+    ]
   );
   const appStateLoader = useMemo(
     () => ({

package/app/utils/ApplicationStateLoader.d.ts

@@ -5,7 +5,7 @@
  * tracks loading/error state, and populates ApplicationState via identifiers.
  */
 import { ApplicationStateIdentifier, type ApplicationStateValue, type ApplicationStateValueController } from "./ApplicationState";
-import { ServiceConfig } from "./Service";
+import { type ServiceConfig, type ServiceRequestConfig } from "./Service";
 /**
  * Access and track the loading of an application state value.
  * */
@@ -49,7 +49,7 @@ export type RemoteProcedureCall<ArgsType extends any[] = any[]> = {
 /**
  * The configuration for an application state loader.
  * */
-export type ApplicationStateLoaderConfig<ValueType = ApplicationStateValue, ArgsType extends any[] = any[]> = {
+export type ApplicationStateLoaderConfig<ValueType = ApplicationStateValue, ArgsType extends any[] = any[]> = ServiceRequestConfig & {
     /**
      * Identifier for the value to update in application state.
      * */

package/app/utils/Service.d.ts

@@ -23,6 +23,17 @@ export type ServiceConfig = {
      * */
     authorization?: string;
 };
+/**
+ * Additional request behavior for a service call.
+ * */
+export type ServiceRequestConfig = {
+    /**
+     * Abort the prior in-flight request for the same service URL before starting a new one.
+     *
+     * @default false
+     * */
+    cancelPendingOnNewRequest?: boolean;
+};
 /**
  * Build the full URL for a service call from config pieces.
  *
@@ -40,6 +51,7 @@ export declare const getFullUrl: (protocol: string, domain: string, basePath?: s
  * @param config - Service configuration for the request.
  * @param path - Endpoint path to call.
  * @param args - JSON-serializable arguments to send.
+ * @param requestConfig - Additional request behavior configuration.
  * @returns Parsed JSON response.
  */
-export declare const sendServiceRequest: (config: ServiceConfig, path?: string, args?: any[]) => Promise<any>;
+export declare const sendServiceRequest: (config: ServiceConfig, path?: string, args?: any[], requestConfig?: ServiceRequestConfig) => Promise<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resistdesign/voltra",
-  "version": "3.0.0-alpha.51",
+  "version": "3.0.0-alpha.52",
   "description": "With our powers combined!",
   "homepage": "https://voltra.app",
   "repository": "git@github.com:resistdesign/voltra.git",