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

package/plugins/request/cms/cms.js

@@ -12,22 +12,20 @@ var file = require('../file/file.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-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)) {
         url = url.slice(prefix.length);
     }
     else {
-        return innet__default["default"](children, handler);
+        return innet.innet(children, handler);
     }
     const filePath = path__default["default"].join(dir, url);
-    innet__default["default"]({ type: file.file, props: { path: filePath }, children }, handler);
+    innet.innet({ children, props: { path: filePath }, type: file.file }, handler);
 }
 
 exports.cms = cms;

package/plugins/request/cookie/cookie.d.ts

@@ -1,6 +1,6 @@
 import { type HandlerPlugin } from 'innet';
-import { type CookieSerializeOptions } from 'cookie';
-export interface CookieProps extends CookieSerializeOptions {
+import { type Cookies } from 'cookie';
+export interface CookieProps extends Cookies {
     key: string;
     value?: string;
 }

package/plugins/request/cookie/cookie.es6.js

@@ -1,11 +1,10 @@
-import { __rest } from 'tslib';
 import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import { useAction } from '../../../hooks/useAction/useAction.es6.js';
 
 const cookie = () => {
     const action = useAction();
-    const _a = useProps(), { key, value } = _a, opt = __rest(_a, ["key", "value"]);
+    const { key, value, ...opt } = useProps();
     action.setCookie(key, value, opt);
 };
 

package/plugins/request/cookie/cookie.js

@@ -2,14 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 var useAction = require('../../../hooks/useAction/useAction.js');
 
 const cookie = () => {
     const action = useAction.useAction();
-    const _a = jsx.useProps(), { key, value } = _a, opt = tslib.__rest(_a, ["key", "value"]);
+    const { key, value, ...opt } = jsx.useProps();
     action.setCookie(key, value, opt);
 };
 

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,74 @@
-import { useChildren, useProps } from '@innet/jsx';
+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 { children, ...props } = useProps();
     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

@@ -9,68 +9,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 { children, ...props } = jsx.useProps();
     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,5 @@
-import innet, { useHandler } from 'innet';
-import { useProps, useChildren } from '@innet/jsx';
+import { useHandler, innet } from 'innet';
+import { useProps } from '@innet/jsx';
 import fs from 'node:fs';
 import mime from 'mime';
 import '../../../hooks/index.es6.js';
@@ -8,8 +8,7 @@ import { useThrow } from '../../../hooks/useThrow/useThrow.es6.js';
 
 function file() {
     const handler = useHandler();
-    const props = useProps();
-    const children = useChildren();
+    const { children, ...props } = useProps();
     const res = useResponse();
     if (!res) {
         useThrow('<{type}> MUST be in <request> or <fallback>');
@@ -28,11 +27,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

@@ -12,14 +12,12 @@ var useThrow = require('../../../hooks/useThrow/useThrow.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var mime__default = /*#__PURE__*/_interopDefaultLegacy(mime);
 
 function file() {
     const handler = innet.useHandler();
-    const props = jsx.useProps();
-    const children = jsx.useChildren();
+    const { children, ...props } = jsx.useProps();
     const res = useResponse.useResponse();
     if (!res) {
         useThrow.useThrow('<{type}> MUST be in <request> or <fallback>');
@@ -38,11 +36,10 @@ function file() {
             }
             res.writeHead(200, headers);
             readStream.pipe(res);
+            return;
         }
     }
-    else {
-        innet__default["default"](children, handler);
-    }
+    innet.innet(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/index.d.ts

@@ -1,8 +1,8 @@
-export * from './success';
+export * from './cms';
+export * from './cookie';
 export * from './error';
+export * from './file';
+export * from './header';
 export * from './proxy';
 export * from './redirect';
-export * from './header';
-export * from './cookie';
-export * from './file';
-export * from './cms';
+export * from './success';

package/plugins/request/index.es6.js

@@ -1,8 +1,8 @@
-import './success/index.es6.js';
+import './cms/index.es6.js';
+import './cookie/index.es6.js';
 import './error/index.es6.js';
+import './file/index.es6.js';
+import './header/index.es6.js';
 import './proxy/index.es6.js';
 import './redirect/index.es6.js';
-import './header/index.es6.js';
-import './cookie/index.es6.js';
-import './file/index.es6.js';
-import './cms/index.es6.js';
+import './success/index.es6.js';

package/plugins/request/index.js

@@ -1,11 +1,11 @@
 'use strict';
 
-require('./success/index.js');
+require('./cms/index.js');
+require('./cookie/index.js');
 require('./error/index.js');
+require('./file/index.js');
+require('./header/index.js');
 require('./proxy/index.js');
 require('./redirect/index.js');
-require('./header/index.js');
-require('./cookie/index.js');
-require('./file/index.js');
-require('./cms/index.js');
+require('./success/index.js');
 

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

@@ -1,6 +1,8 @@
 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;

package/plugins/request/redirect/redirect.es6.js

@@ -4,14 +4,14 @@ import { useResponse } from '../../../hooks/useResponse/useResponse.es6.js';
 import { useHeaders } from '../../../hooks/useHeaders/useHeaders.es6.js';
 
 const redirectStatuses = {
-    multipleChoices: 300,
-    movedPermanently: 301,
     found: 302,
-    seeOther: 303,
+    movedPermanently: 301,
+    multipleChoices: 300,
     notModified: 304,
-    useProxy: 305,
-    temporaryRedirect: 307,
     permanentRedirect: 308,
+    seeOther: 303,
+    temporaryRedirect: 307,
+    useProxy: 305,
 };
 function getStatus(status) {
     if (typeof status === 'number')
@@ -30,10 +30,10 @@ const redirect = () => {
     }
     const headers = useHeaders();
     const props = useProps();
-    const { to, status = 301, encode } = props;
+    const { encode, status = 301, to, } = props;
     res.writeHead(getStatus(status), {
-        location: encode ? customEncode(to) : to,
         'Cache-Control': (_a = headers['Cache-Control']) !== null && _a !== void 0 ? _a : 'no-cache, no-store, must-revalidate',
+        location: encode ? customEncode(to) : to,
     });
     res.end();
 };