aranea-sdk-cli 0.1.0 → 0.1.1

package/README.md

@@ -1,4 +1,6 @@
-# @aranea-sdk/cli
+# aranea-sdk-cli
+
+[![npm version](https://badge.fury.io/js/aranea-sdk-cli.svg)](https://www.npmjs.com/package/aranea-sdk-cli)
 
 AraneaSDK CLI - ESP32 IoTデバイス開発支援ツール
 
@@ -9,7 +11,7 @@ AraneaSDK CLIは、AraneaSDK対応ESP32デバイスの開発・テスト・登
 ## インストール
 
 ```bash
-npm install -g @aranea-sdk/cli
+npm install -g aranea-sdk-cli
 ```
 
 ## クイックスタート

package/dist/commands/schema.d.ts

@@ -1,9 +1,10 @@
 /**
- * schema コマンド
+ * schema command
  *
  * Usage:
  *   aranea-sdk schema get --type "aranea_ar-is04a"
  *   aranea-sdk schema list
+ *   aranea-sdk schema validate --type "aranea_ar-is04a" --file state.json
  */
 import { Command } from 'commander';
 export declare const schemaCommand: Command;

package/dist/commands/schema.js

@@ -1,10 +1,11 @@
 "use strict";
 /**
- * schema コマンド
+ * schema command
  *
  * Usage:
  *   aranea-sdk schema get --type "aranea_ar-is04a"
  *   aranea-sdk schema list
+ *   aranea-sdk schema validate --type "aranea_ar-is04a" --file state.json
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -14,268 +15,336 @@ exports.schemaCommand = void 0;
 const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
-// 組み込みスキーマ定義
-// 実際の運用ではFirestoreから取得するが、CLIツールでは組み込み版を使用
-const BUILTIN_SCHEMAS = {
-    'aranea_ar-is01': {
-        type: 'aranea_ar-is01',
-        displayName: 'AraneaSDK Basic Sensor',
-        description: '基本センサーデバイス',
-        productType: '001',
-        stateFields: {
-            Trigger1: { type: 'boolean', description: '汎用トリガー1' },
-            Trigger2: { type: 'boolean', description: '汎用トリガー2' },
-            RSSI: { type: 'number', description: 'WiFi信号強度 (dBm)' },
-        },
-        commandFields: {},
-    },
-    'aranea_ar-is04a': {
-        type: 'aranea_ar-is04a',
-        displayName: 'Network Scanner',
-        description: 'ネットワークスキャナー (ESP32)',
-        productType: '004',
-        stateFields: {
-            scanMode: { type: 'string', description: 'スキャンモード (arp/ping/passive)' },
-            discoveredHosts: { type: 'number', description: '発見ホスト数' },
-            lastScanAt: { type: 'string', description: '最終スキャン時刻 (ISO8601)' },
-            RSSI: { type: 'number', description: 'WiFi信号強度 (dBm)' },
-        },
-        commandFields: {
-            startScan: { type: 'boolean', description: 'スキャン開始' },
-            setScanMode: { type: 'string', description: 'スキャンモード設定' },
-        },
-    },
-    'aranea_ar-is05a': {
-        type: 'aranea_ar-is05a',
-        displayName: 'Environment Sensor',
-        description: '環境センサー (ESP32)',
-        productType: '005',
-        stateFields: {
-            temperature: { type: 'number', description: '温度 (℃)' },
-            humidity: { type: 'number', description: '湿度 (%)' },
-            pressure: { type: 'number', description: '気圧 (hPa)' },
-            co2: { type: 'number', description: 'CO2濃度 (ppm)' },
-            RSSI: { type: 'number', description: 'WiFi信号強度 (dBm)' },
-        },
-        commandFields: {
-            calibrate: { type: 'boolean', description: 'センサーキャリブレーション' },
-        },
-    },
-    'aranea_ar-is06a': {
-        type: 'aranea_ar-is06a',
-        displayName: 'Power Monitor',
-        description: '電力モニター (ESP32)',
-        productType: '006',
-        stateFields: {
-            voltage: { type: 'number', description: '電圧 (V)' },
-            current: { type: 'number', description: '電流 (A)' },
-            power: { type: 'number', description: '電力 (W)' },
-            energy: { type: 'number', description: '積算電力量 (Wh)' },
-            RSSI: { type: 'number', description: 'WiFi信号強度 (dBm)' },
-        },
-        commandFields: {
-            resetEnergy: { type: 'boolean', description: '積算電力量リセット' },
-        },
-    },
-    'aranea_ar-is10': {
-        type: 'aranea_ar-is10',
-        displayName: 'Router Inspector',
-        description: 'OpenWrt/AsusWRT ルーターインスペクター',
-        productType: '010',
-        stateFields: {
-            routerType: { type: 'string', description: 'ルータータイプ (openwrt/asuswrt)' },
-            connectedClients: { type: 'number', description: '接続クライアント数' },
-            wanStatus: { type: 'string', description: 'WAN状態' },
-            uptime: { type: 'number', description: '稼働時間 (秒)' },
-        },
-        commandFields: {
-            refresh: { type: 'boolean', description: '状態更新' },
-        },
-    },
-};
+const axios_1 = __importDefault(require("axios"));
+// API Configuration
+const SCHEMA_API_BASE = 'https://asia-northeast1-mobesorder.cloudfunctions.net/araneaSchemaAPI';
+// API Functions
+async function fetchSchemaList() {
+    const response = await axios_1.default.get(`${SCHEMA_API_BASE}?action=list`);
+    return response.data;
+}
+async function fetchSchema(type) {
+    const response = await axios_1.default.get(`${SCHEMA_API_BASE}?action=get&type=${encodeURIComponent(type)}`);
+    return response.data;
+}
 exports.schemaCommand = new commander_1.Command('schema')
-    .description('Type スキーマの取得・表示');
+    .description('Type schema retrieval and validation');
 // schema list
 exports.schemaCommand
     .command('list')
-    .description('利用可能なTypeスキーマ一覧')
-    .action(() => {
-    console.log(chalk_1.default.bold('\n=== AraneaDevice Type スキーマ一覧 ===\n'));
-    const types = Object.keys(BUILTIN_SCHEMAS).sort();
-    console.log(chalk_1.default.cyan('登録済みType:'));
-    console.log('');
-    types.forEach((type) => {
-        const schema = BUILTIN_SCHEMAS[type];
-        console.log(`  ${chalk_1.default.green(type)}`);
-        console.log(`    ${schema.displayName} - ${schema.description}`);
-        console.log(`    ProductType: ${schema.productType}`);
+    .description('List available Type schemas')
+    .action(async () => {
+    const spinner = (0, ora_1.default)('Fetching schema list from API...').start();
+    try {
+        const result = await fetchSchemaList();
+        spinner.stop();
+        console.log(chalk_1.default.bold('\n=== AraneaDevice Type Schema List ===\n'));
+        if (!result.ok || result.count === 0) {
+            console.log(chalk_1.default.yellow('No schemas found.'));
+            console.log(chalk_1.default.gray('Run schema registration script to initialize schemas.'));
+            console.log('');
+            return;
+        }
+        console.log(chalk_1.default.cyan('Registered Types:'));
         console.log('');
-    });
-    console.log(chalk_1.default.gray(`合計: ${types.length} 件`));
-    console.log('');
+        for (const schema of result.schemas) {
+            console.log(`  ${chalk_1.default.green(schema.type)}`);
+            console.log(`    ${schema.displayName} - ${schema.description}`);
+            console.log(`    ProductType: ${schema.productType}`);
+            console.log(`    Capabilities: ${schema.capabilities.join(', ')}`);
+            console.log('');
+        }
+        console.log(chalk_1.default.gray(`Total: ${result.count} types`));
+        console.log('');
+    }
+    catch (error) {
+        spinner.fail('Failed to fetch schema list');
+        if (error.response?.status === 404 || error.code === 'ENOTFOUND') {
+            console.error(chalk_1.default.red('\nSchema API is not available.'));
+            console.error(chalk_1.default.yellow('Please deploy the araneaSchemaAPI function first.'));
+        }
+        else {
+            console.error(chalk_1.default.red(`\nError: ${error.message}`));
+        }
+        process.exit(1);
+    }
 });
 // schema get
 exports.schemaCommand
     .command('get')
-    .description('特定Typeのスキーマ詳細を取得')
-    .requiredOption('-t, --type <type>', '取得するType名')
-    .option('--json', 'JSON形式で出力')
-    .action((options) => {
-    const type = options.type;
-    const schema = BUILTIN_SCHEMAS[type];
-    if (!schema) {
-        console.error(chalk_1.default.red(`\nType "${type}" のスキーマが見つかりません`));
+    .description('Get detailed schema for a specific Type')
+    .requiredOption('-t, --type <type>', 'Type name to retrieve')
+    .option('--json', 'Output as JSON')
+    .action(async (options) => {
+    const spinner = (0, ora_1.default)(`Fetching schema for ${options.type}...`).start();
+    try {
+        const result = await fetchSchema(options.type);
+        spinner.stop();
+        if (!result.ok) {
+            console.error(chalk_1.default.red(`\nSchema "${options.type}" not found`));
+            console.log('');
+            if (result.availableTypes && result.availableTypes.length > 0) {
+                console.log(chalk_1.default.yellow('Available Types:'));
+                result.availableTypes.forEach((t) => {
+                    console.log(`  - ${t}`);
+                });
+            }
+            console.log('');
+            process.exit(1);
+        }
+        const schema = result.schema;
+        if (options.json) {
+            console.log(JSON.stringify(schema, null, 2));
+            return;
+        }
+        console.log(chalk_1.default.bold(`\n=== ${schema.type} Schema ===\n`));
+        console.log(`DisplayName: ${chalk_1.default.cyan(schema.displayName)}`);
+        console.log(`Description: ${schema.description}`);
+        console.log(`ProductType: ${schema.productType}`);
+        console.log(`Capabilities: ${schema.capabilities.join(', ')}`);
+        console.log(`Version: ${schema.version}`);
         console.log('');
-        console.log(chalk_1.default.yellow('利用可能なType:'));
-        Object.keys(BUILTIN_SCHEMAS).forEach((t) => {
-            console.log(`  - ${t}`);
-        });
+        // Features
+        if (schema.features && schema.features.length > 0) {
+            console.log(chalk_1.default.bold('Features:'));
+            schema.features.forEach((f) => {
+                console.log(`  - ${f}`);
+            });
+            console.log('');
+        }
+        // State Schema
+        console.log(chalk_1.default.bold('State Schema (deviceState fields):'));
+        const stateProps = schema.stateSchema?.properties || {};
+        const stateRequired = schema.stateSchema?.required || [];
+        const stateEntries = Object.entries(stateProps);
+        if (stateEntries.length === 0) {
+            console.log(chalk_1.default.gray('  (none)'));
+        }
+        else {
+            stateEntries.forEach(([name, def]) => {
+                const required = stateRequired.includes(name) ? chalk_1.default.red('*') : '';
+                const type = def.type || 'any';
+                const desc = def.description || '';
+                console.log(`  ${chalk_1.default.green(name)}${required}: ${chalk_1.default.yellow(type)}`);
+                if (desc) {
+                    console.log(`    ${desc}`);
+                }
+            });
+        }
         console.log('');
-        process.exit(1);
-    }
-    if (options.json) {
-        console.log(JSON.stringify(schema, null, 2));
-        return;
-    }
-    console.log(chalk_1.default.bold(`\n=== ${schema.type} スキーマ ===\n`));
-    console.log(`DisplayName: ${chalk_1.default.cyan(schema.displayName)}`);
-    console.log(`Description: ${schema.description}`);
-    console.log(`ProductType: ${schema.productType}`);
-    console.log('');
-    // State Fields
-    console.log(chalk_1.default.bold('State Fields (状態レポート):'));
-    const stateFields = Object.entries(schema.stateFields);
-    if (stateFields.length === 0) {
-        console.log(chalk_1.default.gray('  (なし)'));
-    }
-    else {
-        stateFields.forEach(([name, field]) => {
-            console.log(`  ${chalk_1.default.green(name)}: ${chalk_1.default.yellow(field.type)}`);
-            console.log(`    ${field.description}`);
-        });
-    }
-    console.log('');
-    // Command Fields
-    console.log(chalk_1.default.bold('Command Fields (コマンド):'));
-    const commandFields = Object.entries(schema.commandFields);
-    if (commandFields.length === 0) {
-        console.log(chalk_1.default.gray('  (なし)'));
-    }
-    else {
-        commandFields.forEach(([name, field]) => {
-            console.log(`  ${chalk_1.default.green(name)}: ${chalk_1.default.yellow(field.type)}`);
-            console.log(`    ${field.description}`);
+        // Command Schema
+        if (schema.commandSchema) {
+            console.log(chalk_1.default.bold('Command Schema (available commands):'));
+            const cmdProps = schema.commandSchema?.properties || {};
+            const cmdEntries = Object.entries(cmdProps);
+            if (cmdEntries.length === 0) {
+                console.log(chalk_1.default.gray('  (none)'));
+            }
+            else {
+                cmdEntries.forEach(([name, def]) => {
+                    const desc = def.description || '';
+                    console.log(`  ${chalk_1.default.green(name)}`);
+                    if (desc) {
+                        console.log(`    ${desc}`);
+                    }
+                    // Show properties if any
+                    if (def.properties) {
+                        Object.entries(def.properties).forEach(([propName, propDef]) => {
+                            const propType = propDef.type || 'any';
+                            const propDesc = propDef.description || '';
+                            console.log(`      ${chalk_1.default.cyan(propName)}: ${chalk_1.default.yellow(propType)} ${propDesc}`);
+                        });
+                    }
+                });
+            }
+            console.log('');
+        }
+        // Sample State Report
+        console.log(chalk_1.default.bold('Sample State Report Request:'));
+        const sampleState = {};
+        // Generate sample values from state schema
+        Object.entries(stateProps).forEach(([name, def]) => {
+            const type = def.type;
+            if (type === 'boolean') {
+                sampleState[name] = true;
+            }
+            else if (type === 'number' || type === 'integer') {
+                if (name.toLowerCase().includes('rssi')) {
+                    sampleState[name] = -65;
+                }
+                else if (def.minimum !== undefined) {
+                    sampleState[name] = def.minimum;
+                }
+                else {
+                    sampleState[name] = 0;
+                }
+            }
+            else if (type === 'string') {
+                sampleState[name] = def.format === 'date-time' ? new Date().toISOString() : `sample_${name}`;
+            }
+            else if (type === 'object') {
+                sampleState[name] = {};
+            }
+            else if (type === 'array') {
+                sampleState[name] = [];
+            }
         });
+        const sampleRequest = {
+            auth: {
+                tid: 'T9999999999999999999',
+                lacisId: `3${schema.productType.padStart(3, '0')}AABBCCDDEEFF0001`,
+                cic: '******',
+            },
+            report: {
+                type: schema.type,
+                state: sampleState,
+            },
+        };
+        console.log(chalk_1.default.gray(JSON.stringify(sampleRequest, null, 2)));
+        console.log('');
     }
-    console.log('');
-    // サンプルリクエスト生成
-    console.log(chalk_1.default.bold('サンプル状態レポート:'));
-    const sampleState = {};
-    Object.entries(schema.stateFields).forEach(([name, field]) => {
-        switch (field.type) {
-            case 'boolean':
-                sampleState[name] = true;
-                break;
-            case 'number':
-                sampleState[name] = name === 'RSSI' ? -65 : 0;
-                break;
-            case 'string':
-                sampleState[name] = `sample_${name}`;
-                break;
-            default:
-                sampleState[name] = null;
+    catch (error) {
+        spinner.fail('Failed to fetch schema');
+        if (error.response?.status === 404) {
+            console.error(chalk_1.default.red(`\nSchema "${options.type}" not found`));
+            // Try to show available types
+            try {
+                const listResult = await fetchSchemaList();
+                if (listResult.ok && listResult.count > 0) {
+                    console.log('');
+                    console.log(chalk_1.default.yellow('Available Types:'));
+                    listResult.schemas.forEach((s) => {
+                        console.log(`  - ${s.type}`);
+                    });
+                }
+            }
+            catch {
+                // Ignore
+            }
         }
-    });
-    const sampleRequest = {
-        auth: {
-            tid: 'T9999999999999999999',
-            lacisId: '3004AABBCCDDEEFF0001',
-            cic: '******',
-        },
-        report: {
-            type: schema.type,
-            state: sampleState,
-        },
-    };
-    console.log(chalk_1.default.gray(JSON.stringify(sampleRequest, null, 2)));
-    console.log('');
+        else {
+            console.error(chalk_1.default.red(`\nError: ${error.message}`));
+        }
+        console.log('');
+        process.exit(1);
+    }
 });
 // schema validate
 exports.schemaCommand
     .command('validate')
-    .description('状態レポートJSONをスキーマに対して検証')
-    .requiredOption('-t, --type <type>', 'Type名')
-    .requiredOption('-f, --file <path>', 'JSONファイルパス')
-    .action((options) => {
-    const spinner = (0, ora_1.default)('検証中...').start();
+    .description('Validate a state report JSON against schema')
+    .requiredOption('-t, --type <type>', 'Type name')
+    .requiredOption('-f, --file <path>', 'JSON file path')
+    .action(async (options) => {
+    const spinner = (0, ora_1.default)('Validating...').start();
     try {
         const fs = require('fs');
         const path = require('path');
-        const type = options.type;
-        const schema = BUILTIN_SCHEMAS[type];
-        if (!schema) {
-            spinner.fail(`Type "${type}" のスキーマが見つかりません`);
+        // Fetch schema from API
+        const schemaResult = await fetchSchema(options.type);
+        if (!schemaResult.ok) {
+            spinner.fail(`Schema "${options.type}" not found`);
             process.exit(1);
         }
+        const schema = schemaResult.schema;
+        // Read input file
         const filePath = path.resolve(options.file);
         if (!fs.existsSync(filePath)) {
-            spinner.fail(`ファイルが見つかりません: ${filePath}`);
+            spinner.fail(`File not found: ${filePath}`);
             process.exit(1);
         }
         const fileContent = fs.readFileSync(filePath, 'utf-8');
         const data = JSON.parse(fileContent);
         spinner.stop();
-        console.log(chalk_1.default.bold(`\n=== スキーマ検証: ${type} ===\n`));
+        console.log(chalk_1.default.bold(`\n=== Schema Validation: ${options.type} ===\n`));
         const issues = [];
         const warnings = [];
-        // state フィールドの検証
+        // Extract state from input
         const state = data.report?.state || data.state || data;
-        Object.entries(schema.stateFields).forEach(([fieldName, fieldDef]) => {
+        // Get state schema properties
+        const stateProps = schema.stateSchema?.properties || {};
+        const stateRequired = schema.stateSchema?.required || [];
+        // Check required fields
+        stateRequired.forEach((fieldName) => {
             if (!(fieldName in state)) {
-                warnings.push(`フィールド "${fieldName}" が存在しません`);
+                issues.push(`Required field "${fieldName}" is missing`);
             }
-            else {
+        });
+        // Validate field types
+        Object.entries(stateProps).forEach(([fieldName, fieldDef]) => {
+            if (fieldName in state) {
                 const value = state[fieldName];
-                const actualType = typeof value;
+                const actualType = Array.isArray(value) ? 'array' : typeof value;
                 const expectedType = fieldDef.type;
-                if (expectedType === 'number' && actualType !== 'number') {
-                    issues.push(`"${fieldName}": number型が期待されますが ${actualType}型です`);
+                if (expectedType === 'number' || expectedType === 'integer') {
+                    if (actualType !== 'number') {
+                        issues.push(`"${fieldName}": expected number but got ${actualType}`);
+                    }
+                    else {
+                        // Check range
+                        if (fieldDef.minimum !== undefined && value < fieldDef.minimum) {
+                            issues.push(`"${fieldName}": value ${value} is below minimum ${fieldDef.minimum}`);
+                        }
+                        if (fieldDef.maximum !== undefined && value > fieldDef.maximum) {
+                            issues.push(`"${fieldName}": value ${value} is above maximum ${fieldDef.maximum}`);
+                        }
+                    }
+                }
+                else if (expectedType === 'string') {
+                    if (actualType !== 'string') {
+                        issues.push(`"${fieldName}": expected string but got ${actualType}`);
+                    }
                 }
-                else if (expectedType === 'string' && actualType !== 'string') {
-                    issues.push(`"${fieldName}": string型が期待されますが ${actualType}型です`);
+                else if (expectedType === 'boolean') {
+                    if (actualType !== 'boolean') {
+                        issues.push(`"${fieldName}": expected boolean but got ${actualType}`);
+                    }
                 }
-                else if (expectedType === 'boolean' && actualType !== 'boolean') {
-                    issues.push(`"${fieldName}": boolean型が期待されますが ${actualType}型です`);
+                else if (expectedType === 'object') {
+                    if (actualType !== 'object' || Array.isArray(value)) {
+                        issues.push(`"${fieldName}": expected object but got ${actualType}`);
+                    }
                 }
+                else if (expectedType === 'array') {
+                    if (!Array.isArray(value)) {
+                        issues.push(`"${fieldName}": expected array but got ${actualType}`);
+                    }
+                }
+            }
+            else if (!stateRequired.includes(fieldName)) {
+                warnings.push(`Optional field "${fieldName}" is not present`);
             }
         });
-        // 未定義フィールドのチェック
+        // Check for unknown fields
         Object.keys(state).forEach((key) => {
-            if (!(key in schema.stateFields)) {
-                warnings.push(`未定義フィールド "${key}" が含まれています (無視されます)`);
+            if (!(key in stateProps)) {
+                warnings.push(`Unknown field "${key}" (will be ignored)`);
             }
         });
-        // 結果表示
+        // Show results
         if (issues.length === 0) {
-            console.log(chalk_1.default.green('✓ スキーマ検証に成功しました'));
+            console.log(chalk_1.default.green('Validation passed'));
         }
         else {
-            console.log(chalk_1.default.red('✗ スキーマ検証エラー:'));
+            console.log(chalk_1.default.red('Validation errors:'));
             issues.forEach((issue) => {
                 console.log(chalk_1.default.red(`  - ${issue}`));
             });
         }
         if (warnings.length > 0) {
             console.log('');
-            console.log(chalk_1.default.yellow('警告:'));
+            console.log(chalk_1.default.yellow('Warnings:'));
             warnings.forEach((warning) => {
                 console.log(chalk_1.default.yellow(`  - ${warning}`));
             });
         }
         console.log('');
+        if (issues.length > 0) {
+            process.exit(1);
+        }
     }
     catch (error) {
-        spinner.fail(`検証エラー: ${error.message}`);
+        spinner.fail(`Validation error: ${error.message}`);
         process.exit(1);
     }
 });

package/package.json

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