Compare commits

...

11 Commits
v4.1.9 ... v4

Author SHA1 Message Date
Darkangeel_hd 6c44d5a712 Fixed getImages urls
No more "https:https://"
Will this work tomorrow, i don't know
2 years ago
Darkangeel_hd cef7574083 Minor updates
Changed PromoVideos redis keyname, using mal_id now
Changed schedule key TTL from 2 to 6 hours
2 years ago
Darkangeel_hd 7c6307cb1e Expire getRelatedMAL_* faster
TTL set to 1h
Also, forgot to mention on last commit that we changed the key name to a more friendly one, using the mal_id now.
As the relation between mal_id and its content is 1:1 collisions are not possible
That way is easier to identify on the db
2 years ago
Darkangeel_hd 58ac761098 Reimplemented getRelatedAnimesMAL
Reimplemented getRelatedAnimesMAL using jikan v4 and aruppi DB
what a pain in the ass was this one...
2 years ago
Darkangeel_hd 3a633b2ff2 Migrating to jikan v4
moved v3 endpoints to jikan v4
Quick fixes, will review later (as in between a day and 2 years later UwU)
2 years ago
dependabot[bot] e39bb486b0 Bump http-cache-semantics from 4.1.0 to 4.1.1
Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/kornelski/http-cache-semantics/releases)
- [Commits](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: http-cache-semantics
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2 years ago
dependabot[bot] 189a5bfb79 Bump mongoose from 5.13.13 to 5.13.15
Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.13.13 to 5.13.15.
- [Release notes](https://github.com/Automattic/mongoose/releases)
- [Changelog](https://github.com/Automattic/mongoose/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Automattic/mongoose/compare/5.13.13...5.13.15)

---
updated-dependencies:
- dependency-name: mongoose
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2 years ago
dependabot[bot] df30fd785e Bump json5 from 1.0.1 to 1.0.2
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2 years ago
dependabot[bot] 656d4ce1ba Bump express from 4.17.1 to 4.17.3
Bumps [express](https://github.com/expressjs/express) from 4.17.1 to 4.17.3.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.1...4.17.3)

---
updated-dependencies:
- dependency-name: express
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2 years ago
dependabot[bot] a90e522c21 Bump minimatch from 3.0.4 to 3.1.2
Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2.
- [Release notes](https://github.com/isaacs/minimatch/releases)
- [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2 years ago
Darkangeel_hd faf0afee8c Updated utils/requestCall
Added new options to spoof user agent
New Aruppi APi user agent
Adapt relevant code to new funcionality

fixed line break on urls.ts
3 years ago

@ -1,4 +1,4 @@
# **Aruppi API** (v4.1.8)
# **Aruppi API** (v4.2.2)
> This API has everything about Japan, from anime, music, radio, images, videos ... to japanese culture
>

@ -1,6 +1,6 @@
{
"name": "aruppi",
"version": "4.1.9",
"version": "4.2.2",
"description": "Aruppi is a custom API to obtain data from the Japanese culture for the mobile app",
"main": "./src/api/api.ts",
"scripts": {
@ -54,11 +54,11 @@
"compose-middleware": "^5.0.1",
"cors": "^2.8.5",
"dotenv": "^8.2.0",
"express": "^4.17.1",
"express": "^4.17.3",
"got": "^11.8.5",
"helmet": "^4.5.0",
"mongodb": "^3.6.6",
"mongoose": "^5.12.5",
"mongoose": "^5.13.15",
"redis": "^3.1.2",
"rss-parser": "^3.12.0",
"tough-cookie": "^4.0.0",

@ -81,7 +81,7 @@ interface Movie {
export default class AnimeController {
async schedule(req: Request, res: Response, next: NextFunction) {
const { day } = req.params;
let data: any;
let info: any;
try {
if (redisClient.connected) {
@ -96,7 +96,7 @@ export default class AnimeController {
}
}
data = await requestGot(`${urls.BASE_JIKAN}schedule/${day}`, {
info = await requestGot(`${urls.BASE_JIKAN}schedules?filter=${day}`, {
parse: true,
scrapy: false,
});
@ -104,10 +104,10 @@ export default class AnimeController {
return next(err);
}
const animeList: Schedule[] = data[day].map((item: Schedule) => ({
title: item.title,
const animeList: Schedule[] = info.data.map((item: any) => ({
title: item.titles.find((x: { type: string; }) => x.type === "Default").title,
malid: item.mal_id,
image: item.image_url,
image: item.images.jpg.image_url,
}));
if (animeList.length > 0) {
@ -119,11 +119,11 @@ export default class AnimeController {
JSON.stringify({ day: animeList }),
);
/* After 24hrs expire the key. */
/* After 6hrs expire the key. */
redisClient.expireat(
redisClient.expire(
`schedule_${hashStringMd5(day)}`,
parseInt(`${+new Date() / 1000}`, 10) + 7200,
+ 21600,
);
}
@ -137,7 +137,7 @@ export default class AnimeController {
async top(req: Request, res: Response, next: NextFunction) {
const { type, subtype, page } = req.params;
let data: any;
let info: any;
try {
if (redisClient.connected) {
@ -161,12 +161,12 @@ export default class AnimeController {
}
if (subtype !== undefined) {
data = await requestGot(
`${urls.BASE_JIKAN}top/${type}/${page}/${subtype}`,
info = await requestGot(
`${urls.BASE_JIKAN}top/${type}?filter=${subtype}&page=${page}`,
{ parse: true, scrapy: false },
);
} else {
data = await requestGot(`${urls.BASE_JIKAN}top/${type}/${page}`, {
info = await requestGot(`${urls.BASE_JIKAN}top/${type}?page=${page}`, {
parse: true,
scrapy: false,
});
@ -175,11 +175,12 @@ export default class AnimeController {
return next(err);
}
const top: Top[] = data.top.map((item: Top) => ({
rank: item.rank,
title: item.title,
const top: Top[] = info.data.map((item: any, index: number) => ({
// A little hacky way to fix null ranks
rank: item.rank || index + 1 + (info.pagination.current_page-1)*info.pagination.items.per_page,
title: item.titles.find((x: { type: string; }) => x.type === "Default").title,
url: item.url,
image_url: item.image_url,
image_url: item.images.jpg.image_url,
type: type,
subtype: subtype,
page: page,
@ -229,6 +230,7 @@ export default class AnimeController {
data = await requestGot(`${urls.BASE_ANIMEFLV}api/animes/list`, {
parse: true,
scrapy: false,
spoof: true,
});
} catch (err) {
return next(err);

@ -104,7 +104,7 @@ export default class DirectoryController {
async getSeason(req: Request, res: Response, next: NextFunction) {
const { year, type } = req.params;
let data: any;
let info: any;
try {
if (redisClient.connected) {
@ -119,7 +119,7 @@ export default class DirectoryController {
}
}
data = await requestGot(`${urls.BASE_JIKAN}season/${year}/${type}`, {
info = await requestGot(`${urls.BASE_JIKAN}seasons/${year}/${type}`, {
scrapy: false,
parse: true,
});
@ -127,10 +127,10 @@ export default class DirectoryController {
return next(err);
}
const season: TypeAnime[] = data.anime.map((item: any) => {
const season: TypeAnime[] = info.data.map((item: any) => {
return {
title: item.title,
image: item.image_url,
title: item.titles.find((x: { type: string; }) => x.type === "Default").title,
image: item.images.jpg.image_url,
genres: item.genres.map((genre: any) => genre.name),
};
});
@ -161,7 +161,7 @@ export default class DirectoryController {
}
async allSeasons(req: Request, res: Response, next: NextFunction) {
let data: any;
let info: any;
try {
if (redisClient.connected) {
@ -176,7 +176,7 @@ export default class DirectoryController {
}
}
data = await requestGot(`${urls.BASE_JIKAN}season/archive`, {
info = await requestGot(`${urls.BASE_JIKAN}seasons`, {
parse: true,
scrapy: false,
});
@ -184,7 +184,7 @@ export default class DirectoryController {
return next(err);
}
const archive: Archive[] = data.archive.map((item: any) => {
const archive: Archive[] = info.data.map((item: any) => {
return {
year: item.year,
seasons: item.seasons,
@ -215,7 +215,7 @@ export default class DirectoryController {
}
async laterSeasons(req: Request, res: Response, next: NextFunction) {
let data: any;
let info: any;
try {
if (redisClient.connected) {
@ -230,7 +230,7 @@ export default class DirectoryController {
}
}
data = await requestGot(`${urls.BASE_JIKAN}season/later`, {
info = await requestGot(`${urls.BASE_JIKAN}seasons/upcoming`, {
parse: true,
scrapy: false,
});
@ -238,10 +238,10 @@ export default class DirectoryController {
return next(err);
}
const future: Season[] = data.anime.map((item: any) => {
const future: Season[] = info.data.map((item: any) => {
return {
title: item.title,
image: item.image_url,
title: item.titles.find((x: { type: string; }) => x.type === "Default").title,
image: item.images.jpg.image_url,
malink: item.url,
};
});
@ -294,6 +294,7 @@ export default class DirectoryController {
const extraInfo: any = await animeExtraInfo(resultQuery!.mal_id);
resultAnime = {
//aruppi_key: hashStringMd5(title),
title: resultQuery?.title,
poster: resultQuery?.poster,
synopsis: resultQuery?.description,

@ -234,7 +234,7 @@ export default class UtilsController {
`${urls.BASE_QWANT}t=images&q=${encodeURIComponent(
title,
)}&count=51&locale=es_ES&safesearch=1`,
{ scrapy: false, parse: true },
{ scrapy: false, parse: true, spoof: true, },
);
} catch (err) {
return next(err);
@ -243,8 +243,8 @@ export default class UtilsController {
const results: any[] = data.data.result.items.map((item: any) => {
return {
type: item.thumb_type,
thumbnail: `https:${item.thumbnail}`,
fullsize: `https:${item.media_fullsize}`,
thumbnail: `${item.thumbnail}`,
fullsize: `${item.media_fullsize}`,
};
});
@ -637,6 +637,7 @@ export default class UtilsController {
data = await requestGot(`${urls.BASE_THEMEMOE}roulette`, {
parse: true,
scrapy: false,
spoof: true,
});
} catch (err) {
return next(err);

@ -26,7 +26,7 @@ routes.get('/api/v4/', (req: Request, res: Response) => {
res.json({
message: 'Aruppi /api - 🎏',
author: 'Jéluchu',
version: '4.1.8',
version: '4.2.2',
credits: 'The bitch loves /apis that offers data to Aruppi App',
entries: [
{

@ -285,6 +285,7 @@ async function redditocall(href: string) {
const resp = await requestGot(urls.REDDIT_ANIMETHEMES + href + '.json', {
parse: true,
scrapy: false,
spoof: true,
});
return cheerio.load(getHTML(resp.data.content_html));

@ -1,28 +1,52 @@
import got from 'got';
import cheerio from 'cheerio';
import { CookieJar } from 'tough-cookie';
// @ts-ignore
import * as got_pjson from 'got/package.json'
const pjson = require('../../package.json');
const cookieJar = new CookieJar();
const aruppi_options: any = {
cookieJar,
'headers': {
'user-agent': `Aruppi-API/${pjson.version} ${got_pjson.name}/${got_pjson.version}`,
'x-client': 'aruppi-api'
},
};
interface Options {
scrapy: boolean;
parse: boolean;
scrapy?: boolean,
parse?: boolean,
spoof?: boolean
}
export const requestGot = async (
url: string,
options?: Options,
): Promise<any> => {
if (options !== undefined) {
const got_options: any = {...got.defaults.options, ...aruppi_options}
if (options) {
if (options.spoof != null) {
got_options.headers["user-agent"] = "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:71.0) Gecko/20100101 Firefox/69.0";
delete got_options.headers['x-client'];
if (!options.spoof)
got_options.headers['user-agent'] = got.defaults.options.headers['user-agent'];
} else if (process.env.ALPI_KEY && (new URL(url)).hostname.match(/\.jeluchu\.xyz$/)) {
got_options.headers['x-aruppi-key'] = process.env.ALPI_KEY;
}
if (options.scrapy) {
const response = await got(url, { cookieJar });
return await cheerio.load(response.body);
const response = await got(url, got_options);
return cheerio.load(response.body);
}
if (options.parse) {
return await got(url, { cookieJar }).json();
got_options.responseType = 'json';
const response = await got(url, got_options);
return response.body;
}
} else {
return await got.get(url, { cookieJar });
}
const response = await got.get(url, got_options);
return response;
};

@ -7,9 +7,8 @@ export default {
BASE_ANIMEFLV_JELU: 'https://aruppi.jeluchu.xyz/apis/animeflv/v1/',
BASE_YOUTUBE: 'https://aruppi.jeluchu.xyz/api/Youtube/?channelId=',
BASE_YOUTUBE_PLAYLIST: 'https://aruppi.jeluchu.xyz/api/Youtube/playlist/?playlistId=',
BASE_JIKAN: 'https://aruppi.jeluchu.xyz/apis/jikan/v3/',
BASE_IVOOX:
'https://www.ivoox.com/podcast-anitakume_fg_f1660716_filtro_1.xml',
BASE_JIKAN: 'https://aruppi.jeluchu.xyz/apis/jikan/v4/',
BASE_IVOOX: 'https://www.ivoox.com/podcast-anitakume_fg_f1660716_filtro_1.xml',
BASE_KUDASAI: 'https://somoskudasai.com/feed/',
BASE_RAMENPARADOS: 'https://ramenparados.com/category/noticias/anime/feed/',
BASE_CRUNCHYROLL: 'https://www.crunchyroll.com/newsrss?lang=esES',

@ -4,6 +4,7 @@ import AnimeModel, {Anime} from '../database/models/anime.model';
import crypto from 'crypto';
import util from 'util';
import {redisClient} from '../database/connection';
import { stderr } from 'process';
// @ts-ignore
redisClient.get = util.promisify(redisClient.get);
@ -34,7 +35,7 @@ interface RelatedAnime {
}
export const animeExtraInfo = async (mal_id: number) => {
let data: any;
let info: any;
let broadcast: any;
const airDay: any = {
@ -68,40 +69,40 @@ export const animeExtraInfo = async (mal_id: number) => {
}
}
data = await requestGot(`${urls.BASE_JIKAN}anime/${mal_id}`, {
info = await requestGot(`${urls.BASE_JIKAN}anime/${mal_id}`, {
parse: true,
scrapy: false,
});
if (data.broadcast) {
broadcast = data.broadcast.split('at')[0].trim().toLowerCase() || null;
if (info.data.airing) {
broadcast = info.data.broadcast.string.split('at')[0].trim().toLowerCase() || null;
}
} catch (err) {
return err;
}
if (airDay.hasOwnProperty(broadcast)) {
data.broadcast = airDay[broadcast];
info.data.broadcast = airDay[broadcast];
} else {
data.broadcast = null;
info.data.broadcast = null;
}
const formattedObject: any = {
titleJapanese: data.title_japanese,
source: data.source,
totalEpisodes: data.episodes,
titleJapanese: info.data.titles.find((x: { type: string; }) => x.type === "Default").title,
source: info.data.source,
totalEpisodes: info.data.episodes,
aired: {
from: data.aired.from,
to: data.aired.to,
from: info.data.aired.from,
to: info.data.aired.to,
},
duration: data.duration.split('per')[0],
rank: data.rank,
broadcast: data.broadcast,
producers: data.producers.map((item: any) => item.name) || null,
licensors: data.licensors.map((item: any) => item.name) || null,
studios: data.studios.map((item: any) => item.name) || null,
openingThemes: data.opening_themes || null,
endingThemes: data.ending_themes || null,
duration: info.data.duration.split('per')[0],
rank: info.data.rank,
broadcast: info.data.broadcast,
producers: info.data.producers.map((item: any) => item.name) || null,
licensors: info.data.licensors.map((item: any) => item.name) || null,
studios: info.data.studios.map((item: any) => item.name) || null,
openingThemes: info.data.opening_themes || null,
endingThemes: info.data.ending_themes || null,
};
if (formattedObject) {
@ -128,12 +129,12 @@ export const animeExtraInfo = async (mal_id: number) => {
};
export const getAnimeVideoPromo = async (mal_id: number) => {
let data: any;
let info: any;
try {
if (redisClient.connected) {
const resultQueryRedis: any = await redisClient.get(
`promoInfo_${hashStringMd5(`${mal_id}`)}`,
`getMALpromoInfo_${mal_id}`,
);
if (resultQueryRedis) {
@ -143,7 +144,7 @@ export const getAnimeVideoPromo = async (mal_id: number) => {
}
}
data = await requestGot(`${urls.BASE_JIKAN}anime/${mal_id}/videos`, {
info = await requestGot(`${urls.BASE_JIKAN}anime/${mal_id}/videos`, {
parse: true,
scrapy: false,
});
@ -151,11 +152,11 @@ export const getAnimeVideoPromo = async (mal_id: number) => {
return err;
}
const promo: Promo[] = data.promo.map((item: Promo) => {
const promo: Promo[] = info.data.promo.map((item: any) => {
return {
title: item.title,
previewImage: item.image_url,
videoURL: item.video_url,
previewImage: item.trailer.images.image_url,
videoURL: item.trailer.url,
};
});
@ -164,15 +165,15 @@ export const getAnimeVideoPromo = async (mal_id: number) => {
/* Set the key in the redis cache. */
redisClient.set(
`promoInfo_${hashStringMd5(`${mal_id}`)}`,
`getMALpromoInfo_${mal_id}`,
JSON.stringify(promo),
);
/* After 24hrs expire the key. */
/* After 2hrs expire the key. */
redisClient.expireat(
`promoInfo_${hashStringMd5(`${mal_id}`)}`,
parseInt(`${+new Date() / 1000}`, 10) + 7200,
redisClient.expire(
`getMALpromoInfo_${mal_id}`,
7200,
);
}
@ -183,7 +184,7 @@ export const getAnimeVideoPromo = async (mal_id: number) => {
};
export const getAnimeCharacters = async (mal_id: number) => {
let data: any;
let info: any;
try {
if (redisClient.connected) {
@ -198,19 +199,19 @@ export const getAnimeCharacters = async (mal_id: number) => {
}
}
data = await requestGot(
`${urls.BASE_JIKAN}anime/${mal_id}/characters_staff`,
info = await requestGot(
`${urls.BASE_JIKAN}anime/${mal_id}/characters`,
{parse: true, scrapy: false},
);
} catch (err) {
return err;
}
const characters: Character[] = data.characters.map((item: any) => {
const characters: Character[] = info.data.map((item: any) => {
return {
id: item.mal_id,
name: item.name,
image: item.image_url,
id: item.character.mal_id,
name: item.character.name,
image: item.character.images.jpg.image_url,
role: item.role,
};
});
@ -262,12 +263,12 @@ const getPosterAndType = async (
};
export const getRelatedAnimesMAL = async (mal_id: number) => {
let $: cheerio.Root;
let info: any;
try {
if (redisClient.connected) {
const resultQueryRedis: any = await redisClient.get(
`getRelatedMAL_${hashStringMd5(`${mal_id}`)}`,
`getRelatedMAL_${mal_id}`,
);
if (resultQueryRedis) {
@ -277,41 +278,31 @@ export const getRelatedAnimesMAL = async (mal_id: number) => {
}
}
$ = await requestGot(`https://myanimelist.net/anime/${mal_id}`, {
parse: false,
scrapy: true,
info = await requestGot(`${urls.BASE_JIKAN}anime/${mal_id}/relations`, {
parse: true,
scrapy: false,
});
} catch (err) {
stderr.write(`Error on getRelatedAnimesMAL http on mal_id: ${mal_id}\n`)
return err;
}
let listRelated: any = {};
let relatedAnimes: RelatedAnime[] = [];
if ($('table.anime_detail_related_anime').length > 0) {
$('table.anime_detail_related_anime')
.find('tbody tr')
.each((index: number, element: any) => {
if ($(element).find('td').eq(0).text() !== 'Adaptation:') {
listRelated[$(element).find('td').eq(1).text()] = $(element)
.find('td')
.children('a')
.attr('href');
}
const relatedAnimes = []
for (const relation_entry of info.data) {
for (const entry of relation_entry.entry){
if (entry.type != "anime")
break;
const queryRes: Anime | null = await AnimeModel.findOne({
mal_id: {$eq: entry.mal_id}
});
if (queryRes == null)
break
for (const related in listRelated) {
let posterUrl: any = await getPosterAndType(
undefined,
listRelated[related].split('/')[2],
);
if (posterUrl !== '') {
relatedAnimes.push({
title: related,
type: posterUrl[1],
poster: posterUrl[0],
});
title: queryRes!.title,
type: queryRes?.type,
poster: queryRes?.poster
})
}
}
@ -320,23 +311,20 @@ export const getRelatedAnimesMAL = async (mal_id: number) => {
/* Set the key in the redis cache. */
redisClient.set(
`getRelatedMAL_${hashStringMd5(`${mal_id}`)}`,
`getRelatedMAL_${mal_id}`,
JSON.stringify(relatedAnimes),
);
/* After 24hrs expire the key. */
/* After 1hr expire the key. */
redisClient.expireat(
`getRelatedMAL_${hashStringMd5(`${mal_id}`)}`,
parseInt(`${+new Date() / 1000}`, 10) + 7200,
redisClient.expire(
`getRelatedMAL_${mal_id}`,
3600,
);
}
return relatedAnimes;
}
} else {
return [];
}
};
export const jkanimeInfo = async (id: string | undefined, mal_id: number) => {
@ -606,6 +594,7 @@ export const tioanimeInfo = async (id: string | undefined, mal_id: number) => {
$ = await requestGot(`${urls.BASE_TIOANIME}anime/${id}`, {
scrapy: true,
parse: false,
spoof: true,
});
/* Extra info of the anime */
@ -785,6 +774,7 @@ export const videoServersTioAnime = async (id: string) => {
$ = await requestGot(`${urls.BASE_TIOANIME}${id}`, {
scrapy: true,
parse: false,
spoof: true,
});
} catch (err) {
return err;
@ -941,7 +931,7 @@ async function desuServerUrl(url: string) {
}
}
$ = await requestGot(url, {scrapy: true, parse: false});
$ = await requestGot(url, {scrapy: true, parse: false, spoof: true});
} catch (err) {
return err;
}
@ -1033,7 +1023,7 @@ export function getThemes(themes: any[]) {
}
export const imageUrlToBase64 = async (url: string) => {
let img: any = await requestGot(url);
let img: any = await requestGot(url,{spoof:false});
return img.rawBody.toString('base64');
};

@ -268,12 +268,12 @@
"@typescript-eslint/types" "4.33.0"
eslint-visitor-keys "^2.0.0"
accepts@~1.3.7:
version "1.3.7"
resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"
accepts@~1.3.8:
version "1.3.8"
resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
dependencies:
mime-types "~2.1.24"
negotiator "0.6.2"
mime-types "~2.1.34"
negotiator "0.6.3"
acorn-jsx@^5.3.1:
version "5.3.2"
@ -374,7 +374,7 @@ astral-regex@^2.0.0:
balanced-match@^1.0.0:
version "1.0.2"
resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
binary-extensions@^2.0.0:
version "2.2.0"
@ -391,20 +391,20 @@ bluebird@3.5.1:
version "3.5.1"
resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"
body-parser@1.19.0, body-parser@^1.19.0:
version "1.19.0"
resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"
body-parser@1.19.2, body-parser@^1.19.0:
version "1.19.2"
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e"
dependencies:
bytes "3.1.0"
bytes "3.1.2"
content-type "~1.0.4"
debug "2.6.9"
depd "~1.1.2"
http-errors "1.7.2"
http-errors "1.8.1"
iconv-lite "0.4.24"
on-finished "~2.3.0"
qs "6.7.0"
raw-body "2.4.0"
type-is "~1.6.17"
qs "6.9.7"
raw-body "2.4.3"
type-is "~1.6.18"
boolbase@^1.0.0:
version "1.0.0"
@ -412,7 +412,7 @@ boolbase@^1.0.0:
brace-expansion@^1.1.7:
version "1.1.11"
resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
dependencies:
balanced-match "^1.0.0"
concat-map "0.0.1"
@ -431,9 +431,9 @@ buffer-from@^1.0.0:
version "1.1.2"
resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
bytes@3.1.0:
version "3.1.0"
resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"
bytes@3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
cacheable-lookup@^5.0.3:
version "5.0.4"
@ -549,13 +549,13 @@ compose-middleware@^5.0.1:
concat-map@0.0.1:
version "0.0.1"
resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
content-disposition@0.5.3:
version "0.5.3"
resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"
content-disposition@0.5.4:
version "0.5.4"
resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
dependencies:
safe-buffer "5.1.2"
safe-buffer "5.2.1"
content-type@~1.0.4:
version "1.0.4"
@ -565,9 +565,9 @@ cookie-signature@1.0.6:
version "1.0.6"
resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
cookie@0.4.0:
version "0.4.0"
resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"
cookie@0.4.2:
version "0.4.2"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
core-util-is@~1.0.0:
version "1.0.3"
@ -948,16 +948,16 @@ etag@~1.8.1:
version "1.8.1"
resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"
express@^4.17.1:
version "4.17.1"
resolved "https://registry.npmjs.org/express/-/express-4.17.1.tgz"
express@^4.17.3:
version "4.17.3"
resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1"
dependencies:
accepts "~1.3.7"
accepts "~1.3.8"
array-flatten "1.1.1"
body-parser "1.19.0"
content-disposition "0.5.3"
body-parser "1.19.2"
content-disposition "0.5.4"
content-type "~1.0.4"
cookie "0.4.0"
cookie "0.4.2"
cookie-signature "1.0.6"
debug "2.6.9"
depd "~1.1.2"
@ -971,13 +971,13 @@ express@^4.17.1:
on-finished "~2.3.0"
parseurl "~1.3.3"
path-to-regexp "0.1.7"
proxy-addr "~2.0.5"
qs "6.7.0"
proxy-addr "~2.0.7"
qs "6.9.7"
range-parser "~1.2.1"
safe-buffer "5.1.2"
send "0.17.1"
serve-static "1.14.1"
setprototypeof "1.1.1"
safe-buffer "5.2.1"
send "0.17.2"
serve-static "1.14.2"
setprototypeof "1.2.0"
statuses "~1.5.0"
type-is "~1.6.18"
utils-merge "1.0.1"
@ -1193,18 +1193,18 @@ htmlparser2@^6.1.0:
entities "^2.0.0"
http-cache-semantics@^4.0.0:
version "4.1.0"
resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"
version "4.1.1"
resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
http-errors@1.7.2, http-errors@~1.7.2:
version "1.7.2"
resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"
http-errors@1.8.1:
version "1.8.1"
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
dependencies:
depd "~1.1.2"
inherits "2.0.3"
setprototypeof "1.1.1"
inherits "2.0.4"
setprototypeof "1.2.0"
statuses ">= 1.5.0 < 2"
toidentifier "1.0.0"
toidentifier "1.0.1"
http2-wrapper@^1.0.0-beta.5.2:
version "1.0.3"
@ -1245,10 +1245,14 @@ inflight@^1.0.4:
once "^1.3.0"
wrappy "1"
inherits@2, inherits@2.0.3, inherits@~2.0.3:
inherits@2, inherits@~2.0.3:
version "2.0.3"
resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
inherits@2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
internal-slot@^1.0.3:
version "1.0.3"
resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"
@ -1389,8 +1393,8 @@ json-stable-stringify-without-jsonify@^1.0.1:
resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
json5@^1.0.1:
version "1.0.1"
resolved "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"
version "1.0.2"
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
dependencies:
minimist "^1.2.0"
@ -1471,12 +1475,22 @@ mime-db@1.51.0:
version "1.51.0"
resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"
mime-db@1.52.0:
version "1.52.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
mime-types@~2.1.24:
version "2.1.34"
resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"
dependencies:
mime-db "1.51.0"
mime-types@~2.1.34:
version "2.1.35"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
dependencies:
mime-db "1.52.0"
mime@1.6.0:
version "1.6.0"
resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"
@ -1490,14 +1504,14 @@ mimic-response@^3.1.0:
resolved "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz"
minimatch@^3.0.4:
version "3.0.4"
resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
version "3.1.2"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
dependencies:
brace-expansion "^1.1.7"
minimist@^1.2.0, minimist@^1.2.5:
version "1.2.6"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
version "1.2.7"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
mkdirp@^1.0.4:
version "1.0.4"
@ -1519,9 +1533,9 @@ mongoose-legacy-pluralize@1.0.2:
version "1.0.2"
resolved "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz"
mongoose@^5.12.5:
version "5.13.13"
resolved "https://registry.npmjs.org/mongoose/-/mongoose-5.13.13.tgz"
mongoose@^5.13.15:
version "5.13.15"
resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.13.15.tgz#ba2cd0f22c1a5dd9ae15aaf6b10f03c59a4202dd"
dependencies:
"@types/bson" "1.x || 4.0.x"
"@types/mongodb" "^3.5.27"
@ -1556,21 +1570,21 @@ ms@2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
ms@2.1.1:
version "2.1.1"
resolved "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"
ms@2.1.2, ms@^2.1.1:
version "2.1.2"
resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
ms@2.1.3:
version "2.1.3"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
natural-compare@^1.4.0:
version "1.4.0"
resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
negotiator@0.6.2:
version "0.6.2"
resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"
negotiator@0.6.3:
version "0.6.3"
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
normalize-path@^3.0.0, normalize-path@~3.0.0:
version "3.0.0"
@ -1744,9 +1758,9 @@ progress@^2.0.0:
version "2.0.3"
resolved "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"
proxy-addr@~2.0.5:
proxy-addr@~2.0.7:
version "2.0.7"
resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
dependencies:
forwarded "0.2.0"
ipaddr.js "1.9.1"
@ -1766,9 +1780,9 @@ punycode@^2.1.0, punycode@^2.1.1:
version "2.1.1"
resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
qs@6.7.0:
version "6.7.0"
resolved "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"
qs@6.9.7:
version "6.9.7"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
queue-microtask@^1.2.2:
version "1.2.3"
@ -1782,12 +1796,12 @@ range-parser@~1.2.1:
version "1.2.1"
resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"
raw-body@2.4.0:
version "2.4.0"
resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"
raw-body@2.4.3:
version "2.4.3"
resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c"
dependencies:
bytes "3.1.0"
http-errors "1.7.2"
bytes "3.1.2"
http-errors "1.8.1"
iconv-lite "0.4.24"
unpipe "1.0.0"
@ -1898,11 +1912,11 @@ run-parallel@^1.1.9:
dependencies:
queue-microtask "^1.2.2"
safe-buffer@5.1.2, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2"
resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
safe-buffer@5.2.1:
safe-buffer@5.2.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2:
version "5.2.1"
resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
@ -1926,9 +1940,9 @@ semver@^7.2.1, semver@^7.3.5:
dependencies:
lru-cache "^6.0.0"
send@0.17.1:
version "0.17.1"
resolved "https://registry.npmjs.org/send/-/send-0.17.1.tgz"
send@0.17.2:
version "0.17.2"
resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
dependencies:
debug "2.6.9"
depd "~1.1.2"
@ -1937,25 +1951,25 @@ send@0.17.1:
escape-html "~1.0.3"
etag "~1.8.1"
fresh "0.5.2"
http-errors "~1.7.2"
http-errors "1.8.1"
mime "1.6.0"
ms "2.1.1"
ms "2.1.3"
on-finished "~2.3.0"
range-parser "~1.2.1"
statuses "~1.5.0"
serve-static@1.14.1:
version "1.14.1"
resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"
serve-static@1.14.2:
version "1.14.2"
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
dependencies:
encodeurl "~1.0.2"
escape-html "~1.0.3"
parseurl "~1.3.3"
send "0.17.1"
send "0.17.2"
setprototypeof@1.1.1:
version "1.1.1"
resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"
setprototypeof@1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
shebang-command@^2.0.0:
version "2.0.0"
@ -2098,9 +2112,9 @@ to-regex-range@^5.0.1:
dependencies:
is-number "^7.0.0"
toidentifier@1.0.0:
version "1.0.0"
resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"
toidentifier@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
tough-cookie@^4.0.0:
version "4.0.0"
@ -2182,7 +2196,7 @@ type-fest@^0.20.2:
version "0.20.2"
resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
type-is@~1.6.17, type-is@~1.6.18:
type-is@~1.6.18:
version "1.6.18"
resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"
dependencies:

Loading…
Cancel
Save