@innet/server 1.6.6 → 1.7.0

package/{action → utils/action}/Action/Action.js

@@ -6,15 +6,13 @@ var tslib = require('tslib');
 var utils = require('@cantinc/utils');
 var cookie = require('cookie');
 var multiparty = require('multiparty');
-var parseSearch = require('../../utils/parseSearch/parseSearch.js');
-require('qs');
+var parseSearch = require('../../parseSearch/parseSearch.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var cookie__default = /*#__PURE__*/_interopDefaultLegacy(cookie);
 var multiparty__default = /*#__PURE__*/_interopDefaultLegacy(multiparty);
 
-var ACTION = Symbol('Action');
 var URL_PARSER = /^(?<path>[^?]+)(\?(?<search>.*))?/;
 var KEY_FIELD = /^(?<field>[^[]+)(?<rest>.*)$/;
 var KEY_KEYS = /^\[(?<key>[^\]]+)\](?<rest>.*)$/;
@@ -161,7 +159,6 @@ var Action = /** @class */ (function () {
     return Action;
 }());
 
-exports.ACTION = ACTION;
 exports.Action = Action;
 exports.KEY_FIELD = KEY_FIELD;
 exports.KEY_KEYS = KEY_KEYS;

package/utils/action/Action/index.es6.js

@@ -0,0 +1 @@
+export { Action, KEY_FIELD, KEY_KEYS, URL_PARSER } from './Action.es6.js';

package/{action → utils/action}/Action/index.js

@@ -6,7 +6,6 @@ var Action = require('./Action.js');
 
 
 
-exports.ACTION = Action.ACTION;
 exports.Action = Action.Action;
 exports.KEY_FIELD = Action.KEY_FIELD;
 exports.KEY_KEYS = Action.KEY_KEYS;

package/utils/action/index.es6.js

@@ -0,0 +1 @@
+export { Action, KEY_FIELD, KEY_KEYS, URL_PARSER } from './Action/Action.es6.js';

package/{action → utils/action}/index.js

@@ -6,7 +6,6 @@ var Action = require('./Action/Action.js');
 
 
 
-exports.ACTION = Action.ACTION;
 exports.Action = Action.Action;
 exports.KEY_FIELD = Action.KEY_FIELD;
 exports.KEY_KEYS = Action.KEY_KEYS;

package/utils/index.d.ts

@@ -1,2 +1,3 @@
 export * from './parseSearch';
 export * from './stringifySearch';
+export * from './action';

package/utils/index.es6.js

@@ -1,2 +1,3 @@
 export { parseSearch } from './parseSearch/parseSearch.es6.js';
 export { stringifySearch } from './stringifySearch/stringifySearch.es6.js';
+export { Action, KEY_FIELD, KEY_KEYS, URL_PARSER } from './action/Action/Action.es6.js';

package/utils/index.js

@@ -4,8 +4,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var parseSearch = require('./parseSearch/parseSearch.js');
 var stringifySearch = require('./stringifySearch/stringifySearch.js');
+var Action = require('./action/Action/Action.js');
 
 
 
 exports.parseSearch = parseSearch.parseSearch;
 exports.stringifySearch = stringifySearch.stringifySearch;
+exports.Action = Action.Action;
+exports.KEY_FIELD = Action.KEY_FIELD;
+exports.KEY_KEYS = Action.KEY_KEYS;
+exports.URL_PARSER = Action.URL_PARSER;

package/action/Action/index.es6.js

@@ -1 +0,0 @@
-export { ACTION, Action, KEY_FIELD, KEY_KEYS, URL_PARSER } from './Action.es6.js';

package/action/index.es6.js

@@ -1 +0,0 @@
-export { ACTION, Action, KEY_FIELD, KEY_KEYS, URL_PARSER } from './Action/Action.es6.js';

package/server/server.d.ts

@@ -1,20 +0,0 @@
-import { Handler } from 'innet';
-import { Action, ActionParams } from '../action';
-export interface SSL {
-    cert: string;
-    key: string;
-}
-export interface ServerProps {
-    actionParams?: ActionParams;
-    port?: number;
-    ssl?: SSL;
-    unknownError?: string;
-    onStart?: (url: string) => any;
-    onRequest?: (action: Action) => any;
-    onError?: (e: Error, action?: Action) => any;
-    onDestroy?: () => any;
-}
-export declare function server({ props, children }: {
-    props?: ServerProps;
-    children: any;
-}, handler: Handler): Promise<unknown>;

package/server/server.es6.js

@@ -1,69 +0,0 @@
-import { __awaiter } from 'tslib';
-import innet from 'innet';
-import fs from 'fs';
-import http from 'http';
-import http2 from 'https';
-import { onDestroy } from 'watch-state';
-import { ACTION, Action } from '../action/Action/Action.es6.js';
-import { CONTINUE } from '../constants.es6.js';
-
-const isInvalidPath = require('is-invalid-path');
-function server({ props = {}, children }, handler) {
-    const { env } = process;
-    let { ssl: { key = env.SSL_KEY, cert = env.SSL_CRT } = {}, actionParams } = props;
-    if (!isInvalidPath(key)) {
-        key = fs.readFileSync(key).toString();
-    }
-    if (!isInvalidPath(cert)) {
-        cert = fs.readFileSync(cert).toString();
-    }
-    const https = Boolean(key && cert);
-    const { port = env.PORT || (https ? 442 : 80), unknownError = '', onStart, onError, onRequest } = props;
-    const server = https ? http2.createServer({ key, cert }) : http.createServer();
-    onDestroy(() => {
-        var _a;
-        (_a = props.onDestroy) === null || _a === void 0 ? void 0 : _a.call(props);
-        server.close();
-    });
-    server.on('request', (req, res) => __awaiter(this, void 0, void 0, function* () {
-        const childHandler = Object.create(handler);
-        childHandler[ACTION] = new Action(req, res, actionParams);
-        if (onRequest) {
-            yield onRequest(childHandler[ACTION]);
-        }
-        if (children) {
-            try {
-                const result = yield innet(children, childHandler);
-                if (result === CONTINUE) {
-                    return;
-                }
-                if (typeof result === 'string') {
-                    res.write(result);
-                }
-            }
-            catch (e) {
-                res.statusCode = 520;
-                onError === null || onError === void 0 ? void 0 : onError(e, childHandler[ACTION]);
-                res.write(unknownError);
-            }
-        }
-        res.end();
-    }));
-    let res, rej;
-    const promise = new Promise((resolve, reject) => {
-        res = resolve;
-        rej = reject;
-    });
-    server.on('error', e => {
-        rej(e);
-        onError === null || onError === void 0 ? void 0 : onError(e);
-    });
-    server.listen(port, () => {
-        const url = `http${https ? 's' : ''}://localhost:${port}`;
-        onStart === null || onStart === void 0 ? void 0 : onStart(url);
-        res(url);
-    });
-    return promise;
-}
-
-export { server };

package/server/server.js

@@ -1,97 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var tslib = require('tslib');
-var innet = require('innet');
-var fs = require('fs');
-var http = require('http');
-var http2 = require('https');
-var watchState = require('watch-state');
-var Action = require('../action/Action/Action.js');
-var constants = require('../constants.js');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
-var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
-var http2__default = /*#__PURE__*/_interopDefaultLegacy(http2);
-
-var isInvalidPath = require('is-invalid-path');
-function server(_a, handler) {
-    var _this = this;
-    var _b = _a.props, props = _b === void 0 ? {} : _b, children = _a.children;
-    var env = process.env;
-    var _c = props.ssl, _d = _c === void 0 ? {} : _c, _e = _d.key, key = _e === void 0 ? env.SSL_KEY : _e, _f = _d.cert, cert = _f === void 0 ? env.SSL_CRT : _f, actionParams = props.actionParams;
-    if (!isInvalidPath(key)) {
-        key = fs__default["default"].readFileSync(key).toString();
-    }
-    if (!isInvalidPath(cert)) {
-        cert = fs__default["default"].readFileSync(cert).toString();
-    }
-    var https = Boolean(key && cert);
-    var _g = props.port, port = _g === void 0 ? env.PORT || (https ? 442 : 80) : _g, _h = props.unknownError, unknownError = _h === void 0 ? '' : _h, onStart = props.onStart, onError = props.onError, onRequest = props.onRequest;
-    var server = https ? http2__default["default"].createServer({ key: key, cert: cert }) : http__default["default"].createServer();
-    watchState.onDestroy(function () {
-        var _a;
-        (_a = props.onDestroy) === null || _a === void 0 ? void 0 : _a.call(props);
-        server.close();
-    });
-    server.on('request', function (req, res) { return tslib.__awaiter(_this, void 0, void 0, function () {
-        var childHandler, result, e_1;
-        return tslib.__generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    childHandler = Object.create(handler);
-                    childHandler[Action.ACTION] = new Action.Action(req, res, actionParams);
-                    if (!onRequest) return [3 /*break*/, 2];
-                    return [4 /*yield*/, onRequest(childHandler[Action.ACTION])];
-                case 1:
-                    _a.sent();
-                    _a.label = 2;
-                case 2:
-                    if (!children) return [3 /*break*/, 6];
-                    _a.label = 3;
-                case 3:
-                    _a.trys.push([3, 5, , 6]);
-                    return [4 /*yield*/, innet__default["default"](children, childHandler)];
-                case 4:
-                    result = _a.sent();
-                    if (result === constants.CONTINUE) {
-                        return [2 /*return*/];
-                    }
-                    if (typeof result === 'string') {
-                        res.write(result);
-                    }
-                    return [3 /*break*/, 6];
-                case 5:
-                    e_1 = _a.sent();
-                    res.statusCode = 520;
-                    onError === null || onError === void 0 ? void 0 : onError(e_1, childHandler[Action.ACTION]);
-                    res.write(unknownError);
-                    return [3 /*break*/, 6];
-                case 6:
-                    res.end();
-                    return [2 /*return*/];
-            }
-        });
-    }); });
-    var res, rej;
-    var promise = new Promise(function (resolve, reject) {
-        res = resolve;
-        rej = reject;
-    });
-    server.on('error', function (e) {
-        rej(e);
-        onError === null || onError === void 0 ? void 0 : onError(e);
-    });
-    server.listen(port, function () {
-        var url = "http".concat(https ? 's' : '', "://localhost:").concat(port);
-        onStart === null || onStart === void 0 ? void 0 : onStart(url);
-        res(url);
-    });
-    return promise;
-}
-
-exports.server = server;