@amazon-devices/expo-file-system 2.0.9000000000 → 3.0.0

package/kepler/ExponentFileSystem.h

@@ -7,12 +7,21 @@
  */
 #pragma once
 
-#include <KeplerScript/modules/KeplerTurboModule.h>
+#include <Kepler/turbomodule/KeplerTurboModule.h>
+#include "expo-export.h"
 
-class KEPLERSCRIPT_EXPORT ExponentFileSystem : public volta::react::KeplerTurboModule {
+#include <memory>
+
+#include "CurlWrapper.h"
+
+class EXPO_EXPORT ExponentFileSystem : public com::amazon::kepler::turbomodule::KeplerTurboModule {
 public:
     ExponentFileSystem();
 
+    void aggregateMethods(
+            com::amazon::kepler::turbomodule::MethodAggregator<com::amazon::kepler::turbomodule::KeplerTurboModule>&
+                    methodAggregator) const noexcept override;
+
 #ifndef UNIT_TEST
 protected:
 #endif
@@ -20,41 +29,47 @@ protected:
     std::string cacheDirectory();
     std::string bundleDirectory();
 
-    volta::react::Promise getInfoAsync(const std::string fileUri, volta::react::NativeJSObject options);
-    volta::react::Promise readAsStringAsync(const std::string fileUri, volta::react::NativeJSObject options);
-    volta::react::Promise getContentUriAsync(const std::string fileUri);
-    volta::react::Promise writeAsStringAsync(
+    com::amazon::kepler::turbomodule::Promise getInfoAsync(
+            const std::string fileUri,
+            com::amazon::kepler::turbomodule::NativeJSObject options);
+    com::amazon::kepler::turbomodule::Promise readAsStringAsync(
+            const std::string fileUri,
+            com::amazon::kepler::turbomodule::NativeJSObject options);
+    com::amazon::kepler::turbomodule::Promise getContentUriAsync(const std::string fileUri);
+    com::amazon::kepler::turbomodule::Promise writeAsStringAsync(
             const std::string fileUri,
             const std::string contents,
-            volta::react::NativeJSObject options);
-    volta::react::Promise writeArrayBufferAsync(
-            const std::string fileUri,
-            const volta::react::ArrayBuffer arrayBuffer);
-    volta::react::Promise deleteAsync(const std::string fileUri, volta::react::NativeJSObject options);
-    volta::react::Promise moveAsync(volta::react::NativeJSObject options);
-    volta::react::Promise copyAsync(volta::react::NativeJSObject options);
-    volta::react::Promise makeDirectoryAsync(const std::string fileUri, volta::react::NativeJSObject options);
-    volta::react::Promise readDirectoryAsync(const std::string fileUri);
-    volta::react::Promise getFreeDiskStorageAsync();
-    volta::react::Promise getTotalDiskCapacityAsync();
-    volta::react::Promise downloadAsync(
+            com::amazon::kepler::turbomodule::NativeJSObject options);
+    com::amazon::kepler::turbomodule::Promise writeArrayBufferAsync(
+            const std::string fileUri,
+            const com::amazon::kepler::turbomodule::ArrayBuffer arrayBuffer);
+    com::amazon::kepler::turbomodule::Promise deleteAsync(
+            const std::string fileUri,
+            com::amazon::kepler::turbomodule::NativeJSObject options);
+    com::amazon::kepler::turbomodule::Promise moveAsync(com::amazon::kepler::turbomodule::NativeJSObject options);
+    com::amazon::kepler::turbomodule::Promise copyAsync(com::amazon::kepler::turbomodule::NativeJSObject options);
+    com::amazon::kepler::turbomodule::Promise makeDirectoryAsync(
+            const std::string fileUri,
+            com::amazon::kepler::turbomodule::NativeJSObject options);
+    com::amazon::kepler::turbomodule::Promise readDirectoryAsync(const std::string fileUri);
+    com::amazon::kepler::turbomodule::Promise getFreeDiskStorageAsync();
+    com::amazon::kepler::turbomodule::Promise getTotalDiskCapacityAsync();
+    com::amazon::kepler::turbomodule::Promise downloadAsync(
             const std::string url,
             const std::string fileUri,
-            volta::react::NativeJSObject options,
+            com::amazon::kepler::turbomodule::NativeJSObject options,
             double requestId,
             std::vector<utils::json::JsonContainer> headers);
-    volta::react::Promise uploadAsync(
+    com::amazon::kepler::turbomodule::Promise uploadAsync(
             const std::string url,
             const std::string fileUri,
-            volta::react::NativeJSObject options,
+            com::amazon::kepler::turbomodule::NativeJSObject options,
             double requestId,
             std::vector<utils::json::JsonContainer> headers);
 
-    void aggregateMethods(
-            volta::react::MethodAggregator<volta::react::KeplerTurboModule>& methodAggregator) const noexcept override;
-
 private:
     static constexpr int DIRECTORY_SIZE = 4096;
 
     std::uintmax_t getSize(const std::string& path);
+    std::unique_ptr<CurlWrapper> curlWrapper_;
 };

package/kepler/KeplerInit.cpp

@@ -6,20 +6,15 @@
  * Use is subject to license terms.
  */
 
-#include <KeplerScript/logger/KPLog.h>
-#include <KeplerScript/utils/autolink/KeplerAutoLinkInfo.h>
-#include <keplerui-072/keplerscript-export.h>
+#include <Kepler/turbomodule/KeplerTurboModuleRegistration.h>
+#include <Kepler/turbomodule/TMLog.h>
 
 #include "ExponentFileSystem.h"
-#include "RegisterModule.h"
 
 extern "C" {
-KEPLERSCRIPT_EXPORT void keplerAutoLinkInitV1(const kepler::autolink::v1::KeplerAutoLinkInfo* autoLinkInfo) noexcept {
-    volta::react::KPLog.debug("keplerAutoLinkInitV1 for ExponentFileSystem");
-
-    REGISTER_MODULE(autoLinkInfo, ExponentFileSystem, "ExponentFileSystem");
-
-    volta::react::KPLog.debug("after registering module");
+__attribute__((visibility("default"))) void autoLinkKeplerTurboModulesV1() noexcept {
+    TMDEBUG("autoLinkKeplerTurboModulesV1 for expo-file-system");
+    KEPLER_REGISTER_TURBO_MODULE_WITH_NAME("ExponentFileSystemAppTM", ExponentFileSystem);
 }
 }
 

package/package.json

@@ -1 +1 @@
-{"name": "@amazon-devices/expo-file-system", "version": "2.0.9000000000+15.8.0", "description": "Provides access to the local file system on the device.", "main": "build/index.js", "types": "build/index.d.ts", "sideEffects": false, "scripts": {"build": "expo-module build", "clean": "expo-module clean", "lint": "expo-module lint", "test": "expo-module test", "prepublishOnly": "expo-module prepublishOnly", "expo-module": "expo-module"}, "kepler": {"temporary-alias-for-package": {"name": "expo-file-system", "version": "15.8.0"}}, "keywords": ["react-native", "expo", "file-system", "file"], "repository": {"type": "git", "url": "https://github.com/expo/expo.git", "directory": "packages/expo-file-system"}, "bugs": {"url": "https://github.com/expo/expo/issues"}, "author": "650 Industries, Inc.", "license": "See license in LICENSE", "homepage": "https://docs.expo.dev/versions/latest/sdk/filesystem/", "dependencies": {"uuid": "^3.4.0", "@amazon-devices/keplerscript-turbomodule-api": "^1.0.0"}, "devDependencies": {"expo-module-scripts": "^3.0.0", "jest-expo": "~50.0.0-alpha.0", "@types/glob": "^7.2.0", "@types/minimatch": "^3.0.5"}, "peerDependencies": {"expo": "*"}}
+{"name": "@amazon-devices/expo-file-system", "version": "3.0.0+15.8.0", "description": "Provides access to the local file system on the device.", "main": "build/index.js", "types": "build/index.d.ts", "sideEffects": false, "scripts": {"build": "expo-module build", "clean": "expo-module clean", "lint": "expo-module lint", "test": "expo-module test", "prepublishOnly": "expo-module prepublishOnly", "expo-module": "expo-module"}, "kepler": {"temporary-alias-for-package": {"name": "expo-file-system", "version": "15.8.0"}}, "keywords": ["react-native", "expo", "file-system", "file"], "repository": {"type": "git", "url": "https://github.com/expo/expo.git", "directory": "packages/expo-file-system"}, "bugs": {"url": "https://github.com/expo/expo/issues"}, "author": "650 Industries, Inc.", "license": "See license in LICENSE", "homepage": "https://docs.expo.dev/versions/latest/sdk/filesystem/", "dependencies": {"uuid": "^3.4.0", "@amazon-devices/keplerscript-turbomodule-api": "^1.0.0"}, "devDependencies": {"expo-module-scripts": "^3.0.0", "jest-expo": "~50.0.0-alpha.0", "@types/glob": "^7.2.0", "@types/minimatch": "^3.0.5"}, "peerDependencies": {"expo": "^50.0.0-alpha.1"}}

package/react-native.config.js

@@ -10,9 +10,11 @@ module.exports = {
         platforms: {
             kepler: {
                 autolink: {
-                    ExponentFileSystemLib: {
-                        provider: 'system',
-                        turbomodules: ['ExponentFileSystem'],
+                    ExponentFileSystemAppLib: {
+                        provider: 'application',
+                        linkDynamic: true,
+                        libraryName: 'libexpo-file-system-3.so',
+                        turbomodules: ['ExponentFileSystemAppTM'],
                     },
                 },
             },

package/src/ExponentFileSystem.kepler.ts

@@ -12,7 +12,6 @@ import {
   ReadingOptions,
   RelocatingOptions,
   WritingOptions,
-  FileSystemHttpResult,
 } from './FileSystem.types';
 import { ExponentFileSystemModule } from './types';
 
@@ -36,22 +35,17 @@ interface Spec extends KeplerTurboModule {
     readonly readDirectoryAsync: (fileUri: string) => Promise<string[]>;
     readonly getFreeDiskStorageAsync: () => Promise<string>;
     readonly getTotalDiskCapacityAsync: () => Promise<string | undefined>;
+    readonly downloadAsync: (url: string, fileUri: string, options: Record<string, any>, requestId: number, headers: Array<{key: string, value: string}>) => Promise<FileSystemDownloadResult>;
+    readonly uploadAsync: (url: string, fileUri: string, options: Record<string, any>, requestId: number, headers: Array<{key: string, value: string}>) => Promise<FileSystemUploadResult>;
 }
 
-const nativeModule = TurboModuleRegistry.getEnforcing<Spec>('ExponentFileSystem') as Spec;
-const expoCryptoNativeModule = TurboModuleRegistry.getEnforcing<any>('ExpoCrypto');
+const nativeModule = TurboModuleRegistry.getEnforcing<Spec>('ExponentFileSystemAppTM') as Spec;
 
-function getHeadersFromResponse(response: Response): FileSystemHttpResult['headers'] {
-  const responseHeaders: FileSystemDownloadResult['headers'] = {};
-  response.headers.forEach((value: string, key: string) => {
-    responseHeaders[key] = value;
-  })
-  return responseHeaders;
-}
+let _requestId = 1;
+const generateRequestId = (): number => { return _requestId++; };
 
-function getMimeTypeFromHeaders(responseHeaders: FileSystemHttpResult['headers']): FileSystemHttpResult['mimeType'] {
-  const contentTypeKey = Object.keys(responseHeaders).find((key) => key.toLowerCase() === "content-type");
-  return contentTypeKey ? responseHeaders[contentTypeKey].split(';')[0] : null;
+function toHeadersList(headers?: Record<string, string>): Array<{key: string, value: string}> {
+  return Object.entries(headers ?? {}).map(([key, value]) => ({ key, value }));
 }
 
 const module: ExponentFileSystemModule = {
@@ -108,57 +102,36 @@ const module: ExponentFileSystemModule = {
         return result ? parseInt(result) : 0;
     },
     async downloadAsync(url: string, fileUri: string, options: DownloadOptions): Promise<FileSystemDownloadResult> {
-      const { headers, md5 } = options;
-      const response = await fetch(url, { headers });
-
-      if (!response.ok) {
-        throw new Error('Failed to download the file!');
-      }
-
-      const data = await response.arrayBuffer();
-
-      await nativeModule.writeArrayBufferAsync(fileUri, data);
-
-      const responseHeaders = getHeadersFromResponse(response);
-
-      let downloadResult: FileSystemDownloadResult = {
-        uri: fileUri,
-        headers: responseHeaders,
-        status: response.status,
-        mimeType: getMimeTypeFromHeaders(responseHeaders)
-      };
-
-      if (md5) {
-        const md5ArrayBuffer = await expoCryptoNativeModule.digestAsync("MD5", data);
-        downloadResult.md5 = [...new Uint8Array(md5ArrayBuffer)]
-          .map(x => x.toString(16).padStart(2, '0'))
-          .join('');
+      console.log("[ExponentFileSystem] downloadAsync: native streaming download via libcurl");
+      console.log(`DOWNLOAD URL: ${url}`);
+      console.log(`FILE URL: ${fileUri}`);
+
+      try {
+        const result = await nativeModule.downloadAsync(url, fileUri, {
+          md5: options.md5 ?? false,
+        }, generateRequestId(), toHeadersList(options.headers));
+
+        return result as FileSystemDownloadResult;
+      } catch (error: any) {
+        console.error("[ExponentFileSystem] Download failed:", error?.message);
+        const message = error?.message ?? JSON.stringify(error);
+        throw new Error(`Download failed: ${message}`);
       }
-
-      return downloadResult;
     },
     async uploadAsync(url: string, fileUri: string, options: FileSystemUploadOptions): Promise<FileSystemUploadResult> {
-      const { headers, httpMethod } = options;
-      const method = httpMethod ?? "POST";
-
-      const data = await nativeModule.readAsStringAsync(fileUri, {});
-
-      const response = await fetch(url, { method, headers, body: data });
-
-      if (!response.ok) {
-        throw new Error('Failed to upload the file!');
+      console.log("[ExponentFileSystem] uploadAsync: native streaming upload via libcurl");
+
+      try {
+        const result = await nativeModule.uploadAsync(url, fileUri, {
+          httpMethod: options.httpMethod ?? "POST",
+        }, generateRequestId(), toHeadersList(options.headers));
+
+        return result as FileSystemUploadResult;
+      } catch (error: any) {
+        console.error("[ExponentFileSystem] Upload failed:", error?.message);
+        const message = error?.message ?? JSON.stringify(error);
+        throw new Error(`Upload failed: ${message}`);
       }
-
-      const uploadResult = await response.text();
-
-      const responseHeaders = getHeadersFromResponse(response);
-
-      return {
-        body: uploadResult,
-        headers: responseHeaders,
-        status: response.status,
-        mimeType: getMimeTypeFromHeaders(responseHeaders)
-      };
     },
     addListener(eventName: string): void{},
     removeListeners(count: number): void{},

package/src/FileSystem.ts

@@ -30,8 +30,6 @@ if (!ExponentFileSystem) {
     "No native ExponentFileSystem module found, are you sure the expo-file-system's module is linked properly?"
   );
 }
-// Prevent webpack from pruning this.
-const _unused = new EventEmitter(ExponentFileSystem); // eslint-disable-line
 
 function normalizeEndingSlash(p: string | null): string | null {
   if (p != null) {

package/kepler/NetworkingRequestHandler.cpp

@@ -1,47 +0,0 @@
-#include "NetworkingRequestHandler.h"
-
-#include <fstream>
-
-bool NetworkingRequestHandler::supports(utils::json::JsonContainer& data) {
-    return data["fileUri"].isValue();
-}
-
-void NetworkingRequestHandler::decorateRequest(
-        utils::json::JsonContainer& data,
-        const std::string& contentType,
-        volta::react::NetworkRequest& request) {
-    auto type = data["type"].getValue<std::string>("");
-
-    if (type.empty()) {
-        type = "application/octet-stream";
-    }
-
-    request.addHeader(volta::react::NetworkingModule::CONTENT_TYPE_HEADER_KEY, type);
-
-    try {
-        auto dataPtr = std::make_shared<std::vector<uint8_t>>();
-
-        auto fileUri = data["fileUri"].getValue<std::string>();
-
-        std::ifstream file(fileUri, std::ios::binary);
-
-        if (file.fail()) {
-            volta::react::KPLog.error("[ExponentFileSystem] unable to open file at {} for response read", fileUri);
-        } else {
-            std::copy(
-                    std::istreambuf_iterator<char>(file),
-                    std::istreambuf_iterator<char>(),
-                    std::back_inserter(*dataPtr));
-
-            if (file.fail()) {
-                volta::react::KPLog.error("[ExponentFileSystem] error while reading response from file");
-            } else {
-                volta::react::KPLog.debug("[ExponentFileSystem] successfully read response from file");
-                volta::react::ArrayBuffer buf(dataPtr);
-                request.bodyDataBuffer = volta::react::ArrayBuffer(buf.dataVector());
-            }
-        }
-    } catch (std::exception& e) {
-        volta::react::KPLog.error("[ExponentFileSystem] reading response from file exception reason: {}", e.what());
-    }
-}