@api-client/core 0.5.18 → 0.5.21

package/src/authorization/types.ts

@@ -0,0 +1,176 @@
+export interface OauthProcessingOptions {
+  /**
+   * The number of milliseconds of an interval to check the popup state.
+   * Default to 250 ms.
+   */
+  popupPullTimeout?: number;
+  /**
+   * The event target on which to listen to the redirect page `message` event.
+   * This event should contain a list of authorization parameters returned by the authorization server.
+   * 
+   * The library contains `oauth-popup.html` page that reads the data from the URL and posts it back to the opener.
+   * However, you can create `tokenInfoTranslation` to map returned by the popup parameters to the onces used by the library.
+   */
+  messageTarget?: EventTarget;
+  /**
+   * A number of milliseconds after which the iframe triggers a timeout if the response is not present.
+   * Defaults to `1020`.
+   */
+  iframeTimeout?: number;
+  /** 
+   * When set it uses this value to prefix the call to the 
+   * OAuth 2 token endpoint. This is to support use cases when 
+   * the requests should be proxied through a server to avoid CORS problems.
+   */
+  tokenProxy?: string;
+   /** 
+    * When set it encodes the token URI value before adding it to the 
+    * `tokenProxy`. This is to be used when the proxy takes the target 
+    * URL as a query parameter.
+    */
+  tokenProxyEncode?: boolean;
+}
+
+export interface IOpenIdProviderMetadata {
+  /**
+   * URL using the https scheme with no query or fragment component that the OP asserts as its Issuer Identifier. If Issuer discovery is supported (see Section 2), this value MUST be identical to the issuer value returned by WebFinger. This also MUST be identical to the iss Claim value in ID Tokens issued from this Issuer.
+   */
+  issuer: string;
+  /**
+   * URL of the OP's OAuth 2.0 Authorization Endpoint [OpenID.Core].
+   */
+  authorization_endpoint: string;
+  /**
+   * URL of the OP's OAuth 2.0 Token Endpoint [OpenID.Core]. This is REQUIRED unless only the Implicit Flow is used.
+   */
+  token_endpoint?: string;
+  /**
+   * URL of the OP's UserInfo Endpoint [OpenID.Core]. This URL MUST use the https scheme and MAY contain port, path, and query parameter components.
+   */
+  userinfo_endpoint?: string;
+  /**
+   * URL of the OP's JSON Web Key Set [JWK] document. This contains the signing key(s) the RP uses to validate signatures from the OP. The JWK Set MAY also contain the Server's encryption key(s), which are used by RPs to encrypt requests to the Server. When both signing and encryption keys are made available, a use (Key Use) parameter value is REQUIRED for all keys in the referenced JWK Set to indicate each key's intended usage. Although some algorithms allow the same key to be used for both signatures and encryption, doing so is NOT RECOMMENDED, as it is less secure. The JWK x5c parameter MAY be used to provide X.509 representations of keys provided. When used, the bare key values MUST still be present and MUST match those in the certificate.
+   */
+  jwks_uri: string;
+  /**
+   * URL of the OP's Dynamic Client Registration Endpoint.
+   */
+  registration_endpoint?: string;
+  /**
+   * JSON array containing a list of the OAuth 2.0 [RFC6749] scope values that this server supports. The server MUST support the openid scope value. Servers MAY choose not to advertise some supported scope values even when this parameter is used, although those defined in [OpenID.Core] SHOULD be listed, if supported.
+   */
+  scopes_supported?: string[];
+  /**
+   * JSON array containing a list of the OAuth 2.0 response_type values that this OP supports. Dynamic OpenID Providers MUST support the code, id_token, and the token id_token Response Type values.
+   */
+  response_types_supported: string[];
+  /**
+   * JSON array containing a list of the OAuth 2.0 response_mode values that this OP supports, as specified in OAuth 2.0 Multiple Response Type Encoding Practices [OAuth.Responses]. If omitted, the default for Dynamic OpenID Providers is ["query", "fragment"].
+   */
+  response_modes_supported?: string[];
+  /**
+   * JSON array containing a list of the OAuth 2.0 Grant Type values that this OP supports. Dynamic OpenID Providers MUST support the authorization_code and implicit Grant Type values and MAY support other Grant Types. If omitted, the default value is ["authorization_code", "implicit"].
+   */
+  grant_types_supported?: string[];
+  /**
+   * JSON array containing a list of the Authentication Context Class References that this OP supports.
+   */
+  acr_values_supported?: string[];
+  /**
+   * JSON array containing a list of the Subject Identifier types that this OP supports. Valid types include pairwise and public.
+   */
+  subject_types_supported: string[];
+  /**
+   * JSON array containing a list of the JWS signing algorithms (alg values) supported by the OP for the ID Token to encode the Claims in a JWT [JWT]. The algorithm RS256 MUST be included. The value none MAY be supported, but MUST NOT be used unless the Response Type used returns no ID Token from the Authorization Endpoint (such as when using the Authorization Code Flow).
+   */
+  id_token_signing_alg_values_supported: string[];
+  /**
+   * JSON array containing a list of the JWE encryption algorithms (alg values) supported by the OP for the ID Token to encode the Claims in a JWT [JWT].
+   */
+  id_token_encryption_alg_values_supported?: string[];
+  /**
+   * JSON array containing a list of the JWE encryption algorithms (enc values) supported by the OP for the ID Token to encode the Claims in a JWT [JWT].
+   */
+  id_token_encryption_enc_values_supported?: string[];
+  /**
+   * JSON array containing a list of the JWS [JWS] signing algorithms (alg values) [JWA] supported by the UserInfo Endpoint to encode the Claims in a JWT [JWT]. The value none MAY be included.
+   */
+  userinfo_signing_alg_values_supported?: string[];
+  /**
+   * JSON array containing a list of the JWE [JWE] encryption algorithms (alg values) [JWA] supported by the UserInfo Endpoint to encode the Claims in a JWT [JWT].
+   */
+  userinfo_encryption_alg_values_supported?: string[];
+  /**
+   * JSON array containing a list of the JWE encryption algorithms (enc values) [JWA] supported by the UserInfo Endpoint to encode the Claims in a JWT [JWT].
+   */
+  userinfo_encryption_enc_values_supported?: string[];
+  /**
+   * JSON array containing a list of the JWS signing algorithms (alg values) supported by the OP for Request Objects, which are described in Section 6.1 of OpenID Connect Core 1.0 [OpenID.Core]. These algorithms are used both when the Request Object is passed by value (using the request parameter) and when it is passed by reference (using the request_uri parameter). Servers SHOULD support none and RS256.
+   */
+  request_object_signing_alg_values_supported?: string[];
+  /**
+   * JSON array containing a list of the JWE encryption algorithms (alg values) supported by the OP for Request Objects. These algorithms are used both when the Request Object is passed by value and when it is passed by reference.
+   */
+  request_object_encryption_alg_values_supported?: string[];
+  /**
+   * JSON array containing a list of the JWE encryption algorithms (enc values) supported by the OP for Request Objects. These algorithms are used both when the Request Object is passed by value and when it is passed by reference.
+   */
+  request_object_encryption_enc_values_supported?: string[];
+  /**
+   * JSON array containing a list of Client Authentication methods supported by this Token Endpoint. The options are client_secret_post, client_secret_basic, client_secret_jwt, and private_key_jwt, as described in Section 9 of OpenID Connect Core 1.0 [OpenID.Core]. Other authentication methods MAY be defined by extensions. If omitted, the default is client_secret_basic -- the HTTP Basic Authentication Scheme specified in Section 2.3.1 of OAuth 2.0 [RFC6749].
+   */
+  token_endpoint_auth_methods_supported?: string[];
+  /**
+   * JSON array containing a list of the JWS signing algorithms (alg values) supported by the Token Endpoint for the signature on the JWT [JWT] used to authenticate the Client at the Token Endpoint for the private_key_jwt and client_secret_jwt authentication methods. Servers SHOULD support RS256. The value none MUST NOT be used.
+   */
+  token_endpoint_auth_signing_alg_values_supported?: string[];
+  /**
+   * JSON array containing a list of the display parameter values that the OpenID Provider supports. These values are described in Section 3.1.2.1 of OpenID Connect Core 1.0 [OpenID.Core].
+   */
+  display_values_supported?: string[];
+  /**
+   * JSON array containing a list of the Claim Types that the OpenID Provider supports. These Claim Types are described in Section 5.6 of OpenID Connect Core 1.0 [OpenID.Core]. Values defined by this specification are normal, aggregated, and distributed. If omitted, the implementation supports only normal Claims.
+   */
+  claim_types_supported?: string[];
+  /**
+   * JSON array containing a list of the Claim Names of the Claims that the OpenID Provider MAY be able to supply values for. Note that for privacy or other reasons, this might not be an exhaustive list.
+   */
+  claims_supported?: string[];
+  /**
+   * URL of a page containing human-readable information that developers might want or need to know when using the OpenID Provider. In particular, if the OpenID Provider does not support Dynamic Client Registration, then information on how to register Clients needs to be provided in this documentation.
+   */
+  service_documentation?: string;
+  /**
+   * Languages and scripts supported for values in Claims being returned, represented as a JSON array of BCP47 [RFC5646] language tag values. Not all languages and scripts are necessarily supported for all Claim values.
+   */
+  claims_locales_supported?: string[];
+  /**
+   * Languages and scripts supported for the user interface, represented as a JSON array of BCP47 [RFC5646] language tag values.
+   */
+  ui_locales_supported?: string[];
+  /**
+   * Boolean value specifying whether the OP supports use of the claims parameter, with true indicating support. If omitted, the default value is false.
+   */
+  claims_parameter_supported?: boolean;
+  /**
+   * Boolean value specifying whether the OP supports use of the request parameter, with true indicating support. If omitted, the default value is false.
+   */
+  request_parameter_supported?: boolean;
+  /**
+   * Boolean value specifying whether the OP supports use of the request_uri parameter, with true indicating support. If omitted, the default value is true.
+   */
+  request_uri_parameter_supported?: boolean;
+  /**
+   * Boolean value specifying whether the OP requires any request_uri values used to be pre-registered using the request_uris registration parameter. Pre-registration is REQUIRED when the value is true. If omitted, the default value is false.
+   */
+  require_request_uri_registration?: boolean;
+  /**
+   * URL that the OpenID Provider provides to the person registering the Client to read about the OP's requirements on how the Relying Party can use the data provided by the OP. The registration process SHOULD display this URL to the person registering the Client if it is given.
+   */
+  op_policy_uri?: string;
+  /**
+   * URL that the OpenID Provider provides to the person registering the Client to read about OpenID Provider's terms of service. The registration process SHOULD display this URL to the person registering the Client if it is given.
+   */
+  op_tos_uri?: string;
+  
+}

package/src/events/BaseEvents.ts

@@ -212,7 +212,7 @@ export interface ContextUpdateEventDetail<T> {
  * 
  * @template T The object that is being updated.
  */
-export class ContextUpdateEvent<T extends object> extends ContextEvent<ContextUpdateEventDetail<T>, ContextChangeRecord<T>> {
+export class ContextUpdateEvent<T extends object, U = T> extends ContextEvent<ContextUpdateEventDetail<T>, ContextChangeRecord<U>> {
   constructor(type: string, updateInfo: ContextUpdateEventDetail<T>) {
     super(type, updateInfo);
   }

package/src/events/models/ClientCertificateEvents.ts

@@ -1,4 +1,4 @@
-import { IClientCertificate, ICertificateIndex, IRequestCertificate } from '../../models/ClientCertificate.js';
+import { HttpCertificate, ICertificateCreateOptions } from '../../models/ClientCertificate.js';
 import { ContextReadEvent, ContextListEvent, ContextListOptions, ContextListResult, ContextDeleteEvent, ContextDeleteRecord, ContextUpdateEvent, ContextChangeRecord, ContextStateUpdateEvent, ContextStateDeleteEvent } from '../BaseEvents.js';
 import { ModelEventTypes } from './ModelEventTypes.js';
 
@@ -8,11 +8,10 @@ export class ClientCertificateEvents {
    *
    * @param target A node on which to dispatch the event.
    * @param id The id of the client certificate
-   * @param rev The revision of the client certificate. If not set then the latest revision is used.
    * @returns Promise resolved to a client certificate model.
    */
-  static async read(target: EventTarget, id: string, rev?: string): Promise<IRequestCertificate | undefined> {
-    const e = new ContextReadEvent<IClientCertificate>(ModelEventTypes.ClientCertificate.read, id, rev);
+  static async read(target: EventTarget, id: string): Promise<HttpCertificate | undefined> {
+    const e = new ContextReadEvent<HttpCertificate>(ModelEventTypes.ClientCertificate.read, id);
     target.dispatchEvent(e);
     return e.detail.result;
   }
@@ -24,8 +23,8 @@ export class ClientCertificateEvents {
    * @param opts Query options.
    * @returns The list result.
    */
-  static async list(target: EventTarget, opts?: ContextListOptions): Promise<ContextListResult<ICertificateIndex> | undefined> {
-    const e = new ContextListEvent<ICertificateIndex>(ModelEventTypes.ClientCertificate.list, opts);
+  static async list(target: EventTarget, opts?: ContextListOptions): Promise<ContextListResult<HttpCertificate> | undefined> {
+    const e = new ContextListEvent<HttpCertificate>(ModelEventTypes.ClientCertificate.list, opts);
     target.dispatchEvent(e);
     return e.detail.result;
   }
@@ -35,11 +34,10 @@ export class ClientCertificateEvents {
    *
    * @param target A node on which to dispatch the event.
    * @param id The id of the project to delete.
-   * @param rev The revision of the project. If not set then the latest revision is used.
    * @returns Promise resolved to a new revision after delete.
    */
-  static async delete(target: EventTarget, id: string, rev?: string): Promise<ContextDeleteRecord | undefined> {
-    const e = new ContextDeleteEvent(ModelEventTypes.ClientCertificate.delete, id, undefined, rev);
+  static async delete(target: EventTarget, id: string): Promise<ContextDeleteRecord | undefined> {
+    const e = new ContextDeleteEvent(ModelEventTypes.ClientCertificate.delete, id, undefined);
     target.dispatchEvent(e);
     return e.detail.result;
   }
@@ -51,8 +49,8 @@ export class ClientCertificateEvents {
    * @param item The certificate object.
    * @returns Promise resolved to the change record
    */
-  static async insert(target: EventTarget, item: IClientCertificate): Promise<ContextChangeRecord<ICertificateIndex> | undefined> {
-    const e = new ContextUpdateEvent<IClientCertificate>(ModelEventTypes.ClientCertificate.insert, { item, });
+  static async insert(target: EventTarget, item: ICertificateCreateOptions): Promise<ContextChangeRecord<HttpCertificate> | undefined> {
+    const e = new ContextUpdateEvent<ICertificateCreateOptions, HttpCertificate>(ModelEventTypes.ClientCertificate.insert, { item, });
     target.dispatchEvent(e);
     return e.detail.result;
   }
@@ -69,8 +67,8 @@ class StateEvents {
    * @param target A node on which to dispatch the event.
    * @param record Change record
    */
-  static update(target: EventTarget, record: ContextChangeRecord<ICertificateIndex>): void {
-    const e = new ContextStateUpdateEvent<ICertificateIndex>(ModelEventTypes.ClientCertificate.State.update, record);
+  static update(target: EventTarget, record: ContextChangeRecord<HttpCertificate>): void {
+    const e = new ContextStateUpdateEvent<HttpCertificate>(ModelEventTypes.ClientCertificate.State.update, record);
     target.dispatchEvent(e);
   }
 

package/src/events/models/ModelEventTypes.ts

@@ -10,38 +10,4 @@ export const ModelEventTypes = {
       delete: 'storestateclientcertificatedelete',
     }),
   }),
-  Project: Object.freeze({
-    create: 'storeprojectcreate',
-    read: 'storeprojectread',
-    update: 'storeprojectupdate',
-    delete: 'storeprojectdelete',
-    /** 
-     * Moves objects inside a project between position and/or folders.
-     */
-    move: 'storeprojectmove',
-    /** 
-     * Makes a copy of the project and stores it as new.
-     */
-    clone: 'storeprojectclone',
-    listAll: 'storeprojectlistall', // without pagination
-    Folder: Object.freeze({
-      create: 'storeprojectfoldercreate',
-      delete: 'storeprojectfolderdelete',
-      update: 'storeprojectfolderupdate',
-    }),
-    Request: Object.freeze({
-      create: 'storeprojectrequestcreate',
-      delete: 'storeprojectrequestdelete',
-      update: 'storeprojectrequestupdate',
-    }),
-    Environment: Object.freeze({
-      create: 'storeprojectenvironmentcreate',
-      delete: 'storeprojectenvironmentdelete',
-      update: 'storeprojectenvironmentupdate',
-    }),
-    State: Object.freeze({
-      update: 'storeprojectstateupdate',
-      delete: 'storeprojectstatedelete',
-    })
-  }),
 }

package/src/events/models/ModelEvents.ts

@@ -1,7 +1,5 @@
 import { ClientCertificateEvents } from './ClientCertificateEvents.js';
-import { ProjectEvents } from './ProjectEvents.js';
 
 export const ModelEvents = Object.freeze({
-  Project: ProjectEvents,
   ClientCertificate: ClientCertificateEvents,
 });

package/src/lib/Buffer.ts

@@ -0,0 +1,48 @@
+/**
+ * Converts base64 string to Uint8Array.
+ * 
+ * @returns The restored array view.
+ */
+export function base64ToBuffer(str: string): Uint8Array {
+  const asciiString = atob(str);
+  return new Uint8Array([...asciiString].map((char) => char.charCodeAt(0)));
+}
+
+/**
+ * Converts incoming data to base64 string.
+ * 
+ * @returns Safe to store string.
+ */
+export function bufferToBase64(view: Buffer | Uint8Array): string {
+  const str = view.reduce(
+    (data, byte) => data + String.fromCharCode(byte),
+    ''
+  );
+  return btoa(str);
+}
+
+/**
+ * Reads file as ArrayBuffer
+ */
+export function fileToBuffer(blob: Blob): Promise<Uint8Array> {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onload = (): void => { resolve(new Uint8Array(reader.result as ArrayBuffer)); };
+    /* istanbul ignore next */
+    reader.onerror = (): void => { reject(new Error('Unable to read file')); };
+    reader.readAsArrayBuffer(blob);
+  });
+}
+
+/**
+ * Reads file as string
+ */
+export function fileToString(blob: Blob): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onload = (): void => { resolve(reader.result as string); };
+    /* istanbul ignore next */
+    reader.onerror = (): void => { reject(new Error('Unable to read file')); };
+    reader.readAsText(blob);
+  });
+}

package/src/lib/definitions/HttpDefinitions.ts

@@ -0,0 +1,63 @@
+import { requestHeaders, responseHeaders, statusCodes, IHeaderDefinition, IStatusCodeDefinition } from '../headers/HeadersData.js';
+
+/**
+ * Queries for headers containing a `query`. If query is not set
+ * (value is falsy) then it returns all headers definitions array.
+ *
+ * @param query A query to search for in the `key` field of the headers array.
+ * @param type If this equals `request` then it will look in the request headers array. Is the response headers list otherwise.
+ * @returns Array of the headers of selected `type` matched a `query` in a header's `key` field.
+ */
+export function queryHeaders(type: 'request' | 'response', query?: string): IHeaderDefinition[] {
+  const headers = type === 'request' ? requestHeaders : responseHeaders;
+  if (!query) {
+    return headers;
+  }
+  const lowerQuery = query.trim().toLowerCase();
+  return headers.filter(
+    (item) => item.key.toLowerCase().indexOf(lowerQuery) !== -1
+  );
+}
+
+/**
+ * Queries for request headers that contains a `query`. If query is
+ * not set (value is falsy) then it returns all headers definitions array.
+ *
+ * @param name A header name to look for. It will match a header where the header name contains the `name` param.
+ * @returns Array of the request headers matched `name` in the header's `key` field.
+ */
+export function queryRequestHeaders(name?: string): IHeaderDefinition[] {
+  return queryHeaders('request', name);
+}
+
+/**
+ * Queries for response headers that contains a `query`. If query is
+ * not set (value is falsy) then it returns all headers definitions array.
+ *
+ * @param name A header name to look for. It will match a header where the header name contains the `name` param.
+ * @returns Array of the response headers matched `name` in the header's `key` field.
+ */
+export function queryResponseHeaders(name?: string): IHeaderDefinition[] {
+  return queryHeaders('response', name);
+}
+
+/**
+ * Convenient function to look for a status code in the array.
+ *
+ * @param codeArg The status code to look for.
+ * @returns Status code definition or null if not found.
+ */
+export function getStatusCode(codeArg: number): IStatusCodeDefinition|IStatusCodeDefinition[]|null {
+  if (!codeArg) {
+    return statusCodes;
+  }
+  const code = Number(codeArg);
+  if (Number.isNaN(code)) {
+    return null;
+  }
+  const res = statusCodes.filter((item) => item.key === code);
+  if (!res.length) {
+    return null;
+  }
+  return res[0];
+}

package/src/lib/headers/Headers.ts

@@ -55,8 +55,8 @@ function* headersStringToList(string: string): Generator<string[]> {
     if (sepPosition === -1) {
       yield [line, ''];
     } else {
-      const name = line.substr(0, sepPosition);
-      const value = line.substr(sepPosition + 1).trim();
+      const name = line.substring(0, sepPosition);
+      const value = line.substring(sepPosition + 1).trim();
       yield [name, value];
     }
   }
@@ -70,7 +70,8 @@ export class Headers {
   /**
    * The keys are canonical keys and the values are the input values.
    */
-  map: Record<string, RawValue> = {};
+  _map: Record<string, RawValue> = {};
+
   /**
    * @param headers The headers to parse.
    */
@@ -99,7 +100,7 @@ export class Headers {
     }
     const normalizedName = normalizeName(name);
     value = value ? normalizeValue(value) : '';
-    let item = this.map[normalizedName];
+    let item = this._map[normalizedName];
     if (item) {
       const oldValue = item.value;
       item.value = oldValue ? `${oldValue},${value}` : value;
@@ -109,7 +110,7 @@ export class Headers {
         value,
       };
     }
-    this.map[normalizedName] = item;
+    this._map[normalizedName] = item;
   }
 
   /**
@@ -117,7 +118,7 @@ export class Headers {
    * @param name The header name
    */
   delete(name: string): void {
-    delete this.map[normalizeName(name)];
+    delete this._map[normalizeName(name)];
   }
 
   /**
@@ -126,14 +127,14 @@ export class Headers {
    */
   get(name: string): string | undefined {
     name = normalizeName(name);
-    return this.has(name) ? this.map[name].value : undefined;
+    return this.has(name) ? this._map[name].value : undefined;
   }
 
   /**
    * Checks if the header exists.
    */
   has(name: string): boolean {
-    return Object.prototype.hasOwnProperty.call(this.map, normalizeName(name));
+    return Object.prototype.hasOwnProperty.call(this._map, normalizeName(name));
   }
 
   /**
@@ -141,7 +142,7 @@ export class Headers {
    */
   set(name: string, value: string): void {
     const normalizedName = normalizeName(name);
-    this.map[normalizedName] = {
+    this._map[normalizedName] = {
       value: normalizeValue(value),
       name,
     };
@@ -151,11 +152,28 @@ export class Headers {
    * Iterates over each header.
    */
   forEach(callback: (value: string, name: string, headers: Headers) => void, thisArg?: unknown): void {
-    for (const name in this.map) {
-      if (Object.prototype.hasOwnProperty.call(this.map, name)) {
-        callback.call(thisArg, this.map[name].value, this.map[name].name, this);
-      }
+    const keys = Object.keys(this._map);
+    keys.forEach((key) => {
+      const item = this._map[key];
+      callback.call(thisArg, item.value, item.name, this);
+    });
+  }
+
+  /**
+   * Calls a defined callback function on each element of the headers, and returns an array that contains the results.
+   * 
+   * @param callbackfn A function that accepts up to two arguments. The map method calls the callbackfn function one time for each header.
+   * @param thisArg An object to which the `this` keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
+   */
+  map<U>(callbackfn: (name: string, value: string) => U, thisArg?: any): U[] {
+    const keys = Object.keys(this._map);
+    const results: U[] = [];
+    for (const name of keys) {
+      const item = this._map[name];
+      const cbReturn = callbackfn.call(thisArg, item.value, item.name);
+      results.push(cbReturn);
     }
+    return results;
   }
 
   /**
@@ -163,13 +181,15 @@ export class Headers {
    */
   toString(): string {
     const result: string[] = [];
-    this.forEach((value, name) => {
-      let tmp = `${name}: `;
-      if (value) {
-        tmp += value;
+    const keys = Object.keys(this._map);
+    for (const name of keys) {
+      const item = this._map[name];
+      let tmp = `${item.name}: `;
+      if (item.value) {
+        tmp += item.value;
       }
       result.push(tmp);
-    });
+    }
     return result.join('\n');
   }
 
@@ -177,10 +197,9 @@ export class Headers {
    * Iterates over keys.
    */
   *keys(): IterableIterator<string> {
-    for (const name in this.map) {
-      if (Object.prototype.hasOwnProperty.call(this.map, name)) {
-        yield this.map[name].name;
-      }
+    const keys = Object.keys(this._map);
+    for (const name of keys) {
+      yield this._map[name].name;
     }
   }
 
@@ -188,10 +207,9 @@ export class Headers {
    * Iterates over values.
    */
   *values(): IterableIterator<string> {
-    for (const name in this.map) {
-      if (Object.prototype.hasOwnProperty.call(this.map, name)) {
-        yield this.map[name].value;
-      }
+    const keys = Object.keys(this._map);
+    for (const name of keys) {
+      yield this._map[name].value;
     }
   }
 
@@ -199,10 +217,9 @@ export class Headers {
    * Iterates over headers.
    */
   *entries(): IterableIterator<string[]> {
-    for (const name in this.map) {
-      if (Object.prototype.hasOwnProperty.call(this.map, name)) {
-        yield [this.map[name].name, this.map[name].value];
-      }
+    const keys = Object.keys(this._map);
+    for (const name of keys) {
+      yield [this._map[name].name, this._map[name].value];
     }
   }
 
@@ -210,10 +227,9 @@ export class Headers {
    * Iterates over headers.
    */
   *[Symbol.iterator](): IterableIterator<string[]> {
-    for (const name in this.map) {
-      if (Object.prototype.hasOwnProperty.call(this.map, name)) {
-        yield [this.map[name].name, this.map[name].value];
-      }
+    const keys = Object.keys(this._map);
+    for (const name of keys) {
+      yield [this._map[name].name, this._map[name].value];
     }
   }
 }