dependabot/npm_and_yarn/react-scripts-4.0.3
Rawrington
5 years ago
parent
0ffdfacafe
commit
c1dda4bacc
@ -0,0 +1,43 @@ |
||||
const getHost = () => /HOST_PORT=(wss?:\/\/.+)/.exec(window.location.search) |
||||
|
||||
export default function listenToACT(callback) { |
||||
if (!getHost()) return listenOverlayPlugin(callback) |
||||
return listenActWebSocket(callback) |
||||
} |
||||
|
||||
function listenActWebSocket(callback) { |
||||
const url = new URLSearchParams(window.location.search) |
||||
const wsUri = `${url.get("HOST_PORT")}BeforeLogLineRead` || undefined |
||||
const ws = new WebSocket(wsUri) |
||||
ws.onerror = () => ws.close() |
||||
ws.onclose = () => |
||||
setTimeout(() => { |
||||
listenActWebSocket(callback) |
||||
}, 1000) |
||||
ws.onmessage = function(e, m) { |
||||
if (e.data === ".") return ws.send(".") |
||||
|
||||
const obj = JSON.parse(e.data) |
||||
if (obj.msgtype === "SendCharName") { |
||||
return callback(obj.msg) |
||||
} else if (obj.msgtype === "Chat") { |
||||
return callback(...obj.msg.split("|")) |
||||
} |
||||
} |
||||
|
||||
return () => { |
||||
ws.close() |
||||
} |
||||
} |
||||
|
||||
function listenOverlayPlugin(callback) { |
||||
const listener = e => { |
||||
callback(...e.detail) |
||||
} |
||||
|
||||
document.addEventListener("onLogLine", listener) |
||||
|
||||
return () => { |
||||
document.removeEventListener("onLogLine", listener) |
||||
} |
||||
} |
||||
@ -1,30 +0,0 @@ |
||||
const handleCodes = new Set([ |
||||
'00', |
||||
'01', |
||||
'02', |
||||
'21', |
||||
'22', |
||||
'33' |
||||
]) |
||||
|
||||
export default function listenActWebSocket( callback ) { |
||||
const url = new URLSearchParams(window.location.search) |
||||
const wsUri = `${url.get("HOST_PORT")}BeforeLogLineRead` || undefined |
||||
const ws = new WebSocket(wsUri) |
||||
ws.onerror = () => ws.close() |
||||
ws.onclose = () => setTimeout(() => { listenActWebSocket( callback ) }, 1000) |
||||
ws.onmessage = function(e, m) { |
||||
if (e.data === ".") return ws.send(".") //PING
|
||||
|
||||
const obj = JSON.parse(e.data); |
||||
if (obj.msgtype === "SendCharName") { |
||||
return callback(obj.msg, null) |
||||
} else if (obj.msgtype === "Chat") { |
||||
const code = obj.msg.substring(0, 2) //first 2 numbers POG
|
||||
|
||||
if (handleCodes.has(code)) return callback(obj.msg, code) //NetworkAbility or NetworkAoeAbility
|
||||
} |
||||
} |
||||
|
||||
return ws |
||||
} |
||||
@ -0,0 +1,33 @@ |
||||
import React from "react" |
||||
import "./css/Rotation.css" |
||||
import Action from "./Action" |
||||
|
||||
export default function RotationContainer({ encounterId, name, actionList }) { |
||||
const [open, setOpen] = React.useState(false) |
||||
|
||||
return ( |
||||
<> |
||||
<button |
||||
className={open ? "rotation-button expanded" : "rotation-button"} |
||||
onClick={() => { |
||||
setOpen(open => !open) |
||||
}} |
||||
> |
||||
{encounterId === 0 ? "Current Rotation" : name} |
||||
</button> |
||||
<RotationContents expanded={open} actionList={actionList} /> |
||||
</> |
||||
) |
||||
} |
||||
|
||||
function RotationContents({ expanded, actionList }) { |
||||
if (!expanded) return null |
||||
|
||||
return ( |
||||
<div className="rotation-list"> |
||||
{actionList.map((action, i) => ( |
||||
<Action key={i} actionId={action} additionalClasses="action-rotation" /> |
||||
))} |
||||
</div> |
||||
) |
||||
} |
||||
@ -0,0 +1,32 @@ |
||||
.rotation-list { |
||||
padding: 0 18px; |
||||
background-color: rgba(80, 80, 80, 0.3); |
||||
display: block; |
||||
} |
||||
|
||||
.rotation-button { |
||||
background-color: rgba(100, 100, 100, 0.3); |
||||
color: rgba(255, 255, 255, 0.5); |
||||
padding: 0.1em; |
||||
width: 100vw; |
||||
border: none; |
||||
outline: none; |
||||
transition: 0.4s; |
||||
display: block; |
||||
} |
||||
|
||||
.rotation-button.expanded, .rotation-button:hover { |
||||
background-color: rgba(120, 120, 120, 0.3); |
||||
} |
||||
|
||||
.rotation-button:after { |
||||
content: '\25BC'; |
||||
font-size: 13px; |
||||
color: rgb(119,119,119); |
||||
float: right; |
||||
margin-left: 5px; |
||||
} |
||||
|
||||
.rotation-button.expanded:after { |
||||
content: "\25B2"; |
||||
} |
||||
@ -1,12 +1,5 @@ |
||||
import React from 'react'; |
||||
import ReactDOM from 'react-dom'; |
||||
import './css/index.css'; |
||||
import App from './App'; |
||||
import * as serviceWorker from './serviceWorker'; |
||||
import React from 'react' |
||||
import ReactDOM from 'react-dom' |
||||
import App from './App' |
||||
|
||||
ReactDOM.render(<App />, document.getElementById('root')); |
||||
|
||||
// If you want your app to work offline and load faster, you can change
|
||||
// unregister() to register() below. Note this comes with some pitfalls.
|
||||
// Learn more about service workers: https://bit.ly/CRA-PWA
|
||||
serviceWorker.unregister(); |
||||
ReactDOM.render(<App />, document.getElementById('root')) |
||||
|
||||
@ -1,135 +0,0 @@ |
||||
// This optional code is used to register a service worker.
|
||||
// register() is not called by default.
|
||||
|
||||
// This lets the app load faster on subsequent visits in production, and gives
|
||||
// it offline capabilities. However, it also means that developers (and users)
|
||||
// will only see deployed updates on subsequent visits to a page, after all the
|
||||
// existing tabs open on the page have been closed, since previously cached
|
||||
// resources are updated in the background.
|
||||
|
||||
// To learn more about the benefits of this model and instructions on how to
|
||||
// opt-in, read https://bit.ly/CRA-PWA
|
||||
|
||||
const isLocalhost = Boolean( |
||||
window.location.hostname === 'localhost' || |
||||
// [::1] is the IPv6 localhost address.
|
||||
window.location.hostname === '[::1]' || |
||||
// 127.0.0.1/8 is considered localhost for IPv4.
|
||||
window.location.hostname.match( |
||||
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ |
||||
) |
||||
); |
||||
|
||||
export function register(config) { |
||||
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { |
||||
// The URL constructor is available in all browsers that support SW.
|
||||
const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href); |
||||
if (publicUrl.origin !== window.location.origin) { |
||||
// Our service worker won't work if PUBLIC_URL is on a different origin
|
||||
// from what our page is served on. This might happen if a CDN is used to
|
||||
// serve assets; see https://github.com/facebook/create-react-app/issues/2374
|
||||
return; |
||||
} |
||||
|
||||
window.addEventListener('load', () => { |
||||
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; |
||||
|
||||
if (isLocalhost) { |
||||
// This is running on localhost. Let's check if a service worker still exists or not.
|
||||
checkValidServiceWorker(swUrl, config); |
||||
|
||||
// Add some additional logging to localhost, pointing developers to the
|
||||
// service worker/PWA documentation.
|
||||
navigator.serviceWorker.ready.then(() => { |
||||
console.log( |
||||
'This web app is being served cache-first by a service ' + |
||||
'worker. To learn more, visit https://bit.ly/CRA-PWA' |
||||
); |
||||
}); |
||||
} else { |
||||
// Is not localhost. Just register service worker
|
||||
registerValidSW(swUrl, config); |
||||
} |
||||
}); |
||||
} |
||||
} |
||||
|
||||
function registerValidSW(swUrl, config) { |
||||
navigator.serviceWorker |
||||
.register(swUrl) |
||||
.then(registration => { |
||||
registration.onupdatefound = () => { |
||||
const installingWorker = registration.installing; |
||||
if (installingWorker == null) { |
||||
return; |
||||
} |
||||
installingWorker.onstatechange = () => { |
||||
if (installingWorker.state === 'installed') { |
||||
if (navigator.serviceWorker.controller) { |
||||
// At this point, the updated precached content has been fetched,
|
||||
// but the previous service worker will still serve the older
|
||||
// content until all client tabs are closed.
|
||||
console.log( |
||||
'New content is available and will be used when all ' + |
||||
'tabs for this page are closed. See https://bit.ly/CRA-PWA.' |
||||
); |
||||
|
||||
// Execute callback
|
||||
if (config && config.onUpdate) { |
||||
config.onUpdate(registration); |
||||
} |
||||
} else { |
||||
// At this point, everything has been precached.
|
||||
// It's the perfect time to display a
|
||||
// "Content is cached for offline use." message.
|
||||
console.log('Content is cached for offline use.'); |
||||
|
||||
// Execute callback
|
||||
if (config && config.onSuccess) { |
||||
config.onSuccess(registration); |
||||
} |
||||
} |
||||
} |
||||
}; |
||||
}; |
||||
}) |
||||
.catch(error => { |
||||
console.error('Error during service worker registration:', error); |
||||
}); |
||||
} |
||||
|
||||
function checkValidServiceWorker(swUrl, config) { |
||||
// Check if the service worker can be found. If it can't reload the page.
|
||||
fetch(swUrl) |
||||
.then(response => { |
||||
// Ensure service worker exists, and that we really are getting a JS file.
|
||||
const contentType = response.headers.get('content-type'); |
||||
if ( |
||||
response.status === 404 || |
||||
(contentType != null && contentType.indexOf('javascript') === -1) |
||||
) { |
||||
// No service worker found. Probably a different app. Reload the page.
|
||||
navigator.serviceWorker.ready.then(registration => { |
||||
registration.unregister().then(() => { |
||||
window.location.reload(); |
||||
}); |
||||
}); |
||||
} else { |
||||
// Service worker found. Proceed as normal.
|
||||
registerValidSW(swUrl, config); |
||||
} |
||||
}) |
||||
.catch(() => { |
||||
console.log( |
||||
'No internet connection found. App is running in offline mode.' |
||||
); |
||||
}); |
||||
} |
||||
|
||||
export function unregister() { |
||||
if ('serviceWorker' in navigator) { |
||||
navigator.serviceWorker.ready.then(registration => { |
||||
registration.unregister(); |
||||
}); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue