@undefineds.co/xpod 0.4.9 → 0.4.10

package/dist/identity/drizzle/PodLookupRepository.d.ts

@@ -29,15 +29,14 @@ export declare class PodLookupRepository {
      */
     findById(podId: string): Promise<PodLookupResult | undefined>;
     /**
-     * Find Pod by a linked WebID URL.
+     * Find Pod by an explicitly recorded owner WebID URL.
      *
-     * CSS account data stores WebID links separately from Pod base URLs. This is
-     * the precise lookup for IdP/SP split deployments where the WebID path does
-     * not have to match the storage base URL.
+     * Account WebID links are not ownership. IdP/SP split deployments still use
+     * the complete recorded WebID, independently of the storage base URL.
      */
     findByWebId(webId: string): Promise<PodLookupResult | undefined>;
     /**
-     * Find all Pods linked to a WebID.
+     * Find all Pods explicitly owned by a WebID.
      *
      * A Cloud WebID can legitimately back both a Cloud Pod and a Local SP Pod.
      * Callers that are scoped to a storage provider must inspect all candidates
@@ -45,7 +44,7 @@ export declare class PodLookupRepository {
      */
     findAllByWebId(webId: string): Promise<PodLookupResult[]>;
     /**
-     * Find Pods by linked WebID URLs in one scan.
+     * Find Pods by explicit owner WebID URLs in one scan.
      */
     findByWebIds(webIds: string[]): Promise<PodLookupResult[]>;
     /**
@@ -62,16 +61,6 @@ export declare class PodLookupRepository {
     private getAllPods;
     private getAccountRowsFromKv;
     private getNodeAssignments;
-    /**
-     * Fast path for CSS WrappedIndexedStorage. WebID indexes point to the root
-     * account id, so a single indexed key plus account data row can resolve the
-     * profile without scanning all account records.
-     */
-    private findByWebIdIndex;
-    private readAccountData;
-    private readStringArrayFromKv;
-    private readKvValue;
-    private extractPodsFromAccountData;
     /**
      * DrizzleIndexedStorage stores CSS identity facts as typed rows in
      * identity_store; this is the canonical clustered identity source.

package/dist/identity/drizzle/PodLookupRepository.js

@@ -39,17 +39,16 @@ class PodLookupRepository {
         return pods.find((p) => p.podId === podId);
     }
     /**
-     * Find Pod by a linked WebID URL.
+     * Find Pod by an explicitly recorded owner WebID URL.
      *
-     * CSS account data stores WebID links separately from Pod base URLs. This is
-     * the precise lookup for IdP/SP split deployments where the WebID path does
-     * not have to match the storage base URL.
+     * Account WebID links are not ownership. IdP/SP split deployments still use
+     * the complete recorded WebID, independently of the storage base URL.
      */
     async findByWebId(webId) {
         return (await this.findAllByWebId(webId))[0];
     }
     /**
-     * Find all Pods linked to a WebID.
+     * Find all Pods explicitly owned by a WebID.
      *
      * A Cloud WebID can legitimately back both a Cloud Pod and a Local SP Pod.
      * Callers that are scoped to a storage provider must inspect all candidates
@@ -71,19 +70,10 @@ class PodLookupRepository {
                 });
             }
         }
-        if (results.length > 0) {
-            return results;
-        }
-        const indexed = await this.findByWebIdIndex(exact);
-        if (!indexed) {
-            return [];
-        }
-        return [{
-                ...indexed,
-            }];
+        return results;
     }
     /**
-     * Find Pods by linked WebID URLs in one scan.
+     * Find Pods by explicit owner WebID URLs in one scan.
      */
     async findByWebIds(webIds) {
         const exactTargets = new Set(webIds.map(exactWebId).filter((value) => Boolean(value)));
@@ -105,18 +95,6 @@ class PodLookupRepository {
                 webId: matchedWebId,
             });
         }
-        if (results.length < exactTargets.size) {
-            const seen = new Set(results.map((result) => exactWebId(result.webId)).filter(Boolean));
-            for (const exact of exactTargets) {
-                if (seen.has(exact)) {
-                    continue;
-                }
-                const indexed = await this.findByWebIdIndex(exact);
-                if (indexed) {
-                    results.push(indexed);
-                }
-            }
-        }
         return results;
     }
     /**
@@ -150,18 +128,17 @@ class PodLookupRepository {
                 }
                 const data = unwrapStoredValue(typeof row.value === 'string' ? JSON.parse(row.value) : row.value);
                 const podMap = data['**pod**'] || data.pod || {};
-                const webIds = extractAccountWebIds(data);
                 for (const [podId, podData] of Object.entries(podMap)) {
                     const pod = podData;
                     if (pod.baseUrl && typeof pod.baseUrl === 'string') {
                         const storageUrl = stringValue(pod.storageUrl) ?? stringValue(pod.storage);
-                        const podWebIds = resolvePodWebIds(pod, webIds);
+                        const podWebIds = dedupeStrings(explicitPodWebIds(pod));
                         pods.push({
                             podId,
                             accountId,
                             baseUrl: pod.baseUrl,
                             storageUrl,
-                            webId: dedupeStrings(podWebIds)[0],
+                            webId: podWebIds[0],
                             ...webIdsProperty(podWebIds),
                             nodeId: typeof pod.nodeId === 'string' ? pod.nodeId : findNodeIdForPod(nodeAssignments, [storageUrl, pod.baseUrl]),
                             edgeNodeId: typeof pod.edgeNodeId === 'string' ? pod.edgeNodeId : undefined,
@@ -173,10 +150,13 @@ class PodLookupRepository {
                 // Skip malformed entries.
             }
         }
-        return mergePodLookupResults([
-            ...pods,
-            ...await this.getPodsFromIndexedStore(nodeAssignments),
-        ]);
+        const indexed = await this.getPodsFromIndexedStore(nodeAssignments);
+        // Presence in the canonical table shadows the whole legacy record, even
+        // when the canonical payload is incomplete. Never resurrect old owners.
+        return [...new Map([
+                ...pods.filter((pod) => !indexed.podIds.has(pod.podId)),
+                ...indexed.pods,
+            ].map((pod) => [pod.podId, pod])).values()];
     }
     async getAccountRowsFromKv() {
         const kvTableId = drizzle_orm_1.sql.identifier(this.kvTableName);
@@ -213,90 +193,6 @@ class PodLookupRepository {
             return [];
         }
     }
-    /**
-     * Fast path for CSS WrappedIndexedStorage. WebID indexes point to the root
-     * account id, so a single indexed key plus account data row can resolve the
-     * profile without scanning all account records.
-     */
-    async findByWebIdIndex(webId) {
-        const accountIds = await this.readStringArrayFromKv(`accounts/index/webIdLink/webId/${encodeURIComponent(webId)}`);
-        for (const accountId of accountIds) {
-            const account = await this.readAccountData(accountId);
-            if (!account) {
-                continue;
-            }
-            const pods = this.extractPodsFromAccountData(accountId, account);
-            const match = pods.find((pod) => getPodWebIds(pod).some((candidate) => exactWebId(candidate) === webId));
-            if (match) {
-                return {
-                    ...match,
-                    webId,
-                };
-            }
-            if (pods.length === 1 && !hasExplicitPodWebIds(account, pods[0].podId)) {
-                return {
-                    ...pods[0],
-                    webId,
-                    ...webIdsProperty([webId, ...getPodWebIds(pods[0])]),
-                };
-            }
-        }
-        return undefined;
-    }
-    async readAccountData(accountId) {
-        for (const key of [`accounts/data/${accountId}`, `/.internal/accounts/data/${accountId}`]) {
-            const value = await this.readKvValue(key);
-            const record = parsePayloadRecord(value);
-            if (record) {
-                return record;
-            }
-        }
-        return undefined;
-    }
-    async readStringArrayFromKv(key) {
-        const value = await this.readKvValue(key);
-        return Array.isArray(value) ? value.filter((entry) => typeof entry === 'string') : [];
-    }
-    async readKvValue(key) {
-        const tableId = drizzle_orm_1.sql.identifier(this.kvTableName);
-        try {
-            const result = await (0, db_1.executeQuery)(this.db, (0, drizzle_orm_1.sql) `
-        SELECT value FROM ${tableId}
-        WHERE key = ${key}
-        LIMIT 1
-      `);
-            if (result.rows.length === 0) {
-                return undefined;
-            }
-            return parseStoredValue(result.rows[0].value);
-        }
-        catch {
-            return undefined;
-        }
-    }
-    extractPodsFromAccountData(accountId, data) {
-        const podMap = data['**pod**'] || data.pod || {};
-        const webIds = extractAccountWebIds(data);
-        const pods = [];
-        for (const [podId, podData] of Object.entries(podMap)) {
-            const pod = podData;
-            if (pod.baseUrl && typeof pod.baseUrl === 'string') {
-                const storageUrl = stringValue(pod.storageUrl) ?? stringValue(pod.storage);
-                const podWebIds = resolvePodWebIds(pod, webIds);
-                pods.push({
-                    podId,
-                    accountId,
-                    baseUrl: pod.baseUrl,
-                    storageUrl,
-                    webId: dedupeStrings(podWebIds)[0],
-                    ...webIdsProperty(podWebIds),
-                    nodeId: typeof pod.nodeId === 'string' ? pod.nodeId : undefined,
-                    edgeNodeId: typeof pod.edgeNodeId === 'string' ? pod.edgeNodeId : undefined,
-                });
-            }
-        }
-        return pods;
-    }
     /**
      * DrizzleIndexedStorage stores CSS identity facts as typed rows in
      * identity_store; this is the canonical clustered identity source.
@@ -307,19 +203,25 @@ class PodLookupRepository {
         try {
             result = await (0, db_1.executeQuery)(this.db, (0, drizzle_orm_1.sql) `
         SELECT container, id, payload FROM ${storeTableId}
-        WHERE container IN ('pod', 'owner', 'webIdLink')
+        WHERE container IN ('pod', 'owner')
       `);
         }
-        catch {
-            return [];
+        catch (error) {
+            // Legacy-only installations have no canonical table. An unavailable or
+            // unreadable existing table must not reactivate legacy ownership.
+            if (!isMissingIdentityStore(error))
+                throw error;
+            return { pods: [], podIds: new Set() };
         }
+        const podIds = new Set();
         const podPayloads = new Map();
         const ownerWebIdsByPodId = new Map();
-        const webIdsByAccountId = new Map();
         for (const row of result?.rows ?? []) {
             if (!row.id || !row.container) {
                 continue;
             }
+            if (row.container === 'pod')
+                podIds.add(row.id);
             const payload = parsePayloadRecord(row.payload);
             if (!payload) {
                 continue;
@@ -334,14 +236,6 @@ class PodLookupRepository {
                 if (podId && webId) {
                     appendMapValue(ownerWebIdsByPodId, podId, webId);
                 }
-                continue;
-            }
-            if (row.container === 'webIdLink') {
-                const accountId = stringValue(payload.accountId);
-                const webId = stringValue(payload.webId);
-                if (accountId && webId) {
-                    appendMapValue(webIdsByAccountId, accountId, webId);
-                }
             }
         }
         const pods = [];
@@ -355,9 +249,7 @@ class PodLookupRepository {
                 stringValue(pod.webId),
                 ...(ownerWebIdsByPodId.get(podId) ?? []),
             ].filter((value) => typeof value === 'string');
-            const podWebIds = dedupeStrings(explicitPodWebIds.length > 0
-                ? explicitPodWebIds
-                : webIdsByAccountId.get(accountId) ?? []);
+            const podWebIds = dedupeStrings(explicitPodWebIds);
             const storageUrl = stringValue(pod.storageUrl) ?? stringValue(pod.storage);
             pods.push({
                 podId,
@@ -370,10 +262,23 @@ class PodLookupRepository {
                 edgeNodeId: stringValue(pod.edgeNodeId),
             });
         }
-        return pods;
+        return { pods, podIds };
     }
 }
 exports.PodLookupRepository = PodLookupRepository;
+function isMissingIdentityStore(error) {
+    const visited = new Set();
+    while (error && typeof error === 'object' && !visited.has(error)) {
+        visited.add(error);
+        const failure = error;
+        if (failure.message === 'no such table: identity_store'
+            || (failure.code === '42P01' && failure.message === 'relation "identity_store" does not exist')) {
+            return true;
+        }
+        error = failure.cause;
+    }
+    return false;
+}
 function extractAccountIdFromAccountDataKey(key) {
     const marker = 'accounts/data/';
     const index = key.indexOf(marker);
@@ -383,25 +288,6 @@ function extractAccountIdFromAccountDataKey(key) {
     const accountId = key.slice(index + marker.length).replace(/\.json$/u, '');
     return accountId || undefined;
 }
-function extractAccountWebIds(data) {
-    if (!data || typeof data !== 'object') {
-        return [];
-    }
-    const record = data;
-    const linkMap = record['**webIdLink**'] || record.webIdLink || {};
-    if (!linkMap || typeof linkMap !== 'object') {
-        return [];
-    }
-    return Object.values(linkMap)
-        .map((value) => {
-        if (!value || typeof value !== 'object') {
-            return undefined;
-        }
-        const webId = value.webId;
-        return typeof webId === 'string' ? webId : undefined;
-    })
-        .filter((value) => typeof value === 'string');
-}
 function extractPodOwnerWebIds(pod) {
     const ownerMap = pod['**owner**'] || pod.owner || {};
     if (!ownerMap || typeof ownerMap !== 'object') {
@@ -423,17 +309,6 @@ function explicitPodWebIds(pod) {
         ...extractPodOwnerWebIds(pod),
     ].filter((value) => typeof value === 'string');
 }
-function hasExplicitPodWebIds(account, podId) {
-    const podMap = account['**pod**'] ?? account.pod;
-    if (!podMap || typeof podMap !== 'object')
-        return false;
-    const pod = podMap[podId];
-    return Boolean(pod && typeof pod === 'object' && explicitPodWebIds(pod).length > 0);
-}
-function resolvePodWebIds(pod, accountWebIds) {
-    const explicit = explicitPodWebIds(pod);
-    return dedupeStrings(explicit.length > 0 ? explicit : accountWebIds);
-}
 function exactWebId(webId) {
     // WebID identity is the complete original string, not URL equivalence.
     return webId && webId === webId.trim() && !/[\r\n\t]/u.test(webId) ? webId : undefined;
@@ -466,31 +341,6 @@ function webIdsProperty(values) {
     const webIds = dedupeStrings(values);
     return webIds.length > 1 ? { webIds } : {};
 }
-function mergePodLookupResults(values) {
-    const byPodId = new Map();
-    for (const value of values) {
-        const existing = byPodId.get(value.podId);
-        if (!existing) {
-            byPodId.set(value.podId, value);
-            continue;
-        }
-        const webIds = dedupeStrings([
-            ...getPodWebIds(existing),
-            ...getPodWebIds(value),
-        ]);
-        byPodId.set(value.podId, {
-            ...existing,
-            baseUrl: existing.baseUrl || value.baseUrl,
-            storageUrl: existing.storageUrl ?? value.storageUrl,
-            accountId: existing.accountId || value.accountId,
-            webId: webIds[0],
-            ...webIdsProperty(webIds),
-            nodeId: existing.nodeId ?? value.nodeId,
-            edgeNodeId: existing.edgeNodeId ?? value.edgeNodeId,
-        });
-    }
-    return [...byPodId.values()];
-}
 function parsePayloadRecord(value) {
     if (!value) {
         return undefined;
@@ -508,17 +358,6 @@ function parsePayloadRecord(value) {
     const unwrapped = unwrapStoredValue(value);
     return typeof unwrapped === 'object' ? unwrapped : undefined;
 }
-function parseStoredValue(value) {
-    if (typeof value === 'string') {
-        try {
-            return unwrapStoredValue(JSON.parse(value));
-        }
-        catch {
-            return undefined;
-        }
-    }
-    return unwrapStoredValue(value);
-}
 function unwrapStoredValue(value) {
     if (value && typeof value === 'object' && 'key' in value && 'payload' in value) {
         return value.payload;

package/node_modules/@undefineds.co/ai-connections/dist/AiConnectionsMain.js

@@ -31,6 +31,7 @@ export function AiConnectionsMain({ controller, renderToaster = true }) {
     useEffect(() => {
         if (controller.client)
             void controller.loadProviders();
+        return () => controller.cancelProviderLoads();
     }, [controller]);
     if (!controller.client) {
         return (_jsxs("section", { role: "alert", "aria-label": "AI Connections unavailable", children: [_jsx("h2", { children: "AI Connections \u5C1A\u672A\u5C31\u7EEA" }), _jsx("p", { children: "\u5BBF\u4E3B\u9700\u8981\u5148\u63D0\u4F9B\u5DF2\u767B\u5F55\u7684 WebID \u548C\u53EF\u7528\u7684 Pod\u3002" })] }));

package/node_modules/@undefineds.co/ai-connections/dist/controller.d.ts

@@ -38,6 +38,7 @@ export interface AiConnectionsController {
     setSearchQuery(value: string): void;
     setProviderState(provider: AiConnectionsProvider, state: ProviderProductState): void;
     loadProviders(): Promise<void>;
+    cancelProviderLoads(): void;
     subscribe(listener: () => void): () => void;
 }
 export declare function createAiConnectionsController(host: WebExtensionHost): AiConnectionsController;

package/node_modules/@undefineds.co/ai-connections/dist/controller.js

@@ -16,18 +16,72 @@ export const AI_CONNECTIONS_PINNED_SECTIONS = [
 if (PROVIDERS.map((provider) => provider.id).join(',') !== AI_CONNECTIONS_PROVIDERS.join(',')) {
     throw new Error('AI Connection provider UI is out of sync with the client catalog');
 }
+class ProviderLoadCancelled extends Error {
+}
 export function createAiConnectionsController(host) {
     const sessionSnapshot = host.solid.session.getSnapshot();
     const pod = host.solid.pod;
     const readyPod = pod?.status === 'ready' ? pod : undefined;
     const authenticated = sessionSnapshot.status === 'authenticated'
         && readyPod !== undefined;
+    let providerLoadGeneration = 0;
+    let providerLoadPromise;
+    let providerLoadOperation;
+    const activeProviderLoads = new Set();
+    const isCurrentSession = () => {
+        const current = host.solid.session.getSnapshot();
+        return authenticated && current.status === 'authenticated' && current.webId === sessionSnapshot.webId;
+    };
+    const cancelProviderLoads = () => {
+        providerLoadGeneration += 1;
+        providerLoadOperation = undefined;
+        providerLoadPromise = undefined;
+        for (const guard of activeProviderLoads)
+            guard.cancel();
+    };
+    const beginProviderLoad = () => {
+        const generation = providerLoadGeneration;
+        let invalidated = !isCurrentSession();
+        let released = false;
+        let unsubscribe = () => undefined;
+        const guard = {
+            assertCurrent() {
+                if (invalidated || generation !== providerLoadGeneration || !isCurrentSession())
+                    throw new ProviderLoadCancelled();
+            },
+            dispose() {
+                if (released)
+                    return;
+                released = true;
+                activeProviderLoads.delete(guard);
+                unsubscribe();
+            },
+            cancel() {
+                invalidated = true;
+                guard.dispose();
+            },
+        };
+        activeProviderLoads.add(guard);
+        let subscribing = true;
+        unsubscribe = host.solid.session.subscribe((current) => {
+            // The Solid SDK deduplicates unchanged state except new LOGIN/RESTORED
+            // sessions; SESSION_EXTENDED does not notify. Accept a synchronous initial
+            // snapshot, then invalidate on every published session transition.
+            if (!subscribing || current.status !== 'authenticated' || current.webId !== sessionSnapshot.webId)
+                cancelProviderLoads();
+        });
+        subscribing = false;
+        // Also handle a host that synchronously publishes its state on subscribe.
+        if (released)
+            unsubscribe();
+        return guard;
+    };
     const client = authenticated
         ? createInteractiveAiConnectionsClient(withAccountClientCredentials(createAiConnectionsClient({
             webId: sessionSnapshot.webId,
             podBaseUrl: readyPod.current.podUrl,
             authenticatedFetch: host.solid.session.fetch,
-        }), host.capabilities.aiClientCredentials), host.capabilities.aiConnectionsPodStore)
+        }), host.capabilities.aiClientCredentials), host.capabilities.aiConnectionsPodStore, beginProviderLoad)
         : null;
     let selectedSection = 'keys';
     let selectedProvider = 'openai';
@@ -36,8 +90,6 @@ export function createAiConnectionsController(host) {
     let providerStates = {};
     let providerSummaries = {};
     let providerLoadError;
-    let providerLoadGeneration = 0;
-    let providerLoadPromise;
     const listeners = new Set();
     const notify = () => listeners.forEach((listener) => listener());
     const controller = {
@@ -111,19 +163,23 @@ export function createAiConnectionsController(host) {
             }
             notify();
         },
+        cancelProviderLoads,
         async loadProviders() {
             if (!client)
                 return;
             if (providerLoadPromise)
                 return providerLoadPromise;
-            providerLoadPromise = (async () => {
-                const generation = providerLoadGeneration + 1;
-                providerLoadGeneration = generation;
+            const operation = {};
+            providerLoadOperation = operation;
+            const generation = ++providerLoadGeneration;
+            const load = Promise.resolve().then(async () => {
+                if (providerLoadOperation !== operation)
+                    return;
                 providerLoadError = undefined;
                 notify();
                 try {
                     const summaries = await client.listProviders();
-                    if (generation !== providerLoadGeneration)
+                    if (generation !== providerLoadGeneration || !isCurrentSession())
                         return;
                     providerSummaries = Object.fromEntries(summaries.map((summary) => [summary.id, summary]));
                     providerStates = Object.fromEntries(PROVIDERS.map((provider) => [
@@ -133,16 +189,20 @@ export function createAiConnectionsController(host) {
                     notify();
                 }
                 catch (error) {
-                    if (generation !== providerLoadGeneration)
+                    if (error instanceof ProviderLoadCancelled || generation !== providerLoadGeneration || !isCurrentSession())
                         return;
                     providerLoadError = errorMessage(error);
                     notify();
                 }
                 finally {
-                    providerLoadPromise = undefined;
+                    if (providerLoadOperation === operation) {
+                        providerLoadOperation = undefined;
+                        providerLoadPromise = undefined;
+                    }
                 }
-            })();
-            return providerLoadPromise;
+            });
+            providerLoadPromise = load;
+            return load;
         },
         subscribe(listener) {
             listeners.add(listener);
@@ -195,9 +255,29 @@ function withAccountClientCredentials(client, credentials) {
         },
     };
 }
-function createInteractiveAiConnectionsClient(operationsClient, podStore) {
+function createInteractiveAiConnectionsClient(operationsClient, podStore, beginProviderLoad) {
+    const listProviders = async () => {
+        const guard = beginProviderLoad();
+        try {
+            guard.assertCurrent();
+            const providers = podStore
+                ? await podStore.listProviders()
+                : await operationsClient.listProviders();
+            guard.assertCurrent();
+            if (!podStore)
+                return providers;
+            const methods = operationsClient.listAuthorizationMethods
+                ? await operationsClient.listAuthorizationMethods()
+                : [];
+            guard.assertCurrent();
+            return mergeAuthorizationMethodsIntoProviders(providers, methods);
+        }
+        finally {
+            guard.dispose();
+        }
+    };
     if (!podStore)
-        return operationsClient;
+        return { ...operationsClient, listProviders };
     const refreshTasks = new Map();
     const refreshOAuthCredential = podStore.readCredentialSecret && podStore.updateOAuthCredential
         ? (provider, credentialId) => {
@@ -249,9 +329,7 @@ function createInteractiveAiConnectionsClient(operationsClient, podStore) {
     };
     return {
         ...operationsClient,
-        listProviders: async () => mergeAuthorizationMethodsIntoProviders(await podStore.listProviders(), operationsClient.listAuthorizationMethods
-            ? await operationsClient.listAuthorizationMethods()
-            : []),
+        listProviders,
         listModels: podStore.listModels
             ? async () => podStore.listModels()
             : operationsClient.listModels,