@tstdl/base 0.86.0-beta10 → 0.86.0-beta11

package/module/modules/web-server.module.js

@@ -24,7 +24,6 @@ __export(web_server_module_exports, {
 });
 module.exports = __toCommonJS(web_server_module_exports);
 var import_server = require("../../api/server/index.js");
-var import_log = require("../../decorators/log.js");
 var import_disposable = require("../../disposable/disposable.js");
 var import_http_server = require("../../http/server/http-server.js");
 var import_decorators = require("../../injector/decorators.js");
@@ -87,7 +86,6 @@ let WebServerModule = class WebServerModule2 extends import_module_base.ModuleBa
 };
 WebServerModule = __decorate([
   (0, import_decorators.Singleton)({ defaultArgumentProvider: () => webServerModuleConfiguration }),
-  (0, import_log.Log)(),
   __metadata("design:paramtypes", [])
 ], WebServerModule);
 function configureWebServerModule(config) {

package/object-storage/object-storage-provider.d.ts

@@ -4,5 +4,5 @@ export declare abstract class ObjectStorageProvider<T extends ObjectStorage = Ob
      * get an object storage instance
      * @param module name for object container (module) to store objects in. Can be used to isolate objects like profile pictures and log files
      */
-    abstract get(module: string): T | Promise<T>;
+    abstract get(module: string): T;
 }

package/object-storage/s3/s3.object-storage-provider.d.ts

@@ -17,10 +17,6 @@ export declare class S3ObjectStorageProviderConfig {
      * mutually exclusive with bucket
      */
     bucketPerModule?: boolean;
-    /**
-     * create bucket for requested storage module if it does not exist
-     */
-    autoCreateBucket?: boolean;
     /**
      * s3 access key
      */
@@ -34,9 +30,8 @@ export declare const bucketPerModule: unique symbol;
 export declare class S3ObjectStorageProvider extends ObjectStorageProvider<S3ObjectStorage> {
     private readonly client;
     private readonly bucket;
-    private readonly createBucket;
     constructor(config: S3ObjectStorageProviderConfig);
-    get(module: string): Promise<S3ObjectStorage>;
+    get(module: string): S3ObjectStorage;
 }
 /**
  * configure s3 object storage provider

package/object-storage/s3/s3.object-storage-provider.js

@@ -61,10 +61,6 @@ class S3ObjectStorageProviderConfig {
    * mutually exclusive with bucket
    */
   bucketPerModule;
-  /**
-   * create bucket for requested storage module if it does not exist
-   */
-  autoCreateBucket;
   /**
    * s3 access key
    */
@@ -78,14 +74,12 @@ const bucketPerModule = Symbol("bucket per module");
 let S3ObjectStorageProvider = class S3ObjectStorageProvider2 extends import_object_storage.ObjectStorageProvider {
   client;
   bucket;
-  createBucket;
   constructor(config) {
     super();
     const { hostname, port, protocol } = new URL(config.endpoint);
     if ((0, import_type_guards.isDefined)(config.bucket) && config.bucketPerModule == true) {
       throw new Error("bucket and bucketPerModule is mutually exclusive");
     }
-    this.createBucket = config.autoCreateBucket ?? false;
     this.client = new import_minio.Client({
       endPoint: hostname,
       port: port.length > 0 ? parseInt(port, 10) : void 0,
@@ -95,14 +89,10 @@ let S3ObjectStorageProvider = class S3ObjectStorageProvider2 extends import_obje
     });
     this.bucket = (0, import_type_guards.assertDefinedPass)(config.bucketPerModule == true ? true : config.bucket, "either bucket or bucketPerModule must be specified");
   }
-  async get(module2) {
+  get(module2) {
     const bucket = this.bucket == true ? module2 : (0, import_type_guards.assertStringPass)(this.bucket);
     const prefix = this.bucket == true ? "" : module2 == "" ? "" : `${module2}/`;
-    const objectStorage = new import_s3_object_storage.S3ObjectStorage(this.client, bucket, module2, prefix);
-    if (this.createBucket) {
-      await objectStorage.ensureBucketExists();
-    }
-    return objectStorage;
+    return new import_s3_object_storage.S3ObjectStorage(this.client, bucket, module2, prefix);
   }
 };
 S3ObjectStorageProvider = __decorate([

package/object-storage/s3/s3.object-storage.js

@@ -152,7 +152,10 @@ let S3ObjectStorage = class S3ObjectStorage2 extends import_object_storage.Objec
 S3ObjectStorage = __decorate([
   (0, import_decorators.Singleton)({
     provider: {
-      useFactory: async (argument, context) => context.resolve(import_s3_object_storage_provider.S3ObjectStorageProvider).get((0, import_type_guards.assertStringPass)(argument, "resolve argument must be a string (object storage module)"))
+      useFactory: (argument, context) => context.resolve(import_s3_object_storage_provider.S3ObjectStorageProvider).get((0, import_type_guards.assertStringPass)(argument, "resolve argument must be a string (object storage module)")),
+      async afterResolve(value) {
+        await value.ensureBucketExists();
+      }
     }
   }),
   __metadata("design:paramtypes", [import_minio.Client, String, String, String])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.86.0-beta10",
+  "version": "0.86.0-beta11",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"