fix: merge router to validator branch

microfleet · Nov 22, 2020 · bfb9258 · bfb9258
1 parent c05d1d9
commit bfb9258
Show file tree

Hide file tree

Showing 175 changed files with 3,947 additions and 4,493 deletions.
diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
     "@typescript-eslint/parser": "^4.7.0",
     "conventional-changelog-cli": "^2.1.1",
     "cross-env": "^7.0.2",
+    "denque": "^1.4.1",
     "eslint": "^7.13.0",
     "jest": "26.6.3",
     "lerna": "^3.22.1",

diff --git a/packages/core-types/index.d.ts b/packages/core-types/index.d.ts
@@ -5,7 +5,6 @@ import type {
   ActionTransport,
   CONNECTORS_PROPERTY,
   ConnectorsTypes,
-  DATA_KEY_SELECTOR,
   DESTRUCTORS_PROPERTY,
   PLUGIN_STATUS_FAIL,
   PLUGIN_STATUS_OK,
@@ -119,52 +118,6 @@ export type MserviceError = Error & {
   toJSON(): any;
 }
 
-export interface AuthConfig {
-  name: string;
-  passAuthError: boolean;
-  strategy: string;
-}
-
 export type HandlerProperties = typeof CONNECTORS_PROPERTY | typeof DESTRUCTORS_PROPERTY
-export type TransportTypes = $Values<typeof ActionTransport>
 export type ConnectorsTypes = $Values<typeof ConnectorsTypes>
-export type RequestMethods = $Keys<typeof DATA_KEY_SELECTOR>
-export type GetAuthName = (req: ServiceRequest) => string
-export type ServiceActionStep = (...args: any[]) => PromiseLike<any>
-
-export declare interface ServiceAction extends ServiceActionStep {
-  allowed?: () => boolean | Promise<boolean>;
-  auth?: string | GetAuthName | AuthConfig;
-  passAuthError?: boolean;
-  schema?: string | null | boolean;
-  responseSchema?: string;
-  validateResponse: boolean;
-  transports: TransportTypes[];
-  actionName: string;
-  readonly?: boolean;
-}
-
-export interface ServiceRequest {
-  route: string;
-  params: any;
-  headers: any;
-  query: any;
-  method: RequestMethods;
-  transport: TransportTypes;
-  transportRequest: any | ClientRequest;
-  action: ServiceAction;
-  locals: any;
-  auth?: any;
-  parentSpan: any;
-  span: any;
-  log: {
-    trace(...args: any[]): void;
-    debug(...args: any[]): void;
-    info(...args: any[]): void;
-    warn(...args: any[]): void;
-    error(...args: any[]): void;
-    fatal(...args: any[]): void;
-  };
-}
-
 export type PluginStatus = typeof PLUGIN_STATUS_OK | typeof PLUGIN_STATUS_FAIL
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -6,8 +6,7 @@
   "version": "17.5.3",
   "scripts": {
     "lint": "eslint ./src",
-    "test": "yarn test:unit && yarn test:e2e",
-    "test:unit": "TS_NODE_TRANSPILE_ONLY=true mocha ./src/**/*.spec.?s",
+    "test": "yarn test:e2e",
     "test:e2e": "mdep test run",
     "compile": "tsc -b ./tsconfig.build.json",
     "prepublishOnly": "cp ../../README.md ./README.md",

diff --git a/packages/core/schemas/router.auth.json b/packages/core/schemas/router.auth.json
diff --git a/packages/core/schemas/router.extensions.json b/packages/core/schemas/router.extensions.json
diff --git a/packages/core/schemas/router.json b/packages/core/schemas/router.json
diff --git a/packages/core/schemas/router.routes.json b/packages/core/schemas/router.routes.json
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -43,7 +43,6 @@ export {
   PLUGIN_STATUS_FAIL,
   PluginTypes,
   PluginsPriority,
-  ActionTransport,
   ConnectorsTypes,
   ConnectorsPriority
 } from '@microfleet/utils'

diff --git a/packages/core/src/plugins/prometheus.ts b/packages/core/src/plugins/prometheus.ts
@@ -7,6 +7,7 @@ import semver = require('semver')
 import Bluebird = require('bluebird')
 import prometheus = require('prom-client')
 
+// @todo plugin-router refactoring
 const usageError = `
 if "prometheus" and "router" plugins are used together - you have to  manually configure router handlers: