aranea-sdk-cli 0.3.13 → 0.3.15

package/dist/commands/device.d.ts

@@ -0,0 +1,15 @@
+/**
+ * device コマンド - デバイス直接操作（HTTP経由）
+ *
+ * MQTTが未設定のデバイスに対して、HTTP経由で直接設定を行う
+ *
+ * Usage:
+ *   aranea-sdk device status -i 192.168.3.126
+ *   aranea-sdk device config get -i 192.168.3.126
+ *   aranea-sdk device config set -i 192.168.3.126 -k mqtt_broker -v "wss://..."
+ *   aranea-sdk device reboot -i 192.168.3.126 --force
+ *   aranea-sdk device scan --subnet 192.168.3
+ */
+import { Command } from 'commander';
+export declare const deviceCommand: Command;
+export default deviceCommand;

package/dist/commands/device.js

@@ -0,0 +1,518 @@
+"use strict";
+/**
+ * device コマンド - デバイス直接操作（HTTP経由）
+ *
+ * MQTTが未設定のデバイスに対して、HTTP経由で直接設定を行う
+ *
+ * Usage:
+ *   aranea-sdk device status -i 192.168.3.126
+ *   aranea-sdk device config get -i 192.168.3.126
+ *   aranea-sdk device config set -i 192.168.3.126 -k mqtt_broker -v "wss://..."
+ *   aranea-sdk device reboot -i 192.168.3.126 --force
+ *   aranea-sdk device scan --subnet 192.168.3
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deviceCommand = void 0;
+const commander_1 = require("commander");
+const chalk_1 = __importDefault(require("chalk"));
+const ora_1 = __importDefault(require("ora"));
+const axios_1 = __importStar(require("axios"));
+// ============================================================================
+// Helper Functions
+// ============================================================================
+/**
+ * デバイスのベースURL取得
+ */
+function getDeviceBaseUrl(ip, port = 80, https = false) {
+    const protocol = https ? 'https' : 'http';
+    return `${protocol}://${ip}:${port}`;
+}
+/**
+ * HTTP GETリクエスト
+ */
+async function httpGet(url, timeout = 5000) {
+    const response = await axios_1.default.get(url, {
+        timeout,
+        headers: {
+            Accept: 'application/json',
+        },
+    });
+    return response.data;
+}
+/**
+ * HTTP POSTリクエスト
+ */
+async function httpPost(url, data, timeout = 5000) {
+    const response = await axios_1.default.post(url, data, {
+        timeout,
+        headers: {
+            'Content-Type': 'application/json',
+            Accept: 'application/json',
+        },
+    });
+    return response.data;
+}
+/**
+ * エラーメッセージ抽出
+ */
+function getErrorMessage(error) {
+    if (error instanceof axios_1.AxiosError) {
+        if (error.code === 'ECONNREFUSED') {
+            return 'Connection refused - デバイスが応答しません';
+        }
+        if (error.code === 'ETIMEDOUT' || error.code === 'ECONNABORTED') {
+            return 'Timeout - デバイスからの応答がありません';
+        }
+        if (error.response) {
+            return `HTTP ${error.response.status}: ${error.response.statusText}`;
+        }
+        return error.message;
+    }
+    if (error instanceof Error) {
+        return error.message;
+    }
+    return String(error);
+}
+// ============================================================================
+// Commands
+// ============================================================================
+exports.deviceCommand = new commander_1.Command('device').description('デバイス直接操作（HTTP経由）- MQTT未設定デバイス向け');
+// ----------------------------------------------------------------------------
+// device status
+// ----------------------------------------------------------------------------
+exports.deviceCommand
+    .command('status')
+    .description('デバイス状態を取得')
+    .requiredOption('-i, --ip <ip>', 'デバイスIPアドレス')
+    .option('-P, --port <port>', 'HTTPポート', '80')
+    .option('--https', 'HTTPSを使用')
+    .option('--timeout <ms>', 'タイムアウト（ミリ秒）', '5000')
+    .action(async (options) => {
+    try {
+        console.log(chalk_1.default.bold('\n=== Device Status ===\n'));
+        const baseUrl = getDeviceBaseUrl(options.ip, parseInt(options.port), options.https);
+        console.log(chalk_1.default.cyan('ターゲット:'));
+        console.log(`  IP: ${options.ip}`);
+        console.log(`  Port: ${options.port}`);
+        console.log('');
+        const spinner = (0, ora_1.default)('ステータス取得中...').start();
+        // Try multiple common endpoints
+        const endpoints = ['/api/status', '/status', '/api/info', '/info'];
+        let status = null;
+        let successEndpoint = '';
+        for (const endpoint of endpoints) {
+            try {
+                status = await httpGet(`${baseUrl}${endpoint}`, parseInt(options.timeout));
+                successEndpoint = endpoint;
+                break;
+            }
+            catch {
+                // Try next endpoint
+            }
+        }
+        if (!status) {
+            spinner.fail('デバイスからステータスを取得できませんでした');
+            console.log(chalk_1.default.yellow('\n試行したエンドポイント:'));
+            endpoints.forEach((e) => console.log(`  - ${baseUrl}${e}`));
+            process.exit(1);
+        }
+        spinner.succeed(`ステータス取得成功 (${successEndpoint})`);
+        console.log('');
+        // Display status
+        console.log(chalk_1.default.cyan('デバイス情報:'));
+        if (status.lacisId)
+            console.log(`  LacisID:     ${chalk_1.default.green(status.lacisId)}`);
+        if (status.cic)
+            console.log(`  CIC:         ${status.cic}`);
+        if (status.type)
+            console.log(`  Type:        ${status.type}`);
+        if (status.mac)
+            console.log(`  MAC:         ${status.mac}`);
+        if (status.ip)
+            console.log(`  IP:          ${status.ip}`);
+        if (status.firmwareVersion)
+            console.log(`  Firmware:    ${status.firmwareVersion}`);
+        if (status.uptime !== undefined) {
+            const hours = Math.floor(status.uptime / 3600);
+            const mins = Math.floor((status.uptime % 3600) / 60);
+            console.log(`  Uptime:      ${hours}h ${mins}m`);
+        }
+        if (status.freeHeap !== undefined)
+            console.log(`  Free Heap:   ${(status.freeHeap / 1024).toFixed(1)} KB`);
+        if (status.rssi !== undefined)
+            console.log(`  WiFi RSSI:   ${status.rssi} dBm`);
+        if (status.wifiConnected !== undefined) {
+            console.log(`  WiFi:        ${status.wifiConnected ? chalk_1.default.green('Connected') : chalk_1.default.red('Disconnected')}`);
+        }
+        if (status.mqttConnected !== undefined) {
+            console.log(`  MQTT:        ${status.mqttConnected ? chalk_1.default.green('Connected') : chalk_1.default.yellow('Not connected')}`);
+        }
+        // Show raw JSON for other fields
+        const knownKeys = [
+            'lacisId',
+            'cic',
+            'type',
+            'mac',
+            'ip',
+            'firmwareVersion',
+            'uptime',
+            'freeHeap',
+            'rssi',
+            'wifiConnected',
+            'mqttConnected',
+        ];
+        const otherKeys = Object.keys(status).filter((k) => !knownKeys.includes(k));
+        if (otherKeys.length > 0) {
+            console.log('');
+            console.log(chalk_1.default.gray('その他のフィールド:'));
+            otherKeys.forEach((k) => {
+                console.log(`  ${k}: ${JSON.stringify(status[k])}`);
+            });
+        }
+        console.log('');
+    }
+    catch (error) {
+        console.error(chalk_1.default.red(`❌ エラー: ${getErrorMessage(error)}`));
+        process.exit(1);
+    }
+});
+// ----------------------------------------------------------------------------
+// device config (parent)
+// ----------------------------------------------------------------------------
+const configCommand = exports.deviceCommand.command('config').description('デバイス設定の取得・変更');
+// ----------------------------------------------------------------------------
+// device config get
+// ----------------------------------------------------------------------------
+configCommand
+    .command('get')
+    .description('現在の設定を取得')
+    .requiredOption('-i, --ip <ip>', 'デバイスIPアドレス')
+    .option('-P, --port <port>', 'HTTPポート', '80')
+    .option('--https', 'HTTPSを使用')
+    .option('-k, --key <key>', '特定のキーのみ取得')
+    .option('--timeout <ms>', 'タイムアウト（ミリ秒）', '5000')
+    .action(async (options) => {
+    try {
+        console.log(chalk_1.default.bold('\n=== Device Config Get ===\n'));
+        const baseUrl = getDeviceBaseUrl(options.ip, parseInt(options.port), options.https);
+        console.log(chalk_1.default.cyan('ターゲット:'));
+        console.log(`  IP: ${options.ip}`);
+        if (options.key) {
+            console.log(`  Key: ${options.key}`);
+        }
+        console.log('');
+        const spinner = (0, ora_1.default)('設定取得中...').start();
+        const endpoints = ['/api/config', '/config', '/api/settings', '/settings'];
+        let config = null;
+        let successEndpoint = '';
+        for (const endpoint of endpoints) {
+            try {
+                config = await httpGet(`${baseUrl}${endpoint}`, parseInt(options.timeout));
+                successEndpoint = endpoint;
+                break;
+            }
+            catch {
+                // Try next endpoint
+            }
+        }
+        if (!config) {
+            spinner.fail('デバイスから設定を取得できませんでした');
+            process.exit(1);
+        }
+        spinner.succeed(`設定取得成功 (${successEndpoint})`);
+        console.log('');
+        if (options.key) {
+            // Show specific key
+            if (options.key in config) {
+                console.log(`${options.key}: ${chalk_1.default.green(String(config[options.key]))}`);
+            }
+            else {
+                console.log(chalk_1.default.yellow(`⚠ キー "${options.key}" が見つかりません`));
+                console.log(chalk_1.default.gray('利用可能なキー: ' + Object.keys(config).join(', ')));
+            }
+        }
+        else {
+            // Show all config
+            console.log(chalk_1.default.cyan('設定一覧:'));
+            Object.entries(config).forEach(([key, value]) => {
+                const displayValue = typeof value === 'string' && value.length > 50
+                    ? value.substring(0, 50) + '...'
+                    : String(value);
+                // Highlight MQTT-related keys
+                if (key.toLowerCase().includes('mqtt') || key.toLowerCase().includes('broker')) {
+                    console.log(`  ${chalk_1.default.yellow(key)}: ${chalk_1.default.green(displayValue)}`);
+                }
+                else {
+                    console.log(`  ${key}: ${displayValue}`);
+                }
+            });
+        }
+        console.log('');
+    }
+    catch (error) {
+        console.error(chalk_1.default.red(`❌ エラー: ${getErrorMessage(error)}`));
+        process.exit(1);
+    }
+});
+// ----------------------------------------------------------------------------
+// device config set
+// ----------------------------------------------------------------------------
+configCommand
+    .command('set')
+    .description('設定値を変更')
+    .requiredOption('-i, --ip <ip>', 'デバイスIPアドレス')
+    .requiredOption('-k, --key <key>', '設定キー')
+    .requiredOption('-v, --value <value>', '設定値')
+    .option('-P, --port <port>', 'HTTPポート', '80')
+    .option('--https', 'HTTPSを使用')
+    .option('--timeout <ms>', 'タイムアウト（ミリ秒）', '5000')
+    .option('-d, --dry-run', '実行せずに内容を表示')
+    .option('--reboot', '設定変更後にリブート')
+    .action(async (options) => {
+    try {
+        console.log(chalk_1.default.bold('\n=== Device Config Set ===\n'));
+        console.log(chalk_1.default.cyan('設定変更:'));
+        console.log(`  IP:    ${options.ip}`);
+        console.log(`  Key:   ${chalk_1.default.yellow(options.key)}`);
+        console.log(`  Value: ${chalk_1.default.green(options.value)}`);
+        console.log('');
+        if (options.dryRun) {
+            console.log(chalk_1.default.yellow('(dry-run モード: 実際には変更されません)'));
+            console.log('');
+            return;
+        }
+        const baseUrl = getDeviceBaseUrl(options.ip, parseInt(options.port), options.https);
+        const spinner = (0, ora_1.default)(`${options.key} を設定中...`).start();
+        // Try multiple endpoint patterns
+        const endpoints = [
+            { url: '/api/config', method: 'POST', body: { [options.key]: options.value } },
+            { url: '/config', method: 'POST', body: { [options.key]: options.value } },
+            { url: '/api/settings', method: 'POST', body: { [options.key]: options.value } },
+            { url: `/api/config/${options.key}`, method: 'POST', body: { value: options.value } },
+            { url: '/api/nvs', method: 'POST', body: { key: options.key, value: options.value } },
+        ];
+        let success = false;
+        let successEndpoint = '';
+        let responseData = null;
+        for (const endpoint of endpoints) {
+            try {
+                responseData = await httpPost(`${baseUrl}${endpoint.url}`, endpoint.body, parseInt(options.timeout));
+                success = true;
+                successEndpoint = endpoint.url;
+                break;
+            }
+            catch {
+                // Try next endpoint
+            }
+        }
+        if (!success) {
+            spinner.fail('設定を変更できませんでした');
+            console.log(chalk_1.default.yellow('\n⚠ デバイスが設定変更APIをサポートしていない可能性があります'));
+            console.log(chalk_1.default.gray('試行したエンドポイント:'));
+            endpoints.forEach((e) => console.log(`  - ${e.method} ${baseUrl}${e.url}`));
+            process.exit(1);
+        }
+        spinner.succeed(`設定変更成功 (${successEndpoint})`);
+        if (responseData) {
+            console.log(chalk_1.default.gray('\nレスポンス: ' + JSON.stringify(responseData)));
+        }
+        // Reboot if requested
+        if (options.reboot) {
+            console.log('');
+            const rebootSpinner = (0, ora_1.default)('デバイスをリブート中...').start();
+            try {
+                await httpPost(`${baseUrl}/api/reboot`, {}, 3000);
+                rebootSpinner.succeed('リブートコマンド送信完了');
+            }
+            catch {
+                // Device might not respond after reboot command
+                rebootSpinner.warn('リブートコマンド送信 (デバイスが応答しない場合があります)');
+            }
+        }
+        else {
+            console.log(chalk_1.default.yellow('\n⚠ 設定によってはリブートが必要です (--reboot オプション)'));
+        }
+        console.log('');
+    }
+    catch (error) {
+        console.error(chalk_1.default.red(`❌ エラー: ${getErrorMessage(error)}`));
+        process.exit(1);
+    }
+});
+// ----------------------------------------------------------------------------
+// device reboot
+// ----------------------------------------------------------------------------
+exports.deviceCommand
+    .command('reboot')
+    .description('デバイスをリブート')
+    .requiredOption('-i, --ip <ip>', 'デバイスIPアドレス')
+    .option('-P, --port <port>', 'HTTPポート', '80')
+    .option('--https', 'HTTPSを使用')
+    .option('--force', '確認なしでリブート')
+    .action(async (options) => {
+    try {
+        console.log(chalk_1.default.bold('\n=== Device Reboot ===\n'));
+        console.log(chalk_1.default.cyan('ターゲット:'));
+        console.log(`  IP: ${options.ip}`);
+        console.log('');
+        if (!options.force) {
+            console.log(chalk_1.default.yellow(`⚠ これにより ${options.ip} がリブートされます。`));
+            console.log(chalk_1.default.gray('確認なしで実行するには --force を使用してください。'));
+            console.log('');
+            process.exit(1);
+        }
+        const baseUrl = getDeviceBaseUrl(options.ip, parseInt(options.port), options.https);
+        const spinner = (0, ora_1.default)(`${options.ip} をリブート中...`).start();
+        const endpoints = ['/api/reboot', '/reboot', '/api/restart', '/restart'];
+        let sent = false;
+        for (const endpoint of endpoints) {
+            try {
+                await httpPost(`${baseUrl}${endpoint}`, {}, 3000);
+                sent = true;
+                break;
+            }
+            catch (error) {
+                // Device might close connection immediately after reboot
+                if (error instanceof axios_1.AxiosError &&
+                    (error.code === 'ECONNRESET' || error.code === 'ECONNABORTED')) {
+                    sent = true;
+                    break;
+                }
+            }
+        }
+        if (sent) {
+            spinner.succeed('リブートコマンド送信完了');
+            console.log(chalk_1.default.gray('\nデバイスが再起動中です。数秒後にオンラインになります。'));
+        }
+        else {
+            spinner.fail('リブートコマンドを送信できませんでした');
+        }
+        console.log('');
+    }
+    catch (error) {
+        // Connection reset is expected after reboot
+        if (error instanceof axios_1.AxiosError && error.code === 'ECONNRESET') {
+            console.log(chalk_1.default.green('✓ リブートコマンド送信完了'));
+        }
+        else {
+            console.error(chalk_1.default.red(`❌ エラー: ${getErrorMessage(error)}`));
+            process.exit(1);
+        }
+    }
+});
+// ----------------------------------------------------------------------------
+// device scan
+// ----------------------------------------------------------------------------
+exports.deviceCommand
+    .command('scan')
+    .description('ローカルネットワーク上のAraneaデバイスをスキャン')
+    .option('-s, --subnet <subnet>', 'スキャン対象サブネット (例: 192.168.3)', '192.168.1')
+    .option('--start <num>', '開始IP', '1')
+    .option('--end <num>', '終了IP', '254')
+    .option('--timeout <ms>', '各IPへのタイムアウト', '500')
+    .option('-c, --concurrency <num>', '並列数', '20')
+    .action(async (options) => {
+    try {
+        console.log(chalk_1.default.bold('\n=== Aranea Device Scanner ===\n'));
+        const subnet = options.subnet;
+        const start = parseInt(options.start);
+        const end = parseInt(options.end);
+        const timeout = parseInt(options.timeout);
+        const concurrency = parseInt(options.concurrency);
+        console.log(chalk_1.default.cyan('スキャン設定:'));
+        console.log(`  Subnet:      ${subnet}.${start}-${end}`);
+        console.log(`  Timeout:     ${timeout}ms`);
+        console.log(`  Concurrency: ${concurrency}`);
+        console.log('');
+        const spinner = (0, ora_1.default)('スキャン中...').start();
+        const foundDevices = [];
+        let scanned = 0;
+        const total = end - start + 1;
+        // Create IP list
+        const ips = [];
+        for (let i = start; i <= end; i++) {
+            ips.push(`${subnet}.${i}`);
+        }
+        // Scan in batches
+        const scanIp = async (ip) => {
+            try {
+                const status = await httpGet(`http://${ip}/api/status`, timeout);
+                if (status &&
+                    (status.lacisId || status.type?.includes('aranea') || status.type?.includes('ISMS'))) {
+                    foundDevices.push({ ip, status });
+                }
+            }
+            catch {
+                // Not an Aranea device or not responding
+            }
+            scanned++;
+            spinner.text = `スキャン中... ${scanned}/${total} (発見: ${foundDevices.length})`;
+        };
+        // Process in batches
+        for (let i = 0; i < ips.length; i += concurrency) {
+            const batch = ips.slice(i, i + concurrency);
+            await Promise.all(batch.map(scanIp));
+        }
+        spinner.succeed(`スキャン完了: ${foundDevices.length} 台のデバイスを発見`);
+        if (foundDevices.length > 0) {
+            console.log('');
+            console.log(chalk_1.default.cyan('発見したデバイス:'));
+            console.log('');
+            foundDevices.forEach(({ ip, status }) => {
+                console.log(`  ${chalk_1.default.green('●')} ${chalk_1.default.bold(ip)}`);
+                if (status.lacisId)
+                    console.log(`      LacisID: ${chalk_1.default.green(status.lacisId)}`);
+                if (status.type)
+                    console.log(`      Type:    ${status.type}`);
+                if (status.cic)
+                    console.log(`      CIC:     ${status.cic}`);
+                if (status.mqttConnected !== undefined) {
+                    console.log(`      MQTT:    ${status.mqttConnected ? chalk_1.default.green('Connected') : chalk_1.default.yellow('Not connected')}`);
+                }
+                console.log('');
+            });
+        }
+        console.log('');
+    }
+    catch (error) {
+        console.error(chalk_1.default.red(`❌ エラー: ${getErrorMessage(error)}`));
+        process.exit(1);
+    }
+});
+exports.default = exports.deviceCommand;

package/dist/commands/schema.js

@@ -734,8 +734,8 @@ exports.schemaCommand
             console.log(chalk_1.default.gray('Remove --dry-run to actually promote'));
             return;
         }
-        // Confirmation step
-        if (!options.confirm) {
+        // Confirmation step (skip if --confirm or --force)
+        if (!options.confirm && !options.force) {
             console.log(chalk_1.default.red('This will promote the schema to PRODUCTION state.'));
             console.log(chalk_1.default.red('Existing devices using this schema type will be affected.'));
             console.log('');
@@ -1031,8 +1031,8 @@ exports.schemaCommand
             console.log(chalk_1.default.gray('Remove --dry-run to actually rollback'));
             return;
         }
-        // Confirmation step
-        if (!options.confirm) {
+        // Confirmation step (skip if --confirm or --force)
+        if (!options.confirm && !options.force) {
             console.log(chalk_1.default.red('This will rollback the schema to a previous version.'));
             console.log(chalk_1.default.red('The current version will be saved in history.'));
             console.log('');

package/dist/index.js

@@ -21,6 +21,7 @@ const validate_1 = require("./commands/validate");
 const schema_1 = require("./commands/schema");
 const register_1 = require("./commands/register");
 const mqtt_1 = require("./commands/mqtt");
+const device_1 = require("./commands/device");
 const knowledge_1 = require("./commands/knowledge");
 const metatron_1 = require("./commands/metatron");
 const auth_1 = require("./commands/auth");
@@ -28,7 +29,7 @@ const program = new commander_1.Command();
 program
     .name('aranea-sdk')
     .description('AraneaSDK CLI - デバイス開発支援ツール')
-    .version('0.3.13');
+    .version('0.3.15');
 // test コマンド
 program.addCommand(test_1.testCommand);
 // simulate コマンド
@@ -41,6 +42,8 @@ program.addCommand(schema_1.schemaCommand);
 program.addCommand(register_1.registerCommand);
 // mqtt コマンド (v0.2.0 P0)
 program.addCommand(mqtt_1.mqttCommand);
+// device コマンド (v0.3.15) - HTTP直接操作
+program.addCommand(device_1.deviceCommand);
 // knowledge コマンド (v0.2.1)
 program.addCommand(knowledge_1.knowledgeCommand);
 // metatron コマンド (v0.2.1)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aranea-sdk-cli",
-  "version": "0.3.13",
+  "version": "0.3.15",
   "description": "AraneaSDK CLI - ESP32 IoTデバイス開発支援ツール",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",