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

Jump to bottom

[TIMOB-25072] Wait for server response without using "while loop" #106

Merged
merged 7 commits into from
Sep 6, 2017
Merged

[TIMOB-25072] Wait for server response without using "while loop" #106

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
4a1b031
[TIMOB-25072] Add waitForResponse() to wait for a response from server
infosia Aug 15, 2017
53f1a82
Fix typo
infosia Aug 15, 2017
3dd9c84
globalCtx should be set to "this"
infosia Aug 15, 2017
bdf2248
Rename to _waitForResponse to indicate this is private API
infosia Aug 24, 2017
8792682
require.js also has Module implementation
infosia Sep 6, 2017
d0dee5a
fix style
feons Sep 6, 2017
bd502ca
fix style
feons Sep 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 15 additions & 1 deletion build/liveview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,20 @@
request.open('GET', url);
request.setRequestHeader('x-platform', this.platform);
request.send();

//
// Windows only private API: _waitForResponse() waits for the response from the server.
//
if (this.platform === 'windows' && request._waitForResponse) {
request._waitForResponse();
if (request.readyState === 4 || request.status === 404) {
rsp = request.status === 200 ? request.responseText : false;
} else {
throw new Error('[LiveView] File Server unavailable. Host Unreachable @ ' + Module._url + ':' + Module._port + '\n[LiveView] Please ensure your device and computer are on the same network and the port is not blocked.');
}
done = true;
}

while (!done) {
if (request.readyState === 4 || request.status === 404) {
rsp = request.status === 200 ? request.responseText : false;
Expand Down Expand Up @@ -714,4 +728,4 @@
// Prevent display from sleeping

Titanium.App.idleTimerDisabled = true;
})(undefined);
})(this);
14 changes: 14 additions & 0 deletions lib/platform/require.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,20 @@ Module.prototype._getRemoteSource = function (file, timeout) {
request.open('GET', url);
request.setRequestHeader('x-platform', this.platform);
request.send();

//
// Windows only private API: _waitForResponse() waits for the response from the server.
//
if (this.platform === 'windows' && request._waitForResponse) {
request._waitForResponse();
if (request.readyState === 4 || request.status === 404) {
rsp = request.status === 200 ? request.responseText : false;
} else {
throw new Error('[LiveView] File Server unavailable. Host Unreachable @ ' + Module._url + ':' + Module._port + '\n[LiveView] Please ensure your device and computer are on the same network and the port is not blocked.');
}
done = true;
}

while (!done) {
if (request.readyState === 4 || request.status === 404) {
rsp = (request.status === 200) ? request.responseText : false;
Expand Down