Skip to content

Support HTTP Caching #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lramos15 wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −21
Open

Support HTTP Caching #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,13 +634,13 @@ export function createFetchPatch(params: ProxyAgentParams, originalFetch: typeof
}

let previousAddCertsAgent: boolean | undefined = undefined;
let defaultAgent: undici.Agent | undefined = undefined;
let agentCache = new WeakMap<undici.Dispatcher, undici.Agent>();
function getAgent(originalDispatcher: undici.Dispatcher | undefined, allowH2: boolean | undefined, requestCA: string | Buffer | (string | Buffer)[] | undefined, currentAddCerts: boolean): undici.Agent | undefined {
let defaultAgent: undici.Dispatcher.ComposedDispatcher | undefined = undefined;
let agentCache = new WeakMap<undici.Dispatcher, undici.Dispatcher.ComposedDispatcher>();
function getAgent(originalDispatcher: undici.Dispatcher | undefined, allowH2: boolean | undefined, requestCA: string | Buffer | (string | Buffer)[] | undefined, currentAddCerts: boolean): undici.Dispatcher.ComposedDispatcher | undefined {
if (previousAddCertsAgent !== currentAddCerts) {
previousAddCertsAgent = currentAddCerts;
defaultAgent = undefined;
agentCache = new WeakMap<undici.Dispatcher, undici.Agent>();
agentCache = new WeakMap<undici.Dispatcher, undici.Dispatcher.ComposedDispatcher>();
}
if (!originalDispatcher) {
if (!defaultAgent) {
Expand All @@ -659,13 +659,13 @@ function createAgent(allowH2: boolean | undefined, requestCA: string | Buffer |
return new undici.Agent({
allowH2,
connect: { ca: requestCA },
});
}).compose(undici.interceptors.cache({ type: 'private' }));
}

let previousAddCertsProxyAgent: boolean | undefined = undefined;
let previousLookupProxyAuthorization: LookupProxyAuthorization | undefined = undefined;
let defaultProxyAgents = new Map<string, undici.ProxyAgent>();
let proxyAgentCache = new WeakMap<undici.Dispatcher, Map<string, undici.ProxyAgent>>();
let defaultProxyAgents = new Map<string, undici.Dispatcher.ComposedDispatcher>();
let proxyAgentCache = new WeakMap<undici.Dispatcher, Map<string, undici.Dispatcher.ComposedDispatcher>>();
function getProxyAgent(
params: ProxyAgentParams,
originalDispatcher: undici.Dispatcher | undefined,
Expand All @@ -674,13 +674,13 @@ function getProxyAgent(
requestCA: string | Buffer | (string | Buffer)[] | undefined,
proxyCA: string | Buffer | (string | Buffer)[] | undefined,
currentAddCerts: boolean,
): undici.ProxyAgent {
): undici.Dispatcher.ComposedDispatcher {
const shouldClearCache = previousAddCertsProxyAgent !== currentAddCerts || previousLookupProxyAuthorization !== params.lookupProxyAuthorization;
if (shouldClearCache) {
previousAddCertsProxyAgent = currentAddCerts;
previousLookupProxyAuthorization = params.lookupProxyAuthorization;
defaultProxyAgents = new Map<string, undici.ProxyAgent>();
proxyAgentCache = new WeakMap<undici.Dispatcher, Map<string, undici.ProxyAgent>>();
defaultProxyAgents = new Map<string, undici.Dispatcher.ComposedDispatcher>();
proxyAgentCache = new WeakMap<undici.Dispatcher, Map<string, undici.Dispatcher.ComposedDispatcher>>();
}

if (!originalDispatcher) {
Expand All @@ -692,7 +692,7 @@ function getProxyAgent(

let dispatcherCache = proxyAgentCache.get(originalDispatcher);
if (!dispatcherCache) {
dispatcherCache = new Map<string, undici.ProxyAgent>();
dispatcherCache = new Map<string, undici.Dispatcher.ComposedDispatcher>();
proxyAgentCache.set(originalDispatcher, dispatcherCache);
}

Expand All @@ -708,7 +708,7 @@ function createProxyAgent(
allowH2: boolean | undefined,
requestCA: string | Buffer | (string | Buffer)[] | undefined,
proxyCA: string | Buffer | (string | Buffer)[] | undefined,
): undici.ProxyAgent {
): undici.Dispatcher.ComposedDispatcher {
return new undici.ProxyAgent({
uri: proxyURL,
allowH2,
Expand Down Expand Up @@ -783,7 +783,7 @@ function createProxyAgent(
})();
};
}),
});
}).compose(undici.interceptors.cache({ type: 'private' }));
}

export function createWebSocketPatch(params: ProxyAgentParams, originalWebSocket: typeof globalThis.WebSocket, resolveProxyURL: (url: string) => Promise<string | undefined>) {
Expand Down
Loading