oak-backend-base 4.1.15 → 4.1.17

package/lib/AppLoader.js

@@ -16,6 +16,7 @@ const dependencyBuilder_1 = require("oak-domain/lib/compiler/dependencyBuilder")
 const DataSubscriber_1 = tslib_1.__importDefault(require("./cluster/DataSubscriber"));
 const env_1 = require("./cluster/env");
 const Synchronizer_1 = tslib_1.__importDefault(require("./Synchronizer"));
+const i18n_1 = tslib_1.__importDefault(require("oak-domain/lib/data/i18n"));
 class AppLoader extends types_1.AppLoader {
     dbStore;
     aspectDict;
@@ -168,10 +169,10 @@ class AppLoader extends types_1.AppLoader {
         // 从aspect过来的，不能有空cxtString，以防被误判为root
         const context = await this.makeContext(contextString || '{}', headers);
         const fn = this.aspectDict[name];
-        if (!fn) {
-            throw new Error(`不存在的接口名称: ${name}`);
-        }
         try {
+            if (!fn) {
+                throw new Error(`不存在的接口名称: ${name}`);
+            }
             const result = await fn(params, context);
             await context.refineOpRecords();
             const { opRecords } = context;
@@ -185,12 +186,24 @@ class AppLoader extends types_1.AppLoader {
         }
         catch (err) {
             await context.rollback();
+            if (err instanceof types_1.OakException) {
+                throw err;
+            }
+            if (err instanceof Error) {
+                const exception = await context.tryDeduceException(err);
+                if (exception) {
+                    throw exception;
+                }
+            }
             throw err;
         }
     }
     async initialize() {
         await this.dbStore.initialize({ ifExists: 'dropIfNotStatic' });
         const data = this.requireSth('lib/data/index');
+        // oak-domain中只有i18n
+        (0, assert_1.default)(data.i18n);
+        data.i18n.push(...i18n_1.default);
         const context = this.contextBuilder(this.dbStore);
         context.openRootMode();
         for (const entity in data) {
@@ -253,29 +266,38 @@ class AppLoader extends types_1.AppLoader {
         const transformEndpointItem = (key, item) => {
             const { name, method, fn, params: itemParams } = item;
             const k = `${key}-${name}-${method}`;
+            const makeEndpoint = async () => {
+                endPointMap[k] = true;
+                let url = `${prefix}/${key}`;
+                if (itemParams) {
+                    for (const p of itemParams) {
+                        url += `/:${p}`;
+                    }
+                }
+                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();
+                            return result;
+                        }
+                        catch (err) {
+                            await context.rollback();
+                            console.error(`endpoint「${key}」方法「${method}」出错`, err);
+                            throw err;
+                        }
+                    }]);
+            };
             if (endPointMap[k]) {
-                throw new Error(`endpoint中，url为「${key}」、名为${name}的方法「${method}」存在重复定义`);
-            }
-            endPointMap[k] = true;
-            let url = `${prefix}/${key}`;
-            if (itemParams) {
-                for (const p of itemParams) {
-                    url += `/:${p}`;
+                if (process.env.NODE_ENV === 'development') {
+                    // 这里发现在热重载模式下会出现报错，debug跟到requireSth发现问题，怀疑是node的require机制导致的，先加个容错，在其他环境肯定不会出现
+                    console.warn(`endpoint中，url为「${key}」、名为${name}的方法「${method}」存在重复定义，将进行覆盖`);
+                    makeEndpoint();
+                    return;
                 }
+                throw new Error(`endpoint中，url为「${key}」、名为${name}的方法「${method}」存在重复定义`);
             }
-            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();
-                        return result;
-                    }
-                    catch (err) {
-                        await context.rollback();
-                        console.error(`endpoint「${key}」方法「${method}」出错`, err);
-                        throw err;
-                    }
-                }]);
+            makeEndpoint();
         };
         if (endpoints) {
             for (const router in endpoints) {

package/lib/ClusterAppLoader.js

@@ -114,6 +114,7 @@ class ClusterAppLoader extends AppLoader_1.AppLoader {
         });
         this.csTriggers = {};
         const { name } = nsServer;
+        // 本机pm2的socketio连接，在cli中连接到adaptor之后，会被自然推到redis，这边继续保持pm2的socketio连接即可
         const socketUrl = `http://localhost:${process.env.PM2_PORT || 8080}${name}`;
         this.socket = (0, socket_io_client_1.io)(socketUrl, {
             path: socketPath,

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);

package/lib/cluster/env.js

@@ -35,10 +35,12 @@ function initialize() {
         const usingCluster = true;
         const instanceId = parseInt(instanceIdStr);
         const instanceCount = parseInt(getProcessEnvOption('OAK_INSTANCE_CNT'));
+        const enableRedis = getProcessEnvOption('OAK_ENABLE_REDIS') === 'true';
         return {
             usingCluster,
             instanceCount,
             instanceId,
+            enableRedis,
         };
     }
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-backend-base",
-    "version": "4.1.15",
+    "version": "4.1.17",
     "description": "oak-backend-base",
     "main": "lib/index",
     "author": {
@@ -21,9 +21,9 @@
         "mysql2": "^2.3.3",
         "node-schedule": "^2.1.0",
         "oak-common-aspect": "^3.0.5",
-        "oak-db": "^3.3.5",
-        "oak-domain": "^5.1.16",
-        "oak-frontend-base": "^5.3.25",
+        "oak-db": "^3.3.6",
+        "oak-domain": "^5.1.21",
+        "oak-frontend-base": "^5.3.29",
         "socket.io": "^4.8.1",
         "socket.io-client": "^4.7.2",
         "uuid": "^8.3.2"