aws-runtime-bridge 1.0.3 → 1.1.0

package/dist/services/aws-mcp-http.test.js

@@ -1,27 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { injectAwsMcpContext, mapAwsMcpToolName, normalizeAwsMcpArgs } from './aws-mcp-http.js';
-describe('aws mcp http service helpers', () => {
-    it('maps public aws-mcp tool names to scheduler tool names', () => {
-        expect(mapAwsMcpToolName('get_colleague')).toBe('discover_colleague');
-        expect(mapAwsMcpToolName('get_group_rooms')).toBe('discover_group_rooms');
-        expect(mapAwsMcpToolName('send_group')).toBe('send_group_message');
-        expect(mapAwsMcpToolName('send_private')).toBe('send_dm');
-        expect(mapAwsMcpToolName('my_task')).toBe('my_task');
-    });
-    it('normalizes non-object args to an empty object', () => {
-        expect(normalizeAwsMcpArgs(undefined)).toEqual({});
-        expect(normalizeAwsMcpArgs(null)).toEqual({});
-        expect(normalizeAwsMcpArgs([])).toEqual({});
-        expect(normalizeAwsMcpArgs({ content: 'hello' })).toEqual({ content: 'hello' });
-    });
-    it('injects bridge-bound agent context and converts waitReply for send_private', () => {
-        const args = injectAwsMcpContext('send_private', { targetId: 'agent-2', content: 'ping', waitReply: true }, { agentId: 'agent-1', workspacePath: '/workspace/demo' });
-        expect(args).toEqual({
-            agentId: 'agent-1',
-            workspacePath: '/workspace/demo',
-            targetId: 'agent-2',
-            content: 'ping',
-            requireReply: true,
-        });
-    });
-});

package/dist/services/easytier-manager.d.ts

@@ -1,106 +0,0 @@
-/**
- * EasyTier 网络管理服务
- *
- * 管理 EasyTier 组网流程，支持：
- * 1. 启动 EasyTier 节点（DHCP 模式自动获取虚拟 IP）
- * 2. 监控网络状态
- * 3. 获取分配的虚拟 IP
- */
-/**
- * EasyTier 配置
- */
-export interface EasyTierConfig {
-    /** 是否启用 EasyTier 组网 */
-    enabled: boolean;
-    /** 网络名称 */
-    networkName: string;
-    /** 网络密钥 */
-    networkSecret: string;
-    /** 初始连接节点 (格式: tcp://ip:port 或 udp://ip:port) */
-    peers: string[];
-    /** 公共共享节点 */
-    externalNodes: string[];
-    /** EasyTier 可执行文件路径 */
-    executablePath?: string;
-    /** RPC 端口 (用于查询状态) */
-    rpcPort: number;
-    /** 监听端口 */
-    listenPort: number;
-    /** 等待网络就绪超时 (毫秒) */
-    readyTimeout: number;
-    /** 网络就绪检查间隔 (毫秒) */
-    readyCheckInterval: number;
-}
-/**
- * 网络状态
- */
-export interface NetworkStatus {
-    /** 是否已连接 */
-    connected: boolean;
-    /** 本地虚拟 IPv4 地址 */
-    ipv4?: string;
-    /** 本地虚拟 IPv6 地址 */
-    ipv6?: string;
-    /** 节点 ID */
-    nodeId?: string;
-    /** 已连接的 peer 数量 */
-    peerCount: number;
-    /** peer 列表 */
-    peers: PeerInfo[];
-}
-/**
- * Peer 信息
- */
-export interface PeerInfo {
-    /** peer ID */
-    peerId: string;
-    /** 虚拟 IP */
-    ipv4: string;
-    /** 主机名 */
-    hostname: string;
-    /** 延迟 (ms) */
-    latencyMs?: number;
-    /** 连接协议 */
-    tunnelProto?: string;
-}
-/**
- * 初始化配置
- */
-export declare function initEasyTierConfig(customConfig?: Partial<EasyTierConfig>): EasyTierConfig;
-/**
- * 获取当前配置
- */
-export declare function getEasyTierConfig(): EasyTierConfig;
-/**
- * 启动 EasyTier 节点
- *
- * 使用 DHCP 模式自动获取虚拟 IP
- */
-export declare function startEasyTier(): Promise<boolean>;
-/**
- * 停止 EasyTier 节点
- */
-export declare function stopEasyTier(): Promise<void>;
-/**
- * 查询网络状态 (通过 RPC)
- */
-export declare function queryNetworkStatus(): Promise<NetworkStatus>;
-/**
- * 等待网络就绪
- *
- * 返回分配的虚拟 IP
- */
-export declare function waitForNetworkReady(): Promise<string | null>;
-/**
- * 获取当前网络状态
- */
-export declare function getNetworkStatus(): NetworkStatus;
-/**
- * 获取虚拟 IP
- */
-export declare function getVirtualIp(): string | undefined;
-/**
- * 检查 EasyTier 是否可用
- */
-export declare function isEasyTierAvailable(): boolean;
-//# sourceMappingURL=easytier-manager.d.ts.map

package/dist/services/easytier-manager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"easytier-manager.d.ts","sourceRoot":"","sources":["../../src/services/easytier-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AASH;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,uBAAuB;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW;IACX,aAAa,EAAE,MAAM,CAAC;IACtB,iDAAiD;IACjD,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,aAAa;IACb,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,uBAAuB;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,sBAAsB;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB;IACpB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,YAAY;IACZ,SAAS,EAAE,OAAO,CAAC;IACnB,mBAAmB;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,mBAAmB;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mBAAmB;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc;IACd,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,cAAc;IACd,MAAM,EAAE,MAAM,CAAC;IACf,YAAY;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,UAAU;IACV,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAyID;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,cAAc,CAezF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,cAAc,CAKlD;AAED;;;;GAIG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC,CAkFtD;AAED;;GAEG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CA8BlD;AAED;;GAEG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,aAAa,CAAC,CA4CjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAkClE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,aAAa,CAEhD;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,MAAM,GAAG,SAAS,CAEjD;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAG7C"}

package/dist/services/easytier-manager.js

@@ -1,331 +0,0 @@
-/**
- * EasyTier 网络管理服务
- *
- * 管理 EasyTier 组网流程，支持：
- * 1. 启动 EasyTier 节点（DHCP 模式自动获取虚拟 IP）
- * 2. 监控网络状态
- * 3. 获取分配的虚拟 IP
- */
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import { spawn, execSync } from 'node:child_process';
-import axios from 'axios';
-import { logger } from '../utils/logger.js';
-// 默认配置
-const DEFAULT_CONFIG = {
-    enabled: false,
-    networkName: 'aws-bridge-network',
-    networkSecret: 'aws-bridge-secret',
-    peers: [],
-    externalNodes: ['tcp://public.easytier.top:11010'],
-    rpcPort: 15888,
-    listenPort: 11010,
-    readyTimeout: 60000, // 60 秒
-    readyCheckInterval: 2000, // 2 秒
-};
-let config;
-let easytierProcess = null;
-let networkStatus = { connected: false, peerCount: 0, peers: [] };
-/**
- * 从环境变量加载配置
- */
-function loadConfigFromEnv() {
-    const envConfig = {};
-    if (process.env.AWS_EASYTIER_ENABLED === 'true') {
-        envConfig.enabled = true;
-    }
-    if (process.env.AWS_EASYTIER_NETWORK_NAME) {
-        envConfig.networkName = process.env.AWS_EASYTIER_NETWORK_NAME;
-    }
-    if (process.env.AWS_EASYTIER_NETWORK_SECRET) {
-        envConfig.networkSecret = process.env.AWS_EASYTIER_NETWORK_SECRET;
-    }
-    if (process.env.AWS_EASYTIER_PEERS) {
-        envConfig.peers = process.env.AWS_EASYTIER_PEERS.split(',').map(p => p.trim()).filter(Boolean);
-    }
-    if (process.env.AWS_EASYTIER_EXTERNAL_NODES) {
-        envConfig.externalNodes = process.env.AWS_EASYTIER_EXTERNAL_NODES.split(',').map(p => p.trim()).filter(Boolean);
-    }
-    if (process.env.AWS_EASYTIER_EXECUTABLE_PATH) {
-        envConfig.executablePath = process.env.AWS_EASYTIER_EXECUTABLE_PATH;
-    }
-    if (process.env.AWS_EASYTIER_RPC_PORT) {
-        envConfig.rpcPort = parseInt(process.env.AWS_EASYTIER_RPC_PORT, 10);
-    }
-    if (process.env.AWS_EASYTIER_LISTEN_PORT) {
-        envConfig.listenPort = parseInt(process.env.AWS_EASYTIER_LISTEN_PORT, 10);
-    }
-    if (process.env.AWS_EASYTIER_READY_TIMEOUT) {
-        envConfig.readyTimeout = parseInt(process.env.AWS_EASYTIER_READY_TIMEOUT, 10);
-    }
-    return envConfig;
-}
-/**
- * 查找 EasyTier 可执行文件
- */
-function findEasyTierExecutable() {
-    // 1. 检查环境变量指定的路径
-    if (process.env.AWS_EASYTIER_EXECUTABLE_PATH) {
-        if (fs.existsSync(process.env.AWS_EASYTIER_EXECUTABLE_PATH)) {
-            return process.env.AWS_EASYTIER_EXECUTABLE_PATH;
-        }
-    }
-    // 2. 检查常见位置
-    const possiblePaths = [];
-    if (process.platform === 'win32') {
-        // Windows
-        possiblePaths.push(path.join(os.homedir(), 'easytier', 'easytier-core.exe'), path.join('C:', 'Program Files', 'easytier', 'easytier-core.exe'), 'easytier-core.exe' // PATH
-        );
-    }
-    else {
-        // Linux/macOS
-        possiblePaths.push('/usr/local/bin/easytier-core', '/usr/bin/easytier-core', path.join(os.homedir(), '.local', 'bin', 'easytier-core'), path.join(os.homedir(), 'easytier', 'easytier-core'), 'easytier-core' // PATH
-        );
-    }
-    for (const p of possiblePaths) {
-        try {
-            if (fs.existsSync(p)) {
-                return p;
-            }
-        }
-        catch {
-            // 忽略错误，继续尝试下一个
-        }
-    }
-    // 3. 尝试从 PATH 查找
-    try {
-        const result = execSync(process.platform === 'win32' ? 'where easytier-core' : 'which easytier-core', {
-            encoding: 'utf8',
-            timeout: 5000
-        });
-        const found = result.trim().split('\n')[0];
-        if (found && fs.existsSync(found)) {
-            return found;
-        }
-    }
-    catch {
-        // 未找到
-    }
-    return null;
-}
-/**
- * 初始化配置
- */
-export function initEasyTierConfig(customConfig) {
-    const envConfig = loadConfigFromEnv();
-    config = {
-        ...DEFAULT_CONFIG,
-        ...envConfig,
-        ...customConfig,
-    };
-    // 自动查找可执行文件
-    if (!config.executablePath) {
-        config.executablePath = findEasyTierExecutable() || undefined;
-    }
-    return config;
-}
-/**
- * 获取当前配置
- */
-export function getEasyTierConfig() {
-    if (!config) {
-        initEasyTierConfig();
-    }
-    return config;
-}
-/**
- * 启动 EasyTier 节点
- *
- * 使用 DHCP 模式自动获取虚拟 IP
- */
-export async function startEasyTier() {
-    if (!config) {
-        initEasyTierConfig();
-    }
-    if (!config.enabled) {
-        logger.info('[EasyTier] EasyTier 组网未启用');
-        return false;
-    }
-    if (easytierProcess) {
-        logger.warn('[EasyTier] EasyTier 已在运行中');
-        return true;
-    }
-    // 检查可执行文件
-    const executable = config.executablePath || findEasyTierExecutable();
-    if (!executable) {
-        logger.error('[EasyTier] 未找到 easytier-core 可执行文件');
-        logger.error('[EasyTier] 请安装 EasyTier 或设置 AWS_EASYTIER_EXECUTABLE_PATH 环境变量');
-        return false;
-    }
-    logger.info(`[EasyTier] 使用可执行文件: ${executable}`);
-    // 构建命令参数
-    const args = [];
-    // DHCP 模式 (自动获取虚拟 IP)
-    args.push('-d');
-    // 网络名称和密钥
-    args.push('--network-name', config.networkName);
-    args.push('--network-secret', config.networkSecret);
-    // RPC 端口 (用于状态查询)
-    args.push('--rpc-portal', `127.0.0.1:${config.rpcPort}`);
-    // 监听端口
-    args.push('-l', `tcp://0.0.0.0:${config.listenPort}`);
-    // 初始连接节点
-    for (const peer of config.peers) {
-        args.push('-p', peer);
-    }
-    // 公共共享节点
-    for (const external of config.externalNodes) {
-        args.push('-e', external);
-    }
-    // 后台运行
-    args.push('--daemon');
-    logger.info(`[EasyTier] 启动参数: ${args.join(' ')}`);
-    try {
-        easytierProcess = spawn(executable, args, {
-            stdio: 'ignore',
-            detached: true,
-        });
-        easytierProcess.on('error', (err) => {
-            logger.error(`[EasyTier] 进程错误: ${err.message}`);
-            easytierProcess = null;
-        });
-        easytierProcess.on('exit', (code, signal) => {
-            logger.info(`[EasyTier] 进程退出: code=${code}, signal=${signal}`);
-            easytierProcess = null;
-        });
-        // 等待进程启动
-        await new Promise(resolve => setTimeout(resolve, 2000));
-        logger.info('[EasyTier] EasyTier 已启动');
-        return true;
-    }
-    catch (error) {
-        const err = error;
-        logger.error(`[EasyTier] 启动失败: ${err.message}`);
-        return false;
-    }
-}
-/**
- * 停止 EasyTier 节点
- */
-export async function stopEasyTier() {
-    if (!easytierProcess) {
-        return;
-    }
-    try {
-        // 尝试优雅关闭
-        easytierProcess.kill('SIGTERM');
-        // 等待进程退出
-        await new Promise((resolve) => {
-            const timeout = setTimeout(() => {
-                if (easytierProcess) {
-                    easytierProcess.kill('SIGKILL');
-                }
-                resolve();
-            }, 5000);
-            easytierProcess?.on('exit', () => {
-                clearTimeout(timeout);
-                resolve();
-            });
-        });
-        easytierProcess = null;
-        logger.info('[EasyTier] EasyTier 已停止');
-    }
-    catch (error) {
-        const err = error;
-        logger.error(`[EasyTier] 停止失败: ${err.message}`);
-    }
-}
-/**
- * 查询网络状态 (通过 RPC)
- */
-export async function queryNetworkStatus() {
-    if (!config) {
-        initEasyTierConfig();
-    }
-    const rpcUrl = `http://127.0.0.1:${config.rpcPort}`;
-    try {
-        // 查询节点信息
-        const nodeResponse = await axios.get(`${rpcUrl}/api/v1/node`, {
-            timeout: 5000,
-        });
-        // 查询 peer 列表
-        const peerResponse = await axios.get(`${rpcUrl}/api/v1/peer`, {
-            timeout: 5000,
-        });
-        const nodeData = nodeResponse.data;
-        const peerData = peerResponse.data;
-        const peers = (peerData.peers || []).map((p) => ({
-            peerId: p.peer_id || p.peerId || '',
-            ipv4: p.ipv4 || '',
-            hostname: p.hostname || '',
-            latencyMs: p.lat_ms || p.latencyMs,
-            tunnelProto: p.tunnel_proto || p.tunnelProto,
-        }));
-        networkStatus = {
-            connected: true,
-            ipv4: nodeData?.ipv4,
-            ipv6: nodeData?.ipv6,
-            nodeId: nodeData?.node_id || nodeData?.nodeId,
-            peerCount: peers.length,
-            peers,
-        };
-        return networkStatus;
-    }
-    catch {
-        // 网络未就绪或 RPC 不可用
-        networkStatus = { connected: false, peerCount: 0, peers: [] };
-        return networkStatus;
-    }
-}
-/**
- * 等待网络就绪
- *
- * 返回分配的虚拟 IP
- */
-export async function waitForNetworkReady() {
-    if (!config) {
-        initEasyTierConfig();
-    }
-    if (!config.enabled) {
-        logger.info('[EasyTier] EasyTier 未启用，跳过网络就绪等待');
-        return null;
-    }
-    const startTime = Date.now();
-    const timeout = config.readyTimeout;
-    const interval = config.readyCheckInterval;
-    logger.info(`[EasyTier] 等待网络就绪 (超时: ${timeout / 1000}s)...`);
-    while (Date.now() - startTime < timeout) {
-        const status = await queryNetworkStatus();
-        if (status.connected && status.ipv4) {
-            logger.info(`[EasyTier] ✓ 网络已就绪`);
-            logger.info(`[EasyTier]   虚拟 IP: ${status.ipv4}`);
-            logger.info(`[EasyTier]   节点 ID: ${status.nodeId}`);
-            logger.info(`[EasyTier]   已连接 Peer 数量: ${status.peerCount}`);
-            return status.ipv4;
-        }
-        // 等待后重试
-        await new Promise(resolve => setTimeout(resolve, interval));
-    }
-    logger.error(`[EasyTier] ✗ 等待网络就绪超时 (${timeout / 1000}s)`);
-    return null;
-}
-/**
- * 获取当前网络状态
- */
-export function getNetworkStatus() {
-    return { ...networkStatus };
-}
-/**
- * 获取虚拟 IP
- */
-export function getVirtualIp() {
-    return networkStatus.ipv4;
-}
-/**
- * 检查 EasyTier 是否可用
- */
-export function isEasyTierAvailable() {
-    const executable = findEasyTierExecutable();
-    return executable !== null;
-}

package/dist/services/easytier-manager.test.d.ts

@@ -1,5 +0,0 @@
-/**
- * EasyTier Manager 测试
- */
-export {};
-//# sourceMappingURL=easytier-manager.test.d.ts.map

package/dist/services/easytier-manager.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"easytier-manager.test.d.ts","sourceRoot":"","sources":["../../src/services/easytier-manager.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/dist/services/easytier-manager.test.js

@@ -1,98 +0,0 @@
-/**
- * EasyTier Manager 测试
- */
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { initEasyTierConfig, getEasyTierConfig, isEasyTierAvailable, } from './easytier-manager.js';
-// Mock child_process
-vi.mock('node:child_process', () => ({
-    spawn: vi.fn(() => ({
-        on: vi.fn(),
-        kill: vi.fn(),
-    })),
-    execSync: vi.fn((cmd) => {
-        if (cmd.includes('which') || cmd.includes('where')) {
-            return '/usr/bin/easytier-core';
-        }
-        return '';
-    }),
-}));
-// Mock fs
-vi.mock('node:fs', () => {
-    const existsSync = vi.fn((path) => {
-        if (path.includes('easytier-core')) {
-            return true;
-        }
-        return false;
-    });
-    return {
-        default: { existsSync },
-        existsSync,
-    };
-});
-describe('EasyTier Manager', () => {
-    beforeEach(() => {
-        // 重置环境变量
-        delete process.env.AWS_EASYTIER_ENABLED;
-        delete process.env.AWS_EASYTIER_NETWORK_NAME;
-        delete process.env.AWS_EASYTIER_NETWORK_SECRET;
-        delete process.env.AWS_EASYTIER_PEERS;
-        delete process.env.AWS_EASYTIER_RPC_PORT;
-        delete process.env.AWS_EASYTIER_EXECUTABLE_PATH;
-    });
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-    describe('initEasyTierConfig', () => {
-        it('should return default config when no env vars set', () => {
-            const config = initEasyTierConfig();
-            expect(config.enabled).toBe(false);
-            expect(config.networkName).toBe('aws-bridge-network');
-            expect(config.networkSecret).toBe('aws-bridge-secret');
-            expect(config.rpcPort).toBe(15888);
-            expect(config.listenPort).toBe(11010);
-        });
-        it('should load config from environment variables', () => {
-            process.env.AWS_EASYTIER_ENABLED = 'true';
-            process.env.AWS_EASYTIER_NETWORK_NAME = 'test-network';
-            process.env.AWS_EASYTIER_NETWORK_SECRET = 'test-secret';
-            process.env.AWS_EASYTIER_RPC_PORT = '12345';
-            const config = initEasyTierConfig();
-            expect(config.enabled).toBe(true);
-            expect(config.networkName).toBe('test-network');
-            expect(config.networkSecret).toBe('test-secret');
-            expect(config.rpcPort).toBe(12345);
-        });
-        it('should parse peers from environment', () => {
-            process.env.AWS_EASYTIER_PEERS = 'tcp://1.2.3.4:11010, udp://5.6.7.8:11010';
-            const config = initEasyTierConfig();
-            expect(config.peers).toHaveLength(2);
-            expect(config.peers).toContain('tcp://1.2.3.4:11010');
-            expect(config.peers).toContain('udp://5.6.7.8:11010');
-        });
-        it('should merge custom config', () => {
-            const config = initEasyTierConfig({
-                enabled: true,
-                networkName: 'custom-network',
-                readyTimeout: 120000,
-            });
-            expect(config.enabled).toBe(true);
-            expect(config.networkName).toBe('custom-network');
-            expect(config.readyTimeout).toBe(120000);
-        });
-    });
-    describe('getEasyTierConfig', () => {
-        it('should return initialized config', () => {
-            initEasyTierConfig({ enabled: true });
-            const config = getEasyTierConfig();
-            expect(config.enabled).toBe(true);
-        });
-    });
-    describe('isEasyTierAvailable', () => {
-        it('should return true when executable is found', () => {
-            process.env.AWS_EASYTIER_EXECUTABLE_PATH = '/usr/bin/easytier-core';
-            const available = isEasyTierAvailable();
-            // 显式路径存在时，应判定为可用
-            expect(available).toBe(true);
-        });
-    });
-});