@lad-tech/nsc-toolkit 0.7.1 → 1.0.0

package/.github/workflows/publish-package-to-npmjs.yml

@@ -1,18 +1,30 @@
 name: Publish Package to npmjs
 on:
-  release:
-    types: [ published ]
+  push:
+    branches: [ main ]
+env:
+  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [ 18.x ]
+
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: '16.x'
+          node-version: ${{ matrix.node-version }}
+          cache: 'npm'
           registry-url: 'https://registry.npmjs.org'
       - run: npm i
       - run: npm run build
-      - run: npm publish --access public
+      - run: npx semantic-release
         env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+

package/.releaserc

@@ -0,0 +1,12 @@
+branches:
+  - main
+
+debug: true
+ci: true
+dryRun: false
+plugins:
+  - "@semantic-release/commit-analyzer"
+  - "@semantic-release/changelog"
+  - "@semantic-release/release-notes-generator"
+  - "@semantic-release/github"
+  - "@semantic-release/npm"

package/CHANGELOG.md

@@ -0,0 +1,22 @@
+# 1.0.0 (2022-12-05)
+
+
+### Bug Fixes
+
+* remove eslint jest rules ([37cd3dc](https://github.com/lad-tech/nsc-toolkit/commit/37cd3dc15a3912b0080b2b99d774421e2db7f40e))
+* transfer logger formatter ([6722a21](https://github.com/lad-tech/nsc-toolkit/commit/6722a21320a7984537813833002b713e6036bfaa))
+* version up ([927db66](https://github.com/lad-tech/nsc-toolkit/commit/927db66bb70e4db92aa18f656143f2a619c5dc6d))
+* version up ([d3fb4e0](https://github.com/lad-tech/nsc-toolkit/commit/d3fb4e0904a28639756e71c00058a6a04d1660a1))
+* version up ([53be760](https://github.com/lad-tech/nsc-toolkit/commit/53be760f06c26f9fb418486aa75f6d145d98e089))
+* исправлен пайплайн ci ([068c306](https://github.com/lad-tech/nsc-toolkit/commit/068c30636324f29ddcf68044ac9b8927c7f4fee3))
+* Исправлен тип метода handler класса Method [#3](https://github.com/lad-tech/nsc-toolkit/issues/3) ([b577644](https://github.com/lad-tech/nsc-toolkit/commit/b577644dfb5afc7f7d404e38d87956bf40033779))
+* Исправлена работа с кешем ([4a2d9fd](https://github.com/lad-tech/nsc-toolkit/commit/4a2d9fdadf2cf95590c2474e192c611f55e32926))
+* Исправленна передача форматтера логов ([d23fb2f](https://github.com/lad-tech/nsc-toolkit/commit/d23fb2fdc29a5876796961f486e961271bbed0c5))
+
+
+### Features
+
+* build lib ([522e2c7](https://github.com/lad-tech/nsc-toolkit/commit/522e2c736d4a6f4799ef84ec4fea86abcbbe15e6))
+* В клиенте используется форматтер логов из сервиса ([3bf51fe](https://github.com/lad-tech/nsc-toolkit/commit/3bf51fe2115136cd8f7cac630a81f273fde02d19))
+* Добавлен semantic-release ([80f64b9](https://github.com/lad-tech/nsc-toolkit/commit/80f64b929cdaa660d4cee555acb7eefc12e91c0c))
+* Добавлена возможность добавить свой форматтер для логов [#5](https://github.com/lad-tech/nsc-toolkit/issues/5) ([f81427f](https://github.com/lad-tech/nsc-toolkit/commit/f81427fa0edcbc7624adc8bde81c554341d807aa))

package/commitlint.config.js

@@ -0,0 +1,19 @@
+module.exports = {
+  extends: ['@commitlint/config-conventional'],
+  rules: {
+    'header-max-length': [1, 'always', 120],
+    'type-enum': [
+      1,
+      'always',
+      ['docs', 'style', 'ci', 'debug', 'refactor', 'perf', 'fix', 'test', 'chore', 'build', 'revert', 'feat'],
+    ],
+    // tslint:disable-next-line:object-literal-sort-keys
+    'type-case': [1, 'always', 'lower-case'],
+    'type-empty': [1, 'never'],
+    'subject-case': [0, 'always', 'lower-case'],
+    'scope-case': [1, 'always', 'lower-case'],
+    'body-leading-blank': [1, 'always'],
+    'footer-leading-blank': [1, 'always'],
+  },
+};
+

package/dist/Root.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Root = void 0;
-const opentelemetry = require("@opentelemetry/api");
 const toolbelt_1 = require("@lad-tech/toolbelt");
+const opentelemetry = require("@opentelemetry/api");
 class Root {
     constructor(brocker, outputFormatter) {
         this.brocker = brocker;

package/dist/Root.js.map

@@ -1 +1 @@
-{"version":3,"file":"Root.js","sourceRoot":"","sources":["../src/Root.ts"],"names":[],"mappings":";;;AACA,oDAAoD;AAEpD,iDAA0C;AAE1C,MAAa,IAAI;IAKf,YACY,OAAuB,EACjC,eAAsC;QAD5B,YAAO,GAAP,OAAO,CAAgB;QALzB,0CAAqC,GAAG,mBAAmB,CAAC;QAC5D,sBAAiB,GAAG,OAAO,CAAC;QAOpC,IAAI,CAAC,MAAM,GAAG,IAAI,eAAI,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;IACrD,CAAC;IAES,YAAY,CAAC,KAAc;QACnC,MAAM,MAAM,GAAG,CAAC,KAAM,CAAC;QACvB,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,gCAAgC,KAAK,UAAU,CAAC,CAAC;SAClE;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAES,iBAAiB,CAAC,IAAY,EAAE,QAAQ,GAAG,IAAI;QACvD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,KAAK,IAAI,QAAQ,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,0CAA0C,IAAI,EAAE,CAAC,CAAC;SACnE;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACO,UAAU,CAAC,OAAiB;QACpC,IAAI,OAAO,EAAE;YACX,OAAO,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;SACpF;IACH,CAAC;IAES,UAAU,CAAC,OAAgB,EAAE,UAAmB;QACxD,IAAI;YACF,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,OAAO,GAAG,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAC,CAAC;gBACnG,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,GAAG,IAAI,CAAC;aACpC;YACD,OAAO,OAAO,CAAC;SAChB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;IAES,iBAAiB,CAAC,KAAqB,EAAE,IAAa;QAC9D,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,KAAK,YAAY,KAAK,EAAE;YAC1B,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;SACzB;aAAM;YACL,OAAO,GAAG,KAAK,CAAC;SACjB;QACD,OAAO;YACL,OAAO,EAAE,IAAI;YACb,KAAK,EAAE;gBACL,OAAO;gBACP,IAAI;aACL;SACF,CAAC;IACJ,CAAC;CACF;AAjED,oBAiEC"}
+{"version":3,"file":"Root.js","sourceRoot":"","sources":["../src/Root.ts"],"names":[],"mappings":";;;AAAA,iDAA0C;AAC1C,oDAAoD;AAIpD,MAAa,IAAI;IAKf,YAAsB,OAAuB,EAAE,eAAsC;QAA/D,YAAO,GAAP,OAAO,CAAgB;QAJnC,0CAAqC,GAAG,mBAAmB,CAAC;QAC5D,sBAAiB,GAAG,OAAO,CAAC;QAIpC,IAAI,CAAC,MAAM,GAAG,IAAI,eAAI,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;IACrD,CAAC;IAES,YAAY,CAAC,KAAc;QACnC,MAAM,MAAM,GAAG,CAAC,KAAM,CAAC;QACvB,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,gCAAgC,KAAK,UAAU,CAAC,CAAC;SAClE;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAES,iBAAiB,CAAC,IAAY,EAAE,QAAQ,GAAG,IAAI;QACvD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,KAAK,IAAI,QAAQ,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,0CAA0C,IAAI,EAAE,CAAC,CAAC;SACnE;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACO,UAAU,CAAC,OAAiB;QACpC,IAAI,OAAO,EAAE;YACX,OAAO,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;SACpF;IACH,CAAC;IAES,UAAU,CAAC,OAAgB,EAAE,UAAmB;QACxD,IAAI;YACF,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,OAAO,GAAG,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAC,CAAC;gBACnG,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,GAAG,IAAI,CAAC;aACpC;YACD,OAAO,OAAO,CAAC;SAChB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;IAES,iBAAiB,CAAC,KAAqB,EAAE,IAAa;QAC9D,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,KAAK,YAAY,KAAK,EAAE;YAC1B,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;SACzB;aAAM;YACL,OAAO,GAAG,KAAK,CAAC;SACjB;QACD,OAAO;YACL,OAAO,EAAE,IAAI;YACb,KAAK,EAAE;gBACL,OAAO;gBACP,IAAI;aACL;SACF,CAAC;IACJ,CAAC;CACF;AA9DD,oBA8DC"}

package/dist/types/Root.d.ts

@@ -1,7 +1,7 @@
-import { Baggage } from './interfaces';
+import { Logs } from '@lad-tech/toolbelt';
 import * as opentelemetry from '@opentelemetry/api';
 import { NatsConnection } from 'nats';
-import { Logs } from '@lad-tech/toolbelt';
+import { Baggage } from './interfaces';
 export declare class Root {
     protected brocker: NatsConnection;
     protected SERVICE_SUBJECT_FOR_GET_HTTP_SETTINGS: string;

package/lefthook.yml

@@ -0,0 +1,15 @@
+pre-commit:
+  parallel: true
+  commands:
+    eslint:
+      glob: "*.{js,ts,jsx,tsx}"
+      run: npx eslint --fix {staged_files}
+    types:
+      glob: "*.{ts, tsx}"
+      run: npx tsc  --noEmit  {staged_files}
+commit-msg:
+  parallel: true
+  commands:
+    commitlint:
+      run: npx commitlint --edit
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lad-tech/nsc-toolkit",
-  "version": "0.7.1",
+  "version": "1.0.0",
   "description": "Toolkit for create microservices around NATS",
   "main": "dist/index.js",
   "types": "./dist/types/index.d.ts",
@@ -14,6 +14,10 @@
   "devDependencies": {
     "@types/node": "^17.0.42",
     "@typescript-eslint/eslint-plugin": "^5.43.0",
+    "@semantic-release/changelog": "^6.0.2",
+    "@semantic-release/npm": "^9.0.1",
+    "@commitlint/cli": "^17.2.0",
+    "@commitlint/config-conventional": "^17.2.0",
     "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.5.0",
@@ -24,6 +28,8 @@
     "prettier": "^2.6.1",
     "prettier-eslint": "^13.0.0",
     "ts-jest": "^27.1.4",
+    "lefthook": "^1.2.0",
+    "semantic-release": "^19.0.5",
     "typescript": "^4.6.3"
   },
   "dependencies": {

package/examples/HttpGate/index.ts

@@ -1,61 +0,0 @@
-import { connect } from 'nats';
-import LogicService, { WeirdSumRequest } from '../LogicService';
-import { Service } from '../../src/Service';
-import { SimpleCache } from '../SimpleCache';
-import { Logs } from '@lad-tech/toolbelt';
-import Fastify from 'fastify';
-import { Baggage, ExternalBaggage } from '../../src/interfaces';
-
-declare module 'fastify' {
-  interface FastifyRequest {
-    baggage: Baggage;
-  }
-}
-
-const HTTP_SERVICE_PORT = 8000;
-const logger = new Logs.Logger({ location: 'HttpGate' });
-
-const upHttpGate = async (service: Service) => {
-  const fastify = Fastify();
-
-  fastify.decorateRequest('baggage', null);
-
-  fastify.addHook<{ Headers: ExternalBaggage }>('preHandler', (request, reply, done) => {
-    request.baggage = service.getRootBaggage(request.routerPath, request.headers);
-    reply.header('trace-id', request.baggage.traceId);
-    done();
-  });
-
-  fastify.addHook<{ Headers: ExternalBaggage }>('onResponse', (request, reply, done) => {
-    service.endRootSpan(request.baggage.traceId);
-    done();
-  });
-
-  fastify.post<{ Body: WeirdSumRequest }>('/math/weird/sum', async request => {
-    return await service.buildService(LogicService, request.baggage).weirdSum(request.body);
-  });
-
-  await fastify.listen({ port: HTTP_SERVICE_PORT });
-};
-
-const start = async () => {
-  try {
-    const brokerConnection = await connect({ servers: ['localhost:4222'] });
-    const service = new Service({
-      brokerConnection,
-      name: 'HttpGate',
-      methods: [],
-      events: [],
-      cache: { service: new SimpleCache(), timeout: 100 },
-    });
-
-    await service.start();
-    await upHttpGate(service);
-    logger.info('Http server start on port:', HTTP_SERVICE_PORT);
-  } catch (error) {
-    logger.error(error);
-    process.exit(1);
-  }
-};
-
-start();