Skip to content
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

Optimus add autoRestart property for application #2270

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Optimus add autoRestart property for application #2270

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
66 changes: 57 additions & 9 deletions examples/pxScene2d/src/rcvrcore/optimus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ var ApplicationState = Object.freeze({
DESTROYED:"DESTROYED"
});

var ApplicationRestartType = Object.freeze({
NEVER:"NEVER",
AFTER_CRASH:"AFTER_CRASH",
ALWAYS:"ALWAYS"
});

/**
* @param props
* @example
Expand Down Expand Up @@ -78,6 +84,7 @@ function Application(props) {
this.createTime = 0;
this.uri = "";
this.type = ApplicationType.UNDEFINED;
this.autoRestart = ApplicationRestartType.NEVER;
this.expectedMemoryUsage = -1;
this.actualMemoryUsage = -1;
var _readyBaseResolve = function(){};
Expand Down Expand Up @@ -623,6 +630,9 @@ function Application(props) {
if ("displayName" in props) {
displayName = props.displayName;
}
if ("autoRestart" in props) {
this.autoRestart = props.autoRestart;
}

this.log("cmd:",cmd,"uri:",uri,"w:",w,"h:",h,"hasApi:",hasApi);

Expand Down Expand Up @@ -695,11 +705,19 @@ function Application(props) {
_externalApp.on("onClientStarted", function () { _this.log("onClientStarted"); });
_externalApp.on("onClientConnected", function () { _this.log("onClientConnected"); });
_externalApp.on("onClientDisconnected", function () { _this.log("onClientDisconnected"); }); // called on client crash
_externalApp.on("onClientStopped", function () { // called on client crash
_externalApp.on("onClientStopped", function restartSparkApp(e) { // called on client crash
_this.log("onClientStopped");
setTimeout(function () {
_this.destroy();
});
if((e.crash && _this.autoRestart === ApplicationRestartType.AFTER_CRASH) || _this.autoRestart === ApplicationRestartType.ALWAYS) {
_this.log("sparkInstance app crashed, restarting:" + uri);
_externalApp = scene.create( {t:"external", parent:appParent, cmd:"spark " + uri, w:w, h:h, hasApi:true} );
_externalApp.on("onClientStopped", function (e) { restartSparkApp(e); });
_this.setProperties(props);
}
else {
setTimeout(function () {
_this.destroy();
});
}
});
_externalApp.ready.then(function() {
}, function rejection() {
Expand Down Expand Up @@ -737,7 +755,29 @@ function Application(props) {
_externalApp.on("onReady", function () { _this.log("onReady"); });
_externalApp.on("onClientStarted", function () { _this.log("onClientStarted"); });
_externalApp.on("onClientConnected", function () { _this.log("onClientConnected"); });
_externalApp.on("onClientDisconnected", function () { _this.log("onClientDisconnected"); });
_externalApp.on("onClientDisconnected", function restartWebApp() {
_this.log("onClientDisconnected");
if(_this.autoRestart === ApplicationRestartType.ALWAYS) {
_this.log("WebApp crashed, restarting: " + uri);
_externalApp = scene.create( {t:"external", parent:appParent, server:"wl-rdkbrowser2-server", w:w, h:h, hasApi:true} );
_externalApp.on("onClientDisconnected", function () { restartWebApp(); });
_externalApp.remoteReady.then(function(obj) {
if(obj) {
_browser = _externalApp.api.createWindow(_externalApp.displayName, false);
if (_browser) {
_this.log("Starting browser url " + uri);
_browser.url = uri;
}
}
});
_this.setProperties(props);
}
else {
setTimeout(function () {
_this.destroy();
});
}
});
_externalApp.on("onClientStopped", function () { _this.log("onClientStopped"); });
_externalApp.remoteReady.then(function(obj) {
if(obj) {
Expand Down Expand Up @@ -803,11 +843,19 @@ function Application(props) {
_externalApp.on("onClientStarted", function () { _this.log("onClientStarted"); });
_externalApp.on("onClientConnected", function () { _this.log("onClientConnected"); });
_externalApp.on("onClientDisconnected", function () { _this.log("onClientDisconnected"); }); // called on client crash
_externalApp.on("onClientStopped", function () { // called on client crash
_externalApp.on("onClientStopped", function restartNativeApp(e) { // called on client crash
_this.log("onClientStopped");
setTimeout(function () {
_this.destroy();
});
if((e.crash && _this.autoRestart === ApplicationRestartType.AFTER_CRASH) || _this.autoRestart === ApplicationRestartType.ALWAYS) {
_this.log("Native app crashed restarting " + cmd);
_externalApp = scene.create( {t:"external", parent:appParent, cmd:cmd, w:w, h:h, hasApi:hasApi, displayName:displayName} );
_externalApp.on("onClientStopped", function (e) { restartNativeApp(e); });
_this.setProperties(props);
}
else {
setTimeout(function () {
_this.destroy();
});
}
});

_externalApp.ready.then(function() {
Expand Down