iOS: PoC WebDAV support

Author: birdofpreyru

README.md

@@ -349,9 +349,11 @@ routes when you create [Server] instance inside your TypeScript code.
     ReactNativeStaticServer_webdav = true
     ```
 
-    **iOS**: _TO BE FIGURED OUT_
+    **iOS**: Use environment variable `RN_STATIC_SERVER_WEBDAV=1` when
+    installing or updating the pods (_i.e._ when doing `pod install` or
+    `pod update`).
 
-    **macOS (Catalyst)**: _TO BE FIGURED OUT_
+    **macOS (Catalyst)**: The same as for iOS.
 
     **Windows**: _TO BE FIGURED OUT_
 

dr-pogodin-react-native-static-server.podspec

@@ -3,6 +3,41 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
+$extraCMakeArgs = ""
+
+$libToolFlags = "-llighttpd -lpcre2-8 -lmod_dirlisting -lmod_h2"
+
+$outputFiles = [
+  # Note: Below is the list of all build products generated from PRCE2,
+  # Lighttpd, and this library, as of now; the commented out modules are
+  # not currently used by our library.
+  '${BUILT_PRODUCTS_DIR}/liblighttpd.a',
+  # '${BUILT_PRODUCTS_DIR}/libmod_accesslog.a',
+  # '${BUILT_PRODUCTS_DIR}/libmod_ajp13.a',
+  # '${BUILT_PRODUCTS_DIR}/libmod_auth.a',
+  # '${BUILT_PRODUCTS_DIR}/libmod_authn_file.a',
+  # '${BUILT_PRODUCTS_DIR}/libmod_cgi.a',
+  # '${BUILT_PRODUCTS_DIR}/libmod_deflate.a',
+  '${BUILT_PRODUCTS_DIR}/libmod_dirlisting.a',
+  # '${BUILT_PRODUCTS_DIR}/libmod_extforward.a',
+  '${BUILT_PRODUCTS_DIR}/libmod_h2.a',
+  # '${BUILT_PRODUCTS_DIR}/libmod_proxy.a',
+  # '${BUILT_PRODUCTS_DIR}/libmod_rrdtool.a',
+  # '${BUILT_PRODUCTS_DIR}/libmod_sockproxy.a',
+  # '${BUILT_PRODUCTS_DIR}/libmod_ssi.a',
+  # '${BUILT_PRODUCTS_DIR}/libmod_status.a',
+  # '${BUILT_PRODUCTS_DIR}/libmod_userdir.a',
+  # '${BUILT_PRODUCTS_DIR}/libmod_vhostdb.a',
+  # '${BUILT_PRODUCTS_DIR}/libmod_wstunnel.a',
+  '${BUILT_PRODUCTS_DIR}/libpcre2-8.a'
+]
+
+if ENV['RN_STATIC_SERVER_WEBDAV'] == '1' then
+  $extraCMakeArgs += " -DWITH_MOD_WEBDAV=ON"
+  $libToolFlags += " -lmod_webdav"
+  $outputFiles.append('${BUILT_PRODUCTS_DIR}/libmod_webdav.a')
+end
+
 Pod::Spec.new do |s|
   s.name         = "dr-pogodin-react-native-static-server"
   s.version      = package["version"]
@@ -21,31 +56,7 @@ Pod::Spec.new do |s|
   s.script_phase = {
     :name => 'Build native dependencies',
     :execution_position => :before_compile,
-    :output_files => [
-      # Note: Below is the list of all build products generated from PRCE2,
-      # Lighttpd, and this library, as of now; the commented out modules are
-      # not currently used by our library.
-      '${BUILT_PRODUCTS_DIR}/liblighttpd.a',
-      # '${BUILT_PRODUCTS_DIR}/libmod_accesslog.a',
-      # '${BUILT_PRODUCTS_DIR}/libmod_ajp13.a',
-      # '${BUILT_PRODUCTS_DIR}/libmod_auth.a',
-      # '${BUILT_PRODUCTS_DIR}/libmod_authn_file.a',
-      # '${BUILT_PRODUCTS_DIR}/libmod_cgi.a',
-      # '${BUILT_PRODUCTS_DIR}/libmod_deflate.a',
-      '${BUILT_PRODUCTS_DIR}/libmod_dirlisting.a',
-      # '${BUILT_PRODUCTS_DIR}/libmod_extforward.a',
-      '${BUILT_PRODUCTS_DIR}/libmod_h2.a',
-      # '${BUILT_PRODUCTS_DIR}/libmod_proxy.a',
-      # '${BUILT_PRODUCTS_DIR}/libmod_rrdtool.a',
-      # '${BUILT_PRODUCTS_DIR}/libmod_sockproxy.a',
-      # '${BUILT_PRODUCTS_DIR}/libmod_ssi.a',
-      # '${BUILT_PRODUCTS_DIR}/libmod_status.a',
-      # '${BUILT_PRODUCTS_DIR}/libmod_userdir.a',
-      # '${BUILT_PRODUCTS_DIR}/libmod_vhostdb.a',
-      # '${BUILT_PRODUCTS_DIR}/libmod_webdav.a',
-      # '${BUILT_PRODUCTS_DIR}/libmod_wstunnel.a',
-      '${BUILT_PRODUCTS_DIR}/libpcre2-8.a'
-    ],
+    :output_files => $outputFiles,
     :script => <<-CMD
       set -e
 
@@ -60,7 +71,7 @@ Pod::Spec.new do |s|
       fi
 
       cmake ${PODS_TARGET_SRCROOT} -B ${TARGET_TEMP_DIR} \
-        -DBUILD_STATIC=1 -DBUILD_LIBRARY=1 ${EXTRA_CONFIG_ARGS}
+        -DBUILD_STATIC=1 -DBUILD_LIBRARY=1 ${EXTRA_CONFIG_ARGS} #{$extraCMakeArgs}
 
       cmake --build ${TARGET_TEMP_DIR} --config ${CONFIGURATION} --target lighttpd
 
@@ -94,6 +105,6 @@ Pod::Spec.new do |s|
   end
 
   s.pod_target_xcconfig    = {
-    "OTHER_LIBTOOLFLAGS" => "-llighttpd -lpcre2-8 -lmod_dirlisting -lmod_h2"
+    "OTHER_LIBTOOLFLAGS" => $libToolFlags
   }
 end

example/README.md

@@ -7,10 +7,10 @@ demonstrates a few optional features relevant to such example, like messaging
 between the native app and a web app inside [react-native-webview], and opening
 selected web app links separately in the system browser app.
 
-**BEWARE:** To facilitate library development needs, this example is set up
+**BEWARE:** _To facilitate library development needs, this example is set up
 differently from a real project — instead of consuming library code from
 a node module installed from NPM, this example consumes the library from its
-parent folder. Because of this, be sure to execute in the parent folder:
+parent folder. Because of this, be sure to execute in the parent folder:_
 ```shell
 # This might be not strictly needed, but good to be consistent with
 # the usual environment of the example during library development.
@@ -28,7 +28,12 @@ to prepare and run the example:
 - On **Android**:
   - `npm run android`
 - On **iOS**:
-  - `cd ios && pod install`
+  - ```sh
+    cd ios && RCT_NEW_ARCH_ENABLED=1 pod install
+    ```
+    Here `RCT_NEW_ARCH_ENABLED=1` is optional, omit it to build for the old RN
+    architecture.
+
   - Then open, build, and run the project in XCode.
 
 [@dr.pogodin/react-native-static-server]: https://www.npmjs.com/package/@dr.pogodin/react-native-static-server

example/ios/Podfile.lock

@@ -18,7 +18,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - dr-pogodin-react-native-static-server (0.8.3):
+  - dr-pogodin-react-native-static-server (0.8.4):
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
     - RCTRequired
@@ -964,7 +964,7 @@ PODS:
   - React-jsinspector (0.72.4)
   - React-logger (0.72.4):
     - glog
-  - react-native-webview (13.3.1):
+  - react-native-webview (13.6.0):
     - RCT-Folly
     - RCTRequired
     - RCTTypeSafety
@@ -1290,7 +1290,7 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   dr-pogodin-react-native-fs: bb2051cf55bd125d705d5fa227439e091ac91bf1
-  dr-pogodin-react-native-static-server: 464fd513aad1a316f287964bbe67c53e3ad11222
+  dr-pogodin-react-native-static-server: 9b41fc942e30cbc71a9668028bff222b7e88bb00
   FBLazyVector: 5d4a3b7f411219a45a6d952f77d2c0a6c9989da5
   Flipper: 6edb735e6c3e332975d1b17956bcc584eccf5818
   Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
@@ -1323,7 +1323,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: c7f826e40fa9cab5d37cab6130b1af237332b594
   React-jsinspector: aaed4cf551c4a1c98092436518c2d267b13a673f
   React-logger: da1ebe05ae06eb6db4b162202faeafac4b435e77
-  react-native-webview: 64e9f6ec5585ae97936747e129da1280f347c1c0
+  react-native-webview: b40b30b3e0f0af534209c4c9f56f72b8c111e831
   React-NativeModulesApple: edb5ace14f73f4969df6e7b1f3e41bef0012740f
   React-perflogger: 496a1a3dc6737f964107cb3ddae7f9e265ddda58
   React-RCTActionSheet: 02904b932b50e680f4e26e7a686b33ebf7ef3c00

example/src/App.tsx

@@ -51,8 +51,8 @@ export default function App() {
       // to the emulated device network or ethernet interface, which can be
       // connected to from the host machine, following instructions at:
       // https://developer.android.com/studio/run/emulator-networking#consoleredir
-      hostname: '10.0.2.15', // Android emulator ethernet interface.
-      // hostname: '127.0.0.1', // This is just the local loopback address.
+      // hostname: '10.0.2.15', // Android emulator ethernet interface.
+      hostname: '127.0.0.1', // This is just the local loopback address.
 
       // The fixed port is just more convenient for library development &
       // testing.
@@ -72,7 +72,10 @@ export default function App() {
         timeouts: true,
       },
 
-      webdav: ['^/dav($|/)', '^/davos($|/)'],
+      // This is to enable WebDAV for /dav... routes. To use, you should also
+      // opt-in for building the library with WebDAV support enabled
+      // (see README for details).
+      // webdav: ['^/dav($|/)'],
     });
     const serverId = server.id;