@innet/server 2.0.0-alpha.9 → 2.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "2.0.0-alpha.9",
+  "version": "2.0.0-beta.2",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",
@@ -21,7 +21,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/d8corp/innet-server.git"
+    "url": "git+https://github.com/d8corp/innet-server.git"
   },
   "keywords": [
     "innet",
@@ -35,24 +35,23 @@
   },
   "homepage": "https://github.com/d8corp/innet-server",
   "dependencies": {
-    "@cantinc/utils": "^1.4.2",
-    "@innet/jsx": "^2.0.0-alpha.10",
-    "@innet/utils": "^2.0.0-alpha.1",
-    "@types/cookie": "^0.5.1",
-    "@types/multiparty": "^0.0.33",
-    "@types/qs": "^6.9.7",
-    "cookie": "^0.5.0",
+    "@cantinc/utils": "^1.4.4",
+    "@innet/jsx": "^2.0.0-rc.3",
+    "@innet/utils": "^2.0.3-beta.1",
+    "@types/cookie": "^1.0.0",
+    "@types/multiparty": "^4.2.1",
+    "@types/qs": "^6.15.0",
+    "cookie": "^1.1.1",
     "http-proxy": "^1.18.1",
-    "innet": "^2.0.0-alpha.3",
-    "is-invalid-path": "^1.0.2",
-    "mime": "^3.0.0",
+    "innet": "^2.0.1",
+    "mime": "^4.1.0",
     "multiparty": "^4.2.3",
     "openapi-types": "^12.1.3",
-    "qs": "^6.11.2",
+    "qs": "^6.15.0",
     "request-ip": "^3.3.0",
     "string_decoder": "^1.3.0",
-    "tslib": "^2.6.1",
-    "uuid": "^9.0.0",
-    "watch-state": "^3.5.0-alpha.3"
+    "tslib": "^2.8.1",
+    "uuid": "^13.0.0",
+    "watch-state": "^3.6.2"
   }
 }

package/plugins/handler/serverFn/serverFn.es6.js

@@ -5,7 +5,7 @@ const serverFn = () => {
     return () => {
         const handler = useHandler();
         const fn = useApp();
-        new Watch(update => {
+        new Watch((update) => {
             innet(fn(update), handler);
         });
     };

package/plugins/handler/serverFn/serverFn.js

@@ -13,7 +13,7 @@ const serverFn = () => {
     return () => {
         const handler = innet.useHandler();
         const fn = innet.useApp();
-        new watchState.Watch(update => {
+        new watchState.Watch((update) => {
             innet__default["default"](fn(update), handler);
         });
     };

package/plugins/main/api/api.d.ts

@@ -1,5 +1,16 @@
 import { type HandlerPlugin } from 'innet';
 export interface ApiProps {
+    children?: any;
+    /** A description of the API. [CommonMark syntax](https://spec.commonmark.or.org) MAY be used for rich text representation. */
+    description?: string;
+    exclude?: RegExp;
+    include?: RegExp;
+    /** URL path prefix scopes the API. */
+    prefix?: string;
+    /** A short summary of the API. */
+    summary?: string;
+    /** A URL to the Terms of Service for the API. This MUST be in the form of a URL. */
+    termsOfService?: string;
     /** The title of the API. */
     title?: string;
     /**
@@ -10,13 +21,5 @@ export interface ApiProps {
      * @default: 0.0.0
      * */
     version?: string;
-    /** A short summary of the API. */
-    summary?: string;
-    /** A description of the API. [CommonMark syntax](https://spec.commonmark.or.org) MAY be used for rich text representation. */
-    description?: string;
-    /** A URL to the Terms of Service for the API. This MUST be in the form of a URL. */
-    termsOfService?: string;
-    /** URL path prefix scopes the API. */
-    prefix?: string;
 }
 export declare const api: HandlerPlugin;

package/plugins/main/api/api.es6.js

@@ -1,56 +1,58 @@
-import { __rest, __awaiter } from 'tslib';
-import innet, { useNewHandler, useApp } from 'innet';
-import { onDestroy } from 'watch-state';
+import innet, { useNewHandler } from 'innet';
+import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
 import '../../../utils/rules/index.es6.js';
-import { useServer } from '../../../hooks/useServer/useServer.es6.js';
+import { serverPlugins } from '../../../hooks/useServerPlugins/useServerPlugins.es6.js';
 import { apiContext } from '../../../hooks/useApi/useApi.es6.js';
-import { Action } from '../../../utils/action/Action.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
+import { useAction, actionContext } from '../../../hooks/useAction/useAction.es6.js';
 import { JSONString } from '../../../utils/JSONString/JSONString.es6.js';
 import { RulesError } from '../../../utils/rules/helpers.es6.js';
-import { responseContext } from '../../../hooks/useResponse/useResponse.es6.js';
-import { requestContext } from '../../../hooks/useRequest/useRequest.es6.js';
 import { paramsContext } from '../../../hooks/useParams/useParams.es6.js';
-import { actionContext } from '../../../hooks/useAction/useAction.es6.js';
 
 const api = () => {
-    var _a;
     const handler = useNewHandler();
-    const { props = {}, children } = useApp();
-    const { server } = useServer();
-    const { prefix = '', title = '' } = props, rest = __rest(props, ["prefix", "title"]);
-    const info = Object.assign(Object.assign({}, rest), { version: (_a = rest.version) !== null && _a !== void 0 ? _a : '0.0.0', title });
+    const props = useProps();
+    const { children, exclude, include, prefix = process.env.INNET_API_PREFIX || '', title = '', version = process.env.INNET_API_VERSION || '0.0.0', ...rest } = props;
+    const info = { ...rest, title, version };
     const endpoints = {};
     const docs = {
-        openapi: '3.1.0',
         info,
+        openapi: '3.1.0',
         paths: {},
     };
-    const requestPlugins = new Set();
-    const context = { docs, endpoints, prefix, requestPlugins, refRules: {} };
+    const plugins = new Set();
+    const context = { docs, endpoints, prefix, refRules: {} };
+    const condition = (action) => {
+        const path = action.parsedUrl.path;
+        const url = path.endsWith('/') ? path.slice(0, -1) : path;
+        if (!url.startsWith(prefix) || (exclude === null || exclude === void 0 ? void 0 : exclude.test(url))) {
+            return false;
+        }
+        if (include && !include.test(url)) {
+            return false;
+        }
+        return true;
+    };
+    serverPlugins.set(handler, plugins);
     apiContext.set(handler, context);
-    const listener = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
-        var _b, _c, _d, _e, _f, _g;
-        if (res.writableEnded)
+    useServerPlugin(async () => {
+        var _a, _b, _c, _d, _e, _f;
+        const action = useAction();
+        if (!condition(action))
             return;
-        const action = new Action(req, res);
+        const actionHandler = useNewHandler();
         const path = action.parsedUrl.path;
         const url = path.endsWith('/') ? path.slice(0, -1) : path;
+        const { req, res, } = action;
         if (url === (prefix || '')) {
             res.setHeader('Content-Type', 'application/json');
             res.write(JSONString(docs));
             res.end();
-            return;
-        }
-        if (!url.startsWith(prefix)) {
-            return;
-        }
-        for (const requestPlugin of requestPlugins) {
-            if (requestPlugin(action))
-                return;
+            return null;
         }
-        const method = ((_c = (_b = req.method) === null || _b === void 0 ? void 0 : _b.toLowerCase()) !== null && _c !== void 0 ? _c : 'get');
+        const method = ((_b = (_a = req.method) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : 'get');
         const rawSplitPath = url.slice(prefix.length).split('/').slice(1);
         const splitPath = rawSplitPath.at(-1) ? rawSplitPath : rawSplitPath.slice(0, -1);
         const endpoint = endpoints[method];
@@ -59,121 +61,118 @@ const api = () => {
             const [deep, currentEndpoint, params] = endpointQueue.shift();
             const key = splitPath[deep];
             if (deep + 1 === splitPath.length) {
-                function run(runEndpoint, params) {
+                async function run(runEndpoint, params) {
                     var _a, _b, _c, _d, _e;
-                    return __awaiter(this, void 0, void 0, function* () {
-                        const pathRules = (_a = runEndpoint.rules) === null || _a === void 0 ? void 0 : _a.path;
-                        const headerRules = (_b = runEndpoint.rules) === null || _b === void 0 ? void 0 : _b.header;
-                        const cookieRules = (_c = runEndpoint.rules) === null || _c === void 0 ? void 0 : _c.cookie;
-                        const searchRules = (_d = runEndpoint.rules) === null || _d === void 0 ? void 0 : _d.search;
-                        const bodyRules = (_e = runEndpoint.rules) === null || _e === void 0 ? void 0 : _e.body;
-                        if (pathRules) {
+                    const pathRules = (_a = runEndpoint.rules) === null || _a === void 0 ? void 0 : _a.path;
+                    const headerRules = (_b = runEndpoint.rules) === null || _b === void 0 ? void 0 : _b.header;
+                    const cookieRules = (_c = runEndpoint.rules) === null || _c === void 0 ? void 0 : _c.cookie;
+                    const searchRules = (_d = runEndpoint.rules) === null || _d === void 0 ? void 0 : _d.search;
+                    const bodyRules = (_e = runEndpoint.rules) === null || _e === void 0 ? void 0 : _e.body;
+                    if (pathRules) {
+                        try {
+                            Object.assign(params, pathRules(params, { in: 'path' }));
+                        }
+                        catch (_f) {
+                            return false;
+                        }
+                    }
+                    function checkActionRules(rules, key = 'search') {
+                        if (rules) {
                             try {
-                                Object.assign(params, pathRules(params, { in: 'path' }));
-                            }
-                            catch (_f) {
-                                return false;
+                                action[key] = rules(action[key]);
                             }
-                        }
-                        function checkActionRules(rules, key = 'search') {
-                            if (rules) {
-                                try {
-                                    action[key] = rules(action[key]);
+                            catch (e) {
+                                res.setHeader('Content-Type', 'application/json');
+                                if (e instanceof RulesError) {
+                                    res.statusCode = 400;
+                                    res.write(JSONString({
+                                        data: {
+                                            ...e.data,
+                                            in: key,
+                                        },
+                                        error: 'requestValidation',
+                                    }));
+                                    res.end();
                                 }
-                                catch (e) {
-                                    res.setHeader('Content-Type', 'application/json');
-                                    if (e instanceof RulesError) {
-                                        res.statusCode = 400;
-                                        res.write(JSONString({
-                                            error: 'requestValidation',
-                                            data: Object.assign(Object.assign({}, e.data), { in: key }),
-                                        }));
-                                        res.end();
-                                    }
-                                    else {
-                                        console.error(e);
-                                        res.statusCode = 500;
-                                        res.write(JSONString({
-                                            error: 'unknown',
-                                            data: { in: key },
-                                        }));
-                                        res.end();
-                                    }
-                                    return true;
+                                else {
+                                    console.error(e);
+                                    res.statusCode = 500;
+                                    res.write(JSONString({
+                                        data: { in: key },
+                                        error: 'unknown',
+                                    }));
+                                    res.end();
                                 }
+                                return true;
                             }
-                            return false;
                         }
-                        if (checkActionRules(headerRules, 'headers'))
-                            return true;
-                        if (checkActionRules(cookieRules, 'cookies'))
-                            return true;
-                        if (checkActionRules(searchRules, 'search'))
+                        return false;
+                    }
+                    if (checkActionRules(headerRules, 'headers'))
+                        return true;
+                    if (checkActionRules(cookieRules, 'cookies'))
+                        return true;
+                    if (checkActionRules(searchRules, 'search'))
+                        return true;
+                    if (bodyRules) {
+                        await action.parseBody();
+                        if (!action.body) {
+                            res.statusCode = 400;
+                            res.setHeader('Content-Type', 'application/json');
+                            res.write(JSONString({
+                                error: 'requestBodyContentType',
+                            }));
+                            res.end();
                             return true;
-                        if (bodyRules) {
-                            yield action.parseBody();
-                            if (!action.body) {
-                                res.statusCode = 400;
-                                res.setHeader('Content-Type', 'application/json');
-                                res.write(JSONString({
-                                    error: 'requestBodyContentType',
-                                }));
-                                res.end();
-                                return true;
-                            }
-                            if (checkActionRules(bodyRules, 'body'))
-                                return true;
                         }
-                        const newHandler = Object.create(runEndpoint.handler);
-                        responseContext.set(newHandler, res);
-                        requestContext.set(newHandler, req);
-                        paramsContext.set(newHandler, params);
-                        actionContext.set(newHandler, action);
-                        innet(runEndpoint.content, newHandler);
+                        if (checkActionRules(bodyRules, 'body'))
+                            return true;
+                    }
+                    paramsContext.set(actionHandler, params);
+                    for (const plugin of runEndpoint.plugins) {
+                        const result = await plugin();
+                        if (result === undefined)
+                            continue;
+                        innet(result, actionHandler);
                         return true;
-                    });
+                    }
+                    return true;
                 }
-                if ((_e = (_d = currentEndpoint.static) === null || _d === void 0 ? void 0 : _d[key]) === null || _e === void 0 ? void 0 : _e.content) {
-                    if (!(yield run((_f = currentEndpoint.static) === null || _f === void 0 ? void 0 : _f[key], params)))
+                if ((_d = (_c = currentEndpoint.static) === null || _c === void 0 ? void 0 : _c[key]) === null || _d === void 0 ? void 0 : _d.plugins) {
+                    if (!await run((_e = currentEndpoint.static) === null || _e === void 0 ? void 0 : _e[key], params))
                         continue;
-                    return;
+                    return null;
                 }
                 if (currentEndpoint.dynamic) {
                     for (const dynamicEndpoint of currentEndpoint.dynamic) {
-                        if (dynamicEndpoint.content) {
-                            if (!(yield run(dynamicEndpoint, Object.assign(Object.assign({}, params), { [dynamicEndpoint.key.slice(1, -1)]: key }))))
+                        if (dynamicEndpoint.plugins) {
+                            if (!await run(dynamicEndpoint, { ...params, [dynamicEndpoint.key.slice(1, -1)]: key }))
                                 continue;
-                            return;
+                            return null;
                         }
                     }
                 }
                 break;
             }
-            if ((_g = currentEndpoint.static) === null || _g === void 0 ? void 0 : _g[key]) {
+            if ((_f = currentEndpoint.static) === null || _f === void 0 ? void 0 : _f[key]) {
                 endpointQueue.push([deep + 1, currentEndpoint.static[key], params]);
             }
             if (currentEndpoint.dynamic) {
                 for (const dynamicEndpoint of currentEndpoint.dynamic) {
-                    endpointQueue.push([deep + 1, dynamicEndpoint, Object.assign(Object.assign({}, params), { [dynamicEndpoint.key.slice(1, -1)]: key })]);
+                    endpointQueue.push([deep + 1, dynamicEndpoint, { ...params, [dynamicEndpoint.key.slice(1, -1)]: key }]);
                 }
             }
         }
-        if (context.fallback) {
-            const newHandler = Object.create(context.fallback.handler);
-            responseContext.set(newHandler, res);
-            requestContext.set(newHandler, req);
+        for (const plugin of plugins) {
+            const result = await plugin();
+            if (result === undefined)
+                continue;
+            const newHandler = Object.create(handler);
             actionContext.set(newHandler, action);
-            innet(context.fallback.children, newHandler);
-        }
-        else {
-            res.statusCode = 404;
-            res.end();
+            innet(result, newHandler);
+            return null;
         }
     });
-    server.on('request', listener);
-    onDestroy(() => {
-        server.off('request', listener);
-    });
     innet(children, handler);
 };