Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
56585774
Commit
56585774
authored
Nov 22, 2016
by
Devon Carew
Committed by
GitHub
Nov 22, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pass through the ws debugging uri (#6989)
parent
4a7531da
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
5 deletions
+18
-5
daemon.dart
packages/flutter_tools/lib/src/commands/daemon.dart
+4
-1
hot.dart
packages/flutter_tools/lib/src/hot.dart
+5
-1
resident_runner.dart
packages/flutter_tools/lib/src/resident_runner.dart
+2
-1
run.dart
packages/flutter_tools/lib/src/run.dart
+7
-2
No files found.
packages/flutter_tools/lib/src/commands/daemon.dart
View file @
56585774
...
...
@@ -358,7 +358,10 @@ class AppDomain extends Domain {
if
(
options
.
debuggingEnabled
)
{
connectionInfoCompleter
=
new
Completer
<
DebugConnectionInfo
>();
connectionInfoCompleter
.
future
.
then
((
DebugConnectionInfo
info
)
{
Map
<
String
,
dynamic
>
params
=
<
String
,
dynamic
>{
'port'
:
info
.
port
};
Map
<
String
,
dynamic
>
params
=
<
String
,
dynamic
>{
'port'
:
info
.
port
,
'wsUri'
:
info
.
wsUri
};
if
(
info
.
baseUri
!=
null
)
params
[
'baseUri'
]
=
info
.
baseUri
;
_sendAppEvent
(
app
,
'debugPort'
,
params
);
...
...
packages/flutter_tools/lib/src/hot.dart
View file @
56585774
...
...
@@ -237,7 +237,11 @@ class HotRunner extends ResidentRunner {
Uri
baseUri
=
await
_initDevFS
();
if
(
connectionInfoCompleter
!=
null
)
{
connectionInfoCompleter
.
complete
(
new
DebugConnectionInfo
(
_observatoryPort
,
baseUri:
baseUri
.
toString
())
new
DebugConnectionInfo
(
port:
_observatoryPort
,
wsUri:
'ws://localhost:
$_observatoryPort
/ws'
,
baseUri:
baseUri
.
toString
()
)
);
}
}
catch
(
error
)
{
...
...
packages/flutter_tools/lib/src/resident_runner.dart
View file @
56585774
...
...
@@ -271,8 +271,9 @@ String getMissingPackageHintForPlatform(TargetPlatform platform) {
}
class
DebugConnectionInfo
{
DebugConnectionInfo
(
this
.
port
,
{
this
.
baseUri
});
DebugConnectionInfo
(
{
this
.
port
,
this
.
wsUri
,
this
.
baseUri
});
final
int
port
;
final
String
wsUri
;
final
String
baseUri
;
}
packages/flutter_tools/lib/src/run.dart
View file @
56585774
...
...
@@ -119,8 +119,13 @@ class RunAndStayResident extends ResidentRunner {
startTime
.
stop
();
if
(
_result
.
hasObservatory
)
connectionInfoCompleter
?.
complete
(
new
DebugConnectionInfo
(
_result
.
observatoryPort
));
if
(
_result
.
hasObservatory
)
{
int
port
=
_result
.
observatoryPort
;
connectionInfoCompleter
?.
complete
(
new
DebugConnectionInfo
(
port:
port
,
wsUri:
'ws://localhost:
$port
/ws'
));
}
// Connect to observatory.
if
(
debuggingOptions
.
debuggingEnabled
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment