w-web-perm 1.0.71 → 1.0.74

package/server/staLogs/staEventTable.mjs

@@ -1,102 +1,12 @@
-import ot from 'dayjs'
-import get from 'lodash-es/get.js'
-import each from 'lodash-es/each.js'
-import genPm from 'wsemi/src/genPm.mjs'
-import isestr from 'wsemi/src/isestr.mjs'
-import fsTreeFolder from 'wsemi/src/fsTreeFolder.mjs'
-import fsBuildReadStreamText from 'wsemi/src/fsBuildReadStreamText.mjs'
-import filterVpfsByWindow from './filterVpfsByWindow.mjs'
+import { staTable } from './staLogsCore.mjs'
 
 
-//統計各 event 事件於近 1日/8hr/4hr/1hr 各窗內之發生數量（鏡像 staEvent.mjs 的 NDJSON 讀取方式）。
-//巢狀窗:1hr⊂4hr⊂8hr⊂24hr, 各窗各自累計該窗內出現總數。
-//回傳: [{ event, last1Day, last8Hour, last4Hour, last1Hour }, ...], 依 last1Day 由大到小排序。
+//staEventTable: 各 event 於近 1日/8hr/4hr/1hr 巢狀窗之發生數量 (1hr⊂4hr⊂8hr⊂24hr), 由 staLogsCore 掃近 25 小時之檔取得; 簽章與輸出形狀不變
+//回傳: [{ event, last1Day, last8Hour, last4Hour, last1Hour }, ...], 依 last1Day 由大到小排序
 async function staEventTable(opt = {}) {
-
-    //fdLog
-    let fdLog = get(opt, 'fdLog')
-    if (!isestr(fdLog)) {
-        fdLog = './_logs'
-    }
-
-    //now
-    let now = ot()
-
-    //kp, 各 event 名累計各窗計數
-    let kp = {}
-
-    //vpfs
-    let vpfs = fsTreeFolder(fdLog)
-    vpfs = filterVpfsByWindow(vpfs, now.subtract(25, 'hour'), 'YYYY-MM-DDTHH') //開檔前剔除窗外檔; 用 25h(非 24h)是因 diff('hour') 取整, 最舊可能到 now-25h, 多留一小時確保不漏讀
-
-    //逐檔逐行讀取
-    for (let vpf of vpfs) {
-
-        //fp
-        let fp = vpf.path
-
-        //ev
-        let ev = fsBuildReadStreamText(fp)
-
-        //line
-        ev.on('line', (line) => {
-            try {
-                let v = JSON.parse(line)
-                let event = v.event
-                if (!isestr(event)) {
-                    return
-                }
-
-                //dh, 距今幾小時(用 dayjs 比較)
-                let dh = now.diff(ot(v.time), 'hour')
-                if (dh < 0 || dh > 24) {
-                    return //超過 1日窗或未來時間略過
-                }
-
-                //初始化
-                if (!kp[event]) {
-                    kp[event] = { last1Day: 0, last8Hour: 0, last4Hour: 0, last1Hour: 0 }
-                }
-
-                //巢狀窗各自累計(1hr⊂4hr⊂8hr⊂24hr)
-                if (dh <= 24) {
-                    kp[event].last1Day += 1
-                }
-                if (dh <= 8) {
-                    kp[event].last8Hour += 1
-                }
-                if (dh <= 4) {
-                    kp[event].last4Hour += 1
-                }
-                if (dh <= 1) {
-                    kp[event].last1Hour += 1
-                }
-            }
-            catch (err) {}
-        })
-
-        //await close
-        let pm = genPm()
-        ev.on('close', () => {
-            pm.resolve()
-        })
-        await pm
-
-    }
-
-    //rs
-    let rs = []
-    each(kp, (vv, event) => {
-        rs.push({
-            event,
-            ...vv,
-        })
-    })
-
-    //依 last1Day 由大到小排序
-    rs.sort((a, b) => b.last1Day - a.last1Day)
-
-    return rs
+    let r = await staTable(opt)
+    return r.rs
 }
 
+
 export default staEventTable

package/server/staLogs/staLogsCore.callWorker.mjs

@@ -0,0 +1,89 @@
+import { fileURLToPath } from 'url'
+import path from 'path'
+import { Worker } from 'worker_threads'
+import genPm from 'wsemi/src/genPm.mjs'
+import { staLogs as staLogsCore, staTable as staTableCore } from './staLogsCore.mjs'
+
+
+let __filename = fileURLToPath(import.meta.url)
+let __dirname = path.dirname(__filename)
+
+let fpWkDefault = path.resolve(__dirname, 'staLogsCore.shellWorker.mjs')
+
+
+//runWorker: 以單一 worker 執行指定 kind 之掃描 (主執行緒不阻塞), 回傳 worker 之 payload; fpWk 可注入 (測試用)
+//  終止路徑一律走 settle(): message(done/error) / error / exit 三者任一先到者定案, 其餘為 no-op, 且皆 terminate 回收
+//  exit 為必要: worker 未送任何訊息即結束 (如 worker 內 process.exit) 時若無 exit 監聽, promise 永不落定,
+//  又因 staLogsCore 之 single-flight 以 finally 釋放 in-flight key, 該 key 會永久卡死 (後續同參數呼叫皆取得死 promise, 需重啟後端)
+function runWorker(param, fpWk = fpWkDefault) {
+    let pm = genPm()
+
+    //wk
+    let wk = new Worker(fpWk)
+
+    //settle
+    let settled = false
+    let settle = (fn, v) => {
+        if (!settled) {
+            settled = true
+            fn(v)
+        }
+        try {
+            wk.terminate()
+        }
+        catch (err) {}
+    }
+
+    wk.on('message', (msg) => {
+        if (msg.mode === 'done') {
+            settle(pm.resolve, msg.payload)
+        }
+        else if (msg.mode === 'error') {
+            settle(pm.reject, msg.payload)
+        }
+    })
+
+    wk.on('error', (err) => {
+        settle(pm.reject, err)
+    })
+
+    wk.on('exit', (code) => {
+        settle(pm.reject, new Error(`staLogs worker exited without result, code=${code}`))
+    })
+
+    wk.postMessage(param)
+
+    return pm
+}
+
+
+//scanFilesByWorker: staEvent 之「需重掃檔案清單」交 worker
+async function scanFilesByWorker(files, tStartMs, fmt) {
+    if (files.length === 0) {
+        return [] //無需重掃時不 spawn
+    }
+    return runWorker({ kind: 'scan', files, tStartMs, fmt })
+}
+
+
+//scanTableFilesByWorker: staEventTable 之近 25 小時檔案清單交 worker
+async function scanTableFilesByWorker(files, nowMs) {
+    if (files.length === 0) {
+        return { kp: {}, errors: [] }
+    }
+    return runWorker({ kind: 'table', files, nowMs })
+}
+
+
+function staLogs(timeLength = 7, timeInterval = 'hr', opt = {}) {
+    return staLogsCore(timeLength, timeInterval, { ...opt, scanFiles: scanFilesByWorker })
+}
+
+
+function staTable(opt = {}) {
+    return staTableCore({ ...opt, scanTableFiles: scanTableFilesByWorker })
+}
+
+
+export { staLogs, staTable, scanFilesByWorker, scanTableFilesByWorker, runWorker }
+export default staLogs