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

package/plugins/main/tag/tag.es6.js

@@ -1,5 +1,5 @@
 import innet, { useNewHandler } from 'innet';
-import { useContext, useProps, useChildren } from '@innet/jsx';
+import { useContext, useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import { tagContext } from '../../../hooks/useTag/useTag.es6.js';
 import { useApi } from '../../../hooks/useApi/useApi.es6.js';
@@ -8,10 +8,12 @@ const tag = () => {
     if (useContext(tagContext)) {
         throw Error('You cannot use a <tag> inside another one');
     }
-    const { name, description } = useProps();
-    const children = useChildren();
+    const { children, description, name, } = useProps();
     const { docs } = useApi();
-    const tag = description ? { name, description } : { name };
+    const tag = { name };
+    if (description) {
+        tag.description = description;
+    }
     if (!docs.tags) {
         docs.tags = [tag];
     }

package/plugins/main/tag/tag.js

@@ -16,10 +16,12 @@ const tag = () => {
     if (jsx.useContext(useTag.tagContext)) {
         throw Error('You cannot use a <tag> inside another one');
     }
-    const { name, description } = jsx.useProps();
-    const children = jsx.useChildren();
+    const { children, description, name, } = jsx.useProps();
     const { docs } = useApi.useApi();
-    const tag = description ? { name, description } : { name };
+    const tag = { name };
+    if (description) {
+        tag.description = description;
+    }
     if (!docs.tags) {
         docs.tags = [tag];
     }

package/plugins/main/variable/variable.d.ts

@@ -1,5 +1,10 @@
 import { type HandlerPlugin } from 'innet';
 export interface VariableProps {
+    /**
+     * An optional description for the server variable.
+     * [CommonMark syntax](https://spec.commonmark.org) MAY be used for rich text representation.
+     * */
+    description?: string;
     /**
      * A server url parameter
      * */
@@ -15,10 +20,5 @@ export interface VariableProps {
      * The array MUST NOT be empty.
      * */
     values?: [string, string, ...string[]];
-    /**
-     * An optional description for the server variable.
-     * [CommonMark syntax](https://spec.commonmark.org) MAY be used for rich text representation.
-     * */
-    description?: string;
 }
 export declare const variable: HandlerPlugin;

package/plugins/main/variable/variable.es6.js

@@ -5,7 +5,9 @@ import { useHost } from '../../../hooks/useHost/useHost.es6.js';
 
 const variable = () => {
     const { server } = useHost();
-    const _a = useProps(), { key, values, value = values === null || values === void 0 ? void 0 : values[0] } = _a, rest = __rest(_a, ["key", "values", "value"]);
+    const _a = useProps(), { key, values, 
+    // predefine
+    value = values === null || values === void 0 ? void 0 : values[0] } = _a, rest = __rest(_a, ["key", "values", "value"]);
     if (!server.variables) {
         server.variables = {};
     }

package/plugins/main/variable/variable.js

@@ -9,7 +9,9 @@ var useHost = require('../../../hooks/useHost/useHost.js');
 
 const variable = () => {
     const { server } = useHost.useHost();
-    const _a = jsx.useProps(), { key, values, value = values === null || values === void 0 ? void 0 : values[0] } = _a, rest = tslib.__rest(_a, ["key", "values", "value"]);
+    const _a = jsx.useProps(), { key, values, 
+    // predefine
+    value = values === null || values === void 0 ? void 0 : values[0] } = _a, rest = tslib.__rest(_a, ["key", "values", "value"]);
     if (!server.variables) {
         server.variables = {};
     }

package/plugins/request/cms/cms.d.ts

@@ -1,4 +1,5 @@
 export interface CmsProps {
+    children?: any;
     dir?: string;
     prefix?: string;
 }

package/plugins/request/cms/cms.es6.js

@@ -1,5 +1,5 @@
 import innet, { useHandler } from 'innet';
-import { useProps, useChildren } from '@innet/jsx';
+import { useProps } from '@innet/jsx';
 import path from 'node:path';
 import '../file/index.es6.js';
 import '../../../hooks/index.es6.js';
@@ -7,8 +7,7 @@ import { usePath } from '../../../hooks/usePath/usePath.es6.js';
 import { file } from '../file/file.es6.js';
 
 function cms() {
-    const { prefix = '/', dir = '.' } = useProps() || {};
-    const children = useChildren();
+    const { children, dir = process.env.INNET_CMS_DIR || '.', prefix = process.env.INNET_CMS_PREFIX || '/', } = useProps();
     const handler = useHandler();
     let url = usePath();
     if (url.startsWith(prefix)) {
@@ -18,7 +17,7 @@ function cms() {
         return innet(children, handler);
     }
     const filePath = path.join(dir, url);
-    innet({ type: file, props: { path: filePath }, children }, handler);
+    innet({ children, props: { path: filePath }, type: file }, handler);
 }
 
 export { cms };

package/plugins/request/cms/cms.js

@@ -16,8 +16,7 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 
 function cms() {
-    const { prefix = '/', dir = '.' } = jsx.useProps() || {};
-    const children = jsx.useChildren();
+    const { children, dir = process.env.INNET_CMS_DIR || '.', prefix = process.env.INNET_CMS_PREFIX || '/', } = jsx.useProps();
     const handler = innet.useHandler();
     let url = usePath.usePath();
     if (url.startsWith(prefix)) {
@@ -27,7 +26,7 @@ function cms() {
         return innet__default["default"](children, handler);
     }
     const filePath = path__default["default"].join(dir, url);
-    innet__default["default"]({ type: file.file, props: { path: filePath }, children }, handler);
+    innet__default["default"]({ children, props: { path: filePath }, type: file.file }, handler);
 }
 
 exports.cms = cms;

package/plugins/request/error/error.d.ts

@@ -1,59 +1,60 @@
 import { type HandlerPlugin } from 'innet';
 export declare const errorStatuses: {
+    readonly aTimeoutOccurred: 524;
+    readonly authenticationTimeout: 419;
+    readonly badGateway: 502;
     readonly badRequest: 400;
-    readonly unauthorized: 401;
-    readonly paymentRequired: 402;
-    readonly forbidden: 403;
-    readonly notFound: 404;
-    readonly methodNotAllowed: 405;
-    readonly notAcceptable: 406;
-    readonly proxyAuthenticationRequired: 407;
-    readonly requestTimeout: 408;
+    readonly bandwidthLimitExceeded: 509;
+    readonly clientClosedRequest: 499;
     readonly conflict: 409;
-    readonly gone: 410;
-    readonly lengthRequired: 411;
-    readonly preconditionFailed: 412;
-    readonly payloadTooLarge: 413;
-    readonly URITooLong: 414;
-    readonly unsupportedMediaType: 415;
-    readonly rangeNotSatisfiable: 416;
+    readonly connectionTimedOut: 522;
     readonly expectationFailed: 417;
-    readonly imATeapot: 418;
-    readonly authenticationTimeout: 419;
-    readonly misdirectedRequest: 421;
-    readonly unprocessableEntity: 422;
-    readonly locked: 423;
     readonly failedDependency: 424;
-    readonly tooEarly: 425;
-    readonly upgradeRequired: 426;
-    readonly preconditionRequired: 428;
-    readonly tooManyRequests: 429;
-    readonly requestHeaderFieldsTooLarge: 431;
-    readonly retryWith: 449;
-    readonly unavailableForLegalReasons: 451;
-    readonly clientClosedRequest: 499;
-    readonly internalServerError: 500;
-    readonly notImplemented: 501;
-    readonly badGateway: 502;
-    readonly serviceUnavailable: 503;
+    readonly forbidden: 403;
     readonly gatewayTimeout: 504;
+    readonly gone: 410;
     readonly HTTPVersionNotSupported: 505;
-    readonly variantAlsoNegotiates: 506;
+    readonly imATeapot: 418;
     readonly insufficientStorage: 507;
+    readonly internalServerError: 500;
+    readonly invalidSSLCertificate: 526;
+    readonly lengthRequired: 411;
+    readonly locked: 423;
     readonly loopDetected: 508;
-    readonly bandwidthLimitExceeded: 509;
-    readonly notExtended: 510;
+    readonly methodNotAllowed: 405;
+    readonly misdirectedRequest: 421;
     readonly networkAuthenticationRequired: 511;
-    readonly unknownError: 520;
-    readonly webServerIsDown: 521;
-    readonly connectionTimedOut: 522;
+    readonly notAcceptable: 406;
+    readonly notExtended: 510;
+    readonly notFound: 404;
+    readonly notImplemented: 501;
     readonly originIsUnreachable: 523;
-    readonly aTimeoutOccurred: 524;
+    readonly payloadTooLarge: 413;
+    readonly paymentRequired: 402;
+    readonly preconditionFailed: 412;
+    readonly preconditionRequired: 428;
+    readonly proxyAuthenticationRequired: 407;
+    readonly rangeNotSatisfiable: 416;
+    readonly requestHeaderFieldsTooLarge: 431;
+    readonly requestTimeout: 408;
+    readonly retryWith: 449;
+    readonly serviceUnavailable: 503;
     readonly SSLHandshakeFailed: 525;
-    readonly invalidSSLCertificate: 526;
+    readonly tooEarly: 425;
+    readonly tooManyRequests: 429;
+    readonly unauthorized: 401;
+    readonly unavailableForLegalReasons: 451;
+    readonly unknownError: 520;
+    readonly unprocessableEntity: 422;
+    readonly unsupportedMediaType: 415;
+    readonly upgradeRequired: 426;
+    readonly URITooLong: 414;
+    readonly variantAlsoNegotiates: 506;
+    readonly webServerIsDown: 521;
 };
 export type ErrorStatuses = keyof typeof errorStatuses;
 export interface ErrorProps {
+    children?: any;
     code?: string;
     status?: ErrorStatuses | number;
 }

package/plugins/request/error/error.es6.js

@@ -1,72 +1,75 @@
-import { useChildren, useProps } from '@innet/jsx';
+import { __rest } from 'tslib';
+import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
 import { useResponse } from '../../../hooks/useResponse/useResponse.es6.js';
 import { JSONString } from '../../../utils/JSONString/JSONString.es6.js';
 
 const errorStatuses = {
+    aTimeoutOccurred: 524,
+    authenticationTimeout: 419,
+    badGateway: 502,
     badRequest: 400,
-    unauthorized: 401,
-    paymentRequired: 402,
-    forbidden: 403,
-    notFound: 404,
-    methodNotAllowed: 405,
-    notAcceptable: 406,
-    proxyAuthenticationRequired: 407,
-    requestTimeout: 408,
+    bandwidthLimitExceeded: 509,
+    clientClosedRequest: 499,
     conflict: 409,
-    gone: 410,
-    lengthRequired: 411,
-    preconditionFailed: 412,
-    payloadTooLarge: 413,
-    URITooLong: 414,
-    unsupportedMediaType: 415,
-    rangeNotSatisfiable: 416,
+    connectionTimedOut: 522,
     expectationFailed: 417,
-    imATeapot: 418,
-    authenticationTimeout: 419,
-    misdirectedRequest: 421,
-    unprocessableEntity: 422,
-    locked: 423,
     failedDependency: 424,
-    tooEarly: 425,
-    upgradeRequired: 426,
-    preconditionRequired: 428,
-    tooManyRequests: 429,
-    requestHeaderFieldsTooLarge: 431,
-    retryWith: 449,
-    unavailableForLegalReasons: 451,
-    clientClosedRequest: 499,
-    internalServerError: 500,
-    notImplemented: 501,
-    badGateway: 502,
-    serviceUnavailable: 503,
+    forbidden: 403,
     gatewayTimeout: 504,
+    gone: 410,
     HTTPVersionNotSupported: 505,
-    variantAlsoNegotiates: 506,
+    imATeapot: 418,
     insufficientStorage: 507,
+    internalServerError: 500,
+    invalidSSLCertificate: 526,
+    lengthRequired: 411,
+    locked: 423,
     loopDetected: 508,
-    bandwidthLimitExceeded: 509,
-    notExtended: 510,
+    methodNotAllowed: 405,
+    misdirectedRequest: 421,
     networkAuthenticationRequired: 511,
-    unknownError: 520,
-    webServerIsDown: 521,
-    connectionTimedOut: 522,
+    notAcceptable: 406,
+    notExtended: 510,
+    notFound: 404,
+    notImplemented: 501,
     originIsUnreachable: 523,
-    aTimeoutOccurred: 524,
+    payloadTooLarge: 413,
+    paymentRequired: 402,
+    preconditionFailed: 412,
+    preconditionRequired: 428,
+    proxyAuthenticationRequired: 407,
+    rangeNotSatisfiable: 416,
+    requestHeaderFieldsTooLarge: 431,
+    requestTimeout: 408,
+    retryWith: 449,
+    serviceUnavailable: 503,
     SSLHandshakeFailed: 525,
-    invalidSSLCertificate: 526,
+    tooEarly: 425,
+    tooManyRequests: 429,
+    unauthorized: 401,
+    unavailableForLegalReasons: 451,
+    unknownError: 520,
+    unprocessableEntity: 422,
+    unsupportedMediaType: 415,
+    upgradeRequired: 426,
+    URITooLong: 414,
+    variantAlsoNegotiates: 506,
+    webServerIsDown: 521,
 };
 const error = () => {
-    const [children] = (useChildren()) || [];
-    const props = useProps();
+    const _a = useProps(), { children } = _a, props = __rest(_a, ["children"]);
     const res = useResponse();
     if (!res) {
         throw Error('<error> MUST be in <request>');
     }
-    const { status = 520, code = 'undefined' } = props || {};
+    const { code = 'undefined', status = 520, } = props;
     res.statusCode = typeof status === 'string' ? errorStatuses[status] : status;
-    res.write(JSONString({ error: code, data: children }));
+    const content = JSONString({ data: children, error: code });
+    res.setHeader('Content-Type', 'application/json');
+    res.setHeader('Content-Length', content.length);
+    res.write(content);
     res.end();
 };
 

package/plugins/request/error/error.js

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../utils/index.js');
@@ -9,68 +10,70 @@ var useResponse = require('../../../hooks/useResponse/useResponse.js');
 var JSONString = require('../../../utils/JSONString/JSONString.js');
 
 const errorStatuses = {
+    aTimeoutOccurred: 524,
+    authenticationTimeout: 419,
+    badGateway: 502,
     badRequest: 400,
-    unauthorized: 401,
-    paymentRequired: 402,
-    forbidden: 403,
-    notFound: 404,
-    methodNotAllowed: 405,
-    notAcceptable: 406,
-    proxyAuthenticationRequired: 407,
-    requestTimeout: 408,
+    bandwidthLimitExceeded: 509,
+    clientClosedRequest: 499,
     conflict: 409,
-    gone: 410,
-    lengthRequired: 411,
-    preconditionFailed: 412,
-    payloadTooLarge: 413,
-    URITooLong: 414,
-    unsupportedMediaType: 415,
-    rangeNotSatisfiable: 416,
+    connectionTimedOut: 522,
     expectationFailed: 417,
-    imATeapot: 418,
-    authenticationTimeout: 419,
-    misdirectedRequest: 421,
-    unprocessableEntity: 422,
-    locked: 423,
     failedDependency: 424,
-    tooEarly: 425,
-    upgradeRequired: 426,
-    preconditionRequired: 428,
-    tooManyRequests: 429,
-    requestHeaderFieldsTooLarge: 431,
-    retryWith: 449,
-    unavailableForLegalReasons: 451,
-    clientClosedRequest: 499,
-    internalServerError: 500,
-    notImplemented: 501,
-    badGateway: 502,
-    serviceUnavailable: 503,
+    forbidden: 403,
     gatewayTimeout: 504,
+    gone: 410,
     HTTPVersionNotSupported: 505,
-    variantAlsoNegotiates: 506,
+    imATeapot: 418,
     insufficientStorage: 507,
+    internalServerError: 500,
+    invalidSSLCertificate: 526,
+    lengthRequired: 411,
+    locked: 423,
     loopDetected: 508,
-    bandwidthLimitExceeded: 509,
-    notExtended: 510,
+    methodNotAllowed: 405,
+    misdirectedRequest: 421,
     networkAuthenticationRequired: 511,
-    unknownError: 520,
-    webServerIsDown: 521,
-    connectionTimedOut: 522,
+    notAcceptable: 406,
+    notExtended: 510,
+    notFound: 404,
+    notImplemented: 501,
     originIsUnreachable: 523,
-    aTimeoutOccurred: 524,
+    payloadTooLarge: 413,
+    paymentRequired: 402,
+    preconditionFailed: 412,
+    preconditionRequired: 428,
+    proxyAuthenticationRequired: 407,
+    rangeNotSatisfiable: 416,
+    requestHeaderFieldsTooLarge: 431,
+    requestTimeout: 408,
+    retryWith: 449,
+    serviceUnavailable: 503,
     SSLHandshakeFailed: 525,
-    invalidSSLCertificate: 526,
+    tooEarly: 425,
+    tooManyRequests: 429,
+    unauthorized: 401,
+    unavailableForLegalReasons: 451,
+    unknownError: 520,
+    unprocessableEntity: 422,
+    unsupportedMediaType: 415,
+    upgradeRequired: 426,
+    URITooLong: 414,
+    variantAlsoNegotiates: 506,
+    webServerIsDown: 521,
 };
 const error = () => {
-    const [children] = (jsx.useChildren()) || [];
-    const props = jsx.useProps();
+    const _a = jsx.useProps(), { children } = _a, props = tslib.__rest(_a, ["children"]);
     const res = useResponse.useResponse();
     if (!res) {
         throw Error('<error> MUST be in <request>');
     }
-    const { status = 520, code = 'undefined' } = props || {};
+    const { code = 'undefined', status = 520, } = props;
     res.statusCode = typeof status === 'string' ? errorStatuses[status] : status;
-    res.write(JSONString.JSONString({ error: code, data: children }));
+    const content = JSONString.JSONString({ data: children, error: code });
+    res.setHeader('Content-Type', 'application/json');
+    res.setHeader('Content-Length', content.length);
+    res.write(content);
     res.end();
 };
 

package/plugins/request/file/file.d.ts

@@ -1,4 +1,5 @@
 export interface FileProps {
+    children?: any;
     path: string;
 }
 export declare function file(): void;

package/plugins/request/file/file.es6.js

@@ -1,5 +1,6 @@
+import { __rest } from 'tslib';
 import innet, { useHandler } from 'innet';
-import { useProps, useChildren } from '@innet/jsx';
+import { useProps } from '@innet/jsx';
 import fs from 'node:fs';
 import mime from 'mime';
 import '../../../hooks/index.es6.js';
@@ -8,8 +9,7 @@ import { useThrow } from '../../../hooks/useThrow/useThrow.es6.js';
 
 function file() {
     const handler = useHandler();
-    const props = useProps();
-    const children = useChildren();
+    const _a = useProps(), { children } = _a, props = __rest(_a, ["children"]);
     const res = useResponse();
     if (!res) {
         useThrow('<{type}> MUST be in <request> or <fallback>');
@@ -28,11 +28,10 @@ function file() {
             }
             res.writeHead(200, headers);
             readStream.pipe(res);
+            return;
         }
     }
-    else {
-        innet(children, handler);
-    }
+    innet(children, handler);
 }
 
 export { file };

package/plugins/request/file/file.js

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var innet = require('innet');
 var jsx = require('@innet/jsx');
 var fs = require('node:fs');
@@ -18,8 +19,7 @@ var mime__default = /*#__PURE__*/_interopDefaultLegacy(mime);
 
 function file() {
     const handler = innet.useHandler();
-    const props = jsx.useProps();
-    const children = jsx.useChildren();
+    const _a = jsx.useProps(), { children } = _a, props = tslib.__rest(_a, ["children"]);
     const res = useResponse.useResponse();
     if (!res) {
         useThrow.useThrow('<{type}> MUST be in <request> or <fallback>');
@@ -38,11 +38,10 @@ function file() {
             }
             res.writeHead(200, headers);
             readStream.pipe(res);
+            return;
         }
     }
-    else {
-        innet__default["default"](children, handler);
-    }
+    innet__default["default"](children, handler);
 }
 
 exports.file = file;

package/plugins/request/header/header.es6.js

@@ -8,7 +8,7 @@ const header = () => {
     if (!res) {
         useThrow('<{type}> MUST be in <request> or <fallback>');
     }
-    const { key, value } = useProps();
+    const { key, value, } = useProps();
     res.setHeader(key, value);
 };
 

package/plugins/request/header/header.js

@@ -12,7 +12,7 @@ const header = () => {
     if (!res) {
         useThrow.useThrow('<{type}> MUST be in <request> or <fallback>');
     }
-    const { key, value } = jsx.useProps();
+    const { key, value, } = jsx.useProps();
     res.setHeader(key, value);
 };
 

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;
+    onProxyRes?: (res: IncomingMessage) => void;
     secure?: boolean;
+    to: string;
 }
 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 { onProxyRes, secure = false, to, } = useProps();
     const req = useRequest();
     const res = useResponse();
     if (!req || !res) {
@@ -14,7 +14,10 @@ const proxy = () => {
     }
     const proxyServer = httpProxy.createProxyServer({});
     delete req.headers.host;
-    proxyServer.web(req, res, { target: to, secure });
+    if (onProxyRes) {
+        proxyServer.on('proxyRes', onProxyRes);
+    }
+    proxyServer.web(req, res, { secure, target: to });
 };
 
 export { proxy };

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 { onProxyRes, secure = false, to, } = jsx.useProps();
     const req = useRequest.useRequest();
     const res = useResponse.useResponse();
     if (!req || !res) {
@@ -22,7 +22,10 @@ const proxy = () => {
     }
     const proxyServer = httpProxy__default["default"].createProxyServer({});
     delete req.headers.host;
-    proxyServer.web(req, res, { target: to, secure });
+    if (onProxyRes) {
+        proxyServer.on('proxyRes', onProxyRes);
+    }
+    proxyServer.web(req, res, { secure, target: to });
 };
 
 exports.proxy = proxy;

package/plugins/request/redirect/redirect.d.ts

@@ -1,17 +1,18 @@
 import { type HandlerPlugin } from 'innet';
 export declare const redirectStatuses: {
-    multipleChoices: number;
-    movedPermanently: number;
     found: number;
-    seeOther: number;
+    movedPermanently: number;
+    multipleChoices: number;
     notModified: number;
-    useProxy: number;
-    temporaryRedirect: number;
     permanentRedirect: number;
+    seeOther: number;
+    temporaryRedirect: number;
+    useProxy: number;
 };
+export type RedirectStatuses = keyof typeof redirectStatuses;
 export interface RedirectProps {
-    to: string;
     encode?: boolean;
-    status?: number | keyof typeof redirectStatuses;
+    status?: RedirectStatuses | number;
+    to: string;
 }
 export declare const redirect: HandlerPlugin;