@cpp.js/package-curl 2.0.0-beta.2 → 2.0.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cpp.js/package-curl",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "nativeVersion": "8.17.0",
   "description": "This package provides a CURL library compiled with Cpp.js, enabling seamless usage of CURL functionalities in JavaScript, WebAssembly and React Native projects. Client-side URL transfers for web and mobile applications.",
   "homepage": "https://github.com/bugra9/cpp.js/tree/main/packages/cppjs-package-curl#readme",
@@ -15,11 +15,11 @@
     "react-native"
   ],
   "dependencies": {
-    "@cpp.js/package-curl-wasm": "^2.0.0-beta.1",
-    "@cpp.js/package-curl-android": "^2.0.0-beta.1",
-    "@cpp.js/package-curl-ios": "^2.0.0-beta.1"
+    "@cpp.js/package-curl-wasm": "^2.0.0-beta.4",
+    "@cpp.js/package-curl-android": "^2.0.0-beta.4",
+    "@cpp.js/package-curl-ios": "^2.0.0-beta.4"
   },
   "devDependencies": {
-    "cpp.js": "^2.0.0-beta.1"
+    "cpp.js": "^2.0.0-beta.4"
   }
 }

package/cppjs-package-curl.podspec

@@ -1,13 +0,0 @@
-require "json"
-package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-
-Pod::Spec.new do |s|
-  s.module_name  = "curl"
-  s.name         = "cppjs-package-curl"
-  s.version      = package["nativeVersion"]
-  s.summary      = "Transferring data with URLs"
-  s.homepage     = "https://curl.se/"
-  s.author       = "CURL Authors"
-  s.source       = { :http => "https://cpp.js.org" }
-  s.vendored_frameworks = 'curl.xcframework'
-end

package/cppjs.build.js

@@ -1,182 +0,0 @@
-const easyPerformAbove = `
-#ifdef __EMSCRIPTEN__
-static void on_success(emscripten_fetch_t *fetch) {
-    void **userData = (void **)fetch->userData;
-    volatile emscripten_fetch_t **fetch_result_ptr = (volatile emscripten_fetch_t **)userData[0];
-    volatile int *fetch_completed_ptr = (volatile int *)userData[1];
-    *fetch_result_ptr = fetch;
-    *fetch_completed_ptr = 1;
-}
-
-static void on_error(emscripten_fetch_t *fetch) {
-    void **userData = (void **)fetch->userData;
-    volatile emscripten_fetch_t **fetch_result_ptr = (volatile emscripten_fetch_t **)userData[0];
-    volatile int *fetch_completed_ptr = (volatile int *)userData[1];
-    *fetch_result_ptr = fetch;
-    *fetch_completed_ptr = 1;
-}
-#endif
-`;
-
-const easyPerformInside = `
-#ifdef __EMSCRIPTEN__
-    char method[10] = "GET";
-    switch (data->set.method) {
-        case HTTPREQ_GET:
-            strcpy(method, "GET");
-            break;
-        case HTTPREQ_POST:
-        case HTTPREQ_POST_FORM:
-        case HTTPREQ_POST_MIME:
-            strcpy(method, "POST");
-            break;
-        case HTTPREQ_PUT:
-            strcpy(method, "PUT");
-            break;
-        case HTTPREQ_HEAD:
-            strcpy(method, "HEAD");
-            break;
-    }
-    if (data->set.str[28]) {
-        strcpy(method, data->set.str[28]);
-    }
-    emscripten_fetch_attr_t attr;
-    emscripten_fetch_attr_init(&attr);
-    strcpy(attr.requestMethod, method);
-    if (data->set.postfields) {
-        attr.requestData = data->set.postfields;
-        attr.requestDataSize = strlen(data->set.postfields);
-    }
-    if (data->set.headers) {
-        int header_count = 0;
-        struct curl_slist* temp = data->set.headers;
-        while (temp) {
-            header_count++;
-            temp = temp->next;
-        }
-
-        const char** result = (const char**)malloc(sizeof(char*) * (header_count * 2 + 1));
-
-        temp = data->set.headers;
-        int i = 0;
-        while (temp) {
-            char* header_line = strdup(temp->data);
-            char* colon = strchr(header_line, ':');
-
-            if (colon) {
-                *colon = '\0';
-                char* value = colon + 1;
-
-                while (*value == ' ') value++;
-
-                result[i++] = strdup(header_line);
-                result[i++] = strdup(value);
-            } else {}
-
-            free(header_line);
-            temp = temp->next;
-        }
-        result[i] = NULL;
-
-        attr.requestHeaders = result;
-    }
-    attr.attributes = EMSCRIPTEN_FETCH_LOAD_TO_MEMORY;
-
-    volatile int fetch_completed = 0;
-    volatile emscripten_fetch_t* fetch = NULL;
-    void* userData[2] = { (void*)&fetch, (void*)&fetch_completed };
-
-    attr.onsuccess = on_success;
-    attr.onerror = on_error;
-    attr.userData = userData;
-
-    emscripten_fetch(&attr, data->state.url);
-
-    while (!fetch_completed) {
-        emscripten_sleep(100);
-    }
-
-    data->info.httpcode = fetch->status;
-    if (fetch->status == 200) {
-        if (data->set.out) {
-            data->set.fwrite_func(fetch->data, 1, fetch->numBytes, data->set.out);
-        }
-    } else if (fetch->status >= 400) {
-        if (data->set.http_fail_on_error && data->set.errorbuffer) {
-            data->set.fwrite_func(fetch->data, 1, fetch->numBytes, data->set.errorbuffer);
-        } else if (data->set.out) {
-            data->set.fwrite_func(fetch->data, 1, fetch->numBytes, data->set.out);
-        }
-    } else {
-        if (data->set.out) {
-            data->set.fwrite_func(fetch->data, 1, fetch->numBytes, data->set.out);
-        }
-    }
-
-    if (attr.requestHeaders) {
-        for (int i = 0; attr.requestHeaders[i] != NULL; i++) {
-            free((void*)attr.requestHeaders[i]);
-        }
-
-        free(attr.requestHeaders);
-    }
-
-    emscripten_fetch_close(fetch);
-
-    if (data->set.http_fail_on_error && fetch->status >= 400) {
-        return CURLE_HTTP_RETURNED_ERROR;
-    }
-
-    return CURLE_OK;
-#endif
-`;
-
-const fetchImportString = `
-#ifdef __EMSCRIPTEN__
-#include <emscripten.h>
-#include <emscripten/fetch.h>
-#endif
-`;
-
-const platformBuild = {
-    'Emscripten-x86_64': ['-DBUILD_SHARED_LIBS=OFF', '-DBUILD_STATIC_LIBS=ON'],
-    'Android-arm64-v8a': ['-DBUILD_SHARED_LIBS=ON', '-DBUILD_STATIC_LIBS=OFF'],
-    'Android-x86_64': ['-DBUILD_SHARED_LIBS=ON', '-DBUILD_STATIC_LIBS=OFF'],
-    'iOS-iphoneos': ['-DBUILD_SHARED_LIBS=OFF', '-DBUILD_STATIC_LIBS=ON'],
-    'iOS-iphonesimulator': ['-DBUILD_SHARED_LIBS=OFF', '-DBUILD_STATIC_LIBS=ON'],
-};
-
-export default {
-    getURL: (version) => `https://curl.se/download/curl-${version}.tar.gz`,
-    replaceList: [
-        {
-            regex: 'static CURLcode easy_perform\\(struct Curl_easy \\*data, bool events\\)',
-            replacement: `${easyPerformAbove}\nstatic CURLcode easy_perform(struct Curl_easy *data, bool events)`,
-            paths: ['lib/easy.c'],
-        },
-        {
-            regex: '  struct Curl\\_multi \\*multi\\;',
-            replacement: `${easyPerformInside}\n  struct Curl_multi *multi;`,
-            paths: ['lib/easy.c'],
-        },
-        {
-            regex: '#include "urldata.h"',
-            replacement: `${fetchImportString}\n#include "urldata.h"`,
-            paths: ['lib/easy.c'],
-        },
-    ],
-    buildType: 'cmake',
-    getBuildParams: (platform, depPaths) => [
-        ...(platformBuild[platform] || []),
-        `-DOPENSSL_INCLUDE_DIR=${depPaths.ssl.header}`,
-        `-DOPENSSL_SSL_LIBRARY=${depPaths.ssl.lib}`,
-        `-DOPENSSL_CRYPTO_LIBRARY=${depPaths.crypto.lib}`,
-        // `-DOPENSSL_CMAKE_PATH=${depPaths.cmake.openssl}`,
-        '-DBUILD_EXAMPLES=OFF', '-DBUILD_CURL_EXE=OFF', '-DBUILD_LIBCURL_DOCS=OFF',
-        '-DBUILD_TESTING=OFF',
-        '-DENABLE_CURL_MANUAL=OFF', // '-DCURL_DISABLE_THREADED_RESOLVER=ON','-DCURL_DISABLE_THREAD=ON',
-        '-DENABLE_NETRC=OFF', '-DCURL_USE_LIBPSL=OFF', '-DENABLE_IPV6=OFF', '-DENABLE_NTLMWB=OFF',
-        // '-DCURL_DISABLE_UNIX_SOCKETS=ON',
-        // '-DCURL_ENABLE_EXPORT_TARGET=OFF'
-    ],
-};