Page MenuHomePhabricator
Differential D12612

[Tunnelbroker] implement creating APNs headers
ClosedPublic
Actions

Authored by kamil on Jun 28 2024, 5:18 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Apr 17, 1:11 PM
Unknown Object (File)
Thu, Apr 17, 1:09 PM
Unknown Object (File)
Thu, Apr 17, 5:52 AM
Unknown Object (File)
Thu, Apr 17, 3:48 AM
Unknown Object (File)
Wed, Apr 16, 8:50 AM
Unknown Object (File)
Mon, Apr 14, 5:37 PM
Unknown Object (File)
Sun, Apr 13, 4:16 AM
Unknown Object (File)
Wed, Apr 9, 11:26 AM
View All 93 Files
Subscribers
ashoat
marcin
tomek

Details

Reviewers
bartek
marcin
Commits
rCOMM493327ac8540: [Tunnelbroker] implement creating APNs headers
Summary

Implementing building request headers.

Apple docs: Send a POST request to APNs.

Not sure about PushType - perhaps we can just use String but I prefer more detailed type definition. (cc. @marcin).

Depends on D12611

Test Plan

Tested calling this function with different params

Diff Detail

Repository
rCOMM Comm
Branch
apns-tb
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

kamil created this revision.Jun 28 2024, 5:18 AM
kamil held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptJun 28 2024, 5:18 AM
kamil added a child revision: D12613: [Tunnelbroker] implement APNs response types.Jun 28 2024, 5:29 AM
Harbormaster completed remote builds in B29991: Diff 41790.Jun 28 2024, 5:35 AM
kamil published this revision for review.Jun 28 2024, 6:30 AM
kamil added inline comments.
services/tunnelbroker/src/notifs/apns/headers.rs
32

that's how headers are typed in the keyserver codebase, cc. @marcin

61

forgot to make lines 80 chars width - I'll update before landing

bartek accepted this revision.Jul 1 2024, 2:35 AM
bartek added 1 blocking reviewer(s): marcin.

Rust looks ok, letting @marcin review as well, I have no context on some of these

services/tunnelbroker/src/notifs/apns/mod.rs
36–39

Not sure about your preference, just indicating there's another way of doing this:

impl TryFrom<NotificationHeaders> for HeaderMap {
  type Error = error::Error;
  fn try_from(notif_headers: NotificationHeaders) -> Result<Self, Self::Error> {
    // ...
  }
}

A good alternative if you feel impl APNsClient becomes bloated and difficult to navigate

71

The push_type_str should be a &'static str so using HeaderValue::from_static() should be possible

marcin accepted this revision.Jul 2 2024, 2:04 AM
This revision is now accepted and ready to land.Jul 2 2024, 2:04 AM
kamil mentioned this in D12635: [Tunnelbroker] implement creating APNs client.Jul 2 2024, 4:08 AM
kamil added inline comments.Jul 2 2024, 4:25 AM
services/tunnelbroker/src/notifs/apns/mod.rs
36–39

I like this but this could get messy because of self.token.get_bearer().await? below

kamil updated this revision to Diff 41878.Jul 2 2024, 4:30 AM

fix docs length

Harbormaster completed remote builds in B30047: Diff 41878.Jul 2 2024, 4:50 AM
kamil mentioned this in D12614: [Tunnelbroker] implement sending APNs notif.Jul 2 2024, 6:03 AM
Closed by commit rCOMM493327ac8540: [Tunnelbroker] implement creating APNs headers (authored by kamil). · Explain WhyJul 2 2024, 8:35 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMM493327ac8540: [Tunnelbroker] implement creating APNs headers.

Revision Contents
Changeset List

PathSize
services/
tunnelbroker/
src/
notifs/
apns/
1 line
61 lines
56 lines

Diff 41790

View Options

services/tunnelbroker/src/notifs/apns/error.rs

require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking") require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")
require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods") require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods")
require File.join(File.dirname(`node --print "require.resolve('@react-native-community/cli-platform-ios/package.json')"`), "native_modules") require File.join(File.dirname(`node --print "require.resolve('@react-native-community/cli-platform-ios/package.json')"`), "native_modules")
platform :ios, '12.0' platform :ios, '12.0'
require 'json' require 'json'
podfile_properties = JSON.parse(File.read('./Podfile.properties.json')) rescue {}
target 'Comm' do def common_comm_target_pods
pod 'ReactNativeKeyboardTrackingView', :path => '../../node_modules/react-native-keyboard-tracking-view'
pod 'ReactNativeKeyboardInput', :path => '../../node_modules/react-native-keyboard-input'
pod 'react-native-ffmpeg/min-lts', :podspec => '../../node_modules/react-native-ffmpeg/react-native-ffmpeg.podspec'
pod 'react-native-video/VideoCaching', :podspec => '../../node_modules/react-native-video/react-native-video.podspec'
pod 'SQLCipher-Amalgamation', :path => '../../node_modules/@commapp/sqlcipher-amalgamation' pod 'SQLCipher-Amalgamation', :path => '../../node_modules/@commapp/sqlcipher-amalgamation'
pod 'gRPC-C++', :podspec => './pod-patch/.patched/gRPC-C++/1.40.0/gRPC-C++.podspec.json' pod 'gRPC-C++', :podspec => './pod-patch/.patched/gRPC-C++/1.40.0/gRPC-C++.podspec.json'
pod 'gRPC-C++/Protobuf', :podspec => './pod-patch/.patched/gRPC-C++/1.40.0/gRPC-C++.podspec.json' pod 'gRPC-C++/Protobuf', :podspec => './pod-patch/.patched/gRPC-C++/1.40.0/gRPC-C++.podspec.json'
pod 'gRPC-Core', :podspec => './pod-patch/.patched/gRPC-Core/1.40.0/gRPC-Core.podspec.json' pod 'gRPC-Core', :podspec => './pod-patch/.patched/gRPC-Core/1.40.0/gRPC-Core.podspec.json'
pod 'Protobuf-C++', '3.15.8' pod 'Protobuf-C++', '3.15.8'
end
target 'Comm' do
pod 'ReactNativeKeyboardTrackingView', :path => '../../node_modules/react-native-keyboard-tracking-view'
pod 'ReactNativeKeyboardInput', :path => '../../node_modules/react-native-keyboard-input'
pod 'react-native-video/VideoCaching', :podspec => '../../node_modules/react-native-video/react-native-video.podspec'
pod 'react-native-ffmpeg/min-lts', :podspec => '../../node_modules/react-native-ffmpeg/react-native-ffmpeg.podspec'
common_comm_target_pods
use_expo_modules! use_expo_modules!
config = use_native_modules! config = use_native_modules!
podfile_properties = JSON.parse(File.read('./Podfile.properties.json')) rescue {}
use_react_native!( use_react_native!(
:path => config[:reactNativePath], :path => config[:reactNativePath],
# to enable hermes on iOS, change `false` to `true` and then install pods # to enable hermes on iOS, change `false` to `true` and then install pods
:hermes_enabled => podfile_properties['expo.jsEngine'] == 'hermes' :hermes_enabled => podfile_properties['expo.jsEngine'] == 'hermes'
) )
# Enables Flipper. # Enables Flipper.
# #
# Note that if you have use_frameworks! enabled, Flipper will not work and # Note that if you have use_frameworks! enabled, Flipper will not work and
# you should disable these next few lines. # you should disable these next few lines.
use_flipper!({ "Flipper-DoubleConversion" => "1.1.7" }) use_flipper!({ "Flipper-DoubleConversion" => "1.1.7" })
end
target 'NotificationService' do
common_comm_target_pods
pod 'OLMKit', :path => "../../node_modules/olm"
pod 'RCT-Folly', :podspec => "../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
# Lines below are only needed to compile and use Expo Secure Store in Notification Service.
# If Apple disapproves 'APPLICATION_EXTENSION_API_ONLY' flag then we can safely delete them and use
# customized Expo Secure Store that does not depend on ExpoModulesCore
podfile_properties = JSON.parse(File.read('./Podfile.properties.json')) rescue {}
use_expo_modules!
use_react_native!(
:path => "../../node_modules/react-native",
:hermes_enabled => podfile_properties['expo.jsEngine'] == 'hermes'
)
end
post_install do |installer| post_install do |installer|
react_native_post_install(installer) react_native_post_install(installer)
__apply_Xcode_12_5_M1_post_install_workaround(installer) __apply_Xcode_12_5_M1_post_install_workaround(installer)
# Excluding arm64 because M1 simulator isn't supported yet # Excluding arm64 because M1 simulator isn't supported yet
# Excluding 32-bit x86 because nobody uses it and it causes compilation issues # Excluding 32-bit x86 because nobody uses it and it causes compilation issues
installer.pods_project.build_configurations.each do |config| installer.pods_project.build_configurations.each do |config|
config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64 i386" config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64 i386"
config.build_settings['OTHER_CPLUSPLUSFLAGS'] = '-DDONT_AUTOINSTALL_REANIMATED' config.build_settings['OTHER_CPLUSPLUSFLAGS'] = '-DDONT_AUTOINSTALL_REANIMATED'
end end
# Lines below are only needed to compile and use Expo Secure Store in Notification Service.
# If Apple disapproves 'APPLICATION_EXTENSION_API_ONLY' flag then we can safely delete them and use
# customized Expo Secure Store that does not depend on ExpoModulesCore
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'NO'
end
end end
end end
View Options

services/tunnelbroker/src/notifs/apns/headers.rs

require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking") require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")
require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods") require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods")
require File.join(File.dirname(`node --print "require.resolve('@react-native-community/cli-platform-ios/package.json')"`), "native_modules") require File.join(File.dirname(`node --print "require.resolve('@react-native-community/cli-platform-ios/package.json')"`), "native_modules")
platform :ios, '12.0' platform :ios, '12.0'
require 'json' require 'json'
podfile_properties = JSON.parse(File.read('./Podfile.properties.json')) rescue {}
target 'Comm' do def common_comm_target_pods
pod 'ReactNativeKeyboardTrackingView', :path => '../../node_modules/react-native-keyboard-tracking-view'
pod 'ReactNativeKeyboardInput', :path => '../../node_modules/react-native-keyboard-input'
pod 'react-native-ffmpeg/min-lts', :podspec => '../../node_modules/react-native-ffmpeg/react-native-ffmpeg.podspec'
pod 'react-native-video/VideoCaching', :podspec => '../../node_modules/react-native-video/react-native-video.podspec'
pod 'SQLCipher-Amalgamation', :path => '../../node_modules/@commapp/sqlcipher-amalgamation' pod 'SQLCipher-Amalgamation', :path => '../../node_modules/@commapp/sqlcipher-amalgamation'
pod 'gRPC-C++', :podspec => './pod-patch/.patched/gRPC-C++/1.40.0/gRPC-C++.podspec.json' pod 'gRPC-C++', :podspec => './pod-patch/.patched/gRPC-C++/1.40.0/gRPC-C++.podspec.json'
pod 'gRPC-C++/Protobuf', :podspec => './pod-patch/.patched/gRPC-C++/1.40.0/gRPC-C++.podspec.json' pod 'gRPC-C++/Protobuf', :podspec => './pod-patch/.patched/gRPC-C++/1.40.0/gRPC-C++.podspec.json'
pod 'gRPC-Core', :podspec => './pod-patch/.patched/gRPC-Core/1.40.0/gRPC-Core.podspec.json' pod 'gRPC-Core', :podspec => './pod-patch/.patched/gRPC-Core/1.40.0/gRPC-Core.podspec.json'
pod 'Protobuf-C++', '3.15.8' pod 'Protobuf-C++', '3.15.8'
end
target 'Comm' do
pod 'ReactNativeKeyboardTrackingView', :path => '../../node_modules/react-native-keyboard-tracking-view'
pod 'ReactNativeKeyboardInput', :path => '../../node_modules/react-native-keyboard-input'
pod 'react-native-video/VideoCaching', :podspec => '../../node_modules/react-native-video/react-native-video.podspec'
pod 'react-native-ffmpeg/min-lts', :podspec => '../../node_modules/react-native-ffmpeg/react-native-ffmpeg.podspec'
common_comm_target_pods
use_expo_modules! use_expo_modules!
config = use_native_modules! config = use_native_modules!
podfile_properties = JSON.parse(File.read('./Podfile.properties.json')) rescue {}
use_react_native!( use_react_native!(
:path => config[:reactNativePath], :path => config[:reactNativePath],
# to enable hermes on iOS, change `false` to `true` and then install pods # to enable hermes on iOS, change `false` to `true` and then install pods
:hermes_enabled => podfile_properties['expo.jsEngine'] == 'hermes' :hermes_enabled => podfile_properties['expo.jsEngine'] == 'hermes'
) )
# Enables Flipper. # Enables Flipper.
# #
# Note that if you have use_frameworks! enabled, Flipper will not work and # Note that if you have use_frameworks! enabled, Flipper will not work and
# you should disable these next few lines. # you should disable these next few lines.
use_flipper!({ "Flipper-DoubleConversion" => "1.1.7" }) use_flipper!({ "Flipper-DoubleConversion" => "1.1.7" })
end
target 'NotificationService' do
common_comm_target_pods
pod 'OLMKit', :path => "../../node_modules/olm"
pod 'RCT-Folly', :podspec => "../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
# Lines below are only needed to compile and use Expo Secure Store in Notification Service.
# If Apple disapproves 'APPLICATION_EXTENSION_API_ONLY' flag then we can safely delete them and use
# customized Expo Secure Store that does not depend on ExpoModulesCore
podfile_properties = JSON.parse(File.read('./Podfile.properties.json')) rescue {}
use_expo_modules!
use_react_native!(
:path => "../../node_modules/react-native",
:hermes_enabled => podfile_properties['expo.jsEngine'] == 'hermes'
)
end
post_install do |installer| post_install do |installer|
react_native_post_install(installer) react_native_post_install(installer)
__apply_Xcode_12_5_M1_post_install_workaround(installer) __apply_Xcode_12_5_M1_post_install_workaround(installer)
# Excluding arm64 because M1 simulator isn't supported yet # Excluding arm64 because M1 simulator isn't supported yet
# Excluding 32-bit x86 because nobody uses it and it causes compilation issues # Excluding 32-bit x86 because nobody uses it and it causes compilation issues
installer.pods_project.build_configurations.each do |config| installer.pods_project.build_configurations.each do |config|
config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64 i386" config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64 i386"
config.build_settings['OTHER_CPLUSPLUSFLAGS'] = '-DDONT_AUTOINSTALL_REANIMATED' config.build_settings['OTHER_CPLUSPLUSFLAGS'] = '-DDONT_AUTOINSTALL_REANIMATED'
end end
# Lines below are only needed to compile and use Expo Secure Store in Notification Service.
# If Apple disapproves 'APPLICATION_EXTENSION_API_ONLY' flag then we can safely delete them and use
# customized Expo Secure Store that does not depend on ExpoModulesCore
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'NO'
end
end end
end end
View Options

services/tunnelbroker/src/notifs/apns/mod.rs

require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking") require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")
require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods") require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods")
require File.join(File.dirname(`node --print "require.resolve('@react-native-community/cli-platform-ios/package.json')"`), "native_modules") require File.join(File.dirname(`node --print "require.resolve('@react-native-community/cli-platform-ios/package.json')"`), "native_modules")
platform :ios, '12.0' platform :ios, '12.0'
require 'json' require 'json'
podfile_properties = JSON.parse(File.read('./Podfile.properties.json')) rescue {}
target 'Comm' do def common_comm_target_pods
pod 'ReactNativeKeyboardTrackingView', :path => '../../node_modules/react-native-keyboard-tracking-view'
pod 'ReactNativeKeyboardInput', :path => '../../node_modules/react-native-keyboard-input'
pod 'react-native-ffmpeg/min-lts', :podspec => '../../node_modules/react-native-ffmpeg/react-native-ffmpeg.podspec'
pod 'react-native-video/VideoCaching', :podspec => '../../node_modules/react-native-video/react-native-video.podspec'
pod 'SQLCipher-Amalgamation', :path => '../../node_modules/@commapp/sqlcipher-amalgamation' pod 'SQLCipher-Amalgamation', :path => '../../node_modules/@commapp/sqlcipher-amalgamation'
pod 'gRPC-C++', :podspec => './pod-patch/.patched/gRPC-C++/1.40.0/gRPC-C++.podspec.json' pod 'gRPC-C++', :podspec => './pod-patch/.patched/gRPC-C++/1.40.0/gRPC-C++.podspec.json'
pod 'gRPC-C++/Protobuf', :podspec => './pod-patch/.patched/gRPC-C++/1.40.0/gRPC-C++.podspec.json' pod 'gRPC-C++/Protobuf', :podspec => './pod-patch/.patched/gRPC-C++/1.40.0/gRPC-C++.podspec.json'
pod 'gRPC-Core', :podspec => './pod-patch/.patched/gRPC-Core/1.40.0/gRPC-Core.podspec.json' pod 'gRPC-Core', :podspec => './pod-patch/.patched/gRPC-Core/1.40.0/gRPC-Core.podspec.json'
pod 'Protobuf-C++', '3.15.8' pod 'Protobuf-C++', '3.15.8'
end
target 'Comm' do
pod 'ReactNativeKeyboardTrackingView', :path => '../../node_modules/react-native-keyboard-tracking-view'
pod 'ReactNativeKeyboardInput', :path => '../../node_modules/react-native-keyboard-input'
pod 'react-native-video/VideoCaching', :podspec => '../../node_modules/react-native-video/react-native-video.podspec'
pod 'react-native-ffmpeg/min-lts', :podspec => '../../node_modules/react-native-ffmpeg/react-native-ffmpeg.podspec'
common_comm_target_pods
use_expo_modules! use_expo_modules!
config = use_native_modules! config = use_native_modules!
podfile_properties = JSON.parse(File.read('./Podfile.properties.json')) rescue {}
use_react_native!( use_react_native!(
:path => config[:reactNativePath], :path => config[:reactNativePath],
# to enable hermes on iOS, change `false` to `true` and then install pods # to enable hermes on iOS, change `false` to `true` and then install pods
:hermes_enabled => podfile_properties['expo.jsEngine'] == 'hermes' :hermes_enabled => podfile_properties['expo.jsEngine'] == 'hermes'
) )
# Enables Flipper. # Enables Flipper.
# #
# Note that if you have use_frameworks! enabled, Flipper will not work and # Note that if you have use_frameworks! enabled, Flipper will not work and
# you should disable these next few lines. # you should disable these next few lines.
use_flipper!({ "Flipper-DoubleConversion" => "1.1.7" }) use_flipper!({ "Flipper-DoubleConversion" => "1.1.7" })
end
target 'NotificationService' do
common_comm_target_pods
pod 'OLMKit', :path => "../../node_modules/olm"
pod 'RCT-Folly', :podspec => "../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
# Lines below are only needed to compile and use Expo Secure Store in Notification Service.
# If Apple disapproves 'APPLICATION_EXTENSION_API_ONLY' flag then we can safely delete them and use
# customized Expo Secure Store that does not depend on ExpoModulesCore
podfile_properties = JSON.parse(File.read('./Podfile.properties.json')) rescue {}
use_expo_modules!
use_react_native!(
:path => "../../node_modules/react-native",
:hermes_enabled => podfile_properties['expo.jsEngine'] == 'hermes'
)
end
post_install do |installer| post_install do |installer|
react_native_post_install(installer) react_native_post_install(installer)
__apply_Xcode_12_5_M1_post_install_workaround(installer) __apply_Xcode_12_5_M1_post_install_workaround(installer)
# Excluding arm64 because M1 simulator isn't supported yet # Excluding arm64 because M1 simulator isn't supported yet
# Excluding 32-bit x86 because nobody uses it and it causes compilation issues # Excluding 32-bit x86 because nobody uses it and it causes compilation issues
installer.pods_project.build_configurations.each do |config| installer.pods_project.build_configurations.each do |config|
config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64 i386" config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64 i386"
config.build_settings['OTHER_CPLUSPLUSFLAGS'] = '-DDONT_AUTOINSTALL_REANIMATED' config.build_settings['OTHER_CPLUSPLUSFLAGS'] = '-DDONT_AUTOINSTALL_REANIMATED'
end end
# Lines below are only needed to compile and use Expo Secure Store in Notification Service.
# If Apple disapproves 'APPLICATION_EXTENSION_API_ONLY' flag then we can safely delete them and use
# customized Expo Secure Store that does not depend on ExpoModulesCore
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'NO'
end
end end
end end