From 936a754bbb50a3b0e7d19323c9537a420a815a38 Mon Sep 17 00:00:00 2001 From: jonas-martinez Date: Tue, 27 Jun 2023 10:33:08 +0200 Subject: [PATCH 01/12] Trying to change the way we run the webhook --- lenra.yml | 12 ++++++------ src/classes/System.js | 12 ++++++++++++ src/listeners/setAppId.js | 30 ++++++++++++++++++++++++++++++ src/listeners/systemEvents.js | 4 +++- src/views/gamePage.js | 5 +++-- src/views/homePage.js | 20 +++++++++++++++----- 6 files changed, 69 insertions(+), 14 deletions(-) create mode 100644 src/classes/System.js create mode 100644 src/listeners/setAppId.js diff --git a/lenra.yml b/lenra.yml index 6925573..47c1a7f 100644 --- a/lenra.yml +++ b/lenra.yml @@ -27,9 +27,9 @@ generator: - "**" - "!/*.json" - "!/src/" -# dev: -# dofigen: -# cmd: -# - npm run debug -# ports: -# - 9229 \ No newline at end of file +dev: + dofigen: + cmd: + - npm run debug + ports: + - 9229 \ No newline at end of file diff --git a/src/classes/System.js b/src/classes/System.js new file mode 100644 index 0000000..6cdf5c6 --- /dev/null +++ b/src/classes/System.js @@ -0,0 +1,12 @@ +import { Data } from "@lenra/app-server"; + +export class System extends Data { + /** + * + * @param {Number} appId + */ + constructor(appId) { + super(); + this.appId = appId; + } +} \ No newline at end of file diff --git a/src/listeners/setAppId.js b/src/listeners/setAppId.js new file mode 100644 index 0000000..8a37901 --- /dev/null +++ b/src/listeners/setAppId.js @@ -0,0 +1,30 @@ +'use strict' + +import axios from "axios"; +import { System } from "../classes/System.js"; +import { User } from "../classes/User.js"; + +/** + * + * @param {import("@lenra/app-server").props} props + * @param {import("@lenra/app-server").event} event + * @param {import("@lenra/app-server").Api} api + * @returns + */ +export default async function (props, event, api) { + let [user] = await api.data.find(User, { id: "@me" }); + await axios.post(`${api.url}/app/${event.value.appId}/webhooks/${user.webhookUuid}`, { + userId: user.id, + steamId: user.steamId + }).catch((error) => { + console.log(error); + }); + + let [system] = await api.data.find(System, {}); + if (system == undefined) { + return await api.data.createDoc(new System(event.value.appId)); + } + + system.appId = event.value.appId; + return await api.data.updateDoc(system); +} \ No newline at end of file diff --git a/src/listeners/systemEvents.js b/src/listeners/systemEvents.js index c32086b..f475fb7 100644 --- a/src/listeners/systemEvents.js +++ b/src/listeners/systemEvents.js @@ -1,5 +1,7 @@ 'use strict' +import { System } from "../classes/System.js"; + /** * * @param {import("@lenra/app-server").props} _props @@ -7,7 +9,7 @@ * @param {import("@lenra/app-server").Api} api */ export async function onEnvStart(_props, _event, api) { - + } export async function onUserFirstJoin(_props, _event, api) { diff --git a/src/views/gamePage.js b/src/views/gamePage.js index 1852577..bc91e14 100644 --- a/src/views/gamePage.js +++ b/src/views/gamePage.js @@ -16,8 +16,9 @@ export default async function ([game], _props, _context) { ] ).direction("horizontal") ] - ).direction("horizontal").mainAxisAlignment("center").crossAxisAlignment("center").spacing(2) + ).direction("horizontal").mainAxisAlignment("center").crossAxisAlignment("center").spacing(2).fillParent(true), + ] - ).direction("horizontal").mainAxisAlignment("center").crossAxisAlignment("center").fillParent(true) + ).direction("vertical").crossAxisAlignment("center").fillParent(true) } diff --git a/src/views/homePage.js b/src/views/homePage.js index 186b736..83a51d4 100644 --- a/src/views/homePage.js +++ b/src/views/homePage.js @@ -1,6 +1,6 @@ 'use strict' -import { Flex, Text, Button, Flexible, Container, View, TextField } from '@lenra/components' +import { Flex, Form, Text, Button, Flexible, Container, View, TextField } from '@lenra/components' import { UserGame } from '../classes/UserGame.js'; import { DataApi } from '@lenra/app-server'; @@ -10,10 +10,20 @@ export default async function ([user], props, context) { Flex( [ Text("Achiever").style({ fontSize: 24 }), - Button("DEBUG BUTTON").onPressed("debug"), - Text("To load or update your games, please send a POST request to the following URL with the corresponding data."), - Container(TextField(`/apps//webhooks/${user.webhookUuid}`)).maxWidth(600), - Container(TextField(`{ "userId": "${user.id}", "steamId": "${user.steamId}" }`)).maxWidth(600), + // Button("DEBUG BUTTON").onPressed("debug"), + Text("To load or update your games, please enter this lenra application uuid in the text field below."), + Container( + Form( + Flex( + [ + Container(TextField('').style({ decoration: { labelText: 'Please enter the id of this app to get your games' } }).name('appId')).maxWidth(500), + Button('OK').submit(true) + ] + ).crossAxisAlignment('center') + ).onSubmit('setAppId') + ).maxWidth(600), + // `/apps//webhooks/${user.webhookUuid}` + // Container(TextField(`{ "userId": "${user.id}", "steamId": "${user.steamId}" }`)).maxWidth(600), Flexible( Container( View("gameList").data(DataApi.collectionName(UserGame), { user: "@me" }), From 2d2f1e5050e2b812b22651f1a9b9043895252396 Mon Sep 17 00:00:00 2001 From: jonas-martinez Date: Tue, 27 Jun 2023 17:04:17 +0200 Subject: [PATCH 02/12] Much more style --- lenra.yml | 12 +- src/classes/User.js | 6 +- src/index.gen.js | 11 +- src/listeners/setAppId.js | 3 +- src/listeners/setSteamID.js | 5 - src/listeners/thisisme.js | 19 +++ src/manifest.js | 5 +- src/services/steamService.js | 3 + src/views/firstTimePage.js | 110 ++++++++++++------ src/views/gamePage.js | 9 +- .../{firstTimeGuard.js => firstTime.js} | 0 src/views/guards/welcome.js | 16 +++ src/views/unlockedAchievements.js | 14 +++ src/views/welcome.js | 83 +++++++++++++ technical.md | 1 + 15 files changed, 242 insertions(+), 55 deletions(-) create mode 100644 src/listeners/thisisme.js rename src/views/guards/{firstTimeGuard.js => firstTime.js} (100%) create mode 100644 src/views/guards/welcome.js create mode 100644 src/views/unlockedAchievements.js create mode 100644 src/views/welcome.js diff --git a/lenra.yml b/lenra.yml index 47c1a7f..6925573 100644 --- a/lenra.yml +++ b/lenra.yml @@ -27,9 +27,9 @@ generator: - "**" - "!/*.json" - "!/src/" -dev: - dofigen: - cmd: - - npm run debug - ports: - - 9229 \ No newline at end of file +# dev: +# dofigen: +# cmd: +# - npm run debug +# ports: +# - 9229 \ No newline at end of file diff --git a/src/classes/User.js b/src/classes/User.js index fc541fd..96eaabe 100644 --- a/src/classes/User.js +++ b/src/classes/User.js @@ -6,11 +6,15 @@ export class User extends Data { * @param {string} id * @param {string} steamId * @param {string} webhookUuid + * @param {string} avatar + * @param {string} personaname */ - constructor(id, steamid, webhookUuid) { + constructor(id, steamid, webhookUuid, avatar, personaname) { super(); this.id = id; this.steamId = steamid; this.webhookUuid = webhookUuid; + this.avatar = avatar; + this.personaname = personaname; } } \ No newline at end of file diff --git a/src/index.gen.js b/src/index.gen.js index 17f60d9..e15d763 100644 --- a/src/index.gen.js +++ b/src/index.gen.js @@ -6,11 +6,14 @@ export const views = { "gamePageDataProvider": "gamePageDataProvider", "guards": { "_guards": "guards._guards", - "firstTimeGuard": "guards.firstTimeGuard" + "firstTime": "guards.firstTime", + "welcome": "guards.welcome" }, "homePage": "homePage", "resetDatabaseButton": "resetDatabaseButton", - "userData": "userData" + "unlockedAchievements": "unlockedAchievements", + "userData": "userData", + "welcome": "welcome" }; export const listeners = { "debug": "debug", @@ -19,5 +22,7 @@ export const listeners = { "onSessionStart": "onSessionStart", "onUserFirstJoin": "onUserFirstJoin", "resetDatabase": "resetDatabase", - "setSteamID": "setSteamID" + "setAppId": "setAppId", + "setSteamID": "setSteamID", + "thisisme": "thisisme" }; diff --git a/src/listeners/setAppId.js b/src/listeners/setAppId.js index 8a37901..81eabea 100644 --- a/src/listeners/setAppId.js +++ b/src/listeners/setAppId.js @@ -13,7 +13,8 @@ import { User } from "../classes/User.js"; */ export default async function (props, event, api) { let [user] = await api.data.find(User, { id: "@me" }); - await axios.post(`${api.url}/app/${event.value.appId}/webhooks/${user.webhookUuid}`, { + + await axios.post(`${api.url}/apps/${event.value.appId}/webhooks/${user.webhookUuid}`, { userId: user.id, steamId: user.steamId }).catch((error) => { diff --git a/src/listeners/setSteamID.js b/src/listeners/setSteamID.js index 9aaa340..2fa1b40 100644 --- a/src/listeners/setSteamID.js +++ b/src/listeners/setSteamID.js @@ -35,11 +35,6 @@ function createWebhook(api, params) { return axios.post(`${api.url}/app/webhooks`, params, options(api)).catch((error) => console.log(error)); }; -function triggerWebhook(api, uuid, props) { - // TODO: How to get app uuid ? - return axios.post(`${api.url}/apps/00000000-0000-0000-0000-000000000000/webhooks/${uuid}`, props, options(api)).catch((error) => console.log(error)); -}; - function options(api) { return { headers: headers(api) } } diff --git a/src/listeners/thisisme.js b/src/listeners/thisisme.js new file mode 100644 index 0000000..1a33b7c --- /dev/null +++ b/src/listeners/thisisme.js @@ -0,0 +1,19 @@ +'use strict' + +import axios from "axios"; +import { System } from "../classes/System.js"; +import { User } from "../classes/User.js"; + +/** + * + * @param {import("@lenra/app-server").props} props + * @param {import("@lenra/app-server").event} event + * @param {import("@lenra/app-server").Api} api + * @returns + */ +export default async function (userSummary, event, api) { + let [user] = await api.data.find(User, { id: "@me" }); + user.avatar = userSummary.avatarfull; + user.personaname = userSummary.personaname; + await api.data.updateDoc(user); +} \ No newline at end of file diff --git a/src/manifest.js b/src/manifest.js index f5fc82c..ead5ee6 100644 --- a/src/manifest.js +++ b/src/manifest.js @@ -9,8 +9,9 @@ export const lenraRoutes = [ view: GuardsModule([], { page: View("homePage").data(DataApi.collectionName(User), { id: "@me" }).context({ me: true }), guards: [ - View("guards.firstTimeGuard") + View("guards.firstTime") .data(DataApi.collectionName(User), { id: "@me" }).context({ me: true }), + View("guards.welcome").data(DataApi.collectionName(User), { id: "@me" }).context({ me: true }), ], }).context({ pathParams: true }) }, @@ -19,7 +20,7 @@ export const lenraRoutes = [ view: GuardsModule([], { page: View("gamePageDataProvider"), guards: [ - View("guards.firstTimeGuard") + View("guards.firstTime") .data(DataApi.collectionName(User), { id: "@me" }).context({ me: true }), ], }).context({ pathParams: true }) diff --git a/src/services/steamService.js b/src/services/steamService.js index 5fd656d..9a5265f 100644 --- a/src/services/steamService.js +++ b/src/services/steamService.js @@ -52,4 +52,7 @@ export default { return []; } }, + async getUserSummary(steamId) { + return await axios.get(`${steamAPIBaseUrl}/ISteamUser/GetPlayerSummaries/v2/?key=${steamAPIKey}&steamids=${steamId}`).then((value) => value.data.response.players[0]).catch((error) => console.log(error)); + } } \ No newline at end of file diff --git a/src/views/firstTimePage.js b/src/views/firstTimePage.js index a2583b3..5007b3d 100644 --- a/src/views/firstTimePage.js +++ b/src/views/firstTimePage.js @@ -1,41 +1,81 @@ 'use strict' -import { Flex, Text, Container, Form, TextField, Button } from "@lenra/components"; +import { Flex, Text, Container, Form, TextField, Button, Actionable } from "@lenra/components"; export default function (data, props) { - return Flex( - [ - Flex( - [ - Text("Welcome to Achiever."), - Text("The Steam Achievement tracking app."), - Container( - Form( - Flex( - [ - TextField("").name("steamId").style({ - decoration: { - label: Text("Please enter your SteamID.") - } - }), - Button("Validate").submit(true) - ] - ).direction("vertical") - ).onSubmit("setSteamID") - ).constraints({ - maxWidth: 250 - }) - ] - ) - .direction("vertical") - .mainAxisAlignment("center") - .crossAxisAlignment("center") - .fillParent(true) - ] - ) - .direction("horizontal") - .mainAxisAlignment("center") - .crossAxisAlignment("center") - .fillParent(true) + return Container( + Flex( + [ + Flex( + [ + Flex([ + Text("Welcome to Achiever.").style({ fontSize: 24, fontWeight: 'bold', color: 0xFFaaabad }), + Text("The Steam Achievement tracking app.").style({ fontSize: 24, fontWeight: 'bold', color: 0xFFaaabad }), + ]).direction('vertical').crossAxisAlignment('center'), + Container( + Form( + Flex( + [ + TextField("").name("steamId").style({ + decoration: { + label: Text("Please enter your SteamID."), + labelStyle: { color: 0xFF000000 }, + fillColor: 0xFFaaabad, + filled: true, + } + }), + Actionable( + Container( + Text('OK').style({ fontSize: 24, fontWeight: 'bold', color: 0xFFaaabad }) + ).border( + { + "top": { "width": 3, "color": 0xFFaaabad }, + "left": { "width": 3, "color": 0xFFaaabad }, + "bottom": { "width": 3, "color": 0xFFaaabad }, + "right": { "width": 3, "color": 0xFFaaabad }, + } + ).padding({ + "top": 8, + "left": 8, + "bottom": 8, + "right": 8 + },).borderRadius({ + "topLeft": { + "x": 10, + "y": 10, + }, + "topRight": { + "x": 10, + "y": 10, + }, + "bottomRight": { + "x": 10, + "y": 10, + }, + "bottomLeft": { + "x": 10, + "y": 10, + }, + }) + ).submit(true), + ] + ).direction("vertical").spacing(16).crossAxisAlignment("center") + ).onSubmit("setSteamID") + ).constraints({ + maxWidth: 250 + }) + ] + ) + .direction("vertical") + .mainAxisAlignment("center") + .crossAxisAlignment("center") + .fillParent(true).spacing(16) + ] + ) + .direction("horizontal") + .mainAxisAlignment("center") + .crossAxisAlignment("center") + .fillParent(true) + ).decoration({ color: 0xFF000000 }); } diff --git a/src/views/gamePage.js b/src/views/gamePage.js index bc91e14..76f34fb 100644 --- a/src/views/gamePage.js +++ b/src/views/gamePage.js @@ -1,6 +1,8 @@ 'use strict' -import { Flex, Actionable, Icon, Text } from '@lenra/components'; +import { DataApi } from '@lenra/app-server'; +import { Flex, Actionable, Icon, Text, View } from '@lenra/components'; +import { UserGame } from '../classes/UserGame.js'; export default async function ([game], _props, _context) { return Flex( @@ -17,7 +19,10 @@ export default async function ([game], _props, _context) { ).direction("horizontal") ] ).direction("horizontal").mainAxisAlignment("center").crossAxisAlignment("center").spacing(2).fillParent(true), - + View('unlockedAchievements').data(DataApi.collectionName(UserGame), { + user: "@me", + appid: game.appid + }), ] ).direction("vertical").crossAxisAlignment("center").fillParent(true) } diff --git a/src/views/guards/firstTimeGuard.js b/src/views/guards/firstTime.js similarity index 100% rename from src/views/guards/firstTimeGuard.js rename to src/views/guards/firstTime.js diff --git a/src/views/guards/welcome.js b/src/views/guards/welcome.js new file mode 100644 index 0000000..a479d1d --- /dev/null +++ b/src/views/guards/welcome.js @@ -0,0 +1,16 @@ +import { View } from "@lenra/components" +import GuardsModule from './_guards.js' +import { DataApi } from "@lenra/app-server"; +import { User } from "../../classes/User.js"; +import steamService from "../../services/steamService.js" + + +export default async function ([user], props, context) { + let userSummary = await steamService.getUserSummary(user.steamId); + + if (user.avatar == undefined) { + return View("welcome").data(DataApi.collectionName(User), { id: "@me" }).props(userSummary); + } + + return GuardsModule([], props, context); +} \ No newline at end of file diff --git a/src/views/unlockedAchievements.js b/src/views/unlockedAchievements.js new file mode 100644 index 0000000..00e5c37 --- /dev/null +++ b/src/views/unlockedAchievements.js @@ -0,0 +1,14 @@ +'use strict' + +import { DataApi } from '@lenra/app-server'; +import { Flex, Actionable, Icon, Text, View } from '@lenra/components'; +import { UserGame } from '../classes/UserGame.js'; + +export default async function ([userGame], _props, _context) { + return Flex( + userGame.achieved.map((achievement) => { + return Text(achievement); + }) + ).direction("vertical").crossAxisAlignment("center").fillParent(true) +} + diff --git a/src/views/welcome.js b/src/views/welcome.js new file mode 100644 index 0000000..147f611 --- /dev/null +++ b/src/views/welcome.js @@ -0,0 +1,83 @@ +import { Flex, Image, Text, Container, Actionable } from "@lenra/components" + + +export default async function ([user], props, context) { + console.log(user); + console.log(props); + + return Container( + Flex([ + Flex([ + Container( + Image(props.avatarfull).width(100).height(100) + ).borderRadius( + { + "topLeft": { + "x": 30, + "y": 30, + }, + "bottomRight": { + "x": 30, + "y": 30, + }, + }, + ), + Text(`Hello ${props.personaname}, is this you ?`).style({ fontSize: 24, fontWeight: 'bold', color: 0xFFaaabad }), + Flex([ + Actionable( + Container( + Text('Yes').style({ fontSize: 24, fontWeight: 'bold', color: 0xFFaaabad }) + ).border( + { + "top": { "width": 3, "color": 0xFFaaabad }, + "left": { "width": 3, "color": 0xFFaaabad }, + "bottom": { "width": 3, "color": 0xFFaaabad }, + "right": { "width": 3, "color": 0xFFaaabad }, + } + ).padding({ + "top": 8, + "left": 8, + "bottom": 8, + "right": 8 + },).borderRadius({ + "topRight": { + "x": 10, + "y": 10, + }, + "bottomLeft": { + "x": 10, + "y": 10, + }, + }) + ).onPressed('thisisme', props), + Actionable( + Container( + Text('No').style({ fontSize: 24, fontWeight: 'bold', color: 0xFFaaabad }) + ).border( + { + "top": { "width": 3, "color": 0xFFaaabad }, + "left": { "width": 3, "color": 0xFFaaabad }, + "bottom": { "width": 3, "color": 0xFFaaabad }, + "right": { "width": 3, "color": 0xFFaaabad }, + } + ).padding({ + "top": 8, + "left": 8, + "bottom": 8, + "right": 8 + },).borderRadius({ + "topLeft": { + "x": 10, + "y": 10, + }, + "bottomRight": { + "x": 10, + "y": 10, + }, + }) + ).onPressed('@lenra:navTo', { path: '/' }), + ]).direction('horizontal').spacing(32) + ]).direction('vertical').fillParent(true).crossAxisAlignment('center').mainAxisAlignment('center').spacing(16) + ]).fillParent(true).mainAxisAlignment('center').crossAxisAlignment('center') + ).decoration({ color: 0xFF000000 }); +} \ No newline at end of file diff --git a/technical.md b/technical.md index d38df31..beb4240 100644 --- a/technical.md +++ b/technical.md @@ -3,3 +3,4 @@ https://api.steampowered.com/ISteamUser/ResolveVanityURL/v0001/?key=CA8F42C8DC79 STEAMID : 76561197973393048 +DEVTOOL APPID : 00000000-0000-0000-0000-000000000000 \ No newline at end of file From 9f81d4827748053fbd916be0313124e82ff518c2 Mon Sep 17 00:00:00 2001 From: jonas-martinez Date: Thu, 29 Jun 2023 19:02:25 +0200 Subject: [PATCH 03/12] There is a problem on achievement icons --- src/classes/Game.js | 2 +- src/services/steamService.js | 16 +++++-------- src/views/gamePage.js | 9 ++++++- src/views/unlockedAchievements.js | 39 +++++++++++++++++++++++++------ 4 files changed, 47 insertions(+), 19 deletions(-) diff --git a/src/classes/Game.js b/src/classes/Game.js index f15132f..16b196c 100644 --- a/src/classes/Game.js +++ b/src/classes/Game.js @@ -4,7 +4,7 @@ export class Game extends Data { /** * * @param {Number} appid - * @param {string[]} achievements + * @param {JSON} achievements * @param {string} img_icon_url * @param {string} name */ diff --git a/src/services/steamService.js b/src/services/steamService.js index 9a5265f..61d1f35 100644 --- a/src/services/steamService.js +++ b/src/services/steamService.js @@ -14,16 +14,17 @@ export default { return axios.get(`${steamAPIBaseUrl}/ISteamUser/ResolveVanityURL/v0001/?key=${steamAPIKey}&vanityurl=${vanityUrl}`).then((value) => value.data.response).catch((error) => console.log(error)); }, async getUserGames(api, userId, steamId) { + // TODO: Don't create Game if appid already in DB but update it. let games = await axios.get(`${steamAPIBaseUrl}/IPlayerService/GetOwnedGames/v1/?key=${steamAPIKey}&steamid=${steamId}&include_appinfo=true&include_played_free_games=true`).then((value) => value.data.response).catch((error) => console.log(error)); let promises = []; games.games.forEach(game => { if (game !== undefined) { promises.push(new Promise(async () => { // Add achievements to game - let achievements = await this.getGameAchievements(steamId, game.appid); + let achievements = (await this.getSchemaForGame(game.appid)).game?.availableGameStats?.achievements; // Add game in db - await gameService.new(api, new Game(game.appid, achievements, game.img_icon_url, game.name)); + await gameService.new(api, new Game(game.appid, achievements ?? [], game.img_icon_url, game.name)); // Add user game achievements and playtime in db let unlockedAchievements = await this.getUserGameAchievements(steamId, game.appid); @@ -33,14 +34,6 @@ export default { }); return await Promise.all(promises); }, - async getGameAchievements(steamId, gameId) { - // Get user game achievements as there is not API to get game achievements directly - let achievements = await axios.get(`${steamAPIBaseUrl}/ISteamUserStats/GetPlayerAchievements/v0001/?key=${steamAPIKey}&steamid=${steamId}&appid=${gameId}`).then((value) => value.data.playerstats.achievements).catch((error) => null); - if (achievements != undefined && achievements != null) { - // Return array of achievements apiname - return achievements.map(achievement => achievement.apiname); - } - }, async getUserGameAchievements(steamId, gameId) { // Get user achievements (unlocked & locked) let achievements = await axios.get(`${steamAPIBaseUrl}/ISteamUserStats/GetPlayerAchievements/v0001/?key=${steamAPIKey}&steamid=${steamId}&appid=${gameId}`).then((value) => value.data.playerstats.achievements).catch((error) => null); @@ -54,5 +47,8 @@ export default { }, async getUserSummary(steamId) { return await axios.get(`${steamAPIBaseUrl}/ISteamUser/GetPlayerSummaries/v2/?key=${steamAPIKey}&steamids=${steamId}`).then((value) => value.data.response.players[0]).catch((error) => console.log(error)); + }, + async getSchemaForGame(appid) { + return (await axios.get(`${steamAPIBaseUrl}/ISteamUserStats/GetSchemaForGame/v2/?key=${steamAPIKey}&appid=${appid}`)).data; } } \ No newline at end of file diff --git a/src/views/gamePage.js b/src/views/gamePage.js index 76f34fb..1b904dd 100644 --- a/src/views/gamePage.js +++ b/src/views/gamePage.js @@ -3,8 +3,15 @@ import { DataApi } from '@lenra/app-server'; import { Flex, Actionable, Icon, Text, View } from '@lenra/components'; import { UserGame } from '../classes/UserGame.js'; +import steamService from '../services/steamService.js'; export default async function ([game], _props, _context) { + // let schema = await steamService.getSchemaForGame(game.appid); + // if (schema?.game?.availableGameStats?.achievements) { + // console.log(schema.game.availableGameStats.achievements); + // } + + return Flex( [ Flex( @@ -22,7 +29,7 @@ export default async function ([game], _props, _context) { View('unlockedAchievements').data(DataApi.collectionName(UserGame), { user: "@me", appid: game.appid - }), + }).props(game), ] ).direction("vertical").crossAxisAlignment("center").fillParent(true) } diff --git a/src/views/unlockedAchievements.js b/src/views/unlockedAchievements.js index 00e5c37..b54ad7e 100644 --- a/src/views/unlockedAchievements.js +++ b/src/views/unlockedAchievements.js @@ -1,14 +1,39 @@ 'use strict' import { DataApi } from '@lenra/app-server'; -import { Flex, Actionable, Icon, Text, View } from '@lenra/components'; +import { Flex, Actionable, Icon, Text, View, Image, Container } from '@lenra/components'; import { UserGame } from '../classes/UserGame.js'; -export default async function ([userGame], _props, _context) { - return Flex( - userGame.achieved.map((achievement) => { - return Text(achievement); - }) - ).direction("vertical").crossAxisAlignment("center").fillParent(true) +export default async function ([userGame], game, _context) { + return Container( + Flex( + // userGame.achieved.map((achievement) => { + // return Text(achievement); + // }) + game.achievements.map((achievement) => { + // const achievementIcon = achievement.icon.replace(/https:\/\/steamcdn-a\.akamaihd\.net/g, 'https://cdn.cloudflare.steamstatic.com'); + + return Container( + Flex([ + Image(achievement.icon), + Flex([ + Text(achievement.displayName), + Text(achievement.description) + ]).direction('vertical') + ]) + ).border({ + bottom: {}, + left: {}, + right: {}, + top: {} + }).minWidth(600).maxWidth(600).padding({ + bottom: 6, + left: 6, + right: 6, + top: 6, + }) + }) + ).direction("vertical").crossAxisAlignment("center").spacing(16).scroll(true) + ).maxHeight(600) } From fc7f99142e568541b86e31eb153df2cc55bfcfd6 Mon Sep 17 00:00:00 2001 From: jonas-martinez Date: Mon, 3 Jul 2023 14:42:36 +0200 Subject: [PATCH 04/12] More work --- src/services/steamService.js | 2 +- src/views/gameCard.js | 28 ++++++++++++++++------------ src/views/unlockedAchievements.js | 10 ++++++---- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/services/steamService.js b/src/services/steamService.js index 61d1f35..500791a 100644 --- a/src/services/steamService.js +++ b/src/services/steamService.js @@ -40,7 +40,7 @@ export default { // Filter unlocked achievements if (achievements != undefined) { let unlocked = achievements.filter(achievement => achievement.achieved == 1 ? true : false); - return unlocked.map(achievement => achievement.apiname); + return unlocked.map(achievement => { return { name: achievement.apiname, unlocktime: achievement.unlocktime } }); } else { return []; } diff --git a/src/views/gameCard.js b/src/views/gameCard.js index 60b0532..aeea14a 100644 --- a/src/views/gameCard.js +++ b/src/views/gameCard.js @@ -1,8 +1,6 @@ 'use strict' -import { DataApi } from "@lenra/app-server"; -import { Actionable, Container, Image, Text, View, Flex } from "@lenra/components"; -import { UserGame } from "../classes/UserGame.js"; +import { Actionable, Container, Image, Text, View, Flex, Icon } from "@lenra/components"; export default async function (data, userGame) { let game = data[0]; @@ -17,23 +15,29 @@ export default async function (data, userGame) { Image(`https://cdn.cloudflare.steamstatic.com/steam/apps/${userGame.appid}/capsule_231x87.jpg`), Flex( [ - Text(game.name), - Text(`${hoursPlayed}h ${minutesPlayed}m`), - Text(`${userGame.achieved.length} achievements`) + Text(game.name).style({ fontWeight: 'bold', fontSize: 16 }), + Flex([ + Icon("timer"), + Text(`${hoursPlayed}h ${minutesPlayed}m`), + ]).direction('horizontal'), + Flex([ + Icon("emoji_events"), + Text(`${userGame.achieved.length} achievements`) + ]).direction('horizontal'), ] - ).direction("vertical").spacing(1) + ).direction("vertical").spacing(4) ] - ).spacing(1) + ).spacing(8) ) .constraints({ minWidth: -1, maxWidth: -1 }) .padding({ - bottom: 1, - left: 1, - right: 1, - top: 1, + bottom: 4, + left: 4, + right: 4, + top: 4, }) .border({ bottom: {}, diff --git a/src/views/unlockedAchievements.js b/src/views/unlockedAchievements.js index b54ad7e..ee9922b 100644 --- a/src/views/unlockedAchievements.js +++ b/src/views/unlockedAchievements.js @@ -5,19 +5,21 @@ import { Flex, Actionable, Icon, Text, View, Image, Container } from '@lenra/com import { UserGame } from '../classes/UserGame.js'; export default async function ([userGame], game, _context) { + let unlockedAchievements = game.achievements.filter((achievement) => { + return userGame.achieved.some(achieved => achieved.name == achievement.name); + }); + return Container( Flex( // userGame.achieved.map((achievement) => { // return Text(achievement); // }) - game.achievements.map((achievement) => { - // const achievementIcon = achievement.icon.replace(/https:\/\/steamcdn-a\.akamaihd\.net/g, 'https://cdn.cloudflare.steamstatic.com'); - + unlockedAchievements.map((achievement) => { return Container( Flex([ Image(achievement.icon), Flex([ - Text(achievement.displayName), + Text(achievement.displayName).style({ fontSize: 20, fontWeight: 'bold' }), Text(achievement.description) ]).direction('vertical') ]) From a1e71f1e7f2720ddf03887475e919ace7b25749b Mon Sep 17 00:00:00 2001 From: jonas-martinez Date: Mon, 3 Jul 2023 16:38:45 +0200 Subject: [PATCH 05/12] Add icons --- src/views/gameCard.js | 8 ++++---- src/views/unlockedAchievements.js | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/views/gameCard.js b/src/views/gameCard.js index aeea14a..2244453 100644 --- a/src/views/gameCard.js +++ b/src/views/gameCard.js @@ -17,13 +17,13 @@ export default async function (data, userGame) { [ Text(game.name).style({ fontWeight: 'bold', fontSize: 16 }), Flex([ - Icon("timer"), + Icon("timer").color(0xFF1a9925), Text(`${hoursPlayed}h ${minutesPlayed}m`), - ]).direction('horizontal'), + ]).direction('horizontal').crossAxisAlignment('center').spacing(4), Flex([ - Icon("emoji_events"), + Icon("emoji_events").color(0xFFd4af37), Text(`${userGame.achieved.length} achievements`) - ]).direction('horizontal'), + ]).direction('horizontal').crossAxisAlignment('center').spacing(4), ] ).direction("vertical").spacing(4) ] diff --git a/src/views/unlockedAchievements.js b/src/views/unlockedAchievements.js index ee9922b..2c64b52 100644 --- a/src/views/unlockedAchievements.js +++ b/src/views/unlockedAchievements.js @@ -1,8 +1,6 @@ 'use strict' -import { DataApi } from '@lenra/app-server'; import { Flex, Actionable, Icon, Text, View, Image, Container } from '@lenra/components'; -import { UserGame } from '../classes/UserGame.js'; export default async function ([userGame], game, _context) { let unlockedAchievements = game.achievements.filter((achievement) => { From 2a09a31de30ee5940f03b76c87f5e82e9bcb45e9 Mon Sep 17 00:00:00 2001 From: jonas-martinez Date: Tue, 4 Jul 2023 14:02:26 +0200 Subject: [PATCH 06/12] trying async listener --- src/listeners/setAppId.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/listeners/setAppId.js b/src/listeners/setAppId.js index 81eabea..267e79c 100644 --- a/src/listeners/setAppId.js +++ b/src/listeners/setAppId.js @@ -14,7 +14,7 @@ import { User } from "../classes/User.js"; export default async function (props, event, api) { let [user] = await api.data.find(User, { id: "@me" }); - await axios.post(`${api.url}/apps/${event.value.appId}/webhooks/${user.webhookUuid}`, { + axios.post(`${api.url}/apps/${event.value.appId}/webhooks/${user.webhookUuid}`, { userId: user.id, steamId: user.steamId }).catch((error) => { From d32399f862173693a26a7177f22388a98a190c0e Mon Sep 17 00:00:00 2001 From: jonas-martinez Date: Tue, 4 Jul 2023 14:56:40 +0200 Subject: [PATCH 07/12] Add more style --- src/views/gameCard.js | 14 ++++---- src/views/gameList.js | 2 +- src/views/homePage.js | 79 +++++++++++++++++++++++++------------------ 3 files changed, 54 insertions(+), 41 deletions(-) diff --git a/src/views/gameCard.js b/src/views/gameCard.js index 2244453..439973c 100644 --- a/src/views/gameCard.js +++ b/src/views/gameCard.js @@ -15,14 +15,14 @@ export default async function (data, userGame) { Image(`https://cdn.cloudflare.steamstatic.com/steam/apps/${userGame.appid}/capsule_231x87.jpg`), Flex( [ - Text(game.name).style({ fontWeight: 'bold', fontSize: 16 }), + Text(game.name).style({ fontWeight: 'bold', fontSize: 16, color: 0xFFFFFFFF }), Flex([ Icon("timer").color(0xFF1a9925), - Text(`${hoursPlayed}h ${minutesPlayed}m`), + Text(`${hoursPlayed}h ${minutesPlayed}m`).style({ color: 0xFFaaabad }), ]).direction('horizontal').crossAxisAlignment('center').spacing(4), Flex([ Icon("emoji_events").color(0xFFd4af37), - Text(`${userGame.achieved.length} achievements`) + Text(`${userGame.achieved.length} achievements`).style({ color: 0xFFaaabad }), ]).direction('horizontal').crossAxisAlignment('center').spacing(4), ] ).direction("vertical").spacing(4) @@ -40,10 +40,10 @@ export default async function (data, userGame) { top: 4, }) .border({ - bottom: {}, - left: {}, - right: {}, - top: {} + bottom: { color: 0xFFaaabad }, + left: { color: 0xFFaaabad }, + right: { color: 0xFFaaabad }, + top: { color: 0xFFaaabad } }) ).onPressed("@lenra:navTo", { path: `/game/${userGame.appid}` }) } diff --git a/src/views/gameList.js b/src/views/gameList.js index 1d95753..b761ae7 100644 --- a/src/views/gameList.js +++ b/src/views/gameList.js @@ -12,7 +12,7 @@ export default async function (userGames, props) { return Flex(userGames.map(function (userGame) { return View("gameCard").props(userGame).data(DataApi.collectionName(Game), { appid: userGame.appid }); - })).direction("vertical").scroll(true).spacing(2) + })).direction("vertical").scroll(true).spacing(8) } function paginate(array, page_size, page_number) { diff --git a/src/views/homePage.js b/src/views/homePage.js index 83a51d4..cd42e22 100644 --- a/src/views/homePage.js +++ b/src/views/homePage.js @@ -5,39 +5,52 @@ import { UserGame } from '../classes/UserGame.js'; import { DataApi } from '@lenra/app-server'; export default async function ([user], props, context) { - return Flex( - [ - Flex( - [ - Text("Achiever").style({ fontSize: 24 }), - // Button("DEBUG BUTTON").onPressed("debug"), - Text("To load or update your games, please enter this lenra application uuid in the text field below."), - Container( - Form( - Flex( - [ - Container(TextField('').style({ decoration: { labelText: 'Please enter the id of this app to get your games' } }).name('appId')).maxWidth(500), - Button('OK').submit(true) - ] - ).crossAxisAlignment('center') - ).onSubmit('setAppId') - ).maxWidth(600), - // `/apps//webhooks/${user.webhookUuid}` - // Container(TextField(`{ "userId": "${user.id}", "steamId": "${user.steamId}" }`)).maxWidth(600), - Flexible( + return Container( + Flex( + [ + Flex( + [ + Text("Achiever").style({ fontSize: 24, fontWeight: 'bold', color: 0xFFFFFFFF }), + // Button("DEBUG BUTTON").onPressed("debug"), + Text("To load or update your games, please enter this lenra application uuid in the text field below.").style({ + fontSize: 16, + fontWeight: 'bold', + color: 0xFFaaabad + }), Container( - View("gameList").data(DataApi.collectionName(UserGame), { user: "@me" }), - ).maxWidth(600).maxHeight(600) - ) - ] - ).direction("vertical") - .mainAxisAlignment("center") - .crossAxisAlignment("center") - .spacing(2) - ] - ).direction("horizontal") - .mainAxisAlignment("center") - .crossAxisAlignment("center") - .fillParent(true); + Form( + Flex( + [ + Container(TextField('').style({ + decoration: { + labelText: 'Please enter the id of this app to get your games', + labelStyle: { color: 0xFF000000 }, + fillColor: 0xFFaaabad, + filled: true, + } + }).name('appId')).maxWidth(500), + Button('OK').submit(true) + ] + ).crossAxisAlignment('center').spacing(8) + ).onSubmit('setAppId') + ).maxWidth(600), + // `/apps//webhooks/${user.webhookUuid}` + // Container(TextField(`{ "userId": "${user.id}", "steamId": "${user.steamId}" }`)).maxWidth(600), + Flexible( + Container( + View("gameList").data(DataApi.collectionName(UserGame), { user: "@me" }), + ).maxWidth(600).maxHeight(600) + ) + ] + ).direction("vertical") + .mainAxisAlignment('spaceAround') + .crossAxisAlignment("center") + .spacing(16) + ] + ).direction("horizontal") + .mainAxisAlignment("center") + .crossAxisAlignment("center") + .fillParent(true) + ).color(0xFF000000); } From ad5b5beb92442189229781243c22d55c6cc02982 Mon Sep 17 00:00:00 2001 From: "jonas.martinez" Date: Fri, 13 Oct 2023 16:33:42 +0200 Subject: [PATCH 08/12] Update app --- lenra.yml | 3 +- package-lock.json | 91 ++++++++++++++++++------------- package.json | 14 ++--- src/classes/Game.js | 2 +- src/classes/System.js | 2 +- src/classes/User.js | 2 +- src/classes/UserGame.js | 2 +- src/listeners/debug.js | 7 +-- src/listeners/getUserGames.js | 6 +- src/listeners/resetDatabase.js | 8 +-- src/listeners/setAppId.js | 6 +- src/listeners/setSteamID.js | 7 +-- src/listeners/systemEvents.js | 6 +- src/listeners/thisisme.js | 6 +- src/manifest.js | 53 +++++++++--------- src/services/gameService.js | 8 +-- src/services/userGameService.js | 8 +-- src/views/firstTimePage.js | 2 +- src/views/gameCard.js | 2 +- src/views/gameList.js | 6 +- src/views/gamePage.js | 6 +- src/views/gamePageDataProvider.js | 6 +- src/views/guards/_guards.js | 4 +- src/views/guards/firstTime.js | 6 +- src/views/guards/welcome.js | 6 +- src/views/homePage.js | 6 +- src/views/resetDatabaseButton.js | 2 +- src/views/unlockedAchievements.js | 2 +- src/views/welcome.js | 2 +- 29 files changed, 148 insertions(+), 133 deletions(-) diff --git a/lenra.yml b/lenra.yml index 6925573..187bd85 100644 --- a/lenra.yml +++ b/lenra.yml @@ -15,8 +15,7 @@ generator: adds: - . cmd: - - node - - node_modules/@lenra/app-server/dist/bin/app-lenra.js + - npm start envs: NODE_ENV: production MAX_RAW_SIZE: 50mb diff --git a/package-lock.json b/package-lock.json index b2a7fcf..c8047f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,30 +7,25 @@ "": { "name": "javascript-template", "version": "1.0.0", + "hasInstallScript": true, "license": "MIT", "dependencies": { - "@lenra/app-server": "^1.0.0-beta.4", - "@lenra/components": "^1.0.0-beta.7" + "@lenra/app": "^1.0.0-beta.12", + "axios": "^1.5.1" } }, - "node_modules/@lenra/app-server": { - "version": "1.0.0-beta.4", - "resolved": "https://registry.npmjs.org/@lenra/app-server/-/app-server-1.0.0-beta.4.tgz", - "integrity": "sha512-lOahuXZaGwjRP4eypn1ERQSezZddBAikj5juXB8IjrJmgX/Q7s8NJA/yMCdsXZm+OX5vFjKKhwes6AvCRqx3YQ==", + "node_modules/@lenra/app": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@lenra/app/-/app-1.1.0.tgz", + "integrity": "sha512-yZrSvqsX1lVzsk4DNtK3aZI9KCJYBBcx8Mmimt59WMXItzuMj9Ob6CKwGqF53iqByrCTiTN/YWUpbrXglX8qEw==", "dependencies": { - "@lenra/components": "~1.0.0-beta.7", - "axios": "^1.3.6", - "express": "^4.18.1" + "express": "^4.18.1", + "openapi-fetch": "^0.7.6" }, "bin": { "app-lenra": "dist/bin/app-lenra.js" } }, - "node_modules/@lenra/components": { - "version": "1.0.0-beta.7", - "resolved": "https://registry.npmjs.org/@lenra/components/-/components-1.0.0-beta.7.tgz", - "integrity": "sha512-63CLKaqy/OQ78IysOAHaoWYAuLuV9ezaJneW11UdvpZDtkLEkU0u0ct3JdFzBJyh9kQ/LTtcAvruXVtQm88YCg==" - }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -54,9 +49,9 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz", - "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz", + "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==", "dependencies": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", @@ -267,9 +262,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", "funding": [ { "type": "individual", @@ -476,6 +471,19 @@ "node": ">= 0.8" } }, + "node_modules/openapi-fetch": { + "version": "0.7.10", + "resolved": "https://registry.npmjs.org/openapi-fetch/-/openapi-fetch-0.7.10.tgz", + "integrity": "sha512-lDZkHjSxBuSTPXkJuJ9kSpkLxY9jgsVHbKkhS7rukoKi5et5QUlWCEzO/E6PaSHTQkJDPOjXdBJeDOSj2e8QwQ==", + "dependencies": { + "openapi-typescript-helpers": "^0.0.4" + } + }, + "node_modules/openapi-typescript-helpers": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/openapi-typescript-helpers/-/openapi-typescript-helpers-0.0.4.tgz", + "integrity": "sha512-Q0MTapapFAG993+dx8lNw33X6P/6EbFr31yNymJHq56fNc6dODyRm8tWyRnGxuC74lyl1iCRMV6nQCGQsfVNKg==" + }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -680,21 +688,15 @@ } }, "dependencies": { - "@lenra/app-server": { - "version": "1.0.0-beta.4", - "resolved": "https://registry.npmjs.org/@lenra/app-server/-/app-server-1.0.0-beta.4.tgz", - "integrity": "sha512-lOahuXZaGwjRP4eypn1ERQSezZddBAikj5juXB8IjrJmgX/Q7s8NJA/yMCdsXZm+OX5vFjKKhwes6AvCRqx3YQ==", + "@lenra/app": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@lenra/app/-/app-1.1.0.tgz", + "integrity": "sha512-yZrSvqsX1lVzsk4DNtK3aZI9KCJYBBcx8Mmimt59WMXItzuMj9Ob6CKwGqF53iqByrCTiTN/YWUpbrXglX8qEw==", "requires": { - "@lenra/components": "~1.0.0-beta.7", - "axios": "^1.3.6", - "express": "^4.18.1" + "express": "^4.18.1", + "openapi-fetch": "^0.7.6" } }, - "@lenra/components": { - "version": "1.0.0-beta.7", - "resolved": "https://registry.npmjs.org/@lenra/components/-/components-1.0.0-beta.7.tgz", - "integrity": "sha512-63CLKaqy/OQ78IysOAHaoWYAuLuV9ezaJneW11UdvpZDtkLEkU0u0ct3JdFzBJyh9kQ/LTtcAvruXVtQm88YCg==" - }, "accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -715,9 +717,9 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "axios": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz", - "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz", + "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==", "requires": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", @@ -884,9 +886,9 @@ } }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==" }, "form-data": { "version": "4.0.0", @@ -1022,6 +1024,19 @@ "ee-first": "1.1.1" } }, + "openapi-fetch": { + "version": "0.7.10", + "resolved": "https://registry.npmjs.org/openapi-fetch/-/openapi-fetch-0.7.10.tgz", + "integrity": "sha512-lDZkHjSxBuSTPXkJuJ9kSpkLxY9jgsVHbKkhS7rukoKi5et5QUlWCEzO/E6PaSHTQkJDPOjXdBJeDOSj2e8QwQ==", + "requires": { + "openapi-typescript-helpers": "^0.0.4" + } + }, + "openapi-typescript-helpers": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/openapi-typescript-helpers/-/openapi-typescript-helpers-0.0.4.tgz", + "integrity": "sha512-Q0MTapapFAG993+dx8lNw33X6P/6EbFr31yNymJHq56fNc6dODyRm8tWyRnGxuC74lyl1iCRMV6nQCGQsfVNKg==" + }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", diff --git a/package.json b/package.json index 5599692..7e3cda8 100644 --- a/package.json +++ b/package.json @@ -5,16 +5,16 @@ "type": "module", "main": "index.js", "scripts": { - "start": "app-lenra", - "index": "app-lenra index", - "test": "echo \"Error: no test specified\" && exit 0", - "debug": "touch /tmp/.lock && node --inspect-brk=0.0.0.0:9229 node_modules/@lenra/app-server/dist/bin/app-lenra.js" + "start": "node node_modules/@lenra/app/dist/bin/app-lenra.js start", + "index": "node node_modules/@lenra/app/dist/bin/app-lenra.js index", + "postinstall": "npm run index", + "test": "echo \"Error: no test specified\" && exit 0" }, "keywords": [], "author": "Lenra", "license": "MIT", "dependencies": { - "@lenra/app-server": "^1.0.0-beta.4", - "@lenra/components": "^1.0.0-beta.7" + "@lenra/app": "^1.0.0-beta.12", + "axios": "^1.5.1" } -} \ No newline at end of file +} diff --git a/src/classes/Game.js b/src/classes/Game.js index 16b196c..599f025 100644 --- a/src/classes/Game.js +++ b/src/classes/Game.js @@ -1,4 +1,4 @@ -import { Data } from "@lenra/app-server"; +import { Data } from "@lenra/app"; export class Game extends Data { /** diff --git a/src/classes/System.js b/src/classes/System.js index 6cdf5c6..7b269ac 100644 --- a/src/classes/System.js +++ b/src/classes/System.js @@ -1,4 +1,4 @@ -import { Data } from "@lenra/app-server"; +import { Data } from "@lenra/app"; export class System extends Data { /** diff --git a/src/classes/User.js b/src/classes/User.js index 96eaabe..ff80f01 100644 --- a/src/classes/User.js +++ b/src/classes/User.js @@ -1,4 +1,4 @@ -import { Data } from "@lenra/app-server"; +import { Data } from "@lenra/app"; export class User extends Data { /** diff --git a/src/classes/UserGame.js b/src/classes/UserGame.js index 711ad7f..c498260 100644 --- a/src/classes/UserGame.js +++ b/src/classes/UserGame.js @@ -1,4 +1,4 @@ -import { Data } from "@lenra/app-server"; +import { Data } from "@lenra/app"; export class UserGame extends Data { /** diff --git a/src/listeners/debug.js b/src/listeners/debug.js index 1dbd317..90e3be9 100644 --- a/src/listeners/debug.js +++ b/src/listeners/debug.js @@ -1,14 +1,13 @@ 'use strict' -import { DataApi } from "@lenra/app-server"; import userGameService from "../services/userGameService.js"; import { User } from "../classes/User.js"; /** * - * @param {import("@lenra/app-server").props} props - * @param {import("@lenra/app-server").event} event - * @param {import("@lenra/app-server").Api} api + * @param {import("@lenra/app").props} props + * @param {import("@lenra/app").event} event + * @param {import("@lenra/app").Api} api * @returns */ export default async function (props, event, api) { diff --git a/src/listeners/getUserGames.js b/src/listeners/getUserGames.js index 5cb2305..e865c9f 100644 --- a/src/listeners/getUserGames.js +++ b/src/listeners/getUserGames.js @@ -4,9 +4,9 @@ import steamService from "../services/steamService.js"; /** * - * @param {import("@lenra/app-server").props} props - * @param {import("@lenra/app-server").event} event - * @param {import("@lenra/app-server").Api} api + * @param {import("@lenra/app").props} props + * @param {import("@lenra/app").event} event + * @param {import("@lenra/app").Api} api * @returns */ export default async function (props, event, api) { diff --git a/src/listeners/resetDatabase.js b/src/listeners/resetDatabase.js index ef8c2f5..c63dcd8 100644 --- a/src/listeners/resetDatabase.js +++ b/src/listeners/resetDatabase.js @@ -4,13 +4,13 @@ import { User } from "../classes/User.js"; import { Game } from "../classes/Game.js"; import { UserGame } from "../classes/UserGame.js"; import apiServices from "../services/api.js"; -import { DataApi } from "@lenra/app-server"; +import { DataApi } from "@lenra/app"; /** * - * @param {import("@lenra/app-server").props} props - * @param {import("@lenra/app-server").event} event - * @param {import("@lenra/app-server").Api} api + * @param {import("@lenra/app").props} props + * @param {import("@lenra/app").event} event + * @param {import("@lenra/app").Api} api * @returns */ export default async function (props, event, api) { diff --git a/src/listeners/setAppId.js b/src/listeners/setAppId.js index 267e79c..78cce16 100644 --- a/src/listeners/setAppId.js +++ b/src/listeners/setAppId.js @@ -6,9 +6,9 @@ import { User } from "../classes/User.js"; /** * - * @param {import("@lenra/app-server").props} props - * @param {import("@lenra/app-server").event} event - * @param {import("@lenra/app-server").Api} api + * @param {import("@lenra/app").props} props + * @param {import("@lenra/app").event} event + * @param {import("@lenra/app").Api} api * @returns */ export default async function (props, event, api) { diff --git a/src/listeners/setSteamID.js b/src/listeners/setSteamID.js index 2fa1b40..3cc70c6 100644 --- a/src/listeners/setSteamID.js +++ b/src/listeners/setSteamID.js @@ -2,13 +2,12 @@ import axios from "axios"; import { User } from "../classes/User.js"; -import { DataApi } from "@lenra/app-server"; /** * - * @param {import("@lenra/app-server").props} props - * @param {import("@lenra/app-server").event} event - * @param {import("@lenra/app-server").Api} api + * @param {import("@lenra/app").props} props + * @param {import("@lenra/app").event} event + * @param {import("@lenra/app").Api} api * @returns */ export default async function (props, event, api) { diff --git a/src/listeners/systemEvents.js b/src/listeners/systemEvents.js index f475fb7..0ad46d0 100644 --- a/src/listeners/systemEvents.js +++ b/src/listeners/systemEvents.js @@ -4,9 +4,9 @@ import { System } from "../classes/System.js"; /** * - * @param {import("@lenra/app-server").props} _props - * @param {import("@lenra/app-server").event} _event - * @param {import("@lenra/app-server").Api} api + * @param {import("@lenra/app").props} _props + * @param {import("@lenra/app").event} _event + * @param {import("@lenra/app").Api} api */ export async function onEnvStart(_props, _event, api) { diff --git a/src/listeners/thisisme.js b/src/listeners/thisisme.js index 1a33b7c..11c631c 100644 --- a/src/listeners/thisisme.js +++ b/src/listeners/thisisme.js @@ -6,9 +6,9 @@ import { User } from "../classes/User.js"; /** * - * @param {import("@lenra/app-server").props} props - * @param {import("@lenra/app-server").event} event - * @param {import("@lenra/app-server").Api} api + * @param {import("@lenra/app").props} props + * @param {import("@lenra/app").event} event + * @param {import("@lenra/app").Api} api * @returns */ export default async function (userSummary, event, api) { diff --git a/src/manifest.js b/src/manifest.js index ead5ee6..3c56ca5 100644 --- a/src/manifest.js +++ b/src/manifest.js @@ -1,28 +1,31 @@ -import { View } from "@lenra/components" +import { View } from "@lenra/app" import GuardsModule from './views/guards/_guards.js' -import { DataApi } from "@lenra/app-server" +import { DataApi } from "@lenra/app" import { User } from "./classes/User.js" -export const lenraRoutes = [ - { - path: "/", - view: GuardsModule([], { - page: View("homePage").data(DataApi.collectionName(User), { id: "@me" }).context({ me: true }), - guards: [ - View("guards.firstTime") - .data(DataApi.collectionName(User), { id: "@me" }).context({ me: true }), - View("guards.welcome").data(DataApi.collectionName(User), { id: "@me" }).context({ me: true }), - ], - }).context({ pathParams: true }) - }, - { - path: "/game/:appid", - view: GuardsModule([], { - page: View("gamePageDataProvider"), - guards: [ - View("guards.firstTime") - .data(DataApi.collectionName(User), { id: "@me" }).context({ me: true }), - ], - }).context({ pathParams: true }) - }, -] \ No newline at end of file +export const lenra = +{ + routes: [ + { + path: "/", + view: GuardsModule([], { + page: View("homePage").find(DataApi.collectionName(User), { id: "@me" }).context({ me: true }), + guards: [ + View("guards.firstTime") + .find(DataApi.collectionName(User), { id: "@me" }).context({ me: true }), + View("guards.welcome").find(DataApi.collectionName(User), { id: "@me" }).context({ me: true }), + ], + }).context({ pathParams: true }) + }, + { + path: "/game/:appid", + view: GuardsModule([], { + page: View("gamePageDataProvider"), + guards: [ + View("guards.firstTime") + .find(DataApi.collectionName(User), { id: "@me" }).context({ me: true }), + ], + }).context({ pathParams: true }) + }, + ] +} \ No newline at end of file diff --git a/src/services/gameService.js b/src/services/gameService.js index 718da85..88e8e43 100644 --- a/src/services/gameService.js +++ b/src/services/gameService.js @@ -5,7 +5,7 @@ import { Game } from '../classes/Game.js'; export default { /** * - * @param {import("@lenra/app-server").Api} api + * @param {import("@lenra/app").Api} api * @param {Number} gameId */ get(api, gameId) { @@ -13,14 +13,14 @@ export default { }, /** * - * @param {import("@lenra/app-server").Api} api + * @param {import("@lenra/app").Api} api */ get_all(api) { return api.data.find(Game, {}).then((value) => value.data); }, /** * - * @param {import("@lenra/app-server").Api} api + * @param {import("@lenra/app").Api} api * @param {Game} game */ update(api, game) { @@ -28,7 +28,7 @@ export default { }, /** * - * @param {import("@lenra/app-server").Api} api + * @param {import("@lenra/app").Api} api * @param {Game} game */ async new(api, game) { diff --git a/src/services/userGameService.js b/src/services/userGameService.js index db364b4..93de1e4 100644 --- a/src/services/userGameService.js +++ b/src/services/userGameService.js @@ -5,7 +5,7 @@ import { UserGame } from '../classes/UserGame.js'; export default { /** * - * @param {import("@lenra/app-server").Api} api + * @param {import("@lenra/app").Api} api * @param {Number} gameId */ get(api, gameId) { @@ -16,7 +16,7 @@ export default { }, /** * - * @param {import("@lenra/app-server").Api} api + * @param {import("@lenra/app").Api} api */ get_all(api) { return api.data.find(UserGame, { @@ -25,7 +25,7 @@ export default { }, /** * - * @param {import("@lenra/app-server").Api} api + * @param {import("@lenra/app").Api} api * @param {UserGame} userGame */ async new(api, userGame) { @@ -33,7 +33,7 @@ export default { }, /** * - * @param {import("@lenra/app-server").Api} api + * @param {import("@lenra/app").Api} api * @param {string} userGameId * @param {UserGame} userGame */ diff --git a/src/views/firstTimePage.js b/src/views/firstTimePage.js index 5007b3d..82eeb7c 100644 --- a/src/views/firstTimePage.js +++ b/src/views/firstTimePage.js @@ -1,6 +1,6 @@ 'use strict' -import { Flex, Text, Container, Form, TextField, Button, Actionable } from "@lenra/components"; +import { Flex, Text, Container, Form, TextField, Button, Actionable } from "@lenra/app"; export default function (data, props) { return Container( diff --git a/src/views/gameCard.js b/src/views/gameCard.js index 439973c..d1c9eca 100644 --- a/src/views/gameCard.js +++ b/src/views/gameCard.js @@ -1,6 +1,6 @@ 'use strict' -import { Actionable, Container, Image, Text, View, Flex, Icon } from "@lenra/components"; +import { Actionable, Container, Image, Text, View, Flex, Icon } from "@lenra/app"; export default async function (data, userGame) { let game = data[0]; diff --git a/src/views/gameList.js b/src/views/gameList.js index b761ae7..7aff365 100644 --- a/src/views/gameList.js +++ b/src/views/gameList.js @@ -1,7 +1,7 @@ 'use strict' -import { DataApi } from "@lenra/app-server"; -import { Flex, View } from "@lenra/components"; +import { DataApi } from "@lenra/app"; +import { Flex, View } from "@lenra/app"; import { Game } from "../classes/Game.js"; export default async function (userGames, props) { @@ -11,7 +11,7 @@ export default async function (userGames, props) { userGames = paginate(userGames, 10, 1) return Flex(userGames.map(function (userGame) { - return View("gameCard").props(userGame).data(DataApi.collectionName(Game), { appid: userGame.appid }); + return View("gameCard").props(userGame).find(DataApi.collectionName(Game), { appid: userGame.appid }); })).direction("vertical").scroll(true).spacing(8) } diff --git a/src/views/gamePage.js b/src/views/gamePage.js index 1b904dd..a338012 100644 --- a/src/views/gamePage.js +++ b/src/views/gamePage.js @@ -1,7 +1,7 @@ 'use strict' -import { DataApi } from '@lenra/app-server'; -import { Flex, Actionable, Icon, Text, View } from '@lenra/components'; +import { DataApi } from '@lenra/app'; +import { Flex, Actionable, Icon, Text, View } from '@lenra/app'; import { UserGame } from '../classes/UserGame.js'; import steamService from '../services/steamService.js'; @@ -26,7 +26,7 @@ export default async function ([game], _props, _context) { ).direction("horizontal") ] ).direction("horizontal").mainAxisAlignment("center").crossAxisAlignment("center").spacing(2).fillParent(true), - View('unlockedAchievements').data(DataApi.collectionName(UserGame), { + View('unlockedAchievements').find(DataApi.collectionName(UserGame), { user: "@me", appid: game.appid }).props(game), diff --git a/src/views/gamePageDataProvider.js b/src/views/gamePageDataProvider.js index c214b14..abb62b2 100644 --- a/src/views/gamePageDataProvider.js +++ b/src/views/gamePageDataProvider.js @@ -1,10 +1,10 @@ 'use strict' -import { View } from '@lenra/components'; +import { View } from '@lenra/app'; import { Game } from '../classes/Game.js'; -import { DataApi } from '@lenra/app-server'; +import { DataApi } from '@lenra/app'; export default async function (_data, props, _context) { - return View('gamePage').data(DataApi.collectionName(Game), { appid: props.context.pathParams.appid }); + return View('gamePage').find(DataApi.collectionName(Game), { appid: props.context.pathParams.appid }); } diff --git a/src/views/guards/_guards.js b/src/views/guards/_guards.js index cac78bf..57a6e05 100644 --- a/src/views/guards/_guards.js +++ b/src/views/guards/_guards.js @@ -1,6 +1,6 @@ 'use strict' -import { View, ViewImpl } from "@lenra/components" +import { View, ViewImpl } from "@lenra/app" export default function (_data, { page, guards = [], context }, ctx) { let nextView = page @@ -21,7 +21,7 @@ function jsonToView(json) { if (!(json instanceof ViewImpl)) { let view = View(json.name) if (json.find && json.find.coll && json.find.query) { - view = view.data(json.find.coll, json.find.query); + view = view.find(json.find.coll, json.find.query); } return view; diff --git a/src/views/guards/firstTime.js b/src/views/guards/firstTime.js index 17e69c9..e969db5 100644 --- a/src/views/guards/firstTime.js +++ b/src/views/guards/firstTime.js @@ -1,12 +1,12 @@ -import { View } from "@lenra/components" +import { View } from "@lenra/app" import GuardsModule from './_guards.js' -import { DataApi } from "@lenra/app-server"; +import { DataApi } from "@lenra/app"; import { User } from "../../classes/User.js"; export default function ([user], props, context) { if (user == undefined) { - return View("firstTimePage").data(DataApi.collectionName(User), { id: "@me" }); + return View("firstTimePage").find(DataApi.collectionName(User), { id: "@me" }); } return GuardsModule([], props, context); diff --git a/src/views/guards/welcome.js b/src/views/guards/welcome.js index a479d1d..4d06b60 100644 --- a/src/views/guards/welcome.js +++ b/src/views/guards/welcome.js @@ -1,6 +1,6 @@ -import { View } from "@lenra/components" +import { View } from "@lenra/app" import GuardsModule from './_guards.js' -import { DataApi } from "@lenra/app-server"; +import { DataApi } from "@lenra/app"; import { User } from "../../classes/User.js"; import steamService from "../../services/steamService.js" @@ -9,7 +9,7 @@ export default async function ([user], props, context) { let userSummary = await steamService.getUserSummary(user.steamId); if (user.avatar == undefined) { - return View("welcome").data(DataApi.collectionName(User), { id: "@me" }).props(userSummary); + return View("welcome").find(DataApi.collectionName(User), { id: "@me" }).props(userSummary); } return GuardsModule([], props, context); diff --git a/src/views/homePage.js b/src/views/homePage.js index cd42e22..9b37858 100644 --- a/src/views/homePage.js +++ b/src/views/homePage.js @@ -1,8 +1,8 @@ 'use strict' -import { Flex, Form, Text, Button, Flexible, Container, View, TextField } from '@lenra/components' +import { Flex, Form, Text, Button, Flexible, Container, View, TextField } from '@lenra/app' import { UserGame } from '../classes/UserGame.js'; -import { DataApi } from '@lenra/app-server'; +import { DataApi } from '@lenra/app'; export default async function ([user], props, context) { return Container( @@ -38,7 +38,7 @@ export default async function ([user], props, context) { // Container(TextField(`{ "userId": "${user.id}", "steamId": "${user.steamId}" }`)).maxWidth(600), Flexible( Container( - View("gameList").data(DataApi.collectionName(UserGame), { user: "@me" }), + View("gameList").find(DataApi.collectionName(UserGame), { user: "@me" }), ).maxWidth(600).maxHeight(600) ) ] diff --git a/src/views/resetDatabaseButton.js b/src/views/resetDatabaseButton.js index 2577b74..9e53b59 100644 --- a/src/views/resetDatabaseButton.js +++ b/src/views/resetDatabaseButton.js @@ -1,6 +1,6 @@ 'use strict' -import { Actionable, Container, Text } from '@lenra/components' +import { Actionable, Container, Text } from '@lenra/app' export default async function (data, props) { return Actionable( diff --git a/src/views/unlockedAchievements.js b/src/views/unlockedAchievements.js index 2c64b52..292fecb 100644 --- a/src/views/unlockedAchievements.js +++ b/src/views/unlockedAchievements.js @@ -1,6 +1,6 @@ 'use strict' -import { Flex, Actionable, Icon, Text, View, Image, Container } from '@lenra/components'; +import { Flex, Actionable, Icon, Text, View, Image, Container } from '@lenra/app'; export default async function ([userGame], game, _context) { let unlockedAchievements = game.achievements.filter((achievement) => { diff --git a/src/views/welcome.js b/src/views/welcome.js index 147f611..6123a05 100644 --- a/src/views/welcome.js +++ b/src/views/welcome.js @@ -1,4 +1,4 @@ -import { Flex, Image, Text, Container, Actionable } from "@lenra/components" +import { Flex, Image, Text, Container, Actionable } from "@lenra/app" export default async function ([user], props, context) { From 63ded93a839f5834ceddc1cf2f7d36cf9a63bad9 Mon Sep 17 00:00:00 2001 From: "jonas.martinez" Date: Fri, 13 Oct 2023 16:33:48 +0200 Subject: [PATCH 09/12] remove server.js --- server.js | 204 ------------------------------------------------------ 1 file changed, 204 deletions(-) delete mode 100644 server.js diff --git a/server.js b/server.js deleted file mode 100644 index 474eac9..0000000 --- a/server.js +++ /dev/null @@ -1,204 +0,0 @@ -// Copyright (c) Alex Ellis 2021. All rights reserved. -// Copyright (c) OpenFaaS Author(s) 2021. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -"use strict" - -import express from 'express'; -import { writeFileSync } from 'fs'; -import morgan from 'morgan'; -const app = express(); - -import manifestHandler from './index.js'; -const defaultMaxSize = '50mb'; // body-parser default - -const rawLimit = process.env.MAX_RAW_SIZE || defaultMaxSize; -const jsonLimit = process.env.MAX_JSON_SIZE || defaultMaxSize; - -let listenerHandlers = null; -let viewHandlers = null; -let manifest = null; - -const RESOURCE_TYPE = "resource"; -const LISTENER_TYPE = "listener"; -const WIDGET_TYPE = "view"; -const MANIFEST_TYPE = "manifest"; - -app.disable('x-powered-by'); - -app.use(morgan(function (tokens, req, res) { - return [ - tokens.method(req, res), - tokens.url(req, res), - 'type:', get_req_type(req), - tokens.status(req, res), - tokens['response-time'](req, res), 'ms' - ].join(' ') -}, { - skip: function (req, res) { return res.statusCode < 400 } -})) - -app.use(function addDefaultContentType(req, res, next) { - // When no content-type is given, the body element is set to - // nil, and has been a source of contention for new users. - - if (!req.headers['content-type']) { - req.headers['content-type'] = "text/plain" - } - next() -}) - -if (process.env.RAW_BODY === 'true') { - app.use(express.raw({ type: '*/*', limit: rawLimit })) -} else { - app.use(express.text({ type: "text/*" })); - app.use(express.json({ limit: jsonLimit })); - app.use(express.urlencoded({ extended: true })); -} - -const get_req_type = (req) => { - if (req.method !== "POST") return "none"; - if (req.body.resource) { - return RESOURCE_TYPE; - } else if (req.body.action) { - return LISTENER_TYPE; - } else if (req.body.view) { - return WIDGET_TYPE; - } else { - return MANIFEST_TYPE; - } -} - -const middleware = async (req, res) => { - switch (get_req_type(req)) { - case RESOURCE_TYPE: - handleAppResource(req, res); - break; - - case LISTENER_TYPE: - handleAppListener(req, res); - break; - - case WIDGET_TYPE: - handleAppView(req, res); - break; - - case MANIFEST_TYPE: - handleAppManifest(req, res); - break; - - default: - throw "Middleware type unknown."; - - } -}; - -function handleAppResource(req, res) { - const resources_path = "./resources/"; - - // Checking file extensions according to which ones Flutter can handle - if (req.body.resource.match(/.*(\.jpeg|\.jpg|\.png|\.gif|\.webp|\.bmp|\.wbmp)$/)) { - res.sendFile(req.body.resource, { root: resources_path }); - } else { - res.sendStatus(404); - } -} - -async function initManifest() { - if (manifest == null) { - let tempManifest = await manifestHandler(); - viewHandlers = tempManifest.views; - listenerHandlers = tempManifest.listeners || {}; - viewHandlers = tempManifest.views; - listenerHandlers = tempManifest.listeners || {}; - manifest = { - views: Object.keys(viewHandlers), - listeners: Object.keys(listenerHandlers), - rootView: tempManifest.rootView - }; - } - return Promise.resolve(manifest); -} - -async function handleAppManifest(req, res) { - - - return initManifest().then(manifest => { - - res.status(200).json({ manifest: manifest }); - }) - .catch(err => { - const err_string = err.toString ? err.toString() : err; - console.error("handleAppManifest:", err_string); - res.status(500).send(err_string); - }); -} - -async function handleAppView(req, res) { - let { view, data, props } = req.body; - - if (Object.keys(viewHandlers).includes(view)) { - let possibleFutureRes = viewHandlers[view](data, props) - - return Promise.resolve(possibleFutureRes) - .then(view => { - - res.status(200).json({ view: view }); - }) - .catch(err => { - const err_string = err.toString ? err.toString() : err; - console.error('handleAppView:', err_string); - res.status(500).send(err_string); - }); - } else { - let msg = `No view found for name ${view} in app manifest.`; - console.error(msg); - res.status(404).send(msg); - } - -} - -/** - * This is the main entry point for the OpenFaaS function. - * - * This function will call the index.js file of the application - * when the page change. - * If an event is triggered, the matched event function provided by the app is triggered. - * The event can be a listener or a view update. - */ -async function handleAppListener(req, res) { - let { action, props, event, api } = req.body; - /* - listeners file need to exactly math with action name - */ - if (Object.keys(listenerHandlers).includes(action)) { - let possibleFutureRes = listenerHandlers[action](props, event, api); - - return Promise.resolve(possibleFutureRes) - .then(() => { - res.status(200).send(); - }) - .catch(err => { - const err_string = err.toString ? err.toString() : err; - console.error('handleAppAction:', err_string); - res.status(500).send(err_string); - }); - } else { - console.error(`No listener found for action ${action} in app manifest.`); - res.status(404).send(`No listener found for action ${action} in app manifest.`); - } -} - -//middleware to catch ressource -app.post('/*', middleware); - -const port = process.env.http_port || 3000; - -initManifest().then(() => { - app.listen(port, () => { - writeFileSync("/tmp/.lock", "\n"); - console.log(`App listening on port: ${port}`) - }); -}).catch(err => { - console.error(err); -}); \ No newline at end of file From c531e2e439088432d31c797084cadb6afd6f515b Mon Sep 17 00:00:00 2001 From: "jonas.martinez" Date: Thu, 19 Oct 2023 16:51:27 +0200 Subject: [PATCH 10/12] some fix --- package-lock.json | 2 +- package.json | 2 +- src/listeners/debug.js | 2 +- src/listeners/resetDatabase.js | 2 +- src/listeners/setAppId.js | 8 ++++---- src/listeners/setSteamID.js | 10 +++++----- src/listeners/thisisme.js | 4 ++-- src/services/gameService.js | 10 +++++----- src/services/userGameService.js | 8 ++++---- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index c8047f4..bb43a2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "MIT", "dependencies": { - "@lenra/app": "^1.0.0-beta.12", + "@lenra/app": "^1.1.0", "axios": "^1.5.1" } }, diff --git a/package.json b/package.json index 7e3cda8..d32e232 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "author": "Lenra", "license": "MIT", "dependencies": { - "@lenra/app": "^1.0.0-beta.12", + "@lenra/app": "^1.1.0", "axios": "^1.5.1" } } diff --git a/src/listeners/debug.js b/src/listeners/debug.js index 90e3be9..5000a6b 100644 --- a/src/listeners/debug.js +++ b/src/listeners/debug.js @@ -12,7 +12,7 @@ import { User } from "../classes/User.js"; */ export default async function (props, event, api) { userGameService.createDatastore(api); - let userData = (await api.data.find(User, { id: "@me" }))[0]; + let userData = (await api.data.coll(User).find({ id: "@me" }))[0]; userGameService.new(api, {appid: 1}, userData._id); return {} } diff --git a/src/listeners/resetDatabase.js b/src/listeners/resetDatabase.js index c63dcd8..c34dee6 100644 --- a/src/listeners/resetDatabase.js +++ b/src/listeners/resetDatabase.js @@ -16,7 +16,7 @@ import { DataApi } from "@lenra/app"; export default async function (props, event, api) { const colls = [DataApi.collectionName(User), DataApi.collectionName(Game), DataApi.collectionName(UserGame)]; colls.forEach(async (coll) => { - await (await api.data.find(coll, {})).forEach((doc) => { + await (await api.data.coll(coll).find({})).forEach((doc) => { apiServices.deleteDoc(api, coll, doc); }); }); diff --git a/src/listeners/setAppId.js b/src/listeners/setAppId.js index 78cce16..4e23141 100644 --- a/src/listeners/setAppId.js +++ b/src/listeners/setAppId.js @@ -12,7 +12,7 @@ import { User } from "../classes/User.js"; * @returns */ export default async function (props, event, api) { - let [user] = await api.data.find(User, { id: "@me" }); + let [user] = await api.data.coll(User).find({ id: "@me" }); axios.post(`${api.url}/apps/${event.value.appId}/webhooks/${user.webhookUuid}`, { userId: user.id, @@ -21,11 +21,11 @@ export default async function (props, event, api) { console.log(error); }); - let [system] = await api.data.find(System, {}); + let [system] = await api.data.coll(System).find({}); if (system == undefined) { - return await api.data.createDoc(new System(event.value.appId)); + return await api.data.coll(System).createDoc(new System(event.value.appId)); } system.appId = event.value.appId; - return await api.data.updateDoc(system); + return await api.data.coll(System).updateDoc(system); } \ No newline at end of file diff --git a/src/listeners/setSteamID.js b/src/listeners/setSteamID.js index 3cc70c6..de3295f 100644 --- a/src/listeners/setSteamID.js +++ b/src/listeners/setSteamID.js @@ -13,16 +13,16 @@ import { User } from "../classes/User.js"; export default async function (props, event, api) { // TODO: Link games to steamID let webhook = (await createWebhook(api, { - action: "getUserGames" + listener: "getUserGames" })).data; - let userData = (await api.data.find(User, { id: "@me" }))[0]; + let userData = (await api.data.coll(User).find({ id: "@me" }))[0]; if (userData == undefined) { - userData = await api.data.createDoc(new User("@me", event.value.steamId, webhook.uuid)); + userData = await api.data.coll(User).createDoc(new User("@me", event.value.steamId, webhook.uuid)); } else { userData.steamId = event.value.steamId; - await api.data.updateDoc(new User(userData.id, event.value.steamId, webhook.uuid)); + await api.data.coll(User).updateDoc(new User(userData.id, event.value.steamId, webhook.uuid)); } // await triggerWebhook(api, webhook.uuid, { userId: userData.id, steamId: userData.steamId }); @@ -31,7 +31,7 @@ export default async function (props, event, api) { } function createWebhook(api, params) { - return axios.post(`${api.url}/app/webhooks`, params, options(api)).catch((error) => console.log(error)); + return axios.post(`${api.url}/app-api/v1/webhooks`, params, options(api)).catch((error) => console.log(error)); }; function options(api) { diff --git a/src/listeners/thisisme.js b/src/listeners/thisisme.js index 11c631c..c59ae39 100644 --- a/src/listeners/thisisme.js +++ b/src/listeners/thisisme.js @@ -12,8 +12,8 @@ import { User } from "../classes/User.js"; * @returns */ export default async function (userSummary, event, api) { - let [user] = await api.data.find(User, { id: "@me" }); + let [user] = await api.data.coll(User).find({ id: "@me" }); user.avatar = userSummary.avatarfull; user.personaname = userSummary.personaname; - await api.data.updateDoc(user); + await api.data.coll(User).updateDoc(user); } \ No newline at end of file diff --git a/src/services/gameService.js b/src/services/gameService.js index 88e8e43..f9ca09a 100644 --- a/src/services/gameService.js +++ b/src/services/gameService.js @@ -9,14 +9,14 @@ export default { * @param {Number} gameId */ get(api, gameId) { - return api.data.find(Game, { "appid": gameId }).then((value) => value.data[0]); + return api.data.coll(Game).find({ "appid": gameId }).then((value) => value.data[0]); }, /** * * @param {import("@lenra/app").Api} api */ get_all(api) { - return api.data.find(Game, {}).then((value) => value.data); + return api.data.coll(Game).find({}).then((value) => value.data); }, /** * @@ -24,7 +24,7 @@ export default { * @param {Game} game */ update(api, game) { - return api.data.updateDoc(game); + return api.data.coll(Game).updateDoc(game); }, /** * @@ -32,12 +32,12 @@ export default { * @param {Game} game */ async new(api, game) { - let existingGame = (await api.data.find(Game, { + let existingGame = (await api.data.coll(Game).find({ "appid": game.appid })).data; if (typeof existingGame === 'undefined' || existingGame.length == 0) { - let res = await api.data.createDoc(game); + let res = await api.data.coll(Game).createDoc(game); return res.data; } else { let res = await this.update(api, { ...existingGame[0], ...game }); diff --git a/src/services/userGameService.js b/src/services/userGameService.js index 93de1e4..a1a5a88 100644 --- a/src/services/userGameService.js +++ b/src/services/userGameService.js @@ -9,7 +9,7 @@ export default { * @param {Number} gameId */ get(api, gameId) { - return api.data.find(UserGame, { + return api.data.coll(UserGame).find({ "id": "@me", "appid": gameId }).then((value) => value.data[0]); @@ -19,7 +19,7 @@ export default { * @param {import("@lenra/app").Api} api */ get_all(api) { - return api.data.find(UserGame, { + return api.data.coll(UserGame).find({ "id": "@me" }).then((value) => value.data); }, @@ -29,7 +29,7 @@ export default { * @param {UserGame} userGame */ async new(api, userGame) { - return await api.data.createDoc(userGame); + return await api.data.coll(UserGame).createDoc(userGame); }, /** * @@ -38,6 +38,6 @@ export default { * @param {UserGame} userGame */ put(api, userGameId, userGame) { - return api.data.updateDoc({ "_id": userGameId, ...userGame }) + return api.data.coll(UserGame).updateDoc({ "_id": userGameId, ...userGame }) } }; \ No newline at end of file From c8c5ebc4933eb2bc1287a7c88186ed662e9fdca9 Mon Sep 17 00:00:00 2001 From: "jonas.martinez" Date: Thu, 26 Oct 2023 16:17:06 +0200 Subject: [PATCH 11/12] fix webhook --- package-lock.json | 12 ++++++------ src/listeners/getUserGames.js | 2 +- src/listeners/systemEvents.js | 17 ++++++++++++++--- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index bb43a2d..ca85d20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,9 +15,9 @@ } }, "node_modules/@lenra/app": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@lenra/app/-/app-1.1.0.tgz", - "integrity": "sha512-yZrSvqsX1lVzsk4DNtK3aZI9KCJYBBcx8Mmimt59WMXItzuMj9Ob6CKwGqF53iqByrCTiTN/YWUpbrXglX8qEw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@lenra/app/-/app-1.1.1.tgz", + "integrity": "sha512-huD+YznmJAk4T4Z0ZIbI7q8eXdWqQGJAIs2K+CZT8mibDIQCld+lbk0+Q3Y0mdVGwLpQSxIrK5YAoE6BPgrwUQ==", "dependencies": { "express": "^4.18.1", "openapi-fetch": "^0.7.6" @@ -689,9 +689,9 @@ }, "dependencies": { "@lenra/app": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@lenra/app/-/app-1.1.0.tgz", - "integrity": "sha512-yZrSvqsX1lVzsk4DNtK3aZI9KCJYBBcx8Mmimt59WMXItzuMj9Ob6CKwGqF53iqByrCTiTN/YWUpbrXglX8qEw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@lenra/app/-/app-1.1.1.tgz", + "integrity": "sha512-huD+YznmJAk4T4Z0ZIbI7q8eXdWqQGJAIs2K+CZT8mibDIQCld+lbk0+Q3Y0mdVGwLpQSxIrK5YAoE6BPgrwUQ==", "requires": { "express": "^4.18.1", "openapi-fetch": "^0.7.6" diff --git a/src/listeners/getUserGames.js b/src/listeners/getUserGames.js index e865c9f..34d0c52 100644 --- a/src/listeners/getUserGames.js +++ b/src/listeners/getUserGames.js @@ -10,7 +10,7 @@ import steamService from "../services/steamService.js"; * @returns */ export default async function (props, event, api) { - steamService.getUserGames(api, event.userId, event.steamId); + await steamService.getUserGames(api, event.userId, event.steamId); return {}; } \ No newline at end of file diff --git a/src/listeners/systemEvents.js b/src/listeners/systemEvents.js index 0ad46d0..688e420 100644 --- a/src/listeners/systemEvents.js +++ b/src/listeners/systemEvents.js @@ -1,6 +1,5 @@ 'use strict' -import { System } from "../classes/System.js"; /** * @@ -12,10 +11,22 @@ export async function onEnvStart(_props, _event, api) { } +/** + * + * @param {import("@lenra/app").props} _props + * @param {import("@lenra/app").event} _event + * @param {import("@lenra/app").Api} api + */ export async function onUserFirstJoin(_props, _event, api) { } -export async function onSessionStart(_props, _event, _api) { - +/** + * + * @param {import("@lenra/app").props} _props + * @param {import("@lenra/app").event} _event + * @param {import("@lenra/app").Api} api + */ +export async function onSessionStart(_props, _event, api) { + } \ No newline at end of file From d534a04f81fc1936675cef933f9a0c50e4a04e0b Mon Sep 17 00:00:00 2001 From: "jonas.martinez" Date: Thu, 15 Feb 2024 16:43:56 +0100 Subject: [PATCH 12/12] fix healthcheck and trying some new features --- bun.lockb | Bin 0 -> 28492 bytes lenra.yml | 38 +- package-lock.json | 1186 ----------------------------- package.json | 10 +- src/app.js | 42 + src/classes/Game.js | 4 +- src/classes/GameAchievement.js | 20 + src/classes/User.js | 4 +- src/healthcheck.js | 8 + src/listeners/setAppId.js | 15 +- src/services/steamService.js | 44 +- src/views/gameList.js | 5 - src/views/homePage.js | 8 +- src/views/unlockedAchievements.js | 4 +- 14 files changed, 149 insertions(+), 1239 deletions(-) create mode 100755 bun.lockb delete mode 100644 package-lock.json create mode 100644 src/app.js create mode 100644 src/classes/GameAchievement.js create mode 100644 src/healthcheck.js diff --git a/bun.lockb b/bun.lockb new file mode 100755 index 0000000000000000000000000000000000000000..d045ee416ad849ff62fe36664a973e5e450b7493 GIT binary patch literal 28492 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 0.6" - } - }, - "node_modules/array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" - }, - "node_modules/axios": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz", - "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==", - "dependencies": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, - "node_modules/body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", - "dependencies": { - "bytes": "3.1.2", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.11.0", - "raw-body": "2.5.1", - "type-is": "~1.6.18", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, - "node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "dependencies": { - "safe-buffer": "5.2.1" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" - }, - "node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, - "node_modules/ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" - }, - "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" - }, - "node_modules/etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", - "dependencies": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.20.1", - "content-disposition": "0.5.4", - "content-type": "~1.0.4", - "cookie": "0.5.0", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.2.0", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.7", - "qs": "6.11.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", - "dependencies": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "statuses": "2.0.1", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/follow-redirects": { - "version": "1.15.3", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", - "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, - "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "node_modules/get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", - "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "dependencies": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" - }, - "node_modules/methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - }, - "node_modules/negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/openapi-fetch": { - "version": "0.7.10", - "resolved": "https://registry.npmjs.org/openapi-fetch/-/openapi-fetch-0.7.10.tgz", - "integrity": "sha512-lDZkHjSxBuSTPXkJuJ9kSpkLxY9jgsVHbKkhS7rukoKi5et5QUlWCEzO/E6PaSHTQkJDPOjXdBJeDOSj2e8QwQ==", - "dependencies": { - "openapi-typescript-helpers": "^0.0.4" - } - }, - "node_modules/openapi-typescript-helpers": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/openapi-typescript-helpers/-/openapi-typescript-helpers-0.0.4.tgz", - "integrity": "sha512-Q0MTapapFAG993+dx8lNw33X6P/6EbFr31yNymJHq56fNc6dODyRm8tWyRnGxuC74lyl1iCRMV6nQCGQsfVNKg==" - }, - "node_modules/parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" - }, - "node_modules/proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dependencies": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" - }, - "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", - "dependencies": { - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", - "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", - "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/send/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, - "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", - "dependencies": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.18.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" - }, - "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "engines": { - "node": ">= 0.8" - } - } - }, - "dependencies": { - "@lenra/app": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@lenra/app/-/app-1.1.1.tgz", - "integrity": "sha512-huD+YznmJAk4T4Z0ZIbI7q8eXdWqQGJAIs2K+CZT8mibDIQCld+lbk0+Q3Y0mdVGwLpQSxIrK5YAoE6BPgrwUQ==", - "requires": { - "express": "^4.18.1", - "openapi-fetch": "^0.7.6" - } - }, - "accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "requires": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - } - }, - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" - }, - "axios": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz", - "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==", - "requires": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, - "body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", - "requires": { - "bytes": "3.1.2", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.11.0", - "raw-body": "2.5.1", - "type-is": "~1.6.18", - "unpipe": "1.0.0" - } - }, - "bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "requires": { - "safe-buffer": "5.2.1" - } - }, - "content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==" - }, - "cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==" - }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" - }, - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" - }, - "destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" - }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" - }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" - }, - "express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", - "requires": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.20.1", - "content-disposition": "0.5.4", - "content-type": "~1.0.4", - "cookie": "0.5.0", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.2.0", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.7", - "qs": "6.11.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - } - }, - "finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", - "requires": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "statuses": "2.0.1", - "unpipe": "~1.0.0" - } - }, - "follow-redirects": { - "version": "1.15.3", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", - "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==" - }, - "form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - }, - "forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==" - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" - } - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" - }, - "http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "requires": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" - } - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" - }, - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==" - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" - }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" - }, - "mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "requires": { - "mime-db": "1.52.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - }, - "negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" - }, - "object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==" - }, - "on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "requires": { - "ee-first": "1.1.1" - } - }, - "openapi-fetch": { - "version": "0.7.10", - "resolved": "https://registry.npmjs.org/openapi-fetch/-/openapi-fetch-0.7.10.tgz", - "integrity": "sha512-lDZkHjSxBuSTPXkJuJ9kSpkLxY9jgsVHbKkhS7rukoKi5et5QUlWCEzO/E6PaSHTQkJDPOjXdBJeDOSj2e8QwQ==", - "requires": { - "openapi-typescript-helpers": "^0.0.4" - } - }, - "openapi-typescript-helpers": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/openapi-typescript-helpers/-/openapi-typescript-helpers-0.0.4.tgz", - "integrity": "sha512-Q0MTapapFAG993+dx8lNw33X6P/6EbFr31yNymJHq56fNc6dODyRm8tWyRnGxuC74lyl1iCRMV6nQCGQsfVNKg==" - }, - "parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" - }, - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" - }, - "proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "requires": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - } - }, - "proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" - }, - "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", - "requires": { - "side-channel": "^1.0.4" - } - }, - "range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" - }, - "raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", - "requires": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - } - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", - "requires": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, - "dependencies": { - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - } - } - }, - "serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", - "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.18.0" - } - }, - "setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" - }, - "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - } - }, - "statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" - }, - "toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" - }, - "type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "requires": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - } - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==" - }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==" - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==" - } - } -} diff --git a/package.json b/package.json index d32e232..6dc2f14 100644 --- a/package.json +++ b/package.json @@ -5,16 +5,20 @@ "type": "module", "main": "index.js", "scripts": { - "start": "node node_modules/@lenra/app/dist/bin/app-lenra.js start", - "index": "node node_modules/@lenra/app/dist/bin/app-lenra.js index", + "start": "bun node_modules/@lenra/app/dist/bin/app-lenra.js start", + "index": "bun node_modules/@lenra/app/dist/bin/app-lenra.js index", "postinstall": "npm run index", + "healthcheck": "bun src/healthcheck.js", "test": "echo \"Error: no test specified\" && exit 0" }, "keywords": [], "author": "Lenra", "license": "MIT", "dependencies": { - "@lenra/app": "^1.1.0", + "@lenra/app": "^1.2.0", "axios": "^1.5.1" + }, + "app-lenra": { + "app": "app.js" } } diff --git a/src/app.js b/src/app.js new file mode 100644 index 0000000..16ff7f8 --- /dev/null +++ b/src/app.js @@ -0,0 +1,42 @@ +import { serve, file, write } from "bun"; +import { File } from '@lenra/app/dist/lib/handler.js'; +import { App } from "@lenra/app"; + +const port = process.env.http_port || 3000; + +export default class BunServer extends App { + start() { + const app = this; + serve({ + port, + async fetch(req) { + try { + if (req.method === "POST") { + const payload = await req.json(); + const result = await app.handler.handleRequest(payload); + if (result instanceof File) { + return new Response(file(result.path)); + } + else if (result) { + return new Response(JSON.stringify(result)); + } + else { + return new Response(null); + } + } + return new Response(null, { + status: 400, + }); + } + catch (error) { + // TODO: Manage different errors depending on type + console.log("Error occured", error); + return new Response(error.message, { + status: 500, + }); + } + }, + }); + Bun.write("/tmp/.lock", "\n"); + } +} \ No newline at end of file diff --git a/src/classes/Game.js b/src/classes/Game.js index 599f025..9cfd55b 100644 --- a/src/classes/Game.js +++ b/src/classes/Game.js @@ -4,14 +4,12 @@ export class Game extends Data { /** * * @param {Number} appid - * @param {JSON} achievements * @param {string} img_icon_url * @param {string} name */ - constructor(appid, achievements, img_icon_url, name) { + constructor(appid, img_icon_url, name) { super(); this.appid = appid; - this.achievements = achievements; this.img_icon_url = img_icon_url; this.name = name; } diff --git a/src/classes/GameAchievement.js b/src/classes/GameAchievement.js new file mode 100644 index 0000000..f59d436 --- /dev/null +++ b/src/classes/GameAchievement.js @@ -0,0 +1,20 @@ +import { Data } from "@lenra/app"; + +export class GameAchievement extends Data { + /** + * + * @param {Number} appid + * @param {string} name + * @param {string} display_name + * @param {string} description + * @param {string} icon + */ + constructor(appid, name, display_name, description, icon) { + super(); + this.appid = appid; + this.name = name; + this.display_name = display_name; + this.description = description; + this.icon = icon; + } +} \ No newline at end of file diff --git a/src/classes/User.js b/src/classes/User.js index ff80f01..3eac9b9 100644 --- a/src/classes/User.js +++ b/src/classes/User.js @@ -8,13 +8,15 @@ export class User extends Data { * @param {string} webhookUuid * @param {string} avatar * @param {string} personaname + * @param {boolean} isInitialized */ - constructor(id, steamid, webhookUuid, avatar, personaname) { + constructor(id, steamid, webhookUuid, avatar, personaname, isInitialized = false) { super(); this.id = id; this.steamId = steamid; this.webhookUuid = webhookUuid; this.avatar = avatar; this.personaname = personaname; + this.isInitialized = isInitialized; } } \ No newline at end of file diff --git a/src/healthcheck.js b/src/healthcheck.js new file mode 100644 index 0000000..f96fb30 --- /dev/null +++ b/src/healthcheck.js @@ -0,0 +1,8 @@ +const args = process.argv.slice(2); + +fetch(args[0]).then(async response => { + if (response.ok) + console.log(await response.text()); + else + throw new Error(`Response not ok [${response.status}]: ${await response.text()}`); +}); \ No newline at end of file diff --git a/src/listeners/setAppId.js b/src/listeners/setAppId.js index 4e23141..0247608 100644 --- a/src/listeners/setAppId.js +++ b/src/listeners/setAppId.js @@ -1,7 +1,6 @@ 'use strict' import axios from "axios"; -import { System } from "../classes/System.js"; import { User } from "../classes/User.js"; /** @@ -21,11 +20,13 @@ export default async function (props, event, api) { console.log(error); }); - let [system] = await api.data.coll(System).find({}); - if (system == undefined) { - return await api.data.coll(System).createDoc(new System(event.value.appId)); - } + return {}; - system.appId = event.value.appId; - return await api.data.coll(System).updateDoc(system); + // let [system] = await api.data.coll(System).find({}); + // if (system == undefined) { + // return await api.data.coll(System).createDoc(new System(event.value.appId)); + // } + + // system.appId = event.value.appId; + // return await api.data.coll(System).updateDoc(system); } \ No newline at end of file diff --git a/src/services/steamService.js b/src/services/steamService.js index 500791a..e73f9f1 100644 --- a/src/services/steamService.js +++ b/src/services/steamService.js @@ -5,6 +5,8 @@ import gameService from '../services/gameService.js'; import userGameService from "./userGameService.js"; import { Game } from "../classes/Game.js"; import { UserGame } from "../classes/UserGame.js"; +import { GameAchievement } from "../classes/GameAchievement.js"; +import { User } from "../classes/User.js"; const steamAPIKey = "CA8F42C8DC798264FCF69D088BB2E918"; const steamAPIBaseUrl = "https://api.steampowered.com"; @@ -13,26 +15,42 @@ export default { getUserSteamIDFromVanity(vanityUrl) { return axios.get(`${steamAPIBaseUrl}/ISteamUser/ResolveVanityURL/v0001/?key=${steamAPIKey}&vanityurl=${vanityUrl}`).then((value) => value.data.response).catch((error) => console.log(error)); }, + /** + * + * @param {import("@lenra/app").Api} api + */ async getUserGames(api, userId, steamId) { // TODO: Don't create Game if appid already in DB but update it. let games = await axios.get(`${steamAPIBaseUrl}/IPlayerService/GetOwnedGames/v1/?key=${steamAPIKey}&steamid=${steamId}&include_appinfo=true&include_played_free_games=true`).then((value) => value.data.response).catch((error) => console.log(error)); - let promises = []; - games.games.forEach(game => { + + let count = 0; + for (let game of games.games) { if (game !== undefined) { - promises.push(new Promise(async () => { - // Add achievements to game - let achievements = (await this.getSchemaForGame(game.appid)).game?.availableGameStats?.achievements; + // Add achievements to game + let achievements = (await this.getSchemaForGame(game.appid)).game?.availableGameStats?.achievements; + + // Add game in db + await gameService.new(api, new Game(game.appid, game.img_icon_url, game.name)); + + if (achievements != undefined && achievements.length > 0) { + await api.data.coll(GameAchievement).insertMany(achievements?.map((achievement) => new GameAchievement(game.appid, achievement.name, achievement.display_name, achievement.description, achievement.icon))); + } + + // Add user game achievements and playtime in db + let unlockedAchievements = await this.getUserGameAchievements(steamId, game.appid); - // Add game in db - await gameService.new(api, new Game(game.appid, achievements ?? [], game.img_icon_url, game.name)); - // Add user game achievements and playtime in db - let unlockedAchievements = await this.getUserGameAchievements(steamId, game.appid); + await userGameService.new(api, new UserGame(game.appid, unlockedAchievements, userId, game.playtime_forever)); + } + count++; - await userGameService.new(api, new UserGame(game.appid, unlockedAchievements, userId, game.playtime_forever)); - }).catch((error) => console.log(error))); + if (count >= 1) { + break; } - }); - return await Promise.all(promises); + } + + await api.data.coll(User).updateDoc({ id: userId, isInitialized: true }); + + return {}; }, async getUserGameAchievements(steamId, gameId) { // Get user achievements (unlocked & locked) diff --git a/src/views/gameList.js b/src/views/gameList.js index 7aff365..5047e2d 100644 --- a/src/views/gameList.js +++ b/src/views/gameList.js @@ -8,13 +8,8 @@ export default async function (userGames, props) { userGames.sort(function (a, b) { return b.playtimeForever - a.playtimeForever; }); - userGames = paginate(userGames, 10, 1) return Flex(userGames.map(function (userGame) { return View("gameCard").props(userGame).find(DataApi.collectionName(Game), { appid: userGame.appid }); })).direction("vertical").scroll(true).spacing(8) } - -function paginate(array, page_size, page_number) { - return array.slice((page_number - 1) * page_size, page_number * page_size); -} diff --git a/src/views/homePage.js b/src/views/homePage.js index 9b37858..ed6e683 100644 --- a/src/views/homePage.js +++ b/src/views/homePage.js @@ -5,6 +5,7 @@ import { UserGame } from '../classes/UserGame.js'; import { DataApi } from '@lenra/app'; export default async function ([user], props, context) { + console.log(user); return Container( Flex( [ @@ -36,11 +37,12 @@ export default async function ([user], props, context) { ).maxWidth(600), // `/apps//webhooks/${user.webhookUuid}` // Container(TextField(`{ "userId": "${user.id}", "steamId": "${user.steamId}" }`)).maxWidth(600), - Flexible( + user.isInitialized ? Flexible( Container( - View("gameList").find(DataApi.collectionName(UserGame), { user: "@me" }), + View("gameList").find(DataApi.collectionName(UserGame), { query: { user: "@me" }, limit: 10, sort: { playtimeForever: -1 } }), ).maxWidth(600).maxHeight(600) - ) + ) : Text("We are currently loading your games, please wait for a couple of minutes.").style({ fontSize: 16, fontWeight: 'bold', color: 0xFFaaabad }), + ] ).direction("vertical") .mainAxisAlignment('spaceAround') diff --git a/src/views/unlockedAchievements.js b/src/views/unlockedAchievements.js index 292fecb..9f86d9b 100644 --- a/src/views/unlockedAchievements.js +++ b/src/views/unlockedAchievements.js @@ -3,7 +3,7 @@ import { Flex, Actionable, Icon, Text, View, Image, Container } from '@lenra/app'; export default async function ([userGame], game, _context) { - let unlockedAchievements = game.achievements.filter((achievement) => { + let unlockedAchievements = game.achievements?.filter((achievement) => { return userGame.achieved.some(achieved => achieved.name == achievement.name); }); @@ -12,7 +12,7 @@ export default async function ([userGame], game, _context) { // userGame.achieved.map((achievement) => { // return Text(achievement); // }) - unlockedAchievements.map((achievement) => { + unlockedAchievements?.map((achievement) => { return Container( Flex([ Image(achievement.icon),