npm - @undefineds.co/xpod - Versions diffs - 0.3.58 → 0.3.62 - Mend

@undefineds.co/xpod 0.3.58 → 0.3.62

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (806) hide show

package/dist/storage/accessors/SolidRdfDataAccessor.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { Readable } from 'node:stream';
 import type { NamedNode, Quad } from '@rdfjs/types';
 import { DataAccessor, IdentifierStrategy, RepresentationMetadata, type Guarded, type Representation, type ResourceIdentifier } from '@solid/community-server';
-import type { RdfEngineLike, RdfSourceInput } from '../rdf/types';
+import type { RdfEngineLike, RdfSourceInput, RdfTextChunkInput, RdfTextSourceInput, RdfVectorChunkInput, RdfVectorSourceInput } from '../rdf/types';
 import type { Quint } from '../quint/types';
 /**
  * Structured RDF DataAccessor backed directly by SolidRdfEngine.
@@ -27,6 +27,11 @@ export declare class SolidRdfDataAccessor implements DataAccessor {
     writeContainer(identifier: ResourceIdentifier, metadata: RepresentationMetadata): Promise<void>;
     writeDocument(identifier: ResourceIdentifier, data: Guarded<Readable>, metadata: RepresentationMetadata): Promise<void>;
     writeRdfSourceDocument(identifier: ResourceIdentifier, quads: Quad[], metadata: RepresentationMetadata, source: RdfSourceInput): Promise<void>;
+    indexTextSource(source: RdfTextSourceInput, text: string, chunks?: RdfTextChunkInput[]): Promise<void>;
+    deleteTextSource(source: string): Promise<number>;
+    moveRdfSourceDocument(oldSource: string, next: RdfSourceInput): Promise<number>;
+    indexVectorSource(source: RdfVectorSourceInput, chunks: RdfVectorChunkInput[]): Promise<void>;
+    deleteVectorSource(source: string): Promise<number>;
     deleteRdfSourceDocument(identifier: ResourceIdentifier): Promise<void>;
     writeMetadata(identifier: ResourceIdentifier, metadata: RepresentationMetadata): Promise<void>;
     deleteResource(identifier: ResourceIdentifier): Promise<void>;

package/dist/storage/accessors/SolidRdfDataAccessor.js CHANGED Viewed

@@ -130,6 +130,41 @@ class SolidRdfDataAccessor {
         await this.replaceMetadata(name, metadata, parent);
         await this.rdfEngine.replaceSource(quads.map((value) => quad(value.subject, value.predicate, value.object, name)), source);
     }
+    async indexTextSource(source, text, chunks) {
+        await this.initialize();
+        if (!this.rdfEngine.indexTextSource) {
+            throw new Error('SolidRdfDataAccessor text indexing requires an RDF engine with text index support');
+        }
+        await this.rdfEngine.indexTextSource(source, text, chunks);
+    }
+    async deleteTextSource(source) {
+        await this.initialize();
+        if (!this.rdfEngine.deleteTextSource) {
+            return 0;
+        }
+        return await this.rdfEngine.deleteTextSource(source);
+    }
+    async moveRdfSourceDocument(oldSource, next) {
+        await this.initialize();
+        if (!this.rdfEngine.moveSource) {
+            return 0;
+        }
+        return await this.rdfEngine.moveSource(oldSource, next);
+    }
+    async indexVectorSource(source, chunks) {
+        await this.initialize();
+        if (!this.rdfEngine.indexVectorSource) {
+            throw new Error('SolidRdfDataAccessor vector indexing requires an RDF engine with vector index support');
+        }
+        await this.rdfEngine.indexVectorSource(source, chunks);
+    }
+    async deleteVectorSource(source) {
+        await this.initialize();
+        if (!this.rdfEngine.deleteVectorSource) {
+            return 0;
+        }
+        return await this.rdfEngine.deleteVectorSource(source);
+    }
     async deleteRdfSourceDocument(identifier) {
         await this.initialize();
         const { name, parent } = this.getRelatedNames(identifier);

package/dist/storage/accessors/SolidRdfDataAccessor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SolidRdfDataAccessor.js","sourceRoot":"","sources":["../../../src/storage/accessors/SolidRdfDataAccessor.ts"],"names":[],"mappings":"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","sourcesContent":["import { Readable } from 'node:stream';\nimport arrayifyStream from 'arrayify-stream';\nimport { getLoggerFor } from 'global-logger-factory';\nimport { DataFactory } from 'n3';\nimport type { NamedNode, Quad } from '@rdfjs/types';\nimport {\n addResourceMetadata,\n CONTENT_TYPE_TERM,\n ConflictHttpError,\n createErrorMessage,\n DataAccessor,\n guardStream,\n IdentifierStrategy,\n INTERNAL_QUADS,\n isContainerIdentifier,\n LDP,\n NotFoundHttpError,\n NotImplementedHttpError,\n RepresentationMetadata,\n UnsupportedMediaTypeHttpError,\n updateModifiedDate,\n type Guarded,\n type Representation,\n type ResourceIdentifier,\n} from '@solid/community-server';\nimport type { RdfSparqlUpdateDeltaOperation, RdfSparqlUpdateTemplate } from '../rdf/RdfSparqlAdapter';\nimport {\n DisabledSparqlFeatureError,\n RdfSparqlAdapter,\n UnsupportedSparqlQueryError,\n} from '../rdf/RdfSparqlAdapter';\nimport type { RdfBindingRow, RdfEngineLike, RdfSourceInput } from '../rdf/types';\nimport type { Quint } from '../quint/types';\n\nconst { defaultGraph, namedNode, quad } = DataFactory;\n\n/*\n Structured RDF DataAccessor backed directly by SolidRdfEngine.\n \n This is the server-owned Pod storage path. It writes resource graphs and\n * metadata graphs into the term-id RDF index without routing simple CSS LDP\n * operations through Comunica.\n /\nexport class SolidRdfDataAccessor implements DataAccessor {\n protected readonly logger = getLoggerFor(this);\n private readonly adapter = new RdfSparqlAdapter();\n private initialized = false;\n private initializing: Promise<void> \| null = null;\n\n public constructor(\n private readonly rdfEngine: RdfEngineLike,\n private readonly identifierStrategy: IdentifierStrategy,\n ) {}\n\n public async initialize(): Promise<void> {\n if (this.initialized) {\n return;\n }\n\n this.initializing ??= Promise.resolve()\n .then(async () => {\n await this.rdfEngine.open();\n await this.rdfEngine.refreshDerivedIndexes();\n this.initialized = true;\n })\n .finally(() => {\n this.initializing = null;\n });\n\n await this.initializing;\n }\n\n public async finalize(): Promise<void> {\n if (this.initializing) {\n await this.initializing.catch(() => {});\n }\n if (this.initialized) {\n await this.rdfEngine.close();\n this.initialized = false;\n }\n }\n\n public async canHandle(representation: Representation): Promise<void> {\n if (representation.binary \|\| representation.metadata.contentType !== INTERNAL_QUADS) {\n throw new UnsupportedMediaTypeHttpError('Only Quad data is supported.');\n }\n }\n\n public async getData(identifier: ResourceIdentifier): Promise<Guarded<Readable>> {\n await this.initialize();\n const quads = await this.scanGraph(namedNode(identifier.path));\n return guardStream(Readable.from(quads));\n }\n\n public async getMetadata(identifier: ResourceIdentifier): Promise<RepresentationMetadata> {\n await this.initialize();\n const name = namedNode(identifier.path);\n const quads = await this.scanGraph(this.getMetadataNode(name));\n\n if (quads.length === 0) {\n throw new NotFoundHttpError();\n }\n\n const metadata = new RepresentationMetadata(identifier).addQuads(quads);\n if (!isContainerIdentifier(identifier) && !metadata.contentType) {\n metadata.contentType = INTERNAL_QUADS;\n }\n return metadata;\n }\n\n public async getChildren(identifier: ResourceIdentifier): AsyncIterableIterator<RepresentationMetadata> {\n await this.initialize();\n const name = namedNode(identifier.path);\n const scan = await this.rdfEngine.scan({\n pattern: {\n graph: name,\n subject: name,\n predicate: LDP.terms.contains,\n },\n options: { order: ['object'] },\n });\n for (const entry of scan.quads) {\n if (entry.object.termType === 'NamedNode') {\n yield new RepresentationMetadata(entry.object as NamedNode);\n }\n }\n }\n\n public async writeContainer(identifier: ResourceIdentifier, metadata: RepresentationMetadata): Promise<void> {\n await this.initialize();\n addResourceMetadata(metadata, true);\n updateModifiedDate(metadata);\n const { name, parent } = this.getRelatedNames(identifier);\n await this.replaceMetadata(name, metadata, parent);\n }\n\n public async writeDocument(\n identifier: ResourceIdentifier,\n data: Guarded<Readable>,\n metadata: RepresentationMetadata,\n ): Promise<void> {\n await this.initialize();\n if (this.isMetadataIdentifier(identifier)) {\n throw new ConflictHttpError('Not allowed to create NamedNodes with the metadata extension.');\n }\n\n const triples = await arrayifyStream<Quad>(data);\n const def = defaultGraph();\n if (triples.some((triple): boolean => !def.equals(triple.graph))) {\n throw new NotImplementedHttpError('Only triples in the default graph are supported.');\n }\n\n addResourceMetadata(metadata, false);\n updateModifiedDate(metadata);\n metadata.removeAll(CONTENT_TYPE_TERM);\n const { name, parent } = this.getRelatedNames(identifier);\n await this.rdfEngine.delete({ graph: name });\n await this.replaceMetadata(name, metadata, parent);\n await this.putGraphQuads(name, triples);\n }\n\n public async writeRdfSourceDocument(\n identifier: ResourceIdentifier,\n quads: Quad[],\n metadata: RepresentationMetadata,\n source: RdfSourceInput,\n ): Promise<void> {\n await this.initialize();\n if (this.isMetadataIdentifier(identifier)) {\n throw new ConflictHttpError('Not allowed to create NamedNodes with the metadata extension.');\n }\n\n const def = defaultGraph();\n if (quads.some((value): boolean => !def.equals(value.graph))) {\n throw new NotImplementedHttpError('Only triples in the default graph are supported.');\n }\n\n metadata.removeAll(CONTENT_TYPE_TERM);\n const { name, parent } = this.getRelatedNames(identifier);\n await this.replaceMetadata(name, metadata, parent);\n await this.rdfEngine.replaceSource(\n quads.map((value) => quad(value.subject, value.predicate, value.object, name) as Quad),\n source,\n );\n }\n\n public async deleteRdfSourceDocument(identifier: ResourceIdentifier): Promise<void> {\n await this.initialize();\n const { name, parent } = this.getRelatedNames(identifier);\n await this.rdfEngine.deleteSource(identifier.path);\n await this.rdfEngine.delete({ graph: this.getMetadataNode(name) });\n if (parent) {\n await this.rdfEngine.delete({\n graph: parent,\n subject: parent,\n predicate: LDP.terms.contains,\n object: name,\n });\n }\n }\n\n public async writeMetadata(identifier: ResourceIdentifier, metadata: RepresentationMetadata): Promise<void> {\n await this.initialize();\n const { name, parent } = this.getRelatedNames(identifier);\n const metaName = this.getMetadataNode(name);\n await this.rdfEngine.delete({ graph: metaName });\n const inserts = this.toGraphQuads(metaName, metadata.quads());\n if (parent) {\n inserts.push(quad(parent, LDP.terms.contains, name, parent) as Quad);\n }\n await this.rdfEngine.put(inserts);\n }\n\n public async deleteResource(identifier: ResourceIdentifier): Promise<void> {\n await this.initialize();\n const { name, parent } = this.getRelatedNames(identifier);\n await this.rdfEngine.delete({ graph: name });\n await this.rdfEngine.delete({ graph: this.getMetadataNode(name) });\n if (parent) {\n await this.rdfEngine.delete({\n graph: parent,\n subject: parent,\n predicate: LDP.terms.contains,\n object: name,\n });\n }\n }\n\n public async getDataByGraphPrefix(prefix: string): Promise<Quint[]> {\n await this.initialize();\n const scan = await this.rdfEngine.scan({\n pattern: {\n graph: { $startsWith: prefix },\n },\n });\n return scan.quads as Quint[];\n }\n\n public async executeSparqlUpdate(query: string, baseIri?: string): Promise<void> {\n await this.initialize();\n try {\n const delta = this.adapter.compileUpdateDelta(query, baseIri ?? '', {\n defaultGraph: baseIri,\n });\n for (const operation of delta.operations) {\n await this.applyUpdateOperation(operation);\n }\n } catch (error: unknown) {\n if (error instanceof DisabledSparqlFeatureError) {\n throw error;\n }\n if (error instanceof UnsupportedSparqlQueryError) {\n this.logger.warn(`SolidRdfDataAccessor cannot execute SPARQL UPDATE without compatibility fallback: ${error.message}`);\n throw error;\n }\n this.logger.error(`SPARQL update failed: ${createErrorMessage(error)}`);\n throw error;\n }\n }\n\n private async applyUpdateOperation(operation: RdfSparqlUpdateDeltaOperation): Promise<void> {\n if (operation.type === 'insert') {\n await this.rdfEngine.put(operation.quads);\n return;\n }\n if (operation.type === 'delete') {\n for (const value of operation.quads) {\n await this.rdfEngine.delete({\n graph: value.graph,\n subject: value.subject,\n predicate: value.predicate,\n object: value.object,\n });\n }\n return;\n }\n\n if (operation.type === 'deleteWhere') {\n const result = await this.rdfEngine.query(operation.query);\n await this.deleteMaterialized(operation.template, result.bindings);\n return;\n }\n\n if (operation.type === 'insertWhere') {\n const result = await this.rdfEngine.query(operation.query);\n await this.rdfEngine.put(this.adapter.materializeDeleteWhere(\n operation.inserts,\n result.bindings,\n ));\n return;\n }\n\n const result = await this.rdfEngine.query(operation.query);\n const rows = result.bindings;\n await this.deleteMaterialized(operation.deletes, rows);\n await this.rdfEngine.put(this.adapter.materializeDeleteWhere(operation.inserts, rows));\n }\n\n private async deleteMaterialized(template: RdfSparqlUpdateTemplate[], rows: RdfBindingRow[]): Promise<void> {\n for (const value of this.adapter.materializeDeleteWhere(template, rows)) {\n await this.rdfEngine.delete({\n graph: value.graph,\n subject: value.subject,\n predicate: value.predicate,\n object: value.object,\n });\n }\n }\n\n private getRelatedNames(identifier: ResourceIdentifier): { name: NamedNode; parent?: NamedNode } {\n const name = namedNode(identifier.path);\n\n if (this.identifierStrategy.isRootContainer(identifier)) {\n return { name };\n }\n\n const parentIdentifier = this.identifierStrategy.getParentContainer(identifier);\n const parent = namedNode(parentIdentifier.path);\n return { name, parent };\n }\n\n protected getMetadataNode(name: NamedNode): NamedNode {\n return namedNode(`meta:${name.value}`);\n }\n\n private isMetadataIdentifier(identifier: ResourceIdentifier): boolean {\n return identifier.path.startsWith('meta:');\n }\n\n private async replaceMetadata(name: NamedNode, metadata: RepresentationMetadata, parent?: NamedNode): Promise<void> {\n const metaName = this.getMetadataNode(name);\n await this.rdfEngine.delete({ graph: metaName });\n const inserts = this.toGraphQuads(metaName, metadata.quads());\n if (parent) {\n inserts.push(quad(parent, LDP.terms.contains, name, parent) as Quad);\n }\n await this.rdfEngine.put(inserts);\n }\n\n private async putGraphQuads(graph: NamedNode, triples: Quad[]): Promise<void> {\n await this.rdfEngine.put(this.toGraphQuads(graph, triples));\n }\n\n private async scanGraph(graph: NamedNode): Promise<Quad[]> {\n const scan = await this.rdfEngine.scan({\n pattern: { graph },\n options: { order: ['subject', 'predicate', 'object'] },\n });\n return scan.quads.map((value) => quad(value.subject, value.predicate, value.object) as Quad);\n }\n\n private toGraphQuads(graph: NamedNode, quads: Quad[]): Quad[] {\n return quads.map((value) => quad(value.subject, value.predicate, value.object, graph) as Quad);\n }\n}\n"]}
1	+ {"version":3,"file":"SolidRdfDataAccessor.js","sourceRoot":"","sources":["../../../src/storage/accessors/SolidRdfDataAccessor.ts"],"names":[],"mappings":"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","sourcesContent":["import { Readable } from 'node:stream';\nimport arrayifyStream from 'arrayify-stream';\nimport { getLoggerFor } from 'global-logger-factory';\nimport { DataFactory } from 'n3';\nimport type { NamedNode, Quad } from '@rdfjs/types';\nimport {\n addResourceMetadata,\n CONTENT_TYPE_TERM,\n ConflictHttpError,\n createErrorMessage,\n DataAccessor,\n guardStream,\n IdentifierStrategy,\n INTERNAL_QUADS,\n isContainerIdentifier,\n LDP,\n NotFoundHttpError,\n NotImplementedHttpError,\n RepresentationMetadata,\n UnsupportedMediaTypeHttpError,\n updateModifiedDate,\n type Guarded,\n type Representation,\n type ResourceIdentifier,\n} from '@solid/community-server';\nimport type { RdfSparqlUpdateDeltaOperation, RdfSparqlUpdateTemplate } from '../rdf/RdfSparqlAdapter';\nimport {\n DisabledSparqlFeatureError,\n RdfSparqlAdapter,\n UnsupportedSparqlQueryError,\n} from '../rdf/RdfSparqlAdapter';\nimport type {\n RdfBindingRow,\n RdfEngineLike,\n RdfSourceInput,\n RdfTextChunkInput,\n RdfTextSourceInput,\n RdfVectorChunkInput,\n RdfVectorSourceInput,\n} from '../rdf/types';\nimport type { Quint } from '../quint/types';\n\nconst { defaultGraph, namedNode, quad } = DataFactory;\n\n/*\n Structured RDF DataAccessor backed directly by SolidRdfEngine.\n \n This is the server-owned Pod storage path. It writes resource graphs and\n * metadata graphs into the term-id RDF index without routing simple CSS LDP\n * operations through Comunica.\n /\nexport class SolidRdfDataAccessor implements DataAccessor {\n protected readonly logger = getLoggerFor(this);\n private readonly adapter = new RdfSparqlAdapter();\n private initialized = false;\n private initializing: Promise<void> \| null = null;\n\n public constructor(\n private readonly rdfEngine: RdfEngineLike,\n private readonly identifierStrategy: IdentifierStrategy,\n ) {}\n\n public async initialize(): Promise<void> {\n if (this.initialized) {\n return;\n }\n\n this.initializing ??= Promise.resolve()\n .then(async () => {\n await this.rdfEngine.open();\n await this.rdfEngine.refreshDerivedIndexes();\n this.initialized = true;\n })\n .finally(() => {\n this.initializing = null;\n });\n\n await this.initializing;\n }\n\n public async finalize(): Promise<void> {\n if (this.initializing) {\n await this.initializing.catch(() => {});\n }\n if (this.initialized) {\n await this.rdfEngine.close();\n this.initialized = false;\n }\n }\n\n public async canHandle(representation: Representation): Promise<void> {\n if (representation.binary \|\| representation.metadata.contentType !== INTERNAL_QUADS) {\n throw new UnsupportedMediaTypeHttpError('Only Quad data is supported.');\n }\n }\n\n public async getData(identifier: ResourceIdentifier): Promise<Guarded<Readable>> {\n await this.initialize();\n const quads = await this.scanGraph(namedNode(identifier.path));\n return guardStream(Readable.from(quads));\n }\n\n public async getMetadata(identifier: ResourceIdentifier): Promise<RepresentationMetadata> {\n await this.initialize();\n const name = namedNode(identifier.path);\n const quads = await this.scanGraph(this.getMetadataNode(name));\n\n if (quads.length === 0) {\n throw new NotFoundHttpError();\n }\n\n const metadata = new RepresentationMetadata(identifier).addQuads(quads);\n if (!isContainerIdentifier(identifier) && !metadata.contentType) {\n metadata.contentType = INTERNAL_QUADS;\n }\n return metadata;\n }\n\n public async getChildren(identifier: ResourceIdentifier): AsyncIterableIterator<RepresentationMetadata> {\n await this.initialize();\n const name = namedNode(identifier.path);\n const scan = await this.rdfEngine.scan({\n pattern: {\n graph: name,\n subject: name,\n predicate: LDP.terms.contains,\n },\n options: { order: ['object'] },\n });\n for (const entry of scan.quads) {\n if (entry.object.termType === 'NamedNode') {\n yield new RepresentationMetadata(entry.object as NamedNode);\n }\n }\n }\n\n public async writeContainer(identifier: ResourceIdentifier, metadata: RepresentationMetadata): Promise<void> {\n await this.initialize();\n addResourceMetadata(metadata, true);\n updateModifiedDate(metadata);\n const { name, parent } = this.getRelatedNames(identifier);\n await this.replaceMetadata(name, metadata, parent);\n }\n\n public async writeDocument(\n identifier: ResourceIdentifier,\n data: Guarded<Readable>,\n metadata: RepresentationMetadata,\n ): Promise<void> {\n await this.initialize();\n if (this.isMetadataIdentifier(identifier)) {\n throw new ConflictHttpError('Not allowed to create NamedNodes with the metadata extension.');\n }\n\n const triples = await arrayifyStream<Quad>(data);\n const def = defaultGraph();\n if (triples.some((triple): boolean => !def.equals(triple.graph))) {\n throw new NotImplementedHttpError('Only triples in the default graph are supported.');\n }\n\n addResourceMetadata(metadata, false);\n updateModifiedDate(metadata);\n metadata.removeAll(CONTENT_TYPE_TERM);\n const { name, parent } = this.getRelatedNames(identifier);\n await this.rdfEngine.delete({ graph: name });\n await this.replaceMetadata(name, metadata, parent);\n await this.putGraphQuads(name, triples);\n }\n\n public async writeRdfSourceDocument(\n identifier: ResourceIdentifier,\n quads: Quad[],\n metadata: RepresentationMetadata,\n source: RdfSourceInput,\n ): Promise<void> {\n await this.initialize();\n if (this.isMetadataIdentifier(identifier)) {\n throw new ConflictHttpError('Not allowed to create NamedNodes with the metadata extension.');\n }\n\n const def = defaultGraph();\n if (quads.some((value): boolean => !def.equals(value.graph))) {\n throw new NotImplementedHttpError('Only triples in the default graph are supported.');\n }\n\n metadata.removeAll(CONTENT_TYPE_TERM);\n const { name, parent } = this.getRelatedNames(identifier);\n await this.replaceMetadata(name, metadata, parent);\n await this.rdfEngine.replaceSource(\n quads.map((value) => quad(value.subject, value.predicate, value.object, name) as Quad),\n source,\n );\n }\n\n public async indexTextSource(source: RdfTextSourceInput, text: string, chunks?: RdfTextChunkInput[]): Promise<void> {\n await this.initialize();\n if (!this.rdfEngine.indexTextSource) {\n throw new Error('SolidRdfDataAccessor text indexing requires an RDF engine with text index support');\n }\n await this.rdfEngine.indexTextSource(source, text, chunks);\n }\n\n public async deleteTextSource(source: string): Promise<number> {\n await this.initialize();\n if (!this.rdfEngine.deleteTextSource) {\n return 0;\n }\n return await this.rdfEngine.deleteTextSource(source);\n }\n\n public async moveRdfSourceDocument(oldSource: string, next: RdfSourceInput): Promise<number> {\n await this.initialize();\n if (!this.rdfEngine.moveSource) {\n return 0;\n }\n return await this.rdfEngine.moveSource(oldSource, next);\n }\n\n public async indexVectorSource(source: RdfVectorSourceInput, chunks: RdfVectorChunkInput[]): Promise<void> {\n await this.initialize();\n if (!this.rdfEngine.indexVectorSource) {\n throw new Error('SolidRdfDataAccessor vector indexing requires an RDF engine with vector index support');\n }\n await this.rdfEngine.indexVectorSource(source, chunks);\n }\n\n public async deleteVectorSource(source: string): Promise<number> {\n await this.initialize();\n if (!this.rdfEngine.deleteVectorSource) {\n return 0;\n }\n return await this.rdfEngine.deleteVectorSource(source);\n }\n\n public async deleteRdfSourceDocument(identifier: ResourceIdentifier): Promise<void> {\n await this.initialize();\n const { name, parent } = this.getRelatedNames(identifier);\n await this.rdfEngine.deleteSource(identifier.path);\n await this.rdfEngine.delete({ graph: this.getMetadataNode(name) });\n if (parent) {\n await this.rdfEngine.delete({\n graph: parent,\n subject: parent,\n predicate: LDP.terms.contains,\n object: name,\n });\n }\n }\n\n public async writeMetadata(identifier: ResourceIdentifier, metadata: RepresentationMetadata): Promise<void> {\n await this.initialize();\n const { name, parent } = this.getRelatedNames(identifier);\n const metaName = this.getMetadataNode(name);\n await this.rdfEngine.delete({ graph: metaName });\n const inserts = this.toGraphQuads(metaName, metadata.quads());\n if (parent) {\n inserts.push(quad(parent, LDP.terms.contains, name, parent) as Quad);\n }\n await this.rdfEngine.put(inserts);\n }\n\n public async deleteResource(identifier: ResourceIdentifier): Promise<void> {\n await this.initialize();\n const { name, parent } = this.getRelatedNames(identifier);\n await this.rdfEngine.delete({ graph: name });\n await this.rdfEngine.delete({ graph: this.getMetadataNode(name) });\n if (parent) {\n await this.rdfEngine.delete({\n graph: parent,\n subject: parent,\n predicate: LDP.terms.contains,\n object: name,\n });\n }\n }\n\n public async getDataByGraphPrefix(prefix: string): Promise<Quint[]> {\n await this.initialize();\n const scan = await this.rdfEngine.scan({\n pattern: {\n graph: { $startsWith: prefix },\n },\n });\n return scan.quads as Quint[];\n }\n\n public async executeSparqlUpdate(query: string, baseIri?: string): Promise<void> {\n await this.initialize();\n try {\n const delta = this.adapter.compileUpdateDelta(query, baseIri ?? '', {\n defaultGraph: baseIri,\n });\n for (const operation of delta.operations) {\n await this.applyUpdateOperation(operation);\n }\n } catch (error: unknown) {\n if (error instanceof DisabledSparqlFeatureError) {\n throw error;\n }\n if (error instanceof UnsupportedSparqlQueryError) {\n this.logger.warn(`SolidRdfDataAccessor cannot execute SPARQL UPDATE without compatibility fallback: ${error.message}`);\n throw error;\n }\n this.logger.error(`SPARQL update failed: ${createErrorMessage(error)}`);\n throw error;\n }\n }\n\n private async applyUpdateOperation(operation: RdfSparqlUpdateDeltaOperation): Promise<void> {\n if (operation.type === 'insert') {\n await this.rdfEngine.put(operation.quads);\n return;\n }\n if (operation.type === 'delete') {\n for (const value of operation.quads) {\n await this.rdfEngine.delete({\n graph: value.graph,\n subject: value.subject,\n predicate: value.predicate,\n object: value.object,\n });\n }\n return;\n }\n\n if (operation.type === 'deleteWhere') {\n const result = await this.rdfEngine.query(operation.query);\n await this.deleteMaterialized(operation.template, result.bindings);\n return;\n }\n\n if (operation.type === 'insertWhere') {\n const result = await this.rdfEngine.query(operation.query);\n await this.rdfEngine.put(this.adapter.materializeDeleteWhere(\n operation.inserts,\n result.bindings,\n ));\n return;\n }\n\n const result = await this.rdfEngine.query(operation.query);\n const rows = result.bindings;\n await this.deleteMaterialized(operation.deletes, rows);\n await this.rdfEngine.put(this.adapter.materializeDeleteWhere(operation.inserts, rows));\n }\n\n private async deleteMaterialized(template: RdfSparqlUpdateTemplate[], rows: RdfBindingRow[]): Promise<void> {\n for (const value of this.adapter.materializeDeleteWhere(template, rows)) {\n await this.rdfEngine.delete({\n graph: value.graph,\n subject: value.subject,\n predicate: value.predicate,\n object: value.object,\n });\n }\n }\n\n private getRelatedNames(identifier: ResourceIdentifier): { name: NamedNode; parent?: NamedNode } {\n const name = namedNode(identifier.path);\n\n if (this.identifierStrategy.isRootContainer(identifier)) {\n return { name };\n }\n\n const parentIdentifier = this.identifierStrategy.getParentContainer(identifier);\n const parent = namedNode(parentIdentifier.path);\n return { name, parent };\n }\n\n protected getMetadataNode(name: NamedNode): NamedNode {\n return namedNode(`meta:${name.value}`);\n }\n\n private isMetadataIdentifier(identifier: ResourceIdentifier): boolean {\n return identifier.path.startsWith('meta:');\n }\n\n private async replaceMetadata(name: NamedNode, metadata: RepresentationMetadata, parent?: NamedNode): Promise<void> {\n const metaName = this.getMetadataNode(name);\n await this.rdfEngine.delete({ graph: metaName });\n const inserts = this.toGraphQuads(metaName, metadata.quads());\n if (parent) {\n inserts.push(quad(parent, LDP.terms.contains, name, parent) as Quad);\n }\n await this.rdfEngine.put(inserts);\n }\n\n private async putGraphQuads(graph: NamedNode, triples: Quad[]): Promise<void> {\n await this.rdfEngine.put(this.toGraphQuads(graph, triples));\n }\n\n private async scanGraph(graph: NamedNode): Promise<Quad[]> {\n const scan = await this.rdfEngine.scan({\n pattern: { graph },\n options: { order: ['subject', 'predicate', 'object'] },\n });\n return scan.quads.map((value) => quad(value.subject, value.predicate, value.object) as Quad);\n }\n\n private toGraphQuads(graph: NamedNode, quads: Quad[]): Quad[] {\n return quads.map((value) => quad(value.subject, value.predicate, value.object, graph) as Quad);\n }\n}\n"]}

package/dist/storage/accessors/SolidRdfDataAccessor.jsonld CHANGED Viewed

@@ -91,6 +91,26 @@
           "@id": "undefineds:dist/storage/accessors/SolidRdfDataAccessor.jsonld#SolidRdfDataAccessor__member_writeRdfSourceDocument",
           "memberFieldName": "writeRdfSourceDocument"
         },
+        {
+          "@id": "undefineds:dist/storage/accessors/SolidRdfDataAccessor.jsonld#SolidRdfDataAccessor__member_indexTextSource",
+          "memberFieldName": "indexTextSource"
+        },
+        {
+          "@id": "undefineds:dist/storage/accessors/SolidRdfDataAccessor.jsonld#SolidRdfDataAccessor__member_deleteTextSource",
+          "memberFieldName": "deleteTextSource"
+        },
+        {
+          "@id": "undefineds:dist/storage/accessors/SolidRdfDataAccessor.jsonld#SolidRdfDataAccessor__member_moveRdfSourceDocument",
+          "memberFieldName": "moveRdfSourceDocument"
+        },
+        {
+          "@id": "undefineds:dist/storage/accessors/SolidRdfDataAccessor.jsonld#SolidRdfDataAccessor__member_indexVectorSource",
+          "memberFieldName": "indexVectorSource"
+        },
+        {
+          "@id": "undefineds:dist/storage/accessors/SolidRdfDataAccessor.jsonld#SolidRdfDataAccessor__member_deleteVectorSource",
+          "memberFieldName": "deleteVectorSource"
+        },
         {
           "@id": "undefineds:dist/storage/accessors/SolidRdfDataAccessor.jsonld#SolidRdfDataAccessor__member_deleteRdfSourceDocument",
           "memberFieldName": "deleteRdfSourceDocument"

package/dist/storage/database/PostgresPoolManager.d.ts CHANGED Viewed

@@ -12,6 +12,7 @@ interface PoolConfig {
     database?: string;
     user?: string;
     password?: string;
+    options?: string;
     max?: number;
     idleTimeoutMillis?: number;
     connectionTimeoutMillis?: number;

package/dist/storage/database/PostgresPoolManager.js CHANGED Viewed

@@ -75,9 +75,9 @@ class PoolManager {
      */
     getPoolKey(config) {
         if (config.connectionString) {
-            return config.connectionString;
+            return config.options ? `${config.connectionString}|options=${config.options}` : config.connectionString;
         }
-        return `${config.user}@${config.host}:${config.port}/${config.database}`;
+        return `${config.user}@${config.host}:${config.port}/${config.database}|options=${config.options ?? ''}`;
     }
     listPools() {
         return this.pools.entries();

package/dist/storage/database/PostgresPoolManager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PostgresPoolManager.js","sourceRoot":"","sources":["../../../src/storage/database/PostgresPoolManager.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;~~AAyHH~~,sCAEC;AAKD,8CAEC;AAKD,oEAEC;~~AAvID~~,2BAA0B;~~AAmB1B~~;;GAEG;AACH,MAAM,WAAW;IAAjB;QACU,UAAK,GAAG,IAAI,GAAG,EAAqB,CAAC;QACrC,kBAAa,GAAe;YAClC,GAAG,EAAE,EAAE;YACP,iBAAiB,EAAE,KAAK;YACxB,uBAAuB,EAAE,IAAI;SAC9B,CAAC;IAwEJ,CAAC;IAtEC;;OAEG;IACH,OAAO,CAAC,MAAkB;QACxB,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAEpC,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,UAAU,GAAG,EAAE,GAAG,IAAI,CAAC,aAAa,EAAE,GAAG,MAAM,EAAE,CAAC;YACxD,MAAM,IAAI,GAAG,IAAI,SAAI,CAAC,UAAU,CAAC,CAAC;YAElC,KAAK,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAE3B,mEAAmE;YACnE,IAAI,OAAQ,IAAY,CAAC,EAAE,KAAK,UAAU,EAAE,CAAC;gBAC1C,IAAY,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;oBAC7B,8DAA8D;gBAChE,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjB,OAAO,KAAK,CAAC,IAAI,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,MAAkB,EAAE,SAAS,GAAG,KAAK;QAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAElC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO;QACT,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACd,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YACjC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACvB,OAAO;QACT,CAAC;QAED,KAAK,CAAC,QAAQ,EAAE,CAAC;QAEjB,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,EAAE,CAAC;YACxB,YAAY;YACZ,UAAU,CAAC,GAAG,EAAE;gBACd,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACpC,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,IAAI,CAAC,EAAE,CAAC;oBACrC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;oBACnC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC,EAAE,KAAK,CAAC,CAAC;QACZ,CAAC;IACH,CAAC;IAED;;OAEG;IACK,UAAU,CAAC,MAAkB;QACnC,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAC5B,OAAO,MAAM,CAAC,gBAAgB,CAAC;~~QACjC~~,CAAC;QACD,OAAO,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;~~IAC3E~~,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;CACF;AAED,OAAO;AACP,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AAkC7B,kCAAW;AAhCpB,YAAY;AACZ,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;IACnC,KAAK,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxB,OAAO,CAAC,GAAG,CAAC,uCAAuC,IAAI,CAAC,UAAU,UAAU,IAAI,CAAC,SAAS,aAAa,IAAI,CAAC,YAAY,cAAc,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1J,CAAC;AACH,CAAC,EAAE,KAAK,CAAC,CAAC;AACV,IAAI,OAAQ,WAAmB,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;IACpD,WAAmB,CAAC,KAAK,EAAE,CAAC;AAC/B,CAAC;AAED;;GAEG;AACH,SAAgB,aAAa,CAAC,MAAkB;IAC9C,OAAO,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AACrC,CAAC;AAED;;GAEG;AACH,SAAgB,iBAAiB,CAAC,MAAkB;IAClD,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;AAClC,CAAC;AAED;;GAEG;AACH,SAAgB,4BAA4B,CAAC,MAAkB;IAC7D,WAAW,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACxC,CAAC","sourcesContent":["/*\n PostgresPoolManager - 共享 PostgreSQL 连接池管理器\n \n 解决多个组件（PostgresKeyValueStorage, PgQuintStore 等）\n * 创建独立连接池导致的死锁问题。\n /\n\nimport { Pool } from 'pg';\n\ninterface PoolConfig {\n connectionString?: string;\n host?: string;\n port?: number;\n database?: string;\n user?: string;\n password?: string;\n max?: number;\n idleTimeoutMillis?: number;\n connectionTimeoutMillis?: number;\n}\n\ninterface PoolEntry {\n pool: Pool;\n refCount: number;\n}\n\n/\n 连接池管理器 - 按连接字符串共享连接池\n /\nclass PoolManager {\n private pools = new Map<string, PoolEntry>();\n private defaultConfig: PoolConfig = {\n max: 20,\n idleTimeoutMillis: 30000,\n connectionTimeoutMillis: 5000,\n };\n\n /\n 获取或创建连接池\n /\n getPool(config: PoolConfig): Pool {\n const key = this.getPoolKey(config);\n\n let entry = this.pools.get(key);\n if (!entry) {\n const poolConfig = { ...this.defaultConfig, ...config };\n const pool = new Pool(poolConfig);\n\n entry = { pool, refCount: 0 };\n this.pools.set(key, entry);\n\n // Some tests use lightweight Pool mocks without EventEmitter APIs.\n if (typeof (pool as any).on === 'function') {\n (pool as any).on('error', () => {\n // Ignore pool-level events here; query callers handle errors.\n });\n }\n }\n\n entry.refCount++;\n return entry.pool;\n }\n\n /\n 释放连接池引用\n /\n releasePool(config: PoolConfig, immediate = false): void {\n const key = this.getPoolKey(config);\n const entry = this.pools.get(key);\n\n if (!entry) {\n return;\n }\n\n if (immediate) {\n entry.pool.end().catch(() => {});\n this.pools.delete(key);\n return;\n }\n\n entry.refCount--;\n\n if (entry.refCount <= 0) {\n // 延迟关闭，允许复用\n setTimeout(() => {\n const current = this.pools.get(key);\n if (current && current.refCount <= 0) {\n current.pool.end().catch(() => {});\n this.pools.delete(key);\n }\n }, 60000);\n }\n }\n\n /\n 生成连接池 key\n /\n private getPoolKey(config: PoolConfig): string {\n if (config.connectionString) {\n return config.connectionString;\n }\n return `${config.user}@${config.host}:${config.port}/${config.database}`;\n }\n\n listPools(): IterableIterator<[string, PoolEntry]> {\n return this.pools.entries();\n }\n}\n\n// 单例实例\nconst poolManager = new PoolManager();\n\n// 定期打印连接池状态\nconst statusTimer = setInterval(() => {\n for (const [, entry] of poolManager.listPools()) {\n const pool = entry.pool;\n console.log(`[PostgresPoolManager] Status: total=${pool.totalCount}, idle=${pool.idleCount}, waiting=${pool.waitingCount}, refCount=${entry.refCount}`);\n }\n}, 30000);\nif (typeof (statusTimer as any).unref === 'function') {\n (statusTimer as any).unref();\n}\n\n/\n 获取共享连接池\n /\nexport function getSharedPool(config: PoolConfig): Pool {\n return poolManager.getPool(config);\n}\n\n/\n 释放共享连接池引用\n /\nexport function releaseSharedPool(config: PoolConfig): void {\n poolManager.releasePool(config);\n}\n\n/\n 释放共享连接池引用并立即关闭。\n */\nexport function releaseSharedPoolImmediately(config: PoolConfig): void {\n poolManager.releasePool(config, true);\n}\n\nexport { poolManager };\n"]}
1	+ {"version":3,"file":"PostgresPoolManager.js","sourceRoot":"","sources":["../../../src/storage/database/PostgresPoolManager.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n PostgresPoolManager - 共享 PostgreSQL 连接池管理器\n \n 解决多个组件（PostgresKeyValueStorage, PgQuintStore 等）\n * 创建独立连接池导致的死锁问题。\n /\n\nimport { Pool } from 'pg';\n\ninterface PoolConfig {\n connectionString?: string;\n host?: string;\n port?: number;\n database?: string;\n user?: string;\n password?: string;\n options?: string;\n max?: number;\n idleTimeoutMillis?: number;\n connectionTimeoutMillis?: number;\n}\n\ninterface PoolEntry {\n pool: Pool;\n refCount: number;\n}\n\n/\n 连接池管理器 - 按连接字符串共享连接池\n /\nclass PoolManager {\n private pools = new Map<string, PoolEntry>();\n private defaultConfig: PoolConfig = {\n max: 20,\n idleTimeoutMillis: 30000,\n connectionTimeoutMillis: 5000,\n };\n\n /\n 获取或创建连接池\n /\n getPool(config: PoolConfig): Pool {\n const key = this.getPoolKey(config);\n\n let entry = this.pools.get(key);\n if (!entry) {\n const poolConfig = { ...this.defaultConfig, ...config };\n const pool = new Pool(poolConfig);\n\n entry = { pool, refCount: 0 };\n this.pools.set(key, entry);\n\n // Some tests use lightweight Pool mocks without EventEmitter APIs.\n if (typeof (pool as any).on === 'function') {\n (pool as any).on('error', () => {\n // Ignore pool-level events here; query callers handle errors.\n });\n }\n }\n\n entry.refCount++;\n return entry.pool;\n }\n\n /\n 释放连接池引用\n /\n releasePool(config: PoolConfig, immediate = false): void {\n const key = this.getPoolKey(config);\n const entry = this.pools.get(key);\n\n if (!entry) {\n return;\n }\n\n if (immediate) {\n entry.pool.end().catch(() => {});\n this.pools.delete(key);\n return;\n }\n\n entry.refCount--;\n\n if (entry.refCount <= 0) {\n // 延迟关闭，允许复用\n setTimeout(() => {\n const current = this.pools.get(key);\n if (current && current.refCount <= 0) {\n current.pool.end().catch(() => {});\n this.pools.delete(key);\n }\n }, 60000);\n }\n }\n\n /\n 生成连接池 key\n /\n private getPoolKey(config: PoolConfig): string {\n if (config.connectionString) {\n return config.options ? `${config.connectionString}\|options=${config.options}` : config.connectionString;\n }\n return `${config.user}@${config.host}:${config.port}/${config.database}\|options=${config.options ?? ''}`;\n }\n\n listPools(): IterableIterator<[string, PoolEntry]> {\n return this.pools.entries();\n }\n}\n\n// 单例实例\nconst poolManager = new PoolManager();\n\n// 定期打印连接池状态\nconst statusTimer = setInterval(() => {\n for (const [, entry] of poolManager.listPools()) {\n const pool = entry.pool;\n console.log(`[PostgresPoolManager] Status: total=${pool.totalCount}, idle=${pool.idleCount}, waiting=${pool.waitingCount}, refCount=${entry.refCount}`);\n }\n}, 30000);\nif (typeof (statusTimer as any).unref === 'function') {\n (statusTimer as any).unref();\n}\n\n/\n 获取共享连接池\n /\nexport function getSharedPool(config: PoolConfig): Pool {\n return poolManager.getPool(config);\n}\n\n/\n 释放共享连接池引用\n /\nexport function releaseSharedPool(config: PoolConfig): void {\n poolManager.releasePool(config);\n}\n\n/\n 释放共享连接池引用并立即关闭。\n */\nexport function releaseSharedPoolImmediately(config: PoolConfig): void {\n poolManager.releasePool(config, true);\n}\n\nexport { poolManager };\n"]}

package/dist/storage/locking/UrlAwareRedisLocker.d.ts CHANGED Viewed

@@ -5,6 +5,8 @@ export interface UrlAwareRedisLockerOptions {
     attemptSettings_retryDelay?: number;
     attemptSettings_retryJitter?: number;
     namespacePrefix?: string;
+    /** TTL backstop (seconds) for Redis lock/count keys; guards against crash-leaked locks. */
+    lockKeyTtlSeconds?: number;
 }
 /**
  * 扩展 CSS RedisLocker，支持 redis:// 和 rediss:// URL 格式。

package/dist/storage/locking/UrlAwareRedisLocker.js CHANGED Viewed

@@ -16,6 +16,65 @@ const REDIS_LUA_SCRIPTS = (() => {
         return {};
     }
 })();
+/**
+ * CSS 原生 Lua 脚本创建的 lock/count key 都不带 TTL：
+ * 进程在 acquire 与 release 之间崩溃时 key 永久残留，资源被永久死锁（只能手工清 Redis）。
+ * 这里在相同语义上加 TTL 兜底，并在读计数归零时主动删除 key。
+ */
+function buildTtlLuaScripts(ttlSeconds) {
+    const ttl = Math.max(1, Math.floor(ttlSeconds));
+    return {
+        acquireReadLock: `
+    -- Return 0 if an entry already exists.
+    local lockKey = KEYS[1]..".wlock"
+    if redis.call("exists", lockKey) == 1 then
+      return 0
+    end
+    -- Increment the counter and arm the TTL backstop
+    local countKey = KEYS[1]..".count"
+    local count = redis.call("incr", countKey)
+    redis.call("expire", countKey, ${ttl})
+    return count > 0
+    `,
+        acquireWriteLock: `
+    -- Return 0 if a lock entry already exists or read count is > 0
+    local lockKey = KEYS[1]..".wlock"
+    local countKey = KEYS[1]..".count"
+    local count = tonumber(redis.call("get", countKey))
+    if ((redis.call("exists", lockKey) == 1) or (count ~= nil and count > 0)) then
+      return 0
+    end
+    -- Set lock with a TTL backstop and respond with 'OK' if succeeded (otherwise null)
+    return redis.call("set", lockKey, "locked", "EX", ${ttl});
+    `,
+        releaseReadLock: `
+      -- Return 1 after decreasing the counter, if counter is < 0 now: return '-ERR'
+      local countKey = KEYS[1]..".count"
+      local result = redis.call("decr", countKey)
+      if result > 0 then
+        redis.call("expire", countKey, ${ttl})
+        return 1
+      elseif result == 0 then
+        redis.call("del", countKey)
+        return 1
+      else
+        return redis.error_reply("Error trying to release readlock when read count was 0.")
+      end
+    `,
+        acquireLock: `
+      -- Return 0 if lock entry already exists, or 'OK' if it succeeds in setting the lock entry.
+      local key = KEYS[1]..".lock"
+      if redis.call("exists", key) == 1 then
+        return 0
+      end
+      -- Return 'OK' if succeeded setting entry (with a TTL backstop)
+      return redis.call("set", key, "locked", "EX", ${ttl});
+      `,
+    };
+}
 /**
  * 扩展 CSS RedisLocker，支持 redis:// 和 rediss:// URL 格式。
  *
@@ -55,6 +114,12 @@ class UrlAwareRedisLocker extends community_server_1.RedisLocker {
         else {
             super(redisClient, attemptSettings, redisSettings);
         }
+        // 用带 TTL 的脚本覆盖 CSS 原生实现，兜底崩溃泄漏的锁
+        const ttlScripts = buildTtlLuaScripts(options.lockKeyTtlSeconds ?? 60);
+        const liveRedis = this.redis;
+        for (const [name, script] of Object.entries(ttlScripts)) {
+            liveRedis.defineCommand(name, { numberOfKeys: 1, lua: script });
+        }
         this.shuttingDown = false;
         (0, RedisClientLifecycle_1.attachRedisClientErrorHandler)(this.redis, {
             logger: this.logger,

package/dist/storage/locking/UrlAwareRedisLocker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"UrlAwareRedisLocker.js","sourceRoot":"","sources":["../../../src/storage/locking/UrlAwareRedisLocker.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA4B;AAC5B,8DAAsD;AACtD,wEAGuC;AAEvC,MAAM,iBAAiB,GAA2B,CAAC,GAAG,EAAE;IACtD,IAAI,CAAC;QACH,iEAAiE;QACjE,OAAO,OAAO,CAAC,mEAAmE,CAAC,CAAC,iBAAiB,CAAC;IACxG,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC,CAAC,EAAE,CAAC;~~AAUL~~;;;;;;GAMG;AACH,MAAa,mBAAoB,SAAQ,8BAAW;IAGlD,YAAY,UAAsC,EAAE;QAClD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,gBAAgB,CAAC;QAC5D,MAAM,eAAe,GAAG;YACtB,UAAU,EAAE,OAAO,CAAC,0BAA0B,IAAI,CAAC,CAAC;YACpD,UAAU,EAAE,OAAO,CAAC,0BAA0B,IAAI,EAAE;YACpD,WAAW,EAAE,OAAO,CAAC,2BAA2B,IAAI,EAAE;SACvD,CAAC;QACF,MAAM,aAAa,GAAG;YACpB,eAAe,EAAE,OAAO,CAAC,eAAe,IAAI,EAAE;SAC/C,CAAC;QAEF,MAAM,KAAK,GAAG,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAExF,IAAI,KAAK,EAAE,CAAC;YACV,6BAA6B;YAC7B,KAAK,CAAC,gBAAgB,EAAE,eAAe,EAAE,aAAa,CAAC,CAAC;YAExD,cAAc;YACd,MAAM,QAAQ,GAAI,IAAY,CAAC,KAAc,CAAC;YAC9C,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAE3B,gBAAgB;YAChB,MAAM,KAAK,GAAG,IAAI,iBAAK,CAAC,WAAW,CAAC,CAAC;YAErC,YAAY;YACZ,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAC/D,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;YAC9D,CAAC;YAED,iBAAiB;YAChB,IAAY,CAAC,KAAK,GAAG,KAAK,CAAC;YAC3B,IAAY,CAAC,OAAO,GAAG,KAAK,CAAC;YAC7B,IAAY,CAAC,SAAS,GAAG,KAAK,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,WAAW,EAAE,eAAe,EAAE,aAAa,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC1B,IAAA,oDAA6B,EAAE,IAAY,CAAC,KAAc,EAAE;YAC1D,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,qBAAqB;YAC5B,cAAc,EAAE,GAAY,EAAE,CAAC,IAAI,CAAC,YAAY;SACjD,CAAC,CAAC;IACL,CAAC;IAEe,KAAK,CAAC,QAAQ;QAC5B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,MAAM,KAAK,GAAI,IAAY,CAAC,KAAc,CAAC;QAE3C,IAAI,CAAC;YACH,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;QACzB,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,IAAI,CAAC,IAAA,oDAA6B,EAAC,KAAK,CAAC,EAAE,CAAC;gBAC1C,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;CACF;~~AA9DD~~,~~kDA8DC~~","sourcesContent":["import Redis from 'ioredis';\nimport { RedisLocker } from '@solid/community-server';\nimport {\n attachRedisClientErrorHandler,\n isIgnorableRedisShutdownError,\n} from '../redis/RedisClientLifecycle';\n\nconst REDIS_LUA_SCRIPTS: Record<string, string> = (() => {\n try {\n // eslint-disable-next-line @typescript-eslint/no-require-imports\n return require('@solid/community-server/dist/util/locking/scripts/RedisLuaScripts').REDIS_LUA_SCRIPTS;\n } catch {\n return {};\n }\n})();\n\nexport interface UrlAwareRedisLockerOptions {\n redisClient?: string;\n attemptSettings_retryCount?: number;\n attemptSettings_retryDelay?: number;\n attemptSettings_retryJitter?: number;\n namespacePrefix?: string;\n}\n\n/*\n 扩展 CSS RedisLocker，支持 redis:// 和 rediss:// URL 格式。\n \n CSS 原生 RedisLocker.createRedisClient 是 private 的，无法 override。\n * 这里在构造函数中检测 URL 格式，如果是 URL 则用 ioredis 直接创建连接，\n * 替换掉父类构造函数中创建的（会报错的）连接。\n */\nexport class UrlAwareRedisLocker extends RedisLocker {\n private shuttingDown: boolean;\n\n constructor(options: UrlAwareRedisLockerOptions = {}) {\n const redisClient = options.redisClient ?? '127.0.0.1:6379';\n const attemptSettings = {\n retryCount: options.attemptSettings_retryCount ?? -1,\n retryDelay: options.attemptSettings_retryDelay ?? 50,\n retryJitter: options.attemptSettings_retryJitter ?? 30,\n };\n const redisSettings = {\n namespacePrefix: options.namespacePrefix ?? '',\n };\n\n const isUrl = redisClient.startsWith('redis://') \|\| redisClient.startsWith('rediss://');\n\n if (isUrl) {\n // 传一个合法的 host:port 给父类，避免它报错\n super('127.0.0.1:6379', attemptSettings, redisSettings);\n\n // 关闭父类创建的无用连接\n const oldRedis = (this as any).redis as Redis;\n oldRedis.disconnect(false);\n\n // 用 URL 创建真正的连接\n const redis = new Redis(redisClient);\n\n // 注册 Lua 脚本\n for (const [name, script] of Object.entries(REDIS_LUA_SCRIPTS)) {\n redis.defineCommand(name, { numberOfKeys: 1, lua: script });\n }\n\n // 替换父类的 redis 实例\n (this as any).redis = redis;\n (this as any).redisRw = redis;\n (this as any).redisLock = redis;\n } else {\n super(redisClient, attemptSettings, redisSettings);\n }\n\n this.shuttingDown = false;\n attachRedisClientErrorHandler((this as any).redis as Redis, {\n logger: this.logger,\n label: 'UrlAwareRedisLocker',\n isShuttingDown: (): boolean => this.shuttingDown,\n });\n }\n\n public override async finalize(): Promise<void> {\n this.shuttingDown = true;\n const redis = (this as any).redis as Redis;\n\n try {\n await super.finalize();\n } catch (error: unknown) {\n if (!isIgnorableRedisShutdownError(error)) {\n throw error;\n }\n } finally {\n redis.disconnect(false);\n }\n }\n}\n"]}
1	+ {"version":3,"file":"UrlAwareRedisLocker.js","sourceRoot":"","sources":["../../../src/storage/locking/UrlAwareRedisLocker.ts"],"names":[],"mappings":"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","sourcesContent":["import Redis from 'ioredis';\nimport { RedisLocker } from '@solid/community-server';\nimport {\n attachRedisClientErrorHandler,\n isIgnorableRedisShutdownError,\n} from '../redis/RedisClientLifecycle';\n\nconst REDIS_LUA_SCRIPTS: Record<string, string> = (() => {\n try {\n // eslint-disable-next-line @typescript-eslint/no-require-imports\n return require('@solid/community-server/dist/util/locking/scripts/RedisLuaScripts').REDIS_LUA_SCRIPTS;\n } catch {\n return {};\n }\n})();\n\n/*\n CSS 原生 Lua 脚本创建的 lock/count key 都不带 TTL：\n * 进程在 acquire 与 release 之间崩溃时 key 永久残留，资源被永久死锁（只能手工清 Redis）。\n * 这里在相同语义上加 TTL 兜底，并在读计数归零时主动删除 key。\n /\nfunction buildTtlLuaScripts(ttlSeconds: number): Record<string, string> {\n const ttl = Math.max(1, Math.floor(ttlSeconds));\n return {\n acquireReadLock: `\n -- Return 0 if an entry already exists.\n local lockKey = KEYS[1]..\".wlock\"\n if redis.call(\"exists\", lockKey) == 1 then\n return 0\n end\n\n -- Increment the counter and arm the TTL backstop\n local countKey = KEYS[1]..\".count\"\n local count = redis.call(\"incr\", countKey)\n redis.call(\"expire\", countKey, ${ttl})\n return count > 0\n `,\n acquireWriteLock: `\n -- Return 0 if a lock entry already exists or read count is > 0\n local lockKey = KEYS[1]..\".wlock\"\n local countKey = KEYS[1]..\".count\"\n local count = tonumber(redis.call(\"get\", countKey))\n if ((redis.call(\"exists\", lockKey) == 1) or (count ~= nil and count > 0)) then\n return 0\n end\n\n -- Set lock with a TTL backstop and respond with 'OK' if succeeded (otherwise null)\n return redis.call(\"set\", lockKey, \"locked\", \"EX\", ${ttl});\n `,\n releaseReadLock: `\n -- Return 1 after decreasing the counter, if counter is < 0 now: return '-ERR'\n local countKey = KEYS[1]..\".count\"\n local result = redis.call(\"decr\", countKey)\n if result > 0 then\n redis.call(\"expire\", countKey, ${ttl})\n return 1\n elseif result == 0 then\n redis.call(\"del\", countKey)\n return 1\n else\n return redis.error_reply(\"Error trying to release readlock when read count was 0.\")\n end\n `,\n acquireLock: `\n -- Return 0 if lock entry already exists, or 'OK' if it succeeds in setting the lock entry.\n local key = KEYS[1]..\".lock\"\n if redis.call(\"exists\", key) == 1 then\n return 0\n end\n\n -- Return 'OK' if succeeded setting entry (with a TTL backstop)\n return redis.call(\"set\", key, \"locked\", \"EX\", ${ttl});\n `,\n };\n}\n\nexport interface UrlAwareRedisLockerOptions {\n redisClient?: string;\n attemptSettings_retryCount?: number;\n attemptSettings_retryDelay?: number;\n attemptSettings_retryJitter?: number;\n namespacePrefix?: string;\n /* TTL backstop (seconds) for Redis lock/count keys; guards against crash-leaked locks. /\n lockKeyTtlSeconds?: number;\n}\n\n/\n 扩展 CSS RedisLocker，支持 redis:// 和 rediss:// URL 格式。\n \n CSS 原生 RedisLocker.createRedisClient 是 private 的，无法 override。\n * 这里在构造函数中检测 URL 格式，如果是 URL 则用 ioredis 直接创建连接，\n * 替换掉父类构造函数中创建的（会报错的）连接。\n */\nexport class UrlAwareRedisLocker extends RedisLocker {\n private shuttingDown: boolean;\n\n constructor(options: UrlAwareRedisLockerOptions = {}) {\n const redisClient = options.redisClient ?? '127.0.0.1:6379';\n const attemptSettings = {\n retryCount: options.attemptSettings_retryCount ?? -1,\n retryDelay: options.attemptSettings_retryDelay ?? 50,\n retryJitter: options.attemptSettings_retryJitter ?? 30,\n };\n const redisSettings = {\n namespacePrefix: options.namespacePrefix ?? '',\n };\n\n const isUrl = redisClient.startsWith('redis://') \|\| redisClient.startsWith('rediss://');\n\n if (isUrl) {\n // 传一个合法的 host:port 给父类，避免它报错\n super('127.0.0.1:6379', attemptSettings, redisSettings);\n\n // 关闭父类创建的无用连接\n const oldRedis = (this as any).redis as Redis;\n oldRedis.disconnect(false);\n\n // 用 URL 创建真正的连接\n const redis = new Redis(redisClient);\n\n // 注册 Lua 脚本\n for (const [name, script] of Object.entries(REDIS_LUA_SCRIPTS)) {\n redis.defineCommand(name, { numberOfKeys: 1, lua: script });\n }\n\n // 替换父类的 redis 实例\n (this as any).redis = redis;\n (this as any).redisRw = redis;\n (this as any).redisLock = redis;\n } else {\n super(redisClient, attemptSettings, redisSettings);\n }\n\n // 用带 TTL 的脚本覆盖 CSS 原生实现，兜底崩溃泄漏的锁\n const ttlScripts = buildTtlLuaScripts(options.lockKeyTtlSeconds ?? 60);\n const liveRedis = (this as any).redis as Redis;\n for (const [name, script] of Object.entries(ttlScripts)) {\n liveRedis.defineCommand(name, { numberOfKeys: 1, lua: script });\n }\n\n this.shuttingDown = false;\n attachRedisClientErrorHandler((this as any).redis as Redis, {\n logger: this.logger,\n label: 'UrlAwareRedisLocker',\n isShuttingDown: (): boolean => this.shuttingDown,\n });\n }\n\n public override async finalize(): Promise<void> {\n this.shuttingDown = true;\n const redis = (this as any).redis as Redis;\n\n try {\n await super.finalize();\n } catch (error: unknown) {\n if (!isIgnorableRedisShutdownError(error)) {\n throw error;\n }\n } finally {\n redis.disconnect(false);\n }\n }\n}\n"]}

package/dist/storage/locking/UrlAwareRedisLocker.jsonld CHANGED Viewed

@@ -73,6 +73,19 @@
               }
             ]
           }
+        },
+        {
+          "@id": "undefineds:dist/storage/locking/UrlAwareRedisLocker.jsonld#UrlAwareRedisLocker_options_lockKeyTtlSeconds",
+          "range": {
+            "@type": "ParameterRangeUnion",
+            "parameterRangeElements": [
+              "xsd:number",
+              {
+                "@type": "ParameterRangeUndefined"
+              }
+            ]
+          },
+          "comment": "TTL backstop (seconds) for Redis lock/count keys; guards against crash-leaked locks."
         }
       ],
       "memberFields": [
@@ -122,6 +135,12 @@
               "value": {
                 "@id": "undefineds:dist/storage/locking/UrlAwareRedisLocker.jsonld#UrlAwareRedisLocker_options_namespacePrefix"
               }
+            },
+            {
+              "keyRaw": "lockKeyTtlSeconds",
+              "value": {
+                "@id": "undefineds:dist/storage/locking/UrlAwareRedisLocker.jsonld#UrlAwareRedisLocker_options_lockKeyTtlSeconds"
+              }
             }
           ]
         }