@api-client/core 0.3.4 → 0.3.5

package/src/runtime/http-engine/HttpEngine.ts

@@ -19,6 +19,7 @@ import { HttpResponse } from '../../models/HttpResponse.js';
 import { ResponseRedirect } from '../../models/ResponseRedirect.js';
 import { RequestLog, IRequestLog } from '../../models/RequestLog.js';
 import { RequestTime } from '../../models/RequestTime.js';
+import { SerializableError } from '../../models/SerializableError.js';
 import { ResponseAuthorization } from '../../models/ResponseAuthorization.js';
 import { DefaultLogger } from '../../lib/logging/DefaultLogger.js';
 import { ILogger, Logger } from '../../lib/logging/Logger.js';
@@ -26,7 +27,6 @@ import { Headers } from '../../lib/headers/Headers.js';
 import * as RequestUtils from './RequestUtils.js';
 import { Cookies } from '../../lib/cookies/Cookies.js';
 import { HttpErrorCodes } from './HttpErrorCodes.js';
-import { NetError } from './Errors.js';
 
 export interface HttpEngineOptions extends IRequestBaseConfig {
   /**
@@ -188,7 +188,7 @@ export abstract class HttpEngine extends EventEmitter {
   auth?: IRequestAuthState;
 
   protected mainResolver?: (log: IRequestLog) => void;
-  protected mainRejecter?: (err: NetError) => void;
+  protected mainRejecter?: (err: SerializableError) => void;
   [mainPromiseSymbol]?: Promise<IRequestLog>;
 
   constructor(request: IHttpRequest, opts: HttpEngineOptions = {}) {
@@ -562,7 +562,7 @@ Check your request parameters.`);
       message = opts.message;
     }
     message = message || 'Unknown error occurred';
-    const error = new NetError(message, opts.code);
+    const error = new SerializableError(message, opts.code);
     const log = RequestLog.fromRequest(this.sentRequest);
     const response = ErrorResponse.fromError(error);
     log.response = response;
@@ -855,14 +855,14 @@ Check your request parameters.`);
    * 
    * @param log Either the request execution log or an error.
    */
-  protected finalizeRequest(log: RequestLog | NetError): void {
+  protected finalizeRequest(log: RequestLog | SerializableError): void {
     const { mainRejecter, mainResolver } = this;
     if (!mainRejecter || !mainResolver) {
       // console.error(`Trying to finalize the request but the main resolver is not set.`);
       return;
     }
     
-    if (log instanceof Error) {
+    if (log instanceof SerializableError) {
       mainRejecter(log);
     } else {
       mainResolver(log.toJSON());

package/src/runtime/http-engine/NodeEngine.ts

@@ -8,10 +8,10 @@ import { HttpEngine, HttpEngineOptions, ResponseErrorInit, HeadersReceivedDetail
 import { IHttpRequest } from '../../models/HttpRequest.js';
 import { ArcResponse } from '../../models/ArcResponse.js';
 import { IRequestLog } from '../../models/RequestLog.js';
+import { SerializableError } from '../../models/SerializableError.js';
 import { Headers } from '../../lib/headers/Headers.js';
 import { PayloadSupport } from './PayloadSupport.js';
 import { addContentLength, getPort } from './RequestUtils.js';
-import { NetError } from './Errors.js';
 import { INtlmAuthorization } from '../../models/Authorization.js';
 import { NtlmAuth, INtlmAuthConfig } from './ntlm/NtlmAuth.js';
 
@@ -59,9 +59,14 @@ export class NodeEngine extends HttpEngine {
           request.setTimeout(timeout);
         }
       }
-    } catch (e) {
-      console.warn(e);
-      this.finalizeRequest(e as Error);
+    } catch (cause) {
+      console.warn(cause);
+      const e = cause as any;
+      const err = new SerializableError(e.message, { cause: e });
+      if (e.code || e.code === 0) {
+        err.code = e.code as string;
+      }
+      this.finalizeRequest(e);
     }
   }
 
@@ -593,7 +598,7 @@ export class NodeEngine extends HttpEngine {
           });
         } else {
           connectRequest.destroy();
-          const e = new NetError('A tunnel connection through the proxy could not be established.', 111);
+          const e = new SerializableError('A tunnel connection through the proxy could not be established', 111);
           reject(e);
         }
       });

package/src/runtime/http-engine/NodeEngineDirect.ts

@@ -9,6 +9,7 @@ import { IRequestLog } from 'src/models/RequestLog.js';
 import { IHttpRequest } from '../../models/HttpRequest.js';
 import { ArcResponse } from '../../models/ArcResponse.js';
 import { Headers } from '../../lib/headers/Headers.js';
+import { SerializableError } from '../../models/SerializableError.js';
 import { PayloadSupport } from './PayloadSupport.js';
 import { addContentLength, getPort } from './RequestUtils.js';
 
@@ -85,9 +86,14 @@ export class NodeEngineDirect extends HttpEngine {
       if (timeout > 0) {
         request.setTimeout(timeout);
       }
-    } catch (e) {
-      console.warn(e);
-      this.finalizeRequest(e as Error);
+    } catch (cause) {
+      console.warn(cause);
+      const e = cause as any;
+      const err = new SerializableError(e.message, { cause: e });
+      if (e.code || e.code === 0) {
+        err.code = e.code as string;
+      }
+      this.finalizeRequest(e);
     }
   }
 

package/src/runtime/node/ProjectRunner.ts

@@ -1,12 +1,14 @@
 import { EventEmitter } from 'events';
 import { Environment } from '../../models/Environment.js';
 import { Logger } from '../../lib/logging/Logger.js';
-import { IRequestLog } from '../../models/RequestLog.js';
+import { IRequestLog, RequestLog } from '../../models/RequestLog.js';
 import { Property } from '../../models/Property.js';
 import { ProjectFolder, Kind as ProjectFolderKind } from '../../models/ProjectFolder.js';
 import { ProjectRequest } from '../../models/ProjectRequest.js';
 import { IHttpRequest } from '../../models/HttpRequest.js';
 import { HttpProject, IProjectRequestIterator } from '../../models/HttpProject.js';
+import { SentRequest } from '../..//models/SentRequest.js';
+import { ErrorResponse } from '../../models/ErrorResponse.js';
 import { VariablesStore } from './VariablesStore.js';
 import { VariablesProcessor } from '../variables/VariablesProcessor.js';
 import { RequestFactory } from './RequestFactory.js';
@@ -75,7 +77,7 @@ export interface ProjectRunner {
   /**
    * There was a general error during the request
    */
-  on(event: 'error', listener: (key: string, request: IHttpRequest, message: string) => void): this;
+  on(event: 'error', listener: (key: string, log: IRequestLog, message: string) => void): this;
   /**
    * The request object is prepared and about to be sent to the HTTP engine
    */
@@ -87,7 +89,7 @@ export interface ProjectRunner {
   /**
    * There was a general error during the request
    */
-  once(event: 'error', listener: (key: string, request: IHttpRequest, message: string) => void): this;
+  once(event: 'error', listener: (key: string, log: IRequestLog, message: string) => void): this;
 }
 
 /**
@@ -192,9 +194,13 @@ export class ProjectRunner extends EventEmitter {
       info.log = result;
       this.emit('response', request.key, { ...result });
     } catch (e) {
+      const cause = e as Error;
       info.error = true;
-      info.errorMessage = (e as Error).message;
-      this.emit('error', request.key, { ...requestData }, info.errorMessage);
+      info.errorMessage = cause.message;
+      const sent = new SentRequest({ ...requestData, startTime: 0, endTime: 0, });
+      const response = ErrorResponse.fromError(info.errorMessage);
+      const log = RequestLog.fromRequestResponse(sent.toJSON(), response.toJSON()).toJSON();
+      this.emit('error', request.key, log, info.errorMessage);
     }
 
     this.eventTarget.removeEventListener(EventTypes.Environment.set, variableHandler as any);

package/build/src/runtime/http-engine/Errors.d.ts

@@ -1,10 +0,0 @@
-/**
- * Network errors occurred during transport with a message and error code.
- */
-export declare class NetError extends Error {
-    code?: number | string;
-    /**
-     * @param code Optional error code.
-     */
-    constructor(message: string, code?: number | string);
-}

package/build/src/runtime/http-engine/Errors.js

@@ -1,14 +0,0 @@
-/**
- * Network errors occurred during transport with a message and error code.
- */
-export class NetError extends Error {
-    code;
-    /**
-     * @param code Optional error code.
-     */
-    constructor(message, code) {
-        super(message);
-        this.code = code;
-    }
-}
-//# sourceMappingURL=Errors.js.map

package/build/src/runtime/http-engine/Errors.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Errors.js","sourceRoot":"","sources":["../../../../src/runtime/http-engine/Errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,OAAO,QAAS,SAAQ,KAAK;IACjC,IAAI,CAAmB;IACvB;;OAEG;IACH,YAAY,OAAe,EAAE,IAAsB;QACjD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF"}

package/src/runtime/http-engine/Errors.ts

@@ -1,13 +0,0 @@
-/**
- * Network errors occurred during transport with a message and error code.
- */
-export class NetError extends Error {
-  code?: number | string;
-  /**
-   * @param code Optional error code.
-   */
-  constructor(message: string, code?: number | string) {
-    super(message);
-    this.code = code;
-  }
-}