@midscene/webdriver 1.17.2-beta-20261027033907.0 → 1.17.2

package/dist/es/index.mjs

@@ -157,12 +157,6 @@ class WebDriverRequestError extends Error {
         this.name = 'WebDriverRequestError';
     }
 }
-class WebDriverRequestTimeoutError extends WebDriverRequestError {
-    constructor(timeout){
-        super(`Request timeout after ${timeout}ms`);
-        this.name = 'WebDriverRequestTimeoutError';
-    }
-}
 async function makeWebDriverRequest(baseUrl, method, endpoint, data, timeout = 30000) {
     const url = `${baseUrl}${endpoint}`;
     debugRequest(`${method} ${endpoint}${data ? ` with data: ${JSON.stringify(data)}` : ''}`);
@@ -178,6 +172,7 @@ async function makeWebDriverRequest(baseUrl, method, endpoint, data, timeout = 3
             body: data ? JSON.stringify(data) : void 0,
             signal: controller.signal
         });
+        clearTimeout(timeoutId);
         let responseData;
         const contentType = response.headers.get('content-type');
         if (contentType?.includes('application/json')) responseData = await response.json();
@@ -191,12 +186,11 @@ async function makeWebDriverRequest(baseUrl, method, endpoint, data, timeout = 3
         }
         return responseData;
     } catch (error) {
+        clearTimeout(timeoutId);
         if (error instanceof WebDriverRequestError) throw error;
-        if (error instanceof Error && 'AbortError' === error.name) throw new WebDriverRequestTimeoutError(timeout);
+        if (error instanceof Error && 'AbortError' === error.name) throw new WebDriverRequestError(`Request timeout after ${timeout}ms`);
         debugRequest(`Request failed: ${error}`);
         throw new WebDriverRequestError(`Request failed: ${error}`);
-    } finally{
-        clearTimeout(timeoutId);
     }
 }
 function WebDriverClient_define_property(obj, key, value) {
@@ -326,4 +320,4 @@ class WebDriverClient {
         debugClient('Initialized WebDriver client');
     }
 }
-export { BaseServiceManager, WDAManager, WebDriverClient, WebDriverRequestError, WebDriverRequestTimeoutError, makeWebDriverRequest, normalizeWebDriverBaseUrl };
+export { BaseServiceManager, WDAManager, WebDriverClient, WebDriverRequestError, makeWebDriverRequest, normalizeWebDriverBaseUrl };

package/dist/lib/index.js

@@ -24,7 +24,6 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    WebDriverRequestTimeoutError: ()=>WebDriverRequestTimeoutError,
     normalizeWebDriverBaseUrl: ()=>normalizeWebDriverBaseUrl,
     WDAManager: ()=>WDAManager,
     makeWebDriverRequest: ()=>makeWebDriverRequest,
@@ -191,12 +190,6 @@ class WebDriverRequestError extends Error {
         this.name = 'WebDriverRequestError';
     }
 }
-class WebDriverRequestTimeoutError extends WebDriverRequestError {
-    constructor(timeout){
-        super(`Request timeout after ${timeout}ms`);
-        this.name = 'WebDriverRequestTimeoutError';
-    }
-}
 async function makeWebDriverRequest(baseUrl, method, endpoint, data, timeout = 30000) {
     const url = `${baseUrl}${endpoint}`;
     debugRequest(`${method} ${endpoint}${data ? ` with data: ${JSON.stringify(data)}` : ''}`);
@@ -212,6 +205,7 @@ async function makeWebDriverRequest(baseUrl, method, endpoint, data, timeout = 3
             body: data ? JSON.stringify(data) : void 0,
             signal: controller.signal
         });
+        clearTimeout(timeoutId);
         let responseData;
         const contentType = response.headers.get('content-type');
         if (contentType?.includes('application/json')) responseData = await response.json();
@@ -225,12 +219,11 @@ async function makeWebDriverRequest(baseUrl, method, endpoint, data, timeout = 3
         }
         return responseData;
     } catch (error) {
+        clearTimeout(timeoutId);
         if (error instanceof WebDriverRequestError) throw error;
-        if (error instanceof Error && 'AbortError' === error.name) throw new WebDriverRequestTimeoutError(timeout);
+        if (error instanceof Error && 'AbortError' === error.name) throw new WebDriverRequestError(`Request timeout after ${timeout}ms`);
         debugRequest(`Request failed: ${error}`);
         throw new WebDriverRequestError(`Request failed: ${error}`);
-    } finally{
-        clearTimeout(timeoutId);
     }
 }
 function WebDriverClient_define_property(obj, key, value) {
@@ -364,7 +357,6 @@ exports.BaseServiceManager = __webpack_exports__.BaseServiceManager;
 exports.WDAManager = __webpack_exports__.WDAManager;
 exports.WebDriverClient = __webpack_exports__.WebDriverClient;
 exports.WebDriverRequestError = __webpack_exports__.WebDriverRequestError;
-exports.WebDriverRequestTimeoutError = __webpack_exports__.WebDriverRequestTimeoutError;
 exports.makeWebDriverRequest = __webpack_exports__.makeWebDriverRequest;
 exports.normalizeWebDriverBaseUrl = __webpack_exports__.normalizeWebDriverBaseUrl;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
@@ -372,7 +364,6 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "WDAManager",
     "WebDriverClient",
     "WebDriverRequestError",
-    "WebDriverRequestTimeoutError",
     "makeWebDriverRequest",
     "normalizeWebDriverBaseUrl"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];

package/dist/types/index.d.ts

@@ -134,14 +134,6 @@ export declare interface WebDriverRequestOptions {
     timeout?: number;
 }
 
-/**
- * The HTTP request exceeded its timeout, including reading the response body.
- * Remains a WebDriverRequestError for callers that catch transport failures.
- */
-export declare class WebDriverRequestTimeoutError extends WebDriverRequestError {
-    constructor(timeout: number);
-}
-
 export declare interface WebDriverServiceManager {
     start(): Promise<void>;
     stop(): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/webdriver",
-  "version": "1.17.2-beta-20261027033907.0",
+  "version": "1.17.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/midscene.git",
@@ -12,7 +12,7 @@
   "types": "dist/types/index.d.ts",
   "dependencies": {
     "node-fetch": "^3.3.2",
-    "@midscene/shared": "1.17.2-beta-20261027033907.0"
+    "@midscene/shared": "1.17.2"
   },
   "devDependencies": {
     "@rslib/core": "^0.18.3",