Skip to content

fix(debug): align web/app debug status fields between service and UI #209

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
Asuka22687 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(debug): align web/app debug status fields between service and UI #209

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
2 changes: 2 additions & 0 deletions tizenbrew-app/TizenBrew/service-nextgen/service/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ module.exports.onStart = function () {
const inDebug = {
tizenDebug: false,
webDebug: false,
appDebug: false,
rwiDebug: false
};

Expand Down Expand Up @@ -197,6 +198,7 @@ module.exports.onStart = function () {

if (mdl.packageType === 'app') {
inDebug.webDebug = false;
inDebug.appDebug = false;
inDebug.tizenDebug = false;
} else {
currentModule.mainFile = mdl.mainFile;
Expand Down
8 changes: 6 additions & 2 deletions tizenbrew-app/TizenBrew/service-nextgen/service/utils/debugger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ function startDebugging(port, queuedEvents, clientConn, ip, mdl, inDebug, appCon

inDebug.tizenDebug = false;
inDebug.webDebug = false;
inDebug.appDebug = false;
inDebug.rwiDebug = false;

mdl.fullName = '';
Expand Down Expand Up @@ -84,7 +85,10 @@ function startDebugging(port, queuedEvents, clientConn, ip, mdl, inDebug, appCon
}
}
}
if (!isAnotherApp) inDebug.webDebug = true;
if (!isAnotherApp) {
inDebug.webDebug = true;
inDebug.appDebug = true;
}
appControlData = null;
}).on('error', (err) => {
if (attempts >= 15) {
Expand Down Expand Up @@ -121,4 +125,4 @@ function sendClientInformation(clientConn, data) {
}, 500);
}

module.exports = startDebugging;
module.exports = startDebugging;
3 changes: 2 additions & 1 deletion tizenbrew-app/TizenBrew/tizenbrew-ui/src/components/ClientContext.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const initialState = {
sharedData: {
debugStatus: {
rwiDebug: false,
webDebug: false,
appDebug: false,
tizenDebug: false
},
Expand Down Expand Up @@ -48,4 +49,4 @@ export function GlobalStateProvider({ children }) {
{children}
</GlobalStateContext.Provider>
);
}
}
14 changes: 11 additions & 3 deletions tizenbrew-app/TizenBrew/tizenbrew-ui/src/components/WebSocketClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,21 @@ class Client {
}

case Events.GetDebugStatus: {
const normalizedPayload = {
rwiDebug: Boolean(payload && payload.rwiDebug),
webDebug: Boolean(payload && (payload.webDebug || payload.appDebug)),
appDebug: Boolean(payload && (payload.webDebug || payload.appDebug)),
tizenDebug: Boolean(payload && payload.tizenDebug)
};

const state = this.context.state;
state.sharedData.debugStatus = payload;
state.sharedData.debugStatus = normalizedPayload;
this.context.dispatch({
type: 'SET_SHARED_DATA',
payload: state.sharedData
});

if (!payload.rwiDebug && !payload.appDebug && !payload.tizenDebug) {
if (!normalizedPayload.rwiDebug && !normalizedPayload.webDebug && !normalizedPayload.tizenDebug) {
this.send({
type: Events.CanLaunchInDebug
});
Expand Down Expand Up @@ -178,6 +185,7 @@ class Client {
handleCanLaunchModules(payload) {
const debugStatus = this.context.state.sharedData.debugStatus;
debugStatus.webDebug = true;
debugStatus.appDebug = true;
this.context.dispatch({
type: 'SET_DEBUG_STATUS',
payload: debugStatus
Expand Down Expand Up @@ -243,4 +251,4 @@ class Client {
}

export { Events };
export default Client;
export default Client;