From 7bbcc91300cd9941721dd80fb22239c415426353 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Wed, 28 Dec 2022 13:52:16 +0100 Subject: [PATCH] fix(core): update --- .gitlab-ci.yml | 43 ++++++++-------------- .vscode/settings.json | 3 +- package.json | 5 ++- readme.md | 6 +-- test/test.expressserver.ts | 1 - ts/00_commitinfo_data.ts | 2 +- ts/smartsocket.classes.smartsocket.ts | 5 ++- ts/smartsocket.classes.socketconnection.ts | 12 +++--- ts/smartsocket.classes.socketserver.ts | 2 +- ts/smartsocket.pluginstyped.ts | 2 +- 10 files changed, 35 insertions(+), 46 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a70f7eb..c96d0c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,31 +13,24 @@ stages: - metadata before_script: - - npm install -g @shipzone/npmci + - pnpm install -g pnpm + - pnpm install -g @shipzone/npmci + - npmci npm prepare # ==================== # security stage # ==================== -mirror: - stage: security - script: - - npmci git mirror - only: - - tags - tags: - - lossless - - docker - - notpriv - +# ==================== +# security stage +# ==================== 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 + - npmci command npm config set registry https://registry.npmjs.org + - npmci command pnpm audit --audit-level=high --prod tags: + - lossless - docker allow_failure: true @@ -45,11 +38,10 @@ 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 + - npmci command pnpm audit --audit-level=high --dev tags: + - lossless - docker allow_failure: true @@ -60,7 +52,6 @@ auditDevDependencies: testStable: stage: test script: - - npmci npm prepare - npmci node install stable - npmci npm install - npmci npm test @@ -71,10 +62,9 @@ testStable: testBuild: stage: test script: - - npmci npm prepare - npmci node install stable - npmci npm install - - npmci command npm run build + - npmci npm build coverage: /\d+.?\d+?\%\s*coverage/ tags: - docker @@ -100,10 +90,9 @@ codequality: only: - tags script: - - npmci command npm install -g tslint typescript + - npmci command npm install -g typescript - npmci npm prepare - npmci npm install - - npmci command "tslint -c tslint.json ./ts/**/*.ts" tags: - lossless - docker @@ -123,11 +112,9 @@ trigger: pages: stage: metadata script: - - npmci node install lts - - npmci command npm install -g @gitzone/tsdoc - - npmci npm prepare + - npmci node install stable - npmci npm install - - npmci command tsdoc + - npmci command npm run buildDocs tags: - lossless - docker diff --git a/.vscode/settings.json b/.vscode/settings.json index 2868e45..3648eaa 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -22,6 +22,5 @@ } } } - ], - "typescript.tsdk": "node_modules/typescript/lib" + ] } diff --git a/package.json b/package.json index 8ab299d..b3734a5 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "type": "module", "scripts": { "test": "(tstest test/)", - "build": "(tsbuild --web --allowimplicitany && 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", @@ -58,4 +59,4 @@ "browserslist": [ "last 1 chrome versions" ] -} +} \ No newline at end of file diff --git a/readme.md b/readme.md index cc5617b..0eb48b6 100644 --- a/readme.md +++ b/readme.md @@ -21,7 +21,6 @@ Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](htt PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartsocket)](https://lossless.cloud) PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartsocket)](https://lossless.cloud) BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/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) diff --git a/test/test.expressserver.ts b/test/test.expressserver.ts index 9213b65..09e800d 100644 --- a/test/test.expressserver.ts +++ b/test/test.expressserver.ts @@ -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({ diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index e31bfb5..2502ae3 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@pushrocks/smartsocket', - version: '2.0.9', + version: '2.0.10', description: 'easy and secure websocket communication' } diff --git a/ts/smartsocket.classes.smartsocket.ts b/ts/smartsocket.classes.smartsocket.ts index 8898efc..9fed0f5 100644 --- a/ts/smartsocket.classes.smartsocket.ts +++ b/ts/smartsocket.classes.smartsocket.ts @@ -61,7 +61,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(); } }); diff --git a/ts/smartsocket.classes.socketconnection.ts b/ts/smartsocket.classes.socketconnection.ts index 4c3995a..16eb789 100644 --- a/ts/smartsocket.classes.socketconnection.ts +++ b/ts/smartsocket.classes.socketconnection.ts @@ -161,11 +161,10 @@ export class SocketConnection { this.socket.on('function', (dataArg: ISocketRequestDataObject) => { // check if requested function is available to the socket's scope // logger.log('info', 'function request received'); - const referencedFunction: SocketFunction = this.smartsocketRef.socketFunctions.findSync( - (socketFunctionArg) => { + const referencedFunction: SocketFunction = + 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} on side ${this.side}`); + 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'; diff --git a/ts/smartsocket.classes.socketserver.ts b/ts/smartsocket.classes.socketserver.ts index 53f68a2..fbf2bf9 100644 --- a/ts/smartsocket.classes.socketserver.ts +++ b/ts/smartsocket.classes.socketserver.ts @@ -13,7 +13,7 @@ export class SocketServer { private smartsocket: Smartsocket; private httpServerDeferred: plugins.smartpromise.Deferred; private httpServer: pluginsTyped.http.Server | pluginsTyped.https.Server; - + /** * wether httpServer is standalone */ diff --git a/ts/smartsocket.pluginstyped.ts b/ts/smartsocket.pluginstyped.ts index 79359b7..fcd884d 100644 --- a/ts/smartsocket.pluginstyped.ts +++ b/ts/smartsocket.pluginstyped.ts @@ -10,7 +10,7 @@ import type * as smartexpress from '@pushrocks/smartexpress'; export { smartexpress }; // third party scope -import type { Socket as ServerSocket, Server as ServerServer} 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 namespace socketIo {