44 changed files with 3858 additions and 6005 deletions
--- a/.gitea/workflows/default_nottags.yaml
+++ b/.gitea/workflows/default_nottags.yaml
@ -1,66 +0,0 @@
-name: Default (not tags)
-
-on:
-  push:
-    tags-ignore:
-      - '**'
-
-env:
-  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
-  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
-  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
-  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
-  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
-
-jobs:
-  security:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    container:
-      image: ${{ env.IMAGE }}
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install pnpm and npmci
-        run: |
-          pnpm install -g pnpm
-          pnpm install -g @shipzone/npmci
-
-      - name: Run npm prepare
-        run: npmci npm prepare
-
-      - name: Audit production dependencies
-        run: |
-          npmci command npm config set registry https://registry.npmjs.org
-          npmci command pnpm audit --audit-level=high --prod
-        continue-on-error: true
-
-      - name: Audit development dependencies
-        run: |
-          npmci command npm config set registry https://registry.npmjs.org
-          npmci command pnpm audit --audit-level=high --dev
-        continue-on-error: true
-
-  test:
-    if: ${{ always() }}
-    needs: security
-    runs-on: ubuntu-latest
-    container:
-      image: ${{ env.IMAGE }}
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Test stable
-        run: |
-          npmci node install stable
-          npmci npm install
-          npmci npm test
-
-      - name: Test build
-        run: |
-          npmci node install stable
-          npmci npm install
-          npmci npm build
--- a/.gitea/workflows/default_tags.yaml
+++ b/.gitea/workflows/default_tags.yaml
@ -1,124 +0,0 @@
-name: Default (tags)
-
-on:
-  push:
-    tags:
-      - '*'
-
-env:
-  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
-  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
-  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
-  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
-  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
-
-jobs:
-  security:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    container:
-      image: ${{ env.IMAGE }}
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Prepare
-        run: |
-          pnpm install -g pnpm
-          pnpm install -g @shipzone/npmci
-          npmci npm prepare
-
-      - name: Audit production dependencies
-        run: |
-          npmci command npm config set registry https://registry.npmjs.org
-          npmci command pnpm audit --audit-level=high --prod
-        continue-on-error: true
-
-      - name: Audit development dependencies
-        run: |
-          npmci command npm config set registry https://registry.npmjs.org
-          npmci command pnpm audit --audit-level=high --dev
-        continue-on-error: true
-
-  test:
-    if: ${{ always() }}
-    needs: security
-    runs-on: ubuntu-latest
-    container:
-      image: ${{ env.IMAGE }}
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Prepare
-        run: |
-          pnpm install -g pnpm
-          pnpm install -g @shipzone/npmci
-          npmci npm prepare
-
-      - name: Test stable
-        run: |
-          npmci node install stable
-          npmci npm install
-          npmci npm test
-
-      - name: Test build
-        run: |
-          npmci node install stable
-          npmci npm install
-          npmci npm build
-
-  release:
-    needs: test
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
-    container:
-      image: ${{ env.IMAGE }}
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Prepare
-        run: |
-          pnpm install -g pnpm
-          pnpm install -g @shipzone/npmci
-          npmci npm prepare
-
-      - name: Release
-        run: |
-          npmci node install stable
-          npmci npm publish
-
-  metadata:
-    needs: test
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
-    container:
-      image: ${{ env.IMAGE }}
-    continue-on-error: true
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Prepare
-        run: |
-          pnpm install -g pnpm
-          pnpm install -g @shipzone/npmci
-          npmci npm prepare
-
-      - name: Code quality
-        run: |
-          npmci command npm install -g typescript
-          npmci npm install
-
-      - name: Trigger
-        run: npmci trigger
-
-      - name: Build docs and upload artifacts
-        run: |
-          npmci node install stable
-          npmci npm install
-          pnpm install -g @gitzone/tsdoc
-          npmci command tsdoc
-        continue-on-error: true
--- a/.gitignore
+++ b/.gitignore
@ -15,6 +15,8 @@ node_modules/

 # builds
 dist/
-dist_*/
+dist_web/
+dist_serve/
+dist_ts_web/

 # custom
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -0,0 +1,119 @@
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+
+cache:
+  paths:
+  - .npmci_cache/
+  key: "$CI_BUILD_STAGE"
+
+stages:
+- security
+- test
+- release
+- metadata
+
+# ====================
+# security stage
+# ====================
+mirror:
+  stage: security
+  script:
+  - npmci git mirror
+  tags:
+  - docker
+  - notpriv
+
+snyk:
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install -g snyk
+    - npmci command npm install --ignore-scripts
+    - npmci command snyk test
+  tags:
+  - docker
+  - notpriv
+
+# ====================
+# test stage
+# ====================
+
+testLTS:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
+  - notpriv
+
+testBuild:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
+  - notpriv
+
+release:
+  stage: release
+  script:
+  - npmci node install lts
+  - npmci npm publish
+  only:
+  - tags
+  tags:
+  - docker
+  - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  allow_failure: true
+  script:
+    - npmci command npm install -g tslint typescript
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
+  tags:
+  - docker
+  - priv
+
+trigger:
+  stage: metadata
+  script:
+  - npmci trigger
+  only:
+  - tags
+  tags:
+  - docker
+  - notpriv
+
+pages:
+  image: hosttoday/ht-docker-dbase:npmci
+  services:
+   - docker:18-dind
+  stage: metadata
+  script:
+    - npmci command npm install -g @gitzone/tsdoc
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command tsdoc
+  tags:
+    - docker
+    - notpriv
+  only:
+    - tags
+  artifacts:
+    expire_in: 1 week
+    paths:
+    - public
+  allow_failure: true
--- a/.snyk
+++ b/.snyk
@ -0,0 +1,4 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.13.5
+ignore: {}
+patch: {}
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -2,10 +2,28 @@
  "version": "0.2.0",
  "configurations": [
    {
-      "command": "npm test",
-      "name": "Run npm test",
+      "name": "current file",
+      "type": "node",
      "request": "launch",
-      "type": "node-terminal"
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
    }
  ]
 }
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,26 +0,0 @@
-{
-  "json.schemas": [
-    {
-      "fileMatch": ["/npmextra.json"],
-      "schema": {
-        "type": "object",
-        "properties": {
-          "npmci": {
-            "type": "object",
-            "description": "settings for npmci"
-          },
-          "gitzone": {
-            "type": "object",
-            "description": "settings for gitzone",
-            "properties": {
-              "projectType": {
-                "type": "string",
-                "enum": ["website", "element", "service", "npm", "wcc"]
-              }
-            }
-          }
-        }
-      }
-    }
-  ]
-}
--- a/npmextra.json
+++ b/npmextra.json
@ -1,33 +1,17 @@
 {
  "gitzone": {
-    "projectType": "npm",
    "module": {
-      "githost": "code.foss.global",
-      "gitscope": "push.rocks",
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
      "gitrepo": "smartuniverse",
-      "description": "A messaging service enabling secure, reactive communication between microservices.",
-      "npmPackagename": "@push.rocks/smartuniverse",
+      "shortDescription": "messaging service for micro services",
+      "npmPackagename": "@pushrocks/smartuniverse",
      "license": "MIT",
-      "projectDomain": "push.rocks",
-      "keywords": [
-        "microservices",
-        "messaging",
-        "reactive programming",
-        "event-driven",
-        "channel-based communication",
-        "client-server architecture",
-        "message encryption",
-        "typescript",
-        "websocket",
-        "scalability"
-      ]
+      "projectDomain": "push.rocks"
    }
  },
  "npmci": {
    "npmGlobalTools": [],
    "npmAccessLevel": "public"
-  },
-  "tsdoc": {
-    "legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH  \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
  }
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,72 +1,51 @@
 {
-  "name": "@push.rocks/smartuniverse",
-  "version": "1.0.108",
+  "name": "@pushrocks/smartuniverse",
+  "version": "1.0.58",
  "private": false,
-  "description": "A messaging service enabling secure, reactive communication between microservices.",
-  "main": "dist_ts/index.js",
-  "typings": "dist_ts/index.d.ts",
+  "description": "messaging service for your micro services",
+  "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
  "author": "Lossless GmbH",
  "license": "MIT",
  "scripts": {
    "test": "(tstest test/)",
    "testManual": "(tsrun test/test.ts)",
-    "build": "(tsbuild --allowimplicitany && tsbundle --from ./ts/index.ts --to dist_bundle/bundle.js)",
-    "format": "(gitzone format)",
-    "buildDocs": "tsdoc"
+    "build": "(tsbuild)",
+    "format": "(gitzone format)"
  },
  "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.66",
-    "@gitzone/tsbundle": "^2.0.8",
-    "@gitzone/tsrun": "^1.2.44",
-    "@gitzone/tstest": "^1.0.77",
-    "@push.rocks/tapbundle": "^5.0.12",
-    "@types/node": "^20.4.4"
+    "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tstest": "^1.0.24",
+    "@pushrocks/tapbundle": "^3.0.11",
+    "@types/node": "^12.7.1",
+    "tslint": "^5.18.0",
+    "tslint-config-prettier": "^1.18.0"
+  },
+  "peerDependencies": {
+    "rxjs": "*"
  },
  "dependencies": {
-    "@apiglobal/typedrequest-interfaces": "^2.0.1",
-    "@apiglobal/typedserver": "^2.0.65",
-    "@push.rocks/isohash": "^2.0.1",
-    "@push.rocks/isounique": "^1.0.5",
-    "@push.rocks/lik": "^6.0.3",
-    "@push.rocks/smartdelay": "^3.0.5",
-    "@push.rocks/smartlog": "^3.0.3",
-    "@push.rocks/smartpromise": "^4.0.2",
-    "@push.rocks/smartrx": "^3.0.6",
-    "@push.rocks/smartsocket": "^2.0.20",
-    "@push.rocks/smarttime": "^4.0.4",
-    "@push.rocks/smarturl": "^3.0.7"
+    "@pushrocks/lik": "^3.0.10",
+    "@pushrocks/smartdelay": "^2.0.3",
+    "@pushrocks/smartexpress": "^3.0.38",
+    "@pushrocks/smartfile": "^7.0.4",
+    "@pushrocks/smarthash": "^2.0.6",
+    "@pushrocks/smartpromise": "^3.0.2",
+    "@pushrocks/smartrequest": "^1.1.16",
+    "@pushrocks/smartrx": "^2.0.3",
+    "@pushrocks/smartsocket": "^1.1.44",
+    "@pushrocks/smarttime": "^3.0.12",
+    "@pushrocks/smartunique": "^3.0.1"
  },
  "files": [
-    "ts/**/*",
-    "ts_web/**/*",
-    "dist/**/*",
-    "dist_*/**/*",
-    "dist_ts/**/*",
-    "dist_ts_web/**/*",
-    "assets/**/*",
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "dist_ts_web/*",
+    "assets/*",
    "cli.js",
    "npmextra.json",
    "readme.md"
-  ],
-  "browserslist": [
-    "last 1 chrome versions"
-  ],
-  "type": "module",
-  "keywords": [
-    "microservices",
-    "messaging",
-    "reactive programming",
-    "event-driven",
-    "channel-based communication",
-    "client-server architecture",
-    "message encryption",
-    "typescript",
-    "websocket",
-    "scalability"
-  ],
-  "homepage": "https://code.foss.global/push.rocks/smartuniverse",
-  "repository": {
-    "type": "git",
-    "url": "https://code.foss.global/push.rocks/smartuniverse.git"
-  }
+  ]
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/readme.hints.md
+++ b/readme.hints.md
@ -1 +0,0 @@
- 
--- a/readme.md
+++ b/readme.md
@ -1,127 +1,55 @@
-# @push.rocks/smartuniverse
-messaging service for your micro services
+# @pushrocks/smartuniverse
+messaging service for micro services

-## Install
-To install `@push.rocks/smartuniverse`, use the following command with npm:
-```bash
-npm install @push.rocks/smartuniverse --save
-```
-This command adds `@push.rocks/smartuniverse` to your project's dependencies.
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartuniverse)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartuniverse)
+* [github.com (source mirror)](https://github.com/pushrocks/smartuniverse)
+* [docs (typedoc)](https://pushrocks.gitlab.io/smartuniverse/)
+
+## Status for master
+[![build status](https://gitlab.com/pushrocks/smartuniverse/badges/master/build.svg)](https://gitlab.com/pushrocks/smartuniverse/commits/master)
+[![coverage report](https://gitlab.com/pushrocks/smartuniverse/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartuniverse/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartuniverse.svg)](https://www.npmjs.com/package/@pushrocks/smartuniverse)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartuniverse/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartuniverse)
+[![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
-`@push.rocks/smartuniverse` is designed to enable messaging services for microservices, allowing them to communicate in a structured and secure manner. Below are examples and scenarios illustrating how to use `@push.rocks/smartuniverse` for both server (managing messages across services) and client (microservices communicating within the universe) aspects.

-### Server side setup: Creating your Universe
+Use TypeScript for best in class instellisense.

-First, you need to set up the server side of your messaging ecosystem, which involves creating a "universe" where channels reside.
+### What is smartuniverse all about?
+
+Think WhatsApp, but for your microservices architecture. It allows your services to securely talk to each other in **private, shielded channels** without having to expose anything to the outside world. This allows the use of **reactive programming across your entire stack**.
+
+### Server side
+
+every universe has a server that manages messages.  
+Think Kafka, but without Kafka.

 ```typescript
-import { Universe } from '@push.rocks/smartuniverse';
+import * as smartuniverse from '@pushrocks/smartuniverse';

-// Initialize a new Universe
-const myUniverse = new Universe({
-  messageExpiryInMilliseconds: 60000, // messages expire after 60 seconds
+const myUniverse = new smartuniverse.Universe({
+  messageExpiryInMilliseconds: 60000 // the standard time in milliseconds until a message expires
 });

-// Create channels for communication within the universe
-// These channels can be thought of as topics or queues that services can subscribe to or post messages to
-myUniverse.addChannel('channel-one', 'password1');
-myUniverse.addChannel('channel-two', 'password2');
+// create as many channels as you like
+myUniverse.addChannel('awesomeChannel', 'awesomeChannelPass');
+myUniverse.addChannel('awesomeChannel2', 'jhkjhfsdf87eerkjslkfja9');

-// Start the universe server on a specified port
-myUniverse.start(8765);
+myUniverse.start(8765); // start the server and provide the port on which to listen on
 ```

-By starting the universe, you've established a messaging hub for your microservices. Ensure that the services know the universe's address and the channels and passwords they should use for communication.
+### Client side

-### Client side: Microservices joining the Universe
+All your microservices represents clients in the universe that may talk to each other using the universe server.

-On the client side, your microservices will join the universe, subscribing to channels to listen for messages or post their messages to be consumed by other services.
+For further information read the linked docs at the top of this readme.

-```typescript
-import { ClientUniverse, ClientUniverseChannel } from '@push.rocks/smartuniverse';
+> MIT licensed | **&copy;** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)

-// Initialize client that connects to the universe server
-const clientUniverse = new ClientUniverse({
-  serverAddress: 'http://your-universe-server:8765',
-  autoReconnect: true,
-});
-
-// Define a channel to subscribe to (the channel must be created in the universe server)
-const channel = clientUniverse.addChannel('channel-one', 'password1');
-
-// Start the client to enable communication
-clientUniverse.start();
-
-// Posting a message to the channel
-channel.postMessage({
-  messageText: 'Hello, universe!',
-  payload: { some: 'data' },
-});
-
-// Listening for messages from the channel
-channel.subscribe((message) => {
-  console.log('Received message:', message);
-});
-```
-
-### Reaction Patterns: Request and Response Within the Universe
-
-`@push.rocks/smartuniverse` supports reactive programming. Microservices can emit "reaction requests" and listen for "reaction responses" tied to specific actions or commands.
-
-```typescript
-import { ReactionRequest, ReactionResponse } from '@push.rocks/smartuniverse';
-
-// Define a request-response type
-interface MyRequestResponse {
-  method: 'greet';
-  request: { name: string };
-  response: { message: string };
-};
-
-// Creating a reaction request on client side
-const reactionRequest = new ReactionRequest<MyRequestResponse>({ method: 'greet' });
-
-// Emitting a reaction request and handling responses
-reactionRequest.fire([channel], { name: 'World' }).then((reactionResult) => {
-  reactionResult.getFirstResult().then((response) => {
-    console.log(response.message); // Output: Hello, World!
-  });
-});
-
-// Handling reaction requests on server side or another client
-const reactionResponse = new ReactionResponse<MyRequestResponse>({
-  channels: [myUniverse.getChannel('channel-one')],
-  funcDef: async (requestData) => {
-    return { message: `Hello, ${requestData.name}!` };
-  },
-  method: 'greet',
-});
-```
-
-This pattern enables a powerful, flexible communication system where services can asynchronously request information or trigger actions across the microservices architecture without direct coupling.
-
-### Conclusion
-
-`@push.rocks/smartuniverse` provides a robust platform for facilitating communication between microservices. By setting up a universe and defining channels, your services can securely exchange messages, supporting both direct communications and reactive programming patterns. Whether sharing updates, events, or performing request-response interactions, `@push.rocks/smartuniverse` simplifies the process of building a cohesive microservices ecosystem.
-
-For more advanced use cases and configuration options, refer to the complete documentation.
-
-## License and Legal Information
-
-This repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. 
-
-**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
-
-### Trademarks
-
-This project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.
-
-### Company Information
-
-Task Venture Capital GmbH  
-Registered at District court Bremen HRB 35230 HB, Germany
-
-For any legal inquiries or if you require further information, please contact us via email at hello@task.vc.
-
-By using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)
--- a/test/test.ts
+++ b/test/test.ts
@ -1,6 +1,8 @@
 // tslint:disable-next-line:no-implicit-dependencies
-import { expect, tap } from '@push.rocks/tapbundle';
-import * as smartuniverse from '../ts/index.js';
+import { expect, tap } from '@pushrocks/tapbundle';
+import * as smartuniverse from '../ts/index';
+
+import { Observable } from 'rxjs';

 let testUniverse: smartuniverse.Universe;
 let testClientUniverse: smartuniverse.ClientUniverse;
@ -8,17 +10,17 @@ let testClientUniverse2: smartuniverse.ClientUniverse;
 let testClientChannel: smartuniverse.ClientUniverseChannel;

 const testServerData = {
-  serverAddress: 'http://localhost:8765',
+  serverAddress: 'http://localhost:8765'
 };

 const testChannelData = {
  channelName: 'awesomeTestChannel',
-  channelPass: 'awesomeChannelPass',
+  channelPass: 'awesomeChannelPAss'
 };

 tap.test('first test', async () => {
  testUniverse = new smartuniverse.Universe({
-    messageExpiryInMilliseconds: 1000,
+    messageExpiryInMilliseconds: 1000
  });
 });

@ -29,105 +31,49 @@ tap.test('add a message to the SmartUniverse', async () => {
 // testing message handling
 tap.test('create smartuniverse client', async () => {
  testClientUniverse = new smartuniverse.ClientUniverse({
-    serverAddress: testServerData.serverAddress,
-    autoReconnect: true,
+    serverAddress: testServerData.serverAddress
  });
-  expect(testClientUniverse).toBeInstanceOf(smartuniverse.ClientUniverse);
+  expect(testClientUniverse).to.be.instanceof(smartuniverse.ClientUniverse);
 });

 tap.test('should add a channel to the universe', async () => {
-  testUniverse.addChannel(testChannelData.channelName, testChannelData.channelPass);
+  await testUniverse.addChannel(testChannelData.channelName, testChannelData.channelPass);
 });

 tap.test('should add the same channel to the client universe in the same way', async () => {
-  testClientUniverse.addChannel(testChannelData.channelName, testChannelData.channelPass);
-});
-
-tap.test('should start the ClientUniverse', async () => {
-  await testClientUniverse.start();
+  await testClientUniverse.addChannel(testChannelData.channelName, testChannelData.channelPass);
 });

 tap.test('should get a observable correctly', async () => {
-  testClientChannel = testClientUniverse.getChannel(testChannelData.channelName);
-  expect(testClientChannel).toBeInstanceOf(smartuniverse.ClientUniverseChannel);
+  testClientChannel = await testClientUniverse.getChannel(testChannelData.channelName);
+  expect(testClientChannel).to.be.instanceof(smartuniverse.ClientUniverseChannel);
 });

 tap.test('should send a message correctly', async () => {
-  await testClientUniverse.getChannel(testChannelData.channelName).postMessage({
-    messageText: 'hello',
+  await (await testClientUniverse.getChannel(testChannelData.channelName)).sendMessage({
+    messageText: 'hello'
  });
 });

 tap.test('universe should contain the sent message', async () => {
-  expect(testUniverse.universeCache.messageMap.getArray()[0].messageText).toEqual('hello');
+  expect(testUniverse.universeCache.messageMap.getArray()[0].messageText).to.equal('hello');
 });

 tap.test('a second client should be able to subscibe', async () => {
  testClientUniverse2 = new smartuniverse.ClientUniverse({
-    serverAddress: testServerData.serverAddress,
-    autoReconnect: true,
+    serverAddress: testServerData.serverAddress
  });

  testClientUniverse2.addChannel(testChannelData.channelName, testChannelData.channelPass);
-  await testClientUniverse2.start();
 });

-tap.test('should receive a message correctly', async (tools) => {
-  const done = tools.defer();
-  const testChannel = testClientUniverse.getChannel(testChannelData.channelName);
-  const testChannel2 = testClientUniverse2.getChannel(testChannelData.channelName);
-  const subscription = testChannel2.subscribe((messageArg) => {
-    if (messageArg.messageText === 'hellothere') {
-      console.log('Yay##########');
-      done.resolve();
-    }
-  });
-  await testChannel.postMessage({
-    messageText: 'hellothere',
-  });
-  await done.promise;
+tap.test('should receive a message correctly', async () => {});
+
+tap.test('should disconnect the client correctly', async () => {
+  testClientUniverse.close();
 });

-interface IDemoReqRes {
-  method: 'demo';
-  request: {
-    wowso: string;
-  };
-  response: {
-    hereso: string;
-  };
-}
-
-tap.test('ReactionRequest and ReactionResponse should work', async () => {
-  const reactionResponse = new smartuniverse.ReactionResponse<IDemoReqRes>({
-    channels: [testUniverse.getChannel(testChannelData.channelName)],
-    funcDef: async (reqData) => {
-      console.log(reqData);
-      return {
-        hereso: 'Hello there',
-      };
-    },
-    method: 'demo',
-  });
-  const reactionRequest = new smartuniverse.ReactionRequest<IDemoReqRes>({
-    method: 'demo',
-  });
-  const reactionResult = await reactionRequest.fire(
-    [testClientUniverse2.getChannel(testChannelData.channelName)],
-    {
-      wowso: 'wowza',
-    }
-  );
-  const result = await reactionResult.getFirstResult();
-  console.log(result);
-});
-
-tap.test('should disconnect the client correctly', async (tools) => {
-  await testClientUniverse.stop();
-  await testClientUniverse2.stop();
-});
-
-tap.test('should end the server correctly', async (tools) => {
+tap.test('should end the server correctly', async tools => {
  await testUniverse.stopServer();
 });

--- a/ts/00_commitinfo_data.ts
+++ b/ts/00_commitinfo_data.ts
@ -1,8 +0,0 @@
-/**
- * autocreated commitinfo by @pushrocks/commitinfo
- */
-export const commitinfo = {
-  name: '@push.rocks/smartuniverse',
-  version: '1.0.108',
-  description: 'messaging service for your micro services'
-}
--- a/ts/index.ts
+++ b/ts/index.ts
@ -1,16 +1,11 @@
 // Client classes
-export * from './smartuniverse.classes.client.universe.js';
-export * from './smartuniverse.classes.client.universechannel.js';
-export * from './smartuniverse.classes.client.universemessage.js';
+export * from './smartuniverse.classes.clientuniverse';
+export * from './smartuniverse.classes.clientuniversechannel';

 // Server classes
-export * from './smartuniverse.classes.universe.js';
-export * from './smartuniverse.classes.universecache.js';
-export * from './smartuniverse.classes.universechannel.js';
-export * from './smartuniverse.classes.universemessage.js';
+export * from './smartuniverse.classes.universe';
+export * from './smartuniverse.classes.universecache';
+export * from './smartuniverse.classes.universechannel';
+export * from './smartuniverse.classes.universemessage';

-// Reaction Response
-export * from './smartuniverse.classes.event.reactionrequest.js';
-export * from './smartuniverse.classes.event.reactionresponse.js';
-
-export * from './interfaces/index.js';
+export * from './interfaces';
--- a/ts/interfaces/index.ts
+++ b/ts/interfaces/index.ts
@ -1,5 +1,4 @@
-export * from './http.interfaces.js';
-export * from './socketfunctionrequests.js';
-export * from './universechannel.interfaces.js';
-export * from './universemessage.interfaces.js';
-export * from './universeactions.interfaces.js';
+export * from './http.interfaces';
+export * from './universechannel.interfaces';
+export * from './universemessage.interfaces';
+export * from './universeactions.interfaces';
--- a/ts/interfaces/socketfunctionrequests.ts
+++ b/ts/interfaces/socketfunctionrequests.ts
@ -1,20 +0,0 @@
-import * as interfaces from './index.js';
-
-export interface ISocketRequest_SubscribeChannel {
-  method: 'subscribeChannel';
-  request: {
-    name: string;
-    passphrase: string;
-  };
-  response: {
-    subscriptionStatus: 'subscribed' | 'unsubscribed';
-  };
-}
-
-export interface ISocketRequest_ProcessMessage {
-  method: 'processMessage';
-  request: interfaces.IUniverseMessage;
-  response: {
-    messageStatus: 'ok' | 'channel not found';
-  };
-}
--- a/ts/interfaces/universeactions.interfaces.ts
+++ b/ts/interfaces/universeactions.interfaces.ts
@ -1,3 +1,17 @@
+export type IServerCallActions =
+  | 'channelSubscription'
+  | 'processMessage'
+  | 'channelUnsubscribe'
+  | 'terminateConnection';
+
+/**
+ * the interface for a subscription
+ */
+export interface IServerCallSubscribeActionPayload {
+  name: string;
+  passphrase: string;
+}
+
 export interface IServerUnsubscribeActionPayload {
  name: string;
 }
--- a/ts/interfaces/universeconnection.interfaces.ts
+++ b/ts/interfaces/universeconnection.interfaces.ts
@ -0,0 +1,4 @@
+export interface IAuthenticationRequest {
+  channelName: string;
+  password: string;
+}
--- a/ts/interfaces/universemessage.interfaces.ts
+++ b/ts/interfaces/universemessage.interfaces.ts
@ -1,10 +1,11 @@
 export interface IMessageCreator {
  messageText: string;
  payload?: string | number | any;
+  payloadStringType?: 'Buffer' | 'string' | 'object';
 }

 /**
- * A universe
+ * 
 */
 export interface IUniverseMessage extends IMessageCreator {
  id: string;
--- a/ts/smartuniverse.classes.client.universe.ts
+++ b/ts/smartuniverse.classes.client.universe.ts
@ -1,186 +0,0 @@
-import * as plugins from './smartuniverse.plugins.js';
-import { Smartsocket, SmartsocketClient } from '@push.rocks/smartsocket';
-
-import * as interfaces from './interfaces/index.js';
-
-import { ClientUniverseChannel, ClientUniverseMessage } from './index.js';
-import { ClientUniverseCache } from './smartuniverse.classes.client.universecache.js';
-import { logger } from './smartuniverse.logging.js';
-
-export interface IClientOptions {
-  serverAddress: string;
-  autoReconnect: boolean;
-}
-
-/**
- * this class is for client side only!!!
- * allows connecting to a universe server
- */
-export class ClientUniverse {
-  public options: IClientOptions;
-  public smartsocketClient: plugins.smartsocket.SmartsocketClient;
-  public messageRxjsSubject = new plugins.smartrx.rxjs.Subject<ClientUniverseMessage<any>>();
-  public clientUniverseCache = new ClientUniverseCache();
-
-  public autoReconnectStatus: 'on' | 'off' = 'off';
-
-  constructor(optionsArg: IClientOptions) {
-    this.options = optionsArg;
-  }
-
-  /**
-   * adds a channel to the channelcache
-   * TODO: verify channel before adding it to the channel cache
-   */
-  public addChannel(channelNameArg: string, passphraseArg: string) {
-    const existingChannel = this.getChannel(channelNameArg);
-
-    if (existingChannel) {
-      throw new Error('channel exists');
-    }
-
-    // lets create the channel
-    const clientUniverseChannel = ClientUniverseChannel.createClientUniverseChannel(
-      this,
-      channelNameArg,
-      passphraseArg
-    );
-    return clientUniverseChannel;
-  }
-
-  /**
-   * gets a channel from the channelcache
-   * @param channelName
-   * @param passphraseArg
-   */
-  public getChannel(channelName: string): ClientUniverseChannel {
-    const clientUniverseChannel = this.clientUniverseCache.channelMap.findSync((channel) => {
-      return channel.name === channelName;
-    });
-    return clientUniverseChannel;
-  }
-
-  /**
-   * remove a a achannel
-   * @param messageArg
-   */
-  public removeChannel(channelNameArg, notifyServer = true) {
-    const clientUniverseChannel = this.clientUniverseCache.channelMap.findOneAndRemoveSync(
-      (channelItemArg) => {
-        return channelItemArg.name === channelNameArg;
-      }
-    );
-  }
-
-  public async start() {
-    if (this.options.autoReconnect) {
-      this.autoReconnectStatus = 'on';
-    }
-    await this.checkConnection();
-  }
-
-  public async stop() {
-    this.autoReconnectStatus = 'off';
-    await this.disconnect('triggered');
-  }
-
-  /**
-   * checks the connection towards a universe server
-   * since password validation is done through other means, a connection should always be possible
-   */
-  private async checkConnection(): Promise<void> {
-    if (!this.smartsocketClient) {
-      const parsedURL = plugins.smarturl.Smarturl.createFromUrl(this.options.serverAddress);
-      const socketConfig: plugins.smartsocket.ISmartsocketClientOptions = {
-        alias: 'universeclient',
-        port: parseInt(parsedURL.port, 10),
-        url: parsedURL.protocol + '//' + parsedURL.hostname,
-      };
-      this.smartsocketClient = new SmartsocketClient(socketConfig);
-
-      this.smartsocketClient.eventSubject.subscribe(async (eventArg) => {
-        switch (eventArg) {
-          case 'disconnected':
-            this.disconnect('upstreamEvent');
-        }
-      });
-
-      // lets define some basic actions
-
-      /**
-       * should handle a forced unsubscription by the server
-       */
-      const socketFunctionUnsubscribe = new plugins.smartsocket.SocketFunction({
-        funcName: 'unsubscribe',
-        funcDef: async (dataArg: interfaces.IServerUnsubscribeActionPayload) => {
-          const channel = this.clientUniverseCache.channelMap.findSync((channelArg) => {
-            return channelArg.name === dataArg.name;
-          });
-          if (channel) {
-            channel.unsubscribe();
-          }
-          return {};
-        },
-      });
-
-      /**
-       * handles message reception
-       */
-      const socketFunctionProcessMessage =
-        new plugins.smartsocket.SocketFunction<interfaces.ISocketRequest_ProcessMessage>({
-          funcName: 'processMessage',
-          funcDef: async (messageDescriptorArg) => {
-            logger.log('info', 'Got message from server');
-            const clientUniverseMessage =
-              ClientUniverseMessage.createMessageFromMessageDescriptor(messageDescriptorArg);
-            this.messageRxjsSubject.next(clientUniverseMessage);
-
-            // lets find the corresponding channel
-            const targetChannel = this.getChannel(clientUniverseMessage.targetChannelName);
-            if (targetChannel) {
-              await targetChannel.emitMessageLocally(clientUniverseMessage);
-              return {
-                messageStatus: 'ok',
-              };
-            } else {
-              return {
-                messageStatus: 'channel not found',
-              };
-            }
-          },
-        });
-
-      // add functions
-      this.smartsocketClient.addSocketFunction(socketFunctionUnsubscribe);
-      this.smartsocketClient.addSocketFunction(socketFunctionProcessMessage);
-
-      await this.smartsocketClient.connect();
-      logger.log('info', 'universe client connected successfully');
-      await this.clientUniverseCache.channelMap.forEach(async (clientUniverseChannelArg) => {
-        await clientUniverseChannelArg.populateSubscriptionToServer();
-      });
-    }
-  }
-
-  private async disconnect(
-    reason: 'upstreamEvent' | 'triggered' = 'triggered',
-    tryReconnect = false
-  ) {
-    const instructDisconnect = async () => {
-      if (this.smartsocketClient) {
-        const smartsocketToDisconnect = this.smartsocketClient;
-        this.smartsocketClient = null; // making sure the upstreamEvent does  not interfere
-        await smartsocketToDisconnect.disconnect();
-      }
-    };
-
-    if (reason === 'triggered' && this.smartsocketClient) {
-      await instructDisconnect();
-    }
-    if (this.autoReconnectStatus === 'on' && reason === 'upstreamEvent') {
-      await instructDisconnect();
-      await plugins.smartdelay.delayForRandom(5000, 20000);
-      await this.checkConnection();
-    }
-  }
-}
--- a/ts/smartuniverse.classes.client.universecache.ts
+++ b/ts/smartuniverse.classes.client.universecache.ts
@ -1,11 +0,0 @@
-import * as plugins from './smartuniverse.plugins.js';
-import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel.js';
-
-/**
- * a cache for clients
- * keeps track of which messages have already been received
- * good for deduplication in mesh environments
- */
-export class ClientUniverseCache {
-  public channelMap = new plugins.lik.ObjectMap<ClientUniverseChannel>();
-}
--- a/ts/smartuniverse.classes.client.universechannel.ts
+++ b/ts/smartuniverse.classes.client.universechannel.ts
@ -1,107 +0,0 @@
-import * as plugins from './smartuniverse.plugins.js';
-import * as interfaces from './interfaces/index.js';
-
-import { ClientUniverse } from './index.js';
-import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage.js';
-import { ReactionRequest } from './smartuniverse.classes.event.reactionrequest.js';
-import { ReactionResponse } from './smartuniverse.classes.event.reactionresponse.js';
-
-export class ClientUniverseChannel implements interfaces.IUniverseChannel {
-  // ======
-  // STATIC
-  // ======
-  /**
-   * creates a channel and adds it to the cache of clientUniverseArg
-   * @param clientUniverseArg
-   * @param channelNameArg
-   * @param passphraseArg
-   */
-  public static createClientUniverseChannel(
-    clientUniverseArg: ClientUniverse,
-    channelNameArg: string,
-    passphraseArg: string
-  ): ClientUniverseChannel {
-    const clientChannel = new ClientUniverseChannel(
-      clientUniverseArg,
-      channelNameArg,
-      passphraseArg
-    );
-    clientUniverseArg.clientUniverseCache.channelMap.add(clientChannel);
-    return clientChannel;
-  }
-
-  // ========
-  // INSTANCE
-  // ========
-
-  // properties
-  public name: string;
-  public passphrase: string;
-  public status: 'subscribed' | 'unsubscribed' = 'unsubscribed';
-  private subject = new plugins.smartrx.rxjs.Subject<ClientUniverseMessage<any>>();
-
-  // refs
-  public clientUniverseRef: ClientUniverse;
-
-  constructor(clientUniverseArg: ClientUniverse, nameArg: string, passphraseArg: string) {
-    this.clientUniverseRef = clientUniverseArg;
-    this.name = nameArg;
-    this.passphrase = passphraseArg;
-  }
-
-  /**
-   * subscribes to a channel
-   * tells the universe about this instances interest into a channel
-   */
-  public subscribe(observingFunctionArg: (messageArg: ClientUniverseMessage<any>) => void) {
-    return this.subject.subscribe(
-      (messageArg) => {
-        observingFunctionArg(messageArg);
-      },
-      (error) => console.log(error)
-    );
-  }
-
-  public unsubscribe() {
-    // TODO: unsubscribe all users
-  }
-
-  public async populateSubscriptionToServer() {
-    // lets make sure the channel is connected
-    if (this.status === 'unsubscribed') {
-      const response =
-        await this.clientUniverseRef.smartsocketClient.serverCall<interfaces.ISocketRequest_SubscribeChannel>(
-          'subscribeChannel',
-          {
-            name: this.name,
-            passphrase: this.passphrase,
-          }
-        );
-      this.status = response.subscriptionStatus;
-    }
-  }
-
-  public async emitMessageLocally(messageArg: ClientUniverseMessage<any>) {
-    this.subject.next(messageArg);
-  }
-
-  /**
-   * sends a message towards the server
-   * @param messageArg
-   */
-  public async postMessage(messageArg: interfaces.IMessageCreator) {
-    await this.clientUniverseRef.start(); // its ok to call this multiple times
-    const universeMessageToSend: interfaces.IUniverseMessage = {
-      id: plugins.isounique.uni(),
-      timestamp: Date.now(),
-      passphrase: this.passphrase,
-      targetChannelName: this.name,
-      messageText: messageArg.messageText,
-      payload: messageArg.payload,
-    };
-    await this.clientUniverseRef.smartsocketClient.serverCall(
-      'processMessage',
-      universeMessageToSend
-    );
-  }
-}
--- a/ts/smartuniverse.classes.client.universemessage.ts
+++ b/ts/smartuniverse.classes.client.universemessage.ts
@ -1,38 +0,0 @@
-import * as plugins from './smartuniverse.plugins.js';
-
-import * as interfaces from './interfaces/index.js';
-
-export class ClientUniverseMessage<T> implements interfaces.IUniverseMessage {
-  // ======
-  // STATIC
-  // ======
-  public static createMessageFromMessageDescriptor(messageDescriptor: interfaces.IUniverseMessage) {
-    const clientuniverseMessage = new ClientUniverseMessage(messageDescriptor);
-    return clientuniverseMessage;
-  }
-
-  // ========
-  // INSTANCE
-  // ========
-
-  // properties
-  public id: string;
-
-  public timestamp: number;
-  public smartTimestamp: plugins.smarttime.TimeStamp;
-  public messageText: string;
-  public passphrase: string;
-  public payload: T;
-  public targetChannelName: string;
-
-  constructor(messageArg: interfaces.IUniverseMessage) {
-    for (const key of Object.keys(messageArg)) {
-      this[key] = messageArg[key];
-    }
-  }
-
-  /**
-   * gets json for payload
-   */
-  getAsJsonForPayload() {}
-}
--- a/ts/smartuniverse.classes.clientuniverse.ts
+++ b/ts/smartuniverse.classes.clientuniverse.ts
@ -0,0 +1,120 @@
+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';
+
+import * as interfaces from './interfaces';
+
+import { ClientUniverseChannel, UniverseMessage } from './';
+import { ClientUniverseCache } from './smartuniverse.classes.clientuniversecache';
+
+export interface IClientOptions {
+  serverAddress: string;
+}
+
+/**
+ * this class is for client side only!!!
+ * allows connecting to a universe server
+ */
+export class ClientUniverse {
+  public options;
+  public smartsocketClient: plugins.smartsocket.SmartsocketClient;
+  public observableIntake: plugins.smartrx.ObservableIntake<UniverseMessage>;
+
+  public channelStore = new Objectmap<ClientUniverseChannel>();
+  public clientUniverseCache = new ClientUniverseCache();
+
+  constructor(optionsArg: IClientOptions) {
+    this.options = optionsArg;
+  }
+
+  /**
+   * adds a channel to the channelcache
+   * TODO: verify channel before adding it to the channel cache
+   */
+  public async addChannel(channelNameArg: string, passphraseArg: string) {
+    const existingChannel = await this.getChannel(channelNameArg);
+
+    if (existingChannel) {
+      throw new Error('channel exists');
+    }
+
+    // lets create the channel
+    await ClientUniverseChannel.createClientUniverseChannel(this, channelNameArg, passphraseArg);
+  }
+
+  /**
+   * gets a channel from the channelcache
+   * @param channelName
+   * @param passphraseArg
+   */
+  public async getChannel(channelName: string): Promise<ClientUniverseChannel> {
+    await this.checkConnection();
+    const clientUniverseChannel = this.channelStore.find(channel => {
+      return channel.name === channelName;
+    });
+    return clientUniverseChannel;
+  }
+
+  /**
+   * remove a a achannel
+   * @param messageArg
+   */
+  public removeChannel(channelNameArg, notifyServer = true) {
+    const clientUniverseChannel = this.channelStore.findOneAndRemove(channelItemArg => {
+      return channelItemArg.name === channelNameArg;
+    });
+  }
+
+  public close() {
+    this.smartsocketClient.disconnect();
+  }
+
+  /**
+   * checks the connection towards a universe server
+   * since password validation is done through other means, a connection should always be possible
+   */
+  public async checkConnection(): Promise<void> {
+    if (!this.smartsocketClient && !this.observableIntake) {
+      const parsedURL = url.parse(this.options.serverAddress);
+      const socketConfig: plugins.smartsocket.ISmartsocketClientOptions = {
+        alias: process.env.SOCKET_ALIAS || 'someclient',
+        password: 'UniverseClient',
+        port: parseInt(parsedURL.port, 10),
+        role: 'UniverseClient',
+        url: parsedURL.protocol + '//' + parsedURL.hostname
+      };
+      console.log(socketConfig);
+      this.smartsocketClient = new SmartsocketClient(socketConfig);
+      this.observableIntake = new plugins.smartrx.ObservableIntake();
+
+      // lets define some basic actions
+
+      /**
+       * should handle a forced unsubscription by the server
+       */
+      const unsubscribe = new plugins.smartsocket.SocketFunction({
+        funcName: 'unsubscribe',
+        allowedRoles: [],
+        funcDef: async (data: interfaces.IServerUnsubscribeActionPayload) => {
+          throw new Error('TODO');
+        }
+      });
+
+      /**
+       * should handle a message reception
+       */
+      const processMessageSocketFunction = new plugins.smartsocket.SocketFunction({
+        funcName: 'processMessage',
+        allowedRoles: [],
+        funcDef: async (data: interfaces.IServerUnsubscribeActionPayload) => {
+          throw new Error('TODO');
+        }
+      });
+
+      await this.smartsocketClient.connect();
+    }
+  }
+}
--- a/ts/smartuniverse.classes.clientuniversecache.ts
+++ b/ts/smartuniverse.classes.clientuniversecache.ts
@ -0,0 +1,8 @@
+import * as plugins from './smartuniverse.plugins';
+
+/**
+ * a cache for clients
+ * keeps track of which messages have already been received
+ * good for deduplication in mesh environments
+ */
+export class ClientUniverseCache {}
--- a/ts/smartuniverse.classes.clientuniversechannel.ts
+++ b/ts/smartuniverse.classes.clientuniversechannel.ts
@ -0,0 +1,78 @@
+import * as plugins from './smartuniverse.plugins';
+import * as interfaces from './interfaces';
+
+import { ClientUniverse } from './';
+
+export class ClientUniverseChannel implements interfaces.IUniverseChannel {
+  // ======
+  // STATIC
+  // ======
+  /**
+   * creates a channel and adds it to the cache of clientUniverseArg
+   * @param clientUniverseArg
+   * @param channelNameArg
+   * @param passphraseArg
+   */
+  public static async createClientUniverseChannel(
+    clientUniverseArg: ClientUniverse,
+    channelNameArg: string,
+    passphraseArg: string
+  ): Promise<ClientUniverseChannel> {
+    const clientChannel = new ClientUniverseChannel(
+      clientUniverseArg,
+      channelNameArg,
+      passphraseArg
+    );
+    clientUniverseArg.channelStore.add(clientChannel);
+    await clientChannel.subscribe();
+    return clientChannel;
+  }
+
+  // ========
+  // INSTANCE
+  // ========
+
+  // properties
+  public name: string;
+  public passphrase: string;
+
+  // refs
+  public clientUniverseRef: ClientUniverse;
+
+  constructor(clientUniverseArg: ClientUniverse, nameArg: string, passphraseArg: string) {
+    this.clientUniverseRef = clientUniverseArg;
+    this.name = nameArg;
+    this.passphrase = passphraseArg;
+  }
+
+  /**
+   * subscribes to a channel
+   * tells the universe about this instances interest into a channel
+   */
+  public async subscribe() {
+    const serverCallActionName: interfaces.IServerCallActions = 'channelSubscription';
+    const serverCallActionPayload: interfaces.IServerCallSubscribeActionPayload = {
+      name: this.name,
+      passphrase: this.passphrase
+    };
+    await this.clientUniverseRef.smartsocketClient.serverCall(serverCallActionName, serverCallActionPayload);
+  }
+
+  /**
+   * sends a message towards the server
+   * @param messageArg
+   */
+  public async sendMessage(messageArg: interfaces.IMessageCreator) {
+    await this.clientUniverseRef.checkConnection();
+    const universeMessageToSend: interfaces.IUniverseMessage = {
+      id: plugins.smartunique.shortId(),
+      timestamp: Date.now(),
+      passphrase: this.passphrase,
+      targetChannelName: this.name,
+      messageText: messageArg.messageText,
+      payload: messageArg.payload,
+      payloadStringType: messageArg.payloadStringType
+    };
+    await this.clientUniverseRef.smartsocketClient.serverCall('processMessage', universeMessageToSend);
+  }
+}
--- a/ts/smartuniverse.classes.clientuniversemessage.ts
+++ b/ts/smartuniverse.classes.clientuniversemessage.ts
@ -0,0 +1,33 @@
+import * as plugins from './smartuniverse.plugins';
+
+import * as interfaces from './interfaces';
+
+export class ClientUniverseMessage implements interfaces.IUniverseMessage {
+  // ======
+  // STATIC
+  // ======
+  public static createMessageFromPayload(messageDescriptor: interfaces.IUniverseMessage) {}
+
+  // ========
+  // INSTANCE
+  // ========
+
+  // properties
+  public id: string;
+
+  public timestamp: number;
+  public smartTimestamp: plugins.smarttime.TimeStamp;
+  public messageText: string;
+  public passphrase: string;
+  public payload: any;
+  public payloadStringType;
+  public targetChannelName: string;
+
+  constructor(messageArg: interfaces.IUniverseMessage, payloadArg) {
+    for (const key of Object.keys(messageArg)) {
+      this[key] = messageArg[key];
+    }
+  }
+
+  getAsJsonForPayload() {}
+}
--- a/ts/smartuniverse.classes.event.broadcastevent.ts
+++ b/ts/smartuniverse.classes.event.broadcastevent.ts
@ -1,17 +0,0 @@
-import * as plugins from './smartuniverse.plugins.js';
-
-/**
- * broadcasts an event to multiple channels
- * also handles subscription
- */
-export class BroadcastEvent<T extends plugins.typedrequestInterfaces.ITypedEvent<any>> {
-  public eventSubject = new plugins.smartrx.rxjs.Subject<T['payload']>();
-
-  constructor() {}
-
-  public fire(eventPayloadArg: T['payload']) {}
-
-  public subscribe(funcArg: (nextArg: T['payload']) => void): plugins.smartrx.rxjs.Subscription {
-    return this.eventSubject.subscribe(funcArg);
-  }
-}
--- a/ts/smartuniverse.classes.event.reactionrequest.ts
+++ b/ts/smartuniverse.classes.event.reactionrequest.ts
@ -1,83 +0,0 @@
-import * as plugins from './smartuniverse.plugins.js';
-import { UniverseChannel } from './smartuniverse.classes.universechannel.js';
-import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel.js';
-import { ReactionResult } from './smartuniverse.classes.event.reactionresult.js';
-import { UniverseMessage } from './smartuniverse.classes.universemessage.js';
-import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage.js';
-
-export interface IReactionRequestConstructorOptions<
-  T extends plugins.typedrequestInterfaces.ITypedRequest
-> {
-  method: T['method'];
-}
-
-export interface ICombinatorPayload<T extends plugins.typedrequestInterfaces.ITypedRequest> {
-  /**
-   * needed for tying responses to requests
-   */
-  id: string;
-  typedRequestPayload: {
-    method: T['method'];
-    request: T['request'];
-    response: T['response'];
-  };
-}
-
-export class ReactionRequest<T extends plugins.typedrequestInterfaces.ITypedRequest> {
-  public method: T['method'];
-
-  constructor(optionsArg: IReactionRequestConstructorOptions<T>) {
-    this.method = optionsArg.method;
-  }
-
-  public async fire(
-    channelsArg: Array<UniverseChannel | ClientUniverseChannel>,
-    requestDataArg: T['request'],
-    timeoutMillisArg = 5000
-  ) {
-    const subscriptionMap = new plugins.lik.ObjectMap<plugins.smartrx.rxjs.Subscription>();
-    const reactionResult = new ReactionResult<T>();
-    const requestId = plugins.isounique.uni();
-    for (const channel of channelsArg) {
-      subscriptionMap.add(
-        channel.subscribe(
-          (
-            messageArg:
-              | UniverseMessage<ICombinatorPayload<T>>
-              | ClientUniverseMessage<ICombinatorPayload<T>>
-          ) => {
-            if (
-              messageArg.messageText === 'reactionResponse' &&
-              messageArg.payload.typedRequestPayload.method === this.method
-            ) {
-              const payload: ICombinatorPayload<T> = messageArg.payload;
-              if (payload.id !== requestId) {
-                return;
-              }
-              reactionResult.pushReactionResponse(payload.typedRequestPayload.response);
-            }
-          }
-        )
-      );
-      const payload: ICombinatorPayload<T> = {
-        id: requestId,
-        typedRequestPayload: {
-          method: this.method,
-          request: requestDataArg,
-          response: null,
-        },
-      };
-      channel.postMessage({
-        messageText: 'reactionRequest',
-        payload,
-      });
-    }
-    plugins.smartdelay.delayFor(timeoutMillisArg).then(async () => {
-      await subscriptionMap.forEach((subscriptionArg) => {
-        subscriptionArg.unsubscribe();
-      });
-      reactionResult.complete();
-    });
-    return reactionResult;
-  }
-}
--- a/ts/smartuniverse.classes.event.reactionresponse.ts
+++ b/ts/smartuniverse.classes.event.reactionresponse.ts
@ -1,63 +0,0 @@
-import * as plugins from './smartuniverse.plugins.js';
-
-import { type ICombinatorPayload } from './smartuniverse.classes.event.reactionrequest.js';
-import { UniverseChannel } from './smartuniverse.classes.universechannel.js';
-import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel.js';
-import { UniverseMessage } from './smartuniverse.classes.universemessage.js';
-import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage.js';
-
-export type TReactionResponseFuncDef<T extends plugins.typedrequestInterfaces.ITypedRequest> = (
-  dataArg: T['request']
-) => Promise<T['response']>;
-
-export interface IReactionResponseConstructorOptions<
-  T extends plugins.typedrequestInterfaces.ITypedRequest
-> {
-  method: T['method'];
-  channels: Array<UniverseChannel | ClientUniverseChannel>;
-  funcDef: TReactionResponseFuncDef<T>;
-}
-
-export class ReactionResponse<T extends plugins.typedrequestInterfaces.ITypedRequest> {
-  public method: T['method'];
-  public channels = new plugins.lik.ObjectMap<UniverseChannel | ClientUniverseChannel>();
-  public funcDef: TReactionResponseFuncDef<T>;
-
-  constructor(optionsArg: IReactionResponseConstructorOptions<T>) {
-    this.method = optionsArg.method;
-    this.channels.addArray(optionsArg.channels);
-    this.funcDef = optionsArg.funcDef;
-    for (const channel of this.channels.getArray()) {
-      channel.subscribe((messageArg) => {
-        this.processMessageForReaction(channel, messageArg);
-      });
-    }
-  }
-
-  private async processMessageForReaction(
-    channelArg: UniverseChannel | ClientUniverseChannel,
-    messageArg:
-      | UniverseMessage<ICombinatorPayload<T>>
-      | ClientUniverseMessage<ICombinatorPayload<T>>
-  ) {
-    if (
-      messageArg.messageText === 'reactionRequest' &&
-      messageArg.payload.typedRequestPayload.method === this.method
-    ) {
-      const response: T['response'] = await this.funcDef(
-        messageArg.payload.typedRequestPayload.request
-      );
-      const payload: ICombinatorPayload<T> = {
-        ...messageArg.payload,
-        typedRequestPayload: {
-          ...messageArg.payload.typedRequestPayload,
-          response,
-        },
-      };
-      channelArg.postMessage({
-        messageText: 'reactionResponse',
-        payload,
-      });
-    }
-  }
-}
--- a/ts/smartuniverse.classes.event.reactionresult.ts
+++ b/ts/smartuniverse.classes.event.reactionresult.ts
@ -1,52 +0,0 @@
-import * as plugins from './smartuniverse.plugins.js';
-import { ReactionResponse } from './smartuniverse.classes.event.reactionresponse.js';
-
-export class ReactionResult<T extends plugins.typedrequestInterfaces.ITypedRequest> {
-  private resultReplaySubject = new plugins.smartrx.rxjs.ReplaySubject<T['response']>();
-  private endResult: Array<T['response']> = [];
-  private completeDeferred = plugins.smartpromise.defer<Array<T['response']>>();
-
-  constructor() {
-    this.resultSubscribe((responseArg) => {
-      this.endResult.push(responseArg);
-    });
-  }
-
-  public resultSubscribe(observerArg: (responseArg: T['response']) => void) {
-    return this.resultReplaySubject.subscribe(observerArg);
-  }
-
-  /**
-   * gets the end result as an array of all results
-   */
-  public async getEndResult() {
-    const result = await this.completeDeferred.promise;
-    return result;
-  }
-
-  /**
-   * if there is a single respondant, or you are only interested in the first result
-   */
-  public async getFirstResult() {
-    const done = plugins.smartpromise.defer<T['response']>();
-    const subscription = this.resultReplaySubject.subscribe((result) => {
-      done.resolve(result);
-      subscription.unsubscribe();
-    });
-    return await done.promise;
-  }
-
-  /**
-   * push a reactionResponse
-   */
-  public async pushReactionResponse(responseArg: T['response']) {
-    this.resultReplaySubject.next(responseArg);
-  }
-
-  /**
-   * completes the ReactionResult
-   */
-  public async complete() {
-    this.completeDeferred.resolve(this.endResult);
-  }
-}
--- a/ts/smartuniverse.classes.universe.ts
+++ b/ts/smartuniverse.classes.universe.ts
@ -1,15 +1,15 @@
-import * as plugins from './smartuniverse.plugins.js';
-import * as pluginsTyped from './smartuniverse.pluginstyped.js';
+import * as plugins from './smartuniverse.plugins';

-import { UniverseCache, UniverseChannel, UniverseMessage } from './index.js';
+import { Handler, Route, Server } from '@pushrocks/smartexpress';
+import { UniverseCache, UniverseChannel, UniverseMessage } from './';

-import * as interfaces from './interfaces/index.js';
-import { UniverseConnection } from './smartuniverse.classes.universeconnection.js';
-import { logger } from './smartuniverse.logging.js';
+import * as paths from './smartuniverse.paths';
+
+import * as interfaces from './interfaces';
+import { UniverseConnection } from './smartuniverse.classes.universeconnection';

 export interface ISmartUniverseConstructorOptions {
  messageExpiryInMilliseconds: number;
-  externalServer?: pluginsTyped.typedserver.servertools.Server;
 }

 /**
@ -25,7 +25,7 @@ export class Universe {
  /**
   * the smartexpress server used
   */
-  private server: pluginsTyped.typedserver.servertools.Server;
+  private smartexpressServer: plugins.smartexpress.Server;

  /**
   * the smartsocket used
@ -34,7 +34,7 @@ export class Universe {

  constructor(optionsArg: ISmartUniverseConstructorOptions) {
    this.options = optionsArg;
-    this.universeCache = new UniverseCache(this, this.options.messageExpiryInMilliseconds);
+    this.universeCache = new UniverseCache(this.options.messageExpiryInMilliseconds);
  }

  /**
@ -46,7 +46,7 @@ export class Universe {
  /**
   * get the currently running version of smartuniverse
   */
-  /* public getUniverseVersion() {
+  public getUniverseVersion() {
    if (this.universeVersionStore) {
      return this.universeVersionStore;
    } else {
@ -54,93 +54,91 @@ export class Universe {
      this.universeVersionStore = packageJson.version;
      return this.universeVersionStore;
    }
-  } */
+  }

  /**
   * adds a channel to the Universe
   */
-  public addChannel(nameArg: string, passphraseArg: string) {
-    const newChannel = UniverseChannel.createChannel(this, nameArg, passphraseArg);
-    return newChannel;
-  }
-
-  /**
-   * returns a channel
-   */
-  public getChannel(channelNameArg: string) {
-    return this.universeCache.channelMap.findSync((channelArg) => {
-      return channelArg.name === channelNameArg;
-    });
+  public async addChannel(nameArg: string, passphraseArg: string) {
+    const newChannel = UniverseChannel.createChannel(this.universeCache, nameArg, passphraseArg);
  }

  /**
   * initiates a server
   */
-  public async start(portArg?: number) {
-    if (!this.options.externalServer && !portArg) {
-      throw new Error(`You supplied an external error. You need to specify a portArg to start on.`);
-    }
-
-    portArg = portArg || 3000; // TODO: remove
-
-    // add websocket upgrade
-    this.smartsocket = new plugins.smartsocket.Smartsocket({
-      alias: 'smartuniverse',
-      port: portArg,
+  public async start(portArg: number) {
+    // lets create the base smartexpress server
+    this.smartexpressServer = new plugins.smartexpress.Server({
+      cors: true,
+      defaultAnswer: async () => {
+        return `smartuniverse server ${this.getUniverseVersion()}`;
+      },
+      forceSsl: false,
+      port: portArg
    });

-    // lets create the base smartexpress server
-    if (this.options.externalServer) {
-      console.log('Universe is using externally supplied server');
-      this.smartsocket.setExternalServer('smartexpress', this.options.externalServer);
-    }
+    // add websocket upgrade
+    this.smartsocket = new plugins.smartsocket.Smartsocket({});

+    // add a role for the clients
+    const ClientRole = new plugins.smartsocket.SocketRole({
+      name: 'UniverseClient',
+      passwordHash: plugins.smarthash.sha256FromStringSync('UniverseClient') // authentication happens on another level
+    });

-    const socketFunctionSubscription =
-      new plugins.smartsocket.SocketFunction<interfaces.ISocketRequest_SubscribeChannel>({
-        funcName: 'subscribeChannel',
-        funcDef: async (dataArg, socketConnectionArg) => {
+    // add the role to smartsocket
+    this.smartsocket.addSocketRoles([ClientRole]);
+
+    const socketFunctionSubscription = new plugins.smartsocket.SocketFunction({
+      allowedRoles: [ClientRole], // there is only one client role, Authentication happens on another level
+      funcName: 'channelSubscription',
+      funcDef: async (
+        dataArg: interfaces.IServerCallSubscribeActionPayload,
+        socketConnectionArg
+      ) => {
+        // run in "this context" of this class
+        await (async () => {
+          // TODO: properly add the connection
          const universeConnection = new UniverseConnection({
-            universe: this,
            socketConnection: socketConnectionArg,
-            authenticationRequests: [dataArg],
+            authenticationRequests: []
          });
-          await UniverseConnection.addConnectionToCache(this, universeConnection);
+          await UniverseConnection.addConnectionToCache(this.universeCache, universeConnection);
          return {
-            subscriptionStatus: 'subscribed',
+            'subscription status': 'success'
          };
-        },
-      });
+        })();
+      }
+    });

-    const socketFunctionProcessMessage = new plugins.smartsocket.SocketFunction<any>({
-      // TODO proper ITypedRequest here instead of any
+    const socketFunctionProcessMessage = new plugins.smartsocket.SocketFunction({
+      allowedRoles: [ClientRole], // there is only one client role, Authentication happens on another level
      funcName: 'processMessage',
-      funcDef: async (messageDataArg: interfaces.IUniverseMessage, socketConnectionArg) => {
-        const universeConnection = UniverseConnection.findUniverseConnectionBySocketConnection(
-          this.universeCache,
-          socketConnectionArg
-        );
-        if (universeConnection) {
-          logger.log('ok', 'found UniverseConnection for socket for incoming message');
-        } else {
-          logger.log('warn', 'found no Authorized channel for incoming message');
-          return {
-            error: 'You need to authenticate for a channel',
-          };
-        }
-        const unauthenticatedMessage = UniverseMessage.createMessageFromPayload(
-          socketConnectionArg,
-          messageDataArg
-        );
-        const foundChannel = await UniverseChannel.authorizeAMessageForAChannel(
-          this.universeCache,
-          unauthenticatedMessage
-        );
-        if (foundChannel && unauthenticatedMessage.authenticated) {
-          const authenticatedMessage = unauthenticatedMessage;
-          await this.universeCache.addMessage(authenticatedMessage);
-        }
-      },
+      funcDef: async (dataArg: interfaces.IUniverseMessage, socketConnectionArg) => {
+        // run in "this" context of this class
+        await (async () => {
+          const universeConnection = UniverseConnection.findUniverseConnectionBySocketConnection(
+            this.universeCache,
+            socketConnectionArg
+          );
+          if (universeConnection) {
+            console.log('found UniverseConnection for socket');
+          } else {
+            return {
+              error: 'You need to authenticate for a channel'
+            };
+          }
+          const unauthenticatedMessage = UniverseMessage.createMessageFromPayload(dataArg);
+          const foundChannel = await UniverseChannel.authorizeAMessageForAChannel(
+            this.universeCache,
+            unauthenticatedMessage
+          );
+          if (foundChannel && unauthenticatedMessage.authenticated) {
+            const authenticatedMessage = unauthenticatedMessage;
+            await this.universeCache.addMessage(authenticatedMessage);
+          }
+        })();
+      }
    });

    // add socket functions
@ -148,8 +146,11 @@ export class Universe {
    this.smartsocket.addSocketFunction(socketFunctionProcessMessage);

    // add smartsocket to the running smartexpress app
+    this.smartsocket.setExternalServer('smartexpress', this.smartexpressServer as any);
+    // start everything
+    await this.smartexpressServer.start();
    await this.smartsocket.start();
-    logger.log('success', 'started universe');
+    console.log('started universe');
  }

  /**
@ -157,5 +158,6 @@ export class Universe {
   */
  public async stopServer() {
    await this.smartsocket.stop();
+    await this.smartexpressServer.stop();
  }
 }
--- a/ts/smartuniverse.classes.universecache.ts
+++ b/ts/smartuniverse.classes.universecache.ts
@ -1,11 +1,14 @@
-import * as plugins from './smartuniverse.plugins.js';
+import * as plugins from './smartuniverse.plugins';

-import { UniverseChannel } from './smartuniverse.classes.universechannel.js';
-import { UniverseMessage } from './smartuniverse.classes.universemessage.js';
+import { UniverseChannel } from './smartuniverse.classes.universechannel';
+import { UniverseMessage } from './smartuniverse.classes.universemessage';

-import { ObjectMap } from '@push.rocks/lik';
-import { UniverseConnection } from './smartuniverse.classes.universeconnection.js';
-import { Universe } from './smartuniverse.classes.universe.js';
+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';

 /**
 * universe store handles the creation, storage and retrieval of messages.
@ -15,34 +18,27 @@ export class UniverseCache {
  // INSTANCE
  // ========
  public standardMessageExpiry: number;
-  public destructionTime: number = 10000;
+  public destructionTime: number = 60000;

  /**
   * stores messages for this instance
   */
-  public messageMap = new ObjectMap<UniverseMessage<any>>();
+  public messageMap = new Objectmap<UniverseMessage>();

  /**
   * 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
   */
-  public blackListChannel: UniverseChannel;
+  public blackListChannel = new UniverseChannel(this, 'blacklist', 'nada');

-  public universeRef: Universe;
-
-  constructor(universeArg: Universe, standardMessageExpiryArg: number) {
-    this.universeRef = universeArg;
+  constructor(standardMessageExpiryArg: number) {
    this.standardMessageExpiry = standardMessageExpiryArg;
-    this.blackListChannel = new UniverseChannel(this.universeRef, 'blacklist', 'nada');
  }

  /**
@ -50,13 +46,10 @@ export class UniverseCache {
   * @param messageArg
   * @param attachedPayloadArg
   */
-  public async addMessage(messageArg: UniverseMessage<any>) {
+  public async addMessage(messageArg: UniverseMessage) {
    messageArg.setUniverseCache(this);
    UniverseChannel.authorizeAMessageForAChannel(this, messageArg);
    this.messageMap.add(messageArg);
-    messageArg.universeChannelList.forEach((universeChannel) => {
-      universeChannel.push(messageArg);
-    });
  }

  /**
@ -65,9 +58,9 @@ export class UniverseCache {
  public readMessagesYoungerThan(
    unixTimeArg?: number,
    channelName?: string
-  ): plugins.smartrx.rxjs.Observable<UniverseMessage<any>> {
-    const messageObservable = plugins.smartrx.rxjs.from(this.messageMap.getArray()).pipe(
-      plugins.smartrx.rxjs.ops.filter((messageArg) => {
+  ): Observable<UniverseMessage> {
+    const messageObservable = from(this.messageMap.getArray()).pipe(
+      filter(messageArg => {
        return messageArg.smartTimestamp.isYoungerThanMilliSeconds(this.destructionTime);
      })
    );
--- a/ts/smartuniverse.classes.universechannel.ts
+++ b/ts/smartuniverse.classes.universechannel.ts
@ -1,11 +1,7 @@
-import * as plugins from './smartuniverse.plugins.js';
-import * as interfaces from './interfaces/index.js';
+import * as plugins from './smartuniverse.plugins';

-import { UniverseCache } from './smartuniverse.classes.universecache.js';
-import { UniverseMessage } from './smartuniverse.classes.universemessage.js';
-import { UniverseConnection } from './smartuniverse.classes.universeconnection.js';
-import { Universe } from './smartuniverse.classes.universe.js';
-import { logger } from './smartuniverse.logging.js';
+import { UniverseCache } from './smartuniverse.classes.universecache';
+import { UniverseMessage } from './smartuniverse.classes.universemessage';

 /**
 * enables messages to stay within a certain scope.
@ -21,12 +17,12 @@ export class UniverseChannel {
   * @param passphraseArg the secret thats used for a certain topic.
   */
  public static createChannel(
-    universeArg: Universe,
+    universeCacheArg: UniverseCache,
    channelNameArg: string,
    passphraseArg: string
  ) {
-    const newChannel = new UniverseChannel(universeArg, channelNameArg, passphraseArg);
-    universeArg.universeCache.channelMap.add(newChannel);
+    const newChannel = new UniverseChannel(universeCacheArg, channelNameArg, passphraseArg);
+    universeCacheArg.channelMap.add(newChannel);
    return newChannel;
  }

@ -34,7 +30,7 @@ export class UniverseChannel {
   * returns boolean wether certain channel exists
   */
  public static async doesChannelExists(universeCacheArg: UniverseCache, channelNameArg: string) {
-    const channel = universeCacheArg.channelMap.findSync((channelArg) => {
+    const channel = universeCacheArg.channelMap.find(channelArg => {
      return channelArg.name === channelNameArg;
    });
    if (channel) {
@ -53,31 +49,25 @@ export class UniverseChannel {
   */
  public static authorizeAMessageForAChannel(
    universeCacheArg: UniverseCache,
-    universeMessageArg: UniverseMessage<any>
+    universeMessageArg: UniverseMessage
  ): UniverseChannel {
-    const foundChannel = universeCacheArg.channelMap.findSync((universeChannel) => {
+    const foundChannel = universeCacheArg.channelMap.find(universeChannel => {
      const result = universeChannel.authenticate(universeMessageArg);
      return result;
    });
    if (foundChannel) {
      universeMessageArg.authenticated = true;
      universeMessageArg.universeChannelList.add(foundChannel);
-      logger.log('ok', 'message authorized');
+      console.log('message authorized');
      return foundChannel;
    } else {
      universeMessageArg.authenticated = false;
      universeMessageArg.universeChannelList.add(universeCacheArg.blackListChannel);
-      logger.log('warn', 'message not valid');
+      console.log('message not valid');
      return null;
    }
  }

-  public static getUniverseChannelByName(universeRef: Universe, universeChannelName: string) {
-    return universeRef.universeCache.channelMap.findSync((channelArg) => {
-      return channelArg.name === universeChannelName;
-    });
-  }
-
  // ========
  // INSTANCE
  // ========
@ -85,16 +75,14 @@ export class UniverseChannel {
   * the name of the channel
   */
  public name: string;
-  public universeRef: Universe;
-  private subject = new plugins.smartrx.rxjs.Subject<UniverseMessage<any>>();
+  public universeCacheInstance: UniverseCache;

  /**
   * the passphrase for the channel
   */
  public passphrase: string;

-  constructor(universeArg: Universe, channelNameArg: string, passphraseArg: string) {
-    this.universeRef = universeArg;
+  constructor(universeCacheArg: UniverseCache, channelNameArg: string, passphraseArg: string) {
    this.name = channelNameArg;
    this.passphrase = passphraseArg;
  }
@ -104,66 +92,12 @@ export class UniverseChannel {
   * # the messages channelName against the unverseChannel's name
   * # the messages password against the universeChannel's password
   */
-  public authenticate(universeMessageArg: UniverseMessage<any>): boolean {
+  public authenticate(universeMessageArg: UniverseMessage): boolean {
    return (
      this.name === universeMessageArg.targetChannelName &&
      this.passphrase === universeMessageArg.passphrase
    );
  }

-  /**
-   * pushes a message to clients
-   * @param messageArg
-   */
-  public async push(messageArg: UniverseMessage<any>) {
-    this.subject.next(messageArg);
-    const universeConnectionsWithChannelAccess: UniverseConnection[] = [];
-    await this.universeRef.universeCache.connectionMap.forEach(async (socketConnection) => {
-      if (socketConnection.authenticatedChannels.includes(this)) {
-        universeConnectionsWithChannelAccess.push(socketConnection);
-      }
-    });
-    for (const universeConnection of universeConnectionsWithChannelAccess) {
-      const smartsocket = universeConnection.socketConnection
-        .smartsocketRef as plugins.smartsocket.Smartsocket;
-      const universeMessageToSend: interfaces.IUniverseMessage = {
-        id: messageArg.id,
-        timestamp: messageArg.timestamp,
-        passphrase: messageArg.passphrase,
-        targetChannelName: this.name,
-        messageText: messageArg.messageText,
-        payload: messageArg.payload,
-      };
-      smartsocket.clientCall(
-        'processMessage',
-        universeMessageToSend,
-        universeConnection.socketConnection
-      );
-    }
-  }
-
-  // functions to interact with a channel locally
-  public subscribe(observingFunctionArg: (messageArg: UniverseMessage<any>) => void) {
-    return this.subject.subscribe(
-      (messageArg) => {
-        observingFunctionArg(messageArg);
-      },
-      (error) => console.log(error)
-    );
-  }
-
-  /**
-   * sends a message to the channel
-   */
-  public async postMessage(messageDescriptor: interfaces.IMessageCreator) {
-    const messageToSend = new UniverseMessage({
-      id: plugins.isounique.uni(),
-      messageText: messageDescriptor.messageText,
-      payload: messageDescriptor.payload,
-      targetChannelName: this.name,
-      passphrase: this.passphrase,
-      timestamp: Date.now(),
-    });
-    this.universeRef.universeCache.addMessage(messageToSend);
-  }
+  public pushToClients(messageArg: UniverseMessage) {}
 }
--- a/ts/smartuniverse.classes.universeconnection.ts
+++ b/ts/smartuniverse.classes.universeconnection.ts
@ -1,8 +1,7 @@
-import * as plugins from './smartuniverse.plugins.js';
-import * as interfaces from './interfaces/index.js';
-import { UniverseChannel } from './smartuniverse.classes.universechannel.js';
-import { UniverseCache } from './smartuniverse.classes.universecache.js';
-import { Universe } from './smartuniverse.classes.universe.js';
+import * as plugins from './smartuniverse.plugins';
+import * as interfaces from './interfaces';
+import { UniverseChannel } from './smartuniverse.classes.universechannel';
+import { UniverseCache } from './smartuniverse.classes.universecache';

 /**
 * represents a connection to the universe
@ -13,20 +12,18 @@ export class UniverseConnection {
   * @param universeConnectionArg
   */
  public static async addConnectionToCache(
-    universeRef: Universe,
+    universeCache: UniverseCache,
    universeConnectionArg: UniverseConnection
  ) {
    let universeConnection = universeConnectionArg;
    universeConnection = await UniverseConnection.deduplicateUniverseConnection(
-      universeRef.universeCache,
+      universeCache,
      universeConnection
    );
    universeConnection = await UniverseConnection.authenticateAuthenticationRequests(
-      universeRef,
      universeConnection
    );
-    universeRef.universeCache.connectionMap.add(universeConnection);
-    console.log('hi');
+    universeCache.connectionMap.add(universeConnection);
  }

  /**
@ -37,7 +34,7 @@ export class UniverseConnection {
    universeConnectionArg: UniverseConnection
  ): Promise<UniverseConnection> {
    let connectionToReturn: UniverseConnection;
-    universeCache.connectionMap.forEach(async (existingConnection) => {
+    universeCache.connectionMap.forEach(async existingConnection => {
      if (existingConnection.socketConnection === universeConnectionArg.socketConnection) {
        connectionToReturn = await this.mergeUniverseConnections(
          existingConnection,
@ -54,19 +51,10 @@ export class UniverseConnection {
  /**
   * authenticate AuthenticationRequests
   */
-  public static async authenticateAuthenticationRequests(
-    universeRef: Universe,
-    universeConnectionArg: UniverseConnection
+  public static authenticateAuthenticationRequests(
+    universeConnectionArg
  ): Promise<UniverseConnection> {
-    for (const authenticationRequest of universeConnectionArg.authenticationRequests) {
-      const universeChannelToAuthenticateAgainst = UniverseChannel.getUniverseChannelByName(
-        universeRef,
-        authenticationRequest.name
-      );
-      if (universeChannelToAuthenticateAgainst.passphrase === authenticationRequest.passphrase) {
-        universeConnectionArg.authenticatedChannels.push(universeChannelToAuthenticateAgainst);
-      }
-    }
+    // TODO: authenticate connections
    return universeConnectionArg;
  }

@ -77,6 +65,7 @@ export class UniverseConnection {
    connectionArg1: UniverseConnection,
    connectionArg2: UniverseConnection
  ) {
+    // TODO: merge connections
    return connectionArg1;
  }

@ -87,49 +76,36 @@ export class UniverseConnection {
    universeCache: UniverseCache,
    socketConnectionArg: plugins.smartsocket.SocketConnection
  ): UniverseConnection {
-    const universeConnection = universeCache.connectionMap.findSync((universeConnectionArg) => {
+    const universeConnection = universeCache.connectionMap.find(universeConnectionArg => {
      return universeConnectionArg.socketConnection === socketConnectionArg;
    });
    return universeConnection;
  }

-  // INSTANCE
-  public universeRef: Universe;
  public terminatedDeferred = plugins.smartpromise.defer();

  /**
   * the socketClient to ping
   */
  public socketConnection: plugins.smartsocket.SocketConnection;
-  public authenticationRequests: Array<interfaces.ISocketRequest_SubscribeChannel['request']> = [];
+  public authenticationRequests = [];
+  public subscribedChannels: UniverseChannel[] = [];
  public authenticatedChannels: UniverseChannel[] = [];
  public failedToJoinChannels: UniverseChannel[] = [];

  /**
-   * disconnect the connection
+   * terminates the connection
   */
-  public async disconnect(reason: 'upstreamevent' | 'triggered' = 'triggered') {
-    if (reason === 'triggered') {
-      await this.socketConnection.disconnect();
-    }
-    this.universeRef.universeCache.connectionMap.remove(this);
+  public terminateConnection() {
+    this.socketConnection.socket.disconnect();
    this.terminatedDeferred.resolve();
  }

  constructor(optionsArg: {
-    universe: Universe;
    socketConnection: plugins.smartsocket.SocketConnection;
-    authenticationRequests: Array<interfaces.ISocketRequest_SubscribeChannel['request']>;
+    authenticationRequests: interfaces.IServerCallSubscribeActionPayload[];
  }) {
-    this.universeRef = optionsArg.universe;
-    this.authenticationRequests = optionsArg.authenticationRequests;
+    // TODO: check if this is correct
    this.socketConnection = optionsArg.socketConnection;
-    this.socketConnection.eventSubject.subscribe(async (eventArg) => {
-      switch (eventArg) {
-        case 'disconnected':
-          await this.disconnect('upstreamevent');
-          break;
-      }
-    });
  }
 }
--- a/ts/smartuniverse.classes.universemessage.ts
+++ b/ts/smartuniverse.classes.universemessage.ts
@ -1,33 +1,33 @@
-import * as plugins from './smartuniverse.plugins.js';
-import * as interfaces from './interfaces/index.js';
-import { Universe } from './smartuniverse.classes.universe.js';
-import { UniverseChannel } from './smartuniverse.classes.universechannel.js';
-import { UniverseCache } from './smartuniverse.classes.universecache.js';
-import { SocketConnection } from '@push.rocks/smartsocket';
-import { logger } from './smartuniverse.logging.js';
+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 { IUniverseMessage } from './interfaces';

 /**
 * represents a message within a universe
 * acts as a container to save message states like authentication status
 */
-export class UniverseMessage<T> implements interfaces.IUniverseMessage {
-  public static createMessageFromPayload(
-    socketConnectionArg: SocketConnection,
-    dataArg: interfaces.IUniverseMessage
-  ) {
-    const universeMessageInstance = new UniverseMessage(dataArg);
-    universeMessageInstance.socketConnection = socketConnectionArg;
-    return universeMessageInstance;
+export class UniverseMessage implements interfaces.IUniverseMessage {
+  public static createMessageFromPayload(dataArg: interfaces.IUniverseMessage) {
+    return new UniverseMessage(dataArg);
  }

  public id: string;
+
  public timestamp: number;
-  public smartTimestamp: plugins.smarttime.TimeStamp;
+  public smartTimestamp: TimeStamp;
+
  public messageText: string;
  public passphrase: string;
-  public payload: T;
+  public payload: any;
+  public payloadStringType;
  public targetChannelName: string;
-  public socketConnection: SocketConnection;

  /**
   * the UniverseCache the message is attached to
@ -37,7 +37,7 @@ export class UniverseMessage<T> implements interfaces.IUniverseMessage {
  /**
   * enables unprotected grouping of messages for efficiency purposes.
   */
-  public universeChannelList = new plugins.lik.ObjectMap<UniverseChannel>();
+  public universeChannelList = new Objectmap<UniverseChannel>();

  /**
   * wether the message is authenticated
@ -47,48 +47,38 @@ export class UniverseMessage<T> implements interfaces.IUniverseMessage {
  /**
   * a destruction timer for this message
   */
-  public destructionTimer: plugins.smarttime.Timer; // a timer to take care of message destruction
+  public destructionTimer: Timer; // a timer to take care of message destruction

  /**
   * the constructor to create a universe message
   * @param messageArg
   * @param attachedPayloadArg
   */
-  constructor(messageDescriptor: interfaces.IUniverseMessage) {
-    this.smartTimestamp = new plugins.smarttime.TimeStamp(this.timestamp);
+  constructor(messageDescriptor: IUniverseMessage) {
+    this.smartTimestamp = new TimeStamp(this.timestamp);
    this.messageText = messageDescriptor.messageText;
    this.targetChannelName = messageDescriptor.targetChannelName;
    this.passphrase = messageDescriptor.passphrase;
    this.payload = messageDescriptor.payload;
    // prevent memory issues
-    this.setDestructionTimer();
+    this.fallBackDestruction();
  }

  public setUniverseCache(universeCacheArg: UniverseCache) {
    this.universeCache = universeCacheArg;
  }

-  public setTargetChannel() {}
-
-  public setDestructionTimer(selfdestructAfterArg?: number) {
+  public setDestructionTimer(selfdestructAfterArg: number) {
    if (selfdestructAfterArg) {
-      this.destructionTimer = new plugins.smarttime.Timer(selfdestructAfterArg);
+      this.destructionTimer = new Timer(selfdestructAfterArg);
      this.destructionTimer.start();
+
      // set up self destruction by removing this from the parent messageCache
-      this.destructionTimer.completed
-        .then(async () => {
-          this.universeCache.messageMap.remove(this);
-        })
-        .catch((err) => {
-          console.log(err);
-          console.log(this);
-        });
-    } else {
-      plugins.smartdelay.delayFor(1000).then(() => {
-        if (!this.destructionTimer) {
-          this.setDestructionTimer(6000);
-        }
+      this.destructionTimer.completed.then(async () => {
+        this.universeCache.messageMap.remove(this);
      });
+    } else {
+      this.fallBackDestruction();
    }
  }

@ -96,6 +86,17 @@ export class UniverseMessage<T> implements interfaces.IUniverseMessage {
   * handles bad messages for further analysis
   */
  public handleAsBadMessage() {
-    logger.log('warn', 'received a bad message');
+    console.log('received a bad message');
+  }
+
+  /**
+   * prevents memory leaks if channels have no default
+   */
+  private fallBackDestruction() {
+    plugins.smartdelay.delayFor(1000).then(() => {
+      if (!this.destructionTimer) {
+        this.setDestructionTimer(6000);
+      }
+    });
  }
 }
--- a/ts/smartuniverse.logging.ts
+++ b/ts/smartuniverse.logging.ts
@ -1,2 +0,0 @@
-import * as plugins from './smartuniverse.plugins.js';
-export const logger = new plugins.smartlog.ConsoleLog();
--- a/ts/smartuniverse.paths.ts
+++ b/ts/smartuniverse.paths.ts
@ -0,0 +1,3 @@
+import * as plugins from './smartuniverse.plugins';
+
+export const packageJson = plugins.path.join(__dirname, '../package.json');
--- a/ts/smartuniverse.plugins.ts
+++ b/ts/smartuniverse.plugins.ts
@ -1,29 +1,31 @@
-// apiglobal scope
-import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces';
+// node native
+import * as path from 'path';

-export { typedrequestInterfaces };
+export { path };

 // pushrocks scope
-import * as lik from '@push.rocks/lik';
-import * as isohash from '@push.rocks/isohash';
-import * as isounique from '@push.rocks/isounique';
-import * as smartdelay from '@push.rocks/smartdelay';
-import * as smartlog from '@push.rocks/smartlog';
-import * as smartpromise from '@push.rocks/smartpromise';
-import * as smartrx from '@push.rocks/smartrx';
-import * as smartsocket from '@push.rocks/smartsocket';
-import * as smarttime from '@push.rocks/smarttime';
-import * as smarturl from '@push.rocks/smarturl';
+import * as lik from '@pushrocks/lik';
+import * as smarthash from '@pushrocks/smarthash';
+import * as smartdelay from '@pushrocks/smartdelay';
+import * as smartexpress from '@pushrocks/smartexpress';
+import * as smartfile from '@pushrocks/smartfile';
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartrequest from '@pushrocks/smartrequest';
+import * as smartrx from '@pushrocks/smartrx';
+import * as smartsocket from '@pushrocks/smartsocket';
+import * as smarttime from '@pushrocks/smarttime';
+import * as smartunique from '@pushrocks/smartunique';

 export {
  lik,
-  isohash,
-  isounique,
+  smarthash,
  smartdelay,
-  smartlog,
+  smartexpress,
+  smartfile,
  smartpromise,
  smartrx,
+  smartrequest,
  smartsocket,
  smarttime,
-  smarturl,
+  smartunique
 };
--- a/ts/smartuniverse.pluginstyped.ts
+++ b/ts/smartuniverse.pluginstyped.ts
@ -1,5 +0,0 @@
-import type * as typedserver from '@apiglobal/typedserver';
-
-export type {
-  typedserver
-};
--- a/tsconfig.json
+++ b/tsconfig.json
@ -1,14 +0,0 @@
-{
-  "compilerOptions": {
-    "experimentalDecorators": true,
-    "useDefineForClassFields": false,
-    "target": "ES2022",
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext",
-    "esModuleInterop": true,
-    "verbatimModuleSyntax": true
-  },
-  "exclude": [
-    "dist_*/**/*.d.ts"
-  ]
-}
--- a/tslint.json
+++ b/tslint.json
@ -0,0 +1,17 @@
+{
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
+}