mirrors/fcast
1
0
Fork 0
mirror of https://gitlab.com/futo-org/fcast.git synced 2025-08-05 08:47:02 +00:00
Code Activity

WebOS 22 and 6.0 collection of fixes

Browse source
This commit is contained in:
Michael Hollister 2024-12-17 22:59:41 -06:00
parent 902ccff8bc
commit d57e1368b1
13 changed files with 228 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

35
receivers/common/web/main/Preload.ts
View file

@ -33,7 +33,19 @@ if (TARGET === 'electron') {
require('lib/webOSTVjs-1.2.10/webOSTV.js');
require('lib/webOSTVjs-1.2.10/webOSTV-dev.js');
const serviceId = 'com.futo.fcast.receiver.service';
let onDeviceInfoCb: any;
let onDeviceInfoCb = () => { console.log('Main: Callback not set while fetching device info'); };
const keepAliveService = window.webOS.service.request(`luna://${serviceId}/`, {
method:"keepAlive",
parameters: {},
onSuccess: (message: any) => {
console.log(`Main: keepAlive ${JSON.stringify(message)}`);
},
onFailure: (message: any) => {
console.error(`Main: keepAlive ${JSON.stringify(message)}`);
},
// onComplete: (message) => {},
});
const getDeviceInfoService = window.webOS.service.request(`luna://${serviceId}/`, {
method:"getDeviceInfo",
@ -58,9 +70,16 @@ if (TARGET === 'electron') {
console.log('Main: Registered play handler with service');
}
else {
console.log(`Main: Playing ${JSON.stringify(message)}`);
getDeviceInfoService.cancel();
playService.cancel();
if (message.value !== undefined && message.value.playData !== undefined) {
console.log(`Main: Playing ${JSON.stringify(message)}`);
getDeviceInfoService.cancel();
playService.cancel();
// WebOS 22 and earlier does not work well using the history API,
// so manually handling page navigation...
// history.pushState({}, '', '../main_window/index.html');
window.open('../player/index.html');
}
}
},
onFailure: (message: any) => {
@ -71,14 +90,14 @@ if (TARGET === 'electron') {
});
window.targetAPI = {
onDeviceInfo: (callback: any) => onDeviceInfoCb = callback,
onDeviceInfo: (callback: () => void) => onDeviceInfoCb = callback,
getDeviceInfo: () => deviceInfo,
};
document.addEventListener('webOSRelaunch', (args: any) => {
console.log(`Relaunching FCast Receiver with args: ${JSON.stringify(args)}`);
if (args.playData !== null) {
if (args.playData !== undefined) {
if (getDeviceInfoService !== undefined) {
getDeviceInfoService.cancel();
}
@ -86,7 +105,9 @@ if (TARGET === 'electron') {
playService.cancel();
}
history.pushState({}, '', '../main_window/index.html');
// WebOS 22 and earlier does not work well using the history API,
// so manually handling page navigation...
// history.pushState({}, '', '../main_window/index.html');
window.open('../player/index.html');
}
});

9
receivers/common/web/main/Renderer.ts
View file

@ -43,8 +43,13 @@ function renderIPsAndQRCode() {
},
errorCorrectionLevel : "M",
},
(e) => {
console.log(`Error rendering QR Code: ${e}`)
(err) => {
if (err) {
console.error(`Error rendering QR Code: ${err}`);
}
else {
console.log(`Rendered QR Code`);
}
});
onQRCodeRendered();