1.1.65

fix(core): update
1.1.64
2020-09-29 19:42:38 +00:00 · 2020-09-29 19:42:38 +00:00 · 2020-09-29 19:37:49 +00:00 · 2020-09-29 19:37:49 +00:00 · 2020-09-29 18:58:10 +00:00 · 2020-09-29 18:58:09 +00:00
7 changed files with 24 additions and 137 deletions
--- a/README.md
+++ b/README.md
@ -1,111 +0,0 @@
-# @pushrocks/smartsocket
-easy and secure websocket communication
-
-## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartsocket)
-* [gitlab.com (source)](https://gitlab.com/pushrocks/smartsocket)
-* [github.com (source mirror)](https://github.com/pushrocks/smartsocket)
-* [docs (typedoc)](https://pushrocks.gitlab.io/smartsocket/)
-
-## Status for master
-[![build status](https://gitlab.com/pushrocks/smartsocket/badges/master/build.svg)](https://gitlab.com/pushrocks/smartsocket/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/smartsocket/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartsocket/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartsocket.svg)](https://www.npmjs.com/package/@pushrocks/smartsocket)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartsocket/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartsocket)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
-
-## Usage
-
-Use TypeScript for best in class instellisense.
-
-Under the hood we use socket.io and shortid for managed data exchange.
-
-### Serverside
-
-```typescript
-import * as smartsocket from 'smartsocket';
-import * as q from q; // q is a promise library
-
-// The "Smartsocket" listens on a port and can receive new "SocketConnection" requests.
-let mySmartsocket = new smartsocket.Smartsocket({
-  port: 3000 // the port smartsocket will listen on
-});
-
-// optional:
-// run this with anothoer existing server like express
-declare var someExpressServer; // read the express docs about how express actually works
-mySmartsocket.setServer(someExpressServer);
-
-// A "SocketRole" can be referenced by "SocketFunction"s.
-// All "SocketRequest"s carry authentication data for a specific "SocketRole".
-// "SocketFunction"s know which "SocketRole"s are allowed to execute them
-let mySocketRole = new smartsocket.SocketRole({
-  name: 'someRoleName',
-  passwordHash: 'someHashedString'
-});
-
-// A "SocketFunction" executes a referenced function and passes in any data of the corresponding "SocketRequest".
-// The referenced function must return a promise and resolve with data of type any.
-// Any "SocketRequest" carries a unique identifier. If the referenced function's promise resolved any passed on argument will be returned to the requesting party
-let testSocketFunction1 = new smartsocket.SocketFunction({
-  funcName: 'testSocketFunction1',
-  funcDef: data => {
-    console.log('testSocketFunction1 executed successfully!');
-  },
-  allowedRoles: [mySocketRole] // all roles that have access to a specific function
-});
-
-// A "Smartsocket" exposes a .clientCall() that gets
-// 1. the name of the "SocketFunction" on the client side
-// 2. the data to pass in
-// 3. And a target "SocketConnection" (there can be multiple connections at once)
-// any unique id association is done internally
-mySmartsocket.clientCall('restart', data, someTargetConnection).then(responseData => {});
-```
-
-#### Client side
-
-```typescript
-import * as smartsocket from 'smartsocket';
-
-// A "SmartsocketClient" is different from a "Smartsocket" in that it doesn't expose any public address.
-// Thus any new "SocketConnection"s must be innitiated from a "SmartsocketClient".
-let testSmartsocketClient = new smartsocket.SmartsocketClient({
-  port: testConfig.port,
-  url: 'http://localhost',
-  password: 'testPassword',
-  alias: 'testClient1',
-  role: 'testRole1'
-});
-
-// You can .connect() and .disconnect() from a "Smartsocket"
-testSmartsocketClient.connect().then(() => {
-  done();
-});
-
-// The client can also specify "SocketFunction"s. It can also specify "SocketRole"s in case a client connects to multiple servers at once
-let testSocketFunction2 = new smartsocket.SocketFunction({
-  funcName: 'testSocketFunction2',
-  funcDef: data => {}, // the function to execute, has to return promise
-  allowedRoles: []
-});
-
-// A "SmartsocketClient" can call functions on the serverside using .serverCall() analog to the "Smartsocket"'s .clientCall method.
-mySmartsocketClient.serverCall('function', functionCallData).then(functionResponseData => {
-  // the functionResponseData comes from the server... awesome, right?
-});
-```
-
-> **NOTE:**  
-> you can easily chain dependent requests on either the server or client side with promises.  
-> `data` is always a js object that you can design for your specific needs.  
-> It supports buffers for large binary data network exchange.
-
-For further information read the linked docs at the top of this readme.
-
-> MIT licensed | **&copy;** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
-
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "@pushrocks/smartsocket",
-  "version": "1.1.62",
+  "version": "1.1.65",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@ -1560,11 +1560,10 @@
      }
    },
    "@pushrocks/smartenv": {
-      "version": "4.0.11",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartenv/-/smartenv-4.0.11.tgz",
-      "integrity": "sha512-dmphN7A3sUBdoBYbWdIYRvNEhvsZSZn/57tSMlpgqcyfGixYC8PGXKvqbsBKLnEwfpBFVQD95hHe26srANqELA==",
+      "version": "4.0.15",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartenv/-/smartenv-4.0.15.tgz",
+      "integrity": "sha512-7bz2jzxAnojlIu3jYCZwnG5LEIjAQbLEQFRLpWDzoS80U62kEhC8bhOJ7+pdMHH3xqDYszabiv2PEr5/zQZ/Nw==",
      "requires": {
-        "@pushrocks/smartparam": "^1.1.6",
        "@pushrocks/smartpromise": "^3.0.6",
        "@types/node": "^14.11.2"
      }
@ -1889,6 +1888,7 @@
      "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",
@ -6855,7 +6855,8 @@
    "is-promise": {
      "version": "2.2.2",
      "resolved": "https://verdaccio.lossless.one/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
+      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
+      "dev": true
    },
    "is-reference": {
      "version": "1.2.1",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "@pushrocks/smartsocket",
-  "version": "1.1.62",
+  "version": "1.1.65",
  "description": "easy and secure websocket communication",
  "main": "dist_ts/index.js",
  "typings": "dist_ts/index.d.ts",
@ -24,7 +24,7 @@
    "@pushrocks/isounique": "^1.0.4",
    "@pushrocks/lik": "^4.0.17",
    "@pushrocks/smartdelay": "^2.0.10",
-    "@pushrocks/smartenv": "^4.0.11",
+    "@pushrocks/smartenv": "^4.0.15",
    "@pushrocks/smartexpress": "^3.0.76",
    "@pushrocks/smartlog": "^2.0.39",
    "@pushrocks/smartpromise": "^3.0.6",
--- a/ts/smartsocket.classes.smartsocketclient.ts
+++ b/ts/smartsocket.classes.smartsocketclient.ts
@ -64,8 +64,16 @@ export class SmartsocketClient {
  /**
   * connect the client to the server
   */
-  public connect() {
+  public async connect() {
    const done = plugins.smartpromise.defer();
+    const smartenvInstance = new plugins.smartenv.Smartenv();
+    const socketIoClient = await smartenvInstance.getEnvAwareModule({
+      nodeModuleName: 'socket.io-client',
+      webUrlArg: 'https://cdn.jsdelivr.net/npm/socket.io-client@2/dist/socket.io.js',
+      getFunction: () => {
+        return globalThis.io;
+      },
+    });
    logger.log('info', 'trying to connect...');
    const socketUrl = `${this.serverUrl}:${this.serverPort}`;
    this.socketConnection = new SocketConnection({
@ -74,7 +82,7 @@ export class SmartsocketClient {
      role: this.socketRole,
      side: 'client',
      smartsocketHost: this,
-      socket: plugins.socketIoClient(socketUrl, {
+      socket: await socketIoClient.connect(socketUrl, {
        multiplex: false,
        reconnectionAttempts: 5,
      }),
--- a/ts/smartsocket.classes.socketstats.ts
+++ b/ts/smartsocket.classes.socketstats.ts
@ -1,3 +1,3 @@
 import * as plugins from './smartsocket.plugins';

-export class SocketStats {}
+export class SocketStats {}
--- a/ts/smartsocket.plugins.ts
+++ b/ts/smartsocket.plugins.ts
@ -25,10 +25,3 @@ export {
  smarttime,
  smartrx,
 };
-
-// third party
-import socketIoClient from 'socket.io-client';
-
-export {
-  socketIoClient
-};
--- a/ts/smartsocket.pluginstyped.ts
+++ b/ts/smartsocket.pluginstyped.ts
@ -2,19 +2,15 @@
 import type http from 'http';
 import type https from 'https';

-export {
-  http,
-  https
-};
+export { http, https };

 // pushrocks scope
 import type * as smartexpress from '@pushrocks/smartexpress';

-export {
-  smartexpress
-};
+export { smartexpress };

 // third party scope
 import type socketIo from 'socket.io';
+import type socketIoClient from 'socket.io-client';

-export { socketIo };
+export { socketIo, socketIoClient };
Author	SHA1	Message	Date
Phil Kunz	09dec2071e	1.1.65	2020-09-29 19:42:38 +00:00
Phil Kunz	a1443deafe	fix(core): update	2020-09-29 19:42:38 +00:00
Phil Kunz	9eac5ad336	1.1.64	2020-09-29 19:37:49 +00:00
Phil Kunz	cf607a79d5	fix(core): update	2020-09-29 19:37:49 +00:00
Phil Kunz	8426c976bf	1.1.63	2020-09-29 18:58:10 +00:00
Phil Kunz	1086065000	fix(core): update	2020-09-29 18:58:09 +00:00