oak-backend-base 4.1.6 → 4.1.8

package/lib/AppLoader.d.ts

@@ -15,15 +15,17 @@ export declare class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt exten
     protected dataSubscriber?: DataSubscriber<ED, Cxt>;
     protected synchronizer?: Synchronizer<ED, Cxt>;
     protected contextBuilder: (store: DbStore<ED, Cxt>) => Cxt;
+    private nsSocket?;
     private requireSth;
     protected makeContext(cxtStr?: string, headers?: IncomingHttpHeaders): Promise<Cxt>;
     /**
      * 后台启动的configuration，统一放在这里读取
      */
     private getConfiguration;
-    constructor(path: string, ns?: Namespace, nsServer?: Namespace);
+    constructor(path: string, nsSubscribe?: Namespace, nsSocket?: Namespace, nsServer?: Namespace);
     protected registerTrigger(trigger: Trigger<ED, keyof ED, Cxt>): void;
-    initTriggers(): void;
+    protected initTriggers(): void;
+    protected initSocket(): void;
     mount(initialize?: true): Promise<void>;
     unmount(): Promise<void>;
     execAspect(name: string, headers?: IncomingHttpHeaders, contextString?: string, params?: any): Promise<{
@@ -35,7 +37,7 @@ export declare class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt exten
     getStore(): DbStore<ED, Cxt>;
     getEndpoints(prefix: string): [string, "post" | "get" | "put" | "delete", string, (params: Record<string, string>, headers: IncomingHttpHeaders, req: IncomingMessage, body?: any) => Promise<any>][];
     protected operateInWatcher<T extends keyof ED>(entity: T, operation: ED[T]['Update'], context: Cxt, singleton?: true): Promise<OperationResult<ED>>;
-    protected selectInWatcher<T extends keyof ED>(entity: T, selection: ED[T]['Selection'], context: Cxt, singleton?: true): Promise<Partial<ED[T]["Schema"]>[]>;
+    protected selectInWatcher<T extends keyof ED>(entity: T, selection: ED[T]['Selection'], context: Cxt, forUpdate?: true, singleton?: true): Promise<Partial<ED[T]["Schema"]>[]>;
     protected execWatcher(watcher: Watcher<ED, keyof ED, Cxt>): Promise<OperationResult<ED> | undefined>;
     protected getCheckpointTs(): number;
     protected checkpoint(): Promise<number>;

package/lib/AppLoader.js

@@ -11,6 +11,7 @@ const uuid_1 = require("oak-domain/lib/utils/uuid");
 const types_1 = require("oak-domain/lib/types");
 const DbStore_1 = require("./DbStore");
 const index_1 = tslib_1.__importStar(require("oak-common-aspect/lib/index"));
+const assert_1 = tslib_1.__importDefault(require("assert"));
 const dependencyBuilder_1 = require("oak-domain/lib/compiler/dependencyBuilder");
 const DataSubscriber_1 = tslib_1.__importDefault(require("./cluster/DataSubscriber"));
 const env_1 = require("./cluster/env");
@@ -22,6 +23,7 @@ class AppLoader extends types_1.AppLoader {
     dataSubscriber;
     synchronizer;
     contextBuilder;
+    nsSocket;
     requireSth(filePath) {
         const depFilePath = (0, path_1.join)(this.path, filePath);
         let sth;
@@ -65,7 +67,7 @@ class AppLoader extends types_1.AppLoader {
             syncConfig: syncConfigs,
         };
     }
-    constructor(path, ns, nsServer) {
+    constructor(path, nsSubscribe, nsSocket, nsServer) {
         super(path);
         const { dbConfig } = this.getConfiguration();
         const { storageSchema } = require(`${path}/lib/oak-app-domain/Storage`);
@@ -74,9 +76,10 @@ class AppLoader extends types_1.AppLoader {
         const { authDeduceRelationMap, selectFreeEntities, updateFreeDict } = this.requireSth('lib/configuration/relation');
         this.aspectDict = Object.assign({}, index_1.default, this.requireSth('lib/aspects/index'));
         this.dbStore = new DbStore_1.DbStore(storageSchema, () => this.contextBuilder(this.dbStore), dbConfig, authDeduceRelationMap, selectFreeEntities, updateFreeDict);
-        if (ns) {
-            this.dataSubscriber = new DataSubscriber_1.default(ns, nsServer);
+        if (nsSubscribe) {
+            this.dataSubscriber = new DataSubscriber_1.default(nsSubscribe, nsServer);
         }
+        this.nsSocket = nsSocket;
         const { BackendRuntimeContext } = require(`${path}/lib/context/BackendRuntimeContext`);
         const loaderThis = this;
         // 需要重载context上的构造和commit方法，否则程序中执行context.restartToExecute这样的方法中，new一个context出来是无法正确执行的
@@ -123,6 +126,14 @@ class AppLoader extends types_1.AppLoader {
             syncTriggers.forEach((trigger) => this.registerTrigger(trigger));
         }
     }
+    initSocket() {
+        // todo
+        const socketFilePath = (0, path_1.join)(this.path, 'lib/socket/index');
+        if ((0, fs_1.existsSync)(socketFilePath)) {
+            const { registerSocketEntry } = require(socketFilePath);
+            (0, assert_1.default)(typeof registerSocketEntry === 'function');
+        }
+    }
     async mount(initialize) {
         const { path } = this;
         if (!initialize) {
@@ -131,6 +142,7 @@ class AppLoader extends types_1.AppLoader {
                 this.synchronizer = new Synchronizer_1.default(syncConfig, this.dbStore.getSchema(), () => this.contextBuilder(this.dbStore));
             }
             this.initTriggers();
+            this.initSocket();
         }
         const { importations, exportations } = require(`${path}/lib/ports/index`);
         (0, index_1.registerPorts)(importations || [], exportations || []);
@@ -273,10 +285,10 @@ class AppLoader extends types_1.AppLoader {
     operateInWatcher(entity, operation, context, singleton) {
         return this.dbStore.operate(entity, operation, context, {});
     }
-    selectInWatcher(entity, selection, context, singleton) {
+    selectInWatcher(entity, selection, context, forUpdate, singleton) {
         return this.dbStore.select(entity, selection, context, {
             blockTrigger: true,
-            forUpdate: true,
+            forUpdate,
         });
     }
     async execWatcher(watcher) {
@@ -295,13 +307,13 @@ class AppLoader extends types_1.AppLoader {
                 }, context, singleton);
             }
             else {
-                const { entity, projection, fn, filter, singleton } = watcher;
+                const { entity, projection, fn, filter, singleton, forUpdate } = watcher;
                 const filter2 = typeof filter === 'function' ? await filter() : (0, lodash_1.cloneDeep)(filter);
                 const projection2 = typeof projection === 'function' ? await projection() : (0, lodash_1.cloneDeep)(projection);
                 const rows = await this.selectInWatcher(entity, {
                     data: projection2,
                     filter: filter2,
-                }, context, singleton);
+                }, context, forUpdate, singleton);
                 if (rows.length > 0) {
                     result = await fn(context, rows);
                 }
@@ -424,7 +436,9 @@ class AppLoader extends types_1.AppLoader {
                 const context = await this.makeContext();
                 const start = Date.now();
                 try {
-                    const result = await routineFn(context);
+                    const result = await routineFn(context, {
+                        socket: this.nsSocket,
+                    });
                     console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`);
                     await context.commit();
                 }

package/lib/ClusterAppLoader.d.ts

@@ -10,10 +10,10 @@ export declare class ClusterAppLoader<ED extends EntityDict & BaseEntityDict, Cx
     protected socket: Socket;
     private connectServerSocket;
     private sub;
-    constructor(path: string, nsDs: Namespace, nsServer: Namespace, socketPath: string);
+    constructor(path: string, nsDs: Namespace, nsSocket: Namespace, nsServer: Namespace, socketPath: string);
     protected registerTrigger(trigger: Trigger<ED, keyof ED, Cxt>): void;
     protected operateInWatcher<T extends keyof ED>(entity: T, operation: ED[T]['Update'], context: Cxt, singleton?: true): Promise<OperationResult<ED>>;
-    protected selectInWatcher<T extends keyof ED>(entity: T, selection: ED[T]['Selection'], context: Cxt, singleton?: true): Promise<Partial<ED[T]['Schema']>[]>;
+    protected selectInWatcher<T extends keyof ED>(entity: T, selection: ED[T]['Selection'], context: Cxt, forUpdate?: true, singleton?: true): Promise<Partial<ED[T]['Schema']>[]>;
     protected execWatcher(watcher: Watcher<ED, keyof ED, Cxt>): Promise<OperationResult<ED> | undefined>;
     protected execFreeTimer(timer: FreeTimer<ED, Cxt>, context: Cxt): Promise<OperationResult<ED>> | undefined;
     protected checkpoint(): Promise<number>;

package/lib/ClusterAppLoader.js

@@ -48,8 +48,8 @@ class ClusterAppLoader extends AppLoader_1.AppLoader {
             this.socket.connect();
         }
     }
-    constructor(path, nsDs, nsServer, socketPath) {
-        super(path, nsDs, nsServer);
+    constructor(path, nsDs, nsSocket, nsServer, socketPath) {
+        super(path, nsDs, nsSocket, nsServer);
         this.dbStore.setOnVolatileTrigger(async (entity, trigger, ids, cxtStr, option) => {
             const execLocal = async (ids2) => {
                 const context = await this.makeContext(cxtStr);
@@ -72,7 +72,7 @@ class ClusterAppLoader extends AppLoader_1.AppLoader {
             if (trigger.cs) {
                 // 如果是cluster sensative的触发器，需要发送到相应的instance上被处理
                 const context = await this.makeContext();
-                const rows = await context.select(entity, {
+                const rows = !!(ids.length) ? await context.select(entity, {
                     data: {
                         id: 1,
                         $$seq$$: 1,
@@ -80,7 +80,7 @@ class ClusterAppLoader extends AppLoader_1.AppLoader {
                     filter: {
                         id: { $in: ids },
                     }
-                }, { dontCollect: true });
+                }, { dontCollect: true }) : [];
                 await context.commit();
                 const { instanceCount, instanceId } = (0, env_1.getClusterInfo)();
                 const grouped = (0, lodash_1.groupBy)(rows, (ele) => ele.$$seq$$ % instanceCount);
@@ -101,7 +101,7 @@ class ClusterAppLoader extends AppLoader_1.AppLoader {
                 if ((0, env_1.getClusterInfo)().instanceId === 0) {
                     await execLocal(ids);
                 }
-                else {
+                else if (ids.length) {
                     if (process.env.NODE_ENV === 'development') {
                         console.log(`在trigger「${trigger.name}」上，因为singleton原因，数据「${ids.join(',')}」将被推送到「0」号进程操作（当前进程号是「${(0, env_1.getClusterInfo)().instanceId}」）`);
                     }
@@ -145,7 +145,7 @@ class ClusterAppLoader extends AppLoader_1.AppLoader {
             filter: filter2,
         }, context);
     }
-    selectInWatcher(entity, selection, context, singleton) {
+    selectInWatcher(entity, selection, context, forUpdate, singleton) {
         const { instanceCount, instanceId } = (0, env_1.getClusterInfo)();
         (0, assert_1.default)(instanceCount && typeof instanceId === 'number');
         const { filter } = selection;
@@ -157,7 +157,7 @@ class ClusterAppLoader extends AppLoader_1.AppLoader {
         return super.selectInWatcher(entity, {
             ...selection,
             filter: filter2,
-        }, context);
+        }, context, forUpdate);
     }
     async execWatcher(watcher) {
         if (watcher.singleton && (0, env_1.getClusterInfo)().instanceId !== 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-backend-base",
-    "version": "4.1.6",
+    "version": "4.1.8",
     "description": "oak-backend-base",
     "main": "lib/index",
     "author": {
@@ -22,8 +22,8 @@
         "node-schedule": "^2.1.0",
         "oak-common-aspect": "^3.0.2",
         "oak-db": "^3.3.2",
-        "oak-domain": "^5.1.4",
-        "oak-frontend-base": "^5.3.12",
+        "oak-domain": "^5.1.9",
+        "oak-frontend-base": "^5.3.18",
         "socket.io": "^4.7.2",
         "socket.io-client": "^4.7.2",
         "uuid": "^8.3.2"