@ariacompute/engine-ts 1.19.1 → 1.20.0

package/dist/index.d.ts

@@ -43,8 +43,13 @@ export declare const INTL_UPGRADE = "https://github.com/ariacompute";
 export declare const CN_SITE = "https://ariacompute.cn";
 export declare const CN_UPGRADE = "https://gitee.com/ariacompute";
 export interface SetupConfig {
+    /** Local (router registration) */
     router: string;
     router_api_key: string;
+    /** OAuth (Aria Compute) */
+    serve_site: string;
+    serve_api_key: string;
+    /** Hub / compute */
     site_url: string;
     upgrade_url: string;
     compute: string;
@@ -74,7 +79,7 @@ export declare function cachedFfiPath(platform?: string): string | undefined;
 export declare function ffiAssetOs(platform?: string, arch?: string): string;
 export declare function selectLatestStable(releases: Array<Record<string, unknown>>): string;
 export declare function extractFfiArchive(archive: string, destDir: string, want?: string): string;
-/** Return a path to libaria_ffi, downloading the latest stable Release if needed. */
+/** Return a path to libaria-engine_ffi, downloading the latest stable Release if needed. */
 export declare function ensureFfiLib(site?: string): Promise<string>;
 export declare function isLocalRef(modelRef: string): boolean;
 export declare class Engine {

package/dist/index.js

@@ -67,6 +67,8 @@ function defaultSetupConfig() {
     return {
         router: "",
         router_api_key: "",
+        serve_site: "",
+        serve_api_key: "",
         site_url: "",
         upgrade_url: "",
         compute: "auto",
@@ -97,6 +99,25 @@ function fillSetupUrls(cfg) {
         out.upgrade_url = upgrade;
     return out;
 }
+function validateRouterApiKey(key) {
+    const t = (key || "").trim();
+    if (!t)
+        return;
+    if (t.startsWith("bfvk-")) {
+        throw new Error("OAuth key detected (bfvk-); use serve_api_key / [2/2] OAuth (Aria Compute)");
+    }
+}
+function validateServeApiKey(key) {
+    const t = (key || "").trim();
+    if (!t)
+        return;
+    if (t.startsWith("sk-aria_")) {
+        throw new Error("Local router key detected (sk-aria_); use router_api_key / [1/2] Local");
+    }
+    if (!t.startsWith("bfvk-")) {
+        throw new Error("serve_api_key must start with bfvk-");
+    }
+}
 function applySetup(existing, updates) {
     const out = { ...existing };
     for (const [k, v] of Object.entries(updates)) {
@@ -107,6 +128,8 @@ function applySetup(existing, updates) {
     if (!["auto", "cpu", "cuda"].includes(out.compute)) {
         throw new Error(`invalid compute: ${out.compute}`);
     }
+    validateRouterApiKey(out.router_api_key);
+    validateServeApiKey(out.serve_api_key);
     return fillSetupUrls(out);
 }
 const DEFAULT_SDK = "v1.0";
@@ -350,10 +373,10 @@ async function downloadModel(model, tokenOrOpts, site = DEFAULT_SITE) {
 const SDK_UA = "aria-engine-sdk/0.1.0";
 function ffiLibName(platform = process.platform) {
     if (platform === "win32" || platform.toLowerCase().startsWith("win"))
-        return "aria_ffi.dll";
+        return "aria-engine_ffi.dll";
     if (platform === "darwin")
-        return "libaria_ffi.dylib";
-    return "libaria_ffi.so";
+        return "libaria-engine_ffi.dylib";
+    return "libaria-engine_ffi.so";
 }
 function libDir() {
     return path.join(ariaHome(), "lib");
@@ -378,7 +401,7 @@ function ffiAssetOs(platform = process.platform, arch = process.arch) {
     if ((p === "win32" || p.startsWith("win")) && (a === "x64" || a === "x86_64" || a === "amd64")) {
         return "windows_x86_64";
     }
-    throw new Error(`unsupported platform ${platform}/${arch} for libaria_ffi`);
+    throw new Error(`unsupported platform ${platform}/${arch} for libaria-engine_ffi`);
 }
 function stripV(tag) {
     const t = tag.trim();
@@ -413,7 +436,7 @@ function selectLatestStable(releases) {
         }
     }
     if (!bestTag)
-        throw new Error("no stable release found for libaria_ffi");
+        throw new Error("no stable release found for libaria-engine_ffi");
     return stripV(bestTag);
 }
 function upgradeOrg(site) {
@@ -491,7 +514,7 @@ function installFfiFromReleases(raw, archiveBytes) {
     if (!Array.isArray(releases))
         throw new Error("unexpected releases payload");
     const ver = selectLatestStable(releases);
-    const assetName = `libaria_ffi_${ver}_${ffiAssetOs()}.tar.gz`;
+    const assetName = `libaria-engine_ffi_${ver}_${ffiAssetOs()}.tar.gz`;
     let url;
     for (const rel of releases) {
         const tag = String(rel.tag_name || rel.tag || "");
@@ -521,7 +544,7 @@ function installFfiFromReleases(raw, archiveBytes) {
         fs.rmSync(staging, { recursive: true, force: true });
     }
 }
-/** Return a path to libaria_ffi, downloading the latest stable Release if needed. */
+/** Return a path to libaria-engine_ffi, downloading the latest stable Release if needed. */
 async function ensureFfiLib(site) {
     const env = process.env.ARIA_FFI_LIB;
     if (env && fs.existsSync(env))
@@ -557,7 +580,7 @@ function loadLib(ffiLib, site) {
         cachedFfiPath() ||
         ensureFfiLibSync(site);
     if (!libPath)
-        throw new Error("Cannot locate libaria_ffi");
+        throw new Error("Cannot locate libaria-engine_ffi");
     const koffiNS = require("koffi");
     return koffiNS.load(libPath);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ariacompute/engine-ts",
-  "version": "1.19.1",
+  "version": "1.20.0",
   "description": "TypeScript/Node SDK for Aria Engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",