@midwayjs/core 3.0.0-beta.14 → 3.0.0-beta.15

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07)
+
+
+### Bug Fixes
+
+* serverless app run ([#1523](https://github.com/midwayjs/midway/issues/1523)) ([5a25eb7](https://github.com/midwayjs/midway/commit/5a25eb7ebb17bf9b0e2ba4feee5bc1649f70d56f))
+
+
+### Features
+
+* add data listener ([#1525](https://github.com/midwayjs/midway/issues/1525)) ([0bd0db8](https://github.com/midwayjs/midway/commit/0bd0db8c7f3338c754ae852619bbbb4f2336cc16))
+* add secret filter ([#1531](https://github.com/midwayjs/midway/issues/1531)) ([ce77e48](https://github.com/midwayjs/midway/commit/ce77e4804aaffc18a0a091d3726e36d7ec1514b2))
+
+
+
+
+
 # [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04)
 
 

package/dist/common/dataListener.d.ts

@@ -0,0 +1,11 @@
+export declare abstract class DataListener<T> {
+    private innerData;
+    protected init(): Promise<void>;
+    abstract initData(): T;
+    abstract onData(callback: (data: T) => void): any;
+    protected setData(data: T): void;
+    getData(): T;
+    stop(): Promise<void>;
+    protected destroyListener(): Promise<void>;
+}
+//# sourceMappingURL=dataListener.d.ts.map

package/dist/common/dataListener.js

@@ -0,0 +1,43 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataListener = void 0;
+const decorator_1 = require("@midwayjs/decorator");
+class DataListener {
+    async init() {
+        this.innerData = await this.initData();
+        await this.onData(this.setData.bind(this));
+    }
+    setData(data) {
+        this.innerData = data;
+    }
+    getData() {
+        return this.innerData;
+    }
+    async stop() {
+        await this.destroyListener();
+    }
+    async destroyListener() { }
+}
+__decorate([
+    (0, decorator_1.Init)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], DataListener.prototype, "init", null);
+__decorate([
+    (0, decorator_1.Destroy)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], DataListener.prototype, "stop", null);
+exports.DataListener = DataListener;
+//# sourceMappingURL=dataListener.js.map

package/dist/error/http.d.ts

@@ -109,7 +109,7 @@ export declare class PayloadTooLargeError extends MidwayHttpError {
 export declare class UnsupportedMediaTypeError extends MidwayHttpError {
     constructor(resOrMessage?: ResOrMessage);
 }
-export declare class UnprocessableError extends MidwayHttpError {
+export declare class UnprocessableEntityError extends MidwayHttpError {
     constructor(resOrMessage?: ResOrMessage);
 }
 /**
@@ -121,7 +121,7 @@ export declare class InternalServerErrorError extends MidwayHttpError {
 /**
  * 501 http error, Means that the server doesn't recognize the request method or it lacks the ability to fulfill the request.
  */
-declare class NotImplementedError extends MidwayHttpError {
+export declare class NotImplementedError extends MidwayHttpError {
     constructor(resOrMessage?: ResOrMessage);
 }
 /**
@@ -153,12 +153,11 @@ export declare const httpError: {
     GoneError: typeof GoneError;
     PayloadTooLargeError: typeof PayloadTooLargeError;
     UnsupportedMediaTypeError: typeof UnsupportedMediaTypeError;
-    UnprocessableError: typeof UnprocessableError;
+    UnprocessableEntityError: typeof UnprocessableEntityError;
     InternalServerErrorError: typeof InternalServerErrorError;
     NotImplementedError: typeof NotImplementedError;
     BadGatewayError: typeof BadGatewayError;
     ServiceUnavailableError: typeof ServiceUnavailableError;
     GatewayTimeoutError: typeof GatewayTimeoutError;
 };
-export {};
 //# sourceMappingURL=http.d.ts.map

package/dist/error/http.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.httpError = exports.GatewayTimeoutError = exports.ServiceUnavailableError = exports.BadGatewayError = exports.InternalServerErrorError = exports.UnprocessableError = exports.UnsupportedMediaTypeError = exports.PayloadTooLargeError = exports.GoneError = exports.ConflictError = exports.RequestTimeoutError = exports.NotAcceptableError = exports.ForbiddenError = exports.NotFoundError = exports.UnauthorizedError = exports.BadRequestError = exports.HttpStatus = void 0;
+exports.httpError = exports.GatewayTimeoutError = exports.ServiceUnavailableError = exports.BadGatewayError = exports.NotImplementedError = exports.InternalServerErrorError = exports.UnprocessableEntityError = exports.UnsupportedMediaTypeError = exports.PayloadTooLargeError = exports.GoneError = exports.ConflictError = exports.RequestTimeoutError = exports.NotAcceptableError = exports.ForbiddenError = exports.NotFoundError = exports.UnauthorizedError = exports.BadRequestError = exports.HttpStatus = void 0;
 const base_1 = require("./base");
 var HttpStatus;
 (function (HttpStatus) {
@@ -143,12 +143,12 @@ class UnsupportedMediaTypeError extends base_1.MidwayHttpError {
     }
 }
 exports.UnsupportedMediaTypeError = UnsupportedMediaTypeError;
-class UnprocessableError extends base_1.MidwayHttpError {
+class UnprocessableEntityError extends base_1.MidwayHttpError {
     constructor(resOrMessage = 'Unprocessable Entity') {
         super(resOrMessage, HttpStatus.UNPROCESSABLE_ENTITY);
     }
 }
-exports.UnprocessableError = UnprocessableError;
+exports.UnprocessableEntityError = UnprocessableEntityError;
 /**
  * 500 http error, Is a generic error and users receive this error message when there is no more suitable specific message.
  */
@@ -166,6 +166,7 @@ class NotImplementedError extends base_1.MidwayHttpError {
         super(resOrMessage, HttpStatus.NOT_IMPLEMENTED);
     }
 }
+exports.NotImplementedError = NotImplementedError;
 /**
  * 502 http error, Means that the server was acting as a gateway or proxy and it received an invalid answer from the upstream server.
  */
@@ -204,7 +205,7 @@ exports.httpError = {
     GoneError,
     PayloadTooLargeError,
     UnsupportedMediaTypeError,
-    UnprocessableError,
+    UnprocessableEntityError,
     InternalServerErrorError,
     NotImplementedError,
     BadGatewayError,

package/dist/error/index.d.ts

@@ -1,4 +1,4 @@
 export * from './base';
-export * from './http';
+export { HttpStatus, httpError } from './http';
 export * from './framework';
 //# sourceMappingURL=index.d.ts.map

package/dist/error/index.js

@@ -10,7 +10,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.httpError = exports.HttpStatus = void 0;
 __exportStar(require("./base"), exports);
-__exportStar(require("./http"), exports);
+var http_1 = require("./http");
+Object.defineProperty(exports, "HttpStatus", { enumerable: true, get: function () { return http_1.HttpStatus; } });
+Object.defineProperty(exports, "httpError", { enumerable: true, get: function () { return http_1.httpError; } });
 __exportStar(require("./framework"), exports);
 //# sourceMappingURL=index.js.map

package/dist/functional/configuration.d.ts

@@ -4,10 +4,12 @@ export declare class FunctionalConfiguration {
     private readyHandler;
     private stopHandler;
     private configLoadHandler;
+    private serverReadyHandler;
     private options;
     constructor(options: InjectionConfigurationOptions);
     onConfigLoad(configLoadHandler: ((container: IMidwayContainer, app: IMidwayApplication) => any) | IMidwayContainer, app?: IMidwayApplication): any;
     onReady(readyHandler: ((container: IMidwayContainer, app: IMidwayApplication) => void) | IMidwayContainer, app?: IMidwayApplication): any;
+    onServerReady(serverReadyHandler: ((container: IMidwayContainer, app: IMidwayApplication) => void) | IMidwayContainer, app?: IMidwayApplication): any;
     onStop(stopHandler: ((container: IMidwayContainer, app: IMidwayApplication) => void) | IMidwayContainer, app?: IMidwayApplication): any;
     getConfigurationOptions(): InjectionConfigurationOptions;
 }

package/dist/functional/configuration.js

@@ -7,6 +7,7 @@ class FunctionalConfiguration {
         this.readyHandler = () => { };
         this.stopHandler = () => { };
         this.configLoadHandler = () => { };
+        this.serverReadyHandler = () => { };
     }
     onConfigLoad(configLoadHandler, app) {
         if (typeof configLoadHandler === 'function') {
@@ -26,6 +27,15 @@ class FunctionalConfiguration {
         }
         return this;
     }
+    onServerReady(serverReadyHandler, app) {
+        if (typeof serverReadyHandler === 'function') {
+            this.serverReadyHandler = serverReadyHandler;
+        }
+        else {
+            return this.serverReadyHandler(serverReadyHandler, app);
+        }
+        return this;
+    }
     onStop(stopHandler, app) {
         if (typeof stopHandler === 'function') {
             this.stopHandler = stopHandler;

package/dist/index.d.ts

@@ -22,6 +22,7 @@ export { MidwayDecoratorService } from './service/decoratorService';
 export * from './service/pipelineService';
 export * from './util/contextUtil';
 export * from './common/serviceFactory';
+export * from './common/dataListener';
 export * from './common/fileDetector';
 export * from './common/webGenerator';
 export * from './common/middlewareManager';

package/dist/index.js

@@ -56,6 +56,7 @@ Object.defineProperty(exports, "MidwayDecoratorService", { enumerable: true, get
 __exportStar(require("./service/pipelineService"), exports);
 __exportStar(require("./util/contextUtil"), exports);
 __exportStar(require("./common/serviceFactory"), exports);
+__exportStar(require("./common/dataListener"), exports);
 __exportStar(require("./common/fileDetector"), exports);
 __exportStar(require("./common/webGenerator"), exports);
 __exportStar(require("./common/middlewareManager"), exports);

package/dist/interface.d.ts

@@ -468,10 +468,5 @@ export interface MidwayAppInfo {
 export interface MidwayConfig extends FileConfigOption<typeof _default> {
     [customConfigKey: string]: unknown;
 }
-export interface TranslateOptions {
-    lang?: string;
-    group?: string;
-    args?: any;
-}
 export {};
 //# sourceMappingURL=interface.d.ts.map

package/dist/service/configService.d.ts

@@ -1,4 +1,4 @@
-import { IConfigService } from '../interface';
+import { IConfigService, MidwayAppInfo } from '../interface';
 import { MidwayEnvironmentService } from './environmentService';
 import { MidwayInformationService } from './informationService';
 export declare class MidwayConfigService implements IConfigService {
@@ -7,8 +7,10 @@ export declare class MidwayConfigService implements IConfigService {
     protected configuration: any;
     protected isReady: boolean;
     protected externalObject: Record<string, unknown>[];
+    protected appInfo: MidwayAppInfo;
     protected environmentService: MidwayEnvironmentService;
     protected informationService: MidwayInformationService;
+    protected init(): Promise<void>;
     add(configFilePaths: any[]): void;
     addObject(obj: Record<string, unknown>): void;
     private getEnvSet;

package/dist/service/configService.js

@@ -29,6 +29,17 @@ let MidwayConfigService = class MidwayConfigService {
         this.isReady = false;
         this.externalObject = [];
     }
+    async init() {
+        this.appInfo = {
+            pkg: this.informationService.getPkg(),
+            name: this.informationService.getProjectName(),
+            baseDir: this.informationService.getBaseDir(),
+            appDir: this.informationService.getAppDir(),
+            HOME: this.informationService.getHome(),
+            root: this.informationService.getRoot(),
+            env: this.environmentService.getCurrentEnvironment(),
+        };
+    }
     add(configFilePaths) {
         for (const dir of configFilePaths) {
             if (typeof dir === 'string') {
@@ -98,18 +109,7 @@ let MidwayConfigService = class MidwayConfigService {
             let config = await this.loadConfig(filename);
             if ((0, decorator_1.isFunction)(config)) {
                 // eslint-disable-next-line prefer-spread
-                config = config.apply(null, [
-                    {
-                        pkg: this.informationService.getPkg(),
-                        name: this.informationService.getProjectName(),
-                        baseDir: this.informationService.getBaseDir(),
-                        appDir: this.informationService.getAppDir(),
-                        HOME: this.informationService.getHome(),
-                        root: this.informationService.getRoot(),
-                        env: this.environmentService.getCurrentEnvironment(),
-                    },
-                    target,
-                ]);
+                config = config.apply(null, [this.appInfo, target]);
             }
             if (!config) {
                 continue;
@@ -160,6 +160,12 @@ __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", informationService_1.MidwayInformationService)
 ], MidwayConfigService.prototype, "informationService", void 0);
+__decorate([
+    (0, decorator_1.Init)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], MidwayConfigService.prototype, "init", null);
 MidwayConfigService = __decorate([
     (0, decorator_1.Provide)(),
     (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton)

package/dist/service/environmentService.d.ts

@@ -1,6 +1,6 @@
 import { IEnvironmentService } from '../interface';
 export declare class MidwayEnvironmentService implements IEnvironmentService {
-    environment: string;
+    protected environment: string;
     getCurrentEnvironment(): string;
     setCurrentEnvironment(environment: string): void;
     isDevelopmentEnvironment(): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.0-beta.14",
+  "version": "3.0.0-beta.15",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.14",
+    "@midwayjs/decorator": "^3.0.0-beta.15",
     "koa": "2.13.4",
     "midway-test-component": "*",
     "mm": "3.2.0",
@@ -35,7 +35,7 @@
     "@midwayjs/logger": "2.14.0",
     "class-transformer": "^0.5.1",
     "extend2": "^1.0.0",
-    "picomatch": "^2.3.0"
+    "picomatch": "2.3.1"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "95695ada36190cf376e93a1a8866b3fb6dde06bc"
+  "gitHead": "6b9778557289d9e8b562c7ce6127736db1248973"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013 - Now midwayjs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.