@opra/core 0.33.13 → 1.0.0-alpha.2

package/cjs/http/{http-server-response.js → impl/http-outgoing.host.js}

@@ -4,7 +4,7 @@
   https://github.com/expressjs
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpServerResponse = void 0;
+exports.HttpOutgoingHost = void 0;
 const tslib_1 = require("tslib");
 const content_disposition_1 = tslib_1.__importDefault(require("content-disposition"));
 const content_type_1 = tslib_1.__importDefault(require("content-type"));
@@ -16,22 +16,8 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const putil_varhelpers_1 = require("putil-varhelpers");
 const vary_1 = tslib_1.__importDefault(require("vary"));
 const common_1 = require("@opra/common");
-const http_outgoing_message_host_js_1 = require("./impl/http-outgoing-message.host.js");
 const charsetRegExp = /;\s*charset\s*=/;
-function isHttpIncomingMessage(v) {
-    return v && typeof v.getHeaders === 'function' && (0, common_1.isStream)(v);
-}
-var HttpServerResponse;
-(function (HttpServerResponse) {
-    function from(instance) {
-        if (!isHttpIncomingMessage(instance))
-            instance = new http_outgoing_message_host_js_1.HttpOutgoingMessageHost(instance);
-        (0, common_1.mergePrototype)(instance, HttpServerResponseHost.prototype);
-        return instance;
-    }
-    HttpServerResponse.from = from;
-})(HttpServerResponse || (exports.HttpServerResponse = HttpServerResponse = {}));
-class HttpServerResponseHost {
+class HttpOutgoingHost {
     attachment(filename) {
         if (filename)
             this.contentType(path_1.default.extname(filename));
@@ -39,9 +25,7 @@ class HttpServerResponseHost {
         return this;
     }
     contentType(type) {
-        const ct = type.indexOf('/') === -1
-            ? mime_types_1.default.lookup(type)
-            : type;
+        const ct = type.indexOf('/') === -1 ? mime_types_1.default.lookup(type) : type;
         this.setHeader('Content-Type', ct);
         return this;
     }
@@ -54,9 +38,7 @@ class HttpServerResponseHost {
             return this;
         }
         const fieldLower = field.toLowerCase();
-        let value = Array.isArray(val)
-            ? val.map(String)
-            : (val ? String(val) : '');
+        let value = Array.isArray(val) ? val.map(String) : val ? String(val) : '';
         // add charset to content-type
         if (fieldLower === 'content-type') {
             if (Array.isArray(value)) {
@@ -75,15 +57,13 @@ class HttpServerResponseHost {
         const opts = {
             expires: new Date(1),
             path: '/',
-            ...options
+            ...options,
         };
         return this.cookie(name, '', opts);
     }
     cookie(name, value, options) {
         const opts = { ...options };
-        let val = typeof value === 'object'
-            ? 'j:' + JSON.stringify(value)
-            : String(value);
+        let val = typeof value === 'object' ? 'j:' + JSON.stringify(value) : String(value);
         if (opts.signed) {
             const secret = opts.secret || this.req?.secret;
             if (!secret)
@@ -214,6 +194,7 @@ class HttpServerResponseHost {
         return this;
     }
 }
+exports.HttpOutgoingHost = HttpOutgoingHost;
 function setCharset(type, charset) {
     if (!(type && charset))
         return type;

package/cjs/http/{helpers/multipart-helper.js → impl/multipart-reader.js}

@@ -1,38 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MultipartIterator = void 0;
+exports.MultipartReader = void 0;
 const tslib_1 = require("tslib");
 const events_1 = require("events");
 const formidable_1 = tslib_1.__importDefault(require("formidable"));
 const promises_1 = tslib_1.__importDefault(require("fs/promises"));
-class MultipartIterator extends events_1.EventEmitter {
-    constructor(options) {
+class MultipartReader extends events_1.EventEmitter {
+    constructor(incoming, options) {
         super();
+        this._started = false;
         this._cancelled = false;
         this._items = [];
         this._stack = [];
         this.setMaxListeners(1000);
-        const form = this._form = (0, formidable_1.default)({
+        this._incoming = incoming;
+        const form = (this._form = (0, formidable_1.default)({
             ...options,
             filter: (part) => {
                 return !this._cancelled && (!options?.filter || options.filter(part));
-            }
-        });
+            },
+        }));
         form.once('error', () => {
             this._cancelled = true;
             if (this.listenerCount('error') > 0)
                 this.emit('error');
         });
-        form.on('field', (field, value) => {
-            const item = { field, value };
+        form.on('field', (fieldName, value) => {
+            const item = { fieldName, type: 'field', value };
             this._items.push(item);
             this._stack.push(item);
+            this.emit('field', item);
             this.emit('item', item);
         });
-        form.on('file', (field, file) => {
-            const item = { field, file };
+        form.on('file', (fieldName, file) => {
+            const item = { fieldName, type: 'file', file };
             this._items.push(item);
             this._stack.push(item);
+            this.emit('file', item);
             this.emit('item', item);
         });
     }
@@ -48,7 +52,7 @@ class MultipartIterator extends events_1.EventEmitter {
             if (this._form.ended)
                 return resolve(undefined);
             this.once('item', () => resolve(this._stack.shift()));
-            this.once('error', (e) => reject(e));
+            this.once('error', e => reject(e));
         });
     }
     getAll() {
@@ -68,6 +72,8 @@ class MultipartIterator extends events_1.EventEmitter {
             this.resume();
     }
     resume() {
+        if (!this._started)
+            this._form.parse(this._incoming, () => void 0);
         if (this._form.req)
             this._form.resume();
     }
@@ -75,10 +81,9 @@ class MultipartIterator extends events_1.EventEmitter {
         if (this._form.req)
             this._form.pause();
     }
-    async deleteFiles() {
+    async deleteTempFiles() {
         const promises = [];
-        this._items
-            .forEach(item => {
+        this._items.forEach(item => {
             if (!item.file)
                 return;
             const file = item.file;
@@ -86,18 +91,15 @@ class MultipartIterator extends events_1.EventEmitter {
                 if (file._writeStream.closed)
                     return resolve();
                 file._writeStream.once('close', resolve);
-            }).then(() => {
+            })
+                .then(() => {
                 return promises_1.default.unlink(file.filepath);
-            }).then(() => {
+            })
+                .then(() => {
                 return 0;
             }));
         });
         return Promise.allSettled(promises);
     }
-    static async create(incoming, options) {
-        const out = new MultipartIterator(options);
-        await out._form.parse(incoming);
-        return out;
-    }
 }
-exports.MultipartIterator = MultipartIterator;
+exports.MultipartReader = MultipartReader;

package/cjs/http/impl/{http-incoming-message.host.js → node-incoming-message.host.js}

@@ -1,26 +1,21 @@
 "use strict";
-/*
-  This file contains code blocks from open source NodeJs project
-  https://github.com/nodejs/
- */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpIncomingMessageHost = exports.kTrailersDistinct = exports.kTrailers = exports.kHeadersDistinct = exports.kHeaders = exports.CRLF = void 0;
+exports.NodeIncomingMessageHost = exports.kHttpParser = exports.kTrailersDistinct = exports.kTrailers = exports.kHeadersDistinct = exports.kHeaders = exports.CRLF = void 0;
 const stream_1 = require("stream");
-const http_parser_1 = require("@browsery/http-parser");
 const common_1 = require("@opra/common");
-const concat_readable_js_1 = require("../helpers/concat-readable.js");
-const convert_to_headers_js_1 = require("../helpers/convert-to-headers.js");
-const convert_to_raw_headers_js_1 = require("../helpers/convert-to-raw-headers.js");
+const convert_to_headers_js_1 = require("../utils/convert-to-headers.js");
+const convert_to_raw_headers_js_1 = require("../utils/convert-to-raw-headers.js");
 exports.CRLF = Buffer.from('\r\n');
 exports.kHeaders = Symbol.for('kHeaders');
 exports.kHeadersDistinct = Symbol.for('kHeadersDistinct');
 exports.kTrailers = Symbol.for('kTrailers');
 exports.kTrailersDistinct = Symbol.for('kTrailersDistinct');
+exports.kHttpParser = Symbol.for('kHttpParser');
 /**
  *
- * @class HttpIncomingMessageHost
+ * @class NodeIncomingMessageHost
  */
-class HttpIncomingMessageHost extends stream_1.Duplex {
+class NodeIncomingMessageHost extends stream_1.Duplex {
     constructor(init) {
         super();
         this.rawHeaders = [];
@@ -49,12 +44,14 @@ class HttpIncomingMessageHost extends stream_1.Duplex {
             this.ips = init.ips || (this.ip ? [this.ip] : []);
             if (this.body && !this.headers['content-length'])
                 this.headers['content-length'] = String(this.body.length);
+            if (init.params)
+                this.params = init.params;
+            if (init.cookies)
+                this.cookies = init.cookies;
         }
     }
     get httpVersion() {
-        return this.httpVersionMajor
-            ? this.httpVersionMajor + '.' + this.httpVersionMinor
-            : '';
+        return this.httpVersionMajor ? this.httpVersionMajor + '.' + this.httpVersionMinor : '';
     }
     get headers() {
         if (!this[exports.kHeaders])
@@ -98,51 +95,13 @@ class HttpIncomingMessageHost extends stream_1.Duplex {
         }
         const chunk = this._readStream.read(size);
         this.push(chunk);
-        // this.push(null);s
     }
     _write(chunk, encoding, callback) {
-        const error = this._httpParser?.execute(chunk);
+        const error = this[exports.kHttpParser]?.execute(chunk);
         if (error && typeof error === 'object')
             callback(error);
         else
             callback();
     }
-    static from(iterable) {
-        if (typeof iterable === 'object' && !((0, common_1.isIterable)(iterable) || (0, common_1.isAsyncIterable)(iterable)))
-            return new HttpIncomingMessageHost(iterable);
-        const msg = new HttpIncomingMessageHost();
-        const parser = msg._httpParser = new http_parser_1.HTTPParser(http_parser_1.HTTPParser.REQUEST);
-        let bodyChunks;
-        parser[http_parser_1.HTTPParser.kOnHeadersComplete] = (info) => {
-            msg.httpVersionMajor = info.versionMajor;
-            msg.httpVersionMinor = info.versionMinor;
-            msg.rawHeaders = info.headers;
-            msg.method = http_parser_1.HTTPParser.methods[info.method];
-            msg.url = info.url;
-        };
-        parser[http_parser_1.HTTPParser.kOnHeaders] = (trailers) => {
-            msg.rawTrailers = trailers;
-        };
-        parser[http_parser_1.HTTPParser.kOnBody] = (chunk, offset, length) => {
-            bodyChunks = bodyChunks || [];
-            bodyChunks.push(chunk.subarray(offset, offset + length));
-        };
-        parser[http_parser_1.HTTPParser.kOnMessageComplete] = () => {
-            msg.complete = true;
-            if (bodyChunks)
-                msg.body = Buffer.concat(bodyChunks);
-        };
-        const readable = (0, concat_readable_js_1.concatReadable)(stream_1.Readable.from(iterable), stream_1.Readable.from(exports.CRLF));
-        msg.once('finish', () => parser.finish());
-        readable.pipe(msg);
-        return msg;
-    }
-    static async fromAsync(iterable) {
-        return new Promise((resolve, reject) => {
-            const msg = this.from(iterable);
-            msg.once('finish', () => resolve(msg));
-            msg.once('error', (error) => reject(error));
-        });
-    }
 }
-exports.HttpIncomingMessageHost = HttpIncomingMessageHost;
+exports.NodeIncomingMessageHost = NodeIncomingMessageHost;

package/cjs/http/impl/{http-outgoing-message.host.js → node-outgoing-message.host.js}

@@ -4,17 +4,17 @@
   https://github.com/nodejs/
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpOutgoingMessageHost = exports.kOutTrailers = exports.kOutHeaders = void 0;
+exports.NodeOutgoingMessageHost = exports.kOutTrailers = exports.kOutHeaders = void 0;
 const stream_1 = require("stream");
-const common_js_1 = require("../helpers/common.js");
+const common_js_1 = require("../utils/common.js");
 exports.kOutHeaders = Symbol.for('kOutHeaders');
 exports.kOutTrailers = Symbol.for('kOutTrailers');
 // noinspection JSUnusedLocalSymbols
 /**
  *
- * @class HttpOutgoingMessageHost
+ * @class NodeOutgoingMessageHost
  */
-class HttpOutgoingMessageHost extends stream_1.Duplex {
+class NodeOutgoingMessageHost extends stream_1.Duplex {
     constructor(init) {
         super();
         this._headersSent = false;
@@ -67,8 +67,7 @@ class HttpOutgoingMessageHost extends stream_1.Duplex {
     }
     addTrailers(headers) {
         if (headers && typeof headers === 'object') {
-            const entries = typeof headers.entries === 'function'
-                ? headers.entries() : Object.entries(headers);
+            const entries = typeof headers.entries === 'function' ? headers.entries() : Object.entries(headers);
             let trailers = this[exports.kOutTrailers];
             if (trailers == null)
                 this[exports.kOutTrailers] = trailers = { __proto__: null };
@@ -81,6 +80,9 @@ class HttpOutgoingMessageHost extends stream_1.Duplex {
         }
         throw new TypeError('Invalid "headers" argument. Value must be an object or raw headers array');
     }
+    flushHeaders() {
+        // nothing to do
+    }
     setHeader(name, value) {
         if (this.headersSent)
             throw new Error(`Cannot set headers after they are sent to the client`);
@@ -96,8 +98,7 @@ class HttpOutgoingMessageHost extends stream_1.Duplex {
         if (this.headersSent)
             throw new Error(`Cannot set headers after they are sent to the client`);
         if (headers && typeof headers === 'object' && !Array.isArray(headers)) {
-            const entries = typeof headers.entries === 'function'
-                ? headers.entries() : Object.entries(headers);
+            const entries = typeof headers.entries === 'function' ? headers.entries() : Object.entries(headers);
             for (const entry of entries) {
                 this.setHeader(entry[0], entry[1]);
             }
@@ -145,8 +146,7 @@ class HttpOutgoingMessageHost extends stream_1.Duplex {
     }
     hasHeader(name) {
         (0, common_js_1.validateString)(name);
-        return this[exports.kOutHeaders] != null &&
-            !!this[exports.kOutHeaders][name.toLowerCase()];
+        return this[exports.kOutHeaders] != null && !!this[exports.kOutHeaders][name.toLowerCase()];
     }
     removeHeader(name) {
         (0, common_js_1.validateString)(name);
@@ -191,8 +191,5 @@ class HttpOutgoingMessageHost extends stream_1.Duplex {
         //
         return this;
     }
-    static from(init) {
-        return new HttpOutgoingMessageHost(init);
-    }
 }
-exports.HttpOutgoingMessageHost = HttpOutgoingMessageHost;
+exports.NodeOutgoingMessageHost = NodeOutgoingMessageHost;

package/cjs/http/interfaces/http-incoming.interface.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpIncoming = void 0;
+const common_1 = require("@opra/common");
+const type_guards_js_1 = require("../../type-guards.js");
+const http_incoming_host_js_1 = require("../impl/http-incoming.host.js");
+const node_incoming_message_interface_js_1 = require("./node-incoming-message.interface.js");
+/**
+ * @namespace HttpIncoming
+ */
+var HttpIncoming;
+(function (HttpIncoming) {
+    function from(instance) {
+        if ((0, type_guards_js_1.isHttpIncoming)(instance))
+            return instance;
+        if (!(0, type_guards_js_1.isNodeIncomingMessage)(instance))
+            instance = node_incoming_message_interface_js_1.NodeIncomingMessage.from(instance);
+        (0, common_1.mergePrototype)(instance, http_incoming_host_js_1.HttpIncomingHost.prototype);
+        const req = instance;
+        req.baseUrl = req.baseUrl || '';
+        req.params = req.params || {};
+        return req;
+    }
+    HttpIncoming.from = from;
+})(HttpIncoming || (exports.HttpIncoming = HttpIncoming = {}));

package/cjs/http/interfaces/http-outgoing.interface.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpOutgoing = void 0;
+const common_1 = require("@opra/common");
+const type_guards_js_1 = require("../../type-guards.js");
+const http_outgoing_host_js_1 = require("../impl/http-outgoing.host.js");
+const node_outgoing_message_interface_js_1 = require("./node-outgoing-message.interface.js");
+/**
+ * @namespace HttpIncoming
+ */
+var HttpOutgoing;
+(function (HttpOutgoing) {
+    function from(instance) {
+        if ((0, type_guards_js_1.isHttpOutgoing)(instance))
+            return instance;
+        if (!(0, type_guards_js_1.isNodeOutgoingMessage)(instance))
+            instance = node_outgoing_message_interface_js_1.NodeOutgoingMessage.from(instance);
+        (0, common_1.mergePrototype)(instance, http_outgoing_host_js_1.HttpOutgoingHost.prototype);
+        return instance;
+    }
+    HttpOutgoing.from = from;
+})(HttpOutgoing || (exports.HttpOutgoing = HttpOutgoing = {}));

package/cjs/http/interfaces/node-incoming-message.interface.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeIncomingMessage = void 0;
+const stream_1 = require("stream");
+const http_parser_1 = require("@browsery/http-parser");
+const common_1 = require("@opra/common");
+const node_incoming_message_host_js_1 = require("../impl/node-incoming-message.host.js");
+const concat_readable_js_1 = require("../utils/concat-readable.js");
+/**
+ *
+ * @namespace NodeIncomingMessage
+ */
+var NodeIncomingMessage;
+(function (NodeIncomingMessage) {
+    /**
+     * Creates a new NodeIncomingMessage from given argument
+     * @param iterable
+     */
+    function from(iterable) {
+        if (typeof iterable === 'object' && !((0, common_1.isIterable)(iterable) || (0, common_1.isAsyncIterable)(iterable)))
+            return new node_incoming_message_host_js_1.NodeIncomingMessageHost(iterable);
+        const msg = new node_incoming_message_host_js_1.NodeIncomingMessageHost();
+        const parser = (msg[node_incoming_message_host_js_1.kHttpParser] = new http_parser_1.HTTPParser(http_parser_1.HTTPParser.REQUEST));
+        let bodyChunks;
+        parser[http_parser_1.HTTPParser.kOnHeadersComplete] = (info) => {
+            msg.httpVersionMajor = info.versionMajor;
+            msg.httpVersionMinor = info.versionMinor;
+            msg.rawHeaders = info.headers;
+            msg.method = http_parser_1.HTTPParser.methods[info.method];
+            msg.url = info.url;
+            msg.emit('headers');
+        };
+        parser[http_parser_1.HTTPParser.kOnHeaders] = (trailers) => {
+            msg.rawTrailers = trailers;
+        };
+        parser[http_parser_1.HTTPParser.kOnBody] = (chunk, offset, length) => {
+            bodyChunks = bodyChunks || [];
+            bodyChunks.push(chunk.subarray(offset, offset + length));
+        };
+        const readable = (0, concat_readable_js_1.concatReadable)(stream_1.Readable.from(iterable), stream_1.Readable.from(node_incoming_message_host_js_1.CRLF));
+        msg.once('finish', () => {
+            parser.finish();
+            msg.complete = true;
+            if (bodyChunks)
+                msg.body = Buffer.concat(bodyChunks);
+        });
+        readable.pipe(msg);
+        return msg;
+    }
+    NodeIncomingMessage.from = from;
+    /**
+     * Creates a new NodeIncomingMessage from given argument
+     * @param iterable
+     */
+    async function fromAsync(iterable) {
+        return new Promise((resolve, reject) => {
+            const msg = from(iterable);
+            msg.once('finish', () => resolve(msg));
+            msg.once('error', error => reject(error));
+        });
+    }
+    NodeIncomingMessage.fromAsync = fromAsync;
+})(NodeIncomingMessage || (exports.NodeIncomingMessage = NodeIncomingMessage = {}));

package/cjs/http/interfaces/node-outgoing-message.interface.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeOutgoingMessage = void 0;
+const node_outgoing_message_host_js_1 = require("../impl/node-outgoing-message.host.js");
+/**
+ *
+ * @namespace NodeOutgoingMessage
+ */
+var NodeOutgoingMessage;
+(function (NodeOutgoingMessage) {
+    function from(init) {
+        return new node_outgoing_message_host_js_1.NodeOutgoingMessageHost(init);
+    }
+    NodeOutgoingMessage.from = from;
+})(NodeOutgoingMessage || (exports.NodeOutgoingMessage = NodeOutgoingMessage = {}));