Push Notifications Feature

build/AzurePipelinesTemplates/ProjectReunion-CreateNugetPackage-Job.yml

@@ -62,7 +62,8 @@ jobs:
         Copy-Item -Path "$targetsFilePath\AppxManifest.xml" -Destination "$fullpackagePath\AppxManifest.xml"
 
         Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.Windows.AppLifecycle.xml" -Destination "$fullpackagePath\lib\uap10.0\Microsoft.Windows.AppLifecycle.xml"
-        Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.Windows.ApplicationModel.DynamicDependency.xml" -Destination "$fullpackagePath\lib\uap10.0\Microsoft.Windows.ApplicationModel.DynamicDependency.xml"
+        Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.ApplicationModel.DynamicDependency.xml" -Destination "$fullpackagePath\lib\uap10.0\Microsoft.ApplicationModel.DynamicDependency.xml"
+        Copy-Item -Path "$targetsFilePath\Intellisense\Microsoft.Windows.PushNotifications.xml" -Destination "$fullpackagePath\lib\uap10.0\Microsoft.Windows.PushNotifications.xml"
 
   # - script: |
   #     dir /s $(Build.SourcesDirectory)

build/CopyFilesToStagingDir.ps1

@@ -38,7 +38,8 @@ PublishFile $OverrideDir\DynamicDependency-Override.json $FullPublishDir\
 PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.ProjectReunion.dll $FullPublishDir\Microsoft.ProjectReunion\
 PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.ProjectReunion.lib $FullPublishDir\Microsoft.ProjectReunion\
 PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.Windows.AppLifecycle.winmd $FullPublishDir\Microsoft.ProjectReunion\
-PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.Windows.ApplicationModel.DynamicDependency.winmd $FullPublishDir\Microsoft.ProjectReunion\
+PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.Windows.PushNotifications.winmd $FullPublishDir\Microsoft.ProjectReunion\
+PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.ApplicationModel.DynamicDependency.winmd $FullPublishDir\Microsoft.ProjectReunion\
 PublishFile $FullBuildOutput\ProjectReunion_DLL\MsixDynamicDependency.h $FullPublishDir\Microsoft.ProjectReunion\
 PublishFile $FullBuildOutput\ProjectReunion_DLL\wil_msixdynamicdependency.h $FullPublishDir\Microsoft.ProjectReunion\
 #
@@ -114,12 +115,15 @@ PublishFile $FullBuildOutput\DynamicDependencyLifetimeManager.ProxyStub\DynamicD
 #
 # WinMD for UWP apps
 PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.Windows.AppLifecycle.winmd $NugetDir\lib\uap10.0
+PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.Windows.PushNotifications.winmd $NugetDir\lib\uap10.0
 #
 # Native (not managed, no MSIX)
 PublishFile $FullBuildOutput\ProjectReunion_BootstrapDLL\Microsoft.ProjectReunion.Bootstrap.dll $NugetDir\runtimes\lib\native\$Platform
 PublishFile $FullBuildOutput\ProjectReunion_BootstrapDLL\Microsoft.ProjectReunion.Bootstrap.pdb $NugetDir\runtimes\lib\native\$Platform
 PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.Windows.AppLifecycle.winmd $NugetDir\lib\native
 PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.Windows.ApplicationModel.DynamicDependency.winmd $NugetDir\lib\native
+PublishFile $FullBuildOutput\ProjectReunion_DLL\Microsoft.Windows.PushNotifications.winmd $NugetDir\lib\native
+
 #
 # C#/WinRT Projections
 #

build/NuSpecs/AppxManifest.xml

@@ -37,6 +37,14 @@
           <!-- AppLifecycle -->
           <ActivatableClass ActivatableClassId="Microsoft.Windows.AppLifecycle.ActivationRegistrationManager" ThreadingModel="both" />
           <ActivatableClass ActivatableClassId="Microsoft.Windows.AppLifecycle.AppInstance" ThreadingModel="both" />
+
+          <!-- PushNotifications -->
+          <ActivatableClass ActivatableClassId="Microsoft.Windows.PushNotifications.PushNotificationChannel" ThreadingModel="both" />
+          <ActivatableClass ActivatableClassId="Microsoft.Windows.PushNotifications.PushNotificationCreateChannelResult" ThreadingModel="both" />
+          <ActivatableClass ActivatableClassId="Microsoft.Windows.PushNotifications.PushNotificationActivationInfo" ThreadingModel="both" />
+          <ActivatableClass ActivatableClassId="Microsoft.Windows.PushNotifications.PushNotificationReceivedEventArgs" ThreadingModel="both" />
+          <ActivatableClass ActivatableClassId="Microsoft.Windows.PushNotifications.PushNotificationRegistrationToken" ThreadingModel="both" />
+          <ActivatableClass ActivatableClassId="Microsoft.Windows.PushNotifications.PushNotificationManager" ThreadingModel="both" />
       </InProcessServer>
     </Extension>
   </Extensions>

build/NuSpecs/ProjectReunion-Nuget-Native.WinRt.props

@@ -20,6 +20,11 @@
       <Implementation Condition="'$(ProjectReunionFrameworkPackage)' != 'true'">$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(_ProjectReunionFoundationPlatform)\native\Microsoft.ProjectReunion.dll</Implementation>
       <IsWinMDFile>true</IsWinMDFile>
     </Reference>
+    <Reference Include="Microsoft.Windows.PushNotifications.winmd">
+      <HintPath>$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Windows.PushNotifications.winmd</HintPath>
+      <Implementation Condition="'$(ProjectReunionFrameworkPackage)' != 'true'">$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(_ProjectReunionFoundationPlatform)\native\Microsoft.ProjectReunion.dll</Implementation>
+      <IsWinMDFile>true</IsWinMDFile>
+    </Reference>
   </ItemGroup>
 
 </Project>

build/NuSpecs/ProjectReunion-Nuget-Native.targets

@@ -23,4 +23,11 @@
     </Reference>
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="$(MSBuildThisFileDirectory)..\..\lib\native\Microsoft.Windows.PushNotifications.winmd">
+      <Private>false</Private>
+      <Implementation>Microsoft.ProjectReunion.dll</Implementation>
+    </Reference>
+  </ItemGroup>
+
 </Project>

dev/AppLifecycle/AppInstance.cpp

@@ -11,6 +11,7 @@
 #include "FileActivatedEventArgs.h"
 #include "Association.h"
 #include "ExtensionContract.h"
+#include "GetRawNotificationEventArgs.h"
 
 using namespace winrt;
 using namespace winrt::Windows::Foundation;
@@ -33,30 +34,37 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation
         // Push past the '----' commandline argument prefix.
         argsStart += 4;
 
-        // We explicitly use find_first_of here, so that the resulting data may contain : as a valid character.
-        auto argsEnd = commandLine.find_first_of(L":", argsStart);
+        auto argsEnd = commandLine.find_first_of(L" ", argsStart);
+
+        // Separate the argument from any behind it on the command-line.
+        std::wstring argument;
         if (argsEnd == std::wstring::npos)
         {
-            return { L"", L"" };
+            argument = commandLine.substr(argsStart);
         }
-
-        if (argsStart > argsEnd)
+        else
         {
-            throw std::overflow_error("commandLine");
+            if (argsStart > argsEnd)
+            {
+                throw std::invalid_argument("commandLine");
+            }
+
+            argument = commandLine.substr(argsStart, (argsEnd - argsStart));
         }
 
-        auto argsLength = argsEnd - argsStart;
-        auto dataStart = argsEnd + 1;
+        // We explicitly use find_first_of here, so that the resulting data may contain : as a valid character.
+        auto argsDelim = argument.find_first_of(L":");
+        if (argsDelim == std::wstring::npos)
+        {
+            return { argument, L"" };
+        }
 
-        return { commandLine.substr(argsStart, argsLength), commandLine.substr(dataStart) };
+        return { argument.substr(0, argsDelim), argument.substr(argsDelim + 1) };
     }
 
     std::tuple<ExtendedActivationKind, winrt::Windows::Foundation::IInspectable> GetEncodedLaunchActivatedEventArgs(IProtocolActivatedEventArgs const& args)
     {
-        auto kind = ExtendedActivationKind::Protocol;
-        winrt::Windows::Foundation::IInspectable data;
-
-        std::tie(kind, data) = DecodeActivatedEventArgs(args.Uri());
+        auto [kind, data] = DecodeActivatedEventArgs(args.Uri());
 
         // Let the caller args pass through if nothing was determined here.
         if (data == nullptr)
@@ -308,51 +316,67 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation
     {
         ExtendedActivationKind kind = ExtendedActivationKind::Launch;
         IInspectable data;
+        bool foundArgs = false;
 
+        // For packaged, try to get platform args first.
         if (HasIdentity())
         {
-            auto args = winrt::Windows::ApplicationModel::AppInstance::GetActivatedEventArgs();
-            if (args)
+            if (auto args = winrt::Windows::ApplicationModel::AppInstance::GetActivatedEventArgs())
             {
-                data = args.as<IInspectable>();
+                data = args;
                 kind = static_cast<ExtendedActivationKind>(args.Kind());
+                foundArgs = true;
             }
         }
-        else
+
+        // Handle all Reunion types next (both packaged and unpackaged).
+        std::wstring commandLine = std::wstring(GetCommandLine());
+        if (!foundArgs)
         {
-            // Generate IActivatedEventArgs for non-Packaged applications.
-            std::wstring contractId;
-            std::wstring contractData;
-            auto commandLine = std::wstring(GetCommandLine());
-            std::tie(contractId, contractData) = ParseCommandLine(commandLine);
+            auto [contractArgument, contractData] = ParseCommandLine(commandLine);
 
             // All specific launch types are encoded as a URI and transported as a
             // protocol, except the catch-all LaunchActivatedEventArgs case.
-            if (!contractId.empty() && (CompareStringOrdinal(contractId.c_str(), -1, c_protocolArgumentString, -1, TRUE) == CSTR_EQUAL))
+            if (!contractArgument.empty())
             {
-                kind = ExtendedActivationKind::Protocol;
-                auto args = make<ProtocolActivatedEventArgs>(contractData);
-                data = args.as<IInspectable>();
-
-                // Encoded launch is a protocol launch where the argument data is
-                // encapsulated in the Uri Query data.  We handle that here and
-                // try to return the correct IActivatedEventArgs type that is
-                // encoded in the data rather than the IProtocolActivatedEventArgs
-                // itself.
-                auto protocolArgs = args.as<IProtocolActivatedEventArgs>();
-                if (IsEncodedLaunch(protocolArgs.Uri()))
+                if (contractData.empty())
                 {
-                    std::tie(kind, data) = GetEncodedLaunchActivatedEventArgs(protocolArgs);
+                    // If the contractData is empty, handle any aliased encoded launches.
+                    if (CompareStringOrdinal(contractArgument.data(), static_cast<int>(contractArgument.size()), L"ReunionPushServer", -1, TRUE) == CSTR_EQUAL)
+                    {
+                        contractData = GenerateEncodedLaunchUri(L"App", c_pushContractId);
+                        contractArgument = c_protocolArgumentString;
+                    }
                 }
-            }
 
-            // Haven't set the kind yet, and so let's default to Launch.
-            if (kind == ExtendedActivationKind::Launch)
-            {
-                data = make<LaunchActivatedEventArgs>(commandLine).as<IInspectable>();
+                if (CompareStringOrdinal(contractArgument.c_str(), -1, c_protocolArgumentString, -1, TRUE) == CSTR_EQUAL)
+                {
+                    kind = ExtendedActivationKind::Protocol;
+                    auto args = make<ProtocolActivatedEventArgs>(contractData);
+                    data = args;
+
+                    // Encoded launch is a protocol launch where the argument data is
+                    // encapsulated in the Uri Query data.  We handle that here and
+                    // try to return the correct IActivatedEventArgs type that is
+                    // encoded in the data rather than the IProtocolActivatedEventArgs
+                    // itself.
+                    if (IsEncodedLaunch(args.Uri()))
+                    {
+                        std::tie(kind, data) = GetEncodedLaunchActivatedEventArgs(args);
+                    }
+
+                    foundArgs = true;
+                }
             }
         }
 
+        // All scenarios should just be marked as Launch.
+        if (!foundArgs)
+        {
+            kind = ExtendedActivationKind::Launch;
+            data = make<LaunchActivatedEventArgs>(commandLine);
+        }
+
         return make<AppActivationArguments>(kind, data);
     }
 

dev/AppLifecycle/AppLifecycle.idl

@@ -50,9 +50,10 @@ namespace Microsoft.Windows.AppLifecycle
         PrintSupportSettingsUI,
         PhoneCallActivation,
         VpnForeground,
-
         // NOTE: Values below 5000 are designated for the platform.  The above list is kept in sync with
         // Windows.ApplicationModel.Activation.ActivationKind.
+
+        Push = 5000,
     };
 
     [experimental]

dev/AppLifecycle/ExtensionContract.h

@@ -7,22 +7,25 @@
 #include "ProtocolActivatedEventArgs.h"
 #include "FileActivatedEventArgs.h"
 #include "StartupActivatedEventArgs.h"
+#include "GetRawNotificationEventArgs.h"
 
 namespace winrt::Microsoft::Windows::AppLifecycle::implementation
 {
     // This array holds the mapping between a class factory and it's extension contract Id.
-    static const struct ExtensionMap
+    struct ExtensionMap
     {
         ExtendedActivationKind kind;
-        std::wstring contractId;
-        winrt::Windows::ApplicationModel::Activation::IActivatedEventArgs(*factory)(winrt::Windows::Foundation::Uri const& uri);
-    }
-    c_extensionMap[] =
+        PCWSTR contractId;
+        winrt::Windows::Foundation::IInspectable(*factory)(winrt::Windows::Foundation::Uri const& uri);
+    };
+
+    constexpr ExtensionMap c_extensionMap[] =
     {
         { ExtendedActivationKind::Launch, c_launchContractId, &LaunchActivatedEventArgs::Deserialize },
         { ExtendedActivationKind::File, c_fileContractId, &FileActivatedEventArgs::Deserialize },
         { ExtendedActivationKind::Protocol, c_protocolContractId, &ProtocolActivatedEventArgs::Deserialize },
         { ExtendedActivationKind::StartupTask, c_startupTaskContractId, &StartupActivatedEventArgs::Deserialize },
+        { ExtendedActivationKind::Push, c_pushContractId, &winrt::Microsoft::Windows::PushNotifications::Deserialize },
     };
 
     inline bool IsEncodedLaunch(winrt::Windows::Foundation::Uri const& uri)
@@ -39,7 +42,7 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation
                 for (const auto& extension : c_extensionMap)
                 {
                     std::wstring contractId = pair.Value().c_str();
-                    if (CompareStringOrdinal(contractId.c_str(), -1, extension.contractId.c_str(), -1, TRUE) == CSTR_EQUAL)
+                    if (CompareStringOrdinal(contractId.c_str(), -1, extension.contractId, -1, TRUE) == CSTR_EQUAL)
                     {
                         return { extension.kind, extension.factory(uri).as<winrt::Windows::Foundation::IInspectable>() };
                     }

dev/AppLifecycle/FileActivatedEventArgs.h

@@ -10,9 +10,9 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation
     using namespace winrt::Windows::ApplicationModel::Activation;
     using namespace winrt::Windows::Storage;
 
-    static PCWSTR c_fileContractId = L"Windows.File";
+    constexpr PCWSTR c_fileContractId = L"Windows.File";
 
-    class FileActivatedEventArgs : public winrt::implements<FileActivatedEventArgs, ActivatedEventArgsBase, IFileActivatedEventArgs,
+    class FileActivatedEventArgs : public winrt::implements<FileActivatedEventArgs, IFileActivatedEventArgs, ActivatedEventArgsBase,
         IInternalValueMarshalable>
     {
     public:
@@ -29,8 +29,8 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation
             }
 
             m_kind = ActivationKind::File;
-            m_verb = verb;
-            m_path = file;
+            m_verb = std::move(verb);
+            m_path = std::move(file);
             m_files = winrt::single_threaded_vector<IStorageItem>();
 
             // There is a scenario where we just want to create an object to serialize it.  In that situation
@@ -44,11 +44,11 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation
             }
         }
 
-        static IActivatedEventArgs Deserialize(winrt::Windows::Foundation::Uri const& uri)
+        static winrt::Windows::Foundation::IInspectable Deserialize(winrt::Windows::Foundation::Uri const& uri)
         {
             auto query = uri.QueryParsed();
-            std::wstring verb = query.GetFirstValueByName(L"Verb").c_str();
-            std::wstring file = query.GetFirstValueByName(L"File").c_str();
+            auto verb = std::wstring(query.GetFirstValueByName(L"Verb"));
+            auto file = std::wstring(query.GetFirstValueByName(L"File"));
             return make<FileActivatedEventArgs>(verb, file);
         }
 

dev/AppLifecycle/LaunchActivatedEventArgs.h

@@ -9,21 +9,21 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation
 {
     using namespace winrt::Windows::ApplicationModel::Activation;
 
-    static PCWSTR c_launchContractId = L"Windows.Launch";
+    constexpr PCWSTR c_launchContractId = L"Windows.Launch";
 
-    class LaunchActivatedEventArgs : public winrt::implements<LaunchActivatedEventArgs,
-        ActivatedEventArgsBase, ILaunchActivatedEventArgs, IInternalValueMarshalable>
+    class LaunchActivatedEventArgs : public winrt::implements<LaunchActivatedEventArgs, ILaunchActivatedEventArgs,
+        ActivatedEventArgsBase, IInternalValueMarshalable>
     {
     public:
-        LaunchActivatedEventArgs(const std::wstring& args) : m_args(args)
+        LaunchActivatedEventArgs(const std::wstring& args) : m_args(std::move(args))
         {
             m_kind = ActivationKind::Launch;
         }
 
-        static IActivatedEventArgs Deserialize(winrt::Windows::Foundation::Uri const& uri)
+        static winrt::Windows::Foundation::IInspectable Deserialize(winrt::Windows::Foundation::Uri const& uri)
         {
             auto query = uri.QueryParsed();
-            auto args = query.GetFirstValueByName(L"Arguments").c_str();
+            auto args = std::wstring(query.GetFirstValueByName(L"Arguments"));
             return make<LaunchActivatedEventArgs>(args);
         }
 

dev/AppLifecycle/ProtocolActivatedEventArgs.h

@@ -10,21 +10,21 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation
     using namespace winrt::Windows::Foundation::Collections;
     using namespace winrt::Windows::ApplicationModel::Activation;
 
-    static PCWSTR c_protocolContractId = L"Windows.Protocol";
+    constexpr PCWSTR c_protocolContractId = L"Windows.Protocol";
 
-    class ProtocolActivatedEventArgs : public winrt::implements<ProtocolActivatedEventArgs, ActivatedEventArgsBase, IProtocolActivatedEventArgs,
+    class ProtocolActivatedEventArgs : public winrt::implements<ProtocolActivatedEventArgs, IProtocolActivatedEventArgs, ActivatedEventArgsBase,
         IInternalValueMarshalable>
     {
     public:
-        ProtocolActivatedEventArgs(const std::wstring& uri) : m_uri(winrt::Windows::Foundation::Uri(uri))
+        ProtocolActivatedEventArgs(const std::wstring& uri) : m_uri(winrt::Windows::Foundation::Uri(std::move(uri)))
         {
             m_kind = ActivationKind::Protocol;
         }
 
-        static IActivatedEventArgs Deserialize(winrt::Windows::Foundation::Uri const& uri)
+        static winrt::Windows::Foundation::IInspectable Deserialize(winrt::Windows::Foundation::Uri const& uri)
         {
             auto query = uri.QueryParsed();
-            auto args = query.GetFirstValueByName(L"Uri").c_str();
+            auto args = std::wstring(query.GetFirstValueByName(L"Uri"));
             return make<ProtocolActivatedEventArgs>(args);
         }