diff --git a/package-lock.json b/package-lock.json index 59834ab..56550a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1210,9 +1210,9 @@ } }, "@gitzone/tstest": { - "version": "1.0.44", - "resolved": "https://verdaccio.lossless.one/@gitzone%2ftstest/-/tstest-1.0.44.tgz", - "integrity": "sha512-IzQ9mEboN17Vgm/ecW2GtJa8FsnxDawD0PTeWfvtFbS4KNcqOxVM/gkkO7H4f1eJuzDaMvKWlsjBt2DBRhKqSg==", + "version": "1.0.48", + "resolved": "https://verdaccio.lossless.one/@gitzone%2ftstest/-/tstest-1.0.48.tgz", + "integrity": "sha512-BfB8p/ApUdjkFHgpjR4UucBn8BMkEUM9LsyZJW9jkeZI2NNTiU2JV/67WcCf/sNmk5L4TqbaBMiiPSUHc2EEyg==", "dev": true, "requires": { "@gitzone/tsbundle": "^1.0.78", @@ -1222,7 +1222,7 @@ "@pushrocks/smartdelay": "^2.0.10", "@pushrocks/smartexpress": "^3.0.76", "@pushrocks/smartfile": "^8.0.0", - "@pushrocks/smartlog": "^2.0.36", + "@pushrocks/smartlog": "^2.0.39", "@pushrocks/smartpromise": "^3.0.6", "@pushrocks/smartshell": "^2.0.25", "@pushrocks/tapbundle": "^3.2.9", @@ -1339,6 +1339,27 @@ "@pushrocks/smartpromise": "^3.0.6" } }, + "@pushrocks/isohash": { + "version": "1.0.2", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fisohash/-/isohash-1.0.2.tgz", + "integrity": "sha512-TeXlktpAoLFDeXFJyhHTUOIiaZQ2oSdtEdbVt8/sA3lBMBfu+BXgfq5RLvQnqCDFpWKGmu9hn0P5NNK6zXQUkw==", + "requires": { + "@pushrocks/smartenv": "^4.0.11", + "@pushrocks/smarthash": "^2.1.6" + }, + "dependencies": { + "@pushrocks/smartenv": { + "version": "4.0.13", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartenv/-/smartenv-4.0.13.tgz", + "integrity": "sha512-6H9bBRrU8lKzIw2G+Cu6gUzIw2Gn/oYHY6gzxAzsozcUQG6tKKM5tU+A12FgVgOiVDDoki+h8LfDu2D85wqq8A==", + "requires": { + "@pushrocks/smartparam": "^1.1.6", + "@pushrocks/smartpromise": "^3.0.6", + "@types/node": "^14.11.2" + } + } + } + }, "@pushrocks/isounique": { "version": "1.0.4", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fisounique/-/isounique-1.0.4.tgz", @@ -1827,7 +1848,6 @@ "version": "1.1.6", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartparam/-/smartparam-1.1.6.tgz", "integrity": "sha512-1El/F2QTWYDGy4Nh6vz9Ry1JVg1FEeyexB7Uvi4zHElpXYVxwso6xImRTLj+SW50JAg7nwEZ+ljkzTG9XvnwWA==", - "dev": true, "requires": { "@pushrocks/smartpromise": "^3.0.6", "is-promise": "^2.1.0", @@ -1910,9 +1930,9 @@ } }, "@pushrocks/smartrequest": { - "version": "1.1.49", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrequest/-/smartrequest-1.1.49.tgz", - "integrity": "sha512-LBzUoPZvtp5s0cjm4tIoA0IrKX3O0OBKkLdi7W7juQx3TI2JJP5cEYEzxTxTGUGYoWpmy10w18bA3iDx7qJ0Qg==", + "version": "1.1.51", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrequest/-/smartrequest-1.1.51.tgz", + "integrity": "sha512-RJUvo7MEIAm+gFueJrmf8LcpVals5jp7PgOZ+ebGTvDoVwCpor0Z6nmJDOs9ykjFCIvvPhfiterQeb6hJr2uDw==", "requires": { "@pushrocks/smartpromise": "^3.0.6", "agentkeepalive": "^4.1.3", @@ -1944,23 +1964,37 @@ } }, "@pushrocks/smartsocket": { - "version": "1.1.60", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartsocket/-/smartsocket-1.1.60.tgz", - "integrity": "sha512-+1xFjRoovGiL1ijd4OTJyd8pS+bGu+f0p28IS7Kg9DbnmcSxWLU33RhUWaw6ywFnjHjSlsqDd8GMGeQCnLV4Bg==", + "version": "1.1.63", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartsocket/-/smartsocket-1.1.63.tgz", + "integrity": "sha512-ed0JabIzEUDBFie/PlMs7Oh5URbULhdaS4UPKXU6Rj9573sf4i7JuwRdgO+8ozR+jfnE3+fg2gDnJWeG4YUcGg==", "requires": { "@apiglobal/typedrequest-interfaces": "^1.0.15", + "@pushrocks/isohash": "^1.0.2", + "@pushrocks/isounique": "^1.0.4", "@pushrocks/lik": "^4.0.17", "@pushrocks/smartdelay": "^2.0.10", + "@pushrocks/smartenv": "^4.0.13", "@pushrocks/smartexpress": "^3.0.76", - "@pushrocks/smarthash": "^2.1.6", "@pushrocks/smartlog": "^2.0.39", "@pushrocks/smartpromise": "^3.0.6", "@pushrocks/smartrx": "^2.0.19", - "@pushrocks/smartunique": "^3.0.3", + "@pushrocks/smarttime": "^3.0.35", "@types/socket.io": "^2.1.11", "@types/socket.io-client": "^1.4.33", "socket.io": "^2.3.0", "socket.io-client": "^2.3.0" + }, + "dependencies": { + "@pushrocks/smartenv": { + "version": "4.0.13", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartenv/-/smartenv-4.0.13.tgz", + "integrity": "sha512-6H9bBRrU8lKzIw2G+Cu6gUzIw2Gn/oYHY6gzxAzsozcUQG6tKKM5tU+A12FgVgOiVDDoki+h8LfDu2D85wqq8A==", + "requires": { + "@pushrocks/smartparam": "^1.1.6", + "@pushrocks/smartpromise": "^3.0.6", + "@types/node": "^14.11.2" + } + } } }, "@pushrocks/smartstring": { @@ -2293,9 +2327,9 @@ } }, "@types/puppeteer": { - "version": "2.1.4", - "resolved": "https://verdaccio.lossless.one/@types%2fpuppeteer/-/puppeteer-2.1.4.tgz", - "integrity": "sha512-IlJgM1wYKhRTuk5kT39KXCB+O1SQcCKEQTmjC2ilKnc2c76BpyKsdAO1kgaXRp5zeA6uZ5m4X2fdJsX7+u/iKg==", + "version": "2.1.5", + "resolved": "https://verdaccio.lossless.one/@types%2fpuppeteer/-/puppeteer-2.1.5.tgz", + "integrity": "sha512-ZZKAcX5XVEtSK+CLxz6FhofPt8y1D3yDtjGZHDFBZ4bGe8v2aaS6qBDHY4crruvpb4jsO7HKrPEx39IIqsZAUg==", "dev": true, "requires": { "@types/node": "*" @@ -3147,13 +3181,13 @@ } }, "browserslist": { - "version": "4.14.4", - "resolved": "https://verdaccio.lossless.one/browserslist/-/browserslist-4.14.4.tgz", - "integrity": "sha512-7FOuawafVdEwa5Jv4nzeik/PepAjVte6HmVGHsjt2bC237jeL9QlcTBDF3PnHEvcC6uHwLGYPwZHNZMB7wWAnw==", + "version": "4.14.5", + "resolved": "https://verdaccio.lossless.one/browserslist/-/browserslist-4.14.5.tgz", + "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==", "dev": true, "requires": { "caniuse-lite": "^1.0.30001135", - "electron-to-chromium": "^1.3.570", + "electron-to-chromium": "^1.3.571", "escalade": "^3.1.0", "node-releases": "^1.1.61" } @@ -3325,9 +3359,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001135", - "resolved": "https://verdaccio.lossless.one/caniuse-lite/-/caniuse-lite-1.0.30001135.tgz", - "integrity": "sha512-ziNcheTGTHlu9g34EVoHQdIu5g4foc8EsxMGC7Xkokmvw0dqNtX8BS8RgCgFBaAiSp2IdjvBxNdh0ssib28eVQ==", + "version": "1.0.30001137", + "resolved": "https://verdaccio.lossless.one/caniuse-lite/-/caniuse-lite-1.0.30001137.tgz", + "integrity": "sha512-54xKQZTqZrKVHmVz0+UvdZR6kQc7pJDgfhsMYDG19ID1BWoNnDMFm5Q3uSBSU401pBvKYMsHAt9qhEDcxmk8aw==", "dev": true }, "caseless": { @@ -4588,9 +4622,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.571", - "resolved": "https://verdaccio.lossless.one/electron-to-chromium/-/electron-to-chromium-1.3.571.tgz", - "integrity": "sha512-UYEQ2Gtc50kqmyOmOVtj6Oqi38lm5yRJY3pLuWt6UIot0No1L09uu6Ja6/1XKwmz/p0eJFZTUZi+khd1PV1hHA==", + "version": "1.3.576", + "resolved": "https://verdaccio.lossless.one/electron-to-chromium/-/electron-to-chromium-1.3.576.tgz", + "integrity": "sha512-uSEI0XZ//5ic+0NdOqlxp0liCD44ck20OAGyLMSymIWTEAtHKVJi6JM18acOnRgUgX7Q65QqnI+sNncNvIy8ew==", "dev": true }, "elliptic": { @@ -4832,7 +4866,7 @@ }, "esutils": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "resolved": "https://verdaccio.lossless.one/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true }, @@ -6573,9 +6607,9 @@ "dev": true }, "ip-regex": { - "version": "4.1.0", - "resolved": "https://verdaccio.lossless.one/ip-regex/-/ip-regex-4.1.0.tgz", - "integrity": "sha512-pKnZpbgCTfH/1NLIlOduP/V+WRXzC2MOz3Qo8xmxk8C5GudJLgK5QyLVXOSWy3ParAH7Eemurl3xjv/WXYFvMA==", + "version": "4.2.0", + "resolved": "https://verdaccio.lossless.one/ip-regex/-/ip-regex-4.2.0.tgz", + "integrity": "sha512-n5cDDeTWWRwK1EBoWwRti+8nP4NbytBBY0pldmnIkq6Z55KNFmWofh4rl9dPZpj+U/nVq7gweR3ylrvMt4YZ5A==", "dev": true }, "ipaddr.js": { @@ -8278,9 +8312,9 @@ "dev": true }, "postcss": { - "version": "7.0.34", - "resolved": "https://verdaccio.lossless.one/postcss/-/postcss-7.0.34.tgz", - "integrity": "sha512-H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw==", + "version": "7.0.35", + "resolved": "https://verdaccio.lossless.one/postcss/-/postcss-7.0.35.tgz", + "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -8733,9 +8767,9 @@ } }, "postcss-selector-parser": { - "version": "6.0.3", - "resolved": "https://verdaccio.lossless.one/postcss-selector-parser/-/postcss-selector-parser-6.0.3.tgz", - "integrity": "sha512-0ClFaY4X1ra21LRqbW6y3rUbWcxnSVkDFG57R7Nxus9J9myPFlv+jYDMohzpkBx0RrjjiqjtycpchQ+PLGmZ9w==", + "version": "6.0.4", + "resolved": "https://verdaccio.lossless.one/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz", + "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==", "dev": true, "requires": { "cssesc": "^3.0.0", @@ -10784,9 +10818,9 @@ "dev": true }, "uglify-js": { - "version": "3.10.4", - "resolved": "https://verdaccio.lossless.one/uglify-js/-/uglify-js-3.10.4.tgz", - "integrity": "sha512-kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw==", + "version": "3.11.0", + "resolved": "https://verdaccio.lossless.one/uglify-js/-/uglify-js-3.11.0.tgz", + "integrity": "sha512-e1KQFRCpOxnrJsJVqDUCjURq+wXvIn7cK2sRAx9XL3HYLL9aezOP4Pb1+Y3/o693EPk111Yj2Q+IUXxcpHlygQ==", "dev": true }, "uncss": { diff --git a/package.json b/package.json index 67a54a0..d0d715d 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ }, "devDependencies": { "@gitzone/tsbuild": "^2.1.25", - "@gitzone/tstest": "^1.0.44", + "@gitzone/tstest": "^1.0.48", "@pushrocks/tapbundle": "^3.2.9", "@types/node": "^14.11.2", "tslint": "^6.1.3", @@ -33,9 +33,9 @@ "@pushrocks/smarthash": "^2.1.6", "@pushrocks/smartlog": "^2.0.39", "@pushrocks/smartpromise": "^3.0.6", - "@pushrocks/smartrequest": "^1.1.49", + "@pushrocks/smartrequest": "^1.1.51", "@pushrocks/smartrx": "^2.0.19", - "@pushrocks/smartsocket": "^1.1.60", + "@pushrocks/smartsocket": "^1.1.63", "@pushrocks/smarttime": "^3.0.35", "@pushrocks/smartunique": "^3.0.3" }, diff --git a/test/test.ts b/test/test.ts index f58d18a..646592b 100644 --- a/test/test.ts +++ b/test/test.ts @@ -55,7 +55,7 @@ tap.test('should get a observable correctly', async () => { }); tap.test('should send a message correctly', async () => { - await testClientUniverse.getChannel(testChannelData.channelName).sendMessage({ + await testClientUniverse.getChannel(testChannelData.channelName).postMessage({ messageText: 'hello', }); }); @@ -84,7 +84,7 @@ tap.test('should receive a message correctly', async (tools) => { done.resolve(); } }); - await testChannel.sendMessage({ + await testChannel.postMessage({ messageText: 'hellothere', }); await done.promise; diff --git a/ts/index.ts b/ts/index.ts index 9bb27f7..4615e08 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -1,7 +1,7 @@ // Client classes -export * from './smartuniverse.classes.clientuniverse'; -export * from './smartuniverse.classes.clientuniversechannel'; -export * from './smartuniverse.classes.clientuniversemessage'; +export * from './smartuniverse.classes.client.universe'; +export * from './smartuniverse.classes.client.universechannel'; +export * from './smartuniverse.classes.client.universemessage'; // Server classes export * from './smartuniverse.classes.universe'; @@ -10,7 +10,7 @@ export * from './smartuniverse.classes.universechannel'; export * from './smartuniverse.classes.universemessage'; // Reaction Response -export * from './smartuniverse.classes.reactionrequest'; -export * from './smartuniverse.classes.reactionresponse'; +export * from './smartuniverse.classes.event.reactionrequest'; +export * from './smartuniverse.classes.event.reactionresponse'; export * from './interfaces'; diff --git a/ts/smartuniverse.classes.clientuniverse.ts b/ts/smartuniverse.classes.client.universe.ts similarity index 98% rename from ts/smartuniverse.classes.clientuniverse.ts rename to ts/smartuniverse.classes.client.universe.ts index 3282a59..c8cf424 100644 --- a/ts/smartuniverse.classes.clientuniverse.ts +++ b/ts/smartuniverse.classes.client.universe.ts @@ -6,8 +6,8 @@ import * as url from 'url'; import * as interfaces from './interfaces'; -import { ClientUniverseChannel, ClientUniverseMessage } from './'; -import { ClientUniverseCache } from './smartuniverse.classes.clientuniversecache'; +import { ClientUniverseChannel, ClientUniverseMessage } from '.'; +import { ClientUniverseCache } from './smartuniverse.classes.client.universecache'; import { logger } from './smartuniverse.logging'; export interface IClientOptions { diff --git a/ts/smartuniverse.classes.clientuniversecache.ts b/ts/smartuniverse.classes.client.universecache.ts similarity index 93% rename from ts/smartuniverse.classes.clientuniversecache.ts rename to ts/smartuniverse.classes.client.universecache.ts index dd16986..e6c7eed 100644 --- a/ts/smartuniverse.classes.clientuniversecache.ts +++ b/ts/smartuniverse.classes.client.universecache.ts @@ -1,5 +1,5 @@ import * as plugins from './smartuniverse.plugins'; -import { ClientUniverseChannel } from './smartuniverse.classes.clientuniversechannel'; +import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel'; /** * a cache for clients diff --git a/ts/smartuniverse.classes.clientuniversechannel.ts b/ts/smartuniverse.classes.client.universechannel.ts similarity index 90% rename from ts/smartuniverse.classes.clientuniversechannel.ts rename to ts/smartuniverse.classes.client.universechannel.ts index 91b36cf..5bfb7e6 100644 --- a/ts/smartuniverse.classes.clientuniversechannel.ts +++ b/ts/smartuniverse.classes.client.universechannel.ts @@ -1,10 +1,10 @@ import * as plugins from './smartuniverse.plugins'; import * as interfaces from './interfaces'; -import { ClientUniverse } from './'; -import { ClientUniverseMessage } from './smartuniverse.classes.clientuniversemessage'; -import { ReactionRequest } from './smartuniverse.classes.reactionrequest'; -import { ReactionResponse } from './smartuniverse.classes.reactionresponse'; +import { ClientUniverse } from '.'; +import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage'; +import { ReactionRequest } from './smartuniverse.classes.event.reactionrequest'; +import { ReactionResponse } from './smartuniverse.classes.event.reactionresponse'; export class ClientUniverseChannel implements interfaces.IUniverseChannel { // ====== @@ -87,7 +87,7 @@ export class ClientUniverseChannel implements interfaces.IUniverseChannel { * sends a message towards the server * @param messageArg */ - public async sendMessage(messageArg: interfaces.IMessageCreator) { + public async postMessage(messageArg: interfaces.IMessageCreator) { await this.clientUniverseRef.start(); // its ok to call this multiple times const universeMessageToSend: interfaces.IUniverseMessage = { id: plugins.smartunique.shortId(), diff --git a/ts/smartuniverse.classes.clientuniversemessage.ts b/ts/smartuniverse.classes.client.universemessage.ts similarity index 100% rename from ts/smartuniverse.classes.clientuniversemessage.ts rename to ts/smartuniverse.classes.client.universemessage.ts diff --git a/ts/smartuniverse.classes.broadcastevent.ts b/ts/smartuniverse.classes.event.broadcastevent.ts similarity index 94% rename from ts/smartuniverse.classes.broadcastevent.ts rename to ts/smartuniverse.classes.event.broadcastevent.ts index 399ff61..b5f4135 100644 --- a/ts/smartuniverse.classes.broadcastevent.ts +++ b/ts/smartuniverse.classes.event.broadcastevent.ts @@ -2,7 +2,7 @@ import * as plugins from './smartuniverse.plugins'; /** * broadcasts an event to multiple channels - * also handles subsription + * also handles subscription */ export class BroadcastEvent> { public eventSubject = new plugins.smartrx.rxjs.Subject(); diff --git a/ts/smartuniverse.classes.reactionrequest.ts b/ts/smartuniverse.classes.event.reactionrequest.ts similarity index 94% rename from ts/smartuniverse.classes.reactionrequest.ts rename to ts/smartuniverse.classes.event.reactionrequest.ts index 466f914..5b4c911 100644 --- a/ts/smartuniverse.classes.reactionrequest.ts +++ b/ts/smartuniverse.classes.event.reactionrequest.ts @@ -1,9 +1,9 @@ import * as plugins from './smartuniverse.plugins'; import { UniverseChannel } from './smartuniverse.classes.universechannel'; -import { ClientUniverseChannel } from './smartuniverse.classes.clientuniversechannel'; -import { ReactionResult } from './smartuniverse.classes.reactionresult'; +import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel'; +import { ReactionResult } from './smartuniverse.classes.event.reactionresult'; import { UniverseMessage } from './smartuniverse.classes.universemessage'; -import { ClientUniverseMessage } from './smartuniverse.classes.clientuniversemessage'; +import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage'; export interface IReactionRequestConstructorOptions< T extends plugins.typedrequestInterfaces.ITypedRequest @@ -67,7 +67,7 @@ export class ReactionRequest = ( dataArg: T['request'] @@ -54,7 +54,7 @@ export class ReactionResponse { private resultReplaySubject = new plugins.smartrx.rxjs.ReplaySubject(); diff --git a/ts/smartuniverse.classes.universecache.ts b/ts/smartuniverse.classes.universecache.ts index e27c33b..2378206 100644 --- a/ts/smartuniverse.classes.universecache.ts +++ b/ts/smartuniverse.classes.universecache.ts @@ -7,7 +7,6 @@ import { ObjectMap } from '@pushrocks/lik'; import { Observable, from } from 'rxjs'; import { filter } from 'rxjs/operators'; -import { rxjs } from '@pushrocks/smartrx'; import { UniverseConnection } from './smartuniverse.classes.universeconnection'; import { Universe } from './smartuniverse.classes.universe'; diff --git a/ts/smartuniverse.classes.universechannel.ts b/ts/smartuniverse.classes.universechannel.ts index 297dd43..6cb96e5 100644 --- a/ts/smartuniverse.classes.universechannel.ts +++ b/ts/smartuniverse.classes.universechannel.ts @@ -155,7 +155,7 @@ export class UniverseChannel { /** * sends a message to the channel */ - public async sendMessage(messageDescriptor: interfaces.IMessageCreator) { + public async postMessage(messageDescriptor: interfaces.IMessageCreator) { const messageToSend = new UniverseMessage({ id: plugins.smartunique.shortId(), messageText: messageDescriptor.messageText,