Skip to content

fix CheckRunTimeError #3284

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

Merged
merged 1 commit into from
Jan 27, 2023
Merged

fix CheckRunTimeError #3284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions src/js/serial.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ const serial = {
self.connectionType = 'serial';

chrome.serial.connect(path, options, function (connectionInfo) {
if (connectionInfo && !self.openCanceled && !checkChromeRuntimeError()) {
self.failed = checkChromeRuntimeError();
if (connectionInfo && !self.openCanceled && !self.failed) {
self.connected = true;
self.connectionId = connectionInfo.connectionId;
self.bitrate = connectionInfo.bitrate;
Expand All @@ -65,6 +66,7 @@ const serial = {
if (!self.failed++) {
chrome.serial.setPaused(self.connectionId, false, function () {
self.getInfo(function (getInfo) {
checkChromeRuntimeError();
if (getInfo) {
if (!getInfo.paused) {
console.log(`${self.connectionType}: connection recovered from last onReceiveError`);
Expand All @@ -74,8 +76,6 @@ const serial = {
gui_log(i18n.getMessage('serialUnrecoverable'));
self.errorHandler(getInfo.error, 'receive');
}
} else {
checkChromeRuntimeError();
}
});
});
Expand All @@ -87,13 +87,14 @@ const serial = {
self.error = info.error;
setTimeout(function() {
chrome.serial.setPaused(info.connectionId, false, function() {
self.getInfo(function (_info) {
if (_info) {
if (_info.paused) {
checkChromeRuntimeError();
self.getInfo(function (getInfo) {
if (getInfo) {
if (getInfo.paused) {
// assume unrecoverable, disconnect
console.log(`${self.connectionType}: connection did not recover from ${self.error} condition, disconnecting`);
gui_log(i18n.getMessage('serialUnrecoverable'));
self.errorHandler(_info.error, 'receive');
self.errorHandler(getInfo.error, 'receive');
}
else {
console.log(`${self.connectionType}: connection recovered from ${self.error} condition`);
Expand Down
3 changes: 2 additions & 1 deletion src/js/utils/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import semver from "semver";
import { mixerList } from "../model";
import CONFIGURATOR from "../data_storage";
import { gui_log } from "../gui_log";

export function millitime() {
return new Date().getTime();
Expand Down Expand Up @@ -39,7 +40,7 @@ export function isInt(n) {
export function checkChromeRuntimeError() {
if (chrome.runtime.lastError) {
console.error(`Chrome API Error: ${chrome.runtime.lastError.message}.\n Traced ${new Error().stack}`);

gui_log(`Chrome API Error: ${chrome.runtime.lastError.message}.`);
return true;
}
return false;
Expand Down