🔌 Socket + RabbitMQ setup for download-client touched folders/files

This commit is contained in:
2021-09-18 09:25:59 -07:00
parent 476a55614e
commit be43c163dc
13 changed files with 265 additions and 86 deletions

View File

@@ -34,7 +34,6 @@
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
"better-docs": "^2.3.2", "better-docs": "^2.3.2",
"calibre-opds": "^1.0.7", "calibre-opds": "^1.0.7",
"chokidar": "^3.5.2",
"comlink-loader": "^2.0.0", "comlink-loader": "^2.0.0",
"compromise": "^13.11.3", "compromise": "^13.11.3",
"compromise-dates": "^2.2.1", "compromise-dates": "^2.2.1",
@@ -56,6 +55,7 @@
"react-dom": "^17.0.1", "react-dom": "^17.0.1",
"react-fast-compare": "^3.2.0", "react-fast-compare": "^3.2.0",
"react-final-form": "^6.5.3", "react-final-form": "^6.5.3",
"react-lazylog": "^4.5.3",
"react-loader-spinner": "^4.0.0", "react-loader-spinner": "^4.0.0",
"react-notification-system": "^0.4.0", "react-notification-system": "^0.4.0",
"react-notification-system-redux": "^2.0.1", "react-notification-system-redux": "^2.0.1",
@@ -65,7 +65,7 @@
"react-window-dynamic-list": "^2.3.5", "react-window-dynamic-list": "^2.3.5",
"sharp": "^0.28.1", "sharp": "^0.28.1",
"socket.io-client": "^4.1.2", "socket.io-client": "^4.1.2",
"threetwo-ui-typings": "^1.0.3", "threetwo-ui-typings": "^1.0.5",
"voca": "^1.4.0", "voca": "^1.4.0",
"websocket": "^1.0.34", "websocket": "^1.0.34",
"ws": "^7.5.3", "ws": "^7.5.3",

View File

@@ -1,4 +1,5 @@
import axios from "axios"; import axios from "axios";
import { useContext } from "react";
import { IFolderData, IExtractedComicBookCoverFile } from "threetwo-ui-typings"; import { IFolderData, IExtractedComicBookCoverFile } from "threetwo-ui-typings";
import { API_BASE_URI, SOCKET_BASE_URI } from "../constants/endpoints"; import { API_BASE_URI, SOCKET_BASE_URI } from "../constants/endpoints";
import { import {
@@ -15,14 +16,8 @@ import {
} from "../constants/action-types"; } from "../constants/action-types";
import { refineQuery } from "../shared/utils/filenameparser.utils"; import { refineQuery } from "../shared/utils/filenameparser.utils";
import sortBy from "array-sort-by"; import sortBy from "array-sort-by";
import { io } from "socket.io-client"; import { success } from "react-notification-system-redux";
import { import { WebSocketContext } from "../context/socket/socket.context";
success,
error,
warning,
info,
removeAll,
} from "react-notification-system-redux";
export async function walkFolder(path: string): Promise<Array<IFolderData>> { export async function walkFolder(path: string): Promise<Array<IFolderData>> {
return axios return axios
@@ -51,24 +46,8 @@ export async function walkFolder(path: string): Promise<Array<IFolderData>> {
* @return {Promise<string>} HTML of the page * @return {Promise<string>} HTML of the page
*/ */
export const fetchComicBookMetadata = (options) => async (dispatch) => { export const fetchComicBookMetadata = (options) => async (dispatch) => {
const socket = io(SOCKET_BASE_URI, { const socket = useContext(WebSocketContext);
reconnectionDelayMax: 10000,
secure: false,
rejectUnauthorized: false,
});
socket.on("connect", () => {
console.log(`connect ${socket.id}`);
dispatch({
type: RMQ_SOCKET_CONNECTED,
isSocketConnected: true,
socketId: socket.id,
});
});
socket.on("disconnect", () => {
console.log(`disconnect`);
});
const extractionOptions = { const extractionOptions = {
sourceFolder: options,
extractTarget: "cover", extractTarget: "cover",
targetExtractionFolder: "./userdata/covers", targetExtractionFolder: "./userdata/covers",
extractionMode: "bulk", extractionMode: "bulk",
@@ -82,7 +61,7 @@ export const fetchComicBookMetadata = (options) => async (dispatch) => {
success({ success({
// uid: 'once-please', // you can specify your own uid if required // uid: 'once-please', // you can specify your own uid if required
title: "Import Started", title: "Import Started",
message: `${socket.id} connected. ${walkedFolders.length} comics scanned.`, message: `<span class="icon-text has-text-success"><i class="fas fa-plug"></i></span> Socket <span class="has-text-info">${socket.id}</span> connected. <strong>${walkedFolders.length}</strong> comics scanned.`,
dismissible: "click", dismissible: "click",
position: "tr", position: "tr",
autoDismiss: 0, autoDismiss: 0,

View File

@@ -28,6 +28,15 @@ $border-color: red;
.min { .min {
overflow: visible; overflow: visible;
margin: auto;
.tag__custom {
height: auto !important;
padding: 0.3rem;
white-space: unset !important;
width: 100%;
background-color: #effaf5;
color: #257953;
}
.tags { .tags {
display: inline; display: inline;
margin-right: 5px; margin-right: 5px;

View File

@@ -29,6 +29,19 @@ const style = {
}, },
tr: { tr: {
top: "40px", top: "40px",
right: "10px",
},
},
Title: {
DefaultStyle: {
fontSize: "14px",
margin: "0 0 5px 0",
padding: 0,
fontWeight: "bold",
},
success: {
color: "hsl(141, 71%, 48%)",
}, },
}, },
NotificationItem: { NotificationItem: {
@@ -36,7 +49,7 @@ const style = {
success: { success: {
// Applied to every notification, regardless of the notification level // Applied to every notification, regardless of the notification level
borderTop: "none", borderTop: "none",
backgroundColor: "none", backgroundColor: "#FFF",
borderRadius: "0.4rem", borderRadius: "0.4rem",
WebkitBoxShadow: "-7px 11px 25px -9px rgba(0, 0, 0, 0.3)", WebkitBoxShadow: "-7px 11px 25px -9px rgba(0, 0, 0, 0.3)",
MozBoxShadow: "-7px 11px 25px -9px rgba(0, 0, 0, 0.3)", MozBoxShadow: "-7px 11px 25px -9px rgba(0, 0, 0, 0.3)",
@@ -53,6 +66,7 @@ export const App = (): ReactElement => {
notifications={notifications} notifications={notifications}
style={style} style={style}
newOnTop={true} newOnTop={true}
allowHTML={true}
/> />
<Switch> <Switch>
<Route exact path="/"> <Route exact path="/">

View File

@@ -213,10 +213,26 @@ export const ComicDetail = ({}: ComicDetailProps): ReactElement => {
<dl> <dl>
<dt>Raw File Details</dt> <dt>Raw File Details</dt>
<dd>{props.data.containedIn}</dd> <dd>{props.data.containedIn}</dd>
<dd>{prettyBytes(props.data.fileSize)}</dd>
<dd>{props.data.path}</dd> <dd>{props.data.path}</dd>
<dd> <dd>
<span className="tag is-primary">{props.data.extension}</span> <div className="field is-grouped">
<div className="control">
<div className="tags has-addons">
<span className="tag">Size</span>
<span className="tag is-info is-light">
{prettyBytes(props.data.fileSize)}
</span>
</div>
</div>
<div className="control">
<div className="tags has-addons">
<span className="tag">Extension</span>
<span className="tag is-primary is-light">
{props.data.extension}
</span>
</div>
</div>
</div>
</dd> </dd>
</dl> </dl>
</div> </div>

View File

@@ -1,10 +1,12 @@
import React, { ReactElement, useCallback } from "react"; import React, { ReactElement, useCallback } from "react";
import { isNil, isUndefined } from "lodash"; import { isEmpty, isNil, isUndefined } from "lodash";
import { useSelector, useDispatch } from "react-redux"; import { useSelector, useDispatch } from "react-redux";
import { fetchComicBookMetadata } from "../actions/fileops.actions"; import { fetchComicBookMetadata } from "../actions/fileops.actions";
import { IFolderData } from "threetwo-ui-typings"; import { IFolderData } from "threetwo-ui-typings";
import { LazyLog, ScrollFollow } from "react-lazylog";
import DynamicList, { createCache } from "react-window-dynamic-list"; import DynamicList, { createCache } from "react-window-dynamic-list";
; import "react-loader-spinner/dist/loader/css/react-spinner-loader.css";
import Loader from "react-loader-spinner";
interface IProps { interface IProps {
matches?: unknown; matches?: unknown;
@@ -32,13 +34,27 @@ export const Import = (props: IProps): ReactElement => {
console.log(state); console.log(state);
return state.fileOps.isSocketConnected; return state.fileOps.isSocketConnected;
}); });
const importResults = useSelector(
(state: RootState) => state.fileOps.comicBookMetadata,
);
const IMSCallInProgress = useSelector(
(state: RootState) => state.fileOps.IMSCallInProgress,
);
const initiateImport = useCallback(() => { const initiateImport = useCallback(() => {
if (typeof props.path !== "undefined") { if (typeof props.path !== "undefined") {
console.log("asdasd"); console.log("asdasd");
dispatch(fetchComicBookMetadata(props.path)); dispatch(fetchComicBookMetadata(props.path));
} }
}, [dispatch]); }, [dispatch]);
const cache = createCache();
const renderRow = ({ index, style }) => (
<li className="is-size-7" style={style}>
<strong>{importResults[index].comicBookCoverMetadata.name} </strong>
<br />
{importResults[index].comicBookCoverMetadata.path}
<hr />
</li>
);
return ( return (
<div className="container"> <div className="container">
@@ -78,6 +94,37 @@ export const Import = (props: IProps): ReactElement => {
<span>Import and Tag</span> <span>Import and Tag</span>
</button> </button>
</p> </p>
{!isEmpty(importResults) ? (
<>
<h3>Import Results</h3>
<hr />
<ul>
<DynamicList
data={importResults}
cache={cache}
height={800}
width={"100%"}
lazyMeasurement={false}
>
{renderRow}
</DynamicList>
</ul>
</>
) : (
<div className="progress-indicator-container">
<div className="indicator">
<Loader
type="MutatingDots"
color="#CCC"
secondaryColor="#999"
height={100}
width={100}
visible={IMSCallInProgress}
/>
</div>
</div>
)}
</section> </section>
</div> </div>
); );

View File

@@ -0,0 +1,37 @@
import React, { createContext } from "react";
import io, { Socket } from "socket.io-client";
import { SOCKET_BASE_URI } from "../../constants/endpoints";
import { useDispatch } from "react-redux";
import { RMQ_SOCKET_CONNECTED } from "../../constants/action-types";
const WebSocketContext = createContext(null);
export const WebSocketProvider = ({ children }) => {
let socket: Socket;
let ws;
const dispatch = useDispatch();
if (!socket) {
socket = io(SOCKET_BASE_URI);
socket.on("connect", () => {
dispatch({
type: RMQ_SOCKET_CONNECTED,
isSocketConnected: true,
socketId: socket.id,
});
});
socket.on("disconnect", () => {
console.log(`disconnect`);
});
ws = {
socket: socket,
};
}
return (
<WebSocketContext.Provider value={ws}>{children}</WebSocketContext.Provider>
);
};
export { WebSocketContext };
export default WebSocketProvider;

View File

@@ -2,6 +2,9 @@ import * as React from "react";
import { render } from "react-dom"; import { render } from "react-dom";
import { Provider } from "react-redux"; import { Provider } from "react-redux";
import { ConnectedRouter } from "connected-react-router"; import { ConnectedRouter } from "connected-react-router";
import WebSocketProvider, {
WebSocketContext,
} from "./context/socket/socket.context";
import configureStore, { history } from "./store/index"; import configureStore, { history } from "./store/index";
import App from "./components/App"; import App from "./components/App";
@@ -10,9 +13,11 @@ const rootEl = document.getElementById("root");
render( render(
<Provider store={store}> <Provider store={store}>
<ConnectedRouter history={history}> <WebSocketProvider>
<App /> <ConnectedRouter history={history}>
</ConnectedRouter> <App />
</ConnectedRouter>
</WebSocketProvider>
</Provider>, </Provider>,
rootEl, rootEl,
); );

View File

@@ -12,7 +12,7 @@ import {
IMS_CV_METADATA_IMPORT_CALL_IN_PROGRESS, IMS_CV_METADATA_IMPORT_CALL_IN_PROGRESS,
} from "../constants/action-types"; } from "../constants/action-types";
const initialState = { const initialState = {
dataTransferred: false, IMSCallInProgress: false,
comicBookMetadata: [], comicBookMetadata: [],
isSocketConnected: false, isSocketConnected: false,
isComicVineMetadataImportInProgress: false, isComicVineMetadataImportInProgress: false,
@@ -26,7 +26,7 @@ function fileOpsReducer(state = initialState, action) {
return { return {
...state, ...state,
comicBookMetadata: [...state.comicBookMetadata, action.data], comicBookMetadata: [...state.comicBookMetadata, action.data],
dataTransferred: true, IMSCallInProgress: false,
}; };
case RMQ_SOCKET_CONNECTED: case RMQ_SOCKET_CONNECTED:
@@ -34,6 +34,7 @@ function fileOpsReducer(state = initialState, action) {
...state, ...state,
isSocketConnected: action.isSocketConnected, isSocketConnected: action.isSocketConnected,
socketId: action.socketId, socketId: action.socketId,
IMSCallInProgress: true,
}; };
case IMS_RAW_IMPORT_SUCCESSFUL: case IMS_RAW_IMPORT_SUCCESSFUL:
return { return {

View File

@@ -4,9 +4,10 @@ export const detectTradePaperbacks = (deck): any => {
const paperback = [ const paperback = [
/((trade)?\s?(paperback)|(tpb))/gim, // https://regex101.com/r/FhuowT/1 /((trade)?\s?(paperback)|(tpb))/gim, // https://regex101.com/r/FhuowT/1
/(hard\s?cover)\s?(collect((ion)|(ed)|(ing)))/gim, //https://regex101.com/r/eFJVRM/1 /(hard\s?cover)\s?(collect((ion)|(ed)|(ing)))/gim, //https://regex101.com/r/eFJVRM/1
/(collected\s?editions)/gim, // https://regex101.com/r/40pAm5/1
/(?:collects|issues|issue)/gim,
]; ];
const miniSeries = [
]
const matches = paperback const matches = paperback
.map((regex) => { .map((regex) => {
return deck.match(regex); return deck.match(regex);

View File

@@ -1,8 +1,9 @@
import express, { Request, Response, Router, Express } from "express"; import express, { Request, Response, Router, Express } from "express";
import bodyParser from "body-parser"; import bodyParser from "body-parser";
import { createServer } from "http"; import { createServer } from "http";
import { Server, Socket } from "socket.io"; import { Server } from "socket.io";
import router from "./route"; import router from "./route";
const amqp = require("amqplib/callback_api");
// call express // call express
const app: Express = express(); // define our app using express const app: Express = express(); // define our app using express
@@ -42,6 +43,35 @@ io.on("connection", (socket) => {
}); });
}); });
amqp.connect("amqp://localhost", (error0, connection) => {
if (error0) {
throw error0;
}
connection.createChannel((error1, channel) => {
if (error1) {
throw error1;
}
const queue = "comicBookCovers";
channel.assertQueue(queue, {
durable: false,
});
console.log(`Connected to ${queue} queue.`);
console.log(`Waiting for comic book cover data in ${queue}`);
channel.consume(
queue,
(data) => {
//Socket Trigger All Clients
io.sockets.emit("coverExtracted", JSON.parse(data.content.toString()));
},
{
noAck: true,
},
);
});
});
// socket server // socket server
httpServer.listen(8051); httpServer.listen(8051);
console.log(`Socket server is listening on 8051`); console.log(`Socket server is listening on 8051`);

View File

@@ -1,8 +1,6 @@
import router from "../router"; import router from "../router";
import { Request, Response } from "express"; import { Request, Response } from "express";
const amqp = require("amqplib/callback_api");
import axios from "axios"; import axios from "axios";
import { io } from "../../index";
router.route("/getComicCovers").post(async (req: Request, res: Response) => { router.route("/getComicCovers").post(async (req: Request, res: Response) => {
typeof req.body === "object" ? req.body : {}; typeof req.body === "object" ? req.body : {};
@@ -14,41 +12,7 @@ router.route("/getComicCovers").post(async (req: Request, res: Response) => {
walkedFolders: req.body.walkedFolders, walkedFolders: req.body.walkedFolders,
}, },
}); });
const queueConsumer = amqp.connect( res.send({ po: "jo" });
"amqp://localhost",
(error0, connection) => {
if (error0) {
throw error0;
}
connection.createChannel((error1, channel) => {
if (error1) {
throw error1;
}
const queue = "comicBookCovers";
channel.assertQueue(queue, {
durable: false,
});
console.log(`Connected to ${queue} queue.`);
console.log(`Waiting for comic book cover data in ${queue}`);
channel.consume(
queue,
(data) => {
//Socket Trigger All Clients
io.sockets.emit(
"coverExtracted",
JSON.parse(data.content.toString()),
);
},
{
noAck: true,
},
);
});
},
);
res.send({ queue: queueConsumer });
}); });
export default router; export default router;

View File

@@ -978,7 +978,7 @@
dependencies: dependencies:
regenerator-runtime "^0.13.4" regenerator-runtime "^0.13.4"
"@babel/runtime@^7.12.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7": "@babel/runtime@^7.12.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7":
version "7.15.4" version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw== integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
@@ -1338,6 +1338,13 @@
"@types/yargs" "^15.0.0" "@types/yargs" "^15.0.0"
chalk "^4.0.0" chalk "^4.0.0"
"@mattiasbuelens/web-streams-polyfill@^0.2.0":
version "0.2.1"
resolved "https://registry.yarnpkg.com/@mattiasbuelens/web-streams-polyfill/-/web-streams-polyfill-0.2.1.tgz#d7c4aa94f98084ec0787be084d47167d62ea5f67"
integrity sha512-oKuFCQFa3W7Hj7zKn0+4ypI8JFm4ZKIoncwAC6wd5WwFW2sL7O1hpPoJdSWpynQ4DJ4lQ6MvFoVDmCLilonDFg==
dependencies:
"@types/whatwg-streams" "^0.0.7"
"@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.2": "@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.2":
version "2.1.8-no-fsevents.2" version "2.1.8-no-fsevents.2"
resolved "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.2.tgz" resolved "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.2.tgz"
@@ -1965,6 +1972,11 @@
dependencies: dependencies:
"@types/node" "*" "@types/node" "*"
"@types/whatwg-streams@^0.0.7":
version "0.0.7"
resolved "https://registry.yarnpkg.com/@types/whatwg-streams/-/whatwg-streams-0.0.7.tgz#28bfe73dc850562296367249c4b32a50db81e9d3"
integrity sha512-6sDiSEP6DWcY2ZolsJ2s39ZmsoGQ7KVwBDI3sESQsEm9P2dHTcqnDIHRZFRNtLCzWp7hCFGqYbw5GyfpQnJ01A==
"@types/yargs-parser@*": "@types/yargs-parser@*":
version "20.2.1" version "20.2.1"
resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz" resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"
@@ -3657,7 +3669,7 @@ chokidar@^2.1.8:
optionalDependencies: optionalDependencies:
fsevents "^1.2.7" fsevents "^1.2.7"
chokidar@^3.4.0, chokidar@^3.5.2: chokidar@^3.4.0:
version "3.5.2" version "3.5.2"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
@@ -3827,6 +3839,11 @@ clone@^1.0.2:
resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz" resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"
integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
clsx@^1.0.4:
version "1.1.1"
resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==
cmd-shim@^4.0.1: cmd-shim@^4.0.1:
version "4.1.0" version "4.1.0"
resolved "https://registry.npmjs.org/cmd-shim/-/cmd-shim-4.1.0.tgz" resolved "https://registry.npmjs.org/cmd-shim/-/cmd-shim-4.1.0.tgz"
@@ -4738,7 +4755,7 @@ dom-converter@^0.2.0:
dependencies: dependencies:
utila "~0.4" utila "~0.4"
dom-helpers@^5.0.1: dom-helpers@^5.0.1, dom-helpers@^5.1.3:
version "5.2.1" version "5.2.1"
resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902" resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902"
integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA== integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==
@@ -5728,6 +5745,11 @@ fd-slicer@~1.1.0:
dependencies: dependencies:
pend "~1.2.0" pend "~1.2.0"
fetch-readablestream@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/fetch-readablestream/-/fetch-readablestream-0.2.0.tgz#eaa6d1a76b12de2d4731a343393c6ccdcfe2c795"
integrity sha512-qu4mXWf4wus4idBIN/kVH+XSer8IZ9CwHP+Pd7DL7TuKNC1hP7ykon4kkBjwJF3EMX2WsFp4hH7gU7CyL7ucXw==
figures@^1.3.5: figures@^1.3.5:
version "1.7.0" version "1.7.0"
resolved "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz" resolved "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz"
@@ -6867,6 +6889,11 @@ imagemin@^7.0.1:
resolved "https://registry.npmjs.org/immutable/-/immutable-4.0.0-rc.14.tgz" resolved "https://registry.npmjs.org/immutable/-/immutable-4.0.0-rc.14.tgz"
integrity sha512-pfkvmRKJSoW7JFx0QeYlAmT+kNYvn5j0u7bnpNq4N2RCvHSTlLT208G8jgaquNe+Q8kCPHKOSpxJkyvLDpYq0w== integrity sha512-pfkvmRKJSoW7JFx0QeYlAmT+kNYvn5j0u7bnpNq4N2RCvHSTlLT208G8jgaquNe+Q8kCPHKOSpxJkyvLDpYq0w==
immutable@^3.8.2:
version "3.8.2"
resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
import-fresh@^3.0.0, import-fresh@^3.2.1: import-fresh@^3.0.0, import-fresh@^3.2.1:
version "3.3.0" version "3.3.0"
resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz" resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
@@ -8961,6 +8988,11 @@ minizlib@^2.0.0, minizlib@^2.1.1:
minipass "^3.0.0" minipass "^3.0.0"
yallist "^4.0.0" yallist "^4.0.0"
mitt@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.2.0.tgz#cb24e6569c806e31bd4e3995787fe38a04fdf90d"
integrity sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==
mixin-deep@^1.2.0: mixin-deep@^1.2.0:
version "1.3.2" version "1.3.2"
resolved "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz" resolved "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz"
@@ -10927,6 +10959,21 @@ react-is@^17.0.1:
resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz" resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"
integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
react-lazylog@^4.5.3:
version "4.5.3"
resolved "https://registry.yarnpkg.com/react-lazylog/-/react-lazylog-4.5.3.tgz#289e24995b5599e75943556ac63f5e2c04d0001e"
integrity sha512-lyov32A/4BqihgXgtNXTHCajXSXkYHPlIEmV8RbYjHIMxCFSnmtdg4kDCI3vATz7dURtiFTvrw5yonHnrS+NNg==
dependencies:
"@mattiasbuelens/web-streams-polyfill" "^0.2.0"
fetch-readablestream "^0.2.0"
immutable "^3.8.2"
mitt "^1.1.2"
prop-types "^15.6.1"
react-string-replace "^0.4.1"
react-virtualized "^9.21.0"
text-encoding-utf-8 "^1.0.1"
whatwg-fetch "^2.0.4"
react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4: react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4:
version "3.0.4" version "3.0.4"
resolved "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz" resolved "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz"
@@ -11036,6 +11083,13 @@ react-sliding-pane@^7.0.0:
prop-types "^15.7.2" prop-types "^15.7.2"
react-modal "^3.12.1" react-modal "^3.12.1"
react-string-replace@^0.4.1:
version "0.4.4"
resolved "https://registry.yarnpkg.com/react-string-replace/-/react-string-replace-0.4.4.tgz#24006fbe0db573d5be583133df38b1a735cb4225"
integrity sha512-FAMkhxmDpCsGTwTZg7p/2v+/GTmxAp73so3fbSvlAcBBX36ujiGRNEaM/1u+jiYQrArhns+7eE92g2pi5E5FUA==
dependencies:
lodash "^4.17.4"
react-table@^7.7.0: react-table@^7.7.0:
version "7.7.0" version "7.7.0"
resolved "https://registry.npmjs.org/react-table/-/react-table-7.7.0.tgz" resolved "https://registry.npmjs.org/react-table/-/react-table-7.7.0.tgz"
@@ -11051,6 +11105,18 @@ react-transition-group@^4.3.0:
loose-envify "^1.4.0" loose-envify "^1.4.0"
prop-types "^15.6.2" prop-types "^15.6.2"
react-virtualized@^9.21.0:
version "9.22.3"
resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.22.3.tgz#f430f16beb0a42db420dbd4d340403c0de334421"
integrity sha512-MKovKMxWTcwPSxE1kK1HcheQTWfuCxAuBoSTf2gwyMM21NdX/PXUhnoP8Uc5dRKd+nKm8v41R36OellhdCpkrw==
dependencies:
"@babel/runtime" "^7.7.2"
clsx "^1.0.4"
dom-helpers "^5.1.3"
loose-envify "^1.4.0"
prop-types "^15.7.2"
react-lifecycles-compat "^3.0.4"
react-window-dynamic-list@^2.3.5: react-window-dynamic-list@^2.3.5:
version "2.4.2" version "2.4.2"
resolved "https://registry.npmjs.org/react-window-dynamic-list/-/react-window-dynamic-list-2.4.2.tgz" resolved "https://registry.npmjs.org/react-window-dynamic-list/-/react-window-dynamic-list-2.4.2.tgz"
@@ -12860,15 +12926,20 @@ test-exclude@^6.0.0:
glob "^7.1.4" glob "^7.1.4"
minimatch "^3.0.4" minimatch "^3.0.4"
text-encoding-utf-8@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13"
integrity sha512-8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg==
text-table@^0.2.0, text-table@~0.2.0: text-table@^0.2.0, text-table@~0.2.0:
version "0.2.0" version "0.2.0"
resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
threetwo-ui-typings@^1.0.3: threetwo-ui-typings@^1.0.5:
version "1.0.3" version "1.0.5"
resolved "https://registry.npmjs.org/threetwo-ui-typings/-/threetwo-ui-typings-1.0.3.tgz" resolved "https://registry.yarnpkg.com/threetwo-ui-typings/-/threetwo-ui-typings-1.0.5.tgz#3b9b6967178ac603377bc711de4823403f74264b"
integrity sha512-whyTLLMsgDIR6jkrJrz58qiMG8mYXF5V8akBI0okCmsE2djsnVPaihvXcL8bZWH4/HktqC86iJs9F9oYaG/4Ig== integrity sha512-3SxAFXpWWxP3umyO7QkH5s4ySDeXC08qIASrx6M3AkzLJCt2uCqYKumAxM9H78ETasEh0oOXzgusy6BvVMIRYA==
dependencies: dependencies:
typescript "^4.3.2" typescript "^4.3.2"
@@ -13855,6 +13926,11 @@ whatwg-encoding@^1.0.5:
dependencies: dependencies:
iconv-lite "0.4.24" iconv-lite "0.4.24"
whatwg-fetch@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
whatwg-mimetype@^2.3.0: whatwg-mimetype@^2.3.0:
version "2.3.0" version "2.3.0"
resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz" resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"