@oneuptime/common 11.4.0 → 11.5.0

package/build/dist/Server/Services/IoTDeviceCredentialService.js

@@ -0,0 +1,321 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import DatabaseService from "./DatabaseService";
+import IoTFleetService from "./IoTFleetService";
+import GlobalCache from "../Infrastructure/GlobalCache";
+import InMemoryTTLCache from "../Infrastructure/InMemoryTTLCache";
+import ObjectID from "../../Types/ObjectID";
+import OneUptimeDate from "../../Types/Date";
+import BadDataException from "../../Types/Exception/BadDataException";
+import LIMIT_MAX from "../../Types/Database/LimitMax";
+import Model from "../../Models/DatabaseModels/IoTDeviceCredential";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import logger from "../Utils/Logger";
+/*
+ * Cache TTLs mirror TelemetryIngestionKeyService: the positive TTL is
+ * the worst-case revocation lag on the MQTT hot path (the broker
+ * re-validates each publish through this cache, so disabling or
+ * deleting a credential cuts a connected device off within ~60s);
+ * the shorter negative TTL keeps invalid-credential floods off
+ * Postgres without pinning misses for long.
+ */
+const POSITIVE_TTL_MS = 60 * 1000;
+const NEGATIVE_TTL_MS = 10 * 1000;
+// lastConnectedAt heartbeat writes are throttled through Redis.
+const LAST_CONNECTED_CACHE_NAMESPACE = "iot-device-credential-last-connected";
+const LAST_CONNECTED_THROTTLE_SECONDS = 60;
+export class Service extends DatabaseService {
+    constructor() {
+        super(Model);
+        this.contextCache = new InMemoryTTLCache(10000);
+    }
+    async onBeforeCreate(createBy) {
+        /*
+         * Always server-generate the secret. secretKey is a computed
+         * column (create ACL []), and computed columns are skipped rather
+         * than stripped by the create-permission check — so a
+         * client-supplied value would otherwise survive verbatim and
+         * defeat the unpredictability the MQTT password relies on.
+         */
+        createBy.data.secretKey = ObjectID.generate();
+        /*
+         * The tenant column (projectId) is forced to the caller's project
+         * by the framework, but the iotFleetId relation is not — reject a
+         * fleet that belongs to another project so a credential cannot be
+         * attached to a victim fleet (which would let it steer that
+         * fleet's inventory cleanup and mint a cross-tenant auth context).
+         */
+        await this.validateFleetBelongsToProject(createBy);
+        /*
+         * Byte-exact duplicate guard. The DB unique index is
+         * case-sensitive (device.id labels are matched byte-exact), so the
+         * check must be too — a case-insensitive @UniqueColumnBy would
+         * wrongly reject two legitimately-distinct device ids that differ
+         * only in case.
+         */
+        await this.validateDeviceIdIsUnique(createBy);
+        return { createBy, carryForward: null };
+    }
+    async validateFleetBelongsToProject(createBy) {
+        if (!createBy.data.iotFleetId || !createBy.data.projectId) {
+            return;
+        }
+        const fleet = await IoTFleetService.findOneById({
+            id: createBy.data.iotFleetId,
+            select: {
+                _id: true,
+                projectId: true,
+            },
+            props: { isRoot: true },
+        });
+        if (!(fleet === null || fleet === void 0 ? void 0 : fleet.projectId) ||
+            fleet.projectId.toString() !== createBy.data.projectId.toString()) {
+            throw new BadDataException("IoT Fleet not found in this project.");
+        }
+    }
+    async validateDeviceIdIsUnique(createBy) {
+        if (!createBy.data.projectId ||
+            !createBy.data.iotFleetId ||
+            !createBy.data.externalId) {
+            return;
+        }
+        const existingCount = await this.countBy({
+            query: {
+                projectId: createBy.data.projectId,
+                iotFleetId: createBy.data.iotFleetId,
+                externalId: createBy.data.externalId,
+            },
+            props: { isRoot: true },
+        });
+        if (existingCount.toNumber() > 0) {
+            throw new BadDataException("A device with this Device ID is already registered in this fleet.");
+        }
+    }
+    async onBeforeDelete(deleteBy) {
+        /*
+         * We don't know which credential(s) are being deleted without an
+         * extra query; clear the whole cache so revocation-by-delete takes
+         * effect on the broker within one cache miss.
+         */
+        this.contextCache.clear();
+        return { deleteBy, carryForward: null };
+    }
+    async onBeforeUpdate(updateBy) {
+        // isEnabled flips must reach the broker — same reasoning as delete.
+        this.contextCache.clear();
+        return { updateBy, carryForward: null };
+    }
+    async onUpdateSuccess(onUpdate, _updatedItemIds) {
+        /*
+         * Clear again AFTER the write commits: the before-hook clear races
+         * a concurrent getCredentialContext that could re-cache the stale
+         * (pre-revocation) row before the UPDATE lands. A second clear on
+         * success closes that window.
+         */
+        this.contextCache.clear();
+        return onUpdate;
+    }
+    async onDeleteSuccess(onDelete, _itemIdsBeforeDelete) {
+        this.contextCache.clear();
+        return onDelete;
+    }
+    /**
+     * Resolve a credential id to its auth context, with a short-lived
+     * in-process cache to keep the MQTT CONNECT/publish hot path off
+     * Postgres. Returns null for unknown, disabled, or deleted
+     * credentials (also cached, for a shorter TTL). The caller must
+     * still compare the presented secret against context.secretKey.
+     */
+    async getCredentialContext(credentialId) {
+        var _a;
+        const cached = this.contextCache.get(credentialId);
+        if (cached !== undefined) {
+            return cached;
+        }
+        let idObject;
+        try {
+            idObject = new ObjectID(credentialId);
+        }
+        catch (_b) {
+            this.contextCache.set(credentialId, null, NEGATIVE_TTL_MS);
+            return null;
+        }
+        const credential = await this.findOneBy({
+            query: { _id: idObject },
+            select: {
+                projectId: true,
+                iotFleetId: true,
+                externalId: true,
+                secretKey: true,
+                isEnabled: true,
+                iotFleet: {
+                    name: true,
+                },
+            },
+            props: { isRoot: true },
+        });
+        if (!credential ||
+            credential.isEnabled === false ||
+            !credential.projectId ||
+            !credential.iotFleetId ||
+            !credential.externalId ||
+            !credential.secretKey ||
+            !((_a = credential.iotFleet) === null || _a === void 0 ? void 0 : _a.name)) {
+            this.contextCache.set(credentialId, null, NEGATIVE_TTL_MS);
+            return null;
+        }
+        const context = {
+            credentialId: credentialId,
+            projectId: credential.projectId.toString(),
+            iotFleetId: credential.iotFleetId.toString(),
+            fleetName: credential.iotFleet.name,
+            externalId: credential.externalId,
+            secretKey: credential.secretKey.toString(),
+        };
+        this.contextCache.set(credentialId, context, POSITIVE_TTL_MS);
+        return context;
+    }
+    /**
+     * Stamp lastConnectedAt for a credential, throttled to one write
+     * per minute per credential (heartbeat write — same hot-row
+     * pattern as IoTFleetService.updateLastSeen).
+     */
+    async markConnected(credentialId) {
+        const cacheKey = credentialId.toString();
+        let cached = null;
+        try {
+            cached = await GlobalCache.getString(LAST_CONNECTED_CACHE_NAMESPACE, cacheKey);
+        }
+        catch (_a) {
+            /*
+             * Fail open: a Redis blip must never skip the DB write —
+             * lastConnectedAt drives the registry UI's liveness column.
+             */
+            cached = null;
+        }
+        if (cached === "1") {
+            return;
+        }
+        try {
+            await GlobalCache.setString(LAST_CONNECTED_CACHE_NAMESPACE, cacheKey, "1", {
+                expiresInSeconds: LAST_CONNECTED_THROTTLE_SECONDS,
+            });
+        }
+        catch (err) {
+            logger.debug(`IoTDeviceCredential markConnected cache write failed: ${err}`);
+        }
+        /*
+         * Single no-hooks, no-version-bump UPDATE — a heartbeat write must
+         * not contend on hooks or lock convoys at connect storms.
+         */
+        await this.updateColumnsByIdWithoutHooks({
+            id: credentialId,
+            data: {
+                lastConnectedAt: OneUptimeDate.getCurrentDate(),
+            },
+        });
+    }
+    /**
+     * The expected-device set for a fleet — ENABLED registered device
+     * ids, VERBATIM (device.id labels are matched byte-exact; do not
+     * canonicalize). Feeds ONLY the absent-series injection in IoT
+     * Device monitor evaluation.
+     *
+     * Note: stale-cleanup preservation (IoTDeviceService.deleteStaleForFleet)
+     * deliberately does NOT use this method — it preserves any
+     * non-deleted credential row regardless of isEnabled, so a revoked
+     * (disabled) device stays in the inventory as Offline until its
+     * credential row is deleted, while its silent-death alerting pauses.
+     */
+    async getExpectedDeviceExternalIds(data) {
+        const credentials = await this.findBy({
+            query: {
+                projectId: data.projectId,
+                iotFleetId: data.iotFleetId,
+                isEnabled: true,
+            },
+            select: {
+                externalId: true,
+            },
+            limit: LIMIT_MAX,
+            skip: 0,
+            props: { isRoot: true },
+        });
+        const externalIds = [];
+        for (const credential of credentials) {
+            if (credential.externalId) {
+                externalIds.push(credential.externalId);
+            }
+        }
+        return externalIds;
+    }
+}
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onBeforeCreate", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "validateFleetBelongsToProject", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "validateDeviceIdIsUnique", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onBeforeDelete", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onBeforeUpdate", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Array]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onUpdateSuccess", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Array]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onDeleteSuccess", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "getCredentialContext", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [ObjectID]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "markConnected", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "getExpectedDeviceExternalIds", null);
+export default new Service();
+//# sourceMappingURL=IoTDeviceCredentialService.js.map

package/build/dist/Server/Services/IoTDeviceCredentialService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IoTDeviceCredentialService.js","sourceRoot":"","sources":["../../../../Server/Services/IoTDeviceCredentialService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/IoTDeviceService.js

@@ -216,25 +216,59 @@ export class Service extends DatabaseService {
         }
     }
     /**
-     * Hard-delete all devices in a fleet whose last scrape is older
-     * than olderThan. Returns the number of deleted rows. Only called by
-     * the cleanup worker for fleets that are still connected — a
-     * disconnected fleet keeps its last-known inventory.
+     * Age out devices in a fleet whose last scrape is older than
+     * olderThan. Only called by the cleanup worker for fleets that are
+     * still connected — a disconnected fleet keeps its last-known
+     * inventory.
+     *
+     * REGISTERED devices (a matching IoTDeviceCredential row on
+     * fleet + externalId, kind-agnostic) are flipped to Down instead of
+     * deleted: registration marks the device as expected, so a silent
+     * device must stay visible in the inventory as offline. Unregistered
+     * devices are hard-deleted as before (the inventory is a projection
+     * of what is actively reporting).
+     *
+     * The UPDATE deliberately does NOT touch lastSeenAt: reconnect
+     * recovery relies on the bulkUpsert dominance guard comparing a
+     * fresh scrape against the old timestamp, so the next scrape flips
+     * isUp back to true automatically.
      */
     async deleteStaleForFleet(data) {
-        const result = await this.getRepository().manager.query(`DELETE FROM "IoTDevice" WHERE "iotFleetId" = $1 AND "lastSeenAt" < $2`, [data.iotFleetId.toString(), data.olderThan]);
-        // Postgres driver returns [rows, affected] for DELETE — normalize.
-        let affected = 0;
-        if (Array.isArray(result) && result.length >= 2) {
-            const second = result[1];
-            if (typeof second === "number") {
-                affected = second;
+        // Postgres driver returns [rows, affected] for UPDATE/DELETE — normalize.
+        const affectedOf = (result) => {
+            if (Array.isArray(result) && result.length >= 2) {
+                const second = result[1];
+                if (typeof second === "number") {
+                    return second;
+                }
             }
+            return 0;
+        };
+        /*
+         * Registered = a live credential on the same PROJECT + fleet +
+         * device id (kind-agnostic — one credential covers every kind the
+         * device reports). The projectId correlation is defense-in-depth
+         * against a credential row that names another project's fleet.
+         */
+        const registeredSubquery = `SELECT 1 FROM "IoTDeviceCredential" c WHERE c."projectId" = "IoTDevice"."projectId" AND c."iotFleetId" = "IoTDevice"."iotFleetId" AND c."externalId" = "IoTDevice"."externalId" AND c."deletedAt" IS NULL`;
+        /*
+         * A device whose iot.device.kind label drifts mints a second
+         * inventory row (identity is projectId+iotFleetId+kind+externalId).
+         * Without this guard the stale old-kind row would be registered
+         * (same externalId) and pinned as Offline forever. "Shadowed" =
+         * a fresher row exists for the same (fleet, externalId) under a
+         * different kind — keep only the freshest, let shadows self-heal.
+         */
+        const shadowedSubquery = `SELECT 1 FROM "IoTDevice" d2 WHERE d2."iotFleetId" = "IoTDevice"."iotFleetId" AND d2."externalId" = "IoTDevice"."externalId" AND d2."kind" <> "IoTDevice"."kind" AND d2."lastSeenAt" > "IoTDevice"."lastSeenAt" AND d2."deletedAt" IS NULL`;
+        const params = [data.iotFleetId.toString(), data.olderThan];
+        const updateResult = await this.getRepository().manager.query(`UPDATE "IoTDevice" SET "isUp" = false, "updatedAt" = now() WHERE "iotFleetId" = $1 AND "lastSeenAt" < $2 AND "isUp" IS DISTINCT FROM false AND EXISTS (${registeredSubquery}) AND NOT EXISTS (${shadowedSubquery})`, params);
+        const deleteResult = await this.getRepository().manager.query(`DELETE FROM "IoTDevice" WHERE "iotFleetId" = $1 AND "lastSeenAt" < $2 AND (NOT EXISTS (${registeredSubquery}) OR EXISTS (${shadowedSubquery}))`, params);
+        const deleted = affectedOf(deleteResult);
+        const markedOffline = affectedOf(updateResult);
+        if (deleted > STALE_DELETE_WARN_THRESHOLD) {
+            logger.warn(`IoTDevice cleanup deleted ${deleted} stale rows for fleet ${data.iotFleetId.toString()} — larger than expected; investigate agent health.`);
         }
-        if (affected > STALE_DELETE_WARN_THRESHOLD) {
-            logger.warn(`IoTDevice cleanup deleted ${affected} stale rows for fleet ${data.iotFleetId.toString()} — larger than expected; investigate agent health.`);
-        }
-        return affected;
+        return { deleted, markedOffline };
     }
     /**
      * Compute the sidebar/overview summary in Postgres: counts per kind

package/build/dist/Server/Services/IoTDeviceService.js.map

@@ -1 +1 @@
-{"version":3,"file":"IoTDeviceService.js","sourceRoot":"","sources":["../../../../Server/Services/IoTDeviceService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"IoTDeviceService.js","sourceRoot":"","sources":["../../../../Server/Services/IoTDeviceService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/LlmLogService.js

@@ -1,6 +1,16 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 import DatabaseService from "./DatabaseService";
 import Model from "../../Models/DatabaseModels/LlmLog";
 import { IsBillingEnabled } from "../EnvironmentConfig";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
@@ -8,6 +18,25 @@ export class Service extends DatabaseService {
             this.hardDeleteItemsOlderThanInDays("createdAt", 3);
         }
     }
+    /*
+     * Sum of totalTokens this project has consumed for the given features since
+     * the given time — one SQL aggregate, used on the hot path of the daily
+     * autonomous-budget check (G4).
+     */
+    async getTotalTokensUsedSince(data) {
+        var _a;
+        if (data.features.length === 0) {
+            return 0;
+        }
+        const rows = await this.getRepository().manager.query(`SELECT COALESCE(SUM("totalTokens"), 0) AS "total" FROM "LlmLog" WHERE "projectId" = $1 AND "createdAt" >= $2 AND "feature" = ANY($3) AND "deletedAt" IS NULL`, [data.projectId.toString(), data.since, data.features]);
+        return Number(((_a = rows[0]) === null || _a === void 0 ? void 0 : _a.total) || 0);
+    }
 }
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "getTotalTokensUsedSince", null);
 export default new Service();
 //# sourceMappingURL=LlmLogService.js.map

package/build/dist/Server/Services/LlmLogService.js.map

@@ -1 +1 @@
-{"version":3,"file":"LlmLogService.js","sourceRoot":"","sources":["../../../../Server/Services/LlmLogService.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,oCAAoC,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,gBAAgB,EAAE,CAAC;YACrB,IAAI,CAAC,8BAA8B,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;CACF;AAED,eAAe,IAAI,OAAO,EAAE,CAAC"}
+{"version":3,"file":"LlmLogService.js","sourceRoot":"","sources":["../../../../Server/Services/LlmLogService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,oCAAoC,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,gBAAgB,EAAE,CAAC;YACrB,IAAI,CAAC,8BAA8B,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAED;;;;OAIG;IAEU,AAAN,KAAK,CAAC,uBAAuB,CAAC,IAIpC;;QACC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,CAAC;QACX,CAAC;QAED,MAAM,IAAI,GACR,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,KAAK,CACtC,8JAA8J,EAC9J,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CACvD,CAAC;QAEJ,OAAO,MAAM,CAAC,CAAA,MAAA,IAAI,CAAC,CAAC,CAAC,0CAAE,KAAK,KAAI,CAAC,CAAC,CAAC;IACrC,CAAC;CACF;AAjBc;IADZ,WAAW,EAAE;;;;sDAiBb;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}

package/build/dist/Server/Services/LlmProviderService.js

@@ -105,6 +105,7 @@ export class Service extends DatabaseService {
                 apiKey: true,
                 baseUrl: true,
                 modelName: true,
+                additionalParams: true,
                 isGlobalLlm: true,
                 costPerMillionTokensInUSDCents: true,
             },
@@ -128,6 +129,7 @@ export class Service extends DatabaseService {
                 apiKey: true,
                 baseUrl: true,
                 modelName: true,
+                additionalParams: true,
                 isGlobalLlm: true,
                 costPerMillionTokensInUSDCents: true,
             },
@@ -162,6 +164,7 @@ export class Service extends DatabaseService {
                     apiKey: true,
                     baseUrl: true,
                     modelName: true,
+                    additionalParams: true,
                     isGlobalLlm: true,
                     projectId: true,
                     costPerMillionTokensInUSDCents: true,

package/build/dist/Server/Services/LlmProviderService.js.map

@@ -1 +1 @@
-{"version":3,"file":"LlmProviderService.js","sourceRoot":"","sources":["../../../../Server/Services/LlmProviderService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LlmProviderService.js","sourceRoot":"","sources":["../../../../Server/Services/LlmProviderService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/LogAggregationService.js

@@ -493,13 +493,27 @@ export class LogAggregationService {
                  * remember the exact casing is a poor experience. The user-supplied
                  * key is validated above.
                  */
-                statement.append(SQL ` AND arrayExists((k, v) -> lowerUTF8(k) = lowerUTF8(${{
-                    type: TableColumnType.Text,
-                    value: attrKey,
-                }}) AND v = ${{
-                    type: TableColumnType.Text,
-                    value: attrValue,
-                }}, mapKeys(attributes), mapValues(attributes))`);
+                if (Array.isArray(attrValue)) {
+                    if (attrValue.length === 0) {
+                        continue;
+                    }
+                    statement.append(SQL ` AND arrayExists((k, v) -> lowerUTF8(k) = lowerUTF8(${{
+                        type: TableColumnType.Text,
+                        value: attrKey,
+                    }}) AND v IN (${{
+                        type: TableColumnType.Text,
+                        value: new Includes(attrValue),
+                    }}), mapKeys(attributes), mapValues(attributes))`);
+                }
+                else {
+                    statement.append(SQL ` AND arrayExists((k, v) -> lowerUTF8(k) = lowerUTF8(${{
+                        type: TableColumnType.Text,
+                        value: attrKey,
+                    }}) AND v = ${{
+                        type: TableColumnType.Text,
+                        value: attrValue,
+                    }}, mapKeys(attributes), mapValues(attributes))`);
+                }
             }
         }
     }