spice-js 2.7.11 → 2.7.13

package/build/models/SpiceModel.js

@@ -791,7 +791,7 @@ class SpiceModel {
               if ((cached_results == null ? void 0 : cached_results.value) === undefined || (yield _this6.shouldForceRefresh(cached_results))) {
                 results = yield _this6.database.multi_get(args.ids, {
                   keep_type: true,
-                  columns: args.columns.length > 0 && args.columns != "" ? [...args.columns, 'type'] : []
+                  columns: args.columns && args.columns.length > 0 && args.columns != "" ? [...args.columns, 'type'] : []
                 });
 
                 _this6.getCacheProviderObject(_this6.type).set(key, {
@@ -802,7 +802,7 @@ class SpiceModel {
             } else {
               results = yield _this6.database.multi_get(args.ids, {
                 keep_type: true,
-                columns: args.columns.length > 0 && args.columns != "" ? [...args.columns, 'type'] : []
+                columns: args.columns && args.columns.length > 0 && args.columns != "" ? [...args.columns, 'type'] : []
               });
             }
           }

package/build/utility/RestHelper.js

@@ -196,7 +196,12 @@ class RestHelper {
             ctx.set("Content-Disposition", "attachment; filename=\"" + filename + "\"");
             ctx.type = "text/csv; charset=utf-8";
             ctx.status = 200;
-            ctx.body = fs.createReadStream(filePath);
+            var csvStream = fs.createReadStream(filePath); // Delete file after stream is finished
+
+            csvStream.on('close', () => {
+              fs.promises.unlink(filePath).catch(() => {});
+            });
+            ctx.body = csvStream;
             return {
               v: void 0
             };
@@ -213,7 +218,12 @@ class RestHelper {
         ctx.set("Content-Disposition", "attachment; filename=\"" + filename + "\"");
         ctx.type = "application/json; charset=utf-8";
         ctx.status = 200;
-        ctx.body = fs.createReadStream(filePath);
+        var jsonStream = fs.createReadStream(filePath); // Delete file after stream is finished
+
+        jsonStream.on('close', () => {
+          fs.promises.unlink(filePath).catch(() => {});
+        });
+        ctx.body = jsonStream;
       } catch (e) {
         console.error(e.stack);
         ctx.status = 400;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.7.11",
+  "version": "2.7.13",
   "description": "spice",
   "main": "build/index.js",
   "repository": {

package/src/models/SpiceModel.js

@@ -684,7 +684,7 @@ export default class SpiceModel {
             cached_results?.value === undefined ||
             (await this.shouldForceRefresh(cached_results))
           ) {
-            results = await this.database.multi_get(args.ids, {keep_type:true, columns:args.columns.length > 0 && args.columns != ""?[...args.columns, 'type']:[]});
+            results = await this.database.multi_get(args.ids, {keep_type:true, columns:args.columns && args.columns.length > 0 && args.columns != ""?[...args.columns, 'type']:[]});
             this.getCacheProviderObject(this.type).set(
               key,
               { value: results, time: new Date().getTime() },
@@ -692,7 +692,7 @@ export default class SpiceModel {
             );
           }
         } else {
-          results = await this.database.multi_get(args.ids, {keep_type:true, columns:args.columns.length> 0 && args.columns != ""?[...args.columns, 'type']:[]});
+          results = await this.database.multi_get(args.ids, {keep_type:true, columns:args.columns && args.columns.length > 0 && args.columns != ""?[...args.columns, 'type']:[]});
         }
       }
       _.remove(results, (o) => o.type != this.type);

package/src/utility/RestHelper.js

@@ -119,18 +119,22 @@ export default class RestHelper {
           a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" })
         );
   
-        const csv = parse(flatRows, { fields, defaultValue: "", excelStrings: true });
-  
+      const csv = parse(flatRows, { fields, defaultValue: "", excelStrings: true });
+
         makeDirectory(`./storage/exports/csv`);
         filename = `${RestHelper.makeid(9)}.csv`;
         filePath = path.resolve(`./storage/exports/csv/${filename}`);
         await fs.promises.writeFile(filePath, csv, "utf8");
-    
- 
+
         ctx.set("Content-Disposition", `attachment; filename="${filename}"`);
         ctx.type = "text/csv; charset=utf-8";
         ctx.status = 200;
-        ctx.body = fs.createReadStream(filePath);
+        const csvStream = fs.createReadStream(filePath);
+        // Delete file after stream is finished
+        csvStream.on('close', () => {
+          fs.promises.unlink(filePath).catch(() => {});
+        });
+        ctx.body = csvStream;
         return;
       }
 
@@ -143,7 +147,12 @@ export default class RestHelper {
       ctx.set("Content-Disposition", `attachment; filename="${filename}"`);
       ctx.type = "application/json; charset=utf-8";
       ctx.status = 200;
-      ctx.body = fs.createReadStream(filePath);
+      const jsonStream = fs.createReadStream(filePath);
+      // Delete file after stream is finished
+      jsonStream.on('close', () => {
+        fs.promises.unlink(filePath).catch(() => {});
+      });
+      ctx.body = jsonStream;
   
     } catch (e) {
       console.error(e.stack);