Compare commits

..

No commits in common. "c87d598e64102e99b11e45100a79756f3db4d73f" and "c3e2e28ec402cdb1f4aa446548838db42fcd24a9" have entirely different histories.

28 changed files with 134 additions and 1262 deletions

View File

@ -54,9 +54,6 @@ services:
OPENAI_API_KEY: "${OPENAI_API_KEY:-}" OPENAI_API_KEY: "${OPENAI_API_KEY:-}"
GEMINI_API_KEY: "${GEMINI_API_KEY:-}" GEMINI_API_KEY: "${GEMINI_API_KEY:-}"
ANYBOT_RESTORE_FROM_ACCOUNT: "${ANYBOT_RESTORE_FROM_ACCOUNT:-}" ANYBOT_RESTORE_FROM_ACCOUNT: "${ANYBOT_RESTORE_FROM_ACCOUNT:-}"
# The bots' computer goes by its own name: a desktop AnyBot on this same machine keeps
# "anybot-box" for itself (and used to pause the brain's one as idle).
ANYBOT_BOX_NAME: "anybot-brain-box"
volumes: volumes:
- anybot-data:/data - anybot-data:/data
# The bot's own computer runs as a container next to this one. # The bot's own computer runs as a container next to this one.

View File

@ -1,411 +0,0 @@
# End-to-end test of a brain on a server working on a person's computer, all on this machine and
# all made up for the test: an account server, a headless brain, a headless "hands" computer (it
# also plays the person's screen, as a Mac showing the brain does), and a scripted fake model.
# Never touches a real account, and no Docker box (the bot's own computer is a sealed folder).
# Build first (cargo build --release; and in relay/), then, from app/:
# python3 -I deploy/test/remote_e2e.py .
# On a Mac the terminal needs 輔助使用 (the hands open Calculator through agent-desktop).
import base64, json, os, re, shutil, socket, subprocess, sys, tempfile, threading, time, urllib.request, urllib.error
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
APP = os.path.abspath(sys.argv[1])
BIN = os.path.join(APP, 'target/release/anybot')
RELAY = os.path.join(APP, 'relay/target/release/anybot-relay')
WORK = tempfile.mkdtemp(prefix='anybot-e2e-')
USER, PW = 'e2euser', 'e2e-pass-12345'
HANDS = 'E2E手腳'
APP_NAME = os.environ.get('E2E_APP', 'Calculator')
# E2E_SCREENSHOT=1: also a screenshot of the hands' screen, sent back to the brain (needs a
# screen: on Linux a Wayland or X11 session, on a Mac 螢幕錄製 for the terminal).
SHOT = os.environ.get('E2E_SCREENSHOT') == '1'
# E2E_TYPE=1 (with E2E_SCREENSHOT): also click, type and press Enter in a terminal on the right
# half of the hands' screen (the Linux Wayland test opens one there).
results = []
images = []
def free_port():
s = socket.socket(); s.bind(('127.0.0.1', 0)); p = s.getsockname()[1]; s.close(); return p
def check(name, ok, detail=''):
results.append((name, bool(ok), detail))
print(('PASS ' if ok else 'FAIL ') + name + ('' if ok else f' — {detail}'), flush=True)
# ---------- the scripted model ----------
def tool_call(name, args):
return {'tool': (name, json.dumps(args, ensure_ascii=False))}
SCRIPTS = {
'SC_LIST': [tool_call('list_computers', {})],
'SC_OPEN': [tool_call('computer_use_open_app', {'app': APP_NAME, 'computer': HANDS})],
'SC_SHOT': [tool_call('computer_use_screenshot', {'computer': HANDS})],
# Mouse and keyboard there: click the terminal on the right, type a command (Chinese too), Enter.
'SC_TYPE': [tool_call('computer_use_screenshot', {'computer': HANDS}),
tool_call('computer_use_click', {'x': 768, 'y': 300, 'computer': HANDS}),
tool_call('computer_use_typing', {'value': 'echo 打字-$((3*4)) > /tmp/e2e-typed.txt', 'computer': HANDS}),
tool_call('computer_use_press_key', {'key': 'return', 'computer': HANDS}),
tool_call('shell', {'command': 'sleep 1; cat /tmp/e2e-typed.txt', 'computer': HANDS})],
'SC_SHELL': [tool_call('shell', {'command': 'echo e2e-$((6*7))', 'computer': HANDS})],
'SC_REDIRECT': [tool_call('shell', {'command': 'echo moved-here', 'computer': HANDS})],
'SC_HANDOFF': [tool_call('hand_over_computer', {'instruction': 'E2E:請按「我完成了」', 'computer': HANDS})],
'另一台:': [tool_call('hand_over_computer', {'instruction': 'E2E:在另一台', 'computer': 'E2E另一台'})],
'SC_OWN': [tool_call('shell', {'command': 'echo on-own-$((2+3))'})],
}
class Model(BaseHTTPRequestHandler):
def log_message(self, *a):
pass
def do_GET(self):
body = json.dumps({'data': [{'id': 'e2e'}]}).encode()
self.send_response(200); self.send_header('Content-Type', 'application/json'); self.send_header('Content-Length', str(len(body))); self.end_headers(); self.wfile.write(body)
def do_POST(self):
n = int(self.headers.get('Content-Length', '0') or 0)
raw = self.rfile.read(n) or b'{}'
req = json.loads(raw)
# Pictures the model was shown (a screenshot from another computer comes back as one).
for m in re.finditer(rb'data:image/jpeg;base64,([A-Za-z0-9+/=]+)', raw):
images.append(base64.b64decode(m.group(1)))
msgs = req.get('messages', [])
# The person's last message (a screenshot comes back as a user message of pictures: not them).
said = lambda m: m.get('role') == 'user' and not (isinstance(m.get('content'), list) and any(isinstance(p, dict) and p.get('type') == 'image_url' for p in m['content']))
last_user = max((i for i, m in enumerate(msgs) if said(m)), default=-1)
text = msgs[last_user].get('content', '') if last_user >= 0 else ''
if isinstance(text, list):
text = ' '.join(p.get('text', '') for p in text if isinstance(p, dict))
done = sum(1 for m in msgs[last_user + 1:] if m.get('role') == 'tool')
last_tool = next((m.get('content', '') for m in reversed(msgs) if m.get('role') == 'tool'), '')
script = next((v for k, v in SCRIPTS.items() if k in text), [])
if done < len(script):
name, args = script[done]['tool']
chunk = {'choices': [{'delta': {'tool_calls': [{'index': 0, 'id': f'c{int(time.time()*1000)}', 'function': {'name': name, 'arguments': args}}]}}]}
else:
chunk = {'choices': [{'delta': {'content': 'E2E 完成:' + (last_tool if isinstance(last_tool, str) else '')[:300]}}]}
self.send_response(200); self.send_header('Content-Type', 'text/event-stream'); self.end_headers()
self.wfile.write(('data: ' + json.dumps(chunk, ensure_ascii=False) + '\n\ndata: [DONE]\n\n').encode())
# ---------- relay helpers ----------
RP = free_port(); MP = free_port()
RURL = f'http://127.0.0.1:{RP}'
def http(method, url, body=None, token=None, timeout=60, raw=False):
data = None if body is None else json.dumps(body).encode()
req = urllib.request.Request(url, method=method, data=data, headers={'Content-Type': 'application/json', **({'Authorization': 'Bearer ' + token} if token else {})})
try:
with urllib.request.urlopen(req, timeout=timeout) as r:
b = r.read(); return r.status, (b if raw else json.loads(b or b'null'))
except urllib.error.HTTPError as e:
b = e.read()
try:
return e.code, json.loads(b)
except Exception:
return e.code, b
procs = {}
def start(name, args, env):
log = open(os.path.join(WORK, name + '.log'), 'a')
e = dict(os.environ); e.update(env)
procs[name] = subprocess.Popen(args, env=e, stdout=log, stderr=log, cwd=WORK)
def stop(name):
p = procs.pop(name, None)
if p:
p.terminate()
try:
p.wait(10)
except Exception:
p.kill()
def template():
path = os.path.join(WORK, 'sample.json')
subprocess.run([BIN, '--sample-state', path], check=True)
t = json.load(open(path))
for k in ('channels', 'mcp_servers', 'skills', 'pages', 'review_allow_rules', 'review_ask_rules', 'remote_computers', 'folders'):
if k in t:
t[k] = []
t['providers'] = {'custom': {'api_key': '', 'base_url': f'http://127.0.0.1:{MP}/v1', 'default_model': 'e2e', 'known_models': ['e2e']}}
t['remote'] = {'lan': False, 'password': '', 'devices': [], 'mac_from_phone': False, 'device_link': False, 'relay_url': '', 'relay_user': '', 'host_id': '', 'host_token': '', 'host_name': '', 'backup_key': '', 'auto_backup': False, 'last_backup': 0}
b = t['bots'][0]
b.update({'name': 'Master', 'provider': 'Custom', 'model': 'e2e', 'messages': [], 'memories': [], 'allow_rules': [], 'last_turn': None, 'default_computer': 'Bot 的電腦', 'tools_enabled': True, 'instructions': ''})
b.pop('threads', None)
t['bots'] = [b]; t['primary_bot'] = b['id']; t['selected'] = b['id']
t['local_execution'] = False; t['direct_mode'] = False; t['auto_review'] = False
return t
NOBOX = {'DOCKER_HOST': 'unix:///nonexistent/docker.sock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
def run():
srv = ThreadingHTTPServer(('127.0.0.1', MP), Model)
threading.Thread(target=srv.serve_forever, daemon=True).start()
os.makedirs(os.path.join(WORK, 'relay'))
start('relay', [RELAY, '--bind', '127.0.0.1', '--port', str(RP), '--data', os.path.join(WORK, 'relay')], {})
for _ in range(50):
try:
if http('GET', RURL + '/api/hello')[0] == 200:
break
except Exception:
time.sleep(0.2)
# The brain: a seeded bot on the fake model, joins (and makes) the account.
bdir = os.path.join(WORK, 'brain'); os.makedirs(bdir)
st = template(); st['remote']['host_name'] = 'E2E大腦'
json.dump(st, open(os.path.join(bdir, 'state.json'), 'w'), ensure_ascii=False)
benv = {'ANYBOT_DATA_DIR': bdir, 'ANYBOT_ACCOUNT': f'{RURL}|{USER}', 'ANYBOT_ACCOUNT_PASSWORD': PW, 'ANYBOT_ACCOUNT_CREATE': '1', 'ANYBOT_HOST_NAME': 'E2E大腦', **NOBOX}
start('brain', [BIN, '--serve'], benv)
brain_id = None
for _ in range(60):
time.sleep(0.5)
try:
s = json.load(open(os.path.join(bdir, 'state.json')))
if s['remote'].get('host_id'):
brain_id = s['remote']['host_id']; break
except Exception:
pass
check('brain joins the account', brain_id, 'no host id')
# The hands: a second AnyBot of the account, lending its hands to that brain only.
_, v = http('POST', RURL + '/relay/login', {'user': USER, 'password': PW, 'device': HANDS})
_, h = http('POST', RURL + '/relay/hosts', {'name': HANDS}, token=v['token'])
hdir = os.path.join(WORK, 'hands'); os.makedirs(hdir)
hs = template(); hs['bots'] = []
hs['remote'].update({'relay_url': RURL, 'relay_user': USER, 'host_id': h['id'], 'host_token': h['token'], 'host_name': HANDS, 'device_link': True, 'hands_for': brain_id, 'hands_for_name': 'E2E大腦'})
json.dump(hs, open(os.path.join(hdir, 'state.json'), 'w'), ensure_ascii=False)
henv = {'ANYBOT_DATA_DIR': hdir, **NOBOX}
start('hands', [BIN, '--serve'], henv)
# A second computer showing the same brain (as a desktop AnyBot left on the server does):
# with two, 「我的電腦」 has to be the one the person typed on, not a guess.
_, h2 = http('POST', RURL + '/relay/hosts', {'name': 'E2E另一台'}, token=v['token'])
h2dir = os.path.join(WORK, 'hands2'); os.makedirs(h2dir)
hs2 = template(); hs2['bots'] = []
hs2['remote'].update({'relay_url': RURL, 'relay_user': USER, 'host_id': h2['id'], 'host_token': h2['token'], 'host_name': 'E2E另一台', 'device_link': True, 'hands_for': brain_id, 'hands_for_name': 'E2E大腦', 'brain_id': brain_id, 'brain_name': 'E2E大腦'})
json.dump(hs2, open(os.path.join(h2dir, 'state.json'), 'w'), ensure_ascii=False)
start('hands2', [BIN, '--serve'], {'ANYBOT_DATA_DIR': h2dir, **NOBOX})
tok = h['token']
sync = lambda method, rest='', body=None, q='': http(method, f'{RURL}/relay/hosts/{brain_id}/api/sync{rest}{q}', body, token=tok)
def peers():
return {x['name']: x for x in http('GET', RURL + '/relay/host/peers', token=tok)[1]['hosts']}
for _ in range(40):
p = peers()
if p.get('E2E大腦', {}).get('online') and p.get(HANDS, {}).get('online') and p.get('E2E另一台', {}).get('online'):
break
time.sleep(0.5)
p = peers()
check('brain and hands are online', p.get('E2E大腦', {}).get('online') and p.get(HANDS, {}).get('online'), json.dumps(p, ensure_ascii=False))
# Tell the account this computer shows that brain (as the Mac's screen does).
copy = {'version': 0, 'msgs': {}}
def pull(full=False, client='screen'):
since = 0 if full else copy['version']
code, v = sync('GET', q=f'?since={since}&client={client}')
if code != 200:
raise RuntimeError(f'pull {code} {v}')
if client == 'screen':
copy['version'] = v.get('version', 0)
for d in v.get('bots', []):
cur = copy['msgs'].setdefault(d['id'], [])
if len(cur) < d['from']:
copy['version'] = 0 # the screen asks for everything again
continue
del cur[d['from']:]
cur.extend(d['messages'])
return v
# The brain looks the account's computers up every 15 s: a computer that just came on is
# there within that.
for _ in range(25):
v = pull()
comps = v.get('computers', {}).get('1', {})
names = [x['name'] for x in comps.get('names', [])]
if HANDS in names and 'E2E另一台' in names:
break
time.sleep(1)
check('computers by their own names; no server computer', sorted(names) == sorted(['Master 的電腦', HANDS, 'E2E另一台']), names)
check('the bot works on its own computer by default', comps.get('current') == 'Master 的電腦', comps)
def wait_turn(answer=None, timeout=90, during=None):
"""Until the turn ends; answers requests with `answer` ("once"/"reject")."""
t0 = time.time(); seen = []
while time.time() - t0 < timeout:
v = pull(client='poll')
for a in v.get('approvals', []):
key = (a.get('call_id'), a.get('kind'))
if key not in [s[:2] for s in seen]:
seen.append((a.get('call_id'), a.get('kind'), a))
if during:
during(a)
elif answer:
sync('POST', '/act', {'bot': 1, 'action': 'answer', 'answer': answer})
if not v.get('live') and not v.get('approvals') and time.time() - t0 > 2.5:
return seen, v
time.sleep(0.5)
return seen, None
def last_tool(v):
msgs = [m for m in v['bots'][0]['messages'] if m['role'] == 'Tool'] if v and v.get('bots') else []
return msgs[-1]['text'] if msgs else ''
def full_messages():
return pull(full=True, client='check')['bots'][0]['messages']
def tool_text_after(marker):
ms = full_messages()
i = max((k for k, m in enumerate(ms) if m['role'] == 'User' and marker in m['text']), default=-1)
return [m['text'] for m in ms[i + 1:] if m['role'] == 'Tool']
# 1. 查看電腦: the person's computer is the one they typed on.
sync('POST', '/act', {'bot': 1, 'action': 'send', 'text': '我現在用哪台?SC_LIST'})
wait_turn('once')
t = ' '.join(tool_text_after('SC_LIST'))
check('list_computers names the hands as where the person is', HANDS in t and '使用者現在就是在這台' in t, t[:300])
# 4. Not asked for: back to the chosen computer, with a word for the bot.
sync('POST', '/act', {'bot': 1, 'action': 'send', 'text': '跑一下 SC_REDIRECT'})
wait_turn('once')
t = ' '.join(tool_text_after('SC_REDIRECT'))
check('a step the person did not ask for goes to the chosen computer, and the bot is told', 'moved-here' in t and '[Master 的電腦]' in t and '這一步你指定了' in t, t[:400])
# 2. A step on the person's computer, named by them: asks once, runs there (agent-desktop).
sync('POST', '/act', {'bot': 1, 'action': 'send', 'text': '在我的電腦打開計算機 SC_OPEN'})
seen, _ = wait_turn('once')
t = ' '.join(tool_text_after('SC_OPEN'))
check('open_app on the person computer asks first', any(s[1] == 'action' for s in seen), seen)
check('open_app ran on the hands via agent-desktop', f'[{HANDS}]' in t and ('已打開' in t), t[:400])
# 3. A command there.
sync('POST', '/act', {'bot': 1, 'action': 'send', 'text': '在我的電腦跑指令 SC_SHELL'})
wait_turn('once')
t = ' '.join(tool_text_after('SC_SHELL'))
check('shell runs on the hands', 'e2e-42' in t and f'[{HANDS}]' in t, t[:300])
# 3b. A screenshot there, back to the brain and on to the model as a picture.
if SHOT:
before = len(images)
sync('POST', '/act', {'bot': 1, 'action': 'send', 'text': '看一下我的螢幕 SC_SHOT'})
wait_turn('once')
t = ' '.join(tool_text_after('SC_SHOT'))
check('screenshot runs on the hands', f'[{HANDS}]' in t and '螢幕截圖(' in t, t[:300])
pics = [b for b in images[before:] if b[:2] == b'\xff\xd8' and len(b) > 1000]
if pics:
open(os.path.join(WORK, 'shot.jpg'), 'wb').write(pics[-1])
check('the model gets the screenshot as a JPEG', bool(pics), f'{len(images) - before} pictures; saved {os.path.join(WORK, "shot.jpg")}')
if os.environ.get('E2E_TYPE') == '1':
sync('POST', '/act', {'bot': 1, 'action': 'send', 'text': '在我的電腦打字 SC_TYPE'})
wait_turn('once')
t = ' '.join(tool_text_after('SC_TYPE'))
check('click, typing (Chinese too) and Enter reach the hands', '打字-12' in t, t[-400:])
# 5. Its own computer.
sync('POST', '/act', {'bot': 1, 'action': 'send', 'text': '用你自己的 SC_OWN'})
wait_turn('once')
t = ' '.join(tool_text_after('SC_OWN'))
check('own computer by default', 'on-own-5' in t and '[Master 的電腦]' in t, t[:300])
# 6. 需要處理: 我完成了.
sync('POST', '/act', {'bot': 1, 'action': 'send', 'text': '在我的電腦 SC_HANDOFF'})
got = {}
phone = {}
def on_handoff(a):
got.update(a)
# The phone (signed in as the person) sees it too, as 需要處理 with the computer.
_, ses = http('POST', RURL + '/relay/login', {'user': USER, 'password': PW, 'device': 'e2e-phone'})
code, view = http('GET', f'{RURL}/h/{brain_id}/api/state?since=0', token=ses.get('token'))
phone.update(next((x for x in (view or {}).get('approvals', []) if x.get('bot') == 1), {}) if code == 200 else {'code': code, 'body': str(view)[:200]})
sync('POST', '/act', {'bot': 1, 'action': 'answer', 'answer': 'once'})
wait_turn(during=on_handoff)
t = ' '.join(tool_text_after('在我的電腦 SC_HANDOFF'))
check('hand-off shows as 需要處理 with the instruction and computer', got.get('kind') == 'handoff' and got.get('reason') == 'E2E:請按「我完成了」' and got.get('grant') == HANDS, got)
check('我完成了 lets the bot carry on', '我完成了' in t, t[:300])
check('the phone shows the hand-off with its computer', phone.get('kind') == 'handoff' and phone.get('computer') == HANDS and not phone.get('can_always'), phone)
# 7. 需要處理: 跳過.
sync('POST', '/act', {'bot': 1, 'action': 'send', 'text': '再一次在我的電腦 SC_HANDOFF'})
wait_turn('reject')
t = ' '.join(tool_text_after('再一次在我的電腦 SC_HANDOFF'))
check('跳過 tells the bot the step is skipped', '跳過' in t, t[:300])
# 8. 需要處理: answered by a message.
sync('POST', '/act', {'bot': 1, 'action': 'send', 'text': '第三次在我的電腦 SC_HANDOFF'})
def on_reply(a):
sync('POST', '/act', {'bot': 1, 'action': 'send', 'text': '我已經登入好了'})
seen, v = wait_turn(during=on_reply)
t = ' '.join(tool_text_after('第三次在我的電腦 SC_HANDOFF'))
check('a message answers a hand-off', '傳了訊息' in t, t[:300])
ms = full_messages()
check('the reply is in the chat once', sum(1 for m in ms if m['role'] == 'User' and m['text'] == '我已經登入好了') == 1, [m['text'] for m in ms if m['role'] == 'User'])
# 8b. A turn started on one computer; while it waits, the person types on another one:
# 「我的電腦」 in that message is the computer it was typed on (the turn's own idea was fixed
# when it started).
tok2 = h2['token']
sync2 = lambda method, rest='', body=None, q='': http(method, f'{RURL}/relay/hosts/{brain_id}/api/sync{rest}{q}', body, token=tok2)
sync2('POST', '/act', {'bot': 1, 'action': 'send', 'text': '另一台:在這台 E2E另一台 請我接手'})
def steer_from_hands(a):
if a.get('kind') == 'handoff':
sync('POST', '/act', {'bot': 1, 'action': 'send', 'text': '算了,在我的電腦跑指令 SC_SHELL 插話'})
else:
sync('POST', '/act', {'bot': 1, 'action': 'answer', 'answer': 'once'})
wait_turn(during=steer_from_hands)
t = ' '.join(tool_text_after('SC_SHELL 插話'))
check('a message typed on another computer mid-turn: 「我的電腦」 is that one', 'e2e-42' in t and f'[{HANDS}]' in t and '這一步你指定了' not in t, t[:300])
# 9. The screen's copy, kept from small updates, matches the brain's chat exactly.
for _ in range(3):
pull()
mine = copy['msgs'].get(1, [])
full = full_messages()
sig = lambda ms: [(m['role'], m['text'], m.get('at')) for m in ms]
check('screen copy equals the brain chat (no duplicates)', sig(mine) == sig(full), f'{len(mine)} vs {len(full)}')
users = [m['text'] for m in full if m['role'] == 'User']
check('no user message twice', len(users) == len(set(users)), users)
# 10. Choosing a computer from the screen reaches the brain.
sync('POST', '/edit', {'client': 'screen', 'seq': 1, 'ops': [{'op': 'bot_set', 'id': 1, 'key': 'default_computer', 'value': HANDS}]})
time.sleep(1.0)
c = pull(full=True, client='check2')['computers']['1']
check('the computer chosen on the screen is the brain\'s choice', c['current'] == HANDS, c)
sync('POST', '/edit', {'client': 'screen', 'seq': 2, 'ops': [{'op': 'bot_set', 'id': 1, 'key': 'default_computer', 'value': 'Bot 的電腦'}]})
time.sleep(1.0)
c = pull(full=True, client='check3')['computers']['1']
check('and back to its own', c['current'] == 'Master 的電腦', c)
# 11. The hands go away: plain words, not codes.
stop('hands')
time.sleep(10)
sync('POST', '/act', {'bot': 1, 'action': 'send', 'text': '在我的電腦跑指令 SC_SHELL 二'})
wait_turn('once', timeout=120)
t = ' '.join(tool_text_after('SC_SHELL 二'))
check('hands offline: the bot hears it in words', ('連不到' in t or '離線' in t) and 'e2e-42' not in t and '這一步你指定了' not in t and not any(code in t for code in ('503', '502', '404')), t[:300])
start('hands', [BIN, '--serve'], henv)
for _ in range(40):
if peers().get(HANDS, {}).get('online'):
break
time.sleep(0.5)
sync('POST', '/act', {'bot': 1, 'action': 'send', 'text': '在我的電腦跑指令 SC_SHELL 三'})
wait_turn('once')
t = ' '.join(tool_text_after('SC_SHELL 三'))
check('hands back: works again', 'e2e-42' in t and f'[{HANDS}]' in t, t[:300])
# 12. The brain restarts: the screen picks everything up again, and work goes on.
before = len(full_messages())
stop('brain')
time.sleep(3)
start('brain', [BIN, '--serve'], benv)
for _ in range(60):
try:
if peers().get('E2E大腦', {}).get('online'):
v = pull()
break
except Exception:
pass
time.sleep(0.5)
time.sleep(2)
pull()
check('after a brain restart the screen has the whole chat', len(copy['msgs'].get(1, [])) >= before, f'{len(copy["msgs"].get(1, []))} < {before}')
sync('POST', '/act', {'bot': 1, 'action': 'send', 'text': '在我的電腦跑指令 SC_SHELL 四'})
wait_turn('once')
t = ' '.join(tool_text_after('SC_SHELL 四'))
check('after a brain restart, the first 「我的電腦」 is the computer the person typed on', 'e2e-42' in t and f'[{HANDS}]' in t and '這一步你指定了' not in t, t[:300])
pull(); pull()
check('screen copy still equals the brain chat', sig(copy['msgs'].get(1, [])) == sig(full_messages()))
# 13. 清除聊天記錄 from the screen clears the brain's chat.
sync('POST', '/act', {'bot': 1, 'action': 'clear'})
time.sleep(1.5)
check('clear from the screen empties the brain chat', full_messages() == [])
pull(); pull()
check('and the screen copy follows', copy['msgs'].get(1, []) == [], len(copy['msgs'].get(1, [])))
try:
run()
except Exception as e:
import traceback; traceback.print_exc()
check('harness ran to the end', False, repr(e))
finally:
for n in list(procs):
stop(n)
failed = [r for r in results if not r[1]]
print(f'\n{len(results) - len(failed)}/{len(results)} passed; logs in {WORK}')
sys.exit(1 if failed else 0)

View File

@ -1,16 +0,0 @@
# The remote end-to-end test (../remote_e2e.py) on a Linux Wayland desktop: a headless sway in
# Docker whose runtime folder (XDG_RUNTIME_DIR) is full, as on a desktop that once crashed when
# AnyBot took a screenshot. Brain, relay and devices are the server images' own builds.
# On the server, after `docker compose build` in deploy/server, from app/:
# docker build -t anybot-wl-e2e deploy/test/wayland
# docker run --rm --user 1000:1000 --tmpfs /run/xdg:size=4m,mode=0700,uid=1000,gid=1000 \
# -v $PWD/deploy:/e2e/app/deploy:ro anybot-wl-e2e dbus-run-session -- /e2e/app/deploy/test/wayland/run.sh
# (add -v <an older anybot>:/old/anybot:ro to see how that one does with the full folder)
FROM server-relay:latest AS relay
FROM server-anybot:latest
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends sway foot python3 dbus at-spi2-core fonts-dejavu-core procps && rm -rf /var/lib/apt/lists/*
COPY --from=relay /usr/local/bin/anybot-relay /usr/local/bin/anybot-relay
RUN mkdir -p /e2e/app/target/release /e2e/app/relay/target/release \
&& ln -s /usr/local/bin/anybot /e2e/app/target/release/anybot \
&& ln -s /usr/local/bin/anybot-relay /e2e/app/relay/target/release/anybot-relay
RUN (getent passwd 1000 >/dev/null || useradd -u 1000 -m tester)

View File

@ -1,24 +0,0 @@
#!/bin/sh
# Inside the container: a headless sway desktop with a full runtime folder (like the crashed one).
export XDG_RUNTIME_DIR=/run/xdg HOME=/tmp/home
mkdir -p $HOME
export WLR_BACKENDS=headless WLR_LIBINPUT_NO_DEVICES=1 WLR_RENDERER=pixman
sway -c /e2e/app/deploy/test/wayland/sway.conf > /tmp/sway.log 2>&1 &
SWAY=$!
for i in $(seq 1 50); do ls $XDG_RUNTIME_DIR | grep -q '^wayland-[0-9]*$' && break; sleep 0.2; done
export WAYLAND_DISPLAY=$(ls $XDG_RUNTIME_DIR | grep '^wayland-[0-9]*$' | head -1)
sleep 2
dd if=/dev/zero of=$XDG_RUNTIME_DIR/filler bs=64k 2>/dev/null
echo "== runtime folder: $(df -h $XDG_RUNTIME_DIR | tail -1) display=$WAYLAND_DISPLAY"
alive() { kill -0 $SWAY 2>/dev/null && echo " sway still running" || { echo " SWAY DIED"; tail -5 /tmp/sway.log; }; }
shot() {
timeout 30 "$1" --tool computer_use_screenshot '{}' > /tmp/shot-$2.txt 2>&1
echo "== $2 build, screenshot with the folder full: exit $? :: $(head -c 160 /tmp/shot-$2.txt | tr '\n' ' ')"
alive
}
shot /usr/local/bin/anybot new
echo "== full E2E (brain + relay + 2 devices), with a remote screenshot"
cd /e2e/app && E2E_SCREENSHOT=1 E2E_TYPE=1 E2E_APP=foot python3 -I deploy/test/remote_e2e.py /e2e/app 2>&1 | tail -40
alive
[ -d /out ] && cp /tmp/anybot-e2e-*/shot.jpg /out/ 2>/dev/null
if [ -x /old/anybot ]; then shot /old/anybot old; fi

View File

@ -1,2 +0,0 @@
output HEADLESS-1 resolution 1280x800
exec foot -e sh -c 'echo AnyBot Wayland E2E; sleep 100000'

View File

@ -1,22 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024">
<!-- AnyBot's icon edge to edge (web, iPhone home screen, Android): the same drawing as the app icon. -->
<defs>
<linearGradient id="bg" x1="0" y1="0" x2="0" y2="1">
<stop offset="0" stop-color="#3b3e47"/>
<stop offset="1" stop-color="#121317"/>
</linearGradient>
<radialGradient id="glow" cx="0.5" cy="0.18" r="0.75">
<stop offset="0" stop-color="#ffffff" stop-opacity="0.16"/>
<stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
</radialGradient>
<linearGradient id="body" gradientUnits="userSpaceOnUse" x1="0" y1="240" x2="0" y2="817">
<stop offset="0" stop-color="#ffffff"/>
<stop offset="1" stop-color="#dcdde3"/>
</linearGradient>
<filter id="soft" x="-30%" y="-200%" width="160%" height="500%"><feGaussianBlur stdDeviation="19.8"/></filter>
</defs>
<rect x="0" y="0" width="1024" height="1024" rx="0" fill="url(#bg)"/>
<rect x="0" y="0" width="1024" height="1024" rx="0" fill="url(#glow)"/>
<ellipse cx="512.0" cy="826.9" rx="257.4" ry="36.3" fill="#000" fill-opacity="0.45" filter="url(#soft)"/><g fill="url(#body)"><circle cx="363.5" cy="569.5" r="181.5"/><circle cx="660.5" cy="569.5" r="181.5"/><circle cx="512.0" cy="454.0" r="214.5"/><circle cx="512.0" cy="635.5" r="181.5"/></g><ellipse cx="422.9" cy="526.6" rx="36.3" ry="72.6" transform="rotate(-18 422.9 526.6)" fill="#17171a"/><circle cx="411.3" cy="490.3" r="9.9" fill="#ffffff" fill-opacity="0.9"/><ellipse cx="601.1" cy="526.6" rx="36.3" ry="72.6" transform="rotate(-18 601.1 526.6)" fill="#17171a"/><circle cx="589.6" cy="490.3" r="9.9" fill="#ffffff" fill-opacity="0.9"/>
<rect x="1.5" y="1.5" width="1021" height="1021" rx="-1.5" fill="none" stroke="#ffffff" stroke-opacity="0.10" stroke-width="3"/>
</svg>

Before

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -1,22 +1,13 @@
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024"> <svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512">
<!-- AnyBot's app icon (macOS grid: an 824 tile in 1024): the bot's cloud body and slanted eyes, as in the app's avatars. --> <!-- AnyBot's app icon: the bot's face (two eyes) on a dark rounded square. -->
<defs> <defs>
<linearGradient id="bg" x1="0" y1="0" x2="0" y2="1"> <linearGradient id="bg" x1="0" y1="0" x2="0" y2="1">
<stop offset="0" stop-color="#3b3e47"/> <stop offset="0" stop-color="#3a3a3a"/>
<stop offset="1" stop-color="#121317"/> <stop offset="1" stop-color="#1c1c1c"/>
</linearGradient> </linearGradient>
<radialGradient id="glow" cx="0.5" cy="0.18" r="0.75">
<stop offset="0" stop-color="#ffffff" stop-opacity="0.16"/>
<stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
</radialGradient>
<linearGradient id="body" gradientUnits="userSpaceOnUse" x1="0" y1="309" x2="0" y2="768">
<stop offset="0" stop-color="#ffffff"/>
<stop offset="1" stop-color="#dcdde3"/>
</linearGradient>
<filter id="soft" x="-30%" y="-200%" width="160%" height="500%"><feGaussianBlur stdDeviation="15.7"/></filter>
</defs> </defs>
<rect x="100" y="100" width="824" height="824" rx="186" fill="url(#bg)"/> <rect x="32" y="32" width="448" height="448" rx="112" fill="url(#bg)"/>
<rect x="100" y="100" width="824" height="824" rx="186" fill="url(#glow)"/> <rect x="32.5" y="32.5" width="447" height="447" rx="111.5" fill="none" stroke="#ffffff" stroke-opacity="0.08"/>
<ellipse cx="512.0" cy="775.7" rx="204.4" ry="28.8" fill="#000" fill-opacity="0.45" filter="url(#soft)"/><g fill="url(#body)"><circle cx="394.1" cy="571.3" r="144.1"/><circle cx="629.9" cy="571.3" r="144.1"/><circle cx="512.0" cy="479.6" r="170.3"/><circle cx="512.0" cy="623.7" r="144.1"/></g><ellipse cx="441.3" cy="537.2" rx="28.8" ry="57.6" transform="rotate(-18 441.3 537.2)" fill="#17171a"/><circle cx="432.1" cy="508.4" r="7.9" fill="#ffffff" fill-opacity="0.9"/><ellipse cx="582.7" cy="537.2" rx="28.8" ry="57.6" transform="rotate(-18 582.7 537.2)" fill="#17171a"/><circle cx="573.6" cy="508.4" r="7.9" fill="#ffffff" fill-opacity="0.9"/> <ellipse cx="200" cy="262" rx="30" ry="50" fill="#ffffff" transform="rotate(-12 200 262)"/>
<rect x="101.5" y="101.5" width="821" height="821" rx="184.5" fill="none" stroke="#ffffff" stroke-opacity="0.10" stroke-width="3"/> <ellipse cx="312" cy="262" rx="30" ry="50" fill="#ffffff" transform="rotate(-12 312 262)"/>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 744 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

View File

@ -1,22 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024">
<!-- AnyBot's icon for browser tabs: the same drawing with rounded corners. -->
<defs>
<linearGradient id="bg" x1="0" y1="0" x2="0" y2="1">
<stop offset="0" stop-color="#3b3e47"/>
<stop offset="1" stop-color="#121317"/>
</linearGradient>
<radialGradient id="glow" cx="0.5" cy="0.18" r="0.75">
<stop offset="0" stop-color="#ffffff" stop-opacity="0.16"/>
<stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
</radialGradient>
<linearGradient id="body" gradientUnits="userSpaceOnUse" x1="0" y1="240" x2="0" y2="817">
<stop offset="0" stop-color="#ffffff"/>
<stop offset="1" stop-color="#dcdde3"/>
</linearGradient>
<filter id="soft" x="-30%" y="-200%" width="160%" height="500%"><feGaussianBlur stdDeviation="19.8"/></filter>
</defs>
<rect x="0" y="0" width="1024" height="1024" rx="230" fill="url(#bg)"/>
<rect x="0" y="0" width="1024" height="1024" rx="230" fill="url(#glow)"/>
<ellipse cx="512.0" cy="826.9" rx="257.4" ry="36.3" fill="#000" fill-opacity="0.45" filter="url(#soft)"/><g fill="url(#body)"><circle cx="363.5" cy="569.5" r="181.5"/><circle cx="660.5" cy="569.5" r="181.5"/><circle cx="512.0" cy="454.0" r="214.5"/><circle cx="512.0" cy="635.5" r="181.5"/></g><ellipse cx="422.9" cy="526.6" rx="36.3" ry="72.6" transform="rotate(-18 422.9 526.6)" fill="#17171a"/><circle cx="411.3" cy="490.3" r="9.9" fill="#ffffff" fill-opacity="0.9"/><ellipse cx="601.1" cy="526.6" rx="36.3" ry="72.6" transform="rotate(-18 601.1 526.6)" fill="#17171a"/><circle cx="589.6" cy="490.3" r="9.9" fill="#ffffff" fill-opacity="0.9"/>
<rect x="1.5" y="1.5" width="1021" height="1021" rx="228.5" fill="none" stroke="#ffffff" stroke-opacity="0.10" stroke-width="3"/>
</svg>

Before

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -9,9 +9,8 @@
<meta name="theme-color" content="#121212" media="(prefers-color-scheme: dark)"> <meta name="theme-color" content="#121212" media="(prefers-color-scheme: dark)">
<meta name="theme-color" content="#ffffff" media="(prefers-color-scheme: light)"> <meta name="theme-color" content="#ffffff" media="(prefers-color-scheme: light)">
<link rel="manifest" href="manifest.webmanifest"> <link rel="manifest" href="manifest.webmanifest">
<link rel="icon" href="icon.svg" type="image/svg+xml"> <link rel="icon" href="icon.svg">
<link rel="icon" href="icon-192.png" type="image/png" sizes="192x192"> <link rel="apple-touch-icon" href="icon.svg">
<link rel="apple-touch-icon" href="icon-180.png">
<title>AnyBot</title> <title>AnyBot</title>
<style> <style>
:root{ :root{
@ -39,9 +38,6 @@ header .sub{font-size:12px;color:var(--text3);font-weight:400}
.icon-btn:active{background:var(--raise)} .icon-btn:active{background:var(--raise)}
.icon-btn svg{width:20px;height:20px} .icon-btn svg{width:20px;height:20px}
.scroll{flex:1;overflow-y:auto;-webkit-overflow-scrolling:touch;overscroll-behavior:contain} .scroll{flex:1;overflow-y:auto;-webkit-overflow-scrolling:touch;overscroll-behavior:contain}
/* A list that reaches the bottom of the screen keeps its last row above the iPhone's home bar and
Safari's toolbar (it looked cut off). */
.view > .scroll:last-child{padding-bottom:calc(env(safe-area-inset-bottom) + 16px)}
/* login */ /* login */
.login{flex:1;display:flex;flex-direction:column;justify-content:center;padding:32px 24px calc(env(safe-area-inset-bottom) + 32px);max-width:420px;margin:0 auto;width:100%} .login{flex:1;display:flex;flex-direction:column;justify-content:center;padding:32px 24px calc(env(safe-area-inset-bottom) + 32px);max-width:420px;margin:0 auto;width:100%}
.logo{width:56px;height:56px;margin-bottom:20px} .logo{width:56px;height:56px;margin-bottom:20px}
@ -57,8 +53,6 @@ header .sub{font-size:12px;color:var(--text3);font-weight:400}
.row{display:flex;gap:12px;align-items:center;padding:12px 16px;border-bottom:1px solid var(--line)} .row{display:flex;gap:12px;align-items:center;padding:12px 16px;border-bottom:1px solid var(--line)}
.row:active{background:var(--raise)} .row:active{background:var(--raise)}
.av{width:42px;height:42px;border-radius:50%;flex:none;display:grid;place-items:center;font-weight:600;color:#fff;font-size:16px;position:relative;box-shadow:inset 0 0 0 1px var(--line)} .av{width:42px;height:42px;border-radius:50%;flex:none;display:grid;place-items:center;font-weight:600;color:#fff;font-size:16px;position:relative;box-shadow:inset 0 0 0 1px var(--line)}
.av.face{background:none !important;box-shadow:none;border-radius:0}
.av.face svg{width:100%;height:100%;display:block}
.av.sm{width:26px;height:26px;font-size:12px} .av.sm{width:26px;height:26px;font-size:12px}
.row .mid{flex:1;min-width:0} .row .mid{flex:1;min-width:0}
.row .name{font-weight:600;display:flex;gap:6px;align-items:center} .row .name{font-weight:600;display:flex;gap:6px;align-items:center}
@ -324,33 +318,6 @@ const S = {
}; };
// The app sends each bot's colour as #rrggbb (the same palette as the window). // The app sends each bot's colour as #rrggbb (the same palette as the window).
const color = (c) => (/^#[0-9a-f]{6}$/i.test(String(c || "")) ? c : "#1c1c1c"); const color = (c) => (/^#[0-9a-f]{6}$/i.test(String(c || "")) ? c : "#1c1c1c");
// A bot's face as in the app (src/avatar.rs): its shape in its colour, two slanted oval eyes.
// Drawn in a -1..1 box; the phone used to show the name's first letter in a circle.
function avatarSvg(shape, hex) {
const col = color(hex), P = Math.PI, f = (n) => n.toFixed(3);
const pts = (a) => `<polygon points="${a.map(([x, y]) => f(x) + "," + f(y)).join(" ")}"/>`;
const circ = (x, y, r) => `<circle cx="${f(x)}" cy="${f(y)}" r="${f(r)}"/>`;
const range = (n) => [...Array(n).keys()];
let body;
switch (shape) {
case "squircle": body = `<rect x="-0.92" y="-0.92" width="1.84" height="1.84" rx="0.42"/>`; break;
case "capsule": body = `<rect x="-0.675" y="-1" width="1.35" height="2" rx="0.66"/>`; break;
case "egg": body = pts(range(48).map((i) => { const t = i / 48 * 2 * P; return [0.8 * Math.cos(t), 0.08 + (Math.sin(t) < 0 ? 1 : 0.86) * Math.sin(t)]; })); break;
case "hex": body = pts(range(6).map((i) => { const a = i / 6 * 2 * P + P / 6; return [Math.cos(a), Math.sin(a)]; })); break;
case "gem": body = pts([[-0.55, -0.8], [0.55, -0.8], [1, -0.2], [0, 1], [-1, -0.2]]); break;
case "arch": body = pts(range(25).map((i) => { const a = P + i / 24 * P; return [0.85 * Math.cos(a), -0.15 + 0.85 * Math.sin(a)]; }).concat([[0.85, 1], [-0.85, 1]])); break;
case "shield": body = pts([[-0.85, -0.9], [0.85, -0.9], [0.85, 0.05], [0.5, 0.65], [0, 1], [-0.5, 0.65], [-0.85, 0.05]]); break;
case "pebble": body = `<ellipse rx="1" ry="0.78" transform="rotate(-14.3)"/>`; break;
case "cloud": body = circ(-0.45, 0.15, 0.55) + circ(0.45, 0.15, 0.55) + circ(0, -0.2, 0.65) + circ(0, 0.35, 0.55); break;
case "heart": body = circ(-0.45, -0.25, 0.55) + circ(0.45, -0.25, 0.55) + pts([[-0.97, -0.1], [0.97, -0.1], [0, 1]]); break;
case "star": body = pts(range(10).map((i) => { const a = -P / 2 + i * P / 5, r = i % 2 ? 0.48 : 1.05; return [r * Math.cos(a), 0.08 + r * Math.sin(a)]; })); break;
default: body = circ(0, 0, 0.95);
}
const rgb = [1, 3, 5].map((i) => parseInt(col.slice(i, i + 2), 16));
const eye = rgb[0] + rgb[1] + rgb[2] > 600 ? "#1c1c1c" : "#fcfcfc";
const eyes = [-0.27, 0.27].map((x) => `<ellipse cx="${x}" cy="0.02" rx="0.11" ry="0.22" transform="rotate(-20 ${x} 0.02)"/>`).join("");
return `<svg viewBox="-1.1 -1.1 2.2 2.2" aria-hidden="true"><g fill="${col}">${body}</g><g fill="${eye}">${eyes}</g></svg>`;
}
function toast(t) { const e = $("toast"); e.textContent = t; e.classList.add("on"); clearTimeout(toast.t); toast.t = setTimeout(() => e.classList.remove("on"), 2600); } function toast(t) { const e = $("toast"); e.textContent = t; e.classList.add("on"); clearTimeout(toast.t); toast.t = setTimeout(() => e.classList.remove("on"), 2600); }
function show(v) { document.querySelectorAll(".view").forEach((x) => x.classList.toggle("on", x.id === "v-" + v)); S.view = v; if (v !== "screen") stopFrames(); } function show(v) { document.querySelectorAll(".view").forEach((x) => x.classList.toggle("on", x.id === "v-" + v)); S.view = v; if (v !== "screen") stopFrames(); }
@ -412,13 +379,8 @@ function signOut(expired) {
} }
$("b-out1").onclick = () => signOut(); $("b-out1").onclick = () => signOut();
// The list waits for a brain that is restarting (or a computer that woke up): it looks again
// every few seconds and goes in by itself; it used to sit on 「離線」 until tapped.
let hostRetry = null;
async function pickHost() { async function pickHost() {
clearTimeout(hostRetry); const me = await api("relay/me");
let me;
try { me = await api("relay/me"); } catch (e) { toast(e.message); if (S.token) hostRetry = setTimeout(pickHost, 3000); return; }
const all = me.hosts || []; const all = me.hosts || [];
// A computer that shows another one's bots (大腦) leads to that brain. // A computer that shows another one's bots (大腦) leads to that brain.
const byId = Object.fromEntries(all.map((h) => [h.id, h])); const byId = Object.fromEntries(all.map((h) => [h.id, h]));
@ -437,14 +399,10 @@ async function pickHost() {
} }
if (live.length === 1) { S.host = live[0].id; localStorage.setItem("anybot.host", S.host); return start(); } if (live.length === 1) { S.host = live[0].id; localStorage.setItem("anybot.host", S.host); return start(); }
const note = (h) => { const n = sharers(h.id); return n.length ? " · " + esc(n.join("、")) + " 也用這個大腦" : ""; }; const note = (h) => { const n = sharers(h.id); return n.length ? " · " + esc(n.join("、")) + " 也用這個大腦" : ""; };
const wanted = (S.host && byId[target(S.host)]) || (all.find((h) => sharers(h.id).length)) || hosts[0]; $("hosts").innerHTML = hosts.length ? hosts.map((h) => `<div class="row" data-h="${esc(h.id)}"><div class="av" style="background:${h.online ? "var(--ok)" : "#888"}">${esc((h.name || "?")[0])}</div><div class="mid"><div class="name">${esc(h.name)}</div><div class="last">${h.online ? "在線上" : "離線(" + esc(h.last_seen_text || "很久沒連線") + ")"}${note(h)}</div></div></div>`).join("")
const waiting = hosts.length && !live.length && wanted : `<div class="empty">這個帳號還沒有連上任何 AnyBot。<br>在電腦上打開 AnyBot › 設定 › 手機與帳號,登入同一個帳號。</div>`;
? `<div class="empty">「${esc(wanted.name)}」暫時沒有連線(可能正在重新啟動,或那台電腦睡著了)。<br>連上後會自動進入,不用重新整理。</div>` : ""; document.querySelectorAll("#hosts .row").forEach((r) => r.onclick = () => { S.host = r.dataset.h; localStorage.setItem("anybot.host", S.host); start(); });
$("hosts").innerHTML = waiting + (hosts.length ? hosts.map((h) => `<div class="row" data-h="${esc(h.id)}"><div class="av" style="background:${h.online ? "var(--ok)" : "#888"}">${esc((h.name || "?")[0])}</div><div class="mid"><div class="name">${esc(h.name)}</div><div class="last">${h.online ? "在線上" : "離線(" + esc(h.last_seen_text || "很久沒連線") + ")"}${note(h)}</div></div></div>`).join("")
: `<div class="empty">這個帳號還沒有連上任何 AnyBot。<br>在電腦上打開 AnyBot › 設定 › 手機與帳號,登入同一個帳號。</div>`);
document.querySelectorAll("#hosts .row").forEach((r) => r.onclick = () => { clearTimeout(hostRetry); S.host = r.dataset.h; localStorage.setItem("anybot.host", S.host); start(); });
show("hosts"); show("hosts");
if (S.token && !live.length) hostRetry = setTimeout(pickHost, 3000);
} }
// ---------- live state ---------- // ---------- live state ----------
@ -474,7 +432,7 @@ function apply(v) {
renderList(); renderList();
if (S.open) { if (S.open) {
const b = S.bots.find((x) => x.id === S.open); const b = S.bots.find((x) => x.id === S.open);
if (b) { $("chat-name").textContent = b.name; $("chat-av").innerHTML = avatarSvg(b.shape, b.color); $("chat-av").classList.add("face"); } if (b) { $("chat-name").textContent = b.name; $("chat-av").textContent = (b.name || "?")[0]; $("chat-av").style.background = color(b.color); }
loadChat(); renderAsk(); loadChat(); renderAsk();
} }
} }
@ -485,7 +443,7 @@ function renderList() {
el.innerHTML = S.bots.map((b) => { el.innerHTML = S.bots.map((b) => {
const waiting = S.approvals.some((a) => a.bot === b.id); const waiting = S.approvals.some((a) => a.bot === b.id);
const state = waiting ? `<span class="wait">等你決定</span>` : b.busy ? `<span class="busy">${esc(b.status || "工作中…")}</span>` : ""; const state = waiting ? `<span class="wait">等你決定</span>` : b.busy ? `<span class="busy">${esc(b.status || "工作中…")}</span>` : "";
return `<div class="row" data-id="${b.id}"><div class="av face">${avatarSvg(b.shape, b.color)}</div><div class="mid"><div class="name">${esc(b.name)}${b.members ? '<span class="pill">群組</span>' : ""}${b.unread ? '<span class="badge"></span>' : ""}</div><div class="last">${state || esc(b.last || b.description || "")}</div></div></div>`; return `<div class="row" data-id="${b.id}"><div class="av" style="background:${color(b.color)}">${esc((b.name || "?")[0])}</div><div class="mid"><div class="name">${esc(b.name)}${b.members ? '<span class="pill">群組</span>' : ""}${b.unread ? '<span class="badge"></span>' : ""}</div><div class="last">${state || esc(b.last || b.description || "")}</div></div></div>`;
}).join(""); }).join("");
el.querySelectorAll(".row").forEach((r) => r.onclick = () => openChat(+r.dataset.id)); el.querySelectorAll(".row").forEach((r) => r.onclick = () => openChat(+r.dataset.id));
} }
@ -494,7 +452,7 @@ function renderList() {
function openChat(id) { function openChat(id) {
S.open = id; S.msgs = []; S.pending = []; renderChips(); S.open = id; S.msgs = []; S.pending = []; renderChips();
const b = S.bots.find((x) => x.id === id) || {}; const b = S.bots.find((x) => x.id === id) || {};
$("chat-name").textContent = b.name || ""; $("chat-av").innerHTML = avatarSvg(b.shape, b.color); $("chat-av").classList.add("face"); $("chat-name").textContent = b.name || ""; $("chat-av").textContent = (b.name || "?")[0]; $("chat-av").style.background = color(b.color);
$("msgs").innerHTML = ""; show("chat"); loadChat(true); renderAsk(); $("msgs").innerHTML = ""; show("chat"); loadChat(true); renderAsk();
api(base() + `api/bots/${id}/read`, {json: {}}).catch(() => {}); api(base() + `api/bots/${id}/read`, {json: {}}).catch(() => {});
} }
@ -689,14 +647,8 @@ function renderAsk() {
const a = S.approvals.find((x) => x.bot === S.open); const a = S.approvals.find((x) => x.bot === S.open);
if (!a) { $("ask").innerHTML = ""; return; } if (!a) { $("ask").innerHTML = ""; return; }
if (S.role === "member") { $("ask").innerHTML = `<div class="ask"><div class="q">${esc(a.title)}</div><div class="why">等擁有者或管理員決定</div></div>`; return; } if (S.role === "member") { $("ask").innerHTML = `<div class="ask"><div class="q">${esc(a.title)}</div><div class="why">等擁有者或管理員決定</div></div>`; return; }
// 需要處理 (a step only you can do on a computer): its screen is one tap away, then 我完成了 / 跳過.
if (a.kind === "handoff") {
$("ask").innerHTML = `<div class="ask"><div class="q">需要處理 · ${esc(a.computer || "")}</div><div class="why">${esc(a.reason)}</div><div class="btns"><button class="btn" data-screen="1">接管</button><button class="btn main" data-a="once">我完成了</button><button class="btn no" data-a="reject" title="取消此要求且不執行該步驟;Bot 會跳過它並繼續">跳過</button></div></div>`;
$("ask").querySelector("[data-screen]").onclick = () => { S.back = S.view; show("screen"); $("seg").children[0].textContent = ownComputer(); $("seg").children[1].style.display = S.mac ? "" : "none"; startFrames(); };
} else {
$("ask").innerHTML = `<div class="ask"><div class="q">${esc(a.title)}</div><div class="why">${esc(a.reason)}</div><div class="btns"><button class="btn main" data-a="once">允許一次</button>${a.can_always ? `<button class="btn" data-a="always">一律允許</button>` : ""}<button class="btn no" data-a="reject">拒絕</button></div></div>`; $("ask").innerHTML = `<div class="ask"><div class="q">${esc(a.title)}</div><div class="why">${esc(a.reason)}</div><div class="btns"><button class="btn main" data-a="once">允許一次</button>${a.can_always ? `<button class="btn" data-a="always">一律允許</button>` : ""}<button class="btn no" data-a="reject">拒絕</button></div></div>`;
} $("ask").querySelectorAll("button").forEach((b) => b.onclick = async () => {
$("ask").querySelectorAll("button[data-a]").forEach((b) => b.onclick = async () => {
$("ask").innerHTML = ""; $("ask").innerHTML = "";
try { await api(base() + `api/bots/${S.open}/answer`, {json: {answer: b.dataset.a}}); } catch (e) { toast(e.message); } try { await api(base() + `api/bots/${S.open}/answer`, {json: {answer: b.dataset.a}}); } catch (e) { toast(e.message); }
}); });

View File

@ -29,10 +29,8 @@ use std::sync::{Arc, Condvar, Mutex};
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
const PAGE: &str = include_str!("../../mobile/index.html"); const PAGE: &str = include_str!("../../mobile/index.html");
const MANIFEST: &str = r##"{"name":"AnyBot","short_name":"AnyBot","start_url":"./","display":"standalone","background_color":"#121212","theme_color":"#121212","icons":[{"src":"icon.svg","sizes":"any","type":"image/svg+xml"},{"src":"icon-192.png","sizes":"192x192","type":"image/png","purpose":"any maskable"},{"src":"icon-512.png","sizes":"512x512","type":"image/png","purpose":"any maskable"}]}"##; const MANIFEST: &str = r##"{"name":"AnyBot","short_name":"AnyBot","start_url":"./","display":"standalone","background_color":"#121212","theme_color":"#121212","icons":[{"src":"icon.svg","sizes":"any","type":"image/svg+xml"}]}"##;
/// AnyBot's icon (the same drawing as the app's), and PNGs for the iPhone home screen and Android. const ICON: &str = r##"<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96 96"><rect width="96" height="96" rx="22" fill="#161616"/><circle cx="48" cy="48" r="24" fill="none" stroke="#f5f5f5" stroke-width="7"/><circle cx="48" cy="48" r="7" fill="#f5f5f5"/></svg>"##;
const ICON: &str = include_str!("../../mobile/icon.svg");
const ICON_PNGS: [(&str, &[u8]); 3] = [("icon-180.png", include_bytes!("../../mobile/icon-180.png")), ("icon-192.png", include_bytes!("../../mobile/icon-192.png")), ("icon-512.png", include_bytes!("../../mobile/icon-512.png"))];
/// How long a host's "next request?" waits before answering "nothing". /// How long a host's "next request?" waits before answering "nothing".
const HOST_POLL_SECS: u64 = 25; const HOST_POLL_SECS: u64 = 25;
@ -126,7 +124,7 @@ self.addEventListener("activate", (e) => e.waitUntil(self.clients.claim()));
self.addEventListener("push", (e) => { self.addEventListener("push", (e) => {
let d = {}; let d = {};
try { d = e.data ? e.data.json() : {}; } catch (_) { d = {body: e.data ? e.data.text() : ""}; } try { d = e.data ? e.data.json() : {}; } catch (_) { d = {body: e.data ? e.data.text() : ""}; }
e.waitUntil(self.registration.showNotification(d.title || "AnyBot", {body: d.body || "", tag: "bot-" + (d.bot || 0), renotify: true, data: d, icon: "icon-192.png", badge: "icon-192.png"})); e.waitUntil(self.registration.showNotification(d.title || "AnyBot", {body: d.body || "", tag: "bot-" + (d.bot || 0), renotify: true, data: d, icon: "icon.svg", badge: "icon.svg"}));
}); });
self.addEventListener("notificationclick", (e) => { self.addEventListener("notificationclick", (e) => {
e.notification.close(); e.notification.close();
@ -499,7 +497,6 @@ impl Relay {
.with_header("Strict-Transport-Security", "max-age=31536000"), .with_header("Strict-Transport-Security", "max-age=31536000"),
("GET", ["manifest.webmanifest"]) => Resp::bytes("application/manifest+json", MANIFEST.as_bytes().to_vec()), ("GET", ["manifest.webmanifest"]) => Resp::bytes("application/manifest+json", MANIFEST.as_bytes().to_vec()),
("GET", ["icon.svg"]) => Resp::bytes("image/svg+xml", ICON.as_bytes().to_vec()), ("GET", ["icon.svg"]) => Resp::bytes("image/svg+xml", ICON.as_bytes().to_vec()),
("GET", [name]) if ICON_PNGS.iter().any(|(n, _)| n == name) => Resp::bytes("image/png", ICON_PNGS.iter().find(|(n, _)| n == name).map(|(_, b)| b.to_vec()).unwrap_or_default()),
("GET", ["api", "hello"]) => Resp::json(&json!({"app": "anybot-relay"})), ("GET", ["api", "hello"]) => Resp::json(&json!({"app": "anybot-relay"})),
("GET", ["sw.js"]) => Resp::bytes("text/javascript; charset=utf-8", SW.as_bytes().to_vec()).with_header("Service-Worker-Allowed", "/"), ("GET", ["sw.js"]) => Resp::bytes("text/javascript; charset=utf-8", SW.as_bytes().to_vec()).with_header("Service-Worker-Allowed", "/"),
("GET", ["relay", "push", "key"]) => Resp::json(&json!({"key": self.vapid.public_b64})), ("GET", ["relay", "push", "key"]) => Resp::json(&json!({"key": self.vapid.public_b64})),

View File

@ -112,7 +112,9 @@ fn drain_steer(job: &Job, history: &mut Vec<Message>, send: &dyn Fn(StreamEvent)
fn target_for(job: &Job, args: &str) -> Result<tools::Target, String> { fn target_for(job: &Job, args: &str) -> Result<tools::Target, String> {
let v = tools::args_of(args); let v = tools::args_of(args);
let want = v.get("computer").and_then(|c| c.as_str()).filter(|c| !c.is_empty()).unwrap_or(&job.default_computer).to_string(); let want = v.get("computer").and_then(|c| c.as_str()).filter(|c| !c.is_empty()).unwrap_or(&job.default_computer).to_string();
job.computers.iter().find(|t| t.name == want).cloned().ok_or_else(|| not_here(job, &want)) job.computers.iter().find(|t| t.name == want).cloned().ok_or_else(|| {
format!("沒有「{want}」這台電腦。可以用:{}", job.computers.iter().map(|t| t.name.as_str()).collect::<Vec<_>>().join("、"))
})
} }
enum BrowserAt { enum BrowserAt {
@ -140,7 +142,7 @@ fn browser_place(job: &Job, name: &str, args: &str) -> (BrowserAt, String) {
if let Some((b, n)) = job.computers.iter().find(|t| t.name == want).and_then(|t| at(t).map(|b| (b, t.name.clone()))) { if let Some((b, n)) = job.computers.iter().find(|t| t.name == want).and_then(|t| at(t).map(|b| (b, t.name.clone()))) {
return (b, n); return (b, n);
} }
let person = roles_now(job).person.and_then(|p| job.computers.iter().find(|t| t.name == p)); let person = job.roles.person.as_ref().and_then(|p| job.computers.iter().find(|t| &t.name == p));
match person.and_then(|t| at(t).map(|b| (b, t.name.clone()))).or_else(|| job.computers.iter().find_map(|t| at(t).map(|b| (b, t.name.clone())))) { match person.and_then(|t| at(t).map(|b| (b, t.name.clone()))).or_else(|| job.computers.iter().find_map(|t| at(t).map(|b| (b, t.name.clone())))) {
Some(x) => x, Some(x) => x,
None => (BrowserAt::Here, String::new()), None => (BrowserAt::Here, String::new()),
@ -222,10 +224,7 @@ fn keep_to_chosen(job: &Job, history: &[Message], args: &str) -> (String, Option
} }
let said = history.iter().rev().filter(|m| m.role == Role::User && !m.summary).take(3).map(|m| m.text.as_str()).collect::<Vec<_>>().join("\n"); let said = history.iter().rev().filter(|m| m.role == Role::User && !m.summary).take(3).map(|m| m.text.as_str()).collect::<Vec<_>>().join("\n");
match job.computers.iter().find(|t| t.name == named) { match job.computers.iter().find(|t| t.name == named) {
Some(t) if mentions(&said, t, &roles_now(job)) => (args.to_string(), None), Some(t) if mentions(&said, t, &job.roles) => (args.to_string(), None),
// A computer that isn't on the list now (switched off, its AnyBot closed): the step says
// so instead of quietly running somewhere else.
None => (args.to_string(), None),
_ => { _ => {
v["computer"] = serde_json::Value::String(job.default_computer.clone()); v["computer"] = serde_json::Value::String(job.default_computer.clone());
let note = format!("(這一步你指定了「{named}」,但使用者選的電腦是「{}」,而且他沒有說要換,所以這一步在「{}」上做。真的需要別台,先問使用者。)\n", job.default_computer, job.default_computer); let note = format!("(這一步你指定了「{named}」,但使用者選的電腦是「{}」,而且他沒有說要換,所以這一步在「{}」上做。真的需要別台,先問使用者。)\n", job.default_computer, job.default_computer);
@ -234,14 +233,6 @@ fn keep_to_chosen(job: &Job, history: &[Message], args: &str) -> (String, Option
} }
} }
/// What element `e7` is, from the latest app list in the chat (「按鈕「7」」).
fn element_named(history: &[Message], r: &str) -> Option<String> {
let tag = format!("{r} ");
history.iter().rev().filter(|m| m.role == Role::Tool).take(12).find_map(|m| {
m.text.lines().find_map(|l| l.trim_start().strip_prefix(&tag).map(|rest| rest.trim().to_string())).filter(|e| !e.is_empty())
})
}
/// A step's result, with a word first when the step was moved back to the chosen computer. /// A step's result, with a word first when the step was moved back to the chosen computer.
fn noted(moved: &std::collections::HashMap<String, String>, id: &str, text: &str) -> String { fn noted(moved: &std::collections::HashMap<String, String>, id: &str, text: &str) -> String {
match moved.get(id) { match moved.get(id) {
@ -250,25 +241,6 @@ fn noted(moved: &std::collections::HashMap<String, String>, id: &str, text: &str
} }
} }
/// A computer the step names that isn't among this bot's computers right now, in plain words.
fn not_here(job: &Job, name: &str) -> String {
format!("「{name}」現在連不到:那台電腦可能沒開,或上面的 AnyBot 沒開、沒登入。請告訴使用者,等它連上再做(或問他要不要改用別台)。現在可以用:{}", job.computers.iter().map(|t| t.name.as_str()).collect::<Vec<_>>().join("、"))
}
/// Which computer is the person's right now: a message typed on one of the account's computers
/// while the turn runs (a steer, or the answer to a hand-off) moves it there — the turn's own
/// idea was fixed when it started, maybe from the phone, which isn't a computer.
fn roles_now(job: &Job) -> tools::Roles {
let mut r = job.roles.clone();
let host = crate::remote::person_host();
if !host.is_empty() {
if let Some(t) = job.computers.iter().find(|t| matches!(&t.place, tools::Place::Device { host: h } if *h == host)) {
r.person = Some(t.name.clone());
}
}
r
}
/// Does the call name a computer? /// Does the call name a computer?
fn names_a_computer(args: &str) -> bool { fn names_a_computer(args: &str) -> bool {
tools::args_of(args).get("computer").and_then(|c| c.as_str()).map(|c| !c.trim().is_empty()).unwrap_or(false) tools::args_of(args).get("computer").and_then(|c| c.as_str()).map(|c| !c.trim().is_empty()).unwrap_or(false)
@ -282,7 +254,7 @@ fn screen_target(job: &Job, args: &str) -> Result<tools::Target, String> {
let has_screen = |t: &tools::Target| matches!(t.place, tools::Place::Box { .. } | tools::Place::Local { .. } | tools::Place::Device { .. }); let has_screen = |t: &tools::Target| matches!(t.place, tools::Place::Box { .. } | tools::Place::Local { .. } | tools::Place::Device { .. });
let named = v.get("computer").and_then(|c| c.as_str()).map(str::trim).filter(|c| !c.is_empty()); let named = v.get("computer").and_then(|c| c.as_str()).map(str::trim).filter(|c| !c.is_empty());
if let Some(n) = named { if let Some(n) = named {
let t = job.computers.iter().find(|t| t.name == n).ok_or_else(|| not_here(job, n))?; let t = job.computers.iter().find(|t| t.name == n).ok_or_else(|| format!("沒有「{n}」這台電腦。可以用:{}", job.computers.iter().map(|t| t.name.as_str()).collect::<Vec<_>>().join("、")))?;
if !has_screen(t) { if !has_screen(t) {
return Err(if n == job.roles.own { return Err(if n == job.roles.own {
format!("{n}現在沒有螢幕:AnyBot 所在的電腦沒有 Docker({})。要用別台請使用者指名。", if cfg!(target_os = "macos") { "安裝 OrbStack 或 Docker Desktop 就會有" } else { "安裝 Docker Engine 就會有" }) format!("{n}現在沒有螢幕:AnyBot 所在的電腦沒有 Docker({})。要用別台請使用者指名。", if cfg!(target_os = "macos") { "安裝 OrbStack 或 Docker Desktop 就會有" } else { "安裝 Docker Engine 就會有" })
@ -530,9 +502,7 @@ pub fn spawn(job: Job, bot_id: u64, tx: Sender<(u64, StreamEvent)>, cancel: Arc<
let what = if is_mac { let what = if is_mac {
format!("{} {}", crate::macapps::label(&call.name), crate::macapps::describe(&call.name, &call.args)) format!("{} {}", crate::macapps::label(&call.name), crate::macapps::describe(&call.name, &call.args))
} else if is_screen { } else if is_screen {
// A control by its number: name it from the app's list the bot last read. format!("{} {}", computer::label(&call.name), computer::describe(&call.name, &call.args))
let named = tools::args_of(&call.args)["ref"].as_str().map(str::trim).filter(|r| !r.is_empty()).and_then(|r| element_named(&history, r)).map(|e| format!("({e})")).unwrap_or_default();
format!("{} {}{named}", computer::label(&call.name), computer::describe(&call.name, &call.args))
} else if is_web { } else if is_web {
web::describe(&call.name, &call.args) web::describe(&call.name, &call.args)
} else { } else {
@ -545,46 +515,6 @@ pub fn spawn(job: Job, bot_id: u64, tx: Sender<(u64, StreamEvent)>, cancel: Arc<
send(StreamEvent::NeedApproval(Approval { call_id: call.id.clone(), tool: call.name.clone(), reason, grant, reply: atx, kind })); send(StreamEvent::NeedApproval(Approval { call_id: call.id.clone(), tool: call.name.clone(), reason, grant, reply: atx, kind }));
wait_answer(arx, &cancel) wait_answer(arx, &cancel)
}; };
// 需要處理 (the original's box hand-off): a step only the person can do — signing
// in, a captcha, a code from their phone. A card with the computer's live screen
// appears in the chat; they take over, do it, and say 「我完成了」 or 「跳過」. A
// message typed meanwhile answers it too.
if call.name == tools::HANDOFF_TOOL {
let instruction = tools::args_of(&call.args)["instruction"].as_str().unwrap_or("").trim().to_string();
let (output, status) = match screen_target(&job, &call.args) {
Err(e) => (e, ToolStatus::Failed),
Ok(_) if instruction.is_empty() => ("請在 instruction 寫清楚要使用者做什麼。".to_string(), ToolStatus::Failed),
Ok(t) => {
let (atx, arx) = channel();
send(StreamEvent::ToolStatus(call.id.clone(), ToolStatus::Waiting));
send(StreamEvent::NeedApproval(Approval { call_id: call.id.clone(), tool: call.name.clone(), reason: instruction.clone(), grant: t.name.clone(), reply: atx, kind: ApprovalKind::Handoff }));
let answer = loop {
if cancel.load(Ordering::Relaxed) {
return;
}
match arx.recv_timeout(Duration::from_millis(200)) {
Ok(a) => break Some(a),
Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {
if !job.steer.lock().unwrap().is_empty() {
break None;
}
}
Err(_) => break Some(ApprovalAnswer::Reject),
}
};
match answer {
Some(ApprovalAnswer::Reject) => ("使用者選擇跳過這一步。不要再要求同一件事:沒有它就繼續其餘的工作,做不到的照實說。".to_string(), ToolStatus::Denied),
Some(_) => (format!("[{}] 使用者按了「我完成了」。先截圖確認畫面,再接著做。", t.name), ToolStatus::Done),
None => ("使用者沒有按按鈕,而是傳了訊息(就在下面)。照他說的做。".to_string(), ToolStatus::Done),
}
}
};
send(StreamEvent::ToolStatus(call.id.clone(), status));
let result = Message::tool_result(&call.id, &call.name, &noted(&moved, &call.id, &output));
send(StreamEvent::ToolResult(result.clone()));
history.push(result);
continue;
}
// 生活卡片: drawn by the window from the call itself. // 生活卡片: drawn by the window from the call itself.
if call.name == "show_card" { if call.name == "show_card" {
send(StreamEvent::ToolStatus(call.id.clone(), ToolStatus::Done)); send(StreamEvent::ToolStatus(call.id.clone(), ToolStatus::Done));
@ -649,8 +579,7 @@ pub fn spawn(job: Job, bot_id: u64, tx: Sender<(u64, StreamEvent)>, cancel: Arc<
}; };
// On a server nobody sits at its screen: a link opens in the browser of the // On a server nobody sits at its screen: a link opens in the browser of the
// computer the person is using; a file is sent into the chat instead. // computer the person is using; a file is sent into the chat instead.
let person_now = roles_now(&job).person; let person_host = job.roles.person.as_ref().and_then(|n| job.computers.iter().find(|t| &t.name == n)).and_then(|t| match &t.place {
let person_host = person_now.as_ref().and_then(|n| job.computers.iter().find(|t| &t.name == n)).and_then(|t| match &t.place {
tools::Place::Device { host } => Some(host.clone()), tools::Place::Device { host } => Some(host.clone()),
_ => None, _ => None,
}); });
@ -658,7 +587,7 @@ pub fn spawn(job: Job, bot_id: u64, tx: Sender<(u64, StreamEvent)>, cancel: Arc<
let web = path.starts_with("http://") || path.starts_with("https://"); let web = path.starts_with("http://") || path.starts_with("https://");
let (output, ok) = match (&person_host, web) { let (output, ok) = match (&person_host, web) {
(Some(host), true) => match crate::remote::run_on_device(host, "browser_open", &serde_json::json!({"url": path}).to_string(), &job.via_name) { (Some(host), true) => match crate::remote::run_on_device(host, "browser_open", &serde_json::json!({"url": path}).to_string(), &job.via_name) {
Ok(v) => (format!("[{}] {}", person_now.clone().unwrap_or_default(), v["text"].as_str().unwrap_or("")), v["ok"].as_bool().unwrap_or(false)), Ok(v) => (format!("[{}] {}", job.roles.person.clone().unwrap_or_default(), v["text"].as_str().unwrap_or("")), v["ok"].as_bool().unwrap_or(false)),
Err(e) => (e, false), Err(e) => (e, false),
}, },
(None, true) => ("不知道使用者現在在用哪台電腦,沒辦法打開給他看。把網址直接寫在回覆裡。".to_string(), false), (None, true) => ("不知道使用者現在在用哪台電腦,沒辦法打開給他看。把網址直接寫在回覆裡。".to_string(), false),
@ -871,9 +800,10 @@ pub fn spawn(job: Job, bot_id: u64, tx: Sender<(u64, StreamEvent)>, cancel: Arc<
if names_a_computer(&call.args) { if names_a_computer(&call.args) {
return target_for(&job, &call.args); return target_for(&job, &call.args);
} }
roles_now(&job) job.roles
.person .person
.and_then(|n| job.computers.iter().find(|t| t.name == n)) .as_ref()
.and_then(|n| job.computers.iter().find(|t| &t.name == n))
.cloned() .cloned()
.ok_or_else(|| format!("不知道使用者現在在用哪台電腦。請問他要在哪台做(可以用:{})。", job.computers.iter().map(|t| t.name.as_str()).collect::<Vec<_>>().join("、"))) .ok_or_else(|| format!("不知道使用者現在在用哪台電腦。請問他要在哪台做(可以用:{})。", job.computers.iter().map(|t| t.name.as_str()).collect::<Vec<_>>().join("、")))
}; };
@ -1156,15 +1086,6 @@ mod tests {
assert!(!mentions("在 macOS 的登入機制下,幫 Bot 的電腦截圖", &mac, &roles)); assert!(!mentions("在 macOS 的登入機制下,幫 Bot 的電腦截圖", &mac, &roles));
} }
#[test]
fn a_click_by_number_is_named_in_the_question() {
let list = Message::tool_result("c1", "computer_use_read_app", "[王小明的Mac mini] 「計算機」的畫面:\n 文字「0」\n e4 按鈕「全部清除」\n e7 按鈕「7」");
assert_eq!(element_named(&[list.clone()], "e7").as_deref(), Some("按鈕「7」"));
assert_eq!(element_named(&[list], "e9"), None);
assert_eq!(computer::describe("computer_use_click", r#"{"ref":"e7"}"#), "點 e7");
assert_eq!(computer::describe("computer_use_click", r#"{"x":10,"y":20}"#), "點 (10, 20)");
}
#[test] #[test]
fn every_computer_answers_to_its_own_name() { fn every_computer_answers_to_its_own_name() {
// One name per computer: the bot's own goes by the bot's name, the others by theirs, and // One name per computer: the bot's own goes by the bot's name, the others by theirs, and
@ -1453,71 +1374,6 @@ mod tests {
assert!(result.contains("note.txt"), "{result}"); assert!(result.contains("note.txt"), "{result}");
} }
/// 需要處理: the model hands a step to the person; the card's request carries the instruction
/// and the computer, 「我完成了」 tells the bot to carry on, 「跳過」 that the step is skipped.
#[test]
fn a_hand_off_waits_for_the_person_and_says_what_they_chose() {
use std::io::{Read, Write};
use std::net::TcpListener;
for (answer, expect, status) in [(ApprovalAnswer::Once, "我完成了", ToolStatus::Done), (ApprovalAnswer::Reject, "跳過", ToolStatus::Denied)] {
let l = TcpListener::bind("127.0.0.1:0").unwrap();
let port = l.local_addr().unwrap().port();
std::thread::spawn(move || {
let replies = [
"data: {\"choices\":[{\"delta\":{\"tool_calls\":[{\"index\":0,\"id\":\"h1\",\"function\":{\"name\":\"hand_over_computer\",\"arguments\":\"{\\\"instruction\\\":\\\"請登入 Threads\\\"}\"}}]}}]}\n\ndata: [DONE]\n\n",
"data: {\"choices\":[{\"delta\":{\"content\":\"好\"}}]}\n\ndata: [DONE]\n\n",
];
for body in replies {
let (mut s, _) = l.accept().unwrap();
let mut req = Vec::new();
let mut buf = [0u8; 8192];
loop {
let n = s.read(&mut buf).unwrap_or(0);
if n == 0 {
break;
}
req.extend_from_slice(&buf[..n]);
let t = String::from_utf8_lossy(&req).to_string();
if let Some(end) = t.find("\r\n\r\n") {
let len = t[..end].lines().find_map(|l| l.to_ascii_lowercase().strip_prefix("content-length:").map(|v| v.trim().parse::<usize>().unwrap_or(0))).unwrap_or(0);
if req.len() >= end + 4 + len {
break;
}
}
}
let _ = s.write_all(b"HTTP/1.1 200 OK\r\nContent-Type: text/event-stream\r\nConnection: close\r\n\r\n");
let _ = s.write_all(body.as_bytes());
}
});
let job = Job {
req: ChatRequest { kind: ProviderKind::Custom, base_url: format!("http://127.0.0.1:{port}/v1"), api_key: String::new(), model: "m".into(), system: String::new(), history: vec![Message::user("幫我登入 Threads")], tools: vec![], session: String::new() },
computers: vec![tools::Target { name: "王小明的Mac mini".into(), place: tools::Place::Device { host: "m".into() } }],
default_computer: "王小明的Mac mini".into(),
roles: tools::Roles { own: "Master 的電腦".into(), person: Some("王小明的Mac mini".into()), server: true },
..test_job()
};
let (tx, rx) = channel();
spawn(job, 1, tx, Arc::new(AtomicBool::new(false)), eframe::egui::Context::default());
let (mut asked, mut result, mut last) = (None, String::new(), None);
loop {
match rx.recv_timeout(Duration::from_secs(10)).expect("loop stalled") {
(_, StreamEvent::NeedApproval(a)) => {
asked = Some((a.kind, a.reason.clone(), a.grant.clone()));
let _ = a.reply.send(answer.clone());
}
(_, StreamEvent::ToolStatus(_, st)) => last = Some(st),
(_, StreamEvent::ToolResult(m)) => result = m.text,
(_, StreamEvent::Done) => break,
(_, StreamEvent::Error(e)) => panic!("{e}"),
_ => {}
}
}
assert_eq!(asked, Some((ApprovalKind::Handoff, "請登入 Threads".to_string(), "王小明的Mac mini".to_string())));
assert!(result.contains(expect), "{result}");
assert_eq!(last, Some(status));
}
}
/// 直接操作: tools off, this Mac off, a command that changes files — and still no question. /// 直接操作: tools off, this Mac off, a command that changes files — and still no question.
/// Dangerous commands stay blocked. /// Dangerous commands stay blocked.
#[test] #[test]

View File

@ -44,9 +44,6 @@ pub const SIDEBAR_DEFAULT_WIDTH: f32 = 280.0;
pub const SIDEBAR_MIN_WIDTH: f32 = 240.0; pub const SIDEBAR_MIN_WIDTH: f32 = 240.0;
pub const SIDEBAR_MAX_WIDTH: f32 = 400.0; pub const SIDEBAR_MAX_WIDTH: f32 = 400.0;
pub const SIDEBAR_RAIL_WIDTH: f32 = 88.0; pub const SIDEBAR_RAIL_WIDTH: f32 = 88.0;
/// Mac: the window has no title bar of its own (the content reaches the top); this strip at the
/// top moves the window, and the traffic lights sit in its left corner.
pub const TITLEBAR_H: f32 = 28.0;
pub const SIDEBAR_COLLAPSE_BELOW: f32 = 210.0; pub const SIDEBAR_COLLAPSE_BELOW: f32 = 210.0;
pub const SIDEBAR_EXPAND_FROM: f32 = 220.0; pub const SIDEBAR_EXPAND_FROM: f32 = 220.0;
/// `--sand-chat-min-width:424px` (index CSS, class sand-1fiktjy). /// `--sand-chat-min-width:424px` (index CSS, class sand-1fiktjy).
@ -303,12 +300,6 @@ impl App {
}; };
crate::i18n::set(&app.state.language); crate::i18n::set(&app.state.language);
app.computers_start(); app.computers_start();
// The computer the person used last time (a brain that restarted for an update).
if !app.demo {
if let Some(h) = crate::remote::load_person_host() {
app.typed_on = Some(h);
}
}
if demo { if demo {
// The computer helper's pending step, so the picture shows the approval card. // The computer helper's pending step, so the picture shows the approval card.
let (reply, _) = channel(); let (reply, _) = channel();
@ -500,13 +491,6 @@ impl App {
} }
} }
} }
// 需要處理: the bot waits for the person on its own computer (the hand-off card).
Ok("handoff") => {
app.state.selected = 1;
let (reply, _) = channel();
let own = app.state.bot(1).map(|b| crate::model::own_computer_name(&b.name)).unwrap_or_default();
app.approvals.insert(1, Approval { call_id: "h1".into(), tool: tools::HANDOFF_TOOL.into(), reason: "請在 Threads 登入頁輸入帳號和密碼後登入,好了按「我完成了」。".into(), grant: own, reply, kind: ApprovalKind::Handoff });
}
Ok("panel") => { Ok("panel") => {
// The real box, so the 電腦 card shows its screen. // The real box, so the 電腦 card shows its screen.
crate::cloudbox::start_background(); crate::cloudbox::start_background();
@ -566,13 +550,6 @@ impl App {
app.show_settings = true; app.show_settings = true;
app.settings_tab = SettingsTab::Remote; app.settings_tab = SettingsTab::Remote;
} }
// …or the side panel, or the computer viewer, as they look with that data.
if app.screenshot.is_some() && !app.demo {
match std::env::var("ANYBOT_SHOT_VIEW").as_deref() {
Ok("panel") => app.panel = Some(panel_ui::PanelTab::Activity),
_ => {}
}
}
app app
} }
@ -779,13 +756,6 @@ impl App {
if !screens.is_empty() { if !screens.is_empty() {
let default_screen = if screens.contains(&default_computer) { default_computer.clone() } else { screens[0].clone() }; let default_screen = if screens.contains(&default_computer) { default_computer.clone() } else { screens[0].clone() };
tool_specs.extend(crate::computer::specs_for(&screens, &default_screen)); tool_specs.extend(crate::computer::specs_for(&screens, &default_screen));
// 需要處理: hand a step to the person on that screen (the original's box hand-off).
tool_specs.push(serde_json::json!({"name": tools::HANDOFF_TOOL,
"description": "Ask the person to do one step themselves on a computer's screen: signing in (you never type their passwords), a captcha or puzzle, a code sent to their phone or email, approving a payment, or anything else only they may do. First get the computer to that point (open the page, click into the sign-in form), then call this with a short instruction. A card with that computer's live screen appears in the chat; they take over, do it, and press 「我完成了」 (or 「跳過」). The result says which; after 「我完成了」 take a screenshot and carry on. Don't ask them in words to find a window themselves.",
"parameters": {"type": "object", "properties": {
"instruction": {"type": "string", "description": "What they should do, one or two short sentences in their language, e.g. 「請在 Threads 登入頁輸入帳號和密碼後登入」."},
"computer": {"type": "string", "enum": screens.clone(), "description": format!("Which computer's screen. Default: {default_screen}.")}},
"required": ["instruction"]}}));
} }
// 看圖小幫手: the person's models that may see pictures, for a bot whose model can't. // 看圖小幫手: the person's models that may see pictures, for a bot whose model can't.
providers::set_eyes(self.eyes()); providers::set_eyes(self.eyes());
@ -1323,7 +1293,6 @@ impl App {
} }
} }
ApprovalKind::EnableThisComputer => self.state.local_execution = true, ApprovalKind::EnableThisComputer => self.state.local_execution = true,
ApprovalKind::Handoff => {}
ApprovalKind::Action => { ApprovalKind::Action => {
if let Some(b) = self.state.bot_mut(bot_id) { if let Some(b) = self.state.bot_mut(bot_id) {
if !g.is_empty() && !b.allow_rules.contains(g) { if !g.is_empty() && !b.allow_rules.contains(g) {
@ -1459,10 +1428,6 @@ impl App {
if let Some(c) = b.messages.iter_mut().rev().flat_map(|m| m.tool_calls.iter_mut()).find(|c| c.id == call_id) { if let Some(c) = b.messages.iter_mut().rev().flat_map(|m| m.tool_calls.iter_mut()).find(|c| c.id == call_id) {
c.status = st; c.status = st;
} }
// The step moved on without the buttons (a message answered a hand-off).
if st != ToolStatus::Waiting && self.approvals.get(&id).map(|a| a.call_id == call_id).unwrap_or(false) {
self.approvals.remove(&id);
}
} }
other => { other => {
let Some(m) = b.messages.last_mut() else { continue }; let Some(m) = b.messages.last_mut() else { continue };
@ -1769,10 +1734,6 @@ impl App {
fn rail(&mut self, ui: &mut egui::Ui) { fn rail(&mut self, ui: &mut egui::Ui) {
let p = self.pal; let p = self.pal;
ui.vertical_centered(|ui| { ui.vertical_centered(|ui| {
// (The Mac's window buttons sit in the top corner.)
if cfg!(target_os = "macos") {
ui.add_space(TITLEBAR_H - 6.0);
}
if icon_button(ui, "◨", "展開側邊欄", p).clicked() { if icon_button(ui, "◨", "展開側邊欄", p).clicked() {
self.state.sidebar_collapsed = false; self.state.sidebar_collapsed = false;
self.mark(); self.mark();
@ -2059,11 +2020,9 @@ impl App {
self.voice_toggle(&ctx, bot.id); self.voice_toggle(&ctx, bot.id);
} }
} }
if let Some(kind) = self.approvals.get(&bot.id).map(|a| a.kind) { if self.approvals.contains_key(&bot.id) {
let label = if kind == ApprovalKind::Handoff { t("等你處理") } else { t("需要你允許") }; if crate::icons::pill(&mut right, crate::icons::Icon::Shield, &t("需要你允許"), p.accent, Color32::WHITE, 36.0).on_hover_text(t("打開請求視窗")).clicked() {
if crate::icons::pill(&mut right, crate::icons::Icon::Shield, &label, p.accent, Color32::WHITE, 36.0).on_hover_text(t("打開請求視窗")).clicked() {
self.popup_hidden.remove(&bot.id); self.popup_hidden.remove(&bot.id);
self.stick_bottom = true;
} }
} }
let right_w = bar.right() - right.min_rect().left(); let right_w = bar.right() - right.min_rect().left();
@ -2137,12 +2096,11 @@ impl App {
ApprovalKind::EnableThisComputer => format!("允許 {} 在你的電腦上執行任務嗎?", bot.name), ApprovalKind::EnableThisComputer => format!("允許 {} 在你的電腦上執行任務嗎?", bot.name),
ApprovalKind::Action if machine.is_empty() => format!("允許 {} {}嗎?", bot.name, what), ApprovalKind::Action if machine.is_empty() => format!("允許 {} {}嗎?", bot.name, what),
ApprovalKind::Action => format!("允許 {} 在 {machine} 上{what}嗎?", bot.name), ApprovalKind::Action => format!("允許 {} 在 {machine} 上{what}嗎?", bot.name),
ApprovalKind::Handoff => format!("{}:需要你", bot.name),
}; };
let note = match kind { let note = match kind {
ApprovalKind::EnableTools => Some("這個 Bot 的電腦工具還沒打開。它想做的事:"), ApprovalKind::EnableTools => Some("這個 Bot 的電腦工具還沒打開。它想做的事:"),
ApprovalKind::EnableThisComputer => Some("「在這台電腦上執行」還沒打開,Bot 平常只在它自己的電腦上做事。它想在你的電腦上:"), ApprovalKind::EnableThisComputer => Some("「在這台電腦上執行」還沒打開,Bot 平常只在它自己的電腦上做事。它想在你的電腦上:"),
ApprovalKind::Action | ApprovalKind::Handoff => None, ApprovalKind::Action => None,
}; };
let mut answer = None; let mut answer = None;
ui.label(RichText::new(title).strong().size(if big { 17.0 } else { 14.0 })); ui.label(RichText::new(title).strong().size(if big { 17.0 } else { 14.0 }));
@ -2170,7 +2128,7 @@ impl App {
ApprovalKind::EnableTools => Some("一律允許這個 Bot 使用電腦".to_string()), ApprovalKind::EnableTools => Some("一律允許這個 Bot 使用電腦".to_string()),
ApprovalKind::EnableThisComputer => Some("一律允許(打開「在這台電腦上執行」)".to_string()), ApprovalKind::EnableThisComputer => Some("一律允許(打開「在這台電腦上執行」)".to_string()),
ApprovalKind::Action if !grant.is_empty() => Some(format!("一律允許{}", grant_label(&grant))), ApprovalKind::Action if !grant.is_empty() => Some(format!("一律允許{}", grant_label(&grant))),
ApprovalKind::Action | ApprovalKind::Handoff => None, ApprovalKind::Action => None,
}; };
if let Some(label) = always { if let Some(label) = always {
if ui.button(label).clicked() { if ui.button(label).clicked() {
@ -2195,9 +2153,7 @@ impl App {
fn approval_card(&mut self, ui: &mut egui::Ui, ctx: &egui::Context, bot: &Bot) { fn approval_card(&mut self, ui: &mut egui::Ui, ctx: &egui::Context, bot: &Bot) {
let p = self.pal; let p = self.pal;
let Some(kind) = self.approvals.get(&bot.id).map(|a| a.kind) else { return }; if !self.approvals.contains_key(&bot.id) {
if kind == ApprovalKind::Handoff {
self.handoff_card(ui, ctx, bot);
return; return;
} }
let mut answer = None; let mut answer = None;
@ -2217,91 +2173,6 @@ impl App {
} }
} }
/// 需要處理 (the original's box hand-off card): what the bot needs the person to do, the
/// computer's live screen with 「接管」 on it, and 跳過 / 我完成了 / 接管.
fn handoff_card(&mut self, ui: &mut egui::Ui, ctx: &egui::Context, bot: &Bot) {
let p = self.pal;
let Some(a) = self.approvals.get(&bot.id) else { return };
let (instruction, computer) = (a.reason.clone(), a.grant.clone());
// Its own computer shows here (on a screen of a brain, the brain's); another computer of
// the person's is the one in front of them.
let own = computer == crate::model::own_computer_name(&bot.name) || computer == crate::model::BOT_COMPUTER_NAME;
let shows = own && (self.mir.on || crate::cloudbox::available());
let thumb = if shows { self.box_thumbnail(ctx) } else { None };
let width = (ui.available_width() - 32.0 - 28.0).clamp(200.0, 560.0);
enum Act {
Skip,
Done,
TakeOver,
}
let mut act = None;
ui.horizontal_top(|ui| {
ui.add_space(32.0);
Frame::new().fill(p.elevated).stroke(Stroke::new(2.0, p.accent)).corner_radius(14).inner_margin(Margin::symmetric(14, 12)).show(ui, |ui| {
ui.vertical(|ui| {
ui.set_width(width);
ui.horizontal(|ui| {
crate::icons::label(ui, crate::icons::Icon::Monitor, &t("電腦"), FONT_XS, p.text3);
ui.label(RichText::new(sidebar_ui::shorten_width(ui, &format!("· {computer}"), (ui.available_width() - 4.0).max(40.0), FONT_XS)).size(FONT_XS).color(p.text3));
});
ui.add_space(2.0);
ui.label(RichText::new(t("需要處理")).strong().size(15.0));
ui.add(egui::Label::new(RichText::new(&instruction).size(13.5).color(p.text2)).wrap());
ui.add_space(8.0);
// The screen, 16:10, with 「接管」 on it.
let sw = width.min(420.0);
let (rect, r) = ui.allocate_exact_size(vec2(sw, sw * 0.625), if shows { egui::Sense::click() } else { egui::Sense::hover() });
match thumb {
Some((tex, size)) => {
egui::Image::new((tex, size)).fit_to_exact_size(rect.size()).corner_radius(10).paint_at(ui, rect);
}
None => {
ui.painter().rect_filled(rect, 10, Color32::from_rgb(0x2b, 0x2f, 0x36));
let text = if shows { t("連結中") } else { t("請到「{name}」上操作").replace("{name}", &computer) };
ui.painter().text(rect.center(), egui::Align2::CENTER_CENTER, sidebar_ui::shorten_width(ui, &text, rect.width() - 20.0, FONT_BASE), egui::FontId::proportional(FONT_BASE), Color32::from_gray(220));
}
}
ui.painter().rect_stroke(rect, 10, Stroke::new(1.0, p.border), egui::StrokeKind::Inside);
if shows {
let label = t("接管");
let g = ui.painter().layout_no_wrap(label.clone(), egui::FontId::proportional(13.0), Color32::WHITE);
let pill = egui::Rect::from_min_size(rect.right_bottom() - vec2(g.size().x + 28.0, 38.0), vec2(g.size().x + 20.0, 28.0));
ui.painter().rect_filled(pill, 14, Color32::from_black_alpha(if r.hovered() { 200 } else { 160 }));
ui.painter().galley(pill.center() - g.size() / 2.0, g, Color32::WHITE);
if r.on_hover_cursor(egui::CursorIcon::PointingHand).on_hover_text(t("接管電腦")).clicked() {
act = Some(Act::TakeOver);
}
}
ui.add_space(10.0);
ui.horizontal(|ui| {
if ui.button(t("跳過")).on_hover_text(t("取消此要求且不執行該步驟;Bot 會跳過它並繼續")).clicked() {
act = Some(Act::Skip);
}
if ui.button(t("我完成了")).clicked() {
act = Some(Act::Done);
}
if shows && ui.add(egui::Button::new(RichText::new(t("接管")).color(p.on_primary)).fill(p.primary).corner_radius(8)).clicked() {
act = Some(Act::TakeOver);
}
});
});
});
});
ui.add_space(10.0);
match act {
Some(Act::Skip) => {
self.give_back_computer();
self.answer(ctx, bot.id, ApprovalAnswer::Reject);
}
Some(Act::Done) => {
self.give_back_computer();
self.answer(ctx, bot.id, ApprovalAnswer::Once);
}
Some(Act::TakeOver) => self.take_over_computer(),
None => {}
}
}
/// A new request: show it as a pop-up (even over another bot's chat) and get the person's /// A new request: show it as a pop-up (even over another bot's chat) and get the person's
/// attention (the Dock icon bounces when AnyBot isn't in front). /// attention (the Dock icon bounces when AnyBot isn't in front).
fn on_new_approval(&mut self, ctx: &egui::Context, bot_id: u64) { fn on_new_approval(&mut self, ctx: &egui::Context, bot_id: u64) {
@ -2312,12 +2183,10 @@ impl App {
if self.state.notify && self.away() { if self.state.notify && self.away() {
if let (Some(b), Some(a)) = (self.state.bot(bot_id), self.approvals.get(&bot_id)) { if let (Some(b), Some(a)) = (self.state.bot(bot_id), self.approvals.get(&bot_id)) {
let what = a.reason.split('\n').next().unwrap_or("").to_string(); let what = a.reason.split('\n').next().unwrap_or("").to_string();
// 「{callee} 需要你」 for a step only the person can do.
let title = if a.kind == ApprovalKind::Handoff { format!("{}:需要你", b.name) } else { format!("{} 需要你允許", b.name) };
if !self.headless { if !self.headless {
notify::banner(&title, &what); notify::banner(&format!("{} 需要你允許", b.name), &what);
} }
crate::remote::notify(&title, &what, bot_id); crate::remote::notify(&format!("{} 需要你允許", b.name), &what, bot_id);
} }
} }
} }
@ -2344,8 +2213,7 @@ impl App {
/// The pop-up: a dimmed window with the request in the middle, so it can't be missed. /// The pop-up: a dimmed window with the request in the middle, so it can't be missed.
fn approval_popup(&mut self, ctx: &egui::Context) { fn approval_popup(&mut self, ctx: &egui::Context) {
let selected = self.state.selected; let selected = self.state.selected;
// (A hand-off is the card in the chat, with the live screen, like the original's.) let mut ids: Vec<u64> = self.approvals.keys().copied().filter(|id| !self.popup_hidden.contains(id)).collect();
let mut ids: Vec<u64> = self.approvals.iter().filter(|(id, a)| !self.popup_hidden.contains(id) && a.kind != ApprovalKind::Handoff).map(|(id, _)| *id).collect();
ids.sort_by_key(|id| (*id != selected, *id)); ids.sort_by_key(|id| (*id != selected, *id));
let Some(&bot_id) = ids.first() else { return }; let Some(&bot_id) = ids.first() else { return };
let Some(bot) = self.state.bot(bot_id).cloned() else { return }; let Some(bot) = self.state.bot(bot_id).cloned() else { return };
@ -3423,11 +3291,6 @@ impl App {
ctx.send_viewport_cmd(egui::ViewportCommand::InnerSize(vec2(w, h))); ctx.send_viewport_cmd(egui::ViewportCommand::InnerSize(vec2(w, h)));
} }
} }
// Real data: the computer viewer opens a little after start, as a person would open it (a
// screen of a brain has said so by then, so it shows the brain's computer).
if self.frames == 10 && !self.demo && std::env::var("ANYBOT_SHOT_VIEW").as_deref() == Ok("viewer") {
self.open_viewer();
}
// ANYBOT_SHOT_PAGE=id: open that page late (a screen gets its pages from the brain first). // ANYBOT_SHOT_PAGE=id: open that page late (a screen gets its pages from the brain first).
if self.frames == need * 3 / 4 { if self.frames == need * 3 / 4 {
if let Some(id) = std::env::var("ANYBOT_SHOT_PAGE").ok().and_then(|v| v.parse().ok()) { if let Some(id) = std::env::var("ANYBOT_SHOT_PAGE").ok().and_then(|v| v.parse().ok()) {
@ -3742,20 +3605,6 @@ impl eframe::App for App {
if ctx.input(|i| i.modifiers.command && i.key_pressed(Key::Comma)) { if ctx.input(|i| i.modifiers.command && i.key_pressed(Key::Comma)) {
self.show_settings = true; self.show_settings = true;
} }
// Mac: the top strip moves the window like a title bar would (buttons drawn over it still
// take their clicks: they come later, so they are on top); a double click zooms.
if cfg!(target_os = "macos") {
let full = ui.max_rect();
let strip = egui::Rect::from_min_max(full.min, egui::pos2(full.max.x, full.min.y + TITLEBAR_H));
let r = ui.interact(strip, egui::Id::unique("titlebar-drag"), egui::Sense::click_and_drag());
if r.drag_started_by(egui::PointerButton::Primary) {
ctx.send_viewport_cmd(egui::ViewportCommand::StartDrag);
}
if r.double_clicked() {
let zoomed = ctx.input(|i| i.viewport().maximized.unwrap_or(false));
ctx.send_viewport_cmd(egui::ViewportCommand::Maximized(!zoomed));
}
}
self.sidebar(ui); self.sidebar(ui);
self.main_pane(ui); self.main_pane(ui);
self.bot_editor(ctx); self.bot_editor(ctx);
@ -4037,9 +3886,8 @@ fn system_prompt(b: &Bot, st: &State, computers: &[tools::Target], default_compu
- 公開網頁:web_fetch。\n\ - 公開網頁:web_fetch。\n\
- 要登入才看得到的(Threads、Instagram、Facebook、Gmail、銀行…):用 browser_open 在 AnyBot 自己的瀏覽器視窗打開,再用 browser_read 讀分頁內容。例如看 Threads 帳號:browser_open(\"https://www.threads.net\") 然後 browser_read。\n\ - 要登入才看得到的(Threads、Instagram、Facebook、Gmail、銀行…):用 browser_open 在 AnyBot 自己的瀏覽器視窗打開,再用 browser_read 讀分頁內容。例如看 Threads 帳號:browser_open(\"https://www.threads.net\") 然後 browser_read。\n\
- 在網頁上做事(後台、報表、表單)要像人一樣操作:先 browser_screenshot 看一眼(圖上每個可點的東西都有編號),再用 browser_click/browser_type/browser_select/browser_press 照編號操作;表格用 browser_table 讀,找字用 browser_find,要等載入用 browser_wait,匯出報表用 browser_download。不要猜網址;找不到想要的功能(例如排序、篩選),就看欄位標題、篩選器、下拉選單或分頁標籤,還是沒有就照頁面現有的資料自己整理,並說明網站沒有這個功能。 - 在網頁上做事(後台、報表、表單)要像人一樣操作:先 browser_screenshot 看一眼(圖上每個可點的東西都有編號),再用 browser_click/browser_type/browser_select/browser_press 照編號操作;表格用 browser_table 讀,找字用 browser_find,要等載入用 browser_wait,匯出報表用 browser_download。不要猜網址;找不到想要的功能(例如排序、篩選),就看欄位標題、篩選器、下拉選單或分頁標籤,還是沒有就照頁面現有的資料自己整理,並說明網站沒有這個功能。
- 絕對不要直接呼叫網站的內部 API、下載網站的程式碼來研究,或用程式大量抓資料:網站會把帳號當成機器人(例如跳出拼圖驗證、封鎖帳號)。 - 絕對不要直接呼叫網站的內部 API、下載網站的程式碼來研究,或用程式大量抓資料:網站會把帳號當成機器人(例如跳出拼圖驗證、封鎖帳號)。出現驗證碼、拼圖或簡訊驗證時,停下來請使用者在 AnyBot 瀏覽器視窗完成。
- 需要使用者親手做的步驟(登入、輸入密碼、驗證碼、拼圖、簡訊或 email 驗證、確認付款):先在電腦上把那一頁打開、點到要輸入的地方,再呼叫 hand_over_computer,instruction 寫清楚要他做什麼。聊天裡會出現那台電腦的即時畫面,他點「接管」做完後按「我完成了」,你再截圖確認、接著做。不要只用文字叫他自己去找視窗;也絕對不要替他打密碼。 - 如果讀到的是登入頁,請使用者在跳出來的 AnyBot 瀏覽器視窗登入一次(之後會記住),登入好再讀。絕對不要叫使用者去改瀏覽器的設定或選單(例如「允許來自 Apple 事件的 JavaScript」),那不需要。也不要說要從 Chrome 複製登入或 Cookie,沒有這個功能。\n\
- 如果讀到的是登入頁:把登入頁開在那台電腦上,用 hand_over_computer 請使用者登入一次(之後會記住),他按「我完成了」再讀。絕對不要叫使用者去改瀏覽器的設定或選單(例如「允許來自 Apple 事件的 JavaScript」),那不需要。也不要說要從 Chrome 複製登入或 Cookie,沒有這個功能。\n\
- AnyBot 瀏覽器有設定檔(profile),每個有自己的登入。使用者說要換 profile/設定檔/另一個帳號時,用 browser_profiles:list 看有哪些,use 切換,add 新增(新的要登入一次)。也可以在 browser_open / browser_read 帶 profile 參數。使用者想用自己平常的 Chrome(自己的 Chrome 設定檔、已經登入的帳號)時,用 profile「你的瀏覽器」:請使用者在 Chrome 切到想要的設定檔,再 browser_read。\n\ - AnyBot 瀏覽器有設定檔(profile),每個有自己的登入。使用者說要換 profile/設定檔/另一個帳號時,用 browser_profiles:list 看有哪些,use 切換,add 新增(新的要登入一次)。也可以在 browser_open / browser_read 帶 profile 參數。使用者想用自己平常的 Chrome(自己的 Chrome 設定檔、已經登入的帳號)時,用 profile「你的瀏覽器」:請使用者在 Chrome 切到想要的設定檔,再 browser_read。\n\
- 你也能像人一樣操作螢幕({screens})。computer_use_screenshot 看畫面,再用 computer_use_click / computer_use_typing / computer_use_press_key / computer_use_scroll / computer_use_drag 操作;座標用最新截圖上的像素。每做一步就再截圖確認。用在檔案和網頁工具做不到的事(例如操作其他 App、在 Chrome 切換設定檔)。\n\ - 你也能像人一樣操作螢幕({screens})。computer_use_screenshot 看畫面,再用 computer_use_click / computer_use_typing / computer_use_press_key / computer_use_scroll / computer_use_drag 操作;座標用最新截圖上的像素。每做一步就再截圖確認。用在檔案和網頁工具做不到的事(例如操作其他 App、在 Chrome 切換設定檔)。\n\
{}\ {}\

View File

@ -977,40 +977,6 @@ impl App {
} }
} }
/// 接管: open the computer and take control (the bot waits for the person anyway).
pub(super) fn take_over_computer(&mut self) {
self.open_viewer();
if self.cu.control {
return;
}
self.cu.control = true;
match self.cu.remote.clone() {
Some(s) => {
std::thread::spawn(move || {
let _ = crate::remote::sync_post(&s, "screen", &serde_json::json!({"kind": "hold", "on": true}));
});
}
None => cloudbox::HELD_BY_PERSON.store(true, Ordering::SeqCst),
}
}
/// 我完成了 / 跳過: the bot gets its computer back (its steps would otherwise wait for the
/// person to let go).
pub(super) fn give_back_computer(&mut self) {
if !self.cu.control {
return;
}
self.cu.control = false;
match self.cu.remote.clone() {
Some(s) => {
std::thread::spawn(move || {
let _ = crate::remote::sync_post(&s, "screen", &serde_json::json!({"kind": "hold", "on": false}));
});
}
None => cloudbox::HELD_BY_PERSON.store(false, Ordering::SeqCst),
}
}
fn close_viewer(&mut self) { fn close_viewer(&mut self) {
self.cu.viewer_open = false; self.cu.viewer_open = false;
self.cu.control = false; self.cu.control = false;
@ -1150,11 +1116,8 @@ impl App {
let default = vec2((screen.width() * 0.62).min(900.0), (screen.width() * 0.62).min(900.0) * 0.625 + 52.0); let default = vec2((screen.width() * 0.62).min(900.0), (screen.width() * 0.62).min(900.0) * 0.625 + 52.0);
let busy = if brain { self.mir.box_state["busy"].as_bool().unwrap_or(false) } else { cloudbox::is_busy() }; let busy = if brain { self.mir.box_state["busy"].as_bool().unwrap_or(false) } else { cloudbox::is_busy() };
let title = self.state.bot(self.state.selected).map(|b| crate::model::own_computer_name(&b.name)).unwrap_or_else(|| crate::model::BOT_COMPUTER_NAME.to_string()); let title = self.state.bot(self.state.selected).map(|b| crate::model::own_computer_name(&b.name)).unwrap_or_else(|| crate::model::BOT_COMPUTER_NAME.to_string());
let title = if brain { format!("{title}(在大腦「{}」上)", self.state.remote.brain_name) } else { title };
let mut close_clicked = false; let mut close_clicked = false;
let mut done_clicked = false;
let selected = self.state.selected;
let handoff = self.approvals.get(&selected).map(|a| a.kind == crate::providers::ApprovalKind::Handoff).unwrap_or(false);
egui::Window::new("box-viewer") egui::Window::new("box-viewer")
.id(egui::Id::unique("box-viewer")) .id(egui::Id::unique("box-viewer"))
.title_bar(false) .title_bar(false)
@ -1172,9 +1135,16 @@ impl App {
.shadow(egui::epaint::Shadow { offset: [0, 14], blur: 40, spread: 0, color: Color32::from_black_alpha(60) }), .shadow(egui::epaint::Shadow { offset: [0, 14], blur: 40, spread: 0, color: Color32::from_black_alpha(60) }),
) )
.show(ctx, |ui| { .show(ctx, |ui| {
// Buttons first, from the right; the title and state get what is left and end in
// … when it's short (the state used to slide under 「取得控制權」 in a narrow window).
ui.horizontal(|ui| { ui.horizontal(|ui| {
monitor_icon(ui, 20.0, p.text);
ui.label(RichText::new(&title).strong().size(FONT_LG));
status_pill(ui, &run, p);
if busy && !self.cu.control {
crate::icons::label(ui, crate::icons::Icon::Bot, &t("Bot 正在操作"), FONT_XS, p.accent);
}
if self.cu.control {
crate::icons::label(ui, crate::icons::Icon::Users, &t("你正在操作,Bot 已暫停"), FONT_XS, p.accent);
}
ui.with_layout(Layout::right_to_left(Align::Center), |ui| { ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
let (rect, r) = ui.allocate_exact_size(vec2(28.0, 28.0), egui::Sense::click()); let (rect, r) = ui.allocate_exact_size(vec2(28.0, 28.0), egui::Sense::click());
if r.hovered() { if r.hovered() {
@ -1188,10 +1158,6 @@ impl App {
close_clicked = true; close_clicked = true;
} }
ui.add_space(4.0); ui.add_space(4.0);
// The bot is waiting for the person here: done, and it carries on.
if handoff && ui.add(egui::Button::new(RichText::new(t("我完成了")).strong().color(p.on_primary)).fill(p.primary).corner_radius(8).min_size(vec2(84.0, 30.0))).clicked() {
done_clicked = true;
}
if !brain && ui.add(secondary_button("全螢幕")).on_hover_text(t("在瀏覽器用 noVNC 全螢幕開啟")).clicked() { if !brain && ui.add(secondary_button("全螢幕")).on_hover_text(t("在瀏覽器用 noVNC 全螢幕開啟")).clicked() {
let control = self.cu.control; let control = self.cu.control;
self.box_task(move || { self.box_task(move || {
@ -1218,19 +1184,6 @@ impl App {
None => cloudbox::HELD_BY_PERSON.store(self.cu.control, Ordering::SeqCst), None => cloudbox::HELD_BY_PERSON.store(self.cu.control, Ordering::SeqCst),
} }
} }
ui.add_space(8.0);
ui.with_layout(Layout::left_to_right(Align::Center), |ui| {
monitor_icon(ui, 20.0, p.text);
let note = if self.cu.control { Some(t("你正在操作,Bot 已暫停")) } else if busy { Some(t("Bot 正在操作")) } else { None };
let room = (ui.available_width() - 96.0 - if note.is_some() { 120.0 } else { 0.0 }).max(60.0);
ui.label(RichText::new(super::sidebar_ui::shorten_width(ui, &title, room, FONT_LG)).strong().size(FONT_LG));
if ui.available_width() > 80.0 {
status_pill(ui, &run, p);
}
if let Some(n) = note.filter(|_| ui.available_width() > 110.0) {
crate::icons::label(ui, if self.cu.control { crate::icons::Icon::Users } else { crate::icons::Icon::Bot }, &n, FONT_XS, p.accent);
}
});
}); });
}); });
ui.add_space(6.0); ui.add_space(6.0);
@ -1247,17 +1200,7 @@ impl App {
}; };
egui::ScrollArea::both().auto_shrink([false, false]).show(ui, |ui| { egui::ScrollArea::both().auto_shrink([false, false]).show(ui, |ui| {
let sense = if self.cu.control { egui::Sense::click_and_drag() } else { egui::Sense::hover() }; let sense = if self.cu.control { egui::Sense::click_and_drag() } else { egui::Sense::hover() };
// Centred in the window (it sat at the left with an empty band beside it). let resp = ui.add(egui::Image::new((tex_id, size)).corner_radius(8).sense(sense));
let resp = if self.cu.fit {
let pad = ((ui.available_width() - size.x) / 2.0).max(0.0);
ui.horizontal(|ui| {
ui.add_space(pad);
ui.add(egui::Image::new((tex_id, size)).corner_radius(8).sense(sense))
})
.inner
} else {
ui.add(egui::Image::new((tex_id, size)).corner_radius(8).sense(sense))
};
if self.cu.control { if self.cu.control {
ui.painter().rect_stroke(resp.rect, 8, Stroke::new(2.0, p.accent), egui::StrokeKind::Outside); ui.painter().rect_stroke(resp.rect, 8, Stroke::new(2.0, p.accent), egui::StrokeKind::Outside);
self.forward_input(ui, &resp, (fw, fh)); self.forward_input(ui, &resp, (fw, fh));
@ -1290,11 +1233,7 @@ impl App {
} }
} }
}); });
if done_clicked { if close_clicked || !open {
self.give_back_computer();
self.answer(ctx, selected, crate::providers::ApprovalAnswer::Once);
self.close_viewer();
} else if close_clicked || !open {
self.close_viewer(); self.close_viewer();
} }
ctx.request_repaint_after(std::time::Duration::from_millis(VIEWER_FRAME_MS)); ctx.request_repaint_after(std::time::Duration::from_millis(VIEWER_FRAME_MS));

View File

@ -533,7 +533,6 @@ impl App {
ApprovalKind::Action => "action", ApprovalKind::Action => "action",
ApprovalKind::EnableTools => "tools", ApprovalKind::EnableTools => "tools",
ApprovalKind::EnableThisComputer => "local", ApprovalKind::EnableThisComputer => "local",
ApprovalKind::Handoff => "handoff",
}; };
json!({"bot": id, "call_id": a.call_id, "tool": a.tool, "reason": a.reason, "grant": a.grant, "kind": kind}) json!({"bot": id, "call_id": a.call_id, "tool": a.tool, "reason": a.reason, "grant": a.grant, "kind": kind})
}) })
@ -1016,7 +1015,6 @@ impl App {
let kind = match a["kind"].as_str().unwrap_or("") { let kind = match a["kind"].as_str().unwrap_or("") {
"tools" => ApprovalKind::EnableTools, "tools" => ApprovalKind::EnableTools,
"local" => ApprovalKind::EnableThisComputer, "local" => ApprovalKind::EnableThisComputer,
"handoff" => ApprovalKind::Handoff,
_ => ApprovalKind::Action, _ => ApprovalKind::Action,
}; };
let (reply, _) = channel(); let (reply, _) = channel();

View File

@ -105,8 +105,7 @@ impl App {
let status = self.streams.get(&bot.id).and_then(|l| l.status.clone()).unwrap_or_else(|| t("工作中…")); let status = self.streams.get(&bot.id).and_then(|l| l.status.clone()).unwrap_or_else(|| t("工作中…"));
let mut clicked = false; let mut clicked = false;
panel_card(ui, p, |ui| { panel_card(ui, p, |ui| {
let label = if self.approvals.get(&bot.id).map(|a| a.kind == crate::providers::ApprovalKind::Handoff).unwrap_or(false) { t("等你處理") } else { t("需要你允許") }; clicked = if waiting { panel_row(ui, p, Some(crate::icons::Icon::Shield), &t("需要你允許"), "", true).clicked() } else { panel_row(ui, p, Some(crate::icons::Icon::Stop), &status, &t("停止"), false).clicked() };
clicked = if waiting { panel_row(ui, p, Some(crate::icons::Icon::Shield), &label, "", true).clicked() } else { panel_row(ui, p, Some(crate::icons::Icon::Stop), &status, &t("停止"), false).clicked() };
}); });
if clicked { if clicked {
if waiting { if waiting {
@ -174,28 +173,21 @@ impl App {
let run = crate::cloudbox::run_state(); let run = crate::cloudbox::run_state();
let running = if brain { self.mir.box_state["running"].as_bool().unwrap_or(false) } else { run.is_running() }; let running = if brain { self.mir.box_state["running"].as_bool().unwrap_or(false) } else { run.is_running() };
let state = if brain { let state = if brain {
self.mir.box_state["label"].as_str().map(t).unwrap_or_else(|| t("連線中…")) let label = self.mir.box_state["label"].as_str().map(t).unwrap_or_else(|| t("連線中…"));
format!("{label} · {}", t("在大腦「{name}」上").replace("{name}", &brain_name))
} else if available { } else if available {
t(&run.label()) t(&run.label())
} else { } else {
t("沒有 Docker") t("沒有 Docker")
}; };
// Where it is, on its own line (it ran into the picture when it shared the state's). let (rect, r) = ui.allocate_exact_size(vec2(ui.available_width(), 64.0), egui::Sense::click());
let place = brain.then(|| t("在大腦「{name}」上").replace("{name}", &brain_name));
let (rect, r) = ui.allocate_exact_size(vec2(ui.available_width(), if place.is_some() { 72.0 } else { 64.0 }), egui::Sense::click());
if r.hovered() { if r.hovered() {
ui.painter().rect_filled(rect, 9, p.hover); ui.painter().rect_filled(rect, 9, p.hover);
} }
// Every line stops before the picture (long names end in …). ui.painter().text(rect.left_top() + vec2(10.0, 15.0), egui::Align2::LEFT_TOP, &own_name, egui::FontId::proportional(13.0), p.text);
let text_w = (rect.width() - 86.0 - 10.0 - 8.0).max(40.0); ui.painter().text(rect.left_top() + vec2(10.0, 33.0), egui::Align2::LEFT_TOP, state, egui::FontId::proportional(12.0), p.text3);
let top = if place.is_some() { 9.0 } else { 15.0 };
ui.painter().text(rect.left_top() + vec2(10.0, top), egui::Align2::LEFT_TOP, super::sidebar_ui::shorten_width(ui, &own_name, text_w, 13.0), egui::FontId::proportional(13.0), p.text);
ui.painter().text(rect.left_top() + vec2(10.0, top + 18.0), egui::Align2::LEFT_TOP, super::sidebar_ui::shorten_width(ui, &state, text_w, 12.0), egui::FontId::proportional(12.0), p.text3);
if let Some(place) = &place {
ui.painter().text(rect.left_top() + vec2(10.0, top + 35.0), egui::Align2::LEFT_TOP, super::sidebar_ui::shorten_width(ui, place, text_w, 12.0), egui::FontId::proportional(12.0), p.text3);
}
// The screen: 16:10, rounded, the real desktop when there is a picture. // The screen: 16:10, rounded, the real desktop when there is a picture.
let box_r = egui::Rect::from_min_size(egui::pos2(rect.right() - 86.0, rect.center().y - 24.0), vec2(78.0, 48.0)); let box_r = egui::Rect::from_min_size(rect.right_top() + vec2(-86.0, 8.0), vec2(78.0, 48.0));
match thumb { match thumb {
Some((tex, size)) => { Some((tex, size)) => {
let mut img = egui::Image::new((tex, size)).fit_to_exact_size(box_r.size()).corner_radius(7); let mut img = egui::Image::new((tex, size)).fit_to_exact_size(box_r.size()).corner_radius(7);
@ -219,8 +211,7 @@ impl App {
let tip = if running { t("看「{name}」的螢幕,也可以取得控制權自己操作") } else { t("叫醒「{name}」並看它的螢幕") }.replace("{name}", &own_name); let tip = if running { t("看「{name}」的螢幕,也可以取得控制權自己操作") } else { t("叫醒「{name}」並看它的螢幕") }.replace("{name}", &own_name);
view = r.on_hover_cursor(egui::CursorIcon::PointingHand).on_hover_text(tip).clicked(); view = r.on_hover_cursor(egui::CursorIcon::PointingHand).on_hover_text(tip).clicked();
if !choices.is_empty() { if !choices.is_empty() {
let shown = super::sidebar_ui::shorten_width(ui, &current, (ui.available_width() - 120.0).max(60.0), 13.0); panel_select(ui, p, "做事的電腦", ("computer", bot.id), &current, |ui| {
panel_select(ui, p, "做事的電腦", ("computer", bot.id), &shown, |ui| {
for (name, kind) in &choices { for (name, kind) in &choices {
let what = t(match kind.as_str() { let what = t(match kind.as_str() {
"own" => "它自己的電腦", "own" => "它自己的電腦",

View File

@ -41,10 +41,8 @@ fn approval_json(bot: &Bot, a: &Approval) -> serde_json::Value {
ApprovalKind::EnableTools => format!("允許 {} 使用電腦工具嗎?", bot.name), ApprovalKind::EnableTools => format!("允許 {} 使用電腦工具嗎?", bot.name),
ApprovalKind::EnableThisComputer => format!("允許 {} 在你的電腦上執行任務嗎?", bot.name), ApprovalKind::EnableThisComputer => format!("允許 {} 在你的電腦上執行任務嗎?", bot.name),
ApprovalKind::Action => format!("{} 想要{what}", bot.name), ApprovalKind::Action => format!("{} 想要{what}", bot.name),
ApprovalKind::Handoff => format!("{}:需要你", bot.name),
}; };
let handoff = a.kind == ApprovalKind::Handoff; json!({"bot": bot.id, "title": title, "reason": a.reason, "tool": a.tool, "can_always": a.kind != ApprovalKind::Action || !a.grant.is_empty()})
json!({"bot": bot.id, "title": title, "reason": a.reason, "tool": a.tool, "can_always": !handoff && (a.kind != ApprovalKind::Action || !a.grant.is_empty()), "kind": if handoff { "handoff" } else { "ask" }, "computer": if handoff { a.grant.as_str() } else { "" }})
} }
impl App { impl App {
@ -131,9 +129,8 @@ impl App {
if !self.mir.on && s.auto_backup && !s.backup_key.is_empty() && !s.relay_url.is_empty() && chrono::Utc::now().timestamp() - s.last_backup > 86_400 && !self.rm.busy.load(Ordering::SeqCst) { if !self.mir.on && s.auto_backup && !s.backup_key.is_empty() && !s.relay_url.is_empty() && chrono::Utc::now().timestamp() - s.last_backup > 86_400 && !self.rm.busy.load(Ordering::SeqCst) {
self.remote_backup(); self.remote_backup();
} }
// 裝置連結: keep the list of this account's computers fresh (every 15 s: a computer that // 裝置連結: keep the list of this account's computers fresh (once a minute).
// comes on is one the bots can use soon after). if !self.state.remote.host_token.is_empty() && !self.rm.peers_at.map(|t| t.elapsed().as_secs() < 60).unwrap_or(false) {
if !self.state.remote.host_token.is_empty() && !self.rm.peers_at.map(|t| t.elapsed().as_secs() < 15).unwrap_or(false) {
self.rm.peers_at = Some(Instant::now()); self.rm.peers_at = Some(Instant::now());
let (peers, s) = (self.rm.peers.clone(), self.state.remote.clone()); let (peers, s) = (self.rm.peers.clone(), self.state.remote.clone());
std::thread::spawn(move || { std::thread::spawn(move || {
@ -269,15 +266,6 @@ impl App {
// 「我的電腦」 and the model on their network). The phone isn't a computer. // 「我的電腦」 and the model on their network). The phone isn't a computer.
if !from.is_empty() { if !from.is_empty() {
remote::set_person_host(&from); remote::set_person_host(&from);
// A computer this brain hasn't heard of yet (it just came on): look the
// account's computers up now, or its 「我的電腦」 wouldn't be known for a minute.
if !self.rm.peers.lock().unwrap().iter().any(|(id, _, online)| *id == from && *online) {
let v = remote::devices_online(&self.state.remote);
if !v.is_empty() {
*self.rm.peers.lock().unwrap() = v;
}
self.rm.peers_at = Some(Instant::now());
}
self.typed_on = Some(from); self.typed_on = Some(from);
} }
// Only files the app itself stored in its attachments folder may ride along; // Only files the app itself stored in its attachments folder may ride along;

View File

@ -745,7 +745,7 @@ impl App {
}; };
painter.galley(egui::pos2(tx, rect.top() + 9.0), one_line(b.name.clone(), 15.0, p.text), p.text); painter.galley(egui::pos2(tx, rect.top() + 9.0), one_line(b.name.clone(), 15.0, p.text), p.text);
let sub = if waiting { let sub = if waiting {
if self.approvals.get(&b.id).map(|a| a.kind == crate::providers::ApprovalKind::Handoff).unwrap_or(false) { t("等你處理") } else { t("需要你允許") } t("需要你允許")
} else if streaming { } else if streaming {
t("正在工作…") t("正在工作…")
} else { } else {

View File

@ -27,34 +27,7 @@ use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
use std::sync::{Mutex, OnceLock}; use std::sync::{Mutex, OnceLock};
use std::time::{Duration, Instant, SystemTime}; use std::time::{Duration, Instant, SystemTime};
/// The box's usual name. Two AnyBots on one Docker host (a server's brain and a desktop AnyBot
/// left on the same machine) each took "anybot-box" for their own, and the desktop one kept
/// pausing the brain's box as "idle". ANYBOT_BOX_NAME gives an AnyBot a box of its own name.
pub const CONTAINER: &str = "anybot-box"; pub const CONTAINER: &str = "anybot-box";
/// This AnyBot's box (ANYBOT_BOX_NAME, else "anybot-box").
pub fn container() -> &'static str {
static C: OnceLock<String> = OnceLock::new();
C.get_or_init(|| {
std::env::var("ANYBOT_BOX_NAME")
.ok()
.map(|n| n.trim().to_string())
.filter(|n| !n.is_empty() && n.len() <= 60 && n.chars().all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_'))
.unwrap_or_else(|| CONTAINER.to_string())
})
}
/// A box of its own name takes over the usual one this AnyBot used before (same files: the
/// home folder is a volume, kept by name; a rename doesn't stop it).
fn adopt_usual_box() {
let me = container();
if me == CONTAINER || dk(&["inspect", "-f", "{{.Id}}", me]).is_ok() {
return;
}
if dk(&["inspect", "-f", "{{.Id}}", CONTAINER]).is_ok() && dk(&["rename", CONTAINER, me]).is_ok() {
log(&format!("Bot 的電腦改用自己的名字 {me}(原本叫 {CONTAINER})。"));
}
}
pub const IMAGE: &str = "anybot-box:1"; pub const IMAGE: &str = "anybot-box:1";
/// The bot's files live here and survive an update (the original's mounted sand-data tree). /// The bot's files live here and survive an update (the original's mounted sand-data tree).
pub const VOLUME: &str = "anybot-box-home"; pub const VOLUME: &str = "anybot-box-home";
@ -68,9 +41,8 @@ pub const HOST_PORT: u16 = 16080;
pub const SCREEN: &str = "1280x800x24"; pub const SCREEN: &str = "1280x800x24";
/// Health probe timeout (QQn). /// Health probe timeout (QQn).
pub const HEALTH_TIMEOUT_MS: u64 = 3_000; pub const HEALTH_TIMEOUT_MS: u64 = 3_000;
/// Saving a snapshot ("flush the durable store"). The original waits 30 s (VQn); a home folder of /// Snapshot ("flush the durable store") timeout (VQn).
/// a GB with an open browser takes minutes to pack, and a cut-off snapshot is no snapshot. pub const SNAPSHOT_TIMEOUT_MS: u64 = 30_000;
pub const SNAPSHOT_SAVE_TIMEOUT_MS: u64 = 600_000;
/// Restore copy-in: longest wait and poll interval (zQn, HQn). /// Restore copy-in: longest wait and poll interval (zQn, HQn).
pub const COPY_IN_WAIT_MS: u64 = 90_000; pub const COPY_IN_WAIT_MS: u64 = 90_000;
pub const COPY_IN_POLL_MS: u64 = 2_000; pub const COPY_IN_POLL_MS: u64 = 2_000;
@ -348,7 +320,7 @@ pub fn wanted_version() -> String {
/// The running computer is older than the one this AnyBot carries. /// The running computer is older than the one this AnyBot carries.
pub fn update_available() -> bool { pub fn update_available() -> bool {
match dk(&["inspect", "-f", "{{index .Config.Labels \"anybot.box.version\"}}", container()]) { match dk(&["inspect", "-f", "{{index .Config.Labels \"anybot.box.version\"}}", CONTAINER]) {
Ok(v) => v.trim() != wanted_version(), Ok(v) => v.trim() != wanted_version(),
Err(_) => false, Err(_) => false,
} }
@ -487,12 +459,12 @@ pub fn probe() -> Run {
format!("Docker 沒有在執行:{}", e.lines().last().unwrap_or("")) format!("Docker 沒有在執行:{}", e.lines().last().unwrap_or(""))
}); });
} }
match dk(&["inspect", "-f", "{{.State.Status}}", container()]) { match dk(&["inspect", "-f", "{{.State.Status}}", CONTAINER]) {
Err(_) => Run::Absent, Err(_) => Run::Absent,
Ok(s) => match s.as_str() { Ok(s) => match s.as_str() {
"running" => { "running" => {
// The health probe (3 s, like the original's GET /health). // The health probe (3 s, like the original's GET /health).
if dk_timeout(&["exec", container(), "test", "-f", "/tmp/anybot-box.ready"], HEALTH_TIMEOUT_MS).is_ok() { if dk_timeout(&["exec", CONTAINER, "test", "-f", "/tmp/anybot-box.ready"], HEALTH_TIMEOUT_MS).is_ok() {
Run::Running Run::Running
} else { } else {
Run::Starting("連線中") Run::Starting("連線中")
@ -577,14 +549,14 @@ fn create_container() -> Result<(), String> {
let vnc = format!("VNC_PASSWORD={}", vnc_password()); let vnc = format!("VNC_PASSWORD={}", vnc_password());
log("正在開一台新的電腦…"); log("正在開一台新的電腦…");
// host.docker.internal → this Mac (for 網路流量改走你的電腦; Docker Desktop and OrbStack already have it). // host.docker.internal → this Mac (for 網路流量改走你的電腦; Docker Desktop and OrbStack already have it).
dk(&["run", "-d", "--name", container(), "--hostname", "bot-computer", "--shm-size", "1g", "--pids-limit", "4096", "--memory", "2g", "--cpus", "2", "--add-host", "host.docker.internal:host-gateway", "-p", &publish, "-v", &vol, "-e", &env, "-e", &vnc, "--label", "anybot.box=1", IMAGE]).map_err(|e| format!("開不了電腦:{}", tail(&e, 400)))?; dk(&["run", "-d", "--name", CONTAINER, "--hostname", "bot-computer", "--shm-size", "1g", "--pids-limit", "4096", "--memory", "2g", "--cpus", "2", "--add-host", "host.docker.internal:host-gateway", "-p", &publish, "-v", &vol, "-e", &env, "-e", &vnc, "--label", "anybot.box=1", IMAGE]).map_err(|e| format!("開不了電腦:{}", tail(&e, 400)))?;
Ok(()) Ok(())
} }
fn wait_ready(ms: u64) -> Result<(), String> { fn wait_ready(ms: u64) -> Result<(), String> {
let start = Instant::now(); let start = Instant::now();
while start.elapsed() < Duration::from_millis(ms) { while start.elapsed() < Duration::from_millis(ms) {
if dk(&["exec", container(), "test", "-f", "/tmp/anybot-box.ready"]).is_ok() { if dk(&["exec", CONTAINER, "test", "-f", "/tmp/anybot-box.ready"]).is_ok() {
return Ok(()); return Ok(());
} }
std::thread::sleep(Duration::from_millis(250)); std::thread::sleep(Duration::from_millis(250));
@ -616,7 +588,7 @@ fn box_cdp_forward() -> Result<u16, String> {
for conn in l.incoming().flatten() { for conn in l.incoming().flatten() {
std::thread::spawn(move || { std::thread::spawn(move || {
let script = format!("exec 3<>/dev/tcp/127.0.0.1/{BOX_CDP_PORT} || exit 1; cat <&3 & cat >&3; kill $! 2>/dev/null"); let script = format!("exec 3<>/dev/tcp/127.0.0.1/{BOX_CDP_PORT} || exit 1; cat <&3 & cat >&3; kill $! 2>/dev/null");
let Ok(mut child) = docker().args(["exec", "-i", container(), "bash", "-c", &script]).stdin(Stdio::piped()).stdout(Stdio::piped()).stderr(Stdio::null()).spawn() else { return }; let Ok(mut child) = docker().args(["exec", "-i", CONTAINER, "bash", "-c", &script]).stdin(Stdio::piped()).stdout(Stdio::piped()).stderr(Stdio::null()).spawn() else { return };
let (Some(mut cin), Some(mut cout)) = (child.stdin.take(), child.stdout.take()) else { return }; let (Some(mut cin), Some(mut cout)) = (child.stdin.take(), child.stdout.take()) else { return };
let (Ok(mut r), Ok(mut w)) = (conn.try_clone(), conn.try_clone()) else { return }; let (Ok(mut r), Ok(mut w)) = (conn.try_clone(), conn.try_clone()) else { return };
let up = std::thread::spawn(move || { let up = std::thread::spawn(move || {
@ -648,7 +620,7 @@ pub fn browser_port() -> Result<u16, String> {
return Ok(port); return Ok(port);
} }
let dbg = format!("--remote-debugging-port={BOX_CDP_PORT}"); let dbg = format!("--remote-debugging-port={BOX_CDP_PORT}");
dk(&["exec", "-d", "-u", "bot", "-e", "DISPLAY=:1", "-e", "HOME=/home/bot", container(), "chromium", &dbg, "--remote-allow-origins=*", "--user-data-dir=/home/bot/.config/anybot-browser", "about:blank"]).map_err(|e| format!("Bot 的電腦打不開瀏覽器:{e}"))?; dk(&["exec", "-d", "-u", "bot", "-e", "DISPLAY=:1", "-e", "HOME=/home/bot", CONTAINER, "chromium", &dbg, "--remote-allow-origins=*", "--user-data-dir=/home/bot/.config/anybot-browser", "about:blank"]).map_err(|e| format!("Bot 的電腦打不開瀏覽器:{e}"))?;
let start = Instant::now(); let start = Instant::now();
while start.elapsed() < Duration::from_secs(20) { while start.elapsed() < Duration::from_secs(20) {
if box_cdp_alive(port) { if box_cdp_alive(port) {
@ -679,8 +651,8 @@ pub fn ensure_running() -> Result<(), String> {
Run::Asleep => { Run::Asleep => {
set_run(Run::Starting("喚醒中")); set_run(Run::Starting("喚醒中"));
log("喚醒電腦…"); log("喚醒電腦…");
let st = dk(&["inspect", "-f", "{{.State.Status}}", container()]).unwrap_or_default(); let st = dk(&["inspect", "-f", "{{.State.Status}}", CONTAINER]).unwrap_or_default();
let woke = if st == "paused" { dk(&["unpause", container()]) } else { dk(&["start", container()]) }; let woke = if st == "paused" { dk(&["unpause", CONTAINER]) } else { dk(&["start", CONTAINER]) };
woke.map_err(|e| format!("叫不醒電腦:{e}")).and_then(|_| wait_ready(BOOT_WAIT_MS)) woke.map_err(|e| format!("叫不醒電腦:{e}")).and_then(|_| wait_ready(BOOT_WAIT_MS))
} }
Run::Starting(_) => { Run::Starting(_) => {
@ -692,13 +664,13 @@ pub fn ensure_running() -> Result<(), String> {
// A broken container: start it again. // A broken container: start it again.
log(&format!("電腦狀態異常({e}),重新啟動…")); log(&format!("電腦狀態異常({e}),重新啟動…"));
set_run(Run::Starting("連線中")); set_run(Run::Starting("連線中"));
dk(&["restart", container()]).map_err(|e| e.to_string()).and_then(|_| wait_ready(BOOT_WAIT_MS)) dk(&["restart", CONTAINER]).map_err(|e| e.to_string()).and_then(|_| wait_ready(BOOT_WAIT_MS))
} }
}; };
match &result { match &result {
Ok(()) => { Ok(()) => {
set_run(Run::Running); set_run(Run::Running);
let _ = dk(&["exec", container(), "sh", "-c", &format!("mkdir -p {HOME} && chown bot:bot {HOME}")]); let _ = dk(&["exec", CONTAINER, "sh", "-c", &format!("mkdir -p {HOME} && chown bot:bot {HOME}")]);
} }
Err(e) => { Err(e) => {
log(e); log(e);
@ -722,7 +694,6 @@ pub fn start_background() {
return; return;
} }
std::thread::spawn(|| { std::thread::spawn(|| {
adopt_usual_box();
set_run(probe()); set_run(probe());
resume_interrupted(); resume_interrupted();
loop { loop {
@ -776,11 +747,7 @@ pub fn save_snapshot() -> Result<u64, String> {
let tmp = data_dir().join("snapshot.tmp"); let tmp = data_dir().join("snapshot.tmp");
let file = std::fs::File::create(&tmp).map_err(|e| e.to_string())?; let file = std::fs::File::create(&tmp).map_err(|e| e.to_string())?;
let mut child = docker() let mut child = docker()
// Caches are left out: the browser's grow to hundreds of MB and come back by themselves. .args(["exec", CONTAINER, "tar", "-C", HOME, "--exclude=./.cache", "-czf", "-", "."])
.args([
"exec", container(), "tar", "-C", HOME, "--exclude=./.cache", "--exclude=Cache", "--exclude=Code Cache", "--exclude=GPUCache", "--exclude=CacheStorage", "--exclude=ScriptCache", "--exclude=Crashpad",
"--warning=no-file-changed", "-czf", "-", ".",
])
.stdout(Stdio::from(file)) .stdout(Stdio::from(file))
.stderr(Stdio::piped()) .stderr(Stdio::piped())
.spawn() .spawn()
@ -796,12 +763,10 @@ pub fn save_snapshot() -> Result<u64, String> {
}); });
let start = Instant::now(); let start = Instant::now();
let ok = loop { let ok = loop {
// tar says 1 when a file changed while it was read (the open browser writes all the
// time): the archive is still whole. Only 2 and up are failures.
if let Ok(Some(st)) = child.try_wait() { if let Ok(Some(st)) = child.try_wait() {
break st.code().map(|c| c <= 1).unwrap_or(false); break st.success();
} }
if start.elapsed() > Duration::from_millis(SNAPSHOT_SAVE_TIMEOUT_MS) { if start.elapsed() > Duration::from_millis(SNAPSHOT_TIMEOUT_MS * 4) {
let _ = child.kill(); let _ = child.kill();
break false; break false;
} }
@ -822,7 +787,7 @@ fn copy_in_snapshot() -> Result<(), String> {
use std::io::Write; use std::io::Write;
let data = std::fs::read(snapshot_path()).map_err(|_| "還沒有快照可以還原".to_string())?; let data = std::fs::read(snapshot_path()).map_err(|_| "還沒有快照可以還原".to_string())?;
let mut child = docker() let mut child = docker()
.args(["exec", "-i", container(), "sh", "-c", &format!("tar -C {HOME} -xzf - && chown -R bot:bot {HOME} && echo '[box-copy-in] result outcome=hydrated' >> /tmp/anybot-copy-in.log")]) .args(["exec", "-i", CONTAINER, "sh", "-c", &format!("tar -C {HOME} -xzf - && chown -R bot:bot {HOME} && echo '[box-copy-in] result outcome=hydrated' >> /tmp/anybot-copy-in.log")])
.stdin(Stdio::piped()) .stdin(Stdio::piped())
.stdout(Stdio::null()) .stdout(Stdio::null())
.stderr(Stdio::piped()) .stderr(Stdio::piped())
@ -836,7 +801,7 @@ fn copy_in_snapshot() -> Result<(), String> {
// Like readCopyInOutcome: wait for the copy-in to report "hydrated". // Like readCopyInOutcome: wait for the copy-in to report "hydrated".
let start = Instant::now(); let start = Instant::now();
while start.elapsed() < Duration::from_millis(COPY_IN_WAIT_MS) { while start.elapsed() < Duration::from_millis(COPY_IN_WAIT_MS) {
if let Ok(s) = dk(&["exec", container(), "sh", "-c", "cat /tmp/anybot-copy-in.log 2>/dev/null || true"]) { if let Ok(s) = dk(&["exec", CONTAINER, "sh", "-c", "cat /tmp/anybot-copy-in.log 2>/dev/null || true"]) {
if s.contains("outcome=hydrated") { if s.contains("outcome=hydrated") {
return Ok(()); return Ok(());
} }
@ -847,7 +812,7 @@ fn copy_in_snapshot() -> Result<(), String> {
} }
fn home_has_files() -> bool { fn home_has_files() -> bool {
dk(&["exec", container(), "sh", "-c", &format!("ls -A {HOME} | head -1")]).map(|s| !s.trim().is_empty()).unwrap_or(false) dk(&["exec", CONTAINER, "sh", "-c", &format!("ls -A {HOME} | head -1")]).map(|s| !s.trim().is_empty()).unwrap_or(false)
} }
pub fn human(b: u64) -> String { pub fn human(b: u64) -> String {
@ -959,7 +924,7 @@ fn run_rebuild(kind: Rebuild, phase: &dyn Fn(&str, &str)) -> Result<(), String>
phase("creating", "更新電腦的映像檔"); phase("creating", "更新電腦的映像檔");
build_image(true)?; build_image(true)?;
phase("creating", "換上一台新的電腦"); phase("creating", "換上一台新的電腦");
let _ = dk(&["rm", "-f", container()]); let _ = dk(&["rm", "-f", CONTAINER]);
create_container()?; create_container()?;
wait_ready(BOOT_WAIT_MS)?; wait_ready(BOOT_WAIT_MS)?;
phase("moving", "確認保留的檔案和新電腦的連線"); phase("moving", "確認保留的檔案和新電腦的連線");
@ -970,7 +935,7 @@ fn run_rebuild(kind: Rebuild, phase: &dyn Fn(&str, &str)) -> Result<(), String>
} }
Rebuild::Reset => { Rebuild::Reset => {
phase("cleaning-up", "拆掉舊的電腦"); phase("cleaning-up", "拆掉舊的電腦");
let _ = dk(&["rm", "-f", container()]); let _ = dk(&["rm", "-f", CONTAINER]);
phase("wiping", "清除電腦裡的資料"); phase("wiping", "清除電腦裡的資料");
let _ = dk(&["volume", "rm", "-f", VOLUME]); let _ = dk(&["volume", "rm", "-f", VOLUME]);
phase("creating", "開一台全新的電腦"); phase("creating", "開一台全新的電腦");
@ -982,7 +947,7 @@ fn run_rebuild(kind: Rebuild, phase: &dyn Fn(&str, &str)) -> Result<(), String>
} }
Rebuild::Restore => { Rebuild::Restore => {
phase("cleaning-up", "拆掉舊的電腦和它的資料"); phase("cleaning-up", "拆掉舊的電腦和它的資料");
let _ = dk(&["rm", "-f", container()]); let _ = dk(&["rm", "-f", CONTAINER]);
let _ = dk(&["volume", "rm", "-f", VOLUME]); let _ = dk(&["volume", "rm", "-f", VOLUME]);
phase("creating", "從快照開一台新的電腦"); phase("creating", "從快照開一台新的電腦");
if !image_exists() { if !image_exists() {
@ -1018,7 +983,7 @@ fn resume_interrupted() {
/// Disk use in the box, for the settings page and the clean-up request. /// Disk use in the box, for the settings page and the clean-up request.
pub fn disk_report() -> Result<String, String> { pub fn disk_report() -> Result<String, String> {
ensure_running()?; ensure_running()?;
dk(&["exec", "-u", "bot", container(), "sh", "-c", &format!("df -h {HOME} | tail -1; echo; du -sh {HOME}/* {HOME}/.cache 2>/dev/null | sort -rh | head -8")]) dk(&["exec", "-u", "bot", CONTAINER, "sh", "-c", &format!("df -h {HOME} | tail -1; echo; du -sh {HOME}/* {HOME}/.cache 2>/dev/null | sort -rh | head -8")])
} }
// ---------- secrets (write-only) ---------- // ---------- secrets (write-only) ----------
@ -1108,7 +1073,7 @@ pub fn exec_wrapper(dir: &str, cmd: &str, interactive: bool, job: &str) -> Strin
let inner = format!("mkdir -p {d} && cd {d} && {tagged}", d = sh_quote(dir)); let inner = format!("mkdir -p {d} && cd {d} && {tagged}", d = sh_quote(dir));
let env = env_file_path(); let env = env_file_path();
let env_arg = if env.exists() { format!(" --env-file {}", sh_quote(&env.display().to_string())) } else { String::new() }; let env_arg = if env.exists() { format!(" --env-file {}", sh_quote(&env.display().to_string())) } else { String::new() };
format!("{} exec{} -u bot -e DISPLAY={DISPLAY} -e HOME={HOME}{}{env_arg} {box} bash -lc {}", docker_prefix(), if interactive { " -i" } else { "" }, egress_env(), sh_quote(&inner), r#box = container()) format!("{} exec{} -u bot -e DISPLAY={DISPLAY} -e HOME={HOME}{}{env_arg} {CONTAINER} bash -lc {}", docker_prefix(), if interactive { " -i" } else { "" }, egress_env(), sh_quote(&inner))
} }
/// An argv that kills the box process carrying this job tag (and its children). /// An argv that kills the box process carrying this job tag (and its children).
@ -1120,7 +1085,7 @@ pub fn exec_kill_argv(job: &str) -> Vec<String> {
} }
argv.extend([ argv.extend([
"exec".to_string(), "exec".to_string(),
container().to_string(), CONTAINER.to_string(),
"sh".to_string(), "sh".to_string(),
"-c".to_string(), "-c".to_string(),
format!("for p in $(pgrep -f 'export ANYBOT_JOB={job}'); do pkill -9 -P $p; pkill -9 -P $p; kill -9 $p 2>/dev/null; done; true"), format!("for p in $(pgrep -f 'export ANYBOT_JOB={job}'); do pkill -9 -P $p; pkill -9 -P $p; kill -9 $p 2>/dev/null; done; true"),
@ -1141,10 +1106,10 @@ pub fn copy_in(local: &str, bot_id: u64, name: &str) -> Result<String, String> {
.filter(|n| !n.is_empty() && n != "." && n != "..") .filter(|n| !n.is_empty() && n != "." && n != "..")
.ok_or_else(|| "檔案名稱無效".to_string())?; .ok_or_else(|| "檔案名稱無效".to_string())?;
let dir = format!("{}/附件", bot_dir(bot_id)); let dir = format!("{}/附件", bot_dir(bot_id));
dk(&["exec", "-u", "bot", container(), "mkdir", "-p", &dir])?; dk(&["exec", "-u", "bot", CONTAINER, "mkdir", "-p", &dir])?;
let dst = format!("{dir}/{safe}"); let dst = format!("{dir}/{safe}");
dk(&["cp", local, &format!("{c}:{dst}", c = container())])?; dk(&["cp", local, &format!("{CONTAINER}:{dst}")])?;
let _ = dk(&["exec", container(), "chown", "bot:bot", &dst]); let _ = dk(&["exec", CONTAINER, "chown", "bot:bot", &dst]);
Ok(dst) Ok(dst)
} }
@ -1155,21 +1120,21 @@ pub fn copy_out(path_in_box: &str) -> Result<PathBuf, String> {
let dir = std::env::temp_dir().join(format!("anybot-from-box-{}", chrono::Utc::now().timestamp_millis())); let dir = std::env::temp_dir().join(format!("anybot-from-box-{}", chrono::Utc::now().timestamp_millis()));
std::fs::create_dir_all(&dir).map_err(|e| e.to_string())?; std::fs::create_dir_all(&dir).map_err(|e| e.to_string())?;
let local = dir.join(&name); let local = dir.join(&name);
dk(&["cp", &format!("{}:{path_in_box}", container()), &local.display().to_string()]).map_err(|e| format!("拿不到檔案:{e}"))?; dk(&["cp", &format!("{CONTAINER}:{path_in_box}"), &local.display().to_string()]).map_err(|e| format!("拿不到檔案:{e}"))?;
Ok(local) Ok(local)
} }
// ---------- the box's screen (xdotool) ---------- // ---------- the box's screen (xdotool) ----------
fn xdo(args: &[&str]) -> Result<String, String> { fn xdo(args: &[&str]) -> Result<String, String> {
let mut a = vec!["exec", "-u", "bot", "-e", "DISPLAY=:1", container(), "xdotool"]; let mut a = vec!["exec", "-u", "bot", "-e", "DISPLAY=:1", CONTAINER, "xdotool"];
a.extend_from_slice(args); a.extend_from_slice(args);
dk(&a).map_err(|e| format!("xdotool:{e}")) dk(&a).map_err(|e| format!("xdotool:{e}"))
} }
/// The desktop as an image (full size). /// The desktop as an image (full size).
pub fn grab() -> Result<image::RgbImage, String> { pub fn grab() -> Result<image::RgbImage, String> {
let png = dk_timeout(&["exec", container(), "import", "-window", "root", "-display", DISPLAY, "png:-"], 10_000)?; let png = dk_timeout(&["exec", CONTAINER, "import", "-window", "root", "-display", DISPLAY, "png:-"], 10_000)?;
image::load_from_memory(&png).map(|i| i.to_rgb8()).map_err(|e| format!("截圖讀不出來:{e}")) image::load_from_memory(&png).map(|i| i.to_rgb8()).map_err(|e| format!("截圖讀不出來:{e}"))
} }
@ -1192,7 +1157,7 @@ pub fn frame() -> Option<image::RgbaImage> {
if !run_state().is_running() { if !run_state().is_running() {
return None; return None;
} }
let png = dk_timeout(&["exec", container(), "import", "-window", "root", "-display", DISPLAY, "-quality", "1", "png:-"], 5_000).ok()?; let png = dk_timeout(&["exec", CONTAINER, "import", "-window", "root", "-display", DISPLAY, "-quality", "1", "png:-"], 5_000).ok()?;
image::load_from_memory(&png).ok().map(|i| i.to_rgba8()) image::load_from_memory(&png).ok().map(|i| i.to_rgba8())
} }
@ -1412,7 +1377,7 @@ pub fn type_text(text: &str) -> Result<(), String> {
use std::io::Write; use std::io::Write;
// Both selections hold the text; xclip keeps serving it after docker exec returns (setsid). // Both selections hold the text; xclip keeps serving it after docker exec returns (setsid).
let mut child = docker() let mut child = docker()
.args(["exec", "-i", "-u", "bot", "-e", "DISPLAY=:1", container(), "sh", "-c", "cat > /tmp/anybot-paste.txt && for s in clipboard primary; do setsid xclip -selection $s -i /tmp/anybot-paste.txt </dev/null >/dev/null 2>&1 & done; sleep 0.15"]) .args(["exec", "-i", "-u", "bot", "-e", "DISPLAY=:1", CONTAINER, "sh", "-c", "cat > /tmp/anybot-paste.txt && for s in clipboard primary; do setsid xclip -selection $s -i /tmp/anybot-paste.txt </dev/null >/dev/null 2>&1 & done; sleep 0.15"])
.stdin(Stdio::piped()) .stdin(Stdio::piped())
.stdout(Stdio::null()) .stdout(Stdio::null())
.stderr(Stdio::null()) .stderr(Stdio::null())
@ -1420,7 +1385,7 @@ pub fn type_text(text: &str) -> Result<(), String> {
.map_err(|e| e.to_string())?; .map_err(|e| e.to_string())?;
child.stdin.take().ok_or("寫不進剪貼簿")?.write_all(text.as_bytes()).map_err(|e| e.to_string())?; child.stdin.take().ok_or("寫不進剪貼簿")?.write_all(text.as_bytes()).map_err(|e| e.to_string())?;
let _ = child.wait(); let _ = child.wait();
let class = dk(&["exec", "-u", "bot", "-e", "DISPLAY=:1", container(), "sh", "-c", "xprop -id $(xdotool getactivewindow) WM_CLASS 2>/dev/null"]).unwrap_or_default().to_lowercase(); let class = dk(&["exec", "-u", "bot", "-e", "DISPLAY=:1", CONTAINER, "sh", "-c", "xprop -id $(xdotool getactivewindow) WM_CLASS 2>/dev/null"]).unwrap_or_default().to_lowercase();
let paste = if class.contains("term") { "shift+Insert" } else { "ctrl+v" }; let paste = if class.contains("term") { "shift+Insert" } else { "ctrl+v" };
xdo(&["key", "--clearmodifiers", paste])?; xdo(&["key", "--clearmodifiers", paste])?;
Ok(()) Ok(())
@ -1455,7 +1420,7 @@ pub fn viewer_text(text: &str) {
// ---------- the browser viewer (noVNC) ---------- // ---------- the browser viewer (noVNC) ----------
fn published_port() -> u16 { fn published_port() -> u16 {
dk(&["port", container(), &NOVNC_PORT.to_string()]) dk(&["port", CONTAINER, &NOVNC_PORT.to_string()])
.ok() .ok()
.and_then(|s| s.lines().next().and_then(|l| l.rsplit(':').next()).and_then(|p| p.trim().parse().ok())) .and_then(|s| s.lines().next().and_then(|l| l.rsplit(':').next()).and_then(|p| p.trim().parse().ok()))
.unwrap_or(HOST_PORT) .unwrap_or(HOST_PORT)
@ -1562,29 +1527,15 @@ mod tests {
println!("{txt}"); println!("{txt}");
assert!(img.is_some()); assert!(img.is_some());
run_on("shell", r#"{"command":"(xterm >/dev/null 2>&1 &) ; sleep 1.5"}"#, &t, &cancel, &ids); run_on("shell", r#"{"command":"(xterm >/dev/null 2>&1 &) ; sleep 1.5"}"#, &t, &cancel, &ids);
// Click the middle of that window, wherever it opened (other windows — a browser left computer_run("computer_use_click", &serde_json::json!({"x": 200, "y": 150})).unwrap();
// open — may cover the corner), in the screenshot's pixels. (Its shell renames it, so it
// is found by its class: the newest xterm.)
let (geo, _) = run_on("shell", r#"{"command":"W=$(DISPLAY=:1 xdotool search --onlyvisible --class xterm | tail -1); DISPLAY=:1 xdotool getwindowgeometry --shell $W | tail -n +2 | head -4 | tr '\n' ' '"}"#, &t, &cancel, &ids);
let num = |k: &str| geo.split_whitespace().find_map(|w| w.strip_prefix(&format!("{k}=")).and_then(|v| v.parse::<f64>().ok())).unwrap_or(0.0);
let (cx, cy) = (num("X") + num("WIDTH") / 2.0, num("Y") + num("HEIGHT") / 2.0);
let k = 1024.0 / 1280.0;
computer_run("computer_use_click", &serde_json::json!({"x": cx * k, "y": cy * k})).unwrap();
computer_run("computer_use_typing", &serde_json::json!({"value": "echo 中文輸入OK > /home/bot/typed.txt"})).unwrap(); computer_run("computer_use_typing", &serde_json::json!({"value": "echo 中文輸入OK > /home/bot/typed.txt"})).unwrap();
computer_run("computer_use_press_key", &serde_json::json!({"key": "return"})).unwrap(); computer_run("computer_use_press_key", &serde_json::json!({"key": "return"})).unwrap();
std::thread::sleep(Duration::from_millis(800)); std::thread::sleep(Duration::from_millis(800));
let (out, _) = run_on("shell", r#"{"command":"cat /home/bot/typed.txt"}"#, &t, &cancel, &ids); let (out, _) = run_on("shell", r#"{"command":"cat /home/bot/typed.txt"}"#, &t, &cancel, &ids);
println!("typed: {out}"); println!("typed: {out}");
assert!(out.contains("中文輸入OK"), "{out}"); assert!(out.contains("中文輸入OK"), "{out}");
// snapshot (with the browser and its caches in the home folder), then restore — which // snapshot + restore
// rebuilds the whole box, so only on a box meant for it (ANYBOT_TEST_RESTORE=1). save_snapshot().unwrap();
let size = save_snapshot().expect("snapshot saves even while the browser writes");
println!("snapshot: {}", human(size));
assert!(size > 0);
if std::env::var("ANYBOT_TEST_RESTORE").as_deref() != Ok("1") {
let _ = run_on("shell", r#"{"command":"rm -rf /home/bot/bot-999 /home/bot/typed.txt"}"#, &t, &cancel, &ids);
return;
}
run_on("shell", r#"{"command":"rm -rf notes"}"#, &t, &cancel, &ids); run_on("shell", r#"{"command":"rm -rf notes"}"#, &t, &cancel, &ids);
rebuild(Rebuild::Restore).unwrap(); rebuild(Rebuild::Restore).unwrap();
let start = Instant::now(); let start = Instant::now();
@ -1657,7 +1608,7 @@ mod tests {
fn wrapper_runs_as_the_bot_in_its_folder() { fn wrapper_runs_as_the_bot_in_its_folder() {
let w = exec_wrapper("/home/bot/bot-3", "ls -la", false, ""); let w = exec_wrapper("/home/bot/bot-3", "ls -la", false, "");
assert!(w.contains("exec -u bot")); assert!(w.contains("exec -u bot"));
assert!(w.contains(container())); assert!(w.contains(CONTAINER));
assert!(w.contains("/home/bot/bot-3")); assert!(w.contains("/home/bot/bot-3"));
} }
} }

View File

@ -161,12 +161,7 @@ fn args_of(args: &str) -> Value {
pub fn describe(name: &str, args: &str) -> String { pub fn describe(name: &str, args: &str) -> String {
let v = args_of(args); let v = args_of(args);
// By number from the app's list (e7), else where on the screen (it said "(0, 0)" for every let xy = || format!("({}, {})", v["x"].as_f64().unwrap_or(0.0), v["y"].as_f64().unwrap_or(0.0));
// click by number).
let xy = || match v["ref"].as_str().map(str::trim).filter(|r| !r.is_empty()) {
Some(r) => r.to_string(),
None => format!("({}, {})", v["x"].as_f64().unwrap_or(0.0), v["y"].as_f64().unwrap_or(0.0)),
};
match name { match name {
"computer_use_screenshot" => "螢幕截圖".into(), "computer_use_screenshot" => "螢幕截圖".into(),
"computer_use_click" => { "computer_use_click" => {
@ -177,8 +172,7 @@ pub fn describe(name: &str, args: &str) -> String {
"computer_use_typing" => { "computer_use_typing" => {
let t = v["value"].as_str().unwrap_or(""); let t = v["value"].as_str().unwrap_or("");
let short: String = t.chars().take(60).collect(); let short: String = t.chars().take(60).collect();
let at = v["ref"].as_str().filter(|r| !r.trim().is_empty()).map(|r| format!("在 {r} ")).unwrap_or_default(); format!("「{short}{}」", if t.chars().count() > 60 { "…" } else { "" })
format!("{at}「{short}{}」", if t.chars().count() > 60 { "…" } else { "" })
} }
"computer_use_press_key" => v["key"].as_str().unwrap_or("").to_string(), "computer_use_press_key" => v["key"].as_str().unwrap_or("").to_string(),
"computer_use_scroll" => format!("{} {} 格,在 {}", v["direction"].as_str().unwrap_or("down"), v["amount"].as_i64().unwrap_or(3), xy()), "computer_use_scroll" => format!("{} {} 格,在 {}", v["direction"].as_str().unwrap_or("down"), v["amount"].as_i64().unwrap_or(3), xy()),
@ -430,20 +424,6 @@ pub fn ask_permission(pane: &str) {
let _ = spawn_reaped(&mut std::process::Command::new("open").arg(format!("x-apple.systempreferences:com.apple.preference.security?{pane}"))); let _ = spawn_reaped(&mut std::process::Command::new("open").arg(format!("x-apple.systempreferences:com.apple.preference.security?{pane}")));
} }
const NO_ACCESSIBILITY: &str = "macOS 還沒讓 AnyBot 使用「輔助使用」,所以讀不到、也按不了這台電腦上的 App。這台電腦上已經跳出詢問並打開「系統設定 → 隱私權與安全性 → 輔助使用」:請使用者把 AnyBot 打開(只要一次),再叫我試一次。";
/// agent-desktop's PERM_DENIED (no 輔助使用), as words the bot can pass on — and the person asked.
fn plain_permission_words(t: String) -> String {
if !t.contains("PERM_DENIED") {
return t;
}
ask_permission("Privacy_Accessibility");
match t.split_once(",但讀不到它的畫面") {
Some((opened, _)) => format!("{opened},但讀不到它的畫面:{NO_ACCESSIBILITY}"),
None => NO_ACCESSIBILITY.to_string(),
}
}
/// The app a shown name stands for (「計算機」 → Calculator), from the apps' display names. /// The app a shown name stands for (「計算機」 → Calculator), from the apps' display names.
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
fn app_named(name: &str) -> Option<String> { fn app_named(name: &str) -> Option<String> {
@ -517,16 +497,8 @@ fn run_inner(name: &str, v: &Value) -> Result<(String, Option<String>), String>
return Err("使用者正在自己操作這台電腦(已取得控制權)。請等他交還控制權後再操作。".into()); return Err("使用者正在自己操作這台電腦(已取得控制權)。請等他交還控制權後再操作。".into());
} }
} }
// Reading and using apps by their controls needs 輔助使用: without it macOS answers
// PERM_DENIED and nobody was asked. Ask (prompt + the Settings pane, now and then) and say it
// plainly; opening an app still opens it.
let by_controls = name == "computer_use_read_app" || run_text_mode_name(name, v).is_some();
if cfg!(target_os = "macos") && by_controls && name != "computer_use_open_app" && !crate::axread::trusted(false) {
ask_permission("Privacy_Accessibility");
return Err(NO_ACCESSIBILITY.into());
}
if let Some(r) = run_text_mode(name, v) { if let Some(r) = run_text_mode(name, v) {
return r.map(|(t, img)| (plain_permission_words(t), img)).map_err(plain_permission_words); return r;
} }
if !cfg!(any(target_os = "macos", target_os = "linux")) { if !cfg!(any(target_os = "macos", target_os = "linux")) {
return Err("操作畫面只支援 macOS 和 Linux".into()); return Err("操作畫面只支援 macOS 和 Linux".into());

View File

@ -614,13 +614,4 @@ pub const ROWS: &[(&str, &str, &str)] = &[
("在「{name}」上做事 · 點一下換電腦", "Works on “{name}” · click to switch computers", "「{name}」で作業 · クリックで切り替え"), ("在「{name}」上做事 · 點一下換電腦", "Works on “{name}” · click to switch computers", "「{name}」で作業 · クリックで切り替え"),
("一台 Linux 電腦,你所有的 Bot 共用,每個 Bot 有自己的資料夾(例如「Master 的電腦」)。一直開著,不會休眠。", "A Linux computer all your bots share; each bot has its own folder (e.g. “Master's computer”). Always on, it never sleeps.", "すべての Bot が共有する Linux コンピューター。Bot ごとにフォルダーがあります(例:「Master のコンピューター」)。常に起動していて、スリープしません。"), ("一台 Linux 電腦,你所有的 Bot 共用,每個 Bot 有自己的資料夾(例如「Master 的電腦」)。一直開著,不會休眠。", "A Linux computer all your bots share; each bot has its own folder (e.g. “Master's computer”). Always on, it never sleeps.", "すべての Bot が共有する Linux コンピューター。Bot ごとにフォルダーがあります(例:「Master のコンピューター」)。常に起動していて、スリープしません。"),
("把 Bot 的檔案備份到這台電腦;每天也會自動存一份", "Back up the bots' files to this computer; a copy is also saved every day", "Bot のファイルをこのコンピューターにバックアップします。毎日自動でも保存します"), ("把 Bot 的檔案備份到這台電腦;每天也會自動存一份", "Back up the bots' files to this computer; a copy is also saved every day", "Bot のファイルをこのコンピューターにバックアップします。毎日自動でも保存します"),
("等你處理", "Waiting for you", "対応待ち"),
("需要處理", "Action needed", "対応が必要です"),
("接管", "Take over", "操作を代わる"),
("接管電腦", "Take over the computer", "コンピューターの操作を代わる"),
("我完成了", "I'm done", "完了しました"),
("跳過", "Skip", "スキップ"),
("取消此要求且不執行該步驟;Bot 會跳過它並繼續", "Cancel this request without doing the step; the Bot continues without it", "この依頼を取り消し、その手順は行いません。Bot はそれを飛ばして続けます"),
("連結中", "Connecting", "接続中"),
("請到「{name}」上操作", "Please do it on “{name}”", "「{name}」で操作してください"),
]; ];

View File

@ -147,11 +147,8 @@ pub fn load_fonts(ctx: &egui::Context) {
/// The window icon (Linux taskbars and window switchers; macOS uses the app bundle's). /// The window icon (Linux taskbars and window switchers; macOS uses the app bundle's).
fn app_icon() -> egui::IconData { fn app_icon() -> egui::IconData {
svg_icon(include_str!("../icons/anybot.svg"), 256) let svg = include_str!("../icons/anybot.svg");
} let px = 256u32;
/// An SVG drawn to a square RGBA picture of `px` pixels.
fn svg_icon(svg: &str, px: u32) -> egui::IconData {
let tree = resvg::usvg::Tree::from_str(svg, &resvg::usvg::Options::default()).expect("icon svg"); let tree = resvg::usvg::Tree::from_str(svg, &resvg::usvg::Options::default()).expect("icon svg");
let mut pm = resvg::tiny_skia::Pixmap::new(px, px).expect("icon pixmap"); let mut pm = resvg::tiny_skia::Pixmap::new(px, px).expect("icon pixmap");
let s = px as f32 / tree.size().width(); let s = px as f32 / tree.size().width();
@ -169,35 +166,21 @@ fn svg_icon(svg: &str, px: u32) -> egui::IconData {
egui::IconData { rgba, width: px, height: px } egui::IconData { rgba, width: px, height: px }
} }
/// `anybot --write-icon out.png [size] [file.svg]`: the app icon (or that SVG) as a PNG, drawn at /// `anybot --write-icon out.png [size]`: the app icon as a PNG (for Linux packages).
/// that size (for the Mac bundle, Linux packages and the web icons). fn write_icon(out: &str, px: u32) -> Result<(), String> {
fn write_icon(out: &str, px: u32, svg: Option<&str>) -> Result<(), String> { let icon = app_icon();
let icon = match svg {
Some(path) => svg_icon(&std::fs::read_to_string(path).map_err(|e| format!("{path}: {e}"))?, px),
None => svg_icon(include_str!("../icons/anybot.svg"), px),
};
let img = image::RgbaImage::from_raw(icon.width, icon.height, icon.rgba).ok_or("icon")?; let img = image::RgbaImage::from_raw(icon.width, icon.height, icon.rgba).ok_or("icon")?;
let img = if px != icon.width { image::imageops::resize(&img, px, px, image::imageops::FilterType::Lanczos3) } else { img };
img.save(out).map_err(|e| e.to_string()) img.save(out).map_err(|e| e.to_string())
} }
fn main() -> eframe::Result<()> { fn main() -> eframe::Result<()> {
let args: Vec<String> = std::env::args().collect(); let args: Vec<String> = std::env::args().collect();
let screenshot = args.iter().position(|a| a == "--screenshot").and_then(|i| args.get(i + 1)).map(PathBuf::from); let screenshot = args.iter().position(|a| a == "--screenshot").and_then(|i| args.get(i + 1)).map(PathBuf::from);
// For tests that start AnyBots of their own: a whole settings file (the sample bots) to edit.
if args.get(1).map(String::as_str) == Some("--sample-state") {
let out = args.get(2).cloned().unwrap_or_else(|| "state.json".into());
let mut st = model::State::samples();
st.remote = Default::default();
if let Err(e) = std::fs::write(&out, serde_json::to_vec_pretty(&st).unwrap_or_default()) {
eprintln!("{e}");
std::process::exit(1);
}
return Ok(());
}
if args.get(1).map(String::as_str) == Some("--write-icon") { if args.get(1).map(String::as_str) == Some("--write-icon") {
let out = args.get(2).cloned().unwrap_or_else(|| "anybot.png".into()); let out = args.get(2).cloned().unwrap_or_else(|| "anybot.png".into());
let px = args.get(3).and_then(|v| v.parse().ok()).unwrap_or(256); let px = args.get(3).and_then(|v| v.parse().ok()).unwrap_or(256);
if let Err(e) = write_icon(&out, px, args.get(4).map(String::as_str)) { if let Err(e) = write_icon(&out, px) {
eprintln!("{e}"); eprintln!("{e}");
std::process::exit(1); std::process::exit(1);
} }
@ -252,18 +235,15 @@ fn main() -> eframe::Result<()> {
app::App::serve(&ctx); app::App::serve(&ctx);
} }
let mut viewport = egui::ViewportBuilder::default() let options = eframe::NativeOptions {
.with_title("AnyBot") viewport: egui::ViewportBuilder::default()
.with_inner_size(shot_size()) .with_title("AnyBot")
.with_min_inner_size([app::SIDEBAR_MIN_WIDTH + app::CHAT_MIN_WIDTH, 480.0]) .with_inner_size(shot_size())
.with_app_id("anybot") .with_min_inner_size([app::SIDEBAR_MIN_WIDTH + app::CHAT_MIN_WIDTH, 480.0])
.with_icon(app_icon()); .with_app_id("anybot")
// On a Mac the window is one surface to the very top (the grey system title bar didn't match .with_icon(app_icon()),
// a dark window); the traffic lights sit over the sidebar's empty corner. ..Default::default()
if cfg!(target_os = "macos") { };
viewport = viewport.with_fullsize_content_view(true).with_titlebar_shown(false).with_title_shown(false);
}
let options = eframe::NativeOptions { viewport, ..Default::default() };
eframe::run_native( eframe::run_native(
"AnyBot", "AnyBot",
options, options,

View File

@ -223,10 +223,6 @@ pub enum ApprovalKind {
EnableTools, EnableTools,
/// 在這台電腦上執行 is off: let it work on this Mac? ("always" turns the setting on.) /// 在這台電腦上執行 is off: let it work on this Mac? ("always" turns the setting on.)
EnableThisComputer, EnableThisComputer,
/// 需要處理: a step only the person can do on a computer (signing in, a captcha…). `reason`
/// is what to do, `grant` the computer's name; Once = 「我完成了」, Reject = 「跳過」 (the
/// original's box hand-off card).
Handoff,
} }
pub struct AppCall { pub struct AppCall {

View File

@ -324,7 +324,6 @@ pub fn handle(req: Req, via_relay: bool) -> Resp {
("GET", []) | ("GET", ["index.html"]) => return page(), ("GET", []) | ("GET", ["index.html"]) => return page(),
("GET", ["manifest.webmanifest"]) => return Resp::bytes("application/manifest+json", MANIFEST.as_bytes().to_vec()), ("GET", ["manifest.webmanifest"]) => return Resp::bytes("application/manifest+json", MANIFEST.as_bytes().to_vec()),
("GET", ["icon.svg"]) => return Resp::bytes("image/svg+xml", ICON.as_bytes().to_vec()), ("GET", ["icon.svg"]) => return Resp::bytes("image/svg+xml", ICON.as_bytes().to_vec()),
("GET", [name]) if ICON_PNGS.iter().any(|(n, _)| n == name) => return Resp::bytes("image/png", ICON_PNGS.iter().find(|(n, _)| n == name).map(|(_, b)| b.to_vec()).unwrap_or_default()),
("GET", ["api", "hello"]) => { ("GET", ["api", "hello"]) => {
let s = hub().settings(); let s = hub().settings();
return Resp::json(&json!({"app": "anybot", "host": s.host_name, "relay": via_relay, "needs_password": !via_relay})); return Resp::json(&json!({"app": "anybot", "host": s.host_name, "relay": via_relay, "needs_password": !via_relay}));
@ -1427,27 +1426,9 @@ fn person_cell() -> &'static Mutex<String> {
P.get_or_init(Mutex::default) P.get_or_init(Mutex::default)
} }
/// The account computer the person last typed on (they are sitting at it). Kept beside the data, /// The account computer the person last typed on (they are sitting at it).
/// so a brain that restarts (an update) still knows it.
pub fn set_person_host(id: &str) { pub fn set_person_host(id: &str) {
let mut cur = person_cell().lock().unwrap(); *person_cell().lock().unwrap() = id.to_string();
if *cur != id {
*cur = id.to_string();
let _ = std::fs::write(person_file(), id);
}
}
fn person_file() -> std::path::PathBuf {
crate::model::State::path().with_file_name("person-computer.txt")
}
/// At start: the computer the person used last time.
pub fn load_person_host() -> Option<String> {
let id = std::fs::read_to_string(person_file()).ok()?.trim().to_string();
(!id.is_empty() && id.len() <= 64 && id.chars().all(|c| c.is_ascii_alphanumeric())).then(|| {
*person_cell().lock().unwrap() = id.clone();
id
})
} }
pub fn person_host() -> String { pub fn person_host() -> String {
@ -1483,11 +1464,8 @@ pub fn devices_online(s: &Settings) -> Vec<(String, String, bool)> {
// ---------- the phone page ---------- // ---------- the phone page ----------
const PAGE: &str = include_str!("../mobile/index.html"); const PAGE: &str = include_str!("../mobile/index.html");
pub const MANIFEST: &str = r##"{"name":"AnyBot","short_name":"AnyBot","start_url":"./","display":"standalone","background_color":"#121212","theme_color":"#121212","icons":[{"src":"icon.svg","sizes":"any","type":"image/svg+xml"},{"src":"icon-192.png","sizes":"192x192","type":"image/png","purpose":"any maskable"},{"src":"icon-512.png","sizes":"512x512","type":"image/png","purpose":"any maskable"}]}"##; pub const MANIFEST: &str = r##"{"name":"AnyBot","short_name":"AnyBot","start_url":"./","display":"standalone","background_color":"#121212","theme_color":"#121212","icons":[{"src":"icon.svg","sizes":"any","type":"image/svg+xml"}]}"##;
/// The app's icon, the same drawing everywhere (icons/anybot.svg is the Mac/Linux one). pub const ICON: &str = r##"<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96 96"><rect width="96" height="96" rx="22" fill="#161616"/><circle cx="48" cy="48" r="24" fill="none" stroke="#f5f5f5" stroke-width="7"/><circle cx="48" cy="48" r="7" fill="#f5f5f5"/></svg>"##;
pub const ICON: &str = include_str!("../mobile/icon.svg");
/// PNG sizes for the iPhone home screen (it ignores SVG) and Android.
pub const ICON_PNGS: [(&str, &[u8]); 3] = [("icon-180.png", include_bytes!("../mobile/icon-180.png")), ("icon-192.png", include_bytes!("../mobile/icon-192.png")), ("icon-512.png", include_bytes!("../mobile/icon-512.png"))];
pub fn page() -> Resp { pub fn page() -> Resp {
Resp::bytes("text/html; charset=utf-8", PAGE.as_bytes().to_vec()).with_header("Content-Security-Policy", "default-src 'self'; img-src 'self' blob: data:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'; connect-src 'self'") Resp::bytes("text/html; charset=utf-8", PAGE.as_bytes().to_vec()).with_header("Content-Security-Policy", "default-src 'self'; img-src 'self' blob: data:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'; connect-src 'self'")

View File

@ -60,12 +60,8 @@ pub fn specs() -> Vec<Value> {
] ]
} }
/// 請你接手: the step that asks the person to do something by hand on a computer.
pub const HANDOFF_TOOL: &str = "hand_over_computer";
pub fn label(name: &str) -> &'static str { pub fn label(name: &str) -> &'static str {
match name { match name {
HANDOFF_TOOL => "請你接手電腦",
"list_dir" => "查看資料夾", "list_dir" => "查看資料夾",
"search" => "搜尋檔案", "search" => "搜尋檔案",
"read_file" => "讀取檔案", "read_file" => "讀取檔案",

View File

@ -168,52 +168,15 @@ pub fn available() -> bool {
} }
/// A file only we can see, gone from the folder already (for shared memory and keymaps). /// A file only we can see, gone from the folder already (for shared memory and keymaps).
/// Its memory is really there before the compositor gets it: the compositor writes screen
/// pixels straight into it, and if the space ran out half-way the compositor would be the one
/// to crash (SIGBUS: a full /run/user once took a whole Hyprland desktop down this way).
/// So it lives in memory of its own (memfd), not in the runtime folder, and with no room the
/// screenshot just fails here.
fn scratch_file(len: u64) -> std::io::Result<std::fs::File> { fn scratch_file(len: u64) -> std::io::Result<std::fs::File> {
use std::os::fd::FromRawFd as _; let dir = std::env::var_os("XDG_RUNTIME_DIR").map(std::path::PathBuf::from).unwrap_or_else(std::env::temp_dir);
let fd = unsafe { libc::memfd_create(c"anybot-wl".as_ptr(), libc::MFD_CLOEXEC) }; let path = dir.join(format!("anybot-wl-{}-{}", std::process::id(), crate::model::now_ms()));
let f = if fd >= 0 { let f = std::fs::OpenOptions::new().read(true).write(true).create_new(true).open(&path)?;
unsafe { std::fs::File::from_raw_fd(fd) } let _ = std::fs::remove_file(&path);
} else { f.set_len(len)?;
let dir = std::env::var_os("XDG_RUNTIME_DIR").map(std::path::PathBuf::from).unwrap_or_else(std::env::temp_dir);
let path = dir.join(format!("anybot-wl-{}-{}", std::process::id(), crate::model::now_ms()));
let f = std::fs::OpenOptions::new().read(true).write(true).create_new(true).open(&path)?;
let _ = std::fs::remove_file(&path);
f
};
if len > 0 {
reserve(&f, len)?;
}
Ok(f) Ok(f)
} }
/// Make every page of the file real now (not a promise the compositor finds broken later).
fn reserve(f: &std::fs::File, len: u64) -> std::io::Result<()> {
use std::os::fd::AsRawFd as _;
let r = unsafe { libc::posix_fallocate(f.as_raw_fd(), 0, len as libc::off_t) };
if r == 0 {
return Ok(());
}
if r != libc::EOPNOTSUPP && r != libc::EINVAL {
return Err(std::io::Error::from_raw_os_error(r));
}
// A file system without fallocate: write the zeros ourselves.
f.set_len(0)?;
let mut w = f;
let zeros = vec![0u8; 1 << 20];
let mut left = len;
while left > 0 {
let n = left.min(zeros.len() as u64) as usize;
w.write_all(&zeros[..n])?;
left -= n as u64;
}
Ok(())
}
/// The keymap text: one key per keysym we use; the first four are the modifiers. /// The keymap text: one key per keysym we use; the first four are the modifiers.
pub fn keymap_text(keys: &[u32]) -> String { pub fn keymap_text(keys: &[u32]) -> String {
let mut s = String::from("xkb_keymap {\nxkb_keycodes \"anybot\" {\n minimum = 8;\n"); let mut s = String::from("xkb_keymap {\nxkb_keycodes \"anybot\" {\n minimum = 8;\n");
@ -651,19 +614,4 @@ mod tests {
let px = to_rgba(&[1, 2, 3, 0], wl_shm::Format::Abgr8888, 1, 1, 4, false).unwrap(); let px = to_rgba(&[1, 2, 3, 0], wl_shm::Format::Abgr8888, 1, 1, 4, false).unwrap();
assert_eq!(px.get_pixel(0, 0).0, [1, 2, 3, 255]); assert_eq!(px.get_pixel(0, 0).0, [1, 2, 3, 255]);
} }
/// The screenshot buffer is real memory before the compositor writes into it, and not a
/// file in the runtime folder (a full /run/user must not crash the desktop).
#[test]
fn screenshot_buffer_is_allocated_up_front() {
use std::os::fd::AsRawFd as _;
let len = 3 * 1024 * 1024 + 17;
let f = scratch_file(len).unwrap();
assert_eq!(f.metadata().unwrap().len(), len);
let mut st: libc::stat = unsafe { std::mem::zeroed() };
assert_eq!(unsafe { libc::fstat(f.as_raw_fd(), &mut st) }, 0);
assert!(st.st_blocks as u64 * 512 >= len, "pages not reserved: {} blocks", st.st_blocks);
let link = std::fs::read_link(format!("/proc/self/fd/{}", f.as_raw_fd())).unwrap();
assert!(link.to_string_lossy().starts_with("/memfd:"), "{link:?}");
}
} }