npm - w-orm-mongodb - Versions diffs - 1.1.27 → 1.1.28 - Mend

w-orm-mongodb 1.1.27 → 1.1.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/.eslintrc.js +17 -17
package/babel.config.js +1 -0
package/dist/w-orm-mongodb.umd.js +2 -2
package/dist/w-orm-mongodb.umd.js.map +1 -1
package/docs/WOrmMongodb.html +110 -99
package/docs/WOrmMongodb.mjs.html +495 -403
package/docs/index.html +4 -1
package/docs/scripts/collapse.js +19 -0
package/docs/scripts/commonNav.js +28 -0
package/docs/scripts/search.js +16 -0
package/docs/styles/jsdoc.css +13 -2
package/docs/styles/prettify.css +1 -0
package/g-basic.mjs +5 -1
package/g-gfs.mjs +12 -1
package/package.json +4 -4
package/src/WOrmMongodb.mjs +491 -402
package/test/basic.test.mjs +400 -0
package/test/gfs.test.mjs +188 -0
package/test/all.test.mjs +0 -10

package/docs/WOrmMongodb.mjs.html CHANGED Viewed

@@ -14,6 +14,7 @@
     <link type="text/css" rel="stylesheet" href="styles/prettify.css">
     <link type="text/css" rel="stylesheet" href="styles/jsdoc.css">
     <script src="scripts/nav.js" defer></script>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 </head>
 <body>
@@ -27,7 +28,9 @@
 <nav >
     <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="WOrmMongodb.html">WOrmMongodb</a><ul class='methods'><li data-type='method'><a href="WOrmMongodb.html#.del">del</a></li><li data-type='method'><a href="WOrmMongodb.html#.delAll">delAll</a></li><li data-type='method'><a href="WOrmMongodb.html#.delAllGfs">delAllGfs</a></li><li data-type='method'><a href="WOrmMongodb.html#.delGfs">delGfs</a></li><li data-type='method'><a href="WOrmMongodb.html#.insert">insert</a></li><li data-type='method'><a href="WOrmMongodb.html#.insertGfs">insertGfs</a></li><li data-type='method'><a href="WOrmMongodb.html#.save">save</a></li><li data-type='method'><a href="WOrmMongodb.html#.select">select</a></li><li data-type='method'><a href="WOrmMongodb.html#.selectGfs">selectGfs</a></li></ul></li></ul>
 </nav>
 <div id="main">
@@ -104,37 +107,47 @@ function WOrmMongodb(opt = {}) {
      * @returns {Promise} 回傳Promise，resolve回傳數據，reject回傳錯誤訊息
      */
     async function select(find = {}) {
-        //pm
-        let pm = genPm()
+        let isErr = false
         //client
-        let client = await MongoClient.connect(opt.url, optMGConn)
+        // let client = await MongoClient.connect(opt.url, optMGConn)
+        let client = new MongoClient(opt.url, optMGConn)
-        //database, collection
-        let database = client.db(opt.db)
-        let collection = database.collection(opt.cl)
+        //res
+        let res = null
+        try {
-        //find
-        collection
-            .find(find) //find第二參數為option, 可放sort或limit等
+            //database, collection
+            let database = client.db(opt.db)
+            let collection = database.collection(opt.cl)
+            //find
+            let cursor = collection.find(find)
             //.sort({ $natural: -1 })
             //.limit(N)
-            .toArray(function(err, res) {
-                if (err) {
-                    pm.reject(err)
-                }
-                else {
-                    res = map(res, function(v) {
-                        v = omit(v, '_id')
-                        return v
-                    })
-                    pm.resolve(res)
-                }
-                client.close()
+            //toArray
+            res = await cursor.toArray()
+            //omit
+            res = map(res, function(v) {
+                v = omit(v, '_id')
+                return v
             })
-        return pm
+        }
+        catch (err) {
+            isErr = true
+            res = err
+        }
+        finally {
+            await client.close()
+        }
+        if (isErr) {
+            return Promise.reject(res)
+        }
+        return res
     }
@@ -146,60 +159,74 @@ function WOrmMongodb(opt = {}) {
      * @returns {Promise} 回傳Promise，resolve回傳插入結果，reject回傳錯誤訊息
      */
     async function insert(data) {
+        let isErr = false
         //cloneDeep
         data = cloneDeep(data)
-        //pm
-        let pm = genPm()
         //client
-        let client = await MongoClient.connect(opt.url, optMGConn)
+        // let client = await MongoClient.connect(opt.url, optMGConn)
+        let client = new MongoClient(opt.url, optMGConn)
-        //database, collection
-        let database = client.db(opt.db)
-        let collection = database.collection(opt.cl)
+        //res
+        let res = null
+        try {
-        //check
-        if (!isarr(data)) {
-            data = [data]
-        }
+            //database, collection
+            let database = client.db(opt.db)
+            let collection = database.collection(opt.cl)
-        //check
-        data = map(data, function(v) {
-            if (!v.id) {
-                v.id = genID()
+            //check
+            if (!isarr(data)) {
+                data = [data]
             }
-            return v
-        })
-        //insertMany
-        collection
-            .insertMany(data, function(err, res) {
-                if (err) {
-                    pm.reject(err)
+            //check id
+            data = map(data, function(v) {
+                if (!v.id) {
+                    v.id = genID()
                 }
-                else {
+                return v
+            })
-                    //check
-                    if (res.insertedCount > 0) {
-                        res = {
-                            n: size(data),
-                            nInserted: res.insertedCount,
-                            ok: res.acknowledged ? 1 : 0,
-                        }
-                        pm.resolve(res)
-                        ee.emit('change', 'insert', data, res)
-                    }
-                    else {
-                        pm.reject(err)
-                    }
+            //insertMany
+            res = await collection.insertMany(data)
+            //check
+            if (res.insertedCount > 0) {
+                //res
+                res = {
+                    n: size(data),
+                    nInserted: res.insertedCount,
+                    ok: res.acknowledged ? 1 : 0,
                 }
-                client.close()
-            })
-        return pm
+                //emit
+                ee.emit('change', 'insert', data, res)
+            }
+            else {
+                isErr = true
+                //res
+                res = `no insert data`
+            }
+        }
+        catch (err) {
+            isErr = true
+            res = err
+        }
+        finally {
+            await client.close()
+        }
+        if (isErr) {
+            return Promise.reject(res)
+        }
+        return res
     }
@@ -214,6 +241,7 @@ function WOrmMongodb(opt = {}) {
      * @returns {Promise} 回傳Promise，resolve回傳儲存結果，reject回傳錯誤訊息
      */
     async function save(data, option = {}) {
+        let isErr = false
         //cloneDeep
         data = cloneDeep(data)
@@ -222,104 +250,96 @@ function WOrmMongodb(opt = {}) {
         let autoInsert = get(option, 'autoInsert', true)
         let atomic = get(option, 'atomic', false)
-        //pm
-        let pm = genPm()
         //client
-        let client = await MongoClient.connect(opt.url, optMGConn)
-        //database, collection
-        let database = client.db(opt.db)
-        let collection = database.collection(opt.cl)
+        // let client = await MongoClient.connect(opt.url, optMGConn)
+        let client = new MongoClient(opt.url, optMGConn)
-        //check
-        if (!isarr(data)) {
-            data = [data]
-        }
+        //res
+        let res = null
+        try {
-        //oper
-        let oper = null
-        if (atomic) {
-            oper = 'findOneAndUpdate'
-        }
-        else {
-            oper = 'updateOne'
-        }
+            //database, collection
+            let database = client.db(opt.db)
+            let collection = database.collection(opt.cl)
-        //pmSeries
-        pmSeries(data, async(v) => {
-            let pmm = genPm()
+            //check
+            if (!isarr(data)) {
+                data = [data]
+            }
             //oper
-            collection[oper]({ id: v.id }, { $set: v }, function(err, res) {
-                // console.log(oper, 'res', res)
-                if (err) {
-                    pmm.reject(err)
-                }
-                else {
+            let oper = null
+            if (atomic) {
+                oper = 'findOneAndUpdate'
+            }
+            else {
+                oper = 'updateOne'
+            }
-                    //lastErrorObject for findOneAndUpdate
-                    if (res.lastErrorObject) {
-                        // console.log('res.lastErrorObject', res.lastErrorObject)
-                        res = {
-                            // lastErrorObject: { n: 1, updatedExisting: true },
-                            // value: {
-                            //   _id: new ObjectId("615c18bb6e5db9935b10d88e"),
-                            //   id: 'id-rosemary',
-                            //   name: 'rosemary',
-                            //   value: 123.456
-                            // },
-                            // ok: 1
-                            n: res.lastErrorObject.n,
-                            nModified: res.lastErrorObject.updatedExisting ? 1 : 0,
-                            ok: 1,
-                        }
-                    }
-                    else {
-                        res = {
-                            // acknowledged: true,
-                            // modifiedCount: 1,
-                            // upsertedId: null,
-                            // upsertedCount: 0,
-                            // matchedCount: 1
-                            n: res.matchedCount,
-                            nModified: res.modifiedCount,
-                            ok: res.acknowledged ? 1 : 0,
-                        }
-                    }
-                    // console.log('res', res)
-                    //autoInsert
-                    if (autoInsert &amp;&amp; res.n === 0) {
-                        insert(v)
-                            .then(function(res) {
-                                pmm.resolve(res)
-                            })
-                            .catch(function(err) {
-                                pmm.reject(err)
-                            })
+            //pmSeries
+            res = await pmSeries(data, async(v) => {
+                //rest
+                let rest = null
+                //oper
+                rest = await collection[oper]({ id: v.id }, { $set: v },)
+                //lastErrorObject for findOneAndUpdate
+                if (rest.lastErrorObject) {
+                    // console.log('rest.lastErrorObject', rest.lastErrorObject)
+                    rest = {
+                        // lastErrorObject: { n: 1, updatedExisting: true },
+                        // value: {
+                        //   _id: new ObjectId("615c18bb6e5db9935b10d88e"),
+                        //   id: 'id-rosemary',
+                        //   name: 'rosemary',
+                        //   value: 123.456
+                        // },
+                        // ok: 1
+                        n: rest.lastErrorObject.n,
+                        nModified: rest.lastErrorObject.updatedExisting ? 1 : 0,
+                        ok: 1,
                     }
-                    else {
-                        pmm.resolve(res)
+                }
+                else {
+                    rest = {
+                        // acknowledged: true,
+                        // modifiedCount: 1,
+                        // upsertedId: null,
+                        // upsertedCount: 0,
+                        // matchedCount: 1
+                        n: rest.matchedCount,
+                        nModified: rest.modifiedCount,
+                        ok: rest.acknowledged ? 1 : 0,
                     }
+                }
+                // console.log('rest', rest)
+                //autoInsert
+                if (autoInsert &amp;&amp; rest.n === 0) {
+                    rest = await insert(v)
                 }
-            })
-            return pmm
-        })
-            .then(function(msg) {
-                pm.resolve(msg)
-                ee.emit('change', 'save', data, msg)
-            })
-            .catch(function(msg) {
-                pm.reject(msg)
-            })
-            .finally(function() {
-                client.close()
+                return rest
             })
-        return pm
+            //emit
+            ee.emit('change', 'save', data, res)
+        }
+        catch (err) {
+            isErr = true
+            res = err
+        }
+        finally {
+            await client.close()
+        }
+        if (isErr) {
+            return Promise.reject(res)
+        }
+        return res
     }
@@ -331,59 +351,63 @@ function WOrmMongodb(opt = {}) {
      * @returns {Promise} 回傳Promise，resolve回傳刪除結果，reject回傳錯誤訊息
      */
     async function del(data) {
+        let isErr = false
         //cloneDeep
         data = cloneDeep(data)
-        //pm
-        let pm = genPm()
         //client
-        let client = await MongoClient.connect(opt.url, optMGConn)
+        // let client = await MongoClient.connect(opt.url, optMGConn)
+        let client = new MongoClient(opt.url, optMGConn)
-        //database, collection
-        let database = client.db(opt.db)
-        let collection = database.collection(opt.cl)
+        //res
+        let res = null
+        try {
-        //check
-        if (!isarr(data)) {
-            data = [data]
-        }
+            //database, collection
+            let database = client.db(opt.db)
+            let collection = database.collection(opt.cl)
-        //pmSeries
-        pmSeries(data, function(v) {
-            let pmm = genPm()
+            //check
+            if (!isarr(data)) {
+                data = [data]
+            }
-            //deleteOne
-            collection
-                .deleteOne({ id: v.id }, function(err, res) {
-                    if (err) {
-                        pmm.resolve(err) //找不到數據刪除採resovle回傳
-                    }
-                    else {
-                        res = {
-                            n: res.deletedCount,
-                            nDeleted: res.deletedCount,
-                            ok: res.acknowledged ? 1 : 0,
-                        }
-                        pmm.resolve(res)
-                    }
-                })
+            //pmSeries
+            res = await pmSeries(data, async(v) => {
-            return pmm
-        })
-            .then(function(msg) {
-                pm.resolve(msg)
-                ee.emit('change', 'del', data, msg)
-            })
-            .catch(function(msg) {
-                pm.reject(msg)
-            })
-            .finally(function() {
-                client.close()
+                //rest
+                let rest = null
+                //deleteOne
+                rest = await collection.deleteOne({ id: v.id })
+                //rest
+                rest = {
+                    n: rest.deletedCount,
+                    nDeleted: rest.deletedCount,
+                    ok: rest.acknowledged ? 1 : 0,
+                }
+                return rest
             })
-        return pm
+            //emit
+            ee.emit('change', 'del', data, res)
+        }
+        catch (err) {
+            isErr = true
+            res = err
+        }
+        finally {
+            await client.close()
+        }
+        if (isErr) {
+            return Promise.reject(res)
+        }
+        return res
     }
@@ -395,36 +419,46 @@ function WOrmMongodb(opt = {}) {
      * @returns {Promise} 回傳Promise，resolve回傳刪除結果，reject回傳錯誤訊息
      */
     async function delAll(find = {}) {
-        //pm
-        let pm = genPm()
+        let isErr = false
         //client
-        let client = await MongoClient.connect(opt.url, optMGConn)
+        // let client = await MongoClient.connect(opt.url, optMGConn)
+        let client = new MongoClient(opt.url, optMGConn)
-        //database, collection
-        let database = client.db(opt.db)
-        let collection = database.collection(opt.cl)
+        //res
+        let res = null
+        try {
-        //deleteMany
-        collection
-            .deleteMany(find, function(err, res) {
-                if (err) {
-                    pm.resolve(err) //找不到數據刪除採resovle回傳
-                }
-                else {
-                    res = {
-                        n: res.deletedCount,
-                        nDeleted: res.deletedCount,
-                        ok: res.acknowledged ? 1 : 0,
-                    }
-                    pm.resolve(res)
-                    ee.emit('change', 'delAll', null, res)
-                }
-                client.close()
-            })
+            //database, collection
+            let database = client.db(opt.db)
+            let collection = database.collection(opt.cl)
+            //deleteMany
+            res = await collection.deleteMany(find)
+            //res
+            res = {
+                n: res.deletedCount,
+                nDeleted: res.deletedCount,
+                ok: res.acknowledged ? 1 : 0,
+            }
+            //emit
+            ee.emit('change', 'delAll', null, res)
+        }
+        catch (err) {
+            isErr = true
+            res = err
+        }
+        finally {
+            await client.close()
+        }
-        return pm
+        if (isErr) {
+            return Promise.reject(res)
+        }
+        return res
     }
@@ -436,9 +470,7 @@ function WOrmMongodb(opt = {}) {
      * @returns {Promise} 回傳Promise，resolve回傳插入結果，reject回傳錯誤訊息
      */
     async function insertGfs(u8a) {
-        //pm
-        let pm = genPm()
+        let isErr = false
         //id
         let id = genID()
@@ -447,47 +479,72 @@ function WOrmMongodb(opt = {}) {
         let buf = Buffer.from(u8a)
         //client
-        let client = await MongoClient.connect(opt.url, optMGConn)
+        // let client = await MongoClient.connect(opt.url, optMGConn)
+        let client = new MongoClient(opt.url, optMGConn)
-        //database, collection
-        let database = client.db(opt.db)
+        //core
+        let core = async (id, buf) => {
-        //bucket
-        let bucket = new mongodb.GridFSBucket(database, {
-            chunkSizeBytes: 10 * 1024 * 1024, //10mb
-            bucketName: opt.cl
-        })
+            //pm
+            let pm = genPm()
-        //stream
-        let sm = new stream.Readable()
-        sm._read = () => {}
-        sm.push(buf)
-        sm.push(null)
-        sm.pipe(bucket.openUploadStream(id)) //pipe是接bucket的Writable, 所以會監聽finish
-            .on('error', function(err) {
+            //database
+            let database = client.db(opt.db)
-                //reject
-                pm.reject(err)
+            //bucket
+            let bucket = new mongodb.GridFSBucket(database, {
+                chunkSizeBytes: 10 * 1024 * 1024, //10mb
+                bucketName: opt.cl
+            })
-                //close
-                client.close()
+            //stream
+            let sm = new stream.Readable()
+            sm._read = () => {}
+            sm.push(buf)
+            sm.push(null)
+            sm.pipe(bucket.openUploadStream(id)) //pipe是接bucket的Writable, 所以會監聽finish
+                .on('error', function(err) {
-            })
-            .on('finish', function() {
-                let res = { n: 1, ok: 1, id: id }
+                    //reject
+                    pm.reject(err)
-                //resolve
-                pm.resolve(res)
+                })
+                .on('finish', function() {
-                //emit
-                ee.emit('change', 'insertGfs', null, res)
+                    //res
+                    let res = { n: 1, ok: 1, id }
+                    //resolve
+                    pm.resolve(res)
-                //close
-                client.close()
+                })
-            })
+            return pm
+        }
+        //res
+        let res = null
+        try {
+            //core
+            res = await core(id, buf)
+            //emit
+            ee.emit('change', 'insertGfs', null, res)
+        }
+        catch (err) {
+            isErr = true
+            res = err
+        }
+        finally {
+            await client.close()
+        }
-        return pm
+        if (isErr) {
+            return Promise.reject(res)
+        }
+        return res
     }
@@ -499,93 +556,106 @@ function WOrmMongodb(opt = {}) {
      * @returns {Promise} 回傳Promise，resolve回傳數據，reject回傳錯誤訊息
      */
     async function selectGfs(id) {
-        //pm
-        let pm = genPm()
+        let isErr = false
         //client
-        let client = await MongoClient.connect(opt.url, optMGConn)
+        // let client = await MongoClient.connect(opt.url, optMGConn)
+        let client = new MongoClient(opt.url, optMGConn)
-        //database, collection
-        let database = client.db(opt.db)
+        //core
+        let core = async (id) => {
-        //bucket
-        let bucket = new mongodb.GridFSBucket(database, {
-            chunkSizeBytes: 10 * 1024 * 1024, //10mb
-            bucketName: opt.cl
-        })
+            //pm
+            let pm = genPm()
-        //buf
-        let buf = Buffer.from('')
+            //database
+            let database = client.db(opt.db)
-        //stream
-        let sm = bucket.openDownloadStreamByName(id)
-        sm.on('data', function (chunk) {
-            buf = Buffer.concat([buf, chunk])
-        })
-        sm.on('error', function (err) {
+            //bucket
+            let bucket = new mongodb.GridFSBucket(database, {
+                chunkSizeBytes: 10 * 1024 * 1024, //10mb
+                bucketName: opt.cl
+            })
-            //reject
-            pm.reject(err)
+            //buf
+            let buf = Buffer.from('')
-            //close
-            client.close()
+            //stream
+            let sm = bucket.openDownloadStreamByName(id)
+            sm.on('data', function (chunk) {
+                buf = Buffer.concat([buf, chunk])
+            })
+            sm.on('error', function (err) {
-        })
-        sm.on('end', function () {
+                //reject
+                pm.reject(err)
-            //u8a
-            let u8a = new Uint8Array(buf)
+            })
+            sm.on('end', function () {
-            //clean memory
-            buf = null
+                //u8a
+                let u8a = new Uint8Array(buf)
-            //resolve
-            pm.resolve(u8a)
+                //clean memory
+                buf = null
-            //close
-            client.close()
+                //resolve
+                pm.resolve(u8a)
-        })
+            })
-        return pm
-    }
+            return pm
+        }
+        //res
+        let res = null
+        try {
-    async function _findGfs(find = {}, bucket = null) {
+            //core
+            res = await core(id)
-        //pm
-        let pm = genPm()
+        }
+        catch (err) {
+            isErr = true
+            res = err
+        }
+        finally {
+            await client.close()
+        }
-        //bucket
-        if (bucket === null) {
+        if (isErr) {
+            return Promise.reject(res)
+        }
+        return res
+    }
-            //client
-            let client = await MongoClient.connect(opt.url, optMGConn)
-            //database, collection
-            let database = client.db(opt.db)
+    async function _findGfs(find = {}, bucket) {
+        let isErr = false
-            //bucket
-            bucket = new mongodb.GridFSBucket(database, {
-                chunkSizeBytes: 10 * 1024 * 1024, //10mb
-                bucketName: opt.cl
-            })
+        //res
+        let res = null
+        try {
-        }
+            //find
+            let cursor = bucket.find(find)
-        //find
-        bucket.find(find)
-            .toArray(function(err, res) {
-                if (err) {
-                    pm.reject(err)
-                }
-                else {
-                    pm.resolve(res)
-                }
-            })
+            //toArray
+            res = await cursor.toArray()
+        }
+        catch (err) {
+            isErr = true
+            res = err
+        }
+        finally {
+            // await client.close()
+        }
-        return pm
+        if (isErr) {
+            return Promise.reject(res)
+        }
+        return res
     }
@@ -597,87 +667,101 @@ function WOrmMongodb(opt = {}) {
      * @returns {Promise} 回傳Promise，resolve回傳刪除結果，reject回傳錯誤訊息
      */
     async function delGfs(id) {
-        //pm
-        let pm = genPm()
+        let isErr = false
         //client
-        let client = await MongoClient.connect(opt.url, optMGConn)
+        // let client = await MongoClient.connect(opt.url, optMGConn)
+        let client = new MongoClient(opt.url, optMGConn)
-        //database, collection
-        let database = client.db(opt.db)
+        //res
+        let res = null
+        try {
-        //bucket
-        let bucket = new mongodb.GridFSBucket(database, {
-            chunkSizeBytes: 10 * 1024 * 1024, //10mb
-            bucketName: opt.cl
-        })
-        //_findGfs
-        let res = await _findGfs({ filename: id }, bucket)
+            //database, collection
+            let database = client.db(opt.db)
-        //check
-        if (res.length === 0) {
-            pm.reject('can not find id')
-            client.close()
-        }
-        else if (res.length > 1) {
-            pm.reject('duplicate id')
-            client.close()
-        }
-        else {
+            //bucket
+            let bucket = new mongodb.GridFSBucket(database, {
+                chunkSizeBytes: 10 * 1024 * 1024, //10mb
+                bucketName: opt.cl
+            })
-            //bid, get _id from res[0]
-            let bid = res[0]._id
+            //_findGfs
+            res = await _findGfs({ filename: id }, bucket)
-            //delete
-            bucket.delete(bid, function(err) {
-                if (err) {
-                    pm.reject(err)
-                }
-                else {
-                    let res = {
-                        n: 1,
-                        nDeleted: 1,
-                        ok: 1,
-                    }
+            //check
+            if (res.length === 0) {
+                res = `can not find id[${id}]`
+            }
+            else if (res.length > 1) {
+                res = `duplicate id[${id}]`
+            }
+            else {
-                    //resolve
-                    pm.resolve(res)
+                //bid, get _id from res[0]
+                let bid = res[0]._id
-                    //emit
-                    ee.emit('change', 'delGfs', null, res)
+                //delete
+                res = await bucket.delete(bid)
+                //res
+                res = {
+                    n: 1,
+                    nDeleted: 1,
+                    ok: 1,
                 }
-                client.close()
-            })
+                //emit
+                ee.emit('change', 'delGfs', null, res)
+            }
         }
+        catch (err) {
+            isErr = true
+            res = err
+        }
+        finally {
+            await client.close()
+        }
-        return pm
+        if (isErr) {
+            return Promise.reject(res)
+        }
+        return res
     }
     async function _delGfs(bid, bucket) {
+        let isErr = false
-        //pm
-        let pm = genPm()
+        //res
+        let res = null
+        try {
-        //delete
-        bucket.delete(bid, function(err) {
-            if (err) {
-                pm.reject(err)
-            }
-            else {
-                pm.resolve({
-                    n: 1,
-                    nDeleted: 1,
-                    ok: 1,
-                })
+            //delete
+            res = await bucket.delete(bid)
+            //res
+            res = {
+                n: 1,
+                nDeleted: 1,
+                ok: 1,
             }
-        })
-        return pm
+        }
+        catch (err) {
+            isErr = true
+            res = err
+        }
+        finally {
+            // await client.close()
+        }
+        if (isErr) {
+            return Promise.reject(res)
+        }
+        return res
     }
@@ -689,54 +773,62 @@ function WOrmMongodb(opt = {}) {
      * @returns {Promise} 回傳Promise，resolve回傳刪除結果，reject回傳錯誤訊息
      */
     async function delAllGfs(find = {}) {
-        //pm
-        let pm = genPm()
+        let isErr = false
         //client
-        let client = await MongoClient.connect(opt.url, optMGConn)
+        // let client = await MongoClient.connect(opt.url, optMGConn)
+        let client = new MongoClient(opt.url, optMGConn)
-        //database, collection
-        let database = client.db(opt.db)
+        //res
+        let res = null
+        try {
-        //bucket
-        let bucket = new mongodb.GridFSBucket(database, {
-            chunkSizeBytes: 10 * 1024 * 1024, //10mb
-            bucketName: opt.cl
-        })
+            //database, collection
+            let database = client.db(opt.db)
-        //_findGfs
-        let res = await _findGfs(find, bucket)
+            //bucket
+            let bucket = new mongodb.GridFSBucket(database, {
+                chunkSizeBytes: 10 * 1024 * 1024, //10mb
+                bucketName: opt.cl
+            })
-        //n
-        let n = size(res)
+            //_findGfs
+            res = await _findGfs(find, bucket)
-        //ps
-        let ps = map(res, function(v) {
-            let bid = v._id
-            return _delGfs(bid, bucket)
-        })
+            //n
+            let n = size(res)
-        //all
-        Promise.all(ps)
-            .then(function(msg) {
-                let res = { n, ok: 1 }
+            //ps
+            let ps = map(res, function(v) {
+                let bid = v._id
+                return _delGfs(bid, bucket)
+            })
-                //resolve
-                pm.resolve(res)
+            //all
+            res = await Promise.all(ps)
-                //emit
-                ee.emit('change', 'delAllGfs', null, res)
+            //res
+            res = {
+                n,
+                ok: 1
+            }
-            })
-            .catch(function(msg) {
-                pm.reject(msg)
-            })
-            .finally(function() {
-                client.close()
-            })
+            //emit
+            ee.emit('change', 'delAllGfs', null, res)
-        return pm
+        }
+        catch (err) {
+            isErr = true
+            res = err
+        }
+        finally {
+            await client.close()
+        }
+        if (isErr) {
+            return Promise.reject(res)
+        }
+        return res
     }
@@ -771,7 +863,7 @@ export default WOrmMongodb
 <br class="clear">
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Jan 19 2023 14:38:10 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Thu Mar 30 2023 11:53:34 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 <script>prettyPrint();</script>