Handle errors in poll()

Signed-off-by: Andrew Stein <steinlink@gmail.com>

Author: texodus

cpp/perspective/src/cpp/binding_api.cpp

@@ -96,8 +96,8 @@ psp_handle_request(
 
 PERSPECTIVE_EXPORT
 EncodedApiEntries*
-psp_poll(ProtoServer* server) {
-    auto responses = server->poll();
+psp_poll(ProtoServer* server, std::uint32_t client_id) {
+    auto responses = server->poll(client_id);
     return encode_api_responses(responses);
 }
 

cpp/perspective/src/cpp/server.cpp

@@ -799,13 +799,52 @@ ProtoServer::handle_request(
 }
 
 std::vector<ProtoServerResp<std::string>>
-ProtoServer::poll() {
+ProtoServer::poll(std::uint32_t client_id) {
     std::vector<ProtoServerResp<std::string>> out;
-    for (auto& resp : _poll()) {
+    try {
+        const auto& responses = _poll();
+        for (const auto& resp : responses) {
+            ProtoServerResp<std::string> str_resp;
+            str_resp.data = resp.data.SerializeAsString();
+            str_resp.client_id = resp.client_id;
+            out.emplace_back(str_resp);
+        }
+
+    } catch (const PerspectiveException& e) {
+        proto::Response resp;
+        auto* err = resp.mutable_server_error()->mutable_message();
+        *err = std::string(e.what());
+        ProtoServerResp<std::string> str_resp;
+        str_resp.data = resp.SerializeAsString();
+        str_resp.client_id = client_id;
+        out.emplace_back(std::move(str_resp));
+    } catch (const PerspectiveViewNotFoundException& e) {
+        proto::Response resp;
+        auto* err = resp.mutable_server_error();
+        err->set_status_code(proto::StatusCode::VIEW_NOT_FOUND);
+        auto* msg = err->mutable_message();
+        *msg = std::string(e.what());
+        ProtoServerResp<std::string> str_resp;
+        str_resp.data = resp.SerializeAsString();
+        str_resp.client_id = client_id;
+        out.emplace_back(std::move(str_resp));
+    } catch (const std::exception& e) {
+        proto::Response resp;
+        auto* err = resp.mutable_server_error()->mutable_message();
+        *err = std::string(e.what());
+        ProtoServerResp<std::string> str_resp;
+        str_resp.data = resp.SerializeAsString();
+        str_resp.client_id = client_id;
+        out.emplace_back(std::move(str_resp));
+    } catch (...) {
+        proto::Response resp;
+        auto* err = resp.mutable_server_error()->mutable_message();
+        std::exception_ptr p = std::current_exception();
+        *err = "Unknown exception";
         ProtoServerResp<std::string> str_resp;
-        str_resp.data = resp.data.SerializeAsString();
-        str_resp.client_id = resp.client_id;
-        out.emplace_back(str_resp);
+        str_resp.data = resp.SerializeAsString();
+        str_resp.client_id = client_id;
+        out.emplace_back(std::move(str_resp));
     }
 
     return out;
@@ -2141,11 +2180,11 @@ ProtoServer::_handle_request(std::uint32_t client_id, Request&& req) {
                             auto tm = scalar.get<t_date>();
                             std::stringstream ss;
                             ss << std::setfill('0') << std::setw(4) << tm.year()
-                               << "-" << std::setfill('0') << std::setw(2)
-                               // Increment month by 1, as date::month is [1-12] but
-                               // t_date::month() is [0-11]
-                               << tm.month() + 1
                                << "-" << std::setfill('0')
+                               << std::setw(2)
+                               // Increment month by 1, as date::month is [1-12]
+                               // but t_date::month() is [0-11]
+                               << tm.month() + 1 << "-" << std::setfill('0')
                                << std::setw(2) << tm.day();
                             s->set_string(ss.str());
                             break;

cpp/perspective/src/include/perspective/server.h

@@ -625,7 +625,7 @@ namespace server {
         void close_session(std::uint32_t);
         std::vector<ProtoServerResp<std::string>>
         handle_request(std::uint32_t client_id, const std::string_view& data);
-        std::vector<ProtoServerResp<std::string>> poll();
+        std::vector<ProtoServerResp<std::string>> poll(std::uint32_t client_id);
 
     private:
         void handle_process_table(

rust/perspective-js/src/ts/wasm/engine.ts

@@ -79,7 +79,7 @@ export class PerspectiveSession {
     }
 
     poll() {
-        const polled = this.mod._psp_poll(this.server as any);
+        const polled = this.mod._psp_poll(this.server as any, this.client_id);
         decode_api_responses(this.mod, polled, async (msg: ApiResponse) => {
             await this.client_map.get(msg.client_id)!(msg.data);
         });

rust/perspective-server/src/ffi.rs

@@ -35,7 +35,7 @@ unsafe extern "C" {
         buffer_ptr: *const u8,
         buffer_len: usize,
     ) -> ResponseBatch;
-    fn psp_poll(server: *const u8) -> ResponseBatch;
+    fn psp_poll(server: *const u8, client_id: u32) -> ResponseBatch;
     fn psp_close_session(server: *const u8, client_id: u32);
 }
 
@@ -122,8 +122,8 @@ impl Server {
         unsafe { psp_handle_request(self.0, client_id, request.0, request.1) }
     }
 
-    pub fn poll(&self) -> ResponseBatch {
-        unsafe { psp_poll(self.0) }
+    pub fn poll(&self, client_id: u32) -> ResponseBatch {
+        unsafe { psp_poll(self.0, client_id) }
     }
 
     pub fn close_session(&self, session_id: u32) {

rust/perspective-server/src/local_session.rs

@@ -57,7 +57,7 @@ impl Session<ServerError> for LocalSession {
     }
 
     async fn poll(&self) -> Result<(), ServerError> {
-        let responses = self.server.server.poll();
+        let responses = self.server.server.poll(self.id);
         for response in responses.iter_responses() {
             let cb = self
                 .server