comments

yao-msft · Sep 25, 2023 · c676480 · c676480
1 parent 4920193
commit c676480
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 24 deletions.
diff --git a/src/Microsoft.Management.Deployment/Helpers.cpp b/src/Microsoft.Management.Deployment/Helpers.cpp
@@ -130,8 +130,10 @@ namespace winrt::Microsoft::Management::Deployment::implementation
             try
             {
                 auto [hrGetCallerId, callerProcessId] = GetCallerProcessId();
-                THROW_IF_FAILED(hrGetCallerId);
-                callerName = AppInstaller::Utility::ConvertToUTF8(TryGetCallerProcessInfo(callerProcessId));
+                if (SUCCEEDED(hrGetCallerId))
+                {
+                    callerName = AppInstaller::Utility::ConvertToUTF8(TryGetCallerProcessInfo(callerProcessId));
+                }
             }
             CATCH_LOG();
         }
@@ -143,4 +145,26 @@ namespace winrt::Microsoft::Management::Deployment::implementation
 
         return callerName;
     }
+
+    bool ShouldDelayBackgroundUpdateByCaller()
+    {
+        bool shouldDelayBackgroundUpdateInterval = false;
+        try
+        {
+            auto [hrGetCallerId, callerProcessId] = GetCallerProcessId();
+            if (SUCCEEDED(hrGetCallerId) && callerProcessId != GetCurrentProcessId())
+            {
+                // OutOfProc case, we check for explorer.exe
+                auto callerNameWide = AppInstaller::Utility::ConvertToUTF16(GetCallerName());
+                auto processName = AppInstaller::Utility::ConvertToUTF8(std::filesystem::path{ callerNameWide }.filename().wstring());
+                if (::AppInstaller::Utility::CaseInsensitiveEquals("explorer.exe", processName))
+                {
+                    shouldDelayBackgroundUpdateInterval = true;
+                }
+            }
+        }
+        CATCH_LOG();
+
+        return shouldDelayBackgroundUpdateInterval;
+    }
 }
diff --git a/src/Microsoft.Management.Deployment/Helpers.h b/src/Microsoft.Management.Deployment/Helpers.h
@@ -19,4 +19,5 @@ namespace winrt::Microsoft::Management::Deployment::implementation
     std::pair<HRESULT, DWORD> GetCallerProcessId();
     std::wstring TryGetCallerProcessInfo(DWORD callerProcessId);
     std::string GetCallerName();
+    bool ShouldDelayBackgroundUpdateByCaller();
 }
diff --git a/src/Microsoft.Management.Deployment/PackageCatalogReference.cpp b/src/Microsoft.Management.Deployment/PackageCatalogReference.cpp
@@ -22,33 +22,19 @@ namespace winrt::Microsoft::Management::Deployment::implementation
 {
     void PackageCatalogReference::Initialize(winrt::Microsoft::Management::Deployment::PackageCatalogInfo packageCatalogInfo, ::AppInstaller::Repository::Source sourceReference)
     {
-        static constexpr winrt::Windows::Foundation::TimeSpan s_PackageCatalogUpdateIntervalDelay = 168h; //1 week
-
         m_info = packageCatalogInfo;
         m_sourceReference = std::move(sourceReference);
         m_packageCatalogBackgroundUpdateInterval = ::AppInstaller::Settings::User().Get<::AppInstaller::Settings::Setting::AutoUpdateTimeInMinutes>();
 
-        bool shouldDelayBackgroundUpdateInterval = false;
-        try
+        if (ShouldDelayBackgroundUpdateByCaller())
         {
-            auto [hrGetCallerId, callerProcessId] = GetCallerProcessId();
-            THROW_IF_FAILED(hrGetCallerId);
-            if (callerProcessId != GetCurrentProcessId())
-            {
-                // OutOfProc case, we check for explorer.exe
-                auto callerNameWide = AppInstaller::Utility::ConvertToUTF16(GetCallerName());
-                auto processName = AppInstaller::Utility::ConvertToUTF8(std::filesystem::path{ callerNameWide }.filename().wstring());
-                if (::AppInstaller::Utility::CaseInsensitiveEquals("explorer.exe", processName))
-                {
-                    shouldDelayBackgroundUpdateInterval = true;
-                }
-            }
-        }
-        CATCH_LOG();
+            static constexpr winrt::Windows::Foundation::TimeSpan s_PackageCatalogUpdateIntervalDelay_Base = 168h; //1 week
 
-        if (shouldDelayBackgroundUpdateInterval)
-        {
-            m_packageCatalogBackgroundUpdateInterval = s_PackageCatalogUpdateIntervalDelay;
+            // Add a bit of randomness to the default interval time
+            std::default_random_engine randomEngine(std::random_device{}());
+            std::uniform_int_distribution<long long> distribution(0, 168);
+
+            m_packageCatalogBackgroundUpdateInterval = s_PackageCatalogUpdateIntervalDelay_Base + std::chrono::hours(distribution(randomEngine));
         }
     }
     void PackageCatalogReference::Initialize(winrt::Microsoft::Management::Deployment::CreateCompositePackageCatalogOptions options)
@@ -108,6 +94,7 @@ namespace winrt::Microsoft::Management::Deployment::implementation
                     winrt::Microsoft::Management::Deployment::implementation::PackageCatalogReference* catalogImpl = get_self<winrt::Microsoft::Management::Deployment::implementation::PackageCatalogReference>(catalog);
                     auto copy = catalogImpl->m_sourceReference;
                     copy.SetCaller(callerName);
+                    copy.SetBackgroundUpdateInterval(catalog.PackageCatalogBackgroundUpdateInterval());
                     copy.Open(progress);
                     remoteSources.emplace_back(std::move(copy));
                 }
@@ -149,6 +136,7 @@ namespace winrt::Microsoft::Management::Deployment::implementation
 
                 source = m_sourceReference;
                 source.SetCaller(callerName);
+                source.SetBackgroundUpdateInterval(PackageCatalogBackgroundUpdateInterval());
                 source.Open(progress);
             }
 

diff --git a/src/Microsoft.Management.Deployment/pch.h b/src/Microsoft.Management.Deployment/pch.h
@@ -5,4 +5,5 @@
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Foundation.Collections.h>
 
-#include <mutex>
+#include <mutex>
+#include <random>