new database methods

Author: Athlon1600

api_server/src/Database.ts

@@ -1,6 +1,7 @@
-import {Pool, ResultSetHeader, RowDataPacket} from "mysql2";
+import {FieldPacket, Pool, ResultSetHeader, RowDataPacket} from "mysql2";
 import {Util} from "./Util";
 import {CONFIG} from "./config";
+import {IChannel} from "./types";
 
 const mysql = require('mysql2');
 
@@ -44,8 +45,12 @@ export class Database {
     }
 
     // contains affectedRows and lastInsertId properties.
-    public async update() {
-        // TODO
+    public async insertGetId(sql: string, parameters?: unknown[]): Promise<number> {
+
+        const [result, fields]: [ResultSetHeader, FieldPacket[]] = await this.pool.promise()
+            .query<ResultSetHeader>(sql, parameters);
+
+        return result.insertId;
     }
 
     async ping(): Promise<boolean> {
@@ -61,22 +66,38 @@ export class Database {
         return rows.length && rows[0]["cnt"] == 0;
     }
 
-    async createChannel(name: string): Promise<boolean> {
+    async createChannel(name: string, ipAddress: string): Promise<boolean> {
 
         if (!await this.checkIfChannelNameAvailable(name)) {
             throw "Channel with name '" + name + "' is not available";
         }
 
-        const sk = Util.generateStreamKey();
+        const streamKey: string = Util.generateStreamKey();
+        const authKey: string = Util.randomString(32, 'ak_');
 
-        const result = await this.pool.promise()
-            .execute<ResultSetHeader>("INSERT INTO channels (created_at, name, stream_key) VALUES (UTC_TIMESTAMP(), ?, ?)", [
-                name, sk
-            ]);
+        const result = await this.insertGetId(
+            "INSERT INTO channels (created_at, ip_address, name, auth_key, stream_key) VALUES (UTC_TIMESTAMP(), ?, ?, ?, ?)",
+            [ipAddress, name, authKey, streamKey]
+        );
 
         return true;
     }
 
+    async findChannelById(id: number): Promise<IChannel> {
+        const result: IChannel[] = await this.select<IChannel>("SELECT * FROM channels WHERE id = ?", [id]);
+        return result.length ? result[0] : null;
+    }
+
+    async findChannelByAuthToken(token: string): Promise<IChannel | null> {
+        const result = await this.select<IChannel>("SELECT * FROM channels WHERE stream_key = ? LIMIT 1", [token]);
+        return result.length ? result[0] : null;
+    }
+
+    async findChannelByName(name: string): Promise<IChannel> {
+        const result: IChannel[] = await this.select<IChannel>("SELECT * FROM channels WHERE name = ? LIMIT 1", [name]);
+        return result.length ? result[0] : null;
+    }
+
     async createNewStream(name: string, ipAddress: string, streamInfo: string): Promise<void> {
         await this.pool.promise().execute("INSERT INTO streams (name, user_ip, started_at, ffprobe_json) VALUES (?, ?, UTC_TIMESTAMP(), ?)", [
             name, ipAddress, streamInfo

api_server/src/classes/Server.ts

@@ -33,6 +33,15 @@ export class Server {
         this.app.use(this.router);
         this.app.use("/", routes);
 
+        this.app.use((req: Request, res: Response, next) => {
+
+            const path = req.path;
+
+            res.status(404).json({
+                error: `${path} not found`
+            });
+        });
+
         // must be registered AFTER all routes
         this.app.use((error: Error, req: Request, res: Response, next: any) => {
 

api_server/src/config.ts

@@ -1,6 +1,8 @@
 import {ConnectionOptions} from "mysql2";
 import {URL} from "url";
 
+require('dotenv').config();
+
 const urlFromEnv: URL | null = (() => {
 
     try {
@@ -12,7 +14,7 @@ const urlFromEnv: URL | null = (() => {
 })();
 
 const connectionOptions: ConnectionOptions = {
-    host: urlFromEnv?.hostname || 'db',
+    host: process.env.DB_HOST || urlFromEnv?.hostname || 'localhost',
     port: +(urlFromEnv?.port || 3306),
     user: urlFromEnv?.username || 'root',
     password: urlFromEnv?.password || 'password',

docker-compose.yml

@@ -33,7 +33,8 @@ services:
       - ./public/storage:/var/storage
     environment:
       - NODE_ENV=production
-     # - MYSQL_CONNECTION=mysql://root:password@db:3306
+      - DB_HOST=db
+      # - MYSQL_CONNECTION=mysql://root:password@db:3306
       - RTMP_SERVER=rtmp
 
   adminer: