@ariacompute/engine-rn 1.16.0 → 1.17.0

package/README.md

@@ -20,13 +20,13 @@ ModelScope; `site` defaults to `https://ariacompute.com`) into
 `~/.ariacompute/models/{model}` and then loads it. Dashboard is not used. A
 Dashboard `sk-` / `bfvk-` token is ignored for hub auth. Token is optional for
 public models. Gated files: pass `hfToken` / `modelscopeApiToken` (same as
-`aria-engine auth`); if omitted, reads `~/.ariacompute/config.yml`. Instance
-`auth` is in-memory only (does not write that file). A valid cached bundle is
+`aria-engine setup`); if omitted, reads `~/.ariacompute/engine.yml`. Instance
+`setup` is in-memory only (does not write that file). A valid cached bundle is
 reused without re-downloading.
 
 ```js
 const eng = await AriaEngine.open("gemma-4-e2b-it_q4");
 const gated = new AriaEngine();
-gated.auth({ hf_token: "hf_..." });
+gated.setup({ hf_token: "hf_..." });
 await gated.open("gemma-4-e2b-it_q4");
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ariacompute/engine-rn",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "React Native binding for Aria Engine",
   "main": "src/index.js",
   "license": "MIT",
@@ -8,6 +8,6 @@
     "react-native": ">=0.72.0"
   },
   "scripts": {
-    "test": "node --test test/auth.test.cjs"
+    "test": "node --test test/setup.test.cjs"
   }
 }

package/src/index.js

@@ -9,9 +9,9 @@
  */
 import { NativeModules } from 'react-native';
 import {
-  defaultAuthConfig,
-  applyAuth,
-} from './auth.js';
+  defaultSetupConfig,
+  applySetup,
+} from './setup.js';
 
 const AriaEngineModule = NativeModules.AriaEngine;
 
@@ -91,19 +91,22 @@ function unquoteYaml(v) {
 function configYmlScalar(key) {
   const fs = require('fs');
   const path = require('path');
-  try {
-    const raw = fs.readFileSync(path.join(ariaHome(), 'config.yml'), 'utf8');
-    for (const line of raw.split('\n')) {
-      if (line.startsWith(' ') || line.startsWith('\t')) continue;
-      const s = line.trim();
-      if (!s || s.startsWith('#') || !s.includes(':')) continue;
-      const idx = s.indexOf(':');
-      if (s.slice(0, idx).trim() !== key) continue;
-      const v = unquoteYaml(s.slice(idx + 1));
-      return v || undefined;
+  const home = ariaHome();
+  for (const name of ['engine.yml', 'config.yml']) {
+    try {
+      const raw = fs.readFileSync(path.join(home, name), 'utf8');
+      for (const line of raw.split('\n')) {
+        if (line.startsWith(' ') || line.startsWith('\t')) continue;
+        const s = line.trim();
+        if (!s || s.startsWith('#') || !s.includes(':')) continue;
+        const idx = s.indexOf(':');
+        if (s.slice(0, idx).trim() !== key) continue;
+        const v = unquoteYaml(s.slice(idx + 1));
+        if (v) return v;
+      }
+    } catch {
+      continue;
     }
-  } catch {
-    return undefined;
   }
   return undefined;
 }
@@ -213,7 +216,7 @@ async function fetchHubFile(source, model, file, dest, token, required) {
       if (e && (e.status === 401 || e.status === 403)) {
         const field = source === 'modelscope' ? 'modelscope_api_token' : 'hf_token';
         throw new Error(
-          `auth failed HTTP ${e.status}; set ${field} via aria-engine auth (do not pass a Dashboard sk-/bfvk- key as the hub token)`,
+          `auth failed HTTP ${e.status}; set ${field} via aria-engine setup (do not pass a Dashboard sk-/bfvk- key as the hub token)`,
         );
       }
     }
@@ -425,22 +428,22 @@ async function ensureFfiLib(site) {
 export class AriaEngine {
   constructor(bundlePath) {
     this.bundlePath = bundlePath;
-    this.cfg = defaultAuthConfig();
+    this.cfg = defaultSetupConfig();
     this.opts = {};
     // NativeModules.AriaEngine.init(bundlePath) when linked.
   }
 
-  auth(updates) {
-    this.cfg = applyAuth(this.cfg, updates);
+  setup(updates) {
+    this.cfg = applySetup(this.cfg, updates);
     return this;
   }
 
-  authStatus() {
+  setupStatus() {
     return { ...this.cfg };
   }
 
-  authClear() {
-    this.cfg = defaultAuthConfig();
+  setupClear() {
+    this.cfg = defaultSetupConfig();
     return this;
   }
 
@@ -460,7 +463,7 @@ export class AriaEngine {
     const eng = new AriaEngine();
     eng.opts = opts;
     if (opts.site || opts.hfToken || opts.modelscopeApiToken) {
-      eng.auth({
+      eng.setup({
         site_url: opts.site,
         hf_token: opts.hfToken,
         modelscope_api_token: opts.modelscopeApiToken,

package/src/setup.js

@@ -0,0 +1,60 @@
+/** Instance-level Engine setup (in-memory; does not write engine.yml). */
+
+const INTL_SITE = 'https://ariacompute.com';
+const INTL_UPGRADE = 'https://github.com/ariacompute';
+const CN_SITE = 'https://ariacompute.cn';
+const CN_UPGRADE = 'https://gitee.com/ariacompute';
+
+function defaultSetupConfig() {
+  return {
+    router: '',
+    site_url: '',
+    upgrade_url: '',
+    compute: 'auto',
+    hf_token: '',
+    modelscope_api_token: '',
+  };
+}
+
+function gatewayRegion(url) {
+  const lower = (url || '').toLowerCase();
+  if (lower.includes('ariacompute.cn') || lower.includes('gitee.com/ariacompute')) return 'cn';
+  if (lower.includes('ariacompute.com') || lower.includes('github.com/ariacompute')) return 'intl';
+  return undefined;
+}
+
+function pairUrls(region) {
+  return region === 'cn' ? [CN_SITE, CN_UPGRADE] : [INTL_SITE, INTL_UPGRADE];
+}
+
+function fillSetupUrls(cfg) {
+  const out = { ...cfg };
+  const region = gatewayRegion(out.site_url) || gatewayRegion(out.upgrade_url);
+  if (!region) return out;
+  const [site, upgrade] = pairUrls(region);
+  if (!out.site_url) out.site_url = site;
+  if (!out.upgrade_url) out.upgrade_url = upgrade;
+  return out;
+}
+
+function applySetup(existing, updates) {
+  const out = { ...existing };
+  for (const [k, v] of Object.entries(updates || {})) {
+    if (v === undefined) continue;
+    out[k] = v;
+  }
+  if (!['auto', 'cpu', 'cuda'].includes(out.compute)) {
+    throw new Error(`invalid compute: ${out.compute}`);
+  }
+  return fillSetupUrls(out);
+}
+
+module.exports = {
+  INTL_SITE,
+  INTL_UPGRADE,
+  CN_SITE,
+  CN_UPGRADE,
+  defaultSetupConfig,
+  fillSetupUrls,
+  applySetup,
+};

package/test/setup.test.cjs

@@ -0,0 +1,77 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const os = require('node:os');
+const path = require('node:path');
+const {
+  applySetup,
+  defaultSetupConfig,
+  fillSetupUrls,
+  CN_SITE,
+  CN_UPGRADE,
+} = require('../src/setup.js');
+
+test('setup defaults', () => {
+  const cfg = defaultSetupConfig();
+  assert.equal(cfg.compute, 'auto');
+  assert.equal(cfg.router, '');
+});
+
+test('setup invalid enum', () => {
+  assert.throws(() => applySetup(defaultSetupConfig(), { compute: 'gpu' }));
+});
+
+test('setup fills urls from cn site', () => {
+  const got = fillSetupUrls({ site_url: CN_SITE, upgrade_url: '' });
+  assert.equal(got.upgrade_url, CN_UPGRADE);
+});
+
+test('setup instance all fields via applySetup', () => {
+  const st = applySetup(defaultSetupConfig(), {
+    router: 'http://127.0.0.1:8080',
+    site_url: CN_SITE,
+    upgrade_url: CN_UPGRADE,
+    compute: 'cpu',
+    hf_token: 'hf_abc',
+    modelscope_api_token: 'ms_xyz',
+  });
+  assert.equal(st.router, 'http://127.0.0.1:8080');
+  assert.equal(st.hf_token, 'hf_abc');
+});
+
+test('setup partial merge', () => {
+  const once = applySetup(defaultSetupConfig(), { hf_token: 'hf_one', router: 'http://127.0.0.1:1' });
+  const st = applySetup(once, { compute: 'cuda' });
+  assert.equal(st.hf_token, 'hf_one');
+  assert.equal(st.router, 'http://127.0.0.1:1');
+  assert.equal(st.compute, 'cuda');
+});
+
+test('setup invalid enum leaves state', () => {
+  const once = applySetup(defaultSetupConfig(), { compute: 'cpu' });
+  assert.throws(() => applySetup(once, { compute: 'gpu' }));
+  assert.equal(once.compute, 'cpu');
+});
+
+test('setup fills urls from site tld', () => {
+  const st = applySetup(defaultSetupConfig(), { site_url: 'https://ariacompute.cn' });
+  assert.equal(st.upgrade_url, CN_UPGRADE);
+});
+
+test('setup does not write engine.yml', () => {
+  const prev = process.env.ARIA_COMPUTE_HOME;
+  const home = fs.mkdtempSync(path.join(os.tmpdir(), 'aria-rn-setup-'));
+  process.env.ARIA_COMPUTE_HOME = home;
+  try {
+    applySetup(defaultSetupConfig(), {
+      router: 'http://127.0.0.1:8080',
+      site_url: 'https://ariacompute.com',
+      hf_token: 'hf_x',
+    });
+    assert.equal(fs.existsSync(path.join(home, 'engine.yml')), false);
+    assert.equal(fs.existsSync(path.join(home, 'config.yml')), false);
+  } finally {
+    if (prev === undefined) delete process.env.ARIA_COMPUTE_HOME;
+    else process.env.ARIA_COMPUTE_HOME = prev;
+  }
+});

package/src/auth.js

@@ -1,115 +0,0 @@
-/** Instance-level Engine auth (in-memory; does not write config.yml). */
-
-const INTL_CLOUD = 'https://gateway.ariacompute.com';
-const INTL_SITE = 'https://ariacompute.com';
-const INTL_UPGRADE = 'https://github.com/ariacompute';
-const CN_CLOUD = 'https://gateway.ariacompute.cn';
-const CN_SITE = 'https://ariacompute.cn';
-const CN_UPGRADE = 'https://gitee.com/ariacompute';
-
-function defaultAuthConfig() {
-  return {
-    cloud_api_key: '',
-    cloud_url: '',
-    site_url: '',
-    upgrade_url: '',
-    hybrid_mode: 'balance',
-    hybrid_execution: 'hybrid',
-    hybrid_semantic: true,
-    hybrid_semantic_timeout_ms: 800,
-    hybrid_semantic_cache_size: 512,
-    compute: 'auto',
-    hf_token: '',
-    modelscope_api_token: '',
-  };
-}
-
-function gatewayRegion(url) {
-  const lower = (url || '').toLowerCase();
-  if (lower.includes('ariacompute.cn') || lower.includes('gitee.com/ariacompute')) return 'cn';
-  if (lower.includes('ariacompute.com') || lower.includes('github.com/ariacompute')) return 'intl';
-  return undefined;
-}
-
-function pairUrls(region) {
-  return region === 'cn' ? [CN_CLOUD, CN_SITE, CN_UPGRADE] : [INTL_CLOUD, INTL_SITE, INTL_UPGRADE];
-}
-
-function fillAuthUrls(cfg) {
-  const out = { ...cfg };
-  const region =
-    gatewayRegion(out.site_url) || gatewayRegion(out.cloud_url) || gatewayRegion(out.upgrade_url);
-  if (!region) return out;
-  const [cloud, site, upgrade] = pairUrls(region);
-  if (!out.cloud_url) out.cloud_url = cloud;
-  if (!out.site_url) out.site_url = site;
-  if (!out.upgrade_url) out.upgrade_url = upgrade;
-  return out;
-}
-
-function localePrefersCn() {
-  const lang = `${process.env.LANG || ''}${process.env.LC_ALL || ''}`.toLowerCase();
-  return lang.includes('zh') || lang.includes('.cn') || lang.startsWith('cn');
-}
-
-const authHooks = {
-  probeDashboard: () => false,
-};
-
-function detectGatewayPair(apiKey) {
-  const key = (apiKey || '').trim();
-  const first = localePrefersCn() ? 'cn' : 'intl';
-  const second = first === 'cn' ? 'intl' : 'cn';
-  for (const region of [first, second]) {
-    const [cloud, site, upgrade] = pairUrls(region);
-    if (key && authHooks.probeDashboard(site, key)) return [cloud, site, upgrade];
-  }
-  return pairUrls(first);
-}
-
-function applyAuth(existing, updates) {
-  const out = { ...existing };
-  for (const [k, v] of Object.entries(updates || {})) {
-    if (v === undefined) continue;
-    out[k] = v;
-  }
-  if (!['cost', 'balance', 'intelligence'].includes(out.hybrid_mode)) {
-    throw new Error(`invalid hybrid_mode: ${out.hybrid_mode}`);
-  }
-  if (!['hybrid', 'device', 'cloud'].includes(out.hybrid_execution)) {
-    throw new Error(`invalid hybrid_execution: ${out.hybrid_execution}`);
-  }
-  if (!['auto', 'cpu', 'cuda'].includes(out.compute)) {
-    throw new Error(`invalid compute: ${out.compute}`);
-  }
-  const timeout = Number(out.hybrid_semantic_timeout_ms);
-  const cache = Number(out.hybrid_semantic_cache_size);
-  if (!Number.isInteger(timeout) || !Number.isInteger(cache) || timeout <= 0 || cache <= 0) {
-    throw new Error('hybrid_semantic_timeout_ms / cache_size must be positive integers');
-  }
-  out.hybrid_semantic = Boolean(out.hybrid_semantic);
-  out.hybrid_semantic_timeout_ms = timeout;
-  out.hybrid_semantic_cache_size = cache;
-  const filled = fillAuthUrls(out);
-  if (filled.cloud_api_key && !(filled.cloud_url && filled.site_url && filled.upgrade_url)) {
-    const [cloud, site, upgrade] = detectGatewayPair(filled.cloud_api_key);
-    if (!filled.cloud_url) filled.cloud_url = cloud;
-    if (!filled.site_url) filled.site_url = site;
-    if (!filled.upgrade_url) filled.upgrade_url = upgrade;
-  }
-  return filled;
-}
-
-module.exports = {
-  INTL_CLOUD,
-  INTL_SITE,
-  INTL_UPGRADE,
-  CN_CLOUD,
-  CN_SITE,
-  CN_UPGRADE,
-  defaultAuthConfig,
-  fillAuthUrls,
-  applyAuth,
-  authHooks,
-  detectGatewayPair,
-};

package/test/auth.test.cjs

@@ -1,106 +0,0 @@
-const test = require('node:test');
-const assert = require('node:assert/strict');
-const fs = require('node:fs');
-const os = require('node:os');
-const path = require('node:path');
-const {
-  applyAuth,
-  defaultAuthConfig,
-  fillAuthUrls,
-  authHooks,
-  CN_CLOUD,
-  CN_SITE,
-  CN_UPGRADE,
-} = require('../src/auth.js');
-
-test('auth defaults', () => {
-  const cfg = defaultAuthConfig();
-  assert.equal(cfg.hybrid_mode, 'balance');
-  assert.equal(cfg.hybrid_execution, 'hybrid');
-  assert.equal(cfg.hybrid_semantic, true);
-  assert.equal(cfg.hybrid_semantic_timeout_ms, 800);
-  assert.equal(cfg.hybrid_semantic_cache_size, 512);
-  assert.equal(cfg.compute, 'auto');
-});
-
-test('auth invalid enum', () => {
-  assert.throws(() => applyAuth(defaultAuthConfig(), { hybrid_mode: 'fast' }));
-  assert.throws(() => applyAuth(defaultAuthConfig(), { hybrid_execution: 'local' }));
-  assert.throws(() => applyAuth(defaultAuthConfig(), { compute: 'gpu' }));
-});
-
-test('auth fills urls from cn site', () => {
-  const got = fillAuthUrls({ site_url: CN_SITE, cloud_url: '', upgrade_url: '' });
-  assert.equal(got.cloud_url, CN_CLOUD);
-  assert.equal(got.upgrade_url, CN_UPGRADE);
-});
-
-test('auth instance all fields via applyAuth', () => {
-  const st = applyAuth(defaultAuthConfig(), {
-    cloud_api_key: 'sk-test',
-    cloud_url: CN_CLOUD,
-    site_url: CN_SITE,
-    upgrade_url: CN_UPGRADE,
-    hybrid_mode: 'cost',
-    hybrid_execution: 'device',
-    hybrid_semantic: false,
-    hybrid_semantic_timeout_ms: 250,
-    hybrid_semantic_cache_size: 16,
-    compute: 'cpu',
-    hf_token: 'hf_abc',
-    modelscope_api_token: 'ms_xyz',
-  });
-  assert.equal(st.cloud_api_key, 'sk-test');
-  assert.equal(st.hybrid_mode, 'cost');
-  assert.equal(st.hf_token, 'hf_abc');
-});
-
-test('auth partial merge', () => {
-  const once = applyAuth(defaultAuthConfig(), { hf_token: 'hf_one', hybrid_mode: 'intelligence' });
-  const st = applyAuth(once, { compute: 'cuda' });
-  assert.equal(st.hf_token, 'hf_one');
-  assert.equal(st.hybrid_mode, 'intelligence');
-  assert.equal(st.compute, 'cuda');
-});
-
-test('auth invalid enum leaves state', () => {
-  const once = applyAuth(defaultAuthConfig(), { hybrid_mode: 'cost' });
-  assert.throws(() => applyAuth(once, { hybrid_mode: 'nope' }));
-  assert.equal(once.hybrid_mode, 'cost');
-});
-
-test('auth fills urls from site tld', () => {
-  const st = applyAuth(defaultAuthConfig(), { site_url: 'https://ariacompute.cn' });
-  assert.equal(st.cloud_url, CN_CLOUD);
-  assert.equal(st.upgrade_url, CN_UPGRADE);
-});
-
-test('auth does not write config.yml', () => {
-  const prev = process.env.ARIA_COMPUTE_HOME;
-  const home = fs.mkdtempSync(path.join(os.tmpdir(), 'aria-rn-auth-'));
-  process.env.ARIA_COMPUTE_HOME = home;
-  try {
-    applyAuth(defaultAuthConfig(), {
-      cloud_api_key: 'sk-test',
-      site_url: 'https://ariacompute.com',
-      hf_token: 'hf_x',
-    });
-    assert.equal(fs.existsSync(path.join(home, 'config.yml')), false);
-  } finally {
-    if (prev === undefined) delete process.env.ARIA_COMPUTE_HOME;
-    else process.env.ARIA_COMPUTE_HOME = prev;
-  }
-});
-
-test('auth detect urls from key mocked', () => {
-  const prev = authHooks.probeDashboard;
-  authHooks.probeDashboard = (site) => String(site).includes('ariacompute.cn');
-  try {
-    const st = applyAuth(defaultAuthConfig(), { cloud_api_key: 'sk-region' });
-    assert.equal(st.site_url, CN_SITE);
-    assert.equal(st.cloud_url, CN_CLOUD);
-    assert.equal(st.upgrade_url, CN_UPGRADE);
-  } finally {
-    authHooks.probeDashboard = prev;
-  }
-});