objective-http 1.2.3 → 1.2.5

package/README.md

@@ -8,7 +8,7 @@ There are all `Server` classes feature.
 Your endpoints must implement `Endpoint` class interface (`route()` and `async handle(request)` methods).
 
 ```javascript
-const http = require('node:http');
+const createServerFunction = require('node:http').createServer;
 
 const {
     Server,
@@ -34,7 +34,7 @@ new LoggedServer(
         {port: server_port},
         new LoggedInputRequest(new JsonInputRequest(new InputRequest()), console),
         new LoggedOutputResponse(new JsonOutputResponse(new OutputResponse()), console),
-        http
+        createServerFunction
     ),
     console
 ).start();
@@ -74,8 +74,8 @@ class MyEndpoint {
 ## Client
 
 ```javascript
-const http = require('node:http');
-const requestFunction = http.request;
+const requestFunction = require('node:http').request;
+
 const {
     OutputRequest,
     InputResponse
@@ -122,7 +122,7 @@ And you should replace `node:http` package with `objective-http.bun.bunttp` in y
 It should work with `node` and `bun`:
 
 ```javascript
-const http = require('node:http');
+const createServerFunction = require('node:http').createServer;
 
 const {
     Server,
@@ -148,7 +148,7 @@ new LoggedServer(
         {port: server_port},
         new LoggedInputRequest(new JsonInputRequest(new InputRequest()), console),
         new LoggedOutputResponse(new JsonOutputResponse(new OutputResponse()), console),
-        http
+        createServerFunction
     ),
     console
 ).start()
@@ -158,7 +158,7 @@ In order for the code to be executed only by `bun` (with `Bun API` inside), you
 `bun` package redeclare only `InputRequest` and `OutputResponse` classes. Other classes taken from `server` package.
 
 ```javascript
-const http = require('objective-http').bun.bunttp;
+const createServerFunction = require('objective-http').bun.bunttp.createServer;
 
 const {
     Server,
@@ -181,8 +181,8 @@ const {
 It should work with `node` and `bun`:
 
 ```javascript
-const http = require('node:http');
-const requestFunction = http.request;
+const requestFunction = require('node:http').request;
+
 const {
     OutputRequest,
     InputResponse
@@ -200,8 +200,8 @@ await (new OutputRequest(new InputResponse(), requestFunction)
 In order for the code to be executed only by `bun`, you need to make changes to the import block.
 
 ```javascript
-const http = require('objective-http').bun.bunttp;
-const requestFunction = http.request;
+const requestFunction = require('objective-http').bun.bunttp.request;
+
 const {
     OutputRequest,
     InputResponse

package/package.json

@@ -1 +1 @@
-{"name":"objective-http","version":"1.2.3","description":"Proxy classes for creating a http server","keywords":["web","web-server","http","http-server","oop"],"author":{"name":"volatilization","email":"volatilization@yandex.ru"},"repository":{"url":"git+https://github.com/volatilization/objective-http.git"},"license":"LGPL-3.0-only","main":"src/js/index.js"}
+{"name":"objective-http","version":"1.2.5","description":"Proxy classes for creating a http server","keywords":["web","web-server","http","http-server","oop"],"author":{"name":"volatilization","email":"volatilization@yandex.ru"},"repository":{"url":"git+https://github.com/volatilization/objective-http.git"},"license":"LGPL-3.0-only","main":"src/js/index.js"}

package/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;

package/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
     }

package/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))
             );
         });
     }