@e-mc/request 0.8.3 → 0.8.4

package/README.md

@@ -1,7 +1,91 @@
-### @e-mc/request
+# @e-mc/request
 
-https://e-mc.readthedocs.io
+* NodeJS 14
+* ES2020
 
-### LICENSE
+## General Usage
+
+* [Read the Docs](https://e-mc.readthedocs.io)
+
+## Interface
+
+- https://www.unpkg.com/@e-mc/types@0.8.4/lib/index.d.ts
+
+```typescript
+import type { IModule, ModuleConstructor } from "./index";
+import type { HttpAgentSettings, HttpProtocolVersion, HttpRequestClient, InternetProtocolVersion } from "./http";
+import type { ApplyOptions, Aria2Options, FormDataPart, HeadersOnCallback, HostConfig, OpenOptions, PostOptions, ProxySettings, ReadExpectType, RequestInit, StatusOnCallback } from "./request";
+import type { DnsLookupSettings, RequestModule, RequestSettings } from "./settings";
+
+import type { Writable } from "stream";
+import type { LookupFunction } from "net";
+import type { ClientRequest, OutgoingHttpHeaders } from "http";
+
+interface IRequest extends IModule {
+    module: RequestModule;
+    startTime: number;
+    acceptEncoding: boolean;
+    keepAlive: boolean | null;
+    readTimeout: number;
+    readExpect: ReadExpectType;
+    proxy: ProxySettings | null;
+    init(config?: RequestInit): this;
+    apply(options: ApplyOptions): this;
+    addDns(hostname: string, address: string, timeout: number): void;
+    addDns(hostname: string, address: string, family?: number | string, timeout?: number): void;
+    lookupDns(hostname: string): LookupFunction;
+    proxyOf(uri: string, localhost?: boolean): ProxySettings | undefined;
+    statusOn(name: number | number[], callback: StatusOnCallback): void;
+    statusOn(name: number | number[], patternUrl: string, callback: StatusOnCallback): void;
+    headersOn(name: string | string[], callback: HeadersOnCallback): void;
+    headersOn(name: string | string[], patternUrl: string, callback: HeadersOnCallback): void;
+    headersOf(uri: string): OutgoingHttpHeaders | undefined;
+    aria2c(uri: string | URL, pathname: string): Promise<string[]>;
+    aria2c(uri: string | URL, options?: Aria2Options): Promise<string[]>;
+    json(uri: string | URL, options?: OpenOptions): Promise<object | null>;
+    pipe(uri: string | URL, to: Writable, options?: OpenOptions): Promise<null>;
+    opts(url: string | URL, options?: OpenOptions): HostConfig;
+    open(uri: string | URL, options: OpenOptions): HttpRequestClient;
+    head(uri: string | URL, options?: OpenOptions): ClientRequest;
+    post(uri: string | URL, data: unknown, contentType: string): Promise<Buffer | string | null>;
+    post(uri: string | URL, parts: FormDataPart[]): Promise<Buffer | string | null>;
+    post(uri: string | URL, form: Record<string, unknown>, parts: FormDataPart[]): Promise<Buffer | string | null>;
+    post(uri: string | URL, data: unknown, options: PostOptions): Promise<Buffer | string | null>;
+    post(uri: string | URL, data: unknown, contentType?: string, options?: PostOptions): Promise<Buffer | string | null>;
+    get(uri: string | URL, options?: OpenOptions): Promise<Buffer | object | string | null>;
+    detach(singleton?: boolean): void;
+    reset(): void;
+    close(): void;
+    set agentTimeout(value);
+    get agentTimeout(): number;
+    set httpVersion(value);
+    get httpVersion(): HttpProtocolVersion | null;
+    set ipVersion(value);
+    get ipVersion(): InternetProtocolVersion;
+    get settings(): RequestSettings;
+}
+
+interface RequestConstructor extends ModuleConstructor {
+    readCACert(value: string, cache?: boolean): string;
+    readTLSKey(value: string, cache?: boolean): string;
+    readTLSCert(value: string, cache?: boolean): string;
+    isCert(value: string): boolean;
+    fromURL(url: URL, value: string): string;
+    fromStatusCode(value: number | string): string;
+    defineHttpAgent(options: HttpAgentSettings): void;
+    defineDnsLookup(options: DnsLookupSettings, clear?: boolean): void;
+    getAria2Path(): string;
+    readonly prototype: IRequest;
+    new(module?: RequestModule): IRequest;
+}
+```
+
+## References
+
+- https://www.unpkg.com/@e-mc/types@0.8.4/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.4/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.4/lib/settings.d.ts
+
+## LICENSE
 
 BSD 3-Clause

package/index.js

@@ -722,7 +722,7 @@ class Request extends module_1.default {
                         const args = [];
                         for (let i = 0; i < log.length; ++i) {
                             const item = log[i];
-                            if (Array.isArray(item[2]) && item[2][0].startsWith(origin)) {
+                            if (item[1] === title && Array.isArray(item[2]) && item[2][0].startsWith(origin)) {
                                 item[1] = '';
                                 item[2][0] = item[2][0].substring(origin.length);
                                 item[4].titleBgColor = undefined;
@@ -731,12 +731,17 @@ class Request extends module_1.default {
                                 log.splice(i--, 1);
                             }
                         }
-                        output.push([title, origin, value, args]);
+                        output.push([title, origin, value, args.sort((a, b) => a[2][0] < b[2][0] ? -1 : 1)]);
                         count = Math.max(count, value);
                     }
                 });
                 if (LOG_STDOUT) {
-                    output.sort((a, b) => b[2] - a[2]);
+                    output.sort((a, b) => {
+                        if (a[2] === b[2]) {
+                            return a[1] < b[1] ? -1 : 1;
+                        }
+                        return b[2] - a[2];
+                    });
                     const width = count.toString().length;
                     output.forEach(item => {
                         const [title, origin, downloads, messages] = item;
@@ -1464,7 +1469,7 @@ class Request extends module_1.default {
             }
         }
         if (!proxy && httpVersion !== 1 && ((httpVersion || host.version) === 2 && version !== 1 || secure && version === 2 && host.failed(2, true) === 0)) {
-            request = ((_p = this[kSession][0])[origin] || (_p[origin] = http2.connect(origin, { lookup: this.lookupDns(hostname), ca, cert, key, minVersion, settings: localhost ? { initialWindowSize: 4294967295 /* CONSTANTS.INITIAL_WINDOW_SIZE */, maxFrameSize: 16777215 /* CONSTANTS.MAX_FRAME_SIZE */, enablePush: false } : { enablePush: false } }))).request({ ...baseHeaders, ...host_1.default.getBasicAuth(url), ...headers, ':path': pathname, ':method': method });
+            request = ((_p = this[kSession][0])[origin] || (_p[origin] = http2.connect(origin, { lookup: this.lookupDns(hostname), ca, cert, key, minVersion, settings: localhost ? { maxFrameSize: 16777215 /* CONSTANTS.MAX_FRAME_SIZE */, enablePush: false } : { enablePush: false } }))).request({ ...baseHeaders, ...host_1.default.getBasicAuth(url), ...headers, ':path': pathname, ':method': method });
             if (getting) {
                 const listenerMap = {};
                 const onEvent = request.on.bind(request);
@@ -1921,9 +1926,6 @@ class Request extends module_1.default {
                                     }, readTimeout);
                                 }
                                 if (log) {
-                                    if (buffering === false) {
-                                        mibsTime = process.hrtime();
-                                    }
                                     switch (this.settings?.time_format || LOG_TIMEFORMAT) {
                                         case 'readable':
                                             delayTime = process.hrtime(startTime);
@@ -1932,6 +1934,7 @@ class Request extends module_1.default {
                                             delayTime = Date.now() - this.startTime;
                                             break;
                                     }
+                                    mibsTime = process.hrtime();
                                 }
                             });
                         }
@@ -1949,9 +1952,6 @@ class Request extends module_1.default {
                                     }
                                 }
                                 else {
-                                    if (log) {
-                                        mibsTime = process.hrtime();
-                                    }
                                     buffer = typeof chunk === 'string' ? chunk : [chunk];
                                 }
                             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "Request constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,8 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.8.3",
-    "@e-mc/types": "0.8.3",
+    "@e-mc/module": "0.8.4",
+    "@e-mc/types": "0.8.4",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "picomatch": "^3.0.1",