@innet/server 2.0.0-alpha.3 → 2.0.0-alpha.30

package/plugins/schema/string/string.js

@@ -7,48 +7,62 @@ var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../hooks/useParentRule/index.js');
 require('../../../utils/index.js');
+var useApi = require('../../../hooks/useApi/useApi.js');
 var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
 var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
 var values = require('../../../utils/rules/values/values.js');
 var minLength = require('../../../utils/rules/minLength/minLength.js');
 var maxLength = require('../../../utils/rules/maxLength/maxLength.js');
 var pattern = require('../../../utils/rules/pattern/pattern.js');
-var useRule = require('../../../hooks/useRule/useRule.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
+var useRule = require('../../../hooks/useRule/useRule.js');
 var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
 
 const string = () => {
-    const _a = jsx.useProps() || {}, { min, max, pattern: pattern$1, patternId } = _a, props = tslib.__rest(_a, ["min", "max", "pattern", "patternId"]);
+    const _a = jsx.useProps() || {}, { max, min, pattern: pattern$1, patternId } = _a, props = tslib.__rest(_a, ["max", "min", "pattern", "patternId"]);
+    const { refRules } = useApi.useApi();
     const schema = useSchemaType.useSchemaType('string', props);
-    const rules = [];
-    if (props.default !== undefined) {
-        rules.push(defaultTo.defaultTo(props.default));
-    }
-    rules.push(String);
-    if (props.values) {
-        rules.push(values.values(props.values));
-    }
-    if (min !== undefined) {
-        // @ts-expect-error: FIXME
-        schema.minimum = min;
-        rules.push(minLength.minLength(min));
-    }
-    if (max !== undefined) {
-        // @ts-expect-error: FIXME
-        schema.maximum = max;
-        rules.push(maxLength.maxLength(max));
-    }
-    if (pattern$1 !== undefined) {
-        // @ts-expect-error: FIXME
-        schema.pattern = String(pattern$1);
-        rules.push(pattern.pattern(pattern$1, patternId));
-    }
-    if (props.default) {
-        useRule.useRule(pipe.pipe(...rules));
+    if (schema) {
+        const rules = [];
+        if (props.default !== undefined) {
+            rules.push(defaultTo.defaultTo(props.default));
+        }
+        rules.push(String);
+        if (props.values) {
+            rules.push(values.values(props.values));
+        }
+        if (min !== undefined) {
+            schema.minimum = min;
+            rules.push(minLength.minLength(min));
+        }
+        if (max !== undefined) {
+            schema.maximum = max;
+            rules.push(maxLength.maxLength(max));
+        }
+        if (pattern$1 !== undefined) {
+            schema.pattern = String(pattern$1);
+            rules.push(pattern.pattern(pattern$1, patternId));
+        }
+        const rule = pipe.pipe(...rules);
+        if (props.ref) {
+            refRules[props.ref] = rule;
+        }
+        if (props.default) {
+            useRule.useRule(rule);
+        }
+        else {
+            const parentRule = useParentRule.useParentRule();
+            useRule.useRule(parentRule(rule));
+        }
     }
-    else {
-        const parentRule = useParentRule.useParentRule();
-        useRule.useRule(parentRule(pipe.pipe(...rules)));
+    else if (props.ref) {
+        if (props.default) {
+            useRule.useRule(refRules[props.ref]);
+        }
+        else {
+            const parentRule = useParentRule.useParentRule();
+            useRule.useRule(parentRule(refRules[props.ref]));
+        }
     }
 };
 

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

@@ -0,0 +1,4 @@
+export interface BlacklistProps {
+    ip?: string | string[];
+}
+export declare function blacklist(): void;

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

@@ -0,0 +1,18 @@
+import { useProps, useChildren } 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 { ip = process.env.INNET_BLACKLIST_IP, } = useProps() || {};
+    const children = useChildren();
+    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,22 @@
+'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 { ip = process.env.INNET_BLACKLIST_IP, } = jsx.useProps() || {};
+    const children = jsx.useChildren();
+    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,6 +1,6 @@
 import { type HandlerPlugin } from 'innet';
-import { type Config } from 'dtsgenerator/dist/core/config';
-export interface DtsProps extends Partial<Config> {
-    path: string;
+export interface DtsProps {
+    namespace?: string;
+    path?: string;
 }
 export declare const dts: HandlerPlugin;

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

@@ -1,34 +1,15 @@
-import { __rest, __awaiter } from 'tslib';
 import { useProps } from '@innet/jsx';
-import dtsGenerator, { parseSchema } from 'dtsgenerator';
-import fs from 'node:fs';
+import { promises } from 'node:fs';
 import '../../../hooks/index.es6.js';
+import '../../../utils/index.es6.js';
 import { useApi } from '../../../hooks/useApi/useApi.es6.js';
+import { generateTypes } from '../../../utils/generateTypes/generateTypes.es6.js';
 
 const dts = () => {
-    const _a = useProps(), { path } = _a, config = __rest(_a, ["path"]);
+    const { namespace = process.env.INNET_DTS_NAMESPACE, path = process.env.INNET_DTS_PATH || 'src/apiTypes.d.ts', } = useProps() || {};
     const { docs } = useApi();
-    dtsGenerator({
-        contents: [parseSchema(JSON.parse(JSON.stringify(docs)))],
-        config,
-    }).then((content) => __awaiter(void 0, void 0, void 0, function* () {
-        yield fs.promises.writeFile(path, `interface Bin {
-  filename: string
-  fieldName: string
-  originalFilename: string
-  path: string
-  type: string
-  disposition: string
-  size: number
-  extension?: string
-}
-${content
-            .replaceAll(';', '')
-            .replaceAll('number // int64', 'bigint')
-            .replaceAll('string // binary', 'Bin')
-            .replaceAll('string // date-time', 'Date')}`);
-    })).catch(error => {
-        console.warn(error);
+    promises.writeFile(path, generateTypes(docs, namespace)).catch(e => {
+        console.error(e);
     });
 };
 

package/plugins/utils/dts/dts.js

@@ -2,42 +2,18 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var jsx = require('@innet/jsx');
-var dtsGenerator = require('dtsgenerator');
 var fs = require('node:fs');
 require('../../../hooks/index.js');
+require('../../../utils/index.js');
 var useApi = require('../../../hooks/useApi/useApi.js');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var dtsGenerator__default = /*#__PURE__*/_interopDefaultLegacy(dtsGenerator);
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
+var generateTypes = require('../../../utils/generateTypes/generateTypes.js');
 
 const dts = () => {
-    const _a = jsx.useProps(), { path } = _a, config = tslib.__rest(_a, ["path"]);
+    const { namespace = process.env.INNET_DTS_NAMESPACE, path = process.env.INNET_DTS_PATH || 'src/apiTypes.d.ts', } = jsx.useProps() || {};
     const { docs } = useApi.useApi();
-    dtsGenerator__default["default"]({
-        contents: [dtsGenerator.parseSchema(JSON.parse(JSON.stringify(docs)))],
-        config,
-    }).then((content) => tslib.__awaiter(void 0, void 0, void 0, function* () {
-        yield fs__default["default"].promises.writeFile(path, `interface Bin {
-  filename: string
-  fieldName: string
-  originalFilename: string
-  path: string
-  type: string
-  disposition: string
-  size: number
-  extension?: string
-}
-${content
-            .replaceAll(';', '')
-            .replaceAll('number // int64', 'bigint')
-            .replaceAll('string // binary', 'Bin')
-            .replaceAll('string // date-time', 'Date')}`);
-    })).catch(error => {
-        console.warn(error);
+    fs.promises.writeFile(path, generateTypes.generateTypes(docs, namespace)).catch(e => {
+        console.error(e);
     });
 };
 

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

@@ -0,0 +1,6 @@
+import { type HandlerPlugin } from 'innet';
+export interface EnvProps {
+    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, useChildren } from '@innet/jsx';
+
+const env = () => {
+    const { is, of = 'NODE_ENV', } = useProps();
+    if (Array.isArray(is) ? is.includes(process.env[of]) : process.env[of] === is) {
+        innet(useChildren(), 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') {
+const env = () => {
+    const { is, of = 'NODE_ENV', } = jsx.useProps();
+    if (Array.isArray(is) ? is.includes(process.env[of]) : process.env[of] === is) {
         innet__default["default"](jsx.useChildren(), 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,8 @@
+export interface ProtectionProps {
+    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,36 @@
+import { useProps, useChildren } 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 { 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() || {};
+    const children = useChildren();
+    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,40 @@
+'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 { 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() || {};
+    const children = jsx.useChildren();
+    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

@@ -1,27 +1,25 @@
 import { useProps } from '@innet/jsx';
-import { onDestroy } from 'watch-state';
 import '../../../hooks/index.es6.js';
 import html from './swagger.html.es6.js';
 import { useApi } from '../../../hooks/useApi/useApi.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, requestPlugins, prefix } = useApi();
+    const { path = process.env.INNET_SWAGGER_PATH || '/swagger-ui', } = useProps() || {};
+    const { docs, prefix, } = useApi();
     let swaggerResponse;
-    const listener = (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;
         }
-    };
-    requestPlugins.add(listener);
-    onDestroy(() => {
-        requestPlugins.delete(listener);
     });
 };
 

package/plugins/utils/swagger/swagger.js

@@ -3,29 +3,27 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsx = require('@innet/jsx');
-var watchState = require('watch-state');
 require('../../../hooks/index.js');
 var swagger$1 = require('./swagger.html.js');
 var useApi = require('../../../hooks/useApi/useApi.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, requestPlugins, prefix } = useApi.useApi();
+    const { path = process.env.INNET_SWAGGER_PATH || '/swagger-ui', } = jsx.useProps() || {};
+    const { docs, prefix, } = useApi.useApi();
     let swaggerResponse;
-    const listener = (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;
         }
-    };
-    requestPlugins.add(listener);
-    watchState.onDestroy(() => {
-        requestPlugins.delete(listener);
     });
 };
 

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,4 @@
+export interface WhitelistProps {
+    ip?: string | string[];
+}
+export declare function whitelist(): void;

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

@@ -0,0 +1,20 @@
+import { useProps, useChildren } 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 { ip = process.env.INNET_WHITELIST_IP, } = useProps() || {};
+    const children = useChildren();
+    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,24 @@
+'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 { ip = process.env.INNET_WHITELIST_IP, } = jsx.useProps() || {};
+    const children = jsx.useChildren();
+    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;