@webqit/fetch-plus 0.1.16 → 0.1.18

package/package.json

@@ -11,7 +11,7 @@
   ],
   "homepage": "https://fetch-plus.netlify.app/",
   "icon": "https://webqit.io/icon.svg",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@webqit/observer": "^3.8.19",
-    "@webqit/port-plus": "^0.1.17",
+    "@webqit/port-plus": "^0.1.18",
     "@webqit/url-plus": "^0.1.4",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",

package/src/LiveResponse.js

@@ -38,12 +38,19 @@ export class LiveResponse extends EventTarget {
     }
 
     static hasPort(respone) {
+        if (respone instanceof LiveResponse && respone.#port) {
+            return true;
+        }
         const responseMeta = _meta(respone);
         return !!responseMeta.get('port')
             || !!respone.headers?.get?.(this.xHeaderName)?.trim();
     }
 
     static getPort(respone, { handshake = 1 } = {}) {
+        if (respone instanceof LiveResponse && respone.#port) {
+            return respone.#port;
+        }
+        
         if (!(respone instanceof Response
             || respone instanceof LiveResponse)) {
             return;
@@ -318,6 +325,9 @@ export class LiveResponse extends EventTarget {
         const execReplaceWithResponse = async (frame, response, options) => {
             let body, port, jsonSuccess = true;
             if (response instanceof Response) {
+                if (response.bodyUsed) {
+                    throw new Error('Response body already used');
+                }
                 try {
                     body = await ResponsePlus.prototype.any.call(response, { to: 'json' });
                 } catch (e) {

package/src/messageParserMixin.js

@@ -24,7 +24,7 @@ export function messageParserMixin(superClass) {
 
             // Process body
             let body = httpMessageInit.body;
-            let type = dataType(body);
+            let type = [null, undefined].includes(body) ? null : dataType(body);
 
             // Binary bodies
             if (['Blob', 'File'].includes(type)) {
@@ -56,7 +56,7 @@ export function messageParserMixin(superClass) {
                 headers['content-length'] = (new Blob([body])).size;
             }
 
-            if (!['FormData'].includes(type)
+            if (!['FormData', null].includes(type)
                 && !['function'].includes(typeof body)
                 && !headers['content-type']) {
                 headers['content-type'] = 'application/octet-stream';
@@ -77,6 +77,8 @@ export function messageParserMixin(superClass) {
                 'blob', 'text', 'json', 'arrayBuffer', 'bytes', 'formData'
             ].includes(to)) throw new Error(`Invalid target type specified: ${to}`);
 
+            if (this.body === null) return null;
+
             const cache = _meta(this, 'cache');
             const readAs = async (type) => {
                 // 1. Direct parsing