@midwayjs/oss 3.3.1 → 3.3.5

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export { OSSConfiguration as Configuration } from './configuration';
 export * from './manager';
+export * from './interface';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -18,4 +18,5 @@ exports.Configuration = void 0;
 var configuration_1 = require("./configuration");
 Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.OSSConfiguration; } });
 __exportStar(require("./manager"), exports);
+__exportStar(require("./interface"), exports);
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -0,0 +1,19 @@
+import * as OSS from 'ali-oss';
+export declare type Without<T, U> = {
+    [P in Exclude<keyof T, keyof U>]?: never;
+};
+export declare type XOR<T, U> = (Without<T, U> & U) | (Without<U, T> & T);
+export interface MWOSSOptions extends OSS.Options {
+}
+export interface MWOSSClusterOptions extends OSS.ClusterOptions {
+    clusters: (OSS.ClusterType & {
+        endpoint: string;
+    })[];
+    timeout?: string;
+}
+export interface MWOSSSTSOptions extends OSS.STSOptions {
+    sts: boolean;
+}
+export declare type OSSServiceFactoryReturnType = XOR<XOR<OSS, OSS.STS>, OSS.ClusterClient>;
+export declare type OSSServiceFactoryCreateClientConfigType = XOR<XOR<MWOSSOptions, MWOSSClusterOptions>, MWOSSSTSOptions>;
+//# sourceMappingURL=interface.d.ts.map

package/dist/interface.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=interface.js.map

package/dist/manager.d.ts

@@ -1,9 +1,10 @@
 import * as OSS from 'ali-oss';
 import { ServiceFactory } from '@midwayjs/core';
-export declare class OSSServiceFactory<T = OSS> extends ServiceFactory<T> {
-    ossConfig: any;
+import type { OSSServiceFactoryReturnType, OSSServiceFactoryCreateClientConfigType } from './interface';
+export declare class OSSServiceFactory<T extends OSSServiceFactoryReturnType = OSSServiceFactoryReturnType> extends ServiceFactory<T> {
+    ossConfig: OSSServiceFactoryCreateClientConfigType;
     init(): Promise<void>;
-    createClient(config: any): Promise<T>;
+    createClient(config: OSSServiceFactoryCreateClientConfigType): Promise<T>;
     getName(): string;
 }
 export declare class OSSService implements OSS {

package/dist/manager.js

@@ -23,14 +23,20 @@ let OSSServiceFactory = class OSSServiceFactory extends core_1.ServiceFactory {
         await this.initClients(this.ossConfig);
     }
     async createClient(config) {
-        if (config.cluster) {
-            config.cluster.forEach(checkBucketConfig);
+        if (config['cluster'] && !config.clusters) {
+            config.clusters = config['cluster'];
+        }
+        if (config.clusters) {
+            config.clusters.forEach(checkBucketConfig);
+            // @ts-expect-error because this code can return the correct type, but TS still reports an error
             return new OSS.ClusterClient(config);
         }
         if (config.sts === true) {
+            // @ts-expect-error because this code can return the correct type, but TS still reports an error
             return new OSS.STS(config);
         }
         checkBucketConfig(config);
+        // @ts-expect-error because this code can return the correct type, but TS still reports an error
         return new OSS(config);
     }
     getName() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/oss",
   "description": "midway oss component",
-  "version": "3.3.1",
+  "version": "3.3.5",
   "main": "dist/index",
   "typings": "index.d.ts",
   "files": [
@@ -10,9 +10,9 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.3.1",
-    "@midwayjs/decorator": "^3.1.6",
-    "@midwayjs/mock": "^3.3.1",
+    "@midwayjs/core": "^3.3.5",
+    "@midwayjs/decorator": "^3.3.4",
+    "@midwayjs/mock": "^3.3.5",
     "@types/ali-oss": "6.16.3",
     "dotenv": "16.0.0"
   },
@@ -39,5 +39,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "f603b622b205ec126de628eeab59f90045a75dd2"
+  "gitHead": "5a835008aaa26e1b3c7d99c525f4a9fdaa3e41d1"
 }