@innet/server 2.0.0-alpha.8 → 2.0.0-beta.1

package/plugins/utils/blacklist/blacklist.es6.js

@@ -0,0 +1,17 @@
+import { useProps } from '@innet/jsx';
+import '../../../hooks/index.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
+import { useAction } from '../../../hooks/useAction/useAction.es6.js';
+
+function blacklist() {
+    const { children, ip = process.env.INNET_BLACKLIST_IP, } = useProps() || {};
+    const ips = typeof ip === 'string' ? ip.split(',') : ip;
+    useServerPlugin(() => {
+        const action = useAction();
+        if (!action.clientIp || (ips === null || ips === void 0 ? void 0 : ips.includes(action.clientIp))) {
+            return children;
+        }
+    });
+}
+
+export { blacklist };

package/plugins/utils/blacklist/blacklist.js

@@ -0,0 +1,21 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsx = require('@innet/jsx');
+require('../../../hooks/index.js');
+var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
+var useAction = require('../../../hooks/useAction/useAction.js');
+
+function blacklist() {
+    const { children, ip = process.env.INNET_BLACKLIST_IP, } = jsx.useProps() || {};
+    const ips = typeof ip === 'string' ? ip.split(',') : ip;
+    useServerPlugin.useServerPlugin(() => {
+        const action = useAction.useAction();
+        if (!action.clientIp || (ips === null || ips === void 0 ? void 0 : ips.includes(action.clientIp))) {
+            return children;
+        }
+    });
+}
+
+exports.blacklist = blacklist;

package/plugins/utils/blacklist/index.d.ts

@@ -0,0 +1 @@
+export * from './blacklist';

package/plugins/utils/blacklist/index.es6.js

@@ -0,0 +1 @@
+export { blacklist } from './blacklist.es6.js';

package/plugins/utils/blacklist/index.js

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var blacklist = require('./blacklist.js');
+
+
+
+exports.blacklist = blacklist.blacklist;

package/plugins/utils/dts/dts.d.ts

@@ -1,5 +1,6 @@
 import { type HandlerPlugin } from 'innet';
 export interface DtsProps {
-    path: string;
+    namespace?: string;
+    path?: string;
 }
 export declare const dts: HandlerPlugin;

package/plugins/utils/dts/dts.es6.js

@@ -6,9 +6,9 @@ import { useApi } from '../../../hooks/useApi/useApi.es6.js';
 import { generateTypes } from '../../../utils/generateTypes/generateTypes.es6.js';
 
 const dts = () => {
-    const { path } = useProps();
+    const { namespace = process.env.INNET_DTS_NAMESPACE, path = process.env.INNET_DTS_PATH || 'src/apiTypes.d.ts', } = useProps() || {};
     const { docs } = useApi();
-    promises.writeFile(path, generateTypes(docs)).catch(e => {
+    promises.writeFile(path, generateTypes(docs, namespace)).catch(e => {
         console.error(e);
     });
 };

package/plugins/utils/dts/dts.js

@@ -10,9 +10,9 @@ var useApi = require('../../../hooks/useApi/useApi.js');
 var generateTypes = require('../../../utils/generateTypes/generateTypes.js');
 
 const dts = () => {
-    const { path } = jsx.useProps();
+    const { namespace = process.env.INNET_DTS_NAMESPACE, path = process.env.INNET_DTS_PATH || 'src/apiTypes.d.ts', } = jsx.useProps() || {};
     const { docs } = useApi.useApi();
-    fs.promises.writeFile(path, generateTypes.generateTypes(docs)).catch(e => {
+    fs.promises.writeFile(path, generateTypes.generateTypes(docs, namespace)).catch(e => {
         console.error(e);
     });
 };

package/plugins/utils/env/env.d.ts

@@ -0,0 +1,7 @@
+import { type HandlerPlugin } from 'innet';
+export interface EnvProps {
+    children?: any;
+    is: string | string[];
+    of?: string;
+}
+export declare const env: HandlerPlugin;

package/plugins/utils/env/env.es6.js

@@ -0,0 +1,11 @@
+import innet, { useHandler } from 'innet';
+import { useProps } from '@innet/jsx';
+
+const env = () => {
+    const { children, is, of = 'NODE_ENV', } = useProps();
+    if (Array.isArray(is) ? is.includes(process.env[of]) : process.env[of] === is) {
+        innet(children, useHandler());
+    }
+};
+
+export { env };

package/plugins/utils/{prod/prod.js → env/env.js}

@@ -9,10 +9,11 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
-const prod = () => {
-    if (process.env.NODE_ENV === 'production') {
-        innet__default["default"](jsx.useChildren(), innet.useHandler());
+const env = () => {
+    const { children, is, of = 'NODE_ENV', } = jsx.useProps();
+    if (Array.isArray(is) ? is.includes(process.env[of]) : process.env[of] === is) {
+        innet__default["default"](children, innet.useHandler());
     }
 };
 
-exports.prod = prod;
+exports.env = env;

package/plugins/utils/env/index.d.ts

@@ -0,0 +1 @@
+export * from './env';

package/plugins/utils/env/index.es6.js

@@ -0,0 +1 @@
+export { env } from './env.es6.js';

package/plugins/utils/{dev → env}/index.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dev = require('./dev.js');
+var env = require('./env.js');
 
 
 
-exports.dev = dev.dev;
+exports.env = env.env;

package/plugins/utils/index.d.ts

@@ -1,4 +1,6 @@
 export * from './swagger';
 export * from './dts';
-export * from './dev';
-export * from './prod';
+export * from './env';
+export * from './protection';
+export * from './blacklist';
+export * from './whitelist';

package/plugins/utils/index.es6.js

@@ -1,4 +1,6 @@
 import './swagger/index.es6.js';
 import './dts/index.es6.js';
-import './dev/index.es6.js';
-import './prod/index.es6.js';
+import './env/index.es6.js';
+import './protection/index.es6.js';
+import './blacklist/index.es6.js';
+import './whitelist/index.es6.js';

package/plugins/utils/index.js

@@ -2,6 +2,8 @@
 
 require('./swagger/index.js');
 require('./dts/index.js');
-require('./dev/index.js');
-require('./prod/index.js');
+require('./env/index.js');
+require('./protection/index.js');
+require('./blacklist/index.js');
+require('./whitelist/index.js');
 

package/plugins/utils/protection/index.d.ts

@@ -0,0 +1 @@
+export * from './protection';

package/plugins/utils/protection/index.es6.js

@@ -0,0 +1 @@
+export { protection } from './protection.es6.js';

package/plugins/utils/protection/index.js

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var protection = require('./protection.js');
+
+
+
+exports.protection = protection.protection;

package/plugins/utils/protection/protection.d.ts

@@ -0,0 +1,9 @@
+export interface ProtectionProps {
+    children?: any;
+    cookieKey?: string;
+    excludeIp?: string | string[];
+    maxAge?: number;
+    searchKey?: string;
+    value?: string;
+}
+export declare function protection(): void;

package/plugins/utils/protection/protection.es6.js

@@ -0,0 +1,35 @@
+import { useProps } from '@innet/jsx';
+import '../../../hooks/index.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
+import { useAction } from '../../../hooks/useAction/useAction.es6.js';
+
+function protection() {
+    const { children, cookieKey = process.env.INNET_PROTECTION_COOKIE_KEY || 'protection', excludeIp = process.env.INNET_PROTECTED_IP, maxAge = Number(process.env.INNET_PROTECTION_MAX_AGE) || 365 * 24 * 60 * 60, searchKey = process.env.INNET_PROTECTION_SEARCH_KEY || 'protection', value = process.env.INNET_PROTECTION, } = useProps();
+    if (!value)
+        return;
+    const excludeIps = Array.isArray(excludeIp) ? excludeIp : excludeIp === null || excludeIp === void 0 ? void 0 : excludeIp.split(',');
+    useServerPlugin(() => {
+        const action = useAction();
+        if (!action.clientIp)
+            return children;
+        if (excludeIps === null || excludeIps === void 0 ? void 0 : excludeIps.includes(action.clientIp))
+            return;
+        const { [cookieKey]: cookieProtection } = action.cookies;
+        if (cookieProtection && cookieProtection === value)
+            return;
+        const { [searchKey]: searchProtection } = action.search;
+        if (searchProtection && searchProtection === value) {
+            action.setCookie(cookieKey, value, {
+                httpOnly: true,
+                maxAge,
+                path: '/',
+                secure: true,
+            });
+            return;
+        }
+        action.setCookie(cookieKey);
+        return children;
+    });
+}
+
+export { protection };

package/plugins/utils/protection/protection.js

@@ -0,0 +1,39 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsx = require('@innet/jsx');
+require('../../../hooks/index.js');
+var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
+var useAction = require('../../../hooks/useAction/useAction.js');
+
+function protection() {
+    const { children, cookieKey = process.env.INNET_PROTECTION_COOKIE_KEY || 'protection', excludeIp = process.env.INNET_PROTECTED_IP, maxAge = Number(process.env.INNET_PROTECTION_MAX_AGE) || 365 * 24 * 60 * 60, searchKey = process.env.INNET_PROTECTION_SEARCH_KEY || 'protection', value = process.env.INNET_PROTECTION, } = jsx.useProps();
+    if (!value)
+        return;
+    const excludeIps = Array.isArray(excludeIp) ? excludeIp : excludeIp === null || excludeIp === void 0 ? void 0 : excludeIp.split(',');
+    useServerPlugin.useServerPlugin(() => {
+        const action = useAction.useAction();
+        if (!action.clientIp)
+            return children;
+        if (excludeIps === null || excludeIps === void 0 ? void 0 : excludeIps.includes(action.clientIp))
+            return;
+        const { [cookieKey]: cookieProtection } = action.cookies;
+        if (cookieProtection && cookieProtection === value)
+            return;
+        const { [searchKey]: searchProtection } = action.search;
+        if (searchProtection && searchProtection === value) {
+            action.setCookie(cookieKey, value, {
+                httpOnly: true,
+                maxAge,
+                path: '/',
+                secure: true,
+            });
+            return;
+        }
+        action.setCookie(cookieKey);
+        return children;
+    });
+}
+
+exports.protection = protection;

package/plugins/utils/swagger/swagger.es6.js

@@ -2,20 +2,22 @@ import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import html from './swagger.html.es6.js';
 import { useApi } from '../../../hooks/useApi/useApi.es6.js';
-import { useRequestPlugin } from '../../../hooks/useRequestPlugin/useRequestPlugin.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
+import { useAction } from '../../../hooks/useAction/useAction.es6.js';
 
 const swagger = () => {
-    const { path = '/swagger-ui' } = useProps() || {};
-    const { docs, prefix } = useApi();
+    const { path = process.env.INNET_SWAGGER_PATH || '/swagger-ui', } = useProps() || {};
+    const { docs, prefix, } = useApi();
     let swaggerResponse;
-    useRequestPlugin((req, res) => {
-        if (req.url === prefix + path) {
+    useServerPlugin(() => {
+        const action = useAction();
+        if (action.path === prefix + path) {
             if (!swaggerResponse) {
                 swaggerResponse = html.replace('spec: {},', `spec: ${JSON.stringify(docs)},`);
             }
-            res.statusCode = 200;
-            res.write(swaggerResponse);
-            res.end();
+            action.res.statusCode = 200;
+            action.res.write(swaggerResponse);
+            action.res.end();
             return true;
         }
     });

package/plugins/utils/swagger/swagger.js

@@ -6,20 +6,22 @@ var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 var swagger$1 = require('./swagger.html.js');
 var useApi = require('../../../hooks/useApi/useApi.js');
-var useRequestPlugin = require('../../../hooks/useRequestPlugin/useRequestPlugin.js');
+var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
+var useAction = require('../../../hooks/useAction/useAction.js');
 
 const swagger = () => {
-    const { path = '/swagger-ui' } = jsx.useProps() || {};
-    const { docs, prefix } = useApi.useApi();
+    const { path = process.env.INNET_SWAGGER_PATH || '/swagger-ui', } = jsx.useProps() || {};
+    const { docs, prefix, } = useApi.useApi();
     let swaggerResponse;
-    useRequestPlugin.useRequestPlugin((req, res) => {
-        if (req.url === prefix + path) {
+    useServerPlugin.useServerPlugin(() => {
+        const action = useAction.useAction();
+        if (action.path === prefix + path) {
             if (!swaggerResponse) {
                 swaggerResponse = swagger$1["default"].replace('spec: {},', `spec: ${JSON.stringify(docs)},`);
             }
-            res.statusCode = 200;
-            res.write(swaggerResponse);
-            res.end();
+            action.res.statusCode = 200;
+            action.res.write(swaggerResponse);
+            action.res.end();
             return true;
         }
     });

package/plugins/utils/whitelist/index.d.ts

@@ -0,0 +1 @@
+export * from './whitelist';

package/plugins/utils/whitelist/index.es6.js

@@ -0,0 +1 @@
+export { whitelist } from './whitelist.es6.js';

package/plugins/utils/whitelist/index.js

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var whitelist = require('./whitelist.js');
+
+
+
+exports.whitelist = whitelist.whitelist;

package/plugins/utils/whitelist/whitelist.d.ts

@@ -0,0 +1,5 @@
+export interface WhitelistProps {
+    children?: any;
+    ip?: string | string[];
+}
+export declare function whitelist(): void;

package/plugins/utils/whitelist/whitelist.es6.js

@@ -0,0 +1,19 @@
+import { useProps } from '@innet/jsx';
+import '../../../hooks/index.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
+import { useAction } from '../../../hooks/useAction/useAction.es6.js';
+
+function whitelist() {
+    const { children, ip = process.env.INNET_WHITELIST_IP, } = useProps();
+    const ips = typeof ip === 'string' ? ip.split(',') : ip;
+    if (!ips)
+        return;
+    useServerPlugin(() => {
+        const action = useAction();
+        if (!action.clientIp || !ips.includes(action.clientIp)) {
+            return children;
+        }
+    });
+}
+
+export { whitelist };

package/plugins/utils/whitelist/whitelist.js

@@ -0,0 +1,23 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsx = require('@innet/jsx');
+require('../../../hooks/index.js');
+var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
+var useAction = require('../../../hooks/useAction/useAction.js');
+
+function whitelist() {
+    const { children, ip = process.env.INNET_WHITELIST_IP, } = jsx.useProps();
+    const ips = typeof ip === 'string' ? ip.split(',') : ip;
+    if (!ips)
+        return;
+    useServerPlugin.useServerPlugin(() => {
+        const action = useAction.useAction();
+        if (!action.clientIp || !ips.includes(action.clientIp)) {
+            return children;
+        }
+    });
+}
+
+exports.whitelist = whitelist;

package/types.d.ts

@@ -1,8 +1,6 @@
-/// <reference types="node" />
-import type { IncomingMessage, ServerResponse } from 'http';
-import type { Handler } from 'innet';
 import type { OpenAPIV3_1 as API } from 'openapi-types';
 import type { ApiErrorValue } from './constants';
+import { type ServerPlugin } from './hooks';
 import { type Rule, type RulesErrors } from './utils/rules';
 export type TagObject = API.TagObject;
 export type Document = API.Document;
@@ -17,60 +15,54 @@ export type ReferenceObject = API.ReferenceObject;
 export type ParameterObject = API.ParameterObject;
 export type RequestBodyObject = API.RequestBodyObject;
 export type ObjectType = ArraySchemaObjectType | NonArraySchemaObjectType;
-export type RefSchemaObject = SchemaObject | ReferenceObject;
+export type RefSchemaObject = ReferenceObject | SchemaObject;
 export interface IValidationErrorData extends Record<string, any> {
     error: RulesErrors;
 }
 export type ValidationErrorData = IValidationErrorData | undefined;
 export interface EndpointRules {
-    path?: Rule;
-    search?: Rule;
+    body?: Rule;
     cookie?: Rule;
     header?: Rule;
-    body?: Rule;
+    path?: Rule;
     response?: Rule;
+    search?: Rule;
 }
 export interface EndpointRulesMaps {
-    path?: Record<string, Rule>;
-    search?: Record<string, Rule>;
     cookie?: Record<string, Rule>;
     header?: Record<string, Rule>;
+    path?: Record<string, Rule>;
+    search?: Record<string, Rule>;
 }
 export interface Endpoint<I = unknown, O = unknown, E extends ApiErrorValue = ApiErrorValue, P extends InValidationErrorParam = InValidationErrorParam, D extends ValidationErrorData = ValidationErrorData> {
+    dynamic?: Endpoint<I, O, E, P, D>[];
     key: string;
-    content?: any;
+    plugins: Set<ServerPlugin>;
     rules?: EndpointRules;
     rulesMaps?: EndpointRulesMaps;
-    handler?: Handler;
     static?: Record<string, Endpoint<I, O, E, P, D>>;
-    dynamic?: Endpoint<I, O, E, P, D>[];
 }
 export type IntegerFormats = 'int32' | 'int64';
-export type EndpointsMethods = 'get' | 'post' | 'put' | 'patch' | 'delete' | 'options' | 'head' | 'trace';
-export type InParam = 'query' | 'header' | 'path' | 'cookie';
-export type InValidationErrorParam = InParam | 'body';
-export type BodyType = 'application/x-www-form-urlencoded' | 'application/json' | 'multipart/form-data';
+export type EndpointsMethods = 'delete' | 'get' | 'head' | 'options' | 'patch' | 'post' | 'put' | 'trace';
+export type InParam = 'cookie' | 'header' | 'path' | 'query';
+export type InValidationErrorParam = 'body' | InParam;
+export type BodyType = 'application/json' | 'application/x-www-form-urlencoded' | 'multipart/form-data';
 export type Endpoints<I = unknown, O = unknown, E extends ApiErrorValue = ApiErrorValue, P extends InValidationErrorParam = InValidationErrorParam, D extends ValidationErrorData = ValidationErrorData> = Partial<Record<EndpointsMethods, Endpoint<I, O, E, P, D>>>;
 export interface SSL {
     cert: string;
     key: string;
 }
 export interface ServerStartParams {
-    port: number;
     https: boolean;
+    port: number;
 }
 export interface BaseSchemaProps<T> {
     default?: T;
+    description?: string;
     example?: T;
     examples?: T[];
-    description?: string;
     ref?: string;
 }
 export interface ValuesSchemaProps<T> extends BaseSchemaProps<T> {
     values?: T[];
 }
-export interface Fallback {
-    children: any;
-    handler: Handler;
-}
-export type RequestPlugin = (req: IncomingMessage, res: ServerResponse) => boolean | undefined;

package/utils/FileData/Bin.d.ts

@@ -1,4 +1,5 @@
 export interface BinOptions {
+    disposition: string;
     /**
      * A field name of FormData request
      */
@@ -11,37 +12,36 @@ export interface BinOptions {
      * Full path to the file on server, you MUST use it only on server side for the safe
      */
     path: string;
-    /**
-     * MIME-type of the file
-     */
-    type: string;
-    disposition: string;
     /**
      * The file size
      */
     size: number;
-}
-export declare class Bin implements BinOptions {
     /**
-     * A file name, without extension
+     * MIME-type of the file
      */
-    filename: string;
+    type: string;
+}
+export declare class Bin implements BinOptions {
+    disposition: string;
     /**
      * The extension of the origin file from originalFilename
      */
     extension?: string;
-    type: string;
-    disposition: string;
     fieldName: string;
+    /**
+     * A file name, without extension
+     */
+    filename: string;
     originalFilename: string;
     path: string;
     size: number;
+    type: string;
     constructor(options: BinOptions);
     toJSON(): {
         $: string;
-        originalFilename: string;
-        type: string;
         disposition: string;
+        originalFilename: string;
         size: number;
+        type: string;
     };
 }

package/utils/FileData/Bin.es6.js

@@ -8,10 +8,10 @@ class Bin {
     toJSON() {
         return {
             $: 'binary',
-            originalFilename: this.originalFilename,
-            type: this.type,
             disposition: this.disposition,
+            originalFilename: this.originalFilename,
             size: this.size,
+            type: this.type,
         };
     }
 }

package/utils/FileData/Bin.js

@@ -12,10 +12,10 @@ class Bin {
     toJSON() {
         return {
             $: 'binary',
-            originalFilename: this.originalFilename,
-            type: this.type,
             disposition: this.disposition,
+            originalFilename: this.originalFilename,
             size: this.size,
+            type: this.type,
         };
     }
 }

package/utils/action/Action.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
-import type http from 'http';
-import { type IncomingHttpHeaders } from 'http';
+import { type CookieSerializeOptions } from 'cookie';
+import { type IncomingHttpHeaders, type IncomingMessage, type ServerResponse } from 'http';
 import { type ParsedQs } from 'qs';
 import { type BodyType } from '../../types';
 export declare const URL_PARSER: RegExp;
@@ -10,20 +10,23 @@ export interface ParsedUrl {
 }
 export declare class Action {
     #private;
-    private readonly req;
-    constructor(req: http.IncomingMessage);
+    readonly req: IncomingMessage;
+    readonly res: ServerResponse;
+    body?: object;
+    constructor(req: IncomingMessage, res: ServerResponse);
+    parseBody(): Promise<void>;
+    setCookie(name: string, value?: string, options?: CookieSerializeOptions): void;
+    get bodyType(): BodyType | undefined;
+    get clientIp(): string | null;
+    get cookies(): Record<string, string>;
+    set cookies(value: Record<string, string>);
+    get headers(): IncomingHttpHeaders;
+    set headers(value: IncomingHttpHeaders);
+    get originCookies(): Record<string, string>;
+    get originHeaders(): IncomingHttpHeaders;
+    get originSearch(): ParsedQs;
     get parsedUrl(): ParsedUrl;
     get path(): string;
-    get originSearch(): ParsedQs;
     get search(): ParsedQs;
     set search(value: ParsedQs);
-    get originHeaders(): IncomingHttpHeaders;
-    get headers(): IncomingHttpHeaders;
-    set headers(value: IncomingHttpHeaders);
-    get originCookies(): Record<string, string>;
-    get cookies(): Record<string, string>;
-    set cookies(value: Record<string, string>);
-    get bodyType(): BodyType | undefined;
-    body?: object;
-    parseBody(): Promise<void>;
 }