@furystack/rest-service 9.0.0 → 9.0.2

package/src/incoming-message-extensions.ts

@@ -1,20 +1,5 @@
-import http from 'http'
-import { Utils } from './utils.js'
-
 declare module 'http' {
   export interface IncomingMessage {
-    readPostBodyRaw: () => Promise<string>
-    readPostBody: <T>() => Promise<T>
     postBody: unknown
   }
 }
-
-http.IncomingMessage.prototype.readPostBody = async function <T>() {
-  const utils = new Utils()
-  return await utils.readPostBody<T>(this)
-}
-
-http.IncomingMessage.prototype.readPostBodyRaw = async function () {
-  const utils = new Utils()
-  return await utils.readPostBodyRaw(this)
-}

package/src/index.ts

@@ -1,18 +1,18 @@
 export * from './helpers.js'
+export * from './add-cors-header.js'
 export * from './api-manager.js'
 export * from './actions/index.js'
 export * from './authenticate.js'
 export * from './authorize.js'
 export * from './http-authentication-settings.js'
 export * from './http-user-context.js'
-export * from './incoming-message-extensions.js'
 export * from './server-manager.js'
 export * from './server-response-extensions.js'
-export * from './utils.js'
 export * from './models/index.js'
 export * from './endpoint-generators/index.js'
 export * from './schema-validator/index.js'
 export * from './request-action-implementation.js'
 export * from './validate.js'
 export * from './mime-types.js'
+export * from './read-post-body.js'
 export * from './static-server-manager.js'

package/src/models/default-session.ts

@@ -5,10 +5,10 @@ export class DefaultSession {
   /**
    * The generated session identifier
    */
-  public sessionId!: string
+  declare sessionId: string
 
   /**
    * The user's login name for the session
    */
-  public username!: string
+  declare username: string
 }

package/src/read-post-body.ts

@@ -0,0 +1,36 @@
+import type { IncomingMessage } from 'http'
+import './incoming-message-extensions.js'
+
+export const readPostBodyRaw = async (incomingMessage: IncomingMessage) => {
+  if (!incomingMessage.readable) {
+    throw Error('Incoming message is not readable')
+  }
+
+  let body = ''
+  await new Promise<void>((resolve, reject) => {
+    incomingMessage.on('readable', () => {
+      const data = incomingMessage.read()
+      if (data) {
+        body += data
+      }
+    })
+    incomingMessage.on('end', () => {
+      resolve()
+    })
+    incomingMessage.on('error', (err) => {
+      reject(err)
+    })
+  })
+  return body
+}
+
+/**
+ * Reads the post's body and returns a promise with a parsed value
+ * @param incomingMessage The incoming message instance
+ * @returns the parsed object from the post body
+ */
+export const readPostBody = async <T>(incomingMessage: IncomingMessage): Promise<T> => {
+  const body = incomingMessage.postBody || JSON.parse(await readPostBodyRaw(incomingMessage))
+  incomingMessage.postBody = body
+  return body
+}

package/src/rest-service.integration.spec.ts

@@ -11,10 +11,6 @@ import { describe, it, expect } from 'vitest'
 import { serializeValue } from '@furystack/rest'
 import { getPort } from '@furystack/core/port-generator'
 
-class UserWithPassword extends User {
-  password!: string
-}
-
 interface IntegrationTestApi extends RestApi {
   GET: {
     '/isAuthenticated': { result: { isAuthenticated: boolean } }
@@ -29,23 +25,22 @@ interface IntegrationTestApi extends RestApi {
   }
 }
 
-const prepareInjector = async (i: Injector) => {
+const createIntegrationApi = async () => {
+  const i = new Injector()
   const port = getPort()
-  const hostName = 'localhost'
   const root = 'test-api'
 
   addStore(i, new InMemoryStore({ model: User, primaryKey: 'username' })).addStore(
     new InMemoryStore({ model: DefaultSession, primaryKey: 'sessionId' }),
   )
   useHttpAuthentication(i, {
-    getUserStore: (sm) => sm.getStoreFor(UserWithPassword, 'username'),
+    getUserStore: (sm) => sm.getStoreFor(User, 'username'),
     getSessionStore: (sm) => sm.getStoreFor(DefaultSession, 'sessionId'),
   })
   await useRestService<IntegrationTestApi>({
     injector: i,
     root,
-    port: getPort(),
-    hostName,
+    port,
     cors: {
       credentials: true,
       origins: ['http://localhost:8080'],
@@ -71,23 +66,22 @@ const prepareInjector = async (i: Injector) => {
   })
 
   return {
-    apiUrl: `http://${hostName}:${port}/${root}`,
+    apiUrl: `http://127.0.0.1:${port}/${root}`,
     port,
-    hostName,
+    dispose: i.dispose.bind(i),
   }
 }
 
 describe('@furystack/rest-service inregration tests', () => {
   it('Should be started and disposed', async () => {
-    await usingAsync(new Injector(), async (i) => {
-      await prepareInjector(i)
-    })
+    await usingAsync(await createIntegrationApi(), async () => {})
   })
 
   it('Should respond with 404 when a route is not found', async () => {
-    await usingAsync(new Injector(), async (i) => {
-      const { apiUrl } = await prepareInjector(i)
-      const result = await fetch(PathHelper.joinPaths(apiUrl, 'some-route-that-does-not-exists'))
+    await usingAsync(await createIntegrationApi(), async ({ apiUrl }) => {
+      const result = await fetch(PathHelper.joinPaths(apiUrl, 'some-route-that-does-not-exists'), {
+        method: 'GET',
+      })
       expect(result.ok).toBe(false)
       expect(result.status).toBe(404)
       const responseText = await result.json()
@@ -96,8 +90,7 @@ describe('@furystack/rest-service inregration tests', () => {
   })
 
   it('Should respond with 401 for unauthorized request errors', async () => {
-    await usingAsync(new Injector(), async (i) => {
-      const { apiUrl } = await prepareInjector(i)
+    await usingAsync(await createIntegrationApi(), async ({ apiUrl }) => {
       const result = await fetch(PathHelper.joinPaths(apiUrl, 'currentUser'))
       expect(result.ok).toBe(false)
       expect(result.status).toBe(401)
@@ -107,8 +100,7 @@ describe('@furystack/rest-service inregration tests', () => {
   })
 
   it('Should respond with 401 for unauthorized request errors', async () => {
-    await usingAsync(new Injector(), async (i) => {
-      const { apiUrl } = await prepareInjector(i)
+    await usingAsync(await createIntegrationApi(), async ({ apiUrl }) => {
       const result = await fetch(PathHelper.joinPaths(apiUrl, 'currentUser'))
       expect(result.ok).toBe(false)
       expect(result.status).toBe(401)
@@ -118,8 +110,7 @@ describe('@furystack/rest-service inregration tests', () => {
   })
 
   it('Should respond with the correct result body', async () => {
-    await usingAsync(new Injector(), async (i) => {
-      const { apiUrl } = await prepareInjector(i)
+    await usingAsync(await createIntegrationApi(), async ({ apiUrl }) => {
       const response = await fetch(PathHelper.joinPaths(apiUrl, 'isAuthenticated'))
       expect(response.status).toBe(200)
       const result = await response.json()
@@ -128,9 +119,8 @@ describe('@furystack/rest-service inregration tests', () => {
   })
 
   it('Should be able to read query parameters', async () => {
-    await usingAsync(new Injector(), async (i) => {
-      const { apiUrl } = await prepareInjector(i)
-
+    await usingAsync(await createIntegrationApi(), async ({ apiUrl }) => {
+      console.log('apiUrl', apiUrl)
       const response = await fetch(PathHelper.joinPaths(apiUrl, `testQuery?param1=${serializeValue('foo')}`))
       expect(response.status).toBe(200)
       const result = await response.json()
@@ -139,9 +129,7 @@ describe('@furystack/rest-service inregration tests', () => {
   })
 
   it('Should be able to read url parameters', async () => {
-    await usingAsync(new Injector(), async (i) => {
-      const { apiUrl } = await prepareInjector(i)
-
+    await usingAsync(await createIntegrationApi(), async ({ apiUrl }) => {
       const response = await fetch(PathHelper.joinPaths(apiUrl, 'testUrlParams/bar'))
       expect(response.status).toBe(200)
       const result = await response.json()
@@ -150,9 +138,7 @@ describe('@furystack/rest-service inregration tests', () => {
   })
 
   it('Should be able to read post body', async () => {
-    await usingAsync(new Injector(), async (i) => {
-      const { apiUrl } = await prepareInjector(i)
-
+    await usingAsync(await createIntegrationApi(), async ({ apiUrl }) => {
       const response = await fetch(PathHelper.joinPaths(apiUrl, 'testPostBody'), {
         method: 'POST',
         body: JSON.stringify({ value: 'baz' }),
@@ -164,20 +150,20 @@ describe('@furystack/rest-service inregration tests', () => {
   })
 
   it('Should respond with OK to OPTIONS requests', async () => {
-    await usingAsync(new Injector(), async (i) => {
-      const { apiUrl } = await prepareInjector(i)
-
+    await usingAsync(await createIntegrationApi(), async ({ apiUrl }) => {
       const response = await fetch(PathHelper.joinPaths(apiUrl, 'testPostBody'), {
         method: 'OPTIONS',
+      }).catch((e) => {
+        console.log(e)
+        throw e
       })
       expect(response.status).toBe(200)
     })
   })
 
   it('Should reject requests outside of the API Root', async () => {
-    await usingAsync(new Injector(), async (i) => {
-      const { hostName, port } = await prepareInjector(i)
-      await expect(fetch(PathHelper.joinPaths(`http://${hostName}:${port}`, 'not-my-api-root'))).rejects.toThrowError(
+    await usingAsync(await createIntegrationApi(), async ({ port }) => {
+      await expect(fetch(PathHelper.joinPaths(`http://127.0.0.1:${port}`, 'not-my-api-root'))).rejects.toThrowError(
         'fetch failed',
       )
     })

package/src/rest.integration.test.ts

@@ -56,7 +56,7 @@ const createEchoApiServer = async () => {
     },
   })
   const client = createClient<EchoApi>({
-    endpointUrl: `http://localhost:${port}/api`,
+    endpointUrl: `http://127.0.0.1:${port}/api`,
   })
   return {
     dispose: injector.dispose.bind(injector),

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

@@ -3,23 +3,7 @@ import { sleepAsync, usingAsync } from '@furystack/utils'
 import { ServerManager } from './server-manager.js'
 import { StaticServerManager } from './static-server-manager.js'
 import { describe, it, expect, vi } from 'vitest'
-
-/**
- * Generator for an incremental port number
- * @param initialPort The initial port number
- * @yields a port for testing
- * @returns The Port number
- */
-function* portGenerator(initialPort = 17000) {
-  let port = initialPort
-
-  while (true) {
-    yield port++
-  }
-  return port
-}
-
-const getPort = () => portGenerator().next().value
+import { getPort } from '@furystack/core/port-generator'
 
 describe('StaticServerManager', () => {
   describe('Top level routing', () => {
@@ -33,7 +17,7 @@ describe('StaticServerManager', () => {
           port,
         })
 
-        const result = await fetch(`http://localhost:${port}/not-found.html`)
+        const result = await fetch(`http://127.0.0.1:${port}/not-found.html`)
         expect(result.ok).toBe(false)
         expect(result.status).toBe(404)
         expect(result?.headers.get('content-type')).toBe('text/plain')

package/src/static-server-manager.ts

@@ -18,7 +18,7 @@ export interface StaticServerOptions {
 @Injectable({ lifetime: 'singleton' })
 export class StaticServerManager {
   @Injected(ServerManager)
-  private readonly serverManager!: ServerManager
+  private declare readonly serverManager: ServerManager
 
   private async sendFile({
     fullPath,

package/src/validate.integration.spec.ts

@@ -8,13 +8,19 @@ import type { ValidationApi } from './validate.integration.schema.js'
 import { useRestService } from './helpers.js'
 import { describe, it, expect } from 'vitest'
 import { getPort } from '@furystack/core/port-generator'
+import { getStoreManager, InMemoryStore, User } from '@furystack/core'
+import { DefaultSession } from './models/default-session.js'
 
 // To recreate: yarn ts-json-schema-generator -f tsconfig.json --no-type-check -p packages/rest-service/src/validate.integration.schema.ts -o packages/rest-service/src/validate.integration.spec.schema.json
 
 const createValidateApi = async () => {
   const injector = new Injector()
   const port = getPort()
-  useRestService<ValidationApi>({
+
+  getStoreManager(injector).addStore(new InMemoryStore({ model: User, primaryKey: 'username' }))
+  getStoreManager(injector).addStore(new InMemoryStore({ model: DefaultSession, primaryKey: 'sessionId' }))
+
+  await useRestService<ValidationApi>({
     injector,
     api: {
       GET: {
@@ -54,8 +60,9 @@ const createValidateApi = async () => {
     root: '/api',
   })
   const client = createClient<ValidationApi>({
-    endpointUrl: `http://localhost:${port}/api`,
+    endpointUrl: `http://127.0.0.1:${port}/api`,
   })
+
   return {
     dispose: injector.dispose.bind(injector),
     client,

package/esm/incoming-message-extensions.spec.d.ts

@@ -1,2 +0,0 @@
-import './incoming-message-extensions';
-//# sourceMappingURL=incoming-message-extensions.spec.d.ts.map

package/esm/incoming-message-extensions.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"incoming-message-extensions.spec.d.ts","sourceRoot":"","sources":["../src/incoming-message-extensions.spec.ts"],"names":[],"mappings":"AACA,OAAO,+BAA+B,CAAA"}

package/esm/incoming-message-extensions.spec.js

@@ -1,38 +0,0 @@
-import { IncomingMessage } from 'http';
-import './incoming-message-extensions';
-import { Socket } from 'net';
-import { describe, it, expect } from 'vitest';
-describe('IncomingMessage extensions', () => {
-    describe('readPostBody', () => {
-        it('Should be extended', () => {
-            const socket = new Socket();
-            const msg = new IncomingMessage(socket);
-            expect(typeof msg.readPostBody).toBe('function');
-        });
-        it('Should read the raw post body', async () => {
-            const exampleValue = { value: Math.random().toString() };
-            const socket = new Socket();
-            const msg = new IncomingMessage(socket);
-            setTimeout(() => {
-                msg.read = () => JSON.stringify(exampleValue);
-                msg.emit('readable');
-                msg.emit('end');
-            }, 10);
-            const result = await msg.readPostBodyRaw();
-            expect(result).toEqual(JSON.stringify(exampleValue));
-        });
-        it('Should read the post body', async () => {
-            const exampleValue = { value: Math.random().toString() };
-            const socket = new Socket();
-            const msg = new IncomingMessage(socket);
-            setTimeout(() => {
-                msg.read = () => JSON.stringify(exampleValue);
-                msg.emit('readable');
-                msg.emit('end');
-            }, 10);
-            const result = await msg.readPostBody();
-            expect(result).toEqual(exampleValue);
-        });
-    });
-});
-//# sourceMappingURL=incoming-message-extensions.spec.js.map

package/esm/incoming-message-extensions.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"incoming-message-extensions.spec.js","sourceRoot":"","sources":["../src/incoming-message-extensions.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AACtC,OAAO,+BAA+B,CAAA;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE7C,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;YAC5B,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAA;YAC3B,MAAM,GAAG,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,CAAA;YACvC,MAAM,CAAC,OAAO,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAClD,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;YAC7C,MAAM,YAAY,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAA;YACxD,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAA;YAC3B,MAAM,GAAG,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,CAAA;YACvC,UAAU,CAAC,GAAG,EAAE;gBACd,GAAG,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;gBAC7C,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;gBACpB,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACjB,CAAC,EAAE,EAAE,CAAC,CAAA;YAEN,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,eAAe,EAAE,CAAA;YAC1C,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAA;QACtD,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;YACzC,MAAM,YAAY,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAA;YACxD,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAA;YAC3B,MAAM,GAAG,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,CAAA;YACvC,UAAU,CAAC,GAAG,EAAE;gBACd,GAAG,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;gBAC7C,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;gBACpB,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACjB,CAAC,EAAE,EAAE,CAAC,CAAA;YAEN,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,YAAY,EAAE,CAAA;YACvC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QACtC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/esm/utils.d.ts

@@ -1,25 +0,0 @@
-/// <reference path="server-response-extensions.d.ts" />
-/// <reference path="incoming-message-extensions.d.ts" />
-/// <reference types="node/http.js" />
-import type { IncomingMessage, ServerResponse } from 'http';
-import type { CorsOptions } from './models/cors-options.js';
-/**
- * A collection of various HTTP API related utilities
- */
-export declare class Utils {
-    readPostBodyRaw(incomingMessage: IncomingMessage): Promise<string>;
-    /**
-     * Reads the post's body and returns a promise with a parsed value
-     * @param incomingMessage The incoming message instance
-     * @returns the parsed object from the post body
-     */
-    readPostBody<T>(incomingMessage: IncomingMessage): Promise<T>;
-    /**
-     * Adds the specified CORS headers to the response
-     * @param options The CORS Options object
-     * @param incomingMessage The incoming message instance
-     * @param serverResponse The outgoing response instance
-     */
-    addCorsHeaders(options: CorsOptions, incomingMessage: IncomingMessage, serverResponse: ServerResponse): void;
-}
-//# sourceMappingURL=utils.d.ts.map

package/esm/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AAE3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAE3D;;GAEG;AACH,qBACa,KAAK;IACH,eAAe,CAAC,eAAe,EAAE,eAAe;IAuB7D;;;;OAIG;IACU,YAAY,CAAC,CAAC,EAAE,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC;IAM1E;;;;;OAKG;IACI,cAAc,CAAC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc;CAkB7G"}

package/esm/utils.js

@@ -1,70 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { Injectable } from '@furystack/inject';
-/**
- * A collection of various HTTP API related utilities
- */
-let Utils = class Utils {
-    async readPostBodyRaw(incomingMessage) {
-        if (!incomingMessage.readable) {
-            throw Error('Incoming message is not readable');
-        }
-        let body = '';
-        await new Promise((resolve, reject) => {
-            incomingMessage.on('readable', () => {
-                const data = incomingMessage.read();
-                if (data) {
-                    body += data;
-                }
-            });
-            incomingMessage.on('end', () => {
-                resolve();
-            });
-            incomingMessage.on('error', (err) => {
-                reject(err);
-            });
-        });
-        return body;
-    }
-    /**
-     * Reads the post's body and returns a promise with a parsed value
-     * @param incomingMessage The incoming message instance
-     * @returns the parsed object from the post body
-     */
-    async readPostBody(incomingMessage) {
-        const body = incomingMessage.postBody || JSON.parse(await this.readPostBodyRaw(incomingMessage));
-        incomingMessage.postBody = body;
-        return body;
-    }
-    /**
-     * Adds the specified CORS headers to the response
-     * @param options The CORS Options object
-     * @param incomingMessage The incoming message instance
-     * @param serverResponse The outgoing response instance
-     */
-    addCorsHeaders(options, incomingMessage, serverResponse) {
-        if (incomingMessage.headers &&
-            incomingMessage.headers.origin !== incomingMessage.headers.host &&
-            options.origins.some((origin) => origin === incomingMessage.headers.origin)) {
-            serverResponse.setHeader('Access-Control-Allow-Origin', incomingMessage.headers.origin);
-            if (options.credentials) {
-                serverResponse.setHeader('Access-Control-Allow-Credentials', 'true');
-            }
-            if (options.headers && options.headers.length) {
-                serverResponse.setHeader('Access-Control-Allow-Headers', options.headers.join(', '));
-            }
-            if (options.methods && options.methods.length) {
-                serverResponse.setHeader('Access-Control-Allow-Methods', options.methods.join(', '));
-            }
-        }
-    }
-};
-Utils = __decorate([
-    Injectable({ lifetime: 'transient' })
-], Utils);
-export { Utils };
-//# sourceMappingURL=utils.js.map

package/esm/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAG9C;;GAEG;AAEI,IAAM,KAAK,GAAX,MAAM,KAAK;IACT,KAAK,CAAC,eAAe,CAAC,eAAgC;QAC3D,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;YAC9B,MAAM,KAAK,CAAC,kCAAkC,CAAC,CAAA;QACjD,CAAC;QAED,IAAI,IAAI,GAAG,EAAE,CAAA;QACb,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,eAAe,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;gBAClC,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,EAAE,CAAA;gBACnC,IAAI,IAAI,EAAE,CAAC;oBACT,IAAI,IAAI,IAAI,CAAA;gBACd,CAAC;YACH,CAAC,CAAC,CAAA;YACF,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBAC7B,OAAO,EAAE,CAAA;YACX,CAAC,CAAC,CAAA;YACF,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBAClC,MAAM,CAAC,GAAG,CAAC,CAAA;YACb,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,YAAY,CAAI,eAAgC;QAC3D,MAAM,IAAI,GAAG,eAAe,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,CAAA;QAChG,eAAe,CAAC,QAAQ,GAAG,IAAI,CAAA;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;OAKG;IACI,cAAc,CAAC,OAAoB,EAAE,eAAgC,EAAE,cAA8B;QAC1G,IACE,eAAe,CAAC,OAAO;YACvB,eAAe,CAAC,OAAO,CAAC,MAAM,KAAK,eAAe,CAAC,OAAO,CAAC,IAAI;YAC/D,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,EAC3E,CAAC;YACD,cAAc,CAAC,SAAS,CAAC,6BAA6B,EAAE,eAAe,CAAC,OAAO,CAAC,MAAgB,CAAC,CAAA;YACjG,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;gBACxB,cAAc,CAAC,SAAS,CAAC,kCAAkC,EAAE,MAAM,CAAC,CAAA;YACtE,CAAC;YACD,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBAC9C,cAAc,CAAC,SAAS,CAAC,8BAA8B,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YACtF,CAAC;YACD,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBAC9C,cAAc,CAAC,SAAS,CAAC,8BAA8B,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YACtF,CAAC;QACH,CAAC;IACH,CAAC;CACF,CAAA;AA3DY,KAAK;IADjB,UAAU,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;GACzB,KAAK,CA2DjB"}

package/src/incoming-message-extensions.spec.ts

@@ -1,42 +0,0 @@
-import { IncomingMessage } from 'http'
-import './incoming-message-extensions'
-import { Socket } from 'net'
-import { describe, it, expect } from 'vitest'
-
-describe('IncomingMessage extensions', () => {
-  describe('readPostBody', () => {
-    it('Should be extended', () => {
-      const socket = new Socket()
-      const msg = new IncomingMessage(socket)
-      expect(typeof msg.readPostBody).toBe('function')
-    })
-
-    it('Should read the raw post body', async () => {
-      const exampleValue = { value: Math.random().toString() }
-      const socket = new Socket()
-      const msg = new IncomingMessage(socket)
-      setTimeout(() => {
-        msg.read = () => JSON.stringify(exampleValue)
-        msg.emit('readable')
-        msg.emit('end')
-      }, 10)
-
-      const result = await msg.readPostBodyRaw()
-      expect(result).toEqual(JSON.stringify(exampleValue))
-    })
-
-    it('Should read the post body', async () => {
-      const exampleValue = { value: Math.random().toString() }
-      const socket = new Socket()
-      const msg = new IncomingMessage(socket)
-      setTimeout(() => {
-        msg.read = () => JSON.stringify(exampleValue)
-        msg.emit('readable')
-        msg.emit('end')
-      }, 10)
-
-      const result = await msg.readPostBody()
-      expect(result).toEqual(exampleValue)
-    })
-  })
-})

package/src/utils.ts

@@ -1,68 +0,0 @@
-import type { IncomingMessage, ServerResponse } from 'http'
-import { Injectable } from '@furystack/inject'
-import type { CorsOptions } from './models/cors-options.js'
-
-/**
- * A collection of various HTTP API related utilities
- */
-@Injectable({ lifetime: 'transient' })
-export class Utils {
-  public async readPostBodyRaw(incomingMessage: IncomingMessage) {
-    if (!incomingMessage.readable) {
-      throw Error('Incoming message is not readable')
-    }
-
-    let body = ''
-    await new Promise<void>((resolve, reject) => {
-      incomingMessage.on('readable', () => {
-        const data = incomingMessage.read()
-        if (data) {
-          body += data
-        }
-      })
-      incomingMessage.on('end', () => {
-        resolve()
-      })
-      incomingMessage.on('error', (err) => {
-        reject(err)
-      })
-    })
-    return body
-  }
-
-  /**
-   * Reads the post's body and returns a promise with a parsed value
-   * @param incomingMessage The incoming message instance
-   * @returns the parsed object from the post body
-   */
-  public async readPostBody<T>(incomingMessage: IncomingMessage): Promise<T> {
-    const body = incomingMessage.postBody || JSON.parse(await this.readPostBodyRaw(incomingMessage))
-    incomingMessage.postBody = body
-    return body
-  }
-
-  /**
-   * Adds the specified CORS headers to the response
-   * @param options The CORS Options object
-   * @param incomingMessage The incoming message instance
-   * @param serverResponse The outgoing response instance
-   */
-  public addCorsHeaders(options: CorsOptions, incomingMessage: IncomingMessage, serverResponse: ServerResponse) {
-    if (
-      incomingMessage.headers &&
-      incomingMessage.headers.origin !== incomingMessage.headers.host &&
-      options.origins.some((origin) => origin === incomingMessage.headers.origin)
-    ) {
-      serverResponse.setHeader('Access-Control-Allow-Origin', incomingMessage.headers.origin as string)
-      if (options.credentials) {
-        serverResponse.setHeader('Access-Control-Allow-Credentials', 'true')
-      }
-      if (options.headers && options.headers.length) {
-        serverResponse.setHeader('Access-Control-Allow-Headers', options.headers.join(', '))
-      }
-      if (options.methods && options.methods.length) {
-        serverResponse.setHeader('Access-Control-Allow-Methods', options.methods.join(', '))
-      }
-    }
-  }
-}