glass_swift_remote_client introduced

Summary: There is a remote Swift Glass Client that uses ServiceRouter and can be built and run on DevServer/OnDemand

Reviewed By: dmpolukhin

Differential Revision: D78965427

fbshipit-source-id: 0ea3ce81db4ab78b4492ccdab16c4bf40bc0e367

Author: ivanmurashko

glean/client/swift/GlassAccess.cpp

@@ -11,23 +11,13 @@
 #include <folly/String.h>
 #include <folly/coro/BlockingWait.h>
 #include <glog/logging.h>
-#include "servicerouter/client/cpp2/ServiceRouter.h"
 
 using namespace facebook;
 using apache::thrift::RpcOptions;
 
 const auto GlassTimeoutMs = 900;
 
-GlassAccess::GlassAccess() {
-  auto params = facebook::servicerouter::ClientParams().setProcessingTimeoutMs(
-      std::chrono::milliseconds(10000));
-
-  std::string connectionTier = "glean.glass";
-  client =
-      servicerouter::cpp2::getClientFactory()
-          .getSRClientUnique<apache::thrift::Client<::glean::GlassService>>(
-              connectionTier, params);
-}
+GlassAccess::GlassAccess() : client(nullptr) {}
 
 std::optional<protocol::LocationList> GlassAccess::usrToDefinition(
     const std::string& usr) {

glean/client/swift/GlassAccess.h

@@ -22,7 +22,7 @@ class GlassAccess : public IGlassAccess {
   std::optional<protocol::LocationList> usrToDefinition(
       const std::string& usr) override;
 
- private:
+ protected:
   template <typename T>
   std::optional<T> runGlassMethod(
       const std::string& method,

glean/client/swift/GlassAccessRemote.cpp

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "glean/client/swift/GlassAccessRemote.h"
+#include "servicerouter/client/cpp2/ServiceRouter.h"
+
+using namespace facebook;
+
+GlassAccessRemote::GlassAccessRemote() {
+  auto params = facebook::servicerouter::ClientParams().setProcessingTimeoutMs(
+      std::chrono::milliseconds(10000));
+
+  std::string connectionTier = "glean.glass";
+  client =
+      servicerouter::cpp2::getClientFactory()
+          .getSRClientUnique<apache::thrift::Client<::glean::GlassService>>(
+              connectionTier, params);
+}

glean/client/swift/GlassAccessRemote.h

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include "glean/client/swift/GlassAccess.h"
+
+class GlassAccessRemote : public GlassAccess {
+ public:
+  GlassAccessRemote();
+  ~GlassAccessRemote() override = default;
+};

glean/client/swift/GlassSwiftClient.cpp …/client/swift/GlassSwiftRemoteClient.cppglean/client/swift/GlassSwiftClient.cpp renamed to glean/client/swift/GlassSwiftRemoteClient.cpp glean/client/swift/GlassSwiftClient.cpp renamed to glean/client/swift/GlassSwiftRemoteClient.cpp

@@ -10,7 +10,7 @@
 #include <memory>
 #include "folly/Singleton.h"
 #include "folly/init/Init.h"
-#include "glean/client/swift/GlassAccess.h"
+#include "glean/client/swift/GlassAccessRemote.h"
 #include "glean/client/swift/JsonServer.h"
 
 // Folly singleton for JsonServer
@@ -29,8 +29,8 @@ int main(int argc, char** argv) {
 
   std::signal(SIGINT, signalHandler);
 
-  // Create GlassAccess and set it in JsonServer
-  auto glassAccess = std::make_unique<GlassAccess>();
+  // Create GlassAccessRemote and set it in JsonServer
+  auto glassAccess = std::make_unique<GlassAccessRemote>();
   jsonServerSingleton.try_get()->setGlassAccess(std::move(glassAccess));
 
   // Start the server