@qaick/http-executor 0.1.0-alpha.3 → 0.1.0-alpha.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -44,16 +44,31 @@ export class HttpExecutionSession {
44
44
  this.cookies = cookies;
45
45
  }
46
46
  async request(url, init) {
47
- const headers = { ...(init.headers ?? {}) };
48
- const cookieHeader = headerName(headers, 'cookie');
49
- const managed = this.cookies.header(url);
50
- const merged = mergeCookieHeaders(cookieHeader ? headers[cookieHeader] : undefined, managed);
51
- if (merged)
52
- headers[cookieHeader ?? 'cookie'] = merged;
53
- const response = await this.transport.request(url, { ...init, headers });
54
- const setCookie = response.headers && headerValue(response.headers, 'set-cookie');
55
- this.cookies.store(url, setCookie);
56
- return response;
47
+ let currentUrl = url;
48
+ let currentInit = { ...init };
49
+ for (let redirect = 0; redirect <= 10; redirect += 1) {
50
+ const headers = { ...(currentInit.headers ?? {}) };
51
+ const cookieHeader = headerName(headers, 'cookie');
52
+ const managed = this.cookies.header(currentUrl);
53
+ const merged = mergeCookieHeaders(cookieHeader ? headers[cookieHeader] : undefined, managed);
54
+ if (merged)
55
+ headers[cookieHeader ?? 'cookie'] = merged;
56
+ const response = await this.transport.request(currentUrl, { ...currentInit, headers });
57
+ const setCookie = response.headers && headerValue(response.headers, 'set-cookie');
58
+ this.cookies.store(currentUrl, setCookie);
59
+ if (!isRedirect(response.status) || !response.headers)
60
+ return response;
61
+ const location = headerValue(response.headers, 'location');
62
+ if (!location)
63
+ return response;
64
+ if (redirect === 10)
65
+ return response;
66
+ const nextUrl = new URL(location, currentUrl).toString();
67
+ const nextMethod = response.status === 303 || ((response.status === 301 || response.status === 302) && currentInit.method.toUpperCase() === 'POST') ? 'GET' : currentInit.method;
68
+ currentUrl = nextUrl;
69
+ currentInit = nextMethod === 'GET' ? { ...currentInit, method: nextMethod, body: undefined } : { ...currentInit, method: nextMethod };
70
+ }
71
+ throw new Error('HTTP redirect limit exceeded.');
57
72
  }
58
73
  }
59
74
  export class HttpActionError extends Error {
@@ -73,6 +88,7 @@ function headerValue(headers, expected) {
73
88
  const name = Object.keys(headers).find(key => key.toLowerCase() === expected);
74
89
  return name ? headers[name] : undefined;
75
90
  }
91
+ function isRedirect(status) { return status === 301 || status === 302 || status === 303 || status === 307 || status === 308; }
76
92
  function mergeCookieHeaders(explicit, managed) {
77
93
  const cookies = new Map();
78
94
  for (const value of [managed, explicit]) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qaick/http-executor",
3
- "version": "0.1.0-alpha.3",
3
+ "version": "0.1.0-alpha.4",
4
4
  "description": "Reusable QAick HTTP Action execution with browser and native Node transports.",
5
5
  "keywords": [
6
6
  "qaick",