fix: server hostname args (#1196)

* fix: server hostname args * fix: server sts endpoint * fix: oss default factory definition * fix: lint
midwayjs · Jul 31, 2021 · b9d73f0 · b9d73f0
1 parent 1681f42
commit b9d73f0
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 23 deletions.
diff --git a/packages/oss/jest.setup.js b/packages/oss/jest.setup.js
@@ -1,2 +1,23 @@
+const path = require('path');
+const fs = require('fs');
+
 process.env.MIDWAY_TS_MODE = 'true';
 jest.setTimeout(30000);
+
+const envFile = path.join(__dirname, '.env');
+if (!fs.existsSync(envFile)) {
+  fs.writeFileSync(
+    envFile,
+    'ALI_SDK_OSS_REGION=oss-cn-beijing\n' +
+      'ALI_SDK_OSS_ENDPOINT=\n' +
+      'ALI_SDK_OSS_ID=\n' +
+      'ALI_SDK_OSS_SECRET=\n' +
+      'ALI_SDK_OSS_BUCKET=\n' +
+      'ALI_SDK_STS_ID=\n' +
+      'ALI_SDK_STS_SECRET=\n' +
+      'ALI_SDK_STS_BUCKET=\n' +
+      'ALI_SDK_STS_ROLE=\n' +
+      'ALI_SDK_STS_ENDPOINT=https://sts.aliyuncs.com\n'
+  );
+  console.log('please set oss ak in .env file');
+}
diff --git a/packages/oss/src/manager.ts b/packages/oss/src/manager.ts
@@ -23,7 +23,7 @@ function checkBucketConfig(config) {
 
 @Provide()
 @Scope(ScopeEnum.Singleton)
-export class OSSServiceFactory<T = OSS | OSS.STS> extends ServiceFactory<T> {
+export class OSSServiceFactory<T = OSS> extends ServiceFactory<T> {
   @Config('oss')
   ossConfig;
 

diff --git a/packages/oss/test/index.test.ts b/packages/oss/test/index.test.ts
@@ -177,6 +177,9 @@ describe('/test/index.test.ts', () => {
 
     const roleArn = require('./sts_config').roleArn;
     const client1 = ossServiceFactory.get<OSSSTSService>('client1');
+    const client2 = ossServiceFactory.get('client2');
+
+    expect(client2.put).toBeDefined();
 
     const result = await client1.assumeRole(roleArn);
     expect((result as any).res.status).toEqual(200);

diff --git a/packages/oss/test/sts_config.ts b/packages/oss/test/sts_config.ts
@@ -5,5 +5,5 @@ export = {
   accessKeySecret: process.env.ALI_SDK_STS_SECRET,
   roleArn: process.env.ALI_SDK_STS_ROLE,
   bucket: process.env.ALI_SDK_STS_BUCKET,
-  // endpoint: process.env.TRAVIS ? 'https://sts.us-west-1.aliyuncs.com/' : null,
+  endpoint: process.env.ALI_SDK_STS_ENDPOINT,
 };
diff --git a/packages/web-express/src/framework.ts b/packages/web-express/src/framework.ts
@@ -92,13 +92,15 @@ export class MidwayExpressFramework extends BaseFramework<
   public async run(): Promise<void> {
     if (this.configurationOptions.port) {
       new Promise<void>(resolve => {
-        this.server.listen(
-          this.configurationOptions.port,
-          this.configurationOptions.hostname || '127.0.0.1',
-          () => {
-            resolve();
-          }
-        );
+        const args: any[] = [this.configurationOptions.port];
+        if (this.configurationOptions.hostname) {
+          args.push(this.configurationOptions.hostname);
+        }
+        args.push(() => {
+          resolve();
+        });
+
+        this.server.listen(...args);
       });
     }
   }

diff --git a/packages/web-koa/src/framework.ts b/packages/web-koa/src/framework.ts
@@ -282,13 +282,14 @@ export class MidwayKoaFramework extends MidwayKoaBaseFramework<
   public async run(): Promise<void> {
     if (this.configurationOptions.port) {
       new Promise<void>(resolve => {
-        this.server.listen(
-          this.configurationOptions.port,
-          this.configurationOptions.hostname || '127.0.0.1',
-          () => {
-            resolve();
-          }
-        );
+        const args: any[] = [this.configurationOptions.port];
+        if (this.configurationOptions.hostname) {
+          args.push(this.configurationOptions.hostname);
+        }
+        args.push(() => {
+          resolve();
+        });
+        this.server.listen(...args);
       });
     }
   }

diff --git a/packages/web/src/framework/singleProcess.ts b/packages/web/src/framework/singleProcess.ts
@@ -39,13 +39,14 @@ export class MidwayWebSingleProcessFramework
 
     if (this.configurationOptions.port) {
       new Promise<void>(resolve => {
-        this.server.listen(
-          this.configurationOptions.port,
-          this.configurationOptions.hostname || '127.0.0.1',
-          () => {
-            resolve();
-          }
-        );
+        const args: any[] = [this.configurationOptions.port];
+        if (this.configurationOptions.hostname) {
+          args.push(this.configurationOptions.hostname);
+        }
+        args.push(() => {
+          resolve();
+        });
+        this.server.listen(...args);
       });
     }
   }