@gjsify/fetch 0.3.13 → 0.3.15

package/lib/esm/request.js

@@ -1,291 +1,287 @@
-import GLib from "@girs/glib-2.0";
+import { isAbortSignal } from "./utils/is.js";
+import Body, { clone, extractContentType, getTotalBytes } from "./body.js";
+import Headers from "./headers.js";
+import { inputStreamToReadable, soupSendAsync } from "./utils/soup-helpers.js";
+import { DEFAULT_REFERRER_POLICY, determineRequestsReferrer, validateReferrerPolicy } from "./utils/referrer.js";
+import { URL } from "@gjsify/url";
 import Soup from "@girs/soup-3.0";
+import GLib from "@girs/glib-2.0";
 import Gio from "@girs/gio-2.0";
-import { soupSendAsync, inputStreamToReadable } from "./utils/soup-helpers.js";
-import { URL } from "@gjsify/url";
-import Headers from "./headers.js";
-import Body, { clone, extractContentType, getTotalBytes } from "./body.js";
-import { isAbortSignal } from "./utils/is.js";
-import {
-  validateReferrerPolicy,
-  determineRequestsReferrer,
-  DEFAULT_REFERRER_POLICY
-} from "./utils/referrer.js";
-const INTERNALS = /* @__PURE__ */ Symbol("Request internals");
+
+//#region src/request.ts
+const INTERNALS = Symbol("Request internals");
+/**
+* Check if `obj` is an instance of Request.
+*/
 const isRequest = (obj) => {
-  return typeof obj === "object" && typeof obj.url === "string";
+	return typeof obj === "object" && typeof obj.url === "string";
+};
+/** This Fetch API interface represents a resource request. */
+var Request = class Request extends Body {
+	/** Returns the cache mode associated with request, which is a string indicating how the request will interact with the browser's cache when fetching. */
+	cache;
+	/** Returns the credentials mode associated with request, which is a string indicating whether credentials will be sent with the request always, never, or only when sent to a same-origin URL. */
+	credentials;
+	/** Returns the kind of resource requested by request, e.g., "document" or "script". */
+	destination;
+	/** Returns a Headers object consisting of the headers associated with request. Note that headers added in the network layer by the user agent will not be accounted for in this object, e.g., the "Host" header. */
+	get headers() {
+		return this[INTERNALS].headers;
+	}
+	/** Returns request's subresource integrity metadata, which is a cryptographic hash of the resource being fetched. Its value consists of multiple hashes separated by whitespace. [SRI] */
+	integrity;
+	/** Returns a boolean indicating whether or not request can outlive the global in which it was created. */
+	keepalive;
+	/** Returns request's HTTP method, which is "GET" by default. */
+	get method() {
+		return this[INTERNALS].method;
+	}
+	/** Returns the mode associated with request, which is a string indicating whether the request will use CORS, or will be restricted to same-origin URLs. */
+	mode;
+	/** Returns the redirect mode associated with request, which is a string indicating how redirects for the request will be handled during fetching. A request will follow redirects by default. */
+	get redirect() {
+		return this[INTERNALS].redirect;
+	}
+	/**
+	* Returns the referrer of request.
+	* Its value can be a same-origin URL if explicitly set in init, the empty string to indicate no referrer, and "about:client" when defaulting to the global's default.
+	* This is used during fetching to determine the value of the `Referer` header of the request being made.
+	* @see https://fetch.spec.whatwg.org/#dom-request-referrer
+	**/
+	get referrer() {
+		if (this[INTERNALS].referrer === "no-referrer") {
+			return "";
+		}
+		if (this[INTERNALS].referrer === "client") {
+			return "about:client";
+		}
+		if (this[INTERNALS].referrer) {
+			return this[INTERNALS].referrer.toString();
+		}
+		return undefined;
+	}
+	/** Returns the referrer policy associated with request. This is used during fetching to compute the value of the request's referrer. */
+	get referrerPolicy() {
+		return this[INTERNALS].referrerPolicy;
+	}
+	set referrerPolicy(referrerPolicy) {
+		this[INTERNALS].referrerPolicy = validateReferrerPolicy(referrerPolicy);
+	}
+	/** Returns the signal associated with request, which is an AbortSignal object indicating whether or not request has been aborted, and its abort event handler. */
+	get signal() {
+		return this[INTERNALS].signal;
+	}
+	/** Returns the URL of request as a string. */
+	get url() {
+		return this[INTERNALS].parsedURL.toString();
+	}
+	get _uri() {
+		return GLib.Uri.parse(this.url, GLib.UriFlags.NONE);
+	}
+	get _session() {
+		return this[INTERNALS].session;
+	}
+	get _message() {
+		return this[INTERNALS].message;
+	}
+	get _inputStream() {
+		return this[INTERNALS].inputStream;
+	}
+	get [Symbol.toStringTag]() {
+		return "Request";
+	}
+	[INTERNALS];
+	follow;
+	compress = false;
+	counter = 0;
+	agent = "";
+	highWaterMark = 16384;
+	insecureHTTPParser = false;
+	constructor(input, init) {
+		const inputRL = input;
+		const initRL = init || {};
+		let parsedURL;
+		let requestObj = {};
+		if (isRequest(input)) {
+			parsedURL = new URL(inputRL.url);
+			requestObj = inputRL;
+		} else {
+			parsedURL = new URL(input);
+		}
+		if (parsedURL.username !== "" || parsedURL.password !== "") {
+			throw new TypeError(`${parsedURL} is an url with embedded credentials.`);
+		}
+		let method = initRL.method || requestObj.method || "GET";
+		if (/^(delete|get|head|options|post|put)$/i.test(method)) {
+			method = method.toUpperCase();
+		}
+		if ((init?.body != null || isRequest(input) && inputRL.body !== null) && (method === "GET" || method === "HEAD")) {
+			throw new TypeError("Request with GET/HEAD method cannot have body");
+		}
+		const inputBody = init?.body ? init.body : isRequest(input) && inputRL.body !== null ? clone(input) : null;
+		super(inputBody, { size: initRL.size || 0 });
+		const headers = new Headers(init?.headers || inputRL.headers || {});
+		if (inputBody !== null && !headers.has("Content-Type")) {
+			const contentType = extractContentType(inputBody, this);
+			if (contentType) {
+				headers.set("Content-Type", contentType);
+			}
+		}
+		let signal = isRequest(input) ? inputRL.signal : null;
+		if (init && "signal" in init) {
+			signal = init.signal;
+		}
+		if (signal != null && !isAbortSignal(signal)) {
+			throw new TypeError("Expected signal to be an instanceof AbortSignal or EventTarget");
+		}
+		let referrer = init?.referrer == null ? inputRL.referrer : init.referrer;
+		if (referrer === "") {
+			referrer = "no-referrer";
+		} else if (referrer) {
+			const parsedReferrer = new URL(referrer);
+			referrer = /^about:(\/\/)?client$/.test(parsedReferrer.toString()) ? "client" : parsedReferrer;
+		} else {
+			referrer = undefined;
+		}
+		const scheme = parsedURL.protocol;
+		let session = null;
+		let message = null;
+		if (scheme === "http:" || scheme === "https:") {
+			session = new Soup.Session();
+			message = new Soup.Message({
+				method,
+				uri: GLib.Uri.parse(parsedURL.toString(), GLib.UriFlags.NONE)
+			});
+		}
+		this[INTERNALS] = {
+			method,
+			redirect: init?.redirect || inputRL.redirect || "follow",
+			headers,
+			parsedURL,
+			signal,
+			referrer,
+			referrerPolicy: "",
+			session,
+			message
+		};
+		this.follow = initRL.follow === undefined ? inputRL.follow === undefined ? 20 : inputRL.follow : initRL.follow;
+		this.compress = initRL.compress === undefined ? inputRL.compress === undefined ? true : inputRL.compress : initRL.compress;
+		this.counter = initRL.counter || inputRL.counter || 0;
+		this.agent = initRL.agent || inputRL.agent;
+		this.highWaterMark = initRL.highWaterMark || inputRL.highWaterMark || 16384;
+		this.insecureHTTPParser = initRL.insecureHTTPParser || inputRL.insecureHTTPParser || false;
+		this.referrerPolicy = init?.referrerPolicy || inputRL.referrerPolicy || "";
+	}
+	/**
+	* Send the request using Soup.
+	*/
+	async _send(options) {
+		const { session, message } = this[INTERNALS];
+		if (!session || !message) {
+			throw new Error("Cannot send request: no Soup session (non-HTTP URL?)");
+		}
+		try {
+			session.remove_feature_by_type(Soup.ContentDecoder.$gtype);
+		} catch {}
+		options.headers._appendToSoupMessage(message);
+		const rawBuf = this._rawBodyBuffer;
+		if (rawBuf !== null && rawBuf.byteLength > 0) {
+			const contentType = options.headers.get("content-type") || null;
+			message.set_request_body_from_bytes(contentType, new GLib.Bytes(rawBuf));
+		}
+		const cancellable = new Gio.Cancellable();
+		this[INTERNALS].inputStream = await soupSendAsync(session, message, GLib.PRIORITY_DEFAULT, cancellable);
+		this[INTERNALS].readable = inputStreamToReadable(this[INTERNALS].inputStream);
+		return {
+			inputStream: this[INTERNALS].inputStream,
+			readable: this[INTERNALS].readable,
+			cancellable
+		};
+	}
+	/**
+	* Clone this request
+	*/
+	clone() {
+		return new Request(this);
+	}
+	async arrayBuffer() {
+		return super.arrayBuffer();
+	}
+	async blob() {
+		return super.blob();
+	}
+	async formData() {
+		return super.formData();
+	}
+	async json() {
+		return super.json();
+	}
+	async text() {
+		return super.text();
+	}
 };
-class Request extends Body {
-  /** Returns the cache mode associated with request, which is a string indicating how the request will interact with the browser's cache when fetching. */
-  cache;
-  /** Returns the credentials mode associated with request, which is a string indicating whether credentials will be sent with the request always, never, or only when sent to a same-origin URL. */
-  credentials;
-  /** Returns the kind of resource requested by request, e.g., "document" or "script". */
-  destination;
-  /** Returns a Headers object consisting of the headers associated with request. Note that headers added in the network layer by the user agent will not be accounted for in this object, e.g., the "Host" header. */
-  get headers() {
-    return this[INTERNALS].headers;
-  }
-  /** Returns request's subresource integrity metadata, which is a cryptographic hash of the resource being fetched. Its value consists of multiple hashes separated by whitespace. [SRI] */
-  integrity;
-  /** Returns a boolean indicating whether or not request can outlive the global in which it was created. */
-  keepalive;
-  /** Returns request's HTTP method, which is "GET" by default. */
-  get method() {
-    return this[INTERNALS].method;
-  }
-  /** Returns the mode associated with request, which is a string indicating whether the request will use CORS, or will be restricted to same-origin URLs. */
-  mode;
-  /** Returns the redirect mode associated with request, which is a string indicating how redirects for the request will be handled during fetching. A request will follow redirects by default. */
-  get redirect() {
-    return this[INTERNALS].redirect;
-  }
-  /**
-   * Returns the referrer of request.
-   * Its value can be a same-origin URL if explicitly set in init, the empty string to indicate no referrer, and "about:client" when defaulting to the global's default.
-   * This is used during fetching to determine the value of the `Referer` header of the request being made.
-   * @see https://fetch.spec.whatwg.org/#dom-request-referrer
-   **/
-  get referrer() {
-    if (this[INTERNALS].referrer === "no-referrer") {
-      return "";
-    }
-    if (this[INTERNALS].referrer === "client") {
-      return "about:client";
-    }
-    if (this[INTERNALS].referrer) {
-      return this[INTERNALS].referrer.toString();
-    }
-    return void 0;
-  }
-  /** Returns the referrer policy associated with request. This is used during fetching to compute the value of the request's referrer. */
-  get referrerPolicy() {
-    return this[INTERNALS].referrerPolicy;
-  }
-  set referrerPolicy(referrerPolicy) {
-    this[INTERNALS].referrerPolicy = validateReferrerPolicy(referrerPolicy);
-  }
-  /** Returns the signal associated with request, which is an AbortSignal object indicating whether or not request has been aborted, and its abort event handler. */
-  get signal() {
-    return this[INTERNALS].signal;
-  }
-  /** Returns the URL of request as a string. */
-  get url() {
-    return this[INTERNALS].parsedURL.toString();
-  }
-  get _uri() {
-    return GLib.Uri.parse(this.url, GLib.UriFlags.NONE);
-  }
-  get _session() {
-    return this[INTERNALS].session;
-  }
-  get _message() {
-    return this[INTERNALS].message;
-  }
-  get _inputStream() {
-    return this[INTERNALS].inputStream;
-  }
-  get [Symbol.toStringTag]() {
-    return "Request";
-  }
-  [INTERNALS];
-  // Node-fetch-only options
-  follow;
-  compress = false;
-  counter = 0;
-  agent = "";
-  highWaterMark = 16384;
-  insecureHTTPParser = false;
-  constructor(input, init) {
-    const inputRL = input;
-    const initRL = init || {};
-    let parsedURL;
-    let requestObj = {};
-    if (isRequest(input)) {
-      parsedURL = new URL(inputRL.url);
-      requestObj = inputRL;
-    } else {
-      parsedURL = new URL(input);
-    }
-    if (parsedURL.username !== "" || parsedURL.password !== "") {
-      throw new TypeError(`${parsedURL} is an url with embedded credentials.`);
-    }
-    let method = initRL.method || requestObj.method || "GET";
-    if (/^(delete|get|head|options|post|put)$/i.test(method)) {
-      method = method.toUpperCase();
-    }
-    if ((init?.body != null || isRequest(input) && inputRL.body !== null) && (method === "GET" || method === "HEAD")) {
-      throw new TypeError("Request with GET/HEAD method cannot have body");
-    }
-    const inputBody = init?.body ? init.body : isRequest(input) && inputRL.body !== null ? clone(input) : null;
-    super(inputBody, {
-      size: initRL.size || 0
-    });
-    const headers = new Headers(init?.headers || inputRL.headers || {});
-    if (inputBody !== null && !headers.has("Content-Type")) {
-      const contentType = extractContentType(inputBody, this);
-      if (contentType) {
-        headers.set("Content-Type", contentType);
-      }
-    }
-    let signal = isRequest(input) ? inputRL.signal : null;
-    if (init && "signal" in init) {
-      signal = init.signal;
-    }
-    if (signal != null && !isAbortSignal(signal)) {
-      throw new TypeError("Expected signal to be an instanceof AbortSignal or EventTarget");
-    }
-    let referrer = init?.referrer == null ? inputRL.referrer : init.referrer;
-    if (referrer === "") {
-      referrer = "no-referrer";
-    } else if (referrer) {
-      const parsedReferrer = new URL(referrer);
-      referrer = /^about:(\/\/)?client$/.test(parsedReferrer.toString()) ? "client" : parsedReferrer;
-    } else {
-      referrer = void 0;
-    }
-    const scheme = parsedURL.protocol;
-    let session = null;
-    let message = null;
-    if (scheme === "http:" || scheme === "https:") {
-      session = new Soup.Session();
-      message = new Soup.Message({
-        method,
-        uri: GLib.Uri.parse(parsedURL.toString(), GLib.UriFlags.NONE)
-      });
-    }
-    this[INTERNALS] = {
-      method,
-      redirect: init?.redirect || inputRL.redirect || "follow",
-      headers,
-      parsedURL,
-      signal,
-      referrer,
-      referrerPolicy: "",
-      session,
-      message
-    };
-    this.follow = initRL.follow === void 0 ? inputRL.follow === void 0 ? 20 : inputRL.follow : initRL.follow;
-    this.compress = initRL.compress === void 0 ? inputRL.compress === void 0 ? true : inputRL.compress : initRL.compress;
-    this.counter = initRL.counter || inputRL.counter || 0;
-    this.agent = initRL.agent || inputRL.agent;
-    this.highWaterMark = initRL.highWaterMark || inputRL.highWaterMark || 16384;
-    this.insecureHTTPParser = initRL.insecureHTTPParser || inputRL.insecureHTTPParser || false;
-    this.referrerPolicy = init?.referrerPolicy || inputRL.referrerPolicy || "";
-  }
-  /**
-   * Send the request using Soup.
-   */
-  async _send(options) {
-    const { session, message } = this[INTERNALS];
-    if (!session || !message) {
-      throw new Error("Cannot send request: no Soup session (non-HTTP URL?)");
-    }
-    try {
-      session.remove_feature_by_type(Soup.ContentDecoder.$gtype);
-    } catch {
-    }
-    options.headers._appendToSoupMessage(message);
-    const rawBuf = this._rawBodyBuffer;
-    if (rawBuf !== null && rawBuf.byteLength > 0) {
-      const contentType = options.headers.get("content-type") || null;
-      message.set_request_body_from_bytes(contentType, new GLib.Bytes(rawBuf));
-    }
-    const cancellable = new Gio.Cancellable();
-    this[INTERNALS].inputStream = await soupSendAsync(session, message, GLib.PRIORITY_DEFAULT, cancellable);
-    this[INTERNALS].readable = inputStreamToReadable(this[INTERNALS].inputStream);
-    return {
-      inputStream: this[INTERNALS].inputStream,
-      readable: this[INTERNALS].readable,
-      cancellable
-    };
-  }
-  /**
-   * Clone this request
-   */
-  clone() {
-    return new Request(this);
-  }
-  async arrayBuffer() {
-    return super.arrayBuffer();
-  }
-  async blob() {
-    return super.blob();
-  }
-  async formData() {
-    return super.formData();
-  }
-  async json() {
-    return super.json();
-  }
-  async text() {
-    return super.text();
-  }
-}
 Object.defineProperties(Request.prototype, {
-  method: { enumerable: true },
-  url: { enumerable: true },
-  headers: { enumerable: true },
-  redirect: { enumerable: true },
-  clone: { enumerable: true },
-  signal: { enumerable: true },
-  referrer: { enumerable: true },
-  referrerPolicy: { enumerable: true }
+	method: { enumerable: true },
+	url: { enumerable: true },
+	headers: { enumerable: true },
+	redirect: { enumerable: true },
+	clone: { enumerable: true },
+	signal: { enumerable: true },
+	referrer: { enumerable: true },
+	referrerPolicy: { enumerable: true }
 });
-var request_default = Request;
+/**
+* @param request
+*/
 const getSoupRequestOptions = (request) => {
-  const { parsedURL } = request[INTERNALS];
-  const headers = new Headers(request[INTERNALS].headers);
-  if (!headers.has("Accept")) {
-    headers.set("Accept", "*/*");
-  }
-  let contentLengthValue = null;
-  if (request.body === null && /^(post|put)$/i.test(request.method)) {
-    contentLengthValue = "0";
-  }
-  if (request.body !== null) {
-    const totalBytes = getTotalBytes(request);
-    if (typeof totalBytes === "number" && !Number.isNaN(totalBytes)) {
-      contentLengthValue = String(totalBytes);
-    }
-  }
-  if (contentLengthValue) {
-    headers.set("Content-Length", contentLengthValue);
-  }
-  if (request.referrerPolicy === "") {
-    request.referrerPolicy = DEFAULT_REFERRER_POLICY;
-  }
-  if (request.referrer && request.referrer !== "no-referrer") {
-    request[INTERNALS].referrer = determineRequestsReferrer(request);
-  } else {
-    request[INTERNALS].referrer = "no-referrer";
-  }
-  if (request[INTERNALS].referrer instanceof URL) {
-    headers.set("Referer", request.referrer);
-  }
-  if (!headers.has("User-Agent")) {
-    headers.set("User-Agent", "gjsify-fetch");
-  }
-  if (request.compress && !headers.has("Accept-Encoding")) {
-    headers.set("Accept-Encoding", "gzip, deflate");
-  }
-  let { agent } = request;
-  if (typeof agent === "function") {
-    agent = agent(parsedURL);
-  }
-  if (!headers.has("Connection") && !agent) {
-    headers.set("Connection", "close");
-  }
-  const options = {
-    headers
-  };
-  return {
-    parsedURL,
-    options
-  };
-};
-export {
-  Request,
-  request_default as default,
-  getSoupRequestOptions
+	const { parsedURL } = request[INTERNALS];
+	const headers = new Headers(request[INTERNALS].headers);
+	if (!headers.has("Accept")) {
+		headers.set("Accept", "*/*");
+	}
+	let contentLengthValue = null;
+	if (request.body === null && /^(post|put)$/i.test(request.method)) {
+		contentLengthValue = "0";
+	}
+	if (request.body !== null) {
+		const totalBytes = getTotalBytes(request);
+		if (typeof totalBytes === "number" && !Number.isNaN(totalBytes)) {
+			contentLengthValue = String(totalBytes);
+		}
+	}
+	if (contentLengthValue) {
+		headers.set("Content-Length", contentLengthValue);
+	}
+	if (request.referrerPolicy === "") {
+		request.referrerPolicy = DEFAULT_REFERRER_POLICY;
+	}
+	if (request.referrer && request.referrer !== "no-referrer") {
+		request[INTERNALS].referrer = determineRequestsReferrer(request);
+	} else {
+		request[INTERNALS].referrer = "no-referrer";
+	}
+	if (request[INTERNALS].referrer instanceof URL) {
+		headers.set("Referer", request.referrer);
+	}
+	if (!headers.has("User-Agent")) {
+		headers.set("User-Agent", "gjsify-fetch");
+	}
+	if (request.compress && !headers.has("Accept-Encoding")) {
+		headers.set("Accept-Encoding", "gzip, deflate");
+	}
+	let { agent } = request;
+	if (typeof agent === "function") {
+		agent = agent(parsedURL);
+	}
+	if (!headers.has("Connection") && !agent) {
+		headers.set("Connection", "close");
+	}
+	const options = { headers };
+	return {
+		parsedURL,
+		options
+	};
 };
+
+//#endregion
+export { Request, Request as default, getSoupRequestOptions };