Oak-Team
/
oak-backend-base
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 18 Wiki Activity

merge

This commit is contained in:
Xu Chang 2023-09-14 10:07:50 +08:00
parent a3438f3ebf bc21051ecd
commit 9032783680
4 changed files with 121 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/DataSubscriber.d.ts vendored
View File

@ -5,7 +5,9 @@ import { Server } from 'socket.io';
export default class DataSubscriber<ED extends EntityDict & BaseEntityDict, Context extends AsyncContext<ED>> {
private io;
private contextBuilder;
private hash;
constructor(io: Server, contextBuilder: (scene?: string) => Promise<Context>);
private calcEntityFilterID;
/**
* 来自外部的socket连接，监听数据变化
*/

39
lib/DataSubscriber.js
View File

@ -1,19 +1,56 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const crypto_1 = require("crypto");
class DataSubscriber {
io;
contextBuilder;
hash;
constructor(io, contextBuilder) {
this.io = io;
this.contextBuilder = contextBuilder;
this.startup();
this.hash = (0, crypto_1.createHash)('sha256');
}
calcEntityFilterID(entity, filter) {
// 用哈希计算来保证id唯一性
const h = this.hash.copy();
h.update(`${entity}-${JSON.stringify(filter)}`);
const id = h.digest('hex');
return id;
}
/**
* 来自外部的socket连接，监听数据变化
*/
startup() {
this.io.on('connection', (socket) => {
this.io.on('connection', async (socket) => {
console.log('connection', socket.id);
const { 'oak-cxt': cxtStr } = socket.handshake.headers;
const context = await this.contextBuilder(cxtStr);
socket.userId = context.getCurrentUserId();
socket.context = context;
socket.idMap = {};
socket.on('sub', (data, callback) => {
console.log(data);
data.forEach((ele) => {
const { id, entity, filter } = ele;
console.log('sub', id, entity, filter);
const globalId = this.calcEntityFilterID(entity, filter);
const rooms = this.io.of("/").adapter.rooms;
console.log(rooms);
socket.idMap[id] = globalId;
socket.join(globalId);
});
});
socket.on('unsub', (ids) => {
console.log('unsub', ids);
ids.forEach((id) => {
const globalId = socket.idMap[id];
const rooms = this.io.of("/").adapter.rooms;
console.log(rooms);
socket.leave(globalId);
console.log(rooms);
});
});
socket.on('disconnect', (reason) => {
console.log('disconnect', reason);
});

74
package.json
View File

@ -1,39 +1,39 @@
{
"name": "oak-backend-base",
"version": "3.0.1",
"description": "oak-backend-base",
"main": "lib/index",
"author": {
"name": "XuChang"
},
"files": [
"lib/**/*"
],
"scripts": {
"copy-files": "copyfiles -u 1 src/**/*.json lib/",
"test": "ts-node test/test.ts",
"test2": "ts-node test/testDbStore.ts",
"build": "tsc && npm run copy-files"
},
"dependencies": {
"@types/node-schedule": "^2.1.0",
"lodash": "^4.17.21",
"mysql": "^2.18.1",
"mysql2": "^2.3.3",
"node-schedule": "^2.1.0",
"oak-common-aspect": "file:../oak-common-aspect",
"oak-db": "file:../oak-db",
"oak-domain": "file:../oak-domain",
"socket.io": "^4.7.2",
"uuid": "^8.3.2"
},
"license": "ISC",
"devDependencies": {
"@types/node": "^17.0.40",
"@types/uuid": "^8.3.4",
"copyfiles": "^2.4.1",
"ts-node": "~10.9.1",
"tslib": "^2.4.0",
"typescript": "^4.7.4"
}
"name": "oak-backend-base",
"version": "3.0.1",
"description": "oak-backend-base",
"main": "lib/index",
"author": {
"name": "XuChang"
},
"files": [
"lib/**/*"
],
"scripts": {
"copy-files": "copyfiles -u 1 src/**/*.json lib/",
"test": "ts-node test/test.ts",
"test2": "ts-node test/testDbStore.ts",
"build": "tsc && npm run copy-files"
},
"dependencies": {
"lodash": "^4.17.21",
"mysql": "^2.18.1",
"mysql2": "^2.3.3",
"node-schedule": "^2.1.0",
"oak-common-aspect": "file:../oak-common-aspect",
"oak-db": "file:../oak-db",
"oak-domain": "file:../oak-domain",
"socket.io": "^4.7.2",
"uuid": "^8.3.2"
},
"license": "ISC",
"devDependencies": {
"@types/node": "^17.0.40",
"@types/node-schedule": "^2.1.0",
"@types/uuid": "^8.3.4",
"copyfiles": "^2.4.1",
"ts-node": "~10.9.1",
"tslib": "^2.4.0",
"typescript": "^4.7.4"
}
}

47
src/DataSubscriber.ts
View File

@ -1,29 +1,70 @@
import { EntityDict, OpRecord } from 'oak-domain/lib/types';
import { Hash, createHash } from 'crypto';
import assert from 'assert';
import { EntityDict, SubDataDef, OpRecord } from 'oak-domain/lib/types';
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore';
import { Server } from 'socket.io';
export default class DataSubscriber<ED extends EntityDict & BaseEntityDict, Context extends AsyncContext<ED>> {
private io: Server;
private contextBuilder: (scene?: string) => Promise<Context>;
private hash: Hash;
constructor(io: Server, contextBuilder: (scene?: string) => Promise<Context>) {
this.io = io;
this.contextBuilder = contextBuilder;
this.startup();
this.hash = createHash('sha256');
}
private calcEntityFilterID(entity: keyof ED, filter: ED[keyof ED]['Selection']['filter']) {
// 用哈希计算来保证id唯一性
const h = this.hash.copy();
h.update(`${entity as string}-${JSON.stringify(filter)}`);
const id = h.digest('hex');
return id;
}
/**
* 来自外部的socket连接，监听数据变化
*/
private startup() {
this.io.on('connection', (socket) => {
this.io.on('connection', async (socket) => {
console.log('connection', socket.id);
const { 'oak-cxt': cxtStr } = socket.handshake.headers;
const context = await this.contextBuilder(cxtStr as string);
(socket as any).userId = context.getCurrentUserId();
(socket as any).context = context;
(socket as any).idMap = {};
socket.on('sub', (data: SubDataDef<ED, keyof ED>[], callback) => {
console.log(data);
data.forEach(
(ele) => {
const { id, entity, filter } = ele;
console.log('sub', id, entity, filter);
const globalId = this.calcEntityFilterID(entity, filter);
(socket as any).idMap[id] = globalId;
socket.join(globalId);
}
);
});
socket.on('unsub', (ids: string[]) => {
console.log('unsub', ids);
ids.forEach(
(id) => {
const globalId = (socket as any).idMap[id];
socket.leave(globalId);
}
)
});
socket.on('disconnect', (reason) => {
console.log('disconnect', reason);
});
})
});
}
onDataCommited(records: OpRecord<ED>[], userId?: string) {