@geode/opengeodeweb-front 10.14.0-rc.2 → 10.14.0-rc.3

package/app/utils/local/microservices.js

@@ -13,7 +13,7 @@ import { commandExistsSync, waitForReady } from "./scripts.js";
 import { executableName, executablePath } from "./path.js";
 import { microservicesMetadatasPath, projectMicroservices } from "./cleanup.js";
 
-const DEFAULT_TIMEOUT_SECONDS = 30;
+const DEFAULT_TIMEOUT_SECONDS = 60;
 const MILLISECONDS_PER_SECOND = 1000;
 
 function getAvailablePort() {

package/internal/utils/api_fetch.js

@@ -7,7 +7,7 @@ const ERROR_400 = 400;
 export function api_fetch(
   microservice,
   { schema, params },
-  { request_error_function, response_function, response_error_function } = {},
+  { request_error_function, response_function, response_error_function, timeout } = {},
 ) {
   const feedbackStore = useFeedbackStore();
 
@@ -36,30 +36,42 @@ export function api_fetch(
   if (schema.max_retry) {
     request_options.max_retry = schema.max_retry;
   }
-  return $fetch(schema.$id, {
-    baseURL: microservice.base_url,
-    ...request_options,
-    onRequestError({ error }) {
-      microservice.stop_request();
-      feedbackStore.add_error(error.code, schema.$id, error.message, error.stack);
-      if (request_error_function) {
-        request_error_function(error);
-      }
-    },
-    onResponse({ response }) {
-      if (response.ok) {
+
+  function performFetch() {
+    return $fetch(schema.$id, {
+      baseURL: microservice.base_url,
+      ...request_options,
+      onRequestError({ error }) {
+        microservice.stop_request();
+        feedbackStore.add_error(error.code, schema.$id, error.message, error.stack);
+        if (request_error_function) {
+          request_error_function(error);
+        }
+      },
+      onResponse({ response }) {
+        if (response.ok) {
+          microservice.stop_request();
+          if (response_function) {
+            response_function(response._data);
+          }
+        }
+      },
+      onResponseError({ response }) {
         microservice.stop_request();
-        if (response_function) {
-          response_function(response._data);
+        feedbackStore.add_error(response.status, schema.$id, response.name, response.description);
+        if (response_error_function) {
+          response_error_function(response);
         }
-      }
-    },
-    onResponseError({ response }) {
-      microservice.stop_request();
-      feedbackStore.add_error(response.status, schema.$id, response.name, response.description);
-      if (response_error_function) {
-        response_error_function(response);
-      }
-    },
-  });
+      },
+    });
+  }
+
+  if (timeout !== undefined && timeout > 0) {
+    return pTimeout(performCall(), {
+      milliseconds: timeout,
+      message: `${schema.$id}: Timed out after ${timeout}ms`,
+    });
+  }
+
+  return performFetch();
 }

package/internal/utils/viewer_call.js

@@ -4,7 +4,7 @@ import { validate_schema } from "@ogw_front/utils/validate_schema";
 
 const ERROR_400 = 400;
 
-export async function viewer_call(
+export function viewer_call(
   microservice,
   { schema, params = {} },
   { request_error_function, response_function, response_error_function, timeout } = {},
@@ -50,11 +50,11 @@ export async function viewer_call(
   }
 
   if (timeout !== undefined && timeout > 0) {
-    return await pTimeout(performCall(), {
+    return pTimeout(performCall(), {
       milliseconds: timeout,
       message: `${schema.$id}: Timed out after ${timeout}ms`,
     });
   }
 
-  return await performCall();
+  return performCall();
 }

package/nuxt.config.js

@@ -5,7 +5,6 @@ import path from "node:path";
 import package_json from "./package.json";
 
 const __dirname = import.meta.dirname;
-const oneMinute = 60_000;
 
 export default defineNuxtConfig({
   runtimeConfig: {
@@ -38,12 +37,6 @@ export default defineNuxtConfig({
     transpile: ["vuetify"],
   },
 
-  nitro: {
-    routeRules: {
-      "/api/**": { timeout: oneMinute },
-    },
-  },
-
   vuetify: {
     vuetifyOptions: {
       defaults: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.14.0-rc.2",
+  "version": "10.14.0-rc.3",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {