@dynatrace-sdk/client-query 1.7.0 → 1.7.2

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 @dynatrace-sdk/client-query
 
+## 1.7.2
+
+### Patch Changes
+
+- Fixed a bug that caused abort errors from http-client to be wrapped in ApiClientError('UnexpectedError').
+
+## 1.7.1
+
+### Patch Changes
+
+- Update dependencies.
+
 ## 1.7.0
 
 ### Minor Changes

package/README.md

@@ -1,6 +1,6 @@
 # @dynatrace-sdk/client-query
 
-[![npm](https://img.shields.io/badge/npm-v1.7.0-blue)](https://www.npmjs.com/package/@dynatrace-sdk/client-query/v/1.7.0)
+[![npm](https://img.shields.io/badge/npm-v1.7.2-blue)](https://www.npmjs.com/package/@dynatrace-sdk/client-query/v/1.7.2)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 Exposes an API to fetch records stored in Grail

package/cjs/index.js

@@ -88,45 +88,28 @@ module.exports = __toCommonJS(src_exports);
 // packages/client/query/src/lib/apis/query-assistance-api.ts
 var import_http_client = require("@dynatrace-sdk/http-client");
 
-// packages/platform/shared/utils/get-global-with-dt-runtime.ts
-var getGlobalWithDtRuntime = () => typeof globalThis !== "undefined" ? globalThis : window;
-
-// packages/platform/error-handlers/src/lib/add-global-error-serializer.ts
-function addGlobalErrorSerializer(serializer) {
-  const addGlobalErrorSerializerFunc = getAddGlobalErrorSerializer();
-  if (typeof addGlobalErrorSerializerFunc === "function") {
-    addGlobalErrorSerializerFunc(serializer);
-  } else {
-    console.warn("Missing addGlobalErrorSerializer function from sdk-web-runtime.");
-  }
-}
-function isGlobalErrorSerializerSupported() {
-  return typeof getAddGlobalErrorSerializer() === "function";
-}
-function getAddGlobalErrorSerializer() {
-  return getGlobalWithDtRuntime().dtRuntime?.errorHandlers?.addGlobalErrorSerializer;
-}
-
 // packages/client/query/src/lib/error-envelopes/api-client-error.ts
+var import_error_handlers = require("@dynatrace-sdk/error-handlers");
 var ApiClientError = class extends Error {
   constructor(name, message, cause) {
     super(message);
     this.cause = cause;
     this.name = name;
   }
-  errorType = "JS Error" /* COMMON */;
+  errorType = import_error_handlers.ErrorType.COMMON;
 };
 function isApiClientError(e) {
   return e instanceof ApiClientError;
 }
 
 // packages/client/query/src/lib/error-envelopes/client-request-error.ts
+var import_error_handlers2 = require("@dynatrace-sdk/error-handlers");
 var ClientRequestError = class extends ApiClientError {
   body;
   response;
   constructor(name, response, body, message, cause) {
     super(name, message, cause);
-    this.errorType = "Http Error" /* HTTP */;
+    this.errorType = import_error_handlers2.ErrorType.HTTP;
     this.body = body;
     this.response = response;
   }
@@ -143,6 +126,7 @@ function isErrorEnvelopeError(e) {
 }
 
 // packages/client/query/src/lib/error-envelopes/error-serializer.ts
+var import_error_handlers3 = require("@dynatrace-sdk/error-handlers");
 var apiClientErrorSerializer = async (error) => {
   if (isClientRequestError(error)) {
     const status = error.response.status;
@@ -152,7 +136,7 @@ var apiClientErrorSerializer = async (error) => {
       status,
       message,
       stack: error.stack,
-      type: "Http Error" /* HTTP */,
+      type: import_error_handlers3.ErrorType.HTTP,
       body: error.body,
       cause: error.cause,
       ...getOptionalErrorRef(error.body)
@@ -162,16 +146,16 @@ var apiClientErrorSerializer = async (error) => {
       name: error.name,
       message: error.message,
       stack: error.stack,
-      type: "JS Error" /* COMMON */,
+      type: import_error_handlers3.ErrorType.COMMON,
       cause: error.cause
     };
   }
 };
 var errorSerializerAdded = false;
 function registerGlobalErrorSerializer(serializer) {
-  if (!errorSerializerAdded && isGlobalErrorSerializerSupported()) {
+  if (!errorSerializerAdded && (0, import_error_handlers3.isGlobalErrorSerializerSupported)()) {
     errorSerializerAdded = true;
-    addGlobalErrorSerializer(serializer);
+    (0, import_error_handlers3.addGlobalErrorSerializer)(serializer);
   }
 }
 function getOptionalErrorRef(body) {
@@ -1595,7 +1579,7 @@ var QueryAssistanceClient = class {
         );
       }
     } catch (e) {
-      if (isInvalidResponseError(e)) {
+      if ((0, import_http_client.isHttpClientAbortError)(e) || isInvalidResponseError(e)) {
         throw e;
       }
       if (!(0, import_http_client.isHttpClientResponseError)(e)) {
@@ -1701,7 +1685,7 @@ var QueryAssistanceClient = class {
         );
       }
     } catch (e) {
-      if (isInvalidResponseError(e)) {
+      if ((0, import_http_client.isHttpClientAbortError)(e) || isInvalidResponseError(e)) {
         throw e;
       }
       if (!(0, import_http_client.isHttpClientResponseError)(e)) {
@@ -1810,7 +1794,7 @@ var QueryAssistanceClient = class {
         );
       }
     } catch (e) {
-      if (isInvalidResponseError(e)) {
+      if ((0, import_http_client.isHttpClientAbortError)(e) || isInvalidResponseError(e)) {
         throw e;
       }
       if (!(0, import_http_client.isHttpClientResponseError)(e)) {
@@ -3182,7 +3166,7 @@ var QueryExecutionClient = class {
         throw new InvalidResponseError(`QueryExecutionClient.query:poll:200`, err, responseValue, void 0, void 0);
       }
     } catch (e) {
-      if (isInvalidResponseError(e)) {
+      if ((0, import_http_client2.isHttpClientAbortError)(e) || isInvalidResponseError(e)) {
         throw e;
       }
       if (!(0, import_http_client2.isHttpClientResponseError)(e)) {
@@ -3328,7 +3312,7 @@ var QueryExecutionClient = class {
         }
       }
     } catch (e) {
-      if (isClientRequestError(e) || isInvalidResponseError(e)) {
+      if ((0, import_http_client2.isHttpClientAbortError)(e) || isInvalidResponseError(e) || isClientRequestError(e)) {
         throw e;
       }
       if (!(0, import_http_client2.isHttpClientResponseError)(e)) {
@@ -3556,7 +3540,7 @@ var QueryExecutionClient = class {
         }
       }
     } catch (e) {
-      if (isClientRequestError(e) || isInvalidResponseError(e)) {
+      if ((0, import_http_client2.isHttpClientAbortError)(e) || isInvalidResponseError(e) || isClientRequestError(e)) {
         throw e;
       }
       if (!(0, import_http_client2.isHttpClientResponseError)(e)) {

package/docs/DOCS.md

@@ -17,7 +17,7 @@ import NpmLogo from '@site/static/img/npm-logo.png';
     </a>
   </div>
   <div class="col" style={{textAlign: 'right'}}>
-    <a href="https://www.npmjs.com/package/@dynatrace-sdk/client-query/v/1.7.0">v1.7.0</a>
+    <a href="https://www.npmjs.com/package/@dynatrace-sdk/client-query/v/1.7.2">v1.7.2</a>
   </div>
 </div>
 

package/dynatrace-metadata.json

@@ -4,7 +4,7 @@
     "generatedAt": "",
     "template": {
       "name": "@dynatrace-sdk/template-typescript-client",
-      "version": "0.18.5"
+      "version": "0.18.6"
     },
     "featureFlags": {
       "typeguards": true

package/esm/index.js

@@ -22,48 +22,32 @@ var __export = (target, all) => {
 // packages/client/query/src/lib/apis/query-assistance-api.ts
 import {
   httpClient as defaultHttpClient,
-  isHttpClientResponseError
+  isHttpClientResponseError,
+  isHttpClientAbortError
 } from "@dynatrace-sdk/http-client";
 
-// packages/platform/shared/utils/get-global-with-dt-runtime.ts
-var getGlobalWithDtRuntime = () => typeof globalThis !== "undefined" ? globalThis : window;
-
-// packages/platform/error-handlers/src/lib/add-global-error-serializer.ts
-function addGlobalErrorSerializer(serializer) {
-  const addGlobalErrorSerializerFunc = getAddGlobalErrorSerializer();
-  if (typeof addGlobalErrorSerializerFunc === "function") {
-    addGlobalErrorSerializerFunc(serializer);
-  } else {
-    console.warn("Missing addGlobalErrorSerializer function from sdk-web-runtime.");
-  }
-}
-function isGlobalErrorSerializerSupported() {
-  return typeof getAddGlobalErrorSerializer() === "function";
-}
-function getAddGlobalErrorSerializer() {
-  return getGlobalWithDtRuntime().dtRuntime?.errorHandlers?.addGlobalErrorSerializer;
-}
-
 // packages/client/query/src/lib/error-envelopes/api-client-error.ts
+import { ErrorType } from "@dynatrace-sdk/error-handlers";
 var ApiClientError = class extends Error {
   constructor(name, message, cause) {
     super(message);
     this.cause = cause;
     this.name = name;
   }
-  errorType = "JS Error" /* COMMON */;
+  errorType = ErrorType.COMMON;
 };
 function isApiClientError(e) {
   return e instanceof ApiClientError;
 }
 
 // packages/client/query/src/lib/error-envelopes/client-request-error.ts
+import { ErrorType as ErrorType2 } from "@dynatrace-sdk/error-handlers";
 var ClientRequestError = class extends ApiClientError {
   body;
   response;
   constructor(name, response, body, message, cause) {
     super(name, message, cause);
-    this.errorType = "Http Error" /* HTTP */;
+    this.errorType = ErrorType2.HTTP;
     this.body = body;
     this.response = response;
   }
@@ -80,6 +64,11 @@ function isErrorEnvelopeError(e) {
 }
 
 // packages/client/query/src/lib/error-envelopes/error-serializer.ts
+import {
+  ErrorType as ErrorType3,
+  addGlobalErrorSerializer,
+  isGlobalErrorSerializerSupported
+} from "@dynatrace-sdk/error-handlers";
 var apiClientErrorSerializer = async (error) => {
   if (isClientRequestError(error)) {
     const status = error.response.status;
@@ -89,7 +78,7 @@ var apiClientErrorSerializer = async (error) => {
       status,
       message,
       stack: error.stack,
-      type: "Http Error" /* HTTP */,
+      type: ErrorType3.HTTP,
       body: error.body,
       cause: error.cause,
       ...getOptionalErrorRef(error.body)
@@ -99,7 +88,7 @@ var apiClientErrorSerializer = async (error) => {
       name: error.name,
       message: error.message,
       stack: error.stack,
-      type: "JS Error" /* COMMON */,
+      type: ErrorType3.COMMON,
       cause: error.cause
     };
   }
@@ -1532,7 +1521,7 @@ var QueryAssistanceClient = class {
         );
       }
     } catch (e) {
-      if (isInvalidResponseError(e)) {
+      if (isHttpClientAbortError(e) || isInvalidResponseError(e)) {
         throw e;
       }
       if (!isHttpClientResponseError(e)) {
@@ -1638,7 +1627,7 @@ var QueryAssistanceClient = class {
         );
       }
     } catch (e) {
-      if (isInvalidResponseError(e)) {
+      if (isHttpClientAbortError(e) || isInvalidResponseError(e)) {
         throw e;
       }
       if (!isHttpClientResponseError(e)) {
@@ -1747,7 +1736,7 @@ var QueryAssistanceClient = class {
         );
       }
     } catch (e) {
-      if (isInvalidResponseError(e)) {
+      if (isHttpClientAbortError(e) || isInvalidResponseError(e)) {
         throw e;
       }
       if (!isHttpClientResponseError(e)) {
@@ -1825,7 +1814,8 @@ var queryAssistanceClient = /* @__PURE__ */ new QueryAssistanceClient(defaultHtt
 // packages/client/query/src/lib/apis/query-execution-api.ts
 import {
   httpClient as defaultHttpClient2,
-  isHttpClientResponseError as isHttpClientResponseError2
+  isHttpClientResponseError as isHttpClientResponseError2,
+  isHttpClientAbortError as isHttpClientAbortError2
 } from "@dynatrace-sdk/http-client";
 
 // packages/client/query/src/lib/models/execute-request.transformation.ts
@@ -3122,7 +3112,7 @@ var QueryExecutionClient = class {
         throw new InvalidResponseError(`QueryExecutionClient.query:poll:200`, err, responseValue, void 0, void 0);
       }
     } catch (e) {
-      if (isInvalidResponseError(e)) {
+      if (isHttpClientAbortError2(e) || isInvalidResponseError(e)) {
         throw e;
       }
       if (!isHttpClientResponseError2(e)) {
@@ -3268,7 +3258,7 @@ var QueryExecutionClient = class {
         }
       }
     } catch (e) {
-      if (isClientRequestError(e) || isInvalidResponseError(e)) {
+      if (isHttpClientAbortError2(e) || isInvalidResponseError(e) || isClientRequestError(e)) {
         throw e;
       }
       if (!isHttpClientResponseError2(e)) {
@@ -3496,7 +3486,7 @@ var QueryExecutionClient = class {
         }
       }
     } catch (e) {
-      if (isClientRequestError(e) || isInvalidResponseError(e)) {
+      if (isHttpClientAbortError2(e) || isInvalidResponseError(e) || isClientRequestError(e)) {
         throw e;
       }
       if (!isHttpClientResponseError2(e)) {

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@dynatrace-sdk/client-query",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "Exposes an API to fetch records stored in Grail.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@dynatrace-sdk/http-client": "^1.0.6"
+    "@dynatrace-sdk/error-handlers": "^1.2.0",
+    "@dynatrace-sdk/http-client": "^1.0.9"
   },
   "main": "./cjs/index.js",
   "module": "./esm/index.js",