@theshelf/filestore 0.3.0 → 0.3.2

package/dist/FileStore.d.ts

@@ -1,9 +1,7 @@
-import type { ConnectionState } from './definitions/constants.js';
 import type { Driver } from './definitions/interfaces.js';
 export default class FileStore implements Driver {
     #private;
     constructor(driver: Driver);
-    get connectionState(): ConnectionState;
     get connected(): boolean;
     connect(): Promise<void>;
     disconnect(): Promise<void>;

package/dist/FileStore.js

@@ -1,23 +1,16 @@
-import { ConnectionStates } from './definitions/constants.js';
-import ConnectionManager from './ConnectionManager.js';
 export default class FileStore {
     #driver;
-    #connectionManager;
     constructor(driver) {
         this.#driver = driver;
-        this.#connectionManager = new ConnectionManager(driver);
-    }
-    get connectionState() {
-        return this.#connectionManager.state;
     }
     get connected() {
-        return this.connectionState === ConnectionStates.CONNECTED;
+        return this.#driver.connected;
     }
     connect() {
-        return this.#connectionManager.connect();
+        return this.#driver.connect();
     }
     disconnect() {
-        return this.#connectionManager.disconnect();
+        return this.#driver.disconnect();
     }
     hasFile(path) {
         return this.#driver.hasFile(path);

package/dist/drivers/S3.js

@@ -18,23 +18,30 @@ export default class S3 {
             this.#client = new S3Client(this.#configuration);
             const buckets = await this.#client.send(new ListBucketsCommand({}));
             const bucketExists = buckets.Buckets?.some(bucket => bucket.Name === this.#bucketName);
-            if (bucketExists === true)
-                return;
-            await this.#client.send(new CreateBucketCommand({ Bucket: this.#bucketName }));
+            if (bucketExists !== true) {
+                const createBucket = new CreateBucketCommand({ Bucket: this.#bucketName });
+                await this.#client.send(createBucket);
+            }
+            this.#connected = true;
         }
         catch (error) {
             const message = error instanceof Error ? error.message : UNKNOWN_ERROR;
             throw new FileStoreError('File store connection failed: ' + message);
         }
-        this.#connected = true;
     }
     async disconnect() {
         if (this.#client === undefined) {
             throw new NotConnected();
         }
-        this.#client.destroy();
-        this.#client = undefined;
-        this.#connected = false;
+        try {
+            this.#client.destroy();
+            this.#client = undefined;
+            this.#connected = false;
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : UNKNOWN_ERROR;
+            throw new FileStoreError('File store disconnection failed: ' + message);
+        }
     }
     async hasFile(path) {
         const client = this.#getClient();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@theshelf/filestore",
   "private": false,
-  "version": "0.3.0",
+  "version": "0.3.2",
   "type": "module",
   "repository": {
     "url": "git+https://github.com/MaskingTechnology/theshelf.git"

package/dist/ConnectionManager.d.ts

@@ -1,9 +0,0 @@
-import type { ConnectionState } from './definitions/constants.js';
-import type { Driver } from './definitions/interfaces.js';
-export default class ConnectionManager {
-    #private;
-    constructor(driver: Driver);
-    get state(): ConnectionState;
-    connect(): Promise<void>;
-    disconnect(): Promise<void>;
-}

package/dist/ConnectionManager.js

@@ -1,53 +0,0 @@
-import { ConnectionStates } from './definitions/constants.js';
-export default class ConnectionManager {
-    #driver;
-    #state = ConnectionStates.DISCONNECTED;
-    #connectPromise;
-    #disconnectPromise;
-    constructor(driver) {
-        this.#driver = driver;
-    }
-    get state() { return this.#state; }
-    async connect() {
-        if (this.#connectPromise !== undefined) {
-            return this.#connectPromise;
-        }
-        if (this.#state !== ConnectionStates.DISCONNECTED) {
-            return;
-        }
-        this.#state = ConnectionStates.CONNECTING;
-        try {
-            this.#connectPromise = this.#driver.connect();
-            await this.#connectPromise;
-            this.#state = ConnectionStates.CONNECTED;
-        }
-        catch (error) {
-            this.#state = ConnectionStates.DISCONNECTED;
-            throw error;
-        }
-        finally {
-            this.#connectPromise = undefined;
-        }
-    }
-    async disconnect() {
-        if (this.#disconnectPromise !== undefined) {
-            return this.#disconnectPromise;
-        }
-        if (this.#state !== ConnectionStates.CONNECTED) {
-            return;
-        }
-        this.#state = ConnectionStates.DISCONNECTING;
-        try {
-            this.#disconnectPromise = this.#driver.disconnect();
-            await this.#disconnectPromise;
-            this.#state = ConnectionStates.DISCONNECTED;
-        }
-        catch (error) {
-            this.#state = ConnectionStates.CONNECTED;
-            throw error;
-        }
-        finally {
-            this.#disconnectPromise = undefined;
-        }
-    }
-}

package/dist/definitions/constants.d.ts

@@ -1,7 +0,0 @@
-export declare const ConnectionStates: {
-    readonly DISCONNECTED: "DISCONNECTED";
-    readonly DISCONNECTING: "DISCONNECTING";
-    readonly CONNECTING: "CONNECTING";
-    readonly CONNECTED: "CONNECTED";
-};
-export type ConnectionState = typeof ConnectionStates[keyof typeof ConnectionStates];

package/dist/definitions/constants.js

@@ -1,6 +0,0 @@
-export const ConnectionStates = {
-    DISCONNECTED: 'DISCONNECTED',
-    DISCONNECTING: 'DISCONNECTING',
-    CONNECTING: 'CONNECTING',
-    CONNECTED: 'CONNECTED'
-};