circlecloud/cc-server-parent
1
0
Fork 0
Code Releases Activity

v0.7.0

Browse Source
This commit is contained in:
MiaoWoo 2020-01-07 10:00:32 +08:00
parent e078e7d503
commit f13e98568b
11 changed files with 65 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,7 +1,7 @@
{ {
"npmClient": "yarn", "npmClient": "yarn",
"useWorkspaces": true, "useWorkspaces": true,
"version": "0.6.9", "version": "0.7.0",
"packages": [ "packages": [
"packages/*" "packages/*"
], ],

8
packages/binding/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cc-server/binding", "name": "@cc-server/binding",
"version": "0.6.9", "version": "0.7.0",
"description": "> TODO: description", "description": "> TODO: description",
"author": "MiaoWoo <admin@yumc.pw>", "author": "MiaoWoo <admin@yumc.pw>",
"homepage": "https://github.com/502647092/cc-server-parent#readme", "homepage": "https://github.com/502647092/cc-server-parent#readme",
@ -24,9 +24,9 @@
"reflect-metadata": "^0.1.13" "reflect-metadata": "^0.1.13"
}, },
"devDependencies": { "devDependencies": {
"mocha": "^6.1.4", "mocha": "^7.0.0",
"rimraf": "^2.6.3", "rimraf": "^3.0.0",
"typescript": "^3.5.1" "typescript": "^3.7.4"
}, },
"bugs": { "bugs": {
"url": "https://github.com/502647092/cc-server-parent/issues" "url": "https://github.com/502647092/cc-server-parent/issues"

4
packages/binding/src/index.ts
View File

@ -1,5 +1,5 @@
import { httpGet as get, httpPost as post } from 'inversify-express-utils' import { httpGet as get, httpPost as post, httpPut as put, httpPatch as patch, httpDelete as del } from 'inversify-express-utils'
export * from './decorators' export * from './decorators'
export * from './activation' export * from './activation'
export * from 'inversify-express-utils' export * from 'inversify-express-utils'
export { get, post } export { get, post, put, patch, del }

30
packages/core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cc-server/core", "name": "@cc-server/core",
"version": "0.6.9", "version": "0.7.0",
"description": "> TODO: description", "description": "> TODO: description",
"author": "MiaoWoo <admin@yumc.pw>", "author": "MiaoWoo <admin@yumc.pw>",
"homepage": "https://github.com/502647092/cc-server-parent#readme", "homepage": "https://github.com/502647092/cc-server-parent#readme",
@ -21,27 +21,27 @@
"url": "git+https://github.com/502647092/cc-server-parent.git" "url": "git+https://github.com/502647092/cc-server-parent.git"
}, },
"dependencies": { "dependencies": {
"@cc-server/binding": "^0.6.9", "@cc-server/binding": "^0.7.0",
"@cc-server/db-mongo": "^0.6.9", "@cc-server/db-mongo": "^0.7.0",
"@cc-server/ioc": "^0.6.9", "@cc-server/ioc": "^0.7.0",
"@cc-server/ws": "^0.6.9", "@cc-server/ws": "^0.7.0",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"globby": "^9.2.0", "globby": "^10.0.2",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"inversify-express-utils": "^6.3.2", "inversify-express-utils": "^6.3.2",
"prettyjson": "^1.2.1", "prettyjson": "^1.2.1",
"socket.io": "^2.2.0" "socket.io": "^2.3.0"
}, },
"devDependencies": { "devDependencies": {
"@types/body-parser": "^1.17.0", "@types/body-parser": "^1.17.1",
"@types/express": "^4.17.0", "@types/express": "4.17.0",
"@types/prettyjson": "^0.0.29", "@types/prettyjson": "^0.0.29",
"@types/socket.io": "^2.1.2", "@types/socket.io": "^2.1.4",
"mocha": "^6.1.4", "mocha": "^7.0.0",
"rimraf": "^2.6.3", "rimraf": "^3.0.0",
"ts-node": "^8.2.0", "ts-node": "^8.5.4",
"ts-node-dev": "^1.0.0-pre.40", "ts-node-dev": "^1.0.0-pre.44",
"typescript": "^3.5.1" "typescript": "^3.7.4"
}, },
"gitHead": "7d84393a3cb6be6be9ed51d71f12677d2d7d0728" "gitHead": "7d84393a3cb6be6be9ed51d71f12677d2d7d0728"
} }

16
packages/core/src/index.ts
View File

@ -1,6 +1,7 @@
import 'reflect-metadata'; import 'reflect-metadata';
import * as fs from 'fs'; import * as fs from 'fs';
import * as http from 'http'; import * as http from 'http';
import * as path from 'path';
import * as globby from "globby"; import * as globby from "globby";
import * as express from "express"; import * as express from "express";
import * as prettyjson from "prettyjson"; import * as prettyjson from "prettyjson";
@ -104,11 +105,18 @@ export class CcServerBoot {
return this; return this;
} }
public scan(path: fs.PathLike) { public scan(scanDir: string) {
let files = fs.readdirSync(path); let files = fs.readdirSync(scanDir);
for (const file of files) { for (let file of files) {
let moduleDir = path.join(scanDir, file)
let stat = fs.statSync(moduleDir);
if (stat.isDirectory()) {
this.scan(moduleDir)
} else if (stat.isFile() && (file.endsWith('.js') || file.endsWith('.ts'))) {
require(moduleDir);
}
} }
return this;
} }
public build() { public build() {

9
packages/core/src/server.ts
View File

@ -1,17 +1,14 @@
import { CcServerBoot, express } from './index' import { CcServerBoot } from './index'
import './function/http';
import './function/websocket';
import { DBClient } from '@cc-server/db'; import { DBClient } from '@cc-server/db';
import { MongoClient } from 'mongodb'; import { MongoClient } from 'mongodb';
import { MongoCollection } from '@cc-server/db-mongo'; import { MongoCollection } from '@cc-server/db-mongo';
let boot = new CcServerBoot().static('public'); let boot = new CcServerBoot().scan(__dirname + '/function');
MongoClient.connect("mongodb://192.168.2.5:27017", { useNewUrlParser: true }, (error, client) => { MongoClient.connect("mongodb://192.168.2.5:27017", { useNewUrlParser: true }, (error, client) => {
if (error) { if (error) {
console.log(error) console.log(error)
} else { } else {
boot.container.bind(DBClient).toConstantValue(new MongoCollection(client.db("faas").collection("users"))).whenTargetNamed("users") boot.container.bind(DBClient).toConstantValue(new MongoCollection(client.db("faas").collection("users"))).whenTargetNamed("users")
boot.build().listen(); boot.start();
} }
}) })

16
packages/db-mongo/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cc-server/db-mongo", "name": "@cc-server/db-mongo",
"version": "0.6.9", "version": "0.7.0",
"description": "> TODO: description", "description": "> TODO: description",
"author": "MiaoWoo <admin@yumc.pw>", "author": "MiaoWoo <admin@yumc.pw>",
"homepage": "https://faas.yumc.pw", "homepage": "https://faas.yumc.pw",
@ -20,17 +20,17 @@
"url": "git+https://github.com/502647092/cc-server-parent.git" "url": "git+https://github.com/502647092/cc-server-parent.git"
}, },
"dependencies": { "dependencies": {
"@cc-server/db": "^0.6.9", "@cc-server/db": "^0.7.0",
"@cc-server/ioc": "^0.6.9", "@cc-server/ioc": "^0.7.0",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"mongodb": "^3.2.7", "mongodb": "^3.4.1",
"reflect-metadata": "^0.1.13" "reflect-metadata": "^0.1.13"
}, },
"devDependencies": { "devDependencies": {
"@types/mongodb": "^3.1.28", "@types/mongodb": "^3.3.14",
"mocha": "^6.1.4", "mocha": "^7.0.0",
"rimraf": "^2.6.3", "rimraf": "^3.0.0",
"typescript": "^3.5.1" "typescript": "^3.7.4"
}, },
"gitHead": "7d84393a3cb6be6be9ed51d71f12677d2d7d0728" "gitHead": "7d84393a3cb6be6be9ed51d71f12677d2d7d0728"
} }

9
packages/db-mongo/src/client.ts
View File

@ -16,7 +16,7 @@ export class MongoCollection<T = any> implements DBClient {
return await this.collection.find(filter).toArray(); return await this.collection.find(filter).toArray();
} }
public async findOne(filter: Object): Promise<T> { public async findOne(filter: object): Promise<T> {
let result = await this.collection.find(filter).limit(1).toArray(); let result = await this.collection.find(filter).limit(1).toArray();
return result[0]; return result[0];
} }
@ -26,20 +26,21 @@ export class MongoCollection<T = any> implements DBClient {
} }
public async insertOne(model: T): Promise<T> { public async insertOne(model: T): Promise<T> {
//@ts-ignore
var insert = await this.collection.insertOne(model); var insert = await this.collection.insertOne(model);
return insert.ops[0]; return insert.ops[0];
} }
public async updateOne(where: any, model: any): Promise<boolean> { public async updateOne(where: any, model: T): Promise<boolean> {
let result = await this.collection.updateOne(where, { $set: model }); let result = await this.collection.updateOne(where, { $set: model });
return result.result.ok == 1 && result.result.n > 0; return result.result.ok == 1 && result.result.n > 0;
} }
public async updateById(objectId: string, model: any): Promise<boolean> { public async updateById(objectId: string, model: T): Promise<boolean> {
return await this.updateOne({ _id: new ObjectID(objectId) }, model) return await this.updateOne({ _id: new ObjectID(objectId) }, model)
} }
public async deleteOne(where: any): Promise<boolean> { public async deleteOne(where: object): Promise<boolean> {
let result = await this.collection.deleteOne(where); let result = await this.collection.deleteOne(where);
return result.result.ok === 1 && result.result.n > 0 return result.result.ok === 1 && result.result.n > 0
} }

8
packages/db/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cc-server/db", "name": "@cc-server/db",
"version": "0.6.9", "version": "0.7.0",
"description": "> TODO: description", "description": "> TODO: description",
"author": "MiaoWoo <admin@yumc.pw>", "author": "MiaoWoo <admin@yumc.pw>",
"homepage": "https://github.com/502647092/cc-server-parent#readme", "homepage": "https://github.com/502647092/cc-server-parent#readme",
@ -23,8 +23,8 @@
"url": "https://github.com/502647092/cc-server-parent/issues" "url": "https://github.com/502647092/cc-server-parent/issues"
}, },
"devDependencies": { "devDependencies": {
"mocha": "^6.1.4", "mocha": "^7.0.0",
"rimraf": "^2.6.3", "rimraf": "^3.0.0",
"typescript": "^3.5.1" "typescript": "^3.7.4"
} }
} }

8
packages/ioc/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cc-server/ioc", "name": "@cc-server/ioc",
"version": "0.6.9", "version": "0.7.0",
"description": "> TODO: description", "description": "> TODO: description",
"author": "MiaoWoo <admin@yumc.pw>", "author": "MiaoWoo <admin@yumc.pw>",
"homepage": "https://faas.yumc.pw", "homepage": "https://faas.yumc.pw",
@ -25,9 +25,9 @@
"reflect-metadata": "^0.1.13" "reflect-metadata": "^0.1.13"
}, },
"devDependencies": { "devDependencies": {
"mocha": "^6.1.4", "mocha": "^7.0.0",
"rimraf": "^2.6.3", "rimraf": "^3.0.0",
"typescript": "^3.5.1" "typescript": "^3.7.4"
}, },
"gitHead": "7d84393a3cb6be6be9ed51d71f12677d2d7d0728" "gitHead": "7d84393a3cb6be6be9ed51d71f12677d2d7d0728"
} }

14
packages/ws/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cc-server/ws", "name": "@cc-server/ws",
"version": "0.6.9", "version": "0.7.0",
"description": "> TODO: description", "description": "> TODO: description",
"author": "MiaoWoo <admin@yumc.pw>", "author": "MiaoWoo <admin@yumc.pw>",
"homepage": "https://faas.yumc.pw", "homepage": "https://faas.yumc.pw",
@ -20,16 +20,16 @@
"url": "git+https://github.com/502647092/cc-server-parent.git" "url": "git+https://github.com/502647092/cc-server-parent.git"
}, },
"dependencies": { "dependencies": {
"@cc-server/ioc": "^0.6.9", "@cc-server/ioc": "^0.7.0",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",
"socket.io": "^2.2.0" "socket.io": "^2.3.0"
}, },
"devDependencies": { "devDependencies": {
"@types/socket.io": "^2.1.2", "@types/socket.io": "^2.1.4",
"mocha": "^6.1.4", "mocha": "^7.0.0",
"rimraf": "^2.6.3", "rimraf": "^3.0.0",
"typescript": "^3.5.1" "typescript": "^3.7.4"
}, },
"gitHead": "7d84393a3cb6be6be9ed51d71f12677d2d7d0728" "gitHead": "7d84393a3cb6be6be9ed51d71f12677d2d7d0728"
} }