refactor(nanoservice0: compatible with new nano-server

alimd-hub · alimd · Aug 6, 2022 · Jul 22, 2022 · Jul 22, 2022 · Jul 22, 2022
commit eae652324e61512eb1c5e20b3e2e9b45f87fe1db
diff --git a/packages/service/storage/demo.http b/packages/service/storage/demo.http
@@ -1,34 +1,35 @@
-@base = http://localhost:8000/v1
+@apiUrl = http://localhost:80
+@apiVersion = v1
 
 ### echo
-POST {{base}}/echo
+POST {{apiUrl}}/{{apiVersion}}/echo
 Content-Type: application/json
 
 {
   "a": 1,
   "b": 2
 }
 
-### === Test all routes and errors ===
+### === Test other routes and errors ===
 
 ### Page Home
-GET {{base}}
+GET {{apiUrl}}/{{apiVersion}}
 
 ### Page 404 (wrong path)
-GET {{base}}/jafang
+GET {{apiUrl}}/{{apiVersion}}/jafang
 
 ### Page 404 (wrong method)
-POST {{base}}
+POST {{apiUrl}}/{{apiVersion}}
 
 ### Page health
-GET {{base}}/health
+GET {{apiUrl}}/{{apiVersion}}/health
 
 ### empty body
-POST {{base}}/echo
+POST {{apiUrl}}/{{apiVersion}}/echo
 Content-Type: application/json
 
 ### invalid json
-POST {{base}}/echo
+POST {{apiUrl}}/{{apiVersion}}/echo
 Content-Type: application/json
 
 {

diff --git a/packages/service/storage/src/lib/config.ts b/packages/service/storage/src/lib/config.ts
@@ -3,7 +3,7 @@ import {isNumber} from '@alwatr/math';
 
 export const config = {
   /* eslint-disable @typescript-eslint/no-non-null-assertion */
-  port: isNumber(process.env.PORT) ? +process.env.PORT! : 8000,
+  port: isNumber(process.env.PORT) ? +process.env.PORT! : 80,
 };
 
 export const logger = createLogger('nanoservice-starter');

diff --git a/packages/service/storage/src/lib/nano-server.ts b/packages/service/storage/src/lib/nano-server.ts
@@ -2,4 +2,4 @@ import {AlwatrNanoServer} from '@alwatr/nano-server';
 
 import {config} from './config.js';
 
-export const nanoServer = new AlwatrNanoServer(config.port);
+export const nanoServer = new AlwatrNanoServer({port: config.port});
diff --git a/packages/service/storage/src/route/echo.ts b/packages/service/storage/src/route/echo.ts
@@ -1,6 +1,6 @@
 import {nanoServer} from '../lib/nano-server.js';
 
-nanoServer.route('post', '/echo', async (connection) => {
+nanoServer.route('POST', '/echo', async (connection) => {
   const bodyData = await connection.requireJsonBody();
   if (bodyData == null) return;
 

diff --git a/packages/service/storage/src/route/home.ts b/packages/service/storage/src/route/home.ts
@@ -1,6 +1,6 @@
 import {nanoServer} from '../lib/nano-server.js';
 
-nanoServer.route('get', '/', async (connection) => {
+nanoServer.route('GET', '/', async (connection) => {
   connection.reply({
     ok: true,
     data: {

diff --git a/packages/starter/nanoservice/demo.http b/packages/starter/nanoservice/demo.http
@@ -1,34 +1,35 @@
-@base = http://localhost:8000/v1
+@apiUrl = http://localhost:80
+@apiVersion = v1
 
 ### echo
-POST {{base}}/echo
+POST {{apiUrl}}/{{apiVersion}}/echo
 Content-Type: application/json
 
 {
   "a": 1,
   "b": 2
 }
 
-### === Test all routes and errors ===
+### === Test other routes and errors ===
 
 ### Page Home
-GET {{base}}
+GET {{apiUrl}}/{{apiVersion}}
 
 ### Page 404 (wrong path)
-GET {{base}}/jafang
+GET {{apiUrl}}/{{apiVersion}}/jafang
 
 ### Page 404 (wrong method)
-POST {{base}}
+POST {{apiUrl}}/{{apiVersion}}
 
 ### Page health
-GET {{base}}/health
+GET {{apiUrl}}/{{apiVersion}}/health
 
 ### empty body
-POST {{base}}/echo
+POST {{apiUrl}}/{{apiVersion}}/echo
 Content-Type: application/json
 
 ### invalid json
-POST {{base}}/echo
+POST {{apiUrl}}/{{apiVersion}}/echo
 Content-Type: application/json
 
 {

diff --git a/packages/starter/nanoservice/src/lib/config.ts b/packages/starter/nanoservice/src/lib/config.ts
@@ -3,7 +3,7 @@ import {isNumber} from '@alwatr/math';
 
 export const config = {
   /* eslint-disable @typescript-eslint/no-non-null-assertion */
-  port: isNumber(process.env.PORT) ? +process.env.PORT! : 8000,
+  port: isNumber(process.env.PORT) ? +process.env.PORT! : 80,
 };
 
 export const logger = createLogger('nanoservice-starter');

diff --git a/packages/starter/nanoservice/src/lib/nano-server.ts b/packages/starter/nanoservice/src/lib/nano-server.ts
@@ -2,4 +2,4 @@ import {AlwatrNanoServer} from '@alwatr/nano-server';
 
 import {config} from './config.js';
 
-export const nanoServer = new AlwatrNanoServer(config.port);
+export const nanoServer = new AlwatrNanoServer({port: config.port});
diff --git a/packages/starter/nanoservice/src/route/echo.ts b/packages/starter/nanoservice/src/route/echo.ts
@@ -1,6 +1,6 @@
 import {nanoServer} from '../lib/nano-server.js';
 
-nanoServer.route('post', '/echo', async (connection) => {
+nanoServer.route('POST', '/echo', async (connection) => {
   const bodyData = await connection.requireJsonBody();
   if (bodyData == null) return;
 

diff --git a/packages/starter/nanoservice/src/route/home.ts b/packages/starter/nanoservice/src/route/home.ts
@@ -1,6 +1,6 @@
 import {nanoServer} from '../lib/nano-server.js';
 
-nanoServer.route('get', '/', async (connection) => {
+nanoServer.route('GET', '/', async (connection) => {
   connection.reply({
     ok: true,
     data: {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ import {AlwatrNanoServer} from '@alwatr/nano-server';

		import {config} from './config.js';

		export const nanoServer = new AlwatrNanoServer(config.port);
		export const nanoServer = new AlwatrNanoServer({port: config.port});