fix(core): update
This commit is contained in:
@ -4,15 +4,14 @@ import * as plugins from './smartuniverse.plugins';
|
||||
* broadcasts an event to multiple channels
|
||||
* also handles subsription
|
||||
*/
|
||||
export class BroadcastEvent<T extends plugins.typedrequestInterfaces.IBroadCastEvent<any>> {
|
||||
export class BroadcastEvent<T extends plugins.typedrequestInterfaces.ITypedEvent<any>> {
|
||||
public eventSubject = new plugins.smartrx.rxjs.Subject<T['payload']>();
|
||||
|
||||
|
||||
constructor() {
|
||||
|
||||
};
|
||||
|
||||
public fire(eventArg: T['payload']) {
|
||||
public fire(eventPayloadArg: T['payload']) {
|
||||
|
||||
};
|
||||
|
||||
|
@ -1,6 +1,5 @@
|
||||
import * as plugins from './smartuniverse.plugins';
|
||||
|
||||
import { Objectmap } from '@pushrocks/lik';
|
||||
import { Observable } from 'rxjs';
|
||||
import { Smartsocket, SmartsocketClient } from '@pushrocks/smartsocket';
|
||||
import * as url from 'url';
|
||||
@ -9,6 +8,7 @@ import * as interfaces from './interfaces';
|
||||
|
||||
import { ClientUniverseChannel, ClientUniverseMessage } from './';
|
||||
import { ClientUniverseCache } from './smartuniverse.classes.clientuniversecache';
|
||||
import { logger } from './smartuniverse.logging';
|
||||
|
||||
export interface IClientOptions {
|
||||
serverAddress: string;
|
||||
@ -138,7 +138,7 @@ export class ClientUniverse {
|
||||
funcName: 'processMessage',
|
||||
allowedRoles: [],
|
||||
funcDef: async messageDescriptorArg => {
|
||||
plugins.smartlog.defaultLogger.log('info', 'Got message from server');
|
||||
logger.log('info', 'Got message from server');
|
||||
const clientUniverseMessage = ClientUniverseMessage.createMessageFromMessageDescriptor(
|
||||
messageDescriptorArg
|
||||
);
|
||||
@ -164,7 +164,7 @@ export class ClientUniverse {
|
||||
this.smartsocketClient.addSocketFunction(socketFunctionProcessMessage);
|
||||
|
||||
await this.smartsocketClient.connect();
|
||||
plugins.smartlog.defaultLogger.log('info', 'universe client connected successfully');
|
||||
logger.log('info', 'universe client connected successfully');
|
||||
await this.clientUniverseCache.channelMap.forEach(async clientUniverseChannelArg => {
|
||||
await clientUniverseChannelArg.populateSubscriptionToServer();
|
||||
});
|
||||
|
@ -7,5 +7,5 @@ import { ClientUniverseChannel } from './smartuniverse.classes.clientuniversecha
|
||||
* good for deduplication in mesh environments
|
||||
*/
|
||||
export class ClientUniverseCache {
|
||||
public channelMap = new plugins.lik.Objectmap<ClientUniverseChannel>();
|
||||
public channelMap = new plugins.lik.ObjectMap<ClientUniverseChannel>();
|
||||
}
|
||||
|
@ -35,7 +35,7 @@ export class ReactionRequest<T extends plugins.typedrequestInterfaces.ITypedRequ
|
||||
requestDataArg: T['request'],
|
||||
timeoutMillisArg = 5000
|
||||
) {
|
||||
const subscriptionMap = new plugins.lik.Objectmap<plugins.smartrx.rxjs.Subscription>();
|
||||
const subscriptionMap = new plugins.lik.ObjectMap<plugins.smartrx.rxjs.Subscription>();
|
||||
const reactionResult = new ReactionResult<T>();
|
||||
const requestId = plugins.smartunique.shortId();
|
||||
for (const channel of channelsArg) {
|
||||
|
@ -20,7 +20,7 @@ export interface IReactionResponseConstructorOptions<
|
||||
|
||||
export class ReactionResponse<T extends plugins.typedrequestInterfaces.ITypedRequest> {
|
||||
public method: T['method'];
|
||||
public channels = new plugins.lik.Objectmap<UniverseChannel | ClientUniverseChannel>();
|
||||
public channels = new plugins.lik.ObjectMap<UniverseChannel | ClientUniverseChannel>();
|
||||
public funcDef: TReactionResponseFuncDef<T>;
|
||||
|
||||
constructor(optionsArg: IReactionResponseConstructorOptions<T>) {
|
||||
|
@ -7,6 +7,7 @@ import * as paths from './smartuniverse.paths';
|
||||
|
||||
import * as interfaces from './interfaces';
|
||||
import { UniverseConnection } from './smartuniverse.classes.universeconnection';
|
||||
import { logger } from './smartuniverse.logging';
|
||||
|
||||
export interface ISmartUniverseConstructorOptions {
|
||||
messageExpiryInMilliseconds: number;
|
||||
@ -132,12 +133,12 @@ export class Universe {
|
||||
socketConnectionArg
|
||||
);
|
||||
if (universeConnection) {
|
||||
plugins.smartlog.defaultLogger.log(
|
||||
logger.log(
|
||||
'ok',
|
||||
'found UniverseConnection for socket for incoming message'
|
||||
);
|
||||
} else {
|
||||
plugins.smartlog.defaultLogger.log(
|
||||
logger.log(
|
||||
'warn',
|
||||
'found no Authorized channel for incoming message'
|
||||
);
|
||||
@ -172,7 +173,7 @@ export class Universe {
|
||||
// add smartsocket to the running smartexpress app
|
||||
await this.smartsocket.setExternalServer('smartexpress', this.smartexpressServer);
|
||||
await this.smartsocket.start();
|
||||
plugins.smartlog.defaultLogger.log('success', 'started universe');
|
||||
logger.log('success', 'started universe');
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -3,7 +3,7 @@ import * as plugins from './smartuniverse.plugins';
|
||||
import { UniverseChannel } from './smartuniverse.classes.universechannel';
|
||||
import { UniverseMessage } from './smartuniverse.classes.universemessage';
|
||||
|
||||
import { Objectmap } from '@pushrocks/lik';
|
||||
import { ObjectMap } from '@pushrocks/lik';
|
||||
|
||||
import { Observable, from } from 'rxjs';
|
||||
import { filter } from 'rxjs/operators';
|
||||
@ -24,17 +24,17 @@ export class UniverseCache {
|
||||
/**
|
||||
* stores messages for this instance
|
||||
*/
|
||||
public messageMap = new Objectmap<UniverseMessage<any>>();
|
||||
public messageMap = new ObjectMap<UniverseMessage<any>>();
|
||||
|
||||
/**
|
||||
* stores the channels that are available within the universe
|
||||
*/
|
||||
public channelMap = new Objectmap<UniverseChannel>();
|
||||
public channelMap = new ObjectMap<UniverseChannel>();
|
||||
|
||||
/**
|
||||
* stores all connections
|
||||
*/
|
||||
public connectionMap = new plugins.lik.Objectmap<UniverseConnection>();
|
||||
public connectionMap = new plugins.lik.ObjectMap<UniverseConnection>();
|
||||
|
||||
/**
|
||||
* allows messages to be processed in a blacklist mode for further analysis
|
||||
|
@ -5,6 +5,7 @@ import { UniverseCache } from './smartuniverse.classes.universecache';
|
||||
import { UniverseMessage } from './smartuniverse.classes.universemessage';
|
||||
import { UniverseConnection } from './smartuniverse.classes.universeconnection';
|
||||
import { Universe } from './smartuniverse.classes.universe';
|
||||
import { logger } from './smartuniverse.logging';
|
||||
|
||||
/**
|
||||
* enables messages to stay within a certain scope.
|
||||
@ -61,12 +62,12 @@ export class UniverseChannel {
|
||||
if (foundChannel) {
|
||||
universeMessageArg.authenticated = true;
|
||||
universeMessageArg.universeChannelList.add(foundChannel);
|
||||
plugins.smartlog.defaultLogger.log('ok', 'message authorized');
|
||||
logger.log('ok', 'message authorized');
|
||||
return foundChannel;
|
||||
} else {
|
||||
universeMessageArg.authenticated = false;
|
||||
universeMessageArg.universeChannelList.add(universeCacheArg.blackListChannel);
|
||||
plugins.smartlog.defaultLogger.log('warn', 'message not valid');
|
||||
logger.log('warn', 'message not valid');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
@ -1,13 +1,12 @@
|
||||
import * as plugins from './smartuniverse.plugins';
|
||||
import * as interfaces from './interfaces';
|
||||
|
||||
import { Objectmap } from '@pushrocks/lik';
|
||||
|
||||
import { Timer, TimeStamp } from '@pushrocks/smarttime';
|
||||
import { Universe } from './smartuniverse.classes.universe';
|
||||
import { UniverseChannel } from './smartuniverse.classes.universechannel';
|
||||
import { UniverseCache } from './smartuniverse.classes.universecache';
|
||||
import { SocketConnection } from '@pushrocks/smartsocket';
|
||||
import { logger } from './smartuniverse.logging';
|
||||
|
||||
/**
|
||||
* represents a message within a universe
|
||||
@ -40,7 +39,7 @@ export class UniverseMessage<T> implements interfaces.IUniverseMessage {
|
||||
/**
|
||||
* enables unprotected grouping of messages for efficiency purposes.
|
||||
*/
|
||||
public universeChannelList = new Objectmap<UniverseChannel>();
|
||||
public universeChannelList = new plugins.lik.ObjectMap<UniverseChannel>();
|
||||
|
||||
/**
|
||||
* wether the message is authenticated
|
||||
@ -99,6 +98,6 @@ export class UniverseMessage<T> implements interfaces.IUniverseMessage {
|
||||
* handles bad messages for further analysis
|
||||
*/
|
||||
public handleAsBadMessage() {
|
||||
plugins.smartlog.defaultLogger.log('warn', 'received a bad message');
|
||||
logger.log('warn', 'received a bad message');
|
||||
}
|
||||
}
|
||||
|
2
ts/smartuniverse.logging.ts
Normal file
2
ts/smartuniverse.logging.ts
Normal file
@ -0,0 +1,2 @@
|
||||
import * as plugins from './smartuniverse.plugins';
|
||||
export const logger = new plugins.smartlog.ConsoleLog();
|
Reference in New Issue
Block a user