@xh/hoist 70.0.0-SNAPSHOT.1729789044498 → 70.0.0-SNAPSHOT.1730999731048

package/CHANGELOG.md

@@ -5,6 +5,8 @@
 ### ⚙️ Technical
 
 * Deprecated `FileChooserModel.removeAllFiles()`, replaced with `clear()` for brevity/consistency.
+* Improved timeout error message thrown by `FetchService` to format the timeout interval in seconds
+  where possible.
 
 ### 📚 Libraries
 

package/build/types/core/exception/Exception.d.ts

@@ -18,9 +18,7 @@ export declare class Exception {
      *      Other inputs will be treated as the `message` of a new HoistException.
      */
     static create(src: unknown): HoistException;
-    /**
-     * Create an Error for when an operation (e.g. a Promise) times out.
-     */
+    /** Create an Error for when an operation (e.g. a Promise) times out. */
     static timeout(config: TimeoutExceptionConfig): TimeoutException;
     /**
      * Create an Error to throw when a fetch call returns a !ok response.

package/core/exception/Exception.ts

@@ -4,10 +4,10 @@
  *
  * Copyright © 2024 Extremely Heavy Industries Inc.
  */
+import {PlainObject, XH} from '@xh/hoist/core';
 import {FetchOptions} from '@xh/hoist/svc';
-import {PlainObject, XH} from '../';
+import {pluralize} from '@xh/hoist/utils/js';
 import {isPlainObject} from 'lodash';
-
 import {FetchException, HoistException, TimeoutException, TimeoutExceptionConfig} from './Types';
 
 /**
@@ -39,15 +39,19 @@ export class Exception {
         });
     }
 
-    /**
-     * Create an Error for when an operation (e.g. a Promise) times out.
-     */
+    /** Create an Error for when an operation (e.g. a Promise) times out. */
     static timeout(config: TimeoutExceptionConfig): TimeoutException {
         const {interval, ...rest} = config,
-            displayInterval = interval % 1000 ? `${interval}ms` : `${interval / 1000}s`;
+            // Display timeout in seconds if an even multiple (or very close to it).
+            displayInterval =
+                interval % 1000 < 5
+                    ? pluralize('second', Math.round(interval / 1000), true)
+                    : `${interval}ms`;
+
         return this.createInternal({
             name: 'Timeout Exception',
-            message: `Operation timed out after ${displayInterval}`,
+            // Note FetchService.managedFetchAsync appends to this message - review if changing.
+            message: `Timed out after ${displayInterval}`,
             isTimeout: true,
             stack: null,
             interval,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xh/hoist",
-  "version": "70.0.0-SNAPSHOT.1729789044498",
+  "version": "70.0.0-SNAPSHOT.1730999731048",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",

package/svc/FetchService.ts

@@ -314,7 +314,8 @@ export class FetchService extends HoistService {
                 const msg =
                     isObject(timeout) && 'message' in timeout
                         ? timeout.message
-                        : `Timed out loading '${opts.url}' - no response after ${e.interval}ms.`;
+                        : // Exception.timeout() message already includes interval - add URL here.
+                          e.message + ` loading '${opts.url}'`;
                 throw Exception.fetchTimeout(opts, e, msg);
             }