objective-http 1.2.5 → 1.3.0

package/README.md

@@ -13,23 +13,29 @@ const createServerFunction = require('node:http').createServer;
 const {
     Server,
     LoggedServer,
-    InputRequest,
-    JsonInputRequest,
-    LoggedInputRequest,
-    OutputResponse,
-    JsonOutputResponse,
-    LoggedOutputResponse,
-    Endpoint,
-    LoggedEndpoint,
-    Endpoints
+    endpoint: {
+        Endpoint,
+        LoggedEndpoint,
+        Endpoints
+    },
+    request: {
+        InputRequest,
+        JsonInputRequest,
+        LoggedInputRequest,
+    },
+    response: {
+        OutputResponse,
+        JsonOutputResponse,
+        LoggedOutputResponse
+    }
 } = require('objective-http').server;
 
 new LoggedServer(
     new Server(
         new Endpoints([
-            new MyFirstEndpoint(new LoggedEndpoint(new Endpoint(), console)),
-            new MySecondEndpoint(new LoggedEndpoint(new Endpoint(), console)),
-            new MyThirdEndpoint(new LoggedEndpoint(new Endpoint(), console))
+            new LoggedEndpoint(new MyFirstEndpoint(), console),
+            new LoggedEndpoint(new MySecondEndpoint(), console),
+            new LoggedEndpoint(new MyThirdEndpoint(), console)
         ]),
         {port: server_port},
         new LoggedInputRequest(new JsonInputRequest(new InputRequest()), console),
@@ -77,8 +83,12 @@ class MyEndpoint {
 const requestFunction = require('node:http').request;
 
 const {
-    OutputRequest,
-    InputResponse
+    request: {
+        OutputRequest
+    },
+    response: {
+        InputResponse
+    }
 } = require('objective-http').client;
 
 
@@ -127,23 +137,29 @@ const createServerFunction = require('node:http').createServer;
 const {
     Server,
     LoggedServer,
-    InputRequest,
-    JsonInputRequest,
-    LoggedInputRequest,
-    OutputResponse,
-    JsonOutputResponse,
-    LoggedOutputResponse,
-    Endpoint,
-    LoggedEndpoint,
-    Endpoints
+    endpoint: {
+        Endpoint,
+        LoggedEndpoint,
+        Endpoints
+    },
+    request: {
+        InputRequest,
+        JsonInputRequest,
+        LoggedInputRequest,
+    },
+    response: {
+        OutputResponse,
+        JsonOutputResponse,
+        LoggedOutputResponse
+    }
 } = require('objective-http').server;
 
 new LoggedServer(
     new Server(
         new Endpoints([
-            new MyFirstEndpoint(new LoggedEndpoint(new Endpoint(), console)),
-            new MySecondEndpoint(new LoggedEndpoint(new Endpoint(), console)),
-            new MyThirdEndpoint(new LoggedEndpoint(new Endpoint(), console))
+            new LoggedEndpoint(new MyFirstEndpoint(), console),
+            new LoggedEndpoint(new MySecondEndpoint(), console),
+            new LoggedEndpoint(new MyThirdEndpoint(), console)
         ]),
         {port: server_port},
         new LoggedInputRequest(new JsonInputRequest(new InputRequest()), console),
@@ -163,15 +179,28 @@ const createServerFunction = require('objective-http').bun.bunttp.createServer;
 const {
     Server,
     LoggedServer,
-    InputRequest,
-    JsonInputRequest,
-    LoggedInputRequest,
-    OutputResponse,
-    JsonOutputResponse,
-    LoggedOutputResponse,
-    Endpoint,
-    LoggedEndpoint,
-    Endpoints
+    endpoint: {
+        Endpoint,
+        LoggedEndpoint,
+        Endpoints
+    },
+    request: {
+        JsonInputRequest,
+        LoggedInputRequest,
+    },
+    response: {
+        JsonOutputResponse,
+        LoggedOutputResponse
+    }
+} = require('objective-http').server;
+
+const {
+    request: {
+        InputRequest
+    },
+    response: {
+        OutputResponse
+    }
 } = require('objective-http').bun.server;
 ```
 
@@ -184,8 +213,12 @@ It should work with `node` and `bun`:
 const requestFunction = require('node:http').request;
 
 const {
-    OutputRequest,
-    InputResponse
+    request: {
+        OutputRequest
+    },
+    response: {
+        InputResponse
+    }
 } = require('objective-http').client;
 
 await (new OutputRequest(new InputResponse(), requestFunction)
@@ -203,7 +236,11 @@ In order for the code to be executed only by `bun`, you need to make changes to
 const requestFunction = require('objective-http').bun.bunttp.request;
 
 const {
-    OutputRequest,
-    InputResponse
+    request: {
+        OutputRequest
+    },
+    response: {
+        InputResponse
+    }
 } = require('objective-http').bun.client;
 ```

package/package.json

@@ -1 +1 @@
-{"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"}
+{"name":"objective-http","version":"1.3.0","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/client/index.js

@@ -1,4 +1,4 @@
 module.exports = {
-    OutputRequest: require('./request/OutputRequest'),
-    InputResponse: require('./response/InputResponse')
+    request: require('./request'),
+    response: require('./response')
 }

package/src/js/bun/client/request/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+    OutputRequest: require('./OutputRequest')
+};

package/src/js/bun/client/response/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+    InputResponse: require('./InputResponse')
+};

package/src/js/bun/server/index.js

@@ -1,4 +1,4 @@
 module.exports = {
-    InputRequest: require('./request/InputRequest'),
-    OutputResponse: require('./response/OutputResponse')
+    request: require('./request'),
+    response: require('./response')
 }

package/src/js/bun/server/request/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+    InputRequest: require('./InputRequest')
+};

package/src/js/bun/server/response/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+    OutputResponse: require('./OutputResponse')
+};

package/src/js/client/index.js

@@ -1,4 +1,4 @@
 module.exports = {
-    OutputRequest: require('./request/OutputRequest'),
-    InputResponse: require('./response/InputResponse')
+    request: require('./request'),
+    response: require('./response')
 }

package/src/js/client/request/OutputRequest.js

@@ -13,17 +13,42 @@ module.exports = class OutputRequest {
         return new OutputRequest(response, http,  {method: 'GET', ...options});
     }
 
-    send() {
-        return new Promise((resolve, reject) => {
-            try {
+    async send() {
+        try {
+            return await new Promise((resolve, reject) => {
                 this.#sendRequestOutputStream(
                     this.#configureRequestOutputStream(this.#requestFunction, this.#response, this.#options, resolve, reject),
-                    this.#options);
+                    this.#options,
+                    reject);
+            });
 
-            } catch (e) {
+        } catch (e) {
+            if (e.cause == null) {
                 throw new Error(e.message, {cause: 'INVALID_REQUEST'});
             }
-        });
+
+            throw e;
+        }
+    }
+
+    #sendRequestOutputStream(requestOutputStream, options, reject) {
+        try {
+            requestOutputStream.once('error', e => reject(e));
+
+            if (this.#needToByWritten(options)) {
+                requestOutputStream.write(options.body);
+            }
+
+            requestOutputStream.end();
+
+        } catch (e) {
+            reject(e);
+        }
+    }
+
+    #needToByWritten(options) {
+        return ['POST', 'PUT'].some(method => method === options.method.toString().toUpperCase())
+            && (options.body != null && typeof options.body === 'string');
     }
 
     #configureRequestOutputStream(requestFunction, response, options, resolve, reject) {
@@ -53,17 +78,4 @@ module.exports = class OutputRequest {
             reject(e);
         }
     }
-
-    #sendRequestOutputStream(requestOutputStream, options) {
-        if (this.#needToByWritten(options)) {
-            requestOutputStream.write(options.body);
-        }
-
-        requestOutputStream.end();
-    }
-
-    #needToByWritten(options) {
-        return ['POST', 'PUT'].some(method => method === options.method.toString().toUpperCase())
-            && (options.body != null && typeof options.body === 'string');
-    }
 };

package/src/js/client/request/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+    OutputRequest: require('./OutputRequest')
+};

package/src/js/client/response/InputResponse.js

@@ -11,27 +11,6 @@ module.exports = class InputResponse {
         return new InputResponse(inputStream, options);
     }
 
-    flush() {
-        return new Promise((resolve, reject) => {
-            try {
-                this.#inputStream.once('error', (e) => reject(new Error(e.message, {cause: 'INVALID_RESPONSE'})));
-
-                let chunks = [];
-                this.#inputStream.on('data', (chunk) => chunks.push(chunk));
-                this.#inputStream.on('end', () => resolve(new InputResponse(this.#inputStream,
-                    {
-                        statusCode: this.#inputStream.statusCode,
-                        headers: new Headers(this.#inputStream.headers),
-                        body: Buffer.concat(chunks)
-                    }
-                )));
-
-            } catch (e) {
-                throw new Error(e.message, {cause: 'INVALID_RESPONSE'});
-            }
-        });
-    }
-
     statusCode() {
         return this.#options.statusCode;
     }
@@ -43,4 +22,37 @@ module.exports = class InputResponse {
     body() {
         return this.#options.body;
     }
+
+    async flush() {
+        try {
+            return await new Promise((resolve, reject) => {
+                this.#flushResponseInputStream(this.#inputStream, resolve, reject);
+            });
+
+        } catch (e) {
+            throw new Error(e.message, {cause: 'INVALID_RESPONSE'});
+        }
+    }
+
+    #flushResponseInputStream(inputStream, resolve, reject) {
+        try {
+            inputStream.once('error', (e) => reject(e));
+
+            let chunks = [];
+            inputStream.on('data', (chunk) => chunks.push(chunk));
+            inputStream.on('end', () => resolve(
+                new InputResponse(
+                    inputStream,
+                    {
+                        statusCode: inputStream.statusCode,
+                        headers: new Headers(inputStream.headers),
+                        body: Buffer.concat(chunks)
+                    }
+                )
+            ));
+
+        } catch (e) {
+            reject(e);
+        }
+    }
 };

package/src/js/client/response/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+    InputResponse: require('./InputResponse')
+};

package/src/js/server/endpoint/LoggedEndpoint.js

@@ -18,6 +18,13 @@ module.exports = class LoggedEndpoint {
     async handle(request) {
         this.#logger.debug(`HttpEndpoint's handling [${request.route().method}] ${request.route().path}`);
 
-        return await this.#origin.handle(request);
+        try {
+            return await this.#origin.handle(request);
+
+        } catch (e) {
+            this.#logger.error(`HttpEndpoint's handling [${request.route().method}] ${request.route().path} error: ${e.message}`, e);
+
+            throw e;
+        }
     }
 }

package/src/js/server/endpoint/index.js

@@ -0,0 +1,5 @@
+module.exports = {
+    Endpoint: require('./Endpoint'),
+    LoggedEndpoint: require('./LoggedEndpoint'),
+    Endpoints: require('./Endpoints'),
+};

package/src/js/server/index.js

@@ -1,13 +1,7 @@
 module.exports = {
     Server: require('./Server'),
     LoggedServer: require('./LoggedServer'),
-    Endpoint: require('./endpoint/Endpoint'),
-    LoggedEndpoint: require('./endpoint/LoggedEndpoint'),
-    Endpoints: require('./endpoint/Endpoints'),
-    InputRequest: require('./request/InputRequest'),
-    JsonInputRequest: require('./request/JsonInputRequest'),
-    LoggedInputRequest: require('./request/LoggedInputRequest'),
-    OutputResponse: require('./response/OutputResponse'),
-    JsonOutputResponse: require('./response/JsonOutputResponse'),
-    LoggedOutputResponse: require('./response/LoggedOutputResponse')
+    endpoint: require('./endpoint'),
+    request: require('./request'),
+    response: require('./response')
 }

package/src/js/server/request/LoggedInputRequest.js

@@ -16,7 +16,14 @@ module.exports = class LoggedInputRequest {
     async flush() {
         this.#logger.debug(`HttpRequest: [${this.#inputStream.method}] ${this.#inputStream.url} ${JSON.stringify(this.#inputStream.headers)}`);
 
-        return new LoggedInputRequest(await this.#origin.flush(), this.#logger);
+        try {
+            return new LoggedInputRequest(await this.#origin.flush(), this.#logger);
+
+        } catch (e) {
+            this.#logger.error(`HttpRequest: [${this.#inputStream.method}] ${this.#inputStream.url} error: ${e.message}`, e);
+
+            throw e;
+        }
     }
 
     route() {

package/src/js/server/request/index.js

@@ -0,0 +1,5 @@
+module.exports = {
+    InputRequest: require('./InputRequest'),
+    JsonInputRequest: require('./JsonInputRequest'),
+    LoggedInputRequest: require('./LoggedInputRequest')
+};

package/src/js/server/response/LoggedOutputResponse.js

@@ -16,10 +16,21 @@ module.exports = class LoggedOutputResponse {
     }
 
     flush() {
-        const outputStream = this.#origin.flush();
+        const outputStream = this.#loggedFlush();
 
         this.#logger.debug(`HttpResponse: [${outputStream.req.method}] ${outputStream.req.url} - ${outputStream.statusCode}`);
 
         return outputStream;
     }
+
+    #loggedFlush() {
+        try {
+            return this.#origin.flush();
+
+        } catch (e) {
+            this.#logger.error(`HttpResponse error: ${e.message}`, e);
+
+            throw e;
+        }
+    }
 }

package/src/js/server/response/index.js

@@ -0,0 +1,5 @@
+module.exports = {
+    OutputResponse: require('./OutputResponse'),
+    JsonOutputResponse: require('./JsonOutputResponse'),
+    LoggedOutputResponse: require('./LoggedOutputResponse')
+};