@e-mc/request 0.11.10 → 0.11.12

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.11.10/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.11.12/lib/index.d.ts)
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
@@ -209,9 +209,9 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.11.10/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.10/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.10/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.12/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.12/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.12/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/http/adapter/index.js

@@ -73,13 +73,21 @@ class HttpAdapter {
                     return;
                 }
                 const statusCode = headers[':status'];
-                if (statusCode < 300) {
-                    this.acceptResponse(headers);
+                if (statusCode === 204 || statusCode === 304) {
+                    this.acceptResponse(headers, true);
                 }
-                else if (statusCode < 400) {
+                else if (statusCode < 300) {
+                    this.acceptResponse(headers, false);
+                }
+                else if (statusCode === 301 ||
+                    statusCode === 302 ||
+                    statusCode === 303 ||
+                    statusCode === 307 ||
+                    statusCode === 308) {
                     this.redirectResponse(statusCode, headers.location);
                 }
-                else if (statusCode === 401 ||
+                else if (statusCode === 305 ||
+                    statusCode === 401 ||
                     statusCode === 402 ||
                     statusCode === 403 ||
                     statusCode === 404 ||
@@ -145,10 +153,17 @@ class HttpAdapter {
                     return;
                 }
                 const statusCode = res.statusCode;
-                if (statusCode < 300) {
-                    this.acceptResponse(res.headers);
+                if (statusCode === 204 || statusCode === 304) {
+                    this.acceptResponse(res.headers, true);
+                }
+                else if (statusCode < 300) {
+                    this.acceptResponse(res.headers, false);
                 }
-                else if (statusCode < 400) {
+                else if (statusCode === 301 ||
+                    statusCode === 302 ||
+                    statusCode === 303 ||
+                    statusCode === 307 ||
+                    statusCode === 308) {
                     this.redirectResponse(statusCode, res.headers.location);
                 }
                 else if (this.isRetry(statusCode)) {
@@ -220,7 +235,7 @@ class HttpAdapter {
         this.opts.httpVersion = 1;
         this.init();
     }
-    acceptResponse(headers) {
+    acceptResponse(headers, empty = false) {
         const opts = this.opts;
         if ('outHeaders' in opts) {
             opts.outHeaders = headers;
@@ -232,7 +247,7 @@ class HttpAdapter {
         const enabled = opts.connected?.call(this.client, headers) !== false && !pipeline;
         const maxBufferSize = opts.maxBufferSize ? (0, types_1.alignSize)(opts.maxBufferSize) : 0;
         this.contentLength = parseInt(headers['content-length'] || '0');
-        const updating = opts.progressId !== undefined && !!this.instance.host && this.contentLength > 0;
+        const updating = opts.progressId !== undefined && !!this.instance.host && this.contentLength > 0 && !empty;
         const readTimeout = this.instance.readTimeout;
         let log = this.state.log, buffer = null, dataLength = 0;
         this.client.once('readable', () => {
@@ -261,7 +276,7 @@ class HttpAdapter {
                 this.updateProgress(0, 0);
             }
         });
-        if (enabled) {
+        if (enabled && !empty) {
             const encoding = opts.encoding;
             this.client.on('data', (chunk) => {
                 if (buffer) {
@@ -360,7 +375,7 @@ class HttpAdapter {
                 if (updating) {
                     this.updateProgress(0, this.contentLength);
                 }
-                if (enabled && this.instance.readExpect === 'always') {
+                if (enabled && this.instance.readExpect === 'always' && !empty) {
                     this.terminate("No data received");
                     return;
                 }

package/index.js

@@ -277,6 +277,8 @@ function checkEncoding(request, response, statusCode, outStream, contentEncoding
         case 206:
             request.emit('error', (0, types_1.errorValue)("Aborted", 'Partial content'));
         case 204:
+        case 205:
+        case 304:
             return;
     }
     if (!contentEncoding) {
@@ -379,6 +381,7 @@ function successDns(instance, value, pending, connected) {
     }
     pending.length = 0;
 }
+const hasResponse = (value) => value >= 200 && (value < 300 || value === 304);
 const isFunction = (value) => typeof value === 'function';
 const configureDns = (family, options) => family === 0 ? options : { family, hints: family === 6 ? dns.V4MAPPED : 0 };
 const ignoreOpt = (opts, ...values) => !opts?.some(item => values.includes(item));
@@ -570,7 +573,7 @@ class Request extends module_1 {
                 break;
         }
         if (expires !== undefined) {
-            if (typeof expires === 'string') {
+            if ((0, types_1.isString)(expires)) {
                 expires = (0, types_1.parseExpires)(expires);
             }
             if (expires >= 0) {
@@ -807,8 +810,12 @@ class Request extends module_1 {
                     }
                     break;
                 case 'readExpect':
-                    if ((0, types_1.isString)(value)) {
-                        this[name] = value;
+                    switch (value) {
+                        case 'string':
+                        case 'always':
+                        case 'none':
+                            this[name] = value;
+                            break;
                     }
                     break;
             }
@@ -1477,7 +1484,7 @@ class Request extends module_1 {
                         return;
                     }
                     connected = true;
-                    if (this.matchStatus(statusCode, url, response, request, options) && statusCode >= 200 && statusCode < 300) {
+                    if (this.matchStatus(statusCode, url, response, request, options) && hasResponse(statusCode)) {
                         if (emitter = checkEncoding(request, request, statusCode, outStream, response['content-encoding'])) {
                             for (const event in listenerMap) {
                                 const [name, type] = event.split('-');
@@ -1597,7 +1604,7 @@ class Request extends module_1 {
             }, response => {
                 const statusCode = response.statusCode;
                 const incoming = response.headers;
-                if (!expectContinue && this.matchStatus(statusCode, url, incoming, request, options) && (getting || posting) && statusCode >= 200 && statusCode < 300) {
+                if (!expectContinue && this.matchStatus(statusCode, url, incoming, request, options) && (getting || posting) && hasResponse(statusCode)) {
                     let source = checkEncoding(request, response, statusCode, outStream, incoming['content-encoding']);
                     if (source) {
                         source.once('finish', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.11.10",
+  "version": "0.11.12",
   "description": "Request constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,11 +20,11 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.11.10",
-    "@e-mc/types": "0.11.10",
+    "@e-mc/module": "0.11.12",
+    "@e-mc/types": "0.11.12",
     "combined-stream": "^1.0.8",
-    "js-yaml": "^4.1.0",
-    "picomatch": "^4.0.2",
+    "js-yaml": "^4.1.1",
+    "picomatch": "^4.0.3",
     "which": "^4.0.0"
   }
 }