push.rocks/smartuniverse
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): update

Browse Source
This commit is contained in:
Philipp Kunz 2023-07-25 11:33:13 +02:00
parent b5fcefa93b
commit 4ccbc004db
33 changed files with 5028 additions and 11607 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
.gitea/workflows/default_nottags.yaml Normal file
View File

@ -0,0 +1,66 @@
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

124
.gitea/workflows/default_tags.yaml Normal file
View File

@ -0,0 +1,124 @@
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

137
.gitlab-ci.yml
View File

@ -1,137 +0,0 @@
# 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
only:
- tags
tags:
- lossless
- docker
- notpriv
auditProductionDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
stage: security
script:
- npmci npm prepare
- npmci command npm install --production --ignore-scripts
- npmci command npm config set registry https://registry.npmjs.org
- npmci command npm audit --audit-level=high --only=prod --production
tags:
- docker
auditDevDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
stage: security
script:
- npmci npm prepare
- npmci command npm install --ignore-scripts
- npmci command npm config set registry https://registry.npmjs.org
- npmci command npm audit --audit-level=high --only=dev
tags:
- docker
allow_failure: true
# ====================
# test stage
# ====================
testStable:
stage: test
script:
- npmci npm prepare
- npmci node install stable
- npmci npm install
- npmci npm test
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- docker
testBuild:
stage: test
script:
- npmci npm prepare
- npmci node install stable
- npmci npm install
- npmci command npm run build
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- docker
release:
stage: release
script:
- npmci node install stable
- npmci npm publish
only:
- tags
tags:
- lossless
- docker
- notpriv
# ====================
# metadata stage
# ====================
codequality:
stage: metadata
allow_failure: true
only:
- tags
script:
- npmci command npm install -g tslint typescript
- npmci npm prepare
- npmci npm install
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
tags:
- lossless
- docker
- priv
trigger:
stage: metadata
script:
- npmci trigger
only:
- tags
tags:
- lossless
- docker
- notpriv
pages:
stage: metadata
script:
- npmci node install lts
- npmci command npm install -g @gitzone/tsdoc
- npmci npm prepare
- npmci npm install
- npmci command tsdoc
tags:
- lossless
- docker
- notpriv
only:
- tags
artifacts:
expire_in: 1 week
paths:
- public
allow_failure: true

4
.snyk
View File

@ -1,4 +0,0 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.13.5
ignore: {}
patch: {}

24
.vscode/launch.json vendored
View File

@ -2,28 +2,10 @@
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"name": "current file", "command": "npm test",
"type": "node", "name": "Run npm test",
"request": "launch", "request": "launch",
"args": [ "type": "node-terminal"
"${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"
} }
] ]
} }

6
npmextra.json
View File

@ -3,10 +3,10 @@
"projectType": "npm", "projectType": "npm",
"module": { "module": {
"githost": "gitlab.com", "githost": "gitlab.com",
"gitscope": "pushrocks", "gitscope": "push.rocks",
"gitrepo": "smartuniverse", "gitrepo": "smartuniverse",
"shortDescription": "messaging service for micro services", "description": "messaging service for micro services",
"npmPackagename": "@pushrocks/smartuniverse", "npmPackagename": "@push.rocks/smartuniverse",
"license": "MIT", "license": "MIT",
"projectDomain": "push.rocks" "projectDomain": "push.rocks"
} }

11200
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

50
package.json
View File

@ -1,5 +1,5 @@
{ {
"name": "@pushrocks/smartuniverse", "name": "@push.rocks/smartuniverse",
"version": "1.0.106", "version": "1.0.106",
"private": false, "private": false,
"description": "messaging service for your micro services", "description": "messaging service for your micro services",
@ -10,32 +10,31 @@
"scripts": { "scripts": {
"test": "(tstest test/)", "test": "(tstest test/)",
"testManual": "(tsrun test/test.ts)", "testManual": "(tsrun test/test.ts)",
"build": "(tsbuild --web && tsbundle --from ./ts/index.ts --to dist_bundle/bundle.js)", "build": "(tsbuild --allowimplicitany && tsbundle --from ./ts/index.ts --to dist_bundle/bundle.js)",
"format": "(gitzone format)" "format": "(gitzone format)",
"buildDocs": "tsdoc"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.25", "@gitzone/tsbuild": "^2.1.66",
"@gitzone/tstest": "^1.0.52", "@gitzone/tsbundle": "^2.0.8",
"@pushrocks/tapbundle": "^3.2.9", "@gitzone/tsrun": "^1.2.44",
"@types/node": "^14.14.22", "@gitzone/tstest": "^1.0.77",
"tslint": "^6.1.3", "@push.rocks/tapbundle": "^5.0.12",
"tslint-config-prettier": "^1.18.0" "@types/node": "^20.4.4"
},
"peerDependencies": {
"rxjs": "*"
}, },
"dependencies": { "dependencies": {
"@apiglobal/typedrequest-interfaces": "^1.0.15", "@apiglobal/typedrequest-interfaces": "^2.0.1",
"@pushrocks/isohash": "^1.0.2", "@apiglobal/typedserver": "^2.0.65",
"@pushrocks/isounique": "^1.0.4", "@push.rocks/isohash": "^2.0.1",
"@pushrocks/lik": "^4.0.20", "@push.rocks/isounique": "^1.0.5",
"@pushrocks/smartdelay": "^2.0.10", "@push.rocks/lik": "^6.0.3",
"@pushrocks/smartexpress": "^3.0.100", "@push.rocks/smartdelay": "^3.0.5",
"@pushrocks/smartlog": "^2.0.39", "@push.rocks/smartlog": "^3.0.3",
"@pushrocks/smartpromise": "^3.1.3", "@push.rocks/smartpromise": "^4.0.2",
"@pushrocks/smartrx": "^2.0.19", "@push.rocks/smartrx": "^3.0.6",
"@pushrocks/smartsocket": "^1.2.3", "@push.rocks/smartsocket": "^2.0.20",
"@pushrocks/smarttime": "^3.0.38" "@push.rocks/smarttime": "^4.0.4",
"@push.rocks/smarturl": "^3.0.7"
}, },
"files": [ "files": [
"ts/**/*", "ts/**/*",
@ -51,5 +50,6 @@
], ],
"browserslist": [ "browserslist": [
"last 1 chrome versions" "last 1 chrome versions"
] ],
} "type": "module"
}

4610
pnpm-lock.yaml Normal file
View File

File diff suppressed because it is too large Load Diff

30
readme.md
View File

@ -1,27 +1,26 @@
# @pushrocks/smartuniverse # @push.rocks/smartuniverse
messaging service for micro services messaging service for micro services
## Availabililty and Links ## Availabililty and Links
* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartuniverse) * [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/smartuniverse)
* [gitlab.com (source)](https://gitlab.com/pushrocks/smartuniverse) * [gitlab.com (source)](https://gitlab.com/push.rocks/smartuniverse)
* [github.com (source mirror)](https://github.com/pushrocks/smartuniverse) * [github.com (source mirror)](https://github.com/push.rocks/smartuniverse)
* [docs (typedoc)](https://pushrocks.gitlab.io/smartuniverse/) * [docs (typedoc)](https://push.rocks.gitlab.io/smartuniverse/)
## Status for master ## Status for master
Status Category | Status Badge Status Category | Status Badge
-- | -- -- | --
GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartuniverse/badges/master/pipeline.svg)](https://lossless.cloud) GitLab Pipelines | [![pipeline status](https://gitlab.com/push.rocks/smartuniverse/badges/master/pipeline.svg)](https://lossless.cloud)
GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartuniverse/badges/master/coverage.svg)](https://lossless.cloud) GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/push.rocks/smartuniverse/badges/master/coverage.svg)](https://lossless.cloud)
npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartuniverse)](https://lossless.cloud) npm | [![npm downloads per month](https://badgen.net/npm/dy/@push.rocks/smartuniverse)](https://lossless.cloud)
Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartuniverse)](https://lossless.cloud) Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/push.rocks/smartuniverse)](https://lossless.cloud)
TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud) TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud) Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartuniverse)](https://lossless.cloud) PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@push.rocks/smartuniverse)](https://lossless.cloud)
PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartuniverse)](https://lossless.cloud) PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@push.rocks/smartuniverse)](https://lossless.cloud)
BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartuniverse)](https://lossless.cloud) BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@push.rocks/smartuniverse)](https://lossless.cloud)
Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
## Usage ## Usage
@ -60,7 +59,6 @@ We are always happy for code contributions. If you are not the code contributing
For further information read the linked docs at the top of this readme. For further information read the linked docs at the top of this readme.
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh) ## Legal
> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy) | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

12
test/test.ts
View File

@ -1,8 +1,6 @@
// tslint:disable-next-line:no-implicit-dependencies // tslint:disable-next-line:no-implicit-dependencies
import { expect, tap } from '@pushrocks/tapbundle'; import { expect, tap } from '@push.rocks/tapbundle';
import * as smartuniverse from '../ts/index'; import * as smartuniverse from '../ts/index.js';
import { Observable } from 'rxjs';
let testUniverse: smartuniverse.Universe; let testUniverse: smartuniverse.Universe;
let testClientUniverse: smartuniverse.ClientUniverse; let testClientUniverse: smartuniverse.ClientUniverse;
@ -34,7 +32,7 @@ tap.test('create smartuniverse client', async () => {
serverAddress: testServerData.serverAddress, serverAddress: testServerData.serverAddress,
autoReconnect: true, autoReconnect: true,
}); });
expect(testClientUniverse).to.be.instanceof(smartuniverse.ClientUniverse); expect(testClientUniverse).toBeInstanceOf(smartuniverse.ClientUniverse);
}); });
tap.test('should add a channel to the universe', async () => { tap.test('should add a channel to the universe', async () => {
@ -51,7 +49,7 @@ tap.test('should start the ClientUniverse', async () => {
tap.test('should get a observable correctly', async () => { tap.test('should get a observable correctly', async () => {
testClientChannel = testClientUniverse.getChannel(testChannelData.channelName); testClientChannel = testClientUniverse.getChannel(testChannelData.channelName);
expect(testClientChannel).to.be.instanceof(smartuniverse.ClientUniverseChannel); expect(testClientChannel).toBeInstanceOf(smartuniverse.ClientUniverseChannel);
}); });
tap.test('should send a message correctly', async () => { tap.test('should send a message correctly', async () => {
@ -61,7 +59,7 @@ tap.test('should send a message correctly', async () => {
}); });
tap.test('universe should contain the sent message', async () => { tap.test('universe should contain the sent message', async () => {
expect(testUniverse.universeCache.messageMap.getArray()[0].messageText).to.equal('hello'); expect(testUniverse.universeCache.messageMap.getArray()[0].messageText).toEqual('hello');
}); });
tap.test('a second client should be able to subscibe', async () => { tap.test('a second client should be able to subscibe', async () => {

8
ts/00_commitinfo_data.ts Normal file
View File

@ -0,0 +1,8 @@
/**
* autocreated commitinfo by @pushrocks/commitinfo
*/
export const commitinfo = {
name: '@push.rocks/smartuniverse',
version: '1.0.107',
description: 'messaging service for your micro services'
}

20
ts/index.ts
View File

@ -1,16 +1,16 @@
// Client classes // Client classes
export * from './smartuniverse.classes.client.universe'; export * from './smartuniverse.classes.client.universe.js';
export * from './smartuniverse.classes.client.universechannel'; export * from './smartuniverse.classes.client.universechannel.js';
export * from './smartuniverse.classes.client.universemessage'; export * from './smartuniverse.classes.client.universemessage.js';
// Server classes // Server classes
export * from './smartuniverse.classes.universe'; export * from './smartuniverse.classes.universe.js';
export * from './smartuniverse.classes.universecache'; export * from './smartuniverse.classes.universecache.js';
export * from './smartuniverse.classes.universechannel'; export * from './smartuniverse.classes.universechannel.js';
export * from './smartuniverse.classes.universemessage'; export * from './smartuniverse.classes.universemessage.js';
// Reaction Response // Reaction Response
export * from './smartuniverse.classes.event.reactionrequest'; export * from './smartuniverse.classes.event.reactionrequest.js';
export * from './smartuniverse.classes.event.reactionresponse'; export * from './smartuniverse.classes.event.reactionresponse.js';
export * from './interfaces'; export * from './interfaces/index.js';

10
ts/interfaces/index.ts
View File

@ -1,5 +1,5 @@
export * from './http.interfaces'; export * from './http.interfaces.js';
export * from './socketfunctionrequests'; export * from './socketfunctionrequests.js';
export * from './universechannel.interfaces'; export * from './universechannel.interfaces.js';
export * from './universemessage.interfaces'; export * from './universemessage.interfaces.js';
export * from './universeactions.interfaces'; export * from './universeactions.interfaces.js';

2
ts/interfaces/socketfunctionrequests.ts
View File

@ -1,4 +1,4 @@
import * as interfaces from './index'; import * as interfaces from './index.js';
export interface ISocketRequest_SubscribeChannel { export interface ISocketRequest_SubscribeChannel {
method: 'subscribeChannel'; method: 'subscribeChannel';

73
ts/smartuniverse.classes.client.universe.ts
View File

@ -1,14 +1,11 @@
import * as plugins from './smartuniverse.plugins'; import * as plugins from './smartuniverse.plugins.js';
import { Smartsocket, SmartsocketClient } from '@push.rocks/smartsocket';
import { Observable } from 'rxjs'; import * as interfaces from './interfaces/index.js';
import { Smartsocket, SmartsocketClient } from '@pushrocks/smartsocket';
import * as url from 'url';
import * as interfaces from './interfaces'; import { ClientUniverseChannel, ClientUniverseMessage } from './index.js';
import { ClientUniverseCache } from './smartuniverse.classes.client.universecache.js';
import { ClientUniverseChannel, ClientUniverseMessage } from '.'; import { logger } from './smartuniverse.logging.js';
import { ClientUniverseCache } from './smartuniverse.classes.client.universecache';
import { logger } from './smartuniverse.logging';
export interface IClientOptions { export interface IClientOptions {
serverAddress: string; serverAddress: string;
@ -57,7 +54,7 @@ export class ClientUniverse {
* @param passphraseArg * @param passphraseArg
*/ */
public getChannel(channelName: string): ClientUniverseChannel { public getChannel(channelName: string): ClientUniverseChannel {
const clientUniverseChannel = this.clientUniverseCache.channelMap.find((channel) => { const clientUniverseChannel = this.clientUniverseCache.channelMap.findSync((channel) => {
return channel.name === channelName; return channel.name === channelName;
}); });
return clientUniverseChannel; return clientUniverseChannel;
@ -68,7 +65,7 @@ export class ClientUniverse {
* @param messageArg * @param messageArg
*/ */
public removeChannel(channelNameArg, notifyServer = true) { public removeChannel(channelNameArg, notifyServer = true) {
const clientUniverseChannel = this.clientUniverseCache.channelMap.findOneAndRemove( const clientUniverseChannel = this.clientUniverseCache.channelMap.findOneAndRemoveSync(
(channelItemArg) => { (channelItemArg) => {
return channelItemArg.name === channelNameArg; return channelItemArg.name === channelNameArg;
} }
@ -93,12 +90,10 @@ export class ClientUniverse {
*/ */
private async checkConnection(): Promise<void> { private async checkConnection(): Promise<void> {
if (!this.smartsocketClient) { if (!this.smartsocketClient) {
const parsedURL = url.parse(this.options.serverAddress); const parsedURL = plugins.smarturl.Smarturl.createFromUrl(this.options.serverAddress);
const socketConfig: plugins.smartsocket.ISmartsocketClientOptions = { const socketConfig: plugins.smartsocket.ISmartsocketClientOptions = {
alias: 'universeclient', alias: 'universeclient',
password: 'UniverseClient',
port: parseInt(parsedURL.port, 10), port: parseInt(parsedURL.port, 10),
role: 'UniverseClient',
url: parsedURL.protocol + '//' + parsedURL.hostname, url: parsedURL.protocol + '//' + parsedURL.hostname,
}; };
this.smartsocketClient = new SmartsocketClient(socketConfig); this.smartsocketClient = new SmartsocketClient(socketConfig);
@ -117,9 +112,8 @@ export class ClientUniverse {
*/ */
const socketFunctionUnsubscribe = new plugins.smartsocket.SocketFunction({ const socketFunctionUnsubscribe = new plugins.smartsocket.SocketFunction({
funcName: 'unsubscribe', funcName: 'unsubscribe',
allowedRoles: [],
funcDef: async (dataArg: interfaces.IServerUnsubscribeActionPayload) => { funcDef: async (dataArg: interfaces.IServerUnsubscribeActionPayload) => {
const channel = this.clientUniverseCache.channelMap.find((channelArg) => { const channel = this.clientUniverseCache.channelMap.findSync((channelArg) => {
return channelArg.name === dataArg.name; return channelArg.name === dataArg.name;
}); });
if (channel) { if (channel) {
@ -132,32 +126,29 @@ export class ClientUniverse {
/** /**
* handles message reception * handles message reception
*/ */
const socketFunctionProcessMessage = new plugins.smartsocket.SocketFunction< const socketFunctionProcessMessage =
interfaces.ISocketRequest_ProcessMessage new plugins.smartsocket.SocketFunction<interfaces.ISocketRequest_ProcessMessage>({
>({ funcName: 'processMessage',
funcName: 'processMessage', funcDef: async (messageDescriptorArg) => {
allowedRoles: [], logger.log('info', 'Got message from server');
funcDef: async (messageDescriptorArg) => { const clientUniverseMessage =
logger.log('info', 'Got message from server'); ClientUniverseMessage.createMessageFromMessageDescriptor(messageDescriptorArg);
const clientUniverseMessage = ClientUniverseMessage.createMessageFromMessageDescriptor( this.messageRxjsSubject.next(clientUniverseMessage);
messageDescriptorArg
);
this.messageRxjsSubject.next(clientUniverseMessage);
// lets find the corresponding channel // lets find the corresponding channel
const targetChannel = this.getChannel(clientUniverseMessage.targetChannelName); const targetChannel = this.getChannel(clientUniverseMessage.targetChannelName);
if (targetChannel) { if (targetChannel) {
await targetChannel.emitMessageLocally(clientUniverseMessage); await targetChannel.emitMessageLocally(clientUniverseMessage);
return { return {
messageStatus: 'ok', messageStatus: 'ok',
}; };
} else { } else {
return { return {
messageStatus: 'channel not found', messageStatus: 'channel not found',
}; };
} }
}, },
}); });
// add functions // add functions
this.smartsocketClient.addSocketFunction(socketFunctionUnsubscribe); this.smartsocketClient.addSocketFunction(socketFunctionUnsubscribe);

4
ts/smartuniverse.classes.client.universecache.ts
View File

@ -1,5 +1,5 @@
import * as plugins from './smartuniverse.plugins'; import * as plugins from './smartuniverse.plugins.js';
import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel'; import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel.js';
/** /**
* a cache for clients * a cache for clients

26
ts/smartuniverse.classes.client.universechannel.ts
View File

@ -1,10 +1,10 @@
import * as plugins from './smartuniverse.plugins'; import * as plugins from './smartuniverse.plugins.js';
import * as interfaces from './interfaces'; import * as interfaces from './interfaces/index.js';
import { ClientUniverse } from '.'; import { ClientUniverse } from './index.js';
import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage'; import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage.js';
import { ReactionRequest } from './smartuniverse.classes.event.reactionrequest'; import { ReactionRequest } from './smartuniverse.classes.event.reactionrequest.js';
import { ReactionResponse } from './smartuniverse.classes.event.reactionresponse'; import { ReactionResponse } from './smartuniverse.classes.event.reactionresponse.js';
export class ClientUniverseChannel implements interfaces.IUniverseChannel { export class ClientUniverseChannel implements interfaces.IUniverseChannel {
// ====== // ======
@ -69,12 +69,14 @@ export class ClientUniverseChannel implements interfaces.IUniverseChannel {
public async populateSubscriptionToServer() { public async populateSubscriptionToServer() {
// lets make sure the channel is connected // lets make sure the channel is connected
if (this.status === 'unsubscribed') { if (this.status === 'unsubscribed') {
const response = await this.clientUniverseRef.smartsocketClient.serverCall< const response =
interfaces.ISocketRequest_SubscribeChannel await this.clientUniverseRef.smartsocketClient.serverCall<interfaces.ISocketRequest_SubscribeChannel>(
>('subscribeChannel', { 'subscribeChannel',
name: this.name, {
passphrase: this.passphrase, name: this.name,
}); passphrase: this.passphrase,
}
);
this.status = response.subscriptionStatus; this.status = response.subscriptionStatus;
} }
} }

4
ts/smartuniverse.classes.client.universemessage.ts
View File

@ -1,6 +1,6 @@
import * as plugins from './smartuniverse.plugins'; import * as plugins from './smartuniverse.plugins.js';
import * as interfaces from './interfaces'; import * as interfaces from './interfaces/index.js';
export class ClientUniverseMessage<T> implements interfaces.IUniverseMessage { export class ClientUniverseMessage<T> implements interfaces.IUniverseMessage {
// ====== // ======

2
ts/smartuniverse.classes.event.broadcastevent.ts
View File

@ -1,4 +1,4 @@
import * as plugins from './smartuniverse.plugins'; import * as plugins from './smartuniverse.plugins.js';
/** /**
* broadcasts an event to multiple channels * broadcasts an event to multiple channels

12
ts/smartuniverse.classes.event.reactionrequest.ts
View File

@ -1,9 +1,9 @@
import * as plugins from './smartuniverse.plugins'; import * as plugins from './smartuniverse.plugins.js';
import { UniverseChannel } from './smartuniverse.classes.universechannel'; import { UniverseChannel } from './smartuniverse.classes.universechannel.js';
import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel'; import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel.js';
import { ReactionResult } from './smartuniverse.classes.event.reactionresult'; import { ReactionResult } from './smartuniverse.classes.event.reactionresult.js';
import { UniverseMessage } from './smartuniverse.classes.universemessage'; import { UniverseMessage } from './smartuniverse.classes.universemessage.js';
import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage'; import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage.js';
export interface IReactionRequestConstructorOptions< export interface IReactionRequestConstructorOptions<
T extends plugins.typedrequestInterfaces.ITypedRequest T extends plugins.typedrequestInterfaces.ITypedRequest

12
ts/smartuniverse.classes.event.reactionresponse.ts
View File

@ -1,10 +1,10 @@
import * as plugins from './smartuniverse.plugins'; import * as plugins from './smartuniverse.plugins.js';
import { ICombinatorPayload } from './smartuniverse.classes.event.reactionrequest'; import { type ICombinatorPayload } from './smartuniverse.classes.event.reactionrequest.js';
import { UniverseChannel } from './smartuniverse.classes.universechannel'; import { UniverseChannel } from './smartuniverse.classes.universechannel.js';
import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel'; import { ClientUniverseChannel } from './smartuniverse.classes.client.universechannel.js';
import { UniverseMessage } from './smartuniverse.classes.universemessage'; import { UniverseMessage } from './smartuniverse.classes.universemessage.js';
import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage'; import { ClientUniverseMessage } from './smartuniverse.classes.client.universemessage.js';
export type TReactionResponseFuncDef<T extends plugins.typedrequestInterfaces.ITypedRequest> = ( export type TReactionResponseFuncDef<T extends plugins.typedrequestInterfaces.ITypedRequest> = (
dataArg: T['request'] dataArg: T['request']

4
ts/smartuniverse.classes.event.reactionresult.ts
View File

@ -1,5 +1,5 @@
import * as plugins from './smartuniverse.plugins'; import * as plugins from './smartuniverse.plugins.js';
import { ReactionResponse } from './smartuniverse.classes.event.reactionresponse'; import { ReactionResponse } from './smartuniverse.classes.event.reactionresponse.js';
export class ReactionResult<T extends plugins.typedrequestInterfaces.ITypedRequest> { export class ReactionResult<T extends plugins.typedrequestInterfaces.ITypedRequest> {
private resultReplaySubject = new plugins.smartrx.rxjs.ReplaySubject<T['response']>(); private resultReplaySubject = new plugins.smartrx.rxjs.ReplaySubject<T['response']>();

68
ts/smartuniverse.classes.universe.ts
View File

@ -1,16 +1,15 @@
import * as plugins from './smartuniverse.plugins'; import * as plugins from './smartuniverse.plugins.js';
import * as pluginsTyped from './smartuniverse.pluginstyped'; import * as pluginsTyped from './smartuniverse.pluginstyped.js';
import { Handler, Route, Server } from '@pushrocks/smartexpress'; import { UniverseCache, UniverseChannel, UniverseMessage } from './index.js';
import { UniverseCache, UniverseChannel, UniverseMessage } from './';
import * as interfaces from './interfaces'; import * as interfaces from './interfaces/index.js';
import { UniverseConnection } from './smartuniverse.classes.universeconnection'; import { UniverseConnection } from './smartuniverse.classes.universeconnection.js';
import { logger } from './smartuniverse.logging'; import { logger } from './smartuniverse.logging.js';
export interface ISmartUniverseConstructorOptions { export interface ISmartUniverseConstructorOptions {
messageExpiryInMilliseconds: number; messageExpiryInMilliseconds: number;
externalServer?: pluginsTyped.smartexpress.Server; externalServer?: pluginsTyped.typedserver.servertools.Server;
} }
/** /**
@ -26,7 +25,7 @@ export class Universe {
/** /**
* the smartexpress server used * the smartexpress server used
*/ */
private smartexpressServer: pluginsTyped.smartexpress.Server; private server: pluginsTyped.typedserver.servertools.Server;
/** /**
* the smartsocket used * the smartsocket used
@ -69,7 +68,7 @@ export class Universe {
* returns a channel * returns a channel
*/ */
public getChannel(channelNameArg: string) { public getChannel(channelNameArg: string) {
return this.universeCache.channelMap.find((channelArg) => { return this.universeCache.channelMap.findSync((channelArg) => {
return channelArg.name === channelNameArg; return channelArg.name === channelNameArg;
}); });
} }
@ -86,44 +85,35 @@ export class Universe {
// add websocket upgrade // add websocket upgrade
this.smartsocket = new plugins.smartsocket.Smartsocket({ this.smartsocket = new plugins.smartsocket.Smartsocket({
port: portArg alias: 'smartuniverse',
port: portArg,
}); });
// lets create the base smartexpress server // lets create the base smartexpress server
if (this.options.externalServer) { if (this.options.externalServer) {
console.log('Universe is using externally supplied server'); console.log('Universe is using externally supplied server');
this.smartsocket.setExternalServer('smartexpress' ,this.options.externalServer); this.smartsocket.setExternalServer('smartexpress', this.options.externalServer);
} }
// add a role for the clients
const ClientRole = new plugins.smartsocket.SocketRole({
name: 'UniverseClient',
passwordHash: await plugins.isohash.sha256FromString('UniverseClient'), // authentication happens on another level
});
// add the role to smartsocket const socketFunctionSubscription =
this.smartsocket.addSocketRoles([ClientRole]); new plugins.smartsocket.SocketFunction<interfaces.ISocketRequest_SubscribeChannel>({
funcName: 'subscribeChannel',
funcDef: async (dataArg, socketConnectionArg) => {
const universeConnection = new UniverseConnection({
universe: this,
socketConnection: socketConnectionArg,
authenticationRequests: [dataArg],
});
await UniverseConnection.addConnectionToCache(this, universeConnection);
return {
subscriptionStatus: 'subscribed',
};
},
});
const socketFunctionSubscription = new plugins.smartsocket.SocketFunction< const socketFunctionProcessMessage = new plugins.smartsocket.SocketFunction<any>({
interfaces.ISocketRequest_SubscribeChannel // TODO proper ITypedRequest here instead of any
>({
allowedRoles: [ClientRole], // there is only one client role, Authentication happens on another level
funcName: 'subscribeChannel',
funcDef: async (dataArg, socketConnectionArg) => {
const universeConnection = new UniverseConnection({
universe: this,
socketConnection: socketConnectionArg,
authenticationRequests: [dataArg],
});
await UniverseConnection.addConnectionToCache(this, universeConnection);
return {
subscriptionStatus: 'subscribed',
};
},
});
const socketFunctionProcessMessage = new plugins.smartsocket.SocketFunction<any>({ // TODO proper ITypedRequest here instead of any
allowedRoles: [ClientRole], // there is only one client role, Authentication happens on another level
funcName: 'processMessage', funcName: 'processMessage',
funcDef: async (messageDataArg: interfaces.IUniverseMessage, socketConnectionArg) => { funcDef: async (messageDataArg: interfaces.IUniverseMessage, socketConnectionArg) => {
const universeConnection = UniverseConnection.findUniverseConnectionBySocketConnection( const universeConnection = UniverseConnection.findUniverseConnectionBySocketConnection(

21
ts/smartuniverse.classes.universecache.ts
View File

@ -1,14 +1,11 @@
import * as plugins from './smartuniverse.plugins'; import * as plugins from './smartuniverse.plugins.js';
import { UniverseChannel } from './smartuniverse.classes.universechannel'; import { UniverseChannel } from './smartuniverse.classes.universechannel.js';
import { UniverseMessage } from './smartuniverse.classes.universemessage'; import { UniverseMessage } from './smartuniverse.classes.universemessage.js';
import { ObjectMap } from '@pushrocks/lik'; import { ObjectMap } from '@push.rocks/lik';
import { UniverseConnection } from './smartuniverse.classes.universeconnection.js';
import { Observable, from } from 'rxjs'; import { Universe } from './smartuniverse.classes.universe.js';
import { filter } from 'rxjs/operators';
import { UniverseConnection } from './smartuniverse.classes.universeconnection';
import { Universe } from './smartuniverse.classes.universe';
/** /**
* universe store handles the creation, storage and retrieval of messages. * universe store handles the creation, storage and retrieval of messages.
@ -68,9 +65,9 @@ export class UniverseCache {
public readMessagesYoungerThan( public readMessagesYoungerThan(
unixTimeArg?: number, unixTimeArg?: number,
channelName?: string channelName?: string
): Observable<UniverseMessage<any>> { ): plugins.smartrx.rxjs.Observable<UniverseMessage<any>> {
const messageObservable = from(this.messageMap.getArray()).pipe( const messageObservable = plugins.smartrx.rxjs.from(this.messageMap.getArray()).pipe(
filter((messageArg) => { plugins.smartrx.rxjs.ops.filter((messageArg) => {
return messageArg.smartTimestamp.isYoungerThanMilliSeconds(this.destructionTime); return messageArg.smartTimestamp.isYoungerThanMilliSeconds(this.destructionTime);
}) })
); );

20
ts/smartuniverse.classes.universechannel.ts
View File

@ -1,11 +1,11 @@
import * as plugins from './smartuniverse.plugins'; import * as plugins from './smartuniverse.plugins.js';
import * as interfaces from './interfaces'; import * as interfaces from './interfaces/index.js';
import { UniverseCache } from './smartuniverse.classes.universecache'; import { UniverseCache } from './smartuniverse.classes.universecache.js';
import { UniverseMessage } from './smartuniverse.classes.universemessage'; import { UniverseMessage } from './smartuniverse.classes.universemessage.js';
import { UniverseConnection } from './smartuniverse.classes.universeconnection'; import { UniverseConnection } from './smartuniverse.classes.universeconnection.js';
import { Universe } from './smartuniverse.classes.universe'; import { Universe } from './smartuniverse.classes.universe.js';
import { logger } from './smartuniverse.logging'; import { logger } from './smartuniverse.logging.js';
/** /**
* enables messages to stay within a certain scope. * enables messages to stay within a certain scope.
@ -34,7 +34,7 @@ export class UniverseChannel {
* returns boolean wether certain channel exists * returns boolean wether certain channel exists
*/ */
public static async doesChannelExists(universeCacheArg: UniverseCache, channelNameArg: string) { public static async doesChannelExists(universeCacheArg: UniverseCache, channelNameArg: string) {
const channel = universeCacheArg.channelMap.find((channelArg) => { const channel = universeCacheArg.channelMap.findSync((channelArg) => {
return channelArg.name === channelNameArg; return channelArg.name === channelNameArg;
}); });
if (channel) { if (channel) {
@ -55,7 +55,7 @@ export class UniverseChannel {
universeCacheArg: UniverseCache, universeCacheArg: UniverseCache,
universeMessageArg: UniverseMessage<any> universeMessageArg: UniverseMessage<any>
): UniverseChannel { ): UniverseChannel {
const foundChannel = universeCacheArg.channelMap.find((universeChannel) => { const foundChannel = universeCacheArg.channelMap.findSync((universeChannel) => {
const result = universeChannel.authenticate(universeMessageArg); const result = universeChannel.authenticate(universeMessageArg);
return result; return result;
}); });
@ -73,7 +73,7 @@ export class UniverseChannel {
} }
public static getUniverseChannelByName(universeRef: Universe, universeChannelName: string) { public static getUniverseChannelByName(universeRef: Universe, universeChannelName: string) {
return universeRef.universeCache.channelMap.find((channelArg) => { return universeRef.universeCache.channelMap.findSync((channelArg) => {
return channelArg.name === universeChannelName; return channelArg.name === universeChannelName;
}); });
} }

12
ts/smartuniverse.classes.universeconnection.ts
View File

@ -1,8 +1,8 @@
import * as plugins from './smartuniverse.plugins'; import * as plugins from './smartuniverse.plugins.js';
import * as interfaces from './interfaces'; import * as interfaces from './interfaces/index.js';
import { UniverseChannel } from './smartuniverse.classes.universechannel'; import { UniverseChannel } from './smartuniverse.classes.universechannel.js';
import { UniverseCache } from './smartuniverse.classes.universecache'; import { UniverseCache } from './smartuniverse.classes.universecache.js';
import { Universe } from './smartuniverse.classes.universe'; import { Universe } from './smartuniverse.classes.universe.js';
/** /**
* represents a connection to the universe * represents a connection to the universe
@ -87,7 +87,7 @@ export class UniverseConnection {
universeCache: UniverseCache, universeCache: UniverseCache,
socketConnectionArg: plugins.smartsocket.SocketConnection socketConnectionArg: plugins.smartsocket.SocketConnection
): UniverseConnection { ): UniverseConnection {
const universeConnection = universeCache.connectionMap.find((universeConnectionArg) => { const universeConnection = universeCache.connectionMap.findSync((universeConnectionArg) => {
return universeConnectionArg.socketConnection === socketConnectionArg; return universeConnectionArg.socketConnection === socketConnectionArg;
}); });
return universeConnection; return universeConnection;

14
ts/smartuniverse.classes.universemessage.ts
View File

@ -1,10 +1,10 @@
import * as plugins from './smartuniverse.plugins'; import * as plugins from './smartuniverse.plugins.js';
import * as interfaces from './interfaces'; import * as interfaces from './interfaces/index.js';
import { Universe } from './smartuniverse.classes.universe'; import { Universe } from './smartuniverse.classes.universe.js';
import { UniverseChannel } from './smartuniverse.classes.universechannel'; import { UniverseChannel } from './smartuniverse.classes.universechannel.js';
import { UniverseCache } from './smartuniverse.classes.universecache'; import { UniverseCache } from './smartuniverse.classes.universecache.js';
import { SocketConnection } from '@pushrocks/smartsocket'; import { SocketConnection } from '@push.rocks/smartsocket';
import { logger } from './smartuniverse.logging'; import { logger } from './smartuniverse.logging.js';
/** /**
* represents a message within a universe * represents a message within a universe

2
ts/smartuniverse.logging.ts
View File

@ -1,2 +1,2 @@
import * as plugins from './smartuniverse.plugins'; import * as plugins from './smartuniverse.plugins.js';
export const logger = new plugins.smartlog.ConsoleLog(); export const logger = new plugins.smartlog.ConsoleLog();

22
ts/smartuniverse.plugins.ts
View File

@ -4,24 +4,26 @@ import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces';
export { typedrequestInterfaces }; export { typedrequestInterfaces };
// pushrocks scope // pushrocks scope
import * as lik from '@pushrocks/lik'; import * as lik from '@push.rocks/lik';
import * as isohash from '@pushrocks/isohash'; import * as isohash from '@push.rocks/isohash';
import * as smartdelay from '@pushrocks/smartdelay'; import * as isounique from '@push.rocks/isounique';
import * as smartlog from '@pushrocks/smartlog'; import * as smartdelay from '@push.rocks/smartdelay';
import * as smartpromise from '@pushrocks/smartpromise'; import * as smartlog from '@push.rocks/smartlog';
import * as smartrx from '@pushrocks/smartrx'; import * as smartpromise from '@push.rocks/smartpromise';
import * as smartsocket from '@pushrocks/smartsocket'; import * as smartrx from '@push.rocks/smartrx';
import * as smarttime from '@pushrocks/smarttime'; import * as smartsocket from '@push.rocks/smartsocket';
import * as isounique from '@pushrocks/isounique'; import * as smarttime from '@push.rocks/smarttime';
import * as smarturl from '@push.rocks/smarturl';
export { export {
lik, lik,
isohash, isohash,
isounique,
smartdelay, smartdelay,
smartlog, smartlog,
smartpromise, smartpromise,
smartrx, smartrx,
smartsocket, smartsocket,
smarttime, smarttime,
isounique, smarturl,
}; };

8
ts/smartuniverse.pluginstyped.ts
View File

@ -1,5 +1,5 @@
import type * as smartexpress from '@pushrocks/smartexpress'; import type * as typedserver from '@apiglobal/typedserver';
export { export type {
smartexpress typedserver
}; };

11
tsconfig.json Normal file
View File

@ -0,0 +1,11 @@
{
"compilerOptions": {
"experimentalDecorators": true,
"useDefineForClassFields": false,
"target": "ES2022",
"module": "ES2022",
"moduleResolution": "nodenext",
"esModuleInterop": true,
"verbatimModuleSyntax": true,
}
}

17
tslint.json
View File

@ -1,17 +0,0 @@
{
"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"
}