@pawlogic/dl 0.4.0-staging.f938db3 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dl-npm-update.sh +137 -0
- package/dl.mjs +1 -1
- package/ilands.mjs +1 -1
- package/package.json +3 -2
package/dl-npm-update.sh
ADDED
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
#!/bin/sh
|
|
2
|
+
# dl 沙箱内自更新 (npm 版本) —— 替代 dl-selfupdate.sh 的 GCS 路径。
|
|
3
|
+
#
|
|
4
|
+
# wrapper 在 exec dl 之前调一次本脚本。任何步骤失败一律 swallow,永远 exit 0,
|
|
5
|
+
# 绝不阻塞业务 dl 调用。当次仍用旧 bundle,新 bundle 装完后**下次** dl 调用才生效
|
|
6
|
+
# (agent 失败重试天然吃到新版)。
|
|
7
|
+
#
|
|
8
|
+
# 触发条件:DL_NPM_DIST_TAG 已 bake 到 sandbox env(prod=latest,staging=staging;PR
|
|
9
|
+
# preview 留空 → 本脚本直接 exit,沙箱内 dl 锁在 template 烤进去那版,便于 PR 间
|
|
10
|
+
# 复现 / 互不污染)。
|
|
11
|
+
#
|
|
12
|
+
# 鉴权: 不需要。包发到 npmjs.com 的 @pawlogic scope (public),npm 默认 registry
|
|
13
|
+
# 就是 npmjs.com,匿名 download 直接通,沙箱没有 ~/.npmrc。
|
|
14
|
+
#
|
|
15
|
+
# TTL 300s 缓存:同一 sandbox 5 分钟内多次 dl 调用只查一次。LLM 调用链常一分钟 10+
|
|
16
|
+
# 次,不加缓存白白打满 npm registry。
|
|
17
|
+
#
|
|
18
|
+
# 观测: 每条分支结束 fire-and-forget POST 一条事件到 callback-server
|
|
19
|
+
# $CALLBACK_SERVER_URL/internal/dl-selfupdate-event,backend 转 Prometheus
|
|
20
|
+
# counter + 结构化日志。TTL 命中频繁(每个沙箱 5min 内 N 次), 按 1/10 采样上报;
|
|
21
|
+
# 其余分支(install / no_tag / no_npm / lock_skip)全量上报。
|
|
22
|
+
# 上报失败一律 swallow,绝不让观测链阻塞自更新本身。
|
|
23
|
+
|
|
24
|
+
set -u
|
|
25
|
+
|
|
26
|
+
STAMP=/tmp/dl-npm-checkedat
|
|
27
|
+
LOCK=/tmp/dl-npm-update.lock
|
|
28
|
+
TTL=300
|
|
29
|
+
PACKAGE="@pawlogic/dl"
|
|
30
|
+
|
|
31
|
+
# ── 观测上报: fire-and-forget JSON POST,失败 swallow ────────────────────────
|
|
32
|
+
# args: outcome duration_ms
|
|
33
|
+
report_event() {
|
|
34
|
+
_outcome="$1"
|
|
35
|
+
_dur="${2:-null}"
|
|
36
|
+
[ -z "${CALLBACK_SERVER_URL:-}" ] && return 0
|
|
37
|
+
command -v curl >/dev/null 2>&1 || return 0
|
|
38
|
+
_tag="${DL_NPM_DIST_TAG:-unknown}"
|
|
39
|
+
case "$_tag" in
|
|
40
|
+
latest|staging) ;;
|
|
41
|
+
*) _tag="unknown" ;;
|
|
42
|
+
esac
|
|
43
|
+
_ver=""
|
|
44
|
+
_verfile="/home/user/.local/lib/node_modules/@pawlogic/dl/package.json"
|
|
45
|
+
if [ -f "$_verfile" ] && command -v node >/dev/null 2>&1; then
|
|
46
|
+
_ver=$(node -e 'try{console.log(require("'"$_verfile"'").version||"")}catch(e){}' 2>/dev/null || echo "")
|
|
47
|
+
fi
|
|
48
|
+
# 后台 curl, -m 2 上限 2s; 不解析响应; stderr/stdout 全丢。
|
|
49
|
+
(
|
|
50
|
+
curl -fsS -m 2 -X POST "${CALLBACK_SERVER_URL%/}/internal/dl-selfupdate-event" \
|
|
51
|
+
-H 'content-type: application/json' \
|
|
52
|
+
-d "{\"trigger\":\"wrapper\",\"dist_tag\":\"$_tag\",\"outcome\":\"$_outcome\",\"duration_ms\":$_dur,\"installed_version\":\"$_ver\",\"build_short_sha\":null}" \
|
|
53
|
+
>/dev/null 2>&1 || true
|
|
54
|
+
) &
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
# 采样 TTL hit 上报: 10 选 1。awk 比 $RANDOM 更便携 (busybox sh 默认没 $RANDOM)。
|
|
58
|
+
should_sample_ttl() {
|
|
59
|
+
awk 'BEGIN{srand(); exit !(int(rand()*10)==0)}' 2>/dev/null
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
# 环境不全 → no-op。staging / prod 才烤 DL_NPM_DIST_TAG,PR preview / 本地裸跑空。
|
|
63
|
+
if [ -z "${DL_NPM_DIST_TAG:-}" ]; then
|
|
64
|
+
report_event no_tag null
|
|
65
|
+
exit 0
|
|
66
|
+
fi
|
|
67
|
+
if ! command -v npm >/dev/null 2>&1; then
|
|
68
|
+
report_event no_npm null
|
|
69
|
+
exit 0
|
|
70
|
+
fi
|
|
71
|
+
|
|
72
|
+
# TTL 拦截。stamp 损坏当 0 处理。
|
|
73
|
+
now=$(date +%s 2>/dev/null) || exit 0
|
|
74
|
+
if [ -f "$STAMP" ]; then
|
|
75
|
+
last=$(cat "$STAMP" 2>/dev/null || echo 0)
|
|
76
|
+
case "$last" in
|
|
77
|
+
''|*[!0-9]*) last=0 ;;
|
|
78
|
+
esac
|
|
79
|
+
delta=$((now - last))
|
|
80
|
+
if [ "$delta" -ge 0 ] && [ "$delta" -lt "$TTL" ]; then
|
|
81
|
+
if should_sample_ttl; then
|
|
82
|
+
report_event ttl_hit null
|
|
83
|
+
fi
|
|
84
|
+
exit 0
|
|
85
|
+
fi
|
|
86
|
+
fi
|
|
87
|
+
|
|
88
|
+
# 单飞锁:并发 dl 调用同时进来时只让一个跑 npm install,其他直接退出。
|
|
89
|
+
# flock 不一定有(busybox sh) → mkdir 兜底原子锁。
|
|
90
|
+
run_install() {
|
|
91
|
+
_t0=$(date +%s 2>/dev/null || echo 0)
|
|
92
|
+
if npm install -g --silent --no-audit --no-fund --no-update-notifier "$PACKAGE@$DL_NPM_DIST_TAG" >/dev/null 2>&1; then
|
|
93
|
+
_outcome=ok
|
|
94
|
+
else
|
|
95
|
+
_outcome=npm_fail
|
|
96
|
+
fi
|
|
97
|
+
_t1=$(date +%s 2>/dev/null || echo 0)
|
|
98
|
+
_dur_ms=$(( (_t1 - _t0) * 1000 ))
|
|
99
|
+
# npm install -g 会重生成 /home/user/.local/bin/{dl,ilands} shim 顶掉 wrapper
|
|
100
|
+
# 软链, 立刻 re-link 回 /usr/local/bin/{dl,ilands} wrapper —— 不然 PATH 命中
|
|
101
|
+
# npm shim, 下次调用绕过 wrapper, dl 的 DL_NPM_DIST_TAG export 跑不到, 自更新
|
|
102
|
+
# 链路死掉; ilands 也跟着丢 wrapper(虽然 ilands 自己不需要 env, 但 update.sh
|
|
103
|
+
# 入口被绕过, 跟 dl 同时挂)。
|
|
104
|
+
ln -sf /usr/local/bin/dl /home/user/.local/bin/dl >/dev/null 2>&1 || true
|
|
105
|
+
ln -sf /usr/local/bin/ilands /home/user/.local/bin/ilands >/dev/null 2>&1 || true
|
|
106
|
+
# 自我热更: @pawlogic/dl npm 包里 ship 了本脚本的最新版 (packages/dl/sandbox-assets/
|
|
107
|
+
# dl-npm-update.sh), npm install 完成后覆盖一份到 wrapper 调用的固定路径。
|
|
108
|
+
# 1 代 lag: 本次仍跑老逻辑, 新逻辑下次 dl 调用生效 —— 比"等 e2b template republish
|
|
109
|
+
# + 老 snapshot 自然下线"快好几个量级, snapshot resume 的沙箱也能跟上。
|
|
110
|
+
# 当前进程文件是 shell 解释器一次性读入内存的, 覆盖自身不会撕裂正在执行的循环。
|
|
111
|
+
if [ -f /home/user/.local/lib/node_modules/@pawlogic/dl/dl-npm-update.sh ]; then
|
|
112
|
+
cp /home/user/.local/lib/node_modules/@pawlogic/dl/dl-npm-update.sh \
|
|
113
|
+
/home/user/.local/lib/dl-npm-update.sh 2>/dev/null || true
|
|
114
|
+
chmod +x /home/user/.local/lib/dl-npm-update.sh 2>/dev/null || true
|
|
115
|
+
fi
|
|
116
|
+
echo "$now" > "$STAMP"
|
|
117
|
+
report_event "$_outcome" "$_dur_ms"
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
if command -v flock >/dev/null 2>&1; then
|
|
121
|
+
(
|
|
122
|
+
if ! flock -n 9; then
|
|
123
|
+
report_event lock_skip null
|
|
124
|
+
exit 0
|
|
125
|
+
fi
|
|
126
|
+
run_install
|
|
127
|
+
) 9>"$LOCK"
|
|
128
|
+
else
|
|
129
|
+
if mkdir "$LOCK" 2>/dev/null; then
|
|
130
|
+
trap 'rmdir "$LOCK" 2>/dev/null || true' EXIT INT TERM
|
|
131
|
+
run_install
|
|
132
|
+
else
|
|
133
|
+
report_event lock_skip null
|
|
134
|
+
fi
|
|
135
|
+
fi
|
|
136
|
+
|
|
137
|
+
exit 0
|