adds reconnect timeout and stores non-signed in prefs in different key

This commit is contained in:
jessop 2020-07-21 11:16:13 -04:00 committed by Sean Yesmunt
parent 3a140c2318
commit 8c29c7e912
4 changed files with 44 additions and 14 deletions

25
dist/bundle.es.js vendored
View file

@ -965,7 +965,7 @@ var daemon_settings = /*#__PURE__*/Object.freeze({
const SDK_SYNC_KEYS = [LBRYUM_SERVERS, SHARE_USAGE_DATA]; const SDK_SYNC_KEYS = [LBRYUM_SERVERS, SHARE_USAGE_DATA];
// CLIENT // CLIENT
const CLIENT_SYNC_KEYS = [SHOW_MATURE, HIDE_REPOSTS, SHOW_ANONYMOUS, INSTANT_PURCHASE_ENABLED, INSTANT_PURCHASE_MAX, THEME, THEMES, AUTOPLAY, HIDE_BALANCE, HIDE_SPLASH_ANIMATION, FLOATING_PLAYER, DARK_MODE_TIMES, AUTOMATIC_DARK_MODE_ENABLED]; const CLIENT_SYNC_KEYS = [SHOW_MATURE, HIDE_REPOSTS, SHOW_ANONYMOUS, INSTANT_PURCHASE_ENABLED, INSTANT_PURCHASE_MAX, THEME, AUTOPLAY, HIDE_BALANCE, HIDE_SPLASH_ANIMATION, FLOATING_PLAYER, DARK_MODE_TIMES, AUTOMATIC_DARK_MODE_ENABLED];
/* /*
@ -2005,7 +2005,6 @@ function doPreferenceGet(key, success, fail) {
// //
const SHARED_PREFERENCE_KEY = 'shared';
const SHARED_PREFERENCE_VERSION = '0.1'; const SHARED_PREFERENCE_VERSION = '0.1';
let oldShared = {}; let oldShared = {};
@ -2020,6 +2019,7 @@ const buildSharedStateMiddleware = (actions, sharedStateFilters, sharedStateCb)
const actionResult = next(action); const actionResult = next(action);
// Call `getState` after calling `next` to ensure the state has updated in response to the action // Call `getState` after calling `next` to ensure the state has updated in response to the action
const nextState = getState(); const nextState = getState();
const preferenceKey = nextState.user && nextState.user.user && nextState.user.user.has_verified_email ? 'shared' : 'anon';
const shared = {}; const shared = {};
Object.keys(sharedStateFilters).forEach(key => { Object.keys(sharedStateFilters).forEach(key => {
@ -2036,7 +2036,7 @@ const buildSharedStateMiddleware = (actions, sharedStateFilters, sharedStateCb)
if (!isEqual(oldShared, shared)) { if (!isEqual(oldShared, shared)) {
// only update if the preference changed from last call in the same session // only update if the preference changed from last call in the same session
oldShared = shared; oldShared = shared;
doPreferenceSet(SHARED_PREFERENCE_KEY, shared, SHARED_PREFERENCE_VERSION); doPreferenceSet(preferenceKey, shared, SHARED_PREFERENCE_VERSION);
} }
if (sharedStateCb) { if (sharedStateCb) {
@ -2879,6 +2879,7 @@ function creditsToString(amount) {
var _extends$5 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; var _extends$5 = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
const FIFTEEN_SECONDS = 15000;
let walletBalancePromise = null; let walletBalancePromise = null;
function doUpdateBalance() { function doUpdateBalance() {
return (dispatch, getState) => { return (dispatch, getState) => {
@ -3244,11 +3245,23 @@ function doWalletReconnect() {
dispatch({ dispatch({
type: WALLET_RESTART type: WALLET_RESTART
}); });
let failed = false;
// this basically returns null when it's done. :( // this basically returns null when it's done. :(
// might be good to dispatch ACTIONS.WALLET_RESTARTED // might be good to dispatch ACTIONS.WALLET_RESTARTED
lbryProxy.wallet_reconnect().then(() => dispatch({ const walletTimeout = setTimeout(() => {
type: WALLET_RESTART_COMPLETED failed = true;
})); dispatch({
type: WALLET_RESTART_COMPLETED
});
dispatch(doToast({
message: __('Your servers were not available. Check your url and port, or switch back to defaults.'),
isError: true
}));
}, FIFTEEN_SECONDS);
lbryProxy.wallet_reconnect().then(() => {
clearTimeout(walletTimeout);
if (!failed) dispatch({ type: WALLET_RESTART_COMPLETED });
});
}; };
} }
function doWalletDecrypt() { function doWalletDecrypt() {

View file

@ -21,7 +21,6 @@ export const CLIENT_SYNC_KEYS = [
SETTINGS.INSTANT_PURCHASE_ENABLED, SETTINGS.INSTANT_PURCHASE_ENABLED,
SETTINGS.INSTANT_PURCHASE_MAX, SETTINGS.INSTANT_PURCHASE_MAX,
SETTINGS.THEME, SETTINGS.THEME,
SETTINGS.THEMES,
SETTINGS.AUTOPLAY, SETTINGS.AUTOPLAY,
SETTINGS.HIDE_BALANCE, SETTINGS.HIDE_BALANCE,
SETTINGS.HIDE_SPLASH_ANIMATION, SETTINGS.HIDE_SPLASH_ANIMATION,

View file

@ -10,6 +10,7 @@ import { creditsToString } from 'util/format-credits';
import { selectMyClaimsRaw } from 'redux/selectors/claims'; import { selectMyClaimsRaw } from 'redux/selectors/claims';
import { doFetchChannelListMine, doFetchClaimListMine } from 'redux/actions/claims'; import { doFetchChannelListMine, doFetchClaimListMine } from 'redux/actions/claims';
const FIFTEEN_SECONDS = 15000;
let walletBalancePromise = null; let walletBalancePromise = null;
export function doUpdateBalance() { export function doUpdateBalance() {
return (dispatch, getState) => { return (dispatch, getState) => {
@ -421,13 +422,27 @@ export function doWalletReconnect() {
dispatch({ dispatch({
type: ACTIONS.WALLET_RESTART, type: ACTIONS.WALLET_RESTART,
}); });
let failed = false;
// this basically returns null when it's done. :( // this basically returns null when it's done. :(
// might be good to dispatch ACTIONS.WALLET_RESTARTED // might be good to dispatch ACTIONS.WALLET_RESTARTED
Lbry.wallet_reconnect().then(() => const walletTimeout = setTimeout(() => {
failed = true;
dispatch({ dispatch({
type: ACTIONS.WALLET_RESTART_COMPLETED, type: ACTIONS.WALLET_RESTART_COMPLETED,
}) });
); dispatch(
doToast({
message: __(
'Your servers were not available. Check your url and port, or switch back to defaults.'
),
isError: true,
})
);
}, FIFTEEN_SECONDS);
Lbry.wallet_reconnect().then(() => {
clearTimeout(walletTimeout);
if (!failed) dispatch({ type: ACTIONS.WALLET_RESTART_COMPLETED });
});
}; };
} }
export function doWalletDecrypt() { export function doWalletDecrypt() {

View file

@ -2,7 +2,6 @@
import isEqual from 'util/deep-equal'; import isEqual from 'util/deep-equal';
import { doPreferenceSet } from 'redux/actions/sync'; import { doPreferenceSet } from 'redux/actions/sync';
const SHARED_PREFERENCE_KEY = 'shared';
const SHARED_PREFERENCE_VERSION = '0.1'; const SHARED_PREFERENCE_VERSION = '0.1';
let oldShared = {}; let oldShared = {};
@ -10,7 +9,7 @@ export const buildSharedStateMiddleware = (
actions: Array<string>, actions: Array<string>,
sharedStateFilters: {}, sharedStateFilters: {},
sharedStateCb?: any => void sharedStateCb?: any => void
) => ({ getState, dispatch }: { getState: () => {}, dispatch: any => void }) => ( ) => ({ getState, dispatch }: { getState: () => { user: any }, dispatch: any => void }) => (
next: ({}) => void next: ({}) => void
) => (action: { type: string, data: any }) => { ) => (action: { type: string, data: any }) => {
const currentState = getState(); const currentState = getState();
@ -22,7 +21,11 @@ export const buildSharedStateMiddleware = (
const actionResult = next(action); const actionResult = next(action);
// Call `getState` after calling `next` to ensure the state has updated in response to the action // Call `getState` after calling `next` to ensure the state has updated in response to the action
const nextState = getState(); const nextState: { user: any } = getState();
const preferenceKey =
nextState.user && nextState.user.user && nextState.user.user.has_verified_email
? 'shared'
: 'anon';
const shared = {}; const shared = {};
Object.keys(sharedStateFilters).forEach(key => { Object.keys(sharedStateFilters).forEach(key => {
@ -39,7 +42,7 @@ export const buildSharedStateMiddleware = (
if (!isEqual(oldShared, shared)) { if (!isEqual(oldShared, shared)) {
// only update if the preference changed from last call in the same session // only update if the preference changed from last call in the same session
oldShared = shared; oldShared = shared;
doPreferenceSet(SHARED_PREFERENCE_KEY, shared, SHARED_PREFERENCE_VERSION); doPreferenceSet(preferenceKey, shared, SHARED_PREFERENCE_VERSION);
} }
if (sharedStateCb) { if (sharedStateCb) {