fix(core): update

This commit is contained in:
Philipp Kunz 2021-01-28 02:12:22 +00:00
parent c08acd076e
commit f4d820d37e
3 changed files with 86 additions and 25 deletions

75
package-lock.json generated
View File

@ -1950,9 +1950,9 @@
} }
}, },
"@pushrocks/smartsocket": { "@pushrocks/smartsocket": {
"version": "1.2.2", "version": "1.2.6",
"resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartsocket/-/smartsocket-1.2.2.tgz", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartsocket/-/smartsocket-1.2.6.tgz",
"integrity": "sha512-qx5xqlepEGYBTNg+tLjQTgmcxjyHdaysuFLcadxPHYkPdQF13LUnnpvNOeglCW2dgPKP4lIwIOLDyecMtz2ZWw==", "integrity": "sha512-rHOs/ANrgnrt+AHuUNAOzb+X5FrtP/yaC/6qp7lQSorb6x73T5343/9TB875kI1Q3trqlwJDvJy7+uJQ7zMMhg==",
"requires": { "requires": {
"@apiglobal/typedrequest-interfaces": "^1.0.15", "@apiglobal/typedrequest-interfaces": "^1.0.15",
"@pushrocks/isohash": "^1.0.2", "@pushrocks/isohash": "^1.0.2",
@ -1960,15 +1960,31 @@
"@pushrocks/lik": "^4.0.20", "@pushrocks/lik": "^4.0.20",
"@pushrocks/smartdelay": "^2.0.10", "@pushrocks/smartdelay": "^2.0.10",
"@pushrocks/smartenv": "^4.0.16", "@pushrocks/smartenv": "^4.0.16",
"@pushrocks/smartexpress": "^3.0.99", "@pushrocks/smartexpress": "^3.0.100",
"@pushrocks/smartjson": "^4.0.5",
"@pushrocks/smartlog": "^2.0.39", "@pushrocks/smartlog": "^2.0.39",
"@pushrocks/smartpromise": "^3.1.3", "@pushrocks/smartpromise": "^3.1.3",
"@pushrocks/smartrx": "^2.0.19", "@pushrocks/smartrx": "^2.0.19",
"@pushrocks/smarttime": "^3.0.37", "@pushrocks/smarttime": "^3.0.38",
"@types/socket.io": "^2.1.12", "@types/socket.io": "^2.1.13",
"@types/socket.io-client": "^1.4.34", "@types/socket.io-client": "^1.4.35",
"socket.io": "^3.0.4", "socket.io": "^3.1.0",
"socket.io-client": "^3.0.4" "socket.io-client": "^3.1.0"
},
"dependencies": {
"@pushrocks/smarttime": {
"version": "3.0.38",
"resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarttime/-/smarttime-3.0.38.tgz",
"integrity": "sha512-oVT48eZE66OTmDALAsWkk3GXUQiqzkei7mo526UbuMN2iLY8I9WgsxmLfa8Fp4llQmocncW3WTqGyhnEOAuDgA==",
"requires": {
"@pushrocks/lik": "^4.0.17",
"@pushrocks/smartdelay": "^2.0.10",
"@pushrocks/smartpromise": "^3.0.2",
"croner": "^1.1.23",
"dayjs": "^1.9.1",
"is-nan": "^1.3.0"
}
}
} }
}, },
"@pushrocks/smartstring": { "@pushrocks/smartstring": {
@ -2036,15 +2052,30 @@
} }
}, },
"@pushrocks/tapbundle": { "@pushrocks/tapbundle": {
"version": "3.2.9", "version": "3.2.10",
"resolved": "https://verdaccio.lossless.one/@pushrocks%2ftapbundle/-/tapbundle-3.2.9.tgz", "resolved": "https://verdaccio.lossless.one/@pushrocks%2ftapbundle/-/tapbundle-3.2.10.tgz",
"integrity": "sha512-vtmYL/l7BZvAzySh7cYnnTG6CFMp5zYtowJuMAmqUjhIaQaWW1Tvbrpjp7lVwRXj2JlL/i69KcJ6RVdLItK+rA==", "integrity": "sha512-EPFSiFMx6uxWcZgANT1yDigTknVl1FCRIaiuf2AEkpg4vR5ZIZQKDIWkrFZY0ajUWJ6vCM631TmIcJvUnyWJXw==",
"requires": { "requires": {
"@pushrocks/smartdelay": "^2.0.9", "@pushrocks/smartdelay": "^2.0.10",
"@pushrocks/smartenv": "^4.0.10", "@pushrocks/smartenv": "^4.0.16",
"@pushrocks/smartpromise": "^3.0.2", "@pushrocks/smartpromise": "^3.1.3",
"@pushrocks/smarttime": "^3.0.19", "@pushrocks/smarttime": "^3.0.38",
"smartchai": "^2.0.1" "smartchai": "^2.0.1"
},
"dependencies": {
"@pushrocks/smarttime": {
"version": "3.0.38",
"resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarttime/-/smarttime-3.0.38.tgz",
"integrity": "sha512-oVT48eZE66OTmDALAsWkk3GXUQiqzkei7mo526UbuMN2iLY8I9WgsxmLfa8Fp4llQmocncW3WTqGyhnEOAuDgA==",
"requires": {
"@pushrocks/lik": "^4.0.17",
"@pushrocks/smartdelay": "^2.0.10",
"@pushrocks/smartpromise": "^3.0.2",
"croner": "^1.1.23",
"dayjs": "^1.9.1",
"is-nan": "^1.3.0"
}
}
} }
}, },
"@pushrocks/webrequest": { "@pushrocks/webrequest": {
@ -2418,9 +2449,9 @@
"dev": true "dev": true
}, },
"@types/socket.io": { "@types/socket.io": {
"version": "2.1.12", "version": "2.1.13",
"resolved": "https://verdaccio.lossless.one/@types%2fsocket.io/-/socket.io-2.1.12.tgz", "resolved": "https://verdaccio.lossless.one/@types%2fsocket.io/-/socket.io-2.1.13.tgz",
"integrity": "sha512-oStc5VFkpb0AsjOxQUj9ztX5Iziatyla/rjZTYbFGoVrrKwd+JU2mtxk7iSl5RGYx9WunLo6UXW1fBzQok/ZyA==", "integrity": "sha512-JRgH3nCgsWel4OPANkhH8TelpXvacAJ9VeryjuqCDiaVDMpLysd6sbt0dr6Z15pqH3p2YpOT3T1C5vQ+O/7uyg==",
"requires": { "requires": {
"@types/engine.io": "*", "@types/engine.io": "*",
"@types/node": "*", "@types/node": "*",
@ -8134,9 +8165,9 @@
"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
}, },
"pathval": { "pathval": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://verdaccio.lossless.one/pathval/-/pathval-1.1.0.tgz", "resolved": "https://verdaccio.lossless.one/pathval/-/pathval-1.1.1.tgz",
"integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=" "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ=="
}, },
"pbkdf2": { "pbkdf2": {
"version": "3.1.1", "version": "3.1.1",

View File

@ -15,7 +15,7 @@
"@gitzone/tsbuild": "^2.1.25", "@gitzone/tsbuild": "^2.1.25",
"@gitzone/tsbundle": "^1.0.78", "@gitzone/tsbundle": "^1.0.78",
"@gitzone/tstest": "^1.0.44", "@gitzone/tstest": "^1.0.44",
"@pushrocks/tapbundle": "^3.2.9", "@pushrocks/tapbundle": "^3.2.10",
"@types/node": "^14.14.22", "@types/node": "^14.14.22",
"tslint": "^6.1.3", "tslint": "^6.1.3",
"tslint-config-prettier": "^1.15.0" "tslint-config-prettier": "^1.15.0"
@ -25,7 +25,7 @@
"@apiglobal/typedrequest-interfaces": "^1.0.15", "@apiglobal/typedrequest-interfaces": "^1.0.15",
"@pushrocks/isohash": "^1.0.2", "@pushrocks/isohash": "^1.0.2",
"@pushrocks/smartexpress": "^3.0.100", "@pushrocks/smartexpress": "^3.0.100",
"@pushrocks/smartsocket": "^1.2.2", "@pushrocks/smartsocket": "^1.2.6",
"@pushrocks/smartstring": "^3.0.24" "@pushrocks/smartstring": "^3.0.24"
}, },
"browserslist": [ "browserslist": [

View File

@ -4,6 +4,8 @@ import type * as smartexpress from '@pushrocks/smartexpress';
const publicRoleName = 'publicRoleName'; const publicRoleName = 'publicRoleName';
const publicRolePass = 'publicRolePass'; const publicRolePass = 'publicRolePass';
export type TTypedSocketSide = 'server' | 'client';
export class TypedSocket { export class TypedSocket {
// STATIC // STATIC
/** /**
@ -35,6 +37,7 @@ export class TypedSocket {
}) })
); );
const typedsocket = new TypedSocket( const typedsocket = new TypedSocket(
'server',
typedrouterArg, typedrouterArg,
async <T extends plugins.typedrequestInterfaces.ITypedRequest>( async <T extends plugins.typedrequestInterfaces.ITypedRequest>(
dataArg: T, dataArg: T,
@ -91,6 +94,7 @@ export class TypedSocket {
}) })
); );
const typedsocket = new TypedSocket( const typedsocket = new TypedSocket(
'client',
typedrouterArg, typedrouterArg,
async <T extends plugins.typedrequestInterfaces.ITypedRequest>(dataArg: T): Promise<T> => { async <T extends plugins.typedrequestInterfaces.ITypedRequest>(dataArg: T): Promise<T> => {
const response: T = (smartsocketClient.serverCall('processMessage', dataArg) as any) as T; const response: T = (smartsocketClient.serverCall('processMessage', dataArg) as any) as T;
@ -105,6 +109,7 @@ export class TypedSocket {
} }
// INSTANCE // INSTANCE
public side: TTypedSocketSide;
public typedrouter: plugins.typedrequest.TypedRouter; public typedrouter: plugins.typedrequest.TypedRouter;
private postMethod: plugins.typedrequest.IPostMethod & private postMethod: plugins.typedrequest.IPostMethod &
(( ((
@ -113,15 +118,28 @@ export class TypedSocket {
) => Promise<plugins.typedrequestInterfaces.ITypedRequest>); ) => Promise<plugins.typedrequestInterfaces.ITypedRequest>);
private socketServerOrClient: plugins.smartsocket.Smartsocket | plugins.smartsocket.SmartsocketClient; private socketServerOrClient: plugins.smartsocket.Smartsocket | plugins.smartsocket.SmartsocketClient;
constructor( constructor(
sideArg: TTypedSocketSide,
typedrouterArg: plugins.typedrequest.TypedRouter, typedrouterArg: plugins.typedrequest.TypedRouter,
postMethodArg: plugins.typedrequest.IPostMethod, postMethodArg: plugins.typedrequest.IPostMethod,
socketServerOrClientArg: plugins.smartsocket.Smartsocket | plugins.smartsocket.SmartsocketClient socketServerOrClientArg: plugins.smartsocket.Smartsocket | plugins.smartsocket.SmartsocketClient
) { ) {
this.side = sideArg;
this.typedrouter = typedrouterArg; this.typedrouter = typedrouterArg;
this.postMethod = postMethodArg; this.postMethod = postMethodArg;
this.socketServerOrClient = socketServerOrClientArg; this.socketServerOrClient = socketServerOrClientArg;
} }
public addTag(keyArg: string, payloadArg: any) {
if (this.side === 'client' && this.socketServerOrClient instanceof plugins.smartsocket.SmartsocketClient) {
this.socketServerOrClient.socketConnection.addTag({
id: keyArg,
payload: payloadArg
})
} else {
throw new Error('tagging is only supported on clients');
}
}
public createTypedRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>( public createTypedRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(
methodName: T['method'], methodName: T['method'],
targetConnection?: plugins.smartsocket.SocketConnection targetConnection?: plugins.smartsocket.SocketConnection
@ -148,10 +166,22 @@ export class TypedSocket {
} }
} }
} else { } else {
console.warn('this method >>findTargetConnection<< is only available from the server'); throw new Error('this method >>findTargetConnection<< is only available from the server');
} }
} }
public async findTargetConnectionByTag(keyArg: string, payload?: any) {
this.findTargetConnection(socketConnectionArg => {
let result: boolean;
if (!payload) {
result = !!socketConnectionArg.getTagById('keyArg')
} else {
result = !!socketConnectionArg.getTagById('keyArg') === payload;
}
return result;
})
}
public async stop() { public async stop() {
await this.socketServerOrClient.stop() await this.socketServerOrClient.stop()
} }