w-web-perm 1.0.71 → 1.0.72

package/docs/WWebPerm.html

@@ -80,7 +80,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WWebPerm.mjs.html">WWebPerm.mjs</a>, <a href="WWebPerm.mjs.html#line137">line 137</a>
+        <a href="WWebPerm.mjs.html">WWebPerm.mjs</a>, <a href="WWebPerm.mjs.html#line140">line 140</a>
     </li></ul></dd>
     
 
@@ -837,6 +837,126 @@
         </tr>
 
     
+
+        <tr>
+            
+                <td class="name"><code>logFd</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">String</span>
+
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+
+                
+
+                
+                </td>
+            
+
+            
+                <td class="default">
+                
+                    <code>'./logs'</code>
+                
+                </td>
+            
+
+            <td class="description last"><p>輸入log紀錄儲存位置字串，預設'./logs'</p></td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>logInterval</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">String</span>
+
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+
+                
+
+                
+                </td>
+            
+
+            
+                <td class="default">
+                
+                    <code>'hr'</code>
+                
+                </td>
+            
+
+            <td class="description last"><p>輸入log紀錄檔案拆檔時長字串，可選'hr'或'day'，預設'hr'</p></td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>logNumKeep</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">Integer</span>
+
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+
+                
+
+                
+                </td>
+            
+
+            
+                <td class="default">
+                
+                    <code>null</code>
+                
+                </td>
+            
+
+            <td class="description last"><p>輸入log檔保留數上限正整數，超出者自最舊刪除，未給採w-syslog預設(hr模式365*24、day模式365)，預設null</p></td>
+        </tr>
+
+    
     </tbody>
 </table>
 
@@ -925,7 +1045,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 31 2026 17:10:51 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.5</a> on Wed Sep 02 2026 00:36:06 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebPerm.mjs.html

@@ -101,6 +101,9 @@ import procStaInfor from './procStaInfor.mjs'
  * @param {String} [opt.subfolder=''] 輸入站台所在子目錄字串，提供站台位於內網採反向代理進行服務時，故需支援位於子目錄情形，預設''
  * @param {String} [opt.urlRedirect=''] 輸入錯誤時自動轉址字串，提供站台例如無法登入或驗證失敗時須自動轉址，預設''
  * @param {String} [opt.mappingBy='email'] 輸入外部系統識別使用者token後所提供之資料物件，與權限系統之使用者資料物件，兩者間查找之對應欄位，可選'id'、'email'、'name'，預設'email'
+ * @param {String} [opt.logFd='./logs'] 輸入log紀錄儲存位置字串，預設'./logs'
+ * @param {String} [opt.logInterval='hr'] 輸入log紀錄檔案拆檔時長字串，可選'hr'或'day'，預設'hr'
+ * @param {Integer} [opt.logNumKeep=null] 輸入log檔保留數上限正整數，超出者自最舊刪除，未給採w-syslog預設(hr模式365*24、day模式365)，預設null
  * @returns {Object} 回傳物件，其內server為hapi伺服器實體，wsrv為w-converhp的伺服器事件物件，wsds為w-serv-webdata的伺服器事件物件，可監聽error事件
  * @example
  *
@@ -348,9 +351,9 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
     //procStaInfor: 統計資訊, fdLog 對齊 srLog 使用同一目錄(讀 settings.logFd, fallback 邏輯同 srLog.mjs); mock 由 settings.staEventMock 注入(e2e 統計圖穩定用)
     let logFd = get(opt, 'logFd', '')
     if (!isestr(logFd)) {
-        logFd = './_logs'
+        logFd = './logs'
     }
-    let psi = procStaInfor({ fdLog: logFd, mock: get(opt, 'staEventMock', false) })
+    let psi = procStaInfor({ fdLog: logFd, mock: get(opt, 'staEventMock', false), srLog })
 
 
     //getWebInfor
@@ -1228,7 +1231,7 @@ export default WWebPerm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Mon Aug 31 2026 17:10:51 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.5</a> on Wed Sep 02 2026 00:36:06 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.5</a> on Mon Aug 31 2026 17:10:51 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.5</a> on Wed Sep 02 2026 00:36:06 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "w-web-perm",
-  "version": "1.0.71",
+  "version": "1.0.72",
   "main": "dist/w-web-perm.umd.js",
   "dependencies": {
     "axios": "^1.18.1",
     "json5": "^2.2.3",
-    "w-aggrid-vue": "^2.0.76",
-    "w-component-vue": "^2.5.6",
-    "w-data-collector": "^1.0.33",
-    "w-echarts-vue": "^1.0.5",
-    "w-serv-hapi": "^1.0.83",
-    "w-serv-orm": "^1.0.50",
-    "w-syslog": "^1.0.22",
-    "w-ui-loginout": "^1.0.21",
-    "wsemi": "^1.8.80"
+    "w-aggrid-vue": "^2.0.77",
+    "w-component-vue": "^2.5.8",
+    "w-data-collector": "^1.0.34",
+    "w-echarts-vue": "^1.0.6",
+    "w-serv-hapi": "^1.0.84",
+    "w-serv-orm": "^1.0.51",
+    "w-syslog": "^1.0.23",
+    "w-ui-loginout": "^1.0.22",
+    "wsemi": "^1.8.81"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^5.0.8",
@@ -28,15 +28,15 @@
     "eslint-plugin-vue": "^9.10.0",
     "vue": "^2.7.16",
     "vuex": "^3.6.2",
-    "w-orm-lmdb": "^1.0.27",
+    "w-orm-lmdb": "^1.0.28",
     "w-package-tools": "^1.1.15",
     "w-package-tools-e2e": "^1.0.0",
-    "w-screenctl": "^1.0.15"
+    "w-screenctl": "^1.0.16"
   },
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
-    "test:unit": "mocha test/unit-staEvent.test.mjs --timeout 300000",
+    "test:unit": "mocha test/unit-*.test.mjs --timeout 300000",
     "test:apiunit": "mocha test/unit-*.test.mjs test/api-*.test.mjs test/getUserRules.test.mjs --timeout 300000",
     "test:e2e": "node test/run-e2e-isolated.mjs",
     "test": "npm run test:apiunit && npm run test:e2e",

package/server/WWebPerm.mjs

@@ -54,6 +54,9 @@ import procStaInfor from './procStaInfor.mjs'
  * @param {String} [opt.subfolder=''] 輸入站台所在子目錄字串，提供站台位於內網採反向代理進行服務時，故需支援位於子目錄情形，預設''
  * @param {String} [opt.urlRedirect=''] 輸入錯誤時自動轉址字串，提供站台例如無法登入或驗證失敗時須自動轉址，預設''
  * @param {String} [opt.mappingBy='email'] 輸入外部系統識別使用者token後所提供之資料物件，與權限系統之使用者資料物件，兩者間查找之對應欄位，可選'id'、'email'、'name'，預設'email'
+ * @param {String} [opt.logFd='./logs'] 輸入log紀錄儲存位置字串，預設'./logs'
+ * @param {String} [opt.logInterval='hr'] 輸入log紀錄檔案拆檔時長字串，可選'hr'或'day'，預設'hr'
+ * @param {Integer} [opt.logNumKeep=null] 輸入log檔保留數上限正整數，超出者自最舊刪除，未給採w-syslog預設(hr模式365*24、day模式365)，預設null
  * @returns {Object} 回傳物件，其內server為hapi伺服器實體，wsrv為w-converhp的伺服器事件物件，wsds為w-serv-webdata的伺服器事件物件，可監聽error事件
  * @example
  *
@@ -301,9 +304,9 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
     //procStaInfor: 統計資訊, fdLog 對齊 srLog 使用同一目錄(讀 settings.logFd, fallback 邏輯同 srLog.mjs); mock 由 settings.staEventMock 注入(e2e 統計圖穩定用)
     let logFd = get(opt, 'logFd', '')
     if (!isestr(logFd)) {
-        logFd = './_logs'
+        logFd = './logs'
     }
-    let psi = procStaInfor({ fdLog: logFd, mock: get(opt, 'staEventMock', false) })
+    let psi = procStaInfor({ fdLog: logFd, mock: get(opt, 'staEventMock', false), srLog })
 
 
     //getWebInfor

package/server/procLang.mjs

@@ -918,18 +918,6 @@ let kpLang = {
         eng: `Daily`,
         cht: `每日`,
     },
-    staSelectEvents: {
-        eng: `Events`,
-        cht: `事件`,
-    },
-    staSelectAll: {
-        eng: `Select all`,
-        cht: `全選`,
-    },
-    staClear: {
-        eng: `Clear`,
-        cht: `清除`,
-    },
     staTotal: {
         eng: `Total`,
         cht: `全部加總`,

package/server/procStaInfor.mjs

@@ -3,7 +3,7 @@ import get from 'lodash-es/get.js'
 import isestr from 'wsemi/src/isestr.mjs'
 import cache from 'wsemi/src/cache.mjs'
 import staEvent from './staLogs/staEvent.callWorker.mjs'
-import staEventTable from './staLogs/staEventTable.mjs'
+import staEventTable from './staLogs/staEventTable.callWorker.mjs'
 
 
 //mock 確定性資料集（供 e2e 統計圖穩定用）：固定起點時間 + 固定 sin 計數，不依 now / log → 每次完全相同。
@@ -49,7 +49,7 @@ function proc(opt = {}) {
     //fdLog
     let fdLog = get(opt, 'fdLog', '')
     if (!isestr(fdLog)) {
-        fdLog = './_logs'
+        fdLog = './logs'
     }
 
 
@@ -57,6 +57,10 @@ function proc(opt = {}) {
     let mock = get(opt, 'mock', false)
 
 
+    //srLog（staLogsCore 單檔略過時記 warn）
+    let srLog = get(opt, 'srLog', null)
+
+
     //getStaEvent
     let _getStaEvent = async (timeLength = 7, timeInterval = 'hr') => {
 
@@ -66,7 +70,7 @@ function proc(opt = {}) {
         }
 
         //staEvent
-        let rs = await staEvent(timeLength, timeInterval, { fdLog })
+        let rs = await staEvent(timeLength, timeInterval, { fdLog, srLog })
 
         return rs
     }
@@ -76,10 +80,13 @@ function proc(opt = {}) {
         //cacheKey: 含 timeLength + timeInterval 避免不同分組互蓋快取
         let cacheKey = `${timeLength}:${timeInterval}`
 
-        let r = await ocGetStaEvent.getProxy(cacheKey, { fun: _getStaEvent, inputs: [timeLength, timeInterval], timeExpired: 30 * 1000 }) //快取30秒
+        //wsemi ≥1.8.81 cache: 執行中共用 in-flight promise (併發不輪詢); timeFrom:'end' 使 30 秒自掃描完成起算; cacheError:false 失敗不快取且拋錯
+        //(取代原「非陣列即 clear + reject」之繞道), 失敗一律 reject 'cannotGetStaEvent' 讓上層 (kpFunExt) 記 err key
+        let r = await ocGetStaEvent.getProxy(cacheKey, { fun: _getStaEvent, inputs: [timeLength, timeInterval], timeExpired: 30 * 1000, timeFrom: 'end', cacheError: false }) //快取30秒
+            .catch(() => {
+                return Promise.reject('cannotGetStaEvent')
+            })
         if (!Array.isArray(r)) {
-            //_getStaEvent(worker) 失敗時 cache 之 .catch 會回 undefined 並把 undefined 快取 30s; 清除該快取避免窗內重試仍拿 undefined, 並 reject 讓上層 (kpFunExt) 記 err key
-            ocGetStaEvent.clear(cacheKey)
             return Promise.reject('cannotGetStaEvent')
         }
         return r
@@ -95,17 +102,19 @@ function proc(opt = {}) {
         }
 
         //staEventTable
-        let rs = await staEventTable({ fdLog })
+        let rs = await staEventTable({ fdLog, srLog })
 
         return rs
     }
     let ocGetStaEventTable = cache()
     let getStaEventTable = async (userId) => {
 
-        let r = await ocGetStaEventTable.getProxy('staEventTable', { fun: _getStaEventTable, inputs: [], timeExpired: 30 * 1000 }) //快取30秒
+        //cache 選項同 getStaEvent
+        let r = await ocGetStaEventTable.getProxy('staEventTable', { fun: _getStaEventTable, inputs: [], timeExpired: 30 * 1000, timeFrom: 'end', cacheError: false }) //快取30秒
+            .catch(() => {
+                return Promise.reject('cannotGetStaEventTable')
+            })
         if (!Array.isArray(r)) {
-            //同 getStaEvent: staEventTable 失敗時 cache 回 undefined 並快取 30s; 清除避免窗內重試仍拿 undefined, 並 reject 讓上層記 err key
-            ocGetStaEventTable.clear('staEventTable')
             return Promise.reject('cannotGetStaEventTable')
         }
         return r

package/server/srLog.mjs

@@ -1,5 +1,7 @@
 import get from 'lodash-es/get.js'
 import isestr from 'wsemi/src/isestr.mjs'
+import ispint from 'wsemi/src/ispint.mjs'
+import cint from 'wsemi/src/cint.mjs'
 import WSyslog from 'w-syslog/src/WSyslog.mjs'
 
 
@@ -7,7 +9,7 @@ let init = (opt = {}) => {
 
     let fdLog = get(opt, 'logFd', '')
     if (!isestr(fdLog)) {
-        fdLog = './_logs'
+        fdLog = './logs'
     }
 
     let interval = get(opt, 'logInterval', '')
@@ -15,10 +17,17 @@ let init = (opt = {}) => {
         interval = 'hr'
     }
 
-    let srLog = WSyslog({
-        fdLog,
-        interval,
-    })
+    //numKeep, settings 之 logNumKeep (opt-in): 未給採 w-syslog 預設 (hr: 365*24, day: 365), 有給但非正整數視為設定錯誤
+    let numKeep = get(opt, 'logNumKeep', null)
+    let o = { fdLog, interval }
+    if (numKeep !== null && numKeep !== undefined && numKeep !== '') {
+        if (!ispint(numKeep)) {
+            throw new Error(`invalid logNumKeep[${numKeep}], must be positive integer`)
+        }
+        o.numKeep = cint(numKeep)
+    }
+
+    let srLog = WSyslog(o)
     // srLog.info({ event: 'runner', msg: 'start' })
     // srLog.warn({ event: 'monitor-memory', msg: 'usage-high', ratio: 85.4 })
     // srLog.error({ event: 'crash', msg: 'db connection', code: 500 })

package/server/staLogs/staEvent.callWorker.mjs

@@ -1,46 +1,11 @@
-import { fileURLToPath } from 'url'
-import path from 'path'
-import { Worker } from 'worker_threads'
-import genPm from 'wsemi/src/genPm.mjs'
+import { staLogs } from './staLogsCore.callWorker.mjs'
 
 
-let __filename = fileURLToPath(import.meta.url)
-let __dirname = path.dirname(__filename)
-
-//worker 版 staEvent：於獨立 worker thread 計算（避免讀大量 log 阻塞主執行緒）。介面同 staEvent.mjs。
+//staEvent (worker 版): 掃描交由 staLogsCore 單一 worker (只收需重掃之檔案清單), 快取與 single-flight 在主執行緒; 介面同 staEvent.mjs
 async function staEvent(timeLength = 7, timeInterval = 'hr', opt = {}) {
-    let pm = genPm()
-
-    //fpWk
-    let fpWk = path.resolve(__dirname, 'staEvent.shellWorker.mjs')
-
-    //wk
-    let wk = new Worker(fpWk)
-
-    wk.on('message', (msg) => {
-
-        if (msg.mode === 'done') {
-            pm.resolve(msg.payload)
-        }
-        else if (msg.mode === 'error') {
-            pm.reject(msg.payload)
-        }
-
-        wk.terminate()
-
-    })
-
-    wk.on('error', (err) => {
-        pm.reject(err)
-    })
-
-    wk.postMessage({
-        timeLength,
-        timeInterval,
-        opt,
-    })
-
-    return pm
+    let r = await staLogs(timeLength, timeInterval, opt)
+    return r.rs
 }
 
+
 export default staEvent

package/server/staLogs/staEvent.mjs

@@ -1,118 +1,12 @@
-import ot from 'dayjs'
-import get from 'lodash-es/get.js'
-import size from 'lodash-es/size.js'
-import groupBy from 'lodash-es/groupBy.js'
-import each from 'lodash-es/each.js'
-import mapValues from 'lodash-es/mapValues.js'
-import merge from 'lodash-es/merge.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 { staLogs } from './staLogsCore.mjs'
 
 
-//統計各 event 事件於各時間桶之發生頻率（鏡像 SSO staLogs/staToken.mjs；差異：不限特定 event，改依 event 名分組）。
-//回傳: [{ time, data: { count, <event1>: n, <event2>: m, ... } }, ...]（count 為該時間桶全部事件數）
+//staEvent: 各 event 於各時間桶之發生頻率, 由 staLogsCore 單趟掃描 + 檔級彙總快取取得; 簽章與輸出形狀不變
+//回傳: [{ time, data: { count, <event1>: n, <event2>: m, ... } }, ...] (count 為該時間桶全部事件數)
 async function staEvent(timeLength = 7, timeInterval = 'hr', opt = {}) {
-
-    //fdLog
-    let fdLog = get(opt, 'fdLog')
-    if (!isestr(fdLog)) {
-        fdLog = './_logs'
-    }
-
-    //fmt
-    let fmt = timeInterval === 'day' ? 'YYYY-MM-DD' : 'YYYY-MM-DDTHH'
-
-    //unit
-    let unit = timeInterval === 'hr' ? 'hour' : 'day'
-
-    //kpTime, 產生完整的時間區間
-    let now = ot()
-    let tStart = now.subtract(timeLength, 'day')
-    let tCurr = tStart.startOf(unit)
-    let tEnd = now.startOf(unit)
-    let kpTime = {}
-    while (!tCurr.isAfter(tEnd)) {
-        kpTime[tCurr.format(fmt)] = { data: { count: 0 } }
-        tCurr = tCurr.add(1, unit)
-    }
-
-    //vpfs
-    let vpfs = fsTreeFolder(fdLog)
-    vpfs = filterVpfsByWindow(vpfs, tStart, fmt) //開檔前剔除窗外檔, 見該模組註解
-
-    //logs
-    let logs = []
-    for (let vpf of vpfs) {
-
-        //fp
-        let fp = vpf.path
-
-        //ev
-        let ev = fsBuildReadStreamText(fp)
-
-        //line
-        ev.on('line', (line) => {
-            let v = null
-            try {
-                v = JSON.parse(line)
-                let t = ot(v.time)
-                let timeFmt = t.format(fmt)
-                let b1 = t.isAfter(tStart)
-                let b2 = isestr(v.event) //有 event 欄位即計入（不限特定 event）
-                let b = b1 && b2
-                if (b) {
-                    logs.push({
-                        timeFmt,
-                        ...v,
-                    })
-                }
-            }
-            catch (err) {}
-        })
-
-        //await close
-        let pm = genPm()
-        ev.on('close', () => {
-            pm.resolve()
-        })
-        await pm
-
-    }
-
-    //gs
-    let gs = groupBy(logs, 'timeFmt')
-
-    //gsLog, 各時間桶內依 event 名分組計數
-    let gsLog = mapValues(gs, vs => {
-        let count = size(vs)
-        let geve = groupBy(vs, 'event')
-        let kp = {}
-        each(geve, (vvs, event) => {
-            kp[event] = size(vvs)
-        })
-        return {
-            data: {
-                count,
-                ...kp,
-            }
-        }
-    })
-
-    //merge
-    let mr = merge({}, kpTime, gsLog)
-
-    //rs
-    let rs = Object.keys(mr)
-        .sort()
-        .map(time => ({
-            time,
-            ...mr[time]
-        }))
-
-    return rs
+    let r = await staLogs(timeLength, timeInterval, opt)
+    return r.rs
 }
 
+
 export default staEvent

package/server/staLogs/staEventTable.callWorker.mjs

@@ -0,0 +1,11 @@
+import { staTable } from './staLogsCore.callWorker.mjs'
+
+
+//staEventTable (worker 版): 近 25 小時檔案之掃描交由 staLogsCore 單一 worker (主執行緒不阻塞); 介面同 staEventTable.mjs
+async function staEventTable(opt = {}) {
+    let r = await staTable(opt)
+    return r.rs
+}
+
+
+export default staEventTable