DevComp/fxtwitter-docker
1
0
Fork 0
mirror of https://github.com/CompeyDev/fxtwitter-docker.git synced 2025-04-10 04:50:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Workaround for broken @cloudflare/worker-types v4

Browse source
This commit is contained in:
dangered wolf 2023-03-20 01:01:23 -04:00
parent 1be8f809f3
commit bb1ace97fd
No known key found for this signature in database
GPG key ID: 41E4D37680ED8B58
4 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
package-lock.json generated
View file

@ -13,7 +13,7 @@
"toucan-js": "^2.7.0" "toucan-js": "^2.7.0"
}, },
"devDependencies": { "devDependencies": {
"@cloudflare/workers-types": "^3.19.0", "@cloudflare/workers-types": "^4.20230307.0",
"@microsoft/eslint-formatter-sarif": "^3.0.0", "@microsoft/eslint-formatter-sarif": "^3.0.0",
"@sentry/webpack-plugin": "^1.20.0", "@sentry/webpack-plugin": "^1.20.0",
"@types/jest": "^29.5.0", "@types/jest": "^29.5.0",
@ -650,9 +650,9 @@
} }
}, },
"node_modules/@cloudflare/workers-types": { "node_modules/@cloudflare/workers-types": {
"version": "3.19.0", "version": "4.20230307.0",
"resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-3.19.0.tgz", "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20230307.0.tgz",
"integrity": "sha512-0FRcsz7Ea3jT+gc5gKPIYciykm1bbAaTpygdzpCwGt0RL+V83zWnYN30NWDW4rIHj/FHtz+MIuBKS61C8l7AzQ==", "integrity": "sha512-Go968aDDcqONHQcUdgIiPRkPdT4QTzD0ecHJsI1u7ZiHPMOoZn+Dy7hYsdUJ5ldX9wTZDrICBM1rDKTRaDUitg==",
"dev": true "dev": true
}, },
"node_modules/@discoveryjs/json-ext": { "node_modules/@discoveryjs/json-ext": {
@ -1737,12 +1737,6 @@
"node": ">=16.13" "node": ">=16.13"
} }
}, },
"node_modules/@miniflare/shared-test-environment/node_modules/@cloudflare/workers-types": {
"version": "4.20230215.0",
"resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20230215.0.tgz",
"integrity": "sha512-s71gaGwtEIxjSu6l0cekbXm9AwjrmrFVcHPNx9tHidG2dnqamYf5Nms/KgMYZf7gnjdKOp/ZChYFeJJkNv3QfA==",
"dev": true
},
"node_modules/@miniflare/shared-test-environment/node_modules/@miniflare/cache": { "node_modules/@miniflare/shared-test-environment/node_modules/@miniflare/cache": {
"version": "2.12.1", "version": "2.12.1",
"resolved": "https://registry.npmjs.org/@miniflare/cache/-/cache-2.12.1.tgz", "resolved": "https://registry.npmjs.org/@miniflare/cache/-/cache-2.12.1.tgz",
@ -8047,9 +8041,9 @@
} }
}, },
"@cloudflare/workers-types": { "@cloudflare/workers-types": {
"version": "3.19.0", "version": "4.20230307.0",
"resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-3.19.0.tgz", "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20230307.0.tgz",
"integrity": "sha512-0FRcsz7Ea3jT+gc5gKPIYciykm1bbAaTpygdzpCwGt0RL+V83zWnYN30NWDW4rIHj/FHtz+MIuBKS61C8l7AzQ==", "integrity": "sha512-Go968aDDcqONHQcUdgIiPRkPdT4QTzD0ecHJsI1u7ZiHPMOoZn+Dy7hYsdUJ5ldX9wTZDrICBM1rDKTRaDUitg==",
"dev": true "dev": true
}, },
"@discoveryjs/json-ext": { "@discoveryjs/json-ext": {
@ -8789,12 +8783,6 @@
"@miniflare/web-sockets": "2.12.1" "@miniflare/web-sockets": "2.12.1"
}, },
"dependencies": { "dependencies": {
"@cloudflare/workers-types": {
"version": "4.20230215.0",
"resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20230215.0.tgz",
"integrity": "sha512-s71gaGwtEIxjSu6l0cekbXm9AwjrmrFVcHPNx9tHidG2dnqamYf5Nms/KgMYZf7gnjdKOp/ZChYFeJJkNv3QfA==",
"dev": true
},
"@miniflare/cache": { "@miniflare/cache": {
"version": "2.12.1", "version": "2.12.1",
"resolved": "https://registry.npmjs.org/@miniflare/cache/-/cache-2.12.1.tgz", "resolved": "https://registry.npmjs.org/@miniflare/cache/-/cache-2.12.1.tgz",

2
package.json
View file

@ -15,7 +15,7 @@
"author": "dangered wolf", "author": "dangered wolf",
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"@cloudflare/workers-types": "^3.19.0", "@cloudflare/workers-types": "^4.20230307.0",
"@microsoft/eslint-formatter-sarif": "^3.0.0", "@microsoft/eslint-formatter-sarif": "^3.0.0",
"@sentry/webpack-plugin": "^1.20.0", "@sentry/webpack-plugin": "^1.20.0",
"@types/jest": "^29.5.0", "@types/jest": "^29.5.0",

6
src/server.ts
View file

@ -170,8 +170,14 @@ const versionRequest = async (request: Request) => {
request.headers.get('x-real-ip') || request.headers.get('x-real-ip') ||
request.headers.get('cf-connecting-ip') || request.headers.get('cf-connecting-ip') ||
'Unknown IP', 'Unknown IP',
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore - @cloudflare/workers-types v4 is missing IncomingRequestCfProperties.city despite it being a real property
city: request.cf?.city || 'Unknown City', city: request.cf?.city || 'Unknown City',
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore - @cloudflare/workers-types v4 is missing IncomingRequestCfProperties.country / region despite it being a real property
region: request.cf?.region || request.cf?.country || 'Unknown Region', region: request.cf?.region || request.cf?.country || 'Unknown Region',
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore - @cloudflare/workers-types v4 is missing IncomingRequestCfProperties.country despite it being a real property
country: request.cf?.country || 'Unknown Country', country: request.cf?.country || 'Unknown Country',
asn: `AS${request.cf?.asn || '??'} (${ asn: `AS${request.cf?.asn || '??'} (${
request.cf?.asOrganization || 'Unknown ASN' request.cf?.asOrganization || 'Unknown ASN'

2
tsconfig.json
View file

@ -12,7 +12,7 @@
"allowJs": true, "allowJs": true,
"sourceMap": true, "sourceMap": true,
"esModuleInterop": true, "esModuleInterop": true,
"types": ["@cloudflare/workers-types", "@types/jest"] "types": ["@cloudflare/workers-types/2022-11-30", "@types/jest"]
}, },
"include": ["src"], "include": ["src"],
"exclude": ["node_modules", "dist", "test"] "exclude": ["node_modules", "dist", "test"]