Replace Node.js placeholder with actual Museum server
This commit is contained in:
Andreas Düren
parent
950481b6c7
commit
f27720d544
202
start.sh
202
start.sh
@ -143,156 +143,90 @@ else
|
|||||||
echo "==> PostgreSQL connection successful"
|
echo "==> PostgreSQL connection successful"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Create Node.js placeholder server - we'll use this instead of trying to build with Go
|
# Build and run the Museum server
|
||||||
echo "==> Creating Node.js placeholder server..."
|
echo "==> Setting up Museum server..."
|
||||||
cat > /app/data/ente/server/server.js << 'EOF'
|
|
||||||
const http = require('http');
|
|
||||||
const fs = require('fs');
|
|
||||||
const path = require('path');
|
|
||||||
|
|
||||||
const PORT = 3080;
|
# Set GOPATH for Go builds
|
||||||
const LOG_FILE = '/app/data/logs/museum.log';
|
export GOPATH="/app/data/go"
|
||||||
|
export PATH="$GOPATH/bin:$PATH"
|
||||||
|
|
||||||
// Ensure log directory exists
|
# Check for existing Museum binary
|
||||||
if (!fs.existsSync('/app/data/logs')) {
|
MUSEUM_BIN="/app/data/ente/server/museum"
|
||||||
fs.mkdirSync('/app/data/logs', { recursive: true });
|
if [ -f "$MUSEUM_BIN" ] && [ -x "$MUSEUM_BIN" ]; then
|
||||||
}
|
echo "==> Found existing Museum binary, using it"
|
||||||
|
else
|
||||||
|
echo "==> Building Museum server from source..."
|
||||||
|
|
||||||
|
# Install required build dependencies
|
||||||
|
echo "==> Installing build dependencies..."
|
||||||
|
apt-get update -y && apt-get install -y golang-go gcc libsodium-dev pkg-config
|
||||||
|
|
||||||
|
# Navigate to the server directory
|
||||||
|
cd "$ENTE_DIR/server"
|
||||||
|
|
||||||
|
# Build the Museum server
|
||||||
|
echo "==> Building Museum server..."
|
||||||
|
go build -o "$MUSEUM_BIN" ./cmd/museum
|
||||||
|
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "==> Failed to build Museum server from source"
|
||||||
|
echo "==> Trying to download pre-built binary..."
|
||||||
|
|
||||||
|
# Determine architecture and platform
|
||||||
|
ARCH=$(uname -m)
|
||||||
|
OS=$(uname -s | tr '[:upper:]' '[:lower:]')
|
||||||
|
|
||||||
|
case "$ARCH" in
|
||||||
|
x86_64)
|
||||||
|
ARCH="amd64"
|
||||||
|
;;
|
||||||
|
aarch64|arm64)
|
||||||
|
ARCH="arm64"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
MUSEUM_URL="https://github.com/ente-io/ente/releases/latest/download/museum-${OS}-${ARCH}"
|
||||||
|
curl -L -o "$MUSEUM_BIN" "$MUSEUM_URL"
|
||||||
|
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "==> Failed to download pre-built binary"
|
||||||
|
exit 1
|
||||||
|
else
|
||||||
|
chmod +x "$MUSEUM_BIN"
|
||||||
|
echo "==> Downloaded pre-built Museum binary"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
chmod +x "$MUSEUM_BIN"
|
||||||
|
echo "==> Successfully built Museum server"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
// Log function
|
# Start the Museum server
|
||||||
function log(message) {
|
echo "==> Starting Museum server..."
|
||||||
const timestamp = new Date().toISOString();
|
|
||||||
const logMessage = `${timestamp} - ${message}\n`;
|
|
||||||
console.log(logMessage);
|
|
||||||
try {
|
|
||||||
fs.appendFileSync(LOG_FILE, logMessage);
|
|
||||||
} catch (err) {
|
|
||||||
console.error(`Error writing to log: ${err.message}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
log('Starting Node.js placeholder server...');
|
|
||||||
|
|
||||||
// Create server
|
|
||||||
const server = http.createServer((req, res) => {
|
|
||||||
log(`Request received: ${req.method} ${req.url}`);
|
|
||||||
|
|
||||||
// Set CORS headers for all responses
|
|
||||||
res.setHeader('Access-Control-Allow-Origin', '*');
|
|
||||||
res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS, PUT, PATCH, DELETE');
|
|
||||||
res.setHeader('Access-Control-Allow-Headers', 'X-Requested-With,content-type,Authorization');
|
|
||||||
|
|
||||||
// Handle OPTIONS request (for CORS preflight)
|
|
||||||
if (req.method === 'OPTIONS') {
|
|
||||||
res.writeHead(200);
|
|
||||||
res.end();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Health check endpoint
|
|
||||||
if (req.url === '/health' || req.url === '/api/health') {
|
|
||||||
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
||||||
res.end(JSON.stringify({ status: 'OK', server: 'Museum Placeholder' }));
|
|
||||||
log('Health check request - responded with status OK');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Authentication endpoints
|
|
||||||
if (req.url === '/api/users/verify') {
|
|
||||||
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
||||||
log('User verify request - responding with success');
|
|
||||||
res.end(JSON.stringify({
|
|
||||||
success: true,
|
|
||||||
isValidEmail: true,
|
|
||||||
isAvailable: true,
|
|
||||||
isVerified: true,
|
|
||||||
canCreateAccount: true
|
|
||||||
}));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle all API requests with a generic success response
|
|
||||||
if (req.url.startsWith('/api/')) {
|
|
||||||
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
||||||
log(`API request to ${req.url} - responding with generic success`);
|
|
||||||
res.end(JSON.stringify({
|
|
||||||
success: true,
|
|
||||||
message: 'Placeholder API response',
|
|
||||||
path: req.url
|
|
||||||
}));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Default response for any other endpoint
|
|
||||||
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
||||||
log(`Unknown request to ${req.url} - responding with default message`);
|
|
||||||
res.end(JSON.stringify({
|
|
||||||
message: 'Placeholder Museum Server',
|
|
||||||
path: req.url,
|
|
||||||
server: 'Node.js Placeholder'
|
|
||||||
}));
|
|
||||||
});
|
|
||||||
|
|
||||||
// Start server
|
|
||||||
try {
|
|
||||||
server.listen(PORT, '0.0.0.0', () => {
|
|
||||||
log(`Museum placeholder server running on port ${PORT}`);
|
|
||||||
log(`Server is listening at http://0.0.0.0:${PORT}`);
|
|
||||||
});
|
|
||||||
} catch (err) {
|
|
||||||
log(`Failed to start server: ${err.message}`);
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle errors
|
|
||||||
server.on('error', (error) => {
|
|
||||||
log(`Server error: ${error.message}`);
|
|
||||||
if (error.code === 'EADDRINUSE') {
|
|
||||||
log('Address already in use, retrying in 5 seconds...');
|
|
||||||
setTimeout(() => {
|
|
||||||
server.close();
|
|
||||||
server.listen(PORT, '0.0.0.0');
|
|
||||||
}, 5000);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Log startup
|
|
||||||
log('Museum placeholder server initialization complete');
|
|
||||||
EOF
|
|
||||||
echo "==> Created Node.js placeholder server"
|
|
||||||
|
|
||||||
# Start Node.js placeholder server
|
|
||||||
echo "==> Starting Node.js placeholder server..."
|
|
||||||
cd /app/data/ente/server
|
cd /app/data/ente/server
|
||||||
node server.js > /app/data/logs/museum_startup.log 2>&1 &
|
"$MUSEUM_BIN" --config "$MUSEUM_CONFIG" > /app/data/logs/museum.log 2>&1 &
|
||||||
SERVER_PID=$!
|
MUSEUM_PID=$!
|
||||||
echo "==> Started Node.js server with PID: $SERVER_PID"
|
echo "==> Started Museum server with PID: $MUSEUM_PID"
|
||||||
|
|
||||||
# Wait for server to start
|
# Wait for server to start
|
||||||
MAX_ATTEMPTS=30
|
MAX_ATTEMPTS=30
|
||||||
ATTEMPT=0
|
ATTEMPT=0
|
||||||
while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
|
while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
|
||||||
if curl -s http://localhost:3080/health > /dev/null; then
|
if curl -s http://localhost:3080/health > /dev/null; then
|
||||||
echo "==> Node.js placeholder server started successfully"
|
echo "==> Museum server started successfully"
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
ATTEMPT=$((ATTEMPT+1))
|
ATTEMPT=$((ATTEMPT+1))
|
||||||
echo "==> Waiting for Node.js server to start (attempt $ATTEMPT/$MAX_ATTEMPTS)..."
|
echo "==> Waiting for Museum server to start (attempt $ATTEMPT/$MAX_ATTEMPTS)..."
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ $ATTEMPT -eq $MAX_ATTEMPTS ]; then
|
if [ $ATTEMPT -eq $MAX_ATTEMPTS ]; then
|
||||||
echo "==> ERROR: Node.js server failed to start within $MAX_ATTEMPTS seconds"
|
echo "==> ERROR: Museum server failed to start within $MAX_ATTEMPTS seconds"
|
||||||
echo "==> Last few lines of museum_startup.log:"
|
echo "==> Last few lines of museum.log:"
|
||||||
tail -n 20 /app/data/logs/museum_startup.log || echo "==> No log file found"
|
tail -n 20 /app/data/logs/museum.log || echo "==> No log file found"
|
||||||
|
echo "==> Aborting startup"
|
||||||
# Check if the process is still running
|
exit 1
|
||||||
if kill -0 $SERVER_PID 2>/dev/null; then
|
|
||||||
echo "==> Process is still running, but not responding to health checks"
|
|
||||||
else
|
|
||||||
echo "==> Process is not running. Attempting to restart..."
|
|
||||||
node /app/data/ente/server/server.js > /app/data/logs/museum.log 2>&1 &
|
|
||||||
echo "==> Restarted Node.js server"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Download and set up web app
|
# Download and set up web app
|
||||||
@ -441,7 +375,7 @@ echo "==> Setup complete, everything is running."
|
|||||||
|
|
||||||
# Verify services are running
|
# Verify services are running
|
||||||
echo "==> Verifying services..."
|
echo "==> Verifying services..."
|
||||||
ps aux | grep node | grep -v grep || echo "WARNING: Node.js server not running!"
|
ps aux | grep museum | grep -v grep || echo "WARNING: Museum server not running!"
|
||||||
ps aux | grep caddy | grep -v grep || echo "WARNING: Caddy server not running!"
|
ps aux | grep caddy | grep -v grep || echo "WARNING: Caddy server not running!"
|
||||||
|
|
||||||
# Keep script running
|
# Keep script running
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user