Audric Ackermann
4 years ago
committed by
GitHub
commit
cde8a0b3d8
@ -1,31 +1,2 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 404.08533 448.40668"
|
||||
height="448.40668"
|
||||
width="404.08533"
|
||||
xml:space="preserve"
|
||||
id="svg2"
|
||||
version="1.1"><metadata
|
||||
id="metadata8"><rdf:RDF><cc:Work
|
||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
|
||||
id="defs6"><clipPath
|
||||
id="clipPath18"
|
||||
clipPathUnits="userSpaceOnUse"><path
|
||||
id="path16"
|
||||
d="M 0,336.305 H 303.064 V 0 H 0 Z" /></clipPath></defs><g
|
||||
transform="matrix(1.3333333,0,0,-1.3333333,0,448.40667)"
|
||||
id="g10"><g
|
||||
id="g12"><g
|
||||
clip-path="url(#clipPath18)"
|
||||
id="g14"><g
|
||||
transform="translate(216.4556,21.0229)"
|
||||
id="g20"><path
|
||||
id="path22"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
d="m 0,0 h -147.251 c -25.182,0 -46.881,19.311 -48.123,44.461 -1.328,26.885 20.162,49.182 46.765,49.182 h 84.804 c 5.189,0 9.395,4.206 9.395,9.394 v 69.229 L 29.025,126.032 C 51.087,113.807 64.975,90.781 65.565,65.646 66.415,29.551 36.104,0 0,0 m -158.872,168.227 c -22.062,12.225 -35.95,35.251 -36.541,60.386 -0.849,36.095 29.462,65.646 65.565,65.646 H 17.403 c 25.182,0 46.881,-19.311 48.124,-44.462 1.328,-26.884 -20.162,-49.181 -46.764,-49.181 0,0 -60.987,-0.01 -84.808,-0.014 -5.186,-0.001 -9.374,-4.206 -9.376,-9.392 l -0.016,-69.217 z M 39.213,144.42 -24.265,179.593 h 43.028 c 37.408,0 67.845,30.434 67.845,67.843 0,37.408 -30.437,67.846 -67.845,67.846 h -150.224 c -46.864,0 -84.995,-38.131 -84.995,-84.995 0,-33.425 18.162,-64.248 47.396,-80.449 l 63.477,-35.172 h -43.026 c -37.41,0 -67.847,-30.435 -67.847,-67.843 0,-37.408 30.437,-67.846 67.847,-67.846 H 1.613 c 46.866,0 84.995,38.13 84.995,84.995 0,33.425 -18.162,64.248 -47.395,80.448" /></g></g></g></g></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 404.085 448.407"><defs><clipPath id="a" clipPathUnits="userSpaceOnUse"><path d="M0 336.305h303.064V0H0z"/></clipPath></defs><g clip-path="url(#a)" transform="matrix(1.33333 0 0 -1.33333 0 448.407)"><path d="M216.456 21.023H69.205c-25.182 0-46.881 19.31-48.123 44.46-1.328 26.886 20.162 49.183 46.765 49.183h84.804a9.394 9.394 0 019.395 9.394v69.229l83.435-46.234c22.062-12.225 35.95-35.251 36.54-60.386.85-36.095-29.461-65.646-65.565-65.646M57.584 189.25c-22.062 12.225-35.95 35.25-36.541 60.386-.85 36.095 29.462 65.646 65.565 65.646h147.25c25.183 0 46.882-19.311 48.125-44.462 1.328-26.884-20.162-49.181-46.764-49.181l-84.808-.014c-5.186-.001-9.374-4.206-9.376-9.392l-.016-69.217zm198.085-23.807l-63.478 35.173h43.028c37.408 0 67.845 30.434 67.845 67.843 0 37.408-30.437 67.846-67.845 67.846H84.995C38.13 336.305 0 298.174 0 251.31c0-33.425 18.162-64.248 47.396-80.45l63.477-35.171H67.847C30.437 135.689 0 105.254 0 67.846S30.437 0 67.847 0h150.222c46.866 0 84.995 38.13 84.995 84.995 0 33.425-18.162 64.248-47.395 80.448" fill="#fff"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 65 KiB |
@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"><circle cx="512" cy="512.3" r="511.3" fill="#333132"/><path d="M431 574.8c-.8-7.4-6.7-8.2-10.8-10.6-13.6-7.9-27.5-15.4-41.3-23l-22.5-12.3c-8.5-4.7-17.1-9.2-25.6-14.1-10.5-6-21-11.9-31.1-18.6-18.9-12.5-33.8-29.1-46.3-48.1-8.3-12.6-14.8-26.1-19.2-40.4-6.7-21.7-10.8-44.1-7.8-66.8 1.8-14 4.6-28 9.7-41.6 7.8-20.8 19.3-38.8 34.2-54.8 9.8-10.6 21.2-19.1 33.4-26.8 14.7-9.3 30.7-15.4 47.4-19 13.8-3 28.1-4.3 42.2-4.4 89.9-.4 179.7-.3 269.6 0 12.6 0 25.5 1 37.7 4.1 24.3 6.2 45.7 18.2 63 37 11.2 12.2 20.4 25.8 25.8 41.2 7.3 20.7 12.3 42.1 6.7 64.4-2.1 8.5-2.7 17.5-6.1 25.4-4.7 10.9-10.8 21.2-17.2 31.2-8.7 13.5-20.5 24.3-34.4 32.2-10.1 5.7-21 10.2-32 14.3-18.1 6.7-37.2 5-56.1 5.2-17.2.2-34.5 0-51.7.1-1.7 0-3.4 1.2-5.1 1.9 1.3 1.8 2.1 4.3 3.9 5.3 13.5 7.8 27.2 15.4 40.8 22.9 11 6 22.3 11.7 33.2 17.9 15.2 8.5 30.2 17.4 45.3 26.1 19.3 11.1 34.8 26.4 47.8 44.3 9.7 13.3 17.2 27.9 23 43.5 6.1 16.6 9.2 33.8 10.4 51.3.6 9.1-.7 18.5-1.9 27.6-1.2 9.1-2.7 18.4-5.6 27.1-3.3 10.2-7.4 20.2-12.4 29.6-8.4 15.7-19.6 29.4-32.8 41.4-12.7 11.5-26.8 20.6-42.4 27.6-22.9 10.3-46.9 14.4-71.6 14.5-89.7.3-179.4.2-269.1-.1-12.6 0-25.5-1-37.7-3.9-24.5-5.7-45.8-18-63.3-36.4-11.6-12.3-20.2-26.5-26.6-41.9-2.7-6.4-4.1-13.5-5.4-20.4-1.5-8.1-2.8-16.3-3.1-24.5-.6-15.7 2.8-30.9 8.2-45.4 8.2-22 21.7-40.6 40.2-55.2 10-7.9 21.3-13.7 33.1-18.8 16.6-7.2 34-8.1 51.4-8.5 21.9-.5 43.9-.1 65.9-.1 1.9-.1 3.9-.3 6.2-.4zm96.3-342.4c0 .1 0 .1 0 0-48.3.1-96.6-.6-144.9.5-13.5.3-27.4 3.9-40.1 8.7-14.9 5.6-28.1 14.6-39.9 25.8-20.2 19-32.2 42.2-37.2 68.9-3.6 19-1.4 38.1 4.1 56.5 4.1 13.7 10.5 26.4 18.5 38.4 14.8 22.2 35.7 36.7 58.4 49.2 11 6.1 22.2 11.9 33.2 18 13.5 7.5 26.9 15.1 40.4 22.6 13.1 7.3 26.2 14.5 39.2 21.7 9.7 5.3 19.4 10.7 29.1 16.1 2.9 1.6 4.1.2 4.5-2.4.3-2 .3-4 .3-6.1v-58.8c0-19.9.1-39.9 0-59.8 0-6.6 1.7-12.8 7.6-16.1 3.5-2 8.2-2.8 12.4-2.8 50.3-.2 100.7-.2 151-.1 19.8 0 38.3-4.4 55.1-15.1 23.1-14.8 36.3-36.3 40.6-62.9 3.4-20.8-1-40.9-12.4-58.5-17.8-27.5-43.6-43-76.5-43.6-47.8-.8-95.6-.2-143.4-.2zm-30.6 559.7c45.1 0 90.2-.2 135.3.1 18.9.1 36.6-3.9 53.9-11.1 18.4-7.7 33.6-19.8 46.3-34.9 9.1-10.8 16.2-22.9 20.8-36.5 4.2-12.4 7.4-24.7 7.3-37.9-.1-10.3.2-20.5-3.4-30.5-2.6-7.2-3.4-15.2-6.4-22.1-3.9-8.9-8.9-17.3-14-25.5-12.9-20.8-31.9-34.7-52.8-46.4-10.6-5.9-21.2-11.6-31.8-17.5-10.3-5.7-20.4-11.7-30.7-17.4-11.2-6.1-22.5-11.9-33.7-18-16.6-9.1-33.1-18.4-49.8-27.5-4.9-2.7-6.1-1.9-6.4 3.9-.1 2-.1 4.1-.1 6.1v114.5c0 14.8-5.6 20.4-20.4 20.4-47.6.1-95.3-.1-142.9.2-10.5.1-21.1 1.4-31.6 2.8-16.5 2.2-30.5 9.9-42.8 21-17 15.5-27 34.7-29.4 57.5-1.1 10.9-.4 21.7 2.9 32.5 3.7 12.3 9.2 23.4 17.5 33 19.2 22.1 43.4 33.3 72.7 33.3 46.6.1 93 0 139.5 0z" fill="#00f782"/></svg>
|
||||
|
After Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 130 KiB After Width: | Height: | Size: 176 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB |
@ -1 +0,0 @@
|
||||
Subproject commit 5173163fe18ac575676020e2f8621cf7a2956df3
|
||||
@ -1,84 +1,63 @@
|
||||
import React from 'react';
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import classNames from 'classnames';
|
||||
import { updateConfirmModal } from '../../state/ducks/modalDialog';
|
||||
import { useDispatch } from 'react-redux';
|
||||
|
||||
interface Props {
|
||||
type Props = {
|
||||
active: boolean;
|
||||
onClick: any;
|
||||
onClick: () => void;
|
||||
confirmationDialogParams?: any | undefined;
|
||||
};
|
||||
|
||||
updateConfirmModal?: any;
|
||||
}
|
||||
export const SessionToggle = (props: Props) => {
|
||||
const [active, setActive] = useState(false);
|
||||
|
||||
interface State {
|
||||
active: boolean;
|
||||
}
|
||||
|
||||
export class SessionToggle extends React.PureComponent<Props, State> {
|
||||
public static defaultProps = {
|
||||
onClick: () => null,
|
||||
};
|
||||
|
||||
constructor(props: any) {
|
||||
super(props);
|
||||
this.clickHandler = this.clickHandler.bind(this);
|
||||
|
||||
const { active } = this.props;
|
||||
const dispatch = useDispatch();
|
||||
|
||||
this.state = {
|
||||
active: active,
|
||||
};
|
||||
}
|
||||
|
||||
public render() {
|
||||
return (
|
||||
<div
|
||||
className={classNames('session-toggle', this.state.active ? 'active' : '')}
|
||||
role="button"
|
||||
onClick={this.clickHandler}
|
||||
>
|
||||
<div className="knob" />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
useEffect(() => {
|
||||
setActive(props.active);
|
||||
}, []);
|
||||
|
||||
private clickHandler(event: any) {
|
||||
const clickHandler = (event: any) => {
|
||||
const stateManager = (e: any) => {
|
||||
this.setState({
|
||||
active: !this.state.active,
|
||||
});
|
||||
|
||||
if (this.props.onClick) {
|
||||
e.stopPropagation();
|
||||
this.props.onClick();
|
||||
}
|
||||
setActive(!active);
|
||||
e.stopPropagation();
|
||||
props.onClick();
|
||||
};
|
||||
|
||||
if (
|
||||
this.props.confirmationDialogParams &&
|
||||
this.props.updateConfirmModal &&
|
||||
this.props.confirmationDialogParams.shouldShowConfirm()
|
||||
) {
|
||||
if (props.confirmationDialogParams && props.confirmationDialogParams.shouldShowConfirm()) {
|
||||
// If item needs a confirmation dialog to turn ON, render it
|
||||
const closeConfirmModal = () => {
|
||||
this.props.updateConfirmModal(null);
|
||||
dispatch(updateConfirmModal(null));
|
||||
};
|
||||
|
||||
this.props.updateConfirmModal({
|
||||
onClickOk: () => {
|
||||
stateManager(event);
|
||||
closeConfirmModal();
|
||||
},
|
||||
onClickClose: () => {
|
||||
this.props.updateConfirmModal(null);
|
||||
},
|
||||
...this.props.confirmationDialogParams,
|
||||
updateConfirmModal,
|
||||
});
|
||||
dispatch(
|
||||
updateConfirmModal({
|
||||
onClickOk: () => {
|
||||
stateManager(event);
|
||||
closeConfirmModal();
|
||||
},
|
||||
onClickClose: () => {
|
||||
updateConfirmModal(null);
|
||||
},
|
||||
...props.confirmationDialogParams,
|
||||
updateConfirmModal,
|
||||
})
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
stateManager(event);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div
|
||||
className={classNames('session-toggle', active ? 'active' : '')}
|
||||
role="button"
|
||||
onClick={clickHandler}
|
||||
>
|
||||
<div className="knob" />
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
import React from 'react';
|
||||
|
||||
// tslint:disable-next-line: no-submodule-imports
|
||||
import useNetworkState from 'react-use/lib/useNetworkState';
|
||||
import styled from 'styled-components';
|
||||
|
||||
type ContainerProps = {
|
||||
show: boolean;
|
||||
};
|
||||
|
||||
const OfflineContainer = styled.div<ContainerProps>`
|
||||
background: ${props => props.theme.colors.accent};
|
||||
color: ${props => props.theme.colors.textColor};
|
||||
padding: ${props => (props.show ? props.theme.common.margins.sm : '0px')};
|
||||
margin: ${props => (props.show ? props.theme.common.margins.xs : '0px')};
|
||||
height: ${props => (props.show ? 'auto' : '0px')};
|
||||
overflow: hidden;
|
||||
transition: ${props => props.theme.common.animations.defaultDuration};
|
||||
`;
|
||||
|
||||
const OfflineTitle = styled.h3`
|
||||
padding-top: 0px;
|
||||
margin-top: 0px;
|
||||
`;
|
||||
|
||||
const OfflineMessage = styled.div``;
|
||||
|
||||
export const SessionOffline = () => {
|
||||
const isOnline = useNetworkState().online;
|
||||
return (
|
||||
<OfflineContainer show={!isOnline}>
|
||||
<OfflineTitle>{window.i18n('offline')}</OfflineTitle>
|
||||
<OfflineMessage>{window.i18n('checkNetworkConnection')}</OfflineMessage>
|
||||
</OfflineContainer>
|
||||
);
|
||||
};
|
||||
@ -0,0 +1,307 @@
|
||||
// tslint:disable: no-implicit-dependencies max-func-body-length no-unused-expression
|
||||
|
||||
import chai from 'chai';
|
||||
import Sinon, * as sinon from 'sinon';
|
||||
import _, { noop } from 'lodash';
|
||||
import { describe } from 'mocha';
|
||||
|
||||
import chaiAsPromised from 'chai-as-promised';
|
||||
import { TestUtils } from '../../../test-utils';
|
||||
import { UserUtils } from '../../../../session/utils';
|
||||
import { getConversationController } from '../../../../session/conversations';
|
||||
import * as Data from '../../../../../ts/data/data';
|
||||
import { getSwarmPollingInstance, SnodePool } from '../../../../session/snode_api';
|
||||
import { SwarmPolling } from '../../../../session/snode_api/swarmPolling';
|
||||
import { SWARM_POLLING_TIMEOUT } from '../../../../session/constants';
|
||||
import {
|
||||
ConversationCollection,
|
||||
ConversationModel,
|
||||
ConversationTypeEnum,
|
||||
} from '../../../../models/conversation';
|
||||
import { PubKey } from '../../../../session/types';
|
||||
// tslint:disable: chai-vague-errors
|
||||
|
||||
chai.use(chaiAsPromised as any);
|
||||
chai.should();
|
||||
|
||||
const { expect } = chai;
|
||||
|
||||
// tslint:disable-next-line: max-func-body-length
|
||||
describe('SwarmPolling', () => {
|
||||
// Initialize new stubbed cache
|
||||
const sandbox = sinon.createSandbox();
|
||||
const ourPubkey = TestUtils.generateFakePubKey();
|
||||
const ourNumber = ourPubkey.key;
|
||||
|
||||
let pollOnceForKeySpy: Sinon.SinonSpy<any>;
|
||||
|
||||
let swarmPolling: SwarmPolling;
|
||||
|
||||
let clock: Sinon.SinonFakeTimers;
|
||||
beforeEach(async () => {
|
||||
// Utils Stubs
|
||||
sandbox.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber);
|
||||
|
||||
sandbox.stub(Data, 'getAllConversations').resolves(new ConversationCollection());
|
||||
sandbox.stub(Data, 'getItemById').resolves();
|
||||
sandbox.stub(Data, 'saveConversation').resolves();
|
||||
sandbox.stub(Data, 'getSwarmNodesForPubkey').resolves();
|
||||
sandbox.stub(SnodePool, 'getSwarmFor').resolves([]);
|
||||
TestUtils.stubWindow('profileImages', { removeImagesNotInArray: noop, hasImage: noop });
|
||||
TestUtils.stubWindow('inboxStore', undefined);
|
||||
const convoController = getConversationController();
|
||||
await convoController.load();
|
||||
getConversationController().getOrCreate(ourPubkey.key, ConversationTypeEnum.PRIVATE);
|
||||
|
||||
swarmPolling = getSwarmPollingInstance();
|
||||
swarmPolling.TEST_reset();
|
||||
pollOnceForKeySpy = sandbox.spy(swarmPolling, 'TEST_pollOnceForKey');
|
||||
|
||||
clock = sinon.useFakeTimers(Date.now());
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
TestUtils.restoreStubs();
|
||||
sandbox.restore();
|
||||
getConversationController().reset();
|
||||
clock.restore();
|
||||
});
|
||||
|
||||
describe('getPollingTimeout', () => {
|
||||
it('returns INACTIVE for non existing convo', () => {
|
||||
const fakeConvo = TestUtils.generateFakePubKey();
|
||||
|
||||
expect(swarmPolling.TEST_getPollingTimeout(fakeConvo)).to.eq(SWARM_POLLING_TIMEOUT.INACTIVE);
|
||||
});
|
||||
|
||||
it('returns ACTIVE for convo with less than an hour old activeAt', () => {
|
||||
const convo = getConversationController().getOrCreate(
|
||||
TestUtils.generateFakePubKeyStr(),
|
||||
ConversationTypeEnum.GROUP
|
||||
);
|
||||
convo.set('active_at', Date.now() - 3555);
|
||||
expect(swarmPolling.TEST_getPollingTimeout(PubKey.cast(convo.id))).to.eq(
|
||||
SWARM_POLLING_TIMEOUT.ACTIVE
|
||||
);
|
||||
});
|
||||
|
||||
it('returns INACTIVE for convo with undefined activeAt', () => {
|
||||
const convo = getConversationController().getOrCreate(
|
||||
TestUtils.generateFakePubKeyStr(),
|
||||
ConversationTypeEnum.GROUP
|
||||
);
|
||||
convo.set('active_at', undefined);
|
||||
expect(swarmPolling.TEST_getPollingTimeout(PubKey.cast(convo.id))).to.eq(
|
||||
SWARM_POLLING_TIMEOUT.INACTIVE
|
||||
);
|
||||
});
|
||||
|
||||
it('returns MEDIUM_ACTIVE for convo with activeAt of less than a day', () => {
|
||||
const convo = getConversationController().getOrCreate(
|
||||
TestUtils.generateFakePubKeyStr(),
|
||||
ConversationTypeEnum.GROUP
|
||||
);
|
||||
convo.set('active_at', Date.now() - 1000 * 3600 * 23);
|
||||
expect(swarmPolling.TEST_getPollingTimeout(PubKey.cast(convo.id))).to.eq(
|
||||
SWARM_POLLING_TIMEOUT.MEDIUM_ACTIVE
|
||||
);
|
||||
});
|
||||
|
||||
it('returns INACTIVE for convo with activeAt of more than a day', () => {
|
||||
const convo = getConversationController().getOrCreate(
|
||||
TestUtils.generateFakePubKeyStr(),
|
||||
ConversationTypeEnum.GROUP
|
||||
);
|
||||
convo.set('active_at', Date.now() - 1000 * 3600 * 25);
|
||||
expect(swarmPolling.TEST_getPollingTimeout(PubKey.cast(convo.id))).to.eq(
|
||||
SWARM_POLLING_TIMEOUT.INACTIVE
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('pollForAllKeys', () => {
|
||||
it('does run for our pubkey even if activeAt is really old ', async () => {
|
||||
const convo = getConversationController().getOrCreate(
|
||||
ourNumber,
|
||||
ConversationTypeEnum.PRIVATE
|
||||
);
|
||||
convo.set('active_at', Date.now() - 1000 * 3600 * 25);
|
||||
await swarmPolling.start(true);
|
||||
|
||||
expect(pollOnceForKeySpy.callCount).to.eq(1);
|
||||
expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false]);
|
||||
});
|
||||
|
||||
it('does run for our pubkey even if activeAt is recent ', async () => {
|
||||
const convo = getConversationController().getOrCreate(
|
||||
ourNumber,
|
||||
ConversationTypeEnum.PRIVATE
|
||||
);
|
||||
convo.set('active_at', Date.now());
|
||||
await swarmPolling.start(true);
|
||||
|
||||
expect(pollOnceForKeySpy.callCount).to.eq(1);
|
||||
expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false]);
|
||||
});
|
||||
|
||||
it('does run for group pubkey on start no matter the recent timestamp ', async () => {
|
||||
const convo = getConversationController().getOrCreate(
|
||||
TestUtils.generateFakePubKeyStr(),
|
||||
ConversationTypeEnum.GROUP
|
||||
);
|
||||
convo.set('active_at', Date.now());
|
||||
const groupConvoPubkey = PubKey.cast(convo.id);
|
||||
swarmPolling.addGroupId(groupConvoPubkey);
|
||||
await swarmPolling.start(true);
|
||||
|
||||
// our pubkey will be polled for, hence the 2
|
||||
expect(pollOnceForKeySpy.callCount).to.eq(2);
|
||||
expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false]);
|
||||
expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true]);
|
||||
});
|
||||
|
||||
it('does run for group pubkey on start no matter the old timestamp ', async () => {
|
||||
const convo = getConversationController().getOrCreate(
|
||||
TestUtils.generateFakePubKeyStr(),
|
||||
ConversationTypeEnum.GROUP
|
||||
);
|
||||
|
||||
convo.set('active_at', 1);
|
||||
const groupConvoPubkey = PubKey.cast(convo.id);
|
||||
swarmPolling.addGroupId(groupConvoPubkey);
|
||||
await swarmPolling.start(true);
|
||||
|
||||
// our pubkey will be polled for, hence the 2
|
||||
expect(pollOnceForKeySpy.callCount).to.eq(2);
|
||||
expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false]);
|
||||
expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true]);
|
||||
});
|
||||
|
||||
it('does run for group pubkey on start but not another time if activeAt is old ', async () => {
|
||||
const convo = getConversationController().getOrCreate(
|
||||
TestUtils.generateFakePubKeyStr(),
|
||||
ConversationTypeEnum.GROUP
|
||||
);
|
||||
|
||||
convo.set('active_at', 1);
|
||||
const groupConvoPubkey = PubKey.cast(convo.id);
|
||||
swarmPolling.addGroupId(groupConvoPubkey);
|
||||
await swarmPolling.start(true);
|
||||
|
||||
await swarmPolling.TEST_pollForAllKeys();
|
||||
|
||||
expect(pollOnceForKeySpy.callCount).to.eq(3);
|
||||
expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true]);
|
||||
expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false]);
|
||||
});
|
||||
|
||||
it('does run twice if activeAt less than one hour ', async () => {
|
||||
const convo = getConversationController().getOrCreate(
|
||||
TestUtils.generateFakePubKeyStr(),
|
||||
ConversationTypeEnum.GROUP
|
||||
);
|
||||
|
||||
convo.set('active_at', Date.now());
|
||||
const groupConvoPubkey = PubKey.cast(convo.id);
|
||||
swarmPolling.addGroupId(groupConvoPubkey);
|
||||
await swarmPolling.start(true);
|
||||
clock.tick(6000);
|
||||
// no need to do that as the tick will trigger a call in all cases after 5 secs
|
||||
// await swarmPolling.TEST_pollForAllKeys();
|
||||
|
||||
expect(pollOnceForKeySpy.callCount).to.eq(4);
|
||||
expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true]);
|
||||
expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false]);
|
||||
expect(pollOnceForKeySpy.lastCall.args).to.deep.eq([groupConvoPubkey, true]);
|
||||
});
|
||||
|
||||
it('does run once only if activeAt is more than one hour', async () => {
|
||||
const convo = getConversationController().getOrCreate(
|
||||
TestUtils.generateFakePubKeyStr(),
|
||||
ConversationTypeEnum.GROUP
|
||||
);
|
||||
|
||||
convo.set('active_at', Date.now());
|
||||
const groupConvoPubkey = PubKey.cast(convo.id);
|
||||
swarmPolling.addGroupId(groupConvoPubkey);
|
||||
await swarmPolling.start(true);
|
||||
|
||||
// more than hour old, we should not tick after just 5 seconds
|
||||
convo.set('active_at', Date.now() - 3605 * 1000);
|
||||
|
||||
clock.tick(6000);
|
||||
|
||||
expect(pollOnceForKeySpy.callCount).to.eq(3);
|
||||
expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true]);
|
||||
expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false]);
|
||||
});
|
||||
|
||||
it('does run once if activeAt is more than 1 days old ', async () => {
|
||||
const convo = getConversationController().getOrCreate(
|
||||
TestUtils.generateFakePubKeyStr(),
|
||||
ConversationTypeEnum.GROUP
|
||||
);
|
||||
|
||||
convo.set('active_at', Date.now());
|
||||
const groupConvoPubkey = PubKey.cast(convo.id);
|
||||
swarmPolling.addGroupId(groupConvoPubkey);
|
||||
await swarmPolling.start(true);
|
||||
|
||||
// more than hour old, we should not tick after just 5 seconds
|
||||
convo.set('active_at', Date.now() - 25 * 3600 * 1000);
|
||||
|
||||
clock.tick(6 * 1000); // active
|
||||
|
||||
expect(pollOnceForKeySpy.callCount).to.eq(3);
|
||||
expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true]);
|
||||
expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false]);
|
||||
});
|
||||
|
||||
describe('multiple runs', () => {
|
||||
let convo: ConversationModel;
|
||||
let groupConvoPubkey: PubKey;
|
||||
|
||||
beforeEach(async () => {
|
||||
convo = getConversationController().getOrCreate(
|
||||
TestUtils.generateFakePubKeyStr(),
|
||||
ConversationTypeEnum.GROUP
|
||||
);
|
||||
|
||||
convo.set('active_at', Date.now());
|
||||
groupConvoPubkey = PubKey.cast(convo.id);
|
||||
swarmPolling.addGroupId(groupConvoPubkey);
|
||||
await swarmPolling.start(true);
|
||||
});
|
||||
|
||||
it('does run twice if activeAt is more than 1 hour old and we tick more than one minute ', async () => {
|
||||
pollOnceForKeySpy.resetHistory();
|
||||
// more than hour old but less than a day, we should tick after just 60 seconds
|
||||
convo.set('active_at', Date.now() - 3605 * 1000);
|
||||
|
||||
clock.tick(61 * 1000); // medium_active
|
||||
|
||||
await swarmPolling.TEST_pollForAllKeys();
|
||||
expect(pollOnceForKeySpy.callCount).to.eq(3);
|
||||
// first two calls are our pubkey
|
||||
expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false]);
|
||||
expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([ourPubkey, false]);
|
||||
|
||||
expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([groupConvoPubkey, true]);
|
||||
});
|
||||
|
||||
it('does run twice if activeAt is more than 1 day old and we tick more than one hour ', async () => {
|
||||
pollOnceForKeySpy.resetHistory();
|
||||
convo.set('active_at', Date.now() - 25 * 3600 * 1000);
|
||||
|
||||
clock.tick(3700 * 1000); // inactive
|
||||
|
||||
await swarmPolling.TEST_pollForAllKeys();
|
||||
expect(pollOnceForKeySpy.callCount).to.eq(3);
|
||||
// first two calls are our pubkey
|
||||
expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false]);
|
||||
expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([ourPubkey, false]);
|
||||
expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([groupConvoPubkey, true]);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
Loading…
Reference in New Issue