From f541290f474e6b85c744f7a96fb3591d1f719607 Mon Sep 17 00:00:00 2001 From: MiaoWoo Date: Sat, 29 Jun 2019 17:02:30 +0800 Subject: [PATCH] feat: format and rebuild Signed-off-by: MiaoWoo --- packages/binding/src/activation.ts | 4 ++-- packages/binding/src/decorators.ts | 2 +- packages/binding/src/utils.ts | 2 +- packages/core/src/function/websocket.ts | 2 +- packages/db-mongo/src/client/connection.ts | 21 ++++++--------------- packages/db-mongo/src/client/index.ts | 19 +++++++++---------- packages/db-mongo/src/index.ts | 4 ++-- packages/ws/package.json | 1 + packages/ws/src/builder.ts | 12 ++++-------- packages/ws/src/decorators.ts | 9 ++------- packages/ws/src/index.ts | 5 ++--- packages/ws/src/utils.ts | 9 ++------- 12 files changed, 33 insertions(+), 57 deletions(-) diff --git a/packages/binding/src/activation.ts b/packages/binding/src/activation.ts index eda1ae3..a09b5c8 100644 --- a/packages/binding/src/activation.ts +++ b/packages/binding/src/activation.ts @@ -1,7 +1,7 @@ +import { VaildError } from './interfaces' +import { METADATA_KEY } from './constants' import { Container, interfaces as inversify_interfaces } from 'inversify' import { TYPE, interfaces as express_interfaces } from 'inversify-express-utils' -import { METADATA_KEY } from './constants' -import { VaildError } from './interfaces' import { getVaildMethodMetadata, getVaildControllerMetadata, getVaildModelMetadata } from './utils' let handler = { diff --git a/packages/binding/src/decorators.ts b/packages/binding/src/decorators.ts index db66545..c4fa6c8 100644 --- a/packages/binding/src/decorators.ts +++ b/packages/binding/src/decorators.ts @@ -1,7 +1,7 @@ import 'reflect-metadata' import { METADATA_KEY, VAILD_TYPE } from './constants'; -import { getVaildControllerMetadata, getVaildModelMetadata } from './utils' import { VaildFunction, interfaces } from './interfaces' +import { getVaildControllerMetadata, getVaildModelMetadata } from './utils' /** * ParameterVaild */ diff --git a/packages/binding/src/utils.ts b/packages/binding/src/utils.ts index acb672d..3bef41a 100644 --- a/packages/binding/src/utils.ts +++ b/packages/binding/src/utils.ts @@ -1,5 +1,5 @@ -import { METADATA_KEY } from './constants' import { interfaces } from './interfaces' +import { METADATA_KEY } from './constants' function getVaildControllerMetadata(model: Object) { let controllerMetadata: interfaces.MethodMetadata = Reflect.getMetadata( diff --git a/packages/core/src/function/websocket.ts b/packages/core/src/function/websocket.ts index 1d1ca3e..f3e8b44 100644 --- a/packages/core/src/function/websocket.ts +++ b/packages/core/src/function/websocket.ts @@ -1,6 +1,6 @@ +import { lazyInjectNamed } from '@cc-server/ioc' import { controller, httpPost, requestBody } from '@cc-server/binding'; import { namespace, listener, interfaces, io, TYPE } from '@cc-server/ws' -import { lazyInjectNamed } from '@cc-server/ioc' @namespace('/', (socket: io.Socket, next: (err?: any) => void) => { console.log(socket.nsp.name, socket.id, 'before connection'); diff --git a/packages/db-mongo/src/client/connection.ts b/packages/db-mongo/src/client/connection.ts index 6f38781..74ae7f9 100644 --- a/packages/db-mongo/src/client/connection.ts +++ b/packages/db-mongo/src/client/connection.ts @@ -4,24 +4,15 @@ const connStr = process.env.FAAS_MONGO_URL || 'mongodb://192.168.0.2:27017'; const dbName = process.env.FAAS_MONGO_DB || "faas"; export class MongoDBConnection { - private static isConnected: boolean = false; private static db: Db; - public static getConnection(result: (connection: Db) => void) { - if (this.isConnected) { - return result(this.db); - } else { - this.connect((error: Error, db: Db) => { - return result(this.db); - }); - } + public static async getConnection(): Promise { + if (!this.db) { this.db = await this.connect() } + return this.db; } - private static connect(result: (error: Error, db: Db) => void) { - MongoClient.connect(connStr, { useNewUrlParser: true }, (err, client) => { - this.db = client.db(dbName); - this.isConnected = true; - return result(err, this.db); - }); + private static async connect(): Promise { + let client = await MongoClient.connect(connStr, { useNewUrlParser: true }); + return client.db(dbName); } } diff --git a/packages/db-mongo/src/client/index.ts b/packages/db-mongo/src/client/index.ts index ad666f0..47089c2 100644 --- a/packages/db-mongo/src/client/index.ts +++ b/packages/db-mongo/src/client/index.ts @@ -1,7 +1,7 @@ -import { Db, ObjectID, Collection } from 'mongodb'; -import { MongoDBConnection } from './connection'; -import { provide } from '@cc-server/ioc' import { DBClient } from '@cc-server/db' +import { MongoDBConnection } from './connection' +import { Db, ObjectID, Collection } from 'mongodb' +import { provide, postConstruct } from '@cc-server/ioc' @provide(DBClient) export class MongoDBClient implements DBClient { @@ -9,13 +9,12 @@ export class MongoDBClient implements DBClient { private db: Db; private collection: Collection; - constructor() { - MongoDBConnection.getConnection((connection) => { - this.db = connection; - if (this.table) { - this.collection = this.db.collection(this.table); - } - }); + @postConstruct() + private async init() { + this.db = await MongoDBConnection.getConnection(); + if (this.table) { + this.collection = this.db.collection(this.table); + } } public getProvide

(): P { diff --git a/packages/db-mongo/src/index.ts b/packages/db-mongo/src/index.ts index de72b13..e63383b 100644 --- a/packages/db-mongo/src/index.ts +++ b/packages/db-mongo/src/index.ts @@ -1,2 +1,2 @@ -export * from './client' -export * from 'mongodb'; \ No newline at end of file +export * from 'mongodb' +export * from './client' \ No newline at end of file diff --git a/packages/ws/package.json b/packages/ws/package.json index 3ab4eee..4585949 100644 --- a/packages/ws/package.json +++ b/packages/ws/package.json @@ -19,6 +19,7 @@ "url": "git+https://github.com/502647092/cc-server-parent.git" }, "dependencies": { + "@cc-server/ioc": "^0.5.0", "inversify": "^5.0.1", "reflect-metadata": "^0.1.13", "socket.io": "^2.2.0" diff --git a/packages/ws/src/builder.ts b/packages/ws/src/builder.ts index 0ed3f37..1f5e5a7 100644 --- a/packages/ws/src/builder.ts +++ b/packages/ws/src/builder.ts @@ -1,9 +1,9 @@ import "reflect-metadata"; -import { Container } from 'inversify' -import { interfaces, BroadcastMessage } from './interfaces' -import { TYPE } from './constants' -import { getNamespaces, getNamespaceMetadata, getNamespaceListenerMetadata } from './utils' import * as io from 'socket.io' +import { Container } from 'inversify' +import { TYPE } from './constants' +import { interfaces, BroadcastMessage } from './interfaces' +import { getNamespaces, getNamespaceMetadata, getNamespaceListenerMetadata } from './utils' export function buildWebSocket(container: Container, server: io.Server) { let constructors = getNamespaces(); @@ -53,10 +53,6 @@ function flatten(arr: Array) { } function applyMiddlewares(namespaceEventMetadata: interfaces.ListenerMetadata[], socket: io.Socket) { - // socket.use((packet: io.Packet, next: (err?: any) => void) => { - // Reflect.defineMetadata(TYPE.SocketContext, socket, packet); - // next(); - // }) let middlewares = [...new Set(flatten(namespaceEventMetadata.map((data) => data.middleware)))]; for (const middleware of middlewares) { socket.use((packet: io.Packet, next: (err?: any) => void) => { middleware(socket, packet, next); }); diff --git a/packages/ws/src/decorators.ts b/packages/ws/src/decorators.ts index f257cc3..9668fb0 100644 --- a/packages/ws/src/decorators.ts +++ b/packages/ws/src/decorators.ts @@ -1,8 +1,7 @@ -import { inject, injectable, decorate } from "inversify"; import { interfaces } from './interfaces' -import { METADATA_KEY, TYPE } from './constants' +import { METADATA_KEY } from './constants' +import { injectable, decorate } from "inversify"; import { getNamespaceListenerMetadata, getNamespacesMetadata } from './utils' -import { provideNamed, fluentProvide } from "@cc-server/ioc/src"; /** * Socket.io Namespace @@ -17,10 +16,6 @@ export function namespace(name?: string, ...middleware: interfaces.Middleware[]) target: target }; decorate(injectable(), target); - //decorate(fluentProvide(TYPE.Namespace) - // .inSingletonScope() - // .whenTargetNamed(target.constructor.name) - // .done(), target); Reflect.defineMetadata(METADATA_KEY.namespace, currentMetadata, target); const previousMetadata: interfaces.NamespaceMetadata[] = getNamespacesMetadata(); Reflect.defineMetadata(METADATA_KEY.namespace, [currentMetadata, ...previousMetadata], Reflect); diff --git a/packages/ws/src/index.ts b/packages/ws/src/index.ts index 91ca3c0..df7c67c 100644 --- a/packages/ws/src/index.ts +++ b/packages/ws/src/index.ts @@ -1,9 +1,8 @@ import * as io from 'socket.io' +export { io } +export * from './debug' export * from './builder' export * from './decorators' export * from './interfaces' -export * from './debug' export { TYPE } from './constants' -export { getSocketContext } from './utils' -export { io } diff --git a/packages/ws/src/utils.ts b/packages/ws/src/utils.ts index ab741a7..8fc5993 100644 --- a/packages/ws/src/utils.ts +++ b/packages/ws/src/utils.ts @@ -1,5 +1,5 @@ -import { METADATA_KEY, TYPE } from './constants' import { interfaces } from './interfaces' +import { METADATA_KEY } from './constants' function getNamespaces() { return getNamespacesMetadata().map((target) => target.target); @@ -29,14 +29,9 @@ function getNamespaceListenerMetadata(target: any) { return eventMetadata; } -function getSocketContext(packet: any) { - return Reflect.getMetadata(TYPE.SocketContext, packet); -} - export { getNamespaces, getNamespaceMetadata, getNamespacesMetadata, - getNamespaceListenerMetadata, - getSocketContext + getNamespaceListenerMetadata }