diff --git a/package.json b/package.json index 0c2d026..70ec46b 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,8 @@ "author": "MiaoWoo ", "license": "MIT", "scripts": { + "clean": "npx lerna run clean", + "watch": "npx lerna run watch --parallel", "build": "npx lerna run build", "lp": "npx lerna publish" }, diff --git a/packages/binding/src/index.ts b/packages/binding/src/index.ts index c963185..4ce7070 100644 --- a/packages/binding/src/index.ts +++ b/packages/binding/src/index.ts @@ -1,3 +1,5 @@ +import { httpGet as get, httpPost as post } from 'inversify-express-utils' export * from './decorators' export * from './activation' export * from 'inversify-express-utils' +export { get, post } diff --git a/packages/core/src/function/http.ts b/packages/core/src/function/http.ts index 1749fed..5433eff 100644 --- a/packages/core/src/function/http.ts +++ b/packages/core/src/function/http.ts @@ -1,12 +1,8 @@ -import { TYPE, io } from '@cc-server/ws' import { DBClient } from '@cc-server/db' import { inject, postConstruct } from '@cc-server/ioc'; -import { Vaild, NotBlank, NotNull, controller, requestBody, httpGet, httpPost, requestParam } from '@cc-server/binding' +import { Vaild, NotBlank, NotNull, controller, requestBody, get, post, requestParam } from '@cc-server/binding' import '@cc-server/db-mongo' -//process.env.FAAS_MONGO_URL = 'mongodb://192.168.0.2:27017'; -//process.env.FAAS_MONGO_DB = "faas"; - const TABLE = 'users' class ExampleModel { @@ -29,30 +25,29 @@ export class Controller { this.client.setTable(TABLE); } - @httpGet('/') + @get('/') public async list(): Promise { return this.client.find({}); } - @httpGet('/:id') + @get('/:id') public async get( @requestParam('id') id: string ): Promise { return this.client.findOneById(id); } - @httpPost('/') + @post('/') public async create( @Vaild() @requestBody() model: ExampleModel ): Promise { return model; - //return this.client.insertOne(model); } - @httpPost('/:id') + @post('/:id') public async update( @requestParam('id') id: string, - @requestBody() model: ExampleModel + @Vaild() @requestBody() model: ExampleModel ): Promise { return this.client.updateById(id, model); } diff --git a/packages/db-mongo/src/index.ts b/packages/db-mongo/src/index.ts index e63383b..7c5048b 100644 --- a/packages/db-mongo/src/index.ts +++ b/packages/db-mongo/src/index.ts @@ -1,2 +1,2 @@ export * from 'mongodb' -export * from './client' \ No newline at end of file +export * from './client' diff --git a/packages/ws/src/debug.ts b/packages/ws/src/debug.ts index 74366e9..fd8b5e4 100644 --- a/packages/ws/src/debug.ts +++ b/packages/ws/src/debug.ts @@ -4,6 +4,7 @@ import { getContainer } from '@cc-server/ioc' import { getNamespaceMetadata, getNamespaceListenerMetadata } from './utils' export function getNamespaceInfo() { + if (!getContainer().isBound(TYPE.Namespace)) { return [] }; let namespaces = getContainer().getAll(TYPE.Namespace) return namespaces.map(namespace => { let namespaceMetadata = getNamespaceMetadata(namespace);