oak-backend-base 3.3.4 → 3.4.0

package/lib/AppLoader.js

@@ -6,7 +6,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const node_schedule_1 = require("node-schedule");
 const env_1 = require("oak-domain/lib/compiler/env");
-const actionDef_1 = require("oak-domain/lib/store/actionDef");
+const IntrinsicLogics_1 = require("oak-domain/lib/store/IntrinsicLogics");
 const lodash_1 = require("oak-domain/lib/utils/lodash");
 const uuid_1 = require("oak-domain/lib/utils/uuid");
 const types_1 = require("oak-domain/lib/types");
@@ -144,7 +144,7 @@ class AppLoader extends types_1.AppLoader {
         const triggers = this.requireSth('lib/triggers/index');
         const checkers = this.requireSth('lib/checkers/index');
         const { ActionDefDict } = require(`${this.path}/lib/oak-app-domain/ActionDefDict`);
-        const { triggers: adTriggers, checkers: adCheckers } = (0, actionDef_1.makeIntrinsicCTWs)(this.dbStore.getSchema(), ActionDefDict);
+        const { triggers: adTriggers, checkers: adCheckers } = (0, IntrinsicLogics_1.makeIntrinsicCTWs)(this.dbStore.getSchema(), ActionDefDict);
         triggers.forEach((trigger) => this.registerTrigger(trigger));
         adTriggers.forEach((trigger) => this.registerTrigger(trigger));
         checkers.forEach((checker) => this.dbStore.registerChecker(checker));
@@ -333,7 +333,7 @@ class AppLoader extends types_1.AppLoader {
     startWatchers() {
         const watchers = this.requireSth('lib/watchers/index');
         const { ActionDefDict } = require(`${this.path}/lib/oak-app-domain/ActionDefDict`);
-        const { watchers: adWatchers } = (0, actionDef_1.makeIntrinsicCTWs)(this.dbStore.getSchema(), ActionDefDict);
+        const { watchers: adWatchers } = (0, IntrinsicLogics_1.makeIntrinsicCTWs)(this.dbStore.getSchema(), ActionDefDict);
         const totalWatchers = watchers.concat(adWatchers);
         let count = 0;
         const execOne = async (watcher, start) => {

package/lib/DataSubscriber.d.ts

@@ -1,18 +1,18 @@
-import { EntityDict } from 'oak-domain/lib/types';
-import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
-import { BackendRuntimeContext } from 'oak-frontend-base';
-import { Namespace } from 'socket.io';
-export default class DataSubscriber<ED extends EntityDict & BaseEntityDict, Context extends BackendRuntimeContext<ED>> {
-    private ns;
-    private contextBuilder;
-    private filterMap;
-    private idEntityMap;
-    constructor(ns: Namespace, contextBuilder: (scene?: string) => Promise<Context>);
-    private formCreateRoomRoutine;
-    /**
-     * 来自外部的socket连接，监听数据变化
-     */
-    private startup;
-    private sendRecord;
-    onDataCommited(context: Context): void;
-}
+import { EntityDict } from 'oak-domain/lib/types';
+import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
+import { BackendRuntimeContext } from 'oak-frontend-base';
+import { Namespace } from 'socket.io';
+export default class DataSubscriber<ED extends EntityDict & BaseEntityDict, Context extends BackendRuntimeContext<ED>> {
+    private ns;
+    private contextBuilder;
+    private filterMap;
+    private idEntityMap;
+    constructor(ns: Namespace, contextBuilder: (scene?: string) => Promise<Context>);
+    private formCreateRoomRoutine;
+    /**
+     * 来自外部的socket连接，监听数据变化
+     */
+    private startup;
+    private sendRecord;
+    onDataCommited(context: Context): void;
+}

package/lib/DataSubscriber.js

@@ -1,158 +1,158 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const lodash_1 = require("oak-domain/lib/utils/lodash");
-const oak_domain_1 = require("oak-domain");
-class DataSubscriber {
-    ns;
-    contextBuilder;
-    filterMap;
-    idEntityMap;
-    constructor(ns, contextBuilder) {
-        this.ns = ns;
-        this.contextBuilder = contextBuilder;
-        this.startup();
-        this.filterMap = {};
-        this.idEntityMap = {};
-    }
-    formCreateRoomRoutine(def) {
-        const { id, entity, filter } = def;
-        return (room) => {
-            if (room === id) {
-                console.log('instance:', process.env.NODE_APP_INSTANCE, 'add filter', room);
-                // 本房间不存在，说明这个filter是新出现的
-                if (this.filterMap[entity]) {
-                    // id的唯一性由前台保证，重复则无视
-                    Object.assign(this.filterMap[entity], {
-                        [id]: filter,
-                    });
-                }
-                else {
-                    Object.assign(this.filterMap, {
-                        [entity]: {
-                            [id]: filter,
-                        }
-                    });
-                }
-                this.idEntityMap[id] = entity;
-            }
-        };
-    }
-    /**
-     * 来自外部的socket连接，监听数据变化
-     */
-    startup() {
-        this.ns.on('connection', async (socket) => {
-            try {
-                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', async (data) => {
-                    try {
-                        console.log('instance:', process.env.NODE_APP_INSTANCE, 'on sub', JSON.stringify(data));
-                        await Promise.all(data.map(async (ele) => {
-                            const { id, entity, filter } = ele;
-                            // 尝试select此filter，如果失败说明权限越界
-                            await context.select(entity, {
-                                data: {
-                                    id: 1,
-                                },
-                                filter,
-                            }, {});
-                        }));
-                    }
-                    catch (err) {
-                        socket.emit('error', err.toString());
-                        return;
-                    }
-                    data.forEach((ele) => {
-                        const createRoomRoutine = this.formCreateRoomRoutine(ele);
-                        this.ns.adapter.on('create-room', createRoomRoutine);
-                        socket.join(ele.id);
-                        this.ns.adapter.off('create-room', createRoomRoutine);
-                    });
-                });
-                socket.on('unsub', (ids) => {
-                    // console.log('instance:', process.env.NODE_APP_INSTANCE, 'on unsub', JSON.stringify(ids));
-                    ids.forEach((id) => {
-                        socket.leave(id);
-                    });
-                });
-            }
-            catch (err) {
-                socket.emit('error', err.toString());
-            }
-        });
-        this.ns.adapter.on('delete-room', (room) => {
-            const entity = this.idEntityMap[room];
-            if (entity) {
-                // console.log('instance:', process.env.NODE_APP_INSTANCE, 'remove filter', room);
-                (0, lodash_1.unset)(this.filterMap[entity], room);
-                (0, lodash_1.unset)(this.idEntityMap, room);
-            }
-        });
-        this.ns.on('sendRecord', (entity, filter, record, isCreate) => {
-            console.log('instance:', process.env.NODE_APP_INSTANCE, 'get record from another', JSON.stringify(entity));
-        });
-    }
-    sendRecord(entity, filter, record, sid, isCreate) {
-        if (entity === 'spContractApplyment') {
-            console.log('instance:', process.env.NODE_APP_INSTANCE, 'sendRecord', JSON.stringify(entity));
-        }
-        this.ns.serverSideEmit('sendRecord', entity, filter, record, isCreate);
-        if (this.filterMap[entity]) {
-            Object.keys(this.filterMap[entity]).forEach(async (room) => {
-                const context = await this.contextBuilder();
-                const filter2 = this.filterMap[entity][room];
-                let needSend = false;
-                if (isCreate) {
-                    // 如果是插入数据肯定是单行，使用相容性检测
-                    const contained = await (0, oak_domain_1.checkFilterContains)(entity, context, filter2, filter, true);
-                    needSend = contained;
-                }
-                else {
-                    const repeled = await (0, oak_domain_1.checkFilterRepel)(entity, context, filter, filter2, true);
-                    needSend = !repeled;
-                }
-                if (needSend) {
-                    // console.log('instance:', process.env.NODE_APP_INSTANCE, 'needSend', JSON.stringify(room));
-                    if (sid) {
-                        this.ns.to(room).except(sid).emit('data', [record], [room]);
-                    }
-                    else {
-                        this.ns.to(room).emit('data', [record], [room]);
-                    }
-                }
-            });
-        }
-    }
-    onDataCommited(context) {
-        const sid = context.getSubscriberId();
-        const { opRecords } = context;
-        opRecords.forEach((record) => {
-            const { a } = record;
-            switch (a) {
-                case 'c': {
-                    const { e, d } = record;
-                    this.sendRecord(e, d, record, sid, true);
-                    break;
-                }
-                case 'u': {
-                    const { e, d, f } = record;
-                    this.sendRecord(e, f, record, sid);
-                    break;
-                }
-                case 'r': {
-                    const { e, f } = record;
-                    this.sendRecord(e, f, record, sid);
-                    break;
-                }
-                default: {
-                    break;
-                }
-            }
-        });
-    }
-}
-exports.default = DataSubscriber;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const lodash_1 = require("oak-domain/lib/utils/lodash");
+const oak_domain_1 = require("oak-domain");
+class DataSubscriber {
+    ns;
+    contextBuilder;
+    filterMap;
+    idEntityMap;
+    constructor(ns, contextBuilder) {
+        this.ns = ns;
+        this.contextBuilder = contextBuilder;
+        this.startup();
+        this.filterMap = {};
+        this.idEntityMap = {};
+    }
+    formCreateRoomRoutine(def) {
+        const { id, entity, filter } = def;
+        return (room) => {
+            if (room === id) {
+                console.log('instance:', process.env.NODE_APP_INSTANCE, 'add filter', room);
+                // 本房间不存在，说明这个filter是新出现的
+                if (this.filterMap[entity]) {
+                    // id的唯一性由前台保证，重复则无视
+                    Object.assign(this.filterMap[entity], {
+                        [id]: filter,
+                    });
+                }
+                else {
+                    Object.assign(this.filterMap, {
+                        [entity]: {
+                            [id]: filter,
+                        }
+                    });
+                }
+                this.idEntityMap[id] = entity;
+            }
+        };
+    }
+    /**
+     * 来自外部的socket连接，监听数据变化
+     */
+    startup() {
+        this.ns.on('connection', async (socket) => {
+            try {
+                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', async (data) => {
+                    try {
+                        console.log('instance:', process.env.NODE_APP_INSTANCE, 'on sub', JSON.stringify(data));
+                        await Promise.all(data.map(async (ele) => {
+                            const { id, entity, filter } = ele;
+                            // 尝试select此filter，如果失败说明权限越界
+                            await context.select(entity, {
+                                data: {
+                                    id: 1,
+                                },
+                                filter,
+                            }, {});
+                        }));
+                    }
+                    catch (err) {
+                        socket.emit('error', err.toString());
+                        return;
+                    }
+                    data.forEach((ele) => {
+                        const createRoomRoutine = this.formCreateRoomRoutine(ele);
+                        this.ns.adapter.on('create-room', createRoomRoutine);
+                        socket.join(ele.id);
+                        this.ns.adapter.off('create-room', createRoomRoutine);
+                    });
+                });
+                socket.on('unsub', (ids) => {
+                    // console.log('instance:', process.env.NODE_APP_INSTANCE, 'on unsub', JSON.stringify(ids));
+                    ids.forEach((id) => {
+                        socket.leave(id);
+                    });
+                });
+            }
+            catch (err) {
+                socket.emit('error', err.toString());
+            }
+        });
+        this.ns.adapter.on('delete-room', (room) => {
+            const entity = this.idEntityMap[room];
+            if (entity) {
+                // console.log('instance:', process.env.NODE_APP_INSTANCE, 'remove filter', room);
+                (0, lodash_1.unset)(this.filterMap[entity], room);
+                (0, lodash_1.unset)(this.idEntityMap, room);
+            }
+        });
+        this.ns.on('sendRecord', (entity, filter, record, isCreate) => {
+            console.log('instance:', process.env.NODE_APP_INSTANCE, 'get record from another', JSON.stringify(entity));
+        });
+    }
+    sendRecord(entity, filter, record, sid, isCreate) {
+        if (entity === 'spContractApplyment') {
+            console.log('instance:', process.env.NODE_APP_INSTANCE, 'sendRecord', JSON.stringify(entity));
+        }
+        this.ns.serverSideEmit('sendRecord', entity, filter, record, isCreate);
+        if (this.filterMap[entity]) {
+            Object.keys(this.filterMap[entity]).forEach(async (room) => {
+                const context = await this.contextBuilder();
+                const filter2 = this.filterMap[entity][room];
+                let needSend = false;
+                if (isCreate) {
+                    // 如果是插入数据肯定是单行，使用相容性检测
+                    const contained = await (0, oak_domain_1.checkFilterContains)(entity, context, filter2, filter, true);
+                    needSend = contained;
+                }
+                else {
+                    const repeled = await (0, oak_domain_1.checkFilterRepel)(entity, context, filter, filter2, true);
+                    needSend = !repeled;
+                }
+                if (needSend) {
+                    // console.log('instance:', process.env.NODE_APP_INSTANCE, 'needSend', JSON.stringify(room));
+                    if (sid) {
+                        this.ns.to(room).except(sid).emit('data', [record], [room]);
+                    }
+                    else {
+                        this.ns.to(room).emit('data', [record], [room]);
+                    }
+                }
+            });
+        }
+    }
+    onDataCommited(context) {
+        const sid = context.getSubscriberId();
+        const { opRecords } = context;
+        opRecords.forEach((record) => {
+            const { a } = record;
+            switch (a) {
+                case 'c': {
+                    const { e, d } = record;
+                    this.sendRecord(e, d, record, sid, true);
+                    break;
+                }
+                case 'u': {
+                    const { e, d, f } = record;
+                    this.sendRecord(e, f, record, sid);
+                    break;
+                }
+                case 'r': {
+                    const { e, f } = record;
+                    this.sendRecord(e, f, record, sid);
+                    break;
+                }
+                default: {
+                    break;
+                }
+            }
+        });
+    }
+}
+exports.default = DataSubscriber;

package/lib/DbStore.js

@@ -107,7 +107,7 @@ class DbStore extends oak_db_1.MysqlStore {
         this.executor.registerTrigger(trigger);
     }
     registerChecker(checker) {
-        this.executor.registerChecker(checker);
+        this.executor.registerChecker(checker, this.getSchema());
     }
     setOnVolatileTrigger(onVolatileTrigger) {
         this.executor.setOnVolatileTrigger(onVolatileTrigger);

package/lib/Synchronizer.js

@@ -197,6 +197,7 @@ class Synchronizer {
             // 每个pushEntityNode代表配置的一个remoteEntity 
             await Promise.all(pushEntityNodes.map(async (node) => {
                 const { projection, groupByUsers, getRemotePushInfo: getRemoteAccessInfo, endpoint, actions, onSynchronized } = node;
+                // 定义中应该不可能没有actions
                 if (!actions || actions.includes(action)) {
                     const pushed = [];
                     const rows = await context.select(targetEntity, {
@@ -344,7 +345,9 @@ class Synchronizer {
             strict: 'makeSure',
             check: (operation) => {
                 const { data } = operation;
-                return pushEntities.includes(data.targetEntity);
+                const { targetEntity, action } = data;
+                return pushEntities.includes(data.targetEntity)
+                    && !!this.pushAccessMap[targetEntity].find(({ actions }) => !actions || actions.includes(action));
             },
             fn: async ({ ids }, context) => {
                 (0, assert_1.default)(ids.length === 1);

package/lib/types/Sync.d.ts

@@ -1,16 +1,16 @@
-import { EntityDict } from 'oak-domain/lib/types';
-import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
-import { BackendRuntimeContext } from 'oak-frontend-base/lib/context/BackendRuntimeContext';
-import { RemotePushInfo, RemotePullInfo, SelfEncryptInfo, SyncRemoteConfigBase, SyncSelfConfigBase, SyncConfig } from 'oak-domain/lib/types/Sync';
-interface SyncRemoteConfigWrapper<ED extends EntityDict & BaseEntityDict, Cxt extends BackendRuntimeContext<ED>> extends SyncRemoteConfigBase<ED, Cxt> {
-    getRemotePushInfo: (userId: string) => Promise<RemotePushInfo>;
-    getRemotePullInfo: (id: string) => Promise<RemotePullInfo>;
-}
-interface SyncSelfConfigWrapper<ED extends EntityDict & BaseEntityDict> extends SyncSelfConfigBase<ED> {
-    getSelfEncryptInfo: () => Promise<SelfEncryptInfo>;
-}
-export interface SyncConfigWrapper<ED extends EntityDict & BaseEntityDict, Cxt extends BackendRuntimeContext<ED>> {
-    self: SyncSelfConfigWrapper<ED>;
-    remotes: Array<SyncRemoteConfigWrapper<ED, Cxt>>;
-}
-export { RemotePushInfo, RemotePullInfo, SelfEncryptInfo, SyncConfig, };
+import { EntityDict } from 'oak-domain/lib/types';
+import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
+import { BackendRuntimeContext } from 'oak-frontend-base/lib/context/BackendRuntimeContext';
+import { RemotePushInfo, RemotePullInfo, SelfEncryptInfo, SyncRemoteConfigBase, SyncSelfConfigBase, SyncConfig } from 'oak-domain/lib/types/Sync';
+interface SyncRemoteConfigWrapper<ED extends EntityDict & BaseEntityDict, Cxt extends BackendRuntimeContext<ED>> extends SyncRemoteConfigBase<ED, Cxt> {
+    getRemotePushInfo: (userId: string) => Promise<RemotePushInfo>;
+    getRemotePullInfo: (id: string) => Promise<RemotePullInfo>;
+}
+interface SyncSelfConfigWrapper<ED extends EntityDict & BaseEntityDict> extends SyncSelfConfigBase<ED> {
+    getSelfEncryptInfo: () => Promise<SelfEncryptInfo>;
+}
+export interface SyncConfigWrapper<ED extends EntityDict & BaseEntityDict, Cxt extends BackendRuntimeContext<ED>> {
+    self: SyncSelfConfigWrapper<ED>;
+    remotes: Array<SyncRemoteConfigWrapper<ED, Cxt>>;
+}
+export { RemotePushInfo, RemotePullInfo, SelfEncryptInfo, SyncConfig, };

package/lib/types/Sync.js

@@ -1,5 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-;
-;
-;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+;
+;
+;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-backend-base",
-    "version": "3.3.4",
+    "version": "3.4.0",
     "description": "oak-backend-base",
     "main": "lib/index",
     "author": {
@@ -20,10 +20,10 @@
         "mysql": "^2.18.1",
         "mysql2": "^2.3.3",
         "node-schedule": "^2.1.0",
-        "oak-common-aspect": "^2.2.5",
-        "oak-db": "^3.1.0",
-        "oak-domain": "^4.2.8",
-        "oak-frontend-base": "^4.2.7",
+        "oak-common-aspect": "^2.3.0",
+        "oak-db": "^3.2.0",
+        "oak-domain": "^4.3.0",
+        "oak-frontend-base": "^4.3.0",
         "socket.io": "^4.7.2",
         "socket.io-client": "^4.7.2",
         "uuid": "^8.3.2"