1.0.22

.gitignore

@@ -1,5 +1,6 @@
 .nogit/
 node_modules/
+dist/
 coverage/
 public/
 pages/

.gitlab-ci.yml

@@ -3,32 +3,39 @@ image: hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .yarn/
+  - .npmci_cache/
   key: "$CI_BUILD_STAGE"
 
 stages:
 - security
 - test
 - release
-- trigger
+- metadata
-- pages
 
+# ====================
+# security stage
+# ====================
 mirror:
   stage: security
   script:
   - npmci git mirror
   tags:
   - docker
+  - notpriv
 
 snyk:
   stage: security
   script:
-    - npmci command yarn global add snyk
+    - npmci command npm install -g snyk
-    - npmci command yarn install --ignore-scripts
+    - npmci command npm install --ignore-scripts
     - npmci command snyk test
   tags:
   - docker
+  - notpriv
 
+# ====================
+# test stage
+# ====================
 testLEGACY:
   stage: test
   script:
@@ -38,6 +45,7 @@ testLEGACY:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - notpriv
   allow_failure: true
 
 testLTS:
@@ -49,6 +57,7 @@ testLTS:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - notpriv
     
 testSTABLE:
   stage: test
@@ -59,34 +68,60 @@ testSTABLE:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - notpriv
 
 release:
   stage: release
   script:
-  - npmci npm prepare
+  - npmci node install stable
   - npmci npm publish
   only:
   - tags
   tags:
   - docker
+  - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  image: docker:stable
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SOURCE_CODE="$PWD"
+        --volume "$PWD":/code
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+  artifacts:
+    paths: [codeclimate.json]
+  tags:
+  - docker
+  - priv
 
 trigger:
-  stage: trigger
+  stage: metadata
   script:
   - npmci trigger
   only:
   - tags
   tags:
   - docker
+  - notpriv
 
 pages:
   image: hosttoday/ht-docker-node:npmci
-  stage: pages
+  stage: metadata
   script:
-    - npmci command yarn global add npmpage
+    - npmci command npm install -g npmpage
     - npmci command npmpage
   tags:
     - docker
+    - notpriv
   only:
     - tags
   artifacts:

dist/index.d.ts

@@ -1 +0,0 @@
-export * from './smartuniverse.classes.smartuniverse';

dist/index.js

@@ -1,7 +0,0 @@
-"use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./smartuniverse.classes.smartuniverse"));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDJEQUFzRCJ9

dist/smartuniverse.classes.smartuniverse.d.ts

@@ -1,11 +0,0 @@
-export interface ISmartUniverseConstructorOptions {
-    port: number | string;
-}
-export declare class SmartUniverse {
-    private options;
-    private universeVersionStore;
-    private readonly universeVersion;
-    private smartexpressServer;
-    constructor(optionsArg: ISmartUniverseConstructorOptions);
-    init(): Promise<void>;
-}

dist/smartuniverse.classes.smartuniverse.js

@@ -1,45 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const plugins = require("./smartuniverse.plugins");
-const smartexpress_1 = require("smartexpress");
-const paths = require("./smartuniverse.paths");
-class SmartUniverse {
-    get universeVersion() {
-        if (this.universeVersionStore) {
-            return this.universeVersionStore;
-        }
-        else {
-            const packageJson = plugins.smartfile.fs.toObjectSync(paths.packageJson);
-            this.universeVersionStore = packageJson.version;
-            return this.universeVersionStore;
-        }
-    }
-    constructor(optionsArg) {
-        this.options = optionsArg;
-    }
-    init() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.smartexpressServer = new plugins.smartexpress.Server({
-                cors: true,
-                defaultAnswer: `smartuniverse server ${this.universeVersion}`,
-                forceSsl: false,
-                port: this.options.port
-            });
-            const addRoute = new smartexpress_1.Route(this.smartexpressServer, 'addMessage');
-            const addHandler = new smartexpress_1.Handler('PUT', requestBody => {
-                return 'hi';
-            });
-            // await this.smartexpressServer.addRoute()
-        });
-    }
-}
-exports.SmartUniverse = SmartUniverse;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR1bml2ZXJzZS5jbGFzc2VzLnNtYXJ0dW5pdmVyc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHVuaXZlcnNlLmNsYXNzZXMuc21hcnR1bml2ZXJzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEsbURBQW1EO0FBRW5ELCtDQUFzRDtBQUV0RCwrQ0FBK0M7QUFNL0M7SUFHRSxJQUFZLGVBQWU7UUFDekIsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLG9CQUFvQixDQUFDLENBQUMsQ0FBQztZQUM5QixNQUFNLENBQUMsSUFBSSxDQUFDLG9CQUFvQixDQUFDO1FBQ25DLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUM7WUFDekUsSUFBSSxDQUFDLG9CQUFvQixHQUFHLFdBQVcsQ0FBQyxPQUFPLENBQUM7WUFDaEQsTUFBTSxDQUFDLElBQUksQ0FBQyxvQkFBb0IsQ0FBQztRQUNuQyxDQUFDO0lBQ0gsQ0FBQztJQUVELFlBQVksVUFBNEM7UUFDdEQsSUFBSSxDQUFDLE9BQU8sR0FBRyxVQUFVLENBQUM7SUFDNUIsQ0FBQztJQUVZLElBQUk7O1lBQ2YsSUFBSSxDQUFDLGtCQUFrQixHQUFHLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUM7Z0JBQ3hELElBQUksRUFBRSxJQUFJO2dCQUNWLGFBQWEsRUFBRSx3QkFBd0IsSUFBSSxDQUFDLGVBQWUsRUFBRTtnQkFDN0QsUUFBUSxFQUFFLEtBQUs7Z0JBQ2YsSUFBSSxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSTthQUN4QixDQUFDLENBQUM7WUFFSCxNQUFNLFFBQVEsR0FBRyxJQUFJLG9CQUFLLENBQUMsSUFBSSxDQUFDLGtCQUFrQixFQUFFLFlBQVksQ0FBQyxDQUFDO1lBQ2xFLE1BQU0sVUFBVSxHQUFHLElBQUksc0JBQU8sQ0FBQyxLQUFLLEVBQUUsV0FBVyxDQUFDLEVBQUU7Z0JBQ2xELE1BQU0sQ0FBQyxJQUFJLENBQUM7WUFDZCxDQUFDLENBQUMsQ0FBQztZQUNILDJDQUEyQztRQUM3QyxDQUFDO0tBQUE7Q0FDRjtBQS9CRCxzQ0ErQkMifQ==

dist/smartuniverse.cli.d.ts

@@ -1 +0,0 @@
-export {};

dist/smartuniverse.cli.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const plugins = require("./smartuniverse.plugins");
-const index_1 = require("./index");
-process.env.CLI = 'true';
-const universeCli = new plugins.smartcli.Smartcli();
-universeCli.standardTask().then(argvArg => {
-    const standardUniverse = new index_1.SmartUniverse({
-        port: 8765
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR1bml2ZXJzZS5jbGkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHVuaXZlcnNlLmNsaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLG1EQUFtRDtBQUVuRCxtQ0FBd0M7QUFFeEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEdBQUcsTUFBTSxDQUFDO0FBRXpCLE1BQU0sV0FBVyxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQztBQUVwRCxXQUFXLENBQUMsWUFBWSxFQUFFLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFO0lBQ3hDLE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxxQkFBYSxDQUFDO1FBQ3pDLElBQUksRUFBRSxJQUFJO0tBQ1gsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDLENBQUMifQ==

dist/smartuniverse.paths.d.ts

@@ -1 +0,0 @@
-export declare const packageJson: string;

dist/smartuniverse.paths.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const plugins = require("./smartuniverse.plugins");
-exports.packageJson = plugins.path.join(__dirname, '../package.json');
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR1bml2ZXJzZS5wYXRocy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0dW5pdmVyc2UucGF0aHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxtREFBbUQ7QUFFdEMsUUFBQSxXQUFXLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLGlCQUFpQixDQUFDLENBQUMifQ==

dist/smartuniverse.plugins.d.ts

@@ -1,5 +0,0 @@
-import * as path from 'path';
-import * as smartcli from 'smartcli';
-import * as smartexpress from 'smartexpress';
-import * as smartfile from 'smartfile';
-export { path, smartcli, smartexpress, smartfile };

dist/smartuniverse.plugins.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-exports.path = path;
-const smartcli = require("smartcli");
-exports.smartcli = smartcli;
-const smartexpress = require("smartexpress");
-exports.smartexpress = smartexpress;
-const smartfile = require("smartfile");
-exports.smartfile = smartfile;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR1bml2ZXJzZS5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnR1bml2ZXJzZS5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNkJBQTZCO0FBS3BCLG9CQUFJO0FBSmIscUNBQXFDO0FBSXRCLDRCQUFRO0FBSHZCLDZDQUE2QztBQUdwQixvQ0FBWTtBQUZyQyx1Q0FBdUM7QUFFQSw4QkFBUyJ9

npmextra.json

@@ -1,7 +1,9 @@
 {
   "npmci": {
     "npmGlobalTools": [
-      "npmts"
+      "@gitzone/npmts",
-    ]
+      "ts-node"
+    ],
+    "npmAccessLevel": "public"
   }
 }

package.json

@@ -1,21 +1,36 @@
 {
-  "name": "smartuniverse",
+  "name": "@pushrocks/smartuniverse",
-  "version": "1.0.2",
+  "version": "1.0.22",
+  "private": true,
   "description": "messaging service for your micro services",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
-    "test": "(npmts)",
+    "test": "(ts-node -O '{\"lib\": [ \"es2015\" ]}' test/test.ts)",
+    "build": "(npmts)",
     "format": "(gitzone format)"
   },
   "devDependencies": {
-    "tapbundle": "^2.0.0"
+    "@types/node": "^9.6.18",
+    "tapbundle": "^2.0.0",
+    "ts-node": "^6.0.5",
+    "typescript": "^2.8.3"
+  },
+  "peerDependencies": {
+    "rxjs": "*"
   },
   "dependencies": {
-    "smartcli": "^2.0.12",
+    "lik": "^2.0.5",
-    "smartexpress": "^1.0.19",
+    "nodehash": "^1.0.4",
-    "smartfile": "^4.2.28"
+    "smartdelay": "^1.0.4",
+    "smartexpress": "^1.0.21",
+    "smartfile": "^4.2.28",
+    "smartq": "^1.1.8",
+    "smartrequest": "^1.0.8",
+    "smartrx": "^1.0.5",
+    "smartsocket": "^1.1.19",
+    "smarttime": "^2.0.0"
   }
 }

readme.md

@@ -0,0 +1,33 @@
+# smartuniverse
+
+messaging service for your micro services
+
+## Availabililty
+
+[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/@pushrocks/smartuniverse)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartuniverse)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartuniverse)
+[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](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)
+[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartuniverse/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartuniverse/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/pushrocks/smartuniverse/badges/code.svg)](https://www.bithound.io/github/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-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
+
+## Usage
+
+Use TypeScript for best in class instellisense.
+
+For further information read the linked docs at the top of this README.
+
+> licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)

test/test.ts

@@ -1,12 +1,54 @@
+// tslint:disable-next-line:no-implicit-dependencies
 import { expect, tap } from 'tapbundle';
 import * as smartuniverse from '../ts/index';
 
-let testSmartUniverse: smartuniverse.SmartUniverse;
+import { Observable } from 'rxjs';
+
+let testUniverse: smartuniverse.Universe;
+let testUniverseClient: smartuniverse.ClientUniverse;
+let testClientChannel: smartuniverse.ClientUniverseChannel;
 
 tap.test('first test', async () => {
-  testSmartUniverse = new smartuniverse.SmartUniverse({
+  testUniverse = new smartuniverse.Universe({
-    port: 8765
+    messageExpiryInMilliseconds: 1000
-  })
+  });
+});
+
+tap.test('add a message to the SmartUniverse', async () => {
+  await testUniverse.initServer(8765);
+});
+
+// testing message handling
+tap.test('create smartuniverse client', async () => {
+  testUniverseClient = new smartuniverse.ClientUniverse({
+    serverAddress: 'http://localhost:8765'
+  });
+  expect(testUniverseClient).to.be.instanceof(smartuniverse.ClientUniverse);
+});
+
+tap.test('should add a channel to the universe', async () => {
+  await testUniverse.addChannel('testChannel', 'testPassword');
+});
+
+tap.test('should get a observable correctly', async () => {
+  testClientChannel = await testUniverseClient.getChannel('testChannel');
+  expect(testClientChannel).to.be.instanceof(smartuniverse.ClientUniverseChannel);
+});
+
+tap.test('should send a message correctly', async () => {
+  await testUniverseClient.sendMessage('greeting', {
+    anyBool: true
+  });
+});
+
+tap.test('should receive a message correctly', async () => {});
+
+tap.test('should disconnect the client correctly', async () => {
+  testUniverseClient.close();
+});
+
+tap.test('should end the server correctly', async tools => {
+  await testUniverse.stopServer();
 });
 
 tap.start();

ts/index.ts

@@ -1 +1,10 @@
-export * from './smartuniverse.classes.smartuniverse';
+// Client classes
+export * from './smartuniverse.classes.clientuniverse';
+export * from './smartuniverse.classes.clientuniversechannel';
+
+// Server classes
+export * from './smartuniverse.classes.universe';
+export * from './smartuniverse.classes.universecache';
+export * from './smartuniverse.classes.universechannel';
+export * from './smartuniverse.classes.universemessage';
+export * from './smartuniverse.interfaces';

ts/smartuniverse.classes.clientuniverse.ts

@@ -0,0 +1,73 @@
+import * as plugins from './smartuniverse.plugins';
+
+import { Objectmap } from 'lik';
+import { Observable } from 'rxjs';
+import { Smartsocket, SmartsocketClient } from 'smartsocket';
+import * as url from 'url';
+
+import {
+  ClientUniverseChannel,
+  IServerGetMessagesRequestBody,
+  IServerPutMessageRequestBody,
+  UniverseMessage
+} from './';
+
+export interface IClientOptions {
+  serverAddress: string;
+}
+
+/**
+ * this class is for client side only!!!
+ * allows connecting to a universe server
+ */
+export class ClientUniverse {
+  public options;
+  public socketClient: plugins.smartsocket.SmartsocketClient;
+  public observableIntake: plugins.smartrx.ObservableIntake<UniverseMessage>;
+
+  public channelCache = new Objectmap<ClientUniverseChannel>();
+
+  constructor(optionsArg: IClientOptions) {
+    this.options = optionsArg;
+  }
+
+  public async sendMessage(messageArg, payloadArg) {
+    const requestBody = {
+      message: messageArg,
+      payload: payloadArg
+    };
+    // TODO: User websocket connection if available
+    await plugins.smartrequest.post(this.options.serverAddress, {
+      requestBody
+    });
+  }
+
+  public async getChannel(channelName: string): Promise<ClientUniverseChannel> {
+    await this.checkConnection();
+    const clientUniverseChannel = await ClientUniverseChannel.createClientUniverseChannel(
+      this,
+      channelName
+    );
+    this.channelCache.add(clientUniverseChannel);
+    return clientUniverseChannel;
+  }
+
+  public close() {
+    this.socketClient.disconnect();
+  }
+
+  private async checkConnection() {
+    if (!this.socketClient && !this.observableIntake) {
+      const parsedURL = url.parse(this.options.serverAddress);
+      this.socketClient = new SmartsocketClient({
+        alias: process.env.SOCKET_ALIAS || 'someclient',
+        password: 'UniverseClient',
+        port: parseInt(parsedURL.port, 10),
+        role: 'UniverseClient',
+        url: parsedURL.hostname
+      });
+      this.observableIntake = new plugins.smartrx.ObservableIntake();
+      this.socketClient.connect();
+    }
+  }
+}

ts/smartuniverse.classes.clientuniversechannel.ts

@@ -0,0 +1,34 @@
+import * as plugins from './smartuniverse.plugins';
+
+import { ClientUniverse, IUniverseChannel } from './';
+
+export class ClientUniverseChannel implements IUniverseChannel {
+  // ======
+  // STATIC
+  // ======
+  public static async createClientUniverseChannel(
+    clientUniverseArg: ClientUniverse,
+    channelName: string
+  ): Promise<ClientUniverseChannel> {
+    const clientChannel = new ClientUniverseChannel(clientUniverseArg);
+    await clientChannel.transmitSubscription();
+    return clientChannel;
+  }
+
+  // ========
+  // INSTANCE
+  // ========
+
+  public clientUniverse: ClientUniverse;
+
+  constructor(clientUniverseArg: ClientUniverse) {
+    this.clientUniverse = clientUniverseArg;
+  }
+
+  /**
+   * tells the universe about this instances interest into a channel
+   */
+  public async transmitSubscription() {
+    this.clientUniverse.socketClient;
+  }
+}

ts/smartuniverse.classes.clientuniversemessage.ts

@@ -0,0 +1,15 @@
+import * as plugins from './smartuniverse.plugins';
+
+import { IUniverseMessage } from './';
+
+export class ClientUniverseMessage implements IUniverseMessage {
+  // ======
+  // STATIC
+  // ======
+  createMessage(messageArg: string, payloadArg: any) {}
+
+  // ========
+  // INSTANCE
+  // ========
+  constructor(messageArg, payloadArg) {}
+}

ts/smartuniverse.classes.smartuniverse.ts

@@ -1,42 +0,0 @@
-import * as plugins from './smartuniverse.plugins';
-
-import { Handler, Route, Server } from 'smartexpress';
-
-import * as paths from './smartuniverse.paths';
-
-export interface ISmartUniverseConstructorOptions {
-  port: number | string;
-}
-
-export class SmartUniverse {
-  private options: ISmartUniverseConstructorOptions;
-  private universeVersionStore: string;
-  private get universeVersion() {
-    if (this.universeVersionStore) {
-      return this.universeVersionStore;
-    } else {
-      const packageJson = plugins.smartfile.fs.toObjectSync(paths.packageJson);
-      this.universeVersionStore = packageJson.version;
-      return this.universeVersionStore;
-    }
-  }
-  private smartexpressServer: plugins.smartexpress.Server;
-  constructor(optionsArg: ISmartUniverseConstructorOptions) {
-    this.options = optionsArg;
-  }
-
-  public async init() {
-    this.smartexpressServer = new plugins.smartexpress.Server({
-      cors: true,
-      defaultAnswer: `smartuniverse server ${this.universeVersion}`,
-      forceSsl: false,
-      port: this.options.port
-    });
-
-    const addRoute = new Route(this.smartexpressServer, 'addMessage');
-    const addHandler = new Handler('PUT', requestBody => {
-      return 'hi';
-    });
-    // await this.smartexpressServer.addRoute()
-  }
-}

ts/smartuniverse.classes.universe.ts

@@ -0,0 +1,93 @@
+import * as plugins from './smartuniverse.plugins';
+
+import { Handler, Route, Server } from 'smartexpress';
+import { UniverseCache, UniverseChannel, UniverseMessage } from './';
+
+import * as paths from './smartuniverse.paths';
+
+export interface ISmartUniverseConstructorOptions {
+  messageExpiryInMilliseconds: number;
+}
+
+export interface IServerGetMessagesRequestBody {
+  channel: string;
+  topic?: string;
+  youngerThan: number;
+}
+
+/**
+ * the interface for a standard request
+ */
+export interface IServerPutMessageRequestBody {
+  channel: string;
+  passphrase: string;
+  message: string;
+  payload: any;
+}
+
+/**
+ * main class that setsup a Universe
+ */
+export class Universe {
+  // subinstances
+  public universeCache: UniverseCache;
+
+  // options
+  private options: ISmartUniverseConstructorOptions;
+
+  // Store version handling
+  private universeVersionStore: string;
+  private get universeVersion() {
+    if (this.universeVersionStore) {
+      return this.universeVersionStore;
+    } else {
+      const packageJson = plugins.smartfile.fs.toObjectSync(paths.packageJson);
+      this.universeVersionStore = packageJson.version;
+      return this.universeVersionStore;
+    }
+  }
+
+  private smartexpressServer: plugins.smartexpress.Server;
+  private smartsocket: plugins.smartsocket.Smartsocket;
+
+  constructor(optionsArg: ISmartUniverseConstructorOptions) {
+    this.options = optionsArg;
+    this.universeCache = new UniverseCache(this.options.messageExpiryInMilliseconds);
+  }
+
+  /**
+   * adds a channel to the Universe
+   */
+  public async addChannel(nameArg: string, passphraseArg: string) {
+    const newChannel = new UniverseChannel(this.universeCache, nameArg, passphraseArg);
+    this.universeCache.channelMap.add(newChannel);
+  }
+
+  /**
+   * initiates a server
+   */
+  public async initServer(portArg: number | string) {
+    this.smartexpressServer = new plugins.smartexpress.Server({
+      cors: true,
+      defaultAnswer: `smartuniverse server ${this.universeVersion}`,
+      forceSsl: false,
+      port: portArg
+    });
+
+    // add websocket upgrade
+    this.smartsocket = new plugins.smartsocket.Smartsocket({
+      port: 12345 // fix this within smartsocket
+    });
+
+    this.smartsocket.setExternalServer('express', this.smartexpressServer as any);
+    // should work with express as well
+    this.smartsocket.start();
+
+    await this.smartexpressServer.start();
+  }
+
+  public async stopServer() {
+    await this.smartsocket.stop();
+    await this.smartexpressServer.stop();
+  }
+}

ts/smartuniverse.classes.universecache.ts

@@ -0,0 +1,62 @@
+import * as plugins from './smartuniverse.plugins';
+
+import { UniverseChannel } from './smartuniverse.classes.universechannel';
+import { UniverseMessage } from './smartuniverse.classes.universemessage';
+
+import { Objectmap } from 'lik';
+
+import { Observable } from 'rxjs';
+import { rxjs } from 'smartrx';
+
+/**
+ * universe store handles the creation, storage and retrieval of messages.
+ */
+export class UniverseCache {
+  // ========
+  // INSTANCE
+  // ========
+  public standardMessageExpiry: number;
+  public destructionTime: number = 60000;
+
+  /**
+   * stores messages for this instance
+   */
+  public messageMap = new Objectmap<UniverseMessage>();
+
+  /**
+   * stores the channels that are available within the universe
+   */
+  public channelMap = new Objectmap<UniverseChannel>();
+
+  /**
+   * allows messages to be processed in a blacklist mode for further analysis
+   */
+  public blackListChannel = new UniverseChannel(this, 'blacklist', 'nada');
+
+  constructor(standardMessageExpiryArg: number) {
+    this.standardMessageExpiry = standardMessageExpiryArg;
+  }
+
+  /**
+   * add a message to the UniverseStore
+   * @param messageArg
+   * @param attachedPayloadArg
+   */
+  public async addMessage(messageArg: UniverseMessage) {
+    messageArg.setUniverseCache(this);
+    UniverseChannel.authorizeAMessageForAChannel(this, messageArg);
+    this.messageMap.add(messageArg);
+  }
+
+  /**
+   * Read a message from the UniverseStore
+   */
+  public readMessagesYoungerThan(unixTimeArg?: number): Observable<UniverseMessage> {
+    const messageObservable = rxjs.Observable.from(this.messageMap.getArray()).filter(
+      messageArg => {
+        return messageArg.timestamp.isYoungerThanMilliSeconds(this.destructionTime);
+      }
+    );
+    return messageObservable;
+  }
+}

ts/smartuniverse.classes.universechannel.ts

@@ -0,0 +1,91 @@
+import * as plugins from './smartuniverse.plugins';
+
+import { Objectmap } from 'lik';
+import { UniverseCache } from './smartuniverse.classes.universecache';
+import { UniverseMessage } from './smartuniverse.classes.universemessage';
+
+/**
+ * enables messages to stay within a certain scope.
+ */
+export class UniverseChannel {
+  // ======
+  // STATIC
+  // ======
+
+  /**
+   * creates new channels
+   * @param channelArg the name of the topic
+   * @param passphraseArg the secret thats used for a certain topic.
+   */
+  public static createChannel(
+    universeCacheArg: UniverseCache,
+    channelNameArg: string,
+    passphraseArg: string
+  ) {
+    const newChannel = new UniverseChannel(universeCacheArg, channelNameArg, passphraseArg);
+    return newChannel;
+  }
+
+  /**
+   * returns boolean wether certain channel exists
+   */
+  public static async doesChannelExists(universeCacheArg: UniverseCache, channelNameArg: string) {
+    const channel = universeCacheArg.channelMap.find(channelArg => {
+      return channelArg.name === channelNameArg;
+    });
+    if (channel) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  public static authorizeAMessageForAChannel(
+    universeCacheArg: UniverseCache,
+    universeMessageArg: UniverseMessage
+  ) {
+    const foundChannel = universeCacheArg.channelMap.find(universeChannel => {
+      const result = universeChannel.authenticate(universeMessageArg);
+      return result;
+    });
+    if (foundChannel) {
+      universeMessageArg.authenticated = true;
+      universeMessageArg.universeChannelList.add(foundChannel);
+      return foundChannel;
+    } else {
+      universeMessageArg.authenticated = false;
+      universeMessageArg.universeChannelList.add(universeCacheArg.blackListChannel);
+    }
+  }
+
+  // ========
+  // INSTANCE
+  // ========
+  /**
+   * the name of the channel
+   */
+  public name: string;
+  public universeCacheInstance: UniverseCache;
+
+  /**
+   * the passphrase for the channel
+   */
+  public passphrase: string;
+
+  constructor(universeCacheArg: UniverseCache, channelNameArg: string, passphraseArg: string) {
+    this.name = channelNameArg;
+    this.passphrase = passphraseArg;
+  }
+
+  /**
+   * authenticates a client on the server side
+   */
+  public authenticate(universeMessageArg: UniverseMessage): boolean {
+    return (
+      this.name === universeMessageArg.requestedChannelName &&
+      this.passphrase === universeMessageArg.requestedChannelPassphrase
+    );
+  }
+
+  public pushToClients(messageArg: UniverseMessage) {}
+}

ts/smartuniverse.classes.universemessage.ts

@@ -0,0 +1,115 @@
+import * as plugins from './smartuniverse.plugins';
+
+import { Objectmap } from 'lik';
+
+import { Timer, TimeStamp } from 'smarttime';
+import { Universe } from './smartuniverse.classes.universe';
+import { UniverseChannel } from './smartuniverse.classes.universechannel';
+import { UniverseCache } from './smartuniverse.classes.universecache';
+
+/**
+ * represents a message within a universe
+ * acts as a container to save message states like authentication status
+ */
+export class UniverseMessage {
+  /**
+   * public and unique id
+   * numeric ascending
+   * adheres to time in milliseconds
+   * avoids duplications though
+   */
+  public id: number;
+
+  /**
+   * the UniverseCache the message is attached to
+   */
+  public universeCache: UniverseCache;
+
+  /**
+   * requestedChannelName
+   */
+  public requestedChannelName: string;
+  public requestedChannelPassphrase: string;
+
+  /**
+   * enables unprotected grouping of messages for efficiency purposes.
+   */
+  public universeChannelList = new Objectmap<UniverseChannel>();
+
+  /**
+   * wether the message is authenticated
+   */
+  public authenticated: boolean = null;
+
+  /**
+   * time of creation
+   */
+  public timestamp: TimeStamp;
+
+  /**
+   * the actual message
+   */
+  public message: string;
+
+  /**
+   * any attached payloads. Can be of binary format.
+   */
+  public attachedPayload: any;
+  public destructionTimer: Timer; // a timer to take care of message destruction
+
+  /**
+   * the constructor to create a universe message
+   * @param messageArg
+   * @param attachedPayloadArg
+   */
+  constructor(
+    messageArg: string,
+    requestedChannelNameArg: string,
+    passphraseArg: string,
+    attachedPayloadArg: any
+  ) {
+    this.timestamp = new TimeStamp();
+    this.message = messageArg;
+    this.requestedChannelName = requestedChannelNameArg;
+    this.requestedChannelPassphrase = passphraseArg;
+    this.attachedPayload = attachedPayloadArg;
+    // prevent memory issues
+    this.fallBackDestruction();
+  }
+
+  public setUniverseCache(universeCacheArg: UniverseCache) {
+    this.universeCache = universeCacheArg;
+  }
+
+  public setDestructionTimer(selfdestructAfterArg: number) {
+    if (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);
+      });
+    } else {
+      this.fallBackDestruction();
+    }
+  }
+
+  /**
+   * handles bad messages for further analysis
+   */
+  handleAsBadMessage() {
+    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);
+      }
+    });
+  }
+}

ts/smartuniverse.cli.ts

@@ -1,13 +0,0 @@
-import * as plugins from './smartuniverse.plugins';
-
-import { SmartUniverse } from './index';
-
-process.env.CLI = 'true';
-
-const universeCli = new plugins.smartcli.Smartcli();
-
-universeCli.standardTask().then(argvArg => {
-  const standardUniverse = new SmartUniverse({
-    port: 8765
-  });
-});

ts/smartuniverse.interfaces.ts

@@ -0,0 +1,3 @@
+export interface IUniverseChannel {}
+
+export interface IUniverseMessage {}

ts/smartuniverse.plugins.ts

@@ -1,6 +1,25 @@
+import * as lik from 'lik';
+import * as nodehash from 'nodehash';
 import * as path from 'path';
-import * as smartcli from 'smartcli';
+import * as smartdelay from 'smartdelay';
 import * as smartexpress from 'smartexpress';
 import * as smartfile from 'smartfile';
+import * as smartq from 'smartq';
+import * as smartrequest from 'smartrequest';
+import * as smartrx from 'smartrx';
+import * as smartsocket from 'smartsocket';
+import * as smarttime from 'smarttime';
 
-export { path, smartcli, smartexpress, smartfile };
+export {
+  lik,
+  nodehash,
+  path,
+  smartdelay,
+  smartexpress,
+  smartfile,
+  smartq,
+  smartrx,
+  smartrequest,
+  smartsocket,
+  smarttime
+};

tslint.json

@@ -1,6 +1,12 @@
 {
-    "extends": [
+  "extends": [
-        "tslint:latest",
+    "tslint:latest",
-        "tslint-config-prettier"
+    "tslint-config-prettier"
+  ],
+  "rules": {
+    "semicolon": [
+      true,
+      "always"
     ]
-}
+  }
+}