feat: [wip] new maps system

Author: jakeaturner

admin/app/controllers/maps_controller.ts

@@ -0,0 +1,66 @@
+import { MapService } from '#services/map_service'
+import {
+  filenameValidator,
+  remoteDownloadValidator,
+  remoteDownloadValidatorOptional,
+} from '#validators/common'
+import { inject } from '@adonisjs/core'
+import type { HttpContext } from '@adonisjs/core/http'
+
+@inject()
+export default class MapsController {
+  constructor(private mapService: MapService) {}
+
+  async index({ inertia }: HttpContext) {
+    return inertia.render('maps')
+  }
+
+  async checkBaseAssets({}: HttpContext) {
+    const exists = await this.mapService.checkBaseAssetsExist()
+    return { exists }
+  }
+
+  async downloadBaseAssets({ request }: HttpContext) {
+    const payload = await request.validateUsing(remoteDownloadValidatorOptional)
+    await this.mapService.downloadBaseAssets(payload.url)
+    return { success: true }
+  }
+
+  async downloadRemote({ request }: HttpContext) {
+    const payload = await request.validateUsing(remoteDownloadValidator)
+    const filename = await this.mapService.downloadRemote(payload.url)
+    return {
+      message: 'Download started successfully',
+      filename,
+      url: payload.url,
+    }
+  }
+
+  async listRegions({}: HttpContext) {
+    return await this.mapService.listRegions()
+  }
+
+  async styles({ response }: HttpContext) {
+    const styles = await this.mapService.generateStylesJSON()
+    return response.json(styles)
+  }
+
+  async delete({ request, response }: HttpContext) {
+    const payload = await request.validateUsing(filenameValidator)
+
+    try {
+      await this.mapService.delete(payload.filename)
+    } catch (error) {
+      if (error.message === 'not_found') {
+        return response.status(404).send({
+          message: `Map file with key ${payload.filename} not found`,
+        })
+      }
+      throw error // Re-throw any other errors and let the global error handler catch
+    }
+
+    return {
+      message: 'Map file deleted successfully',
+    }
+  }
+}

admin/app/controllers/settings_controller.ts

@@ -1,3 +1,4 @@
+import { MapService } from '#services/map_service';
 import { SystemService } from '#services/system_service';
 import { inject } from '@adonisjs/core';
 import type { HttpContext } from '@adonisjs/core/http'
@@ -6,6 +7,7 @@ import type { HttpContext } from '@adonisjs/core/http'
 export default class SettingsController {
     constructor(
         private systemService: SystemService,
+        private mapService: MapService
     ) { }
 
     async system({ inertia }: HttpContext) {
@@ -25,11 +27,22 @@ export default class SettingsController {
             }
         });
     }
-
+    
     async legal({ inertia }: HttpContext) {
         return inertia.render('settings/legal');
     }
 
+    async maps({ inertia }: HttpContext) {
+        const baseAssetsCheck = await this.mapService.checkBaseAssetsExist();
+        const regionFiles = await this.mapService.listRegions();
+        return inertia.render('settings/maps', {
+            maps: {
+                baseAssetsExist: baseAssetsCheck,
+                regionFiles: regionFiles.files
+            }
+        });
+    }
+
     async zim({ inertia }: HttpContext) {
         return inertia.render('settings/zim/index')
     }

admin/app/controllers/zim_controller.ts

@@ -1,49 +1,48 @@
-import { ZimService } from '#services/zim_service';
-import { inject } from '@adonisjs/core';
+import { ZimService } from '#services/zim_service'
+import { filenameValidator, remoteDownloadValidator } from '#validators/common'
+import { inject } from '@adonisjs/core'
 import type { HttpContext } from '@adonisjs/core/http'
 
 @inject()
 export default class ZimController {
-    constructor(
-        private zimService: ZimService
-    ) { }
+  constructor(private zimService: ZimService) {}
 
-    async list({ }: HttpContext) {
-        return await this.zimService.list();
-    }
+  async list({}: HttpContext) {
+    return await this.zimService.list()
+  }
 
-    async listRemote({ request }: HttpContext) {
-        const { start = 0, count = 12 } = request.qs();
-        return await this.zimService.listRemote({ start, count });
-    }
+  async listRemote({ request }: HttpContext) {
+    const { start = 0, count = 12 } = request.qs()
+    return await this.zimService.listRemote({ start, count })
+  }
 
-    async downloadRemote({ request, response }: HttpContext) {
-        const { url } = request.body()
-        const filename = await this.zimService.downloadRemote(url);
+  async downloadRemote({ request }: HttpContext) {
+    const payload = await request.validateUsing(remoteDownloadValidator)
+    const filename = await this.zimService.downloadRemote(payload.url)
 
-        response.status(200).send({
-            message: 'Download started successfully',
-            filename,
-            url
-        });
+    return {
+      message: 'Download started successfully',
+      filename,
+      url: payload.url,
+    }
+  }
+
+  async delete({ request, response }: HttpContext) {
+    const payload = await request.validateUsing(filenameValidator)
+
+    try {
+      await this.zimService.delete(payload.filename)
+    } catch (error) {
+      if (error.message === 'not_found') {
+        return response.status(404).send({
+          message: `ZIM file with key ${payload.filename} not found`,
+        })
+      }
+      throw error // Re-throw any other errors and let the global error handler catch
     }
 
-    async delete({ request, response }: HttpContext) {
-        const { key } = request.params();
-
-        try {
-            await this.zimService.delete(key);
-        } catch (error) {
-            if (error.message === 'not_found') {
-                return response.status(404).send({
-                    message: `ZIM file with key ${key} not found`
-                });
-            }
-            throw error; // Re-throw any other errors and let the global error handler catch
-        }
-
-        response.status(200).send({
-            message: 'ZIM file deleted successfully'
-        });
+    return {
+      message: 'ZIM file deleted successfully',
     }
-}
+  }
+}