@stage-labs/metro 0.1.0-beta.2 → 0.1.0-beta.200

package/runtime/node_modules/@metro-labs/daemon/src/files/upload-store.ts

@@ -0,0 +1,181 @@
+import { randomBytes } from 'node:crypto';
+import { readdirSync, rmSync, statSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { ensureSecureDir, readJson, writeSecure } from '@metro-labs/core/secure-fs';
+import { grantAllowsPath, issueGrant } from './attach-grant.js';
+import { ownerOf, recordOwner } from './attach-owner.js';
+import { errMsg, log } from '@metro-labs/core/log';
+
+export const UPLOAD_TTL_MS = 30 * 60 * 1000;
+export const MAX_UPLOAD_BYTES = 64 * 1024 * 1024;
+export const MAX_LIVE_UPLOAD_BYTES = 512 * 1024 * 1024;
+export const UPLOAD_ID_RE = /^up_[A-Za-z0-9_-]{22}$/;
+
+const SUFFIXES = ['', '.part', '.meta', '.owner', '.grant'] as const;
+const SWEEP_MS = 60_000;
+
+export const uploadDir = (): string =>
+  process.env.METRO_UPLOAD_DIR ?? join(tmpdir(), 'metro-uploads');
+
+export const newUploadId = (): string =>
+  `up_${randomBytes(16).toString('base64url')}`;
+
+export function uploadPath(id: string, suffix = ''): string | null {
+  return UPLOAD_ID_RE.test(id) ? `${uploadDir()}/${id}${suffix}` : null;
+}
+
+interface UploadMeta {
+  name: string;
+  mime: string;
+  createdAt: number;
+}
+
+export interface UploadRecord extends UploadMeta {
+  id: string;
+  agentId: string;
+  bytes: number;
+  path: string;
+  expiresAt: number;
+}
+
+const sizeOf = (path: string): number | undefined => {
+  try {
+    return statSync(path).size;
+  } catch {
+    return undefined;
+  }
+};
+
+function readMeta(id: string): UploadMeta | undefined {
+  const path = uploadPath(id, '.meta');
+  if (path === null) return undefined;
+  const meta = readJson<UploadMeta | null>(path, null);
+  if (meta === null || typeof meta.createdAt !== 'number') return undefined;
+  return meta;
+}
+
+export interface UploadSlot extends UploadMeta {
+  id: string;
+  agentId: string;
+  expiresAt: number;
+}
+
+export function uploadSlot(id: string): UploadSlot | undefined {
+  const base = uploadPath(id);
+  if (base === null) return undefined;
+  const meta = readMeta(id);
+  const agentId = ownerOf(base);
+  if (meta === undefined || agentId === undefined) return undefined;
+  const expiresAt = meta.createdAt + UPLOAD_TTL_MS;
+  return expiresAt <= Date.now() ? undefined : { ...meta, id, agentId, expiresAt };
+}
+
+export function readUpload(id: string): UploadRecord | undefined {
+  const slot = uploadSlot(id);
+  const path = uploadPath(id);
+  if (slot === undefined || path === null) return undefined;
+  const bytes = sizeOf(path);
+  return bytes === undefined ? undefined : { ...slot, bytes, path };
+}
+
+export function createUploadSlot(
+  agentId: string,
+  meta: { name: string; mime: string },
+): string {
+  ensureSecureDir(uploadDir());
+  const id = newUploadId();
+  const base = `${uploadDir()}/${id}`;
+  writeSecure(
+    `${base}.meta`,
+    JSON.stringify({ ...meta, createdAt: Date.now() }),
+  );
+  recordOwner(base, agentId);
+  return id;
+}
+
+export const issueUploadTicket = (
+  id: string,
+  agentId: string,
+): string | undefined => {
+  const base = uploadPath(id);
+  return base === null ? undefined : issueGrant(base, agentId, 'ut');
+};
+
+export const uploadTicketAllows = (
+  id: string,
+  owner: string,
+  presented: string,
+): boolean => {
+  const base = uploadPath(id);
+  return base === null ? false : grantAllowsPath(base, owner, presented);
+};
+
+export function removeUpload(id: string): void {
+  const base = uploadPath(id);
+  if (base === null) return;
+  for (const suffix of SUFFIXES)
+    rmSync(`${base}${suffix}`, { force: true, recursive: false });
+}
+
+const idsInDir = (): string[] => {
+  let entries: string[];
+  try {
+    entries = readdirSync(uploadDir());
+  } catch {
+    return [];
+  }
+  const ids = new Set<string>();
+  for (const entry of entries) {
+    const id = entry.split('.')[0] ?? '';
+    if (UPLOAD_ID_RE.test(id)) ids.add(id);
+  }
+  return [...ids];
+};
+
+export function liveUploadBytes(): number {
+  let total = 0;
+  for (const id of idsInDir())
+    for (const suffix of ['', '.part'])
+      total += sizeOf(`${uploadDir()}/${id}${suffix}`) ?? 0;
+  return total;
+}
+
+function ageOf(id: string, now: number): number {
+  const created = readMeta(id)?.createdAt;
+  if (created !== undefined) return now - created;
+  let newest = 0;
+  for (const suffix of SUFFIXES) {
+    let mtime: number;
+    try {
+      mtime = statSync(`${uploadDir()}/${id}${suffix}`).mtimeMs;
+    } catch {
+      continue;
+    }
+    newest = Math.max(newest, mtime);
+  }
+  return newest === 0 ? 0 : now - newest;
+}
+
+export function sweepUploads(now = Date.now()): number {
+  let removed = 0;
+  for (const id of idsInDir()) {
+    if (ageOf(id, now) <= UPLOAD_TTL_MS) continue;
+    removeUpload(id);
+    removed += 1;
+  }
+  return removed;
+}
+
+export function startUploadReaper(): void {
+  const run = (): void => {
+    try {
+      const removed = sweepUploads();
+      if (removed > 0) log.info({ removed }, 'uploads: reaped expired uploads');
+    } catch (err) {
+      log.warn({ err: errMsg(err) }, 'uploads: sweep failed');
+    }
+  };
+  run();
+  setInterval(run, SWEEP_MS).unref?.();
+}

package/runtime/node_modules/@metro-labs/daemon/src/gateway/bedrock.ts

@@ -0,0 +1,233 @@
+import type { IncomingMessage, ServerResponse } from 'node:http';
+import { log } from '@metro-labs/core/log';
+import { EventStreamDecoder, type EventStreamMessage } from './eventstream.js';
+import { errorFrame, GatewayError, providerStatus, relayFrames, sendError, upstreamMessage, type Watch } from './forward.js';
+import type { Connection } from './model-config.js';
+import { estimateTokens } from './subscription.js';
+import { UsageScanner } from './usage.js';
+
+const ANTHROPIC_VERSION = 'bedrock-2023-05-31';
+const EXTRA_INPUT_RE = /^([A-Za-z0-9_]+)(?:\.[^:]*)?: Extra inputs are not permitted/;
+const MAX_REPAIRS = 4;
+
+export interface Adaptations {
+  fields: Set<string>;
+  dropBetas: boolean;
+}
+
+export const freshAdaptations = (): Adaptations => ({ fields: new Set(), dropBetas: false });
+
+export interface BedrockUpstream {
+  settings: Connection;
+  base: string;
+  learned: Adaptations;
+  watch: Watch;
+}
+
+interface Rewritten {
+  modelId: string;
+  stream: boolean;
+  body: Record<string, unknown>;
+  betas: string[];
+}
+
+interface Attempt {
+  body: Record<string, unknown>;
+  betas: string[];
+}
+
+const PREFIXES: [RegExp, string][] = [
+  [/^us-gov-/, 'us-gov'],
+  [/^us-/, 'us'],
+  [/^eu-/, 'eu'],
+  [/^ap-/, 'apac'],
+];
+
+export function regionPrefix(region: string): string {
+  for (const [pattern, prefix] of PREFIXES) if (pattern.test(region)) return prefix;
+  return 'global';
+}
+
+export function bedrockModelId(requested: string, region: string): string {
+  if (requested.includes('anthropic.')) return requested;
+  return `${regionPrefix(region)}.anthropic.${requested}`;
+}
+
+export const bedrockBase = (region: string): string => `https://bedrock-runtime.${region}.amazonaws.com`;
+
+function splitBetas(header: string | string[] | undefined): string[] {
+  const raw = Array.isArray(header) ? header.join(',') : (header ?? '');
+  return raw
+    .split(',')
+    .map((b) => b.trim())
+    .filter((b) => b !== '');
+}
+
+export function rewriteForBedrock(
+  body: Record<string, unknown>,
+  model: string,
+  betaHeader: string | string[] | undefined,
+  region: string,
+): Rewritten {
+  const betas = splitBetas(betaHeader);
+  const out: Record<string, unknown> = {
+    ...Object.fromEntries(Object.entries(body).filter(([key]) => key !== 'model' && key !== 'stream')),
+    anthropic_version: ANTHROPIC_VERSION,
+  };
+  if (betas.length > 0) out.anthropic_beta = betas;
+  return { modelId: bedrockModelId(model, region), stream: body.stream === true, body: out, betas };
+}
+
+export function errorKind(status: number, errorType: string | null): string {
+  if (status === 429 || errorType === 'ThrottlingException') return 'rate_limit_error';
+  if (status === 400) return 'invalid_request_error';
+  if (status === 401 || status === 403) return 'permission_error';
+  if (status === 404) return 'not_found_error';
+  if (status === 503) return 'overloaded_error';
+  return 'api_error';
+}
+
+const invokeUrl = (up: BedrockUpstream, modelId: string, action: string): string =>
+  `${up.base}/model/${encodeURIComponent(modelId)}/${action}`;
+
+function callBedrock(up: BedrockUpstream, url: string, body: unknown, accept: string): Promise<Response> {
+  return fetch(url, {
+    method: 'POST',
+    headers: {
+      authorization: `Bearer ${up.settings.apiKey}`,
+      'content-type': 'application/json',
+      accept,
+    },
+    body: JSON.stringify(body),
+    signal: up.watch.signal,
+  });
+}
+
+const without = (body: Record<string, unknown>, keys: Set<string>): Record<string, unknown> =>
+  Object.fromEntries(Object.entries(body).filter(([key]) => !keys.has(key)));
+
+function applyLearned(req: Rewritten, learned: Adaptations): Attempt {
+  const dropped = new Set(learned.fields);
+  if (learned.dropBetas) dropped.add('anthropic_beta');
+  return { body: without(req.body, dropped), betas: learned.dropBetas ? [] : req.betas };
+}
+
+function repair(attempt: Attempt, learned: Adaptations, message: string): Attempt | null {
+  const named = EXTRA_INPUT_RE.exec(message)?.[1];
+  if (named !== undefined && named in attempt.body) {
+    learned.fields.add(named);
+    log.warn({ field: named }, 'gateway: Bedrock refused an extra input; dropping it from every request');
+    return { body: without(attempt.body, new Set([named])), betas: attempt.betas };
+  }
+  if (attempt.betas.length > 0) {
+    learned.dropBetas = true;
+    log.warn({ betas: attempt.betas }, 'gateway: retrying without anthropic_beta');
+    return { body: without(attempt.body, new Set(['anthropic_beta'])), betas: [] };
+  }
+  return null;
+}
+
+async function withRepairs(up: BedrockUpstream, req: Rewritten, send: (attempt: Attempt) => Promise<Response>): Promise<Response> {
+  let attempt = applyLearned(req, up.learned);
+  for (let repairs = 0; ; repairs += 1) {
+    const res = await send(attempt);
+    if (res.status !== 400 || repairs >= MAX_REPAIRS) return res;
+    const text = await res.text();
+    const next = repair(attempt, up.learned, upstreamMessage(text, 'Bedrock returned no body'));
+    if (next === null) return new Response(text, { status: 400, headers: res.headers });
+    attempt = next;
+  }
+}
+
+function invoke(up: BedrockUpstream, req: Rewritten): Promise<Response> {
+  const action = req.stream ? 'invoke-with-response-stream' : 'invoke';
+  const accept = req.stream ? 'application/vnd.amazon.eventstream' : 'application/json';
+  const url = invokeUrl(up, req.modelId, action);
+  return withRepairs(up, req, (attempt) => callBedrock(up, url, attempt.body, accept));
+}
+
+function eventTypeOf(event: string): string {
+  try {
+    const parsed = JSON.parse(event) as { type?: unknown };
+    return typeof parsed.type === 'string' ? parsed.type : 'message';
+  } catch {
+    return 'message';
+  }
+}
+
+function eventFrame(message: EventStreamMessage): string {
+  if (message.headers[':message-type'] === 'event') {
+    const parsed = JSON.parse(message.payload.toString('utf8')) as { bytes?: unknown };
+    if (typeof parsed.bytes !== 'string') return '';
+    const event = Buffer.from(parsed.bytes, 'base64').toString('utf8');
+    return `event: ${eventTypeOf(event)}\ndata: ${event}\n\n`;
+  }
+  const errorType = message.headers[':exception-type'] ?? message.headers[':error-code'] ?? null;
+  return errorFrame(errorKind(500, errorType), upstreamMessage(message.payload.toString('utf8'), 'Bedrock stream error'));
+}
+
+function relayStream(upstream: Response, res: ServerResponse, watch: Watch, key: string): Promise<void> {
+  const decoder = new EventStreamDecoder();
+  return relayFrames(upstream, res, watch, key, {
+    push: (chunk, emit) => {
+      for (const message of decoder.push(Buffer.from(chunk))) emit(eventFrame(message));
+    },
+    close: () => '',
+    idle: (message) => errorFrame('api_error', message),
+  });
+}
+
+async function relayFailure(upstream: Response, res: ServerResponse): Promise<void> {
+  const text = await upstream.text();
+  sendError(res, providerStatus(upstream.status), errorKind(upstream.status, upstream.headers.get('x-amzn-errortype')), upstreamMessage(text, 'Bedrock returned no body'));
+}
+
+export async function bedrockMessages(
+  req: IncomingMessage,
+  res: ServerResponse,
+  body: Record<string, unknown>,
+  model: string,
+  up: BedrockUpstream,
+): Promise<void> {
+  const rewritten = rewriteForBedrock(body, model, req.headers['anthropic-beta'], up.settings.region);
+  const upstream = await invoke(up, rewritten);
+  if (!upstream.ok) {
+    await relayFailure(upstream, res);
+    return;
+  }
+  if (rewritten.stream) {
+    await relayStream(upstream, res, up.watch, up.settings.id);
+    return;
+  }
+  const text = await upstream.text();
+  const scanner = new UsageScanner(up.settings.id);
+  scanner.feed(text);
+  scanner.done();
+  res.writeHead(200, { 'content-type': 'application/json' });
+  res.end(text);
+}
+
+export async function bedrockCount(
+  req: IncomingMessage,
+  res: ServerResponse,
+  body: Record<string, unknown>,
+  model: string,
+  up: BedrockUpstream,
+): Promise<void> {
+  const rewritten = rewriteForBedrock(body, model, req.headers['anthropic-beta'], up.settings.region);
+  const url = invokeUrl(up, rewritten.modelId, 'count-tokens');
+  const upstream = await withRepairs(up, rewritten, (attempt) => callBedrock(up, url, { input: { invokeModel: { body: JSON.stringify(attempt.body) } } }, 'application/json'));
+  const text = await upstream.text();
+  let counted: number | null = null;
+  if (upstream.ok) {
+    const parsed = JSON.parse(text) as { inputTokens?: unknown };
+    if (typeof parsed.inputTokens === 'number') counted = parsed.inputTokens;
+  }
+  res.writeHead(200, { 'content-type': 'application/json' });
+  res.end(JSON.stringify({ input_tokens: counted ?? estimateTokens(rewritten.body) }));
+}
+
+export function assertBedrockReady(settings: Connection): void {
+  if (settings.apiKey === '' || settings.region === '')
+    throw new GatewayError(400, 'invalid_request_error', 'Bedrock needs an API key and a region: add them on the Model page.');
+}

package/runtime/node_modules/@metro-labs/daemon/src/gateway/codex-auth.ts

@@ -0,0 +1,208 @@
+import { readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import { isRecord } from '@metro-labs/core/is-record';
+import { PendingLogins } from './pkce.js';
+import { nonEmpty } from './text.js';
+
+export const CODEX_CLIENT_ID = 'app_EMoamEEZ73f0CkXaXp7hrann';
+export const CODEX_ISSUER = 'https://auth.openai.com';
+export const CODEX_REDIRECT = 'http://localhost:1455/auth/callback';
+const SCOPE = 'openid profile email offline_access api.connectors.read api.connectors.invoke';
+const AUTH_CLAIM = 'https://api.openai.com/auth';
+export const ACCESS_TOKEN_TTL_MS = 55 * 60_000;
+
+export interface CodexTokens {
+  accessToken: string;
+  refreshToken: string;
+  idToken: string;
+  accountId: string;
+  email: string | null;
+  plan: string | null;
+  savedAt: string;
+}
+
+export class CodexAuthError extends Error {}
+
+const pending = new PendingLogins(24);
+
+export function authorizeUrl(state: string, challenge: string, issuer = CODEX_ISSUER): string {
+  const query = new URLSearchParams({
+    response_type: 'code',
+    client_id: CODEX_CLIENT_ID,
+    redirect_uri: CODEX_REDIRECT,
+    scope: SCOPE,
+    code_challenge: challenge,
+    code_challenge_method: 'S256',
+    id_token_add_organizations: 'true',
+    codex_cli_simplified_flow: 'true',
+    state,
+    originator: 'codex_cli_rs',
+  });
+  return `${issuer}/oauth/authorize?${query.toString()}`;
+}
+
+export function beginLogin(issuer = CODEX_ISSUER, now = Date.now()): { url: string; state: string } {
+  const { state, challenge } = pending.begin(now);
+  return { url: authorizeUrl(state, challenge, issuer), state };
+}
+
+export function parseCallback(raw: string): { code: string; state: string } {
+  const text = raw.trim();
+  let query: URLSearchParams;
+  try {
+    query = new URL(text).searchParams;
+  } catch {
+    query = new URLSearchParams(text.replace(/^\?/, ''));
+  }
+  const code = query.get('code')?.trim() ?? '';
+  const state = query.get('state')?.trim() ?? '';
+  if (code === '' || state === '')
+    throw new CodexAuthError('paste the whole address the browser landed on; it carries code= and state=');
+  return { code, state };
+}
+
+function decodeJwtPayload(jwt: string): Record<string, unknown> {
+  const part = jwt.split('.')[1] ?? '';
+  try {
+    const parsed: unknown = JSON.parse(Buffer.from(part, 'base64url').toString('utf8'));
+    return isRecord(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+
+
+export function claimsOf(idToken: string): { accountId: string | null; email: string | null; plan: string | null } {
+  const payload = decodeJwtPayload(idToken);
+  const auth = isRecord(payload[AUTH_CLAIM]) ? payload[AUTH_CLAIM] : {};
+  return { accountId: nonEmpty(auth.chatgpt_account_id), email: nonEmpty(payload.email), plan: nonEmpty(auth.chatgpt_plan_type) };
+}
+
+interface TokenResponse {
+  id_token?: unknown;
+  access_token?: unknown;
+  refresh_token?: unknown;
+}
+
+const EMPTY_TOKENS: CodexTokens = { accessToken: '', refreshToken: '', idToken: '', accountId: '', email: null, plan: null, savedAt: '' };
+
+function assertUsable(next: CodexTokens): CodexTokens {
+  if (next.accessToken === '' || next.refreshToken === '') throw new CodexAuthError('the token endpoint returned no usable tokens');
+  if (next.accountId === '') throw new CodexAuthError('the id token carries no ChatGPT account id; sign in with a ChatGPT account that has Codex');
+  return next;
+}
+
+const pick = (fresh: string | null, kept: string | null): string | null => fresh ?? kept;
+
+export function tokensFrom(body: unknown, previous: CodexTokens | null, now = new Date()): CodexTokens {
+  const res = (isRecord(body) ? body : {}) as TokenResponse;
+  const kept = previous ?? EMPTY_TOKENS;
+  const idToken = pick(nonEmpty(res.id_token), kept.idToken) ?? '';
+  const claims = claimsOf(idToken);
+  return assertUsable({
+    accessToken: nonEmpty(res.access_token) ?? '',
+    refreshToken: pick(nonEmpty(res.refresh_token), kept.refreshToken) ?? '',
+    idToken,
+    accountId: pick(claims.accountId, kept.accountId) ?? '',
+    email: pick(claims.email, kept.email),
+    plan: pick(claims.plan, kept.plan),
+    savedAt: now.toISOString(),
+  });
+}
+
+async function tokenCall(issuer: string, init: RequestInit, fetchImpl: typeof fetch): Promise<unknown> {
+  const res = await fetchImpl(`${issuer}/oauth/token`, init);
+  const raw = await res.text();
+  if (!res.ok) {
+    let detail = raw.slice(0, 300);
+    try {
+      const parsed: unknown = JSON.parse(raw);
+      if (isRecord(parsed)) detail = nonEmpty(parsed.error_description) ?? nonEmpty(parsed.error) ?? detail;
+    } catch {
+      detail = raw.slice(0, 300);
+    }
+    throw new CodexAuthError(`OpenAI refused the token request (${String(res.status)}): ${detail}`);
+  }
+  return JSON.parse(raw) as unknown;
+}
+
+export async function finishLogin(
+  callback: string,
+  issuer = CODEX_ISSUER,
+  fetchImpl: typeof fetch = fetch,
+  now = Date.now(),
+): Promise<CodexTokens> {
+  const { code, state } = parseCallback(callback);
+  const verifier = pending.take(state, now);
+  if (verifier === null) throw new CodexAuthError('this sign-in link has expired or was started elsewhere; press Connect again');
+  return exchangeCode(issuer, code, verifier, CODEX_REDIRECT, fetchImpl, now);
+}
+
+export async function exchangeCode(
+  issuer: string,
+  code: string,
+  verifier: string,
+  redirectUri: string,
+  fetchImpl: typeof fetch,
+  now = Date.now(),
+): Promise<CodexTokens> {
+  const body = new URLSearchParams({
+    grant_type: 'authorization_code',
+    code,
+    redirect_uri: redirectUri,
+    client_id: CODEX_CLIENT_ID,
+    code_verifier: verifier,
+  });
+  const res = await tokenCall(
+    issuer,
+    { method: 'POST', headers: { 'content-type': 'application/x-www-form-urlencoded' }, body: body.toString() },
+    fetchImpl,
+  );
+  return tokensFrom(res, null, new Date(now));
+}
+
+export async function refreshTokens(previous: CodexTokens, issuer = CODEX_ISSUER, fetchImpl: typeof fetch = fetch): Promise<CodexTokens> {
+  const res = await tokenCall(
+    issuer,
+    {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ client_id: CODEX_CLIENT_ID, grant_type: 'refresh_token', refresh_token: previous.refreshToken }),
+    },
+    fetchImpl,
+  );
+  return tokensFrom(res, previous);
+}
+
+export const tokensStale = (tokens: CodexTokens, now = Date.now()): boolean =>
+  now - Date.parse(tokens.savedAt) > ACCESS_TOKEN_TTL_MS;
+
+function readAuthFile(home: string): Record<string, unknown> {
+  let raw: unknown;
+  try {
+    raw = JSON.parse(readFileSync(join(home, '.codex', 'auth.json'), 'utf8'));
+  } catch {
+    throw new CodexAuthError('no Codex CLI login on this machine (~/.codex/auth.json); run codex login there first, or connect here');
+  }
+  return isRecord(raw) ? raw : {};
+}
+
+export function readCodexCliAuth(home = homedir()): CodexTokens {
+  const raw = readAuthFile(home);
+  if (!isRecord(raw.tokens)) throw new CodexAuthError('~/.codex/auth.json holds no ChatGPT tokens (an API-key login cannot be reused here)');
+  const stored = raw.tokens;
+  const idToken = nonEmpty(stored.id_token) ?? '';
+  const claims = claimsOf(idToken);
+  const found: CodexTokens = {
+    accessToken: nonEmpty(stored.access_token) ?? '',
+    refreshToken: nonEmpty(stored.refresh_token) ?? '',
+    idToken,
+    accountId: nonEmpty(stored.account_id) ?? claims.accountId ?? '',
+    email: claims.email,
+    plan: claims.plan,
+    savedAt: nonEmpty(raw.last_refresh) ?? new Date(0).toISOString(),
+  };
+  if ([found.accessToken, found.refreshToken, found.accountId].includes('')) throw new CodexAuthError('~/.codex/auth.json is missing a token or the account id');
+  return found;
+}