pepr 0.42.0 → 0.42.1

package/dist/lib.js

@@ -6,8 +6,8 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
+  for (var name2 in all)
+    __defProp(target, name2, { get: all[name2], enumerable: true });
 };
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
@@ -142,34 +142,34 @@ var MetricsCollector = class {
     this.addGauge(this.#metricNames.cacheMiss, "Number of cache misses per window", ["window"]);
     this.addGauge(this.#metricNames.resyncFailureCount, "Number of failures per resync operation", ["count"]);
   }
-  #getMetricName = (name) => `${this.#prefix}_${name}`;
-  #addMetric = (collection, MetricType, name, help, labelNames) => {
-    if (collection.has(this.#getMetricName(name))) {
-      logger_default.debug(`Metric for ${name} already exists`, loggingPrefix);
+  #getMetricName = (name2) => `${this.#prefix}_${name2}`;
+  #addMetric = (collection, MetricType, name2, help, labelNames) => {
+    if (collection.has(this.#getMetricName(name2))) {
+      logger_default.debug(`Metric for ${name2} already exists`, loggingPrefix);
       return;
     }
     const metric = new MetricType({
-      name: this.#getMetricName(name),
+      name: this.#getMetricName(name2),
       help,
       registers: [this.#registry],
       labelNames
     });
-    collection.set(this.#getMetricName(name), metric);
+    collection.set(this.#getMetricName(name2), metric);
   };
-  addCounter = (name, help) => {
-    this.#addMetric(this.#counters, import_prom_client.default.Counter, name, help, []);
+  addCounter = (name2, help) => {
+    this.#addMetric(this.#counters, import_prom_client.default.Counter, name2, help, []);
   };
-  addSummary = (name, help) => {
-    this.#addMetric(this.#summaries, import_prom_client.default.Summary, name, help, []);
+  addSummary = (name2, help) => {
+    this.#addMetric(this.#summaries, import_prom_client.default.Summary, name2, help, []);
   };
-  addGauge = (name, help, labelNames) => {
-    this.#addMetric(this.#gauges, import_prom_client.default.Gauge, name, help, labelNames);
+  addGauge = (name2, help, labelNames) => {
+    this.#addMetric(this.#gauges, import_prom_client.default.Gauge, name2, help, labelNames);
   };
-  incCounter = (name) => {
-    this.#counters.get(this.#getMetricName(name))?.inc();
+  incCounter = (name2) => {
+    this.#counters.get(this.#getMetricName(name2))?.inc();
   };
-  incGauge = (name, labels, value = 1) => {
-    this.#gauges.get(this.#getMetricName(name))?.inc(labels || {}, value);
+  incGauge = (name2, labels, value = 1) => {
+    this.#gauges.get(this.#getMetricName(name2))?.inc(labels || {}, value);
   };
   /**
    * Increments the error counter.
@@ -184,8 +184,8 @@ var MetricsCollector = class {
    * @param startTime - The start time.
    * @param name - The metrics summary to increment.
    */
-  observeEnd = (startTime, name = this.#metricNames.mutate) => {
-    this.#summaries.get(this.#getMetricName(name))?.observe(import_perf_hooks.performance.now() - startTime);
+  observeEnd = (startTime, name2 = this.#metricNames.mutate) => {
+    this.#summaries.get(this.#getMetricName(name2))?.observe(import_perf_hooks.performance.now() - startTime);
   };
   /**
    * Fetches the current metrics from the registry.
@@ -577,8 +577,8 @@ async function mutateProcessor(config, capabilities, req, reqMetadata) {
     skipDecode = convertFromBase64Map(wrapped.Raw);
   }
   logger_default.info(reqMetadata, `Processing request`);
-  for (const { name, bindings, namespaces } of capabilities) {
-    const actionMetadata = { ...reqMetadata, name };
+  for (const { name: name2, bindings, namespaces } of capabilities) {
+    const actionMetadata = { ...reqMetadata, name: name2 };
     for (const action of bindings) {
       if (!action.mutateCallback) {
         continue;
@@ -595,7 +595,7 @@ async function mutateProcessor(config, capabilities, req, reqMetadata) {
         if (req.operation === "DELETE") {
           return;
         }
-        const identifier = `${config.uuid}.pepr.dev/${name}`;
+        const identifier = `${config.uuid}.pepr.dev/${name2}`;
         wrapped.Raw.metadata = wrapped.Raw.metadata || {};
         wrapped.Raw.metadata.annotations = wrapped.Raw.metadata.annotations || {};
         wrapped.Raw.metadata.annotations[identifier] = status;
@@ -738,6 +738,35 @@ var PeprValidateRequest = class {
 };
 
 // src/lib/validate-processor.ts
+async function processRequest(binding, actionMetadata, peprValidateRequest) {
+  const label = binding.validateCallback.name;
+  logger_default.info(actionMetadata, `Processing validation action (${label})`);
+  const valResp = {
+    uid: peprValidateRequest.Request.uid,
+    allowed: true
+    // Assume it's allowed until a validation check fails
+  };
+  try {
+    const callbackResp = await binding.validateCallback(peprValidateRequest);
+    valResp.allowed = callbackResp.allowed;
+    if (callbackResp.statusCode || callbackResp.statusMessage) {
+      valResp.status = {
+        code: callbackResp.statusCode || 400,
+        message: callbackResp.statusMessage || `Validation failed for ${name}`
+      };
+    }
+    logger_default.info(actionMetadata, `Validation action complete (${label}): ${callbackResp.allowed ? "allowed" : "denied"}`);
+    return valResp;
+  } catch (e) {
+    logger_default.error(actionMetadata, `Action failed: ${JSON.stringify(e)}`);
+    valResp.allowed = false;
+    valResp.status = {
+      code: 500,
+      message: `Action failed with error: ${JSON.stringify(e)}`
+    };
+    return valResp;
+  }
+}
 async function validateProcessor(config, capabilities, req, reqMetadata) {
   const wrapped = new PeprValidateRequest(req);
   const response = [];
@@ -746,44 +775,19 @@ async function validateProcessor(config, capabilities, req, reqMetadata) {
     convertFromBase64Map(wrapped.Raw);
   }
   logger_default.info(reqMetadata, `Processing validation request`);
-  for (const { name, bindings, namespaces } of capabilities) {
-    const actionMetadata = { ...reqMetadata, name };
-    for (const action of bindings) {
-      if (!action.validateCallback) {
+  for (const { name: name2, bindings, namespaces } of capabilities) {
+    const actionMetadata = { ...reqMetadata, name: name2 };
+    for (const binding of bindings) {
+      if (!binding.validateCallback) {
         continue;
       }
-      const localResponse = {
-        uid: req.uid,
-        allowed: true
-        // Assume it's allowed until a validation check fails
-      };
-      const shouldSkip = shouldSkipRequest(action, req, namespaces, config?.alwaysIgnore?.namespaces);
+      const shouldSkip = shouldSkipRequest(binding, req, namespaces, config?.alwaysIgnore?.namespaces);
       if (shouldSkip !== "") {
         logger_default.debug(shouldSkip);
         continue;
       }
-      const label = action.validateCallback.name;
-      logger_default.info(actionMetadata, `Processing validation action (${label})`);
-      try {
-        const resp = await action.validateCallback(wrapped);
-        localResponse.allowed = resp.allowed;
-        if (resp.statusCode || resp.statusMessage) {
-          localResponse.status = {
-            code: resp.statusCode || 400,
-            message: resp.statusMessage || `Validation failed for ${name}`
-          };
-        }
-        logger_default.info(actionMetadata, `Validation action complete (${label}): ${resp.allowed ? "allowed" : "denied"}`);
-      } catch (e) {
-        logger_default.error(actionMetadata, `Action failed: ${JSON.stringify(e)}`);
-        localResponse.allowed = false;
-        localResponse.status = {
-          code: 500,
-          message: `Action failed with error: ${JSON.stringify(e)}`
-        };
-        return [localResponse];
-      }
-      response.push(localResponse);
+      const resp = await processRequest(binding, actionMetadata, wrapped);
+      response.push(resp);
     }
   }
   return response;
@@ -807,12 +811,12 @@ var peprStoreGVK = {
 // src/lib/controller/storeCache.ts
 var import_kubernetes_fluent_client2 = require("kubernetes-fluent-client");
 var import_http_status_codes = require("http-status-codes");
-var sendUpdatesAndFlushCache = async (cache, namespace2, name) => {
+var sendUpdatesAndFlushCache = async (cache, namespace2, name2) => {
   const indexes = Object.keys(cache);
   const payload = Object.values(cache);
   try {
     if (payload.length > 0) {
-      await (0, import_kubernetes_fluent_client2.K8s)(Store, { namespace: namespace2, name }).Patch(payload);
+      await (0, import_kubernetes_fluent_client2.K8s)(Store, { namespace: namespace2, name: name2 }).Patch(updateCacheID(payload));
       Object.keys(cache).forEach((key) => delete cache[key]);
     }
   } catch (err) {
@@ -844,32 +848,41 @@ var fillStoreCache = (cache, capabilityName, op, cacheItem) => {
   }
   return cache;
 };
+function updateCacheID(payload) {
+  payload.push({
+    op: "replace",
+    path: "/metadata/labels/pepr.dev-cacheID",
+    value: `${Date.now()}`
+  });
+  return payload;
+}
 
 // src/lib/controller/store.ts
 var namespace = "pepr-system";
-var debounceBackoff = 1e3;
+var debounceBackoffReceive = 1e3;
+var debounceBackoffSend = 4e3;
 var StoreController = class {
   #name;
   #stores = {};
   #sendDebounce;
   #onReady;
-  constructor(capabilities, name, onReady) {
+  constructor(capabilities, name2, onReady) {
     this.#onReady = onReady;
-    this.#name = name;
-    const setStorageInstance = (registrationFunction, name2) => {
+    this.#name = name2;
+    const setStorageInstance = (registrationFunction, name3) => {
       const scheduleStore = registrationFunction();
-      scheduleStore.registerSender(this.#send(name2));
-      this.#stores[name2] = scheduleStore;
+      scheduleStore.registerSender(this.#send(name3));
+      this.#stores[name3] = scheduleStore;
     };
-    if (name.includes("schedule")) {
-      for (const { name: name2, registerScheduleStore, hasSchedule } of capabilities) {
+    if (name2.includes("schedule")) {
+      for (const { name: name3, registerScheduleStore, hasSchedule } of capabilities) {
         if (hasSchedule === true) {
-          setStorageInstance(registerScheduleStore, name2);
+          setStorageInstance(registerScheduleStore, name3);
         }
       }
     } else {
-      for (const { name: name2, registerStore } of capabilities) {
-        setStorageInstance(registerStore, name2);
+      for (const { name: name3, registerStore } of capabilities) {
+        setStorageInstance(registerStore, name3);
       }
     }
     setTimeout(
@@ -884,17 +897,24 @@ var StoreController = class {
   };
   #migrateAndSetupWatch = async (store) => {
     logger_default.debug(redactedStore(store), "Pepr Store migration");
+    await (0, import_kubernetes_fluent_client3.K8s)(Store, { namespace, name: this.#name }).Patch([
+      {
+        op: "add",
+        path: "/metadata/labels/pepr.dev-cacheID",
+        value: `${Date.now()}`
+      }
+    ]);
     const data = store.data || {};
     let storeCache = {};
-    for (const name of Object.keys(this.#stores)) {
-      const offset = `${name}-`.length;
+    for (const name2 of Object.keys(this.#stores)) {
+      const offset = `${name2}-`.length;
       for (const key of Object.keys(data)) {
-        if ((0, import_ramda4.startsWith)(name, key) && !(0, import_ramda4.startsWith)(`${name}-v2`, key)) {
-          storeCache = fillStoreCache(storeCache, name, "remove", {
+        if ((0, import_ramda4.startsWith)(name2, key) && !(0, import_ramda4.startsWith)(`${name2}-v2`, key)) {
+          storeCache = fillStoreCache(storeCache, name2, "remove", {
             key: [key.slice(offset)],
             value: data[key]
           });
-          storeCache = fillStoreCache(storeCache, name, "add", {
+          storeCache = fillStoreCache(storeCache, name2, "add", {
             key: [key.slice(offset)],
             value: data[key],
             version: "v2"
@@ -909,15 +929,15 @@ var StoreController = class {
     logger_default.debug(redactedStore(store), "Pepr Store update");
     const debounced = () => {
       const data = store.data || {};
-      for (const name of Object.keys(this.#stores)) {
-        const offset = `${name}-`.length;
+      for (const name2 of Object.keys(this.#stores)) {
+        const offset = `${name2}-`.length;
         const filtered = {};
         for (const key of Object.keys(data)) {
-          if ((0, import_ramda4.startsWith)(name, key)) {
+          if ((0, import_ramda4.startsWith)(name2, key)) {
             filtered[key.slice(offset)] = data[key];
           }
         }
-        this.#stores[name].receive(filtered);
+        this.#stores[name2].receive(filtered);
       }
       if (this.#onReady) {
         this.#onReady();
@@ -925,7 +945,7 @@ var StoreController = class {
       }
     };
     clearTimeout(this.#sendDebounce);
-    this.#sendDebounce = setTimeout(debounced, this.#onReady ? 0 : debounceBackoff);
+    this.#sendDebounce = setTimeout(debounced, this.#onReady ? 0 : debounceBackoffReceive);
   };
   #send = (capabilityName) => {
     let storeCache = {};
@@ -937,7 +957,7 @@ var StoreController = class {
         logger_default.debug(redactedPatch(storeCache), "Sending updates to Pepr store");
         void sendUpdatesAndFlushCache(storeCache, namespace, this.#name);
       }
-    }, debounceBackoff);
+    }, debounceBackoffSend);
     return sender;
   };
   #createStoreResource = async (e) => {
@@ -947,7 +967,10 @@ var StoreController = class {
       await (0, import_kubernetes_fluent_client3.K8s)(Store).Apply({
         metadata: {
           name: this.#name,
-          namespace
+          namespace,
+          labels: {
+            "pepr.dev-cacheID": `${Date.now()}`
+          }
         },
         data: {
           // JSON Patch will die if the data is empty, so we need to add a placeholder
@@ -1125,12 +1148,12 @@ var Controller = class _Controller {
       const startTime = MetricsCollector.observeStart();
       try {
         const request = req.body?.request || {};
-        const { name, namespace: namespace2, gvk } = {
+        const { name: name2, namespace: namespace2, gvk } = {
           name: request?.name ? `/${request.name}` : "",
           namespace: request?.namespace || "",
           gvk: request?.kind || { group: "", version: "", kind: "" }
         };
-        const reqMetadata = { uid: request.uid, namespace: namespace2, name };
+        const reqMetadata = { uid: request.uid, namespace: namespace2, name: name2 };
         logger_default.info({ ...reqMetadata, gvk, operation: request.operation, admissionKind }, "Incoming request");
         logger_default.debug({ ...reqMetadata, request }, "Incoming request body");
         this.#beforeHook && this.#beforeHook(request || {});
@@ -1244,20 +1267,20 @@ async function writeEvent(cr, event, eventType, eventReason, reportingComponent,
 }
 function getOwnerRefFrom(customResource, blockOwnerDeletion, controller) {
   const { apiVersion, kind: kind3, metadata } = customResource;
-  const { name, uid } = metadata;
+  const { name: name2, uid } = metadata;
   return [
     {
       apiVersion,
       kind: kind3,
       uid,
-      name,
+      name: name2,
       ...blockOwnerDeletion !== void 0 && { blockOwnerDeletion },
       ...controller !== void 0 && { controller }
     }
   ];
 }
-function sanitizeResourceName(name) {
-  return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").slice(0, 250).replace(/^[^a-z]+|[^a-z]+$/g, "");
+function sanitizeResourceName(name2) {
+  return name2.toLowerCase().replace(/[^a-z0-9]+/g, "-").slice(0, 250).replace(/^[^a-z]+|[^a-z]+$/g, "");
 }
 
 // src/lib/helpers.ts
@@ -1315,8 +1338,8 @@ var Queue = class {
   #uid;
   #queue = [];
   #pendingPromise = false;
-  constructor(name) {
-    this.#name = name;
+  constructor(name2) {
+    this.#name = name2;
     this.#uid = `${Date.now()}-${(0, import_node_crypto.randomBytes)(2).toString("hex")}`;
   }
   label() {
@@ -1405,11 +1428,11 @@ function queueKey(obj) {
   strat = options.includes(strat) ? strat : d3fault;
   const ns = obj.metadata?.namespace ?? "cluster-scoped";
   const kind3 = obj.kind ?? "UnknownKind";
-  const name = obj.metadata?.name ?? "Unnamed";
+  const name2 = obj.metadata?.name ?? "Unnamed";
   const lookup = {
     kind: `${kind3}`,
     kindNs: `${kind3}/${ns}`,
-    kindNsName: `${kind3}/${ns}/${name}`,
+    kindNsName: `${kind3}/${ns}/${name2}`,
     global: "global"
   };
   return lookup[strat];
@@ -1641,17 +1664,19 @@ var Storage = class {
    */
   setItemAndWait = (key, value) => {
     this.#dispatchUpdate("add", [v2StoreKey(key)], value);
+    const record = {};
     return new Promise((resolve, reject) => {
-      const unsubscribe = this.subscribe((data) => {
+      record.timeout = setTimeout(() => {
+        record.unsubscribe();
+        return reject(`MAX_WAIT_TIME elapsed: Key ${key} not seen in ${MAX_WAIT_TIME / 1e3}s`);
+      }, MAX_WAIT_TIME);
+      record.unsubscribe = this.subscribe((data) => {
         if (data[`${v2UnescapedStoreKey(key)}`] === value) {
-          unsubscribe();
-          resolve();
+          record.unsubscribe();
+          clearTimeout(record.timeout);
+          resolve("ok");
         }
       });
-      setTimeout(() => {
-        unsubscribe();
-        return reject();
-      }, MAX_WAIT_TIME);
     });
   };
   /**
@@ -1663,17 +1688,19 @@ var Storage = class {
    */
   removeItemAndWait = (key) => {
     this.#dispatchUpdate("remove", [v2StoreKey(key)]);
+    const record = {};
     return new Promise((resolve, reject) => {
-      const unsubscribe = this.subscribe((data) => {
+      record.timeout = setTimeout(() => {
+        record.unsubscribe();
+        return reject(`MAX_WAIT_TIME elapsed: Key ${key} still seen after ${MAX_WAIT_TIME / 1e3}s`);
+      }, MAX_WAIT_TIME);
+      record.unsubscribe = this.subscribe((data) => {
         if (!Object.hasOwn(data, `${v2UnescapedStoreKey(key)}`)) {
-          unsubscribe();
-          resolve();
+          record.unsubscribe();
+          clearTimeout(record.timeout);
+          resolve("ok");
         }
       });
-      setTimeout(() => {
-        unsubscribe();
-        return reject();
-      }, MAX_WAIT_TIME);
     });
   };
   subscribe = (subscriber) => {
@@ -1857,11 +1884,11 @@ var Capability = class {
    * @returns
    */
   OnSchedule = (schedule) => {
-    const { name, every, unit, run, startTime, completions } = schedule;
+    const { name: name2, every, unit, run, startTime, completions } = schedule;
     this.hasSchedule = true;
     if (process.env.PEPR_WATCH_MODE === "true" || process.env.PEPR_MODE === "dev") {
       const newSchedule = {
-        name,
+        name: name2,
         every,
         unit,
         run,
@@ -2101,9 +2128,9 @@ var Capability = class {
       binding.filters.regexName = regexName.source;
       return commonChain;
     }
-    function WithName(name) {
-      logger_default.debug(`Add name filter ${name}`, prefix);
-      binding.filters.name = name;
+    function WithName(name2) {
+      logger_default.debug(`Add name filter ${name2}`, prefix);
+      binding.filters.name = name2;
       return commonChain;
     }
     function WithLabel(key, value = "") {