From a23c5a0fba961e4ea3e84d8022705f60c0bbd8ad Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Fri, 22 Jan 2021 15:13:05 +0000 Subject: [PATCH] fix(core): update --- package-lock.json | 44 ++++++++++----------------- package.json | 3 +- ts/typedsocket.classes.typedsocket.ts | 7 +++-- ts/typedsocket.plugins.ts | 4 ++- 4 files changed, 26 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index da71847..4ee60b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1956,16 +1956,17 @@ } }, "@pushrocks/smartstring": { - "version": "3.0.18", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartstring/-/smartstring-3.0.18.tgz", - "integrity": "sha512-34Ca5HW6w8fcG2sdbRVDViOZ0vdOHXc/1Qof2KhM5bvWFajU6VASlJjCYNJBrjGg9VCeC2rH6bGIgvd7prSRkg==", - "dev": true, + "version": "3.0.23", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartstring/-/smartstring-3.0.23.tgz", + "integrity": "sha512-lGkmzbNAAvfKDlFHXS6L5IdvYQLa9uUuf8wwCiW4ZadXFsH00ACPp2pgY30aSNYwBqFWc5U9X+przuxIkBM9Pw==", "requires": { - "crypto-random-string": "^3.1.0", + "@pushrocks/smartenv": "^4.0.16", + "crypto-random-string": "^3.3.0", "js-base64": "^2.5.1", "normalize-newline": "^3.0.0", "randomatic": "^3.1.1", - "strip-indent": "^3.0.0" + "strip-indent": "^3.0.0", + "url": "^0.11.0" } }, "@pushrocks/smarttime": { @@ -3921,7 +3922,6 @@ "version": "3.3.0", "resolved": "https://verdaccio.lossless.one/crypto-random-string/-/crypto-random-string-3.3.0.tgz", "integrity": "sha512-teWAwfMb1d6brahYyKqcBEb5Yp8PJPvPOdOonXDnvaKOTmKDFNVE8E3Y2XQuzjNV/3XMwHbrX9fHWvrhRKt4Gg==", - "dev": true, "requires": { "type-fest": "^0.8.1" }, @@ -3929,8 +3929,7 @@ "type-fest": { "version": "0.8.1", "resolved": "https://verdaccio.lossless.one/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" } } }, @@ -6952,8 +6951,7 @@ "js-base64": { "version": "2.6.4", "resolved": "https://verdaccio.lossless.one/js-base64/-/js-base64-2.6.4.tgz", - "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==", - "dev": true + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" }, "js-tokens": { "version": "4.0.0", @@ -7132,8 +7130,7 @@ "kind-of": { "version": "6.0.3", "resolved": "https://verdaccio.lossless.one/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" }, "levn": { "version": "0.3.0", @@ -7332,8 +7329,7 @@ "math-random": { "version": "1.0.4", "resolved": "https://verdaccio.lossless.one/math-random/-/math-random-1.0.4.tgz", - "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==", - "dev": true + "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==" }, "md5.js": { "version": "1.3.5", @@ -7460,8 +7456,7 @@ "min-indent": { "version": "1.0.1", "resolved": "https://verdaccio.lossless.one/min-indent/-/min-indent-1.0.1.tgz", - "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", - "dev": true + "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==" }, "minimalistic-assert": { "version": "1.0.1", @@ -7679,8 +7674,7 @@ "normalize-newline": { "version": "3.0.0", "resolved": "https://verdaccio.lossless.one/normalize-newline/-/normalize-newline-3.0.0.tgz", - "integrity": "sha1-HL6oBKukNgAfg5OKsh7AOdaa6dM=", - "dev": true + "integrity": "sha1-HL6oBKukNgAfg5OKsh7AOdaa6dM=" }, "normalize-path": { "version": "3.0.0", @@ -8937,8 +8931,7 @@ "querystring": { "version": "0.2.0", "resolved": "https://verdaccio.lossless.one/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "dev": true + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" }, "querystring-es3": { "version": "0.2.1", @@ -9003,7 +8996,6 @@ "version": "3.1.1", "resolved": "https://verdaccio.lossless.one/randomatic/-/randomatic-3.1.1.tgz", "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==", - "dev": true, "requires": { "is-number": "^4.0.0", "kind-of": "^6.0.0", @@ -9013,8 +9005,7 @@ "is-number": { "version": "4.0.0", "resolved": "https://verdaccio.lossless.one/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", - "dev": true + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" } } }, @@ -10277,7 +10268,6 @@ "version": "3.0.0", "resolved": "https://verdaccio.lossless.one/strip-indent/-/strip-indent-3.0.0.tgz", "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", - "dev": true, "requires": { "min-indent": "^1.0.0" } @@ -10800,7 +10790,6 @@ "version": "0.11.0", "resolved": "https://verdaccio.lossless.one/url/-/url-0.11.0.tgz", "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "dev": true, "requires": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -10809,8 +10798,7 @@ "punycode": { "version": "1.3.2", "resolved": "https://verdaccio.lossless.one/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" } } }, diff --git a/package.json b/package.json index bbde3a7..2ef2023 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,8 @@ "@apiglobal/typedrequest": "^1.0.56", "@apiglobal/typedrequest-interfaces": "^1.0.15", "@pushrocks/isohash": "^1.0.2", - "@pushrocks/smartsocket": "^1.2.0" + "@pushrocks/smartsocket": "^1.2.0", + "@pushrocks/smartstring": "^3.0.23" }, "browserslist": [ "last 1 chrome versions" diff --git a/ts/typedsocket.classes.typedsocket.ts b/ts/typedsocket.classes.typedsocket.ts index 16bf38a..f5ce66e 100644 --- a/ts/typedsocket.classes.typedsocket.ts +++ b/ts/typedsocket.classes.typedsocket.ts @@ -69,12 +69,15 @@ export class TypedSocket { serverUrlArg: string, aliasArg = 'clientArg' ): Promise { + const domain = new plugins.smartstring.Domain(serverUrlArg); + + const smartsocketClient = new plugins.smartsocket.SmartsocketClient({ alias: aliasArg, role: publicRoleName, password: publicRolePass, - port: 3000, - url: serverUrlArg, + port: domain.port || 3000, + url: `${domain.nodeParsedUrl.protocol}//${domain.nodeParsedUrl.host}`, autoReconnect: true, }); smartsocketClient.addSocketFunction( diff --git a/ts/typedsocket.plugins.ts b/ts/typedsocket.plugins.ts index 63ce647..e2f89d3 100644 --- a/ts/typedsocket.plugins.ts +++ b/ts/typedsocket.plugins.ts @@ -10,8 +10,10 @@ export { // @pushrocks scope import * as isohash from '@pushrocks/isohash'; import * as smartsocket from '@pushrocks/smartsocket'; +import * as smartstring from '@pushrocks/smartstring'; export { isohash, - smartsocket + smartsocket, + smartstring }