Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
import { version } from "../version.ts";
import https from "node:https";
import http from "node:http";
import qs from "node:querystring";
import https from "https";
import http from "http";
import process from "node:process";
import { RequestTimeoutError } from "./errors.ts";
import { config } from "./config.ts";
import { createMultipartBody } from "./multipart.ts";

function stringifyParams(parameters: Record<string, unknown>): string {
const searchParams = new URLSearchParams();
for (const k of Object.keys(parameters)) {
const val = parameters[k];
if (val !== undefined && val !== null) {
searchParams.append(k, String(val));
} else if (val === null) {
searchParams.append(k, "");
}
}
return searchParams.toString();
}

/**
* This `_internals` object is needed to support stubbing/spying of
* certain functions in this file.
Expand Down Expand Up @@ -46,7 +58,7 @@ export function getSource() {

export function buildRequestOptions(
path: string,
parameters: qs.ParsedUrlQueryInput,
parameters: Record<string, unknown>,
): http.RequestOptions {
const clonedParams = { ...parameters };
for (const k in clonedParams) {
Expand All @@ -60,10 +72,11 @@ export function buildRequestOptions(
}
const basicOptions = {
..._internals.getHostnameAndPort(),
path: `${path}?${qs.stringify(clonedParams)}`,
path: `${path}?${stringifyParams(clonedParams)}`,
method: "GET",
};


return {
...config.requestOptions,
...(parameters.requestOptions as http.RequestOptions),
Expand All @@ -73,7 +86,7 @@ export function buildRequestOptions(

export function execute(
path: string,
parameters: qs.ParsedUrlQueryInput,
parameters: Record<string, unknown>,
timeout: number,
): Promise<string> {
const options = buildRequestOptions(path, {
Expand Down
5 changes: 2 additions & 3 deletions tests/utils_test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import http from "node:http";
import qs from "node:querystring";
import { loadSync } from "@std/dotenv";
import { afterAll, beforeAll, describe, it } from "@std/testing/bdd";
import { Stub, stub } from "@std/testing/mock";
Expand Down Expand Up @@ -124,7 +123,7 @@ describe("buildRequestOptions", () => {
const params = {
q: "coffee",
requestOptions: customOptions,
} as unknown as qs.ParsedUrlQueryInput;
} as unknown as Record<string, unknown>;

const options = await buildRequestOptions("/search", params);

Expand Down Expand Up @@ -179,7 +178,7 @@ describe("buildRequestOptions", () => {
const params = {
q: "coffee",
requestOptions: paramOptions,
} as unknown as qs.ParsedUrlQueryInput;
} as unknown as Record<string, unknown>;

const options = await buildRequestOptions("/search", params);

Expand Down