From 3e5945b397f0d8ff43339b1e5d7e89427833e95a Mon Sep 17 00:00:00 2001
From: thomashii <thomashii@dukefirehawk.com>
Date: Mon, 8 Mar 2021 21:11:46 +0800
Subject: [PATCH] Updated package hot

---
 packages/hot/lib/angel_hot.dart | 39 +++++++++++++++++++++------------
 packages/hot/pubspec.yaml       | 29 ++++++++++++++----------
 2 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/packages/hot/lib/angel_hot.dart b/packages/hot/lib/angel_hot.dart
index 6cc8e44d..1903d656 100644
--- a/packages/hot/lib/angel_hot.dart
+++ b/packages/hot/lib/angel_hot.dart
@@ -9,6 +9,7 @@ import 'package:angel_framework/http.dart';
 import 'package:angel_websocket/server.dart';
 import 'package:charcode/ascii.dart';
 import 'package:glob/glob.dart';
+import 'package:glob/list_local_fs.dart';
 import 'package:html_builder/elements.dart';
 import 'package:html_builder/html_builder.dart';
 import 'package:io/ansi.dart';
@@ -103,8 +104,9 @@ class HotReloader {
       response
         ..headers.set(HttpHeaders.contentEncodingHeader, 'gzip')
         ..add(gzip.encode(utf8.encode(_renderer.render(doc))));
-    } else
+    } else {
       response.write(_renderer.render(doc));
+    }
     response.close();
   }
 
@@ -113,11 +115,11 @@ class HotReloader {
   }
 
   Future handleRequest(HttpRequest request) async {
-    if (_server != null)
+    if (_server != null) {
       return await _handle(request);
-    else if (timeout == null)
+    } else if (timeout == null) {
       _requestQueue.add(request);
-    else {
+    } else {
       _requestQueue.add(request);
       Timer(timeout, () {
         if (_requestQueue.remove(request)) {
@@ -157,9 +159,10 @@ class HotReloader {
     var isHot = true;
     _server = await _generateServer();
 
-    if (_paths?.isNotEmpty != true)
+    if (_paths?.isNotEmpty != true) {
       _logWarning(
           'You have instantiated a HotReloader without providing any filesystem paths to watch.');
+    }
 
     bool _sw(String s) {
       return Platform.executableArguments.any((ss) => ss.startsWith(s));
@@ -173,10 +176,11 @@ class HotReloader {
       var info = await dev.Service.getInfo();
       var uri = info.serverUri;
       uri = uri.replace(path: p.join(uri.path, 'ws'));
-      if (uri.scheme == 'https')
+      if (uri.scheme == 'https') {
         uri = uri.replace(scheme: 'wss');
-      else
+      } else {
         uri = uri.replace(scheme: 'ws');
+      }
       _client = await vm.vmServiceConnectUri(uri.toString());
       _vmachine ??= await _client.getVM();
       _mainIsolate ??= _vmachine.isolates.first;
@@ -192,7 +196,9 @@ class HotReloader {
         //.transform(new _Debounce(new Duration(seconds: 1)))
         .listen(_handleWatchEvent);
 
-    while (_requestQueue.isNotEmpty) await _handle(_requestQueue.removeFirst());
+    while (_requestQueue.isNotEmpty) {
+      await _handle(_requestQueue.removeFirst());
+    }
     var server = _io = await HttpServer.bind(address ?? '127.0.0.1', port ?? 0);
     server.listen(handleRequest);
 
@@ -278,12 +284,14 @@ class HotReloader {
       } else if (path is Uri) {
         if (path.scheme == 'package') {
           var uri = await Isolate.resolvePackageUri(path);
-          if (uri != null)
+          if (uri != null) {
             await _listenToStat(uri.toFilePath());
-          else
+          } else {
             await _listenToStat(path.toFilePath());
-        } else
+          }
+        } else {
           await _listenToStat(path.toFilePath());
+        }
       } else {
         throw ArgumentError(
             'Hot reload paths must be a FileSystemEntity, a Uri, a String or a Glob. You provided: $path');
@@ -305,8 +313,9 @@ class HotReloader {
         } else if (stat.type == FileSystemEntityType.directory) {
           var dir = Directory(path);
           if (!await dir.exists()) return null;
-        } else
+        } else {
           return null;
+        }
 
         var watcher = Watcher(path);
 
@@ -357,7 +366,7 @@ class HotReloader {
     }
   }
 
-  _handleWatchEvent(WatchEvent e, [bool hot = true]) async {
+  void _handleWatchEvent(WatchEvent e, [bool hot = true]) async {
     _logInfo('${e.path} changed. Reloading server...\n');
     await _killServer();
     _server = null;
@@ -373,7 +382,9 @@ class HotReloader {
 
     var s = await _generateServer();
     _server = s;
-    while (_requestQueue.isNotEmpty) await _handle(_requestQueue.removeFirst());
+    while (_requestQueue.isNotEmpty) {
+      await _handle(_requestQueue.removeFirst());
+    }
   }
 }
 
diff --git a/packages/hot/pubspec.yaml b/packages/hot/pubspec.yaml
index 250ca159..a1c1429f 100644
--- a/packages/hot/pubspec.yaml
+++ b/packages/hot/pubspec.yaml
@@ -1,23 +1,30 @@
 name: angel_hot
 description: Supports hot reloading/hot code push of Angel servers on file changes.
-version: 2.0.6
+version: 3.0.0
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/hot
+publish_to: none
 environment:
-  sdk: ">=2.10.0 <2.12.0"
+  sdk: ">=2.10.0 <3.0.0"
 dependencies:
-  angel_framework: #^2.0.0-alpha
-    path: ../framework
+  angel_framework:
+    git: 
+      url: https://github.com/dukefirehawk/angel.git
+      ref: sdk-2.12.x
+      path: packages/framework
   angel_websocket: #^2.0.0-alpha
-    path: ../websocket
+   git: 
+      url: https://github.com/dukefirehawk/angel.git
+      ref: sdk-2.12.x
+      path: packages/websocket
   charcode: ^1.0.0
-  glob: ^1.0.0
+  glob: ^2.0.0
   html_builder: ^1.0.0
-  io: ^0.3.2
+  io: ^1.0.0
   path: ^1.0.0
-  vm_service_lib: ^0.3.5
-  watcher: ^0.9.0
+  vm_service_lib: ^3.22.2+1
+  watcher: ^1.0.0
 dev_dependencies:
-  http: ^0.12.0
-  logging: ^0.11.0
+  http: ^0.13.0
+  logging: ^1.0.0
   pedantic: ^1.0.0