Apply 193 (#197)

fixes #193
invertase · Oct 20, 2023 · 37fe9b1 · 37fe9b1 · vercel · Oct 20, 2023
1 parent e8941b7
commit 37fe9b1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/packages/custom_lint/CHANGELOG.md b/packages/custom_lint/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Improve the command line's output (thanks to @kuhnroyal)
 - Update uuid to 4.0.0
 - Fixed a port leak
+- Fix connection issues on Docker/windows (thanks to @hamsbrar)
 
 ## 0.5.3 - 2023-08-29
 

diff --git a/packages/custom_lint/lib/src/v2/server_to_client_channel.dart b/packages/custom_lint/lib/src/v2/server_to_client_channel.dart
@@ -177,6 +177,7 @@ class SocketCustomLintServerToClientChannel {
           [
             if (_server.watchMode) '--enable-vm-service=${await port}',
             join('lib', 'custom_lint_client.dart'),
+            _serverSocket.address.host,
             _serverSocket.port.toString(),
           ],
           workingDirectory: tempDir.path,
@@ -213,10 +214,12 @@ import 'package:custom_lint_builder/src/channel.dart';
 $imports
 
 void main(List<String> args) async {
-  final port = int.parse(args.single);
+  final host = args[0];
+  final port = int.parse(args[1]);
 
   runSocket(
     port: port,
+    host: host,
     includeBuiltInLints: ${_server.includeBuiltInLints},
     {$plugins},
   );

diff --git a/packages/custom_lint/test/cli_test.dart b/packages/custom_lint/test/cli_test.dart
@@ -140,7 +140,7 @@ invalid;
 ^^^^^^^
 '''),
               matchIgnoringAnsi(contains, '''
-lib/custom_lint_client.dart:13:29: Error: Undefined name 'createPlugin'.
+lib/custom_lint_client.dart:15:29: Error: Undefined name 'createPlugin'.
     {'test_lint': test_lint.createPlugin,
                             ^^^^^^^^^^^^
 '''),
@@ -296,7 +296,7 @@ int x = 'oy';
         ^
 '''),
               matchIgnoringAnsi(contains, '''
-lib/custom_lint_client.dart:15:26: Error: Undefined name 'createPlugin'.
+lib/custom_lint_client.dart:17:26: Error: Undefined name 'createPlugin'.
 'test_lint2': test_lint2.createPlugin,
                          ^^^^^^^^^^^^
 '''),

diff --git a/packages/custom_lint_builder/lib/src/channel.dart b/packages/custom_lint_builder/lib/src/channel.dart
@@ -57,14 +57,15 @@ typedef CreatePluginMain = PluginBase Function();
 Future<void> runSocket(
   Map<String, CreatePluginMain> pluginMains, {
   required int port,
+  required String host,
   required bool includeBuiltInLints,
 }) async {
   late Future<CustomLintPluginClient> client;
 
   await asyncRunZonedGuarded(
     () => client = Future(() async {
       // ignore: close_sinks, connection stays open until the plugin is killed
-      final socket = await Socket.connect(InternetAddress.loopbackIPv6, port);
+      final socket = await Socket.connect(host, port);
       final socketChannel = JsonSocketChannel(Future.value(socket));
       final registeredPlugins = <String, PluginBase>{};