Improve file permissions and error handling - use dedicated data directory

Dockerfile

@@ -10,16 +10,19 @@ COPY package*.json ./
 # Install dependencies
 RUN npm ci --only=production
 
+# Create a non-root user first
+RUN addgroup -g 1001 -S nodejs
+RUN adduser -S nodejs -u 1001
+
 # Copy the rest of the application code
 COPY . .
 
-# Create a non-root user
-RUN addgroup -g 1001 -S nodejs
-RUN adduser -S nodejs -u 1001
+# Create data directory for persistent storage
+RUN mkdir -p /app/data
 
 # Ensure devices.json exists and has proper permissions
-RUN touch /app/devices.json && \
-    chmod 664 /app/devices.json
+RUN touch /app/data/devices.json && \
+    chmod 666 /app/data/devices.json
 
 # Change ownership of the app directory to the nodejs user
 RUN chown -R nodejs:nodejs /app

server.js

@@ -3,7 +3,6 @@ const admin = require('firebase-admin');
 const cors = require('cors');
 const bodyParser = require('body-parser');
 const os = require('os');
-const HFDatasetManager = require('./hf-dataset');
 require('dotenv').config();
 
 const app = express();
@@ -60,52 +59,71 @@ const sampleProducts = [
 const fs = require('fs');
 const path = require('path');
 
-// Initialize HF Dataset Manager
-const hfDataset = new HFDatasetManager();
+// File storage for FCM tokens
+const DEVICES_FILE = path.join(__dirname, 'data', 'devices.json');
 
-// Device storage
+// Fallback to in-memory storage if file operations fail
+let fileOperationsEnabled = true;
+
+// Load devices from file or create empty storage
 let deviceTokens = new Map();
 
-async function loadDevicesFromHF() {
+function loadDevicesFromFile() {
   try {
-    deviceTokens = await hfDataset.loadDevices();
-    console.log(`📥 Loaded ${deviceTokens.size} devices from HF dataset`);
+    // Ensure data directory exists
+    const dataDir = path.dirname(DEVICES_FILE);
+    if (!fs.existsSync(dataDir)) {
+      console.log('📁 Creating data directory');
+      fs.mkdirSync(dataDir, { recursive: true });
+    }
+    
+    if (fs.existsSync(DEVICES_FILE)) {
+      const data = fs.readFileSync(DEVICES_FILE, 'utf8');
+      const devicesArray = JSON.parse(data);
+      deviceTokens = new Map(devicesArray);
+      console.log(`📁 Loaded ${deviceTokens.size} devices from file`);
+    } else {
+      console.log('📁 No devices file found, starting fresh');
+      // Try to create an empty file to test write permissions
+      try {
+        fs.writeFileSync(DEVICES_FILE, '[]');
+        console.log('📁 Created empty devices file');
+      } catch (writeError) {
+        console.warn('⚠️ Cannot create devices file, will use in-memory storage only');
+        console.warn('⚠️ File write error:', writeError.message);
+        fileOperationsEnabled = false;
+      }
+    }
   } catch (error) {
-    console.error('❌ Error loading devices from HF dataset:', error);
+    console.error('❌ Error loading devices file:', error.message);
+    console.log('⚠️ Using in-memory storage only');
+    fileOperationsEnabled = false;
     deviceTokens = new Map();
   }
 }
 
-async function saveDevicesToHF() {
-  try {
-    const success = await hfDataset.saveDevices(deviceTokens);
-    if (success) {
-      console.log(`💾 Saved ${deviceTokens.size} devices to HF dataset`);
-    } else {
-      console.log('⚠️ Failed to save devices to HF dataset');
+function saveDevicesToFile() {
+  if (!fileOperationsEnabled) {
+    // Only log this occasionally to avoid spam
+    if (Math.random() < 0.1) {
+      console.log('💾 File operations disabled, keeping devices in memory only');
     }
-  } catch (error) {
-    console.error('❌ Error saving devices to HF dataset:', error);
+    return;
   }
-}
-
-// Initialize HF dataset and load devices on startup
-async function initializeServer() {
+  
   try {
-    // Create dataset if it doesn't exist
-    await hfDataset.createDatasetIfNotExists();
-    
-    // Load devices from HF dataset
-    await loadDevicesFromHF();
-    
-    console.log('✅ Server initialization completed');
+    const devicesArray = Array.from(deviceTokens.entries());
+    fs.writeFileSync(DEVICES_FILE, JSON.stringify(devicesArray, null, 2));
+    console.log(`💾 Saved ${deviceTokens.size} devices to file`);
   } catch (error) {
-    console.error('❌ Error during server initialization:', error);
+    console.error('❌ Error saving devices file:', error.message);
+    console.log('⚠️ Disabling file operations, using in-memory storage only');
+    fileOperationsEnabled = false;
   }
 }
 
-// Start initialization (don't await here to avoid blocking)
-initializeServer();
+// Load devices on startup
+loadDevicesFromFile();
 
 // Routes
 
@@ -115,7 +133,7 @@ app.get('/', (req, res) => {
     message: 'Houzou Medical Notification Server',
     status: 'running',
     timestamp: new Date().toISOString(),
-    hfDataset: hfDataset.getStatus(),
+    fileOperationsEnabled: fileOperationsEnabled,
     deviceCount: deviceTokens.size
   });
 });
@@ -426,8 +444,8 @@ app.post('/register-token', async (req, res) => {
       console.warn(`⚠️ Failed to subscribe device to topic: ${topicError.message}`);
     }
 
-    // Save to HF dataset
-    saveDevicesToHF();
+    // Save to file
+    saveDevicesToFile();
 
     res.json({
       success: true,
@@ -469,8 +487,8 @@ app.post('/unregister-token', async (req, res) => {
       console.log(`📱 Token unregistered for device ${deviceId}`);
     }
 
-    // Save to HF dataset
-    saveDevicesToHF();
+    // Save to file
+    saveDevicesToFile();
 
     res.json({
       success: true,
@@ -524,7 +542,7 @@ app.post('/debug-add-device', (req, res) => {
       registered: true
     });
     
-    saveDevicesToHF();
+    saveDevicesToFile();
     
     console.log(`🔧 Debug: Added device ${deviceId} (${platform})`);
     
@@ -635,7 +653,7 @@ app.post('/send-broadcast-notification', async (req, res) => {
             }
           }
         });
-        saveDevicesToHF();
+        saveDevicesToFile();
       } else {
         console.log(`⚠️ No tokens removed - all failures appear to be temporary`);
       }
@@ -694,7 +712,8 @@ app.listen(PORT, () => {
   console.log(`   Local:    http://localhost:${PORT}`);
   console.log(`   Network:  http://${localIP}:${PORT}`);
   console.log(`\n🔧 For iPhone app, use: http://${localIP}:${PORT}`);
-  console.log(`🤗 Devices stored in HF dataset: ${hfDataset.datasetId}`);
+  console.log(`📁 Devices storage: ${fileOperationsEnabled ? DEVICES_FILE : 'In-memory only'}`);
+  console.log(`💾 File operations: ${fileOperationsEnabled ? 'Enabled' : 'Disabled'}`);
 });
 
 module.exports = app;