Ledda/stocca-tre
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat: improving infrastructure

Browse Source
This commit is contained in:
Daniel Ledda
2022-06-30 08:33:13 +02:00
parent bd177c7f09
commit 3e5c53f9f5
12 changed files with 76 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/globalTypes.d.ts → server/JSON.ts
View File

@@ -7,14 +7,6 @@ type JSONValue =
type JSONArray = Array<JSONValue>;
type Maybe<T> = {
just: T,
error: null,
} | {
just: null,
error: { message: string },
};
interface JSONObject {
export interface JSONObject {
[x: string]: JSONValue;
}

2
server/Maybe.ts Normal file
View File

@@ -0,0 +1,2 @@
export type Maybe<T> = Just<T> | { just?: never, error: { message: string }};
export type Just<T> = { just: T, error?: never };

1
server/StoccaTreRequest.ts
View File

@@ -3,4 +3,5 @@ export type HttpMethod = "POST" | "GET" | "PUT" | "DELETE";
export default interface StoccaTreRequest {
method: HttpMethod,
route: string,
body: string | null,
}

2
server/StoccaTreRequestHandler.ts
View File

@@ -1,4 +1,6 @@
import StoccaTreRequest from "./StoccaTreRequest.ts";
import {Maybe} from "./Maybe.ts";
import {JSONObject} from "./JSON.ts";
export default interface StoccaTreRequestHandler {
handleRequest(request: StoccaTreRequest): Promise<Maybe<JSONObject>>,

6
server/config.json Normal file
View File

@@ -0,0 +1,6 @@
{
"username": "root",
"port": 8080,
"hostname": "127.0.0.1",
"password": "sekna123jk"
}

5
server/database.ts
View File

@@ -1,5 +1,6 @@
import { Client } from "https://deno.land/x/mysql/mod.ts";
import config from "@/config.json" assert { type: "json" };
import config from "./config.json" assert { type: "json" };
import {Maybe} from "./Maybe.ts";
export type WithoutId<T> = Omit<T, "id">;
export interface StoccaTreDbConn {
@@ -19,7 +20,6 @@ export default async function createNewDbConnection(): Promise<StoccaTreDbConn>
const result = await mysqlClient.query(query);
return {
just: result as T,
error: null,
};
} catch (e: unknown) {
if (e && typeof (e as { message?: any }).message === "string") {
@@ -29,7 +29,6 @@ export default async function createNewDbConnection(): Promise<StoccaTreDbConn>
}
}
return {
just: null,
error: {
message: errMessage
},

1
server/import_map.json
View File

@@ -1,5 +1,4 @@
{
"imports": {
"/": "./"
}
}

55
server/main.ts
View File

@@ -1,12 +1,9 @@
import createNewDbConnection, {StoccaTreDbConn} from "/database.ts";
import * as resources from "/resources/main.ts";
import config from "/config.json" assert { type: "json" };
import StoccaTreRequest, {HttpMethod} from "/StoccaTreRequest.ts";
import StoccaTreRequestHandler from "/StoccaTreRequestHandler.ts";
const server = Deno.listen({ port: config.port ?? 8080 });
console.log(`Stocca Tre Server is running. Access it at: http://localhost:${ config.port }/`);
import createNewDbConnection, {StoccaTreDbConn} from "./database.ts";
import * as resources from "./resources/main.ts";
import config from "./config.json" assert { type: "json" };
import StoccaTreRequest, {HttpMethod} from "./StoccaTreRequest.ts";
import StoccaTreRequestHandler from "./StoccaTreRequestHandler.ts";
import {JSONObject} from "./JSON.ts";
type StoccaTreApiBody = {
data: JSONObject,
@@ -19,41 +16,43 @@ function newStoccaTreApiBody(): StoccaTreApiBody {
};
}
type StoccaTreServer = {
type StoccaTreServer = StoccaTreRequestHandler & {
dbConnection: StoccaTreDbConn,
handleRequest(request: StoccaTreRequest): Promise<Maybe<JSONObject>>,
}
async function processRequest(server: StoccaTreServer, requestEvent: Deno.RequestEvent) {
const route = requestEvent.request.destination;
const requestMethod = requestEvent.request.method;
console.log(route, requestMethod);
const route = /^https?:\/\/[^\/]*(\/.*)$/.exec(requestEvent.request.url)?.[1] ?? "/";
const requestBody = (await requestEvent.request.body?.getReader().read())?.value?.toString() ?? null;
console.log(requestBody);
const method: HttpMethod = requestEvent.request.method as HttpMethod;
const body: StoccaTreApiBody = newStoccaTreApiBody();
const maybeResult = await server.handleRequest({
const result = await server.handleRequest({
route,
method: requestMethod as HttpMethod,
body: requestBody,
method,
});
if (maybeResult.error) {
await requestEvent.respondWith(Response.json({ ...body, error: `Internal server error: ${maybeResult.error.message}` }, { status: 500 }));
if (result.error) {
await requestEvent.respondWith(Response.json({ ...body, error: `Internal server error: ${result.error.message}` }, { status: 500 }));
} else {
body.data = maybeResult.just;
body.data = result.just;
await requestEvent.respondWith(Response.json(body, { status: 200 }));
}
}
const stoccaTreListener = Deno.listen({ port: config.port ?? 8080 });
console.log(`Stocca Tre Server is running. Access it at: http://localhost:${ config.port }/`);
const database = await createNewDbConnection();
const ingredientResource = new resources.IngredientResource(database);
const stoccaTreServer: StoccaTreServer = {
dbConnection: database,
handleRequest: (request: StoccaTreRequest) => ingredientResource.handleRequest(request),
};
for await (const conn of server) {
await serveHttp(conn);
}
async function serveHttp(conn: Deno.Conn) {
for await (const conn of stoccaTreListener) {
const httpConn = Deno.serveHttp(conn);
for await (const requestEvent of httpConn) {
await processRequest({
dbConnection: database,
handleRequest: (request: StoccaTreRequest) => ingredientResource.handleRequest(request),
}, requestEvent);
await processRequest(stoccaTreServer, requestEvent);
}
}

2
server/package.json
View File

@@ -2,7 +2,7 @@
"name": "stocca-tre-server",
"version": "0.0.1",
"scripts": {
"start": "deno run --allow-net --import-map=importMap.json main.ts"
"start": "deno run --allow-net --import-map=import_map.json main.ts"
},
"description": "Backend for StoccaTre",
"author": "Daniel Ledda",

9
server/resources/ingredient/IngredientCollection.ts
View File

@@ -1,5 +1,6 @@
import {StoccaTreDbConn, WithoutId} from "../../database.ts";
import {IngredientModel} from "./IngredientModel.ts";
import {Maybe} from "../../Maybe.ts";
export default class IngredientCollection {
private dbConnection: StoccaTreDbConn;
@@ -11,17 +12,16 @@ export default class IngredientCollection {
}
async addIngredient(ingredient: WithoutId<IngredientModel>): Promise<any> {
const result = await this.dbConnection.query<any>(
return await this.dbConnection.query<any>(
`INSERT INTO ingredients (id, name, displayName, displayNameDE) VALUES (NULL, '${ingredient.name}', '${ingredient.displayName}', '${ingredient.displayNameDE}');`
);
return result;
}
async getAllIngredients(): Promise<Maybe<IterableIterator<IngredientModel>>> {
if (!this.allGotten) {
const result = await this.dbConnection.query<IngredientModel[]>("SELECT * FROM ingredients");
if (result.just) {
result.just.forEach((ingredient) => this.mapById.set(ingredient.id, ingredient));
if (!result.error) {
result.just.forEach((ingredient: IngredientModel) => this.mapById.set(ingredient.id, ingredient));
} else {
return result;
}
@@ -29,7 +29,6 @@ export default class IngredientCollection {
}
return {
just: this.mapById.values(),
error: null,
};
}
}

37
server/resources/ingredient/IngredientResource.ts
View File

@@ -1,6 +1,9 @@
import {StoccaTreDbConn} from "/database.ts";
import IngredientCollection from "IngredientCollection.ts";
import StoccaTreRequest from "/StoccaTreRequest.ts";
import {StoccaTreDbConn} from "../../database.ts";
import IngredientCollection from "./IngredientCollection.ts";
import StoccaTreRequest from "../../StoccaTreRequest.ts";
import {Maybe} from "../../Maybe.ts";
import {JSONObject} from "../../JSON.ts";
import {IngredientModel} from "./IngredientModel.ts";
export default class IngredientResource {
private dbConnection: StoccaTreDbConn;
@@ -11,20 +14,40 @@ export default class IngredientResource {
this.collection = new IngredientCollection(dbConnection);
}
static isIngredient(json: JSONObject): json is IngredientModel {
if (json) {
return true;
}
return false;
}
async handleRequest(request: StoccaTreRequest): Promise<Maybe<JSONObject>> {
return await this.allIngredients(request);
switch (request.route) {
case "/add":
if (request.method === "POST") {
const ingredient = JSON.parse(request.body ?? "");
return await this.collection.addIngredient(JSON.parse(request.body));
}
break;
case "/all":
return await this.allIngredients(request);
default:
break;
}
return { error: {message: "Invalid route" }};
}
async allIngredients(request: StoccaTreRequest): Promise<Maybe<JSONObject>> {
const getAllIngredientResult = await this.collection.getAllIngredients();
if (!getAllIngredientResult.error) {
return getAllIngredientResult.just;
if (getAllIngredientResult.error) {
return getAllIngredientResult;
}
return {
just: {
ingredients: Array.from(getAllIngredientResult.just),
},
error: "",
};
}
}

7
server/tsconfig.json
View File

@@ -1,7 +0,0 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"allowJs": false,
"lib": [ "ES2021" ]
}
}