Merge pull request #3 from fleetbase/dev-v0.0.3

v0.0.3
fleetbase · Aug 7, 2024 · cc9a22a · cc9a22a
2 parents 917e994 + 6bc5e21
commit cc9a22a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/lib/index.d.ts.map b/lib/index.d.ts.map
diff --git a/lib/index.js b/lib/index.js
@@ -150,6 +150,7 @@ class S3Database {
         this._getData().then((data) => callback(null, data.list));
     }
     async getAsync() {
+        this.logger.debug('s3: [getAsync]');
         return new Promise((resolve, reject) => {
             this.get((err, data) => {
                 if (err) {
@@ -187,6 +188,7 @@ class S3Database {
         return new s3PackageManager_1.default(this.config, packageName, this.logger);
     }
     async _getData() {
+        this.logger.debug({ localData: this._localData }, 's3: [getAsync] localData: @{localData}');
         if (!this._localData) {
             this._localData = await new Promise((resolve, reject) => {
                 const { bucket, keyPrefix } = this.config;
@@ -217,7 +219,7 @@ class S3Database {
             });
         }
         else {
-            this.logger.trace('s3: [_getData] already exist');
+            this.logger.debug('s3: [_getData] already exist');
         }
         return this._localData;
     }
@@ -306,6 +308,8 @@ class S3Database {
     async getAllComposerJson() {
         this.logger.debug('s3: [getAllComposerJson]');
         const composerPackages = {};
+        // Reset _localData
+        this._localData = null;
         // Use the new getAsync method
         const packages = await this.getAsync();
         this.logger.debug({ packages }, 's3: [getAllComposerJson] found packages: @{packages}');
@@ -359,7 +363,7 @@ class S3Database {
         }
         const fileName = `${nameWithoutScope}-${version}.tgz`;
         const tarballPath = this._getPackagePath(packageName, fileName);
-        const signedUrlExpireSeconds = 60 * 30;
+        const signedUrlExpireSeconds = 60 * 5;
         let url = this.s3.getSignedUrl('getObject', {
             Bucket: this.config.bucket,
             Key: tarballPath,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/verdaccio-fleetbase-s3-storage",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "description": "AWS S3 storage implementation for Verdaccio modified for Fleetbase extensions.",
     "keywords": [
         "fleetbase",

diff --git a/src/index.ts b/src/index.ts
@@ -169,6 +169,7 @@ export default class S3Database implements IPluginStorage<S3Config> {
     }
 
     public async getAsync(): Promise<string[]> {
+        this.logger.debug('s3: [getAsync]');
         return new Promise((resolve, reject) => {
             this.get((err, data) => {
                 if (err) {
@@ -212,6 +213,7 @@ export default class S3Database implements IPluginStorage<S3Config> {
     }
 
     private async _getData(): Promise<LocalStorage> {
+        this.logger.debug({ localData: this._localData }, 's3: [getAsync] localData: @{localData}');
         if (!this._localData) {
             this._localData = await new Promise((resolve, reject): void => {
                 const { bucket, keyPrefix } = this.config;
@@ -244,7 +246,7 @@ export default class S3Database implements IPluginStorage<S3Config> {
                 );
             });
         } else {
-            this.logger.trace('s3: [_getData] already exist');
+            this.logger.debug('s3: [_getData] already exist');
         }
 
         return this._localData as LocalStorage;
@@ -353,6 +355,9 @@ export default class S3Database implements IPluginStorage<S3Config> {
         this.logger.debug('s3: [getAllComposerJson]');
         const composerPackages: { [packageName: string]: any } = {};
 
+        // Reset _localData
+        this._localData = null;
+
         // Use the new getAsync method
         const packages = await this.getAsync();
 
@@ -420,7 +425,7 @@ export default class S3Database implements IPluginStorage<S3Config> {
 
         const fileName = `${nameWithoutScope}-${version}.tgz`;
         const tarballPath = this._getPackagePath(packageName, fileName);
-        const signedUrlExpireSeconds = 60 * 30;
+        const signedUrlExpireSeconds = 60 * 5;
 
         let url = this.s3.getSignedUrl('getObject', {
             Bucket: this.config.bucket,