@innet/server 1.6.1 → 1.6.3

package/action/Action/Action.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { CookieSerializeOptions } from 'cookie';
 import { IncomingMessage, ServerResponse } from 'http';
+import { FormOptions } from 'multiparty';
 import { ParsedQs } from 'qs';
 export declare const ACTION: string;
 export declare type Body = Record<string, any>;
@@ -22,12 +23,16 @@ export interface ActionOptions {
     body?: Body;
     files?: Files;
 }
+export interface ActionParams {
+    multipartyForm?: FormOptions;
+}
 export declare type Resources = Exclude<keyof ActionOptions, undefined>;
 export declare const URL_PARSER: RegExp;
 export declare class Action<O extends ActionOptions = ActionOptions> {
     readonly req: Request;
     readonly res: Response;
-    constructor(req: Request, res: Response);
+    params: ActionParams;
+    constructor(req: Request, res: Response, params?: ActionParams);
     get cookies(): O['cookies'];
     setCookie(key: string, value?: string, opt?: CookieSerializeOptions): void;
     parseBody(): Promise<unknown>;

package/action/Action/Action.es6.js

@@ -9,9 +9,10 @@ import 'qs';
 const ACTION = Symbol('Action');
 const URL_PARSER = /^(?<path>[^?]+)(\?(?<search>.*))?/;
 class Action {
-    constructor(req, res) {
+    constructor(req, res, params = {}) {
         this.req = req;
         this.res = res;
+        this.params = params;
     }
     get cookies() {
         return cookie.parse(this.req.headers.cookie || '');
@@ -32,7 +33,7 @@ class Action {
     }
     parseBody() {
         return new Promise((resolve, reject) => {
-            new multiparty.Form().parse(this.req, (err, fields, files) => {
+            new multiparty.Form(this.params.multipartyForm).parse(this.req, (err, fields, files) => {
                 if (err) {
                     reject(err);
                 }

package/action/Action/Action.js

@@ -18,9 +18,11 @@ var multiparty__default = /*#__PURE__*/_interopDefaultLegacy(multiparty);
 var ACTION = Symbol('Action');
 var URL_PARSER = /^(?<path>[^?]+)(\?(?<search>.*))?/;
 var Action = /** @class */ (function () {
-    function Action(req, res) {
+    function Action(req, res, params) {
+        if (params === void 0) { params = {}; }
         this.req = req;
         this.res = res;
+        this.params = params;
     }
     Object.defineProperty(Action.prototype, "cookies", {
         get: function () {
@@ -46,7 +48,7 @@ var Action = /** @class */ (function () {
     Action.prototype.parseBody = function () {
         var _this = this;
         return new Promise(function (resolve, reject) {
-            new multiparty__default["default"].Form().parse(_this.req, function (err, fields, files) {
+            new multiparty__default["default"].Form(_this.params.multipartyForm).parse(_this.req, function (err, fields, files) {
                 if (err) {
                     reject(err);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",
@@ -22,7 +22,8 @@
   },
   "homepage": "https://github.com/d8corp/innet-server",
   "dependencies": {
-    "@cantinc/utils": "^1.2.4",
+    "@types/multiparty": "^0.0.33",
+    "@cantinc/utils": "^1.2.7",
     "@innet/html": "^1.0.1",
     "@innet/jsx": "^1.1.0",
     "@innet/switch": "^1.0.0",

package/plugins/validation/validation.d.ts

@@ -13,4 +13,4 @@ export interface ValidationContext {
     handleError?: (e: ValidationResponse<any>) => any;
 }
 export declare const validationContext: Context<ValidationContext, ValidationContext>;
-export declare function validation<T extends object, E extends object>({ props, children }: ValidationJsxElement<T>, handler: any): Promise<any>;
+export declare function validation<T extends object, E extends object>({ props, children }: ValidationJsxElement<T>, handler: any): any;

package/plugins/validation/validation.es6.js

@@ -14,13 +14,12 @@ function validation({ props, children }, handler) {
         const data = action[resource];
         if (!data)
             throw Error(`cannot find ${resource} in action`);
-        return validation$1(map, data).then(e => {
-            if (e) {
-                const { handleError } = validationContext.get(handler);
-                return handleError ? innet(handleError(e), handler) : undefined;
-            }
-            return innet(children, handler);
-        });
+        const result = validation$1(map, data);
+        if (result) {
+            const { handleError } = validationContext.get(handler);
+            return handleError ? innet(handleError(result), handler) : undefined;
+        }
+        return innet(children, handler);
     };
     if (resource === 'body' || resource === 'files') {
         return action.parseBody().then(run);

package/plugins/validation/validation.js

@@ -23,13 +23,12 @@ function validation(_a, handler) {
         var data = action[resource];
         if (!data)
             throw Error("cannot find ".concat(resource, " in action"));
-        return utils.validation(map, data).then(function (e) {
-            if (e) {
-                var handleError = validationContext.get(handler).handleError;
-                return handleError ? innet__default["default"](handleError(e), handler) : undefined;
-            }
-            return innet__default["default"](children, handler);
-        });
+        var result = utils.validation(map, data);
+        if (result) {
+            var handleError = validationContext.get(handler).handleError;
+            return handleError ? innet__default["default"](handleError(result), handler) : undefined;
+        }
+        return innet__default["default"](children, handler);
     };
     if (resource === 'body' || resource === 'files') {
         return action.parseBody().then(run);

package/server/server.d.ts

@@ -1,10 +1,11 @@
 import { Handler } from 'innet';
-import { Action } from '../action';
+import { Action, ActionParams } from '../action';
 export interface SSL {
     cert: string;
     key: string;
 }
 export interface ServerProps {
+    actionParams?: ActionParams;
     port?: number;
     ssl?: SSL;
     unknownError?: string;

package/server/server.es6.js

@@ -10,7 +10,7 @@ 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 } = {} } = props;
+    let { ssl: { key = env.SSL_KEY, cert = env.SSL_CRT } = {}, actionParams } = props;
     if (!isInvalidPath(key)) {
         key = fs.readFileSync(key).toString();
     }
@@ -27,7 +27,7 @@ function server({ props = {}, children }, handler) {
     });
     server.on('request', (req, res) => __awaiter(this, void 0, void 0, function* () {
         const childHandler = Object.create(handler);
-        childHandler[ACTION] = new Action(req, res);
+        childHandler[ACTION] = new Action(req, res, actionParams);
         if (onRequest) {
             yield onRequest(childHandler[ACTION]);
         }

package/server/server.js

@@ -23,7 +23,7 @@ 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;
+    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();
     }
@@ -44,7 +44,7 @@ function server(_a, handler) {
             switch (_a.label) {
                 case 0:
                     childHandler = Object.create(handler);
-                    childHandler[Action.ACTION] = new Action.Action(req, res);
+                    childHandler[Action.ACTION] = new Action.Action(req, res, actionParams);
                     if (!onRequest) return [3 /*break*/, 2];
                     return [4 /*yield*/, onRequest(childHandler[Action.ACTION])];
                 case 1: