Merge branch 'feat/full-storage-and-db-support' of github.com:numengames/numinia-hyperfy2 into feat/full-storage-and-db-support

# Conflicts:
#	.env.example
#	scripts/clean-world.mjs
#	src/server/storage/StorageManager.js

Author: DevStarlight

.env.example

@@ -30,36 +30,17 @@ PUBLIC_API_URL=http://localhost:3000/api
 # The public url used by clients to fetch assets
 PUBLIC_ASSETS_URL=http://localhost:3000/assets
 
+# LiveKit (voice chat)
+LIVEKIT_WS_URL=
+LIVEKIT_API_KEY=
+LIVEKIT_API_SECRET=
+
 # ==============================================
 # DATABASE CONFIGURATION
 # ==============================================
 # Configure your database connection here.
 # 
 # Supported databases:
-# - PostgreSQL (DB_TYPE=pg)
-# - MySQL (DB_TYPE=mysql2) 
-# - SQLite (fallback - no configuration needed)
-#
-# If database environment variables are not provided,
-# the application will automatically fall back to SQLite.
-
-# Database type - specify the database engine to use
-# Options: 'pg' (PostgreSQL), 'mysql2' (MySQL)
-DB_TYPE=pg
-
-# Database connection details
-DB_HOST=localhost
-DB_PORT=5432
-DB_USER=your_username
-DB_PASSWORD=your_password
-DB_NAME=your_database_name
-DB_SCHEMA=your_database_schema
-
-# LiveKit (voice chat)
-LIVEKIT_WS_URL=
-LIVEKIT_API_KEY=
-LIVEKIT_API_SECRET=
-
 # - SQLite (default - no configuration needed)
 # - PostgreSQL (DB_TYPE=pg with DB_URL)
 #

package.json

@@ -70,6 +70,7 @@
     "yoga-layout": "^3.2.1"
   },
   "optionalDependencies": {
+    "pg": "^8.16.0",
     "@aws-sdk/client-s3": "^3.685.0",
     "@aws-sdk/s3-request-presigner": "^3.685.0",
     "pg": "^8.16.0"

src/server/storage/StorageManager.js

@@ -15,7 +15,6 @@ export class StorageManager {
     this.isS3 = false
     this.storageData = {}
     this.storageLoaded = false
-
     // Throttle saves to avoid too many writes
     this.saveStorageData = throttle(() => this.persistStorageData(), 1000, { leading: true, trailing: true })
   }
@@ -24,7 +23,14 @@ export class StorageManager {
    * Initialize storage based on environment configuration
    */
   async initialize() {
-    if (process.env.S3_BUCKET_NAME) {
+    const storageType = process.env.STORAGE_TYPE || StorageManager.STORAGE_TYPE.LOCAL;
+    
+    if (storageType === StorageManager.STORAGE_TYPE.S3) {
+      // Validate required S3 configuration
+      if (!process.env.S3_BUCKET_NAME) {
+        throw new Error('S3_BUCKET_NAME is required when STORAGE_TYPE=s3')
+      }
+      
       // Initialize S3 storage
       this.isS3 = true
       const s3Config = {
@@ -35,7 +41,6 @@ export class StorageManager {
         storagePrefix: process.env.S3_STORAGE_PREFIX || 'storage/',
         cloudfrontUrl: process.env.CLOUDFRONT_URL,
       }
-
       if (process.env.S3_ACCESS_KEY_ID && process.env.S3_SECRET_ACCESS_KEY) {
         s3Config.credentials = {
           accessKeyId: process.env.S3_ACCESS_KEY_ID,
@@ -57,6 +62,8 @@ export class StorageManager {
 
       console.log('Initializing local file storage...')
       await this.storage.initialize()
+    } else {
+      throw new Error(`Unsupported storage type: ${storageType}. Supported types: 'local', 's3'`)
     }
 
     // Initialize storage data
@@ -101,7 +108,6 @@ export class StorageManager {
       console.warn('Storage not yet loaded, cannot set value')
       return
     }
-
     try {
       // Ensure value is serializable
       value = JSON.parse(JSON.stringify(value))
@@ -120,7 +126,6 @@ export class StorageManager {
       console.warn('Storage not yet loaded, cannot persist')
       return
     }
-
     try {
       await this.storage.saveStorageData(this.storageData)
       // console.log('Storage data persisted successfully')