push.rocks/smartuniverse
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): update

Browse Source
This commit is contained in:
Philipp Kunz 2019-09-17 15:40:54 +02:00
parent 9a142175aa
commit 23df304535
5 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/test.ts
View File

@ -77,8 +77,10 @@ tap.test('should receive a message correctly', async (tools) => {
const testChannel = testClientUniverse.getChannel(testChannelData.channelName); const testChannel = testClientUniverse.getChannel(testChannelData.channelName);
const testChannel2 = testClientUniverse2.getChannel(testChannelData.channelName); const testChannel2 = testClientUniverse2.getChannel(testChannelData.channelName);
const subscription = testChannel2.subscribe(messageArg => { const subscription = testChannel2.subscribe(messageArg => {
console.log('Yay##########'); if (messageArg.messageText === 'hellothere') {
done.resolve(); console.log('Yay##########');
done.resolve();
}
}); });
await testChannel.sendMessage({ await testChannel.sendMessage({
messageText: 'hellothere' messageText: 'hellothere'
@ -117,11 +119,12 @@ tap.test('ReactionRequest and ReactionResponse should work', async () => {
console.log(result); console.log(result);
}); });
tap.test('should disconnect the client correctly', async () => { tap.test('should disconnect the client correctly', async (tools) => {
await testClientUniverse.stop(); await testClientUniverse.stop();
await testClientUniverse2.stop();
}); });
tap.test('should end the server correctly', async tools => { tap.test('should end the server correctly', async (tools) => {
await testUniverse.stopServer(); await testUniverse.stopServer();
}); });

1
ts/smartuniverse.classes.universe.ts
View File

@ -178,6 +178,7 @@ export class Universe {
* stop everything * stop everything
*/ */
public async stopServer() { public async stopServer() {
console.log('hi');
await this.smartsocket.stop(); await this.smartsocket.stop();
if (!this.options.externalServer) { if (!this.options.externalServer) {
await this.smartexpressServer.stop(); await this.smartexpressServer.stop();

2
ts/smartuniverse.classes.universecache.ts
View File

@ -19,7 +19,7 @@ export class UniverseCache {
// INSTANCE // INSTANCE
// ======== // ========
public standardMessageExpiry: number; public standardMessageExpiry: number;
public destructionTime: number = 60000; public destructionTime: number = 10000;
/** /**
* stores messages for this instance * stores messages for this instance

2
ts/smartuniverse.classes.universechannel.ts
View File

@ -163,6 +163,6 @@ export class UniverseChannel {
passphrase: this.passphrase, passphrase: this.passphrase,
timestamp: Date.now() timestamp: Date.now()
}); });
this.push(messageToSend); this.universeRef.universeCache.addMessage(messageToSend);
} }
} }

25
ts/smartuniverse.classes.universemessage.ts
View File

@ -64,7 +64,7 @@ export class UniverseMessage<T> implements interfaces.IUniverseMessage {
this.passphrase = messageDescriptor.passphrase; this.passphrase = messageDescriptor.passphrase;
this.payload = messageDescriptor.payload; this.payload = messageDescriptor.payload;
// prevent memory issues // prevent memory issues
this.fallBackDestruction(); this.setDestructionTimer();
} }
public setUniverseCache(universeCacheArg: UniverseCache) { public setUniverseCache(universeCacheArg: UniverseCache) {
@ -73,17 +73,23 @@ export class UniverseMessage<T> implements interfaces.IUniverseMessage {
public setTargetChannel() {} public setTargetChannel() {}
public setDestructionTimer(selfdestructAfterArg: number) { public setDestructionTimer(selfdestructAfterArg?: number) {
if (selfdestructAfterArg) { if (selfdestructAfterArg) {
this.destructionTimer = new Timer(selfdestructAfterArg); this.destructionTimer = new Timer(selfdestructAfterArg);
this.destructionTimer.start(); this.destructionTimer.start();
// set up self destruction by removing this from the parent messageCache // set up self destruction by removing this from the parent messageCache
this.destructionTimer.completed.then(async () => { this.destructionTimer.completed.then(async () => {
this.universeCache.messageMap.remove(this); this.universeCache.messageMap.remove(this);
}).catch(err => {
console.log(err);
console.log(this);
}); });
} else { } else {
this.fallBackDestruction(); plugins.smartdelay.delayFor(1000).then(() => {
if (!this.destructionTimer) {
this.setDestructionTimer(6000);
}
});
} }
} }
@ -93,15 +99,4 @@ export class UniverseMessage<T> implements interfaces.IUniverseMessage {
public handleAsBadMessage() { public handleAsBadMessage() {
plugins.smartlog.defaultLogger.log('warn', 'received a bad message'); plugins.smartlog.defaultLogger.log('warn', 'received a bad message');
} }
/**
* prevents memory leaks if channels have no default
*/
private fallBackDestruction() {
plugins.smartdelay.delayFor(1000).then(() => {
if (!this.destructionTimer) {
this.setDestructionTimer(6000);
}
});
}
} }