expo-print 12.3.0 → 12.4.1

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 12.4.1 — 2023-06-27
+
+### 🐛 Bug fixes
+
+- Fixed a regression after refactoring to Swift (restore functionality to print from web url or data string). ([#22997](https://github.com/expo/expo/pull/22997) by [@mroswald](https://github.com/mroswald), [@behenate](https://github.com/behenate))
+
+## 12.4.0 — 2023-06-21
+
+### 🐛 Bug fixes
+
+- Fixed Android build warnings for Gradle version 8. ([#22537](https://github.com/expo/expo/pull/22537), [#22609](https://github.com/expo/expo/pull/22609) by [@kudo](https://github.com/kudo))
+
 ## 12.3.0 — 2023-05-08
 
 ### 🎉 New features

package/README.md

@@ -1,4 +1,11 @@
-# expo-print
+<p>
+  <a href="https://docs.expo.dev/versions/latest/sdk/print/">
+    <img
+      src="../../.github/resources/expo-print.svg"
+      alt="expo-print"
+      height="64" />
+  </a>
+</p>
 
 Provides an API for iOS (AirPrint) and Android printing functionality.
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '12.3.0'
+version = '12.4.1'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -35,19 +35,11 @@ buildscript {
   }
 }
 
-// Creating sources with comments
-task androidSourcesJar(type: Jar) {
-  classifier = 'sources'
-  from android.sourceSets.main.java.srcDirs
-}
-
 afterEvaluate {
   publishing {
     publications {
       release(MavenPublication) {
         from components.release
-        // Add additional sourcesJar to artifacts
-        artifact(androidSourcesJar)
       }
     }
     repositories {
@@ -70,15 +62,21 @@ android {
     jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
+  namespace "expo.modules.print"
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 27
-    versionName "12.3.0"
+    versionName "12.4.1"
   }
   lintOptions {
     abortOnError false
   }
+  publishing {
+    singleVariant("release") {
+      withSourcesJar()
+    }
+  }
 }
 
 dependencies {

package/android/src/main/AndroidManifest.xml

@@ -1,5 +1,3 @@
-
-<manifest package="expo.modules.print">
+<manifest>
 
 </manifest>
-  

package/ios/ExpoPrintWithPrinter.swift

@@ -4,6 +4,8 @@ public class ExpoPrintWithPrinter {
   var renderTasks: [ExpoWKPDFRenderer] = []
   var cachedPrinters: [String: UIPrinter] = [:]
   let delegate: ExpoPrintModuleDelegate
+  let printURLSession = URLSession(configuration: .default)
+  var dataTask: URLSessionDataTask?
 
   init(delegate: ExpoPrintModuleDelegate) {
     self.delegate = delegate
@@ -11,15 +13,16 @@ public class ExpoPrintWithPrinter {
 
   func startPrint(options: PrintOptions, promise: Promise) {
     if let uri = options.uri {
-      guard let printingData = dataFromUri(uri: uri) else {
-        promise.reject(InvalidUrlException())
-        return
+      dataFromUri(uri: uri) { [weak self] data in
+        if let self = self, let printingData = data {
+          self.printWithData(printingData: printingData, options: options, promise: promise)
+        } else {
+          promise.reject(InvalidUrlException())
+        }
       }
-      printWithData(printingData: printingData, options: options, promise: promise)
+      return
     }
 
-    let pageSize = options.toPageSize()
-    let printableRect = options.toPrintableRect()
     // Do this for compatibility with deprecated markup formatter option
     guard let htmlString = options.markupFormatterIOS ?? options.html else {
       promise.reject(NoPrintDataException())
@@ -137,11 +140,36 @@ public class ExpoPrintWithPrinter {
     return printInteractionController
   }
 
-  private func dataFromUri(uri: String) -> Data? {
-    do {
-      return try Data(contentsOf: URL(fileURLWithPath: uri))
-    } catch {
-      return nil
+  private func dataFromUri(uri: String, completion: @escaping (Data?) -> Void) {
+    guard var url = URL(string: uri) else {
+      completion(nil)
+      return
+    }
+
+    // Assume that URLs without a scheme eq. /home/user/file.pdf will be local file urls
+    if url.scheme == nil {
+      url = URL(fileURLWithPath: uri)
+    }
+
+    // process http and https requests asynchronously
+    if url.scheme == "http" || url.scheme == "https" {
+      dataTask = printURLSession.dataTask(with: URLRequest(url: url)) { [weak self] data, response, error in
+        defer {
+          self?.dataTask = nil
+        }
+
+        if error == nil, let response = response as? HTTPURLResponse, response.statusCode == 200 {
+          DispatchQueue.main.async {
+            completion(data)
+          }
+          return
+        }
+        completion(nil)
+      }
+      dataTask?.resume()
+    } else {
+      let data = try? Data(contentsOf: url)
+      completion(data)
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-print",
-  "version": "12.3.0",
+  "version": "12.4.1",
   "description": "Provides an API for iOS (AirPrint) and Android printing functionality.",
   "main": "build/Print.js",
   "types": "build/Print.d.ts",
@@ -40,5 +40,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "4ba50c428c8369bb6b3a51a860d4898ad4ccbe78"
+  "gitHead": "aa6bda733cef821234c77a19bbe6008b72c1c594"
 }