Queue New Task
@@ -111,9 +150,15 @@
const data = await res.json();
const banner = document.getElementById('statusBanner');
+ const loginForm = document.getElementById('loginForm');
const mainDashboard = document.getElementById('mainDashboard');
const setupForm = document.getElementById('setupForm');
+ // If user is currently logging in (modal visible), don't disrupt them unless we detect a hard state change like logged_in
+ if (loginForm.style.display === 'block' && data.status !== 'logged_in') {
+ return;
+ }
+
if (data.status === 'logged_in') {
const name = data.me.first_name || 'User';
banner.className = 'alert alert-success d-flex justify-content-between align-items-center';
@@ -126,30 +171,95 @@
`;
mainDashboard.style.display = 'block';
setupForm.style.display = 'none';
+ loginForm.style.display = 'none'; // Close modal if success
} else if (data.status === 'waiting_for_config') {
banner.className = 'alert alert-danger d-flex justify-content-between align-items-center';
banner.innerText = 'Configuration Missing';
mainDashboard.style.display = 'none';
setupForm.style.display = 'block';
+ loginForm.style.display = 'none';
} else {
banner.className = 'alert alert-warning d-flex justify-content-between align-items-center';
banner.innerHTML = `
Disconnected: Worker is not logged in.
- Login Now
+
`;
mainDashboard.style.display = 'block';
setupForm.style.display = 'none';
+ // Don't auto-hide login form here, let the 'if' above handle it or user close it?
+ // Actually if we are here, it means we are disconnected.
+ // If the user hasn't opened the modal (handled above), ensure it's hidden (default state)
+ if (loginForm.style.display !== 'block') {
+ loginForm.style.display = 'none';
+ }
}
} catch(e) {
console.error("Status check failed", e);
}
}
+ async function startLogin() {
+ document.getElementById('statusBanner').style.display = 'none';
+ document.getElementById('mainDashboard').style.display = 'none';
+ document.getElementById('loginForm').style.display = 'block';
+ document.getElementById('loginStep1').style.display = 'block';
+
+ try {
+ // Empty body triggers use of config phone
+ const res = await fetch('/login', { method: 'POST' });
+ const json = await res.json();
+
+ if(json.status === 'code_requested') {
+ document.getElementById('loginStep1').style.display = 'none';
+ document.getElementById('loginStep2').style.display = 'block';
+ } else if (json.status === 'error') {
+ document.getElementById('loginMsg').innerText = json.message;
+ }
+ } catch(e) {
+ document.getElementById('loginMsg').innerText = e.message;
+ }
+ }
+
+ async function submitLoginCode() {
+ const code = document.getElementById('loginCode').value;
+ const res = await fetch('/login', {
+ method: 'POST',
+ headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+ body: 'code=' + encodeURIComponent(code)
+ });
+ const json = await res.json();
+
+ if (json.status === 'success') {
+ location.reload();
+ } else if (json.message && json.message.includes('password')) {
+ document.getElementById('loginStep2').style.display = 'none';
+ document.getElementById('loginStep3').style.display = 'block';
+ } else {
+ document.getElementById('loginMsg').innerText = json.message || 'Error';
+ }
+ }
+
+ async function submitLoginPassword() {
+ const password = document.getElementById('loginPassword').value;
+ const res = await fetch('/login', {
+ method: 'POST',
+ headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+ body: 'password=' + encodeURIComponent(password)
+ });
+ const json = await res.json();
+
+ if (json.status === 'success') {
+ location.reload();
+ } else {
+ document.getElementById('loginMsg').innerText = json.message || 'Error';
+ }
+ }
+
async function doReset() {
if(!confirm("Are you sure? This will delete the API ID/Hash and require setup again.")) return;
try {
diff --git a/src/index.php b/src/index.php
index 47e2179..8578f23 100644
--- a/src/index.php
+++ b/src/index.php
@@ -19,6 +19,13 @@ if ($method === 'POST' && $uri === '/api/queue') {
exit;
}
+ // Normalize Username (Add @ if missing and not numeric/phone)
+ $username = trim($data['username']);
+ if (!empty($username) && !is_numeric($username) && $username[0] !== '+' && $username[0] !== '@') {
+ $username = '@' . $username;
+ }
+ $data['username'] = $username;
+
$jobId = uniqid('job_');
$data['id'] = $jobId;
$data['status'] = 'queued';
@@ -31,7 +38,7 @@ if ($method === 'POST' && $uri === '/api/queue') {
// Push to history list (for display)
$redis->lpush('job_history', $jobId);
- echo json_encode(['job_id' => $jobId, 'status' => 'queued']);
+ echo json_encode(['job_id' => $jobId, 'status' => 'queued', 'normalized_username' => $username]);
exit;
}
@@ -107,6 +114,12 @@ if ($method === 'GET' && $uri === '/sendmessage') {
exit;
}
+ // Normalize Username (Add @ if missing and not numeric/phone)
+ $user = trim($user);
+ if (!empty($user) && !is_numeric($user) && $user[0] !== '+' && $user[0] !== '@') {
+ $user = '@' . $user;
+ }
+
$audio = 0;
if ($audioParam && strtolower($audioParam) === 'yes') {
$audio = 1;
@@ -144,15 +157,17 @@ if ($method === 'POST' && $uri === '/api/logout') {
// API: Save Config
if ($method === 'POST' && $uri === '/api/config') {
$data = json_decode(file_get_contents('php://input'), true);
- if (!isset($data['api_id'], $data['api_hash'])) {
+ if (!isset($data['api_id'], $data['api_hash'], $data['phone'])) {
http_response_code(400);
- echo json_encode(['error' => 'Missing api_id or api_hash']);
+ echo json_encode(['error' => 'Missing api_id, api_hash, or phone']);
exit;
}
file_put_contents('/app/data/config.json', json_encode([
'api_id' => trim($data['api_id']),
- 'api_hash' => trim($data['api_hash'])
+ 'api_hash' => trim($data['api_hash']),
+ 'phone' => trim($data['phone']),
+ 'call_timeout' => isset($data['call_timeout']) ? (int)$data['call_timeout'] : 15
]));
// Force worker restart to pick up new config
@@ -193,20 +208,27 @@ if ($method === 'POST' && $uri === '/login') {
// We will use a dedicated session API wrapper or just basic calls if possible.
// For simplicity, we try to Instantiate MP and check state.
+ // Load Config
+ if (!file_exists('/app/data/config.json')) {
+ echo json_encode(['status' => 'error', 'message' => 'Config missing']);
+ exit;
+ }
+ $config = json_decode(file_get_contents('/app/data/config.json'), true);
+
$settings = new \danog\MadelineProto\Settings();
$settings->setAppInfo((new \danog\MadelineProto\Settings\AppInfo())
- ->setApiId((int)getenv('API_ID'))
- ->setApiHash(getenv('API_HASH'))
+ ->setApiId((int)$config['api_id'])
+ ->setApiHash($config['api_hash'])
);
$MadelineProto = new API('/app/data/session.madeline', $settings);
- $phone = $_POST['phone'] ?? null;
+ $phone = $_POST['phone'] ?? $config['phone'] ?? null;
$code = $_POST['code'] ?? null;
$password = $_POST['password'] ?? null;
try {
- if ($phone) {
+ if ($phone && !$code && !$password) {
// Create lock file to pause worker
touch('/app/data/login.lock');
@@ -227,11 +249,10 @@ if ($method === 'POST' && $uri === '/login') {
echo json_encode(['status' => 'error', 'message' => 'Invalid Request']);
}
} catch (\Throwable $e) {
- // Don't remove lock on error immediately, user might retry code?
- // Actually if phoneLogin failed, we should probably remove it?
- // For now, let's keep it simple. If it's a fatal error or user gives up, they might need to restart.
- // Or we can provide a 'reset' button.
- // Let's just catch and return error.
+ // Remove lock on error so worker can resume or user can retry
+ if (file_exists('/app/data/login.lock')) {
+ unlink('/app/data/login.lock');
+ }
echo json_encode(['status' => 'error', 'message' => $e->getMessage()]);
}
exit;
diff --git a/src/worker.php b/src/worker.php
index 144d44f..c303301 100644
--- a/src/worker.php
+++ b/src/worker.php
@@ -13,6 +13,10 @@ use danog\MadelineProto\Settings\AppInfo;
echo "Worker Initializing...\n";
+// Cleanup stale locks
+if (file_exists('/app/data/login.lock')) unlink('/app/data/login.lock');
+if (file_exists('/app/data/logout.signal')) unlink('/app/data/logout.signal');
+
$redis->del('telegram:status');
$redis->del('telegram:me');
@@ -29,6 +33,8 @@ while (true) {
sleep(2);
}
+$redis->set('telegram:status', 'starting');
+
$settings = new Settings();
$settings->setAppInfo((new AppInfo())
->setApiId((int)$config['api_id'])
@@ -38,6 +44,14 @@ $settings->setAppInfo((new AppInfo())
$MadelineProto = null;
while (true) {
+ // Check for logout/reset signal
+ if (file_exists('/app/data/logout.signal')) {
+ echo "Worker received logout signal. Logging out...\n";
+ unlink('/app/data/logout.signal');
+ // We might not have an active instance to logout(), so just exit
+ exit(0);
+ }
+
// Check for login lock (Web UI is performing login)
if (file_exists('/app/data/login.lock')) {
echo "Worker detected login in progress. Sleeping...\n";
@@ -67,9 +81,14 @@ while (true) {
// Passive Wait Loop
$waited = 0;
while ($waited < 60) {
+ if (file_exists('/app/data/logout.signal')) {
+ echo "Worker received logout signal during wait. Logging out...\n";
+ unlink('/app/data/logout.signal');
+ exit(0);
+ }
if (file_exists('/app/data/login.lock')) {
echo "Worker detected login activity! Retrying...\n";
- break; // Break inner loop to restart main loop (which handles lock)
+ break; // Break inner loop
}
sleep(1);
$waited++;
@@ -82,9 +101,14 @@ while (true) {
$MadelineProto = null;
unset($MadelineProto);
- // Passive Wait Loop
+ // Passive Wait Loop Wait Loop
$waited = 0;
while ($waited < 60) {
+ if (file_exists('/app/data/logout.signal')) {
+ echo "Worker received logout signal during wait. Logging out...\n";
+ unlink('/app/data/logout.signal');
+ exit(0);
+ }
if (file_exists('/app/data/login.lock')) {
echo "Worker detected login activity! Retrying...\n";
break;
@@ -148,39 +172,68 @@ while (true) {
// Request Call (Synchronous return of VoIP controller)
$call = $MadelineProto->requestCall($task['username']);
- echo "Ringing...\n";
+ $timeoutSeconds = isset($config['call_timeout']) ? (int)$config['call_timeout'] : 15;
+ $timeoutLoops = $timeoutSeconds * 2; // 0.5s per loop
+
+ echo "Ringing (Timeout: {$timeoutSeconds}s)...\n";
$answered = false;
- for ($i = 0; $i < 60; $i++) {
+ $rejected = false;
+
+ for ($i = 0; $i < $timeoutLoops; $i++) {
try {
- // Check for answer
- // Note: STATE_ESTABLISHED is typically 3 or 4. We use the constant.
- if ($call->getCallState() === \danog\MadelineProto\VoIP::STATE_ESTABLISHED) {
+ $state = $call->getCallState();
+
+ // Check for answer (RUNNING or CONFIRMED)
+ if ($state === \danog\MadelineProto\VoIP\CallState::RUNNING || $state === \danog\MadelineProto\VoIP\CallState::CONFIRMED) {
$answered = true;
- echo "Call Answered!\n";
+ echo "Call Answered! (State: " . $state->name . ")\n";
+ break;
+ }
+ if ($state === \danog\MadelineProto\VoIP\CallState::ENDED) {
+ echo "Call Rejected or Ended prematurely.\n";
+ $rejected = true;
break;
}
} catch (\Throwable $e) {
- // Ignore state check errors temporarily
+ // echo "State check error: " . $e->getMessage() . "\n";
}
- sleep(1);
+ usleep(500000); // 0.5s
}
- if (!$answered) {
- echo "No answer after 60s. Cancelling.\n";
+ if ($rejected) {
+ $redis->hset("job:{$task['id']}", 'status', 'rejected');
+ } elseif (!$answered) {
+ echo "No answer after {$timeoutSeconds}s. Cancelling.\n";
$call->discard();
$redis->hset("job:{$task['id']}", 'status', 'no_answer');
continue;
+ } else {
+ // Answered case
+ // Play Audio AFTER answer
+ $call->play(new \danog\MadelineProto\LocalFile($audioFile));
+
+ // Wait for playback to complete, checking for hangup
+ $duration = TTS::getDuration($audioFile);
+ echo "Audio duration: {$duration}s. Playing...\n";
+
+ $startTime = microtime(true);
+ $waitTime = $duration + 2; // Buffer
+
+ while ((microtime(true) - $startTime) < $waitTime) {
+ try {
+ $state = $call->getCallState();
+ if ($state === \danog\MadelineProto\VoIP\CallState::ENDED) {
+ echo "User hung up during playback.\n";
+ break;
+ }
+ } catch (\Throwable $e) {
+ // Ignore state check errors during playback
+ }
+ usleep(500000); // 0.5s
+ }
+
+ $call->discard();
}
-
- // Play Audio AFTER answer
- $call->play(new \danog\MadelineProto\LocalFile($audioFile));
-
- // Wait for playback to complete (now accurate since we just started)
- $duration = TTS::getDuration($audioFile);
- echo "Audio duration: {$duration}s. Sleeping...\n";
- sleep((int)ceil($duration) + 2); // Buffer of 2s
-
- $call->discard();
}
$redis->hset("job:{$task['id']}", 'status', 'completed');