chore: use local minio when possible (#76)

Author: lukepolo

src/configs/s3.ts

@@ -8,8 +8,8 @@ export default (): {
     secret: process.env.S3_SECRET,
     bucket: process.env.S3_BUCKET,
     db_backup_bucket: process.env.S3_DB_BACKUP_BUCKET || "5stack-db-backups",
-    endpoint: process.env.S3_ENDPOINT || process.env.DEMOS_DOMAIN,
-    useSSL: process.env.S3_USE_SSL === "false" ? false : true,
-    port: process.env.S3_PORT || "443",
+    endpoint: process.env.S3_ENDPOINT || "minio",
+    useSSL: process.env.S3_USE_SSL === "true" ? true : false,
+    port: process.env.S3_PORT || "9000",
   },
 });

src/dedicated-servers/dedicated-servers.service.ts

@@ -299,7 +299,7 @@ export class DedicatedServersService {
                       type: "DirectoryOrCreate",
                       path: `/opt/5stack/servers/${server.id}`,
                     },
-                  }
+                  },
                 ],
               },
             },

src/demos/demos.controller.ts

@@ -86,6 +86,7 @@ export class DemosController {
   ) {
     const { matchId } = request.params;
     const { mapId, demo } = request.body;
+    const isGameServerNode = request.query["game-server-node"] === "true";
 
     if (!matchId || !mapId || !demo) {
       return response.status(400).json({
@@ -156,6 +157,10 @@ export class DemosController {
 
     const presignedUrl = await this.s3.getPresignedUrl(
       `${matchId}/${mapId}/demos/${demo}`,
+      undefined,
+      undefined,
+      undefined,
+      isGameServerNode,
     );
 
     return response.status(200).json({

src/s3/s3.controller.ts

@@ -19,7 +19,13 @@ export class S3Controller {
     try {
       const data = `world : ${new Date().toISOString()}`;
       const putResponse = await fetch(
-        await this.s3.getPresignedUrl("hello.txt"),
+        await this.s3.getPresignedUrl(
+          "hello.txt",
+          undefined,
+          undefined,
+          undefined,
+          true,
+        ),
         {
           method: "PUT",
           body: Buffer.from(data),
@@ -49,10 +55,6 @@ export class S3Controller {
   @HasuraAction()
   public async getTestUploadLink() {
     try {
-      const data = await fetch(
-        await this.s3.getPresignedUrl("hello.txt", undefined, 60, "get"),
-      );
-
       return {
         link: await this.s3.getPresignedUrl("hello.txt", undefined, 60, "get"),
       };

src/s3/s3.service.ts

@@ -116,16 +116,13 @@ export class S3Service {
     }
   }
 
-  public getClientEndpoint() {
-    return `${this.config.endpoint}:${this.config.port}`;
-  }
-
   public async getPresignedUrl(
     key: string,
     bucket: string = this.bucket,
     // 5 minutes
     expires = 60 * 5,
     type: "put" | "get" = "put",
+    useLocal: boolean = false,
   ) {
     let presignedUrl: string;
 
@@ -135,6 +132,13 @@ export class S3Service {
       presignedUrl = await this.client.presignedGetObject(bucket, key, expires);
     }
 
+    if (!useLocal && this.config.endpoint === "minio") {
+      presignedUrl = presignedUrl.replace(
+        `http://minio:9000`,
+        `https://${process.env.DEMOS_DOMAIN}`,
+      );
+    }
+
     return presignedUrl;
   }
 }