@kubun/store-connector 0.9.0 → 0.11.0

package/lib/api.d.ts

@@ -1,14 +1,6 @@
 import type { Adapter } from '@kubun/db-adapter';
 import type { Kysely } from 'kysely';
 import type { ConnectorTables } from './tables.js';
-export type Credential = {
-    accessToken: string;
-    refreshToken?: string;
-    expiresAt?: Date;
-    scopes: Array<string>;
-    accountLabel?: string;
-    metadata?: Record<string, unknown>;
-};
 export type SyncStatus = 'idle' | 'syncing' | 'error';
 export type SyncState = {
     checkpoint: unknown;
@@ -16,18 +8,31 @@ export type SyncState = {
     entityCount: number;
     status: SyncStatus;
     error?: string;
+    leaseExpiresAt?: number | null;
 };
 export type SyncStateEntry = SyncState & {
     connectorName: string;
     ownerDID: string;
 };
+export type PendingAuthRecord = {
+    state: string;
+    codeVerifier: string;
+    provider: string;
+    ownerDID: string;
+    createdAt: number;
+};
 export type ConnectorStoreAPI = {
-    getCredential(providerName: string, ownerDID: string): Promise<Credential | null>;
-    setCredential(providerName: string, ownerDID: string, credential: Credential | string): Promise<void>;
+    getCredential(providerName: string, ownerDID: string): Promise<string | null>;
+    setCredential(providerName: string, ownerDID: string, credential: string): Promise<void>;
     deleteCredential(providerName: string, ownerDID: string): Promise<void>;
     getSyncState(connectorName: string, ownerDID: string): Promise<SyncState | null>;
     setSyncState(connectorName: string, ownerDID: string, state: SyncState): Promise<void>;
     deleteSyncState(connectorName: string, ownerDID: string): Promise<void>;
     listSyncStatesForConnector(connectorName: string): Promise<Array<SyncStateEntry>>;
+    claimSync(connectorName: string, ownerDID: string, leaseMs: number): Promise<boolean>;
+    renewSync(connectorName: string, ownerDID: string, leaseMs: number): Promise<void>;
+    createPendingAuth(record: PendingAuthRecord): Promise<void>;
+    consumePendingAuth(state: string): Promise<PendingAuthRecord | null>;
+    deleteExpiredPendingAuth(cutoffMs: number): Promise<void>;
 };
 export declare function createConnectorStore(db: Kysely<ConnectorTables>, _adapter: Adapter): ConnectorStoreAPI;

package/lib/api.js

@@ -1 +1,152 @@
-function e(e){let t=null;null!=e.checkpoint&&(t="string"==typeof e.checkpoint?JSON.parse(e.checkpoint):e.checkpoint);let n={checkpoint:t,lastSyncedAt:e.last_synced_at,entityCount:e.entity_count,status:e.status};return null!=e.error&&(n.error=e.error),n}export function createConnectorStore(t,n){return{async getCredential(e,n){var c;let r,o,a=await t.selectFrom("kubun_connector_credentials").select("credential").where("provider_name","=",e).where("owner_did","=",n).executeTakeFirst();return null==a?null:(o={accessToken:(r="string"==typeof(c=a.credential)?JSON.parse(c):c).accessToken,scopes:r.scopes},null!=r.refreshToken&&(o.refreshToken=r.refreshToken),null!=r.expiresAt&&(o.expiresAt=new Date(r.expiresAt)),null!=r.accountLabel&&(o.accountLabel=r.accountLabel),null!=r.metadata&&(o.metadata=r.metadata),o)},async setCredential(e,n,c){let r,o="string"==typeof c?c:(r={accessToken:c.accessToken,scopes:c.scopes},null!=c.refreshToken&&(r.refreshToken=c.refreshToken),null!=c.expiresAt&&(r.expiresAt=c.expiresAt.toISOString()),null!=c.accountLabel&&(r.accountLabel=c.accountLabel),null!=c.metadata&&(r.metadata=c.metadata),JSON.stringify(r));await t.insertInto("kubun_connector_credentials").values({provider_name:e,owner_did:n,credential:o}).onConflict(e=>e.columns(["provider_name","owner_did"]).doUpdateSet({credential:o})).execute()},async deleteCredential(e,n){await t.deleteFrom("kubun_connector_credentials").where("provider_name","=",e).where("owner_did","=",n).execute()},async getSyncState(n,c){let r=await t.selectFrom("kubun_connector_sync_state").selectAll().where("connector_name","=",n).where("owner_did","=",c).executeTakeFirst();return null==r?null:e(r)},async setSyncState(e,n,c){await t.insertInto("kubun_connector_sync_state").values({connector_name:e,owner_did:n,checkpoint:null!=c.checkpoint?JSON.stringify(c.checkpoint):null,last_synced_at:c.lastSyncedAt,entity_count:c.entityCount,status:c.status,error:c.error??null}).onConflict(e=>e.columns(["connector_name","owner_did"]).doUpdateSet({checkpoint:null!=c.checkpoint?JSON.stringify(c.checkpoint):null,last_synced_at:c.lastSyncedAt,entity_count:c.entityCount,status:c.status,error:c.error??null})).execute()},async deleteSyncState(e,n){await t.deleteFrom("kubun_connector_sync_state").where("connector_name","=",e).where("owner_did","=",n).execute()},listSyncStatesForConnector:async n=>(await t.selectFrom("kubun_connector_sync_state").selectAll().where("connector_name","=",n).execute()).map(t=>({...e(t),connectorName:t.connector_name,ownerDID:t.owner_did}))}}
+// --- Serialization helpers ---
+function rowToSyncState(row) {
+    // ParseJSONResultsPlugin may have already parsed the checkpoint value
+    let checkpoint = null;
+    if (row.checkpoint != null) {
+        checkpoint = typeof row.checkpoint === 'string' ? JSON.parse(row.checkpoint) : row.checkpoint;
+    }
+    const state = {
+        checkpoint,
+        lastSyncedAt: row.last_synced_at,
+        entityCount: row.entity_count,
+        status: row.status,
+        leaseExpiresAt: row.lease_expires_at
+    };
+    if (row.error != null) {
+        state.error = row.error;
+    }
+    return state;
+}
+// --- Factory function ---
+export function createConnectorStore(db, _adapter) {
+    return {
+        // --- Credential operations ---
+        async getCredential (providerName, ownerDID) {
+            const row = await db.selectFrom('kubun_connector_credentials').select('credential').where('provider_name', '=', providerName).where('owner_did', '=', ownerDID).executeTakeFirst();
+            if (row == null) return null;
+            return row.credential;
+        },
+        async setCredential (providerName, ownerDID, credential) {
+            await db.insertInto('kubun_connector_credentials').values({
+                provider_name: providerName,
+                owner_did: ownerDID,
+                credential
+            }).onConflict((oc)=>oc.columns([
+                    'provider_name',
+                    'owner_did'
+                ]).doUpdateSet({
+                    credential
+                })).execute();
+        },
+        async deleteCredential (providerName, ownerDID) {
+            await db.deleteFrom('kubun_connector_credentials').where('provider_name', '=', providerName).where('owner_did', '=', ownerDID).execute();
+        },
+        // --- Sync state operations ---
+        async getSyncState (connectorName, ownerDID) {
+            const row = await db.selectFrom('kubun_connector_sync_state').selectAll().where('connector_name', '=', connectorName).where('owner_did', '=', ownerDID).executeTakeFirst();
+            if (row == null) return null;
+            return rowToSyncState(row);
+        },
+        async setSyncState (connectorName, ownerDID, state) {
+            // Progress write only: the lease column is owned by claimSync/renewSync,
+            // never by a plain set. A fresh INSERT carries no lease (null); on
+            // conflict the lease is deliberately excluded so a live lease held by the
+            // sync worker survives progress updates.
+            await db.insertInto('kubun_connector_sync_state').values({
+                connector_name: connectorName,
+                owner_did: ownerDID,
+                checkpoint: state.checkpoint != null ? JSON.stringify(state.checkpoint) : null,
+                last_synced_at: state.lastSyncedAt,
+                entity_count: state.entityCount,
+                status: state.status,
+                error: state.error ?? null,
+                lease_expires_at: null
+            }).onConflict((oc)=>oc.columns([
+                    'connector_name',
+                    'owner_did'
+                ]).doUpdateSet({
+                    checkpoint: state.checkpoint != null ? JSON.stringify(state.checkpoint) : null,
+                    last_synced_at: state.lastSyncedAt,
+                    entity_count: state.entityCount,
+                    status: state.status,
+                    error: state.error ?? null
+                })).execute();
+        },
+        async claimSync (connectorName, ownerDID, leaseMs) {
+            const now = Date.now();
+            const leaseExpiresAt = now + leaseMs;
+            // Single atomic upsert. INSERT wins when no row exists. On conflict the
+            // DO UPDATE only fires when its WHERE holds: the existing lease is not
+            // 'syncing', is unset, or has expired. The guard columns are
+            // table-qualified because a bare 'status'/'lease_expires_at' is ambiguous
+            // on Postgres (both the target row and the excluded row are in scope).
+            // A live lease fails the WHERE, so no row is returned.
+            const result = await db.insertInto('kubun_connector_sync_state').values({
+                connector_name: connectorName,
+                owner_did: ownerDID,
+                checkpoint: null,
+                last_synced_at: new Date(now).toISOString(),
+                entity_count: 0,
+                status: 'syncing',
+                error: null,
+                lease_expires_at: leaseExpiresAt
+            }).onConflict((oc)=>oc.columns([
+                    'connector_name',
+                    'owner_did'
+                ]).doUpdateSet({
+                    status: 'syncing',
+                    lease_expires_at: leaseExpiresAt
+                }).where((eb)=>eb.or([
+                        eb('kubun_connector_sync_state.status', '!=', 'syncing'),
+                        eb('kubun_connector_sync_state.lease_expires_at', 'is', null),
+                        eb('kubun_connector_sync_state.lease_expires_at', '<', now)
+                    ]))).returningAll().executeTakeFirst();
+            return result != null;
+        },
+        async renewSync (connectorName, ownerDID, leaseMs) {
+            const now = Date.now();
+            // Extend the lease only while the row is still actively syncing. A plain
+            // UPDATE (no excluded row in scope) needs no table-qualified columns.
+            await db.updateTable('kubun_connector_sync_state').set({
+                lease_expires_at: now + leaseMs
+            }).where('connector_name', '=', connectorName).where('owner_did', '=', ownerDID).where('status', '=', 'syncing').execute();
+        },
+        async deleteSyncState (connectorName, ownerDID) {
+            await db.deleteFrom('kubun_connector_sync_state').where('connector_name', '=', connectorName).where('owner_did', '=', ownerDID).execute();
+        },
+        async listSyncStatesForConnector (connectorName) {
+            const rows = await db.selectFrom('kubun_connector_sync_state').selectAll().where('connector_name', '=', connectorName).execute();
+            return rows.map((row)=>({
+                    ...rowToSyncState(row),
+                    connectorName: row.connector_name,
+                    ownerDID: row.owner_did
+                }));
+        },
+        // --- Pending OAuth authorization operations ---
+        async createPendingAuth (record) {
+            await db.insertInto('kubun_connector_pending_auth').values({
+                state: record.state,
+                code_verifier: record.codeVerifier,
+                provider: record.provider,
+                owner_did: record.ownerDID,
+                created_at: record.createdAt
+            }).execute();
+        },
+        async consumePendingAuth (state) {
+            // Atomic single-use read: DELETE ... RETURNING removes and returns the row
+            // in one statement so concurrent callbacks cannot both consume the state.
+            const row = await db.deleteFrom('kubun_connector_pending_auth').where('state', '=', state).returningAll().executeTakeFirst();
+            if (row == null) return null;
+            return {
+                state: row.state,
+                codeVerifier: row.code_verifier,
+                provider: row.provider,
+                ownerDID: row.owner_did,
+                createdAt: row.created_at
+            };
+        },
+        async deleteExpiredPendingAuth (cutoffMs) {
+            await db.deleteFrom('kubun_connector_pending_auth').where('created_at', '<', cutoffMs).execute();
+        }
+    };
+}

package/lib/definition.js

@@ -1 +1,7 @@
-import{createConnectorStore as o}from"./api.js";import{getConnectorMigrations as r}from"./migrations.js";export const connectorStoreDefinition={name:"connector",migrations:r,createAPI:o};
+import { createConnectorStore } from './api.js';
+import { getConnectorMigrations } from './migrations.js';
+export const connectorStoreDefinition = {
+    name: 'connector',
+    migrations: getConnectorMigrations,
+    createAPI: createConnectorStore
+};

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 import type { StoreProvider } from '@kubun/db';
 import type { ConnectorStoreAPI } from './api.js';
-export type { ConnectorStoreAPI, Credential, SyncState, SyncStateEntry, SyncStatus } from './api.js';
+export type { ConnectorStoreAPI, PendingAuthRecord, SyncState, SyncStateEntry, SyncStatus, } from './api.js';
 export { createConnectorStore } from './api.js';
 export { connectorStoreDefinition } from './definition.js';
 export declare const CONNECTOR_STORE: "connector";

package/lib/index.js

@@ -1 +1,6 @@
-export{createConnectorStore}from"./api.js";export{connectorStoreDefinition}from"./definition.js";export const CONNECTOR_STORE="connector";export function getConnectorStore(o){return o.getStore("connector")}
+export { createConnectorStore } from './api.js';
+export { connectorStoreDefinition } from './definition.js';
+export const CONNECTOR_STORE = 'connector';
+export function getConnectorStore(provider) {
+    return provider.getStore(CONNECTOR_STORE);
+}

package/lib/migrations.d.ts

@@ -1,3 +1,3 @@
 import type { MigrationContext } from '@kubun/db';
-import type { Migration } from 'kysely';
+import type { Migration } from 'kysely/migration';
 export declare function getConnectorMigrations(ctx: MigrationContext): Record<string, Migration>;

package/lib/migrations.js

@@ -1 +1,34 @@
-export function getConnectorMigrations(t){let e=t.types;return{"0-init":{async up(t){await t.schema.createTable("kubun_connector_sync_state").ifNotExists().addColumn("connector_name",e.text,t=>t.notNull()).addColumn("owner_did",e.text,t=>t.notNull()).addColumn("checkpoint",e.text).addColumn("last_synced_at",e.text,t=>t.notNull()).addColumn("entity_count","integer",t=>t.notNull().defaultTo(0)).addColumn("status",e.text,t=>t.notNull()).addColumn("error",e.text).addPrimaryKeyConstraint("kubun_connector_sync_state_pkey",["connector_name","owner_did"]).execute(),await t.schema.createTable("kubun_connector_credentials").ifNotExists().addColumn("provider_name",e.text,t=>t.notNull()).addColumn("owner_did",e.text,t=>t.notNull()).addColumn("credential",e.text,t=>t.notNull()).addPrimaryKeyConstraint("kubun_connector_credentials_pkey",["provider_name","owner_did"]).execute()},async down(t){await t.schema.dropTable("kubun_connector_credentials").ifExists().execute(),await t.schema.dropTable("kubun_connector_sync_state").ifExists().execute()}}}}
+export function getConnectorMigrations(ctx) {
+    const t = ctx.types;
+    const init = {
+        async up (db) {
+            // Connector sync state
+            await db.schema.createTable('kubun_connector_sync_state').ifNotExists().addColumn('connector_name', t.text, (col)=>col.notNull()).addColumn('owner_did', t.text, (col)=>col.notNull()).addColumn('checkpoint', t.text).addColumn('last_synced_at', t.text, (col)=>col.notNull()).addColumn('entity_count', 'integer', (col)=>col.notNull().defaultTo(0)).addColumn('status', t.text, (col)=>col.notNull()).addColumn('error', t.text)// Lease expiry for atomic sync-claim coordination. ms-epoch (Date.now)
+            // overflows int32 on Postgres; bigint holds it and the adapter's int8
+            // parser reads it back as a JS number. Nullable: a row with no active
+            // lease leaves this null.
+            .addColumn('lease_expires_at', t.bigint).addPrimaryKeyConstraint('kubun_connector_sync_state_pkey', [
+                'connector_name',
+                'owner_did'
+            ]).execute();
+            // Connector credentials
+            await db.schema.createTable('kubun_connector_credentials').ifNotExists().addColumn('provider_name', t.text, (col)=>col.notNull()).addColumn('owner_did', t.text, (col)=>col.notNull()).addColumn('credential', t.text, (col)=>col.notNull()).addPrimaryKeyConstraint('kubun_connector_credentials_pkey', [
+                'provider_name',
+                'owner_did'
+            ]).execute();
+            // Pending OAuth authorizations: state + PKCE verifier persisted between the
+            // authorize redirect and the callback. State is single-use, consumed on read.
+            await db.schema.createTable('kubun_connector_pending_auth').ifNotExists().addColumn('state', t.text, (col)=>col.notNull().primaryKey()).addColumn('code_verifier', t.text, (col)=>col.notNull()).addColumn('provider', t.text, (col)=>col.notNull()).addColumn('owner_did', t.text, (col)=>col.notNull())// ms-epoch (Date.now) overflows int32 on Postgres; bigint holds it and
+            // the adapter's int8 parser reads it back as a JS number.
+            .addColumn('created_at', t.bigint, (col)=>col.notNull()).execute();
+        },
+        async down (db) {
+            await db.schema.dropTable('kubun_connector_pending_auth').ifExists().execute();
+            await db.schema.dropTable('kubun_connector_credentials').ifExists().execute();
+            await db.schema.dropTable('kubun_connector_sync_state').ifExists().execute();
+        }
+    };
+    return {
+        '0-init': init
+    };
+}

package/lib/tables.d.ts

@@ -7,6 +7,7 @@ export type ConnectorSyncStateTable = {
     entity_count: number;
     status: string;
     error: string | null;
+    lease_expires_at: number | null;
 };
 export type ConnectorSyncState = Selectable<ConnectorSyncStateTable>;
 export type ConnectorCredentialTable = {
@@ -15,7 +16,16 @@ export type ConnectorCredentialTable = {
     credential: string;
 };
 export type ConnectorCredential = Selectable<ConnectorCredentialTable>;
+export type ConnectorPendingAuthTable = {
+    state: string;
+    code_verifier: string;
+    provider: string;
+    owner_did: string;
+    created_at: number;
+};
+export type ConnectorPendingAuth = Selectable<ConnectorPendingAuthTable>;
 export type ConnectorTables = {
     kubun_connector_sync_state: ConnectorSyncStateTable;
     kubun_connector_credentials: ConnectorCredentialTable;
+    kubun_connector_pending_auth: ConnectorPendingAuthTable;
 };

package/lib/tables.js

@@ -1 +1,2 @@
-export{};
+// --- Aggregate ConnectorTables type ---
+export { };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/store-connector",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "license": "see LICENSE.md",
   "keywords": [],
   "type": "module",
@@ -15,16 +15,18 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "kysely": "^0.28.17",
-    "@kubun/db": "^0.9.0",
-    "@kubun/db-adapter": "^0.9.0"
+    "kysely": "^0.29.2",
+    "@kubun/db-adapter": "^0.11.0",
+    "@kubun/db": "^0.11.0"
   },
   "devDependencies": {
-    "@kubun/db-better-sqlite": "^0.9.0"
+    "@testcontainers/postgresql": "^12.0.4",
+    "@kubun/db-postgres": "^0.11.0",
+    "@kubun/db-better-sqlite": "^0.11.0"
   },
   "scripts": {
     "build:clean": "del lib",
-    "build:js": "swc src -d ./lib --config-file ../../swc.json --strip-leading-paths",
+    "build:js": "swc src -d ./lib --config-file ../../node_modules/@kigu/dev/swc.json --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --skipLibCheck",
     "build:types:ci": "tsc --emitDeclarationOnly --declarationMap false",
     "build": "pnpm run build:clean && pnpm run build:js && pnpm run build:types",