Merge branch 'master' into experiment

Author: isoos

CHANGELOG.md

@@ -3,6 +3,8 @@ AppEngine version, listed here to ease deployment and troubleshooting.
 
 ## Next Release (replace with git tag when deployed)
  * Enabled manual publishing settings on package admin UI.
+ * Note: new `Package.publishingConfig` field in Datastore, new `PUT /api/packages/<package>/publishing` endpoint.
+ * Note: Reverted public `cache-control` headers except for `/documentation/` pages.
 
 ## `20251023t081900-all`
  * Bump runtimeVersion to `2025.10.22`.

app/lib/admin/backend.dart

@@ -35,7 +35,6 @@ import '../shared/versions.dart';
 import 'actions/actions.dart' show AdminAction;
 import 'tools/delete_all_staging.dart';
 import 'tools/list_tools.dart';
-import 'tools/notify_service.dart';
 import 'tools/recent_uploaders.dart';
 import 'tools/user_merger.dart';
 
@@ -53,7 +52,6 @@ typedef Tool = Future<String> Function(List<String> args);
 
 final Map<String, Tool> availableTools = {
   'delete-all-staging': executeDeleteAllStaging,
-  'notify-service': executeNotifyService,
   'recent-uploaders': executeRecentUploaders,
   'user-merger': executeUserMergerTool,
   'list-tools': executeListTools,

app/lib/admin/tools/notify_service.dart

@@ -62,20 +62,13 @@ final class CacheControl {
     public: true,
   );
 
-  /// `Cache-Control` headers for package content pages, returning content that
+  /// `Cache-Control` headers for documentation pages, returning content that
   /// is not updated frequently.
-  static const packageContentPage = CacheControl(
+  static const documentationPage = CacheControl(
     maxAge: Duration(minutes: 30),
     public: true,
   );
 
-  /// `Cache-Control` headers for package listing pages, returning content that
-  /// is may be updated frequently.
-  static const packageListingPage = CacheControl(
-    maxAge: Duration(minutes: 5),
-    public: true,
-  );
-
   /// `Cache-Control` headers for API end-points returning completion data for
   /// use in IDE integrations.
   static const completionData = CacheControl(

app/lib/frontend/handlers/cache_control.dart

@@ -5,7 +5,6 @@
 import 'dart:async';
 
 import 'package:_pub_shared/search/tags.dart';
-import 'package:pub_dev/frontend/handlers/cache_control.dart';
 import 'package:pub_dev/search/top_packages.dart';
 import 'package:shelf/shelf.dart' as shelf;
 
@@ -50,10 +49,7 @@ Future<shelf.Response> indexLandingHandler(shelf.Request request) async {
   }
 
   if (requestContext.uiCacheEnabled) {
-    return htmlResponse(
-      (await cache.uiIndexPage().get(_render))!,
-      headers: CacheControl.packageListingPage.headers,
-    );
+    return htmlResponse((await cache.uiIndexPage().get(_render))!);
   }
   return htmlResponse(await _render());
 }

app/lib/frontend/handlers/landing.dart

@@ -7,8 +7,6 @@ import 'dart:async';
 import 'package:_pub_shared/search/search_form.dart';
 import 'package:_pub_shared/search/tags.dart';
 import 'package:logging/logging.dart';
-import 'package:pub_dev/frontend/handlers/cache_control.dart';
-import 'package:pub_dev/frontend/request_context.dart';
 import 'package:shelf/shelf.dart' as shelf;
 
 import '../../package/name_tracker.dart';
@@ -96,9 +94,6 @@ Future<shelf.Response> _packagesHandlerHtmlCore(shelf.Request request) async {
       openSections: openSections,
     ),
     status: statusCode,
-    headers: statusCode == 200 && requestContext.uiCacheEnabled
-        ? CacheControl.packageListingPage.headers
-        : null,
   );
   _searchOverallLatencyTracker.add(sw.elapsed);
   return result;

app/lib/frontend/handlers/listing.dart

@@ -356,10 +356,7 @@ Future<shelf.Response> _handlePackagePage({
     }
     _packageDoneLatencyTracker.add(sw.elapsed);
   }
-  return htmlResponse(
-    cachedPage,
-    headers: cacheEnabled ? CacheControl.packageContentPage.headers : null,
-  );
+  return htmlResponse(cachedPage);
 }
 
 /// Returns the optionally lowercased version of [name], but only if there

app/lib/frontend/handlers/package.dart

@@ -402,10 +402,17 @@ class PubApi {
   ) => putPackageOptionsHandler(request, package, body);
 
   @EndPoint.put('/api/packages/<package>/automated-publishing')
-  Future<AutomatedPublishingConfig> setAutomatedPublishing(
+  Future<PkgPublishingConfig> setAutomatedPublishing(
     Request request,
     String package,
-    AutomatedPublishingConfig body,
+    PkgPublishingConfig body,
+  ) => packageBackend.setAutomatedPublishing(package, body);
+
+  @EndPoint.put('/api/packages/<package>/publishing')
+  Future<PkgPublishingConfig> setPackagePublishing(
+    Request request,
+    String package,
+    PkgPublishingConfig body,
   ) => packageBackend.setAutomatedPublishing(package, body);
 
   @EndPoint.get('/api/packages/<package>/versions/<version>/options')