Abstract out where we get the API details

google · Oct 22, 2024 · 8bfa0b2 · 8bfa0b2
1 parent 0088cd0
commit 8bfa0b2
Show file tree

Hide file tree

Showing 4 changed files with 143 additions and 115 deletions.
diff --git a/generator/lib/googleapis_generator.dart b/generator/lib/googleapis_generator.dart
@@ -7,17 +7,15 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:discoveryapis_generator/discoveryapis_generator.dart';
-import 'package:http/io_client.dart';
-import 'package:io/ansi.dart' as ansi;
-import 'package:pool/pool.dart';
 
+import 'src/fetch_core.dart';
 import 'src/package_configuration.dart';
 import 'src/utils.dart';
 
 Future<List<RestDescription>> downloadDiscoveryDocuments(
   String outputDir,
 ) async {
-  final apis = await fetchDiscoveryDocuments();
+  final apis = await const FetchCore.service().fetchDiscoveryDocuments();
   writeDiscoveryDocuments(outputDir, apis);
   return apis;
 }
@@ -42,116 +40,6 @@ void writeDiscoveryDocuments(
   }
 }
 
-Future<List<RestDescription>> fetchDiscoveryDocuments({
-  Map<String, String>? existingRevisions,
-  Map<String, String>? additionalEntries,
-}) async {
-  final client = IOClient();
-
-  Future<RestDescription?> download(DirectoryListItems item) async {
-    try {
-      final result = await client.get(
-        Uri.parse(item.discoveryRestUrl!),
-        headers: requestHeaders,
-      );
-
-      if (result.statusCode != 200) {
-        throw StateError(
-          'Not a 200 – ${result.statusCode}\n${result.body}',
-        );
-      }
-
-      final description = RestDescription.fromJson(
-        jsonDecode(result.body) as Map<String, dynamic>,
-      );
-
-      // Sort members here for stability in the output!
-      description.sort();
-
-      return description;
-    } catch (e, stack) {
-      print(
-        ansi.red.wrap(
-          '''
-${item.discoveryRestUrl}
-Failed to retrieve document for "${item.name}:${item.version}" -> Ignoring!
-$e
-$stack
-''',
-        ),
-      );
-      return null;
-    }
-  }
-
-  try {
-    final directoryList = await DiscoveryApi(client).apis.list();
-    final list = directoryList.items!;
-
-    if (additionalEntries != null) {
-      for (var entry in additionalEntries.entries) {
-        list.add(DirectoryListItems(
-          id: entry.key,
-          discoveryRestUrl: entry.value,
-        ));
-      }
-    }
-
-    final pool = Pool(10);
-    try {
-      var count = 0;
-      return await pool
-          .forEach(list, (DirectoryListItems item) async {
-            print(ansi.darkGray.wrap(
-              'Requesting ${++count} of ${list.length} - ${item.id}',
-            ));
-
-            RestDescription? description;
-            for (var i = 1; i <= 10; i++) {
-              description = await download(item);
-              if (i > 1) {
-                print('  ${item.id} try #$i');
-              }
-
-              final existingRevision = existingRevisions![description?.id!];
-              if (existingRevision != null &&
-                  existingRevision != description!.revision) {
-                final compare =
-                    existingRevision.compareTo(description.revision!);
-
-                if (compare.isNegative) {
-                  print(
-                    '  New! ${description.id} '
-                    'from $existingRevision to ${description.revision}',
-                  );
-                } else {
-                  final tryAgainLag = i > 5 ? 5 : i;
-                  print(
-                    '  Old revision for ${description.id} '
-                    'from $existingRevision to ${description.revision}.\n'
-                    '    Trying again in $tryAgainLag second(s) – '
-                    '${item.discoveryRestUrl}',
-                  );
-                  await Future<void>.delayed(Duration(seconds: tryAgainLag));
-                  continue;
-                }
-              }
-
-              return description;
-            }
-            return description;
-          })
-          .where((rd) => rd != null)
-          .cast<RestDescription>()
-          .toList();
-    } finally {
-      await pool.close();
-    }
-  } finally {
-    client.close();
-  }
-}
-
 List<RestDescription> loadDiscoveryDocuments(String directory) =>
     Directory(directory)
         .listSync()

diff --git a/generator/lib/src/fetch_core.dart b/generator/lib/src/fetch_core.dart
@@ -0,0 +1,14 @@
+import 'package:discoveryapis_generator/discoveryapis_generator.dart';
+
+import 'fetch_service.dart';
+
+abstract class FetchCore {
+  const FetchCore();
+
+  const factory FetchCore.service() = FetchService;
+
+  Future<List<RestDescription>> fetchDiscoveryDocuments({
+    Map<String, String>? existingRevisions,
+    Map<String, String>? additionalEntries,
+  });
+}
diff --git a/generator/lib/src/fetch_service.dart b/generator/lib/src/fetch_service.dart
@@ -0,0 +1,125 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:discoveryapis_generator/discoveryapis_generator.dart';
+import 'package:http/io_client.dart';
+import 'package:io/ansi.dart' as ansi;
+import 'package:pool/pool.dart';
+
+import 'fetch_core.dart';
+import 'utils.dart';
+
+class FetchService extends FetchCore {
+  const FetchService();
+
+  @override
+  Future<List<RestDescription>> fetchDiscoveryDocuments({
+    Map<String, String>? existingRevisions,
+    Map<String, String>? additionalEntries,
+  }) async {
+    final client = IOClient();
+
+    Future<RestDescription?> download(DirectoryListItems item) async {
+      try {
+        final result = await client.get(
+          Uri.parse(item.discoveryRestUrl!),
+          headers: requestHeaders,
+        );
+
+        if (result.statusCode != 200) {
+          throw StateError(
+            'Not a 200 – ${result.statusCode}\n${result.body}',
+          );
+        }
+
+        final description = RestDescription.fromJson(
+          jsonDecode(result.body) as Map<String, dynamic>,
+        );
+
+        // Sort members here for stability in the output!
+        description.sort();
+
+        return description;
+      } catch (e, stack) {
+        print(
+          ansi.red.wrap(
+            '''
+${item.discoveryRestUrl}
+Failed to retrieve document for "${item.name}:${item.version}" -> Ignoring!
+$e
+$stack
+''',
+          ),
+        );
+        return null;
+      }
+    }
+
+    try {
+      final directoryList = await DiscoveryApi(client).apis.list();
+      final list = directoryList.items!;
+
+      if (additionalEntries != null) {
+        for (var entry in additionalEntries.entries) {
+          list.add(DirectoryListItems(
+            id: entry.key,
+            discoveryRestUrl: entry.value,
+          ));
+        }
+      }
+
+      final pool = Pool(10);
+      try {
+        var count = 0;
+        return await pool
+            .forEach(list, (DirectoryListItems item) async {
+              print(ansi.darkGray.wrap(
+                'Requesting ${++count} of ${list.length} - ${item.id}',
+              ));
+
+              RestDescription? description;
+              for (var i = 1; i <= 10; i++) {
+                description = await download(item);
+                if (i > 1) {
+                  print('  ${item.id} try #$i');
+                }
+
+                final existingRevision = existingRevisions![description?.id!];
+                if (existingRevision != null &&
+                    existingRevision != description!.revision) {
+                  final compare =
+                      existingRevision.compareTo(description.revision!);
+
+                  if (compare.isNegative) {
+                    print(
+                      '  New! ${description.id} '
+                      'from $existingRevision to ${description.revision}',
+                    );
+                  } else {
+                    final tryAgainLag = i > 5 ? 5 : i;
+                    print(
+                      '  Old revision for ${description.id} '
+                      'from $existingRevision to ${description.revision}.\n'
+                      '    Trying again in $tryAgainLag second(s) – '
+                      '${item.discoveryRestUrl}',
+                    );
+                    await Future<void>.delayed(Duration(seconds: tryAgainLag));
+                    continue;
+                  }
+                }
+
+                return description;
+              }
+              return description;
+            })
+            .where((rd) => rd != null)
+            .cast<RestDescription>()
+            .toList();
+      } finally {
+        await pool.close();
+      }
+    } finally {
+      client.close();
+    }
+  }
+}
diff --git a/generator/lib/src/package_configuration.dart b/generator/lib/src/package_configuration.dart
@@ -12,6 +12,7 @@ import 'package:discoveryapis_generator/src/namer.dart';
 import 'package:yaml/yaml.dart';
 
 import '../googleapis_generator.dart';
+import 'fetch_core.dart';
 
 class Package {
   final String name;
@@ -117,7 +118,7 @@ class DiscoveryPackagesConfiguration {
     }
 
     // Get all rest discovery documents & initialize this object.
-    final allApis = await fetchDiscoveryDocuments(
+    final allApis = await const FetchCore.service().fetchDiscoveryDocuments(
       existingRevisions: existingApiRevisions,
       additionalEntries: additionalEntries,
     );