@e-mc/request 0.10.1 → 0.10.3

package/index.js

@@ -11,13 +11,13 @@ const dns = require("dns");
 const net = require("net");
 const stream = require("stream");
 const zlib = require("zlib");
-const qs = require("querystring");
+const qs = require("node:querystring");
 const combined = require("combined-stream");
 const pm = require("picomatch");
 const yaml = require("js-yaml");
 const which = require("which");
-const module_1 = require("@e-mc/module");
 const types_1 = require("@e-mc/types");
+const module_1 = require("@e-mc/module");
 const util_1 = require("@e-mc/request/util");
 const host_1 = require("@e-mc/request/http/host");
 const kSession = Symbol('session');
@@ -96,7 +96,7 @@ function getBaseHeaders(uri, headers) {
     let result;
     for (const pathname in headers) {
         if (pathname === uri || uri.startsWith(pathname + '/')) {
-            (result || (result = [])).push([pathname, headers[pathname]]);
+            (result ||= []).push([pathname, headers[pathname]]);
         }
     }
     if (result) {
@@ -107,7 +107,7 @@ function getBaseHeaders(uri, headers) {
     }
 }
 function setDnsCache(hostname, value, expires) {
-    expires ?? (expires = DNS.EXPIRES);
+    expires ??= DNS.EXPIRES;
     if (expires > 0 && !DNS.CACHE[hostname]) {
         DNS.CACHE[hostname] = value;
         if (expires !== Infinity) {
@@ -331,8 +331,8 @@ function decompressEncoding(value, chunkSize) {
             break;
     }
 }
-function abortHeaders(href, request, options) {
-    const reason = (0, types_1.errorValue)("Aborted by client", href);
+function abortHeaders(href, request, options, statusCode = '') {
+    const reason = (0, types_1.errorMessage)(statusCode, "Aborted by client", href);
     const outAbort = options.outAbort;
     if (outAbort) {
         outAbort.abort(reason);
@@ -413,12 +413,13 @@ class Fetch {
     }
     async start() {
         return new Promise((resolve, reject) => {
-            this.promise = [resolve, reject];
+            this.resolve = resolve;
+            this.reject = reject;
             this.init();
         });
     }
     init() {
-        if (this.retries > 0) {
+        if (this.aborted || this.retries > 0) {
             this.cleanup();
             this.aborted = false;
         }
@@ -445,7 +446,7 @@ class Fetch {
                     statusCode === 404 ||
                     statusCode === 407 ||
                     statusCode === 410) {
-                    this.rejectError(this.formatStatus(statusCode));
+                    this.terminate(this.formatStatus(statusCode));
                 }
                 else if (this.isRetry(statusCode)) {
                     this.retryResponse(statusCode, headers['retry-after']);
@@ -473,7 +474,7 @@ class Fetch {
             })
                 .on('aborted', () => {
                 this.aborted = true;
-                this.rejectError((0, types_1.createAbortError)());
+                this.terminate((0, types_1.createAbortError)());
             })
                 .on('error', async (err) => {
                 if (this.aborted) {
@@ -514,13 +515,12 @@ class Fetch {
                     this.retryResponse(statusCode, res.headers['retry-after']);
                 }
                 else {
-                    this.abortResponse();
-                    this.rejectError(this.formatStatus(statusCode));
+                    this.terminate(this.formatStatus(statusCode));
                 }
             })
                 .on('abort', () => {
                 this.aborted = true;
-                this.rejectError((0, types_1.createAbortError)());
+                this.terminate((0, types_1.createAbortError)());
             })
                 .on('error', err => {
                 if (!this.aborted) {
@@ -532,12 +532,12 @@ class Fetch {
             if (this.aborted) {
                 return;
             }
-            this.abortResponse();
             if (++this.retries <= this.retryLimit) {
+                this.abortResponse();
                 this.retryTimeout();
             }
             else {
-                this.rejectError(this.formatStatus(408));
+                this.terminate(this.formatStatus(408));
             }
         });
     }
@@ -553,7 +553,7 @@ class Fetch {
                 this.config.outStream = this.outStream;
             }
             catch (err) {
-                this.rejectError(err);
+                this.terminate(err);
             }
         }
         else {
@@ -568,12 +568,6 @@ class Fetch {
             clearTimeout(this.timeout);
         }
         this.aborted = true;
-        if (this.outAbort) {
-            if (!this.client.aborted) {
-                this.outAbort.abort();
-            }
-            this.downloading.delete(this.outAbort);
-        }
         this.client.destroy();
     }
     retryDownload(downgrade, message) {
@@ -613,8 +607,7 @@ class Fetch {
             client.once('readable', () => {
                 if (instance.readTimeout > 0) {
                     this.timeout = setTimeout(() => {
-                        this.abortResponse();
-                        this.rejectError((0, types_1.errorValue)("Timeout was exceeded", this.uri.toString()));
+                        this.terminate((0, types_1.errorValue)("Timeout was exceeded", this.uri.toString()));
                     }, instance.readTimeout);
                 }
                 if (log) {
@@ -664,8 +657,7 @@ class Fetch {
                         dataLength += Buffer.byteLength(chunk, encoding);
                     }
                     if (dataLength > maxBufferSize) {
-                        this.abortResponse();
-                        this.rejectError((0, types_1.errorValue)("Size limit was exceeded", this.uri.toString()));
+                        this.terminate((0, types_1.errorValue)("Size limit was exceeded", this.uri.toString()));
                     }
                 }
             });
@@ -674,13 +666,7 @@ class Fetch {
             if (this.closed || this.aborted) {
                 return;
             }
-            if (this.timeout) {
-                clearTimeout(this.timeout);
-            }
-            if (this.outAbort) {
-                this.downloading.delete(this.outAbort);
-            }
-            this.closed = true;
+            this.close();
             const encoding = opts.encoding;
             let result, messageUnit, titleBgColor;
             if (buffer) {
@@ -743,7 +729,7 @@ class Fetch {
                     parent.updateProgress("request", progressId, 0, contentLength);
                 }
                 if (enabled && instance.readExpect === 'always') {
-                    this.rejectError("No data received");
+                    this.terminate("No data received");
                     return;
                 }
                 result = encoding && !pipeline ? '' : null;
@@ -752,34 +738,34 @@ class Fetch {
             if (log) {
                 instance.writeTimeProcess('HTTP' + config.httpVersion, config.statusMessage || this.uri.toString(), this.startTime, { type: 1024, queue: !!parent, titleBgColor, messageUnit, messageUnitMinWidth: 9, delayTime, bypassLog: LOG_STDOUT });
             }
-            this.promise[0](result);
+            this.resolve(result);
         });
         config.host.success(this.httpVersion);
     }
     redirectResponse(statusCode, location) {
-        this.abortResponse();
         if (location) {
-            if (this.config.follow_redirect === false) {
-                this.rejectError(this.formatStatus(statusCode, "Follow redirect was disabled"));
+            if (this.config.follow_redirect === false || this.config.followRedirect === false) {
+                this.terminate(this.formatStatus(statusCode, "Follow redirect was disabled"));
             }
             else if (++this.redirects <= this.redirectLimit) {
+                this.abortResponse();
                 this.setConfig(Request.fromURL(this.config.url, location));
                 this.init();
             }
             else {
-                this.rejectError(this.formatStatus(statusCode, "Exceeded redirect limit"));
+                this.terminate(this.formatStatus(statusCode, "Exceeded redirect limit"));
             }
         }
         else {
-            this.rejectError(this.formatStatus(statusCode, "Missing redirect location"));
+            this.terminate(this.formatStatus(statusCode, "Missing redirect location"));
         }
     }
     errorResponse(err) {
-        this.abortResponse();
         if (Fetch.wasAborted(err)) {
-            this.rejectError(err);
+            this.terminate(err);
         }
         else if ((0, util_1.checkRetryable)(err) && ++this.retries <= this.retryLimit) {
+            this.abortResponse();
             if (Fetch.isConnectionTimeout(err)) {
                 this.retryTimeout();
             }
@@ -791,7 +777,7 @@ class Fetch {
         }
         else {
             this.config.host.error(this.httpVersion);
-            this.rejectError(err);
+            this.terminate(err);
         }
     }
     retryResponse(statusCode, retryAfter) {
@@ -812,7 +798,7 @@ class Fetch {
                     }, offset);
                 }
                 else {
-                    this.rejectError(this.formatStatus(statusCode));
+                    this.terminate(this.formatStatus(statusCode));
                 }
                 return;
             }
@@ -834,17 +820,14 @@ class Fetch {
         this.sendWarning(this.formatRetry("HTTP connection timeout"));
         this.init();
     }
-    rejectError(err) {
+    terminate(err) {
         if (this.timeout) {
             clearTimeout(this.timeout);
         }
         if (!this.closed) {
-            this.closed = true;
             this.cleanup();
-            this.promise[1](typeof err === 'string' ? new Error(err) : err);
-        }
-        if (this.outAbort) {
-            this.downloading.delete(this.outAbort);
+            this.close();
+            this.reject(typeof err === 'string' ? new Error(err) : err);
         }
     }
     sendWarning(message) {
@@ -862,6 +845,19 @@ class Fetch {
     formatRetry(message) {
         return message + ` (${this.retries} / ${this.retryLimit})`;
     }
+    close() {
+        if (this.timeout) {
+            clearTimeout(this.timeout);
+        }
+        this.closed = true;
+        const outAbort = this.opts.outAbort;
+        if (outAbort) {
+            this.downloading.delete(outAbort);
+            if (this.aborted && !this.client.aborted && !this.client.destroyed) {
+                outAbort.abort();
+            }
+        }
+    }
     cleanup() {
         if ((0, types_1.isString)(this.pipeTo) && this.outStream) {
             (0, util_1.cleanupStream)(this.outStream, this.pipeTo);
@@ -1342,7 +1338,6 @@ class Request extends module_1 {
                 const output = [];
                 let count = 0;
                 this[kConnectHttp].forEach((protocol, index) => {
-                    var _p;
                     const title = 'HTTP' + (index + 1);
                     for (const origin in protocol) {
                         const value = protocol[origin];
@@ -1352,7 +1347,7 @@ class Request extends module_1 {
                             if (item[1] === title && Array.isArray(item[2]) && item[2][0].startsWith(origin)) {
                                 item[1] = '';
                                 item[2][0] = item[2][0].substring(origin.length);
-                                (_p = item[4]).titleBgColor && (_p.titleBgColor = undefined);
+                                item[4].titleBgColor &&= undefined;
                                 item[4].titleJustify = 'right';
                                 args.push(item);
                                 log.splice(i--, 1);
@@ -1414,7 +1409,7 @@ class Request extends module_1 {
         if (config) {
             const { headers, httpVersion, ipVersion, readTimeout } = config;
             if ((0, types_1.isObject)(headers)) {
-                setOutgoingHeaders(this[kHeaders] || (this[kHeaders] = {}), headers);
+                setOutgoingHeaders(this[kHeaders] ||= {}, headers);
             }
             if (httpVersion !== undefined) {
                 this.httpVersion = httpVersion;
@@ -1504,7 +1499,6 @@ class Request extends module_1 {
         setDnsCache(hostname, this[kConnectDns][hostname] = [{ address, family }], timeout);
     }
     lookupDns(hostname) {
-        var _p;
         const resolved = this[kConnectDns][hostname] || DNS.CACHE[hostname];
         if (resolved) {
             return (...args) => {
@@ -1516,7 +1510,7 @@ class Request extends module_1 {
                 }
             };
         }
-        const pending = (_p = this[kPendingDns])[hostname] || (_p[hostname] = []);
+        const pending = this[kPendingDns][hostname] ||= [];
         return (value, options, callback) => {
             if (pending.push(callback) === 1) {
                 let ipVersion = this.ipVersion;
@@ -1576,7 +1570,7 @@ class Request extends module_1 {
             globUrl = '*';
         }
         if ((0, types_1.isString)(globUrl) && typeof callback === 'function') {
-            const on = this[kStatusOn] || (this[kStatusOn] = new Map());
+            const on = this[kStatusOn] ||= new Map();
             for (const item of !Array.isArray(code) ? [code] : code) {
                 let status = on.get(item);
                 if (!status) {
@@ -1592,7 +1586,7 @@ class Request extends module_1 {
             globUrl = '*';
         }
         if ((0, types_1.isString)(globUrl) && typeof callback === 'function') {
-            const on = this[kHeadersOn] || (this[kHeadersOn] = new Map());
+            const on = this[kHeadersOn] ||= new Map();
             for (const item of !Array.isArray(name) ? [name] : name) {
                 let headers = on.get(item);
                 if (!headers) {
@@ -1613,13 +1607,14 @@ class Request extends module_1 {
         if (typeof uri === 'string' && module_1.isURL(uri)) {
             uri = new URL(uri);
         }
-        let pathname, headers, binOpts, silent;
+        let pathname, headers, binOpts, signal, silent;
         if (options) {
             if (typeof options === 'string') {
                 pathname = options;
             }
             else {
-                ({ pathname, headers, binOpts, silent } = options);
+                ({ pathname, binOpts, signal, silent } = options);
+                headers = (0, util_1.parseOutgoingHeaders)(options.headers);
                 if ((0, types_1.isArray)(binOpts)) {
                     let next = false;
                     binOpts = binOpts.filter(opt => !((0, types_1.isString)(opt) && /^-[a-z].*$/i.test(opt.trim()))).map((opt) => {
@@ -1681,7 +1676,7 @@ class Request extends module_1 {
         if (!module_1.createDir(pathname)) {
             return Promise.reject((0, types_1.errorMessage)("aria2", "Path is not a directory", pathname));
         }
-        silent ?? (silent = this[kSingleton]);
+        silent ??= this[kSingleton];
         return new Promise((resolve, reject) => {
             let protocol, origin, username, password;
             if (uri instanceof URL) {
@@ -1886,7 +1881,7 @@ class Request extends module_1 {
                                 if (match[3] === '100') {
                                     result.push(file);
                                 }
-                                messageUnit || (messageUnit = match[2]);
+                                messageUnit ||= match[2];
                                 break;
                             case 'INPR':
                                 if (ARIA2.ALWAYS_RESUME) {
@@ -1922,7 +1917,13 @@ class Request extends module_1 {
                         }
                         for (const item of ARIA2.PID_QUEUE) {
                             try {
-                                process.kill(item[0], 0);
+                                if (pid === item[0] && signal?.aborted) {
+                                    process.kill(item[0]);
+                                    closeTorrent(item[0]);
+                                }
+                                else {
+                                    process.kill(item[0], 0);
+                                }
                             }
                             catch {
                                 closeTorrent(item[0]);
@@ -1962,7 +1963,6 @@ class Request extends module_1 {
         return this.get(uri, options);
     }
     opts(url, options) {
-        var _p, _q, _r, _s;
         const base = this[kBaseURL];
         if (base) {
             if (typeof url === 'string') {
@@ -1977,18 +1977,25 @@ class Request extends module_1 {
         }
         let host;
         if (this.host) {
-            host = (_p = HTTP.HOST)[_q = url.origin] || (_p[_q] = new host_1(url, HTTP.VERSION));
+            host = HTTP.HOST[url.origin] ||= new host_1(url, HTTP.VERSION);
         }
         else {
-            host = (_r = this[kHostInfo])[_s = url.origin] || (_r[_s] = new host_1(url, this.httpVersion || 1));
+            host = this[kHostInfo][url.origin] ||= new host_1(url, this.httpVersion || 1);
         }
         return { ...options, host, url };
     }
     open(uri, options) {
-        var _p, _q;
-        let { host, url, httpVersion, method = 'GET', search, encoding, format, headers, postData, keepAlive, agentTimeout, socketPath, timeout = this._config.connectTimeout, outStream } = options;
-        const getting = method === 'GET';
-        const posting = method === 'POST';
+        let { host, url, httpVersion, method = 'GET', search, encoding, format, headers: outgoing, postData, keepAlive, agentTimeout, socketPath, timeout = this._config.connectTimeout, outStream } = options, headers = (0, util_1.parseOutgoingHeaders)(outgoing), getting = false, posting = false;
+        switch (method = method.toUpperCase()) {
+            case 'GET':
+            case 'DELETE':
+                getting = true;
+                break;
+            case 'POST':
+            case 'PUT':
+                posting = true;
+                break;
+        }
         if (format) {
             let parser;
             if ((0, types_1.isObject)(format)) {
@@ -1997,7 +2004,7 @@ class Request extends module_1 {
             if (format.includes('/')) {
                 format = format.split('/').pop().split('-').pop();
             }
-            headers || (headers = {});
+            headers ||= {};
             switch (format = format.trim().toLowerCase()) {
                 case 'yaml':
                     headers.accept = 'application/yaml, application/x-yaml, text/yaml, text/x-yaml';
@@ -2046,7 +2053,7 @@ class Request extends module_1 {
             this[kBaseURL] = [url, httpVersion, headers];
         }
         else if (base) {
-            httpVersion ?? (httpVersion = base[1]);
+            httpVersion ??= base[1];
             if (base[2]) {
                 headers = { ...base[2], ...headers };
             }
@@ -2057,13 +2064,13 @@ class Request extends module_1 {
             }
             uri = url.href;
         }
-        const { hostname, origin, secure, localhost } = host;
+        const { hostname, origin, secure } = host;
         const pathname = url.pathname + (socketPath ? '' : url.search);
-        const proxy = this.proxyOf(uri, localhost);
+        const proxy = this.proxyOf(uri, host.localhost);
         const version = this.httpVersion;
         let request, ca, cert, key, ciphers, minVersion, baseHeaders = this.headersOf(uri);
-        if (getting && this.acceptEncoding && !localhost && !baseHeaders?.['accept-encoding']) {
-            (_p = (headers || (headers = {})))['accept-encoding'] || (_p['accept-encoding'] = 'gzip, deflate, br' + (LIB_ZSTD ? ', zstd' : ''));
+        if (getting && this.acceptEncoding && !host.localhost && !baseHeaders?.['accept-encoding']) {
+            (headers ||= {})['accept-encoding'] ||= 'gzip, deflate, br' + (LIB_ZSTD ? ', zstd' : '');
         }
         if (secure) {
             const certs = this[kCerts]?.[0][origin] || this.host && TLS.TEXT[origin];
@@ -2072,7 +2079,7 @@ class Request extends module_1 {
             }
         }
         if (!proxy && httpVersion !== 1 && ((httpVersion || host.version) === 2 && version !== 1 || secure && version === 2 && host.failed(2, true) === 0)) {
-            request = ((_q = this[kSession][0])[origin] || (_q[origin] = http2.connect(origin, { lookup: this.lookupDns(hostname), ca, cert, key, ciphers, minVersion, settings: localhost ? { maxFrameSize: 16777215, enablePush: false } : { enablePush: false } }))).request({ ...baseHeaders, ...host_1.getBasicAuth(url), ...headers, ':path': pathname, ':method': method });
+            request = (this[kSession][0][origin] ||= http2.connect(origin, { lookup: this.lookupDns(hostname), ca, cert, key, ciphers, minVersion, settings: host.localhost ? { maxFrameSize: 16777215, enablePush: false } : { enablePush: false } })).request({ ...baseHeaders, ...host_1.getBasicAuth(url), ...headers, ':path': pathname, ':method': method });
             if (getting) {
                 const listenerMap = {};
                 const onEvent = request.on.bind(request);
@@ -2113,7 +2120,6 @@ class Request extends module_1 {
                     this.matchHeaders(url, response, request, options);
                 });
                 request.on = function (event, listener) {
-                    var _p;
                     switch (event) {
                         case 'data':
                         case 'error':
@@ -2123,7 +2129,7 @@ class Request extends module_1 {
                                 break;
                             }
                             if (!connected) {
-                                (listenerMap[_p = event + '-on'] || (listenerMap[_p] = [])).push(listener);
+                                (listenerMap[event + '-on'] ||= []).push(listener);
                             }
                         default:
                             onEvent(event, listener);
@@ -2132,7 +2138,6 @@ class Request extends module_1 {
                     return this;
                 };
                 request.once = function (event, listener) {
-                    var _p;
                     switch (event) {
                         case 'data':
                         case 'error':
@@ -2142,7 +2147,7 @@ class Request extends module_1 {
                                 break;
                             }
                             if (!connected) {
-                                (listenerMap[_p = event + '-once'] || (listenerMap[_p] = [])).push(listener);
+                                (listenerMap[event + '-once'] ||= []).push(listener);
                             }
                         default:
                             onceEvent(event, listener);
@@ -2159,8 +2164,8 @@ class Request extends module_1 {
                 if (proxy) {
                     const pkg = secure ? 'https-proxy-agent' : 'http-proxy-agent';
                     try {
-                        keepAlive ?? (keepAlive = proxy.keepAlive);
-                        agentTimeout ?? (agentTimeout = proxy.agentTimeout);
+                        keepAlive ??= proxy.keepAlive;
+                        agentTimeout ??= proxy.agentTimeout;
                         const proxyHeaders = this[kHeaders] && getBaseHeaders(proxy.host.href, this[kHeaders]) || getBaseHeaders(proxy.host.href, HTTP.HEADERS);
                         agent = require(pkg)(proxy.host, typeof keepAlive === 'boolean' || agentTimeout > 0 || proxyHeaders ? { keepAlive: keepAlive ?? true, timeout: agentTimeout, headers: proxyHeaders } : undefined);
                         if (proxyHeaders) {
@@ -2178,7 +2183,7 @@ class Request extends module_1 {
                     agent = new (secure ? https.Agent : http.Agent)({ keepAlive: true, timeout: agentTimeout });
                 }
                 else if (agentTimeout !== 0) {
-                    agentTimeout ?? (agentTimeout = this.agentTimeout);
+                    agentTimeout ??= this.agentTimeout;
                     if (this.keepAlive !== null || agentTimeout > 0) {
                         agent = new (secure ? https.Agent : http.Agent)({ keepAlive: this.keepAlive ?? true, timeout: agentTimeout });
                     }
@@ -2285,6 +2290,9 @@ class Request extends module_1 {
             const ac = new AbortController();
             this[kDownloading].add(options.outAbort = ac);
             stream.addAbortSignal(ac.signal, request);
+            if (options.signal) {
+                stream.addAbortSignal(options.signal, request);
+            }
             this.signal.addEventListener('abort', () => {
                 ac.abort(new Error("Aborted by process"));
             }, { once: true });
@@ -2306,8 +2314,21 @@ class Request extends module_1 {
         out.httpVersion = 1;
         return this.open(out.url, out);
     }
+    async put(uri, data, contentType, options) {
+        if ((0, types_1.isPlainObject)(contentType)) {
+            options = contentType;
+        }
+        else {
+            (options ||= {}).contentType = contentType;
+        }
+        options.method = 'PUT';
+        if (options.contentType === "multipart/form-data") {
+            options.contentType = "application/x-www-form-urlencoded";
+        }
+        return this.post(uri, data, options);
+    }
     async post(uri, data, contentType, options) {
-        let parts;
+        let putting = false, parts;
         if (Array.isArray(contentType)) {
             parts = contentType;
             contentType = undefined;
@@ -2315,9 +2336,10 @@ class Request extends module_1 {
         else {
             if ((0, types_1.isPlainObject)(contentType)) {
                 options = contentType;
+                putting = options.method === 'PUT';
                 contentType = undefined;
             }
-            if (Array.isArray(data) && (!contentType || contentType === "multipart/form-data")) {
+            if (!putting && Array.isArray(data) && (!contentType || contentType === "multipart/form-data")) {
                 parts = data;
                 data = undefined;
             }
@@ -2326,24 +2348,24 @@ class Request extends module_1 {
         if ((0, types_1.isPlainObject)(options)) {
             let formData;
             ({ formData, dataEncoding } = options);
-            if (formData) {
-                (parts || (parts = [])).push(...Array.isArray(formData) ? formData : [formData]);
+            if (!putting && formData) {
+                (parts ||= []).push(...Array.isArray(formData) ? formData : [formData]);
             }
             else {
-                contentType || (contentType = options.contentType);
+                contentType ||= options.contentType;
             }
         }
         else {
             options = {};
         }
-        const headers = options.headers || (options.headers = {});
+        const headers = (0, util_1.parseOutgoingHeaders)(options.headers ||= {});
         for (const attr in headers) {
             const name = attr.toLowerCase();
             if (name === 'content-type' || name === 'content-length') {
                 delete headers[attr];
             }
         }
-        if (parts || contentType === "multipart/form-data" || contentType === 'form-data') {
+        if (!putting && (parts || contentType === "multipart/form-data" || contentType === 'form-data')) {
             let valid;
             if ((0, types_1.isArray)(parts)) {
                 const write = combined.create();
@@ -2375,8 +2397,8 @@ class Request extends module_1 {
                     }
                     if (target) {
                         if (typeof target === 'string') {
-                            filename || (filename = path.basename(target));
-                            type || (type = module_1.lookupMime(filename));
+                            filename ||= path.basename(target);
+                            type ||= module_1.lookupMime(filename);
                             target = fs.readFileSync(target);
                         }
                         else if (target instanceof stream.Readable) {
@@ -2393,7 +2415,7 @@ class Request extends module_1 {
                             const result = await module_1.resolveMime(target);
                             let ext;
                             if (result) {
-                                type || (type = result.mime);
+                                type ||= result.mime;
                                 ext = result.ext;
                             }
                             else if (type) {
@@ -2436,11 +2458,13 @@ class Request extends module_1 {
             }
             else {
                 data = JSON.stringify(data);
-                contentType || (contentType = "application/json");
+                contentType ||= "application/json";
             }
             headers['content-length'] = Buffer.byteLength(data, (0, types_1.getEncoding)(dataEncoding)).toString();
         }
-        options.method = 'POST';
+        if (!putting) {
+            options.method = 'POST';
+        }
         options.httpVersion = 1;
         options.postData = data;
         headers['content-type'] = contentType || "text/plain";
@@ -2480,7 +2504,7 @@ class Request extends module_1 {
             for (const callback of called) {
                 try {
                     if (callback(code, headers, url) === true) {
-                        abortHeaders.call(this, href, request, options);
+                        abortHeaders.call(this, href, request, options, code);
                         return false;
                     }
                 }
@@ -2526,11 +2550,11 @@ class Request extends module_1 {
     set agentTimeout(value) {
         if (value > 0) {
             this[kAgentTimeout] = value;
-            this.keepAlive ?? (this.keepAlive = true);
+            this.keepAlive ??= true;
         }
         else {
             this[kAgentTimeout] = 0;
-            this.keepAlive ?? (this.keepAlive = false);
+            this.keepAlive ??= false;
         }
     }
     get agentTimeout() {
@@ -2560,8 +2584,7 @@ class Request extends module_1 {
         return this[kIpVersion];
     }
     get settings() {
-        var _p;
-        return (_p = this.module).settings || (_p.settings = {});
+        return this.module.settings ||= {};
     }
 }
 _a = kSingleton, _b = kHttpVersion, _c = kHeaders, _d = kCerts, _e = kBaseURL, _f = kConnectDns, _g = kPendingDns, _h = kConnectHttp, _j = kStatusOn, _k = kHeadersOn, _l = kDownloading, _m = kHostInfo, _o = kSession;