mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-17 13:01:24 +00:00
* feat(plugins): add sync providers and encrypted sidecar sync
Implement PR 8 of the plugin platform (#2269): namespaced sync Providers
with provider.sync, encrypted-object storage operations, WebDAV through the
shared storage surface, dynamic cloud provider IDs, and non-cascade sidecars
for sync:true plugin settings plus account/CRDT baselines.
Related to #2269
* fix(plugins): wire sync providers and sidecars into production paths
Close PR 8 integration gaps: dynamic plugin provider registry and
getConnectedAdapter createPluginStorage, WebDAV through EncryptedObjectStorage,
cloud payload collect/apply for pluginSidecars, and IPC/preload bridges.
Related to #2269
* fix(plugins): preserve WebDAV auth reuse and resourceId through EOS wrap
encryptedObjectStorageAsCloudAdapter now reports initiallyAuthenticated when
config exists (matching raw WebDAVAdapter) so getConnectedAdapter reuses the
cached instance, and preserves/refreshes resourceId from the backing adapter
instead of always forcing the default object key.
Related to #2269
* fix(plugins): address Codex PR 8 review findings
Carry pluginSidecars through merge/convergent uploads, lazy-connect before
object I/O with revision-aware writes, fail closed on sidecar collect errors,
expose connectPluginProvider, preserve remote timestamps, and drop deleted
installed-plugin settings from collection.
Related to #2269
* fix(plugins): close remaining Codex P1/P2 sync issues
Lazy stream cancel for inline sync reads, must-not-exist conditional writes,
three-way sidecar merge for local resets, validated apply path for settings,
and merge remote sidecars into convergent uploads.
Related to #2269
* fix(plugins): harden sidecar collect/apply and write verification
Preserve last-known sidecars when the host is offline, apply remote
deletions for installed plugins, force convergent upload on sidecar
divergence, verify plugin object writes, and pick plugin providers in
auto-sync startup checks.
Related to #2269
* fix(plugins): close remaining Codex sidecar/sync path gaps
Include sidecars in auto-sync payload and hash, keep explicit empty bundles,
fail apply when host is offline, require getCapabilities, and carry merged
sidecars into convergent local apply/upload decisions.
Related to #2269
* fix(plugins): close Codex P1 sidecar collect/apply/merge gaps
Treat null host responses as unavailable, persist collected settings into
the non-cascade table, retain decoded convergent payloads, use three-way
sidecar merge for deletions, and fail apply only on operational errors.
Also treat non-empty plugin sidecars as meaningful sync data and re-run
auto-sync when plugin contributions change.
Related to #2269
* fix(plugins): close remaining Codex P1 sidecar and provider gaps
Replay offline-cached sidecars before collect, keep explicit empty
sidecar fields after three-way merge, thread sidecars through convergent
conflict/downgrade materialization, keep gated-off plugin providers from
joining sync as connected, and rebind plugin EOS sessions after runtime
replacement.
Related to #2269
* fix(plugins): separate pending remote sidecars from last-known cache
Replay only host-offline remote applies into the DB, keep last-known as
upload fallback, use contribution reset for deleted settings, probe real
plugin host readiness, rebind storage events for plugin providers, clear
plugin bases on reset, and swallow disconnect rejections.
Related to #2269
* fix(plugins): hydrate retained sidecars and gate missing providers
Materialize installed-plugin settings from retained sidecars before
collect pruning, clear sidecars on setting reset, fail closed when
pending remote replay fails, and only restore plugin providers that are
contribution-available. Also initialize dynamic provider counters on
connect.
Related to #2269
* fix(plugins): surface plugin sync providers and preserve conflict sidecars
Collect live sidecars before convergent conflict apply/upload, include
dynamic providers in status and disconnect paths, and list plugin sync
providers in Cloud Sync settings for connect/disconnect.
Related to #2269
* fix(plugins): per-provider sidecar baselines and safer collect/UI
Merge convergent sidecars against each provider's own baseline, keep
retained settings in sidecars without unvalidated plugin_settings writes,
guard isConnectDisabled for never-connected plugins, and fall back plugin
provider labels/icons in the status popup.
Related to #2269
* fix(plugins): correct plugin provider discovery and sidecar reverify
Read nested contribution metadata for sync provider cards, gate empty-config
connects, enforce single-provider disconnect for plugins, and re-verify after
sidecar-only convergent uploads so baselines track the post-write payload.
Related to #2269
* fix(plugins): refresh sync provider availability from live contributions
Replace the contribution-available provider ID set when plugins change so
disabled or uninstalled sync providers leave the auto-sync ready set and
drop to disconnected with config retained.
Related to #2269
* fix(plugins): preserve sidecars in backups, pending queue, and migration
Attach last-known plugin sidecars to protective local vault backups, fail
operationally when pending/last-known storage writes are rejected, carry
sidecars through convergent migration publish, and reject trailing garbage
on encrypted object parse.
Related to #2269
* fix(plugins): abort conflict collect failures and merge migration sidecars
Rethrow operational sidecar collection errors during convergent conflict
resolution, LWW-union all local/provider sidecars during convergent
migration, re-collect last-known after apply, and prefer live host collect
for protective local vault backups.
Related to #2269
* fix(plugins): restore pluginBridge tests, fix import path, union downgrade sidecars
Correct SettingsSyncTab dynamic import path so production builds resolve,
add ipcMain.on to the plugin bridge test double, union all provider
sidecars on convergent downgrade, keep empty last-known resets, and skip
force-delete when contribution reset validation rejects.
Related to #2269
* fix(plugins): abort backup collect failures and honor empty remote wipes
Only fall back to last-known sidecars when the host is unavailable during
protective backups, treat explicit empty remote sidecar bundles as
authoritative wipes, remove lint-blocking anys from harness tests, and
use a stable equal-timestamp sidecar tie-break.
Related to #2269
* fix(plugins): include sidecars in equality, preserve merge base on reconnect
Compare pluginSidecars in cloudSyncPayloadsEqual for migration freshness,
clear plugin merge state only when account/resource changes on reconnect,
cancel accepted sync read streams on failure, and stop re-connecting the
plugin EOS adapter on every I/O.
Related to #2269
* fix(plugins): drop cached adapters on contribution refresh
Invalidate plugin sync adapters when live contributions change so a
restarted runtime gets a fresh connect, take offline any non-disconnected
missing providers, and latch version-change backups only after cancellation
checks pass.
Related to #2269
* fix(plugins): preserve omitted sidecars and hydrate on plugin enable
Treat missing pluginSidecars as legacy/unsupported in three-way merge
(only explicit empty is a wipe), hydrate retained settings when a plugin
enables, and re-enable retained provider configs when contributions return.
Related to #2269
* fix(plugins): keep newer retained sidecars over older stored settings
When collection merges existing sidecars with plugin_settings rows, prefer
the newer updatedAt so a schema-rejected remote value retained only in
the sidecar table is not overwritten by a stale local setting.
Related to #2269
* fix(plugins): seal plugin provider config and clear base on config change
Encrypt opaque plugin provider configuration before persistence, clear
merge state when reconnect configuration changes, and stream sync objects
below a base64-safe inline threshold so control-plane JSON stays in budget.
Related to #2269
* fix(plugins): seal plugin configs by provider id and hydrate before start
Encrypt plugin provider configuration only for non-builtin provider IDs
so field-name collisions cannot skip sealing, hydrate retained sidecars
before plugin enable starts the runtime, and stop tearing down live
adapters on no-op availability refreshes.
Related to #2269
* fix(plugins): seal scalar configs, safe inline reads, stable config fingerprint
Encrypt any non-builtin plugin configuration JSON shape, enforce the
base64-safe inline read cutoff, and compare reconnect configurations with
order-independent fingerprints so merge bases are not cleared spuriously.
Related to #2269
* fix(plugins): thread sync credentials and harden availability checks
Pass SyncConnectPayload.credential through the object-storage and IPC host
path, treat only null/undefined config as missing, and avoid wiping the
plugin provider availability catalog on transient discovery failures.
Related to #2269
* fix(plugins): unblock schema-required sync connect and scalar configs
Add a JSON config dialog for plugin sync providers that declare a
required configurationSchema, reuse retained configs on reconnect, and
treat falsy scalar configs as present in readiness and adapter lookup.
Related to #2269
* fix(plugins): rebind sync adapters on contribution refresh
Drop cached plugin sync adapters when live contributions still include
the provider so replaced runtimes get a fresh connect, and seal falsy
scalar plugin configs with nullish presence checks end-to-end.
Related to #2269
* fix(plugins): apply sidecars under current declared setting scopes
When a plugin update changes a syncable setting scope, write under the
live declaration and drop the obsolete scope row so collection does not
republish duplicates.
Related to #2269
* fix(plugins): seal config envelopes and stabilize provider counters
Use an unambiguous host-owned sealed-config envelope, initialize
dynamic-provider sequence counters before cross-window decrypt, keep
three-way sidecar deletions during convergent migration, and create the
sidecar table for existing schema-1 plugin databases.
Related to #2269
* fix(plugins): avoid mid-sync adapter drops and sidecar resurrection
Keep plugin adapters across setting-only contribution refreshes and
rebind sessions on ensureConnected; stop preserving local-only missing
plugin sidecars when remote already mentions the plugin; compare configs
with nullish semantics across windows; swallow quick-connect failures
after toasting.
Related to #2269
* fix(plugins): restore remoteKeys for installed sidecar resets
Reintroduce the remote key set used when dropping installed-plugin
settings the remote no longer carries so applyFromSync cannot throw
after replacing the sidecar table.
Related to #2269
* fix(plugins): honor conflict policy and re-key scoped sidecars
Pass preferCloud/preferLocal into three-way sidecar merge, use
per-provider baselines on convergent downgrade so local resets are not
resurrected, and re-key applied settings under the current declared
scope coordinates.
Related to #2269
* fix(plugins): keep strategy on final sidecar merge and block dual legacy
Pass preferCloud/preferLocal through the final verified sidecar merge,
avoid auto-reactivating a retained plugin while another legacy provider
is already connected, cache plugin adapters only after initializeSync,
and preserve explicit null configuration values.
Related to #2269
* fix(plugins): strip plugin avatars and protect last-known sidecars
Do not load plugin-supplied avatar URLs in the main renderer, and avoid
overwriting last-known sidecars with an unmerged remote bundle when the
post-apply collect fails or is non-authoritative.
Related to #2269
* fix(plugins): strip top-bar plugin avatars and stop always-rebind
Hide plugin avatar URLs in the sync status popover, drop always-on
rebindSession for plugin adapters, and read convergent mode from the
local config module when deciding whether to auto-reactivate providers.
Related to #2269
* fix(plugins): use window.netcatty for sync IPC and allow null configs
Read plugin sync and sidecar APIs from the production preload global,
and treat an explicit config property (including JSON null) as present
for readiness and adapter lookup.
Related to #2269
* fix(plugins): close residual Codex P2 sync edge cases
Three-way merge sidecars during v2 convergent migration so local
resets are not resurrected, preserve explicit null plugin configs on
adapter rebuild, rebind EOS sessions after I/O failure for replaced
runtimes, and accept the public inlineObjectBytes limit on readObject.
Related to #2269
* fix(plugins): keep inline read cutoff under control-plane budget
Restore the base64-safe inline cutoff so advertised-size reads cannot
overflow the 128 KiB provider JSON envelope; providers near the public
inlineObjectBytes limit must stream.
Related to #2269
* fix(plugins): harden sidecar empty-vault, hydrate LWW, and credential seals
Close remaining Codex/review gaps for PR8: keep empty sidecar shells from
bypassing upload guards, skip startup hydrate when local settings are newer,
seal/validate durable plugin credential refs, and cover schema 1→2 migration.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(plugins): rebind plugin sync sessions and keep null configs
Address Codex P2 on 8ae52c54: re-issue connect after runtime replacement,
and treat stored config:null as present in the dashboard reconnect path.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(plugins): defer empty sidecar last-known until sync succeeds
Keep prior non-empty last-known across an authoritative empty collect so the
empty-vault guard can still recognize a plugin-only reset, then commit the
empty cache after a successful upload.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(plugins): avoid restricted localStorage global in sidecar test
Bind the mock to a local binding so eslint no-restricted-globals stays clean.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(plugins): commit applied sidecar cache and reset orphan settings
Prefer merged payload sidecars when updating last-known after sync, and clear
syncable plugin_settings that lack sidecar rows on authoritative remote deletes.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(plugins): reseal marker-shaped plugin configs instead of skipping
Exact __netcatty_plugin_config_v1 collisions no longer bypass encryption; trusted
host envelopes are unwrapped then resealed, and false collisions are sealed whole.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(plugins): keep merged sidecars in last-known after apply collect fails
Return applyFromSync entries from IPC and use them when follow-up collect fails,
so preserved missing-plugin rows are not dropped from the offline upload cache.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(plugins): delete stale-scope settings at stored coordinates on reset
After resetSetting against the current declared scope, also remove the row at
the sidecar's stored scope so scope migrations cannot republish remote deletes.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(plugins): close sync-provider credential, stream, and sidecar gaps
Make SecretRef usable end-to-end via lease-bound network.request, keep
renderer/main transfers abortable and bounded, and stop sidecar
last-known/pending from corrupting backups and conflict apply.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(plugins): harden single-provider, secret schema, and conditional conflicts
Keep legacy restart from dual-connecting providers, extract writeOnly schema
secrets into OS storage, and surface conditional-write precondition failures
as conflict UI instead of a generic sync error.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(plugins): dedupe sync type imports for lint
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: address Codex review on PR #2713
* fix(plugins): wait for sidecar host before version backup latch
Defer the one-shot upgrade snapshot until the plugin sidecar host is ready (or a short grace), and catch getDataHash failures so pending/baseline paths do not reject unhandled.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix(plugins): require sidecar grace before version backup
Always wait for contributions/grace tick before the upgrade snapshot, and only latch after a non-cancelled attempt so cleanup cannot suppress retries.
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: netcatty-bot <308658023+netcatty-bot@users.noreply.github.com>
388 lines
14 KiB
TypeScript
388 lines
14 KiB
TypeScript
/**
|
|
* Bridges between the legacy single-file CloudAdapter interface and the
|
|
* shared EncryptedObjectStorage surface used by plugin sync Providers.
|
|
*/
|
|
|
|
import type {
|
|
EncryptedObjectAccount,
|
|
EncryptedObjectDeleteResult,
|
|
EncryptedObjectReadResult,
|
|
EncryptedObjectStorage,
|
|
EncryptedObjectStorageCapabilities,
|
|
EncryptedObjectWriteResult,
|
|
} from '../../../domain/encryptedObjectStorage';
|
|
// EncryptedObjectStorageCapabilities used for session capability gating.
|
|
import {
|
|
DEFAULT_ENCRYPTED_SYNC_OBJECT_KEY,
|
|
} from '../../../domain/encryptedObjectStorage';
|
|
import type {
|
|
CloudProvider,
|
|
OAuthTokens,
|
|
ProviderAccount,
|
|
SyncedFile,
|
|
} from '../../../domain/sync';
|
|
import type { CloudAdapter } from './index';
|
|
|
|
const textEncoder = new TextEncoder();
|
|
const textDecoder = new TextDecoder();
|
|
|
|
function syncedFileToBytes(syncedFile: SyncedFile): Uint8Array {
|
|
return textEncoder.encode(JSON.stringify(syncedFile));
|
|
}
|
|
|
|
function bytesToSyncedFile(bytes: Uint8Array): SyncedFile {
|
|
const raw = textDecoder.decode(bytes);
|
|
// Require a complete JSON object. Do not accept a valid prefix with trailing
|
|
// garbage — that hides provider corruption from read-and-verify recovery.
|
|
return JSON.parse(raw) as SyncedFile;
|
|
}
|
|
|
|
/** Thrown when a conditional write is rejected (revision / precondition). */
|
|
export class ConditionalWriteConflictError extends Error {
|
|
readonly code = 'conditional_write_conflict';
|
|
|
|
constructor(message = 'Encrypted object conditional write was rejected', options?: { cause?: unknown }) {
|
|
super(message, options);
|
|
this.name = 'ConditionalWriteConflictError';
|
|
}
|
|
}
|
|
|
|
export function isConditionalWriteConflictError(error: unknown): boolean {
|
|
if (error instanceof ConditionalWriteConflictError) return true;
|
|
if (!error || typeof error !== 'object') return false;
|
|
const maybe = error as { name?: unknown; code?: unknown; message?: unknown; data?: { pluginCode?: unknown } };
|
|
if (maybe.name === 'ConditionalWriteConflictError') return true;
|
|
if (maybe.code === 'conditional_write_conflict' || maybe.code === -32009 || maybe.code === 'failed_precondition') {
|
|
return true;
|
|
}
|
|
if (maybe.data?.pluginCode === 'failed_precondition') return true;
|
|
return typeof maybe.message === 'string'
|
|
&& /failed[_ ]precondition|expectedRevision|revision mismatch|conditional write/i.test(maybe.message);
|
|
}
|
|
|
|
/**
|
|
* Adapt a legacy CloudAdapter into EncryptedObjectStorage.
|
|
* Uses a single default object key matching the historical vault file name.
|
|
*/
|
|
export function cloudAdapterAsEncryptedObjectStorage(
|
|
adapter: CloudAdapter,
|
|
providerId: string,
|
|
options: {
|
|
objectKey?: string;
|
|
capabilities?: EncryptedObjectStorageCapabilities;
|
|
} = {},
|
|
): EncryptedObjectStorage {
|
|
const objectKey = options.objectKey ?? DEFAULT_ENCRYPTED_SYNC_OBJECT_KEY;
|
|
const capabilities: EncryptedObjectStorageCapabilities = options.capabilities ?? {
|
|
revisions: false,
|
|
conditionalWrites: false,
|
|
atomicReplacement: true,
|
|
};
|
|
|
|
return {
|
|
providerId,
|
|
async connect(): Promise<{ account: EncryptedObjectAccount }> {
|
|
if (!adapter.isAuthenticated) {
|
|
throw new Error(`Cloud provider ${providerId} is not authenticated`);
|
|
}
|
|
await adapter.initializeSync();
|
|
const account = adapter.accountInfo;
|
|
if (!account) {
|
|
return { account: { id: providerId } };
|
|
}
|
|
return { account: { ...account } };
|
|
},
|
|
async disconnect(): Promise<void> {
|
|
adapter.signOut();
|
|
},
|
|
async getAccount(): Promise<EncryptedObjectAccount | null> {
|
|
return adapter.accountInfo ? { ...adapter.accountInfo } : null;
|
|
},
|
|
async getCapabilities(): Promise<EncryptedObjectStorageCapabilities> {
|
|
return { ...capabilities };
|
|
},
|
|
async readObject(key: string): Promise<EncryptedObjectReadResult> {
|
|
if (key !== objectKey) {
|
|
return { found: false, key, bytes: null };
|
|
}
|
|
const file = await adapter.download();
|
|
if (!file) return { found: false, key, bytes: null };
|
|
const bytes = syncedFileToBytes(file);
|
|
return {
|
|
found: true,
|
|
key,
|
|
bytes,
|
|
revision: file.meta?.version != null ? String(file.meta.version) : undefined,
|
|
contentType: 'application/json',
|
|
};
|
|
},
|
|
async writeObject(key: string, bytes: Uint8Array): Promise<EncryptedObjectWriteResult> {
|
|
if (key !== objectKey) {
|
|
throw new Error(`Cloud adapter ${providerId} only supports object key ${objectKey}`);
|
|
}
|
|
const syncedFile = bytesToSyncedFile(bytes);
|
|
// Skip a pre-upload GET for `created`. The single-object vault path does not
|
|
// consume that flag, and WebDAV already pays for pad+verify inside upload.
|
|
await adapter.upload(syncedFile);
|
|
return {
|
|
created: false,
|
|
revision: syncedFile.meta?.version != null ? String(syncedFile.meta.version) : undefined,
|
|
};
|
|
},
|
|
async deleteObject(key: string): Promise<EncryptedObjectDeleteResult> {
|
|
if (key !== objectKey) {
|
|
return { deleted: false };
|
|
}
|
|
const existing = await adapter.download();
|
|
if (!existing) return { deleted: false };
|
|
await adapter.deleteSync();
|
|
return { deleted: true };
|
|
},
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Adapt EncryptedObjectStorage into the legacy CloudAdapter surface so the
|
|
* existing encrypt→upload / download→decrypt manager path can drive WebDAV and
|
|
* plugin providers through one code path.
|
|
*
|
|
* Authentication and resourceId must match pre-bridge CloudAdapter semantics:
|
|
* config-backed providers (WebDAV) report authenticated as soon as credentials
|
|
* exist so getConnectedAdapter can reuse the cached instance; resourceId must
|
|
* preserve the persisted path (or the backing adapter's authoritative id) rather
|
|
* than always forcing the default object key.
|
|
*/
|
|
export function encryptedObjectStorageAsCloudAdapter(
|
|
storage: EncryptedObjectStorage,
|
|
options: {
|
|
objectKey?: string;
|
|
account?: ProviderAccount | null;
|
|
/** When true, getConnectedAdapter reuses this instance without recreating. */
|
|
initiallyAuthenticated?: boolean;
|
|
/** Seeded resource id (e.g. path restored from provider connection storage). */
|
|
resourceId?: string | null;
|
|
/**
|
|
* Prefer the backing adapter's resource id after connect/upload (WebDAV sets
|
|
* `/netcatty-vault.json` via initializeSync; plugins may use object keys).
|
|
*/
|
|
resolveResourceId?: () => string | null | undefined;
|
|
/**
|
|
* When true, re-issue connect() even if a prior session was established.
|
|
* Required for plugin providers whose in-process clients die on runtime
|
|
* restart/replace while the CloudAdapter cache stays alive.
|
|
*/
|
|
rebindSession?: boolean;
|
|
/**
|
|
* When true, skip the host full-byte re-read after writeObject. Use only when
|
|
* the backing storage already performs Netcatty-grade write verification
|
|
* (WebDAV pad+verify). Plugin providers keep host-owned verify.
|
|
*/
|
|
assumeVerifiedWrites?: boolean;
|
|
} = {},
|
|
): CloudAdapter {
|
|
const objectKey = options.objectKey ?? DEFAULT_ENCRYPTED_SYNC_OBJECT_KEY;
|
|
let account: ProviderAccount | null = options.account ?? null;
|
|
let resourceId: string | null = options.resourceId ?? null;
|
|
let authenticated = options.initiallyAuthenticated === true;
|
|
/** Distinct from credential presence: plugin providers need an explicit connect. */
|
|
let sessionConnected = false;
|
|
/**
|
|
* Last observed remote revision for conditional writes.
|
|
* - string: known revision
|
|
* - null: confirmed absent (must-not-exist write)
|
|
* - undefined: unknown / unconditional
|
|
*/
|
|
let lastRevision: string | null | undefined;
|
|
|
|
const refreshResourceId = (fallback?: string | null): string | null => {
|
|
const resolved = options.resolveResourceId?.();
|
|
if (typeof resolved === 'string' && resolved.length > 0) {
|
|
resourceId = resolved;
|
|
return resourceId;
|
|
}
|
|
if (typeof fallback === 'string' && fallback.length > 0) {
|
|
resourceId = fallback;
|
|
return resourceId;
|
|
}
|
|
return resourceId;
|
|
};
|
|
|
|
let capabilities: EncryptedObjectStorageCapabilities | null = null;
|
|
|
|
const ensureConnected = async (): Promise<void> => {
|
|
if (sessionConnected && !options.rebindSession) return;
|
|
// rebindSession: always re-run connect so a replaced plugin runtime gets a
|
|
// fresh client. Connect is expected to be idempotent when still healthy.
|
|
const result = await storage.connect();
|
|
account = result.account;
|
|
capabilities = await storage.getCapabilities();
|
|
authenticated = true;
|
|
sessionConnected = true;
|
|
refreshResourceId(objectKey);
|
|
};
|
|
|
|
/** After I/O failure, force the next ensureConnected to re-issue connect(). */
|
|
const markSessionStale = (): void => {
|
|
sessionConnected = false;
|
|
};
|
|
|
|
return {
|
|
get isAuthenticated() {
|
|
return authenticated;
|
|
},
|
|
get accountInfo() {
|
|
return account;
|
|
},
|
|
get resourceId() {
|
|
return resourceId;
|
|
},
|
|
signOut() {
|
|
authenticated = false;
|
|
sessionConnected = false;
|
|
lastRevision = undefined;
|
|
capabilities = null;
|
|
account = null;
|
|
resourceId = null;
|
|
// Fire-and-forget is intentional for CloudAdapter.signOut sync API;
|
|
// disconnectProvider should call initializeSync/connect after a full await
|
|
// path when a future async signOut is added to CloudAdapter.
|
|
void Promise.resolve(storage.disconnect()).catch(() => {
|
|
// Plugin runtime may already be gone; local sign-out still succeeds.
|
|
});
|
|
},
|
|
async initializeSync(): Promise<string | null> {
|
|
try {
|
|
await ensureConnected();
|
|
return refreshResourceId(objectKey);
|
|
} catch (error) {
|
|
markSessionStale();
|
|
throw error;
|
|
}
|
|
},
|
|
async upload(syncedFile: SyncedFile, uploadOptions?: { signal?: AbortSignal }): Promise<string> {
|
|
try {
|
|
await ensureConnected();
|
|
const bytes = syncedFileToBytes(syncedFile);
|
|
if (
|
|
capabilities?.maxObjectBytes != null
|
|
&& bytes.byteLength > capabilities.maxObjectBytes
|
|
) {
|
|
throw new Error(
|
|
`Encrypted object exceeds provider maxObjectBytes (${capabilities.maxObjectBytes})`,
|
|
);
|
|
}
|
|
if (
|
|
capabilities?.maxObjects != null
|
|
&& capabilities.maxObjects < 1
|
|
) {
|
|
throw new Error(
|
|
`Encrypted object provider reports maxObjects < 1 (${capabilities.maxObjects})`,
|
|
);
|
|
}
|
|
const conditional = capabilities?.conditionalWrites === true;
|
|
let writeResult: EncryptedObjectWriteResult;
|
|
try {
|
|
writeResult = await storage.writeObject(objectKey, bytes, {
|
|
...(conditional && lastRevision !== undefined
|
|
? { expectedRevision: lastRevision }
|
|
: {}),
|
|
signal: uploadOptions?.signal,
|
|
});
|
|
} catch (writeError) {
|
|
if (conditional && isConditionalWriteConflictError(writeError)) {
|
|
throw new ConditionalWriteConflictError(
|
|
writeError instanceof Error ? writeError.message : String(writeError),
|
|
{ cause: writeError },
|
|
);
|
|
}
|
|
throw writeError;
|
|
}
|
|
if (options.assumeVerifiedWrites === true) {
|
|
// Backing adapter already verified (e.g. WebDAV pad+verify). Still honor
|
|
// maxObjectBytes above and refresh revision from the write result.
|
|
if (typeof writeResult.revision === 'string' && writeResult.revision.length > 0) {
|
|
lastRevision = writeResult.revision;
|
|
}
|
|
} else {
|
|
// Host-owned write verification: re-read and compare ciphertext bytes.
|
|
const verified = await storage.readObject(objectKey, { signal: uploadOptions?.signal });
|
|
if (!verified.found || !verified.bytes) {
|
|
throw new Error('Encrypted object write verification failed: object missing after write');
|
|
}
|
|
if (verified.bytes.byteLength !== bytes.byteLength) {
|
|
throw new Error('Encrypted object write verification failed: size mismatch');
|
|
}
|
|
for (let i = 0; i < bytes.byteLength; i += 1) {
|
|
if (verified.bytes[i] !== bytes[i]) {
|
|
throw new Error('Encrypted object write verification failed: content mismatch');
|
|
}
|
|
}
|
|
if (typeof writeResult.revision === 'string' && writeResult.revision.length > 0) {
|
|
lastRevision = writeResult.revision;
|
|
} else if (typeof verified.revision === 'string' && verified.revision.length > 0) {
|
|
lastRevision = verified.revision;
|
|
} else {
|
|
lastRevision = undefined;
|
|
}
|
|
}
|
|
authenticated = true;
|
|
return refreshResourceId(objectKey) ?? objectKey;
|
|
} catch (error) {
|
|
markSessionStale();
|
|
throw error;
|
|
}
|
|
},
|
|
async download(downloadOptions?: { signal?: AbortSignal }): Promise<SyncedFile | null> {
|
|
try {
|
|
await ensureConnected();
|
|
const result = await storage.readObject(objectKey, { signal: downloadOptions?.signal });
|
|
if (!result.found || !result.bytes) {
|
|
// Confirmed absence: next conditional write must use expectedRevision null.
|
|
lastRevision = null;
|
|
return null;
|
|
}
|
|
if (typeof result.revision === 'string' && result.revision.length > 0) {
|
|
lastRevision = result.revision;
|
|
} else {
|
|
lastRevision = undefined;
|
|
}
|
|
return bytesToSyncedFile(result.bytes);
|
|
} catch (error) {
|
|
markSessionStale();
|
|
throw error;
|
|
}
|
|
},
|
|
async deleteSync(deleteOptions?: { signal?: AbortSignal }): Promise<void> {
|
|
try {
|
|
await ensureConnected();
|
|
await storage.deleteObject(objectKey, {
|
|
...(typeof lastRevision === 'string' ? { expectedRevision: lastRevision } : {}),
|
|
signal: deleteOptions?.signal,
|
|
});
|
|
lastRevision = null;
|
|
} catch (error) {
|
|
markSessionStale();
|
|
throw error;
|
|
}
|
|
},
|
|
getTokens(): OAuthTokens | null {
|
|
return null;
|
|
},
|
|
};
|
|
}
|
|
|
|
/**
|
|
* WebDAV-specific capabilities: atomic replacement via temp+MOVE, no native revisions.
|
|
*/
|
|
export function webdavEncryptedObjectCapabilities(): EncryptedObjectStorageCapabilities {
|
|
return {
|
|
revisions: false,
|
|
conditionalWrites: false,
|
|
atomicReplacement: true,
|
|
};
|
|
}
|
|
|
|
export function isWebdavProvider(provider: CloudProvider): boolean {
|
|
return provider === 'webdav';
|
|
}
|