Added TokensHandler and SearchHandler

Author: devgianlu

api/README.md

@@ -21,6 +21,12 @@ All the endpoints will respond with `200` if successful or `204` if there isn't
 ### Metadata
 - `POST \metadata\{type}\{uri}` Retrieve metadata. `type` can be one of `episode`, `track`, `album`, `show`, `artist`, `uri` is the standard Spotify uri.
 
+### Search
+- `POST \search\{query}` Make a search.
+
+### Tokens
+- `POST \token\{scope}` Request an access token for a specific scope.
+
 ### Events
 
 You can subscribe for players events by creating a WebSocket connection to `/events`.

api/src/main/java/xyz/gianlu/librespot/api/ApiServer.java

@@ -6,9 +6,7 @@
 import io.undertow.server.RoutingHandler;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
-import xyz.gianlu.librespot.api.handlers.EventsHandler;
-import xyz.gianlu.librespot.api.handlers.MetadataHandler;
-import xyz.gianlu.librespot.api.handlers.PlayerHandler;
+import xyz.gianlu.librespot.api.handlers.*;
 
 public class ApiServer {
     private static final Logger LOGGER = Logger.getLogger(ApiServer.class);
@@ -27,6 +25,8 @@ public ApiServer(@NotNull ApiConfiguration conf, @NotNull SessionWrapper wrapper
         handler = new RoutingHandler();
         handler.post("/player/{cmd}", new PlayerHandler(wrapper))
                 .post("/metadata/{type}/{uri}", new MetadataHandler(wrapper))
+                .post("/search/{query}", new SearchHandler(wrapper))
+                .post("/token/{scope}", new TokensHandler(wrapper))
                 .get("/events", events);
     }
 

api/src/main/java/xyz/gianlu/librespot/api/handlers/SearchHandler.java

@@ -0,0 +1,38 @@
+package xyz.gianlu.librespot.api.handlers;
+
+import io.undertow.server.HttpServerExchange;
+import org.jetbrains.annotations.NotNull;
+import xyz.gianlu.librespot.api.SessionWrapper;
+import xyz.gianlu.librespot.api.Utils;
+import xyz.gianlu.librespot.core.SearchManager;
+import xyz.gianlu.librespot.core.Session;
+
+import java.util.Deque;
+import java.util.Map;
+
+public final class SearchHandler extends AbsSessionHandler {
+
+    public SearchHandler(@NotNull SessionWrapper wrapper) {
+        super(wrapper);
+    }
+
+    @Override
+    protected void handleRequest(@NotNull HttpServerExchange exchange, @NotNull Session session) throws Exception {
+        exchange.startBlocking();
+        if (exchange.isInIoThread()) {
+            exchange.dispatch(this);
+            return;
+        }
+
+        Map<String, Deque<String>> params = Utils.readParameters(exchange);
+        String query = Utils.getFirstString(params, "query");
+        if (query == null) {
+            Utils.invalidParameter(exchange, "query");
+            return;
+        }
+
+        exchange.getResponseSender().send(session.search()
+                .request(new SearchManager.SearchRequest(query))
+                .toString());
+    }
+}

api/src/main/java/xyz/gianlu/librespot/api/handlers/TokensHandler.java

@@ -0,0 +1,42 @@
+package xyz.gianlu.librespot.api.handlers;
+
+import com.google.gson.JsonObject;
+import io.undertow.server.HttpServerExchange;
+import org.jetbrains.annotations.NotNull;
+import xyz.gianlu.librespot.api.SessionWrapper;
+import xyz.gianlu.librespot.api.Utils;
+import xyz.gianlu.librespot.core.Session;
+import xyz.gianlu.librespot.core.TokenProvider;
+
+import java.util.Deque;
+import java.util.Map;
+
+public final class TokensHandler extends AbsSessionHandler {
+
+    public TokensHandler(@NotNull SessionWrapper wrapper) {
+        super(wrapper);
+    }
+
+    @Override
+    protected void handleRequest(@NotNull HttpServerExchange exchange, @NotNull Session session) throws Exception {
+        exchange.startBlocking();
+        if (exchange.isInIoThread()) {
+            exchange.dispatch(this);
+            return;
+        }
+
+        Map<String, Deque<String>> params = Utils.readParameters(exchange);
+        String scope = Utils.getFirstString(params, "scope");
+        if (scope == null) {
+            Utils.invalidParameter(exchange, "scope");
+            return;
+        }
+
+        TokenProvider.StoredToken token = session.tokens().getToken(scope);
+        JsonObject obj = new JsonObject();
+        obj.addProperty("token", token.accessToken);
+        obj.addProperty("timestamp", token.timestamp);
+        obj.addProperty("expiresIn", token.expiresIn);
+        exchange.getResponseSender().send(obj.toString());
+    }
+}

core/src/main/java/xyz/gianlu/librespot/core/TokenProvider.java

@@ -25,13 +25,13 @@ public class TokenProvider {
     }
 
     @NotNull
-    public String get(@NotNull String scope) throws IOException, MercuryClient.MercuryException {
+    public StoredToken getToken(@NotNull String scope) throws IOException, MercuryClient.MercuryException {
         if (scope.contains(",")) throw new UnsupportedOperationException("Only single scope tokens are supported.");
 
         StoredToken token = tokens.get(scope);
         if (token != null) {
             if (token.expired()) tokens.remove(scope);
-            else return token.accessToken;
+            else return token;
         }
 
         LOGGER.debug(String.format("Token expired or not suitable, requesting again. {scope: %s, oldToken: %s}", scope, token));
@@ -41,14 +41,19 @@ public String get(@NotNull String scope) throws IOException, MercuryClient.Mercu
         LOGGER.debug(String.format("Updated token successfully! {scope: %s, newToken: %s}", scope, token));
 
         tokens.put(scope, token);
-        return token.accessToken;
+        return token;
+    }
+
+    @NotNull
+    public String get(@NotNull String scope) throws IOException, MercuryClient.MercuryException {
+        return getToken(scope).accessToken;
     }
 
-    private static class StoredToken {
-        final int expiresIn;
-        final String accessToken;
-        final String[] scopes;
-        final long timestamp;
+    public static class StoredToken {
+        public final int expiresIn;
+        public final String accessToken;
+        public final String[] scopes;
+        public final long timestamp;
 
         private StoredToken(@NotNull MercuryRequests.KeymasterToken token) {
             timestamp = TimeProvider.currentTimeMillis();
@@ -61,7 +66,7 @@ private StoredToken(@NotNull MercuryRequests.KeymasterToken token) {
                 scopes[i] = scopesArray.get(i).getAsString();
         }
 
-        private boolean expired() {
+        public boolean expired() {
             return timestamp + (expiresIn - TOKEN_EXPIRE_THRESHOLD) * 1000 < TimeProvider.currentTimeMillis();
         }