@innet/server 2.0.0-alpha.26 → 2.0.0-alpha.28

package/README.md

@@ -1710,6 +1710,8 @@ return (
 [\<uuid>](#uuid)  
 [\<binary>](#binary)
 
+---
+
 ### \<any>
 
 [← back](#primitive-data)
@@ -4022,6 +4024,8 @@ Server start
 
 Both  
 [useServer](#useserver)  
+[usePort](#useport)  
+[useIsServerHttps](#useisserverhttps)  
 [useComponentName](#usecomponentname)
 
 ---
@@ -4261,6 +4265,53 @@ export function Component () {
 }
 ```
 
+### usePort
+
+[← back](#hooks)
+
+This hook MUST be used in a component placed in [\<server>](#server).
+This hook returns current http(s) server port.
+
+*src/LocalHost.tsx*
+```typescript jsx
+import { usePort } from '@innet/sever'
+
+export function LocalHost () {
+  const port = usePort()
+
+  return (
+    <host
+      description='Development'
+      url={`http://localhost:${port}/api`}
+    />
+  )
+}
+```
+
+### useIsServerHttps
+
+[← back](#hooks)
+
+This hook MUST be used in a component placed in [\<server>](#server).
+This hook returns `true` if it is https server and `false` if not.
+
+*src/LocalHost.tsx*
+```typescript jsx
+import { usePort, useIsServerHttps } from '@innet/sever'
+
+export function LocalHost () {
+  const https = useIsServerHttps() ? 'https' : 'http'
+  const port = usePort()
+
+  return (
+    <host
+      description='Development'
+      url={`${https}://localhost:${port}/api`}
+    />
+  )
+}
+```
+
 ### useComponentName
 
 [← back](#hooks)

package/hooks/index.d.ts

@@ -28,3 +28,4 @@ export * from './useClientIp';
 export * from './useServerPlugins';
 export * from './useObjectSchemaContext';
 export * from './useServerPort';
+export * from './useIsServerHttps';

package/hooks/index.es6.js

@@ -28,3 +28,4 @@ import './useClientIp/index.es6.js';
 import './useServerPlugins/index.es6.js';
 import './useObjectSchemaContext/index.es6.js';
 import './useServerPort/index.es6.js';
+import './useIsServerHttps/index.es6.js';

package/hooks/index.js

@@ -30,4 +30,5 @@ require('./useClientIp/index.js');
 require('./useServerPlugins/index.js');
 require('./useObjectSchemaContext/index.js');
 require('./useServerPort/index.js');
+require('./useIsServerHttps/index.js');
 

package/hooks/useIsServerHttps/index.d.ts

@@ -0,0 +1 @@
+export * from './useIsServerHttps';

package/hooks/useIsServerHttps/index.es6.js

@@ -0,0 +1 @@
+export { serverHttpsContext, useIsServerHttps } from './useIsServerHttps.es6.js';

package/hooks/useIsServerHttps/index.js

@@ -0,0 +1,10 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var useIsServerHttps = require('./useIsServerHttps.js');
+
+
+
+exports.serverHttpsContext = useIsServerHttps.serverHttpsContext;
+exports.useIsServerHttps = useIsServerHttps.useIsServerHttps;

package/hooks/useIsServerHttps/useIsServerHttps.d.ts

@@ -0,0 +1,3 @@
+import { Context } from '@innet/jsx';
+export declare const serverHttpsContext: Context<boolean, boolean | undefined>;
+export declare function useIsServerHttps(): boolean;

package/hooks/useIsServerHttps/useIsServerHttps.es6.js

@@ -0,0 +1,14 @@
+import { Context, useContext } from '@innet/jsx';
+import '../useThrow/index.es6.js';
+import { useThrow } from '../useThrow/useThrow.es6.js';
+
+const serverHttpsContext = new Context();
+function useIsServerHttps() {
+    const https = useContext(serverHttpsContext);
+    if (https === undefined) {
+        useThrow('{type} MUST BE in <server>');
+    }
+    return https;
+}
+
+export { serverHttpsContext, useIsServerHttps };

package/hooks/useIsServerHttps/useIsServerHttps.js

@@ -0,0 +1,19 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsx = require('@innet/jsx');
+require('../useThrow/index.js');
+var useThrow = require('../useThrow/useThrow.js');
+
+const serverHttpsContext = new jsx.Context();
+function useIsServerHttps() {
+    const https = jsx.useContext(serverHttpsContext);
+    if (https === undefined) {
+        useThrow.useThrow('{type} MUST BE in <server>');
+    }
+    return https;
+}
+
+exports.serverHttpsContext = serverHttpsContext;
+exports.useIsServerHttps = useIsServerHttps;

package/index.es6.js

@@ -114,3 +114,4 @@ export { useClientIp } from './hooks/useClientIp/useClientIp.es6.js';
 export { serverPlugins, useServerPlugins } from './hooks/useServerPlugins/useServerPlugins.es6.js';
 export { objectSchemaContext, useObjectSchemaContext } from './hooks/useObjectSchemaContext/useObjectSchemaContext.es6.js';
 export { serverPortContext, useServerPort } from './hooks/useServerPort/useServerPort.es6.js';
+export { serverHttpsContext, useIsServerHttps } from './hooks/useIsServerHttps/useIsServerHttps.es6.js';

package/index.js

@@ -118,6 +118,7 @@ var useClientIp = require('./hooks/useClientIp/useClientIp.js');
 var useServerPlugins = require('./hooks/useServerPlugins/useServerPlugins.js');
 var useObjectSchemaContext = require('./hooks/useObjectSchemaContext/useObjectSchemaContext.js');
 var useServerPort = require('./hooks/useServerPort/useServerPort.js');
+var useIsServerHttps = require('./hooks/useIsServerHttps/useIsServerHttps.js');
 
 
 
@@ -262,3 +263,5 @@ exports.objectSchemaContext = useObjectSchemaContext.objectSchemaContext;
 exports.useObjectSchemaContext = useObjectSchemaContext.useObjectSchemaContext;
 exports.serverPortContext = useServerPort.serverPortContext;
 exports.useServerPort = useServerPort.useServerPort;
+exports.serverHttpsContext = useIsServerHttps.serverHttpsContext;
+exports.useIsServerHttps = useIsServerHttps.useIsServerHttps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "2.0.0-alpha.26",
+  "version": "2.0.0-alpha.28",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",

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

@@ -9,6 +9,7 @@ import '../../../utils/index.es6.js';
 import { serverContext } from '../../../hooks/useServer/useServer.es6.js';
 import { serverPlugins } from '../../../hooks/useServerPlugins/useServerPlugins.es6.js';
 import { serverPortContext } from '../../../hooks/useServerPort/useServerPort.es6.js';
+import { serverHttpsContext } from '../../../hooks/useIsServerHttps/useIsServerHttps.es6.js';
 import { Action } from '../../../utils/action/Action.es6.js';
 import { actionContext } from '../../../hooks/useAction/useAction.es6.js';
 
@@ -39,6 +40,7 @@ const server = () => {
     serverContext.set(handler, { port, server });
     serverPlugins.set(handler, plugins);
     serverPortContext.set(handler, port);
+    serverHttpsContext.set(handler, https);
     onDestroy(() => {
         server.close();
     });

package/plugins/main/server/server.js

@@ -13,6 +13,7 @@ require('../../../utils/index.js');
 var useServer = require('../../../hooks/useServer/useServer.js');
 var useServerPlugins = require('../../../hooks/useServerPlugins/useServerPlugins.js');
 var useServerPort = require('../../../hooks/useServerPort/useServerPort.js');
+var useIsServerHttps = require('../../../hooks/useIsServerHttps/useIsServerHttps.js');
 var Action = require('../../../utils/action/Action.js');
 var useAction = require('../../../hooks/useAction/useAction.js');
 
@@ -50,6 +51,7 @@ const server = () => {
     useServer.serverContext.set(handler, { port, server });
     useServerPlugins.serverPlugins.set(handler, plugins);
     useServerPort.serverPortContext.set(handler, port);
+    useIsServerHttps.serverHttpsContext.set(handler, https);
     watchState.onDestroy(() => {
         server.close();
     });

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

@@ -28,7 +28,9 @@ const success = () => {
         const contentType = type || (['bigint', 'boolean', 'number', 'string'].includes(typeof child)
             ? 'text/plain'
             : 'application/json');
+        const content = contentType === 'application/json' ? JSONString(child) : String(child);
         res.setHeader('Content-Type', contentType);
+        res.setHeader('Content-Length', content.length);
         if (contentType === 'application/json') {
             res.write(JSONString(child));
         }

package/plugins/request/success/success.js

@@ -32,7 +32,9 @@ const success = () => {
         const contentType = type || (['bigint', 'boolean', 'number', 'string'].includes(typeof child)
             ? 'text/plain'
             : 'application/json');
+        const content = contentType === 'application/json' ? JSONString.JSONString(child) : String(child);
         res.setHeader('Content-Type', contentType);
+        res.setHeader('Content-Length', content.length);
         if (contentType === 'application/json') {
             res.write(JSONString.JSONString(child));
         }

package/utils/generateTypes/generateTypes.es6.js

@@ -106,7 +106,7 @@ function generateTypes(docs, namespace = 'Api') {
                     query: '',
                 };
                 for (const param of parameters) {
-                    const splitter = param.in === 'path' || hasDefault(param.schema) ? ':' : '?:';
+                    const splitter = param.in === 'path' || hasDefault(param.schema) || param.required ? ':' : '?:';
                     params[param.in] += `        ${param.name}${splitter} ${generateSchemaTypes(param.schema)}`;
                 }
                 if (params.path) {

package/utils/generateTypes/generateTypes.js

@@ -110,7 +110,7 @@ function generateTypes(docs, namespace = 'Api') {
                     query: '',
                 };
                 for (const param of parameters) {
-                    const splitter = param.in === 'path' || hasDefault(param.schema) ? ':' : '?:';
+                    const splitter = param.in === 'path' || hasDefault(param.schema) || param.required ? ':' : '?:';
                     params[param.in] += `        ${param.name}${splitter} ${generateSchemaTypes(param.schema)}`;
                 }
                 if (params.path) {