@adminforth/upload 2.5.0 → 2.6.1

package/build.log

@@ -11,5 +11,5 @@ custom/preview.vue
 custom/tsconfig.json
 custom/uploader.vue
 
-sent 49,208 bytes  received 134 bytes  98,684.00 bytes/sec
-total size is 48,726  speedup is 0.99
+sent 49,299 bytes  received 134 bytes  98,866.00 bytes/sec
+total size is 48,810  speedup is 0.99

package/custom/imageGenerator.vue

@@ -376,20 +376,22 @@ async function generateImages() {
       method: 'POST',
       body: { jobId },
     });
-    if (jobResponse?.error) {
-      error = jobResponse.error;
-      break;
-    };
-    jobStatus = jobResponse?.job?.status;
-    if (jobStatus === 'failed') {
-      error = jobResponse?.job?.error || $t('Image generation job failed');
-    }
-    if (jobStatus === 'timeout') {
-      error = jobResponse?.job?.error || $t('Image generation job timeout');
+    if (jobResponse !== null) {
+      if (jobResponse?.error) {
+        error = jobResponse.error;
+        break;
+      };
+      jobStatus = jobResponse?.job?.status;
+      if (jobStatus === 'failed') {
+        error = jobResponse?.job?.error || $t('Image generation job failed');
+      }
+      if (jobStatus === 'timeout') {
+        error = jobResponse?.job?.error || $t('Image generation job timeout');
+      }
     }
     await new Promise((resolve) => setTimeout(resolve, 2000));
-  } while (jobStatus === 'in_progress')
-
+  } while (jobStatus === 'in_progress' || jobStatus === null)
+  
   if (error) {
       adminforth.alert({
         message: error,

package/dist/custom/imageGenerator.vue

@@ -376,20 +376,22 @@ async function generateImages() {
       method: 'POST',
       body: { jobId },
     });
-    if (jobResponse?.error) {
-      error = jobResponse.error;
-      break;
-    };
-    jobStatus = jobResponse?.job?.status;
-    if (jobStatus === 'failed') {
-      error = jobResponse?.job?.error || $t('Image generation job failed');
-    }
-    if (jobStatus === 'timeout') {
-      error = jobResponse?.job?.error || $t('Image generation job timeout');
+    if (jobResponse !== null) {
+      if (jobResponse?.error) {
+        error = jobResponse.error;
+        break;
+      };
+      jobStatus = jobResponse?.job?.status;
+      if (jobStatus === 'failed') {
+        error = jobResponse?.job?.error || $t('Image generation job failed');
+      }
+      if (jobStatus === 'timeout') {
+        error = jobResponse?.job?.error || $t('Image generation job timeout');
+      }
     }
     await new Promise((resolve) => setTimeout(resolve, 2000));
-  } while (jobStatus === 'in_progress')
-
+  } while (jobStatus === 'in_progress' || jobStatus === null)
+  
   if (error) {
       adminforth.alert({
         message: error,

package/dist/index.js

@@ -23,6 +23,12 @@ export default class UploadPlugin extends AdminForthPlugin {
         // for calcualting average time
         this.totalCalls = 0;
         this.totalDuration = 0;
+        this.getFileDownloadUrl = (path_1, ...args_1) => __awaiter(this, [path_1, ...args_1], void 0, function* (path, expiresInSeconds = 1800) {
+            if (!path) {
+                return '';
+            }
+            return this.options.storageAdapter.getDownloadUrl(path, expiresInSeconds);
+        });
         if ((_b = (_a = this.options.generation) === null || _a === void 0 ? void 0 : _a.rateLimit) === null || _b === void 0 ? void 0 : _b.limit) {
             this.rateLimiter = new RateLimiter((_c = this.options.generation.rateLimit) === null || _c === void 0 ? void 0 : _c.limit);
         }

package/index.ts

@@ -21,6 +21,8 @@ export default class UploadPlugin extends AdminForthPlugin {
 
   rateLimiter: RateLimiter;
 
+  getFileDownloadUrl: ((path: string) => Promise<string>); 
+
   constructor(options: PluginOptions) {
     super(options, import.meta.url);
     this.options = options;
@@ -28,6 +30,12 @@ export default class UploadPlugin extends AdminForthPlugin {
     // for calcualting average time
     this.totalCalls = 0;
     this.totalDuration = 0;
+    this.getFileDownloadUrl = async (path: string, expiresInSeconds: number = 1800) : Promise<string> => {
+      if (!path) {
+        return '';
+      }
+      return this.options.storageAdapter.getDownloadUrl(path, expiresInSeconds);
+    }
     if (this.options.generation?.rateLimit?.limit) {
       this.rateLimiter = new RateLimiter(this.options.generation.rateLimit?.limit)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/upload",
-  "version": "2.5.0",
+  "version": "2.6.1",
   "description": "Plugin for uploading files for adminforth",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",