w-dwdata-tweq 1.0.19 → 1.0.21

package/docs/WDwdataTweq.mjs.html

@@ -68,7 +68,9 @@ import cropPic from './cropPic.mjs'
 
 
 /**
- * 下載台灣氣象署地震資料
+ * 基於檔案之下載台灣氣象署地震數據與任務建構器
+ *
+ * 執行階段最新數據放置於fdDwAttime，前次數據放置於fdDwCurrent，於結束前會將fdDwAttime複製蓋過fdDwCurrent
  *
  * @param {Integer} yearStart 輸入數據開始年整數
  * @param {Integer} yearEnd 輸入數據結束年整數
@@ -103,6 +105,8 @@ import cropPic from './cropPic.mjs'
  *     console.log('change', msg)
  * })
  * // change { event: 'start', msg: 'running...' }
+ * // change { event: 'proc-callfun-afterStart', msg: 'start...' }
+ * // change { event: 'proc-callfun-afterStart', msg: 'done' }
  * // change { event: 'proc-callfun-download', msg: 'start...' }
  * // change { event: 'proc-callfun-download', num: 2, msg: 'done' }
  * // change { event: 'proc-callfun-getCurrent', msg: 'start...' }
@@ -268,6 +272,19 @@ let WDwdataTweq = async(yearStart, yearEnd, opt = {}) => {
         funRemove = funRemoveDef
     }
 
+    //downloadAndCropPics
+    let downloadAndCropPics = async(fd, v) => {
+
+        await downloadPics(fd, v)
+
+        let fnIn = 'picEqReport.gif'
+        let fpIn = `${fd}/${fnIn}`
+        let fnOut = 'picEqIntensityList.gif'
+        let fpOut = `${fd}/${fnOut}`
+        await cropPic(fpIn, fpOut, 364, 199, 276, 204)
+
+    }
+
     //funAddDef
     let funAddDef = async(v) => {
 
@@ -277,13 +294,7 @@ let WDwdataTweq = async(yearStart, yearEnd, opt = {}) => {
         }
         fsCleanFolder(fd)
 
-        await downloadPics(fd, v)
-
-        let fnIn = 'picEqReport.gif'
-        let fpIn = `${fd}/${fnIn}`
-        let fnOut = 'picEqIntensityList.gif'
-        let fpOut = `${fd}/${fnOut}`
-        await cropPic(fpIn, fpOut, 364, 199, 276, 204)
+        await downloadAndCropPics(fd, v)
 
     }
     if (!isfun(funAdd)) {
@@ -299,7 +310,7 @@ let WDwdataTweq = async(yearStart, yearEnd, opt = {}) => {
         }
         fsCleanFolder(fd)
 
-        await downloadPics(fd, v)
+        await downloadAndCropPics(fd, v)
 
     }
     if (!isfun(funModify)) {
@@ -341,7 +352,7 @@ export default WDwdataTweq
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Thu Sep 11 2025 23:30:38 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.4</a> on Fri Sep 12 2025 12:04:08 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/global.html

@@ -140,13 +140,14 @@
 <dl class="details">
     
     <dt class="tag-description">Description:</dt>
-    <dd class="tag-description"><ul class="dummy"><li><p>下載台灣氣象署地震資料</p></li></ul></dd>
+    <dd class="tag-description"><ul class="dummy"><li><p>基於檔案之下載台灣氣象署地震數據與任務建構器</p>
+<p>執行階段最新數據放置於fdDwAttime，前次數據放置於fdDwCurrent，於結束前會將fdDwAttime複製蓋過fdDwCurrent</p></li></ul></dd>
     
 
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WDwdataTweq.mjs.html">WDwdataTweq.mjs</a>, <a href="WDwdataTweq.mjs.html#line72">line 72</a>
+        <a href="WDwdataTweq.mjs.html">WDwdataTweq.mjs</a>, <a href="WDwdataTweq.mjs.html#line76">line 76</a>
     </li></ul></dd>
     
 
@@ -193,7 +194,7 @@
 
     <h5 class="h5-examples">Example</h5>
     
-    <pre class="prettyprint"><code>import WDwdataTweq from './src/WDwdataTweq.mjs'
    .catch((err) => {
        console.log(err)
    })
    delete msg.type
    console.log('change', msg)
+    <pre class="prettyprint"><code>import WDwdataTweq from './src/WDwdataTweq.mjs'
    .catch((err) => {
        console.log(err)
    })
    delete msg.type
    console.log('change', msg)
 
 
 
@@ -950,7 +951,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Thu Sep 11 2025 23:30:38 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.4</a> on Fri Sep 12 2025 12:04:08 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Thu Sep 11 2025 23:30:38 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.4</a> on Fri Sep 12 2025 12:04:08 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g.funDownload.mjs

@@ -0,0 +1,213 @@
+// import path from 'path'
+import fs from 'fs'
+import _ from 'lodash-es'
+import w from 'wsemi'
+import WDwdataTweq from './src/WDwdataTweq.mjs'
+
+
+let eqs1 = [
+    {
+        'id': '114115',
+        'tag': '2025082116374751115',
+        'number': '115',
+        'time': '2025-08-21T16:37:47+08:00',
+        'timeRec': '2025-08-21 16:37:47',
+        'timeTag': '20250821163747',
+        'ml': '5.1',
+        'urlWebEqInfor': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/Details/2025082116374751115',
+        'urlWebEqReport': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/Imgs/2025082116374751115',
+        'urlWebEqIntensity': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/ShakeMap/2025082116374751115',
+        'urlWebEqWave': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/WaveformAcc/2025082116374751115',
+        'urlPicEqReport': 'https://scweb.cwa.gov.tw/webdata/OLDEQ/202508/2025082116374751115.gif',
+        'urlPicEqIntensity': 'https://scweb.cwa.gov.tw/webdata/drawTrace/plotContour/2025/2025115i.png',
+        'urlPicEqPga': 'https://scweb.cwa.gov.tw/webdata/drawTrace/plotContour/2025/2025115a.png',
+        'urlPicEqPgv': 'https://scweb.cwa.gov.tw/webdata/drawTrace/plotContour/2025/2025115v.png',
+    },
+]
+let eqs2 = [ //add 114116
+    {
+        'id': '114115',
+        'tag': '2025082116374751115',
+        'number': '115',
+        'time': '2025-08-21T16:37:47+08:00',
+        'timeRec': '2025-08-21 16:37:47',
+        'timeTag': '20250821163747',
+        'ml': '5.1',
+        'urlWebEqInfor': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/Details/2025082116374751115',
+        'urlWebEqReport': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/Imgs/2025082116374751115',
+        'urlWebEqIntensity': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/ShakeMap/2025082116374751115',
+        'urlWebEqWave': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/WaveformAcc/2025082116374751115',
+        'urlPicEqReport': 'https://scweb.cwa.gov.tw/webdata/OLDEQ/202508/2025082116374751115.gif',
+        'urlPicEqIntensity': 'https://scweb.cwa.gov.tw/webdata/drawTrace/plotContour/2025/2025115i.png',
+        'urlPicEqPga': 'https://scweb.cwa.gov.tw/webdata/drawTrace/plotContour/2025/2025115a.png',
+        'urlPicEqPgv': 'https://scweb.cwa.gov.tw/webdata/drawTrace/plotContour/2025/2025115v.png',
+    },
+    {
+        'id': '114116',
+        'tag': '2025082214061554116',
+        'number': '116',
+        'time': '2025-08-22T14:06:15+08:00',
+        'timeRec': '2025-08-22 14:06:15',
+        'timeTag': '20250822140615',
+        'ml': '5.4',
+        'urlWebEqInfor': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/Details/2025082214061554116',
+        'urlWebEqReport': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/Imgs/2025082214061554116',
+        'urlWebEqIntensity': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/ShakeMap/2025082214061554116',
+        'urlWebEqWave': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/WaveformAcc/2025082214061554116',
+        'urlPicEqReport': 'https://scweb.cwa.gov.tw/webdata/OLDEQ/202508/2025082214061554116.gif',
+        'urlPicEqIntensity': 'https://scweb.cwa.gov.tw/webdata/drawTrace/plotContour/2025/2025116i.png',
+        'urlPicEqPga': 'https://scweb.cwa.gov.tw/webdata/drawTrace/plotContour/2025/2025116a.png',
+        'urlPicEqPgv': 'https://scweb.cwa.gov.tw/webdata/drawTrace/plotContour/2025/2025116v.png',
+    },
+]
+let eqs3 = [ //modify 114116
+    {
+        'id': '114115',
+        'tag': '2025082116374751115',
+        'number': '115',
+        'time': '2025-08-21T16:37:47+08:00',
+        'timeRec': '2025-08-21 16:37:47',
+        'timeTag': '20250821163747',
+        'ml': '5.1',
+        'urlWebEqInfor': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/Details/2025082116374751115',
+        'urlWebEqReport': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/Imgs/2025082116374751115',
+        'urlWebEqIntensity': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/ShakeMap/2025082116374751115',
+        'urlWebEqWave': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/WaveformAcc/2025082116374751115',
+        'urlPicEqReport': 'https://scweb.cwa.gov.tw/webdata/OLDEQ/202508/2025082116374751115.gif',
+        'urlPicEqIntensity': 'https://scweb.cwa.gov.tw/webdata/drawTrace/plotContour/2025/2025115i.png',
+        'urlPicEqPga': 'https://scweb.cwa.gov.tw/webdata/drawTrace/plotContour/2025/2025115a.png',
+        'urlPicEqPgv': 'https://scweb.cwa.gov.tw/webdata/drawTrace/plotContour/2025/2025115v.png',
+    },
+    {
+        'id': '114116',
+        'tag': '2025082214061554116',
+        'number': '116',
+        'time': '2025-08-22T14:06:15+08:00',
+        'timeRec': '2025-08-22 14:06:15',
+        'timeTag': '20250822140615',
+        'ml': '5.6',
+        'urlWebEqInfor': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/Details/2025082214061554116',
+        'urlWebEqReport': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/Imgs/2025082214061554116',
+        'urlWebEqIntensity': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/ShakeMap/2025082214061554116',
+        'urlWebEqWave': 'https://scweb.cwa.gov.tw/zh-TW/earthquake/WaveformAcc/2025082214061554116',
+        'urlPicEqReport': 'https://scweb.cwa.gov.tw/webdata/OLDEQ/202508/2025082214061554116.gif',
+        'urlPicEqIntensity': 'https://scweb.cwa.gov.tw/webdata/drawTrace/plotContour/2025/2025116i.png',
+        'urlPicEqPga': 'https://scweb.cwa.gov.tw/webdata/drawTrace/plotContour/2025/2025116a.png',
+        'urlPicEqPgv': 'https://scweb.cwa.gov.tw/webdata/drawTrace/plotContour/2025/2025116v.png',
+    },
+]
+let kpEqs = {
+    1: eqs1,
+    2: eqs2,
+    3: eqs3,
+}
+
+//fdDwAttime
+let fdDwAttime = `./_dwAttime`
+w.fsCleanFolder(fdDwAttime)
+
+//fdDwCurrent
+let fdDwCurrent = `./_dwCurrent`
+w.fsCleanFolder(fdDwCurrent)
+
+//fdResult
+let fdResult = `./_result`
+w.fsCleanFolder(fdResult)
+
+let i = 0
+let run = async() => {
+    i++
+
+    let pm = w.genPm()
+
+    //funDownload
+    let funDownload = async() => {
+        w.fsCleanFolder(fdDwAttime)
+        let eqs = kpEqs[i]
+        _.each(eqs, (v) => {
+            let fp = `${fdDwAttime}/${v.id}.json`
+            fs.writeFileSync(fp, JSON.stringify(v), 'utf8')
+        })
+        return eqs
+    }
+
+    let yearStart = 2022
+    let yearEnd = 2022
+    let opt = {
+        fdDwAttime,
+        fdDwCurrent,
+        fdResult,
+        funDownload,
+        // funGetCurrent,
+        // funRemove,
+        // funAdd,
+        // funModify,
+    }
+    let ev = await WDwdataTweq(yearStart, yearEnd, opt)
+        .catch((err) => {
+            console.log(err)
+        })
+    ev.on('change', (msg) => {
+        delete msg.type
+        delete msg.timeRunStart
+        delete msg.timeRunEnd
+        delete msg.timeRunSpent
+        if (w.arrHas(msg.event, [
+            'start',
+            'proc-callfun-download',
+            'proc-callfun-getCurrent',
+            'proc-callfun-afterStart',
+            'proc-callfun-beforeEnd',
+        ])) {
+            return
+        }
+        console.log('change', msg)
+    })
+    ev.on('end', () => {
+        pm.resolve()
+    })
+
+    return pm
+}
+await w.pmSeries(kpEqs, async() => {
+    await run()
+})
+// change { event: 'compare', msg: 'start...' }
+// change {
+//   event: 'compare',
+//   numRemove: 0,
+//   numAdd: 1,
+//   numModify: 0,
+//   numSame: 0,
+//   msg: 'done'
+// }
+// change { event: 'proc-add-callfun-add', id: '114115', msg: 'start...' }
+// change { event: 'proc-add-callfun-add', id: '114115', msg: 'done' }
+// change { event: 'end', msg: 'done' }
+// change { event: 'compare', msg: 'start...' }
+// change {
+//   event: 'compare',
+//   numRemove: 0,
+//   numAdd: 1,
+//   numModify: 0,
+//   numSame: 1,
+//   msg: 'done'
+// }
+// change { event: 'proc-add-callfun-add', id: '114116', msg: 'start...' }
+// change { event: 'proc-add-callfun-add', id: '114116', msg: 'done' }
+// change { event: 'end', msg: 'done' }
+// change { event: 'compare', msg: 'start...' }
+// change {
+//   event: 'compare',
+//   numRemove: 0,
+//   numAdd: 0,
+//   numModify: 1,
+//   numSame: 1,
+//   msg: 'done'
+// }
+// change { event: 'proc-diff-callfun-modify', id: '114116', msg: 'start...' }
+// change { event: 'proc-diff-callfun-modify', id: '114116', msg: 'done' }
+// change { event: 'end', msg: 'done' }
+
+
+//node g.funDownload.mjs

package/g.mjs

@@ -38,6 +38,8 @@ ev.on('change', (msg) => {
     console.log('change', msg)
 })
 // change { event: 'start', msg: 'running...' }
+// change { event: 'proc-callfun-afterStart', msg: 'start...' }
+// change { event: 'proc-callfun-afterStart', msg: 'done' }
 // change { event: 'proc-callfun-download', msg: 'start...' }
 // change { event: 'proc-callfun-download', num: 2, msg: 'done' }
 // change { event: 'proc-callfun-getCurrent', msg: 'start...' }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "w-dwdata-tweq",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "main": "dist/w-dwdata-tweq.umd.js",
   "dependencies": {
-    "axios": "^1.11.0",
+    "axios": "^1.12.0",
     "lodash-es": "^4.17.21",
     "sharp": "^0.34.3",
-    "w-dwdata-builder": "^1.0.22",
+    "w-dwdata-builder": "^1.0.25",
     "wsemi": "^1.8.20"
   },
   "devDependencies": {

package/src/WDwdataTweq.mjs

@@ -21,7 +21,9 @@ import cropPic from './cropPic.mjs'
 
 
 /**
- * 下載台灣氣象署地震資料
+ * 基於檔案之下載台灣氣象署地震數據與任務建構器
+ *
+ * 執行階段最新數據放置於fdDwAttime，前次數據放置於fdDwCurrent，於結束前會將fdDwAttime複製蓋過fdDwCurrent
  *
  * @param {Integer} yearStart 輸入數據開始年整數
  * @param {Integer} yearEnd 輸入數據結束年整數
@@ -56,6 +58,8 @@ import cropPic from './cropPic.mjs'
  *     console.log('change', msg)
  * })
  * // change { event: 'start', msg: 'running...' }
+ * // change { event: 'proc-callfun-afterStart', msg: 'start...' }
+ * // change { event: 'proc-callfun-afterStart', msg: 'done' }
  * // change { event: 'proc-callfun-download', msg: 'start...' }
  * // change { event: 'proc-callfun-download', num: 2, msg: 'done' }
  * // change { event: 'proc-callfun-getCurrent', msg: 'start...' }
@@ -221,6 +225,19 @@ let WDwdataTweq = async(yearStart, yearEnd, opt = {}) => {
         funRemove = funRemoveDef
     }
 
+    //downloadAndCropPics
+    let downloadAndCropPics = async(fd, v) => {
+
+        await downloadPics(fd, v)
+
+        let fnIn = 'picEqReport.gif'
+        let fpIn = `${fd}/${fnIn}`
+        let fnOut = 'picEqIntensityList.gif'
+        let fpOut = `${fd}/${fnOut}`
+        await cropPic(fpIn, fpOut, 364, 199, 276, 204)
+
+    }
+
     //funAddDef
     let funAddDef = async(v) => {
 
@@ -230,13 +247,7 @@ let WDwdataTweq = async(yearStart, yearEnd, opt = {}) => {
         }
         fsCleanFolder(fd)
 
-        await downloadPics(fd, v)
-
-        let fnIn = 'picEqReport.gif'
-        let fpIn = `${fd}/${fnIn}`
-        let fnOut = 'picEqIntensityList.gif'
-        let fpOut = `${fd}/${fnOut}`
-        await cropPic(fpIn, fpOut, 364, 199, 276, 204)
+        await downloadAndCropPics(fd, v)
 
     }
     if (!isfun(funAdd)) {
@@ -252,7 +263,7 @@ let WDwdataTweq = async(yearStart, yearEnd, opt = {}) => {
         }
         fsCleanFolder(fd)
 
-        await downloadPics(fd, v)
+        await downloadAndCropPics(fd, v)
 
     }
     if (!isfun(funModify)) {

package/src/cropPic.mjs

@@ -1,13 +1,29 @@
+import fs from 'fs'
 import sharp from 'sharp'
 
 
 let cropPic = async (fpIn, fpOut, left, top, width, height) => {
 
-    await sharp(fpIn, {
+    //注意sharp須改使用buff處理, 否則會鎖死檔案
+    // await sharp(fpIn, {
+    //     animated: false, //設定非動畫
+    // })
+    //     .extract({ left, top, width, height })
+    //     .toFile(fpOut)
+
+    //buffIn
+    let buffIn = fs.readFileSync(fpIn)
+
+    //輸入buffIn, 輸出buffOut
+    let buffOut = await sharp(buffIn, {
         animated: false, //設定非動畫
     })
         .extract({ left, top, width, height })
-        .toFile(fpOut)
+        // .toFile(fpOut)
+        .toBuffer()
+
+    //writeFileSync
+    fs.writeFileSync(fpOut, buffOut)
 
 }
 

package/src/downloadFile.mjs

@@ -54,6 +54,7 @@ let downloadFile = async (url, fp, opt = {}) => {
                 state = 'success'
             })
             .catch((err) => {
+                console.log(err)
                 errFin = err
             })