device-center 0.2.0-beta.7 → 0.2.0-beta.8

package/src/agent-setup.js

@@ -1,5 +1,6 @@
 import { agentInstallPlan, terminalInstallScript, OFFICIAL_CONTROL_ORIGIN } from './onboarding.js';
 import { translate, getLocale, h } from './i18n.js';
+import { installedCliCommand } from './installed-cli.js';
 
 // Public instructions only. No installation, authentication or credential generation here.
 export function agentSetupPrompt({ role = 'manager', locale = 'zh-CN', ...options } = {}) {
@@ -19,9 +20,8 @@ export function agentSetupPrompt({ role = 'manager', locale = 'zh-CN', ...option
 export function managerSetupPlan({ origin, os = 'posix', locale = 'zh-CN' } = {}) {
   const options = { mode: origin === OFFICIAL_CONTROL_ORIGIN ? 'official' : 'self-hosted', ...(origin === OFFICIAL_CONTROL_ORIGIN ? {} : { origin }), os, background: true };
   const plan = agentInstallPlan(options);
-  const cli = plan.commands.version.slice(0, -' --version'.length);
-  const authorization = `${cli} auth login --minutes 60 --confirm`;
-  const verify = `${cli} devices list --cloud --json`;
+  const authorization = installedCliCommand('auth login --minutes 60 --confirm', os);
+  const verify = installedCliCommand('devices list --cloud --json', os);
   const install = terminalInstallScript(options);
   // Keep the original installer's stop-on-existing-install and error semantics.
   const script = os === 'windows'

package/src/api.js

@@ -4,11 +4,12 @@ async function request(path, { timeoutMs = 12000, ...options } = {}) {
   const response = await fetch(path, { ...options, cache: 'no-store', signal: AbortSignal.timeout(timeoutMs) });
   const payload = await response.json().catch(() => ({}));
   if (response.status === 401) { location.replace('/login?lang=' + getLocale()); throw new Error('authentication_required'); }
-  if (!response.ok) throw new Error(payload.error ?? `http_${response.status}`);
+  if (!response.ok) throw Object.assign(new Error(payload.error ?? `http_${response.status}`), { statusCode: response.status });
   clearLoginNavigation();
   return payload;
 }
 export const api = {
+  browserPairingResult: browserTicket => request('/api/drivers/pairing/result', { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ browserTicket }) }),
   lookupBrowserPairing: browserTicket => request('/api/drivers/pairing/lookup', { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ browserTicket }) }),
   approveBrowserPairing: input => request('/api/drivers/pairing/approve', { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(input) }),
   saveDeviceProfile: (profile) => request('/api/devices/profile', { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(profile) }),

package/src/install-packages.js

@@ -1,6 +1,11 @@
 import { t } from './i18n.js';
 
 const platforms = { windows: 'win32', macos: 'darwin', linux: 'linux' };
+export function architectureChoices(os) {
+  const choices = { windows: [['x64', 'x64 (Intel / AMD)'], ['arm64', 'ARM64 (Windows on ARM)']], macos: [['arm64', 'Apple Silicon (ARM64)'], ['x64', 'Intel (x64)']], linux: [['x64', 'x86_64 (Intel / AMD)'], ['arm64', 'ARM64 (aarch64)']] };
+  if (!choices[os]) throw new Error('invalid_install_os');
+  return choices[os];
+}
 export function matchingPackages(packages, os, arch) {
   return packages.filter(p => p.platform === platforms[os] && p.arch === arch &&
     /^device-center-[\w.-]+$/.test(p.id ?? '') && p.url === `/install/packages/${p.id}` &&
@@ -20,7 +25,10 @@ export function renderPackageChoices(container, { packages, os, arch, loading =
     const name = document.createElement('p'); name.className = 'hint'; name.textContent = `${item.filename} · ${(item.bytes / 1048576).toFixed(1)} MiB`;
     const digest = document.createElement('code'); digest.className = 'package-digest'; digest.textContent = `SHA-256: ${item.sha256}`;
     card.append(link, name, digest);
-    if (item.candidate) { const notice = document.createElement('p'); notice.className = 'hint'; notice.textContent = t('guide.package.candidate'); card.append(notice); }
+    const launch = document.createElement('p'); launch.className = 'hint';
+    launch.textContent = t(item.platform === 'darwin' && item.signed && item.notarized ? 'guide.package.macosApp' : item.platform === 'darwin' ? 'guide.package.macos' : item.platform === 'win32' ? 'guide.package.windows' : 'guide.package.linux');
+    card.append(launch);
+    if (item.candidate) { const notice = document.createElement('p'); notice.className = 'hint'; notice.textContent = t(item.platform === 'darwin' ? 'guide.package.candidate' : 'guide.package.unsigned'); card.append(notice); }
     container.append(card);
   }
 }

package/src/installed-cli.js

@@ -0,0 +1,6 @@
+// Resolve an existing installation on the target machine. Never installs or changes PATH.
+export function installedCliCommand(args, os = 'posix') {
+  if (!['posix', 'windows'].includes(os) || typeof args !== 'string' || /[\r\n]/.test(args)) throw new Error('invalid_cli_command');
+  if (os === 'windows') return `& { $dcRoot = "$HOME\\AppData\\Local\\Programs\\Device Center\\offline"; $dcNpm = "$HOME\\AppData\\Local\\Programs\\Device Center\\cli\\device-center.cmd"; if ((Test-Path -LiteralPath "$dcRoot\\runtime\\node.exe") -and (Test-Path -LiteralPath "$dcRoot\\app\\bin\\device-center.mjs")) { & "$dcRoot\\runtime\\node.exe" "$dcRoot\\app\\bin\\device-center.mjs" ${args} } elseif (Test-Path -LiteralPath $dcNpm) { & $dcNpm ${args} } elseif (Get-Command device-center.cmd -ErrorAction SilentlyContinue) { & device-center.cmd ${args} } else { throw 'Device Center not found. Open the installer to continue.' }; if ($LASTEXITCODE -ne 0) { throw 'Device Center command failed. Keep the existing installation and inspect the error.' } }`;
+  return `( dc_root="$HOME/.local/share/device-center/offline"; if [ -x "$dc_root/runtime/bin/node" ] && [ -f "$dc_root/app/bin/device-center.mjs" ]; then "$dc_root/runtime/bin/node" "$dc_root/app/bin/device-center.mjs" ${args}; elif [ -x "$HOME/.local/bin/device-center" ]; then "$HOME/.local/bin/device-center" ${args}; elif command -v device-center >/dev/null 2>&1; then device-center ${args}; else printf '%s\\n' 'Device Center not found. Open the installer to continue.' >&2; exit 1; fi )`;
+}

package/src/login-flow.js

@@ -35,3 +35,38 @@ export async function continueSession({ fetchImpl = fetch, signal = AbortSignal.
     throw new Error(cause.name === 'TimeoutError' ? 'login.timeout' : 'login.unavailable');
   }
 }
+
+
+const ACCOUNT_NAVIGATION_KEY = 'device-center-account-navigation';
+const accountNavigationAge = 10 * 60_000;
+const validAccountNavigation = (value, now) => value && /^[a-f0-9-]{36}$/.test(value.id ?? '') && Number.isSafeInteger(value.at) && value.at <= now && now - value.at < accountNavigationAge;
+export function clearAccountNavigation({ store = storage() } = {}) { try { store.removeItem(ACCOUNT_NAVIGATION_KEY); } catch { /* No credentials stored. */ } }
+export function pendingAccountNavigation({ store = storage(), now = Date.now() } = {}) {
+  try { if (validAccountNavigation(JSON.parse(store.getItem(ACCOUNT_NAVIGATION_KEY)), now)) return true; } catch { /* Optional storage. */ }
+  clearAccountNavigation({ store }); return false;
+}
+export function accountLoginDestination(accountUrl, locale, { origin = window.location.origin, search = globalThis.window?.location?.search ?? '', store = storage(), now = Date.now(), requestId = crypto.randomUUID() } = {}) {
+  const target = new URL(accountUrl);
+  if (target.protocol !== 'https:' || target.username || target.password || target.hash || target.pathname !== '/auth/connect' || target.searchParams.get('product') !== 'device-center' || target.searchParams.get('parentOrigin') !== origin || !validAccountNavigation({ id: requestId, at: now }, now)) throw new Error('login.unavailable');
+  const value = JSON.stringify({ id: requestId, at: now });
+  try { store.setItem(ACCOUNT_NAVIGATION_KEY, value); if (store.getItem(ACCOUNT_NAVIGATION_KEY) !== value) throw new Error(); }
+  catch { throw new Error('login.storage'); }
+  // Pairing and CLI proofs stay in this tab's product storage, never in the account URL.
+  target.searchParams.set('requestId', requestId);
+  const continuation = new URLSearchParams({ lang: locale });
+  if (new URLSearchParams(search).get('continue') === 'cli') continuation.set('continue', 'cli');
+  target.searchParams.set('path', '/login?' + continuation);
+  return target.href;
+}
+export function consumeAccountReturn({ location = window.location, history = window.history, store = storage(), now = Date.now() } = {}) {
+  const url = new URL(location.href);
+  if (!url.searchParams.has('authReturn')) return null;
+  const ids = url.searchParams.getAll('authReturn');
+  url.searchParams.delete('authReturn');
+  history.replaceState(null, '', url.pathname + url.search);
+  let pending;
+  try { pending = JSON.parse(store.getItem(ACCOUNT_NAVIGATION_KEY)); } catch { /* Never treat missing storage as verified return. */ }
+  const valid = ids.length === 1 && validAccountNavigation(pending, now) && ids[0] === pending.id;
+  clearAccountNavigation({ store });
+  return Boolean(valid);
+}

package/src/login.js

@@ -1,6 +1,6 @@
 import { initLanguage, getLocale, t } from './i18n.js';
 import { loginDestination } from './pairing-handoff.js';
-import { continueSession, rememberLoginNavigation, pendingLoginNavigation } from './login-flow.js';
+import { continueSession, rememberLoginNavigation, pendingLoginNavigation, accountLoginDestination, consumeAccountReturn, pendingAccountNavigation, clearAccountNavigation } from './login-flow.js';
 if (location.pathname === '/pair') {
   await import('./pair.js');
 } else if (location.pathname === '/cli') {
@@ -10,8 +10,13 @@ initLanguage();
 function setMessage(element, key) { if (key) element.dataset.i18n = key; else delete element.dataset.i18n; element.textContent = key ? t(key) : ''; }
 const form = document.querySelector('#login');
 const loading = document.querySelector('#loading');
-let checking = false, watchingUntil = 0, timer, options;
-async function continueUnified(manual = false) {
+let checking = false, options;
+const accountReturn = consumeAccountReturn();
+function enterAccount() { location.replace(accountLoginDestination(options.accountLoginUrl, getLocale())); }
+function openAccount() {
+  try { enterAccount(); } catch (error) { setMessage(document.querySelector('#unified-message'), error.message); }
+}
+async function continueUnified() {
   if (checking || options?.provider !== 'app-services') return;
   checking = true;
   const message = document.querySelector('#unified-message'), button = document.querySelector('#continue-login');
@@ -20,22 +25,14 @@ async function continueUnified(manual = false) {
   setMessage(message, 'login.checking');
   try {
     await continueSession();
-    clearInterval(timer); rememberLoginNavigation(); location.replace(loginDestination(getLocale()));
+    clearAccountNavigation(); rememberLoginNavigation(); location.replace(loginDestination(getLocale()));
   } catch (cause) {
-    setMessage(message, cause.message === 'login.first' && !manual ? null : cause.message);
-    if (cause.message !== 'login.first') { clearInterval(timer); watchingUntil = 0; }
+    if (cause.message === 'login.first' && accountReturn === null && !pendingAccountNavigation()) openAccount();
+    else setMessage(message, cause.message);
   }
   finally { checking = false; button.disabled = false; document.querySelector('#unified').setAttribute('aria-busy', 'false'); }
 }
-document.querySelector('#continue-login').addEventListener('click', () => continueUnified(true));
-document.querySelector('#unified-login').addEventListener('click', () => {
-  watchingUntil = Date.now() + 5 * 60_000;
-  setMessage(document.querySelector('#unified-message'), 'login.return');
-  clearInterval(timer);
-  timer = setInterval(() => { if (Date.now() > watchingUntil) clearInterval(timer); else void continueUnified(); }, 4000);
-});
-window.addEventListener('focus', () => { if (watchingUntil > Date.now()) void continueUnified(); });
-document.addEventListener('visibilitychange', () => { if (!document.hidden && watchingUntil > Date.now()) void continueUnified(); });
+document.querySelector('#continue-login').addEventListener('click', openAccount);
 try {
   const response = await fetch('/api/auth/options', { signal: AbortSignal.timeout(5000) });
   if (!response.ok) throw new Error();
@@ -43,13 +40,11 @@ try {
   setMessage(document.querySelector('#access-notes'), options.accountMode === 'multi-user' ? 'login.multi' : 'login.personal');
   loading.hidden = true;
   if (options.provider === 'app-services') {
-    const target = new URL(options.accountLoginUrl);
-    if (target.protocol !== 'https:' || target.username || target.password) throw new Error();
-    document.querySelector('#unified-login').href = target.href;
     document.querySelector('#unified').hidden = false;
     if (new URLSearchParams(location.search).get('reason') === 'unavailable') setMessage(document.querySelector('#unified-message'), 'login.unavailable');
-    else if (pendingLoginNavigation()) setMessage(document.querySelector('#unified-message'), 'login.returned');
-    else if (options.automaticContinue) void continueUnified();
+    else if (accountReturn === false || (accountReturn !== true && pendingLoginNavigation())) setMessage(document.querySelector('#unified-message'), 'login.returned');
+    else if (accountReturn === true || options.automaticContinue) void continueUnified();
+    else openAccount();
   } else if (options.provider === 'password') { form.hidden = false; form.elements.username.focus(); }
   else throw new Error();
 } catch { loading.hidden = false; setMessage(loading, 'login.optionsError'); }