Merge remote-tracking branch 'origin/master' into workspace

Author: sigurdm

.github/workflows/dart.yml

@@ -1,4 +1,4 @@
-# Created with package:mono_repo v6.6.1
+# Created with package:mono_repo v6.6.2
 name: Dart CI
 on:
   push:
@@ -36,7 +36,7 @@ jobs:
         name: Checkout repository
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       - name: mono_repo self validate
-        run: dart pub global activate mono_repo 6.6.1
+        run: dart pub global activate mono_repo 6.6.2
       - name: mono_repo self validate
         run: dart pub global run mono_repo generate --validate
   job_002:

CHANGELOG.md

@@ -2,6 +2,31 @@ Important changes to data models, configuration, and migrations between each
 AppEngine version, listed here to ease deployment and troubleshooting.
 
 ## Next Release (replace with git tag when deployed)
+
+## `20241031t095600-all`
+ * Bumped runtimeVersion to `2024.10.29`.
+ * Upgraded stable Dart analysis SDK to `3.5.4`
+ * Upgraded stable Flutter analysis SDK to `3.24.4`.
+ * Upgraded pana to `0.22.15`.
+
+## `20241022t092400-all`
+ * Bumped runtimeVersion to `2024.10.21`.
+
+## `20241017t095600-all`
+ * Bumped runtimeVersion to `2024.10.15`.
+ * Upgraded pana to `0.22.13`.
+ * Upgraded dependencies (including `mailer`).
+
+## `20241008t115400-all`
+
+## `20241003t100900-all`
+
+## `20240926t112500-all`
+ * Bumped runtimeVersion to `2024.09.17`.
+ * Upgraded stable Dart analysis SDK to `3.5.3`
+ * Upgraded stable Flutter analysis SDK to `3.24.3`.
+
+## `20240911t105800-all`
  * Bumped runtimeVersion to `2024.09.10`.
  * Upgraded stable Flutter analysis SDK to `3.24.2`.
 

Dockerfile.worker

@@ -23,10 +23,10 @@ RUN mkdir -p /home/worker/config/dart-stable
 RUN mkdir -p /home/worker/config/flutter-stable
 
 # Setup Dart SDK into /home/worker/dart/{stable,preview}/
-RUN XDG_CONFIG_HOME=/home/worker/config/dart-stable tool/setup-dart.sh /home/worker/dart/stable 3.5.2
+RUN XDG_CONFIG_HOME=/home/worker/config/dart-stable tool/setup-dart.sh /home/worker/dart/stable 3.5.4
 
 # Setup Flutter SDK into /home/worker/flutter/{stable,preview}/
-RUN XDG_CONFIG_HOME=/home/worker/config/flutter-stable tool/setup-flutter.sh /home/worker/flutter/stable 3.24.2
+RUN XDG_CONFIG_HOME=/home/worker/config/flutter-stable tool/setup-flutter.sh /home/worker/flutter/stable 3.24.4
 
 # Setup webp
 RUN tool/setup-webp.sh /home/worker/bin

analysis_options.yaml

@@ -8,73 +8,79 @@ analyzer:
 # https://dart.dev/lints
 linter:
   rules:
-  - always_declare_return_types
-  - always_require_non_null_named_parameters
-  - annotate_overrides
-  - avoid_empty_else
-  - avoid_init_to_null
-  - avoid_null_checks_in_equality_operators
-  - avoid_relative_lib_imports
-  - avoid_return_types_on_setters
-  - avoid_shadowing_type_parameters
-  - avoid_types_as_parameter_names
-  - await_only_futures
-  - camel_case_extensions
-  - camel_case_types
-  - cancel_subscriptions
-  - close_sinks
-  - collection_methods_unrelated_type
-  - comment_references
-  - constant_identifier_names
-  - control_flow_in_finally
-  - curly_braces_in_flow_control_structures
-  - directives_ordering
-  - empty_catches
-  - empty_constructor_bodies
-  - empty_statements
-  - hash_and_equals
-  - implementation_imports
-  - library_names
-  - library_prefixes
-  - literal_only_boolean_expressions
-  - no_duplicate_case_values
-  - non_constant_identifier_names
-  - null_closures
-  #- omit_local_variable_types
-  - one_member_abstracts
-  - only_throw_errors
-  - overridden_fields
-  - package_names
-  - package_prefixed_library_names
-  - prefer_adjacent_string_concatenation
-  - prefer_collection_literals
-  - prefer_conditional_assignment
-  - prefer_contains
-  - prefer_equal_for_default_values
-  - prefer_final_fields
-  - prefer_final_locals
-  - prefer_for_elements_to_map_fromIterable
-  - prefer_generic_function_type_aliases
-  - prefer_if_null_operators
-  - prefer_is_empty
-  - prefer_is_not_empty
-  - prefer_iterable_whereType
-  - prefer_single_quotes
-  - prefer_spread_collections
-  - prefer_typing_uninitialized_variables
-  - recursive_getters
-  - slash_for_doc_comments
-  - test_types_in_equals
-  - throw_in_finally
-  - type_init_formals
-  - unawaited_futures
-  - unnecessary_brace_in_string_interps
-  - unnecessary_const
-  - unnecessary_getters_setters
-  - unnecessary_new
-  - unnecessary_null_in_if_null_operators
-  - unnecessary_this
-  - unrelated_type_equality_checks
-  - use_function_type_syntax_for_parameters
-  - use_rethrow_when_possible
-  - valid_regexps
+    - always_declare_return_types
+    - annotate_overrides
+    - avoid_empty_else
+    - avoid_init_to_null
+    - avoid_null_checks_in_equality_operators
+    - avoid_relative_lib_imports
+    - avoid_return_types_on_setters
+    - avoid_shadowing_type_parameters
+    - avoid_types_as_parameter_names
+    - await_only_futures
+    - camel_case_extensions
+    - camel_case_types
+    - cancel_subscriptions
+    - close_sinks
+    - collection_methods_unrelated_type
+    - comment_references
+    - constant_identifier_names
+    - control_flow_in_finally
+    - curly_braces_in_flow_control_structures
+    - dangling_library_doc_comments
+    - directives_ordering
+    - empty_catches
+    - empty_constructor_bodies
+    - empty_statements
+    - hash_and_equals
+    - implementation_imports
+    - library_annotations
+    - library_names
+    - library_prefixes
+    - literal_only_boolean_expressions
+    - no_duplicate_case_values
+    - non_constant_identifier_names
+    - null_closures
+    #- omit_local_variable_types
+    - one_member_abstracts
+    - only_throw_errors
+    - overridden_fields
+    - package_names
+    - package_prefixed_library_names
+    - prefer_adjacent_string_concatenation
+    - prefer_collection_literals
+    - prefer_conditional_assignment
+    - prefer_contains
+    - prefer_final_fields
+    - prefer_final_in_for_each
+    - prefer_final_locals
+    - prefer_for_elements_to_map_fromIterable
+    - prefer_generic_function_type_aliases
+    - prefer_if_null_operators
+    - prefer_is_empty
+    - prefer_is_not_empty
+    - prefer_iterable_whereType
+    - prefer_null_aware_operators
+    - prefer_single_quotes
+    - prefer_spread_collections
+    - prefer_typing_uninitialized_variables
+    - recursive_getters
+    - slash_for_doc_comments
+    - test_types_in_equals
+    - throw_in_finally
+    - type_init_formals
+    - unawaited_futures
+    - unnecessary_brace_in_string_interps
+    - unnecessary_const
+    - unnecessary_getters_setters
+    - unnecessary_late
+    - unnecessary_library_name
+    - unnecessary_library_directive
+    - unnecessary_new
+    - unnecessary_null_in_if_null_operators
+    - unnecessary_this
+    - unrelated_type_equality_checks
+    - use_function_type_syntax_for_parameters
+    - use_rethrow_when_possible
+    - use_string_in_part_of_directives
+    - valid_regexps

app/bin/tools/search_benchmark.dart

@@ -0,0 +1,41 @@
+// Copyright (c) 2024, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:pub_dev/package/overrides.dart';
+import 'package:pub_dev/search/mem_index.dart';
+import 'package:pub_dev/search/models.dart';
+import 'package:pub_dev/search/search_service.dart';
+
+/// Loads a search snapshot and executes queries on it, benchmarking their total time to complete.
+Future<void> main(List<String> args) async {
+  // Assumes that the first argument is a search snapshot file.
+  final file = File(args.first);
+  final content =
+      json.decode(utf8.decode(gzip.decode(await file.readAsBytes())))
+          as Map<String, Object?>;
+  final snapshot = SearchSnapshot.fromJson(content);
+  snapshot.documents!
+      .removeWhere((packageName, doc) => isSoftRemoved(packageName));
+  final index = InMemoryPackageIndex(documents: snapshot.documents!.values);
+
+  // NOTE: please add more queries to this list, especially if there is a performance bottleneck.
+  final queries = [
+    'json',
+    'camera',
+    'android camera',
+    'sql database',
+  ];
+
+  final sw = Stopwatch()..start();
+  var count = 0;
+  for (var i = 0; i < 100; i++) {
+    index.search(ServiceSearchQuery.parse(query: queries[i % queries.length]));
+    count++;
+  }
+  sw.stop();
+  print('${(sw.elapsedMilliseconds / count).toStringAsFixed(2)} ms/request');
+}

app/lib/account/agent.dart

@@ -25,7 +25,7 @@ abstract class KnownAgents {
   ///
   /// Deprecated and should not be used for new audit-log entries.
   /// This value is still present in some older audit-log entries.
-  static const _genericGithubActions = 'service:github-actions';
+  static const _genericGitHubActions = 'service:github-actions';
 
   /// Non-specific agent - only specifies it is from GCP Service Account.
   ///
@@ -67,7 +67,7 @@ abstract class KnownAgents {
   ];
 
   static const _nonSpecificAgentIds = <String>{
-    _genericGithubActions,
+    _genericGitHubActions,
     _genericGcpServiceAccount,
     pubSupport,
   };
@@ -132,15 +132,15 @@ abstract class AuthenticatedAgent {
 /// Holds the authenticated GitHub Action information.
 ///
 /// The [agentId] has the following format: `service:github-actions:<repositoryOwnerId>/<repositoryId>`
-class AuthenticatedGithubAction implements AuthenticatedAgent {
+class AuthenticatedGitHubAction implements AuthenticatedAgent {
   @override
   late final agentId = KnownAgents.githubActionsAgentId(
     repositoryOwnerId: payload.repositoryOwnerId,
     repositoryId: payload.repositoryId,
   );
 
   @override
-  String get displayId => KnownAgents._genericGithubActions;
+  String get displayId => KnownAgents._genericGitHubActions;
 
   /// OIDC `id_token` the request was authenticated with.
   ///
@@ -155,7 +155,7 @@ class AuthenticatedGithubAction implements AuthenticatedAgent {
   /// The parsed, GitHub-specific JWT payload.
   final GitHubJwtPayload payload;
 
-  AuthenticatedGithubAction({
+  AuthenticatedGitHubAction({
     required this.idToken,
     required this.payload,
   }) {

app/lib/account/backend.dart

@@ -170,7 +170,7 @@ Future<AuthenticatedAgent?> _tryAuthenticateServiceAgent(String token) async {
     if (payload == null) {
       throw AuthenticationException.tokenInvalid('unable to parse payload');
     }
-    return AuthenticatedGithubAction(
+    return AuthenticatedGitHubAction(
       idToken: idToken,
       payload: payload,
     );
@@ -241,7 +241,7 @@ class AccountBackend {
   /// Uses in-memory cache to store entries locally for up to 10 minutes.
   Future<List<String?>> getEmailsOfUserIds(List<String> userIds) async {
     final result = <String?>[];
-    for (String userId in userIds) {
+    for (final userId in userIds) {
       result.add(await getEmailOfUserId(userId));
     }
     return result;

app/lib/account/consent_backend.dart

@@ -14,11 +14,10 @@ import '../frontend/templates/consent.dart';
 import '../package/backend.dart';
 import '../publisher/backend.dart';
 import '../service/email/backend.dart';
+import '../service/email/email_templates.dart' show createInviteEmail;
 import '../shared/datastore.dart';
-import '../shared/email.dart' show createInviteEmail;
 import '../shared/exceptions.dart';
 import '../shared/urls.dart';
-
 import 'backend.dart';
 import 'models.dart';
 
@@ -61,7 +60,7 @@ class ConsentBackend {
     final c = await _lookupAndCheck(consentId, user);
     final action = _actions[c.kind]!;
     final fromAgent = c.fromAgent!;
-    late String invitingUserEmail;
+    final String invitingUserEmail;
     if (looksLikeUserId(fromAgent)) {
       invitingUserEmail = (await accountBackend.getEmailOfUserId(fromAgent))!;
     } else {
@@ -231,7 +230,7 @@ class ConsentBackend {
   Future<void> deleteObsoleteConsents() async {
     final query = _db.query<Consent>()
       ..filter('expires <', clock.now().toUtc());
-    await for (var entry in query.run()) {
+    await for (final entry in query.run()) {
       try {
         await _delete(entry, (a) => a.onExpire(entry));
       } catch (e) {

app/lib/account/default_auth_provider.dart

@@ -12,13 +12,13 @@ import 'package:googleapis_auth/auth_io.dart' as auth;
 import 'package:http/http.dart' as http;
 import 'package:logging/logging.dart';
 
+import '../service/email/email_templates.dart' show looksLikeEmail;
 import '../service/openid/gcp_openid.dart';
 import '../service/openid/github_openid.dart';
 import '../service/openid/jwt.dart';
 import '../service/openid/openid_models.dart';
 import '../service/secret/backend.dart';
 import '../shared/configuration.dart';
-import '../shared/email.dart' show looksLikeEmail;
 import '../shared/exceptions.dart';
 import '../shared/monitoring.dart';
 import '../shared/utils.dart' show fixedTimeEquals;
@@ -207,7 +207,7 @@ abstract class BaseAuthProvider extends AuthProvider {
     if (idToken.payload.iss == GitHubJwtPayload.issuerUrl) {
       // The token claims to be issued by GitHub. If there is any problem
       // with the token, the authentication should fail without any fallback.
-      await _verifyToken(idToken, openIdDataFetch: fetchGithubOpenIdData);
+      await _verifyToken(idToken, openIdDataFetch: fetchGitHubOpenIdData);
       return idToken;
     }
 

app/lib/account/models.dart

@@ -75,7 +75,7 @@ class User extends db.ExpandoModel<String> {
   }
 
   late final isVisible = !isBlocked && !isModerated && !isDeleted;
-  late final isNotVisible = !isVisible;
+  bool get isNotVisible => !isVisible;
 
   void updateIsModerated({
     required bool isModerated,
@@ -415,8 +415,7 @@ String consentDedupId({
   required List<String> args,
 }) =>
     [fromAgentId, email, kind, ...args]
-        .where((s) => s != null)
-        .whereType<String>()
+        .nonNulls
         .map(Uri.encodeComponent)
         .join('/');