fix(core): update

This commit is contained in:
Philipp Kunz 2019-09-10 18:03:46 +02:00
parent da6b7724b8
commit f9f0fc45e2
6 changed files with 24 additions and 12 deletions

View File

@ -69,9 +69,22 @@ tap.test('a second client should be able to subscibe', async () => {
});
testClientUniverse2.addChannel(testChannelData.channelName, testChannelData.channelPass);
await testClientUniverse2.start();
});
tap.test('should receive a message correctly', async () => {});
tap.test('should receive a message correctly', async (tools) => {
const done = tools.defer();
const testChannel = testClientUniverse.getChannel(testChannelData.channelName);
const testChannel2 = testClientUniverse2.getChannel(testChannelData.channelName);
const subscription = await testChannel2.subscribe(messageArg => {
console.log('Yay##########');
done.resolve();
});
await testChannel.sendMessage({
messageText: 'hellothere'
});
await done.promise;
});
tap.test('should disconnect the client correctly', async () => {
await testClientUniverse.stop();

View File

@ -1,9 +1,3 @@
export type IServerCallActions =
| 'channelSubscription'
| 'processMessage'
| 'channelUnsubscribe'
| 'terminateConnection';
export interface IServerUnsubscribeActionPayload {
name: string;
}

View File

@ -53,7 +53,7 @@ export class ClientUniverseChannel implements interfaces.IUniverseChannel {
* subscribes to a channel
* tells the universe about this instances interest into a channel
*/
public async subscribe(observerArg?: plugins.smartrx.rxjs.Observer<any>) {
public async subscribe(observingFunctionArg?: (messageArg: ClientUniverseMessage) => void) {
// lets make sure the channel is connected
if (this.status === 'unsubscribed') {
const response = await this.clientUniverseRef.smartsocketClient.serverCall<
@ -65,8 +65,10 @@ export class ClientUniverseChannel implements interfaces.IUniverseChannel {
this.status = response.subscriptionStatus;
}
if (observerArg) {
return this.subject.subscribe(observerArg);
if (observingFunctionArg) {
return this.subject.subscribe(messageArg => {
observingFunctionArg(messageArg);
},error => console.log);
}
}

View File

@ -1,3 +1,5 @@
import * as plugins from './smartuniverse.plugins';
export class ReactionResponse {}
export class ReactionResponse {
}

View File

@ -117,7 +117,7 @@ export class UniverseChannel {
public async push(messageArg: UniverseMessage) {
this.subject.next(messageArg);
const universeConnectionsWithChannelAccess: UniverseConnection[] = [];
this.universeRef.universeCache.connectionMap.forEach(async socketConnection => {
await this.universeRef.universeCache.connectionMap.forEach(async socketConnection => {
if (socketConnection.authenticatedChannels.includes(this)) {
universeConnectionsWithChannelAccess.push(socketConnection);
}

View File

@ -26,6 +26,7 @@ export class UniverseConnection {
universeConnection
);
universeRef.universeCache.connectionMap.add(universeConnection);
console.log('hi')
}
/**