tirtc-devtools-cli 0.0.9 → 0.0.11

package/dist/{devtools/cli → cli}/src/index.js

@@ -1,21 +1,17 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const protocol_client_1 = require("../../../app-server/protocol-client");
-const facade_1 = require("./facade");
+const protocol_client_1 = require("../../app-server/protocol-client");
+const bootstrap_flows_1 = require("./bootstrap_flows");
 const config_1 = require("./config");
+const facade_1 = require("./facade");
 const guide_1 = require("./guide");
 const session_manager_1 = require("./session_manager");
 const media_assets_1 = require("./media_assets");
 const token_command_1 = require("./token_command");
 const transport_1 = require("./transport");
 const progress_1 = require("./progress");
-const CLI_VERSION = '0.0.9';
+const CLI_VERSION = '0.0.10';
 const HOST_VERSION = '1.0.0';
 const PROTOCOL_VERSION = '1.0.0';
 if (process.argv.includes('--version') || process.argv.includes('-V')) {
@@ -29,6 +25,16 @@ function getCliOptions() {
     return program.opts();
 }
 function normalizeError(error) {
+    if (typeof error === 'object' && error !== null) {
+        const typed = error;
+        if (typed.reasonCode || typed.message || typed.data !== undefined) {
+            return {
+                reasonCode: typed.reasonCode ?? 'internal_error',
+                message: typed.message ?? 'Internal error',
+                data: typed.data,
+            };
+        }
+    }
     if (error instanceof Error) {
         return {
             reasonCode: 'internal_error',
@@ -36,14 +42,6 @@ function normalizeError(error) {
             data: undefined,
         };
     }
-    if (typeof error === 'object' && error !== null) {
-        const typed = error;
-        return {
-            reasonCode: typed.reasonCode ?? 'internal_error',
-            message: typed.message ?? 'Internal error',
-            data: typed.data,
-        };
-    }
     return {
         reasonCode: 'internal_error',
         message: 'Internal error',
@@ -55,18 +53,14 @@ function createSessionTransport(sessionId) {
     return new transport_1.SocketTransport(session.socketPath);
 }
 function isBootstrapCommand(cmdName) {
-    return cmdName === 'service start' || cmdName === 'connection connect';
+    return cmdName === 'service start' || cmdName === 'connection connect' || cmdName === 'client start';
 }
-function resolveSessionForCommand(cmdName, options, config) {
-    const sessionOptions = {
-        logRootDir: config.logging?.root_dir,
-        consoleMirror: config.logging?.console_mirror,
-    };
-    if (cmdName === 'connection connect') {
+function resolveSessionForCommand(cmdName, options) {
+    if (cmdName === 'connection connect' || cmdName === 'client start') {
         if (options.session && options.session.trim().length > 0) {
-            throw new Error('connection connect always creates a new session; do not pass --session');
+            throw new Error(cmdName + ' always creates a new session; do not pass --session');
         }
-        const created = (0, session_manager_1.createSession)({ ...sessionOptions, role: 'client' });
+        const created = (0, session_manager_1.createSession)({ role: 'client' });
         return { sessionId: created.sessionId, created: true };
     }
     if (cmdName === 'service start') {
@@ -75,7 +69,7 @@ function resolveSessionForCommand(cmdName, options, config) {
             (0, session_manager_1.setSessionRole)(existing.sessionId, 'service');
             return { sessionId: existing.sessionId, created: false };
         }
-        const created = (0, session_manager_1.createSession)({ ...sessionOptions, role: 'service' });
+        const created = (0, session_manager_1.createSession)({ role: 'service' });
         return { sessionId: created.sessionId, created: true };
     }
     if (cmdName === 'debug bootstrap qrcode') {
@@ -109,104 +103,21 @@ function toResultObject(result) {
 }
 function requireConfigPath(configPath) {
     if (!configPath || configPath.trim().length === 0) {
-        throw new Error('server-only service start requires --config <path>');
+        throw new Error('command requires --config <path>');
     }
     return configPath;
 }
-function validateServerConfig(config) {
-    const server = config.server;
-    const license = server?.license?.trim() ?? '';
-    const mp4Path = server?.mp4_path?.trim() ?? '';
-    const audioStreamIdValue = server?.audio_stream_id;
-    const videoStreamIdValue = server?.video_stream_id;
-    if (license.length === 0) {
-        throw new Error('server-only config requires [server].license');
-    }
-    if (mp4Path.length === 0) {
-        throw new Error('server-only config requires [server].mp4_path');
-    }
-    if (typeof audioStreamIdValue !== 'number') {
-        throw new Error('server-only config requires [server].audio_stream_id as non-negative integer');
-    }
-    if (!Number.isInteger(audioStreamIdValue) || audioStreamIdValue < 0) {
-        throw new Error('server-only config requires [server].audio_stream_id as non-negative integer');
-    }
-    if (typeof videoStreamIdValue !== 'number') {
-        throw new Error('server-only config requires [server].video_stream_id as non-negative integer');
-    }
-    if (!Number.isInteger(videoStreamIdValue) || videoStreamIdValue < 0) {
-        throw new Error('server-only config requires [server].video_stream_id as non-negative integer');
-    }
-    const audioStreamId = audioStreamIdValue;
-    const videoStreamId = videoStreamIdValue;
-    if (audioStreamId === videoStreamId) {
-        throw new Error('server-only config requires distinct audio_stream_id and video_stream_id');
-    }
-    const resolvedMp4Path = path_1.default.resolve(mp4Path);
-    let stats;
-    try {
-        stats = fs_1.default.statSync(resolvedMp4Path);
-    }
-    catch {
-        throw new Error('server-only config mp4_path does not exist: ' + resolvedMp4Path);
-    }
-    if (!stats.isFile()) {
-        throw new Error('server-only config mp4_path must be a readable file: ' + resolvedMp4Path);
-    }
-    const serviceEntry = server?.service_entry?.trim();
-    return {
-        serviceEntry: serviceEntry && serviceEntry.length > 0 ? serviceEntry : undefined,
-        license,
-        mp4Path: resolvedMp4Path,
-        audioStreamId,
-        videoStreamId,
-    };
-}
 function createProgressIndicator(options) {
     if (options.json) {
         return undefined;
     }
     return new progress_1.ProgressIndicator();
 }
-function resolvePrepareOutputRoot(config) {
-    const loggingRoot = config.logging?.root_dir?.trim();
-    if (loggingRoot && loggingRoot.length > 0) {
-        return path_1.default.resolve(loggingRoot, '..', 'prepared-assets');
-    }
-    return path_1.default.resolve(process.cwd(), '.tmp', 'tirtc-devtools-cli', 'prepared-assets');
-}
-async function applyConfiguredServerBootstrap(client, config, progress) {
-    const server = validateServerConfig(config);
-    progress?.start('Preparing MP4 assets');
-    const prepared = await (0, media_assets_1.prepareMediaAssets)({
-        source: server.mp4Path,
-        outputRoot: resolvePrepareOutputRoot(config),
-    });
-    progress?.update('Prepared MP4 assets');
-    const bootstrapSendStreams = [
-        { streamId: server.audioStreamId, media: 'audio' },
-        { streamId: server.videoStreamId, media: 'video' },
-    ].map(({ streamId, media }) => ({
-        streamId,
-        media,
-        source: {
-            mode: 'local_assets',
-            local_assets: {
-                assets_dir: prepared.assets_dir,
-            },
-        },
-    }));
-    return {
-        preparedAssetsDir: prepared.assets_dir,
-        mediaSendPolicy: 'AUTO_ON_CONNECTED',
-        bootstrapSendStreams,
-    };
-}
 async function runCommand(cmdName, params, options) {
     let transport;
     try {
         const config = (0, config_1.loadConfig)(options.config);
-        const session = resolveSessionForCommand(cmdName, options, config);
+        const session = resolveSessionForCommand(cmdName, options);
         transport = createSessionTransport(session.sessionId);
         const client = new protocol_client_1.AppServerClient(transport);
         await client.initialize({ name: 'tirtc-devtools-cli', version: CLI_VERSION });
@@ -218,7 +129,7 @@ async function runCommand(cmdName, params, options) {
         if (cmdName === 'service start') {
             const progress = createProgressIndicator(options);
             try {
-                const autoApplied = await applyConfiguredServerBootstrap(client, config, progress);
+                const autoApplied = await (0, bootstrap_flows_1.applyConfiguredServerBootstrap)(client, config, progress);
                 progress?.update('Starting service session');
                 const requestParams = {
                     ...params,
@@ -240,6 +151,20 @@ async function runCommand(cmdName, params, options) {
                 throw error;
             }
         }
+        if (cmdName === 'client start') {
+            const progress = createProgressIndicator(options);
+            try {
+                const token = String(params.token ?? '');
+                const result = await (0, bootstrap_flows_1.applyClientStartBootstrap)(client, config, token, progress);
+                printSuccess(options, result, session, cmdName);
+                transport.stop();
+                return 0;
+            }
+            catch (error) {
+                progress?.fail('Client start failed');
+                throw error;
+            }
+        }
         const result = await client.sendRequest(method, params);
         resultForPrint = result;
         printSuccess(options, resultForPrint, session, cmdName);
@@ -353,7 +278,7 @@ program.name('tirtc-devtools-cli')
     .description('TiRTC DevTools CLI')
     .option('--config <path>', '配置文件路径（TOML）')
     .option('--json', '以机器可读 JSON 输出（便于脚本集成）')
-    .option('--session <sessionId>', '指定会话 ID；除 service start/connect 外必须传');
+    .option('--session <sessionId>', '指定会话 ID；除 service start / client start / connection connect 外必须传');
 const host = program.command('host').description('Host 基础能力（状态、停止）');
 host.command('status').description('查看 Host/service/connection/artifact 当前状态').action(() => {
     runAndExit(runCommand('host status', {}, getCliOptions()));
@@ -390,10 +315,7 @@ const hostSession = host.command('session').description('会话管理：start/li
 hostSession.command('start').description('创建并启动一个常驻会话，返回 sessionId').action(() => {
     try {
         const options = getCliOptions();
-        const config = (0, config_1.loadConfig)(options.config);
         const created = (0, session_manager_1.createSession)({
-            logRootDir: config.logging?.root_dir,
-            consoleMirror: config.logging?.console_mirror,
             role: 'idle',
         });
         if (options.json) {
@@ -503,49 +425,41 @@ service.command('start')
     .action(() => {
     const options = getCliOptions();
     const config = (0, config_1.loadConfig)(requireConfigPath(options.config));
-    const server = validateServerConfig(config);
+    const server = (0, bootstrap_flows_1.validateServerConfig)(config);
     runAndExit(runCommand('service start', { serviceEntry: server.serviceEntry, license: server.license, timeoutMs: 5000 }, options));
 });
 service.command('stop').description('停止服务端监听').action(() => {
     runAndExit(runCommand('service stop', {}, getCliOptions()));
 });
+const client = program.command('client').description('客户端正式入口：连接远端并自动挂载本地 web preview');
+client.command('start')
+    .description('读取 [client] 配置，连接远端并输出 web preview 地址')
+    .requiredOption('--token <token>', '显式 client token；不支持 auto token')
+    .action((commandOptions) => {
+    const options = getCliOptions();
+    (0, config_1.loadConfig)(requireConfigPath(options.config));
+    runAndExit(runCommand('client start', { token: commandOptions.token }, options));
+});
 const connection = program.command('connection').description('客户端能力：主动连接远端 peer');
 connection.command('show').description('查看连接状态').action(() => {
     runAndExit(runCommand('connection show', {}, getCliOptions()));
 });
-connection.command('connect [service_entry] <peer_id> [token]')
-    .description('作为客户端连接远端（总是新建 session；不传 token 时自动签发）')
+connection.command('connect [service_entry] <peer_id> <token>')
+    .description('作为客户端连接远端（总是新建 session；要求显式 token）')
     .action((serviceEntry, peerId, token) => {
     const config = (0, config_1.loadConfig)(getCliOptions().config);
-    const finalServiceEntry = [serviceEntry, config.connection?.service_entry, config.server?.service_entry]
+    const finalServiceEntry = [serviceEntry, config.client?.service_entry, config.server?.service_entry]
         .find((value) => typeof value === 'string' && value.trim().length > 0);
-    const configuredToken = config.connection?.token?.trim();
-    const manualToken = (token ?? configuredToken)?.trim();
-    const autoTokenCfg = config.connection?.auto_token;
-    const hasAutoToken = Boolean(autoTokenCfg?.access_id && autoTokenCfg?.secret_key);
-    if (!manualToken && !hasAutoToken) {
-        throw new Error('connection connect requires token or [connection.auto_token] access_id/secret_key');
+    const manualToken = token.trim();
+    if (manualToken.length === 0) {
+        throw new Error('connection connect requires non-empty token');
     }
     const params = {
         serviceEntry: finalServiceEntry,
         peerId,
+        token: manualToken,
         timeoutMs: 5000,
     };
-    if (manualToken && manualToken.length > 0) {
-        params.token = manualToken;
-        params.tokenMode = 'manual';
-    }
-    else {
-        params.tokenMode = 'auto';
-        params.autoToken = {
-            openapiEntry: autoTokenCfg?.openapi_entry,
-            accessId: autoTokenCfg?.access_id,
-            secretKey: autoTokenCfg?.secret_key,
-            localId: autoTokenCfg?.local_id ?? peerId,
-            userTtlSeconds: autoTokenCfg?.user_ttl_seconds,
-            channelTtlSeconds: autoTokenCfg?.channel_ttl_seconds,
-        };
-    }
     runAndExit(runCommand('connection connect', params, getCliOptions()));
 });
 connection.command('disconnect').description('断开当前连接').action(() => {

package/dist/{devtools/cli → cli}/src/session_manager.js

@@ -14,6 +14,7 @@ const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const crypto_1 = require("crypto");
 const child_process_1 = require("child_process");
+const default_paths_1 = require("./default_paths");
 const embedded_paths_1 = require("./embedded_paths");
 const kStartupTimeoutMs = 5000;
 const kStartupPollIntervalMs = 100;
@@ -26,11 +27,7 @@ function sleepMs(ms) {
     Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
 }
 function getStateDir() {
-    const explicit = process.env.TIRTC_DEVTOOL_STATE_DIR;
-    if (explicit && explicit.trim().length > 0) {
-        return explicit.trim();
-    }
-    return path_1.default.join(os_1.default.homedir(), '.tirtc-devtools-cli');
+    return (0, default_paths_1.resolveCliStateRootDir)();
 }
 function getSocketDir() {
     const explicit = process.env.TIRTC_DEVTOOL_SOCKET_DIR;
@@ -148,10 +145,10 @@ function getHostBinaryPath() {
         return embedded;
     }
     const candidates = [
-        path_1.default.resolve(__dirname, '../../../app-server/bin/tirtc-devtool-host.js'),
-        path_1.default.resolve(__dirname, '../../../../../../app-server/bin/tirtc-devtool-host.js'),
-        path_1.default.resolve(process.cwd(), '../app-server/bin/tirtc-devtool-host.js'),
-        path_1.default.resolve(process.cwd(), 'app-server/bin/tirtc-devtool-host.js'),
+        path_1.default.resolve(__dirname, '../../../products/app-server/bin/tirtc-devtool-host.js'),
+        path_1.default.resolve(__dirname, '../../../../../../products/app-server/bin/tirtc-devtool-host.js'),
+        path_1.default.resolve(process.cwd(), '../products/app-server/bin/tirtc-devtool-host.js'),
+        path_1.default.resolve(process.cwd(), 'products/app-server/bin/tirtc-devtool-host.js'),
     ];
     for (const candidate of candidates) {
         if (fs_1.default.existsSync(candidate)) {
@@ -191,7 +188,7 @@ function waitForSocketReady(socketPath, pid) {
     throw new Error(`session startup timeout: socket not ready within ${kStartupTimeoutMs}ms`);
 }
 function resolveDefaultLogRootDir() {
-    return path_1.default.resolve(process.cwd(), '.tmp/tirtc-devtools-cli/logging');
+    return (0, default_paths_1.resolveCliLogRootDir)();
 }
 function createSession(options) {
     const runtimePlatform = resolveRuntimePlatform();
@@ -285,7 +282,8 @@ function killLingeringHostProcesses() {
             if (!Number.isInteger(pid) || pid <= 1 || pid === process.pid) {
                 continue;
             }
-            if (!command.includes('app-server/bin/tirtc-devtool-host.js')) {
+            if (!command.includes('products/app-server/bin/tirtc-devtool-host.js') &&
+                !command.includes('vendor/app-server/bin/tirtc-devtool-host.js')) {
                 continue;
             }
             if (!command.includes('--socket /tmp/tirtc-')) {

package/dist/{devtools/cli → cli}/src/token_command.js

@@ -67,6 +67,29 @@ async function runTokenIssue(params, options) {
         return printTokenCommandError(error, options);
     }
 }
+async function runLicenseQrcode(params, options) {
+    try {
+        const result = await (0, token_tool_1.buildLicenseQrcode)(params);
+        if (options.json) {
+            console.log(JSON.stringify({
+                code: 0,
+                message: 'OK',
+                data: {
+                    payload: result.payload,
+                    payloadJson: result.payloadJson,
+                    qrCodePngPath: result.qrCodePngPath,
+                },
+            }));
+        }
+        else {
+            console.log((0, token_tool_1.formatLicenseQrcodeConsoleOutput)(result));
+        }
+        return 0;
+    }
+    catch (error) {
+        return printTokenCommandError(error, options);
+    }
+}
 function resolveTokenIssueCredential(explicitValue, envVarName, optionName) {
     const normalizedExplicit = explicitValue?.trim();
     if (normalizedExplicit) {
@@ -120,6 +143,43 @@ async function runTokenIssueFromCli(peerId, commandOptions, options) {
         return printTokenCommandError(error, options);
     }
 }
+async function runLicenseQrcodeFromCli(license, commandOptions, options) {
+    const parsePositiveInt = (name, raw) => {
+        if (raw === undefined) {
+            return undefined;
+        }
+        const parsed = Number.parseInt(raw, 10);
+        if (!Number.isInteger(parsed) || parsed <= 0) {
+            throw new Error(name + ' must be a positive integer');
+        }
+        return parsed;
+    };
+    const parseQrErrorCorrectionLevel = (raw) => {
+        if (raw === undefined) {
+            return undefined;
+        }
+        const normalized = raw.trim().toUpperCase();
+        if (normalized !== 'L' && normalized !== 'M' && normalized !== 'Q' && normalized !== 'H') {
+            throw new Error('qr-error-correction-level must be one of: L, M, Q, H');
+        }
+        return normalized;
+    };
+    try {
+        const normalizedLicense = license.trim();
+        if (normalizedLicense.length === 0) {
+            throw new Error('license must not be empty');
+        }
+        return await runLicenseQrcode({
+            license: normalizedLicense,
+            serviceEntry: commandOptions.serviceEntry,
+            qrErrorCorrectionLevel: parseQrErrorCorrectionLevel(commandOptions.qrErrorCorrectionLevel),
+            asciiMaxColumns: parsePositiveInt('ascii-max-columns', commandOptions.asciiMaxColumns),
+        }, options);
+    }
+    catch (error) {
+        return printTokenCommandError(error, options);
+    }
+}
 function registerTokenCommands(program, getCliOptions, runAndExit) {
     const token = program.command('token').description('Token 工具：签发 token，并输出可直接使用的 JSON 与本地二维码 PNG');
     token.command('issue <peer_id>')
@@ -136,4 +196,13 @@ function registerTokenCommands(program, getCliOptions, runAndExit) {
         .action((peerId, commandOptions) => {
         runAndExit(runTokenIssueFromCli(peerId, commandOptions, getCliOptions()));
     });
+    const license = program.command('license').description('License 工具：生成 server 扫码 JSON 与本地二维码 PNG');
+    license.command('qrcode <license>')
+        .description('生成包含 license 与可选 service_entry 的本地二维码')
+        .option('--service-entry <entry>', '可选 service entry；留空时消费端走默认值')
+        .option('--qr-error-correction-level <level>', '二维码纠错级别：L/M/Q/H；默认 M')
+        .option('--ascii-max-columns <columns>', 'ASCII 二维码最大宽度；不传时优先读取当前终端宽度或 COLUMNS')
+        .action((licenseValue, commandOptions) => {
+        runAndExit(runLicenseQrcodeFromCli(licenseValue, commandOptions, getCliOptions()));
+    });
 }

package/dist/{devtools/cli → cli}/src/token_tool.d.ts

@@ -30,9 +30,35 @@ export type TokenIssueOutput = {
     qrCodeAscii: string;
     qrCodeAsciiIncluded: boolean;
 };
+export type LicenseQrcodeInput = {
+    license: string;
+    serviceEntry?: string;
+    qrErrorCorrectionLevel?: 'L' | 'M' | 'Q' | 'H';
+    asciiMaxColumns?: number;
+};
+export type LicenseQrcodePayload = {
+    license: string;
+    service_entry: string;
+};
+export type LicenseQrcodeOutput = {
+    payload: LicenseQrcodePayload;
+    payloadJson: string;
+    qrCodePngPath: string;
+    qrCodeAscii: string;
+    qrCodeAsciiIncluded: boolean;
+};
+export declare function resolveIssueTokenEnvironment(runtimePlatform?: string, fromDir?: string): {
+    runtimePlatform: string;
+    runtimeBundleRoot: string;
+    repoRoot: string;
+    addonPath: string;
+};
 export declare function issueToken(input: TokenIssueInput): Promise<string>;
 export declare function buildIssuedTokenPayload(input: TokenIssueInput, token: string): IssuedTokenPayload;
+export declare function buildLicenseQrcodePayload(input: LicenseQrcodeInput): LicenseQrcodePayload;
 export declare function writePngQrcode(payloadJson: string, outputPath: string, errorCorrectionLevel: 'L' | 'M' | 'Q' | 'H'): Promise<string>;
 export declare function buildAsciiQrcode(payloadJson: string, terminalColumns?: number, errorCorrectionLevel?: 'L' | 'M' | 'Q' | 'H'): Promise<string>;
 export declare function issueTokenWithQrcode(input: TokenIssueInput): Promise<TokenIssueOutput>;
+export declare function buildLicenseQrcode(input: LicenseQrcodeInput): Promise<LicenseQrcodeOutput>;
 export declare function formatTokenIssueConsoleOutput(output: TokenIssueOutput): string;
+export declare function formatLicenseQrcodeConsoleOutput(output: LicenseQrcodeOutput): string;