Port remote-ip.js to TypeScript (#51130)

github · Jun 12, 2024 · 11fee45 · Jmiller133 · Jun 29, 2024 · Jmiller133
1 parent e91c1fe
commit 11fee45
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/frame/middleware/index.ts b/src/frame/middleware/index.ts
@@ -29,7 +29,7 @@ import archivedEnterpriseVersionsAssets from '@/archives/middleware/archived-ent
 import api from './api'
 import healthz from './healthz'
 import manifestJson from './manifest-json'
-import remoteIP from './remote-ip.js'
+import remoteIP from './remote-ip'
 import buildInfo from './build-info.js'
 import archivedEnterpriseVersions from '@/archives/middleware/archived-enterprise-versions.js'
 import robots from './robots.js'

diff --git a/src/frame/middleware/remote-ip.js → src/frame/middleware/remote-ip.ts b/src/frame/middleware/remote-ip.js → src/frame/middleware/remote-ip.ts
@@ -1,6 +1,8 @@
+import type { Request, Response } from 'express'
+
 import { noCacheControl } from './cache-control.js'
 
-export default function remoteIp(req, res) {
+export default function remoteIp(req: Request, res: Response) {
   noCacheControl(res)
   res.json({
     ip: req.ip,

diff --git a/src/frame/tests/remote-ip.js → src/frame/tests/remote-ip.ts b/src/frame/tests/remote-ip.js → src/frame/tests/remote-ip.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test, vi } from 'vitest'
 
-import { get } from '#src/tests/helpers/e2etest.js'
+import { get } from '@/tests/helpers/e2etest.js'
 
 describe('remote ip debugging', () => {
   vi.setConfig({ testTimeout: 60 * 1000 })

diff --git a/src/tests/helpers/e2etest.js b/src/tests/helpers/e2etest.js
@@ -9,7 +9,7 @@ export async function get(
     body = undefined,
     followRedirects = false,
     followAllRedirects = false,
-    headers = undefined,
+    headers = {},
     responseType = '',
     retries = 0,
   } = {},