Skip to content

Commit

Permalink
removed endpoint-utils package (#3009)
Browse files Browse the repository at this point in the history
Co-authored-by: Bayheck <[email protected]>
  • Loading branch information
Bayheck and Bayheck authored Jun 25, 2024
1 parent 3b3a600 commit dcc1406
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 20 deletions.
27 changes: 10 additions & 17 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@
"@types/ws": "^7.4.7",
"@typescript-eslint/eslint-plugin": "^5.54.1",
"@typescript-eslint/parser": "^5.54.1",
"address": "^2.0.3",
"babel-eslint": "^10.1.0",
"babel-plugin-add-module-exports": "^1.0.0",
"basic-auth": "1.0.4",
"body-parser": "^1.18.3",
"chai": "^2.3.0",
"del": "^3.0.0",
"del-cli": "^3.0.1",
"endpoint-utils": "^1.0.1",
"eslint": "^7.13.0",
"eslint-plugin-hammerhead": "^0.4.0",
"eslint-plugin-no-only-tests": "^2.0.1",
Expand Down
51 changes: 51 additions & 0 deletions test/server/common/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const { expect } = require('chai');
const urlUtils = require('../../../lib/utils/url');
const Proxy = require('../../../lib/proxy');
const selfSignedCertificate = require('openssl-self-signed-certificate');
const createServer = require('net').createServer;

const {
PROXY_HOSTNAME,
Expand Down Expand Up @@ -129,3 +130,53 @@ exports.normalizeNewLine = function (str) {
exports.replaceLastAccessedTime = function (cookie) {
return cookie.replace(/[a-z0-9]+\|=/, '%lastAccessed%|=');
};

function createServerOnFreePort () {
return new Promise(resolve => {
const server = createServer();

server.once('listening', () => {
resolve(server);
});

server.listen(0);
});
}

function closeServers (servers) {
return Promise.all(servers.map(server => {
return new Promise(resolve => {
server.once('close', resolve);
server.close();
});
}));
}

function getFreePorts (count) {
const serverPromises = [];
let ports = null;

// NOTE: Sequentially collect listening
// servers to avoid interference.
for (let i = 0; i < count; i++)
serverPromises.push(createServerOnFreePort());

return Promise.all(serverPromises)
.then(servers => {
ports = servers.map(server => {
return server.address().port;
});

return servers;
})
.then(closeServers)
.then(() => {
return ports;
});
}

exports.getFreePort = function () {
return getFreePorts(1).then(ports => {
return ports[0];
});
};
2 changes: 1 addition & 1 deletion test/server/proxy/regression-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ const { expect } = require('chai');
const urlLib = require('url');
const net = require('net');
const { noop } = require('lodash');
const { getFreePort } = require('endpoint-utils');
const request = require('request-promise-native');
const { getFreePort } = require('../common/utils');
const DestinationRequest = require('../../../lib/request-pipeline/destination-request');
const RequestPipelineContext = require('../../../lib/request-pipeline/context');
const scriptHeader = require('../../../lib/processing/script/header');
Expand Down
2 changes: 1 addition & 1 deletion test/server/proxy/web-socket-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const WebSocket = require('ws');
const selfSignedCertificate = require('openssl-self-signed-certificate');
const https = require('https');
const { getFreePort } = require('endpoint-utils');
const { getFreePort } = require('../common/utils');

const {
createDestinationServer,
Expand Down

0 comments on commit dcc1406

Please sign in to comment.