@midwayjs/oss 3.20.6 → 4.0.0-beta.1

package/dist/configuration.js

@@ -14,7 +14,8 @@ let OSSConfiguration = class OSSConfiguration {
         await container.getAsync(manager_1.OSSServiceFactory);
     }
 };
-OSSConfiguration = __decorate([
+exports.OSSConfiguration = OSSConfiguration;
+exports.OSSConfiguration = OSSConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'oss',
         importConfigs: [
@@ -30,5 +31,4 @@ OSSConfiguration = __decorate([
         ],
     })
 ], OSSConfiguration);
-exports.OSSConfiguration = OSSConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/manager.js

@@ -14,12 +14,14 @@ const core_1 = require("@midwayjs/core");
 const OSS = require("ali-oss");
 const assert = require("assert");
 function checkBucketConfig(config) {
-    assert(config.endpoint || config.region, "[midway:oss] Must set `endpoint` or `region` in oss's config");
-    assert(config.accessKeySecret && config.accessKeyId, "[midway:oss] Must set `accessKeyId` and `accessKeySecret` in oss's config");
+    assert.ok(config.endpoint || config.region, "[midway:oss] Must set `endpoint` or `region` in oss's config");
+    assert.ok(config.accessKeySecret && config.accessKeyId, "[midway:oss] Must set `accessKeyId` and `accessKeySecret` in oss's config");
 }
 let OSSServiceFactory = class OSSServiceFactory extends core_1.ServiceFactory {
     async init() {
-        await this.initClients(this.ossConfig);
+        await this.initClients(this.ossConfig, {
+            concurrent: true,
+        });
     }
     async createClient(config) {
         if (config['cluster'] && !config.clusters) {
@@ -42,6 +44,7 @@ let OSSServiceFactory = class OSSServiceFactory extends core_1.ServiceFactory {
         return 'oss';
     }
 };
+exports.OSSServiceFactory = OSSServiceFactory;
 __decorate([
     (0, core_1.Config)('oss'),
     __metadata("design:type", Object)
@@ -52,20 +55,19 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], OSSServiceFactory.prototype, "init", null);
-OSSServiceFactory = __decorate([
+exports.OSSServiceFactory = OSSServiceFactory = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], OSSServiceFactory);
-exports.OSSServiceFactory = OSSServiceFactory;
 let OSSService = class OSSService {
     async init() {
-        var _a, _b;
-        this.instance = this.serviceFactory.get(((_b = (_a = this.serviceFactory).getDefaultClientName) === null || _b === void 0 ? void 0 : _b.call(_a)) || 'default');
+        this.instance = this.serviceFactory.get(this.serviceFactory.getDefaultClientName?.() || 'default');
         if (!this.instance) {
             throw new core_1.MidwayCommonError('oss default instance not found.');
         }
     }
 };
+exports.OSSService = OSSService;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", OSSServiceFactory)
@@ -76,16 +78,14 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], OSSService.prototype, "init", null);
-OSSService = __decorate([
+exports.OSSService = OSSService = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], OSSService);
-exports.OSSService = OSSService;
 (0, core_1.delegateTargetPrototypeMethod)(OSSService, [OSS]);
 let OSSSTSService = class OSSSTSService {
     async init() {
-        var _a, _b;
-        this.instance = this.serviceFactory.get(((_b = (_a = this.serviceFactory).getDefaultClientName) === null || _b === void 0 ? void 0 : _b.call(_a)) || 'default');
+        this.instance = this.serviceFactory.get(this.serviceFactory.getDefaultClientName?.() || 'default');
         if (!this.instance) {
             throw new core_1.MidwayCommonError('oss sts default instance not found.');
         }
@@ -94,6 +94,7 @@ let OSSSTSService = class OSSSTSService {
         return this.instance.assumeRole(roleArn, policy, expirationSeconds, session, options);
     }
 };
+exports.OSSSTSService = OSSSTSService;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", OSSServiceFactory)
@@ -104,9 +105,8 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], OSSSTSService.prototype, "init", null);
-OSSSTSService = __decorate([
+exports.OSSSTSService = OSSSTSService = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], OSSSTSService);
-exports.OSSSTSService = OSSSTSService;
 //# sourceMappingURL=manager.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/oss",
   "description": "midway oss component",
-  "version": "3.20.6",
+  "version": "4.0.0-beta.1",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -10,8 +10,8 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.20.4",
-    "@midwayjs/mock": "^3.20.4",
+    "@midwayjs/core": "^4.0.0-beta.1",
+    "@midwayjs/mock": "^4.0.0-beta.1",
     "dotenv": "16.4.7"
   },
   "dependencies": {
@@ -26,8 +26,8 @@
   "license": "MIT",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
+    "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit",
     "ci": "npm run test",
     "lint": "mwts check"
   },
@@ -38,5 +38,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "3bfa0c5d058250a16f4ef304c2c0d10dc060b95c"
+  "gitHead": "832961ec3aff123c033197d8c00cb2bc9bad7ff8"
 }