ydb-qdrant 4.1.3 → 4.2.0

package/dist/routes/collections.js

@@ -1,5 +1,4 @@
 import { Router } from "express";
-import { sanitizeCollectionName, sanitizeTenantId } from "../utils/tenant.js";
 import { putCollectionIndex, createCollection, getCollection, deleteCollection, } from "../services/CollectionService.js";
 import { QdrantServiceError } from "../services/errors.js";
 import { logger } from "../logging/logger.js";
@@ -9,6 +8,7 @@ collectionsRouter.put("/:collection/index", async (req, res) => {
         const result = await putCollectionIndex({
             tenant: req.header("X-Tenant-Id") ?? undefined,
             collection: String(req.params.collection),
+            apiKey: req.header("api-key") ?? undefined,
         });
         res.json({ status: "ok", result });
     }
@@ -23,9 +23,11 @@ collectionsRouter.put("/:collection/index", async (req, res) => {
 });
 collectionsRouter.put("/:collection", async (req, res) => {
     try {
-        const tenant = sanitizeTenantId(req.header("X-Tenant-Id") ?? "default");
-        const collection = sanitizeCollectionName(String(req.params.collection));
-        const result = await createCollection({ tenant, collection }, req.body);
+        const result = await createCollection({
+            tenant: req.header("X-Tenant-Id") ?? undefined,
+            collection: String(req.params.collection),
+            apiKey: req.header("api-key") ?? undefined,
+        }, req.body);
         res.json({ status: "ok", result });
     }
     catch (err) {
@@ -39,9 +41,11 @@ collectionsRouter.put("/:collection", async (req, res) => {
 });
 collectionsRouter.get("/:collection", async (req, res) => {
     try {
-        const tenant = sanitizeTenantId(req.header("X-Tenant-Id") ?? "default");
-        const collection = sanitizeCollectionName(String(req.params.collection));
-        const result = await getCollection({ tenant, collection });
+        const result = await getCollection({
+            tenant: req.header("X-Tenant-Id") ?? undefined,
+            collection: String(req.params.collection),
+            apiKey: req.header("api-key") ?? undefined,
+        });
         res.json({ status: "ok", result });
     }
     catch (err) {
@@ -55,9 +59,11 @@ collectionsRouter.get("/:collection", async (req, res) => {
 });
 collectionsRouter.delete("/:collection", async (req, res) => {
     try {
-        const tenant = sanitizeTenantId(req.header("X-Tenant-Id") ?? "default");
-        const collection = sanitizeCollectionName(String(req.params.collection));
-        const result = await deleteCollection({ tenant, collection });
+        const result = await deleteCollection({
+            tenant: req.header("X-Tenant-Id") ?? undefined,
+            collection: String(req.params.collection),
+            apiKey: req.header("api-key") ?? undefined,
+        });
         res.json({ status: "ok", result });
     }
     catch (err) {

package/dist/routes/points.js

@@ -9,6 +9,7 @@ pointsRouter.put("/:collection/points", async (req, res) => {
         const result = await upsertPoints({
             tenant: req.header("X-Tenant-Id") ?? undefined,
             collection: String(req.params.collection),
+            apiKey: req.header("api-key") ?? undefined,
         }, req.body);
         res.json({ status: "ok", result });
     }
@@ -26,6 +27,7 @@ pointsRouter.post("/:collection/points/upsert", async (req, res) => {
         const result = await upsertPoints({
             tenant: req.header("X-Tenant-Id") ?? undefined,
             collection: String(req.params.collection),
+            apiKey: req.header("api-key") ?? undefined,
         }, req.body);
         res.json({ status: "ok", result });
     }
@@ -43,6 +45,7 @@ pointsRouter.post("/:collection/points/search", async (req, res) => {
         const result = await searchPoints({
             tenant: req.header("X-Tenant-Id") ?? undefined,
             collection: String(req.params.collection),
+            apiKey: req.header("api-key") ?? undefined,
         }, req.body);
         res.json({ status: "ok", result });
     }
@@ -61,6 +64,7 @@ pointsRouter.post("/:collection/points/query", async (req, res) => {
         const result = await queryPoints({
             tenant: req.header("X-Tenant-Id") ?? undefined,
             collection: String(req.params.collection),
+            apiKey: req.header("api-key") ?? undefined,
         }, req.body);
         res.json({ status: "ok", result });
     }
@@ -78,6 +82,7 @@ pointsRouter.post("/:collection/points/delete", async (req, res) => {
         const result = await deletePoints({
             tenant: req.header("X-Tenant-Id") ?? undefined,
             collection: String(req.params.collection),
+            apiKey: req.header("api-key") ?? undefined,
         }, req.body);
         res.json({ status: "ok", result });
     }

package/dist/services/CollectionService.d.ts

@@ -2,6 +2,7 @@ import { type DistanceKind } from "../types.js";
 export interface CollectionContextInput {
     tenant: string | undefined;
     collection: string;
+    apiKey?: string;
 }
 export interface NormalizedCollectionContext {
     tenant: string;

package/dist/services/CollectionService.js

@@ -5,7 +5,7 @@ import { QdrantServiceError } from "./errors.js";
 import { normalizeCollectionContextShared, tableNameFor, } from "./CollectionService.shared.js";
 import { resolvePointsTableAndUidOneTable } from "./CollectionService.one-table.js";
 export function normalizeCollectionContext(input) {
-    return normalizeCollectionContextShared(input.tenant, input.collection);
+    return normalizeCollectionContextShared(input.tenant, input.collection, input.apiKey);
 }
 export async function resolvePointsTableAndUid(ctx, meta) {
     if (meta?.table === GLOBAL_POINTS_TABLE) {

package/dist/services/CollectionService.shared.d.ts

@@ -4,7 +4,7 @@ export interface NormalizedCollectionContextLike {
 }
 export declare function tableNameFor(tenantId: string, collection: string): string;
 export declare function uidFor(tenantId: string, collection: string): string;
-export declare function normalizeCollectionContextShared(tenant: string | undefined, collection: string): {
+export declare function normalizeCollectionContextShared(tenant: string | undefined, collection: string, apiKey?: string): {
     tenant: string;
     collection: string;
     metaKey: string;

package/dist/services/CollectionService.shared.js

@@ -1,13 +1,14 @@
-import { sanitizeCollectionName, sanitizeTenantId, metaKeyFor, tableNameFor as tableNameForInternal, uidFor as uidForInternal, } from "../utils/tenant.js";
+import { sanitizeCollectionName, sanitizeTenantId, metaKeyFor, tableNameFor as tableNameForInternal, uidFor as uidForInternal, hashApiKey, } from "../utils/tenant.js";
 export function tableNameFor(tenantId, collection) {
     return tableNameForInternal(tenantId, collection);
 }
 export function uidFor(tenantId, collection) {
     return uidForInternal(tenantId, collection);
 }
-export function normalizeCollectionContextShared(tenant, collection) {
+export function normalizeCollectionContextShared(tenant, collection, apiKey) {
     const normalizedTenant = sanitizeTenantId(tenant);
-    const normalizedCollection = sanitizeCollectionName(collection);
+    const apiKeyHash = hashApiKey(apiKey);
+    const normalizedCollection = sanitizeCollectionName(collection, apiKeyHash);
     const metaKey = metaKeyFor(normalizedTenant, normalizedCollection);
     return {
         tenant: normalizedTenant,

package/dist/utils/tenant.d.ts

@@ -1,5 +1,6 @@
-export declare function sanitizeCollectionName(name: string): string;
+export declare function hashApiKey(apiKey: string | undefined): string | undefined;
+export declare function sanitizeCollectionName(name: string, apiKeyHash?: string): string;
 export declare function sanitizeTenantId(tenantId: string | undefined): string;
-export declare function tableNameFor(tenantId: string, collection: string): string;
-export declare function metaKeyFor(tenantId: string, collection: string): string;
-export declare function uidFor(tenantId: string, collectionName: string): string;
+export declare function tableNameFor(sanitizedTenant: string, sanitizedCollection: string): string;
+export declare function metaKeyFor(sanitizedTenant: string, sanitizedCollection: string): string;
+export declare function uidFor(sanitizedTenant: string, sanitizedCollection: string): string;

package/dist/utils/tenant.js

@@ -1,7 +1,16 @@
-export function sanitizeCollectionName(name) {
+import { createHash } from "crypto";
+export function hashApiKey(apiKey) {
+    if (!apiKey || apiKey.trim() === "")
+        return undefined;
+    const hash = createHash("sha256").update(apiKey).digest("hex");
+    return hash.slice(0, 8);
+}
+export function sanitizeCollectionName(name, apiKeyHash) {
     const cleaned = name.replace(/[^a-zA-Z0-9_]/g, "_").replace(/_+/g, "_");
     const lowered = cleaned.toLowerCase().replace(/^_+/, "");
-    return lowered.length > 0 ? lowered : "collection";
+    const base = lowered.length > 0 ? lowered : "collection";
+    const hasHash = apiKeyHash !== undefined && apiKeyHash.trim().length > 0;
+    return hasHash ? `${base}_${apiKeyHash}` : base;
 }
 export function sanitizeTenantId(tenantId) {
     const raw = (tenantId ?? "default").toString();
@@ -9,12 +18,12 @@ export function sanitizeTenantId(tenantId) {
     const lowered = cleaned.toLowerCase().replace(/^_+/, "");
     return lowered.length > 0 ? lowered : "default";
 }
-export function tableNameFor(tenantId, collection) {
-    return `qdr_${sanitizeTenantId(tenantId)}__${sanitizeCollectionName(collection)}`;
+export function tableNameFor(sanitizedTenant, sanitizedCollection) {
+    return `qdr_${sanitizedTenant}__${sanitizedCollection}`;
 }
-export function metaKeyFor(tenantId, collection) {
-    return `${sanitizeTenantId(tenantId)}/${sanitizeCollectionName(collection)}`;
+export function metaKeyFor(sanitizedTenant, sanitizedCollection) {
+    return `${sanitizedTenant}/${sanitizedCollection}`;
 }
-export function uidFor(tenantId, collectionName) {
-    return tableNameFor(tenantId, collectionName);
+export function uidFor(sanitizedTenant, sanitizedCollection) {
+    return tableNameFor(sanitizedTenant, sanitizedCollection);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-qdrant",
-  "version": "4.1.3",
+  "version": "4.2.0",
   "main": "dist/package/api.js",
   "types": "dist/package/api.d.ts",
   "exports": {