YCMD Completions Integration

This patch gets the server working end to end with the swift completion
client in YCMD ( my fork atleast ).

Add a shutdown endpoint so we can restart the sever easily.

Add the ability to pass in options from the client including HMAC secret
and logging level.

Add a bootstrap script to easily get started.

Additionally it includes other cleanups:

- Use the correct JSON headers
- Remove unused code and some naming fixes
- Remove prototype code cleanup names
- Cleanup build defs
- Remove old server code

Author: jerrymarino

CMakeLists.txt

@@ -2,8 +2,6 @@ message("__SSVI CMAKE START")
 
 cmake_minimum_required(VERSION 2.8)
 
-message("parent prefix ${CMAKE_INSTALL_PREFIX}")
-
 # Boost
 #
 
@@ -43,16 +41,14 @@ execute_process (
     COMMAND bash -c "xcode-select --print-path | tr -d '\n'"
     OUTPUT_VARIABLE XCODE_PATH
 )
-# 
+ 
+message(${XCODE_PATH})
 
 set(SKT_FLAGS "-framework sourcekitd")
 set(SKT_FLAGS " ${SKT_FLAGS} -F ${XCODE_PATH}/Toolchains/XcodeDefault.xctoolchain/usr/lib")
 set(SKT_FLAGS " ${SKT_FLAGS} -rpath ${XCODE_PATH}/Toolchains/XcodeDefault.xctoolchain/usr/lib")
-message(${XCODE_PATH})
-set( XCLIB "-F ${XCODE_PATH}/Toolchains/XcodeDefault.xctoolchain/usr/lib")
 
 set(GLOBAL_CXX_FLAGS "-std=c++1y -stdlib=libc++")
-set(GLOBAL_CXX_FLAGS "${GLOBAL_CXX_FLAGS} -std=c++1y -stdlib=libc++")
 set(GLOBAL_CXX_FLAGS "${GLOBAL_CXX_FLAGS} -Wall -Wextra -Wpedantic  -Wno-unused-parameter")
 set(GLOBAL_CXX_FLAGS "${GLOBAL_CXX_FLAGS} -isystem /usr/local/Frameworks")
 
@@ -61,10 +57,8 @@ set(CMAKE_CXX_FLAGS ${SKT_FLAGS})
 
 add_executable (http_server
     file_body.hpp
-    mime_type.hpp
-    ssvi_http_server.hpp
-    ssvi_http_server.cpp
-    sema_task.cpp
+    ssvim_http_server.hpp
+    ssvim_http_server.cpp
     http_server.cpp
     SwiftCompleter.h
     SwiftCompleter.cpp
@@ -76,7 +70,5 @@ INSTALL( TARGETS http_server
     RUNTIME DESTINATION bin )
 INSTALL( FILES scripts/activate
     DESTINATION . )
-#INSTALL( PROGRAMS scripts/run.sh
-#    DESTINATION . )
 
 message("__SSVI CMAKE FINISH")

bootstrap

@@ -0,0 +1,34 @@
+#!/bin/bash
+set -e
+cd `dirname $0`
+
+# System Dependencies
+if [[ ! -d /Applications/Xcode.app/ ]]; then
+    >&2 echo "Needs OSX and Xcode for SourceKitD"
+    exit 1
+fi
+
+# Use boost is installed via brew for now
+EXPECTED_BOOST=/usr/local/Cellar/boost/1.64.0_1 
+if [[ ! -d $EXPECTED_BOOST ]]; then
+    echo "Missing Boost $EXPECTED_BOOST. \
+        trying $ brew install boost 1.64"
+    brew install [email protected]
+fi
+
+if [[ ! -d vendor/ ]]; then
+    echo "Init repository"
+    ./repoinit.sh
+fi
+
+echo "Deps satisfied.."
+
+echo "Configure.."
+./configure
+
+echo "Build.."
+make -C build
+
+echo "Installing.."
+ditto build/http_server /usr/local/bin/swiftyswiftvim
+

http_server.cpp

@@ -1,10 +1,10 @@
-#include "ssvi_http_server.hpp"
+#include "ssvim_http_server.hpp"
 
 #include <boost/program_options.hpp>
 #include <dispatch/dispatch.h>
 #include <iostream>
 
-void loop() {
+void main_loop() {
     __block boost::asio::io_service* ios = new boost::asio::io_service();
     boost::asio::signal_set signals(
                                     *ios, SIGINT, SIGTERM);
@@ -25,7 +25,7 @@ void loop() {
 
 int main(int ac, char const* av[])
 {
-    using namespace beast::http;
+    using namespace ssvim::http;
     namespace po = boost::program_options;
     po::options_description desc("Options");
 
@@ -38,7 +38,11 @@ int main(int ac, char const* av[])
                         "Set the IP address to bind to, \"0.0.0.0\" for all")
         ("threads,n",   po::value<std::size_t>()->default_value(4),
                         "Set the number of threads to use")
-        ("sync,s",      "Launch a synchronous server")
+        // DEBUG, INFO, WARNING
+        ("log,r",      po::value<std::string>()->default_value("INFO"),
+                        "Set the logging level")
+        ("hmac-file-secret,r", po::value<std::string>()->default_value("none"),
+                        "Set the hmac secret")
         ;
     po::variables_map vm;
     po::store(po::parse_command_line(ac, av, desc), vm);
@@ -55,9 +59,11 @@ int main(int ac, char const* av[])
     using address_type = boost::asio::ip::address;
 
     endpoint_type ep{address_type::from_string(ip), port};
-
+    // TODO: HMAC and logging level in the endpoint_impl's
+    // For now, we just dump logs to std::out
+    // and HMAC isn't checked
     ssvi_http_server server(ep, threads, root);
-    loop();
+    main_loop();
     return 0;
 }
 

mime_type.hpp

@@ -95,3 +95,19 @@ cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 "Unix Makefiles" ..
 The compile commands are in build/compile_commands.json
 
 
+## Making sure file type is working
+
+YCM uses the vim file type in the current buffer to identify what completion engine to use and more.
+
+Assert this is set to the correct value      
+:set ft?
+
+manually set
+:set ft=swift
+
+Set automatically in your vimrc
+autocmd BufNewFile,BufRead *.swift set filetype=swift
+
+
+
+

notes.txt

@@ -22,6 +22,7 @@ echo '{"line":0,"column":0,"file_name":"'$PWD'/Examples/some_swift.swift", "cont
 
 # Manually test /completions or /diagnostics
 # TODO: write some integration tests
+# See original python commits with test.py run(19, 15)
 curl -i \
 -H "Content-Type: application/json" \
 -X POST \

req.sh

@@ -5,9 +5,7 @@
  */
 
 #include "file_body.hpp"
-#include "mime_type.hpp"
-#include "ssvi_http_server.hpp"
-#include "sema_task.cpp"
+#include "ssvim_http_server.hpp"
 
 #include "SwiftCompleter.h"
 
@@ -45,7 +43,9 @@ struct service_context {
     log_level logging;
 };
 
-namespace beast { // FIXME: ssvi
+using namespace beast::http;
+
+namespace ssvim {
 namespace http {
 
 using socket_type = boost::asio::ip::tcp::socket;
@@ -89,10 +89,11 @@ class endpoint_impl : public std::enable_shared_from_this<endpoint_impl>{
     endpoint_fn _start;
 };
 
-using namespace ssvi;
+using namespace ssvim;
 
 endpoint_impl make_slow_test_endpoint();
 endpoint_impl make_status_endpoint();
+endpoint_impl make_shutdown_endpoint();
 endpoint_impl make_completions_endpoint();
 endpoint_impl make_diagnostics_endpoint();
 
@@ -141,6 +142,7 @@ class session : public std::enable_shared_from_this<session>
         };
 
         insert_endpoint("/status", make_status_endpoint());
+        insert_endpoint("/shutdown", make_shutdown_endpoint());
         insert_endpoint("/completions", make_completions_endpoint());
         insert_endpoint("/diagnostics", make_diagnostics_endpoint());
         insert_endpoint("/slow_test", make_slow_test_endpoint());
@@ -270,8 +272,26 @@ endpoint_impl make_status_endpoint() {
         res.status = 200;
         res.version = session->request().version;
         res.fields.insert("Server", "ssvi_http_server");
-        res.fields.insert("Content-Type", "text/html");
+        res.fields.insert("Content-Type", "application/json");
+        prepare(res);
+        session->write(res);
+    });
+}
+
+endpoint_impl make_shutdown_endpoint() {
+    return endpoint_impl([&](std::shared_ptr<session> session){
+        std::cout << "Recieved Shutdown Request";
+        response<string_body> res;
+        res.status = 200;
+        res.version = session->request().version;
+        res.fields.insert("Server", "ssvi_http_server");
+        res.fields.insert("Content-Type", "application/json");
         prepare(res);
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 2 * NSEC_PER_SEC),
+                       dispatch_get_main_queue(), ^{
+                       std::cout << "Shutting down...";
+                       exit(0);
+        });
         session->write(res);
     });
 }
@@ -349,7 +369,7 @@ endpoint_impl make_completions_endpoint() {
         res.status = 200;
         res.version = session->request().version;
         res.fields.insert("Server", "ssvi_http_server");
-        res.fields.insert("Content-Type", "text/html");
+        res.fields.insert("Content-Type", "application/json");
         res.body = candidates;
         prepare(res);
         session->write(res);
@@ -403,7 +423,7 @@ endpoint_impl make_diagnostics_endpoint() {
         res.status = 200;
         res.version = session->request().version;
         res.fields.insert("Server", "ssvi_http_server");
-        res.fields.insert("Content-Type", "text/html");
+        res.fields.insert("Content-Type", "application/json");
         res.body = diagnostics;
         prepare(res);
         session->write(res);
@@ -414,7 +434,8 @@ endpoint_impl make_slow_test_endpoint()
 {
     return endpoint_impl([](std::shared_ptr<session> session){
         // Wait for 10 seconds to write hello world.
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 10 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 10 * NSEC_PER_SEC),
+                       dispatch_get_main_queue(), ^{
             std::cout << "Enter main: " << session->instance_id() << "\n";
             std::cout << session->request().url;
             std::cout.flush();
@@ -423,7 +444,7 @@ endpoint_impl make_slow_test_endpoint()
             res.status = 200;
             res.version = session->request().version;
             res.fields.insert("Server", "ssvi_http_server");
-            res.fields.insert("Content-Type", "text/html");
+            res.fields.insert("Content-Type", "application/json");
             res.body = "Hello World";
             prepare(res);
             session->write(res);
@@ -438,7 +459,7 @@ error_response(req_type request, std::string message){
     res.reason = "Internal Error";
     res.version = request.version;
     res.fields.insert("Server", "http_async_server");
-    res.fields.insert("Content-Type", "text/html");
+    res.fields.insert("Content-Type", "application/json");
     res.body =
     std::string{"An internal error occurred"} + message;
     prepare(res);
@@ -452,12 +473,12 @@ not_found_response(req_type request){
     res.reason = "Not Found";
     res.version = request.version;
     res.fields.insert("Server", "http_async_server");
-    res.fields.insert("Content-Type", "text/html");
+    res.fields.insert("Content-Type", "application/json");
     res.body = "Endpoint: '" + request.url + "' not found";
     prepare(res);
     return res;
 }
 
 } // http
-} // beast
+} // ssvim
 

sema_task.cpp

@@ -3,10 +3,6 @@
  *
  * Note: Assume that we are calling dispatch_main() after running the server
  */
-
-#include "file_body.hpp"
-#include "mime_type.hpp"
-
 #include <beast/http.hpp>
 #include <beast/core/handler_helpers.hpp>
 #include <beast/core/handler_ptr.hpp>
@@ -22,10 +18,12 @@
 #include <thread>
 #include <utility>
 #include <sstream>
-#include <map>
 
-namespace beast {
+namespace ssvim {
 namespace http {
+    
+using namespace beast;
+using namespace beast::http;
 
 /**
  * SSVI HTTP Server is a HTTP front end for Swift Semantic
@@ -201,5 +199,5 @@ class ssvi_http_server
 };
 
 } // http
-} // beast
+} // ssvim