Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move thenables to coroutines on worker-interface #2873

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions src/workerd/io/worker-interface.c++
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public:
kj::AsyncInputStream& requestBody,
Response& response) override {
KJ_IF_SOME(w, worker) {
co_await w.get()->request(method, url, headers, requestBody, response);
co_await w->request(method, url, headers, requestBody, response);
} else {
co_await promise;
co_await KJ_ASSERT_NONNULL(worker)->request(method, url, headers, requestBody, response);
Expand Down Expand Up @@ -392,24 +392,21 @@ kj::Promise<WorkerInterface::ScheduledResult> RpcWorkerInterface::runScheduled(
auto req = dispatcher.runScheduledRequest();
req.setScheduledTime((scheduledTime - kj::UNIX_EPOCH) / kj::SECONDS);
req.setCron(cron);
return req.send().then([](auto resp) {
auto respResult = resp.getResult();
return WorkerInterface::ScheduledResult{
.retry = respResult.getRetry(), .outcome = respResult.getOutcome()};
});
auto resp = co_await req.send();
auto respResult = resp.getResult();
co_return ScheduledResult{.retry = respResult.getRetry(), .outcome = respResult.getOutcome()};
}

kj::Promise<WorkerInterface::AlarmResult> RpcWorkerInterface::runAlarm(
kj::Date scheduledTime, uint32_t retryCount) {
auto req = dispatcher.runAlarmRequest();
req.setScheduledTime((scheduledTime - kj::UNIX_EPOCH) / kj::MILLISECONDS);
req.setRetryCount(retryCount);
return req.send().then([](auto resp) {
auto respResult = resp.getResult();
return WorkerInterface::AlarmResult{.retry = respResult.getRetry(),
.retryCountsAgainstLimit = respResult.getRetryCountsAgainstLimit(),
.outcome = respResult.getOutcome()};
});
auto resp = co_await req.send();
auto respResult = resp.getResult();
co_return AlarmResult{.retry = respResult.getRetry(),
.retryCountsAgainstLimit = respResult.getRetryCountsAgainstLimit(),
.outcome = respResult.getOutcome()};
}

kj::Promise<WorkerInterface::CustomEvent::Result> RpcWorkerInterface::customEvent(
Expand Down
Loading