@api-client/core 0.6.28 → 0.6.31

package/src/events/models/ClientCertificateEvents.ts

@@ -6,12 +6,12 @@ export class ClientCertificateEvents {
   /**
    * Dispatches an event handled by the data store to read the client certificate.
    *
-   * @param id The id of the client certificate
+   * @param key The key of the client certificate
    * @param target A node on which to dispatch the event.
    * @returns Promise resolved to a client certificate model.
    */
-  static async read(id: string, target: EventTarget = window): Promise<HttpCertificate | undefined> {
-    const e = new ContextReadEvent<HttpCertificate>(ModelEventTypes.ClientCertificate.read, id);
+  static async read(key: string, target: EventTarget = window): Promise<HttpCertificate | undefined> {
+    const e = new ContextReadEvent<HttpCertificate>(ModelEventTypes.ClientCertificate.read, key);
     target.dispatchEvent(e);
     return e.detail.result;
   }
@@ -32,12 +32,12 @@ export class ClientCertificateEvents {
   /**
    * Dispatches an event handled by the data store to delete a client certificate
    *
-   * @param id The id of the project to delete.
+   * @param key The key of the project to delete.
    * @param target A node on which to dispatch the event.
    * @returns Promise resolved to a new revision after delete.
    */
-  static async delete(id: string, target: EventTarget = window): Promise<ContextDeleteRecord | undefined> {
-    const e = new ContextDeleteEvent(ModelEventTypes.ClientCertificate.delete, id, undefined);
+  static async delete(key: string, target: EventTarget = window): Promise<ContextDeleteRecord | undefined> {
+    const e = new ContextDeleteEvent(ModelEventTypes.ClientCertificate.delete, key, undefined);
     target.dispatchEvent(e);
     return e.detail.result;
   }

package/src/events/transport/TransportEvents.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import { IRequestAuthorization } from "../../models/RequestAuthorization.js";
 import { IHttpRequest } from "../../models/HttpRequest.js";
 import { IRequestBaseConfig } from "../../models/RequestConfig.js";

package/src/mocking/ProjectMock.ts

@@ -6,6 +6,7 @@ import { History } from './lib/History.js';
 import { Url } from './lib/Url.js';
 import { Certificates } from './lib/Certificates.js';
 import { HostRules } from './lib/HostRules.js';
+import { Arc } from './lib/Arc.js';
 
 export { IRequestLogInit } from './lib/Request.js';
 export { IResponseInit } from './lib/Response.js';
@@ -20,6 +21,7 @@ export class ProjectMock extends DataMock {
   url: Url;
   certificates: Certificates;
   hostRules: HostRules;
+  arc: Arc;
   
   /**
    * @param init The library init options.
@@ -33,5 +35,6 @@ export class ProjectMock extends DataMock {
     this.url = new Url(init);
     this.certificates = new Certificates(init);
     this.hostRules = new HostRules(init);
+    this.arc = new Arc(init);
   }
 }

package/src/mocking/lib/Arc.ts

@@ -0,0 +1,28 @@
+import { IDataMockInit, IHttpRequestInit } from '@pawel-up/data-mock';
+import { IArcHttpRequest, Kind as ArcHttpRequestKind } from '../../models/arc/ArcHttpRequest.js';
+import { Request } from './Request.js';
+
+export class Arc {
+  protected request: Request;
+
+  constructor(init: IDataMockInit={}) {
+    this.request = new Request(init);
+  }
+
+  arcRequest(init?: IHttpRequestInit): IArcHttpRequest {
+    const request = this.request.request(init);
+    return {
+      key: new Date(request.created || Date.now()).toJSON(),
+      ...request,
+      kind: ArcHttpRequestKind,
+    };
+  }
+
+  arcRequests(size = 25, init?: IHttpRequestInit): IArcHttpRequest[] {
+    const result: IArcHttpRequest[] = [];
+    for (let i = 0; i < size; i++) {
+      result.push(this.arcRequest(init));
+    }
+    return result;
+  }
+}

package/src/mocking/lib/Certificates.ts

@@ -28,8 +28,10 @@ export class Certificates {
     let instance: Certificate;
     if (type === 'p12') {
       instance = Certificate.fromP12(cert, this.lorem.word());
+    } else if (type === 'pem') {
+      instance = Certificate.fromPem(cert, cert, this.lorem.word());
     } else {
-      instance = Certificate.fromPem(cert, '', this.lorem.word());
+      throw new Error(`Invalid certificate type.`);
     }
     if (!opts.noPassphrase) {
       instance.cert.passphrase = this.lorem.word();
@@ -38,6 +40,7 @@ export class Certificates {
         key.passphrase = this.lorem.word();
       }
     }
+    
     return instance.toJSON();
   }
 

package/src/mocking/lib/Request.ts

@@ -1,7 +1,7 @@
 import { Http, Types, Lorem, Time, IDataMockInit, IHttpRequestInit } from '@pawel-up/data-mock';
 // import { randomValue } from '@pawel-up/data-mock/src/lib/Http.js';
 import { IHttpRequest, Kind as HttpRequestKind } from '../../models/HttpRequest.js';
-import { IRequest, Kind as RequestKind } from '../../models/Request.js';
+import { IRequest, Kind as RequestKind, Request as RequestModel } from '../../models/Request.js';
 import { ISentRequest } from '../../models/SentRequest.js';
 import { IRequestLog, Kind as RequestLogKind } from '../../models/RequestLog.js';
 import { IResponseInit, Response } from './Response.js';
@@ -45,14 +45,17 @@ export class Request {
   }
 
   request(init?: IHttpRequestInit): IRequest {
-    return {
+    const schema = {
       kind: RequestKind,
       expects: this.httpRequest(init),
       info: {
         name: this.lorem.words(2),
         description: this.lorem.paragraph(),
       },
-    }
+      created: this.time.timestamp(),
+    };
+    const instance = new RequestModel(schema);
+    return instance.toJSON();
   }
 
   httpRequest(init?: IHttpRequestInit): IHttpRequest {

package/src/models/ClientCertificate.ts

@@ -71,7 +71,7 @@ export interface IPemCertificate extends ICertificate {
   certKey: ICertificateData;
 }
 
-export type HttpCertificate = IP12Certificate | IPemCertificate;
+export type HttpCertificate = IP12Certificate | IPemCertificate | ICertificate;
 
 export interface IPemCreateOptions {
   type: 'p12';
@@ -128,7 +128,7 @@ export class Certificate {
    * Timestamp when the certificate was inserted into the data store.
    * Required when returning a result. Auto-generated when inserting, if missing.
    */
-  created?: number;
+  created = 0;
   /**
    * Certificate type. Either `p12` or `pem`.
    */
@@ -162,6 +162,7 @@ export class Certificate {
       key: v4(),
       name,
       type: 'pem',
+      created: Date.now(),
     };
     if (keyPassphrase) {
       init.certKey.passphrase = keyPassphrase;
@@ -185,6 +186,7 @@ export class Certificate {
       key: v4(),
       name,
       type: 'p12',
+      created: Date.now(),
     };
     if (passphrase) {
       init.cert.passphrase = passphrase;
@@ -224,6 +226,7 @@ export class Certificate {
         key: _id,
         name,
         type: 'p12',
+        created,
       };
       return new Certificate(init);
     }
@@ -231,16 +234,15 @@ export class Certificate {
   }
 
   constructor(certificate: HttpCertificate) {
-    const { type, cert, key = v4(), name = '', created } = certificate;
+    const { type, cert, key = v4(), name = '', created = Date.now() } = certificate;
     this.key = key;
     this.name = name;
     this.type = type;
     this.cert = Certificate.fromStore(cert);
-    if (typeof created === 'number') {
-      this.created = created;
-    }
+    this.created = created;
     if (type === 'pem') {
-      this.certKey = Certificate.fromStore(certificate.certKey);
+      const typed = certificate as IPemCertificate;
+      this.certKey = Certificate.fromStore(typed.certKey);
     }
   }
 
@@ -288,12 +290,13 @@ export class Certificate {
   }
 
   toJSON(): HttpCertificate {
-    const result: IP12Certificate = {
+    const result: HttpCertificate = {
       kind: Kind,
       key: this.key,
       cert: Certificate.toStore(this.cert),
       name: this.name,
-      type: 'p12',
+      type: this.type,
+      created: this.created,
     };
 
     if (this.type === 'pem' && this.certKey) {

package/src/models/arc/ArcHttpRequest.ts

@@ -1,5 +1,4 @@
 import { IRequest, Request } from "../Request.js";
-import v4 from "../../lib/uuid.js";
 import { HttpRequest, IHttpRequest } from "../HttpRequest.js";
 import { Thing } from "../Thing.js";
 
@@ -15,6 +14,7 @@ export class ArcHttpRequest extends Request {
 
   /**
    * The identifier of the request.
+   * The key is related to the `created` property. It is the `new Date(created).toJSON()` value.
    */
   key = '';
 
@@ -24,9 +24,10 @@ export class ArcHttpRequest extends Request {
    * @param url The Request URL. This is required.
    */
   static fromUrl(url: string): ArcHttpRequest {
-    const now: number = Date.now();
+    const d = new Date();
+    const now: number = d.getTime();
     const request = new ArcHttpRequest({
-      key: v4(),
+      key: d.toJSON(),
       kind: Kind,
       created: now,
       updated: now,
@@ -42,9 +43,10 @@ export class ArcHttpRequest extends Request {
    * @param name The Request name.
    */
   static fromName(name: string): ArcHttpRequest {
-    const now: number = Date.now();
+    const d = new Date();
+    const now: number = d.getTime();
     const request = new ArcHttpRequest({
-      key: v4(),
+      key: d.toJSON(),
       kind: Kind,
       created: now,
       updated: now,
@@ -60,9 +62,10 @@ export class ArcHttpRequest extends Request {
    * @param info The request data.
    */
   static fromHttpRequest(info: IHttpRequest): ArcHttpRequest {
-    const now: number = Date.now();
+    const d = new Date();
+    const now: number = d.getTime();
     const request = new ArcHttpRequest({
-      key: v4(),
+      key: d.toJSON(),
       kind: Kind,
       created: now,
       updated: now,
@@ -76,11 +79,13 @@ export class ArcHttpRequest extends Request {
    * Creates a request for a schema of a Request.
    */
   static fromRequest(request: IArcHttpRequest): ArcHttpRequest {
-    const key = v4();
+    const d = new Date(request.created || Date.now());
+    const now: number = d.getTime();
     const init: IArcHttpRequest = { 
       ...request, 
-      key, 
-      kind: Kind 
+      key: d.toJSON(), 
+      kind: Kind,
+      created: now,
     };
     const result = new ArcHttpRequest(init);
     return result;
@@ -96,7 +101,10 @@ export class ArcHttpRequest extends Request {
       init = input;
     }
     if (init) {
-      this.key = init.key || v4();
+      this.key = init.key;
+    }
+    if (!this.key) {
+      this.key = new Date(this.created || Date.now()).toJSON();
     }
     this.kind = Kind;
   }
@@ -105,7 +113,7 @@ export class ArcHttpRequest extends Request {
     super.new(init);
     
     const { key } = init;
-    this.key = key || v4();
+    this.key = key || new Date(init.created || Date.now()).toJSON();
     this.kind = Kind;
   }
 

package/src/models/arc/ArcProject.ts

@@ -951,12 +951,15 @@ export class ArcProject extends ArcProjectParent {
         init.kind = ArcProjectKind;
       }
     } else {
+      const now = Date.now();
       init = {
         kind: ArcProjectKind,
         key: v4(),
         definitions: {},
         items: [],
         info: Thing.fromName('').toJSON(),
+        created: now,
+        updated: now,
       }
     }
     this.new(init);
@@ -1001,6 +1004,8 @@ export class ArcProject extends ArcProjectParent {
       definitions: {},
       items: [],
       info: this.info.toJSON(),
+      created: this.created,
+      updated: this.updated,
     };
     if (Array.isArray(this.definitions.requests) && this.definitions.requests.length) {
       result.definitions.requests = this.definitions.requests.map(i => i.toJSON());

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

@@ -10,7 +10,7 @@ import { IHttpRequest, HttpRequest } from '../../models/HttpRequest.js';
 import { IRequestBaseConfig } from '../../models/RequestConfig.js';
 import { IRequestAuthorization } from '../../models/RequestAuthorization.js';
 import { HostRule } from '../../models/HostRule.js';
-import { HttpCertificate } from '../../models/ClientCertificate.js';
+import { HttpCertificate, IPemCertificate } from '../../models/ClientCertificate.js';
 import { SentRequest } from '../../models/SentRequest.js';
 import { Response } from '../../models/Response.js';
 import { ErrorResponse } from '../../models/ErrorResponse.js';
@@ -645,6 +645,7 @@ Check your request parameters.`);
       this.finalizeRequest(result);
     } catch (e) {
       const error = e as Error;
+      // eslint-disable-next-line no-console
       console.error(error);
       this._errorRequest({
         message: (error && error.message) || 'Unknown error occurred',
@@ -797,6 +798,7 @@ Check your request parameters.`);
       }
       options.pfx.push(struct);
     } else if (cert.type === 'pem') {
+      const typed = cert as IPemCertificate;
       if (!options.cert) {
         options.cert = [];
       }
@@ -807,9 +809,9 @@ Check your request parameters.`);
           options.cert = [];
         }
       }
-      const added = Buffer.from(cert.cert.data as string);
+      const added = Buffer.from(typed.cert.data as string);
       options.cert.push(added);
-      if (cert.certKey) {
+      if (typed.certKey) {
         if (!Array.isArray(options.key)) {
           if (options.key) {
             options.key = [options.key];
@@ -818,10 +820,10 @@ Check your request parameters.`);
           }
         }
         const struct: tls.KeyObject = {
-          pem: Buffer.from(cert.certKey.data as string),
+          pem: Buffer.from(typed.certKey.data as string),
         };
-        if (cert.certKey.passphrase) {
-          struct.passphrase = cert.certKey.passphrase;
+        if (typed.certKey.passphrase) {
+          struct.passphrase = typed.certKey.passphrase;
         }
         options.key.push(struct);
       }