-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fallback to regular collection when demdex.net is blocked.
- Loading branch information
Showing
5 changed files
with
168 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
export const TYPE_ERROR = "TypeError"; | ||
export const NETWORK_ERROR = "NetworkError"; | ||
|
||
/** | ||
* Checks if the error is a network-related error | ||
* @param {Error} error The error to check | ||
* @returns {boolean} True if the error is network-related | ||
*/ | ||
export const isNetworkError = (error) => { | ||
return ( | ||
error.name === TYPE_ERROR || | ||
error.name === NETWORK_ERROR || | ||
error.status === 0 | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import { RequestMock } from "testcafe"; | ||
|
||
// Mock that fails demdex requests | ||
export default RequestMock() | ||
.onRequestTo((request) => request.url.includes("demdex.net")) | ||
.respond((req, res) => { | ||
res.statusCode = 500; | ||
res.headers = { | ||
"content-type": "application/json", | ||
}; | ||
return ""; | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
import { t } from "testcafe"; | ||
import createNetworkLogger from "../../helpers/networkLogger/index.js"; | ||
import createFixture from "../../helpers/createFixture/index.js"; | ||
import { | ||
compose, | ||
orgMainConfigMain, | ||
thirdPartyCookiesEnabled, | ||
} from "../../helpers/constants/configParts/index.js"; | ||
import createAlloyProxy from "../../helpers/createAlloyProxy.js"; | ||
import demdexBlockerMock from "../../helpers/requestHooks/demdexBlockerMock.js"; | ||
|
||
const networkLogger = createNetworkLogger(); | ||
const config = compose(orgMainConfigMain, thirdPartyCookiesEnabled); | ||
|
||
createFixture({ | ||
title: "Demdex Fallback Behavior", | ||
requestHooks: [networkLogger.edgeEndpointLogs, demdexBlockerMock], | ||
}); | ||
|
||
test("Continues collecting data when demdex is blocked", async () => { | ||
const alloy = createAlloyProxy(); | ||
|
||
await alloy.configure(config); | ||
await alloy.sendEvent(); | ||
|
||
// Get all requests | ||
const requests = networkLogger.edgeEndpointLogs.requests; | ||
|
||
// Find the successful request (should be the last one) | ||
const successfulRequest = requests[requests.length - 1]; | ||
|
||
// Verify the successful request | ||
await t.expect(successfulRequest.request.url).notContains("demdex.net"); | ||
await t.expect(successfulRequest.request.url).contains(config.edgeDomain); | ||
await t.expect(successfulRequest.response.statusCode).eql(200); | ||
|
||
// Verify at least one request was successful | ||
const successfulRequests = requests.filter( | ||
(r) => | ||
!r.request.url.includes("demdex.net") && r.response.statusCode === 200, | ||
); | ||
await t.expect(successfulRequests.length).gte(1); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
import { | ||
TYPE_ERROR, | ||
NETWORK_ERROR, | ||
isNetworkError, | ||
} from "../../../../src/utils/networkErrors.js"; | ||
|
||
describe("Network Errors", () => { | ||
describe("isNetworkError", () => { | ||
it("returns true for TypeError", () => { | ||
const error = new Error(); | ||
error.name = TYPE_ERROR; | ||
|
||
expect(isNetworkError(error)).toBe(true); | ||
}); | ||
|
||
it("returns true for NetworkError", () => { | ||
const error = new Error(); | ||
error.name = NETWORK_ERROR; | ||
|
||
expect(isNetworkError(error)).toBe(true); | ||
}); | ||
|
||
it("returns true for status 0", () => { | ||
const error = { status: 0 }; | ||
|
||
expect(isNetworkError(error)).toBe(true); | ||
}); | ||
|
||
it("returns false for other errors", () => { | ||
const error = new Error(); | ||
error.name = "SyntaxError"; | ||
|
||
expect(isNetworkError(error)).toBe(false); | ||
}); | ||
|
||
it("returns false for non-zero status", () => { | ||
const error = { status: 500 }; | ||
|
||
expect(isNetworkError(error)).toBe(false); | ||
}); | ||
|
||
it("returns false for undefined status", () => { | ||
const error = new Error(); | ||
|
||
expect(isNetworkError(error)).toBe(false); | ||
}); | ||
}); | ||
}); |