Skip to content

Fix rare extension freeze #148 #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ascens1ve wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fix rare extension freeze #148 #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
723c54d
Fix: add correct behavior to chrome sendMessage
Ascens1ve May 18, 2025
390a8f3
Add await to async function
Ascens1ve May 22, 2025
c70ba80
Server off for test build
proitshnik May 25, 2025
354ceb0
Add reject to Promise
Ascens1ve May 25, 2025
b6f7179
Merge branch 'main' into fix_rare_extension_freeze_148
proitshnik May 25, 2025
ad587b0
Update: delete event listener after click close button
Ascens1ve May 25, 2025
e4eeef4
Merge branch 'main' into fix_rare_extension_freeze_148
proitshnik May 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions client/scripts/background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,8 @@ chrome.runtime.onMessage.addListener(
logClientAction("listener gotoMediaTab");
// Активируем вкладку media.html (по URL, переданному в message.mediaExtensionUrl)
openTab(message.mediaExtensionUrl);
sendResponse({status: "gotoMediaTab_processed"});
return true;
}
if (message.action === "closeTabAndOpenTab") {
chrome.tabs.query({ url: message.mediaExtensionUrl }, (tabs) => {
Expand All @@ -289,7 +291,10 @@ chrome.runtime.onMessage.addListener(
openTab(message.settingsUrl);
}
});
sendResponse({status: "closeTab_processed"});
return true;
}
sendResponse(message);
return false;
}
);
12 changes: 7 additions & 5 deletions client/scripts/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export async function deleteFilesFromTempList() {
}

export async function showModalNotify(messages, title = "Уведомление", showOnActiveTab = false, mediaIntependent=false) {
chrome.runtime.sendMessage({ action: "closePopup" });
await chrome.runtime.sendMessage({ action: "closePopup" });

logClientAction({ action: "showModalNotify", showOnActiveTab});

Expand Down Expand Up @@ -49,7 +49,7 @@ export async function showModalNotify(messages, title = "Уведомление"
throw error;
}
} else {
return new Promise((resolve) => {
return new Promise((resolve, reject) => {
chrome.runtime.sendMessage({
action: "gotoMediaTab",
mediaExtensionUrl: chrome.runtime.getURL("pages/media.html") }, (response) => {
Expand Down Expand Up @@ -81,17 +81,19 @@ export async function showModalNotify(messages, title = "Уведомление"
<button id="modal-close-btn">Хорошо. Я прочитал(а).</button>
`;

modal.querySelector('#modal-close-btn').addEventListener('click', () => {
const closeButton = modal.querySelector('#modal-close-btn');
const closeModalHandler = () => {
closeButton.removeEventListener('click', closeModalHandler);
overlay.remove();
document.body.style.overflow = '';
resolve();
});
}
closeButton.addEventListener('click', closeModalHandler);

document.body.style.overflow = 'hidden';
overlay.appendChild(modal);
document.body.appendChild(overlay);
} else {

chrome.runtime.sendMessage({
type: "showModalNotifyOnMedia",
messages: messages,
Expand Down
9 changes: 1 addition & 8 deletions client/scripts/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const recordTime = document.querySelector('#record-time')

let timerInterval = null;
let startTime = null;
let server_connection = true;
let server_connection = false;
chrome.storage.local.set({'server_connection': server_connection});

const inputElements = {
Expand Down Expand Up @@ -470,17 +470,12 @@ chrome.runtime.onMessage.addListener((message) => {

chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
if (message.type === 'stopRecordSignal') {
console.log('Received stopRecordSignal');

clearInterval(timerInterval);

chrome.storage.local.get(['timeStr'], (result) => {
const timeStr = result.timeStr;
recordTime.textContent = timeStr;
sendResponse({status: 'stopRecordSignalProcessed'});
});

sendResponse({status: 'stopRecordSignalProcessed'});
return true;
}
});
Expand Down Expand Up @@ -546,8 +541,6 @@ async function uploadVideo() {
const metadata = (await chrome.storage.local.get('metadata'))['metadata'] || {};
formData.append("metadata", metadata);

//logClientAction({ action: "Prepare upload payload", sessionId: session_id, fileNames: [combinedFileName, cameraFileName] });

if (extension_logs) {
let logsToSend;
if (typeof extension_logs === "string") {
Expand Down
81 changes: 51 additions & 30 deletions client/scripts/media.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@ async function sendButtonsStates(state) {
}
}

const updateInvalidStopValue = (flag) => {
const updateInvalidStopValue = async (flag) => {
invalidStop = flag;
chrome.storage.local.set({ 'invalidStop': flag });
await chrome.storage.local.set({ 'invalidStop': flag });
}

async function getMediaDevices() {
Expand Down Expand Up @@ -252,7 +252,15 @@ async function getMediaDevices() {
throw new Error('Не удалось получить видеопоток с экрана');
}

chrome.runtime.sendMessage({ type: 'screenCaptureStatus', active: true });
chrome.runtime.sendMessage(
{ type: 'screenCaptureStatus', active: true },
(response) => {
if (chrome.runtime.lastError) {
logClientAction(`Screen capture status sending failed. Error: ${chrome.runtime.lastError.message}`);
return;
}
logClientAction(`Screen capture status sending was successful: ${response}`);
});

let micPermissionDenied = false;
let camPermissionDenied = false;
Expand Down Expand Up @@ -349,6 +357,12 @@ async function getMediaDevices() {
action: 'closeTabAndOpenTab',
mediaExtensionUrl: mediaExtensionUrl,
settingsUrl: settingsUrl
}, (response) => {
if (chrome.runtime.lastError) {
logClientAction(`Close tab and open tab was failed. Error: ${chrome.runtime.lastError.message}`);
return;
}
logClientAction(`Close tab and open tab was successful: ${response}`);
});

logClientAction({ action: "Redirect to permission settings" });
Expand All @@ -373,13 +387,21 @@ async function getMediaDevices() {
stopDuration();
await sendButtonsStates('needPermissions');
await showModalNotify(["Текущие записи завершатся. Чтобы продолжить запись заново, выдайте разрешения во всплывающем окне по кнопке Разрешения и начните запись."], "Доступ к камере потерян!");
updateInvalidStopValue(true);
await updateInvalidStopValue(true);
stopRecord();
}
};

streams.screen.getVideoTracks()[0].onended = async function () {
chrome.runtime.sendMessage({ type: 'screenCaptureStatus', active: false });
chrome.runtime.sendMessage(
{ type: 'screenCaptureStatus', active: false },
(response) => {
if (chrome.runtime.lastError) {
logClientAction(`Screen capture status sending failed. Error: ${chrome.runtime.lastError.message}`);
return;
}
logClientAction(`Screen capture status sending was successful: ${response}`);
});
if (streamLossSource) return;
streamLossSource = 'screen';
logClientAction('Screen stream ended');
Expand All @@ -393,7 +415,7 @@ async function getMediaDevices() {
stopDuration();
await sendButtonsStates('needPermissions');
await showModalNotify(["Текущие записи завершатся. Чтобы продолжить запись заново, выдайте разрешения в расширении во всплывающем окне по кнопке Разрешения и начните запись."], "Доступ к экрану потерян!");
updateInvalidStopValue(true);
await updateInvalidStopValue(true);
stopRecord();
}
};
Expand All @@ -412,7 +434,7 @@ async function getMediaDevices() {
stopDuration();
await sendButtonsStates('needPermissions');
await showModalNotify(["Текущие записи завершатся. Чтобы продолжить запись заново, выдайте разрешения в расширении во всплывающем окне по кнопке Разрешения и начните запись."], "Доступ к микрофону потерян!");
updateInvalidStopValue(true);
await updateInvalidStopValue(true);
stopRecord();
}
};
Expand Down Expand Up @@ -654,7 +676,7 @@ chrome.runtime.onMessage.addListener(async (message, sender, sendResponse) => {
window.removeEventListener('beforeunload', beforeUnloadHandler);
stopRecord();
await setMetadatasRecordOff();
chrome.storage.local.set({'metadata': JSON.stringify(metadata)});
await chrome.storage.local.set({'metadata': JSON.stringify(metadata)});
await sendButtonsStates('readyToUpload');
}
}
Expand Down Expand Up @@ -686,7 +708,7 @@ chrome.runtime.onMessage.addListener(async (message, sender, sendResponse) => {
});
}
else if (message.action === 'startRecording') {
updateInvalidStopValue(
await updateInvalidStopValue(
(await chrome.storage.local.get('invalidStop'))['invalidStop'] || false
);
if (!invalidStop) await checkAndCleanLogs();
Expand Down Expand Up @@ -724,7 +746,7 @@ chrome.runtime.onMessage.addListener(async (message, sender, sendResponse) => {
logClientAction({ action: "Generate session ID locally", sessionId });
}
}
updateInvalidStopValue(false);
await updateInvalidStopValue(false);

startRecord()
.then(async () => {
Expand Down Expand Up @@ -793,7 +815,7 @@ async function initSession(formData) {
}
}

function stopDuration() {
async function stopDuration() {
const durationMs = new Date() - startTime;

const seconds = Math.floor((durationMs / 1000) % 60);
Expand All @@ -804,22 +826,30 @@ function stopDuration() {
`${minutes.toString().padStart(2, '0')}:` +
`${seconds.toString().padStart(2, '0')}`;

chrome.storage.local.set({
'timeStr': timeStr
}, function() {
console.log('timeStr saved to storage');
logClientAction("stopDuration timeStr saved to storage");
});
await chrome.storage.local.set({ 'timeStr': timeStr });
logClientAction("stopDuration timeStr saved to storage");

chrome.runtime.sendMessage({type: 'stopRecordSignal'}, function(response) {
console.log('stopRecordSignal sent');
logClientAction("stopDuration stopRecordSignal sent");
chrome.runtime.sendMessage({type: 'stopRecordSignal'}, (response) => {
if (chrome.runtime.lastError) {
logClientAction(`Stop record signal is failed. Error: ${chrome.runtime.lastError.message}`);
return;
}
logClientAction(`stopDuration stopRecordSignal received: ${response}`);
});
}

async function stopRecord() {
if (!invalidStop) stopDuration();
chrome.runtime.sendMessage({ type: 'screenCaptureStatus', active: false });

chrome.runtime.sendMessage(
{ type: 'screenCaptureStatus', active: false },
(response) => {
if (chrome.runtime.lastError) {
logClientAction(`Screen capture status sending failed. Error: ${chrome.runtime.lastError.message}`);
return;
}
logClientAction(`Screen capture status sending was successful: ${response}`);
});

isRecording = false;
isPreviewEnabled = false;
Expand Down Expand Up @@ -984,14 +1014,6 @@ async function startRecord() {
await addFileToTempList(cameraFileName);
logClientAction('Files added to temp list');

chrome.storage.local.set({
'fileNames': {
screen: combinedFileName,
camera: cameraFileName
}
});
logClientAction({ action: "Save fileNames to storage" });

await chrome.runtime.sendMessage({
action: 'scheduleCleanup',
delayMinutes: 245
Expand All @@ -1016,7 +1038,6 @@ async function startRecord() {

console.log('Запись начата');
logClientAction('recording_started');
//chrome.runtime.sendMessage({ action: "closePopup" });
} catch (error) {
console.error('Ошибка при запуске записи:', error.message);
logClientAction({ action: "Fail to start recording", error: error.message });
Expand Down