@next-open-ai/openbot 0.1.8 → 0.2.1

package/dist/server/database/database.service.js

@@ -5,34 +5,61 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { Injectable } from '@nestjs/common';
-import Database from 'better-sqlite3';
-import { mkdirSync, existsSync } from 'fs';
+import { mkdirSync, existsSync, readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
 let DatabaseService = class DatabaseService {
-    db = null;
-    getDb() {
-        if (!this.db) {
-            const pathEnv = process.env.OPENBOT_DB_PATH;
-            const defaultDir = join(homedir(), '.openbot', 'desktop', 'data');
-            const path = pathEnv === ':memory:' || pathEnv === ''
-                ? ':memory:'
-                : pathEnv ?? join(process.env.OPENBOT_DB_DIR ?? defaultDir, 'openbot.db');
-            if (path !== ':memory:') {
-                const dir = path.endsWith('.db') ? join(path, '..') : path;
-                if (!existsSync(dir)) {
-                    mkdirSync(dir, { recursive: true });
-                }
+    sqlDb = null;
+    dbPath = null;
+    initPromise = null;
+    async onModuleInit() {
+        if (this.initPromise)
+            return this.initPromise;
+        this.initPromise = this.doInit();
+        return this.initPromise;
+    }
+    async doInit() {
+        const pathEnv = process.env.OPENBOT_DB_PATH;
+        const defaultDir = join(homedir(), '.openbot', 'desktop', 'data');
+        const path = pathEnv === ':memory:' || pathEnv === ''
+            ? ':memory:'
+            : pathEnv ?? join(process.env.OPENBOT_DB_DIR ?? defaultDir, 'openbot.db');
+        if (path !== ':memory:') {
+            const dir = path.endsWith('.db') ? join(path, '..') : path;
+            if (!existsSync(dir)) {
+                mkdirSync(dir, { recursive: true });
+            }
+        }
+        const initSqlJs = (await import('sql.js')).default;
+        const SQL = await initSqlJs();
+        let db;
+        if (path === ':memory:') {
+            db = new SQL.Database();
+            this.dbPath = ':memory:';
+        }
+        else {
+            if (existsSync(path)) {
+                const buf = readFileSync(path);
+                db = new SQL.Database(new Uint8Array(buf));
             }
-            this.db = new Database(path);
-            this.db.pragma('journal_mode = WAL');
-            this.runMigrations();
+            else {
+                db = new SQL.Database();
+            }
+            this.dbPath = path;
         }
-        return this.db;
+        this.sqlDb = db;
+        db.run('PRAGMA foreign_keys = ON;');
+        this.runMigrations();
+    }
+    getDb() {
+        if (!this.sqlDb) {
+            throw new Error('Database not initialized. Ensure onModuleInit() has completed (Nest awaits it before listening).');
+        }
+        return this.sqlDb;
     }
     runMigrations() {
-        const db = this.db;
-        db.exec(`
+        const db = this.getDb();
+        const ddl = `
           CREATE TABLE IF NOT EXISTS sessions (
             id TEXT PRIMARY KEY,
             created_at INTEGER NOT NULL,
@@ -100,15 +127,18 @@ let DatabaseService = class DatabaseService {
           );
           CREATE INDEX IF NOT EXISTS idx_token_usage_session_id ON token_usage(session_id);
           CREATE INDEX IF NOT EXISTS idx_token_usage_created_at ON token_usage(created_at);
-        `);
-        // Add session type column if missing (scheduled vs chat)
+        `;
+        const statements = ddl.split(';').map((s) => s.trim()).filter(Boolean);
+        for (const stmt of statements) {
+            db.run(stmt + ';');
+        }
         try {
-            const info = db.prepare('PRAGMA table_info(sessions)').all();
+            const info = this.all('PRAGMA table_info(sessions)', []);
             if (!info.some((c) => c.name === 'type')) {
-                db.exec(`ALTER TABLE sessions ADD COLUMN type TEXT DEFAULT 'chat'`);
+                db.run("ALTER TABLE sessions ADD COLUMN type TEXT DEFAULT 'chat';");
             }
             if (!info.some((c) => c.name === 'agent_id')) {
-                db.exec(`ALTER TABLE sessions ADD COLUMN agent_id TEXT DEFAULT 'default'`);
+                db.run("ALTER TABLE sessions ADD COLUMN agent_id TEXT DEFAULT 'default';");
             }
         }
         catch (_) {
@@ -116,19 +146,56 @@ let DatabaseService = class DatabaseService {
         }
     }
     run(sql, params = []) {
-        return this.getDb().prepare(sql).run(...params);
+        const db = this.getDb();
+        db.run(sql, params);
+        const rows = db.exec('SELECT changes() AS c, last_insert_rowid() AS id');
+        const c = rows[0]?.values?.[0]?.[0] ?? 0;
+        const id = rows[0]?.values?.[0]?.[1] ?? 0;
+        return { changes: Number(c), lastInsertRowid: Number(id) };
     }
     get(sql, params = []) {
-        return this.getDb().prepare(sql).get(...params);
+        const db = this.getDb();
+        const stmt = db.prepare(sql);
+        try {
+            stmt.bind(params);
+            const hasRow = stmt.step();
+            return (hasRow ? stmt.getAsObject() : undefined);
+        }
+        finally {
+            stmt.free();
+        }
     }
     all(sql, params = []) {
-        return this.getDb().prepare(sql).all(...params);
+        const db = this.getDb();
+        const stmt = db.prepare(sql);
+        try {
+            stmt.bind(params);
+            const rows = [];
+            while (stmt.step()) {
+                rows.push(stmt.getAsObject());
+            }
+            return rows;
+        }
+        finally {
+            stmt.free();
+        }
     }
     onModuleDestroy() {
-        if (this.db) {
-            this.db.close();
-            this.db = null;
+        if (!this.sqlDb)
+            return;
+        if (this.dbPath && this.dbPath !== ':memory:') {
+            try {
+                const data = this.sqlDb.export();
+                writeFileSync(this.dbPath, Buffer.from(data));
+            }
+            catch (e) {
+                console.error('[DatabaseService] Failed to persist database:', e);
+            }
         }
+        this.sqlDb.close();
+        this.sqlDb = null;
+        this.dbPath = null;
+        this.initPromise = null;
     }
 };
 DatabaseService = __decorate([

package/dist/server/main.js

@@ -1,22 +1,9 @@
 /**
- * OpenBot Desktop 后端入口（NestJS HTTP API，前缀 server-api）。
- * 与 WebSocket Gateway（src/gateway/）是不同进程；Gateway 可拉本进程并代理 /server-api。
+ * OpenBot Desktop 后端入口（独立模式）。
+ * 内嵌到 Gateway 时由 gateway/server 调用 createNestAppEmbedded，不经过本文件。
  */
-import { NestFactory } from '@nestjs/core';
-import { AppModule } from './app.module.js';
-async function bootstrap() {
-    const app = await NestFactory.create(AppModule, {
-        cors: true,
-    });
-    // Set global prefix
-    app.setGlobalPrefix('server-api');
-    // Enable CORS for frontend
-    app.enableCors({
-        origin: ['http://localhost:5173', 'http://localhost:38081'],
-        credentials: true,
-    });
-    const port = process.env.PORT || 38081;
-    await app.listen(port);
+import { createNestAppStandalone } from './bootstrap.js';
+const port = Number(process.env.PORT) || 38081;
+createNestAppStandalone(port).then(() => {
     console.log(`🚀 OpenBot Desktop Server running on http://localhost:${port}`);
-}
-bootstrap();
+});

package/dist/server/skills/skills.service.js

@@ -16,7 +16,7 @@ import { tmpdir } from 'os';
 import { randomUUID } from 'crypto';
 import { exec } from 'child_process';
 import { promisify } from 'util';
-import { getOpenbotAgentDir, getOpenbotWorkspaceDir } from '../../agent/agent-dir.js';
+import { getOpenbotAgentDir, getOpenbotWorkspaceDir } from '../../core/agent/agent-dir.js';
 const execAsync = promisify(exec);
 /** 工作区技能名仅允许英文、数字、下划线、连字符 */
 const SKILL_NAME_REGEX = /^[a-zA-Z0-9_-]+$/;

package/dist/server/workspace/workspace.service.js

@@ -8,7 +8,7 @@ import { Injectable } from '@nestjs/common';
 import { readdir, stat, rm } from 'fs/promises';
 import { join, resolve, relative } from 'path';
 import { existsSync } from 'fs';
-import { getOpenbotWorkspaceDir } from '../../agent/agent-dir.js';
+import { getOpenbotWorkspaceDir } from '../../core/agent/agent-dir.js';
 let WorkspaceService = class WorkspaceService {
     getWorkspaceRoot(name) {
         return join(getOpenbotWorkspaceDir(), name);

package/package.json

@@ -3,7 +3,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.1.8",
+    "version": "0.2.1",
     "description": "CLI and library to run prompts with skill paths (Agent Skills style). Use as npm package or openbot CLI.",
     "type": "module",
     "main": "dist/index.js",
@@ -19,15 +19,13 @@
         "dist",
         "skills",
         "README.md",
-        "desktop/renderer/dist"
+        "apps/desktop/renderer/dist"
     ],
     "bin": {
-        "openbot": "./dist/cli.js"
+        "openbot": "./dist/cli/cli.js"
     },
-"dependencies": {
-    "better-sqlite3": "^11.6.0",
-    "croner": "^9.1.0",
-    "@mariozechner/pi-ai": "^0.51.2",
+    "dependencies": {
+        "@mariozechner/pi-ai": "^0.51.2",
         "@mariozechner/pi-coding-agent": "^0.51.2",
         "@nestjs/common": "^10.3.0",
         "@nestjs/core": "^10.3.0",
@@ -37,18 +35,20 @@
         "@sinclair/typebox": "^0.34.41",
         "agent-browser": "^0.8.5",
         "commander": "^14.0.2",
+        "croner": "^9.1.0",
         "reflect-metadata": "^0.2.1",
         "rxjs": "^7.8.1",
+        "sql.js": "^1.13.0",
         "vectra": "^0.12.3",
         "ws": "^8.19.0"
     },
-"devDependencies": {
-    "@types/better-sqlite3": "^7.6.11",
-    "@types/express": "^4.17.21",
-        "@types/node": "^22.0.0",
+    "devDependencies": {
+        "@nestjs/testing": "^10.3.0",
+        "@types/express": "^4.17.21",
         "@types/jest": "^29.5.14",
+        "@types/node": "^22.0.0",
+        "@types/sql.js": "^1.4.9",
         "@types/ws": "^8.18.1",
-        "@nestjs/testing": "^10.3.0",
         "jest": "^29.7.0",
         "ts-jest": "^29.2.5",
         "typescript": "^5.7.0"
@@ -56,16 +56,19 @@
     "scripts": {
         "clean": "rm -rf dist",
         "build": "npm run clean && tsc",
-        "prepublishOnly": "npm run build && cd desktop && npm run build:renderer",
-        "start": "node dist/cli.js",
-        "run": "node dist/cli.js",
-        "dev": "npm run build && node dist/cli.js",
-        "desktop:dev": "cd desktop && npm run dev",
-        "desktop:build": "cd desktop && npm run build",
-        "desktop:install": "cd desktop && npm install",
+        "build:web": "cd apps/desktop && npm run build:renderer",
+        "build:all": "npm run build && npm run build:web",
+        "prepublishOnly": "npm run build && cd apps/desktop && npm run build:renderer",
+        "start": "node dist/cli/cli.js",
+        "run": "node dist/cli/cli.js",
+        "dev": "npm run build && node dist/cli/cli.js",
+        "desktop:dev": "cd apps/desktop && npm run dev",
+        "desktop:build": "cd apps/desktop && npm run build",
+        "desktop:install": "cd apps/desktop && npm install",
         "test": "jest --config test/jest.config.cjs",
         "test:memory": "node test/run-memory.mjs",
-        "test:e2e": "OPENBOT_DB_PATH=:memory: jest --config test/jest.config.cjs --testPathPattern=e2e"
+        "test:e2e": "OPENBOT_DB_PATH=:memory: jest --config test/jest.config.cjs --testPathPattern=e2e",
+        "test:gateway-e2e": "npm run build && node test/gateway/server.e2e.mjs"
     },
     "engines": {
         "node": ">=20.0.0"