feat: serviceFactory support default client name (#2482)

midwayjs · Nov 17, 2022 · 170092f · 170092f
1 parent 541be19
commit 170092f
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 7 deletions.
diff --git a/packages/axios/src/serviceManager.ts b/packages/axios/src/serviceManager.ts
@@ -58,7 +58,9 @@ export class HttpService implements AxiosHttpService {
 
   @Init()
   protected async init() {
-    this.instance = this.serviceFactory.get('default');
+    this.instance = this.serviceFactory.get(
+      this.serviceFactory.getDefaultClientName?.() || 'default'
+    );
     if (!this.instance) {
       throw new MidwayCommonError('axios default instance not found.');
     }

diff --git a/packages/core/src/common/serviceFactory.ts b/packages/core/src/common/serviceFactory.ts
@@ -15,7 +15,6 @@ export abstract class ServiceFactory<T> {
       options.clients = options.clients || {};
       options.clients['default'] = options.clients['default'] || {};
       extend(true, options.clients['default'], options.client);
-      delete options.client;
     }
 
     // multi client
@@ -58,4 +57,8 @@ export abstract class ServiceFactory<T> {
       await this.destroyClient(value);
     }
   }
+
+  public getDefaultClientName(): string {
+    return this.options['defaultClientName'];
+  }
 }
diff --git a/packages/core/src/interface.ts b/packages/core/src/interface.ts
@@ -24,6 +24,7 @@ export type ServiceFactoryConfigOption<OPTIONS> = {
   clients?: {
     [key: string]: PowerPartial<OPTIONS>;
   };
+  defaultClientName?: string;
 };
 
 export type DataSourceManagerConfigOption<OPTIONS> = {

diff --git a/packages/core/test/common/serviceFactory.test.ts b/packages/core/test/common/serviceFactory.test.ts
@@ -59,4 +59,13 @@ describe('test/common/serviceFactory.test.ts', () => {
     });
     expect(instance.get('default')).toBeDefined();
   });
+
+  it('should test default name', async () => {
+    const instance = new TestServiceFactory();
+    await instance.initClients({
+      defaultClientName: 'abc',
+      clients: {}
+    })
+    expect(instance.getDefaultClientName()).toEqual('abc');
+  });
 });
diff --git a/packages/cos/src/manager.ts b/packages/cos/src/manager.ts
@@ -52,7 +52,9 @@ export class COSService implements COS {
 
   @Init()
   async init() {
-    this.instance = this.serviceFactory.get('default');
+    this.instance = this.serviceFactory.get(
+      this.serviceFactory.getDefaultClientName?.() || 'default'
+    );
     if (!this.instance) {
       throw new MidwayCommonError('cos default instance not found.');
     }

diff --git a/packages/oss/src/manager.ts b/packages/oss/src/manager.ts
@@ -78,7 +78,9 @@ export class OSSService implements OSS {
 
   @Init()
   async init() {
-    this.instance = this.serviceFactory.get('default');
+    this.instance = this.serviceFactory.get(
+      this.serviceFactory.getDefaultClientName?.() || 'default'
+    );
     if (!this.instance) {
       throw new MidwayCommonError('oss default instance not found.');
     }
@@ -102,7 +104,9 @@ export class OSSSTSService implements OSS.STS {
 
   @Init()
   async init() {
-    this.instance = this.serviceFactory.get('default');
+    this.instance = this.serviceFactory.get(
+      this.serviceFactory.getDefaultClientName?.() || 'default'
+    );
     if (!this.instance) {
       throw new MidwayCommonError('oss sts default instance not found.');
     }

diff --git a/packages/redis/src/manager.ts b/packages/redis/src/manager.ts
@@ -112,7 +112,9 @@ export class RedisService implements Redis {
 
   @Init()
   async init() {
-    this.instance = this.serviceFactory.get('default');
+    this.instance = this.serviceFactory.get(
+      this.serviceFactory.getDefaultClientName?.() || 'default'
+    );
     if (!this.instance) {
       throw new MidwayCommonError('redis default instance not found.');
     }

diff --git a/packages/tablestore/src/manager.ts b/packages/tablestore/src/manager.ts
@@ -42,7 +42,9 @@ export class TableStoreService implements TableStoreClient {
 
   @Init()
   async init() {
-    this.instance = this.serviceFactory.get('default');
+    this.instance = this.serviceFactory.get(
+      this.serviceFactory.getDefaultClientName?.() || 'default'
+    );
     if (!this.instance) {
       throw new MidwayCommonError('TableStore default instance not found.');
     }