@furystack/rest-service 6.2.0 → 6.2.2

package/src/static-server-manager.spec.ts

@@ -1,88 +1,126 @@
 import { Injector } from '@furystack/inject'
 import { sleepAsync, usingAsync } from '@furystack/utils'
-import got, { RequestError } from 'got'
 import { ServerManager } from './server-manager'
 import { StaticServerManager } from './static-server-manager'
 
+/**
+ * Generator for an incremental port number
+ *
+ * @param initialPort The initial port number
+ * @yields a port for testing
+ * @returns The Port number
+ */
+function* getPort(initialPort = 1234) {
+  let port = initialPort
+
+  while (true) {
+    yield port++
+  }
+  return port
+}
+
 describe('StaticServerManager', () => {
+  const portGenerator = getPort()
+
   describe('Top level routing', () => {
     it('Should return a 404 without fallback', async () => {
       await usingAsync(new Injector(), async (injector) => {
         const staticServerManager = injector.getInstance(StaticServerManager)
+        const port = portGenerator.next().value
+        await staticServerManager.addStaticSite({
+          baseUrl: '/',
+          path: '.',
+          port,
+        })
+
+        const result = await fetch(`http://localhost:${port}/not-found.html`)
+        expect(result.ok).toBe(false)
+        expect(result.status).toBe(404)
+        expect(result?.headers.get('content-type')).toBe('text/plain')
+        const body = await result.text()
+        expect(body).toBe('Not found')
+      })
+    })
+
+    it('Should return a fallback', async () => {
+      await usingAsync(new Injector(), async (injector) => {
+        const staticServerManager = injector.getInstance(StaticServerManager)
+        const port = portGenerator.next().value
 
         await staticServerManager.addStaticSite({
           baseUrl: '/',
           path: '.',
-          port: 1234,
+          fallback: 'package.json',
+          port,
+          headers: {
+            'custom-header': 'custom-value',
+          },
         })
 
-        try {
-          await got.get('http://localhost:1234/not-found.html')
-        } catch (error) {
-          expect(error).toBeInstanceOf(RequestError)
-          const requestError: RequestError = error as RequestError
+        const result = await fetch(`http://localhost:${port}/not-found.html`)
 
-          expect(requestError.response?.statusCode).toBe(404)
-          expect(requestError.response?.headers['content-type']).toBe('text/plain')
-          expect(requestError.response?.body).toBe('Not found')
-        }
+        expect(result.headers.get('content-type')).toBe('application/json')
+        expect(result.headers.get('custom-header')).toBe('custom-value')
       })
     })
 
-    it('Should return a fallback', async () => {
+    it('Should return a fallback for root files', async () => {
       await usingAsync(new Injector(), async (injector) => {
         const staticServerManager = injector.getInstance(StaticServerManager)
+        const port = portGenerator.next().value
 
         await staticServerManager.addStaticSite({
           baseUrl: '/',
           path: '.',
           fallback: 'package.json',
-          port: 1234,
+          port,
           headers: {
             'custom-header': 'custom-value',
           },
         })
 
-        const result = await got.get('http://localhost:1234/not-found.html')
+        const result = await fetch(`http://localhost:${port}`)
 
-        expect(result.headers['content-type']).toBe('application/json')
-        expect(result.headers['custom-header']).toBe('custom-value')
+        expect(result.headers.get('content-type')).toBe('application/json')
+        expect(result.headers.get('custom-header')).toBe('custom-value')
       })
     })
 
     it('Should return a defined file from a root directory', async () => {
       await usingAsync(new Injector(), async (injector) => {
         const staticServerManager = injector.getInstance(StaticServerManager)
+        const port = portGenerator.next().value
 
         await staticServerManager.addStaticSite({
           baseUrl: '/',
           path: '.',
-          port: 1234,
+          port,
           headers: {
             'custom-header': 'custom-value',
           },
         })
 
-        const result = await got.get('http://localhost:1234/README.md')
+        const result = await fetch(`http://localhost:${port}/README.md`)
 
-        expect(result.headers['content-type']).toBe('text/markdown')
-        expect(result.headers['custom-header']).toBe('custom-value')
+        expect(result.headers.get('content-type')).toBe('text/markdown')
+        expect(result.headers.get('custom-header')).toBe('custom-value')
       })
     })
 
     it('Should return a defined file from a subdirectory', async () => {
       await usingAsync(new Injector(), async (injector) => {
         const staticServerManager = injector.getInstance(StaticServerManager)
+        const port = portGenerator.next().value
 
         await staticServerManager.addStaticSite({
           baseUrl: '/',
           path: '.',
-          port: 1234,
+          port,
         })
 
-        const result = await got.get('http://localhost:1234/packages/utils/README.md')
+        const result = await fetch(`http://localhost:${port}/packages/utils/README.md`)
 
-        expect(result.headers['content-type']).toBe('text/markdown')
+        expect(result.headers.get('content-type')).toBe('text/markdown')
       })
     })
   })
@@ -91,18 +129,21 @@ describe('StaticServerManager', () => {
     it('Should not handle a request when the path is not matching', async () => {
       await usingAsync(new Injector(), async (injector) => {
         const staticServerManager = injector.getInstance(StaticServerManager)
+        const port = portGenerator.next().value
 
         await staticServerManager.addStaticSite({
           baseUrl: '/bundle',
           path: '.',
-          port: 1234,
+          port,
         })
 
         const server = [...injector.getInstance(ServerManager).servers.values()][0]
 
         server.apis[0].onRequest = jest.fn()
 
-        got.get('http://localhost:1234/bundleToAnotherFolder/not-found.html')
+        fetch(`http://localhost:${port}/bundleToAnotherFolder/not-found.html`).catch(() => {
+          /** should fall, ignore */
+        })
 
         await sleepAsync(100)
 
@@ -113,72 +154,72 @@ describe('StaticServerManager', () => {
     it('Should return a 404 without fallback', async () => {
       await usingAsync(new Injector(), async (injector) => {
         const staticServerManager = injector.getInstance(StaticServerManager)
+        const port = portGenerator.next().value
 
         await staticServerManager.addStaticSite({
           baseUrl: '/bundle',
           path: '.',
-          port: 1234,
+          port,
         })
 
-        try {
-          await got.get('http://localhost:1234/bundle/not-found.html')
-        } catch (error) {
-          expect(error).toBeInstanceOf(RequestError)
-          const requestError: RequestError = error as RequestError
-
-          expect(requestError.response?.statusCode).toBe(404)
-          expect(requestError.response?.headers['content-type']).toBe('text/plain')
-          expect(requestError.response?.body).toBe('Not found')
-        }
+        const result = await fetch(`http://localhost:${port}/bundle/not-found.html`)
+        expect(result.ok).toBe(false)
+        expect(result.status).toBe(404)
+        expect(result.headers.get('content-type')).toBe('text/plain')
+        const body = await result.text()
+        expect(body).toBe('Not found')
       })
     })
 
     it('Should return a fallback', async () => {
       await usingAsync(new Injector(), async (injector) => {
         const staticServerManager = injector.getInstance(StaticServerManager)
+        const port = portGenerator.next().value
 
         await staticServerManager.addStaticSite({
           baseUrl: '/bundle',
           path: '.',
           fallback: 'package.json',
-          port: 1234,
+          port,
         })
 
-        const result = await got.get('http://localhost:1234/bundle/not-found.html')
+        const result = await fetch(`http://localhost:${port}/bundle/not-found.html`)
 
-        expect(result.headers['content-type']).toBe('application/json')
+        expect(result.headers.get('content-type')).toBe('application/json')
       })
     })
 
     it('Should return a defined file from a root directory', async () => {
       await usingAsync(new Injector(), async (injector) => {
         const staticServerManager = injector.getInstance(StaticServerManager)
+        const port = portGenerator.next().value
 
         await staticServerManager.addStaticSite({
           baseUrl: '/',
           path: '.',
-          port: 1234,
+          port,
         })
 
-        const result = await got.get('http://localhost:1234/README.md')
+        const result = await fetch(`http://localhost:${port}/README.md`)
 
-        expect(result.headers['content-type']).toBe('text/markdown')
+        expect(result.headers.get('content-type')).toBe('text/markdown')
       })
     })
 
     it('Should return a defined file from a subdirectory', async () => {
       await usingAsync(new Injector(), async (injector) => {
         const staticServerManager = injector.getInstance(StaticServerManager)
+        const port = portGenerator.next().value
 
         await staticServerManager.addStaticSite({
           baseUrl: '/',
           path: '.',
-          port: 1234,
+          port,
         })
 
-        const result = await got.get('http://localhost:1234/packages/utils/README.md')
+        const result = await fetch(`http://localhost:${port}/packages/utils/README.md`)
 
-        expect(result.headers['content-type']).toBe('text/markdown')
+        expect(result.headers.get('content-type')).toBe('text/markdown')
       })
     })
   })

package/src/static-server-manager.ts

@@ -38,7 +38,9 @@ export class StaticServerManager {
     }
 
     res.writeHead(200, head)
-    createReadStream(fullPath, { autoClose: true }).pipe(res)
+    await new Promise<void>((resolve, reject) =>
+      createReadStream(fullPath, { autoClose: true }).once('finish', resolve).once('error', reject).pipe(res),
+    )
   }
 
   public shouldExec =

package/src/validate.integration.spec.ts

@@ -1,7 +1,6 @@
 import { Injector } from '@furystack/inject'
-import { createClient } from '@furystack/rest-client-got'
+import { createClient, ResponseError } from '@furystack/rest-client-fetch'
 import { usingAsync } from '@furystack/utils'
-import { RequestError } from 'got/dist/source'
 import { JsonResult } from './request-action-implementation'
 import { Validate } from './validate'
 import './helpers'
@@ -75,10 +74,10 @@ describe('Validation integration tests', () => {
             query: undefined as any,
           })
         } catch (error) {
-          if (error instanceof RequestError) {
-            expect(error.message).toBe('Response code 400 (Bad Request)')
-            expect(error.response?.statusCode).toBe(400)
-            const responseJson = JSON.parse(error.response?.body as string)
+          if (error instanceof ResponseError) {
+            expect(error.message).toBe('Bad Request')
+            expect(error.response?.status).toBe(400)
+            const responseJson = await error.response.json()
             expect(responseJson.errors[0].params.missingProperty).toEqual('foo')
             expect(responseJson.errors[1].params.missingProperty).toEqual('bar')
             expect(responseJson.errors[2].params.missingProperty).toEqual('baz')
@@ -96,10 +95,10 @@ describe('Validation integration tests', () => {
             url: undefined as any,
           })
         } catch (error) {
-          if (error instanceof RequestError) {
-            expect(error.message).toBe('Response code 400 (Bad Request)')
-            expect(error.response?.statusCode).toBe(400)
-            const responseJson = JSON.parse(error.response?.body as string)
+          if (error instanceof ResponseError) {
+            expect(error.message).toBe('Bad Request')
+            expect(error.response?.status).toBe(400)
+            const responseJson = await error.response.json()
             expect(responseJson.errors[0].params.type).toEqual('number')
             expect(responseJson.errors[0].instancePath).toEqual('/url/id')
           }
@@ -116,10 +115,10 @@ describe('Validation integration tests', () => {
             headers: undefined as any,
           })
         } catch (error) {
-          if (error instanceof RequestError) {
-            expect(error.message).toBe('Response code 400 (Bad Request)')
-            expect(error.response?.statusCode).toBe(400)
-            const responseJson = JSON.parse(error.response?.body as string)
+          if (error instanceof ResponseError) {
+            expect(error.message).toBe('Bad Request')
+            expect(error.response?.status).toBe(400)
+            const responseJson = await error.response.json()
             expect(
               responseJson.errors.find((e: any) => e.keyword === 'required' && e.message.includes('foo')),
             ).toBeDefined()
@@ -137,10 +136,10 @@ describe('Validation integration tests', () => {
             body: undefined as any,
           })
         } catch (error) {
-          if (error instanceof RequestError) {
-            expect(error.message).toBe('Response code 400 (Bad Request)')
-            expect(error.response?.statusCode).toBe(400)
-            const responseJson = JSON.parse(error.response?.body as string)
+          if (error instanceof ResponseError) {
+            expect(error.message).toBe('Bad Request')
+            expect(error.response?.status).toBe(400)
+            const responseJson = await error.response.json()
             expect(responseJson.errors[0].params.missingProperty).toEqual('body')
           }
         }
@@ -160,11 +159,10 @@ describe('Validation integration tests', () => {
             baz: false,
           },
         })
-        expect(result.response.statusCode).toBe(200)
-        const responseJson = result.getJson()
-        expect(responseJson.foo).toBe('foo')
-        expect(responseJson.bar).toBe(2)
-        expect(responseJson.baz).toBe(false)
+        expect(result.response.status).toBe(200)
+        expect(result.result.foo).toBe('foo')
+        expect(result.result.bar).toBe(2)
+        expect(result.result.baz).toBe(false)
       })
     })
     it('Should validate url', async () => {
@@ -174,9 +172,8 @@ describe('Validation integration tests', () => {
           action: '/validate-url/:id',
           url: { id: 3 },
         })
-        expect(result.response.statusCode).toBe(200)
-        const responseJson = result.getJson()
-        expect(responseJson.id).toBe(3)
+        expect(result.response.status).toBe(200)
+        expect(result.result.id).toBe(3)
       })
     })
     it('Should validate headers', async () => {
@@ -190,11 +187,10 @@ describe('Validation integration tests', () => {
             baz: true,
           },
         })
-        expect(result.response.statusCode).toBe(200)
-        const responseJson = result.getJson()
-        expect(responseJson.foo).toBe('foo')
-        expect(responseJson.bar).toBe(42)
-        expect(responseJson.baz).toBe(true)
+        expect(result.response.status).toBe(200)
+        expect(result.result.foo).toBe('foo')
+        expect(result.result.bar).toBe(42)
+        expect(result.result.baz).toBe(true)
       })
     })
     it('Should validate body', async () => {
@@ -209,11 +205,10 @@ describe('Validation integration tests', () => {
           },
         })
 
-        expect(result.response.statusCode).toBe(200)
-        const responseJson = result.getJson()
-        expect(responseJson.foo).toBe('foo')
-        expect(responseJson.bar).toBe(42)
-        expect(responseJson.baz).toBe(true)
+        expect(result.response.status).toBe(200)
+        expect(result.result.foo).toBe('foo')
+        expect(result.result.bar).toBe(42)
+        expect(result.result.baz).toBe(true)
       })
     })
   })

package/types/actions/error-action.d.ts

@@ -7,8 +7,6 @@ export declare const ErrorAction: RequestAction<{
     body: unknown;
     result: {
         message: string;
-        url?: string;
-        stack?: string;
     };
 }>;
 //# sourceMappingURL=error-action.d.ts.map

package/types/actions/error-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-action.d.ts","sourceRoot":"","sources":["../../src/actions/error-action.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAA;AAIrE;;;GAGG;AAEH,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC;IACtC,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAC1D,CAoBA,CAAA"}
+{"version":3,"file":"error-action.d.ts","sourceRoot":"","sources":["../../src/actions/error-action.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAA;AAIrE;;;GAGG;AAEH,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC;IACtC,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAA;CAC5B,CAoBA,CAAA"}

package/types/static-server-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"static-server-manager.d.ts","sourceRoot":"","sources":["../src/static-server-manager.ts"],"names":[],"mappings":";AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAkB,MAAM,MAAM,CAAA;AAKhF,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,mBAAmB,CAAA;CAC9B;AAED,qBACa,mBAAmB;IAE9B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;YAEhC,QAAQ;IAqBf,UAAU,YACL,MAAM;aACC,KAAK,eAAe,EAAE,KAAK,GAAG,QAAQ,CAAC;kBAK7C;IAEb,OAAO,CAAC,SAAS,CA0BhB;IAEY,aAAa,CAAC,OAAO,EAAE,mBAAmB;CAQxD"}
+{"version":3,"file":"static-server-manager.d.ts","sourceRoot":"","sources":["../src/static-server-manager.ts"],"names":[],"mappings":";AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAkB,MAAM,MAAM,CAAA;AAKhF,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,mBAAmB,CAAA;CAC9B;AAED,qBACa,mBAAmB;IAE9B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;YAEhC,QAAQ;IAuBf,UAAU,YACL,MAAM;aACC,KAAK,eAAe,EAAE,KAAK,GAAG,QAAQ,CAAC;kBAK7C;IAEb,OAAO,CAAC,SAAS,CA0BhB;IAEY,aAAa,CAAC,OAAO,EAAE,mBAAmB;CAQxD"}

package/types/validate.integration.spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.integration.spec.d.ts","sourceRoot":"","sources":["../src/validate.integration.spec.ts"],"names":[],"mappings":"AAMA,OAAO,WAAW,CAAA"}
+{"version":3,"file":"validate.integration.spec.d.ts","sourceRoot":"","sources":["../src/validate.integration.spec.ts"],"names":[],"mappings":"AAKA,OAAO,WAAW,CAAA"}