Summary: This change adds a function to base64 encode. It is used to encode the CSR which gets added to the connection url.
Reviewed By: passy
Differential Revision: D31570706
fbshipit-source-id: 8356550fe87ae3ac6aae8616744a9339cf69b511
Summary:
This change removes ourselves as a delegate before closing.
SocketRocket uses its own internal async queue to perform most operations.
After a disconnect, we don't expect to receive any more delegate calls as the handlers may contain references which may have become invalid.
So, removing ourselves as delegates will ensure that we don't get called after a disconnect.
For sanity, we are also taking a copy of the message handler instead of a reference to it.
Reviewed By: briantkelley
Differential Revision: D31360721
fbshipit-source-id: bae5a2423757cd9064ffac28afb8b78c28a20d87
Summary:
Trigger a manual disconnect on deallocation. This was done automatically for us when the underlying socket gets released. But, this gives a bit more visibility and control onto exactly when this is going to take place.
Additionally, do not clear the message handler when a message is received.
It is not required as sendExpectResponse is one time called only used for certificate exchange. If this takes place again, a new handler will be set anyway.
Reviewed By: passy
Differential Revision: D31231828
fbshipit-source-id: 36ad13564a358b88d1618e94195fe05433d80993
Summary:
Addresses an issue with the connect and disconnect sequence.
Both, connect and disconnect should be performed 'synchronously' instead of being queued in the connection event thread.
Events should be queued in the connection event thread instead.
Reviewed By: passy
Differential Revision: D31195525
fbshipit-source-id: c15487ea163dd277dacee0e5669944ac6971355f
Summary:
This change makes WebSockets the default for Flipper on iOS.
Having said that, we are introducing some logic to deal with clients connecting to older Flipper Desktop versions.
The mobile client will first attempt to connect via WebSocket with the Desktop. This connection can either be secure or insecure. If that fails, it will attempt to connect via RSocket.
Connection failure logic:
The mobile client will attempt to connect up-to 3 times via a WebSocket. If it fails to connect, then the socket provider is switched to RSocket.
As before, the mobile client will attempt to connect up-to 3 times via a RSocket. If it fails to connect, then the socket provider is switched back to WebSocket.
Process repeats until a successful connection is established.
Some logs that can be seen from iOS:
2021-09-15 14:31:51.193503+0100 Sample[92026:92107440] [] nw_protocol_get_quic_image_block_invoke dlopen libquic failed
2021-09-15 14:31:51.878257+0100 Sample[92026:92107440] [connection] nw_socket_handle_socket_event [C1.1:1] Socket SO_ERROR [61: Connection refused]
2021-09-15 14:31:52.553729+0100 Sample[92026:92107440] [connection] nw_socket_handle_socket_event [C1.2:1] Socket SO_ERROR [61: Connection refused]
2021-09-15 14:31:52.899511+0100 Sample[92026:92107442] [connection] nw_connection_get_connected_socket [C1] Client called nw_connection_get_connected_socket on unconnected nw_connection
2021-09-15 14:31:52.899664+0100 Sample[92026:92107442] TCP Conn 0x600001d384d0 Failed : error 0:61 [61]
2021-09-15 14:31:57.120120+0100 Sample[92026:92107439] [connection] nw_socket_handle_socket_event [C2.1:1] Socket SO_ERROR [61: Connection refused]
2021-09-15 14:31:57.141785+0100 Sample[92026:92107439] [connection] nw_socket_handle_socket_event [C2.2:1] Socket SO_ERROR [61: Connection refused]
2021-09-15 14:31:57.151604+0100 Sample[92026:92107483] [connection] nw_connection_get_connected_socket [C2] Client called nw_connection_get_connected_socket on unconnected nw_connection
2021-09-15 14:31:57.154312+0100 Sample[92026:92107483] TCP Conn 0x600001d7c0b0 Failed : error 0:61 [61]
2021-09-15 14:31:59.206079+0100 Sample[92026:92107483] [connection] nw_socket_handle_socket_event [C3.1:1] Socket SO_ERROR [61: Connection refused]
2021-09-15 14:31:59.236824+0100 Sample[92026:92107483] [connection] nw_socket_handle_socket_event [C3.2:1] Socket SO_ERROR [61: Connection refused]
2021-09-15 14:31:59.251927+0100 Sample[92026:92107439] [connection] nw_connection_get_connected_socket [C3] Client called nw_connection_get_connected_socket on unconnected nw_connection
2021-09-15 14:31:59.255963+0100 Sample[92026:92107439] TCP Conn 0x600001d1c210 Failed : error 0:61 [61]
2021-09-15 14:32:01.291303+0100 Sample[92026:92107439] [connection] nw_socket_handle_socket_event [C4.1:1] Socket SO_ERROR [61: Connection refused]
2021-09-15 14:32:01.312406+0100 Sample[92026:92107439] [connection] nw_socket_handle_socket_event [C4.2:1] Socket SO_ERROR [61: Connection refused]
2021-09-15 14:32:01.323099+0100 Sample[92026:92107483] [connection] nw_connection_get_connected_socket [C4] Client called nw_connection_get_connected_socket on unconnected nw_connection
2021-09-15 14:32:01.326028+0100 Sample[92026:92107483] TCP Conn 0x600001d7c0b0 Failed : error 0:61 [61]
flipper: Failed to connect with the current socket provider
flipper: Use legacy socket provider
flipper: FlipperClient::onConnected
Reviewed By: passy
Differential Revision: D30900471
fbshipit-source-id: 7c242ad71306803b050d0174fc22696bb74fdba5
Summary:
The changes below add the notion of alternative ports to Flipper.
These alternative ports are meant to and will be used to connect via WebSocket instead of RSocket. The name does not suggest that as to make as generic as possible so that they can be reused for different purposes in the future.
Reviewed By: passy
Differential Revision: D30898874
fbshipit-source-id: 5eed8c61b41b502c859192aaac59c284b7b36228
Summary: This change reverts a revert. The change was reverted for 'unrelated' issues addressed on this diff dependencies.
Reviewed By: passy
Differential Revision: D30696113
fbshipit-source-id: 8591d6ea79999597024c316e9927a346979e5219
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2838
Test Plan:
Imported from GitHub, without a `Test Plan:` line.
|[Site Preview: flipper](https://our.intern.facebook.com/intern/staticdocs/eph/D30838706/V2/flipper/)
Reviewed By: timur-valiev
Differential Revision: D30838706
Pulled By: passy
fbshipit-source-id: 6f7acf441211d9c5f61a4663af6eaf94f86c4dad
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2834
Test Plan:
Imported from GitHub, without a `Test Plan:` line.
|[Site Preview: flipper](https://our.intern.facebook.com/intern/staticdocs/eph/D30808471/V2/flipper/)
Reviewed By: timur-valiev
Differential Revision: D30808471
Pulled By: passy
fbshipit-source-id: 3cb5d487f1222a08ae9b67cb50fbf459ded40058
Summary:
This allows us to configure a simulator to use a non-default port pair by using the `defaults` mechanism. For instance, this can be done by running
```
xcrun simctl spawn booted defaults write "Apple Global Domain" "com.facebook.flipper.ports" -string "9088,9089"
```
Reviewed By: lblasa, timur-valiev
Differential Revision: D30731874
fbshipit-source-id: 689d60b1c392f36dceef1b3c3cfa0c88f54a7a82
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2764
Reviewed By: lblasa
Differential Revision: D30727119
Pulled By: passy
fbshipit-source-id: 67e5f9bf429244c009d2a27134eb4867ff16d254
Summary: Revert D30371791 (cac09d14aa) to address undefined symbols for a few sandcastle jobs
Reviewed By: fabiomassimo
Differential Revision: D30606610
fbshipit-source-id: 24a5c08bcf5456a96469650a4207b05970399181
Summary:
Contains the implementation of FlipperWebSocket with any necessary changes to use it but without switching it on.
About SocketRocket and Cocoapods
A decision had to be made about whether to define different sub-specs, one for RSocket and another for SocketRocket.
I've opted to keep the podspec as is because:
- Keeps pod consumption as is.
- Makes easier to switch implementations using GK.
- There's no intention to keep RSocket going into the future. So, there's no point in creating a sub-spec only to remove it in the future.
- SocketRocket is a relatively small library so is not contributing to a significant increase in binary size.
If, as reviewer, you consider a subspec makes more sense, then feel free to reach out to discuss.
Reviewed By: fabiomassimo
Differential Revision: D30371791
fbshipit-source-id: 225c5b1de76aff1a6e36640a41765b963aaa2796
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2738
Reviewed By: lblasa
Differential Revision: D30573139
Pulled By: passy
fbshipit-source-id: 0b4f36bfe326fff2e543786572fbc6d17bef6c8b
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2664
Test Plan:
Imported from GitHub, without a `Test Plan:` line.
|[Site Preview: flipper](https://our.intern.facebook.com/intern/staticdocs/eph/D30156476/V2/flipper/)
Reviewed By: passy
Differential Revision: D30156476
Pulled By: nikoant
fbshipit-source-id: 04d3ea60a59fc2fe0507319bd6261376388ec31a
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2662
Test Plan:
Imported from GitHub, without a `Test Plan:` line.
|[Site Preview: flipper](https://our.intern.facebook.com/intern/staticdocs/eph/D30131497/V2/flipper/)
Reviewed By: nikoant
Differential Revision: D30131497
Pulled By: passy
fbshipit-source-id: f321dc0187da2660f585d5f3d47531d7aa19d818
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2637
Reviewed By: passy
Differential Revision: D29962132
Pulled By: cekkaewnumchai
fbshipit-source-id: 98cb91e790a80eac9ca530856f909e0a744e40d0
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2613
Test Plan:
Imported from GitHub, without a `Test Plan:` line.
|[Site Preview: flipper](https://our.intern.facebook.com/intern/staticdocs/eph/D29857462/V2/flipper/)
Reviewed By: muraziz
Differential Revision: D29857462
Pulled By: nikoant
fbshipit-source-id: f498f00b6a8fb0c631c27088509be1b3ffdbe3f3
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2599
Test Plan:
Imported from GitHub, without a `Test Plan:` line.
|[Site Preview: flipper](https://our.intern.facebook.com/intern/staticdocs/eph/D29752884/V2/flipper/)
Reviewed By: mweststrate
Differential Revision: D29752884
Pulled By: passy
fbshipit-source-id: ca8456fe519e093ca3a7c428d3c0b20aa39c19c7
Summary:
OpenSSL-Univeral cause app to crash with `rpath/OpenSSL.framework/OpenSSL' not found` when [debugger is not attached] (https://github.com/krzyzanowskim/OpenSSL/issues/115). Looks like this was caused by arm64e slice and it's now resolved in version 1.1.1000
It also updates the folly version to the latest checkout and solves this task T94605859. According to this task it has been asked by folly team to update its dependency to the latest version.
## Changelog
Bump OpenSSL-Universal to version 1.1.1000
Use latest folly checkout v2021.06.14.00
Pull Request resolved: https://github.com/facebook/flipper/pull/2515
Test Plan: There are no code changes, this only removes problematic arm64 slice from OpenSSL-Universal xcframework.
Reviewed By: nikoant
Differential Revision: D29489739
Pulled By: priteshrnandgaonkar
fbshipit-source-id: cd54eccddb9fb87c9e0e25c3b2cedbdb74408f92
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2544
Test Plan:
Imported from GitHub, without a `Test Plan:` line.
|[Site Preview: flipper](https://our.intern.facebook.com/intern/staticdocs/eph/D29499361/V2/flipper/)
Reviewed By: priteshrnandgaonkar
Differential Revision: D29499361
Pulled By: nikoant
fbshipit-source-id: 8052bdfd86c55cfe890849ba31a6f7020b45f298
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2535
Test Plan:
Imported from GitHub, without a `Test Plan:` line.
|[Site Preview: flipper](https://our.intern.facebook.com/intern/staticdocs/eph/D29455139/V2/flipper/)
Reviewed By: jknoxville
Differential Revision: D29455139
Pulled By: priteshrnandgaonkar
fbshipit-source-id: 10eb515430f4ce16e7ab600e12ef68bdbb7614fb
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2512
Reviewed By: mweststrate
Differential Revision: D29427146
Pulled By: cekkaewnumchai
fbshipit-source-id: e64e59fd9b62f96446e3950dc871011c4d55b804
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2475
Reviewed By: passy
Differential Revision: D29193502
Pulled By: mweststrate
fbshipit-source-id: 2da351bf1408208e3cdf8c65b4dfbafb5d0b1179
Summary:
Flipper Network plugin uses timestamps for various usages e.g. start time of network requests, request duration, etc.
This diff changes the origin of such timestamps.
[NSDate timeIntervalSinceReferenceDate] in favour of FBMonotonicDeviceTimeGetCurrentMilliseconds().
The former uses a timestamp based on date. The latter uses the system boot time.
This translates in errors when the Flipper Desktop app tries to make sense of such timestamps.
This change also adds parity with the Android network plugin that uses System.currentTimeMillis().
The result is multiplied by 1000 as JavaScript expects a timestamp in millseconds.
Reviewed By: fabiomassimo
Differential Revision: D29029192
fbshipit-source-id: b38a4798ecf1564f5801ff3549ffeb9671fa32d6
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2435
Reviewed By: fabiomassimo
Differential Revision: D29000395
Pulled By: jknoxville
fbshipit-source-id: 6bec3497db6cb162852bf7f6f8467d22f3f5b7b6
Summary: Thisi diff updates the CK version to > 0.31 everywhere. It also removes direct CK dependency on SampleSwift, as it doesn't use CK directly.
Reviewed By: fabiomassimo
Differential Revision: D28898898
fbshipit-source-id: 77d4cece79a0a4a51e7ac27b3ec68283740cd0b2
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2409
Reviewed By: passy
Differential Revision: D28896423
Pulled By: priteshrnandgaonkar
fbshipit-source-id: 2758592dad6c0597a6bc3a05e8173f7f00f5593b
Summary:
This diff updates and adds the boost ios podspec in flipper repo. This new boost dep works for Arm and i386 archs for simulator too.
This diff also updates our GH Action to remove i386 from excluded archs. Still arm64 is kept as non M1 mac machines do not have arm swift symbols for arm simulator. And since all our CI is on non M1, it is required.
It also takes care of https://github.com/facebook/flipper/issues/2268
## Changelog
- Update the boost dep
- Update the GH action
Pull Request resolved: https://github.com/facebook/flipper/pull/2341
Test Plan: CI
Reviewed By: mweststrate
Differential Revision: D28537004
Pulled By: priteshrnandgaonkar
fbshipit-source-id: 474ccec674d0edf5fa7b792b15a326e0f139d977
Summary: It can now only be accessed through `RenderCore`.
Reviewed By: ivanmisuno
Differential Revision: D28532729
fbshipit-source-id: b5b97ec93c96303b2a6e4c270dfc667712086b79
Summary:
This makes the tutorial app job to pass
## Changelog
Update the podfile with the static dependencies
Pull Request resolved: https://github.com/facebook/flipper/pull/2282
Test Plan: CI is green
Reviewed By: fabiomassimo
Differential Revision: D28295922
Pulled By: priteshrnandgaonkar
fbshipit-source-id: a6507a380f00fbb1df6ba12f481a0104db4626c3
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2274
Reviewed By: mweststrate
Differential Revision: D28257051
Pulled By: priteshrnandgaonkar
fbshipit-source-id: 24968618eb036e55cd704790d37c21fa9496a59b
Summary:
Pull Request resolved: https://github.com/facebook/flipper/pull/2245
This diff does the following:
- Updates Folly to the latest version.
- Updates boost to latest version and the boost is added as pre built artefact
- Updates RSocket to the latest version
- Updates ComponentKit to the latest version which has a fix for XCode 12.5
- Adds Flipper-Glog dependency updated with a fix for the issue mentioned [here](https://github.com/facebook/flipper/issues/2174)
- This diff also ensures that Flipper, FlipperKit builds with Sample and SampleSwift app.
- This diff also ensures that the bug mentioned [here](https://github.com/facebook/flipper/issues/2248) is addressed.
Note: For Tutorial App to work we will have to make a release of Flipper and FlipperKit to CococaPods. Because the tutorial app refers the released version of Flipper and FlipperKit. It doesn't refer it locally.
Reviewed By: passy
Differential Revision: D28058972
fbshipit-source-id: d45dfc7315ace5d5c7d3a4ba94911fd4b58bdc31
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2246
Reviewed By: mweststrate
Differential Revision: D28090937
Pulled By: passy
fbshipit-source-id: 21913f74072788d18bc4343d9b23cf09d824ff90
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2195
Reviewed By: mweststrate
Differential Revision: D27945986
Pulled By: passy
fbshipit-source-id: 9f73adbd09c14b68f42a917f5c8722422b50b3f5
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2170
Reviewed By: passy
Differential Revision: D27654278
Pulled By: nikoant
fbshipit-source-id: b5405196018d42d8e9d4d16fe3817955f46f8df1
Summary:
This PR updates the Glog and DoubleConversion deps. Now the deps are shipped with precompiled xcframework. It will speed up our build time a bit.
The definition can be found [here for glog](https://github.com/priteshrnandgaonkar/glog/tree/update-0.3.5) and [here for double-conversion](https://github.com/priteshrnandgaonkar/double-conversion/)
There has been improvements in time. I will try to precompile folly to improve the timings significantly.
## Changelog
- Updated the Glog and DoubleConversion deps to the precompiled xcframework one
- Updated the sample app's Podfile.lock
Pull Request resolved: https://github.com/facebook/flipper/pull/2153
Test Plan:
- CI should be green
- Verified that sample app builds.
Reviewed By: mweststrate
Differential Revision: D27560567
Pulled By: priteshrnandgaonkar
fbshipit-source-id: ba295cbe84bb9d5ed6bd6ab17bd1cf5ea22f3cee
Summary:
This is an automated PR to update the Podfile.lock.
- Make sure that the Podfile.lock contains latest FlipperKit and Flipper pod versions.
- Also make sure that all the dependencies are updated to the latest one.
- This is auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
Pull Request resolved: https://github.com/facebook/flipper/pull/2147
Reviewed By: passy
Differential Revision: D27499773
Pulled By: priteshrnandgaonkar
fbshipit-source-id: 20012c59f51f2c02f202e9b1cc1ba18051ec90a3
