Skip to content

Commit

Permalink
Bump HTTP Executor (#7223)
Browse files Browse the repository at this point in the history
* Bump HTTP Executor

* chore(dependencies): updated changesets for modified dependencies

* Try Node 22

* Dedup executor

* Try alpha

* Try to fix

* Bump executor

* chore(dependencies): updated changesets for modified dependencies

* Try

* Try more

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
ardatan and github-actions[bot] committed Jul 5, 2024
1 parent fbee31d commit 26549a9
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 38 deletions.
5 changes: 5 additions & 0 deletions .changeset/@graphql-mesh_serve-runtime-7223-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@graphql-mesh/serve-runtime": patch
---
dependencies updates:
- Updated dependency [`@graphql-tools/executor-http@^1.1.2` ↗︎](https://www.npmjs.com/package/@graphql-tools/executor-http/v/1.1.2) (from `^1.0.6`, in `dependencies`)
5 changes: 5 additions & 0 deletions .changeset/@graphql-mesh_transport-http-7223-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@graphql-mesh/transport-http": patch
---
dependencies updates:
- Updated dependency [`@graphql-tools/executor-http@^1.1.2` ↗︎](https://www.npmjs.com/package/@graphql-tools/executor-http/v/1.1.2) (from `^1.0.6`, in `dependencies`)
2 changes: 1 addition & 1 deletion .github/workflows/loadtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [18, 20, 21]
node-version: [18, 20, 22]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [18, 20, 21]
node-version: [18, 20, 22]

steps:
- name: Checkout
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [18, 20, 21]
node-version: [18, 20, 22]
# Service containers to run with `runner-job`
services:
# Label used to access the service container
Expand Down Expand Up @@ -316,7 +316,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [18, 20, 21]
node-version: [18, 20, 22]
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand All @@ -340,7 +340,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [18, 20, 21]
node-version: [18, 20, 22]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
23 changes: 22 additions & 1 deletion examples/federation-example/tests/polling.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,26 @@ import { createServer } from 'http';
import { join } from 'path';

jest.setTimeout(30000);
async function findAvailableHostName() {
const hostnames = ['localhost', '127.0.0.1', '0.0.0.0'];
for (const hostname of hostnames) {
console.log('Trying to connect to ' + hostname);
try {
const res = await fetch(`http://${hostname}:4000/graphql`, {
headers: {
accept: 'text/html',
},
});
await res.text();
} catch (e) {
console.error('Failed to connect to ' + hostname);
continue;
}
console.log('Connected to ' + hostname);
return hostname;
}
throw new Error('No available hostname found');
}
describe('Polling Test', () => {
let cleanupCallbacks: (() => void)[] = [];
afterAll(() => {
Expand Down Expand Up @@ -60,7 +80,8 @@ describe('Polling Test', () => {
}
});
});
const resp = await fetch('http://127.0.0.1:4000/graphql', {
const hostname = await findAvailableHostName();
const resp = await fetch(`http://${hostname}:4000/graphql`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
Expand Down
2 changes: 1 addition & 1 deletion packages/serve-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@graphql-mesh/transport-http": "^0.2.1",
"@graphql-mesh/utils": "^0.98.10",
"@graphql-tools/delegate": "^10.0.12",
"@graphql-tools/executor-http": "^1.0.6",
"@graphql-tools/executor-http": "^1.1.2",
"@graphql-tools/executor-yoga": "^3.0.0",
"@graphql-tools/federation": "^2.1.1",
"@graphql-tools/stitch": "^9.2.10",
Expand Down
2 changes: 1 addition & 1 deletion packages/transports/http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"dependencies": {
"@envelop/core": "^5.0.0",
"@graphql-mesh/transport-common": "^0.3.1",
"@graphql-tools/executor-http": "^1.0.6"
"@graphql-tools/executor-http": "^1.1.2"
},
"publishConfig": {
"access": "public",
Expand Down
54 changes: 24 additions & 30 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5459,7 +5459,7 @@ __metadata:
"@graphql-mesh/transport-http": "npm:^0.2.1"
"@graphql-mesh/utils": "npm:^0.98.10"
"@graphql-tools/delegate": "npm:^10.0.12"
"@graphql-tools/executor-http": "npm:^1.0.6"
"@graphql-tools/executor-http": "npm:^1.1.2"
"@graphql-tools/executor-yoga": "npm:^3.0.0"
"@graphql-tools/federation": "npm:^2.1.1"
"@graphql-tools/stitch": "npm:^9.2.10"
Expand Down Expand Up @@ -5843,7 +5843,7 @@ __metadata:
dependencies:
"@envelop/core": "npm:^5.0.0"
"@graphql-mesh/transport-common": "npm:^0.3.1"
"@graphql-tools/executor-http": "npm:^1.0.6"
"@graphql-tools/executor-http": "npm:^1.1.2"
peerDependencies:
graphql: "*"
tslib: ^2.4.0
Expand Down Expand Up @@ -6129,11 +6129,11 @@ __metadata:
languageName: node
linkType: hard

"@graphql-tools/executor-http@npm:^1.0.6, @graphql-tools/executor-http@npm:^1.0.9":
version: 1.1.0
resolution: "@graphql-tools/executor-http@npm:1.1.0"
"@graphql-tools/executor-http@npm:^1.0.9, @graphql-tools/executor-http@npm:^1.1.2":
version: 1.1.2
resolution: "@graphql-tools/executor-http@npm:1.1.2"
dependencies:
"@graphql-tools/utils": "npm:^10.3.0"
"@graphql-tools/utils": "npm:^10.3.1"
"@repeaterjs/repeater": "npm:^3.0.4"
"@whatwg-node/fetch": "npm:^0.9.0"
extract-files: "npm:^11.0.0"
Expand All @@ -6142,7 +6142,7 @@ __metadata:
value-or-promise: "npm:^1.0.12"
peerDependencies:
graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
checksum: 10c0/f8b920e05922eff4a4593ee8eac4d8afd9433d8dbd2f93d06145c3abc537286e8f747ad3392e12d223856eb8c97a1b6bc98d4d75b663d7457684de1728e10704
checksum: 10c0/e6b000c7dc53eb44758c7a04981a36ce338eea3575b0ba8b138b04cd5aec839f3d3483629a6cbc8f57d39373ed8fbf3377c37c2873da3cbe6c80b3cdce9d7460
languageName: node
linkType: hard

Expand Down Expand Up @@ -6626,7 +6626,7 @@ __metadata:
languageName: node
linkType: hard

"@graphql-tools/utils@npm:10.3.0, @graphql-tools/utils@npm:^10.0.0, @graphql-tools/utils@npm:^10.0.13, @graphql-tools/utils@npm:^10.0.3, @graphql-tools/utils@npm:^10.1.0, @graphql-tools/utils@npm:^10.1.1, @graphql-tools/utils@npm:^10.2.1, @graphql-tools/utils@npm:^10.2.2, @graphql-tools/utils@npm:^10.2.3, @graphql-tools/utils@npm:^10.3.0":
"@graphql-tools/utils@npm:10.3.0, @graphql-tools/utils@npm:^10.0.0, @graphql-tools/utils@npm:^10.0.13, @graphql-tools/utils@npm:^10.0.3, @graphql-tools/utils@npm:^10.1.0, @graphql-tools/utils@npm:^10.1.1, @graphql-tools/utils@npm:^10.2.1, @graphql-tools/utils@npm:^10.2.2, @graphql-tools/utils@npm:^10.2.3":
version: 10.3.0
resolution: "@graphql-tools/utils@npm:10.3.0"
dependencies:
Expand Down Expand Up @@ -6663,6 +6663,20 @@ __metadata:
languageName: node
linkType: hard

"@graphql-tools/utils@npm:^10.3.1":
version: 10.3.1
resolution: "@graphql-tools/utils@npm:10.3.1"
dependencies:
"@graphql-typed-document-node/core": "npm:^3.1.1"
cross-inspect: "npm:1.0.0"
dset: "npm:^3.1.2"
tslib: "npm:^2.4.0"
peerDependencies:
graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
checksum: 10c0/dc8c71664f3b24fdb74469481ec215cf1694bef1bea1262abddec5ca1e80d09d903011196e7a763e39ee71161cc05d881f0f20432a03b7c7962f053260506410
languageName: node
linkType: hard

"@graphql-tools/utils@npm:^8.5.2, @graphql-tools/utils@npm:^8.8.0":
version: 8.13.1
resolution: "@graphql-tools/utils@npm:8.13.1"
Expand Down Expand Up @@ -28859,18 +28873,7 @@ __metadata:
languageName: node
linkType: hard

"postcss@npm:^8.3.5, postcss@npm:^8.4.23, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.4":
version: 8.4.38
resolution: "postcss@npm:8.4.38"
dependencies:
nanoid: "npm:^3.3.7"
picocolors: "npm:^1.0.0"
source-map-js: "npm:^1.2.0"
checksum: 10c0/955407b8f70cf0c14acf35dab3615899a2a60a26718a63c848cf3c29f2467b0533991b985a2b994430d890bd7ec2b1963e36352b0774a19143b5f591540f7c06
languageName: node
linkType: hard

"postcss@npm:^8.4.39":
"postcss@npm:^8.3.5, postcss@npm:^8.4.23, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.39, postcss@npm:^8.4.4":
version: 8.4.39
resolution: "postcss@npm:8.4.39"
dependencies:
Expand Down Expand Up @@ -29400,7 +29403,7 @@ __metadata:
languageName: node
linkType: hard

"qs@npm:6.12.2":
"qs@npm:6.12.2, qs@npm:^6.11.2, qs@npm:^6.4.0":
version: 6.12.2
resolution: "qs@npm:6.12.2"
dependencies:
Expand All @@ -29409,15 +29412,6 @@ __metadata:
languageName: node
linkType: hard

"qs@npm:^6.11.2, qs@npm:^6.4.0":
version: 6.12.1
resolution: "qs@npm:6.12.1"
dependencies:
side-channel: "npm:^1.0.6"
checksum: 10c0/439e6d7c6583e7c69f2cab2c39c55b97db7ce576e4c7c469082b938b7fc8746e8d547baacb69b4cd2b6666484776c3f4840ad7163a4c5326300b0afa0acdd84b
languageName: node
linkType: hard

"querystringify@npm:^2.1.1":
version: 2.2.0
resolution: "querystringify@npm:2.2.0"
Expand Down

0 comments on commit 26549a9

Please sign in to comment.