@mauryasumit/driftdb 2.0.0 → 3.0.0

package/src/sync/snapshot-manager.ts

@@ -8,21 +8,24 @@ import type { S3UploadOptions } from '../storage/s3-adapter.js';
 
 export class SnapshotManager {
   private readonly db: Database.Database;
-  private readonly s3: S3Adapter;
-  private readonly nodeId: string;
+  private readonly s3: S3Adapter;
+  private readonly dbName: string;
+  private readonly nodeId: string;
   private readonly sqlitePath: string;
   private readonly uploadOptions: S3UploadOptions;
 
   constructor(
-    db: Database.Database,
-    s3: S3Adapter,
-    nodeId: string,
-    sqlitePath: string,
-    uploadOptions: S3UploadOptions
-  ) {
-    this.db = db;
-    this.s3 = s3;
-    this.nodeId = nodeId;
+    db: Database.Database,
+    s3: S3Adapter,
+    dbName: string,
+    nodeId: string,
+    sqlitePath: string,
+    uploadOptions: S3UploadOptions
+  ) {
+    this.db = db;
+    this.s3 = s3;
+    this.dbName = dbName;
+    this.nodeId = nodeId;
     this.sqlitePath = sqlitePath;
     this.uploadOptions = uploadOptions;
   }
@@ -35,24 +38,24 @@ export class SnapshotManager {
       this.db.exec('PRAGMA wal_checkpoint(FULL)');
 
       if (this.sqlitePath === ':memory:') {
-        const backup = this.db.serialize();
-        await this.s3.upload(
-          this.s3.snapshotKey(this.nodeId, timestamp),
-          Buffer.from(backup),
-          this.uploadOptions
-        );
-      } else {
-        copyFileSync(this.sqlitePath, tempPath);
-        const data = readFileSync(tempPath);
-        await this.s3.upload(
-          this.s3.snapshotKey(this.nodeId, timestamp),
-          data,
-          this.uploadOptions
-        );
-      }
-
-      const key = this.s3.snapshotKey(this.nodeId, timestamp);
-      return { key, timestamp };
+        const backup = this.db.serialize();
+        await this.s3.upload(
+          this.s3.snapshotKey(this.dbName, this.nodeId, timestamp),
+          Buffer.from(backup),
+          this.uploadOptions
+        );
+      } else {
+        copyFileSync(this.sqlitePath, tempPath);
+        const data = readFileSync(tempPath);
+        await this.s3.upload(
+          this.s3.snapshotKey(this.dbName, this.nodeId, timestamp),
+          data,
+          this.uploadOptions
+        );
+      }
+
+      const key = this.s3.snapshotKey(this.dbName, this.nodeId, timestamp);
+      return { key, timestamp };
     } finally {
       if (existsSync(tempPath)) {
         try { unlinkSync(tempPath); } catch { /* ignore */ }
@@ -60,8 +63,8 @@ export class SnapshotManager {
     }
   }
 
-  async restoreLatest(): Promise<boolean> {
-    const manifest = await this.s3.getManifest(this.nodeId);
+  async restoreLatest(): Promise<boolean> {
+    const manifest = await this.s3.getManifest(this.dbName);
     if (!manifest?.latestSnapshotKey) return false;
 
     const data = await this.s3.download(manifest.latestSnapshotKey, this.uploadOptions);

package/src/types.ts

@@ -1,130 +1,133 @@
-export type ColumnType = 'TEXT' | 'INTEGER' | 'REAL' | 'BLOB' | 'BOOLEAN';
-
-export interface ColumnDef {
-  type: ColumnType;
-  notNull?: boolean;
-  unique?: boolean;
-  default?: string | number | boolean | null;
-  index?: boolean;
-}
-
-export type ModelSchema = Record<string, ColumnDef>;
-
-export interface BaseRecord {
-  id: string;
-  createdAt: number;
-  updatedAt: number;
-}
-
-export type WhereValue<V> =
-  | V
-  | { $gt?: V; $gte?: V; $lt?: V; $lte?: V; $in?: V[]; $like?: string; $ne?: V };
-
-export type WhereClause<T> = {
-  [K in keyof T]?: WhereValue<T[K]>;
-};
-
-export interface FindOptions<T> {
-  where?: WhereClause<T>;
-  orderBy?: Partial<Record<keyof T, 'ASC' | 'DESC'>>;
-  limit?: number;
-  offset?: number;
-}
-
-export interface S3Config {
-  bucket: string;
-  region: string;
-  prefix?: string;
-  accessKeyId?: string;
-  secretAccessKey?: string;
-  endpoint?: string;
-  forcePathStyle?: boolean;
-}
-
-export interface RetryConfig {
-  maxRetries: number;
-  baseDelayMs: number;
-  maxDelayMs: number;
-}
-
-export interface EncryptionConfig {
-  key: string;
-}
-
-export interface DBConfig {
-  sqlitePath: string;
-  s3Config?: S3Config;
-  nodeId?: string;
-  syncIntervalMs?: number;
-  snapshotEveryNLogs?: number;
-  maxBatchSize?: number;
-  compression?: boolean;
-  encryption?: EncryptionConfig;
-  retryConfig?: RetryConfig;
-  autoSync?: boolean;
-}
-
-export interface ChangeLogEntry {
-  sequence: number;
-  timestamp: number;
-  nodeId: string;
-  table: string;
-  operation: 'insert' | 'update' | 'delete';
-  data: string | null;
-  synced: 0 | 1;
-}
-
-export interface LogBatch {
-  version: 1;
-  nodeId: string;
-  fromSequence: number;
-  toSequence: number;
-  entries: Array<{
-    sequence: number;
-    timestamp: number;
-    table: string;
-    operation: 'insert' | 'update' | 'delete';
-    data: Record<string, unknown> | null;
-  }>;
-}
-
-export interface SyncJob {
-  id: string;
-  type: 'upload_log' | 'upload_snapshot';
-  payload: string;
-  status: 'pending' | 'processing' | 'done' | 'failed';
-  attempts: number;
-  nextRetryAt: number;
-  createdAt: number;
-  error: string | null;
-}
-
-export interface SyncManifest {
-  nodeId: string;
-  latestSnapshotKey: string | null;
-  latestSnapshotTimestamp: number | null;
-  latestLogSequence: number;
-  updatedAt: number;
-}
-
-export interface SyncMetrics {
-  lastSyncAt: number | null;
-  lastSnapshotAt: number | null;
-  pendingChanges: number;
-  dbSizeBytes: number;
-  totalSynced: number;
-  syncErrors: number;
-  isRunning: boolean;
-}
-
-export interface UploadLogPayload {
-  fromSequence: number;
-  toSequence: number;
-  s3Key: string;
-}
-
-export interface UploadSnapshotPayload {
-  timestamp: number;
-  s3Key: string;
-  dbPath: string;
-}
+export type ColumnType = 'TEXT' | 'INTEGER' | 'REAL' | 'BLOB' | 'BOOLEAN';
+
+export interface ColumnDef {
+  type: ColumnType;
+  notNull?: boolean;
+  unique?: boolean;
+  default?: string | number | boolean | null;
+  index?: boolean;
+}
+
+export type ModelSchema = Record<string, ColumnDef>;
+
+export interface BaseRecord {
+  id: string;
+  createdAt: number;
+  updatedAt: number;
+}
+
+export type WhereValue<V> =
+  | V
+  | { $gt?: V; $gte?: V; $lt?: V; $lte?: V; $in?: V[]; $like?: string; $ne?: V };
+
+export type WhereClause<T> = {
+  [K in keyof T]?: WhereValue<T[K]>;
+};
+
+export interface FindOptions<T> {
+  where?: WhereClause<T>;
+  orderBy?: Partial<Record<keyof T, 'ASC' | 'DESC'>>;
+  limit?: number;
+  offset?: number;
+}
+
+export interface S3Config {
+  bucket: string;
+  region: string;
+  prefix?: string;
+  accessKeyId?: string;
+  secretAccessKey?: string;
+  endpoint?: string;
+  forcePathStyle?: boolean;
+}
+
+export interface RetryConfig {
+  maxRetries: number;
+  baseDelayMs: number;
+  maxDelayMs: number;
+}
+
+export interface EncryptionConfig {
+  key: string;
+}
+
+export interface DBConfig {
+  dbName: string;
+  sqlitePath: string;
+  s3Config?: S3Config;
+  nodeId?: string;
+  syncIntervalMs?: number;
+  snapshotEveryNLogs?: number;
+  maxBatchSize?: number;
+  compression?: boolean;
+  encryption?: EncryptionConfig;
+  retryConfig?: RetryConfig;
+  autoSync?: boolean;
+  restoreFromS3?: boolean;
+}
+
+export interface ChangeLogEntry {
+  sequence: number;
+  timestamp: number;
+  nodeId: string;
+  table: string;
+  operation: 'insert' | 'update' | 'delete';
+  data: string | null;
+  synced: 0 | 1;
+}
+
+export interface LogBatch {
+  version: 1;
+  nodeId: string;
+  fromSequence: number;
+  toSequence: number;
+  entries: Array<{
+    sequence: number;
+    timestamp: number;
+    table: string;
+    operation: 'insert' | 'update' | 'delete';
+    data: Record<string, unknown> | null;
+  }>;
+}
+
+export interface SyncJob {
+  id: string;
+  type: 'upload_log' | 'upload_snapshot';
+  payload: string;
+  status: 'pending' | 'processing' | 'done' | 'failed';
+  attempts: number;
+  nextRetryAt: number;
+  createdAt: number;
+  error: string | null;
+}
+
+export interface SyncManifest {
+  dbName: string;
+  nodeId: string;
+  latestSnapshotKey: string | null;
+  latestSnapshotTimestamp: number | null;
+  latestLogSequence: number;
+  updatedAt: number;
+}
+
+export interface SyncMetrics {
+  lastSyncAt: number | null;
+  lastSnapshotAt: number | null;
+  pendingChanges: number;
+  dbSizeBytes: number;
+  totalSynced: number;
+  syncErrors: number;
+  isRunning: boolean;
+}
+
+export interface UploadLogPayload {
+  fromSequence: number;
+  toSequence: number;
+  s3Key: string;
+}
+
+export interface UploadSnapshotPayload {
+  timestamp: number;
+  s3Key: string;
+  dbPath: string;
+}