v4.6 -1 (#459)

packages/service/common/mongo/controller.ts

@@ -0,0 +1,26 @@
+/* add logger */
+export const addLog = {
+  info: (msg: string, obj?: Record<string, any>) => {
+    global.logger?.info(msg, { meta: obj });
+  },
+  error: (msg: string, error?: any) => {
+    global.logger?.error(msg, {
+      meta: {
+        stack: error?.stack,
+        ...(error?.config && {
+          config: {
+            headers: error.config.headers,
+            url: error.config.url,
+            data: error.config.data
+          }
+        }),
+        ...(error?.response && {
+          response: {
+            status: error.response.status,
+            statusText: error.response.statusText
+          }
+        })
+      }
+    });
+  }
+};

packages/service/common/mongo/init.ts

@@ -1,6 +1,6 @@
 import mongoose from './index';
-import 'winston-mongodb';
 import { createLogger, format, transports } from 'winston';
+import 'winston-mongodb';
 
 /**
  * connect MongoDB and init data
@@ -19,9 +19,6 @@ export async function connectMongo({
 
   beforeHook && (await beforeHook());
 
-  // logger
-  initLogger();
-
   console.log('mongo start connect');
   try {
     mongoose.set('strictQuery', true);
@@ -35,9 +32,11 @@ export async function connectMongo({
     });
 
     console.log('mongo connected');
+    initLogger();
 
     afterHook && (await afterHook());
   } catch (error) {
+    global.mongodb.disconnect();
     console.log('error->', 'mongo connect error', error);
     global.mongodb = undefined;
   }

packages/service/common/mongo/sessionRun.ts

@@ -1,39 +1,21 @@
-import mongoose from './index';
+import mongoose, { connectionMongo } from './index';
 
-export class MongoSession {
-  tasks: (() => Promise<any>)[] = [];
-  session: mongoose.mongo.ClientSession | null = null;
-  opts: {
-    session: mongoose.mongo.ClientSession;
-    new: boolean;
-  } | null = null;
+export async function mongoSessionTask(
+  fn: (session: mongoose.mongo.ClientSession) => Promise<any>
+) {
+  const session = await connectionMongo.startSession();
 
-  constructor() {}
-  async init() {
-    this.session = await mongoose.startSession();
-    this.opts = { session: this.session, new: true };
-  }
-  push(
-    tasks: ((opts: {
-      session: mongoose.mongo.ClientSession;
-      new: boolean;
-    }) => () => Promise<any>)[] = []
-  ) {
-    if (!this.opts) return;
-    // this.tasks = this.tasks.concat(tasks.map((item) => item(this.opts)));
-  }
-  async run() {
-    if (!this.session || !this.opts) return;
-    try {
-      this.session.startTransaction();
+  try {
+    session.startTransaction();
 
-      const opts = { session: this.session, new: true };
+    await fn(session);
 
-      await this.session.commitTransaction();
-    } catch (error) {
-      await this.session.abortTransaction();
-      console.error(error);
-    }
-    this.session.endSession();
+    await session.commitTransaction();
+    await session.endSession();
+  } catch (error) {
+    await session.abortTransaction();
+    await session.endSession();
+    console.error(error);
+    return Promise.reject(error);
   }
 }