@@ -68,7 +68,7 @@ countlyFs.gridfs = {};
6868 **/
6969 function beforeSave ( category , filename , options , callback , done ) {
7070 log . d ( "checking file" , filename ) ;
71- ob . getId ( category , filename , function ( err , res ) {
71+ ob . getId ( category , filename , async function ( err , res ) {
7272 log . d ( "file state" , filename , err , res ) ;
7373 if ( options . forceClean ) {
7474 ob . clearFile ( category , filename , done ) ;
@@ -80,15 +80,20 @@ countlyFs.gridfs = {};
8080 else if ( options . writeMode === "overwrite" ) {
8181 var bucket = new GridFSBucket ( db , { bucketName : category } ) ;
8282 log . d ( "deleting file" , filename ) ;
83- bucket . delete ( res , function ( error ) {
84- log . d ( "deleted" , filename , error ) ;
85- if ( ! error ) {
86- setTimeout ( done , 1 ) ;
87- }
88- else if ( callback ) {
89- callback ( error ) ;
90- }
91- } ) ;
83+ let errHandle = null ;
84+ try {
85+ await bucket . delete ( res ) ;
86+ }
87+ catch ( error ) {
88+ errHandle = error ;
89+ }
90+ log . d ( "deleted" , filename , errHandle ) ;
91+ if ( ! errHandle ) {
92+ setTimeout ( done , 1 ) ;
93+ }
94+ else if ( callback ) {
95+ callback ( errHandle ) ;
96+ }
9297 }
9398 else {
9499 if ( callback ) {
@@ -116,6 +121,7 @@ countlyFs.gridfs = {};
116121 * });
117122 */
118123 ob . getId = function ( category , filename , callback ) {
124+ log . d ( "getId" , category , filename ) ;
119125 db . collection ( category + ".files" ) . findOne ( { filename : filename } , { _id : 1 } , function ( err , res ) {
120126 if ( callback ) {
121127 callback ( err , ( res && res . _id ) ? res . _id : false ) ;
@@ -144,6 +150,7 @@ countlyFs.gridfs = {};
144150 if ( ! options ) {
145151 options = { } ;
146152 }
153+ log . d ( "exists" , category , dest , options ) ;
147154 var query = { } ;
148155 if ( options . id ) {
149156 query . _id = options . id ;
@@ -184,7 +191,7 @@ countlyFs.gridfs = {};
184191 if ( ! options ) {
185192 options = { } ;
186193 }
187-
194+ log . d ( "saveFile" , category , dest , source , options ) ;
188195 var filename = dest . split ( path . sep ) . pop ( ) ;
189196 beforeSave ( category , filename , options , callback , function ( ) {
190197 save ( category , filename , fs . createReadStream ( source ) , options , callback ) ;
@@ -218,6 +225,7 @@ countlyFs.gridfs = {};
218225 if ( ! options ) {
219226 options = { } ;
220227 }
228+ log . d ( "saveData" , category , dest , typeof data , options ) ;
221229 beforeSave ( category , filename , options , callback , function ( ) {
222230 var readStream = new Readable ;
223231 readStream . push ( data ) ;
@@ -253,6 +261,7 @@ countlyFs.gridfs = {};
253261 if ( ! options ) {
254262 options = { } ;
255263 }
264+ log . d ( "saveStream" , category , dest , typeof readStream , options ) ;
256265 beforeSave ( category , filename , options , callback , function ( ) {
257266 save ( category , filename , readStream , options , callback ) ;
258267 } ) ;
@@ -271,7 +280,7 @@ countlyFs.gridfs = {};
271280 * console.log("Finished", err);
272281 * });
273282 */
274- ob . rename = function ( category , dest , source , options , callback ) {
283+ ob . rename = async function ( category , dest , source , options , callback ) {
275284 var newname = dest . split ( path . sep ) . pop ( ) ;
276285 var oldname = source . split ( path . sep ) . pop ( ) ;
277286 if ( typeof options === "function" ) {
@@ -281,25 +290,35 @@ countlyFs.gridfs = {};
281290 if ( ! options ) {
282291 options = { } ;
283292 }
284-
293+ log . d ( "rename" , category , dest , source , options ) ;
285294 if ( options . id ) {
286295 let bucket = new GridFSBucket ( db , { bucketName : category } ) ;
287- bucket . rename ( options . id , newname , function ( error ) {
288- if ( callback ) {
289- callback ( error ) ;
290- }
291- } ) ;
296+ let errHandle = null ;
297+ try {
298+ await bucket . rename ( options . id , newname ) ;
299+ }
300+ catch ( error ) {
301+ errHandle = error ;
302+ }
303+ if ( callback ) {
304+ callback ( errHandle ) ;
305+ }
292306 }
293307 else {
294- db . collection ( category + ".files" ) . findOne ( { filename : oldname } , { _id : 1 } , function ( err , res ) {
308+ db . collection ( category + ".files" ) . findOne ( { filename : oldname } , { _id : 1 } , async function ( err , res ) {
295309 if ( ! err ) {
296310 if ( res && res . _id ) {
297311 let bucket = new GridFSBucket ( db , { bucketName : category } ) ;
298- bucket . rename ( res . _id , newname , function ( error ) {
299- if ( callback ) {
300- callback ( error ) ;
301- }
302- } ) ;
312+ let errHandle = null ;
313+ try {
314+ await bucket . rename ( res . _id , newname ) ;
315+ }
316+ catch ( error ) {
317+ errHandle = error ;
318+ }
319+ if ( callback ) {
320+ callback ( errHandle ) ;
321+ }
303322 }
304323 else {
305324 if ( callback ) {
@@ -391,7 +410,7 @@ countlyFs.gridfs = {};
391410 if ( ! options ) {
392411 options = { } ;
393412 }
394-
413+ log . d ( "deleteFile" , category , dest , options ) ;
395414 if ( options . id ) {
396415 ob . deleteFileById ( category , options . id , callback ) ;
397416 }
@@ -426,13 +445,19 @@ countlyFs.gridfs = {};
426445 * console.log("Finished", err);
427446 * });
428447 */
429- ob . deleteAll = function ( category , dest , callback ) {
448+ ob . deleteAll = async function ( category , dest , callback ) {
449+ log . d ( "deleteAll" , category , dest ) ;
430450 var bucket = new GridFSBucket ( db , { bucketName : category } ) ;
431- bucket . drop ( function ( error ) {
432- if ( callback ) {
433- callback ( error ) ;
434- }
435- } ) ;
451+ let errHandle = null ;
452+ try {
453+ await bucket . drop ( ) ;
454+ }
455+ catch ( error ) {
456+ errHandle = error ;
457+ }
458+ if ( callback ) {
459+ callback ( errHandle ) ;
460+ }
436461 } ;
437462
438463 /**
@@ -457,7 +482,7 @@ countlyFs.gridfs = {};
457482 if ( ! options ) {
458483 options = { } ;
459484 }
460-
485+ log . d ( "getStream" , category , dest , options ) ;
461486 if ( callback ) {
462487 if ( options . id ) {
463488 ob . getStreamById ( category , options . id , callback ) ;
@@ -490,7 +515,7 @@ countlyFs.gridfs = {};
490515 if ( ! options ) {
491516 options = { } ;
492517 }
493-
518+ log . d ( "getData" , category , dest , options ) ;
494519 if ( options . id ) {
495520 ob . getDataById ( category , options . id , callback ) ;
496521 }
@@ -536,7 +561,7 @@ countlyFs.gridfs = {};
536561 if ( ! options ) {
537562 options = { } ;
538563 }
539-
564+ log . d ( "getSize" , category , dest , options ) ;
540565 var query = { } ;
541566 if ( options . id ) {
542567 query . _id = options . id ;
@@ -571,7 +596,7 @@ countlyFs.gridfs = {};
571596 if ( ! options ) {
572597 options = { } ;
573598 }
574-
599+ log . d ( "getStats" , category , dest , options ) ;
575600 var query = { } ;
576601 if ( options . id ) {
577602 query . _id = options . id ;
@@ -608,6 +633,7 @@ countlyFs.gridfs = {};
608633 * });
609634 */
610635 ob . getDataById = function ( category , id , callback ) {
636+ log . d ( "getDataById" , category , id ) ;
611637 var bucket = new GridFSBucket ( db , { bucketName : category } ) ;
612638 var downloadStream = bucket . openDownloadStream ( id ) ;
613639 downloadStream . on ( 'error' , function ( error ) {
@@ -639,6 +665,7 @@ countlyFs.gridfs = {};
639665 * });
640666 */
641667 ob . getStreamById = function ( category , id , callback ) {
668+ log . d ( "getStreamById" , category , id ) ;
642669 if ( callback ) {
643670 var bucket = new GridFSBucket ( db , { bucketName : category } ) ;
644671 callback ( null , bucket . openDownloadStream ( id ) ) ;
@@ -656,17 +683,17 @@ countlyFs.gridfs = {};
656683 * });
657684 */
658685 ob . deleteFileById = async function ( category , id , callback ) {
686+ log . d ( "deleteFileById" , category , id ) ;
659687 var bucket = new GridFSBucket ( db , { bucketName : category } ) ;
688+ let errHandle = null ;
660689 try {
661690 await bucket . delete ( id ) ;
662- if ( callback ) {
663- callback ( null ) ;
664- }
665691 }
666- catch ( ee ) {
667- if ( callback ) {
668- callback ( ee ) ;
669- }
692+ catch ( error ) {
693+ errHandle = error ;
694+ }
695+ if ( callback ) {
696+ callback ( errHandle ) ;
670697 }
671698 } ;
672699
@@ -681,6 +708,7 @@ countlyFs.gridfs = {};
681708 * });
682709 */
683710 ob . clearFile = function ( category , filename , callback ) {
711+ log . d ( "clearFile" , category , filename ) ;
684712 db . collection ( category + ".files" ) . deleteMany ( { filename : filename } , function ( err1 , res1 ) {
685713 log . d ( "deleting files" , category , { filename : filename } , err1 , res1 && res1 . result ) ;
686714 db . collection ( category + ".chunks" ) . deleteMany ( { files_id : filename } , function ( err2 , res2 ) {
@@ -697,6 +725,7 @@ countlyFs.gridfs = {};
697725 * @param {function } callback - function called when files found or query errored, providing error object as first param and a list of filename, creation date and size as secondas second
698726 */
699727 ob . listFiles = function ( category , callback ) {
728+ log . d ( "listFiles" , category ) ;
700729 const bucket = new GridFSBucket ( db , { bucketName : category } ) ;
701730 bucket . find ( ) . toArray ( )
702731 . then ( ( records ) => callback (
0 commit comments