fix(backend): possible memory leak

cli.ts

@@ -1,5 +1,5 @@
 import { defineCommand, runMain } from 'citty'
-import { MikroORMInstance } from '@services/mikro-orm.service'
+import { MikroORMInstance } from '@/server/services/mikro-orm'
 
 const main = defineCommand({
   meta: {

commands/client.ts

@@ -1,6 +1,6 @@
 import { Client } from '@/entities/client'
 import { EAuthMode } from '@/entities/enum'
-import { MikroORMInstance } from '@services/mikro-orm.service'
+import { MikroORMInstance } from '@/server/services/mikro-orm'
 import { ComfyApi } from '@saintno/comfyui-sdk'
 import { defineCommand } from 'citty'
 import consola from 'consola'

commands/token.ts

@@ -3,7 +3,7 @@ import { Token } from '@/entities/token'
 import { TokenPermission } from '@/entities/token_permission'
 import { User } from '@/entities/user'
 import { Workflow } from '@/entities/workflow'
-import { MikroORMInstance } from '@services/mikro-orm.service'
+import { MikroORMInstance } from '@/server/services/mikro-orm'
 import { defineCommand } from 'citty'
 import consola from 'consola'
 

commands/user.ts

@@ -1,6 +1,6 @@
 import { EUserRole } from '@/entities/enum'
 import { User } from '@/entities/user'
-import { MikroORMInstance } from '@services/mikro-orm.service'
+import { MikroORMInstance } from '@/server/services/mikro-orm'
 import { defineCommand } from 'citty'
 import consola from 'consola'
 

entities/client_monitor_gpu.ts

@@ -12,8 +12,8 @@ export class ClientMonitorGpu {
   @Property({ type: 'int' })
   gpuIdx: number
 
-  @Property({ type: 'float', nullable: true })
-  utlization?: number
+  @Property({ name: 'utlization', type: 'float', nullable: true })
+  utilization?: number
 
   @Property({ type: 'float', nullable: true })
   temperature?: number

entities/enum.ts

@@ -1,5 +1,7 @@
 export enum EAuthMode {
   Basic = 'Basic',
+  Token = 'Token',
+  Custom = 'Custom',
   None = 'None'
 }
 

entities/repositories/user.ts

@@ -2,7 +2,7 @@ import { EntityRepository } from '@mikro-orm/core'
 import type { User } from '../user'
 import { ENotificationType } from '../enum'
 import { INotificationData, UserNotification } from '../user_notifications'
-import CachingService from '@services/caching.service'
+import CachingService from '@/server/services/caching'
 
 export class UserRepository extends EntityRepository<User> {
   public async makeNotify(

package.json

@@ -28,10 +28,10 @@
     "@hookform/resolvers": "^3.9.1",
     "@langchain/core": "^0.3.25",
     "@langchain/openai": "^0.3.16",
-    "@mikro-orm/cli": "^6.4.1",
-    "@mikro-orm/core": "^6.4.1",
-    "@mikro-orm/libsql": "^6.4.1",
-    "@mikro-orm/reflection": "^6.4.1",
+    "@mikro-orm/cli": "^6.4.3",
+    "@mikro-orm/core": "^6.4.3",
+    "@mikro-orm/libsql": "^6.4.3",
+    "@mikro-orm/reflection": "^6.4.3",
     "@radix-ui/react-accordion": "^1.2.2",
     "@radix-ui/react-alert-dialog": "^1.1.3",
     "@radix-ui/react-avatar": "^1.1.2",

package.prod.json

@@ -18,10 +18,10 @@
     "@hookform/resolvers": "^3.9.1",
     "@langchain/core": "^0.3.25",
     "@langchain/openai": "^0.3.16",
-    "@mikro-orm/cli": "^6.4.1",
-    "@mikro-orm/core": "^6.4.1",
-    "@mikro-orm/libsql": "^6.4.1",
-    "@mikro-orm/reflection": "^6.4.1",
+    "@mikro-orm/cli": "^6.4.3",
+    "@mikro-orm/core": "^6.4.3",
+    "@mikro-orm/libsql": "^6.4.3",
+    "@mikro-orm/reflection": "^6.4.3",
     "@saintno/comfyui-sdk": "^0.2.40",
     "@saintno/needed-tools": "^0.3.5",
     "sharp": "^0.33.5",

server/context.ts

@@ -1,9 +1,9 @@
-import { MikroORMInstance } from '@services/mikro-orm.service'
+import { MikroORMInstance } from '@/server/services/mikro-orm'
 import { verify } from 'jsonwebtoken'
 import type { CreateNextContextOptions } from '@trpc/server/adapters/next'
 import { User } from '@/entities/user'
 import { BackendENV } from '@/env'
-import { UserManagement } from '@services/user.service'
+import { UserManagement } from '@/server/services/user'
 import { Logger } from '@saintno/needed-tools'
 
 const logger = new Logger('tRPC')

server/handlers/attachment.ts

@@ -1,7 +1,7 @@
 import Elysia, { NotFoundError, t } from 'elysia'
 import { EnsureMikroORMPlugin } from '../plugins/ensure-mikro-orm.plugin'
 import { Attachment } from '@/entities/attachment'
-import AttachmentService from '@services/attachment.service'
+import AttachmentService from '@/server/services/attachment'
 import { AttachmentSchema, AttachmentURLSchema } from '../schemas/attachment'
 import { EAttachmentStatus } from '@/entities/enum'
 import { EnsureTokenPlugin } from '../plugins/ensure-token-plugin'

server/handlers/task.ts

@@ -8,7 +8,7 @@ import { ETaskStatus } from '@/entities/enum'
 import { QueryOrder } from '@mikro-orm/core'
 import { AttachmentSchema, AttachmentURLSchema } from '../schemas/attachment'
 import { Attachment } from '@/entities/attachment'
-import AttachmentService from '@services/attachment.service'
+import AttachmentService from '@/server/services/attachment'
 import { EnsureBaseURL } from '../plugins/ensure-baseurl-plugin'
 
 export const TaskPlugin = new Elysia({ prefix: '/task', detail: { tags: ['Task'] } })

server/handlers/user.ts

@@ -1,6 +1,6 @@
 import { User } from '@/entities/user'
 import { BackendENV } from '@/env'
-import { MikroORMInstance } from '@services/mikro-orm.service'
+import { MikroORMInstance } from '@/server/services/mikro-orm'
 import Elysia, { t } from 'elysia'
 
 const mikro = MikroORMInstance.getInstance()

server/handlers/workflow.ts

@@ -17,7 +17,7 @@ import { WorkflowTaskEvent } from '@/entities/workflow_task_event'
 import { Trigger } from '@/entities/trigger'
 import { Workflow } from '@/entities/workflow'
 import { repeat } from 'lodash'
-import CachingService from '@services/caching.service'
+import CachingService from '@/server/services/caching'
 
 export const WorkflowPlugin = new Elysia({ prefix: '/workflow', detail: { tags: ['Workflow'] } })
   .use(EnsureMikroORMPlugin)

server/plugins/cleanup-jobs.plugin.ts

@@ -1,4 +1,4 @@
-import { CleanupService } from '@services/cleanup.service'
+import { CleanupService } from '@/server/services/cleanup'
 import { CLEANUP_CONFIG } from '../constants/cleanup'
 import { cron } from '@elysiajs/cron'
 import Elysia from 'elysia'

server/plugins/ensure-mikro-orm.plugin.ts

@@ -1,4 +1,4 @@
-import { MikroORMInstance } from '@services/mikro-orm.service'
+import { MikroORMInstance } from '@/server/services/mikro-orm'
 import Elysia from 'elysia'
 
 export const EnsureMikroORMPlugin = new Elysia().derive({ as: 'scoped' }, async () => {

server/routers/attachment.ts

@@ -2,7 +2,7 @@ import { z } from 'zod'
 import { privateProcedure } from '../procedure'
 import { router } from '../trpc'
 import { Attachment } from '@/entities/attachment'
-import AttachmentService from '@services/attachment.service'
+import AttachmentService from '@/server/services/attachment'
 import { EAttachmentStatus, EUserRole } from '@/entities/enum'
 import { ImageUtil } from '../utils/ImageUtil'
 import { ECompressPreset } from '@/constants/enum'

server/routers/client.ts

@@ -2,14 +2,14 @@ import { z } from 'zod'
 import { adminProcedure } from '../procedure'
 import { router } from '../trpc'
 import { Client } from '@/entities/client'
-import { ComfyPoolInstance } from '@services/comfyui.service'
+import { ComfyPoolInstance } from '@/server/services/comfyui'
 import { observable } from '@trpc/server/observable'
 import { ComfyApi, TMonitorEvent } from '@saintno/comfyui-sdk'
 import { EAuthMode, EClientAction, EClientStatus, EResourceType, ETriggerBy } from '@/entities/enum'
 import { ClientStatusEvent } from '@/entities/client_status_event'
 import { ClientActionEvent } from '@/entities/client_action_event'
 import { Trigger } from '@/entities/trigger'
-import CachingService from '@services/caching.service'
+import CachingService from '@/server/services/caching'
 import { Resource } from '@/entities/client_resource'
 import { Extension } from '@/entities/client_extension'
 import { EImportingClient } from '@/constants/enum'

server/routers/task.ts

@@ -4,7 +4,7 @@ import { router } from '../trpc'
 import { WorkflowTask } from '@/entities/workflow_task'
 import { EClientStatus, ETaskStatus, ETriggerBy, EUserRole } from '@/entities/enum'
 import { observable } from '@trpc/server/observable'
-import CachingService from '@services/caching.service'
+import CachingService from '@/server/services/caching'
 
 const cacher = CachingService.getInstance()
 

server/routers/token.ts

@@ -10,7 +10,7 @@ import { User } from '@/entities/user'
 import { v4 } from 'uuid'
 import { sign } from 'jsonwebtoken'
 import { BackendENV } from '@/env'
-import CachingService from '@services/caching.service'
+import CachingService from '@/server/services/caching'
 
 export const tokenRouter = router({
   list: privateProcedure.query(async ({ ctx }) => {

server/routers/user.ts

@@ -5,7 +5,7 @@ import { User } from '@/entities/user'
 import { EDeviceStatus, ETaskStatus, EUserRole } from '@/entities/enum'
 import { Attachment } from '@/entities/attachment'
 import { WorkflowTask } from '@/entities/workflow_task'
-import CachingService from '@services/caching.service'
+import CachingService from '@/server/services/caching'
 import { UserClient } from '@/entities/user_clients'
 
 export const userRouter = router({

server/routers/user_notification.ts

@@ -2,7 +2,7 @@ import { z } from 'zod'
 import { privateProcedure } from '../procedure'
 import { router } from '../trpc'
 import { UserNotification } from '@/entities/user_notifications'
-import CachingService from '@services/caching.service'
+import CachingService from '@/server/services/caching'
 import { EventEmitter, on } from 'node:events'
 
 export const UserNotificationEE = new EventEmitter()

server/routers/watch.ts

@@ -4,7 +4,7 @@ import { router } from '../trpc'
 import { z } from 'zod'
 import { observable } from '@trpc/server/observable'
 import { ETaskStatus, ETriggerBy, EUserRole } from '@/entities/enum'
-import CachingService from '@services/caching.service'
+import CachingService from '@/server/services/caching'
 import { WorkflowTask } from '@/entities/workflow_task'
 
 export const watchRouter = router({

server/routers/workflow.ts

@@ -4,10 +4,10 @@ import { z } from 'zod'
 import { IMapperOutput, Workflow } from '@/entities/workflow'
 import { EventEmitter, on } from 'node:events'
 import { observable } from '@trpc/server/observable'
-import { ComfyPoolInstance } from '@services/comfyui.service'
+import { ComfyPoolInstance } from '@/server/services/comfyui'
 import { CallWrapper } from '@saintno/comfyui-sdk'
 import { cloneDeep, uniqueId } from 'lodash'
-import AttachmentService, { EAttachmentType } from '@services/attachment.service'
+import AttachmentService, { EAttachmentType } from '@/server/services/attachment'
 import { EUserRole, EValueSelectionType, EValueType, EValueUtilityType, EWorkflowActiveStatus } from '@/entities/enum'
 import { Attachment } from '@/entities/attachment'
 import { TWorkflowProgressMessage } from '@/types/task'

server/routers/workflow_task.ts

@@ -12,11 +12,11 @@ import {
 } from '@/entities/enum'
 import { Workflow } from '@/entities/workflow'
 import { Trigger } from '@/entities/trigger'
-import CachingService from '@services/caching.service'
+import CachingService from '@/server/services/caching'
 import { v4 } from 'uuid'
 import { WorkflowTaskEvent } from '@/entities/workflow_task_event'
 import { convertObjectToArrayOfObjects, delay, seed } from '@/utils/tools'
-import AttachmentService from '@services/attachment.service'
+import AttachmentService from '@/server/services/attachment'
 import { Attachment } from '@/entities/attachment'
 
 export const workflowTaskRouter = router({

server/run.ts

@@ -3,18 +3,18 @@ import cors from 'cors'
 import { WebSocketServer } from 'ws'
 import type { Socket } from 'net'
 import { applyWSSHandler } from '@trpc/server/adapters/ws'
-import AttachmentService from '@services/attachment.service'
-import CachingService from '@services/caching.service'
-import { ComfyPoolInstance } from '@services/comfyui.service'
-import { MikroORMInstance } from '@services/mikro-orm.service'
+import AttachmentService from '@/server/services/attachment'
+import CachingService from '@/server/services/caching'
+import { ComfyPoolInstance } from '@/server/services/comfyui'
+import { MikroORMInstance } from '@/server/services/mikro-orm'
 import { createHTTPHandler } from '@trpc/server/adapters/standalone'
 
 import { convertIMessToRequest } from './utils/request'
 import { ElysiaHandler } from './elysia'
 import { appRouter } from './routers/_app'
 import { createContext } from './context'
-import { UserManagement } from '@services/user.service'
-import { CleanupService } from '@services/cleanup.service'
+import { UserManagement } from '@/server/services/user'
+import { CleanupService } from '@/server/services/cleanup'
 import { createPrefixedHandler } from './utils/handler'
 
 /**

server/schemas/attachment.ts

@@ -1,5 +1,5 @@
 import { EAttachmentStatus, EValueType } from '@/entities/enum'
-import { EAttachmentType } from '@services/attachment.service'
+import { EAttachmentType } from '@/server/services/attachment'
 import { t } from 'elysia'
 
 export const AttachmentSchema = t.Object({