feat: 🎸 update datastore->1.0.0

BREAKING CHANGE: 🧨 update datastore->1.0.0
unipackage · Jan 4, 2024 · 0559957 · 0559957
1 parent 36c0f87
commit 0559957
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 43 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
     "@glif/filecoin-number": "^2.0.69",
     "@glif/filecoin-rpc-client": "^2.0.43",
     "@types/cbor": "^6.0.0",
-    "@unipackage/datastore": "^0.3.0",
+    "@unipackage/datastore": "^1.0.0",
     "@unipackage/ddd": "^1.1.0",
     "@unipackage/net": "^2.5.1",
     "cbor": "^9.0.1",

diff --git a/src/chain/repo/datastore/index.ts b/src/chain/repo/datastore/index.ts
@@ -18,7 +18,11 @@
  *  limitations under the respective licenses.
  ********************************************************************************/
 
-import { DataStore, DatabaseOptions } from "@unipackage/datastore"
+import {
+    DataStore,
+    DatabaseConnection,
+    DatabaseConnectionOptions,
+} from "@unipackage/datastore"
 import { Message } from "../../../basic/message/types"
 import { BlockMessages } from "../../../basic/block/types"
 import { Tipset } from "../../../basic/tipset/types"
@@ -38,12 +42,11 @@ export class MessageMongoDatastore extends DataStore<
     ValueFields<Message>,
     MessageDocument
 > {
-    constructor(uri: string, options?: DatabaseOptions) {
+    constructor(connection: DatabaseConnection) {
         super(
             new MongooseDataStore<ValueFields<Message>, MessageDocument>(
                 MessageModel,
-                uri,
-                options
+                connection
             )
         )
     }
@@ -67,12 +70,12 @@ export class BlockMongoDatastore extends DataStore<
     ValueFields<BlockMessages>,
     BlockMessagesDocument
 > {
-    constructor(uri: string, options?: DatabaseOptions) {
+    constructor(connection: DatabaseConnection) {
         super(
             new MongooseDataStore<
                 ValueFields<BlockMessages>,
                 BlockMessagesDocument
-            >(BlockMessagesModel, uri, options)
+            >(BlockMessagesModel, connection)
         )
     }
 
@@ -94,12 +97,11 @@ export class TipsetMongoDatastore extends DataStore<
     ValueFields<Tipset>,
     TipsetDocument
 > {
-    constructor(uri: string, options?: DatabaseOptions) {
+    constructor(connection: DatabaseConnection) {
         super(
             new MongooseDataStore<ValueFields<Tipset>, TipsetDocument>(
                 TipsetModel,
-                uri,
-                options
+                connection
             )
         )
     }

diff --git a/src/chain/service/index.ts b/src/chain/service/index.ts
@@ -157,14 +157,6 @@ export class ChainService implements ChainService {
             error: undefined,
         }
         try {
-            // Connect to data stores.
-            const msgConnect = await this.messageDs.connect()
-            if (!msgConnect.ok) return { ok: false, error: msgConnect.error }
-            const bmConnect = await this.blockMessagesDs.connect()
-            if (!bmConnect.ok) return { ok: false, error: bmConnect.error }
-            const tsConnect = await this.tipsetDs.connect()
-            if (!tsConnect.ok) return { ok: false, error: tsConnect.error }
-
             // Save messages to the data store.
             const msgDoResults = await Promise.all(
                 chain.messages.map(
@@ -206,12 +198,6 @@ export class ChainService implements ChainService {
             result.error = error
             return result
         } finally {
-            // Disconnect from data stores.
-            /* 
-            await this.tipsetDs.disconnect();
-            await this.blockMessagesDs.disconnect();
-            await this.messageDs.disconnect();
-            */
         }
 
         return result

diff --git a/test/chain/service/index.test.ts b/test/chain/service/index.test.ts
@@ -18,7 +18,12 @@
  *  limitations under the respective licenses.
  ********************************************************************************/
 
-import { messageDs, blockDs, tipsetDs } from "../../helper/mongodb/instance"
+import {
+    messageDs,
+    blockDs,
+    tipsetDs,
+    connection_noAuth,
+} from "../../helper/mongodb/instance"
 import "mocha"
 import { ChainFilecoinRPC } from "../../../src/chain/repo/rpc" // Replace with the actual path to your TypeScript file
 import { ChainService } from "../../../src/chain/service" // Replace with the actual path to your TypeScript file
@@ -42,15 +47,11 @@ describe("ChainService", () => {
     })
 
     beforeEach(async () => {
-        await tipsetDs.connect()
-        await blockDs.connect()
-        await messageDs.connect()
+        await connection_noAuth.connect()
     })
 
     afterEach(async () => {
-        await tipsetDs.disconnect()
-        await blockDs.disconnect()
-        await messageDs.disconnect()
+        await connection_noAuth.disconnect()
     })
 
     describe("GetAndSaveChainInfoByHeight", () => {

diff --git a/test/helper/mongodb/instance/index.ts b/test/helper/mongodb/instance/index.ts
@@ -18,23 +18,21 @@
  *  limitations under the respective licenses.
  ********************************************************************************/
 
+import { DatabaseConnection } from "@unipackage/datastore"
 import {
     MessageMongoDatastore,
     BlockMongoDatastore,
     TipsetMongoDatastore,
 } from "../../../../src/chain/repo/datastore"
 
-export const messageDs = new MessageMongoDatastore(
-    "mongodb://127.0.0.1:27017/datastore"
-)
-export const blockDs = new BlockMongoDatastore(
-    "mongodb://127.0.0.1:27017/datastore"
-)
-export const tipsetDs = new TipsetMongoDatastore(
+export const connection_noAuth = DatabaseConnection.getInstance(
     "mongodb://127.0.0.1:27017/datastore"
 )
+export const messageDs = new MessageMongoDatastore(connection_noAuth)
+export const blockDs = new BlockMongoDatastore(connection_noAuth)
+export const tipsetDs = new TipsetMongoDatastore(connection_noAuth)
 
-export const messageAuthDs = new MessageMongoDatastore(
+export const connection_auth = DatabaseConnection.getInstance(
     "mongodb://127.0.0.1:27018/datastoreAuth",
     {
         user: "admin",
@@ -46,3 +44,4 @@ export const messageAuthDs = new MessageMongoDatastore(
         tlsAllowInvalidHostnames: true,
     }
 )
+export const messageAuthDs = new MessageMongoDatastore(connection_auth)