[Experiment] Ktor Call.Factory #7326
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip | ||
| networkTimeout=10000 | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # Module okhttp-ktor | ||
|
|
||
| OkHttp Ktor library. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| OkHttp Ktor | ||
| =========== | ||
|
|
||
| Support for Kotlin Ktor clients |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| import com.vanniktech.maven.publish.JavadocJar | ||
| import com.vanniktech.maven.publish.KotlinMultiplatform | ||
|
|
||
| plugins { | ||
| kotlin("multiplatform") | ||
| id("org.jetbrains.dokka") | ||
| id("com.vanniktech.maven.publish.base") | ||
| id("binary-compatibility-validator") | ||
| } | ||
|
|
||
| kotlin { | ||
| if (kmpJsEnabled) { | ||
| js { | ||
| compilations.all { | ||
| kotlinOptions { | ||
| moduleKind = "umd" | ||
| sourceMap = true | ||
| metaInfo = true | ||
| } | ||
| } | ||
| nodejs { | ||
| testTask { | ||
| useMocha { | ||
| timeout = "30s" | ||
| } | ||
| } | ||
| } | ||
| browser { | ||
| } | ||
| } | ||
| } | ||
|
|
||
| sourceSets { | ||
| val nonJvmMain = create("nonJvmMain") { | ||
| dependencies { | ||
| api(projects.okhttp) | ||
| api(libs.squareup.okio) | ||
| api(libs.kotlin.stdlib) | ||
| api("io.ktor:ktor-client-core:2.0.2") | ||
| } | ||
| } | ||
|
|
||
| val jsMain = getByName("jsMain") { | ||
| dependencies { | ||
| dependsOn(nonJvmMain) | ||
| implementation("com.squareup.okio:okio-js:3.2.0") | ||
| } | ||
| } | ||
|
|
||
| getByName("jsTest") { | ||
| dependencies { | ||
| dependsOn(nonJvmMain) | ||
| dependsOn(jsMain) | ||
| implementation(libs.kotlin.test.js) | ||
| implementation(libs.kotlinx.coroutines.test) | ||
| implementation(libs.assertk) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| mavenPublishing { | ||
| configure( | ||
| KotlinMultiplatform(javadocJar = JavadocJar.Dokka("dokkaGfm")) | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * Copyright (c) 2022 Square, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package okhttp3.ktor | ||
|
|
||
| import io.ktor.client.statement.HttpResponse | ||
| import io.ktor.http.contentLength | ||
| import io.ktor.http.contentType | ||
| import okhttp3.MediaType | ||
| import okhttp3.ResponseBody | ||
| import okio.BufferedSource | ||
|
|
||
| class HttpResponseBody( | ||
| private val httpResponse: HttpResponse, | ||
| private val source: BufferedSource | ||
| ) : ResponseBody() { | ||
| override fun contentType(): MediaType? = httpResponse.contentType()?.toMediaType() | ||
|
|
||
| override fun contentLength(): Long = httpResponse.contentLength() ?: -1 | ||
|
|
||
| override fun source(): BufferedSource = source | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* | ||
| * Copyright (c) 2022 Square, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package okhttp3.ktor | ||
|
|
||
| import io.ktor.client.statement.HttpResponse | ||
| import io.ktor.client.statement.bodyAsChannel | ||
| import io.ktor.utils.io.core.readBytes | ||
| import okhttp3.RequestBody | ||
| import okhttp3.ResponseBody | ||
|
|
||
| actual suspend fun HttpResponse.toHttpResponseBody(): ResponseBody { | ||
| val bytes = this.bodyAsChannel().readRemaining().readBytes() | ||
| val buffer = okio.Buffer() | ||
| buffer.write(bytes) | ||
| return HttpResponseBody(this, buffer) | ||
| } | ||
|
|
||
| actual suspend fun RequestBody.toHttpRequestBody(): Any { | ||
| val buffer = okio.Buffer() | ||
| this.writeTo(buffer) | ||
|
There was a problem hiding this comment. The Ktor doc examples aren't great here, using readBytes() https://ktor.io/docs/request.html#upload_file And "This function accepts different types of payloads, including plain text, arbitrary class instances, form data, byte arrays, and so on" |
||
| return buffer.readByteArray() | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I need the most help here.
buffer.write(bytes)below is blocking, so at least that should be sorted out.