@innet/server 2.0.0-alpha.13 → 2.0.0-alpha.15

package/plugins/main/endpoint/endpoint.es6.js

@@ -6,6 +6,7 @@ import { useTag } from '../../../hooks/useTag/useTag.es6.js';
 import { useApi } from '../../../hooks/useApi/useApi.es6.js';
 import { getEndpoint } from '../../../utils/getEndpoint/getEndpoint.es6.js';
 import { endpointContext } from '../../../hooks/useEndpoint/useEndpoint.es6.js';
+import { serverPlugins } from '../../../hooks/useServerPlugins/useServerPlugins.es6.js';
 
 const endpoint = () => {
     const handler = useNewHandler();
@@ -42,12 +43,14 @@ const endpoint = () => {
         paths[path][method] = operation;
     }
     if (!endpoints[method]) {
-        endpoints[method] = { key: '' };
+        endpoints[method] = { key: '', plugins: new Set() };
     }
     // @ts-expect-error: it's always an object
     const endpoint = getEndpoint(path, endpoints[method]);
     // @ts-expect-error: it's always an object
     endpointContext.set(handler, { operation, props, endpoint });
+    // @ts-expect-error: it's always an object
+    serverPlugins.set(handler, endpoint.plugins);
     innet(children, handler);
 };
 

package/plugins/main/endpoint/endpoint.js

@@ -10,6 +10,7 @@ var useTag = require('../../../hooks/useTag/useTag.js');
 var useApi = require('../../../hooks/useApi/useApi.js');
 var getEndpoint = require('../../../utils/getEndpoint/getEndpoint.js');
 var useEndpoint = require('../../../hooks/useEndpoint/useEndpoint.js');
+var useServerPlugins = require('../../../hooks/useServerPlugins/useServerPlugins.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -50,12 +51,14 @@ const endpoint = () => {
         paths[path][method] = operation;
     }
     if (!endpoints[method]) {
-        endpoints[method] = { key: '' };
+        endpoints[method] = { key: '', plugins: new Set() };
     }
     // @ts-expect-error: it's always an object
     const endpoint = getEndpoint.getEndpoint(path, endpoints[method]);
     // @ts-expect-error: it's always an object
     useEndpoint.endpointContext.set(handler, { operation, props, endpoint });
+    // @ts-expect-error: it's always an object
+    useServerPlugins.serverPlugins.set(handler, endpoint.plugins);
     innet__default["default"](children, handler);
 };
 

package/plugins/main/index.d.ts

@@ -10,5 +10,4 @@ export * from './response';
 export * from './request';
 export * from './param';
 export * from './body';
-export * from './fallback';
 export * from './preset';

package/plugins/main/index.es6.js

@@ -10,5 +10,4 @@ import './response/index.es6.js';
 import './request/index.es6.js';
 import './param/index.es6.js';
 import './body/index.es6.js';
-import './fallback/index.es6.js';
 import './preset/index.es6.js';

package/plugins/main/index.js

@@ -12,6 +12,5 @@ require('./response/index.js');
 require('./request/index.js');
 require('./param/index.js');
 require('./body/index.js');
-require('./fallback/index.js');
 require('./preset/index.js');
 

package/plugins/main/preset/index.es6.js

@@ -1 +1 @@
-export { preset, presetCondition } from './preset.es6.js';
+export { preset } from './preset.es6.js';

package/plugins/main/preset/index.js

@@ -7,4 +7,3 @@ var preset = require('./preset.js');
 
 
 exports.preset = preset.preset;
-exports.presetCondition = preset.presetCondition;

package/plugins/main/preset/preset.d.ts

@@ -1,7 +1,3 @@
-import { Context } from '@innet/jsx';
-import { Action } from '../../../utils';
 export interface PresetProps {
 }
-export type PresetCondition = (action: Action) => boolean;
-export declare const presetCondition: Context<PresetCondition, PresetCondition>;
 export declare function preset(): void;

package/plugins/main/preset/preset.es6.js

@@ -1,26 +1,13 @@
 import innet, { useHandler } from 'innet';
-import { Context, useChildren, useContext } from '@innet/jsx';
+import { useChildren } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
-import '../../../utils/index.es6.js';
-import { useServer } from '../../../hooks/useServer/useServer.es6.js';
-import { Action } from '../../../utils/action/Action.es6.js';
-import { actionContext } from '../../../hooks/useAction/useAction.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
 
-const presetCondition = new Context(() => true);
 function preset() {
-    const { server } = useServer();
-    const handler = useHandler();
     const children = useChildren();
-    const condition = useContext(presetCondition);
-    const listener = (req, res) => {
-        const action = new Action(req, res);
-        if (condition(action)) {
-            const newHandler = Object.create(handler);
-            actionContext.set(newHandler, action);
-            innet(children, newHandler);
-        }
-    };
-    server.addListener('request', listener);
+    useServerPlugin(() => {
+        innet(children, useHandler());
+    });
 }
 
-export { preset, presetCondition };
+export { preset };

package/plugins/main/preset/preset.js

@@ -5,31 +5,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var innet = require('innet');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
-require('../../../utils/index.js');
-var useServer = require('../../../hooks/useServer/useServer.js');
-var Action = require('../../../utils/action/Action.js');
-var useAction = require('../../../hooks/useAction/useAction.js');
+var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
-const presetCondition = new jsx.Context(() => true);
 function preset() {
-    const { server } = useServer.useServer();
-    const handler = innet.useHandler();
     const children = jsx.useChildren();
-    const condition = jsx.useContext(presetCondition);
-    const listener = (req, res) => {
-        const action = new Action.Action(req, res);
-        if (condition(action)) {
-            const newHandler = Object.create(handler);
-            useAction.actionContext.set(newHandler, action);
-            innet__default["default"](children, newHandler);
-        }
-    };
-    server.addListener('request', listener);
+    useServerPlugin.useServerPlugin(() => {
+        innet__default["default"](children, innet.useHandler());
+    });
 }
 
 exports.preset = preset;
-exports.presetCondition = presetCondition;

package/plugins/main/request/request.es6.js

@@ -1,21 +1,10 @@
-import { useHandler } from 'innet';
 import { useChildren } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
-import { useEndpoint } from '../../../hooks/useEndpoint/useEndpoint.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
 
 const request = () => {
-    const endpointContext = useEndpoint();
-    if (!endpointContext) {
-        throw Error('Use <request> inside <endpoint>');
-    }
     const children = useChildren();
-    const handler = useHandler();
-    const { endpoint, props } = endpointContext;
-    if (endpoint.content) {
-        throw Error(`You cannot use the same endpoints ${props.method}:${props.path}`);
-    }
-    endpoint.content = children;
-    endpoint.handler = handler;
+    useServerPlugin(() => children);
 };
 
 export { request };

package/plugins/main/request/request.js

@@ -2,24 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var innet = require('innet');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
-var useEndpoint = require('../../../hooks/useEndpoint/useEndpoint.js');
+var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
 
 const request = () => {
-    const endpointContext = useEndpoint.useEndpoint();
-    if (!endpointContext) {
-        throw Error('Use <request> inside <endpoint>');
-    }
     const children = jsx.useChildren();
-    const handler = innet.useHandler();
-    const { endpoint, props } = endpointContext;
-    if (endpoint.content) {
-        throw Error(`You cannot use the same endpoints ${props.method}:${props.path}`);
-    }
-    endpoint.content = children;
-    endpoint.handler = handler;
+    useServerPlugin.useServerPlugin(() => children);
 };
 
 exports.request = request;

package/plugins/main/response/response.d.ts

@@ -14,6 +14,7 @@ export interface ResponseProps {
      * Only the following range definitions are allowed: 1XX, 2XX, 3XX, 4XX, and 5XX.
      * */
     status?: number | `${1 | 2 | 3 | 4 | 5}XX` | 'default' | StatusKey;
+    type?: string;
 }
 export declare const statuses: Record<StatusKey, number>;
 export declare const response: HandlerPlugin;

package/plugins/main/response/response.es6.js

@@ -14,7 +14,8 @@ import { ruleContext } from '../../../hooks/useRule/useRule.es6.js';
 
 const statuses = Object.assign(Object.assign(Object.assign({}, errorStatuses), redirectStatuses), successStatuses);
 const response = () => {
-    let { description = '', status = 'default' } = useProps() || {};
+    var _a;
+    let { description = '', status = 'default', type = 'application/json', } = useProps() || {};
     const { operation, props: { path } } = useEndpoint();
     const children = useChildren();
     const handler = useNewHandler();
@@ -28,17 +29,16 @@ const response = () => {
     if (!operation.responses) {
         operation.responses = {};
     }
-    if (operation.responses[status]) {
-        throw Error(`status ${status} for '${path}' already used`);
+    const defaultResponse = operation.responses[status];
+    if ((_a = defaultResponse === null || defaultResponse === void 0 ? void 0 : defaultResponse.content) === null || _a === void 0 ? void 0 : _a[type]) {
+        throw Error(`status ${status} and type ${type} for '${path}' already used`);
     }
     const schema = {};
     const response = {
         description,
-        content: {
-            'application/json': {
+        content: Object.assign(Object.assign({}, defaultResponse === null || defaultResponse === void 0 ? void 0 : defaultResponse.content), { [type]: {
                 schema,
-            },
-        },
+            } }),
     };
     operation.responses[status] = response;
     schemaContext.set(handler, schema);

package/plugins/main/response/response.js

@@ -22,7 +22,8 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
 const statuses = Object.assign(Object.assign(Object.assign({}, error.errorStatuses), redirect.redirectStatuses), success.successStatuses);
 const response = () => {
-    let { description = '', status = 'default' } = jsx.useProps() || {};
+    var _a;
+    let { description = '', status = 'default', type = 'application/json', } = jsx.useProps() || {};
     const { operation, props: { path } } = useEndpoint.useEndpoint();
     const children = jsx.useChildren();
     const handler = innet.useNewHandler();
@@ -36,17 +37,16 @@ const response = () => {
     if (!operation.responses) {
         operation.responses = {};
     }
-    if (operation.responses[status]) {
-        throw Error(`status ${status} for '${path}' already used`);
+    const defaultResponse = operation.responses[status];
+    if ((_a = defaultResponse === null || defaultResponse === void 0 ? void 0 : defaultResponse.content) === null || _a === void 0 ? void 0 : _a[type]) {
+        throw Error(`status ${status} and type ${type} for '${path}' already used`);
     }
     const schema = {};
     const response = {
         description,
-        content: {
-            'application/json': {
+        content: Object.assign(Object.assign({}, defaultResponse === null || defaultResponse === void 0 ? void 0 : defaultResponse.content), { [type]: {
                 schema,
-            },
-        },
+            } }),
     };
     operation.responses[status] = response;
     useSchemaContext.schemaContext.set(handler, schema);

package/plugins/main/server/server.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="node" />
 import { type HandlerPlugin } from 'innet';
-import { type ServerResponse } from 'http';
+import { type IncomingMessage, type ServerResponse } from 'http';
 import { type ServerStartParams, type SSL } from '../../../types';
 export interface ServerProps {
     port?: number;
     ssl?: SSL;
     onStart?: (params: ServerStartParams) => any;
-    onRequest?: (req: Request, res: ServerResponse) => any;
+    onRequest?: (req: IncomingMessage, res: ServerResponse) => any;
     onError?: (e: Error) => any;
-    onDestroy?: () => any;
+    onClose?: () => any;
 }
 export declare const server: HandlerPlugin;

package/plugins/main/server/server.es6.js

@@ -1,10 +1,15 @@
+import { __awaiter } from 'tslib';
 import innet, { useNewHandler, useApp } from 'innet';
 import fs from 'node:fs';
 import http from 'node:http';
 import http2 from 'node:https';
 import { onDestroy } from 'watch-state';
 import '../../../hooks/index.es6.js';
+import '../../../utils/index.es6.js';
 import { serverContext } from '../../../hooks/useServer/useServer.es6.js';
+import { serverPlugins } from '../../../hooks/useServerPlugins/useServerPlugins.es6.js';
+import { Action } from '../../../utils/action/Action.es6.js';
+import { actionContext } from '../../../hooks/useAction/useAction.es6.js';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const isInvalidPath = require('is-invalid-path');
@@ -27,20 +32,37 @@ const server = () => {
         cert = '';
     }
     const https = Boolean(key && cert);
-    const { port = Number((_c = env.PORT) !== null && _c !== void 0 ? _c : (https ? 442 : 80)), onStart, onError, onRequest, } = props;
+    const { port = Number((_c = env.PORT) !== null && _c !== void 0 ? _c : (https ? 442 : 80)), onStart, onError, onRequest, onClose, } = props;
+    const plugins = new Set();
     const server = https ? http2.createServer({ key, cert }) : http.createServer();
-    handler[serverContext.key] = { server, port };
+    serverContext.set(handler, { server, port });
+    serverPlugins.set(handler, plugins);
     onDestroy(() => {
-        var _a;
-        (_a = props.onDestroy) === null || _a === void 0 ? void 0 : _a.call(props);
         server.close();
     });
     if (onError) {
         server.on('error', onError);
     }
-    if (onRequest) {
-        server.on('request', onRequest);
+    if (onClose) {
+        server.addListener('close', onClose);
     }
+    server.on('request', (req, res) => {
+        onRequest === null || onRequest === void 0 ? void 0 : onRequest(req, res);
+        const action = new Action(req, res);
+        const requestHandler = Object.create(handler);
+        actionContext.set(requestHandler, action);
+        function server() {
+            return __awaiter(this, void 0, void 0, function* () {
+                for (const plugin of plugins) {
+                    const result = yield plugin();
+                    if (result !== undefined) {
+                        return result;
+                    }
+                }
+            });
+        }
+        innet({ type: server, props }, requestHandler);
+    });
     innet(children, handler);
     server.listen(port, () => {
         onStart === null || onStart === void 0 ? void 0 : onStart({ port, https });

package/plugins/main/server/server.js

@@ -2,13 +2,18 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var innet = require('innet');
 var fs = require('node:fs');
 var http = require('node:http');
 var http2 = require('node:https');
 var watchState = require('watch-state');
 require('../../../hooks/index.js');
+require('../../../utils/index.js');
 var useServer = require('../../../hooks/useServer/useServer.js');
+var useServerPlugins = require('../../../hooks/useServerPlugins/useServerPlugins.js');
+var Action = require('../../../utils/action/Action.js');
+var useAction = require('../../../hooks/useAction/useAction.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -38,20 +43,37 @@ const server = () => {
         cert = '';
     }
     const https = Boolean(key && cert);
-    const { port = Number((_c = env.PORT) !== null && _c !== void 0 ? _c : (https ? 442 : 80)), onStart, onError, onRequest, } = props;
+    const { port = Number((_c = env.PORT) !== null && _c !== void 0 ? _c : (https ? 442 : 80)), onStart, onError, onRequest, onClose, } = props;
+    const plugins = new Set();
     const server = https ? http2__default["default"].createServer({ key, cert }) : http__default["default"].createServer();
-    handler[useServer.serverContext.key] = { server, port };
+    useServer.serverContext.set(handler, { server, port });
+    useServerPlugins.serverPlugins.set(handler, plugins);
     watchState.onDestroy(() => {
-        var _a;
-        (_a = props.onDestroy) === null || _a === void 0 ? void 0 : _a.call(props);
         server.close();
     });
     if (onError) {
         server.on('error', onError);
     }
-    if (onRequest) {
-        server.on('request', onRequest);
+    if (onClose) {
+        server.addListener('close', onClose);
     }
+    server.on('request', (req, res) => {
+        onRequest === null || onRequest === void 0 ? void 0 : onRequest(req, res);
+        const action = new Action.Action(req, res);
+        const requestHandler = Object.create(handler);
+        useAction.actionContext.set(requestHandler, action);
+        function server() {
+            return tslib.__awaiter(this, void 0, void 0, function* () {
+                for (const plugin of plugins) {
+                    const result = yield plugin();
+                    if (result !== undefined) {
+                        return result;
+                    }
+                }
+            });
+        }
+        innet__default["default"]({ type: server, props }, requestHandler);
+    });
     innet__default["default"](children, handler);
     server.listen(port, () => {
         onStart === null || onStart === void 0 ? void 0 : onStart({ port, https });

package/plugins/request/proxy/proxy.d.ts

@@ -1,6 +1,9 @@
+/// <reference types="node" />
 import { type HandlerPlugin } from 'innet';
+import { type IncomingMessage } from 'http';
 export interface ProxyProps {
     to: string;
     secure?: boolean;
+    onProxyRes?: (res: IncomingMessage) => void;
 }
 export declare const proxy: HandlerPlugin;

package/plugins/request/proxy/proxy.es6.js

@@ -6,7 +6,7 @@ import { useResponse } from '../../../hooks/useResponse/useResponse.es6.js';
 import { useThrow } from '../../../hooks/useThrow/useThrow.es6.js';
 
 const proxy = () => {
-    const { to, secure } = useProps();
+    const { to, secure, onProxyRes } = useProps();
     const req = useRequest();
     const res = useResponse();
     if (!req || !res) {
@@ -14,6 +14,9 @@ const proxy = () => {
     }
     const proxyServer = httpProxy.createProxyServer({});
     delete req.headers.host;
+    if (onProxyRes) {
+        proxyServer.on('proxyRes', onProxyRes);
+    }
     proxyServer.web(req, res, { target: to, secure });
 };
 

package/plugins/request/proxy/proxy.js

@@ -14,7 +14,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var httpProxy__default = /*#__PURE__*/_interopDefaultLegacy(httpProxy);
 
 const proxy = () => {
-    const { to, secure } = jsx.useProps();
+    const { to, secure, onProxyRes } = jsx.useProps();
     const req = useRequest.useRequest();
     const res = useResponse.useResponse();
     if (!req || !res) {
@@ -22,6 +22,9 @@ const proxy = () => {
     }
     const proxyServer = httpProxy__default["default"].createProxyServer({});
     delete req.headers.host;
+    if (onProxyRes) {
+        proxyServer.on('proxyRes', onProxyRes);
+    }
     proxyServer.web(req, res, { target: to, secure });
 };
 

package/plugins/request/success/success.d.ts

@@ -13,6 +13,6 @@ export declare const successStatuses: {
 export type SuccessStatuses = keyof typeof successStatuses;
 export interface SuccessProps {
     status?: SuccessStatuses | number;
-    contentType?: string;
+    type?: string;
 }
 export declare const success: HandlerPlugin;

package/plugins/request/success/success.es6.js

@@ -17,7 +17,7 @@ const successStatuses = {
 };
 const success = () => {
     const children = useChildren();
-    const { status, contentType } = useProps() || {};
+    const { status, type } = useProps() || {};
     const res = useResponse();
     if (!res) {
         throw Error('<success> MUST be in <request>');
@@ -25,11 +25,11 @@ const success = () => {
     res.statusCode = typeof status === 'string' ? successStatuses[status] : status !== null && status !== void 0 ? status : ((children) ? 200 : 204);
     if (children === null || children === void 0 ? void 0 : children[0]) {
         const child = children[0];
-        const type = contentType || (['string', 'number', 'boolean', 'bigint'].includes(typeof child)
+        const contentType = type || (['string', 'number', 'boolean', 'bigint'].includes(typeof child)
             ? 'text/plain'
             : 'application/json');
-        res.setHeader('Content-Type', type);
-        if (type === 'application/json') {
+        res.setHeader('Content-Type', contentType);
+        if (contentType === 'application/json') {
             res.write(JSONString(child));
         }
         else {

package/plugins/request/success/success.js

@@ -21,7 +21,7 @@ const successStatuses = {
 };
 const success = () => {
     const children = jsx.useChildren();
-    const { status, contentType } = jsx.useProps() || {};
+    const { status, type } = jsx.useProps() || {};
     const res = useResponse.useResponse();
     if (!res) {
         throw Error('<success> MUST be in <request>');
@@ -29,11 +29,11 @@ const success = () => {
     res.statusCode = typeof status === 'string' ? successStatuses[status] : status !== null && status !== void 0 ? status : ((children) ? 200 : 204);
     if (children === null || children === void 0 ? void 0 : children[0]) {
         const child = children[0];
-        const type = contentType || (['string', 'number', 'boolean', 'bigint'].includes(typeof child)
+        const contentType = type || (['string', 'number', 'boolean', 'bigint'].includes(typeof child)
             ? 'text/plain'
             : 'application/json');
-        res.setHeader('Content-Type', type);
-        if (type === 'application/json') {
+        res.setHeader('Content-Type', contentType);
+        if (contentType === 'application/json') {
             res.write(JSONString.JSONString(child));
         }
         else {

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

@@ -1,13 +1,14 @@
 import { useProps, useChildren } from '@innet/jsx';
 import '../../../hooks/index.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';
 
 function blacklist() {
     const { ip = process.env.BLACKLIST_IP, } = useProps() || {};
     const children = useChildren();
     const ips = typeof ip === 'string' ? ip.split(',') : ip;
-    useRequestPlugin(action => {
-        console.log(action.clientIp);
+    useServerPlugin(() => {
+        const action = useAction();
         if (!action.clientIp || (ips === null || ips === void 0 ? void 0 : ips.includes(action.clientIp))) {
             return children;
         }

package/plugins/utils/blacklist/blacklist.js

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

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

@@ -1,6 +1,7 @@
 import { useProps, useChildren } from '@innet/jsx';
 import '../../../hooks/index.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';
 
 function protection() {
     const { maxAge = Number(process.env.PROTECTION_MAX_AGE) || 365 * 24 * 60 * 60, value = process.env.PROTECTION, excludeIp = process.env.PROTECTED_IP, cookieKey = process.env.PROTECTION_COOKIE_KEY || 'protection', searchKey = process.env.PROTECTION_SEARCH_KEY || 'protection', } = useProps() || {};
@@ -8,7 +9,8 @@ function protection() {
     if (!value)
         return;
     const excludeIps = Array.isArray(excludeIp) ? excludeIp : excludeIp === null || excludeIp === void 0 ? void 0 : excludeIp.split(',');
-    useRequestPlugin(action => {
+    useServerPlugin(() => {
+        const action = useAction();
         if (!action.clientIp)
             return children;
         if (excludeIps === null || excludeIps === void 0 ? void 0 : excludeIps.includes(action.clientIp))

package/plugins/utils/protection/protection.js

@@ -4,7 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
-var useRequestPlugin = require('../../../hooks/useRequestPlugin/useRequestPlugin.js');
+var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
+var useAction = require('../../../hooks/useAction/useAction.js');
 
 function protection() {
     const { maxAge = Number(process.env.PROTECTION_MAX_AGE) || 365 * 24 * 60 * 60, value = process.env.PROTECTION, excludeIp = process.env.PROTECTED_IP, cookieKey = process.env.PROTECTION_COOKIE_KEY || 'protection', searchKey = process.env.PROTECTION_SEARCH_KEY || 'protection', } = jsx.useProps() || {};
@@ -12,7 +13,8 @@ function protection() {
     if (!value)
         return;
     const excludeIps = Array.isArray(excludeIp) ? excludeIp : excludeIp === null || excludeIp === void 0 ? void 0 : excludeIp.split(',');
-    useRequestPlugin.useRequestPlugin(action => {
+    useServerPlugin.useServerPlugin(() => {
+        const action = useAction.useAction();
         if (!action.clientIp)
             return children;
         if (excludeIps === null || excludeIps === void 0 ? void 0 : excludeIps.includes(action.clientIp))

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

@@ -2,14 +2,16 @@ 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();
     let swaggerResponse;
-    useRequestPlugin(action => {
-        if (action.req.url === prefix + path) {
+    useServerPlugin(() => {
+        const action = useAction();
+        if (action.path === prefix + path) {
             if (!swaggerResponse) {
                 swaggerResponse = html.replace('spec: {},', `spec: ${JSON.stringify(docs)},`);
             }