diff --git a/HublibFramework.xcframework/ios-arm64/Headers/hublibFFI.h b/HublibFramework.xcframework/ios-arm64/Headers/hublibFFI.h index bf4c717..ca163f7 100644 --- a/HublibFramework.xcframework/ios-arm64/Headers/hublibFFI.h +++ b/HublibFramework.xcframework/ios-arm64/Headers/hublibFFI.h @@ -253,12 +253,12 @@ typedef void (*UniffiForeignFutureCompleteVoid)(uint64_t, UniffiForeignFutureStr #endif #ifndef UNIFFI_FFIDEF_UNIFFI_HUBLIB_FN_FUNC_GET_SECRET_VALUE #define UNIFFI_FFIDEF_UNIFFI_HUBLIB_FN_FUNC_GET_SECRET_VALUE -RustBuffer uniffi_hublib_fn_func_get_secret_value(uint64_t given_time, RustBuffer user_agent, RustBuffer url, RustCallStatus *_Nonnull out_status +RustBuffer uniffi_hublib_fn_func_get_secret_value(RustBuffer http_time, RustBuffer user_agent, RustBuffer url, RustCallStatus *_Nonnull out_status ); #endif #ifndef UNIFFI_FFIDEF_UNIFFI_HUBLIB_FN_FUNC_RECREATE_SECRET_VALUE #define UNIFFI_FFIDEF_UNIFFI_HUBLIB_FN_FUNC_RECREATE_SECRET_VALUE -RustBuffer uniffi_hublib_fn_func_recreate_secret_value(uint64_t given_time, RustBuffer user_agent, RustBuffer url, RustBuffer gotten_value, RustCallStatus *_Nonnull out_status +RustBuffer uniffi_hublib_fn_func_recreate_secret_value(RustBuffer http_date, RustBuffer user_agent, RustBuffer url, RustBuffer gotten_value, RustCallStatus *_Nonnull out_status ); #endif #ifndef UNIFFI_FFIDEF_FFI_HUBLIB_RUSTBUFFER_ALLOC diff --git a/HublibFramework.xcframework/ios-arm64/libhublib.a b/HublibFramework.xcframework/ios-arm64/libhublib.a index 35da2a3..d2c03be 100644 Binary files a/HublibFramework.xcframework/ios-arm64/libhublib.a and b/HublibFramework.xcframework/ios-arm64/libhublib.a differ diff --git a/HublibFramework.xcframework/ios-arm64_x86_64-simulator/Headers/hublibFFI.h b/HublibFramework.xcframework/ios-arm64_x86_64-simulator/Headers/hublibFFI.h index bf4c717..ca163f7 100644 --- a/HublibFramework.xcframework/ios-arm64_x86_64-simulator/Headers/hublibFFI.h +++ b/HublibFramework.xcframework/ios-arm64_x86_64-simulator/Headers/hublibFFI.h @@ -253,12 +253,12 @@ typedef void (*UniffiForeignFutureCompleteVoid)(uint64_t, UniffiForeignFutureStr #endif #ifndef UNIFFI_FFIDEF_UNIFFI_HUBLIB_FN_FUNC_GET_SECRET_VALUE #define UNIFFI_FFIDEF_UNIFFI_HUBLIB_FN_FUNC_GET_SECRET_VALUE -RustBuffer uniffi_hublib_fn_func_get_secret_value(uint64_t given_time, RustBuffer user_agent, RustBuffer url, RustCallStatus *_Nonnull out_status +RustBuffer uniffi_hublib_fn_func_get_secret_value(RustBuffer http_time, RustBuffer user_agent, RustBuffer url, RustCallStatus *_Nonnull out_status ); #endif #ifndef UNIFFI_FFIDEF_UNIFFI_HUBLIB_FN_FUNC_RECREATE_SECRET_VALUE #define UNIFFI_FFIDEF_UNIFFI_HUBLIB_FN_FUNC_RECREATE_SECRET_VALUE -RustBuffer uniffi_hublib_fn_func_recreate_secret_value(uint64_t given_time, RustBuffer user_agent, RustBuffer url, RustBuffer gotten_value, RustCallStatus *_Nonnull out_status +RustBuffer uniffi_hublib_fn_func_recreate_secret_value(RustBuffer http_date, RustBuffer user_agent, RustBuffer url, RustBuffer gotten_value, RustCallStatus *_Nonnull out_status ); #endif #ifndef UNIFFI_FFIDEF_FFI_HUBLIB_RUSTBUFFER_ALLOC diff --git a/HublibFramework.xcframework/ios-arm64_x86_64-simulator/libhublib.a b/HublibFramework.xcframework/ios-arm64_x86_64-simulator/libhublib.a index c806cb0..94e11a0 100644 Binary files a/HublibFramework.xcframework/ios-arm64_x86_64-simulator/libhublib.a and b/HublibFramework.xcframework/ios-arm64_x86_64-simulator/libhublib.a differ diff --git a/README.md b/README.md index a3c5cf5..329f541 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ 2. сунуть timestamp, user-agent, path (роут, например /api/v1/guestlogin) в get_secret_value 3. на целевой эндпоинт отправить header-ы в формате { - 'Accept-Time': таймстемп, + 'X-Request-Time': таймстемп в формате rfc2822, 'User-Agent': ну тут ясно, - 'X-SIGN': результат вызова get_secret_value + 'Client-info': результат вызова get_secret_value } \ No newline at end of file diff --git a/Sources/Hublib/hublib.swift b/Sources/Hublib/hublib.swift index 6349af8..b857fec 100644 --- a/Sources/Hublib/hublib.swift +++ b/Sources/Hublib/hublib.swift @@ -384,19 +384,6 @@ fileprivate class UniffiHandleMap { // Public interface members begin here. -fileprivate struct FfiConverterUInt64: FfiConverterPrimitive { - typealias FfiType = UInt64 - typealias SwiftType = UInt64 - - public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> UInt64 { - return try lift(readInt(&buf)) - } - - public static func write(_ value: SwiftType, into buf: inout [UInt8]) { - writeInt(&buf, lower(value)) - } -} - fileprivate struct FfiConverterString: FfiConverter { typealias SwiftType = String typealias FfiType = RustBuffer @@ -434,19 +421,19 @@ fileprivate struct FfiConverterString: FfiConverter { writeBytes(&buf, value.utf8) } } -public func getSecretValue(givenTime: UInt64, userAgent: String, url: String) -> String { +public func getSecretValue(httpTime: String, userAgent: String, url: String) -> String { return try! FfiConverterString.lift(try! rustCall() { uniffi_hublib_fn_func_get_secret_value( - FfiConverterUInt64.lower(givenTime), + FfiConverterString.lower(httpTime), FfiConverterString.lower(userAgent), FfiConverterString.lower(url),$0 ) }) } -public func recreateSecretValue(givenTime: UInt64, userAgent: String, url: String, gottenValue: String) -> String { +public func recreateSecretValue(httpDate: String, userAgent: String, url: String, gottenValue: String) -> String { return try! FfiConverterString.lift(try! rustCall() { uniffi_hublib_fn_func_recreate_secret_value( - FfiConverterUInt64.lower(givenTime), + FfiConverterString.lower(httpDate), FfiConverterString.lower(userAgent), FfiConverterString.lower(url), FfiConverterString.lower(gottenValue),$0 @@ -469,10 +456,10 @@ private var initializationResult: InitializationResult = { if bindings_contract_version != scaffolding_contract_version { return InitializationResult.contractVersionMismatch } - if (uniffi_hublib_checksum_func_get_secret_value() != 1475) { + if (uniffi_hublib_checksum_func_get_secret_value() != 32241) { return InitializationResult.apiChecksumMismatch } - if (uniffi_hublib_checksum_func_recreate_secret_value() != 37917) { + if (uniffi_hublib_checksum_func_recreate_secret_value() != 13679) { return InitializationResult.apiChecksumMismatch }