@social-mail/social-mail-web-server 1.4.749 → 1.4.751

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.4.749",
+  "version": "1.4.751",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/seed/ui/seed-ui.ts

@@ -3,7 +3,7 @@ import semver from "semver";
 
 export default async function seedUI(config: DBConfig) {
 
-    const version = "1.2.291";
+    const version = "1.2.292";
 
     const existing = await config.get(UIPackageConfig, false);
     if (existing) {

package/src/server/services/files/SnapshotService.ts

@@ -68,6 +68,8 @@ export default class SnapshotService {
         const { db } = this;
         db.verifyFilters = false;
 
+        await using tx = await db.connection.createTransaction();
+
         const sourcePath = folderID + "/%";
 
         this.allFiles = await db.appFiles.where({ sourcePath}, (p) => (x) => Sql.text.like(x.path, p.sourcePath)
@@ -125,7 +127,7 @@ export default class SnapshotService {
 
             if (html) {
                 const htmlFile = await this.tempFileService.createFrom(source.name, Buffer.from(html, "utf8"), "text/html");
-                await this.storage.saveFile(htmlFile, dest);
+                await this.storage.updateFile(dest, htmlFile);
             }
         }
 
@@ -138,15 +140,19 @@ export default class SnapshotService {
 
             if (html) {
                 const htmlFile = await this.tempFileService.createFrom(source.name, Buffer.from(html, "utf8"), "text/html");
-                await this.storage.saveFile(htmlFile, dest);
+                await this.storage.updateFile(dest, htmlFile);
             }
         }
 
+        await db.saveChanges();
+
         await this.db.appFiles.where(this.snapshotRoot, (p) => (x) => x.appFileID === p.appFileID)
             .update({ size: this.snapshotSize}, (p) => (x) => ({
                 fileSize: Sql.cast.asBigInt(p.size)
             }));
 
+        await tx.commit();
+
         return snapshotRoot;
 
     }
@@ -164,7 +170,7 @@ export default class SnapshotService {
                 }
             }
 
-            console.log(`Adding ${srcChild.path} - ${srcChild.name} in ${dest.path} - ${dest.name}`);
+            // console.log(`Adding ${srcChild.path} - ${srcChild.name} in ${dest.path} - ${dest.name}`);
 
             const destChild = await db.appFiles.statements.insert({
                 ... srcChild,

package/src/server/storage/BaseStorage.ts

@@ -155,6 +155,11 @@ export default abstract class BaseStorage {
         // return cachedPath;
     }
 
+    async updateFile(appFile: AppFile, file: LocalFile) {
+        const fc = await this.saveFileContent(file, void 0, FileType.canBeCompressed(file));
+        appFile.fileContentID = fc.fileContentID;
+    }
+
     async saveFile(file: LocalFile, extra?: Partial<AppFile>) {
 
         const scope = globalServices.createScope();
@@ -170,7 +175,7 @@ export default abstract class BaseStorage {
 
             let appFile: AppFile;
 
-            if (parentID) {
+            if (parentID && name) {
                 appFile = await db.appFiles
                     .where({ parentID, name }, (p) =>
                         (x) => x.parentID === p.parentID