Merge branch 'develop'

DinoLeung · DinoLeung · commit 9179c45bda01 · 2022-03-12T21:42:43.000+10:30
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.4
+
+- Webhook to throw error when `setWebhook` failed
+
 ## 0.3.3
 
 - Support API 5.7
diff --git a/lib/src/teledart/fetch/webhook.dart b/lib/src/teledart/fetch/webhook.dart
@@ -126,35 +126,36 @@ class Webhook extends AbstractUpdateFetcher {
         allowed_updates: allowed_updates);
   }
 
-  Future<void> setWebhook() async {
-    await telegram.setWebhook('$url:$port$secretPath',
-        ip_address: ip_address,
-        certificate: uploadCertificate ? certificate : null,
-        max_connections: max_connections,
-        allowed_updates: allowed_updates,
-        drop_pending_updates: drop_pending_updates);
-  }
+  Future<bool> setWebhook() async =>
+      await telegram.setWebhook('$url:$port$secretPath',
+          ip_address: ip_address,
+          certificate: uploadCertificate ? certificate : null,
+          max_connections: max_connections,
+          allowed_updates: allowed_updates,
+          drop_pending_updates: drop_pending_updates);
 
   /// Apply webhook configuration on Telegram API, and start the webhook server.
   @override
   Future<void> start() async {
-    await setWebhook();
-
-    _server.listen((io.HttpRequest request) {
-      if (request.method == 'POST' && request.uri.path == secretPath) {
-        request.cast<List<int>>().transform(utf8.decoder).join().then((data) {
-          emitUpdate(Update.fromJson(jsonDecode(data)));
+    if (await setWebhook()) {
+      _server.listen((io.HttpRequest request) {
+        if (request.method == 'POST' && request.uri.path == secretPath) {
+          request.cast<List<int>>().transform(utf8.decoder).join().then((data) {
+            emitUpdate(Update.fromJson(jsonDecode(data)));
+            request.response
+              ..write(jsonEncode({'ok': true}))
+              ..close();
+          });
+        } else {
           request.response
-            ..write(jsonEncode({'ok': true}))
+            ..statusCode = io.HttpStatus.methodNotAllowed
+            ..write(jsonEncode({'ok': false}))
             ..close();
-        });
-      } else {
-        request.response
-          ..statusCode = io.HttpStatus.methodNotAllowed
-          ..write(jsonEncode({'ok': false}))
-          ..close();
-      }
-    });
+        }
+      });
+    } else {
+      throw WebhookException('Telegram API returns an error while attempting to set the webhook.');
+    }
   }
 
   /// Remove webhook configuration from Telegram API, and stop the webhook server.
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: teledart
 description: A Dart library interfacing with the latest Telegram Bot API.
-version: 0.3.3
+version: 0.3.4
 homepage: https://github.com/DinoLeung/TeleDart
 issue_tracker: https://github.com/DinoLeung/TeleDart/issues
 
