feat: add /register endpoint + fix acr run Mode 1 (inline YAML execution)
- POST /register on cypher.arcrun.dev: HMAC-SHA256(email, ENCRYPTION_KEY) → ak_{32hex}, no DB needed
- acr run: Mode 1 (standard/local) now finds local YAML and POSTs to /cypher/execute inline
- acr init: fix register URL → cypher.arcrun.dev/register; fix local mode description
- acr init --local: creates hello.yaml example workflow
- cli v1.0.3 published
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "arcrun",
|
||||
"version": "1.0.2",
|
||||
"version": "1.0.3",
|
||||
"description": "AI Workflow CLI for arcrun — deploy and run WASM-based AI workflows on Cloudflare",
|
||||
"bin": {
|
||||
"acr": "dist/index.js"
|
||||
|
||||
@@ -9,7 +9,7 @@ import { join } from 'node:path';
|
||||
import chalk from 'chalk';
|
||||
import { saveConfig, type ArcrunConfig } from '../lib/config.js';
|
||||
|
||||
const ARCRUN_REGISTER_URL = 'https://api.arcrun.dev/register';
|
||||
const ARCRUN_REGISTER_URL = 'https://cypher.arcrun.dev/register';
|
||||
|
||||
async function prompt(rl: ReturnType<typeof createInterface>, question: string): Promise<string> {
|
||||
const answer = await rl.question(chalk.cyan(`? ${question}: `));
|
||||
@@ -35,21 +35,22 @@ export async function cmdInit(options: { local?: boolean; selfHosted?: boolean }
|
||||
}
|
||||
|
||||
async function initLocal(): Promise<void> {
|
||||
console.log(chalk.gray(' Local 模式:不需要 Cloudflare 帳號,直接在本機跑 workflow\n'));
|
||||
console.log(chalk.gray(' Local 模式:不需要 Cloudflare 帳號,workflow 由 arcrun.dev 雲端引擎執行\n'));
|
||||
|
||||
const config: ArcrunConfig = {
|
||||
mode: 'local',
|
||||
};
|
||||
|
||||
saveConfig(config);
|
||||
createCredentialsYamlIfMissing();
|
||||
createHelloYamlIfMissing();
|
||||
|
||||
console.log(chalk.green('\n ✓ 設定完成 → ~/.arcrun/config.yaml(local 模式)\n'));
|
||||
console.log(chalk.green('\n ✓ 設定完成 → ~/.arcrun/config.yaml(local 模式)'));
|
||||
console.log(chalk.green(' ✓ 建立 hello.yaml 範例 workflow\n'));
|
||||
console.log(' 你可以立刻開始:');
|
||||
console.log(chalk.cyan(' acr validate workflow.yaml --offline') + ' # 驗證 workflow 格式');
|
||||
console.log(chalk.cyan(' acr run <workflow_name>') + ' # 本機執行\n');
|
||||
console.log(chalk.gray(' Local 模式不連線 arcrun.dev,所有 workflow 在本機執行。'));
|
||||
console.log(chalk.gray(' 需要 Cloudflare 部署?執行 acr init(Standard 模式)。\n'));
|
||||
console.log(chalk.cyan(' acr validate hello.yaml --offline') + ' # 驗證 workflow 格式');
|
||||
console.log(chalk.cyan(' acr run hello') + ' # 執行 hello workflow\n');
|
||||
console.log(chalk.gray(' Local 模式:YAML 留在本機,workflow 由 arcrun.dev 引擎執行。'));
|
||||
console.log(chalk.gray(' 需要用自己的 CF 帳號存放 credentials?執行 acr init(Standard 模式)。\n'));
|
||||
}
|
||||
|
||||
async function initStandard(rl: ReturnType<typeof createInterface>): Promise<void> {
|
||||
@@ -79,7 +80,7 @@ async function initStandard(rl: ReturnType<typeof createInterface>): Promise<voi
|
||||
throw new Error(`API Key 取得失敗(${res.status}):${err}`);
|
||||
}
|
||||
|
||||
const data = await res.json() as { api_key: string; tenant_id: string };
|
||||
const data = await res.json() as { api_key: string };
|
||||
apiKey = data.api_key;
|
||||
console.log(chalk.green(' ✓'));
|
||||
} catch (e) {
|
||||
@@ -140,6 +141,29 @@ async function initSelfHosted(rl: ReturnType<typeof createInterface>): Promise<v
|
||||
console.log(chalk.green(' ✓ 建立 credentials.yaml\n'));
|
||||
}
|
||||
|
||||
function createHelloYamlIfMissing(): void {
|
||||
const helloPath = join(process.cwd(), 'hello.yaml');
|
||||
if (!existsSync(helloPath)) {
|
||||
writeFileSync(helloPath,
|
||||
'# arcrun hello world workflow\n' +
|
||||
'# 執行:acr run hello\n\n' +
|
||||
'name: hello\n' +
|
||||
'description: "Hello world — 示範如何讓 AI 處理訊息後傳送通知"\n\n' +
|
||||
'flow:\n' +
|
||||
' - "input >> ON_SUCCESS >> ai_reply"\n' +
|
||||
' - "ai_reply >> ON_SUCCESS >> log_output"\n\n' +
|
||||
'config:\n' +
|
||||
' ai_reply:\n' +
|
||||
' component: "component://cmp_openai_chat"\n' +
|
||||
' model: "gpt-4o-mini"\n' +
|
||||
' prompt: "請用繁體中文說 Hello World,並解釋 arcrun 是什麼"\n' +
|
||||
' log_output:\n' +
|
||||
' component: "component://cmp_log_stdout"\n',
|
||||
'utf8'
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
function createCredentialsYamlIfMissing(): void {
|
||||
const credPath = join(process.cwd(), 'credentials.yaml');
|
||||
if (!existsSync(credPath)) {
|
||||
|
||||
+93
-15
@@ -1,10 +1,19 @@
|
||||
/**
|
||||
* acr run <workflow_name> [--input key=value...]
|
||||
* 觸發 cypher-executor 執行指定 workflow
|
||||
*
|
||||
* 玩法一(Standard / Local):
|
||||
* 在本機找 <workflow_name>.yaml,解析 triplets + config,
|
||||
* 直接 POST /cypher/execute 給 cypher.arcrun.dev 執行。
|
||||
* YAML 不存在 KV,每次執行都帶著走。
|
||||
*
|
||||
* 玩法二(Self-hosted,workflow 已 push 到 KV):
|
||||
* POST /webhooks/<workflow_name>,executor 從 WEBHOOKS KV 讀取定義執行。
|
||||
*/
|
||||
import chalk from 'chalk';
|
||||
import ora from 'ora';
|
||||
import { existsSync, readFileSync } from 'node:fs';
|
||||
import { loadConfig, getCypherExecutorUrl } from '../lib/config.js';
|
||||
import { loadWorkflowYaml, parseTriplets } from '../lib/yaml-parser.js';
|
||||
|
||||
interface RunOptions {
|
||||
input?: string[];
|
||||
@@ -25,15 +34,63 @@ export async function cmdRun(workflowName: string, options: RunOptions): Promise
|
||||
inputContext[pair.slice(0, idx)] = pair.slice(idx + 1);
|
||||
}
|
||||
|
||||
const spinner = ora(`執行 workflow "${workflowName}"`).start();
|
||||
|
||||
const headers: Record<string, string> = { 'Content-Type': 'application/json' };
|
||||
if (config.api_key) headers['X-Arcrun-API-Key'] = config.api_key;
|
||||
|
||||
const webhookUrl = `${executorUrl}/webhooks/${workflowName}`;
|
||||
// ── 玩法一:Standard 模式,YAML 在本機,帶著打 /cypher/execute ──────────────
|
||||
if (config.mode === 'standard' || config.mode === 'local') {
|
||||
const yamlPath = findWorkflowYaml(workflowName);
|
||||
if (!yamlPath) {
|
||||
console.error(chalk.red(`找不到 ${workflowName}.yaml(在目前目錄或子目錄尋找)`));
|
||||
console.error(chalk.gray('玩法二(已 push 到 KV)請改用 Self-hosted 模式'));
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
let workflow;
|
||||
try {
|
||||
workflow = loadWorkflowYaml(yamlPath);
|
||||
} catch (e) {
|
||||
console.error(chalk.red(`YAML 解析失敗:${e instanceof Error ? e.message : e}`));
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const triplets = parseTriplets(workflow.flow);
|
||||
|
||||
const spinner = ora(`執行 workflow "${workflow.name}"`).start();
|
||||
|
||||
try {
|
||||
const res = await fetch(webhookUrl, {
|
||||
const res = await fetch(`${executorUrl}/cypher/execute`, {
|
||||
method: 'POST',
|
||||
headers,
|
||||
body: JSON.stringify({
|
||||
triplets: workflow.flow,
|
||||
context: { ...inputContext, ...(workflow.config ?? {}) },
|
||||
graph_id: workflow.name,
|
||||
graph_name: workflow.name,
|
||||
}),
|
||||
});
|
||||
|
||||
const data = await res.json() as {
|
||||
success: boolean;
|
||||
data?: unknown;
|
||||
error?: string;
|
||||
trace?: Array<{ node: string; status: string; error?: string }>;
|
||||
duration_ms: number;
|
||||
failed_node?: string;
|
||||
};
|
||||
|
||||
printResult(spinner, data, triplets.length);
|
||||
} catch (e) {
|
||||
spinner.fail(chalk.red(`網路錯誤:${e instanceof Error ? e.message : e}`));
|
||||
process.exit(1);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// ── 玩法二:Self-hosted,workflow 已存在 KV,打 /webhooks/{name} ─────────────
|
||||
const spinner = ora(`執行 workflow "${workflowName}"`).start();
|
||||
try {
|
||||
const res = await fetch(`${executorUrl}/webhooks/${workflowName}`, {
|
||||
method: 'POST',
|
||||
headers,
|
||||
body: JSON.stringify(inputContext),
|
||||
@@ -48,18 +105,43 @@ export async function cmdRun(workflowName: string, options: RunOptions): Promise
|
||||
failed_node?: string;
|
||||
};
|
||||
|
||||
printResult(spinner, data, 0);
|
||||
} catch (e) {
|
||||
spinner.fail(chalk.red(`網路錯誤:${e instanceof Error ? e.message : e}`));
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
// ── helpers ──────────────────────────────────────────────────────────────────
|
||||
|
||||
function findWorkflowYaml(name: string): string | null {
|
||||
const candidates = [
|
||||
`${name}.yaml`,
|
||||
`${name}.yml`,
|
||||
`workflows/${name}.yaml`,
|
||||
`workflows/${name}.yml`,
|
||||
];
|
||||
for (const p of candidates) {
|
||||
if (existsSync(p)) return p;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
function printResult(
|
||||
spinner: ReturnType<typeof ora>,
|
||||
data: { success: boolean; data?: unknown; error?: string; trace?: Array<{ node: string; status: string; error?: string }>; duration_ms: number; failed_node?: string },
|
||||
_nodeCount: number,
|
||||
): void {
|
||||
if (data.success) {
|
||||
spinner.succeed(chalk.green(`✓ 執行成功(${data.duration_ms}ms)`));
|
||||
if (data.data !== undefined && data.data !== null) {
|
||||
console.log('\n 結果:');
|
||||
console.log(JSON.stringify(data.data, null, 2).split('\n').map(l => ` ${l}`).join('\n'));
|
||||
}
|
||||
} else {
|
||||
spinner.fail(chalk.red(`✗ 執行失敗(${data.duration_ms}ms)`));
|
||||
if (data.failed_node) {
|
||||
console.log(chalk.red(`\n 失敗節點:${data.failed_node}`));
|
||||
}
|
||||
if (data.error) {
|
||||
console.log(chalk.red(` 錯誤:${data.error}`));
|
||||
}
|
||||
if (data.failed_node) console.log(chalk.red(`\n 失敗節點:${data.failed_node}`));
|
||||
if (data.error) console.log(chalk.red(` 錯誤:${data.error}`));
|
||||
if (data.trace) {
|
||||
console.log('\n 執行追蹤:');
|
||||
for (const step of data.trace) {
|
||||
@@ -68,8 +150,4 @@ export async function cmdRun(workflowName: string, options: RunOptions): Promise
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
spinner.fail(chalk.red(`網路錯誤:${e instanceof Error ? e.message : e}`));
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ import { docsRouter } from './routes/docs';
|
||||
import { webhooksRouter } from './routes/webhooks';
|
||||
import { webhooksCrudRouter } from './routes/webhooks-crud';
|
||||
import { webhooksListRouter } from './routes/webhooks-list';
|
||||
import { registerRouter } from './routes/register';
|
||||
|
||||
const app = new Hono<{ Bindings: Bindings }>();
|
||||
|
||||
@@ -25,6 +26,7 @@ app.route('/', validateRouter);
|
||||
app.route('/', webhooksRouter);
|
||||
app.route('/', webhooksCrudRouter);
|
||||
app.route('/', webhooksListRouter);
|
||||
app.route('/', registerRouter);
|
||||
|
||||
// Worker 導出
|
||||
export default app;
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
// POST /register — API Key 發放
|
||||
// email → HMAC-SHA256(email, ENCRYPTION_KEY) → api_key (ak_ 前綴)
|
||||
// 同一個 email 永遠得到相同的 Key,無需資料庫
|
||||
|
||||
import { Hono } from 'hono';
|
||||
import type { Bindings } from '../types';
|
||||
|
||||
export const registerRouter = new Hono<{ Bindings: Bindings }>();
|
||||
|
||||
registerRouter.post('/register', async (c) => {
|
||||
let email: string;
|
||||
try {
|
||||
const body = await c.req.json() as { email?: string };
|
||||
email = (body.email ?? '').trim().toLowerCase();
|
||||
} catch {
|
||||
return c.json({ success: false, error: 'request body 必須為 JSON' }, 400);
|
||||
}
|
||||
|
||||
if (!email || !email.includes('@')) {
|
||||
return c.json({ success: false, error: 'email 格式不正確' }, 400);
|
||||
}
|
||||
|
||||
const encryptionKey = c.env.ENCRYPTION_KEY;
|
||||
if (!encryptionKey || encryptionKey.length < 32) {
|
||||
return c.json({ success: false, error: 'server configuration error' }, 500);
|
||||
}
|
||||
|
||||
// HMAC-SHA256(email, ENCRYPTION_KEY) → hex → 取前 32 字元 → ak_ 前綴
|
||||
const keyData = new TextEncoder().encode(encryptionKey.slice(0, 32));
|
||||
const msgData = new TextEncoder().encode(email);
|
||||
|
||||
const cryptoKey = await crypto.subtle.importKey(
|
||||
'raw', keyData, { name: 'HMAC', hash: 'SHA-256' }, false, ['sign']
|
||||
);
|
||||
const sig = await crypto.subtle.sign('HMAC', cryptoKey, msgData);
|
||||
const hex = Array.from(new Uint8Array(sig)).map(b => b.toString(16).padStart(2, '0')).join('');
|
||||
const apiKey = 'ak_' + hex.slice(0, 32);
|
||||
|
||||
return c.json({
|
||||
success: true,
|
||||
api_key: apiKey,
|
||||
email,
|
||||
message: 'API Key 已發放,請妥善保存。相同 email 永遠得到相同的 Key。',
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user