2.0.23

.gitea/workflows/default_nottags.yaml

@@ -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

.gitea/workflows/default_tags.yaml

@@ -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

.gitlab-ci.yml

@@ -1,141 +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
-
-before_script:
-  - npm install -g @shipzone/npmci
-
-# ====================
-# 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
-  allow_failure: true
-
-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

npmextra.json

@@ -3,10 +3,10 @@
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "gitscope": "push.rocks",
       "gitrepo": "smartsocket",
       "description": "easy and secure websocket communication",
-      "npmPackagename": "@pushrocks/smartsocket",
+      "npmPackagename": "@push.rocks/smartsocket",
       "license": "MIT",
       "projectDomain": "push.rocks"
     }

package.json

@@ -1,12 +1,14 @@
 {
-  "name": "@pushrocks/smartsocket",
+  "name": "@push.rocks/smartsocket",
-  "version": "1.2.17",
+  "version": "2.0.23",
   "description": "easy and secure websocket communication",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild --web && tsbundle --from ./ts/index.ts --to dist_bundle/bundle.js)"
+    "build": "(tsbuild --web --allowimplicitany && tsbundle --from ./ts/index.ts --to dist_bundle/bundle.js)",
+    "buildDocs": "tsdoc"
   },
   "repository": {
     "type": "git",
@@ -19,29 +21,29 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartsocket#README",
   "dependencies": {
-    "@apiglobal/typedrequest-interfaces": "^1.0.15",
+    "@api.global/typedrequest-interfaces": "^3.0.1",
-    "@pushrocks/isohash": "^1.0.2",
+    "@api.global/typedserver": "^3.0.4",
-    "@pushrocks/isounique": "^1.0.5",
+    "@push.rocks/isohash": "^2.0.0",
-    "@pushrocks/lik": "^5.0.0",
+    "@push.rocks/isounique": "^1.0.5",
-    "@pushrocks/smartdelay": "^2.0.13",
+    "@push.rocks/lik": "^6.0.5",
-    "@pushrocks/smartenv": "^4.0.16",
+    "@push.rocks/smartdelay": "^3.0.5",
-    "@pushrocks/smartexpress": "^3.0.108",
+    "@push.rocks/smartenv": "^5.0.5",
-    "@pushrocks/smartjson": "^4.0.6",
+    "@push.rocks/smartjson": "^5.0.10",
-    "@pushrocks/smartlog": "^2.0.44",
+    "@push.rocks/smartlog": "^3.0.3",
-    "@pushrocks/smartpromise": "^3.1.6",
+    "@push.rocks/smartpromise": "^4.0.3",
-    "@pushrocks/smartrx": "^2.0.19",
+    "@push.rocks/smartrx": "^3.0.6",
-    "@pushrocks/smarttime": "^3.0.43",
+    "@push.rocks/smarttime": "^4.0.5",
-    "socket.io": "^4.4.1",
+    "engine.io": "6.5.2",
-    "socket.io-client": "^4.4.1"
+    "socket.io": "4.7.2",
+    "socket.io-client": "4.7.2"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.29",
+    "@gitzone/tsbuild": "^2.1.66",
-    "@gitzone/tsrun": "^1.2.18",
+    "@gitzone/tsbundle": "^2.0.8",
-    "@gitzone/tstest": "^1.0.60",
+    "@gitzone/tsrun": "^1.2.44",
-    "@pushrocks/tapbundle": "^3.2.15",
+    "@gitzone/tstest": "^1.0.77",
-    "@types/node": "^17.0.10",
+    "@push.rocks/tapbundle": "^5.0.15",
-    "tslint": "^6.1.3",
+    "@types/node": "^20.6.0"
-    "tslint-config-prettier": "^1.18.0"
   },
   "private": false,
   "files": [

readme.md

@@ -1,27 +1,26 @@
-# @pushrocks/smartsocket
+# @push.rocks/smartsocket
 easy and secure websocket communication
 
 ## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartsocket)
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/smartsocket)
-* [gitlab.com (source)](https://gitlab.com/pushrocks/smartsocket)
+* [gitlab.com (source)](https://gitlab.com/push.rocks/smartsocket)
-* [github.com (source mirror)](https://github.com/pushrocks/smartsocket)
+* [github.com (source mirror)](https://github.com/push.rocks/smartsocket)
-* [docs (typedoc)](https://pushrocks.gitlab.io/smartsocket/)
+* [docs (typedoc)](https://push.rocks.gitlab.io/smartsocket/)
 
 ## Status for master
 
 Status Category | Status Badge
 -- | --
-GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartsocket/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipelines | [![pipeline status](https://gitlab.com/push.rocks/smartsocket/badges/master/pipeline.svg)](https://lossless.cloud)
-GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartsocket/badges/master/coverage.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/push.rocks/smartsocket/badges/master/coverage.svg)](https://lossless.cloud)
-npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartsocket)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@push.rocks/smartsocket)](https://lossless.cloud)
-Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartsocket)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/push.rocks/smartsocket)](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/)
 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/smartsocket)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@push.rocks/smartsocket)](https://lossless.cloud)
-PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartsocket)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@push.rocks/smartsocket)](https://lossless.cloud)
-BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartsocket)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@push.rocks/smartsocket)](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
 
@@ -116,7 +115,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.
 
-> 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)
-
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.expressserver.ts

@@ -1,15 +1,15 @@
 // tslint:disable-next-line:no-implicit-dependencies
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, expectAsync, tap } from '@push.rocks/tapbundle';
 
-import * as isohash from '@pushrocks/isohash';
+import * as isohash from '@push.rocks/isohash';
-import * as smartexpress from '@pushrocks/smartexpress';
+import * as smartexpress from '@api.global/typedserver';
 
-import smartsocket = require('../ts/index');
+import * as smartsocket from '../ts/index.js';
 
 let testSmartsocket: smartsocket.Smartsocket;
 let testSmartsocketClient: smartsocket.SmartsocketClient;
 let testSocketFunction1: smartsocket.SocketFunction<any>;
-let myseServer: smartexpress.Server;
+let myseServer: smartexpress.servertools.Server;
 
 const testConfig = {
   port: 3000,
@@ -18,11 +18,11 @@ const testConfig = {
 // class smartsocket
 tap.test('should create a new smartsocket', async () => {
   testSmartsocket = new smartsocket.Smartsocket({ alias: 'testserver', port: testConfig.port });
-  expect(testSmartsocket).be.instanceOf(smartsocket.Smartsocket);
+  expect(testSmartsocket).toBeInstanceOf(smartsocket.Smartsocket);
 });
 
 tap.test('Should accept an smartExpressServer as server', async () => {
-  myseServer = new smartexpress.Server({
+  myseServer = new smartexpress.servertools.Server({
     cors: true,
     forceSsl: false,
     port: testConfig.port,
@@ -33,7 +33,6 @@ tap.test('Should accept an smartExpressServer as server', async () => {
   await myseServer.start();
 });
 
-
 // class SocketFunction
 tap.test('should register a new Function', async () => {
   testSocketFunction1 = new smartsocket.SocketFunction({
@@ -80,7 +79,7 @@ tap.test('should be able to make a functionCall from client to server', async ()
     const response: any = await testSmartsocketClient.serverCall('testFunction1', {
       value1: randomString,
     });
-    expect(response.value1).to.equal(randomString);
+    expect(response.value1).toEqual(randomString);
     if (counter % 100 === 0) {
       console.log(
         `processed 100 more messages in ${Date.now() - startTime}ms. ${

test/test.reconnect.ts

@@ -1,7 +1,7 @@
 // tslint:disable-next-line:no-implicit-dependencies
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 
-import smartsocket = require('../ts/index');
+import * as smartsocket from '../ts/index.js';
 
 let testSmartsocket: smartsocket.Smartsocket;
 let testSmartsocketClient: smartsocket.SmartsocketClient;
@@ -79,7 +79,7 @@ tap.test('should be able to tag a connection from client', async (tools) => {
       return true;
     })
     .getTagById('awesome');
-  expect(tagOnServerSide.payload).to.equal('yes');
+  expect(tagOnServerSide.payload).toEqual('yes');
 });
 
 tap.test('should be able to tag a connection from server', async (tools) => {
@@ -92,7 +92,7 @@ tap.test('should be able to tag a connection from server', async (tools) => {
       payload: 'absolutely',
     });
   const tagOnClientSide = await testSmartsocketClient.socketConnection.getTagById('awesome2');
-  expect(tagOnClientSide.payload).to.equal('absolutely');
+  expect(tagOnClientSide.payload).toEqual('absolutely');
 });
 
 tap.test('should be able to make a functionCall from client to server', async () => {
@@ -100,7 +100,7 @@ tap.test('should be able to make a functionCall from client to server', async ()
     value1: 'hello',
   });
   console.log(response);
-  expect(response.value1).to.equal('hello');
+  expect(response.value1).toEqual('hello');
 });
 
 tap.test('should be able to make a functionCall from server to client', async () => {
@@ -114,37 +114,39 @@ tap.test('should be able to make a functionCall from server to client', async ()
     })
   );
   console.log(response);
-  expect(response.hi).to.equal('hi there from server');
+  expect(response.hi).toEqual('hi there from server');
 });
 
-tap.test('client should disconnect and reconnect', async (tools) => {
+tap.test('client should disconnect and reconnect', async (toolsArg) => {
   await testSmartsocketClient.disconnect();
   await testSmartsocketClient.connect();
+  await toolsArg.delayFor(2000);
+  expect(testSmartsocket.socketConnections.getArray().length).toEqual(1);
 });
 
 // class smartsocket
 tap.test('should be able to switch to a new server', async (toolsArg) => {
   await testSmartsocket.stop();
-  await toolsArg.delayFor(5000);
   testSmartsocket = new smartsocket.Smartsocket({ alias: 'testserver2', port: testConfig.port });
   await testSmartsocket.start();
   await toolsArg.delayFor(30000);
 });
 
 tap.test('should be able to locate a connection tag after reconnect', async (tools) => {
-  console.log(testSmartsocket.socketConnections.getArray().length);
+  expect(testSmartsocket.socketConnections.getArray().length).toEqual(1);
   const tagOnServerSide = await testSmartsocket.socketConnections
     .findSync((socketConnection) => {
       return true;
     })
     .getTagById('awesome');
-  expect(tagOnServerSide.payload).to.equal('yes');
+  expect(tagOnServerSide.payload).toEqual('yes');
 });
 
 // terminate
-tap.test('should close the server', async () => {
+tap.test('should close the server', async (tools) => {
   await testSmartsocketClient.stop();
   await testSmartsocket.stop();
+  tools.delayFor(1000).then(() => process.exit(0));
 });
 
 tap.start();

test/test.tagging.ts

@@ -1,7 +1,7 @@
 // tslint:disable-next-line:no-implicit-dependencies
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 
-import smartsocket = require('../ts/index');
+import * as smartsocket from '../ts/index.js';
 
 let testSmartsocket: smartsocket.Smartsocket;
 let testSmartsocketClient: smartsocket.SmartsocketClient;
@@ -35,7 +35,7 @@ const testConfig = {
 // class smartsocket
 tap.test('should create a new smartsocket', async () => {
   testSmartsocket = new smartsocket.Smartsocket({ alias: 'testserver2', port: testConfig.port });
-  expect(testSmartsocket).be.instanceOf(smartsocket.Smartsocket);
+  expect(testSmartsocket).toBeInstanceOf(smartsocket.Smartsocket);
 });
 
 // class SocketFunction
@@ -82,7 +82,7 @@ tap.test('should be able to tag a connection from client', async (tools) => {
       return true;
     })
     .getTagById('awesome');
-  expect(tagOnServerSide.payload).to.equal('yes');
+  expect(tagOnServerSide.payload).toEqual('yes');
 });
 
 tap.test('should be able to tag a connection from server', async (tools) => {
@@ -95,7 +95,7 @@ tap.test('should be able to tag a connection from server', async (tools) => {
       payload: 'absolutely',
     });
   const tagOnClientSide = await testSmartsocketClient.socketConnection.getTagById('awesome2');
-  expect(tagOnClientSide.payload).to.equal('absolutely');
+  expect(tagOnClientSide.payload).toEqual('absolutely');
 });
 
 tap.test('2 clients should connect in parallel', async () => {
@@ -107,7 +107,7 @@ tap.test('should be able to make a functionCall from client to server', async ()
     value1: 'hello',
   });
   console.log(response);
-  expect(response.value1).to.equal('hello');
+  expect(response.value1).toEqual('hello');
 });
 
 tap.test('should be able to make a functionCall from server to client', async () => {
@@ -121,7 +121,7 @@ tap.test('should be able to make a functionCall from server to client', async ()
     })
   );
   console.log(response);
-  expect(response.hi).to.equal('hi there from server');
+  expect(response.hi).toEqual('hi there from server');
 });
 
 tap.test('client should disconnect and reconnect', async (tools) => {
@@ -136,7 +136,7 @@ tap.test('should be able to locate a connection tag after reconnect', async (too
       return true;
     })
     .getTagById('awesome');
-  expect(tagOnServerSide.payload).to.equal('yes');
+  expect(tagOnServerSide.payload).toEqual('yes');
 });
 
 // terminate

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@push.rocks/smartsocket',
+  version: '2.0.23',
+  description: 'easy and secure websocket communication'
+}

ts/index.ts

@@ -1,7 +1,10 @@
 // export main classes
-export * from './smartsocket.classes.smartsocket';
+export * from './smartsocket.classes.smartsocket.js';
-export * from './smartsocket.classes.smartsocketclient';
+export * from './smartsocket.classes.smartsocketclient.js';
 
 // export further classes and objects
-export * from './smartsocket.classes.socketfunction';
+export * from './smartsocket.classes.socketfunction.js';
-export * from './smartsocket.classes.socketconnection';
+export * from './smartsocket.classes.socketconnection.js';
+
+// export types so they can be referred to
+export * from './interfaces/index.js';

ts/interfaces/connection.ts

@@ -7,4 +7,5 @@ export type TConnectionStatus =
   | 'connecting'
   | 'connected'
   | 'disconnecting'
-  | 'disconnected';
+  | 'disconnected'
+  | 'timedOut';

ts/interfaces/index.ts

@@ -1,2 +1,2 @@
-export * from './connection';
+export * from './connection.js';
-export * from './tag';
+export * from './tag.js';

ts/smartsocket.classes.smartsocket.ts

@@ -1,17 +1,18 @@
-import * as plugins from './smartsocket.plugins';
+import * as plugins from './smartsocket.plugins.js';
-import * as pluginsTyped from './smartsocket.pluginstyped';
+import * as pluginsTyped from './smartsocket.pluginstyped.js';
+import * as interfaces from './interfaces/index.js';
 
 // classes
-import { SocketConnection } from './smartsocket.classes.socketconnection';
+import { SocketConnection } from './smartsocket.classes.socketconnection.js';
 import {
-  ISocketFunctionCallDataRequest,
+  type ISocketFunctionCallDataRequest,
   SocketFunction,
-  ISocketFunctionCallDataResponse,
+  type ISocketFunctionCallDataResponse,
-} from './smartsocket.classes.socketfunction';
+} from './smartsocket.classes.socketfunction.js';
-import { SocketRequest } from './smartsocket.classes.socketrequest';
+import { SocketRequest } from './smartsocket.classes.socketrequest.js';
-import { SocketServer } from './smartsocket.classes.socketserver';
+import { SocketServer } from './smartsocket.classes.socketserver.js';
 
-import { logger } from './smartsocket.logging';
+import { logger } from './smartsocket.logging.js';
 
 export interface ISmartsocketConstructorOptions {
   alias: string;
@@ -30,6 +31,8 @@ export class Smartsocket {
   public socketFunctions = new plugins.lik.ObjectMap<SocketFunction<any>>();
   public socketRequests = new plugins.lik.ObjectMap<SocketRequest<any>>();
 
+  public eventSubject = new plugins.smartrx.rxjs.Subject<interfaces.TConnectionStatus>();
+
   private socketServer = new SocketServer(this);
 
   constructor(optionsArg: ISmartsocketConstructorOptions) {
@@ -37,7 +40,6 @@ export class Smartsocket {
     this.alias = plugins.isounique.uni(this.options.alias);
   }
 
-  // tslint:disable-next-line:member-ordering
   public async setExternalServer(serverType: 'smartexpress', serverArg: any) {
     await this.socketServer.setExternalServer(serverType, serverArg);
   }
@@ -46,8 +48,14 @@ export class Smartsocket {
    * starts smartsocket
    */
   public async start() {
-    const socketIoModule = this.smartenv.getSafeNodeModule('socket.io');
+    const socketIoModule = await this.smartenv.getSafeNodeModule('socket.io');
-    this.io = socketIoModule(this.socketServer.getServerForSocketIo());
+    this.io = new socketIoModule.Server(await this.socketServer.getServerForSocketIo(), {
+      cors: {
+        allowedHeaders: '*',
+        methods: '*',
+        origin: '*',
+      },
+    });
     await this.socketServer.start();
     this.io.on('connection', (socketArg) => {
       this._handleSocketConnection(socketArg);
@@ -61,7 +69,10 @@ export class Smartsocket {
     await plugins.smartdelay.delayFor(1000);
     this.socketConnections.forEach((socketObjectArg: SocketConnection) => {
       if (socketObjectArg) {
-        logger.log('info', `disconnecting socket with >>alias ${socketObjectArg.alias} due to server stop...`);
+        logger.log(
+          'info',
+          `disconnecting socket with >>alias ${socketObjectArg.alias} due to server stop...`
+        );
         socketObjectArg.disconnect();
       }
     });

ts/smartsocket.classes.smartsocketclient.ts

@@ -1,14 +1,14 @@
-import * as plugins from './smartsocket.plugins';
+import * as plugins from './smartsocket.plugins.js';
-import * as pluginsTyped from './smartsocket.pluginstyped';
+import * as pluginsTyped from './smartsocket.pluginstyped.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
-import { SocketConnection } from './smartsocket.classes.socketconnection';
+import { SocketConnection } from './smartsocket.classes.socketconnection.js';
 import {
-  ISocketFunctionCallDataRequest,
+  type ISocketFunctionCallDataRequest,
   SocketFunction,
-} from './smartsocket.classes.socketfunction';
+} from './smartsocket.classes.socketfunction.js';
-import { ISocketRequestDataObject, SocketRequest } from './smartsocket.classes.socketrequest';
+import { type ISocketRequestDataObject, SocketRequest } from './smartsocket.classes.socketrequest.js';
-import { logger } from './smartsocket.logging';
+import { logger } from './smartsocket.logging.js';
 
 /**
  * interface for class SmartsocketClient
@@ -95,9 +95,12 @@ export class SmartsocketClient {
       nodeModuleName: 'socket.io-client',
       webUrlArg: 'https://cdn.jsdelivr.net/npm/socket.io-client@4/dist/socket.io.js',
       getFunction: () => {
-        return (globalThis as any).io;
+        const socketIoBrowserModule = (globalThis as any).io;
+        // console.log('loaded socket.io for browser');
+        return socketIoBrowserModule;
       },
     });
+    // console.log(socketIoClient);
     logger.log('info', 'trying to connect...');
     const socketUrl = `${this.serverUrl}:${this.serverPort}`;
     this.socketConnection = new SocketConnection({
@@ -105,102 +108,120 @@ export class SmartsocketClient {
       authenticated: false,
       side: 'client',
       smartsocketHost: this,
-      socket: await socketIoClient.connect(socketUrl, {
+      socket: await socketIoClient
-        multiplex: false,
+        .connect(socketUrl, {
-        reconnectionAttempts: 5,
+          multiplex: true,
-        rejectUnauthorized: socketUrl.startsWith('https://localhost') ? false : true,
+          rememberUpgrade: true,
-      }),
+          autoConnect: false,
+          reconnectionAttempts: 0,
+          rejectUnauthorized: socketUrl.startsWith('https://localhost') ? false : true,
+        })
+        .open(),
     });
 
     const timer = new plugins.smarttime.Timer(5000);
     timer.start();
     timer.completed.then(() => {
+      this.updateStatus('timedOut');
       logger.log('warn', 'connection to server timed out.');
-      this.disconnect();
+      this.disconnect(true);
     });
 
     // authentication flow
-    this.socketConnection.socket.on(
+    this.socketConnection.socket.on('requestAuth', (dataArg: interfaces.IRequestAuthPayload) => {
-      'requestAuth',
+      timer.reset();
-      (dataArg: interfaces.IRequestAuthPayload) => {
+      logger.log('info', `server ${dataArg.serverAlias} requested authentication`);
-        timer.reset();
-        logger.log('info', `server ${dataArg.serverAlias} requested authentication`);
 
-        // lets register the authenticated event
+      // lets register the authenticated event
-        this.socketConnection.socket.on('authenticated', async () => {
+      this.socketConnection.socket.on('authenticated', async () => {
-          this.remoteShortId = dataArg.serverAlias;
+        this.remoteShortId = dataArg.serverAlias;
-          logger.log('info', 'client is authenticated');
+        logger.log('info', 'client is authenticated');
-          this.socketConnection.authenticated = true;
+        this.socketConnection.authenticated = true;
-          await this.socketConnection.listenToFunctionRequests();
+        await this.socketConnection.listenToFunctionRequests();
-        });
+      });
 
-        this.socketConnection.socket.on('serverFullyReactive', async () => {
+      this.socketConnection.socket.on('serverFullyReactive', async () => {
-          // lets take care of retagging
+        // lets take care of retagging
-          const oldTagStore = this.tagStore;
+        const oldTagStore = this.tagStore;
-          this.tagStoreSubscription?.unsubscribe();
+        this.tagStoreSubscription?.unsubscribe();
-          for (const keyArg of Object.keys(this.tagStore)) {
+        for (const keyArg of Object.keys(this.tagStore)) {
-            this.socketConnection.addTag(this.tagStore[keyArg]);
+          this.socketConnection.addTag(this.tagStore[keyArg]);
+        }
+        this.tagStoreSubscription = this.socketConnection.tagStoreObservable.subscribe(
+          (tagStoreArg) => {
+            this.tagStore = tagStoreArg;
           }
-          this.tagStoreSubscription = this.socketConnection.tagStoreObservable.subscribe(
+        );
-            (tagStoreArg) => {
-              this.tagStore = tagStoreArg;
-            }
-          );
 
-          for (const tag of Object.keys(oldTagStore)) {
+        for (const tag of Object.keys(oldTagStore)) {
-            await this.addTag(oldTagStore[tag]);
+          await this.addTag(oldTagStore[tag]);
-          }
+        }
-          done.resolve();
+        this.updateStatus('connected');
-        });
+        done.resolve();
+      });
 
-        // lets register the forbidden event
+      // lets register the forbidden event
-        this.socketConnection.socket.on('forbidden', async () => {
+      this.socketConnection.socket.on('forbidden', async () => {
-          logger.log('warn', `disconnecting due to being forbidden to use the ressource`);
+        logger.log('warn', `disconnecting due to being forbidden to use the ressource`);
-          await this.disconnect();
+        await this.disconnect();
-        });
+      });
 
-        // lets provide the actual auth data
+      // lets provide the actual auth data
-        this.socketConnection.socket.emit('dataAuth', {
+      this.socketConnection.socket.emit('dataAuth', {
-          alias: this.alias,
+        alias: this.alias,
-        });
+      });
-      }
+    });
-    );
 
     // handle connection
-    this.socketConnection.socket.on('connect', async () => {
+    this.socketConnection.socket.on('connect', async () => {});
-      this.updateStatus('connected');
-    });
 
     // handle disconnection and errors
     this.socketConnection.socket.on('disconnect', async () => {
-      await this.disconnect();
+      await this.disconnect(true);
     });
 
     this.socketConnection.socket.on('reconnect_failed', async () => {
-      await this.disconnect();
+      await this.disconnect(true);
     });
     this.socketConnection.socket.on('connect_error', async () => {
-      await this.disconnect();
+      await this.disconnect(true);
     });
     return done.promise;
   }
 
+  private disconnectRunning = false;
+
   /**
    * disconnect from the server
    */
-  public async disconnect() {
+  public async disconnect(useAutoReconnectSetting = false) {
+    if (this.disconnectRunning) {
+      return;
+    }
+    this.disconnectRunning = true;
+    this.updateStatus('disconnecting');
     this.tagStoreSubscription?.unsubscribe();
     if (this.socketConnection) {
       await this.socketConnection.disconnect();
       this.socketConnection = undefined;
-      logger.log('ok', 'disconnected!');
+      logger.log('ok', 'disconnected socket!');
+    } else {
+      this.disconnectRunning = false;
+      logger.log('warn', 'tried to disconnect, without a SocketConnection');
+      return;
     }
+
     logger.log('warn', `disconnected from server ${this.remoteShortId}`);
     this.remoteShortId = null;
-    this.updateStatus('disconnected');
 
-    if (this.autoReconnect) {
+    if (this.autoReconnect && useAutoReconnectSetting && this.eventStatus !== 'connecting') {
-      this.tryDebouncedReconnect();
+      this.updateStatus('connecting');
+      console.log('debounced reconnect!');
+      await plugins.smartdelay.delayForRandom(10000, 20000);
+      this.disconnectRunning = false;
+      await this.connect();
+    } else {
+      this.disconnectRunning = false;
     }
   }
 
@@ -212,14 +233,6 @@ export class SmartsocketClient {
     await this.disconnect();
   }
 
-  /**
-   * try a reconnection
-   */
-  public async tryDebouncedReconnect() {
-    await plugins.smartdelay.delayForRandom(10000, 20000);
-    await this.connect();
-  }
-
   /**
    * dispatches a server call
    * @param functionNameArg

ts/smartsocket.classes.socketconnection.ts

@@ -1,15 +1,15 @@
-import * as plugins from './smartsocket.plugins';
+import * as plugins from './smartsocket.plugins.js';
-import * as pluginsTyped from './smartsocket.pluginstyped';
+import * as pluginsTyped from './smartsocket.pluginstyped.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
 // import classes
-import { Smartsocket } from './smartsocket.classes.smartsocket';
+import { Smartsocket } from './smartsocket.classes.smartsocket.js';
-import { SocketFunction } from './smartsocket.classes.socketfunction';
+import { SocketFunction } from './smartsocket.classes.socketfunction.js';
-import { SocketRequest, ISocketRequestDataObject } from './smartsocket.classes.socketrequest';
+import { SocketRequest, type ISocketRequestDataObject } from './smartsocket.classes.socketrequest.js';
 
 // socket.io
-import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';
+import { SmartsocketClient } from './smartsocket.classes.smartsocketclient.js';
-import { logger } from './smartsocket.logging';
+import { logger } from './smartsocket.logging.js';
 
 // export interfaces
 
@@ -161,11 +161,10 @@ export class SocketConnection {
       this.socket.on('function', (dataArg: ISocketRequestDataObject<any>) => {
         // check if requested function is available to the socket's scope
         // logger.log('info', 'function request received');
-        const referencedFunction: SocketFunction<any> = this.smartsocketRef.socketFunctions.findSync(
+        const referencedFunction: SocketFunction<any> =
-          (socketFunctionArg) => {
+          this.smartsocketRef.socketFunctions.findSync((socketFunctionArg) => {
             return socketFunctionArg.name === dataArg.funcCallData.funcName;
-          }
+          });
-        );
         if (referencedFunction) {
           // logger.log('ok', 'function in access scope');
           const localSocketRequest = new SocketRequest(this.smartsocketRef, {
@@ -197,7 +196,10 @@ export class SocketConnection {
         this.remoteTagStoreObservable.next(tagStoreArg);
       });
 
-      logger.log('info', `now listening to function requests for ${this.alias}`);
+      logger.log(
+        'info',
+        `now listening to function requests for ${this.alias} on side ${this.side}`
+      );
       done.resolve(this);
     } else {
       const errMessage = 'socket needs to be authenticated first';

ts/smartsocket.classes.socketfunction.ts

@@ -1,9 +1,9 @@
-import * as plugins from './smartsocket.plugins';
+import * as plugins from './smartsocket.plugins.js';
 
 // import classes
-import { SocketConnection } from './smartsocket.classes.socketconnection';
+import { SocketConnection } from './smartsocket.classes.socketconnection.js';
-import { Smartsocket } from './smartsocket.classes.smartsocket';
+import { Smartsocket } from './smartsocket.classes.smartsocket.js';
-import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';
+import { SmartsocketClient } from './smartsocket.classes.smartsocketclient.js';
 
 // export interfaces
 

ts/smartsocket.classes.socketrequest.ts

@@ -1,17 +1,17 @@
-import * as plugins from './smartsocket.plugins';
+import * as plugins from './smartsocket.plugins.js';
 
 // import interfaces
 import {
   SocketFunction,
-  ISocketFunctionCallDataRequest,
+  type ISocketFunctionCallDataRequest,
-  ISocketFunctionCallDataResponse,
+  type ISocketFunctionCallDataResponse,
-} from './smartsocket.classes.socketfunction';
+} from './smartsocket.classes.socketfunction.js';
 
 // import classes
-import { SocketConnection } from './smartsocket.classes.socketconnection';
+import { SocketConnection } from './smartsocket.classes.socketconnection.js';
-import { logger } from './smartsocket.logging';
+import { logger } from './smartsocket.logging.js';
-import { Smartsocket } from './smartsocket.classes.smartsocket';
+import { Smartsocket } from './smartsocket.classes.smartsocket.js';
-import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';
+import { SmartsocketClient } from './smartsocket.classes.smartsocketclient.js';
 
 // export interfaces
 export type TSocketRequestStatus = 'new' | 'pending' | 'finished';

ts/smartsocket.classes.socketserver.ts

@@ -1,9 +1,9 @@
-import * as plugins from './smartsocket.plugins';
+import * as plugins from './smartsocket.plugins.js';
-import * as pluginsTyped from './smartsocket.pluginstyped';
+import * as pluginsTyped from './smartsocket.pluginstyped.js';
 
 // used in case no other server is supplied
-import { Smartsocket } from './smartsocket.classes.smartsocket';
+import { Smartsocket } from './smartsocket.classes.smartsocket.js';
-import { logger } from './smartsocket.logging';
+import { logger } from './smartsocket.logging.js';
 
 /**
  * class socketServer
@@ -11,8 +11,9 @@ import { logger } from './smartsocket.logging';
  */
 export class SocketServer {
   private smartsocket: Smartsocket;
+  private httpServerDeferred: plugins.smartpromise.Deferred<any>;
   private httpServer: pluginsTyped.http.Server | pluginsTyped.https.Server;
-  
+
   /**
    * wether httpServer is standalone
    */
@@ -28,20 +29,25 @@ export class SocketServer {
    */
   public async setExternalServer(
     serverType: 'smartexpress',
-    serverArg: pluginsTyped.smartexpress.Server
+    serverArg: pluginsTyped.typedserver.servertools.Server
   ) {
+    this.httpServerDeferred = plugins.smartpromise.defer();
     await serverArg.startedPromise;
     this.httpServer = serverArg.httpServer;
+    this.httpServerDeferred.resolve();
   }
 
   /**
    * gets the server for socket.io
    */
-  public getServerForSocketIo() {
+  public async getServerForSocketIo() {
+    if (this.httpServerDeferred) {
+      await this.httpServerDeferred.promise;
+    }
     if (this.httpServer) {
       return this.httpServer;
     } else {
-      const httpModule = this.smartsocket.smartenv.getSafeNodeModule('http');
+      const httpModule = await this.smartsocket.smartenv.getSafeNodeModule('http');
       this.httpServer = new httpModule.Server();
       this.standaloneServer = true;
       return this.httpServer;

ts/smartsocket.logging.ts

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

ts/smartsocket.plugins.ts

@@ -1,19 +1,19 @@
 // apiglobal scope
-import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces';
+import * as typedrequestInterfaces from '@api.global/typedrequest-interfaces';
 
 export { typedrequestInterfaces };
 
 // pushrocks scope
-import * as isohash from '@pushrocks/isohash';
+import * as isohash from '@push.rocks/isohash';
-import * as isounique from '@pushrocks/isounique';
+import * as isounique from '@push.rocks/isounique';
-import * as lik from '@pushrocks/lik';
+import * as lik from '@push.rocks/lik';
-import * as smartenv from '@pushrocks/smartenv';
+import * as smartenv from '@push.rocks/smartenv';
-import * as smartjson from '@pushrocks/smartjson';
+import * as smartjson from '@push.rocks/smartjson';
-import * as smartlog from '@pushrocks/smartlog';
+import * as smartlog from '@push.rocks/smartlog';
-import * as smartdelay from '@pushrocks/smartdelay';
+import * as smartdelay from '@push.rocks/smartdelay';
-import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartpromise from '@push.rocks/smartpromise';
-import * as smarttime from '@pushrocks/smarttime';
+import * as smarttime from '@push.rocks/smarttime';
-import * as smartrx from '@pushrocks/smartrx';
+import * as smartrx from '@push.rocks/smartrx';
 
 export {
   isohash,

ts/smartsocket.pluginstyped.ts

@@ -1,19 +1,22 @@
 // node native
-import type http from 'http';
+import type * as http from 'http';
-import type https from 'https';
+import type * as https from 'https';
 
-export { http, https };
+export type { http, https };
 
 // pushrocks scope
-import type * as smartexpress from '@pushrocks/smartexpress';
+import type * as typedserver from '@api.global/typedserver';
 
-export { smartexpress };
+export type { typedserver };
 
 // third party scope
-import type socketIo from 'socket.io';
+import type { Socket as ServerSocket, Server as ServerServer } from 'socket.io';
 import type { Socket as ClientSocket, connect as ClientIo } from 'socket.io-client';
 
-export { socketIo };
+export namespace socketIo {
+  export type Socket = ServerSocket;
+  export type Server = ServerServer;
+}
 export namespace socketIoClient {
   export type Socket = ClientSocket;
   export type connect = typeof ClientIo;

tsconfig.json

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

tslint.json

@@ -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"
-}