rlz-engine 1.0.45 → 1.0.47

package/dist/back/rpc/gen.js

@@ -19,7 +19,7 @@ export function generateClient(fileName, ...rpcBuilders) {
     }
     const props = rpcBuilders.map((b) => {
         const calls = b.endpoints.map((e) => {
-            return F.createPropertyAssignment(F.createIdentifier(e.name), F.createArrowFunction([F.createToken(ts.SyntaxKind.AsyncKeyword)], undefined, e.anonimous
+            return F.createPropertyAssignment(F.createIdentifier(kebabToPascalCase(e.name)), F.createArrowFunction([F.createToken(ts.SyntaxKind.AsyncKeyword)], undefined, e.anonimous
                 ? [
                     F.createParameterDeclaration(undefined, undefined, F.createIdentifier('body'), undefined, F.createTypeReferenceNode(F.createIdentifier(createBodyTypeName(b.name, e)), undefined), undefined)
                 ]
@@ -34,7 +34,7 @@ export function generateClient(fileName, ...rpcBuilders) {
                     F.createIdentifier('body')
                 ])))], true)));
         });
-        return F.createPropertyAssignment(F.createIdentifier(b.name), F.createObjectLiteralExpression(calls, false));
+        return F.createPropertyAssignment(F.createIdentifier(kebabToPascalCase(b.name)), F.createObjectLiteralExpression(calls, false));
     });
     const rpcClientNode = F.createVariableStatement([F.createToken(ts.SyntaxKind.ExportKeyword)], F.createVariableDeclarationList([F.createVariableDeclaration(F.createIdentifier('RPC_CLIENT'), undefined, undefined, F.createObjectLiteralExpression(props, false))], ts.NodeFlags.Const));
     fileContent.push(p(rpcClientNode));
@@ -53,12 +53,15 @@ function generateTypes(rpcName, e, p) {
     resp.push(p(respTypeAlias));
     return resp;
 }
-function firstLetterUp(text) {
-    return `${text[0].toUpperCase()}${text.substring(1)}`;
+function kebabToPascalCase(input, firstLetterUp = false) {
+    if (firstLetterUp) {
+        return input.replace(/(^|-)([a-z])/g, (_, __, c) => c.toUpperCase());
+    }
+    return input.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
 }
 function createBodyTypeName(rpcName, e) {
-    return `RpcBody${firstLetterUp(rpcName)}${firstLetterUp(e.name)}V${e.v}`;
+    return `RpcBody${kebabToPascalCase(rpcName, true)}${kebabToPascalCase(e.name, true)}V${e.v}`;
 }
 function createRespTypeName(rpcName, e) {
-    return `RpcResp${firstLetterUp(rpcName)}${firstLetterUp(e.name)}V${e.v}`;
+    return `RpcResp${kebabToPascalCase(rpcName, true)}${kebabToPascalCase(e.name, true)}V${e.v}`;
 }

package/dist/back/server.d.ts

@@ -3,9 +3,11 @@ import { Logger } from 'pino';
 export type InitServerFuncType = <S extends RawServerBase>(server: FastifyInstance<S, RawRequestDefaultExpression<S>, RawReplyDefaultExpression<S>, Logger>) => Promise<void>;
 export interface RunServerParams {
     production: boolean;
+    unsecurePort?: number;
+    securePort?: number;
     domain: string;
     certDir: string;
     staticDir: string;
     init: InitServerFuncType;
 }
-export declare function runServer({ production, domain, certDir, staticDir, init }: RunServerParams): Promise<() => Promise<void>>;
+export declare function runServer({ production, domain, certDir, staticDir, securePort, unsecurePort, init }: RunServerParams): Promise<() => Promise<void>>;

package/dist/back/server.js

@@ -12,7 +12,7 @@ import path from 'path';
 import { logger } from './logger.js';
 installIntoGlobal();
 const L = logger('init');
-export async function runServer({ production, domain, certDir, staticDir, init }) {
+export async function runServer({ production, domain, certDir, staticDir, securePort, unsecurePort, init }) {
     L.info({ production }, 'runServer');
     const httpServer = fastify({
         loggerInstance: logger('http'),
@@ -32,13 +32,13 @@ export async function runServer({ production, domain, certDir, staticDir, init }
             return httpErrors.notFound();
         });
         addStaticEndpoints(httpServer, staticDir);
-        await httpServer.listen({ port: 8080 });
+        await httpServer.listen({ port: unsecurePort ?? 8080 });
         return async () => {
             await httpServer.close();
         };
     }
     httpServer.register(fastifyAcmeUnsecurePlugin, { redirectDomain: domain });
-    await httpServer.listen({ port: 80, host: '::' });
+    await httpServer.listen({ port: unsecurePort ?? 80, host: '::' });
     L.info('Get certificates');
     const certAndKey = await getCertAndKey(certDir, domain);
     L.info('Init secure server');
@@ -67,7 +67,7 @@ export async function runServer({ production, domain, certDir, staticDir, init }
         return httpErrors.notFound();
     });
     addStaticEndpoints(httpsServer, staticDir);
-    await httpsServer.listen({ port: 443, host: '::' });
+    await httpsServer.listen({ port: securePort ?? 443, host: '::' });
     L.info('runServer done');
     return async () => {
         await Promise.all([

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rlz-engine",
-    "version": "1.0.45",
+    "version": "1.0.47",
     "description": "Deps and tools for my style of development",
     "scripts": {
         "build": "tsc",