@social-mail/social-mail-web-server 1.7.721 → 1.7.723

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.721",
+  "version": "1.7.723",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -21,7 +21,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.717.0",
     "@azure/storage-blob": "^12.25.0",
-    "@entity-access/entity-access": "^1.0.481",
+    "@entity-access/entity-access": "^1.0.482",
     "@entity-access/server-pages": "^1.1.470",
     "@peculiar/asn1-schema": "^2.3.15",
     "@social-mail/shared": "^1.0.29",

package/src/server/model/events/WebSiteEvents.ts

@@ -15,6 +15,7 @@ import WorkflowContext from "@entity-access/entity-access/dist/workflows/Workflo
 import CopyTemplateWorkflow from "../../workflows/site/CopyTemplateWorkflow.js";
 import DeleteWebsiteWorkflow from "../../workflows/web-site/DeleteWebSiteWorkflow.js";
 import WebSiteVersionService from "../../services/files/WebSiteVersionService.js";
+import { hash } from "crypto";
 
 export default class WebSiteEvents extends AuthenticatedEvents<WebSite> {
 
@@ -99,9 +100,13 @@ export default class WebSiteEvents extends AuthenticatedEvents<WebSite> {
 
     async copyTemplate(entity: WebSite) {
 
+        const { folderID, templateID } = entity;
+
         await this.context.queue(CopyTemplateWorkflow, {
-            folderID: entity.folderID,
-            templateID: entity.templateID
+            folderID,
+            templateID
+        }, {
+            id: `copy-template-${folderID}-${ hash("sha256", `${templateID}` as any, "hex")}`
         });
 
     }

package/src/server/services/app-temp-file/AppTempFileService.ts

@@ -175,7 +175,7 @@ export default class AppTempFileService {
 
     async downloadFile(folder: AppTempFile, url: string, path: string, transform: {[key: string]: string}) {
         const { base: name } = parse(path);
-        let localFile = await this.tfs.download(url, name);
+        let localFile = await this.tfs.download(url, name, 3);
 
         // if transform
         // do the transform here...

package/src/server/storage/TempFileService.ts

@@ -146,17 +146,24 @@ export default class TempFileService {
         return lf;
     }
 
-    public async download(inputUrl: string, name?: string) {
+    public async download(inputUrl: string, name?: string, retry = 1) {
 
-        const parsedUrl = url.parse(inputUrl);
-        const urlFilePath = parsedUrl.path;
-        const fileInfo = path.parse(urlFilePath);
-        if (name && !name.endsWith(fileInfo.ext)) {
-            name += fileInfo.ext;
+        try {
+            const parsedUrl = url.parse(inputUrl);
+            const urlFilePath = parsedUrl.path;
+            const fileInfo = path.parse(urlFilePath);
+            if (name && !name.endsWith(fileInfo.ext)) {
+                name += fileInfo.ext;
+            }
+            const t = await this.createTempFile(fileInfo.ext, name);
+            await this.fetch(inputUrl, t.path);
+            return t;
+        } catch (error) {
+            if(--retry) {
+                return this.download(inputUrl, name, retry);
+            }
+            throw error;
         }
-        const t = await this.createTempFile(fileInfo.ext, name);
-        await this.fetch(inputUrl, t.path);
-        return t;
     }
 
     public async createFrom(fileName: string, content: Buffer | Stream, contentType: string) {