@undefineds.co/xpod 0.1.7 → 0.2.0-preview.2

package/dist/storage/accessors/MinioDataAccessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"MinioDataAccessor.js","sourceRoot":"","sources":["../../../src/storage/accessors/MinioDataAccessor.ts"],"names":[],"mappings":"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","sourcesContent":["import { Client, BucketItemStat } from 'minio';\nimport { getLoggerFor } from 'global-logger-factory';\nimport type { DataAccessor } from '@solid/community-server';\nimport type { Readable } from 'node:stream';\nimport { DataFactory } from 'n3';\nimport {\n  RepresentationMetadata,\n  \n  NotFoundHttpError,\n  guardStream,\n  isContainerIdentifier,\n  isContainerPath,\n  joinFilePath,\n  UnsupportedMediaTypeHttpError,\n  CONTENT_TYPE_TERM,\n  DC,\n  IANA,\n  LDP,\n  POSIX,\n  RDF,\n  SOLID_META,\n  XSD,\n  parseQuads,\n  serializeQuads,\n  addResourceMetadata,\n  updateModifiedDate,\n  toLiteral,\n  toNamedTerm,\n} from '@solid/community-server';\nimport type { Guarded } from '@solid/community-server';\nimport type { FileIdentifierMapper, ResourceLink } from '@solid/community-server';\nimport type { \n  ResourceIdentifier,\n  Representation,\n  MetadataRecord\n} from '@solid/community-server';\n\nexport class MinioDataAccessor implements DataAccessor {\n  protected readonly logger = getLoggerFor(this);\n  protected readonly resourceMapper: FileIdentifierMapper;\n  private readonly client: Client;\n  private readonly bucketName: string;\n\n  public constructor(\n    resourceMapper: FileIdentifierMapper,\n    accessKey: string,\n    secretKey: string,\n    endpoint: string,\n    bucketName: string,\n  ) {\n    this.resourceMapper = resourceMapper;\n\n    // Parse endpoint - supports both URL format (http://host:port) and simple format (host:port)\n    let endPoint: string;\n    let port: number | undefined;\n    let useSSL = false;\n\n    if (endpoint.startsWith('http://') || endpoint.startsWith('https://')) {\n      const url = new URL(endpoint);\n      endPoint = url.hostname;\n      port = url.port ? parseInt(url.port, 10) : undefined;\n      useSSL = url.protocol === 'https:';\n    } else {\n      const parts = endpoint.split(':');\n      endPoint = parts[0];\n      port = parts[1] ? parseInt(parts[1], 10) : undefined;\n    }\n\n    this.client = new Client({\n      accessKey,\n      secretKey,\n      endPoint,\n      port,\n      useSSL,\n    });\n    this.bucketName = bucketName;\n    this.logger.info(`MinioDataAccessor initialized with endpoint: ${endPoint}:${port} (SSL: ${useSSL})`)\n  }\n\n  /**\n   * Should throw a NotImplementedHttpError if the DataAccessor does not support storing the given Representation.\n   *\n   * @param representation - Incoming Representation.\n   *\n   * @throws BadRequestHttpError\n   * If it does not support the incoming data.\n   */\n  public async canHandle(representation: Representation): Promise<void> {\n    if (!representation.binary) {\n      throw new UnsupportedMediaTypeHttpError('Only binary data is supported.');\n    }\n  }\n\n  /**\n   * Returns a data stream stored for the given identifier.\n   * It can be assumed that the incoming identifier will always correspond to a document.\n   *\n   * @param identifier - Identifier for which the data is requested.\n   */\n  public async getData(identifier: ResourceIdentifier): Promise<Guarded<Readable>> {\n    const url = new URL(identifier.path)\n    const stream = await this.client.getObject(this.bucketName, url.pathname);\n    return guardStream(stream);\n  }\n\n  /**\n   * Returns the metadata corresponding to the identifier.\n   * If possible, it is suggested to add a `posix:size` triple to the metadata indicating the binary size.\n   * This is necessary for range requests.\n   *\n   * @param identifier - Identifier for which the metadata is requested.\n   */\n  public async getMetadata(identifier: ResourceIdentifier): Promise<RepresentationMetadata> {\n    const url = new URL(identifier.path)\n    const link = await this.resourceMapper.mapUrlToFilePath(identifier, false);\n    const isDirectory = identifier.path.endsWith('/');\n    const objectName = isDirectory ? `${url.pathname}/.container` : url.pathname;\n    let stats: BucketItemStat;\n    try {\n      stats = await this.client.statObject(this.bucketName, objectName);\n    } catch (error) {\n      throw new NotFoundHttpError();\n    }\n    if (!isContainerIdentifier(identifier) && !isDirectory) {\n      return this.getFileMetadata(link, stats);\n    }\n    if (isContainerIdentifier(identifier) && isDirectory) {\n      return this.getDirectoryMetadata(link, stats);\n    }\n    throw new NotFoundHttpError();\n  }\n\n  /**\n   * Returns metadata for all resources in the requested container.\n   * This should not be all metadata of those resources (but it can be),\n   * but instead the main metadata you want to show in situations\n   * where all these resources are presented simultaneously.\n   * Generally this would be metadata that is present for all of these resources,\n   * such as resource type or last modified date.\n   *\n   * It can be safely assumed that the incoming identifier will always correspond to a container.\n   *\n   * @param identifier - Identifier of the parent container.\n   */\n  public async* getChildren(identifier: ResourceIdentifier): AsyncIterableIterator<RepresentationMetadata> {\n    const url = new URL(identifier.path)\n    const objects = this.client.listObjectsV2(this.bucketName, url.pathname);\n    for await (const object of objects) {\n      const metadata = await this.getMetadata(object);\n      yield metadata;\n    }\n  }\n\n  /**\n   * Writes data and metadata for a document.\n   * If any data and/or metadata exist for the given identifier, it should be overwritten.\n   *\n   * @param identifier - Identifier of the resource.\n   * @param data - Data to store.\n   * @param metadata - Metadata to store.\n   */\n  public async writeDocument(identifier: ResourceIdentifier, data: Guarded<Readable>, metadata: RepresentationMetadata): Promise<void> {\n    const url = new URL(identifier.path);\n    const link = await this.resourceMapper.mapUrlToFilePath(identifier, false);\n    const itemMetadata = this.encodeMetadata(link, metadata);\n    try {\n      await this.client.putObject(\n        this.bucketName,\n        url.pathname,\n        data,\n        metadata.contentLength,\n        itemMetadata || undefined,\n      );\n    } catch (error) {\n      this.logger.error(`Error writing document: ${identifier.path} ${error}`)\n      throw error;\n    }\n  }\n\n  /**\n   * Writes metadata for a container.\n   * If the container does not exist yet it should be created,\n   * if it does its metadata should be overwritten, except for the containment triples.\n   *\n   * @param identifier - Identifier of the container.\n   * @param metadata - Metadata to store.\n   */\n  public async writeContainer(identifier: ResourceIdentifier, metadata: RepresentationMetadata): Promise<void> {\n    const url = new URL(identifier.path)\n    const link = await this.resourceMapper.mapUrlToFilePath(identifier, false);\n    await this.client.putObject(\n      this.bucketName,\n      `${url.pathname}/.container`,\n      Buffer.from(''),\n      metadata.contentLength,\n      this.encodeMetadata(link, metadata) || undefined,\n    );\n  }\n\n  /**\n   * Writes metadata for a resource.\n   * It can safely be assumed that the subject resource already exists.\n   *\n   * @param identifier - Identifier of the subject resource.\n   * @param metadata - Metadata to store.\n   */\n  public async writeMetadata(identifier: ResourceIdentifier, metadata: RepresentationMetadata): Promise<void> {\n    throw new Error('Minio does not support writing metadata for a resource.');\n  }\n\n  /**\n   * Deletes the resource and its corresponding metadata.\n   *\n   * Solid, §5.4: \"When a contained resource is deleted, the server MUST also remove the corresponding containment\n   * triple, which has the effect of removing the deleted resource from the containing container.\"\n   * https://solid.github.io/specification/protocol#deleting-resources\n   *\n   * @param identifier - Resource to delete.\n   */\n  public async deleteResource(identifier: ResourceIdentifier): Promise<void> {\n    const link = new URL(identifier.path)\n    await this.client.removeObject(this.bucketName, link.pathname);\n  }\n\n  /**\n   * Reads and generates all metadata relevant for the given file,\n   * ingesting it into a RepresentationMetadata object.\n   *\n   * @param link - Path related metadata.\n   * @param stats - Stats object of the corresponding file.\n   */\n  private async getFileMetadata(link: ResourceLink, stats: BucketItemStat): Promise<RepresentationMetadata> {\n    const metadata = await this.getBaseMetadata(link, stats, false);\n      // If the resource is using an unsupported contentType, the original contentType was written to the metadata file.\n      // As a result, we should only set the contentType derived from the file path,\n      // when no previous metadata entry for contentType is present.\n    if (typeof metadata.contentType === 'undefined') {\n      metadata.set(CONTENT_TYPE_TERM, link.contentType);\n    }\n    return metadata;\n  }\n\n  /**\n   * Reads and generates all metadata relevant for the given directory,\n   * ingesting it into a RepresentationMetadata object.\n   *\n   * @param link - Path related metadata.\n   * @param stats - Stats object of the corresponding directory.\n   */\n  private async getDirectoryMetadata(link: ResourceLink, stats: BucketItemStat): Promise<RepresentationMetadata> {\n    return this.getBaseMetadata(link, stats, true);\n  }\n  \n  /**\n   * Generates metadata relevant for any resources stored by this accessor.\n   *\n   * @param link - Path related metadata.\n   * @param stats - Stats objects of the corresponding directory.\n   * @param isContainer - If the path points to a container (directory) or not.\n   */\n  private async getBaseMetadata(link: ResourceLink, stats: BucketItemStat, isContainer: boolean): Promise<RepresentationMetadata> {\n    const metadata = this.decodeMetadata(link, stats.metaData);\n    addResourceMetadata(metadata, isContainer);\n    this.addPosixMetadata(metadata, stats, isContainer);\n    return metadata;\n  }\n  \n  /**\n   * Helper function to add file system related metadata.\n   *\n   * @param metadata - metadata object to add to\n   * @param stats - Stats of the file/directory corresponding to the resource.\n   */\n  private addPosixMetadata(metadata: RepresentationMetadata, stats: BucketItemStat, isDirectory: boolean): void {\n    updateModifiedDate(metadata, stats.lastModified);\n    metadata.add(\n      POSIX.terms.mtime,\n      toLiteral(Math.floor(stats.lastModified.getTime() / 1000), XSD.terms.integer),\n      SOLID_META.terms.ResponseMetadata,\n    );\n    if (!isDirectory) {\n      metadata.add(\n        POSIX.terms.size,\n        toLiteral(stats.size, XSD.terms.integer),\n        SOLID_META.terms.ResponseMetadata,\n      );\n    }\n  }\n\n  /**\n   * encode the metadata of the resource to string.\n   *\n   * @param link - Path related metadata of the resource.\n   * @param metadata - Metadata to write.\n   *\n   * @returns string of metadata.\n   */\n  protected encodeMetadata(link: ResourceLink, metadata: RepresentationMetadata): object | null {\n    // These are stored by file system conventions\n    metadata.remove(RDF.terms.type, LDP.terms.Resource);\n    metadata.remove(RDF.terms.type, LDP.terms.Container);\n    metadata.remove(RDF.terms.type, LDP.terms.BasicContainer);\n    metadata.removeAll(DC.terms.modified);\n    // When writing metadata for a document, only remove the content-type when dealing with a supported media type.\n    // A media type is supported if the FileIdentifierMapper can correctly store it.\n    // This allows restoring the appropriate content-type on data read (see getFileMetadata).\n    if (isContainerPath(link.filePath) || typeof metadata.contentType !== 'undefined') {\n      metadata.removeAll(CONTENT_TYPE_TERM);\n    }\n    const contentTypeObject = metadata.contentTypeObject\n    if (contentTypeObject === undefined\n      || Object.keys(contentTypeObject.parameters).length === 0) {\n      return null;\n    }\n    // Write metadata to file if there are quads remaining\n    return contentTypeObject.parameters;\n  }\n\n  protected decodeMetadata(link: ResourceLink, metadata: MetadataRecord): RepresentationMetadata {\n    return new RepresentationMetadata(link.identifier, metadata);\n  }\n}\n"]}
+{"version":3,"file":"MinioDataAccessor.js","sourceRoot":"","sources":["../../../src/storage/accessors/MinioDataAccessor.ts"],"names":[],"mappings":";;;AAAA,iCAA+C;AAC/C,iEAAqD;AAIrD,8DAuBiC;AASjC,MAAa,iBAAiB;IAM5B,YACE,cAAoC,EACpC,SAAiB,EACjB,SAAiB,EACjB,QAAgB,EAChB,UAAkB;QAVD,WAAM,GAAG,IAAA,oCAAY,EAAC,IAAI,CAAC,CAAC;QAY7C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QAErC,6FAA6F;QAC7F,IAAI,QAAgB,CAAC;QACrB,IAAI,IAAwB,CAAC;QAC7B,IAAI,MAAM,GAAG,KAAK,CAAC;QAEnB,IAAI,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YACtE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC9B,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;YACxB,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACrD,MAAM,GAAG,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC;QACrC,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACvD,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,IAAI,cAAM,CAAC;YACvB,SAAS;YACT,SAAS;YACT,QAAQ;YACR,IAAI;YACJ,MAAM;SACP,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gDAAgD,QAAQ,IAAI,IAAI,UAAU,MAAM,GAAG,CAAC,CAAA;IACvG,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,SAAS,CAAC,cAA8B;QACnD,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;YAC3B,MAAM,IAAI,gDAA6B,CAAC,gCAAgC,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,OAAO,CAAC,UAA8B;QACjD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC1E,OAAO,IAAA,8BAAW,EAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,eAAe,CAAC,UAA8B,EAAE,OAAO,GAAG,IAAI;QACzE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC7E,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,WAAW,CAAC,UAA8B;QACrD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACpC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC3E,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC7E,IAAI,KAAqB,CAAC;QAC1B,IAAI,CAAC;YACH,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QACpE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,oCAAiB,EAAE,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,IAAA,wCAAqB,EAAC,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3C,CAAC;QACD,IAAI,IAAA,wCAAqB,EAAC,UAAU,CAAC,IAAI,WAAW,EAAE,CAAC;YACrD,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAChD,CAAC;QACD,MAAM,IAAI,oCAAiB,EAAE,CAAC;IAChC,CAAC;IAED;;;;;;;;;;;OAWG;IACI,KAAK,CAAA,CAAE,WAAW,CAAC,UAA8B;QACtD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACpC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;QACzE,IAAI,KAAK,EAAE,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YACnC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAChD,MAAM,QAAQ,CAAC;QACjB,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,aAAa,CAAC,UAA8B,EAAE,IAAuB,EAAE,QAAgC;QAClH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC3E,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACzD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CACzB,IAAI,CAAC,UAAU,EACf,GAAG,CAAC,QAAQ,EACZ,IAAI,EACJ,QAAQ,CAAC,aAAa,EACtB,YAAY,IAAI,SAAS,CAC1B,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,UAAU,CAAC,IAAI,IAAI,KAAK,EAAE,CAAC,CAAA;YACxE,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,cAAc,CAAC,UAA8B,EAAE,QAAgC;QAC1F,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACpC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC3E,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CACzB,IAAI,CAAC,UAAU,EACf,GAAG,GAAG,CAAC,QAAQ,aAAa,EAC5B,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EACf,QAAQ,CAAC,aAAa,EACtB,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,SAAS,CACjD,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,aAAa,CAAC,UAA8B,EAAE,QAAgC;QACzF,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,cAAc,CAAC,UAA8B;QACxD,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACrC,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjE,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,eAAe,CAAC,IAAkB,EAAE,KAAqB;QACrE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC9D,kHAAkH;QAClH,8EAA8E;QAC9E,8DAA8D;QAChE,IAAI,OAAO,QAAQ,CAAC,WAAW,KAAK,WAAW,EAAE,CAAC;YAChD,QAAQ,CAAC,GAAG,CAAC,oCAAiB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,oBAAoB,CAAC,IAAkB,EAAE,KAAqB;QAC1E,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,eAAe,CAAC,IAAkB,EAAE,KAAqB,EAAE,WAAoB;QAC3F,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC3D,IAAA,sCAAmB,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC3C,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;QACpD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;;OAKG;IACK,gBAAgB,CAAC,QAAgC,EAAE,KAAqB,EAAE,WAAoB;QACpG,IAAA,qCAAkB,EAAC,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;QACjD,QAAQ,CAAC,GAAG,CACV,wBAAK,CAAC,KAAK,CAAC,KAAK,EACjB,IAAA,4BAAS,EAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,EAAE,sBAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAC7E,6BAAU,CAAC,KAAK,CAAC,gBAAgB,CAClC,CAAC;QACF,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,QAAQ,CAAC,GAAG,CACV,wBAAK,CAAC,KAAK,CAAC,IAAI,EAChB,IAAA,4BAAS,EAAC,KAAK,CAAC,IAAI,EAAE,sBAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EACxC,6BAAU,CAAC,KAAK,CAAC,gBAAgB,CAClC,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACO,cAAc,CAAC,IAAkB,EAAE,QAAgC;QAC3E,8CAA8C;QAC9C,QAAQ,CAAC,MAAM,CAAC,sBAAG,CAAC,KAAK,CAAC,IAAI,EAAE,sBAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACpD,QAAQ,CAAC,MAAM,CAAC,sBAAG,CAAC,KAAK,CAAC,IAAI,EAAE,sBAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACrD,QAAQ,CAAC,MAAM,CAAC,sBAAG,CAAC,KAAK,CAAC,IAAI,EAAE,sBAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC1D,QAAQ,CAAC,SAAS,CAAC,qBAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACtC,+GAA+G;QAC/G,gFAAgF;QAChF,yFAAyF;QACzF,IAAI,IAAA,kCAAe,EAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,OAAO,QAAQ,CAAC,WAAW,KAAK,WAAW,EAAE,CAAC;YAClF,QAAQ,CAAC,SAAS,CAAC,oCAAiB,CAAC,CAAC;QACxC,CAAC;QACD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAA;QACpD,IAAI,iBAAiB,KAAK,SAAS;eAC9B,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5D,OAAO,IAAI,CAAC;QACd,CAAC;QACD,sDAAsD;QACtD,OAAO,iBAAiB,CAAC,UAAU,CAAC;IACtC,CAAC;IAES,cAAc,CAAC,IAAkB,EAAE,QAAwB;QACnE,OAAO,IAAI,yCAAsB,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC/D,CAAC;CACF;AAvSD,8CAuSC","sourcesContent":["import { Client, BucketItemStat } from 'minio';\nimport { getLoggerFor } from 'global-logger-factory';\nimport type { DataAccessor } from '@solid/community-server';\nimport type { Readable } from 'node:stream';\nimport { DataFactory } from 'n3';\nimport {\n  RepresentationMetadata,\n  \n  NotFoundHttpError,\n  guardStream,\n  isContainerIdentifier,\n  isContainerPath,\n  joinFilePath,\n  UnsupportedMediaTypeHttpError,\n  CONTENT_TYPE_TERM,\n  DC,\n  IANA,\n  LDP,\n  POSIX,\n  RDF,\n  SOLID_META,\n  XSD,\n  parseQuads,\n  serializeQuads,\n  addResourceMetadata,\n  updateModifiedDate,\n  toLiteral,\n  toNamedTerm,\n} from '@solid/community-server';\nimport type { Guarded } from '@solid/community-server';\nimport type { FileIdentifierMapper, ResourceLink } from '@solid/community-server';\nimport type { \n  ResourceIdentifier,\n  Representation,\n  MetadataRecord\n} from '@solid/community-server';\n\nexport class MinioDataAccessor implements DataAccessor {\n  protected readonly logger = getLoggerFor(this);\n  protected readonly resourceMapper: FileIdentifierMapper;\n  private readonly client: Client;\n  private readonly bucketName: string;\n\n  public constructor(\n    resourceMapper: FileIdentifierMapper,\n    accessKey: string,\n    secretKey: string,\n    endpoint: string,\n    bucketName: string,\n  ) {\n    this.resourceMapper = resourceMapper;\n\n    // Parse endpoint - supports both URL format (http://host:port) and simple format (host:port)\n    let endPoint: string;\n    let port: number | undefined;\n    let useSSL = false;\n\n    if (endpoint.startsWith('http://') || endpoint.startsWith('https://')) {\n      const url = new URL(endpoint);\n      endPoint = url.hostname;\n      port = url.port ? parseInt(url.port, 10) : undefined;\n      useSSL = url.protocol === 'https:';\n    } else {\n      const parts = endpoint.split(':');\n      endPoint = parts[0];\n      port = parts[1] ? parseInt(parts[1], 10) : undefined;\n    }\n\n    this.client = new Client({\n      accessKey,\n      secretKey,\n      endPoint,\n      port,\n      useSSL,\n    });\n    this.bucketName = bucketName;\n    this.logger.info(`MinioDataAccessor initialized with endpoint: ${endPoint}:${port} (SSL: ${useSSL})`)\n  }\n\n  /**\n   * Should throw a NotImplementedHttpError if the DataAccessor does not support storing the given Representation.\n   *\n   * @param representation - Incoming Representation.\n   *\n   * @throws BadRequestHttpError\n   * If it does not support the incoming data.\n   */\n  public async canHandle(representation: Representation): Promise<void> {\n    if (!representation.binary) {\n      throw new UnsupportedMediaTypeHttpError('Only binary data is supported.');\n    }\n  }\n\n  /**\n   * Returns a data stream stored for the given identifier.\n   * It can be assumed that the incoming identifier will always correspond to a document.\n   *\n   * @param identifier - Identifier for which the data is requested.\n   */\n  public async getData(identifier: ResourceIdentifier): Promise<Guarded<Readable>> {\n    const url = new URL(identifier.path)\n    const stream = await this.client.getObject(this.bucketName, url.pathname);\n    return guardStream(stream);\n  }\n\n  /**\n   * Generate a presigned GET URL for the given resource.\n   * @param identifier - Resource identifier.\n   * @param expires - URL expiry in seconds (default 3600).\n   */\n  public async getPresignedUrl(identifier: ResourceIdentifier, expires = 3600): Promise<string> {\n    const url = new URL(identifier.path);\n    const objectKey = url.pathname.replace(/^\\//, '');\n    return this.client.presignedGetObject(this.bucketName, objectKey, expires);\n  }\n\n  /**\n   * Returns the metadata corresponding to the identifier.\n   * If possible, it is suggested to add a `posix:size` triple to the metadata indicating the binary size.\n   * This is necessary for range requests.\n   *\n   * @param identifier - Identifier for which the metadata is requested.\n   */\n  public async getMetadata(identifier: ResourceIdentifier): Promise<RepresentationMetadata> {\n    const url = new URL(identifier.path)\n    const link = await this.resourceMapper.mapUrlToFilePath(identifier, false);\n    const isDirectory = identifier.path.endsWith('/');\n    const objectName = isDirectory ? `${url.pathname}/.container` : url.pathname;\n    let stats: BucketItemStat;\n    try {\n      stats = await this.client.statObject(this.bucketName, objectName);\n    } catch (error) {\n      throw new NotFoundHttpError();\n    }\n    if (!isContainerIdentifier(identifier) && !isDirectory) {\n      return this.getFileMetadata(link, stats);\n    }\n    if (isContainerIdentifier(identifier) && isDirectory) {\n      return this.getDirectoryMetadata(link, stats);\n    }\n    throw new NotFoundHttpError();\n  }\n\n  /**\n   * Returns metadata for all resources in the requested container.\n   * This should not be all metadata of those resources (but it can be),\n   * but instead the main metadata you want to show in situations\n   * where all these resources are presented simultaneously.\n   * Generally this would be metadata that is present for all of these resources,\n   * such as resource type or last modified date.\n   *\n   * It can be safely assumed that the incoming identifier will always correspond to a container.\n   *\n   * @param identifier - Identifier of the parent container.\n   */\n  public async* getChildren(identifier: ResourceIdentifier): AsyncIterableIterator<RepresentationMetadata> {\n    const url = new URL(identifier.path)\n    const objects = this.client.listObjectsV2(this.bucketName, url.pathname);\n    for await (const object of objects) {\n      const metadata = await this.getMetadata(object);\n      yield metadata;\n    }\n  }\n\n  /**\n   * Writes data and metadata for a document.\n   * If any data and/or metadata exist for the given identifier, it should be overwritten.\n   *\n   * @param identifier - Identifier of the resource.\n   * @param data - Data to store.\n   * @param metadata - Metadata to store.\n   */\n  public async writeDocument(identifier: ResourceIdentifier, data: Guarded<Readable>, metadata: RepresentationMetadata): Promise<void> {\n    const url = new URL(identifier.path);\n    const link = await this.resourceMapper.mapUrlToFilePath(identifier, false);\n    const itemMetadata = this.encodeMetadata(link, metadata);\n    try {\n      await this.client.putObject(\n        this.bucketName,\n        url.pathname,\n        data,\n        metadata.contentLength,\n        itemMetadata || undefined,\n      );\n    } catch (error) {\n      this.logger.error(`Error writing document: ${identifier.path} ${error}`)\n      throw error;\n    }\n  }\n\n  /**\n   * Writes metadata for a container.\n   * If the container does not exist yet it should be created,\n   * if it does its metadata should be overwritten, except for the containment triples.\n   *\n   * @param identifier - Identifier of the container.\n   * @param metadata - Metadata to store.\n   */\n  public async writeContainer(identifier: ResourceIdentifier, metadata: RepresentationMetadata): Promise<void> {\n    const url = new URL(identifier.path)\n    const link = await this.resourceMapper.mapUrlToFilePath(identifier, false);\n    await this.client.putObject(\n      this.bucketName,\n      `${url.pathname}/.container`,\n      Buffer.from(''),\n      metadata.contentLength,\n      this.encodeMetadata(link, metadata) || undefined,\n    );\n  }\n\n  /**\n   * Writes metadata for a resource.\n   * It can safely be assumed that the subject resource already exists.\n   *\n   * @param identifier - Identifier of the subject resource.\n   * @param metadata - Metadata to store.\n   */\n  public async writeMetadata(identifier: ResourceIdentifier, metadata: RepresentationMetadata): Promise<void> {\n    throw new Error('Minio does not support writing metadata for a resource.');\n  }\n\n  /**\n   * Deletes the resource and its corresponding metadata.\n   *\n   * Solid, §5.4: \"When a contained resource is deleted, the server MUST also remove the corresponding containment\n   * triple, which has the effect of removing the deleted resource from the containing container.\"\n   * https://solid.github.io/specification/protocol#deleting-resources\n   *\n   * @param identifier - Resource to delete.\n   */\n  public async deleteResource(identifier: ResourceIdentifier): Promise<void> {\n    const link = new URL(identifier.path)\n    await this.client.removeObject(this.bucketName, link.pathname);\n  }\n\n  /**\n   * Reads and generates all metadata relevant for the given file,\n   * ingesting it into a RepresentationMetadata object.\n   *\n   * @param link - Path related metadata.\n   * @param stats - Stats object of the corresponding file.\n   */\n  private async getFileMetadata(link: ResourceLink, stats: BucketItemStat): Promise<RepresentationMetadata> {\n    const metadata = await this.getBaseMetadata(link, stats, false);\n      // If the resource is using an unsupported contentType, the original contentType was written to the metadata file.\n      // As a result, we should only set the contentType derived from the file path,\n      // when no previous metadata entry for contentType is present.\n    if (typeof metadata.contentType === 'undefined') {\n      metadata.set(CONTENT_TYPE_TERM, link.contentType);\n    }\n    return metadata;\n  }\n\n  /**\n   * Reads and generates all metadata relevant for the given directory,\n   * ingesting it into a RepresentationMetadata object.\n   *\n   * @param link - Path related metadata.\n   * @param stats - Stats object of the corresponding directory.\n   */\n  private async getDirectoryMetadata(link: ResourceLink, stats: BucketItemStat): Promise<RepresentationMetadata> {\n    return this.getBaseMetadata(link, stats, true);\n  }\n  \n  /**\n   * Generates metadata relevant for any resources stored by this accessor.\n   *\n   * @param link - Path related metadata.\n   * @param stats - Stats objects of the corresponding directory.\n   * @param isContainer - If the path points to a container (directory) or not.\n   */\n  private async getBaseMetadata(link: ResourceLink, stats: BucketItemStat, isContainer: boolean): Promise<RepresentationMetadata> {\n    const metadata = this.decodeMetadata(link, stats.metaData);\n    addResourceMetadata(metadata, isContainer);\n    this.addPosixMetadata(metadata, stats, isContainer);\n    return metadata;\n  }\n  \n  /**\n   * Helper function to add file system related metadata.\n   *\n   * @param metadata - metadata object to add to\n   * @param stats - Stats of the file/directory corresponding to the resource.\n   */\n  private addPosixMetadata(metadata: RepresentationMetadata, stats: BucketItemStat, isDirectory: boolean): void {\n    updateModifiedDate(metadata, stats.lastModified);\n    metadata.add(\n      POSIX.terms.mtime,\n      toLiteral(Math.floor(stats.lastModified.getTime() / 1000), XSD.terms.integer),\n      SOLID_META.terms.ResponseMetadata,\n    );\n    if (!isDirectory) {\n      metadata.add(\n        POSIX.terms.size,\n        toLiteral(stats.size, XSD.terms.integer),\n        SOLID_META.terms.ResponseMetadata,\n      );\n    }\n  }\n\n  /**\n   * encode the metadata of the resource to string.\n   *\n   * @param link - Path related metadata of the resource.\n   * @param metadata - Metadata to write.\n   *\n   * @returns string of metadata.\n   */\n  protected encodeMetadata(link: ResourceLink, metadata: RepresentationMetadata): object | null {\n    // These are stored by file system conventions\n    metadata.remove(RDF.terms.type, LDP.terms.Resource);\n    metadata.remove(RDF.terms.type, LDP.terms.Container);\n    metadata.remove(RDF.terms.type, LDP.terms.BasicContainer);\n    metadata.removeAll(DC.terms.modified);\n    // When writing metadata for a document, only remove the content-type when dealing with a supported media type.\n    // A media type is supported if the FileIdentifierMapper can correctly store it.\n    // This allows restoring the appropriate content-type on data read (see getFileMetadata).\n    if (isContainerPath(link.filePath) || typeof metadata.contentType !== 'undefined') {\n      metadata.removeAll(CONTENT_TYPE_TERM);\n    }\n    const contentTypeObject = metadata.contentTypeObject\n    if (contentTypeObject === undefined\n      || Object.keys(contentTypeObject.parameters).length === 0) {\n      return null;\n    }\n    // Write metadata to file if there are quads remaining\n    return contentTypeObject.parameters;\n  }\n\n  protected decodeMetadata(link: ResourceLink, metadata: MetadataRecord): RepresentationMetadata {\n    return new RepresentationMetadata(link.identifier, metadata);\n  }\n}\n"]}

package/dist/storage/accessors/MinioDataAccessor.jsonld

@@ -67,6 +67,10 @@
           "@id": "undefineds:dist/storage/accessors/MinioDataAccessor.jsonld#MinioDataAccessor__member_getData",
           "memberFieldName": "getData"
         },
+        {
+          "@id": "undefineds:dist/storage/accessors/MinioDataAccessor.jsonld#MinioDataAccessor__member_getPresignedUrl",
+          "memberFieldName": "getPresignedUrl"
+        },
         {
           "@id": "undefineds:dist/storage/accessors/MinioDataAccessor.jsonld#MinioDataAccessor__member_getMetadata",
           "memberFieldName": "getMetadata"

package/dist/storage/accessors/MixDataAccessor.d.ts

@@ -14,7 +14,8 @@ export declare class MixDataAccessor implements DataAccessor {
     protected readonly logger: import("global-logger-factory").Logger<unknown>;
     private readonly structuredDataAccessor;
     private readonly unstructuredDataAccessor;
-    constructor(structuredDataAccessor: DataAccessor, unstructuredDataAccessor: DataAccessor);
+    private readonly presignedRedirectEnabled;
+    constructor(structuredDataAccessor: DataAccessor, unstructuredDataAccessor: DataAccessor, presignedRedirectEnabled?: boolean);
     /**
      * This accessor supports all types of data.
      */

package/dist/storage/accessors/MixDataAccessor.js

@@ -13,10 +13,11 @@ const community_server_1 = require("@solid/community-server");
  * to be used as the RDF storage backend.
  */
 class MixDataAccessor {
-    constructor(structuredDataAccessor, unstructuredDataAccessor) {
+    constructor(structuredDataAccessor, unstructuredDataAccessor, presignedRedirectEnabled = false) {
         this.logger = (0, global_logger_factory_1.getLoggerFor)(this);
         this.structuredDataAccessor = structuredDataAccessor;
         this.unstructuredDataAccessor = unstructuredDataAccessor;
+        this.presignedRedirectEnabled = presignedRedirectEnabled;
     }
     /**
      * This accessor supports all types of data.
@@ -33,6 +34,16 @@ class MixDataAccessor {
     async getData(identifier) {
         const metadata = await this.getMetadata(identifier);
         if (this.isUnstructured(metadata)) {
+            // When presigned redirect is enabled and the unstructured accessor supports it,
+            // generate a presigned URL and throw FoundHttpError to trigger a 302 redirect.
+            if (this.presignedRedirectEnabled) {
+                const accessor = this.unstructuredDataAccessor;
+                if (typeof accessor.getPresignedUrl === 'function') {
+                    const presignedUrl = await accessor.getPresignedUrl(identifier);
+                    this.logger.debug(`Presigned redirect: ${identifier.path}`);
+                    throw new community_server_1.FoundHttpError(presignedUrl);
+                }
+            }
             return await this.unstructuredDataAccessor.getData(identifier);
         }
         return await this.structuredDataAccessor.getData(identifier);

package/dist/storage/accessors/MixDataAccessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"MixDataAccessor.js","sourceRoot":"","sources":["../../../src/storage/accessors/MixDataAccessor.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Readable } from 'stream';\nimport { getLoggerFor } from 'global-logger-factory';\n\nimport type { Quad } from '@rdfjs/types';\nimport { \n  isContainerIdentifier,\n  RepresentationMetadata,\n  INTERNAL_QUADS,\n} from '@solid/community-server';\nimport type {\n  Representation,\n  ResourceIdentifier,\n  Guarded,\n  DataAccessor,\n} from '@solid/community-server';\n\n/**\n * MixDataAccessor - Routes data to appropriate storage based on content type\n * \n * - RDF data (internal/quads) -> structuredDataAccessor (Quadstore or QuintStore)\n * - Other data (binary, text, etc.) -> unstructuredDataAccessor (FileSystem, Minio, etc.)\n * \n * This uses composition instead of inheritance, allowing any DataAccessor\n * to be used as the RDF storage backend.\n */\nexport class MixDataAccessor implements DataAccessor {\n  protected readonly logger = getLoggerFor(this);\n  \n  private readonly structuredDataAccessor: DataAccessor;\n  private readonly unstructuredDataAccessor: DataAccessor;\n\n  constructor(\n    structuredDataAccessor: DataAccessor,\n    unstructuredDataAccessor: DataAccessor,\n  ) {\n    this.structuredDataAccessor = structuredDataAccessor;\n    this.unstructuredDataAccessor = unstructuredDataAccessor;\n  }\n\n  /**\n   * This accessor supports all types of data.\n   */\n  public async canHandle(representation: Representation): Promise<void> {\n    return void 0;\n  }\n\n  /**\n   * Checks if the given representation is unstructured (non-RDF).\n   */\n  private isUnstructured(metadata: RepresentationMetadata): boolean {\n    return metadata.contentType !== INTERNAL_QUADS;\n  }\n\n  public async getData(identifier: ResourceIdentifier): Promise<Guarded<Readable>> {\n    const metadata = await this.getMetadata(identifier);\n    if (this.isUnstructured(metadata)) {\n      return await this.unstructuredDataAccessor.getData(identifier);\n    }\n    return await this.structuredDataAccessor.getData(identifier);\n  }\n\n  public async getMetadata(identifier: ResourceIdentifier): Promise<RepresentationMetadata> {\n    // Metadata is always stored in the structured accessor\n    const metadata = await this.structuredDataAccessor.getMetadata(identifier);\n\n    // For resources without explicit content type, default to RDF\n    // This includes containers (which are always RDF) and documents without contentType\n    if (!metadata.contentType) {\n      metadata.contentType = INTERNAL_QUADS;\n    }\n\n    return metadata;\n  }\n\n  public async* getChildren(identifier: ResourceIdentifier): AsyncIterableIterator<RepresentationMetadata> {\n    // Children metadata is stored in the structured accessor\n    yield* this.structuredDataAccessor.getChildren(identifier);\n  }\n\n  public async writeContainer(\n    identifier: ResourceIdentifier,\n    metadata: RepresentationMetadata,\n  ): Promise<void> {\n    // Container metadata goes to structured storage\n    // Also create in unstructured if it needs to store files\n    if (this.isUnstructured(metadata)) {\n      await this.unstructuredDataAccessor.writeContainer(identifier, metadata);\n    }\n    await this.structuredDataAccessor.writeContainer(identifier, metadata);\n  }\n\n  public async writeDocument(\n    identifier: ResourceIdentifier,\n    data: Guarded<Readable>,\n    metadata: RepresentationMetadata,\n  ): Promise<void> {\n    if (this.isUnstructured(metadata)) {\n      return await this.writeUnstructuredDocument(identifier, data, metadata);\n    }\n    return await this.structuredDataAccessor.writeDocument(identifier, data, metadata);\n  }\n\n  public async writeMetadata(identifier: ResourceIdentifier, metadata: RepresentationMetadata): Promise<void> {\n    // Metadata always goes to structured storage\n    return await this.structuredDataAccessor.writeMetadata(identifier, metadata);\n  }\n\n  public async deleteResource(identifier: ResourceIdentifier): Promise<void> {\n    const metadata = await this.getMetadata(identifier);\n    \n    // Try to delete from unstructured storage if applicable\n    if (this.isUnstructured(metadata)) {\n      try {\n        await this.unstructuredDataAccessor.deleteResource(identifier);\n      } catch (error: any) {\n        // Ignore file not found errors\n        if (error.code !== 'ENOENT' && error.code !== 'ENOTDIR') {\n          throw error;\n        }\n      }\n    }\n    \n    // Always delete from structured storage (contains metadata)\n    return await this.structuredDataAccessor.deleteResource(identifier);\n  }\n\n  /**\n   * Execute SPARQL UPDATE on structured data accessor.\n   * Delegates to the underlying structuredDataAccessor if it supports SPARQL.\n   */\n  public async executeSparqlUpdate(query: string, baseIri?: string): Promise<void> {\n    const accessor = this.structuredDataAccessor as { executeSparqlUpdate?: (query: string, baseIri?: string) => Promise<void> };\n    if (typeof accessor.executeSparqlUpdate !== 'function') {\n      throw new Error('Structured data accessor does not support SPARQL UPDATE');\n    }\n    return accessor.executeSparqlUpdate(query, baseIri);\n  }\n\n  /**\n   * Write unstructured document: store data in unstructured accessor,\n   * then save metadata in structured accessor.\n   */\n  private async writeUnstructuredDocument(\n    identifier: ResourceIdentifier,\n    data: Guarded<Readable>,\n    metadata: RepresentationMetadata,\n  ): Promise<void> {\n    // Write the actual data to unstructured storage\n    await this.unstructuredDataAccessor.writeDocument(identifier, data, metadata);\n    \n    // Get the metadata from unstructured storage (includes size, etc.)\n    let updatedMetadata = await this.unstructuredDataAccessor.getMetadata(identifier);\n    \n    // Filter out invalid quads\n    const removing: Quad[] = [];\n    for (const quad of updatedMetadata.quads()) {\n      if (!/^http/.test(quad.predicate.value)) {\n        removing.push(quad);\n      }\n    }\n    updatedMetadata.removeQuads(removing);\n    \n    // Save metadata to structured storage\n    try {\n      await this.structuredDataAccessor.writeMetadata(identifier, updatedMetadata);\n    } catch (error) {\n      this.logger.error(`Error writing metadata for ${identifier.path}: ${error}`);\n      // Rollback: delete the unstructured data\n      await this.unstructuredDataAccessor.deleteResource(identifier);\n      throw error;\n    }\n  }\n}\n"]}
+{"version":3,"file":"MixDataAccessor.js","sourceRoot":"","sources":["../../../src/storage/accessors/MixDataAccessor.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Readable } from 'stream';\nimport { getLoggerFor } from 'global-logger-factory';\n\nimport type { Quad } from '@rdfjs/types';\nimport {\n  isContainerIdentifier,\n  RepresentationMetadata,\n  INTERNAL_QUADS,\n  FoundHttpError,\n} from '@solid/community-server';\nimport type {\n  Representation,\n  ResourceIdentifier,\n  Guarded,\n  DataAccessor,\n} from '@solid/community-server';\n\n/**\n * MixDataAccessor - Routes data to appropriate storage based on content type\n * \n * - RDF data (internal/quads) -> structuredDataAccessor (Quadstore or QuintStore)\n * - Other data (binary, text, etc.) -> unstructuredDataAccessor (FileSystem, Minio, etc.)\n * \n * This uses composition instead of inheritance, allowing any DataAccessor\n * to be used as the RDF storage backend.\n */\nexport class MixDataAccessor implements DataAccessor {\n  protected readonly logger = getLoggerFor(this);\n  \n  private readonly structuredDataAccessor: DataAccessor;\n  private readonly unstructuredDataAccessor: DataAccessor;\n  private readonly presignedRedirectEnabled: boolean;\n\n  constructor(\n    structuredDataAccessor: DataAccessor,\n    unstructuredDataAccessor: DataAccessor,\n    presignedRedirectEnabled = false,\n  ) {\n    this.structuredDataAccessor = structuredDataAccessor;\n    this.unstructuredDataAccessor = unstructuredDataAccessor;\n    this.presignedRedirectEnabled = presignedRedirectEnabled;\n  }\n\n  /**\n   * This accessor supports all types of data.\n   */\n  public async canHandle(representation: Representation): Promise<void> {\n    return void 0;\n  }\n\n  /**\n   * Checks if the given representation is unstructured (non-RDF).\n   */\n  private isUnstructured(metadata: RepresentationMetadata): boolean {\n    return metadata.contentType !== INTERNAL_QUADS;\n  }\n\n  public async getData(identifier: ResourceIdentifier): Promise<Guarded<Readable>> {\n    const metadata = await this.getMetadata(identifier);\n    if (this.isUnstructured(metadata)) {\n      // When presigned redirect is enabled and the unstructured accessor supports it,\n      // generate a presigned URL and throw FoundHttpError to trigger a 302 redirect.\n      if (this.presignedRedirectEnabled) {\n        const accessor = this.unstructuredDataAccessor as { getPresignedUrl?: (id: ResourceIdentifier, expires?: number) => Promise<string> };\n        if (typeof accessor.getPresignedUrl === 'function') {\n          const presignedUrl = await accessor.getPresignedUrl(identifier);\n          this.logger.debug(`Presigned redirect: ${identifier.path}`);\n          throw new FoundHttpError(presignedUrl);\n        }\n      }\n      return await this.unstructuredDataAccessor.getData(identifier);\n    }\n    return await this.structuredDataAccessor.getData(identifier);\n  }\n\n  public async getMetadata(identifier: ResourceIdentifier): Promise<RepresentationMetadata> {\n    // Metadata is always stored in the structured accessor\n    const metadata = await this.structuredDataAccessor.getMetadata(identifier);\n\n    // For resources without explicit content type, default to RDF\n    // This includes containers (which are always RDF) and documents without contentType\n    if (!metadata.contentType) {\n      metadata.contentType = INTERNAL_QUADS;\n    }\n\n    return metadata;\n  }\n\n  public async* getChildren(identifier: ResourceIdentifier): AsyncIterableIterator<RepresentationMetadata> {\n    // Children metadata is stored in the structured accessor\n    yield* this.structuredDataAccessor.getChildren(identifier);\n  }\n\n  public async writeContainer(\n    identifier: ResourceIdentifier,\n    metadata: RepresentationMetadata,\n  ): Promise<void> {\n    // Container metadata goes to structured storage\n    // Also create in unstructured if it needs to store files\n    if (this.isUnstructured(metadata)) {\n      await this.unstructuredDataAccessor.writeContainer(identifier, metadata);\n    }\n    await this.structuredDataAccessor.writeContainer(identifier, metadata);\n  }\n\n  public async writeDocument(\n    identifier: ResourceIdentifier,\n    data: Guarded<Readable>,\n    metadata: RepresentationMetadata,\n  ): Promise<void> {\n    if (this.isUnstructured(metadata)) {\n      return await this.writeUnstructuredDocument(identifier, data, metadata);\n    }\n    return await this.structuredDataAccessor.writeDocument(identifier, data, metadata);\n  }\n\n  public async writeMetadata(identifier: ResourceIdentifier, metadata: RepresentationMetadata): Promise<void> {\n    // Metadata always goes to structured storage\n    return await this.structuredDataAccessor.writeMetadata(identifier, metadata);\n  }\n\n  public async deleteResource(identifier: ResourceIdentifier): Promise<void> {\n    const metadata = await this.getMetadata(identifier);\n    \n    // Try to delete from unstructured storage if applicable\n    if (this.isUnstructured(metadata)) {\n      try {\n        await this.unstructuredDataAccessor.deleteResource(identifier);\n      } catch (error: any) {\n        // Ignore file not found errors\n        if (error.code !== 'ENOENT' && error.code !== 'ENOTDIR') {\n          throw error;\n        }\n      }\n    }\n    \n    // Always delete from structured storage (contains metadata)\n    return await this.structuredDataAccessor.deleteResource(identifier);\n  }\n\n  /**\n   * Execute SPARQL UPDATE on structured data accessor.\n   * Delegates to the underlying structuredDataAccessor if it supports SPARQL.\n   */\n  public async executeSparqlUpdate(query: string, baseIri?: string): Promise<void> {\n    const accessor = this.structuredDataAccessor as { executeSparqlUpdate?: (query: string, baseIri?: string) => Promise<void> };\n    if (typeof accessor.executeSparqlUpdate !== 'function') {\n      throw new Error('Structured data accessor does not support SPARQL UPDATE');\n    }\n    return accessor.executeSparqlUpdate(query, baseIri);\n  }\n\n  /**\n   * Write unstructured document: store data in unstructured accessor,\n   * then save metadata in structured accessor.\n   */\n  private async writeUnstructuredDocument(\n    identifier: ResourceIdentifier,\n    data: Guarded<Readable>,\n    metadata: RepresentationMetadata,\n  ): Promise<void> {\n    // Write the actual data to unstructured storage\n    await this.unstructuredDataAccessor.writeDocument(identifier, data, metadata);\n    \n    // Get the metadata from unstructured storage (includes size, etc.)\n    let updatedMetadata = await this.unstructuredDataAccessor.getMetadata(identifier);\n    \n    // Filter out invalid quads\n    const removing: Quad[] = [];\n    for (const quad of updatedMetadata.quads()) {\n      if (!/^http/.test(quad.predicate.value)) {\n        removing.push(quad);\n      }\n    }\n    updatedMetadata.removeQuads(removing);\n    \n    // Save metadata to structured storage\n    try {\n      await this.structuredDataAccessor.writeMetadata(identifier, updatedMetadata);\n    } catch (error) {\n      this.logger.error(`Error writing metadata for ${identifier.path}: ${error}`);\n      // Rollback: delete the unstructured data\n      await this.unstructuredDataAccessor.deleteResource(identifier);\n      throw error;\n    }\n  }\n}\n"]}

package/dist/storage/accessors/MixDataAccessor.jsonld

@@ -14,6 +14,18 @@
       ],
       "comment": "MixDataAccessor - Routes data to appropriate storage based on content type  - RDF data (internal/quads) -> structuredDataAccessor (Quadstore or QuintStore) - Other data (binary, text, etc.) -> unstructuredDataAccessor (FileSystem, Minio, etc.)  This uses composition instead of inheritance, allowing any DataAccessor to be used as the RDF storage backend.",
       "parameters": [
+        {
+          "@id": "undefineds:dist/storage/accessors/MixDataAccessor.jsonld#MixDataAccessor_presignedRedirectEnabled",
+          "range": {
+            "@type": "ParameterRangeUnion",
+            "parameterRangeElements": [
+              "xsd:boolean",
+              {
+                "@type": "ParameterRangeUndefined"
+              }
+            ]
+          }
+        },
         {
           "@id": "undefineds:dist/storage/accessors/MixDataAccessor.jsonld#MixDataAccessor_structuredDataAccessor",
           "range": "css:dist/storage/accessors/DataAccessor.jsonld#DataAccessor"
@@ -39,6 +51,10 @@
           "@id": "undefineds:dist/storage/accessors/MixDataAccessor.jsonld#MixDataAccessor__member_unstructuredDataAccessor",
           "memberFieldName": "unstructuredDataAccessor"
         },
+        {
+          "@id": "undefineds:dist/storage/accessors/MixDataAccessor.jsonld#MixDataAccessor__member_presignedRedirectEnabled",
+          "memberFieldName": "presignedRedirectEnabled"
+        },
         {
           "@id": "undefineds:dist/storage/accessors/MixDataAccessor.jsonld#MixDataAccessor__member_constructor",
           "memberFieldName": "constructor"
@@ -94,6 +110,9 @@
         },
         {
           "@id": "undefineds:dist/storage/accessors/MixDataAccessor.jsonld#MixDataAccessor_unstructuredDataAccessor"
+        },
+        {
+          "@id": "undefineds:dist/storage/accessors/MixDataAccessor.jsonld#MixDataAccessor_presignedRedirectEnabled"
         }
       ]
     }

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

@@ -0,0 +1,18 @@
+import { RedisLocker } from '@solid/community-server';
+export interface UrlAwareRedisLockerOptions {
+    redisClient?: string;
+    attemptSettings_retryCount?: number;
+    attemptSettings_retryDelay?: number;
+    attemptSettings_retryJitter?: number;
+    namespacePrefix?: string;
+}
+/**
+ * 扩展 CSS RedisLocker，支持 redis:// 和 rediss:// URL 格式。
+ *
+ * CSS 原生 RedisLocker.createRedisClient 是 private 的，无法 override。
+ * 这里在构造函数中检测 URL 格式，如果是 URL 则用 ioredis 直接创建连接，
+ * 替换掉父类构造函数中创建的（会报错的）连接。
+ */
+export declare class UrlAwareRedisLocker extends RedisLocker {
+    constructor(options?: UrlAwareRedisLockerOptions);
+}

package/dist/storage/locking/UrlAwareRedisLocker.js

@@ -0,0 +1,60 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UrlAwareRedisLocker = void 0;
+const ioredis_1 = __importDefault(require("ioredis"));
+const community_server_1 = require("@solid/community-server");
+const REDIS_LUA_SCRIPTS = (() => {
+    try {
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        return require('@solid/community-server/dist/util/locking/scripts/RedisLuaScripts').REDIS_LUA_SCRIPTS;
+    }
+    catch {
+        return {};
+    }
+})();
+/**
+ * 扩展 CSS RedisLocker，支持 redis:// 和 rediss:// URL 格式。
+ *
+ * CSS 原生 RedisLocker.createRedisClient 是 private 的，无法 override。
+ * 这里在构造函数中检测 URL 格式，如果是 URL 则用 ioredis 直接创建连接，
+ * 替换掉父类构造函数中创建的（会报错的）连接。
+ */
+class UrlAwareRedisLocker extends community_server_1.RedisLocker {
+    constructor(options = {}) {
+        const redisClient = options.redisClient ?? '127.0.0.1:6379';
+        const attemptSettings = {
+            retryCount: options.attemptSettings_retryCount ?? -1,
+            retryDelay: options.attemptSettings_retryDelay ?? 50,
+            retryJitter: options.attemptSettings_retryJitter ?? 30,
+        };
+        const redisSettings = {
+            namespacePrefix: options.namespacePrefix ?? '',
+        };
+        const isUrl = redisClient.startsWith('redis://') || redisClient.startsWith('rediss://');
+        if (isUrl) {
+            // 传一个合法的 host:port 给父类，避免它报错
+            super('127.0.0.1:6379', attemptSettings, redisSettings);
+            // 关闭父类创建的无用连接
+            const oldRedis = this.redis;
+            oldRedis.disconnect(false);
+            // 用 URL 创建真正的连接
+            const redis = new ioredis_1.default(redisClient);
+            // 注册 Lua 脚本
+            for (const [name, script] of Object.entries(REDIS_LUA_SCRIPTS)) {
+                redis.defineCommand(name, { numberOfKeys: 1, lua: script });
+            }
+            // 替换父类的 redis 实例
+            this.redis = redis;
+            this.redisRw = redis;
+            this.redisLock = redis;
+        }
+        else {
+            super(redisClient, attemptSettings, redisSettings);
+        }
+    }
+}
+exports.UrlAwareRedisLocker = UrlAwareRedisLocker;
+//# sourceMappingURL=UrlAwareRedisLocker.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"UrlAwareRedisLocker.js","sourceRoot":"","sources":["../../../src/storage/locking/UrlAwareRedisLocker.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA4B;AAC5B,8DAAsD;AAEtD,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;IAClD,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;IACH,CAAC;CACF;AAtCD,kDAsCC","sourcesContent":["import Redis from 'ioredis';\nimport { RedisLocker } from '@solid/community-server';\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  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}\n"]}

package/dist/storage/locking/UrlAwareRedisLocker.jsonld

@@ -0,0 +1,123 @@
+{
+  "@context": [
+    "https://linkedsoftwaredependencies.org/bundles/npm/@undefineds.co/xpod/^0.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^8.0.0/components/context.jsonld"
+  ],
+  "@id": "npmd:@undefineds.co/xpod",
+  "components": [
+    {
+      "@id": "undefineds:dist/storage/locking/UrlAwareRedisLocker.jsonld#UrlAwareRedisLocker",
+      "@type": "Class",
+      "requireElement": "UrlAwareRedisLocker",
+      "extends": [
+        "css:dist/util/locking/RedisLocker.jsonld#RedisLocker"
+      ],
+      "comment": "扩展 CSS RedisLocker，支持 redis:// 和 rediss:// URL 格式。  CSS 原生 RedisLocker.createRedisClient 是 private 的，无法 override。 这里在构造函数中检测 URL 格式，如果是 URL 则用 ioredis 直接创建连接， 替换掉父类构造函数中创建的（会报错的）连接。",
+      "parameters": [
+        {
+          "@id": "undefineds:dist/storage/locking/UrlAwareRedisLocker.jsonld#UrlAwareRedisLocker_options_redisClient",
+          "range": {
+            "@type": "ParameterRangeUnion",
+            "parameterRangeElements": [
+              "xsd:string",
+              {
+                "@type": "ParameterRangeUndefined"
+              }
+            ]
+          }
+        },
+        {
+          "@id": "undefineds:dist/storage/locking/UrlAwareRedisLocker.jsonld#UrlAwareRedisLocker_options_attemptSettings_retryCount",
+          "range": {
+            "@type": "ParameterRangeUnion",
+            "parameterRangeElements": [
+              "xsd:number",
+              {
+                "@type": "ParameterRangeUndefined"
+              }
+            ]
+          }
+        },
+        {
+          "@id": "undefineds:dist/storage/locking/UrlAwareRedisLocker.jsonld#UrlAwareRedisLocker_options_attemptSettings_retryDelay",
+          "range": {
+            "@type": "ParameterRangeUnion",
+            "parameterRangeElements": [
+              "xsd:number",
+              {
+                "@type": "ParameterRangeUndefined"
+              }
+            ]
+          }
+        },
+        {
+          "@id": "undefineds:dist/storage/locking/UrlAwareRedisLocker.jsonld#UrlAwareRedisLocker_options_attemptSettings_retryJitter",
+          "range": {
+            "@type": "ParameterRangeUnion",
+            "parameterRangeElements": [
+              "xsd:number",
+              {
+                "@type": "ParameterRangeUndefined"
+              }
+            ]
+          }
+        },
+        {
+          "@id": "undefineds:dist/storage/locking/UrlAwareRedisLocker.jsonld#UrlAwareRedisLocker_options_namespacePrefix",
+          "range": {
+            "@type": "ParameterRangeUnion",
+            "parameterRangeElements": [
+              "xsd:string",
+              {
+                "@type": "ParameterRangeUndefined"
+              }
+            ]
+          }
+        }
+      ],
+      "memberFields": [
+        {
+          "@id": "undefineds:dist/storage/locking/UrlAwareRedisLocker.jsonld#UrlAwareRedisLocker__member_constructor",
+          "memberFieldName": "constructor"
+        }
+      ],
+      "constructorArguments": [
+        {
+          "@id": "undefineds:dist/storage/locking/UrlAwareRedisLocker.jsonld#UrlAwareRedisLocker_options__constructorArgument",
+          "fields": [
+            {
+              "keyRaw": "redisClient",
+              "value": {
+                "@id": "undefineds:dist/storage/locking/UrlAwareRedisLocker.jsonld#UrlAwareRedisLocker_options_redisClient"
+              }
+            },
+            {
+              "keyRaw": "attemptSettings_retryCount",
+              "value": {
+                "@id": "undefineds:dist/storage/locking/UrlAwareRedisLocker.jsonld#UrlAwareRedisLocker_options_attemptSettings_retryCount"
+              }
+            },
+            {
+              "keyRaw": "attemptSettings_retryDelay",
+              "value": {
+                "@id": "undefineds:dist/storage/locking/UrlAwareRedisLocker.jsonld#UrlAwareRedisLocker_options_attemptSettings_retryDelay"
+              }
+            },
+            {
+              "keyRaw": "attemptSettings_retryJitter",
+              "value": {
+                "@id": "undefineds:dist/storage/locking/UrlAwareRedisLocker.jsonld#UrlAwareRedisLocker_options_attemptSettings_retryJitter"
+              }
+            },
+            {
+              "keyRaw": "namespacePrefix",
+              "value": {
+                "@id": "undefineds:dist/storage/locking/UrlAwareRedisLocker.jsonld#UrlAwareRedisLocker_options_namespacePrefix"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

package/dist/storage/quota/UsageRepository.d.ts

@@ -6,23 +6,22 @@ export interface AccountUsageRecord {
     egressBytes: number;
     storageLimitBytes?: number | null;
     bandwidthLimitBps?: number | null;
+    computeSeconds: number;
+    tokensUsed: number;
+    computeLimitSeconds?: number | null;
+    tokenLimitMonthly?: number | null;
+    periodStart?: number | null;
 }
 export interface PodUsageRecord extends AccountUsageRecord {
     podId: string;
 }
 /**
  * Repository for tracking pod and account usage metrics.
- * NOTE: This repository only supports PostgreSQL. SQLite is not supported.
- * For local/dev modes, usage tracking should be disabled.
- *
- * TODO: Make UsageRepository database-agnostic to support SQLite in local mode.
- * Required changes:
- * - Replace `sql\`now()\`` with cross-database compatible timestamp (e.g., new Date())
- * - Use Drizzle's database-agnostic transaction API or raw SQL compatible with both
- * - Test with both SQLite and PostgreSQL backends
+ * Supports both PostgreSQL and SQLite through unified schema abstraction.
  */
 export declare class UsageRepository {
     private readonly db;
+    private readonly schema;
     constructor(db: IdentityDatabase);
     incrementUsage(accountId: string, podId: string, storageDelta: number, ingressDelta: number, egressDelta: number): Promise<void>;
     incrementBandwidth(accountId: string, podId: string, ingressDelta: number, egressDelta: number): Promise<void>;
@@ -34,13 +33,47 @@ export declare class UsageRepository {
     setPodStorageLimit(podId: string, accountId: string, limit: number | null): Promise<void>;
     setAccountBandwidthLimit(accountId: string, limit: number | null): Promise<void>;
     setPodBandwidthLimit(podId: string, accountId: string, limit: number | null): Promise<void>;
+    setAccountComputeLimit(accountId: string, limit: number | null): Promise<void>;
+    setAccountTokenLimit(accountId: string, limit: number | null): Promise<void>;
+    setPodComputeLimit(podId: string, accountId: string, limit: number | null): Promise<void>;
+    setPodTokenLimit(podId: string, accountId: string, limit: number | null): Promise<void>;
+    /**
+     * Increment token usage for an account and pod.
+     */
+    incrementTokenUsage(accountId: string, podId: string, tokensDelta: number): Promise<void>;
+    /**
+     * Increment compute usage for an account and pod.
+     */
+    incrementComputeUsage(accountId: string, podId: string, secondsDelta: number): Promise<void>;
+    private incrementAccountTokensWith;
+    private incrementPodTokensWith;
+    private incrementAccountComputeWith;
+    private incrementPodComputeWith;
     private incrementAccountUsageWith;
     private incrementPodUsageWith;
     private upsertAccountUsage;
     private upsertPodUsage;
+    /**
+     * Generic account limit setter for compute/token limits.
+     */
+    private upsertAccountLimit;
+    /**
+     * Generic pod limit setter for compute/token limits.
+     */
+    private upsertPodLimit;
     private getPodUsageWith;
     private normalizeDelta;
     private normalizeValue;
     private coerceNumber;
     private coerceNullable;
+    /**
+     * Coerce timestamp value to Unix timestamp (seconds).
+     * Handles Date objects (from PG) and numbers (from SQLite).
+     */
+    private coerceTimestamp;
+    /**
+     * Get the current timestamp in the format expected by the database.
+     * PG expects Date objects, SQLite expects Unix timestamps (seconds).
+     */
+    private now;
 }