From c1961dd54e910c544b0721afa9c702bcf1f82364 Mon Sep 17 00:00:00 2001 From: KernelDeimos Date: Mon, 30 Dec 2024 11:03:27 -0500 Subject: [PATCH] dev: move app services to apps module Moves AppIconService, OldAppNameService, and ProtectedAppService to the new apps module to keep things organized, and updates imports. There were no interesting init errors. Services creating a database at init were tested for failures but this wasn't an issue. It turns out initializing with a database accessor before the db service inits is okay, but using that database accessor at init is not. --- src/backend/src/CoreModule.js | 9 --------- .../{services => modules/apps}/AppIconService.js | 16 ++++++++-------- src/backend/src/modules/apps/AppsModule.js | 9 +++++++++ .../apps}/OldAppNameService.js | 4 ++-- .../apps}/ProtectedAppService.js | 9 +++++---- .../apps}/default-app-icon.js | 0 6 files changed, 24 insertions(+), 23 deletions(-) rename src/backend/src/{services => modules/apps}/AppIconService.js (94%) rename src/backend/src/{services => modules/apps}/OldAppNameService.js (94%) rename src/backend/src/{services => modules/apps}/ProtectedAppService.js (94%) rename src/backend/src/{services => modules/apps}/default-app-icon.js (100%) diff --git a/src/backend/src/CoreModule.js b/src/backend/src/CoreModule.js index b4f6d2757..d085625bc 100644 --- a/src/backend/src/CoreModule.js +++ b/src/backend/src/CoreModule.js @@ -302,9 +302,6 @@ const install = async ({ services, app, useapi, modapi }) => { const { NotificationService } = require('./services/NotificationService'); services.registerService('notification', NotificationService); - const { ProtectedAppService } = require('./services/ProtectedAppService'); - services.registerService('__protected-app', ProtectedAppService); - const { ShareService } = require('./services/ShareService'); services.registerService('share', ShareService); @@ -356,12 +353,6 @@ const install = async ({ services, app, useapi, modapi }) => { const { WSPushService } = require('./services/WSPushService'); services.registerService('__event-push-ws', WSPushService); - const { AppIconService } = require('./services/AppIconService'); - services.registerService('app-icon', AppIconService); - - const { OldAppNameService } = require('./services/OldAppNameService'); - services.registerService('old-app-name', OldAppNameService); - const { SNSService } = require('./services/SNSService'); services.registerService('sns', SNSService); diff --git a/src/backend/src/services/AppIconService.js b/src/backend/src/modules/apps/AppIconService.js similarity index 94% rename from src/backend/src/services/AppIconService.js rename to src/backend/src/modules/apps/AppIconService.js index 9471a491b..fba668d00 100644 --- a/src/backend/src/services/AppIconService.js +++ b/src/backend/src/modules/apps/AppIconService.js @@ -1,11 +1,11 @@ -const { HLWrite } = require("../filesystem/hl_operations/hl_write"); -const { LLMkdir } = require("../filesystem/ll_operations/ll_mkdir"); -const { LLRead } = require("../filesystem/ll_operations/ll_read"); -const { NodePathSelector } = require("../filesystem/node/selectors"); -const { get_app } = require("../helpers"); -const { Endpoint } = require("../util/expressutil"); -const { buffer_to_stream } = require("../util/streamutil"); -const BaseService = require("./BaseService"); +// const { HLWrite } = require("../filesystem/hl_operations/hl_write"); +const { LLMkdir } = require("../../filesystem/ll_operations/ll_mkdir"); +const { LLRead } = require("../../filesystem/ll_operations/ll_read"); +const { NodePathSelector } = require("../../filesystem/node/selectors"); +const { get_app } = require("../../helpers"); +const { Endpoint } = require("../../util/expressutil"); +const { buffer_to_stream } = require("../../util/streamutil"); +const BaseService = require("../../services/BaseService.js"); const ICON_SIZES = [16,32,64,128,256,512]; diff --git a/src/backend/src/modules/apps/AppsModule.js b/src/backend/src/modules/apps/AppsModule.js index 5fd1dac19..9755a07d9 100644 --- a/src/backend/src/modules/apps/AppsModule.js +++ b/src/backend/src/modules/apps/AppsModule.js @@ -6,6 +6,15 @@ class AppsModule extends AdvancedBase { const { AppInformationService } = require('./AppInformationService'); services.registerService('app-information', AppInformationService); + + const { AppIconService } = require('./AppIconService'); + services.registerService('app-icon', AppIconService); + + const { OldAppNameService } = require('./OldAppNameService'); + services.registerService('old-app-name', OldAppNameService); + + const { ProtectedAppService } = require('./ProtectedAppService'); + services.registerService('__protected-app', ProtectedAppService); } } diff --git a/src/backend/src/services/OldAppNameService.js b/src/backend/src/modules/apps/OldAppNameService.js similarity index 94% rename from src/backend/src/services/OldAppNameService.js rename to src/backend/src/modules/apps/OldAppNameService.js index 7f8ee5084..9cb339455 100644 --- a/src/backend/src/services/OldAppNameService.js +++ b/src/backend/src/modules/apps/OldAppNameService.js @@ -1,5 +1,5 @@ -const BaseService = require("./BaseService"); -const { DB_READ } = require("./database/consts"); +const BaseService = require("../../services/BaseService"); +const { DB_READ } = require("../../services/database/consts"); const N_MONTHS = 4; diff --git a/src/backend/src/services/ProtectedAppService.js b/src/backend/src/modules/apps/ProtectedAppService.js similarity index 94% rename from src/backend/src/services/ProtectedAppService.js rename to src/backend/src/modules/apps/ProtectedAppService.js index fea585d74..acca53d81 100644 --- a/src/backend/src/services/ProtectedAppService.js +++ b/src/backend/src/modules/apps/ProtectedAppService.js @@ -17,10 +17,11 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -const { get_app } = require("../helpers"); -const { UserActorType } = require("./auth/Actor"); -const { PermissionImplicator, PermissionUtil, PermissionRewriter } = require("./auth/PermissionService"); -const BaseService = require("./BaseService"); +const { get_app } = require("../../helpers"); +const { UserActorType } = require("../../services/auth/Actor"); +const { PermissionImplicator, PermissionUtil, PermissionRewriter } = + require("../../services/auth/PermissionService"); +const BaseService = require("../../services/BaseService"); /** diff --git a/src/backend/src/services/default-app-icon.js b/src/backend/src/modules/apps/default-app-icon.js similarity index 100% rename from src/backend/src/services/default-app-icon.js rename to src/backend/src/modules/apps/default-app-icon.js