w-web-perm 1.1.4 → 1.1.6

package/docs/src_plugins_reuseDeletedIds.mjs.html

@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    
+    <meta charset="utf-8">
+    <title>src/plugins/reuseDeletedIds.mjs - Documentation</title>
+    
+    
+    <script src="scripts/prettify/prettify.js"></script>
+    <script src="scripts/prettify/lang-css.js"></script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <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>
+
+<input type="checkbox" id="nav-trigger" class="nav-trigger" />
+<label for="nav-trigger" class="navicon-button x">
+  <div class="navicon"></div>
+</label>
+
+<label for="nav-trigger" class="overlay"></label>
+
+<nav >
+    
+    
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="WWebPerm.html">WWebPerm</a></li></ul><h3>Global</h3><ul><li><a href="global.html#createLegendMeasurer">createLegendMeasurer</a></li><li><a href="global.html#createLockSave">createLockSave</a></li><li><a href="global.html#decideLegendType">decideLegendType</a></li><li><a href="global.html#describeUpstream">describeUpstream</a></li><li><a href="global.html#fetchJson">fetchJson</a></li><li><a href="global.html#genLegend">genLegend</a></li><li><a href="global.html#maskQuery">maskQuery</a></li><li><a href="global.html#maskTok">maskTok</a></li><li><a href="global.html#maskUrl">maskUrl</a></li><li><a href="global.html#mergePickKeysOnly">mergePickKeysOnly</a></li><li><a href="global.html#reuseDeletedIds">reuseDeletedIds</a></li><li><a href="global.html#submitGuard">submitGuard</a></li><li><a href="global.html#wrapInjected">wrapInjected</a></li></ul>
+    
+</nav>
+
+<div id="main">
+    
+    <h1 class="page-title">src/plugins/reuseDeletedIds.mjs</h1>
+    
+
+    
+
+
+
+    
+    <section>
+        <article>
+            <pre class="prettyprint source linenums"><code>import get from 'lodash-es/get.js'
+import map from 'lodash-es/map.js'
+import each from 'lodash-es/each.js'
+
+
+/**
+ * 新增列沿用資料庫既有 id 時之正規化 (標的清單專用, 其 id 為可就地改寫之標的路徑; ADR-025)
+ *
+ * 同一次儲存中刪除(或把 id 改掉)某既有列, 又新增一列並把 id 改成該既有列之 id, 淨效果為「修改該列」:
+ * 該新增列改為一般列送出(_isNew 設 false), 建立者 / 建立時間沿用資料庫之值(修改者 / 修改時間由後端寫入).
+ * 否則後端之「新增列已存在即拒絕」(saveNewRowExists, 擋同一包重送) 會把它當重送擋下, 且重新整理後重做仍被擋;
+ * 亦避免以前端佔位字({待自動給予})覆寫建立者 / 建立時間.
+ * 只處理 id 於 rows 內唯一者; 重複 id 不處理, 由後端 ckKey 回 saveRowFieldDuplicate.
+ * 使用者 / 群組 / 權限清單之 id 為系統產生且不可編輯, 新增列不會與既有列同 id, 不需此處理.
+ *
+ * @param {Array} rows 輸入欲送出之列陣列(清單之 opt.rows), 不修改
+ * @param {Array} rowsDb 輸入資料庫之列陣列(前端 store 之同表資料)
+ * @returns {Array} 回傳正規化後之新陣列
+ */
+function reuseDeletedIds(rows, rowsDb) {
+
+    //kpDb, kpCount: 以 Map 存放, 不以 lodash get 取值(標的 id 為路徑, 可能含「.」而被當成巢狀路徑)
+    let kpDb = new Map()
+    each(rowsDb, (r) => {
+        kpDb.set(get(r, 'id', ''), r)
+    })
+    let kpCount = new Map()
+    each(rows, (r) => {
+        let id = get(r, 'id', '')
+        kpCount.set(id, (kpCount.get(id) || 0) + 1)
+    })
+
+    let rs = map(rows, (r) => {
+        let id = get(r, 'id', '')
+
+        //非新增列
+        if (get(r, '_isNew') !== true) {
+            return r
+        }
+
+        //資料庫無此 id: 真正之新增
+        if (!kpDb.has(id)) {
+            return r
+        }
+        let rDb = kpDb.get(id)
+
+        //rows 內重複 id: 不處理
+        if (kpCount.get(id) !== 1) {
+            return r
+        }
+
+        return {
+            ...r,
+            _isNew: false,
+            userId: get(rDb, 'userId', ''),
+            timeCreate: get(rDb, 'timeCreate', ''),
+        }
+    })
+
+    return rs
+}
+
+
+export default reuseDeletedIds
+</code></pre>
+        </article>
+    </section>
+
+
+
+
+    
+    
+</div>
+
+<br class="clear">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 02 2026 20:53:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+</footer>
+
+<script>prettyPrint();</script>
+<script src="scripts/polyfill.js"></script>
+<script src="scripts/linenumber.js"></script>
+
+
+
+</body>
+</html>

package/docs/src_plugins_submitGuard.mjs.html

@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    
+    <meta charset="utf-8">
+    <title>src/plugins/submitGuard.mjs - Documentation</title>
+    
+    
+    <script src="scripts/prettify/prettify.js"></script>
+    <script src="scripts/prettify/lang-css.js"></script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <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>
+
+<input type="checkbox" id="nav-trigger" class="nav-trigger" />
+<label for="nav-trigger" class="navicon-button x">
+  <div class="navicon"></div>
+</label>
+
+<label for="nav-trigger" class="overlay"></label>
+
+<nav >
+    
+    
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="WWebPerm.html">WWebPerm</a></li></ul><h3>Global</h3><ul><li><a href="global.html#createLegendMeasurer">createLegendMeasurer</a></li><li><a href="global.html#createLockSave">createLockSave</a></li><li><a href="global.html#decideLegendType">decideLegendType</a></li><li><a href="global.html#describeUpstream">describeUpstream</a></li><li><a href="global.html#fetchJson">fetchJson</a></li><li><a href="global.html#genLegend">genLegend</a></li><li><a href="global.html#maskQuery">maskQuery</a></li><li><a href="global.html#maskTok">maskTok</a></li><li><a href="global.html#maskUrl">maskUrl</a></li><li><a href="global.html#mergePickKeysOnly">mergePickKeysOnly</a></li><li><a href="global.html#reuseDeletedIds">reuseDeletedIds</a></li><li><a href="global.html#submitGuard">submitGuard</a></li><li><a href="global.html#wrapInjected">wrapInjected</a></li></ul>
+    
+</nav>
+
+<div id="main">
+    
+    <h1 class="page-title">src/plugins/submitGuard.mjs</h1>
+    
+
+    
+
+
+
+    
+    <section>
+        <article>
+            <pre class="prettyprint source linenums"><code>import get from 'lodash-es/get.js'
+import each from 'lodash-es/each.js'
+import isfun from 'wsemi/src/isfun.mjs'
+import haskey from 'wsemi/src/haskey.mjs'
+
+
+/**
+ * 送出類操作之前端雙擊防護核心 (與 Vue / store 無關, 供單元測試; 由 mUI 之 runSubmit 與 updateLoading 使用, ADR-025)
+ *
+ * - run(key, fn, opt): 同 key 之送出流程進行中(自觸發起至流程結束, 含結果訊息框開啟期間)再觸發即略過.
+ *   按鈕之滑鼠與鍵盤 Enter、輸入框之 Enter 等入口共用同一狀態.
+ *   opt.pm 為 WButtonChip / WButtonCircle 之 promiseUnlock 鎖(click 事件之 msg.pm), 於 releaseBtnLocks()(全頁 loading 關閉, 即請求結束)
+ *   或流程結束時釋放; 被略過之觸發亦立即釋放其 pm, 否則該按鈕永久鎖住.
+ *   fn 收到 unlock 函數: 流程需先開確認框者於開框前呼叫, 按鈕鎖只涵蓋請求期間(確認框背後之按鈕不顯示載入圖示), 重入仍由流程狀態擋.
+ *   opt.hold 為函數, 輸入流程結果, 回傳 true 時保持占位與按鈕鎖(如登入成功轉址, 頁面即將離開).
+ * - releaseBtnLocks(): 釋放進行中流程所登記之按鈕鎖, 流程狀態不變(結果訊息框開啟期間之重入仍擋).
+ * - isRunning(key): 查詢 key 是否進行中.
+ *
+ * 為何需要: 全頁 loading(WDialog)不搶焦點, 只擋滑鼠, 鍵盤事件仍送達背後之按鈕與輸入框;
+ * 按鈕鎖若於 handler 第一行即解除, 鍵盤連按照樣送出(2026-09-29 實測).
+ *
+ * @returns {Object} 回傳 { run, releaseBtnLocks, isRunning }
+ */
+function submitGuard() {
+
+    //kpRunning, 進行中流程: key → { unlock }
+    let kpRunning = {}
+
+    let run = (key, fn, opt = {}) => {
+
+        //unlock, 釋放本次觸發之按鈕鎖; pm.resolve 重複呼叫無作用
+        let pm = get(opt, 'pm', null)
+        let unlock = () => {
+            if (pm &amp;&amp; isfun(pm.resolve)) {
+                pm.resolve()
+            }
+        }
+
+        //同 key 進行中: 略過, 並立即釋放本次觸發之按鈕鎖
+        if (haskey(kpRunning, key)) {
+            unlock()
+            return Promise.resolve(null)
+        }
+
+        //占位
+        kpRunning[key] = { unlock }
+
+        //hold
+        let hold = get(opt, 'hold', null)
+
+        //end
+        let end = () => {
+            unlock()
+            delete kpRunning[key]
+        }
+
+        return Promise.resolve()
+            .then(() => {
+                return fn(unlock)
+            })
+            .then((r) => {
+                if (isfun(hold) &amp;&amp; hold(r) === true) {
+                    return r //保持占位與按鈕鎖
+                }
+                end()
+                return r
+            }, (err) => {
+                end()
+                return Promise.reject(err)
+            })
+    }
+
+    let releaseBtnLocks = () => {
+        each(kpRunning, (v) => {
+            v.unlock()
+        })
+    }
+
+    let isRunning = (key) => {
+        return haskey(kpRunning, key)
+    }
+
+    return {
+        run,
+        releaseBtnLocks,
+        isRunning,
+    }
+}
+
+
+export default submitGuard
+</code></pre>
+        </article>
+    </section>
+
+
+
+
+    
+    
+</div>
+
+<br class="clear">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 02 2026 20:53:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+</footer>
+
+<script>prettyPrint();</script>
+<script src="scripts/polyfill.js"></script>
+<script src="scripts/linenumber.js"></script>
+
+
+
+</body>
+</html>

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "w-web-perm",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "main": "dist/w-web-perm.umd.js",
   "dependencies": {
     "json5": "^2.2.3",
-    "w-aggrid-vue": "^2.1.4",
-    "w-component-vue": "^2.5.21",
-    "w-data-collector": "^1.0.40",
-    "w-echarts-vue": "^1.0.14",
-    "w-serv-hapi": "^1.1.2",
-    "w-serv-orm": "^1.1.3",
-    "w-syslog": "^1.0.29",
-    "w-ui-loginout": "^1.0.28",
-    "wsemi": "^1.9.3"
+    "w-aggrid-vue": "^2.1.5",
+    "w-component-vue": "^2.5.26",
+    "w-data-collector": "^1.0.41",
+    "w-echarts-vue": "^1.0.16",
+    "w-serv-hapi": "^1.1.3",
+    "w-serv-orm": "^1.1.4",
+    "w-syslog": "^1.0.30",
+    "w-ui-loginout": "^1.0.29",
+    "wsemi": "^1.9.9"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^5.0.8",
@@ -27,10 +27,10 @@
     "eslint-plugin-vue": "^9.10.0",
     "vue": "^2.7.16",
     "vuex": "^3.6.2",
-    "w-orm-lmdb": "^1.0.34",
+    "w-orm-lmdb": "^1.0.35",
     "w-package-tools": "^1.1.16",
-    "w-package-tools-e2e": "^1.0.0",
-    "w-screenctl": "^1.0.22"
+    "w-package-tools-e2e": "^1.0.6",
+    "w-screenctl": "^1.0.23"
   },
   "scripts": {
     "serve": "vue-cli-service serve",

package/public/index.html

@@ -4,6 +4,8 @@
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui">
         <meta http-equiv="X-UA-Compatible" content="ie=edge">
+        <!-- referrer: 本站以 ?token= 開啟(w-ui-loginout 讀完不清網址), 瀏覽器預設會把含權杖之完整網址放進同源請求之 Referer, 進而寫入後端 log 與反向代理 access log; strict-origin 使請求只帶 origin(見 spec/設計要點與取捨.md ADR-023) -->
+        <meta name="referrer" content="strict-origin">
         <title></title>
 
         <!-- mdi font -->

package/server/WWebPerm.mjs

@@ -23,14 +23,18 @@ import replace from 'wsemi/src/replace.mjs'
 import strdelleft from 'wsemi/src/strdelleft.mjs'
 import ltdtmapping from 'wsemi/src/ltdtmapping.mjs'
 import pmKeyMutex from 'wsemi/src/pmKeyMutex.mjs'
+import cacheSt from 'wsemi/src/cacheSt.mjs'
 import WServHapiServer from 'w-serv-hapi/src/WServHapiServer.mjs'
 import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
 import ds from '../src/schema/index.mjs'
 import { getUserRules } from '../src/plugins/mShare.mjs'
 import procCore from './procCore.mjs'
+import createLockSave from './lockSave.mjs'
 import procLang from './procLang.mjs'
 import srLogInit from './srLog.mjs'
 import procStaInfor from './procStaInfor.mjs'
+import { maskTok, maskQuery, maskUrl } from './maskLog.mjs'
+import wrapInjected from './wrapInjected.mjs'
 
 
 /**
@@ -40,9 +44,9 @@ import procStaInfor from './procStaInfor.mjs'
  * @param {Function} WOrm 輸入資料庫ORM函數
  * @param {String} url 輸入資料庫連線字串，例如w-orm-lmdb為'./db'，或w-orm-mongodb為'mongodb://username:password@$127.0.0.1:27017'
  * @param {String} db 輸入資料庫名稱字串
- * @param {Function} getUserByToken 輸入處理函數，函數會傳入使用者token，通過此函數處理後並回傳使用者資訊物件，並至少須提供'id'、'email'、'name'、'isAdmin'欄位，且'isAdmin'限輸入'y'或'n'。注意: token 回傳之'isAdmin'僅供識別，權限系統一律以自身users表該使用者之'isAdmin'欄位值為權威，不會被 token 宣稱之值複寫
- * @param {Function} verifyClientUser 輸入驗證瀏覽使用者身份之處理函數，函數會傳入使用者資訊物件(perm users 表之列)與來源字串from，通過此函數識別後回傳布林值(可為Promise)，允許使用者回傳true，反之回傳false。from 值域: 'getUserByToken'(登入)、'getPerm'(api/getPerm)、以及資料通道之 apiType 'main'(RPC 與 ORM 執行)、'upload-controller'、'upload-slice'、'download-get-filename'、'download-get-file'、'download'；資料通道與登入採同一授權強度(反查 perm users 且 isActive='y' 後再經本函數)
- * @param {Function} verifyAppUser 輸入驗證應用程序使用者身份之處理函數，函數會傳入使用者資訊物件，通過此函數識別後回傳布林值，允許使用者回傳true，反之回傳false
+ * @param {Function} getUserByToken 輸入處理函數，函數會傳入使用者token，通過此函數處理後並回傳使用者資訊物件，並至少須提供'id'、'email'、'name'、'isAdmin'欄位，且'isAdmin'限輸入'y'或'n'。注意: token 回傳之'isAdmin'僅供識別，權限系統一律以自身users表該使用者之'isAdmin'欄位值為權威，不會被 token 宣稱之值複寫。函數拋錯或reject時視同查無使用者(回自家錯誤key，錯誤原文不回前端、不入log，只於srLog記warn)
+ * @param {Function} verifyClientUser 輸入驗證瀏覽使用者身份之處理函數，函數會傳入使用者資訊物件(perm users 表之列)與來源字串from，通過此函數識別後回傳布林值(可為Promise)，允許使用者回傳true，反之回傳false。from 值域: 'getUserByToken'(登入)、'getPerm'(api/getPerm)、以及資料通道之 apiType 'main'(RPC 與 ORM 執行)、'upload-controller'、'upload-slice'、'download-get-filename'、'download-get-file'、'download'；資料通道與登入採同一授權強度(反查 perm users 且 isActive='y' 後再經本函數)；函數拋錯或reject時視同回傳false
+ * @param {Function} verifyAppUser 輸入驗證應用程序使用者身份之處理函數，函數會傳入使用者資訊物件，通過此函數識別後回傳布林值，允許使用者回傳true，反之回傳false；函數拋錯或reject時視同回傳false
  * @param {Object} [opt={}] 輸入設定物件，預設{}
  * @param {Integer} [opt.serverPort=11006] 輸入伺服器通訊port，預設11006
  * @param {Boolean} [opt.useCheckUser=false] 輸入是否檢查使用者資訊布林值，預設false
@@ -110,7 +114,7 @@ import procStaInfor from './procStaInfor.mjs'
  *             isAdmin: 'y',
  *         }
  *     }
- *     console.log('invalid token', token)
+ *     console.log('invalid token') //勿印權杖值
  *     console.log('於生產環境時得加入SSO等驗證token機制')
  *     return {}
  * }
@@ -274,6 +278,27 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
     let srLog = srLogInit(opt)
 
 
+    //注入函數一律經包裝(W 契約, spec/設計要點與取捨.md ADR-023), 以包裝版取代三個參數
+    //why: 注入函數拋錯或 reject 時原會被 await 原樣上拋, 其原文經 pm2resolve 回前端、經 verifyConn 之 msg 入 srLog、經 error 事件印出;
+    //部署方常以 w-web-sso 對外 helper(≤1.1.4)包裝 getUserByToken, 其 reject 字串含已代入系統介接權杖與使用者權杖之完整網址.
+    //包裝後失敗視同否定結果(getUserByToken → null 等同查無, verify* → false 等同無權限), 走各呼叫點既有分支回自家 key;
+    //上游原文不回前端、不入 log, 只於此記 warn(白名單 key, 或型別與 Error.name). 同一次失敗 log 2~3 筆: 此處 warn(因) + 呼叫點 error(果).
+    //以下取代後, 本函數內除此三行外不得再直接使用原始參數(盤點見 CLAUDE_rulebook.md「權杖不外洩」, 測試 unit-wrapInjected WRAP-SITE-*)
+    let logInjectFail = (name) => {
+        return (d) => {
+            srLog.warn({ event: `inject-${name}-fail`, ...d })
+        }
+    }
+    getUserByToken = wrapInjected(getUserByToken, { failValue: null, onFail: logInjectFail('getUserByToken') })
+    verifyClientUser = wrapInjected(verifyClientUser, { failValue: false, onFail: logInjectFail('verifyClientUser') })
+    verifyAppUser = wrapInjected(verifyAppUser, { failValue: false, onFail: logInjectFail('verifyAppUser') })
+    //getUserById: 第四個注入函數(選填; useCheckUser=true 時由 WServOrm 於 execute 內呼叫, 原 reject 原文經 pm2resolve 回前端), 有給才包裝;
+    //失敗 → null 等同查無, 由 WServOrm 既有之查無分支拒絕(fail-closed). 須於 WServOrm 建構前取代(建構時即取走此函數)
+    if (isfun(getUserById)) {
+        getUserById = wrapInjected(getUserById, { failValue: null, onFail: logInjectFail('getUserById') })
+    }
+
+
     //WServOrm
     let optWServOrm = {
         useCheckUser,
@@ -297,8 +322,14 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
     let kmx = pmKeyMutex()
 
 
+    //lockSave: 後台整表寫入(updateTabItems)之雙擊防護(後端, 見 lockSave.mjs, ADR-025): 以「updateTabItems:{表名}:{操作者 id}」於 cacheSt 原子占位,
+    //同一操作者之同表寫入處理中再送出即 reject 'saveInProgress'(不排隊); 包在 kmx 之外層, 不同操作者之並行仍由 kmx 序列化(ADR-012)
+    let cst = cacheSt()
+    let lockSave = createLockSave(cst)
+
+
     //procCore: 整表批次 diff 寫入邏輯 (updateTabItems + updateTargets/Pemis/Grups/Users)
-    let pc = procCore(woItems, procOrm, { srLog, kmx })
+    let pc = procCore(woItems, procOrm, { srLog, kmx, lockSave })
 
 
     //procStaInfor: 統計資訊, fdLog 對齊 srLog 使用同一目錄(讀 settings.logFd, fallback 邏輯同 srLog.mjs); mock 由 settings.staEventMock 注入(e2e 統計圖穩定用)
@@ -396,7 +427,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
 
         //check
         if (!iseobj(userSelf)) {
-            console.log(`token`, token)
+            console.log(`token`, maskTok(token))
             srLog.error({ event: 'getTokenUser-error', msg: 'cannotFindUserFromToken' })
             return Promise.reject(`cannotFindUserFromToken`)
         }
@@ -478,7 +509,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
 
         //check
         if (!iseobj(user)) {
-            console.log(`token`, token)
+            console.log(`token`, maskTok(token))
             srLog.error({ event: 'getAndVerifyAppUser-error', msg: 'cannotFindUserFromToken' })
             return Promise.reject(`cannotFindUserFromToken`)
         }
@@ -750,8 +781,8 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
 
                     //check
                     if (!isestr(token)) {
-                        console.log('req.query', get(req, 'query'))
-                        console.log('token', token)
+                        console.log('req.query', maskQuery(get(req, 'query')))
+                        console.log('token', maskTok(token))
                         console.log('[API]getUserByToken/check token: invalid token')
                         srLog.error({ event: 'api/getUserByToken-error', msg: 'tokenNoPermission' })
                         return Promise.reject(`tokenNoPermission`)
@@ -763,7 +794,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
 
                     //check
                     if (!iseobj(user)) {
-                        console.log('token', token)
+                        console.log('token', maskTok(token))
                         console.log('[API]getUserByToken/check user: invalid user')
                         srLog.error({ event: 'api/getUserByToken-error', msg: 'tokenNoPermission' })
                         return Promise.reject(`tokenNoPermission`)
@@ -800,8 +831,8 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
 
                     //check
                     if (!isestr(token)) {
-                        console.log('req.query', get(req, 'query'))
-                        console.log('token', token)
+                        console.log('req.query', maskQuery(get(req, 'query')))
+                        console.log('token', maskTok(token))
                         console.log('[API]getPerm/check token: invalid token')
                         srLog.error({ event: 'api/getPerm-error', msg: 'tokenNoPermission' })
                         return Promise.reject(`tokenNoPermission`)
@@ -813,7 +844,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
 
                     //check
                     if (!iseobj(userSelf)) {
-                        console.log('token', token)
+                        console.log('token', maskTok(token))
                         console.log('[API]getPerm/check userSelf: invalid userSelf')
                         srLog.error({ event: 'api/getPerm-error', msg: 'tokenNoPermission' })
                         return Promise.reject(`tokenNoPermission`)
@@ -825,7 +856,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
 
                     //check
                     if (!isestr(userIdSelf)) {
-                        console.log('token', token)
+                        console.log('token', maskTok(token))
                         console.log('userSelf', userSelf)
                         console.log('[API]getPerm/check userIdSelf: invalid userIdSelf')
                         srLog.error({ event: 'api/getPerm-error', msg: 'tokenNoPermission' })
@@ -838,7 +869,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
 
                     //check
                     if (!iseobj(userWithRulesSelf)) {
-                        console.log('token', token)
+                        console.log('token', maskTok(token))
                         console.log('userSelf', userSelf)
                         console.log('userIdSelf', userIdSelf)
                         console.log('[API]getPerm/check userWithRulesSelf: invalid userWithRulesSelf')
@@ -877,7 +908,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
 
                     //check
                     if (!isestr(tokenSelf)) {
-                        console.log('req.query', get(req, 'query'))
+                        console.log('req.query', maskQuery(get(req, 'query')))
                         console.log('[API]getPermUserInfor/check tokenSelf: invalid tokenSelf')
                         srLog.error({ event: 'api/getPermUserInfor-error', msg: 'tokenNoPermission' })
                         return Promise.reject(`tokenNoPermission`)
@@ -889,8 +920,8 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
 
                     //check
                     if (!iseobj(userSelf)) {
-                        console.log('req.query', get(req, 'query'))
-                        console.log('tokenSelf', tokenSelf)
+                        console.log('req.query', maskQuery(get(req, 'query')))
+                        console.log('tokenSelf', maskTok(tokenSelf))
                         console.log('[API]getPermUserInfor/check userSelf: invalid userSelf')
                         srLog.error({ event: 'api/getPermUserInfor-error', msg: 'tokenNoPermission' })
                         return Promise.reject(`tokenNoPermission`)
@@ -902,8 +933,8 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
 
                     //check
                     if (!isestr(userIdFind)) {
-                        console.log('req.query', get(req, 'query'))
-                        console.log('tokenSelf', tokenSelf)
+                        console.log('req.query', maskQuery(get(req, 'query')))
+                        console.log('tokenSelf', maskTok(tokenSelf))
                         console.log('[API]getPermUserInfor/check userIdFind: invalid userIdFind')
                         srLog.error({ event: 'api/getPermUserInfor-error', msg: 'tokenNoPermission' })
                         return Promise.reject(`tokenNoPermission`)
@@ -952,8 +983,8 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
 
                     //check
                     if (!isestr(token)) {
-                        console.log('req.query', get(req, 'query'))
-                        console.log('token', token)
+                        console.log('req.query', maskQuery(get(req, 'query')))
+                        console.log('token', maskTok(token))
                         console.log('[API]syncAndReplaceTabs/check token: invalid token')
                         srLog.error({ event: 'api/syncAndReplaceTabs-error', msg: 'tokenNoPermission' })
                         return Promise.reject(`tokenNoPermission`)
@@ -964,7 +995,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
 
                     //check
                     if (!isestr(keyTable)) {
-                        console.log('req.query', get(req, 'query'))
+                        console.log('req.query', maskQuery(get(req, 'query')))
                         console.log('keyTable', keyTable)
                         console.log('[API]syncAndReplaceTabs/check keyTable: invalid keyTable')
                         srLog.error({ event: 'api/syncAndReplaceTabs-error', msg: 'tokenNoPermission' })
@@ -984,7 +1015,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
 
                     //check user
                     if (!iseobj(user)) {
-                        console.log('token', token)
+                        console.log('token', maskTok(token))
                         console.log('[API]syncAndReplaceTabs/check user: invalid user')
                         srLog.error({ event: 'api/syncAndReplaceTabs-error', msg: 'tokenNoPermission' })
                         return Promise.reject(`tokenNoPermission`)
@@ -995,7 +1026,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
 
                     //check userId
                     if (!isestr(userId)) {
-                        console.log('token', token)
+                        console.log('token', maskTok(token))
                         console.log('user', user)
                         console.log('[API]syncAndReplaceTabs/check userId: invalid userId')
                         srLog.error({ event: 'api/syncAndReplaceTabs-error', msg: 'tokenNoPermission' })
@@ -1052,8 +1083,9 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
             //check
             if (!isestr(token)) {
                 console.log('apiType', apiType)
-                console.log('authorization', authorization)
+                console.log('authorization', maskTok(authorization))
                 console.log('invalid token')
+                srLog.error({ event: 'verifyConn-error', ok: false, apiType, msg: 'tokenNoPermission' }) //認證失敗須入 log 供稽核/統計(CLAUDE.md「log 記錄要點」; 同 w-web-api、w-web-task); 只記 key, 不記 authorization 原值
                 return false
             }
 
@@ -1078,8 +1110,8 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
             //origin
             let origin = get(headers, 'origin', '')
 
-            //referer
-            let referer = get(headers, 'referer', '')
+            //referer, 只記 origin + pathname(ADR-023): 前端以 ?token= 開站(w-ui-loginout 讀完不清網址), 同源請求之 Referer 預設帶完整網址, 原樣記錄即把使用者權杖寫入 srLog
+            let referer = maskUrl(get(headers, 'referer', ''))
 
             //info, 失敗時 msg 為 err key(cannotFindUserFromToken / cannotGetUserFromPerm / userNoPermission 等), 供資安稽核與統計
             if (b) {
@@ -1096,7 +1128,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser
             let user = await getUserByToken(token)
             let userId = get(user, 'id', '')
             if (!isestr(userId)) {
-                console.log('token', token)
+                console.log('token', maskTok(token))
                 console.log('userId', userId)
                 srLog.error({ event: 'getUserIdByToken-error', msg: 'cannotFindUserId' })
                 return Promise.reject(`cannotFindUserId`)

package/server/lockSave.mjs

@@ -0,0 +1,43 @@
+import get from 'lodash-es/get.js'
+import isestr from 'wsemi/src/isestr.mjs'
+
+
+/**
+ * 有副作用之寫入路徑(如清單儲存 updateUsersList / updateTokensList / updateIpsList)之雙擊防護(後端, ADR-025)
+ *
+ * 以「操作:操作者 id」於 wsemi cacheSt 原子占位執行 fn, 同一操作者之同一操作處理中再送出即 reject 錯誤 key
+ * (預設 'saveInProgress', 可以 opt.errKey 指定; 皆為 i18n key, 見 procLang); 不同操作者、不同操作互不影響;
+ * fn 之 reject 原樣 bubble; fn 結束(含失敗)即釋放.
+ * 第 2 次不排隊執行: 其內容與第 1 次相同, 排隊後再寫一次會把第 1 次剛建立之列當修改覆寫
+ * (依序重送另由各專案之資料層檢查擋, 如 SSO procCore.updateTabItems 之新增列檢查回 'saveNewRowExists').
+ * operatorId 可為操作者 id 或「操作者 id + 列識別」(只擋同一列之連發, 同批其他列不受影響).
+ *
+ * @param {Object} cst 輸入 wsemi cacheSt 實例
+ * @returns {Function} 回傳 async (op, operatorId, fn, opt = {}) => fn 之結果, opt.errKey 為占位衝突時 reject 之 key
+ */
+function createLockSave(cst) {
+
+    let lockSave = async (op, operatorId, fn, opt = {}) => {
+
+        //errKey
+        let errKey = get(opt, 'errKey', '')
+        if (!isestr(errKey)) {
+            errKey = 'saveInProgress'
+        }
+
+        let key = `${op}:${operatorId}`
+        return await cst.setWithFree([key], fn)
+            .catch((err) => {
+                //remap setWithFree 之占位衝突 → i18n key; fn 內之 reject 原樣 bubble
+                if (err === `setWithFree: key in use: ${key}`) {
+                    return Promise.reject(errKey)
+                }
+                return Promise.reject(err)
+            })
+    }
+
+    return lockSave
+}
+
+
+export default createLockSave