Merge pull request #449 from dfpc-coe/minio-integration

PMTiles Dual Compat
dfpc-coe · Dec 16, 2024 · ead4d59 · ead4d59
2 parents db8550e + e4f97e1
commit ead4d59
Show file tree

Hide file tree

Showing 24 changed files with 9,118 additions and 4,957 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,10 @@
 
 ### Pending Release
 
+### v5.24.0 - 2024-12-13
+
+- :tada: `DevOps` Allow DockerCompose mode to use minio configured store
+
 ### v5.23.0 - 2024-12-13
 
 - :rocket: `UI/API` Update ManagementURL in COTAK API (if configured) with Connection ID

diff --git a/api/lib/aws/s3.ts b/api/lib/aws/s3.ts
@@ -9,7 +9,7 @@ import process from 'node:process';
  * @class
  */
 export default class S3 {
-    static #client() {
+    static #client(): S3AWS.S3Client {
         if (!process.env.ASSET_BUCKET) throw new Err(400, null, 'ASSET_BUCKET not set');
 
         const config: S3ClientConfig = {
@@ -19,7 +19,6 @@ export default class S3 {
         if (process.env.AWS_S3_Endpoint) {
             config.endpoint = process.env.AWS_S3_Endpoint;
             config.forcePathStyle = true;
-            config.sslEnabled = false;
 
             if (!process.env.AWS_S3_AccessKeyId || !process.env.AWS_S3_SecretAccessKey) {
                 throw new Error('Cannot use custom S3 Endpoint without providing AWS_S3_AccessKeyId & AWS_S3_SecretAccessKey');

diff --git a/api/lib/config.ts b/api/lib/config.ts
@@ -141,7 +141,7 @@ export default class Config {
                 API_URL = `http://${process.env.API_URL}`;
                 PMTILES_URL = process.env.PMTILES_URL || 'http://localhost:5001'
             } else {
-                PMTILES_URL = `https://tiles.${process.env.API_URL}`;
+                PMTILES_URL = process.env.PMTILES_URL || `https://tiles.${process.env.API_URL}`;
                 API_URL = String(`https://${process.env.API_URL}`);
             }
 

diff --git a/api/lib/types.ts b/api/lib/types.ts
@@ -82,6 +82,7 @@ export const ProfileResponse = Type.Object({
 export const VideoLeaseResponse = createSelectSchema(schemas.VideoLease, {
     id: Type.Integer(),
     ephemeral: Type.Boolean(),
+    expiration: Type.Union([Type.Null(), Type.String()]),
     channel: Type.Union([Type.Null(), Type.String()]),
     proxy: Type.Union([Type.Null(), Type.String()]),
 });

diff --git a/api/migrations/0074_eminent_stick.sql b/api/migrations/0074_eminent_stick.sql
@@ -0,0 +1,6 @@
+-- Custom SQL migration file, put your code below! --
+UPDATE profile_overlays
+    SET
+        url = Regexp_Replace(url, '^http(s)?://[a-zA-Z.]*/', '/')
+    WHERE
+        url ~ '/profile/';