oak-backend-base 4.1.16 → 4.1.18

package/lib/AppLoader.d.ts

@@ -37,7 +37,10 @@ export declare class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt exten
     }>;
     initialize(): Promise<void>;
     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>][];
+    getEndpoints(prefix: string): [string, "post" | "get" | "put" | "delete", string, (params: Record<string, string>, headers: IncomingHttpHeaders, req: IncomingMessage, body?: any) => Promise<{
+        headers?: Record<string, string | string[]> | undefined;
+        data: 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, forUpdate?: true, singleton?: true): Promise<Partial<ED[T]["Schema"]>[]>;
     protected execWatcher(watcher: Watcher<ED, keyof ED, Cxt>): Promise<OperationResult<ED> | undefined>;

package/lib/AppLoader.js

@@ -264,7 +264,7 @@ class AppLoader extends types_1.AppLoader {
         const endPointRouters = [];
         const endPointMap = {};
         const transformEndpointItem = (key, item) => {
-            const { name, method, fn, params: itemParams } = item;
+            const { name, method, fn, params: itemParams, type } = item;
             const k = `${key}-${name}-${method}`;
             const makeEndpoint = async () => {
                 endPointMap[k] = true;
@@ -275,16 +275,24 @@ class AppLoader extends types_1.AppLoader {
                     }
                 }
                 endPointRouters.push([name, method, url, async (params, headers, req, body) => {
-                        const context = await this.makeContext(undefined, headers);
-                        try {
-                            const result = await fn(context, params, headers, req, body);
-                            await context.commit();
+                        if (type == "free") {
+                            const result = await fn(() => this.makeContext(undefined, headers), params, headers, req, body);
                             return result;
                         }
-                        catch (err) {
-                            await context.rollback();
-                            console.error(`endpoint「${key}」方法「${method}」出错`, err);
-                            throw err;
+                        else {
+                            const context = await this.makeContext(undefined, headers);
+                            try {
+                                const data = await fn(context, params, headers, req, body);
+                                await context.commit();
+                                return {
+                                    data,
+                                };
+                            }
+                            catch (err) {
+                                await context.rollback();
+                                console.error(`endpoint「${key}」方法「${method}」出错`, err);
+                                throw err;
+                            }
                         }
                     }]);
             };

package/lib/ClusterAppLoader.d.ts

@@ -5,7 +5,7 @@ import { AppLoader } from './AppLoader';
 import { Namespace } from 'socket.io';
 import { Socket } from 'socket.io-client';
 export declare class ClusterAppLoader<ED extends EntityDict & BaseEntityDict, Cxt extends BackendRuntimeContext<ED>> extends AppLoader<ED, Cxt> {
-    private csTriggers;
+    private commitTriggers;
     static VolatileTriggerEvent: string;
     protected socket: Socket;
     private connectServerSocket;

package/lib/ClusterAppLoader.js

@@ -10,13 +10,13 @@ const AppLoader_1 = require("./AppLoader");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const socket_io_client_1 = require("socket.io-client");
 class ClusterAppLoader extends AppLoader_1.AppLoader {
-    csTriggers;
+    commitTriggers;
     static VolatileTriggerEvent = 'vtEvent';
     socket;
     connectServerSocket() {
         const { instanceId } = (0, env_1.getClusterInfo)();
         this.socket.on('connect', () => {
-            const csTriggerNames = Object.keys(this.csTriggers).map(ele => `${ele}-${instanceId}`);
+            const csTriggerNames = Object.keys(this.commitTriggers).filter(ele => this.commitTriggers[ele]).map(ele => `${ele}-${instanceId}`);
             if (csTriggerNames.length > 0) {
                 this.socket.emit('sub', csTriggerNames);
             }
@@ -37,10 +37,8 @@ class ClusterAppLoader extends AppLoader_1.AppLoader {
             }
         });
     }
-    sub(name, clusterSensative) {
+    sub(name) {
         const { instanceId } = (0, env_1.getClusterInfo)();
-        (0, assert_1.default)(!this.csTriggers[name], `命名为${name}的trigger出现了多次，请检查`);
-        this.csTriggers[name] = !!clusterSensative;
         if (this.socket.connected) {
             this.socket.emit('sub', [`${name}-${instanceId}`]);
         }
@@ -112,7 +110,7 @@ class ClusterAppLoader extends AppLoader_1.AppLoader {
                 await execLocal(ids);
             }
         });
-        this.csTriggers = {};
+        this.commitTriggers = {};
         const { name } = nsServer;
         // 本机pm2的socketio连接，在cli中连接到adaptor之后，会被自然推到redis，这边继续保持pm2的socketio连接即可
         const socketUrl = `http://localhost:${process.env.PM2_PORT || 8080}${name}`;
@@ -124,11 +122,14 @@ class ClusterAppLoader extends AppLoader_1.AppLoader {
     registerTrigger(trigger) {
         // 如果是cluster sensative的trigger，注册到socket事件上
         // 如果是singletone的trigger，只有0号实例注册
-        const { when, cs, singleton } = trigger;
+        const { when, cs, singleton, name } = trigger;
         (0, assert_1.default)(!(cs && singleton));
-        if (when === 'commit' && (cs || singleton && (0, env_1.getClusterInfo)().instanceId === 0)) {
-            const { name } = trigger;
-            this.sub(name, cs);
+        if (when === 'commit') {
+            (0, assert_1.default)(!this.commitTriggers[name], `命名为${name}的trigger出现了多次，请检查`);
+            this.commitTriggers[name] = !!cs;
+            if (cs || singleton && (0, env_1.getClusterInfo)().instanceId === 0) {
+                this.sub(name);
+            }
         }
         this.dbStore.registerTrigger(trigger);
     }
@@ -175,8 +176,8 @@ class ClusterAppLoader extends AppLoader_1.AppLoader {
     async checkpoint() {
         const { instanceCount, instanceId } = (0, env_1.getClusterInfo)();
         let count = 0;
-        for (const name in this.csTriggers) {
-            if (this.csTriggers[name]) {
+        for (const name in this.commitTriggers) {
+            if (this.commitTriggers[name]) {
                 count += await this.dbStore.independentCheckPoint(name, this.getCheckpointTs(), instanceCount, instanceId);
             }
             else {

package/lib/Synchronizer.js

@@ -306,7 +306,7 @@ class Synchronizer {
                 id: 1,
             },
             filter: {
-                [types_1.TriggerDataAttribute]: {
+                [types_1.TriggerUuidAttribute]: {
                     $exists: true,
                 },
             }
@@ -322,6 +322,7 @@ class Synchronizer {
                     targetEntity: 1,
                     operatorId: 1,
                     [types_1.TriggerDataAttribute]: 1,
+                    [types_1.TriggerUuidAttribute]: 1,
                     bornAt: 1,
                     $$createAt$$: 1,
                     $$seq$$: 1,
@@ -340,7 +341,7 @@ class Synchronizer {
                     id: { $in: ids },
                 },
             }, { dontCollect: true, forUpdate: true });
-            dirtyOpers = dirtyOpers.filter(ele => !!ele[types_1.TriggerDataAttribute]);
+            dirtyOpers = dirtyOpers.filter(ele => !!ele[types_1.TriggerUuidAttribute]);
             if (dirtyOpers.length > 0) {
                 for (const c in this.channelDict) {
                     (0, assert_1.default)(this.channelDict[c].queue.length === 0);
@@ -565,7 +566,7 @@ class Synchronizer {
                     }
                 }
                 if (!verify(publicKey, JSON.stringify(body), syncTs, syncNonce, syncSign)) {
-                    throw new Error('sync验签失败');
+                    throw new types_1.OakSignatureVerificationException('同步验签失败');
                 }
                 const opers = body;
                 const ids = opers.map(ele => ele.id);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-backend-base",
-    "version": "4.1.16",
+    "version": "4.1.18",
     "description": "oak-backend-base",
     "main": "lib/index",
     "author": {
@@ -16,14 +16,15 @@
         "build": "tsc && npm run copy-files"
     },
     "dependencies": {
+        "@types/koa": "^2.15.0",
         "lodash": "^4.17.21",
         "mysql": "^2.18.1",
         "mysql2": "^2.3.3",
         "node-schedule": "^2.1.0",
         "oak-common-aspect": "^3.0.5",
-        "oak-db": "^3.3.5",
-        "oak-domain": "^5.1.19",
-        "oak-frontend-base": "^5.3.27",
+        "oak-db": "^3.3.6",
+        "oak-domain": "^5.1.22",
+        "oak-frontend-base": "^5.3.30",
         "socket.io": "^4.8.1",
         "socket.io-client": "^4.7.2",
         "uuid": "^8.3.2"