Refactor database access to use a unified dbAdapter for SQLite and PostgreSQL
- Replaced direct database calls with dbAdapter methods in fieldRoutes, itemRoutes, listRoutes, syncRoutes, and webRoutes. - Implemented a new db.ts file to handle database interactions for both SQLite and PostgreSQL. - Added WebSocket support for real-time synchronization in WebSocketSyncClient and ws.ts. - Updated TypeScript configuration to include WebSocket types. - Created a new WebSocket server for handling sync requests and responses. - Ensured compatibility with both SQLite and PostgreSQL by using parameterized queries.
This commit is contained in:
@@ -1,4 +1,35 @@
|
||||
#################################################################
|
||||
# Server
|
||||
#################################################################
|
||||
PORT=3000
|
||||
DB_PATH=/data/collabtable.db
|
||||
NODE_ENV=production
|
||||
SERVER_PASSWORD=your_secure_password_here
|
||||
|
||||
#################################################################
|
||||
# Database backend selection
|
||||
# - sqlite (default if not set)
|
||||
# - postgres
|
||||
#################################################################
|
||||
# Choose the DB client; if omitted or not set to "postgres", SQLite is used
|
||||
DB_CLIENT=sqlite
|
||||
|
||||
#################################################################
|
||||
# SQLite configuration (used when DB_CLIENT=sqlite)
|
||||
#################################################################
|
||||
# Path to the SQLite database file. Default in code: ./data/collabtable.db
|
||||
# For Docker, you may prefer a volume path like /data/collabtable.db
|
||||
DB_PATH=/data/collabtable.db
|
||||
|
||||
#################################################################
|
||||
# PostgreSQL configuration (used when DB_CLIENT=postgres)
|
||||
# You can either provide a single DATABASE_URL or the PG* variables below
|
||||
#################################################################
|
||||
# Example URL: postgres://user:password@localhost:5432/collabtable
|
||||
DATABASE_URL=
|
||||
|
||||
# If DATABASE_URL is not set, these individual settings are used:
|
||||
PGHOST=localhost
|
||||
PGPORT=5432
|
||||
PGUSER=postgres
|
||||
PGPASSWORD=
|
||||
PGDATABASE=collabtable
|
||||
|
||||
Generated
+185
-2
@@ -12,13 +12,17 @@
|
||||
"better-sqlite3": "^11.0.0",
|
||||
"cors": "^2.8.5",
|
||||
"dotenv": "^16.3.1",
|
||||
"express": "^4.18.2"
|
||||
"express": "^4.18.2",
|
||||
"pg": "^8.11.3",
|
||||
"ws": "^8.16.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/better-sqlite3": "^7.6.11",
|
||||
"@types/cors": "^2.8.17",
|
||||
"@types/express": "^4.17.21",
|
||||
"@types/node": "^20.10.6",
|
||||
"@types/pg": "^8.10.2",
|
||||
"@types/ws": "^8.5.10",
|
||||
"ts-node-dev": "^2.0.0",
|
||||
"typescript": "^5.3.3"
|
||||
}
|
||||
@@ -183,6 +187,18 @@
|
||||
"undici-types": "~6.21.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/pg": {
|
||||
"version": "8.15.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.15.5.tgz",
|
||||
"integrity": "sha512-LF7lF6zWEKxuT3/OR8wAZGzkg4ENGXFNyiV/JeOt9z5B+0ZVwbql9McqX5c/WStFq1GaGso7H1AzP/qSzmlCKQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@types/node": "*",
|
||||
"pg-protocol": "*",
|
||||
"pg-types": "^2.2.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/qs": {
|
||||
"version": "6.14.0",
|
||||
"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz",
|
||||
@@ -244,6 +260,16 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/ws": {
|
||||
"version": "8.18.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
|
||||
"integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/accepts": {
|
||||
"version": "1.3.8",
|
||||
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
|
||||
@@ -1418,6 +1444,95 @@
|
||||
"integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/pg": {
|
||||
"version": "8.16.3",
|
||||
"resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz",
|
||||
"integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"pg-connection-string": "^2.9.1",
|
||||
"pg-pool": "^3.10.1",
|
||||
"pg-protocol": "^1.10.3",
|
||||
"pg-types": "2.2.0",
|
||||
"pgpass": "1.0.5"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 16.0.0"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"pg-cloudflare": "^1.2.7"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"pg-native": ">=3.0.1"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"pg-native": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/pg-cloudflare": {
|
||||
"version": "1.2.7",
|
||||
"resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz",
|
||||
"integrity": "sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==",
|
||||
"license": "MIT",
|
||||
"optional": true
|
||||
},
|
||||
"node_modules/pg-connection-string": {
|
||||
"version": "2.9.1",
|
||||
"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.9.1.tgz",
|
||||
"integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/pg-int8": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
|
||||
"integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
|
||||
"license": "ISC",
|
||||
"engines": {
|
||||
"node": ">=4.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/pg-pool": {
|
||||
"version": "3.10.1",
|
||||
"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.10.1.tgz",
|
||||
"integrity": "sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==",
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"pg": ">=8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/pg-protocol": {
|
||||
"version": "1.10.3",
|
||||
"resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.3.tgz",
|
||||
"integrity": "sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/pg-types": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
|
||||
"integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"pg-int8": "1.0.1",
|
||||
"postgres-array": "~2.0.0",
|
||||
"postgres-bytea": "~1.0.0",
|
||||
"postgres-date": "~1.0.4",
|
||||
"postgres-interval": "^1.1.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/pgpass": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
|
||||
"integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"split2": "^4.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/picomatch": {
|
||||
"version": "2.3.1",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
|
||||
@@ -1431,6 +1546,45 @@
|
||||
"url": "https://github.com/sponsors/jonschlinkert"
|
||||
}
|
||||
},
|
||||
"node_modules/postgres-array": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
|
||||
"integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/postgres-bytea": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
|
||||
"integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/postgres-date": {
|
||||
"version": "1.0.7",
|
||||
"resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
|
||||
"integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/postgres-interval": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
|
||||
"integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"xtend": "^4.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/prebuild-install": {
|
||||
"version": "7.1.3",
|
||||
"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
|
||||
@@ -1832,6 +1986,15 @@
|
||||
"source-map": "^0.6.0"
|
||||
}
|
||||
},
|
||||
"node_modules/split2": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
|
||||
"integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
|
||||
"license": "ISC",
|
||||
"engines": {
|
||||
"node": ">= 10.x"
|
||||
}
|
||||
},
|
||||
"node_modules/statuses": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
|
||||
@@ -2126,11 +2289,31 @@
|
||||
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/ws": {
|
||||
"version": "8.18.3",
|
||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
|
||||
"integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=10.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"bufferutil": "^4.0.1",
|
||||
"utf-8-validate": ">=5.0.2"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"bufferutil": {
|
||||
"optional": true
|
||||
},
|
||||
"utf-8-validate": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/xtend": {
|
||||
"version": "4.0.2",
|
||||
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
|
||||
"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.4"
|
||||
|
||||
@@ -16,13 +16,17 @@
|
||||
"express": "^4.18.2",
|
||||
"cors": "^2.8.5",
|
||||
"better-sqlite3": "^11.0.0",
|
||||
"dotenv": "^16.3.1"
|
||||
"dotenv": "^16.3.1",
|
||||
"ws": "^8.16.0",
|
||||
"pg": "^8.11.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/express": "^4.17.21",
|
||||
"@types/cors": "^2.8.17",
|
||||
"@types/node": "^20.10.6",
|
||||
"@types/better-sqlite3": "^7.6.11",
|
||||
"@types/ws": "^8.5.10",
|
||||
"@types/pg": "^8.10.2",
|
||||
"typescript": "^5.3.3",
|
||||
"ts-node-dev": "^2.0.0"
|
||||
}
|
||||
|
||||
@@ -0,0 +1,266 @@
|
||||
import dotenv from 'dotenv';
|
||||
import BetterSqlite3, { Database as SqliteDB } from 'better-sqlite3';
|
||||
import { Pool, PoolClient, QueryResult } from 'pg';
|
||||
import path from 'path';
|
||||
import fs from 'fs';
|
||||
|
||||
dotenv.config();
|
||||
|
||||
type Param = any;
|
||||
|
||||
type ExecResult = { changes: number };
|
||||
|
||||
type TxClient = {
|
||||
query: (text: string, params?: any[]) => Promise<QueryResult<any>>;
|
||||
};
|
||||
|
||||
interface DBAdapter {
|
||||
queryAll(sql: string, params?: Param[]): Promise<any[]>;
|
||||
queryOne(sql: string, params?: Param[]): Promise<any | undefined>;
|
||||
execute(sql: string, params?: Param[]): Promise<ExecResult>;
|
||||
transaction<T>(fn: (tx: DBAdapter) => Promise<T>): Promise<T>;
|
||||
initialize(): Promise<void>;
|
||||
}
|
||||
|
||||
function ensureDataDir(dbPath: string) {
|
||||
const dir = path.dirname(dbPath);
|
||||
if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
|
||||
}
|
||||
|
||||
function replaceQuotedIdentifiers(sql: string) {
|
||||
// Convert backticks to double quotes for portability
|
||||
return sql.replace(/`([^`]+)`/g, '"$1"');
|
||||
}
|
||||
|
||||
function convertQMarksToPg(sql: string) {
|
||||
// Replace each ? with $1, $2, ...
|
||||
let idx = 0;
|
||||
return sql.replace(/\?/g, () => `$${++idx}`);
|
||||
}
|
||||
|
||||
// ---------- SQLite Adapter (wrapped async) ----------
|
||||
class SqliteAdapter implements DBAdapter {
|
||||
private db: SqliteDB;
|
||||
|
||||
constructor() {
|
||||
const DB_PATH = process.env.DB_PATH || './data/collabtable.db';
|
||||
ensureDataDir(DB_PATH);
|
||||
this.db = new BetterSqlite3(DB_PATH);
|
||||
this.db.pragma('foreign_keys = ON');
|
||||
}
|
||||
|
||||
async initialize(): Promise<void> {
|
||||
// Create tables and indexes
|
||||
this.db.exec(`
|
||||
CREATE TABLE IF NOT EXISTS lists (
|
||||
id TEXT PRIMARY KEY,
|
||||
name TEXT NOT NULL,
|
||||
createdAt INTEGER NOT NULL,
|
||||
updatedAt INTEGER NOT NULL,
|
||||
isDeleted INTEGER DEFAULT 0
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS fields (
|
||||
id TEXT PRIMARY KEY,
|
||||
name TEXT NOT NULL,
|
||||
fieldType TEXT NOT NULL,
|
||||
fieldOptions TEXT,
|
||||
listId TEXT NOT NULL,
|
||||
"order" INTEGER NOT NULL,
|
||||
createdAt INTEGER NOT NULL,
|
||||
updatedAt INTEGER NOT NULL,
|
||||
isDeleted INTEGER DEFAULT 0,
|
||||
FOREIGN KEY (listId) REFERENCES lists(id)
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS items (
|
||||
id TEXT PRIMARY KEY,
|
||||
listId TEXT NOT NULL,
|
||||
createdAt INTEGER NOT NULL,
|
||||
updatedAt INTEGER NOT NULL,
|
||||
isDeleted INTEGER DEFAULT 0,
|
||||
FOREIGN KEY (listId) REFERENCES lists(id)
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS item_values (
|
||||
id TEXT PRIMARY KEY,
|
||||
itemId TEXT NOT NULL,
|
||||
fieldId TEXT NOT NULL,
|
||||
value TEXT,
|
||||
updatedAt INTEGER NOT NULL,
|
||||
FOREIGN KEY (itemId) REFERENCES items(id),
|
||||
FOREIGN KEY (fieldId) REFERENCES fields(id)
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_fields_listId ON fields(listId);
|
||||
CREATE INDEX IF NOT EXISTS idx_items_listId ON items(listId);
|
||||
CREATE INDEX IF NOT EXISTS idx_item_values_itemId ON item_values(itemId);
|
||||
CREATE INDEX IF NOT EXISTS idx_item_values_fieldId ON item_values(fieldId);
|
||||
`);
|
||||
}
|
||||
|
||||
async queryAll(sql: string, params: Param[] = []): Promise<any[]> {
|
||||
const stmt = this.db.prepare(replaceQuotedIdentifiers(sql));
|
||||
return stmt.all(...params);
|
||||
}
|
||||
|
||||
async queryOne(sql: string, params: Param[] = []): Promise<any | undefined> {
|
||||
const stmt = this.db.prepare(replaceQuotedIdentifiers(sql));
|
||||
return stmt.get(...params);
|
||||
}
|
||||
|
||||
async execute(sql: string, params: Param[] = []): Promise<ExecResult> {
|
||||
const stmt = this.db.prepare(replaceQuotedIdentifiers(sql));
|
||||
const res = stmt.run(...params);
|
||||
return { changes: res.changes || 0 };
|
||||
}
|
||||
|
||||
async transaction<T>(fn: (tx: DBAdapter) => Promise<T>): Promise<T> {
|
||||
const tx = this.db.transaction((innerFn: (tx: DBAdapter) => Promise<T>) => {
|
||||
// We can reuse the same adapter since better-sqlite3 is transactional per connection
|
||||
return innerFn(this);
|
||||
});
|
||||
return tx(fn);
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- Postgres Adapter ----------
|
||||
class PostgresAdapter implements DBAdapter {
|
||||
private pool: Pool;
|
||||
|
||||
constructor() {
|
||||
const connectionString = process.env.DATABASE_URL;
|
||||
if (connectionString) {
|
||||
this.pool = new Pool({ connectionString });
|
||||
} else {
|
||||
this.pool = new Pool({
|
||||
host: process.env.PGHOST || 'localhost',
|
||||
port: parseInt(process.env.PGPORT || '5432', 10),
|
||||
user: process.env.PGUSER || 'postgres',
|
||||
password: process.env.PGPASSWORD || '',
|
||||
database: process.env.PGDATABASE || 'collabtable'
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async initialize(): Promise<void> {
|
||||
// Create tables if not exist, keeping schema aligned with sqlite (isDeleted INTEGER 0/1)
|
||||
const client = await this.pool.connect();
|
||||
try {
|
||||
await client.query('BEGIN');
|
||||
await client.query(`
|
||||
CREATE TABLE IF NOT EXISTS lists (
|
||||
id TEXT PRIMARY KEY,
|
||||
name TEXT NOT NULL,
|
||||
createdAt BIGINT NOT NULL,
|
||||
updatedAt BIGINT NOT NULL,
|
||||
isDeleted INTEGER DEFAULT 0
|
||||
);
|
||||
`);
|
||||
await client.query(`
|
||||
CREATE TABLE IF NOT EXISTS fields (
|
||||
id TEXT PRIMARY KEY,
|
||||
name TEXT NOT NULL,
|
||||
fieldType TEXT NOT NULL,
|
||||
fieldOptions TEXT,
|
||||
listId TEXT NOT NULL,
|
||||
"order" INTEGER NOT NULL,
|
||||
createdAt BIGINT NOT NULL,
|
||||
updatedAt BIGINT NOT NULL,
|
||||
isDeleted INTEGER DEFAULT 0,
|
||||
FOREIGN KEY (listId) REFERENCES lists(id)
|
||||
);
|
||||
`);
|
||||
await client.query(`
|
||||
CREATE TABLE IF NOT EXISTS items (
|
||||
id TEXT PRIMARY KEY,
|
||||
listId TEXT NOT NULL,
|
||||
createdAt BIGINT NOT NULL,
|
||||
updatedAt BIGINT NOT NULL,
|
||||
isDeleted INTEGER DEFAULT 0,
|
||||
FOREIGN KEY (listId) REFERENCES lists(id)
|
||||
);
|
||||
`);
|
||||
await client.query(`
|
||||
CREATE TABLE IF NOT EXISTS item_values (
|
||||
id TEXT PRIMARY KEY,
|
||||
itemId TEXT NOT NULL,
|
||||
fieldId TEXT NOT NULL,
|
||||
value TEXT,
|
||||
updatedAt BIGINT NOT NULL,
|
||||
FOREIGN KEY (itemId) REFERENCES items(id),
|
||||
FOREIGN KEY (fieldId) REFERENCES fields(id)
|
||||
);
|
||||
`);
|
||||
await client.query(`CREATE INDEX IF NOT EXISTS idx_fields_listId ON fields(listId);`);
|
||||
await client.query(`CREATE INDEX IF NOT EXISTS idx_items_listId ON items(listId);`);
|
||||
await client.query(`CREATE INDEX IF NOT EXISTS idx_item_values_itemId ON item_values(itemId);`);
|
||||
await client.query(`CREATE INDEX IF NOT EXISTS idx_item_values_fieldId ON item_values(fieldId);`);
|
||||
await client.query('COMMIT');
|
||||
} catch (e) {
|
||||
await client.query('ROLLBACK');
|
||||
throw e;
|
||||
} finally {
|
||||
client.release();
|
||||
}
|
||||
}
|
||||
|
||||
private async runQuery(sql: string, params: Param[] = [], client?: PoolClient): Promise<QueryResult<any>> {
|
||||
// Replace backticks and convert ? to $1..$n
|
||||
const text = convertQMarksToPg(replaceQuotedIdentifiers(sql));
|
||||
const runner = client || this.pool;
|
||||
// @ts-ignore - Pool and PoolClient share query signature
|
||||
return runner.query(text, params);
|
||||
}
|
||||
|
||||
async queryAll(sql: string, params: Param[] = []): Promise<any[]> {
|
||||
const res = await this.runQuery(sql, params);
|
||||
return res.rows;
|
||||
}
|
||||
|
||||
async queryOne(sql: string, params: Param[] = []): Promise<any | undefined> {
|
||||
const res = await this.runQuery(sql, params);
|
||||
return res.rows[0];
|
||||
}
|
||||
|
||||
async execute(sql: string, params: Param[] = []): Promise<ExecResult> {
|
||||
const res = await this.runQuery(sql, params);
|
||||
return { changes: res.rowCount || 0 };
|
||||
}
|
||||
|
||||
async transaction<T>(fn: (tx: DBAdapter) => Promise<T>): Promise<T> {
|
||||
const client = await this.pool.connect();
|
||||
try {
|
||||
await client.query('BEGIN');
|
||||
const txAdapter: DBAdapter = {
|
||||
initialize: async () => {},
|
||||
queryAll: (sql, params) => this.runQuery(sql, params, client).then(r => r.rows),
|
||||
queryOne: (sql, params) => this.runQuery(sql, params, client).then(r => r.rows[0]),
|
||||
execute: (sql, params) => this.runQuery(sql, params, client).then(r => ({ changes: r.rowCount || 0 })),
|
||||
transaction: async (inner) => {
|
||||
// Nested transactions are treated as flat for simplicity
|
||||
return inner(txAdapter);
|
||||
}
|
||||
} as DBAdapter;
|
||||
const result = await fn(txAdapter);
|
||||
await client.query('COMMIT');
|
||||
return result;
|
||||
} catch (e) {
|
||||
await client.query('ROLLBACK');
|
||||
throw e;
|
||||
} finally {
|
||||
client.release();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const clientType = (process.env.DB_CLIENT || process.env.DB_TYPE || 'sqlite').toLowerCase();
|
||||
export const dbAdapter: DBAdapter = clientType === 'postgres' || clientType === 'postgresql'
|
||||
? new PostgresAdapter()
|
||||
: new SqliteAdapter();
|
||||
|
||||
export async function initializeDatabase() {
|
||||
await dbAdapter.initialize();
|
||||
}
|
||||
|
||||
export type { DBAdapter };
|
||||
@@ -1,13 +1,15 @@
|
||||
import express from 'express';
|
||||
import cors from 'cors';
|
||||
import dotenv from 'dotenv';
|
||||
import { initializeDatabase } from './database';
|
||||
import { initializeDatabase } from './db';
|
||||
import { authenticatePassword } from './middleware/auth';
|
||||
import listRoutes from './routes/listRoutes';
|
||||
import fieldRoutes from './routes/fieldRoutes';
|
||||
import itemRoutes from './routes/itemRoutes';
|
||||
import syncRoutes from './routes/syncRoutes';
|
||||
import webRoutes from './routes/webRoutes';
|
||||
import { createServer } from 'http';
|
||||
import { initWebSocket } from './ws';
|
||||
|
||||
dotenv.config();
|
||||
|
||||
@@ -36,23 +38,33 @@ app.use('/api', syncRoutes);
|
||||
app.use('/', webRoutes);
|
||||
|
||||
// Initialize database and start server
|
||||
try {
|
||||
initializeDatabase();
|
||||
console.log('Database synchronized successfully');
|
||||
console.log('Database models loaded:');
|
||||
console.log('- Lists');
|
||||
console.log('- Fields');
|
||||
console.log('- Items');
|
||||
console.log('- ItemValues');
|
||||
|
||||
app.listen(PORT, () => {
|
||||
console.log(`Server is running on port ${PORT}`);
|
||||
console.log(`Environment: ${process.env.NODE_ENV || 'development'}`);
|
||||
console.log(`Database: ${process.env.DB_PATH || './data/collabtable.db'}`);
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Database initialization error:', error);
|
||||
process.exit(1);
|
||||
}
|
||||
(async () => {
|
||||
try {
|
||||
await initializeDatabase();
|
||||
console.log('Database synchronized successfully');
|
||||
console.log('Database models loaded:');
|
||||
console.log('- Lists');
|
||||
console.log('- Fields');
|
||||
console.log('- Items');
|
||||
console.log('- ItemValues');
|
||||
|
||||
const server = createServer(app);
|
||||
initWebSocket(server);
|
||||
server.listen(PORT, () => {
|
||||
console.log(`Server is running on port ${PORT}`);
|
||||
console.log(`Environment: ${process.env.NODE_ENV || 'development'}`);
|
||||
const dbClient = (process.env.DB_CLIENT || process.env.DB_TYPE || 'sqlite').toLowerCase();
|
||||
if (dbClient === 'postgres' || dbClient === 'postgresql') {
|
||||
const source = process.env.DATABASE_URL ? 'DATABASE_URL' : 'PGHOST/PGDATABASE';
|
||||
console.log(`Database: PostgreSQL (${source})`);
|
||||
} else {
|
||||
console.log(`Database: ${process.env.DB_PATH || './data/collabtable.db'}`);
|
||||
}
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Database initialization error:', error);
|
||||
process.exit(1);
|
||||
}
|
||||
})();
|
||||
|
||||
export default app;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { Router, Request, Response } from 'express';
|
||||
import { db } from '../database';
|
||||
import { dbAdapter } from '../db';
|
||||
|
||||
const router = Router();
|
||||
|
||||
// Get fields for a list
|
||||
router.get('/list/:listId', async (req: Request, res: Response) => {
|
||||
try {
|
||||
const fields = db.prepare('SELECT * FROM fields WHERE listId = ? AND isDeleted = 0 ORDER BY `order` ASC').all(req.params.listId);
|
||||
const fields = await dbAdapter.queryAll('SELECT * FROM fields WHERE listId = ? AND isDeleted = 0 ORDER BY "order" ASC', [req.params.listId]);
|
||||
const formattedFields = (fields as any[]).map(field => ({ ...field, isDeleted: !!field.isDeleted }));
|
||||
res.json(formattedFields);
|
||||
} catch (error) {
|
||||
@@ -18,12 +18,11 @@ router.get('/list/:listId', async (req: Request, res: Response) => {
|
||||
router.post('/', async (req: Request, res: Response) => {
|
||||
try {
|
||||
const { id, name, fieldType, fieldOptions, listId, order, createdAt, updatedAt, isDeleted } = req.body;
|
||||
db.prepare(`
|
||||
INSERT INTO fields (id, name, fieldType, fieldOptions, listId, \`order\`, createdAt, updatedAt, isDeleted)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
`).run(id, name, fieldType, fieldOptions, listId, order, createdAt, updatedAt, isDeleted ? 1 : 0);
|
||||
|
||||
const field = db.prepare('SELECT * FROM fields WHERE id = ?').get(id);
|
||||
await dbAdapter.execute(
|
||||
'INSERT INTO fields (id, name, fieldType, fieldOptions, listId, "order", createdAt, updatedAt, isDeleted) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)',
|
||||
[id, name, fieldType, fieldOptions, listId, order, createdAt, updatedAt, isDeleted ? 1 : 0]
|
||||
);
|
||||
const field = await dbAdapter.queryOne('SELECT * FROM fields WHERE id = ?', [id]);
|
||||
res.status(201).json({ ...(field as any), isDeleted: !!(field as any).isDeleted });
|
||||
} catch (error) {
|
||||
res.status(500).json({ error: 'Failed to create field' });
|
||||
@@ -35,17 +34,16 @@ router.put('/:id', async (req: Request, res: Response) => {
|
||||
try {
|
||||
const updatedAt = Date.now();
|
||||
const { name, fieldType, fieldOptions, order } = req.body;
|
||||
const result = db.prepare(`
|
||||
UPDATE fields
|
||||
SET name = ?, fieldType = ?, fieldOptions = ?, \`order\` = ?, updatedAt = ?
|
||||
WHERE id = ?
|
||||
`).run(name, fieldType, fieldOptions, order, updatedAt, req.params.id);
|
||||
const result = await dbAdapter.execute(
|
||||
'UPDATE fields SET name = ?, fieldType = ?, fieldOptions = ?, "order" = ?, updatedAt = ? WHERE id = ?',
|
||||
[name, fieldType, fieldOptions, order, updatedAt, req.params.id]
|
||||
);
|
||||
|
||||
if (result.changes === 0) {
|
||||
return res.status(404).json({ error: 'Field not found' });
|
||||
}
|
||||
|
||||
const field = db.prepare('SELECT * FROM fields WHERE id = ?').get(req.params.id);
|
||||
const field = await dbAdapter.queryOne('SELECT * FROM fields WHERE id = ?', [req.params.id]);
|
||||
res.json({ ...(field as any), isDeleted: !!(field as any).isDeleted });
|
||||
} catch (error) {
|
||||
res.status(500).json({ error: 'Failed to update field' });
|
||||
@@ -56,11 +54,10 @@ router.put('/:id', async (req: Request, res: Response) => {
|
||||
router.delete('/:id', async (req: Request, res: Response) => {
|
||||
try {
|
||||
const updatedAt = Date.now();
|
||||
const result = db.prepare(`
|
||||
UPDATE fields
|
||||
SET isDeleted = 1, updatedAt = ?
|
||||
WHERE id = ?
|
||||
`).run(updatedAt, req.params.id);
|
||||
const result = await dbAdapter.execute(
|
||||
'UPDATE fields SET isDeleted = 1, updatedAt = ? WHERE id = ?',
|
||||
[updatedAt, req.params.id]
|
||||
);
|
||||
|
||||
if (result.changes === 0) {
|
||||
return res.status(404).json({ error: 'Field not found' });
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { Router, Request, Response } from 'express';
|
||||
import { db } from '../database';
|
||||
import { dbAdapter } from '../db';
|
||||
|
||||
const router = Router();
|
||||
|
||||
// Get items for a list
|
||||
router.get('/list/:listId', async (req: Request, res: Response) => {
|
||||
try {
|
||||
const items = db.prepare('SELECT * FROM items WHERE listId = ? AND isDeleted = 0 ORDER BY updatedAt DESC').all(req.params.listId);
|
||||
const items = await dbAdapter.queryAll('SELECT * FROM items WHERE listId = ? AND isDeleted = 0 ORDER BY updatedAt DESC', [req.params.listId]);
|
||||
const formattedItems = (items as any[]).map(item => ({ ...item, isDeleted: !!item.isDeleted }));
|
||||
res.json(formattedItems);
|
||||
} catch (error) {
|
||||
@@ -17,7 +17,7 @@ router.get('/list/:listId', async (req: Request, res: Response) => {
|
||||
// Get item values
|
||||
router.get('/:itemId/values', async (req: Request, res: Response) => {
|
||||
try {
|
||||
const values = db.prepare('SELECT * FROM item_values WHERE itemId = ?').all(req.params.itemId);
|
||||
const values = await dbAdapter.queryAll('SELECT * FROM item_values WHERE itemId = ?', [req.params.itemId]);
|
||||
res.json(values);
|
||||
} catch (error) {
|
||||
res.status(500).json({ error: 'Failed to fetch item values' });
|
||||
@@ -28,12 +28,11 @@ router.get('/:itemId/values', async (req: Request, res: Response) => {
|
||||
router.post('/', async (req: Request, res: Response) => {
|
||||
try {
|
||||
const { id, listId, createdAt, updatedAt, isDeleted } = req.body;
|
||||
db.prepare(`
|
||||
INSERT INTO items (id, listId, createdAt, updatedAt, isDeleted)
|
||||
VALUES (?, ?, ?, ?, ?)
|
||||
`).run(id, listId, createdAt, updatedAt, isDeleted ? 1 : 0);
|
||||
|
||||
const item = db.prepare('SELECT * FROM items WHERE id = ?').get(id);
|
||||
await dbAdapter.execute(
|
||||
'INSERT INTO items (id, listId, createdAt, updatedAt, isDeleted) VALUES (?, ?, ?, ?, ?)',
|
||||
[id, listId, createdAt, updatedAt, isDeleted ? 1 : 0]
|
||||
);
|
||||
const item = await dbAdapter.queryOne('SELECT * FROM items WHERE id = ?', [id]);
|
||||
res.status(201).json({ ...(item as any), isDeleted: !!(item as any).isDeleted });
|
||||
} catch (error) {
|
||||
res.status(500).json({ error: 'Failed to create item' });
|
||||
@@ -44,15 +43,11 @@ router.post('/', async (req: Request, res: Response) => {
|
||||
router.post('/values', async (req: Request, res: Response) => {
|
||||
try {
|
||||
const { id, itemId, fieldId, value, updatedAt } = req.body;
|
||||
db.prepare(`
|
||||
INSERT INTO item_values (id, itemId, fieldId, value, updatedAt)
|
||||
VALUES (?, ?, ?, ?, ?)
|
||||
ON CONFLICT(id) DO UPDATE SET
|
||||
value = ?,
|
||||
updatedAt = ?
|
||||
`).run(id, itemId, fieldId, value, updatedAt, value, updatedAt);
|
||||
|
||||
const itemValue = db.prepare('SELECT * FROM item_values WHERE id = ?').get(id);
|
||||
await dbAdapter.execute(
|
||||
'INSERT INTO item_values (id, itemId, fieldId, value, updatedAt) VALUES (?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET value = ?, updatedAt = ?',
|
||||
[id, itemId, fieldId, value, updatedAt, value, updatedAt]
|
||||
);
|
||||
const itemValue = await dbAdapter.queryOne('SELECT * FROM item_values WHERE id = ?', [id]);
|
||||
res.json(itemValue);
|
||||
} catch (error) {
|
||||
res.status(500).json({ error: 'Failed to save item value' });
|
||||
@@ -63,17 +58,16 @@ router.post('/values', async (req: Request, res: Response) => {
|
||||
router.put('/:id', async (req: Request, res: Response) => {
|
||||
try {
|
||||
const updatedAt = Date.now();
|
||||
const result = db.prepare(`
|
||||
UPDATE items
|
||||
SET updatedAt = ?
|
||||
WHERE id = ?
|
||||
`).run(updatedAt, req.params.id);
|
||||
const result = await dbAdapter.execute(
|
||||
'UPDATE items SET updatedAt = ? WHERE id = ?',
|
||||
[updatedAt, req.params.id]
|
||||
);
|
||||
|
||||
if (result.changes === 0) {
|
||||
return res.status(404).json({ error: 'Item not found' });
|
||||
}
|
||||
|
||||
const item = db.prepare('SELECT * FROM items WHERE id = ?').get(req.params.id);
|
||||
const item = await dbAdapter.queryOne('SELECT * FROM items WHERE id = ?', [req.params.id]);
|
||||
res.json({ ...(item as any), isDeleted: !!(item as any).isDeleted });
|
||||
} catch (error) {
|
||||
res.status(500).json({ error: 'Failed to update item' });
|
||||
@@ -84,11 +78,10 @@ router.put('/:id', async (req: Request, res: Response) => {
|
||||
router.delete('/:id', async (req: Request, res: Response) => {
|
||||
try {
|
||||
const updatedAt = Date.now();
|
||||
const result = db.prepare(`
|
||||
UPDATE items
|
||||
SET isDeleted = 1, updatedAt = ?
|
||||
WHERE id = ?
|
||||
`).run(updatedAt, req.params.id);
|
||||
const result = await dbAdapter.execute(
|
||||
'UPDATE items SET isDeleted = 1, updatedAt = ? WHERE id = ?',
|
||||
[updatedAt, req.params.id]
|
||||
);
|
||||
|
||||
if (result.changes === 0) {
|
||||
return res.status(404).json({ error: 'Item not found' });
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { Router, Request, Response } from 'express';
|
||||
import { db } from '../database';
|
||||
import { dbAdapter } from '../db';
|
||||
|
||||
const router = Router();
|
||||
|
||||
// Get all lists
|
||||
router.get('/', async (req: Request, res: Response) => {
|
||||
try {
|
||||
const lists = db.prepare('SELECT * FROM lists WHERE isDeleted = 0 ORDER BY updatedAt DESC').all();
|
||||
const lists = await dbAdapter.queryAll('SELECT * FROM lists WHERE isDeleted = 0 ORDER BY updatedAt DESC');
|
||||
// Convert isDeleted from INTEGER to BOOLEAN
|
||||
const formattedLists = (lists as any[]).map(list => ({ ...list, isDeleted: !!list.isDeleted }));
|
||||
res.json(formattedLists);
|
||||
@@ -18,7 +18,7 @@ router.get('/', async (req: Request, res: Response) => {
|
||||
// Get single list
|
||||
router.get('/:id', async (req: Request, res: Response) => {
|
||||
try {
|
||||
const list = db.prepare('SELECT * FROM lists WHERE id = ? AND isDeleted = 0').get(req.params.id);
|
||||
const list = await dbAdapter.queryOne('SELECT * FROM lists WHERE id = ? AND isDeleted = 0', [req.params.id]);
|
||||
if (!list) {
|
||||
return res.status(404).json({ error: 'List not found' });
|
||||
}
|
||||
@@ -32,12 +32,11 @@ router.get('/:id', async (req: Request, res: Response) => {
|
||||
router.post('/', async (req: Request, res: Response) => {
|
||||
try {
|
||||
const { id, name, createdAt, updatedAt, isDeleted } = req.body;
|
||||
db.prepare(`
|
||||
INSERT INTO lists (id, name, createdAt, updatedAt, isDeleted)
|
||||
VALUES (?, ?, ?, ?, ?)
|
||||
`).run(id, name, createdAt, updatedAt, isDeleted ? 1 : 0);
|
||||
|
||||
const list = db.prepare('SELECT * FROM lists WHERE id = ?').get(id);
|
||||
await dbAdapter.execute(
|
||||
'INSERT INTO lists (id, name, createdAt, updatedAt, isDeleted) VALUES (?, ?, ?, ?, ?)',
|
||||
[id, name, createdAt, updatedAt, isDeleted ? 1 : 0]
|
||||
);
|
||||
const list = await dbAdapter.queryOne('SELECT * FROM lists WHERE id = ?', [id]);
|
||||
res.status(201).json({ ...(list as any), isDeleted: !!(list as any).isDeleted });
|
||||
} catch (error) {
|
||||
res.status(500).json({ error: 'Failed to create list' });
|
||||
@@ -48,17 +47,15 @@ router.post('/', async (req: Request, res: Response) => {
|
||||
router.put('/:id', async (req: Request, res: Response) => {
|
||||
try {
|
||||
const updatedAt = Date.now();
|
||||
const result = db.prepare(`
|
||||
UPDATE lists
|
||||
SET name = ?, updatedAt = ?
|
||||
WHERE id = ?
|
||||
`).run(req.body.name, updatedAt, req.params.id);
|
||||
|
||||
const result = await dbAdapter.execute(
|
||||
'UPDATE lists SET name = ?, updatedAt = ? WHERE id = ?',
|
||||
[req.body.name, updatedAt, req.params.id]
|
||||
);
|
||||
|
||||
if (result.changes === 0) {
|
||||
return res.status(404).json({ error: 'List not found' });
|
||||
}
|
||||
|
||||
const list = db.prepare('SELECT * FROM lists WHERE id = ?').get(req.params.id);
|
||||
const list = await dbAdapter.queryOne('SELECT * FROM lists WHERE id = ?', [req.params.id]);
|
||||
res.json({ ...(list as any), isDeleted: !!(list as any).isDeleted });
|
||||
} catch (error) {
|
||||
res.status(500).json({ error: 'Failed to update list' });
|
||||
@@ -69,12 +66,11 @@ router.put('/:id', async (req: Request, res: Response) => {
|
||||
router.delete('/:id', async (req: Request, res: Response) => {
|
||||
try {
|
||||
const updatedAt = Date.now();
|
||||
const result = db.prepare(`
|
||||
UPDATE lists
|
||||
SET isDeleted = 1, updatedAt = ?
|
||||
WHERE id = ?
|
||||
`).run(updatedAt, req.params.id);
|
||||
|
||||
const result = await dbAdapter.execute(
|
||||
'UPDATE lists SET isDeleted = 1, updatedAt = ? WHERE id = ?',
|
||||
[updatedAt, req.params.id]
|
||||
);
|
||||
|
||||
if (result.changes === 0) {
|
||||
return res.status(404).json({ error: 'List not found' });
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Router, Request, Response } from 'express';
|
||||
import { db } from '../database';
|
||||
import { dbAdapter } from '../db';
|
||||
|
||||
const router = Router();
|
||||
|
||||
@@ -57,43 +57,11 @@ setInterval(() => {
|
||||
}, 60000); // Changed from 30s to 60s
|
||||
|
||||
// Helper function to get prepared statements (lazy initialization)
|
||||
function getUpsertStatements() {
|
||||
return {
|
||||
upsertList: db.prepare(`
|
||||
INSERT INTO lists (id, name, createdAt, updatedAt, isDeleted)
|
||||
VALUES (@id, @name, @createdAt, @updatedAt, @isDeleted)
|
||||
ON CONFLICT(id) DO UPDATE SET
|
||||
name = @name,
|
||||
updatedAt = @updatedAt,
|
||||
isDeleted = @isDeleted
|
||||
`),
|
||||
upsertField: db.prepare(`
|
||||
INSERT INTO fields (id, name, fieldType, fieldOptions, listId, \`order\`, createdAt, updatedAt, isDeleted)
|
||||
VALUES (@id, @name, @fieldType, @fieldOptions, @listId, @order, @createdAt, @updatedAt, @isDeleted)
|
||||
ON CONFLICT(id) DO UPDATE SET
|
||||
name = @name,
|
||||
fieldType = @fieldType,
|
||||
fieldOptions = @fieldOptions,
|
||||
\`order\` = @order,
|
||||
updatedAt = @updatedAt,
|
||||
isDeleted = @isDeleted
|
||||
`),
|
||||
upsertItem: db.prepare(`
|
||||
INSERT INTO items (id, listId, createdAt, updatedAt, isDeleted)
|
||||
VALUES (@id, @listId, @createdAt, @updatedAt, @isDeleted)
|
||||
ON CONFLICT(id) DO UPDATE SET
|
||||
updatedAt = @updatedAt,
|
||||
isDeleted = @isDeleted
|
||||
`),
|
||||
upsertItemValue: db.prepare(`
|
||||
INSERT INTO item_values (id, itemId, fieldId, value, updatedAt)
|
||||
VALUES (@id, @itemId, @fieldId, @value, @updatedAt)
|
||||
ON CONFLICT(id) DO UPDATE SET
|
||||
value = @value,
|
||||
updatedAt = @updatedAt
|
||||
`)
|
||||
};
|
||||
}
|
||||
// We'll perform upserts with positional params for cross-DB portability
|
||||
const UPSERT_LIST = 'INSERT INTO lists (id, name, createdAt, updatedAt, isDeleted) VALUES (?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET name = EXCLUDED.name, updatedAt = EXCLUDED.updatedAt, isDeleted = EXCLUDED.isDeleted';
|
||||
const UPSERT_FIELD = 'INSERT INTO fields (id, name, fieldType, fieldOptions, listId, "order", createdAt, updatedAt, isDeleted) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET name = EXCLUDED.name, fieldType = EXCLUDED.fieldType, fieldOptions = EXCLUDED.fieldOptions, "order" = EXCLUDED."order", updatedAt = EXCLUDED.updatedAt, isDeleted = EXCLUDED.isDeleted';
|
||||
const UPSERT_ITEM = 'INSERT INTO items (id, listId, createdAt, updatedAt, isDeleted) VALUES (?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET updatedAt = EXCLUDED.updatedAt, isDeleted = EXCLUDED.isDeleted';
|
||||
const UPSERT_ITEM_VALUE = 'INSERT INTO item_values (id, itemId, fieldId, value, updatedAt) VALUES (?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET value = EXCLUDED.value, updatedAt = EXCLUDED.updatedAt';
|
||||
|
||||
router.post('/sync', async (req: Request, res: Response) => {
|
||||
try {
|
||||
@@ -144,65 +112,60 @@ router.post('/sync', async (req: Request, res: Response) => {
|
||||
}
|
||||
|
||||
// Save incoming data from client using a transaction
|
||||
const transaction = db.transaction((data: SyncRequest) => {
|
||||
// Get prepared statements lazily
|
||||
const { upsertList, upsertField, upsertItem, upsertItemValue } = getUpsertStatements();
|
||||
|
||||
if (data.lists && data.lists.length > 0) {
|
||||
for (const list of data.lists) {
|
||||
upsertList.run({
|
||||
id: list.id,
|
||||
name: list.name,
|
||||
createdAt: list.createdAt,
|
||||
updatedAt: list.updatedAt,
|
||||
isDeleted: list.isDeleted ? 1 : 0
|
||||
});
|
||||
await dbAdapter.transaction(async (tx) => {
|
||||
if (lists && lists.length > 0) {
|
||||
for (const list of lists) {
|
||||
await tx.execute(UPSERT_LIST, [
|
||||
list.id,
|
||||
list.name,
|
||||
list.createdAt,
|
||||
list.updatedAt,
|
||||
list.isDeleted ? 1 : 0
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
if (data.fields && data.fields.length > 0) {
|
||||
for (const field of data.fields) {
|
||||
upsertField.run({
|
||||
id: field.id,
|
||||
name: field.name,
|
||||
fieldType: field.fieldType,
|
||||
fieldOptions: field.fieldOptions,
|
||||
listId: field.listId,
|
||||
order: field.order,
|
||||
createdAt: field.createdAt,
|
||||
updatedAt: field.updatedAt,
|
||||
isDeleted: field.isDeleted ? 1 : 0
|
||||
});
|
||||
if (fields && fields.length > 0) {
|
||||
for (const field of fields) {
|
||||
await tx.execute(UPSERT_FIELD, [
|
||||
field.id,
|
||||
field.name,
|
||||
field.fieldType,
|
||||
field.fieldOptions,
|
||||
field.listId,
|
||||
field.order,
|
||||
field.createdAt,
|
||||
field.updatedAt,
|
||||
field.isDeleted ? 1 : 0
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
if (data.items && data.items.length > 0) {
|
||||
for (const item of data.items) {
|
||||
upsertItem.run({
|
||||
id: item.id,
|
||||
listId: item.listId,
|
||||
createdAt: item.createdAt,
|
||||
updatedAt: item.updatedAt,
|
||||
isDeleted: item.isDeleted ? 1 : 0
|
||||
});
|
||||
if (items && items.length > 0) {
|
||||
for (const item of items) {
|
||||
await tx.execute(UPSERT_ITEM, [
|
||||
item.id,
|
||||
item.listId,
|
||||
item.createdAt,
|
||||
item.updatedAt,
|
||||
item.isDeleted ? 1 : 0
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
if (data.itemValues && data.itemValues.length > 0) {
|
||||
for (const value of data.itemValues) {
|
||||
upsertItemValue.run({
|
||||
id: value.id,
|
||||
itemId: value.itemId,
|
||||
fieldId: value.fieldId,
|
||||
value: value.value,
|
||||
updatedAt: value.updatedAt
|
||||
});
|
||||
if (itemValues && itemValues.length > 0) {
|
||||
for (const value of itemValues) {
|
||||
await tx.execute(UPSERT_ITEM_VALUE, [
|
||||
value.id,
|
||||
value.itemId,
|
||||
value.fieldId,
|
||||
value.value,
|
||||
value.updatedAt
|
||||
]);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
transaction({ lastSyncTimestamp, lists, fields, items, itemValues });
|
||||
|
||||
// IMPORTANT: Get updates from server AFTER saving incoming data
|
||||
// This ensures clients receive back any data they just sent (for confirmation)
|
||||
// If lastSyncTimestamp is 0, get all data (initial sync)
|
||||
@@ -210,17 +173,15 @@ router.post('/sync', async (req: Request, res: Response) => {
|
||||
let serverLists, serverFields, serverItems, serverItemValues;
|
||||
|
||||
if (lastSyncTimestamp === 0) {
|
||||
// Initial sync: send all non-deleted items (AFTER processing incoming data)
|
||||
serverLists = db.prepare('SELECT * FROM lists WHERE isDeleted = 0').all();
|
||||
serverFields = db.prepare('SELECT * FROM fields WHERE isDeleted = 0').all();
|
||||
serverItems = db.prepare('SELECT * FROM items WHERE isDeleted = 0').all();
|
||||
serverItemValues = db.prepare('SELECT * FROM item_values').all();
|
||||
serverLists = await dbAdapter.queryAll('SELECT * FROM lists WHERE isDeleted = 0');
|
||||
serverFields = await dbAdapter.queryAll('SELECT * FROM fields WHERE isDeleted = 0');
|
||||
serverItems = await dbAdapter.queryAll('SELECT * FROM items WHERE isDeleted = 0');
|
||||
serverItemValues = await dbAdapter.queryAll('SELECT * FROM item_values');
|
||||
} else {
|
||||
// Incremental sync: send all updates including deletions (use >= to include items updated exactly at lastSyncTimestamp)
|
||||
serverLists = db.prepare('SELECT * FROM lists WHERE updatedAt >= ?').all(lastSyncTimestamp);
|
||||
serverFields = db.prepare('SELECT * FROM fields WHERE updatedAt >= ?').all(lastSyncTimestamp);
|
||||
serverItems = db.prepare('SELECT * FROM items WHERE updatedAt >= ?').all(lastSyncTimestamp);
|
||||
serverItemValues = db.prepare('SELECT * FROM item_values WHERE updatedAt >= ?').all(lastSyncTimestamp);
|
||||
serverLists = await dbAdapter.queryAll('SELECT * FROM lists WHERE updatedAt >= ?', [lastSyncTimestamp]);
|
||||
serverFields = await dbAdapter.queryAll('SELECT * FROM fields WHERE updatedAt >= ?', [lastSyncTimestamp]);
|
||||
serverItems = await dbAdapter.queryAll('SELECT * FROM items WHERE updatedAt >= ?', [lastSyncTimestamp]);
|
||||
serverItemValues = await dbAdapter.queryAll('SELECT * FROM item_values WHERE updatedAt >= ?', [lastSyncTimestamp]);
|
||||
}
|
||||
|
||||
// Convert isDeleted from INTEGER (0/1) to BOOLEAN
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Router, Request, Response } from 'express';
|
||||
import { db } from '../database';
|
||||
import { dbAdapter } from '../db';
|
||||
|
||||
const router = Router();
|
||||
|
||||
@@ -306,10 +306,11 @@ router.get('/web/data', async (req: Request, res: Response) => {
|
||||
res.setHeader('Pragma', 'no-cache');
|
||||
res.setHeader('Expires', '0');
|
||||
|
||||
const lists = db.prepare('SELECT * FROM lists ORDER BY updatedAt DESC').all();
|
||||
const fields = db.prepare('SELECT * FROM fields ORDER BY listId ASC, `order` ASC').all();
|
||||
const items = db.prepare('SELECT * FROM items ORDER BY listId ASC, updatedAt DESC').all();
|
||||
const values = db.prepare('SELECT * FROM item_values').all();
|
||||
// Exclude deleted lists and items from web UI
|
||||
const lists = await dbAdapter.queryAll('SELECT * FROM lists WHERE isDeleted = 0 ORDER BY updatedAt DESC');
|
||||
const fields = await dbAdapter.queryAll('SELECT * FROM fields ORDER BY listId ASC, "order" ASC');
|
||||
const items = await dbAdapter.queryAll('SELECT * FROM items WHERE isDeleted = 0 ORDER BY listId ASC, updatedAt DESC');
|
||||
const values = await dbAdapter.queryAll('SELECT * FROM item_values');
|
||||
|
||||
// Convert isDeleted from INTEGER to BOOLEAN
|
||||
const formattedLists = (lists as any[]).map(list => ({ ...list, isDeleted: !!list.isDeleted }));
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
import { Server as HttpServer, IncomingMessage } from 'http';
|
||||
import { WebSocketServer, WebSocket } from 'ws';
|
||||
import { dbAdapter } from './db';
|
||||
|
||||
interface SyncRequest {
|
||||
lastSyncTimestamp: number;
|
||||
lists: any[];
|
||||
fields: any[];
|
||||
items: any[];
|
||||
itemValues: any[];
|
||||
}
|
||||
|
||||
interface MessageEnvelope<T = any> {
|
||||
id?: string;
|
||||
type: string;
|
||||
payload?: T;
|
||||
}
|
||||
|
||||
function checkAuth(req: any): boolean {
|
||||
const serverPassword = process.env.SERVER_PASSWORD;
|
||||
if (!serverPassword) return true; // auth disabled
|
||||
const auth = req.headers?.authorization as string | undefined;
|
||||
if (!auth) return false;
|
||||
const parts = auth.split(' ');
|
||||
return parts.length === 2 && parts[0] === 'Bearer' && parts[1] === serverPassword;
|
||||
}
|
||||
|
||||
const UPSERT_LIST = 'INSERT INTO lists (id, name, createdAt, updatedAt, isDeleted) VALUES (?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET name = EXCLUDED.name, updatedAt = EXCLUDED.updatedAt, isDeleted = EXCLUDED.isDeleted';
|
||||
const UPSERT_FIELD = 'INSERT INTO fields (id, name, fieldType, fieldOptions, listId, "order", createdAt, updatedAt, isDeleted) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET name = EXCLUDED.name, fieldType = EXCLUDED.fieldType, fieldOptions = EXCLUDED.fieldOptions, "order" = EXCLUDED."order", updatedAt = EXCLUDED.updatedAt, isDeleted = EXCLUDED.isDeleted';
|
||||
const UPSERT_ITEM = 'INSERT INTO items (id, listId, createdAt, updatedAt, isDeleted) VALUES (?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET updatedAt = EXCLUDED.updatedAt, isDeleted = EXCLUDED.isDeleted';
|
||||
const UPSERT_ITEM_VALUE = 'INSERT INTO item_values (id, itemId, fieldId, value, updatedAt) VALUES (?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET value = EXCLUDED.value, updatedAt = EXCLUDED.updatedAt';
|
||||
|
||||
async function processSync(data: SyncRequest) {
|
||||
await dbAdapter.transaction(async (tx) => {
|
||||
for (const list of data.lists || []) {
|
||||
await tx.execute(UPSERT_LIST, [list.id, list.name, list.createdAt, list.updatedAt, list.isDeleted ? 1 : 0]);
|
||||
}
|
||||
for (const field of data.fields || []) {
|
||||
await tx.execute(UPSERT_FIELD, [field.id, field.name, field.fieldType, field.fieldOptions, field.listId, field.order, field.createdAt, field.updatedAt, field.isDeleted ? 1 : 0]);
|
||||
}
|
||||
for (const item of data.items || []) {
|
||||
await tx.execute(UPSERT_ITEM, [item.id, item.listId, item.createdAt, item.updatedAt, item.isDeleted ? 1 : 0]);
|
||||
}
|
||||
for (const val of data.itemValues || []) {
|
||||
await tx.execute(UPSERT_ITEM_VALUE, [val.id, val.itemId, val.fieldId, val.value, val.updatedAt]);
|
||||
}
|
||||
});
|
||||
|
||||
let serverLists: any[], serverFields: any[], serverItems: any[], serverItemValues: any[];
|
||||
const since = data.lastSyncTimestamp;
|
||||
if (since === 0) {
|
||||
serverLists = await dbAdapter.queryAll('SELECT * FROM lists WHERE isDeleted = 0');
|
||||
serverFields = await dbAdapter.queryAll('SELECT * FROM fields WHERE isDeleted = 0');
|
||||
serverItems = await dbAdapter.queryAll('SELECT * FROM items WHERE isDeleted = 0');
|
||||
serverItemValues = await dbAdapter.queryAll('SELECT * FROM item_values');
|
||||
} else {
|
||||
serverLists = await dbAdapter.queryAll('SELECT * FROM lists WHERE updatedAt >= ?', [since]);
|
||||
serverFields = await dbAdapter.queryAll('SELECT * FROM fields WHERE updatedAt >= ?', [since]);
|
||||
serverItems = await dbAdapter.queryAll('SELECT * FROM items WHERE updatedAt >= ?', [since]);
|
||||
serverItemValues = await dbAdapter.queryAll('SELECT * FROM item_values WHERE updatedAt >= ?', [since]);
|
||||
}
|
||||
|
||||
serverLists = serverLists.map(l => ({ ...l, isDeleted: !!l.isDeleted }));
|
||||
serverFields = serverFields.map(f => ({ ...f, isDeleted: !!f.isDeleted }));
|
||||
serverItems = serverItems.map(i => ({ ...i, isDeleted: !!i.isDeleted }));
|
||||
|
||||
return {
|
||||
lists: serverLists,
|
||||
fields: serverFields,
|
||||
items: serverItems,
|
||||
itemValues: serverItemValues,
|
||||
serverTimestamp: Date.now(),
|
||||
};
|
||||
}
|
||||
|
||||
export function initWebSocket(server: HttpServer) {
|
||||
const wss = new WebSocketServer({ server, path: '/api/ws' });
|
||||
console.log('WebSocket server initialized at /api/ws');
|
||||
|
||||
wss.on('connection', (ws: WebSocket, req: IncomingMessage) => {
|
||||
if (!checkAuth(req)) {
|
||||
ws.close(1008, 'Unauthorized');
|
||||
return;
|
||||
}
|
||||
|
||||
ws.on('message', async (raw: Buffer) => {
|
||||
try {
|
||||
const msg = JSON.parse(raw.toString()) as MessageEnvelope;
|
||||
if (msg.type === 'ping') {
|
||||
const resp: MessageEnvelope = { type: 'pong', id: msg.id };
|
||||
ws.send(JSON.stringify(resp));
|
||||
return;
|
||||
}
|
||||
if (msg.type === 'sync') {
|
||||
const respData = await processSync(msg.payload as SyncRequest);
|
||||
const resp: MessageEnvelope = { type: 'syncResponse', id: msg.id, payload: respData };
|
||||
ws.send(JSON.stringify(resp));
|
||||
return;
|
||||
}
|
||||
} catch (e) {
|
||||
const err: MessageEnvelope = { type: 'error', payload: { message: 'Invalid message' } };
|
||||
ws.send(JSON.stringify(err));
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -3,7 +3,7 @@
|
||||
"target": "ES2020",
|
||||
"module": "commonjs",
|
||||
"lib": ["ES2020"],
|
||||
"types": ["node"],
|
||||
"types": ["node", "ws"],
|
||||
"outDir": "./dist",
|
||||
"rootDir": "./src",
|
||||
"strict": true,
|
||||
|
||||
Reference in New Issue
Block a user