Clean up warnings

Author: ospfranco

android/CMakeLists.txt

@@ -1,11 +1,17 @@
 project(OPServer)
-cmake_minimum_required(VERSION 3.9.0)
+cmake_minimum_required(VERSION 3.22.1)
 
 set (PACKAGE_NAME "op-server")
 
+include_directories(
+  ../cpp
+  src/main/cpp
+)
+
 file(GLOB_RECURSE shared_files RELATIVE ${CMAKE_SOURCE_DIR}
      "../cpp/**.cpp"
 )
+
 file(GLOB_RECURSE android_files RELATIVE ${CMAKE_SOURCE_DIR}
      "src/main/cpp/**.cpp"
 )
@@ -17,16 +23,6 @@ add_library(
   ${android_files}
 )
 
-include_directories(
-  ../cpp
-  # Android-specific C++ includes
-  src/main/cpp/core
-  src/main/cpp/registry
-  src/main/cpp/turbomodule
-  src/main/cpp/platform
-  src/main/cpp/utils
-  src/main/cpp/views
-)
 
 find_package(ReactAndroid REQUIRED CONFIG)
 find_package(fbjni REQUIRED CONFIG)

android/build.gradle

@@ -69,7 +69,6 @@ android {
     }
   }
 
-
   prefab {
     "op-server" {
       headers "${project.buildDir}/headers/op-server/"

cpp/Request.cpp

@@ -65,10 +65,4 @@ jsi::Value Request::get(jsi::Runtime &rt, const jsi::PropNameID &propNameID) {
   return jsi::Value::undefined();
 }
 
-void Request::set(jsi::Runtime &rt, const jsi::PropNameID &name,
-                  const jsi::Value &value) {
-  // Request is read-only from JS side
-  throw jsi::JSError(rt, "Request object is read-only");
-}
-
 } // namespace opserver

cpp/Request.hpp

@@ -11,12 +11,10 @@ namespace jsi = facebook::jsi;
 
 class JSI_EXPORT Request : public jsi::HostObject {
 public:
-  Request(const httplib::Request &req);
+  explicit Request(const httplib::Request &req);
 
   std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &rt) override;
   jsi::Value get(jsi::Runtime &rt, const jsi::PropNameID &propNameID) override;
-  void set(jsi::Runtime &rt, const jsi::PropNameID &name,
-           const jsi::Value &value) override;
 
 private:
   std::string method;

cpp/Response.cpp

@@ -1,3 +1,6 @@
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-parameter"
+
 #include "Response.hpp"
 #include "macros.hpp"
 
@@ -23,7 +26,7 @@ jsi::Value Response::get(jsi::Runtime &rt, const jsi::PropNameID &propNameID) {
   const auto name = propNameID.utf8(rt);
 
   if (name == "statusCode") {
-    return jsi::Value(statusCode);
+    return {statusCode};
   }
 
   if (name == "content") {
@@ -90,11 +93,13 @@ void Response::set(jsi::Runtime &rt, const jsi::PropNameID &propNameID,
 
 void Response::applyTo(httplib::Response &res) {
   res.status = statusCode;
-  res.set_content(content, contentType.c_str());
+  res.set_content(content, contentType);
 
   for (const auto &header : headers) {
-    res.set_header(header.first.c_str(), header.second.c_str());
+    res.set_header(header.first, header.second);
   }
 }
 
 } // namespace opserver
+
+#pragma clang diagnostic pop

cpp/Server.cpp

@@ -1,4 +1,5 @@
-#pragma once
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-parameter"
 
 #include "Server.hpp"
 #include "Request.hpp"
@@ -12,14 +13,13 @@ namespace opserver {
 namespace jsi = facebook::jsi;
 namespace react = facebook::react;
 
-Server::Server(jsi::Runtime &rt, std::shared_ptr<react::CallInvoker> invoker) {
-
+Server::Server(jsi::Runtime &rt, const std::shared_ptr<react::CallInvoker>& invoker) {
   function_map["callback"] = HFN2(this, invoker) {
     const std::string method = args[0].asString(rt).utf8(rt);
     const std::string path = args[1].asString(rt).utf8(rt);
     auto callback = std::make_shared<jsi::Value>(rt, args[2]);
 
-    auto handleRequest = [this, &rt, invoker,
+    auto handleRequest = [invoker,
                           callback](const httplib::Request &req,
                                     httplib::Response &res) {
       auto responseDone = std::make_shared<std::promise<void>>();
@@ -148,15 +148,8 @@ jsi::Value Server::get(jsi::Runtime &rt, const jsi::PropNameID &propNameID) {
   return {rt, function_map[name]};
 }
 
-void Server::set(jsi::Runtime &_rt, const jsi::PropNameID &name,
-                 const jsi::Value &value) {
-  throw std::runtime_error("You cannot write to this object!");
-}
-
 void Server::stop() { server.stop(); }
 
-Server::~Server() {
-
-};
-
 } // namespace opserver
+
+#pragma clang diagnostic pop

cpp/Server.hpp

@@ -13,13 +13,10 @@ namespace react = facebook::react;
 
 class JSI_EXPORT Server : public jsi::HostObject {
 public:
-  Server(jsi::Runtime &rt, std::shared_ptr<react::CallInvoker> invoker);
+  Server(jsi::Runtime &rt, const std::shared_ptr<react::CallInvoker>& invoker);
   std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &rt) override;
   jsi::Value get(jsi::Runtime &rt, const jsi::PropNameID &propNameID) override;
-  void set(jsi::Runtime &rt, const jsi::PropNameID &name,
-           const jsi::Value &value) override;
   void stop();
-  ~Server() override;
 
 private:
   httplib::Server server;

cpp/bindings.cpp

@@ -5,6 +5,8 @@
 #include <unordered_map>
 #include <vector>
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-parameter"
 namespace opserver {
 
 namespace jsi = facebook::jsi;
@@ -39,3 +41,5 @@ void install(jsi::Runtime &rt,
 }
 
 } // namespace opserver
+
+#pragma clang diagnostic pop

package.json

@@ -1,7 +1,6 @@
 {
   "name": "@op-engineering/op-server",
-  "private": false,
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Fast HTTP Server for React Native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -55,6 +54,7 @@
   },
   "homepage": "https://github.com/OP-Engineering/op-server#readme",
   "publishConfig": {
+    "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {