ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

http-service: add beginning of xp tracker

Browse Source
This commit is contained in:
Adam
2018-01-20 19:48:07 -05:00
parent 4d2c02e81c
commit 7d5e0ff389
13 changed files with 709 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java
View File

@@ -31,7 +31,6 @@ import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;
import net.runelite.http.service.util.InstantConverter;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -69,6 +68,15 @@ public class SpringBootWebApplication extends SpringBootServletInitializer
return new Sql2o(dataSource, new NoQuirks(converters));
}
@Bean("Runelite XP Tracker SQL2O")
Sql2o trackerSql2o() throws NamingException
{
DataSource dataSource = (DataSource) getContext().lookup("jdbc/runelite-tracker");
Map<Class, Converter> converters = new HashMap<>();
converters.put(Instant.class, new InstantConverter());
return new Sql2o(dataSource, new NoQuirks(converters));
}
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
{

14
http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreController.java
View File

@@ -31,6 +31,7 @@ import net.runelite.http.api.hiscore.HiscoreSkill;
import net.runelite.http.api.hiscore.SingleHiscoreSkillResult;
import net.runelite.http.api.hiscore.Skill;
import net.runelite.http.service.util.HiscoreEndpointEditor;
import net.runelite.http.service.xp.XpTrackerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder;
@@ -46,12 +47,25 @@ public class HiscoreController
@Autowired
private HiscoreService hiscoreService;
@Autowired
private XpTrackerService xpTrackerService;
@RequestMapping("/{endpoint}")
public HiscoreResult lookup(@PathVariable HiscoreEndpoint endpoint, @RequestParam String username) throws IOException
{
HiscoreResultBuilder resultBuilder = hiscoreService.lookupUsername(username, endpoint);
HiscoreResult result = resultBuilder.build();
// Submit to xp tracker?
switch (endpoint)
{
case NORMAL:
case IRONMAN:
case ULTIMATE_IRONMAN:
case HARDCORE_IRONMAN:
xpTrackerService.update(username, result);
}
return result;
}

38
http-service/src/main/java/net/runelite/http/service/xp/XpMapper.java Normal file
View File

@@ -0,0 +1,38 @@
/*
* Copyright (c) 2018, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.http.service.xp;
import net.runelite.http.api.xp.XpData;
import net.runelite.http.service.xp.beans.XpEntity;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
@Mapper
public interface XpMapper
{
XpMapper INSTANCE = Mappers.getMapper(XpMapper.class);
XpData xpEntityToXpData(XpEntity xpEntity);
}

59
http-service/src/main/java/net/runelite/http/service/xp/XpTrackerController.java Normal file
View File

@@ -0,0 +1,59 @@
/*
* Copyright (c) 2018, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.http.service.xp;
import java.io.IOException;
import java.time.Instant;
import net.runelite.http.api.xp.XpData;
import net.runelite.http.service.xp.beans.XpEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/xp")
public class XpTrackerController
{
@Autowired
private XpTrackerService xpTrackerService;
@RequestMapping("/update")
public void update(@RequestParam String username) throws IOException
{
xpTrackerService.update(username);
}
@RequestMapping("/get")
public XpData get(@RequestParam String username, @RequestParam(required = false) Instant time) throws IOException
{
if (time == null)
{
time = Instant.now();
}
XpEntity xpEntity = xpTrackerService.findXpAtTime(username, time);
return XpMapper.INSTANCE.xpEntityToXpData(xpEntity);
}
}

165
http-service/src/main/java/net/runelite/http/service/xp/XpTrackerService.java Normal file
View File

@@ -0,0 +1,165 @@
/*
* Copyright (c) 2018, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.http.service.xp;
import java.io.IOException;
import java.time.Instant;
import net.runelite.http.api.hiscore.HiscoreEndpoint;
import net.runelite.http.api.hiscore.HiscoreResult;
import net.runelite.http.service.hiscore.HiscoreResultBuilder;
import net.runelite.http.service.hiscore.HiscoreService;
import net.runelite.http.service.xp.beans.PlayerEntity;
import net.runelite.http.service.xp.beans.XpEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.sql2o.Connection;
import org.sql2o.Sql2o;
@Service
public class XpTrackerService
{
@Autowired
@Qualifier("Runelite XP Tracker SQL2O")
private Sql2o sql2o;
@Autowired
private HiscoreService hiscoreService;
public void update(String username) throws IOException
{
HiscoreResultBuilder hiscoreResultBuilder = hiscoreService.lookupUsername(username, HiscoreEndpoint.NORMAL);
HiscoreResult hiscoreResult = hiscoreResultBuilder.build();
update(username, hiscoreResult);
}
public void update(String username, HiscoreResult hiscoreResult)
{
try (Connection con = sql2o.open())
{
PlayerEntity playerEntity = findOrCreatePlayer(username);
con.createQuery("insert into xp (player,attack_xp,defence_xp,strength_xp,hitpoints_xp,ranged_xp,prayer_xp,magic_xp,cooking_xp,woodcutting_xp,"
+ "fletching_xp,fishing_xp,firemaking_xp,crafting_xp,smithing_xp,mining_xp,herblore_xp,agility_xp,thieving_xp,slayer_xp,farming_xp,"
+ "runecraft_xp,hunter_xp,construction_xp,attack_rank,defence_rank,strength_rank,hitpoints_rank,ranged_rank,prayer_rank,magic_rank,"
+ "cooking_rank,woodcutting_rank,fletching_rank,fishing_rank,firemaking_rank,crafting_rank,smithing_rank,mining_rank,herblore_rank,"
+ "agility_rank,thieving_rank,slayer_rank,farming_rank,runecraft_rank,hunter_rank,construction_rank,overall_rank) values (:player,:attack_xp,:defence_xp,"
+ ":strength_xp,:hitpoints_xp,:ranged_xp,:prayer_xp,:magic_xp,:cooking_xp,:woodcutting_xp,:fletching_xp,:fishing_xp,:firemaking_xp,"
+ ":crafting_xp,:smithing_xp,:mining_xp,:herblore_xp,:agility_xp,:thieving_xp,:slayer_xp,:farming_xp,:runecraft_xp,:hunter_xp,"
+ ":construction_xp,:attack_rank,:defence_rank,:strength_rank,:hitpoints_rank,:ranged_rank,:prayer_rank,:magic_rank,:cooking_rank,"
+ ":woodcutting_rank,:fletching_rank,:fishing_rank,:firemaking_rank,:crafting_rank,:smithing_rank,:mining_rank,:herblore_rank,"
+ ":agility_rank,:thieving_rank,:slayer_rank,:farming_rank,:runecraft_rank,:hunter_rank,:construction_rank,:overall_rank)")
.addParameter("player", playerEntity.getId())
.addParameter("attack_xp", hiscoreResult.getAttack().getExperience())
.addParameter("defence_xp", hiscoreResult.getDefence().getExperience())
.addParameter("strength_xp", hiscoreResult.getStrength().getExperience())
.addParameter("hitpoints_xp", hiscoreResult.getHitpoints().getExperience())
.addParameter("ranged_xp", hiscoreResult.getRanged().getExperience())
.addParameter("prayer_xp", hiscoreResult.getPrayer().getExperience())
.addParameter("magic_xp", hiscoreResult.getMagic().getExperience())
.addParameter("cooking_xp", hiscoreResult.getCooking().getExperience())
.addParameter("woodcutting_xp", hiscoreResult.getWoodcutting().getExperience())
.addParameter("fletching_xp", hiscoreResult.getFletching().getExperience())
.addParameter("fishing_xp", hiscoreResult.getFishing().getExperience())
.addParameter("firemaking_xp", hiscoreResult.getFiremaking().getExperience())
.addParameter("crafting_xp", hiscoreResult.getCrafting().getExperience())
.addParameter("smithing_xp", hiscoreResult.getSmithing().getExperience())
.addParameter("mining_xp", hiscoreResult.getMining().getExperience())
.addParameter("herblore_xp", hiscoreResult.getHerblore().getExperience())
.addParameter("agility_xp", hiscoreResult.getAgility().getExperience())
.addParameter("thieving_xp", hiscoreResult.getThieving().getExperience())
.addParameter("slayer_xp", hiscoreResult.getSlayer().getExperience())
.addParameter("farming_xp", hiscoreResult.getFarming().getExperience())
.addParameter("runecraft_xp", hiscoreResult.getRunecraft().getExperience())
.addParameter("hunter_xp", hiscoreResult.getHunter().getExperience())
.addParameter("construction_xp", hiscoreResult.getConstruction().getExperience())
.addParameter("attack_rank", hiscoreResult.getAttack().getRank())
.addParameter("defence_rank", hiscoreResult.getDefence().getRank())
.addParameter("strength_rank", hiscoreResult.getStrength().getRank())
.addParameter("hitpoints_rank", hiscoreResult.getHitpoints().getRank())
.addParameter("ranged_rank", hiscoreResult.getRanged().getRank())
.addParameter("prayer_rank", hiscoreResult.getPrayer().getRank())
.addParameter("magic_rank", hiscoreResult.getMagic().getRank())
.addParameter("cooking_rank", hiscoreResult.getCooking().getRank())
.addParameter("woodcutting_rank", hiscoreResult.getWoodcutting().getRank())
.addParameter("fletching_rank", hiscoreResult.getFletching().getRank())
.addParameter("fishing_rank", hiscoreResult.getFishing().getRank())
.addParameter("firemaking_rank", hiscoreResult.getFiremaking().getRank())
.addParameter("crafting_rank", hiscoreResult.getCrafting().getRank())
.addParameter("smithing_rank", hiscoreResult.getSmithing().getRank())
.addParameter("mining_rank", hiscoreResult.getMining().getRank())
.addParameter("herblore_rank", hiscoreResult.getHerblore().getRank())
.addParameter("agility_rank", hiscoreResult.getAgility().getRank())
.addParameter("thieving_rank", hiscoreResult.getThieving().getRank())
.addParameter("slayer_rank", hiscoreResult.getSlayer().getRank())
.addParameter("farming_rank", hiscoreResult.getFarming().getRank())
.addParameter("runecraft_rank", hiscoreResult.getRunecraft().getRank())
.addParameter("hunter_rank", hiscoreResult.getHunter().getRank())
.addParameter("construction_rank", hiscoreResult.getConstruction().getRank())
.addParameter("overall_rank", hiscoreResult.getOverall().getRank())
.executeUpdate();
}
}
private synchronized PlayerEntity findOrCreatePlayer(String username)
{
try (Connection con = sql2o.open())
{
PlayerEntity playerEntity = con.createQuery("select * from player where name = :name")
.addParameter("name", username)
.executeAndFetchFirst(PlayerEntity.class);
if (playerEntity != null)
{
return playerEntity;
}
Instant now = Instant.now();
int id = con.createQuery("insert into player (name, tracked_since) values (:name, :tracked_since)")
.addParameter("name", username)
.addParameter("tracked_since", now)
.executeUpdate()
.getKey(int.class);
playerEntity = new PlayerEntity();
playerEntity.setId(id);
playerEntity.setName(username);
playerEntity.setTracked_since(now);
return playerEntity;
}
}
public XpEntity findXpAtTime(String username, Instant time)
{
try (Connection con = sql2o.open())
{
return con.createQuery("select * from xp join player on player.id=xp.player where player.name = :username and time <= :time order by time desc limit 1")
.throwOnMappingFailure(false)
.addParameter("username", username)
.addParameter("time", time)
.executeAndFetchFirst(XpEntity.class);
}
}
}

36
http-service/src/main/java/net/runelite/http/service/xp/beans/PlayerEntity.java Normal file
View File

@@ -0,0 +1,36 @@
/*
* Copyright (c) 2018, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.http.service.xp.beans;
import java.time.Instant;
import lombok.Data;
@Data
public class PlayerEntity
{
private Integer id;
private String name;
private Instant tracked_since;
}

85
http-service/src/main/java/net/runelite/http/service/xp/beans/XpEntity.java Normal file
View File

@@ -0,0 +1,85 @@
/*
* Copyright (c) 2018, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.http.service.xp.beans;
import java.time.Instant;
import lombok.Data;
@Data
public class XpEntity
{
private Integer id;
private Instant time;
private Integer player;
private int overall_xp;
private int attack_xp;
private int defence_xp;
private int strength_xp;
private int hitpoints_xp;
private int ranged_xp;
private int prayer_xp;
private int magic_xp;
private int cooking_xp;
private int woodcutting_xp;
private int fletching_xp;
private int fishing_xp;
private int firemaking_xp;
private int crafting_xp;
private int smithing_xp;
private int mining_xp;
private int herblore_xp;
private int agility_xp;
private int thieving_xp;
private int slayer_xp;
private int farming_xp;
private int runecraft_xp;
private int hunter_xp;
private int construction_xp;
private int overall_rank;
private int attack_rank;
private int defence_rank;
private int strength_rank;
private int hitpoints_rank;
private int ranged_rank;
private int prayer_rank;
private int magic_rank;
private int cooking_rank;
private int woodcutting_rank;
private int fletching_rank;
private int fishing_rank;
private int firemaking_rank;
private int crafting_rank;
private int smithing_rank;
private int mining_rank;
private int herblore_rank;
private int agility_rank;
private int thieving_rank;
private int slayer_rank;
private int farming_rank;
private int runecraft_rank;
private int hunter_rank;
private int construction_rank;
}