aaden-cli 1.6.122 → 1.6.123

package/AadenDeploy/appCenterUsage.py

@@ -11,6 +11,14 @@
 local（localhost/127.x，收银机本机）、lan（局域网 IP，平板等）、none（没有 Referer，一般是直接打开页面）。
 只统计真实存在的目录，扫描器乱打的路径不算。
 
+另外按「客户端类型」统计打到 /PHP/ 的请求，应用名以 "@client/" 开头（原生 App 不带 Referer，上面那套看不到）：
+  - User-Agent 是 Aaden-<应用>/<版本> 的（约定的统一格式）→ "@client/Aaden-<应用>/<版本>"
+  - 否则按 HTTP 库分：okhttp（快消版安卓收银 2.0/3.0、K2）、ktor（点单 / 老板端）、
+    electron-<系统>（餐厅版桌面，windows / linux）、browser-<系统>（android 多半是商米机）、
+    system（门店主机自己的 cron / PHP / worker、云端经 ngrok 的请求）、other
+  - okhttp 另外数几个只有某一代收银才调的接口（MARKERS），用来区分 2.0 和 3.x，比如 "@client/okhttp:DashboardData.php"
+  客户端类的 sources 按客户端 IP 分（没有 Referer）：local=127.x/::1（含经 ngrok 进来的），lan=其它。
+
 用法: appCenterUsage.py [日志目录，默认 /var/log/apache2]；需要能读 access.log*（root 或 adm 组）。
 """
 import datetime
@@ -49,6 +57,52 @@ def source_of(ref_host):
     return 'lan'
 
 
+# 统一 User-Agent 约定：Aaden-<应用>/<版本> (<平台>; build <提交>; <渠道>)
+AADEN_UA = re.compile(r'^Aaden[- ]([A-Za-z0-9_.-]{1,24})/([A-Za-z0-9_.+-]{1,20})')  # 也认老的 "Aaden Buffet/2.16"
+# 门店主机自己（cron 的 wget/curl、PHP 的 Guzzle、node worker 的 axios）和云端经 ngrok 来的请求，不是收银前端
+SYSTEM_UA = ('wget/', 'curl/', 'guzzlehttp', 'axios/', 'reactornetty', 'java/', 'apache-httpclient', 'undici',
+             'python-requests', 'go-http-client', 'node-fetch', 'php/')
+# 只有某一代安卓收银会调的 PHP 接口：DashboardData.php 只在 2.0，QuickOrder.php 只在较新的 3.x
+MARKERS = ('DashboardData.php', 'QuickOrder.php')
+CLIENT = '@client/'
+
+
+def client_kind(ua):
+    """User-Agent → 客户端类型（不含 "@client/" 前缀）"""
+    m = AADEN_UA.match(ua)
+    if m:
+        return f'Aaden-{m.group(1)}/{m.group(2)}'
+    low = ua.lower()
+    if low in ('', '-') or low.startswith(SYSTEM_UA):
+        return 'system'
+    if low.startswith('okhttp'):
+        return 'okhttp'
+    if 'ktor' in low:
+        return 'ktor'
+    if 'electron' in low:
+        return 'electron-' + ua_os(low)
+    if low.startswith('mozilla'):
+        return 'browser-' + ua_os(low)
+    return 'other'
+
+
+def ua_os(low):
+    """餐厅版要分 Windows / Ubuntu 桌面和安卓平板（商米等）"""
+    if 'android' in low:
+        return 'android'
+    if 'windows' in low:
+        return 'windows'
+    if 'linux' in low or 'x11' in low:
+        return 'linux'
+    if 'iphone' in low or 'ipad' in low or 'mac os' in low:
+        return 'apple'
+    return 'other'
+
+
+def ip_source(ip):
+    return 'local' if ip.startswith('127.') or ip == '::1' else 'lan'
+
+
 TS = re.compile(r'^(\d{2})/([A-Z][a-z]{2})/(\d{4}):(\d{2}:\d{2}:\d{2})')
 
 
@@ -122,6 +176,25 @@ def _app_version(rel):
     return info
 
 
+def count_client(stats, m):
+    """一条 /PHP/ 请求按客户端类型记一次；okhttp 碰到标记接口再多记一行"""
+    day, at = parse_ts(m['ts'])
+    if not day:
+        return
+    kind = client_kind(m['ua'])
+    names = [CLIENT + kind]
+    if kind == 'okhttp':
+        bare = m['path'].split('?')[0]
+        names += [f'{CLIENT}okhttp:{mk}' for mk in MARKERS if bare.endswith('/' + mk)]
+    for name in names:
+        s = stats[(name, day)]
+        s['requests'] += 1
+        s['clients'].add((m['ip'], '-', m['ua'][:120]))
+        s['sources'][ip_source(m['ip'])] += 1
+        if at > s['lastSeen']:
+            s['lastSeen'] = at
+
+
 def main():
     installed = []
     if os.path.isdir(APPCENTER):
@@ -159,11 +232,16 @@ def main():
                         log_from = at
                     if log_to is None or at > log_to:
                         log_to = at
-                if prefilter is None or not prefilter.search(line):
+                php = ' /PHP/' in line
+                if not php and (prefilter is None or not prefilter.search(line)):
                     continue
                 m = LINE.match(line)
                 if not m:
                     continue
+                if php and m['path'].startswith('/PHP/'):
+                    count_client(stats, m)
+                    if prefilter is None or not prefilter.search(line):
+                        continue
                 path, ref = m['path'], m['ref']
                 pm = APP_IN_PATH.match(path)
                 rm = APP_IN_REF.match(ref) if ref and ref != '-' else None

package/dist/index.js

@@ -19352,7 +19352,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.122"};
+module.exports = {"i8":"1.6.123"};
 
 /***/ })
 

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "aaden-cli",
-  "version": "1.6.122",
+  "version": "1.6.123",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
-    "test": "node test/snap-version.test.js && python3 test/app_version_test.py",
+    "test": "node test/snap-version.test.js && python3 test/app_version_test.py && python3 test/client_kind_test.py",
     "update": "git add . && release-it --ci"
   },
   "bin": {

package/test/client_kind_test.py

@@ -0,0 +1,61 @@
+# python3 test/client_kind_test.py：appCenterUsage 按客户端类型统计 /PHP/ 请求
+import importlib.util, io, json, os, sys, tempfile, contextlib
+sys.dont_write_bytecode = True
+
+logdir = tempfile.mkdtemp()
+root = tempfile.mkdtemp()
+os.makedirs(os.path.join(root, 'App')); open(os.path.join(root, 'App', 'index.html'), 'w').write('<p>')
+os.makedirs(os.path.join(root, 'PHP'))
+
+L = '{ip} - - [14/Oct/2026:12:{mm}:00 +0200] "GET {path} HTTP/1.1" 200 12 "{ref}" "{ua}"\n'
+lines = [
+    # 2.0 安卓收银：okhttp + 2.0 独有的 DashboardData.php
+    L.format(ip='192.168.1.20', mm='01', path='/PHP/Orders.php?op=list', ref='-', ua='okhttp/5.0.0-alpha.14'),
+    L.format(ip='192.168.1.20', mm='02', path='/PHP/DashboardData.php?x=1', ref='-', ua='okhttp/5.0.0-alpha.14'),
+    # 3.x 安卓收银：QuickOrder.php
+    L.format(ip='192.168.1.21', mm='03', path='/PHP/QuickOrder.php?op=config', ref='-', ua='okhttp/5.0.0-alpha.14'),
+    # 统一格式的 UA
+    L.format(ip='192.168.1.22', mm='04', path='/PHP/Orders.php', ref='-', ua='Aaden-Antelope/3.1.32 (android; build 38a5a79; pgyer)'),
+    # 商米机浏览器里的 /App：既算 App（Referer）也算 browser-android
+    L.format(ip='127.0.0.1', mm='05', path='/PHP/Orders.php', ref='http://localhost/App/', ua='Mozilla/5.0 (Linux; Android 7.1.2; T2s Build/NHG47K) Chrome/120'),
+    L.format(ip='127.0.0.1', mm='06', path='/PHP/Orders.php', ref='-', ua='Mozilla/5.0 (Windows NT 10.0; Win64; x64) aaden-desktop Electron/28.0.0'),
+    L.format(ip='192.168.1.30', mm='07', path='/PHP/Dishes.php', ref='-', ua='Ktor client'),
+    # 不是 /PHP/ 的不算客户端；乱码时间整行跳过
+    L.format(ip='192.168.1.20', mm='08', path='/Resource/dishImg/1.png', ref='-', ua='okhttp/5.0.0-alpha.14'),
+    '\x16\x03 - - [\x00garbage] "GET /PHP/x.php HTTP/1.1" 200 1 "-" "okhttp/5"\n',
+]
+open(os.path.join(logdir, 'access.log'), 'w').writelines(lines)
+
+spec = importlib.util.spec_from_file_location('usage', os.path.join(os.path.dirname(__file__), '..', 'AadenDeploy', 'appCenterUsage.py'))
+usage = importlib.util.module_from_spec(spec)
+sys.argv = [sys.argv[0], logdir]
+spec.loader.exec_module(usage)
+usage.DOCROOT = root
+usage.APPCENTER = os.path.join(root, 'AppCenter')
+
+buf = io.StringIO()
+with contextlib.redirect_stdout(buf):
+    usage.main()
+out = json.loads(buf.getvalue())
+rows = {r['app']: r for r in out['usage']}
+
+assert rows['@client/okhttp']['requests'] == 3 and rows['@client/okhttp']['clients'] == 2, rows['@client/okhttp']
+assert rows['@client/okhttp:DashboardData.php']['requests'] == 1
+assert rows['@client/okhttp:QuickOrder.php']['requests'] == 1
+assert rows['@client/Aaden-Antelope/3.1.32']['requests'] == 1
+assert rows['@client/browser-android']['requests'] == 1 and rows['@client/browser-android']['sources']['local'] == 1
+assert rows['@client/electron-windows']['requests'] == 1
+assert rows['@client/ktor']['requests'] == 1 and rows['@client/ktor']['sources']['lan'] == 1
+assert rows['App']['requests'] == 1, rows['App']
+assert not any(a.startswith('@client/') for a in out['installedApps'])
+assert set(rows) == {'App', '@client/okhttp', '@client/okhttp:DashboardData.php', '@client/okhttp:QuickOrder.php',
+                     '@client/Aaden-Antelope/3.1.32', '@client/browser-android', '@client/electron-windows', '@client/ktor'}, set(rows)
+assert all(len(a) <= 64 for a in rows)
+assert usage.client_kind('Mozilla/5.0 (X11; Linux x86_64) aaden/1.0 Electron/22') == 'electron-linux'
+assert usage.client_kind('Mozilla/5.0 (Windows NT 10.0) Chrome/120') == 'browser-windows'
+assert usage.client_kind('curl/8') == 'system' and usage.client_kind('-') == 'system'
+assert usage.client_kind('GuzzleHttp/7') == 'system' and usage.client_kind('Wget/1.20.3 (linux-gnu)') == 'system'
+assert usage.client_kind('Aaden Buffet/2.16 (iPad; iOS 27.0.1; Scale/2.00)') == 'Aaden-Buffet/2.16'
+assert usage.client_kind('ktor-client') == 'ktor'
+assert usage.client_kind('SomethingNew/1') == 'other'
+print('client_kind_test OK')