@xyo-network/sentinel 2.84.7 → 2.84.9

package/dist/node/index.js

@@ -1,10 +1,3 @@
-// src/Automation.ts
-import { isPayloadOfSchemaType } from "@xyo-network/payload-model";
-var SentinelAutomationSchema = "network.xyo.automation";
-var SentinelIntervalAutomationSchema = "network.xyo.automation.interval";
-var SentinelEventAutomationSchema = "network.xyo.automation.event";
-var isSentinelIntervalAutomation = isPayloadOfSchemaType(SentinelIntervalAutomationSchema);
-
 // src/MemorySentinel.ts
 import { fulfilled, rejected } from "@xylabs/promise";
 import { asDivinerInstance } from "@xyo-network/diviner-model";
@@ -13,62 +6,13 @@ import {
   SentinelConfigSchema
 } from "@xyo-network/sentinel-model";
 import { asWitnessInstance } from "@xyo-network/witness-model";
-var MemorySentinel = class extends AbstractSentinel {
-  static configSchemas = [SentinelConfigSchema];
-  async reportHandler(inPayloads = []) {
-    await this.started("throw");
-    const job = await this.jobPromise;
-    let index = 0;
-    let previousResults = {};
-    while (index < job.tasks.length) {
-      const generatedPayloads = await this.generateResults(job.tasks[index], previousResults, inPayloads);
-      previousResults = generatedPayloads;
-      index++;
-    }
-    return Object.values(previousResults).flat();
-  }
-  async generateResults(tasks, previousResults, inPayloads) {
-    const results = await Promise.allSettled(
-      tasks == null ? void 0 : tasks.map(async (task) => {
-        const witness = asWitnessInstance(task.module);
-        const input = task.input ?? false;
-        const inPayloadsFound = input === true ? inPayloads : input === false ? [] : this.processPreviousResults(previousResults, await this.inputAddresses(input));
-        if (witness) {
-          return [witness.address, await witness.observe(inPayloadsFound)];
-        }
-        const diviner = asDivinerInstance(task.module);
-        if (diviner) {
-          return [diviner.address, await diviner.divine(inPayloadsFound)];
-        }
-        throw new Error("Unsupported module type");
-      })
-    );
-    const finalResult = {};
-    for (const result of results.filter(fulfilled)) {
-      const [address, payloads] = result.value;
-      finalResult[address] = finalResult[address] ?? [];
-      finalResult[address].push(...payloads);
-    }
-    if (this.throwErrors) {
-      const errors = results.filter(rejected).map((result) => result.reason);
-      if (errors.length > 0) {
-        throw new Error("At least one module failed");
-      }
-    }
-    return finalResult;
-  }
-  async inputAddresses(input) {
-    if (Array.isArray(input)) {
-      return (await Promise.all(input.map(async (inputItem) => await this.inputAddresses(inputItem)))).flat();
-    } else {
-      const resolved = await this.resolve(input);
-      return resolved ? [resolved.address] : [];
-    }
-  }
-  processPreviousResults(payloads, inputs) {
-    return inputs.flatMap((input) => payloads[input] ?? []);
-  }
-};
+
+// src/SentinelRunner.ts
+import { assertEx } from "@xylabs/assert";
+import { PayloadWrapper as PayloadWrapper2 } from "@xyo-network/payload-wrapper";
+import {
+  isSentinelIntervalAutomation
+} from "@xyo-network/sentinel-model";
 
 // src/SentinelIntervalAutomationWrapper.ts
 import { PayloadWrapper } from "@xyo-network/payload-wrapper";
@@ -80,7 +24,8 @@ var SentinelIntervalAutomationWrapper = class extends PayloadWrapper {
     const frequency = this.jsonPayload().frequency;
     if (frequency === void 0)
       return Number.POSITIVE_INFINITY;
-    switch (this.jsonPayload().frequencyUnits ?? "hour") {
+    const frequencyUnits = this.jsonPayload().frequencyUnits;
+    switch (frequencyUnits ?? "hour") {
       case "second": {
         return frequency * 1e3;
       }
@@ -93,34 +38,53 @@ var SentinelIntervalAutomationWrapper = class extends PayloadWrapper {
       case "day": {
         return frequency * 24 * 60 * 60 * 1e3;
       }
+      default: {
+        return Number.POSITIVE_INFINITY;
+      }
     }
   }
   get remaining() {
-    return this.payload().remaining ?? Number.POSITIVE_INFINITY;
+    return this.jsonPayload().remaining ?? Number.POSITIVE_INFINITY;
   }
   next() {
-    this.jsonPayload().start = this.jsonPayload().start + this.frequencyMillis;
+    var _a;
+    const now = Date.now();
+    const previousStart = ((_a = this.jsonPayload()) == null ? void 0 : _a.start) ?? now;
+    const start = Math.max(previousStart, now);
+    const nextStart = start + this.frequencyMillis;
+    this.setStart(nextStart);
     this.consumeRemaining();
     this.checkEnd();
     return this;
   }
   checkEnd() {
     if (this.jsonPayload().start > (this.jsonPayload().end ?? Number.POSITIVE_INFINITY)) {
-      this.jsonPayload().start = Number.POSITIVE_INFINITY;
+      this.setStart(Number.POSITIVE_INFINITY);
     }
   }
   consumeRemaining(count = 1) {
-    const remaining = this.remaining - count;
-    this.jsonPayload().remaining = remaining;
-    if (remaining <= 0) {
-      this.jsonPayload().start = Number.POSITIVE_INFINITY;
-    }
+    const remaining = Math.max(this.remaining - count, 0);
+    this.setRemaining(remaining);
+    if (remaining <= 0)
+      this.setStart(Number.POSITIVE_INFINITY);
+  }
+  /**
+   * Sets the remaining of the wrapped automation
+   * @param remaining The remaining time in milliseconds
+   */
+  setRemaining(remaining) {
+    this.obj.remaining = remaining;
+  }
+  /**
+   * Sets the start of the wrapped automation
+   * @param start The start time in milliseconds
+   */
+  setStart(start) {
+    this.obj.start = start;
   }
 };
 
 // src/SentinelRunner.ts
-import { assertEx } from "@xylabs/assert";
-import { PayloadWrapper as PayloadWrapper2 } from "@xyo-network/payload-wrapper";
 var SentinelRunner = class {
   _automations = {};
   onTriggerResult;
@@ -168,20 +132,22 @@ var SentinelRunner = class {
     await this.start();
   }
   async start() {
+    await Promise.resolve();
     assertEx(this.timeoutId === void 0, "Already started");
     const automation = this.next;
     if (isSentinelIntervalAutomation(automation)) {
-      const delay = automation.start - Date.now();
-      if (delay < 0) {
-        await this.trigger(automation);
-      } else {
-        this.timeoutId = setTimeout(
-          async () => {
-            this.timeoutId = void 0;
+      const now = Date.now();
+      const start = Math.max(automation.start ?? now, now);
+      const delay = Math.max(start - now, 0);
+      if (delay < Number.POSITIVE_INFINITY) {
+        this.timeoutId = setTimeout(async () => {
+          try {
+            await this.trigger(automation);
+            this.stop();
+          } finally {
             await this.start();
-          },
-          delay > 0 ? delay : 0
-        );
+          }
+        }, delay);
       }
     }
   }
@@ -205,7 +171,83 @@ var SentinelRunner = class {
     await this.add(wrapper.jsonPayload(), false);
     const triggerResult = await this.sentinel.report();
     (_a = this.onTriggerResult) == null ? void 0 : _a.call(this, triggerResult);
-    await this.start();
+  }
+};
+
+// src/MemorySentinel.ts
+var MemorySentinel = class extends AbstractSentinel {
+  static configSchemas = [SentinelConfigSchema];
+  runner;
+  async reportHandler(inPayloads = []) {
+    await this.started("throw");
+    const job = await this.jobPromise;
+    let index = 0;
+    let previousResults = {};
+    while (index < job.tasks.length) {
+      const generatedPayloads = await this.generateResults(job.tasks[index], previousResults, inPayloads);
+      previousResults = generatedPayloads;
+      index++;
+    }
+    return Object.values(previousResults).flat();
+  }
+  async start(timeout) {
+    var _a;
+    if (await super.start(timeout)) {
+      if ((((_a = this.config.automations) == null ? void 0 : _a.length) ?? 0) > 0) {
+        this.runner = new SentinelRunner(this, this.config.automations);
+        await this.runner.start();
+      }
+      return true;
+    }
+    return false;
+  }
+  async stop(timeout) {
+    if (this.runner) {
+      this.runner.stop();
+      this.runner = void 0;
+    }
+    return await super.stop(timeout);
+  }
+  async generateResults(tasks, previousResults, inPayloads) {
+    const results = await Promise.allSettled(
+      tasks == null ? void 0 : tasks.map(async (task) => {
+        const witness = asWitnessInstance(task.module);
+        const input = task.input ?? false;
+        const inPayloadsFound = input === true ? inPayloads : input === false ? [] : this.processPreviousResults(previousResults, await this.inputAddresses(input));
+        if (witness) {
+          return [witness.address, await witness.observe(inPayloadsFound)];
+        }
+        const diviner = asDivinerInstance(task.module);
+        if (diviner) {
+          return [diviner.address, await diviner.divine(inPayloadsFound)];
+        }
+        throw new Error("Unsupported module type");
+      })
+    );
+    const finalResult = {};
+    for (const result of results.filter(fulfilled)) {
+      const [address, payloads] = result.value;
+      finalResult[address] = finalResult[address] ?? [];
+      finalResult[address].push(...payloads);
+    }
+    if (this.throwErrors) {
+      const errors = results.filter(rejected).map((result) => result.reason);
+      if (errors.length > 0) {
+        throw new Error("At least one module failed");
+      }
+    }
+    return finalResult;
+  }
+  async inputAddresses(input) {
+    if (Array.isArray(input)) {
+      return (await Promise.all(input.map(async (inputItem) => await this.inputAddresses(inputItem)))).flat();
+    } else {
+      const resolved = await this.resolve(input);
+      return resolved ? [resolved.address] : [];
+    }
+  }
+  processPreviousResults(payloads, inputs) {
+    return inputs.flatMap((input) => payloads[input] ?? []);
   }
 };
 
@@ -239,12 +281,8 @@ export * from "@xyo-network/sentinel-abstract";
 export * from "@xyo-network/sentinel-model";
 export {
   MemorySentinel,
-  SentinelAutomationSchema,
-  SentinelEventAutomationSchema,
-  SentinelIntervalAutomationSchema,
   SentinelIntervalAutomationWrapper,
   SentinelRunner,
-  SentinelWrapper,
-  isSentinelIntervalAutomation
+  SentinelWrapper
 };
 //# sourceMappingURL=index.js.map

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Automation.ts","../../src/MemorySentinel.ts","../../src/SentinelIntervalAutomationWrapper.ts","../../src/SentinelRunner.ts","../../src/Wrapper.ts","../../src/index.ts"],"sourcesContent":["import { isPayloadOfSchemaType, Payload } from '@xyo-network/payload-model'\nimport { Task } from '@xyo-network/sentinel-model'\n\nexport type SentinelAutomationSchema = 'network.xyo.automation'\nexport const SentinelAutomationSchema: SentinelAutomationSchema = 'network.xyo.automation'\n\nexport type SentinelIntervalAutomationSchema = 'network.xyo.automation.interval'\nexport const SentinelIntervalAutomationSchema: SentinelIntervalAutomationSchema = 'network.xyo.automation.interval'\n\nexport type SentinelEventAutomationSchema = 'network.xyo.automation.event'\nexport const SentinelEventAutomationSchema: SentinelEventAutomationSchema = 'network.xyo.automation.event'\n\nexport type SentinelBaseAutomationPayload<T extends Payload> = Payload<\n  {\n    tasks?: Task[]\n    type?: 'interval' | 'event'\n  } & T\n>\n\n/** Settings for an Interval Automation */\nexport type SentinelIntervalAutomationPayload = SentinelBaseAutomationPayload<{\n  /** Epoch after which any reoccurrence stops */\n  end?: number\n\n  /** Time between triggers [non-repeating if undefined] */\n  frequency?: number\n\n  /** Units for frequency field [hour if undefined] */\n  frequencyUnits?: 'second' | 'minute' | 'hour' | 'day'\n\n  /** Remaining triggers [infinite if undefined] */\n  remaining?: number\n\n  schema: SentinelIntervalAutomationSchema\n\n  /** Epoch of the next trigger */\n  start: number\n\n  /** The type of automation */\n  type: 'interval'\n}>\n\nexport const isSentinelIntervalAutomation = isPayloadOfSchemaType<SentinelIntervalAutomationPayload>(SentinelIntervalAutomationSchema)\n\n/** Settings for an Event Automation */\nexport type SentinelEventAutomationPayload = SentinelBaseAutomationPayload<{\n  schema: SentinelEventAutomationSchema\n  type: 'event'\n}>\n\n/** Settings for an Automation */\nexport type SentinelAutomationPayload = Payload<\n  SentinelIntervalAutomationPayload | SentinelEventAutomationPayload,\n  SentinelAutomationSchema | SentinelIntervalAutomationSchema | SentinelEventAutomationSchema\n>\n","import { Address } from '@xylabs/hex'\nimport { fulfilled, rejected } from '@xylabs/promise'\nimport { asDivinerInstance } from '@xyo-network/diviner-model'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { AbstractSentinel } from '@xyo-network/sentinel-abstract'\nimport {\n  ResolvedTask,\n  SentinelConfig,\n  SentinelConfigSchema,\n  SentinelInstance,\n  SentinelModuleEventData,\n  SentinelParams,\n} from '@xyo-network/sentinel-model'\nimport { asWitnessInstance } from '@xyo-network/witness-model'\n\nexport type MemorySentinelParams<TConfig extends AnyConfigSchema<SentinelConfig> = AnyConfigSchema<SentinelConfig>> = SentinelParams<TConfig>\n\nexport class MemorySentinel<\n  TParams extends MemorySentinelParams = MemorySentinelParams,\n  TEventData extends SentinelModuleEventData<SentinelInstance<TParams>> = SentinelModuleEventData<SentinelInstance<TParams>>,\n> extends AbstractSentinel<TParams, TEventData> {\n  static override configSchemas = [SentinelConfigSchema]\n\n  async reportHandler(inPayloads: Payload[] = []): Promise<Payload[]> {\n    await this.started('throw')\n    const job = await this.jobPromise\n\n    let index = 0\n    let previousResults: Record<Address, Payload[]> = {}\n    while (index < job.tasks.length) {\n      const generatedPayloads = await this.generateResults(job.tasks[index], previousResults, inPayloads)\n      previousResults = generatedPayloads\n      index++\n    }\n    return Object.values(previousResults).flat()\n  }\n\n  private async generateResults(\n    tasks: ResolvedTask[],\n    previousResults: Record<Address, Payload[]>,\n    inPayloads?: Payload[],\n  ): Promise<Record<Address, Payload[]>> {\n    const results: PromiseSettledResult<[Address, Payload[]]>[] = await Promise.allSettled(\n      tasks?.map(async (task) => {\n        const witness = asWitnessInstance(task.module)\n        const input = task.input ?? false\n        const inPayloadsFound =\n          input === true ? inPayloads : input === false ? [] : this.processPreviousResults(previousResults, await this.inputAddresses(input))\n        if (witness) {\n          return [witness.address, await witness.observe(inPayloadsFound)]\n        }\n        const diviner = asDivinerInstance(task.module)\n        if (diviner) {\n          return [diviner.address, await diviner.divine(inPayloadsFound)]\n        }\n        throw new Error('Unsupported module type')\n      }),\n    )\n    const finalResult: Record<Address, Payload[]> = {}\n    for (const result of results.filter(fulfilled)) {\n      const [address, payloads] = result.value\n      finalResult[address] = finalResult[address] ?? []\n      finalResult[address].push(...payloads)\n    }\n    if (this.throwErrors) {\n      const errors = results.filter(rejected).map((result) => result.reason)\n      if (errors.length > 0) {\n        throw new Error('At least one module failed')\n      }\n    }\n    return finalResult\n  }\n\n  private async inputAddresses(input: string | string[]): Promise<string[]> {\n    if (Array.isArray(input)) {\n      return (await Promise.all(input.map(async (inputItem) => await this.inputAddresses(inputItem)))).flat()\n    } else {\n      const resolved = await this.resolve(input)\n      return resolved ? [resolved.address] : []\n    }\n  }\n\n  private processPreviousResults(payloads: Record<string, Payload[]>, inputs: string[]) {\n    return inputs.flatMap((input) => payloads[input] ?? [])\n  }\n}\n","import { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { SentinelIntervalAutomationPayload } from './Automation'\n\nexport class SentinelIntervalAutomationWrapper<\n  T extends SentinelIntervalAutomationPayload = SentinelIntervalAutomationPayload,\n> extends PayloadWrapper<T> {\n  constructor(payload: T) {\n    super(payload)\n  }\n\n  protected get frequencyMillis() {\n    const frequency = this.jsonPayload().frequency\n    if (frequency === undefined) return Number.POSITIVE_INFINITY\n    switch (this.jsonPayload().frequencyUnits ?? 'hour') {\n      case 'second': {\n        return frequency * 1000\n      }\n      case 'minute': {\n        return frequency * 60 * 1000\n      }\n      case 'hour': {\n        return frequency * 60 * 60 * 1000\n      }\n      case 'day': {\n        return frequency * 24 * 60 * 60 * 1000\n      }\n    }\n  }\n\n  protected get remaining() {\n    //if remaining is not defined, we assume Infinity\n    return this.payload().remaining ?? Number.POSITIVE_INFINITY\n  }\n\n  next() {\n    this.jsonPayload().start = this.jsonPayload().start + this.frequencyMillis\n    this.consumeRemaining()\n    this.checkEnd()\n    return this\n  }\n\n  protected checkEnd() {\n    if (this.jsonPayload().start > (this.jsonPayload().end ?? Number.POSITIVE_INFINITY)) {\n      this.jsonPayload().start = Number.POSITIVE_INFINITY\n    }\n  }\n\n  protected consumeRemaining(count = 1) {\n    const remaining = this.remaining - count\n    this.jsonPayload().remaining = remaining\n\n    if (remaining <= 0) {\n      this.jsonPayload().start = Number.POSITIVE_INFINITY\n    }\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\nimport { SentinelInstance } from '@xyo-network/sentinel-model'\n\nimport { isSentinelIntervalAutomation, SentinelAutomationPayload, SentinelIntervalAutomationPayload } from './Automation'\nimport { SentinelIntervalAutomationWrapper } from './SentinelIntervalAutomationWrapper'\n\nexport type OnSentinelRunnerTriggerResult = (result: Payload[]) => void\n\nexport class SentinelRunner {\n  protected _automations: Record<string, SentinelAutomationPayload> = {}\n  protected onTriggerResult: OnSentinelRunnerTriggerResult | undefined\n  protected sentinel: SentinelInstance\n  protected timeoutId?: NodeJS.Timeout | string | number\n\n  constructor(sentinel: SentinelInstance, automations?: SentinelAutomationPayload[], onTriggerResult?: OnSentinelRunnerTriggerResult) {\n    this.sentinel = sentinel\n    this.onTriggerResult = onTriggerResult\n    if (automations) for (const automation of automations) this.add(automation)\n  }\n\n  get automations() {\n    return this._automations\n  }\n\n  private get next() {\n    // eslint-disable-next-line unicorn/no-array-reduce\n    return Object.values(this._automations).reduce<SentinelAutomationPayload | undefined>((previous, current) => {\n      if (isSentinelIntervalAutomation(current) && isSentinelIntervalAutomation(previous)) {\n        return current.start < (previous?.start ?? Number.POSITIVE_INFINITY) ? current : previous\n      }\n      return current\n      // eslint-disable-next-line unicorn/no-useless-undefined\n    }, undefined)\n  }\n\n  async add(automation: SentinelAutomationPayload, restart = true) {\n    const hash = await PayloadWrapper.hashAsync(automation)\n    this._automations[hash] = automation\n    if (restart) await this.restart()\n    return hash\n  }\n\n  find(hash: string) {\n    Object.entries(this._automations).find(([key]) => key === hash)\n  }\n\n  async remove(hash: string, restart = true) {\n    delete this._automations[hash]\n    if (restart) await this.restart()\n  }\n\n  removeAll() {\n    this.stop()\n    this._automations = {}\n  }\n\n  async restart() {\n    this.stop()\n    await this.start()\n  }\n\n  async start() {\n    assertEx(this.timeoutId === undefined, 'Already started')\n    const automation = this.next\n    if (isSentinelIntervalAutomation(automation)) {\n      const delay = automation.start - Date.now()\n      if (delay < 0) {\n        //automation is due, just do it\n        await this.trigger(automation)\n      } else {\n        this.timeoutId = setTimeout(\n          async () => {\n            this.timeoutId = undefined\n            await this.start()\n          },\n          delay > 0 ? delay : 0,\n        )\n      }\n    }\n  }\n\n  stop() {\n    if (this.timeoutId) {\n      clearTimeout(this.timeoutId)\n      this.timeoutId = undefined\n    }\n  }\n\n  async update(hash: string, automation: SentinelAutomationPayload, restart = true) {\n    await this.remove(hash, false)\n    await this.add(automation, false)\n    if (restart) await this.restart()\n  }\n\n  private async trigger(automation: SentinelIntervalAutomationPayload) {\n    const wrapper = new SentinelIntervalAutomationWrapper(automation)\n    await this.remove(await wrapper.hashAsync(), false)\n    wrapper.next()\n    await this.add(wrapper.jsonPayload(), false)\n    const triggerResult = await this.sentinel.report()\n    this.onTriggerResult?.(triggerResult)\n    await this.start()\n  }\n}\n","import { ArchivistInstance } from '@xyo-network/archivist'\nimport { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module-wrapper'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  isSentinelInstance,\n  isSentinelModule,\n  SentinelInstance,\n  SentinelModule,\n  SentinelReportQuery,\n  SentinelReportQuerySchema,\n} from '@xyo-network/sentinel-model'\nimport { WitnessInstance } from '@xyo-network/witness-model'\n\nconstructableModuleWrapper()\nexport class SentinelWrapper<TModule extends SentinelModule = SentinelModule>\n  extends ModuleWrapper<TModule>\n  implements SentinelInstance<TModule['params']>\n{\n  static override instanceIdentityCheck = isSentinelInstance\n  static override moduleIdentityCheck = isSentinelModule\n  static override requiredQueries = [SentinelReportQuerySchema, ...super.requiredQueries]\n\n  archivists(): Promise<ArchivistInstance[]> {\n    throw new Error('Not supported')\n  }\n\n  async report(payloads?: Payload[]): Promise<Payload[]> {\n    const queryPayload: SentinelReportQuery = { schema: SentinelReportQuerySchema }\n    const result = await this.sendQuery(queryPayload, payloads)\n    return result\n  }\n\n  witnesses(): Promise<WitnessInstance[]> {\n    throw new Error('Not supported')\n  }\n}\n","export * from './Automation'\nexport * from './MemorySentinel'\nexport * from './SentinelIntervalAutomationWrapper'\nexport * from './SentinelRunner'\nexport * from './Wrapper'\nexport * from '@xyo-network/sentinel-abstract'\nexport * from '@xyo-network/sentinel-model'\n"],"mappings":"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","names":["PayloadWrapper","PayloadWrapper"]}
+{"version":3,"sources":["../../src/MemorySentinel.ts","../../src/SentinelRunner.ts","../../src/SentinelIntervalAutomationWrapper.ts","../../src/Wrapper.ts","../../src/index.ts"],"sourcesContent":["import { Address } from '@xylabs/hex'\nimport { fulfilled, rejected } from '@xylabs/promise'\nimport { asDivinerInstance } from '@xyo-network/diviner-model'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport { AbstractSentinel } from '@xyo-network/sentinel-abstract'\nimport {\n  ResolvedTask,\n  SentinelConfig,\n  SentinelConfigSchema,\n  SentinelInstance,\n  SentinelModuleEventData,\n  SentinelParams,\n} from '@xyo-network/sentinel-model'\nimport { asWitnessInstance } from '@xyo-network/witness-model'\n\nimport { SentinelRunner } from './SentinelRunner'\n\nexport type MemorySentinelParams<TConfig extends AnyConfigSchema<SentinelConfig> = AnyConfigSchema<SentinelConfig>> = SentinelParams<TConfig>\n\nexport class MemorySentinel<\n  TParams extends MemorySentinelParams = MemorySentinelParams,\n  TEventData extends SentinelModuleEventData<SentinelInstance<TParams>> = SentinelModuleEventData<SentinelInstance<TParams>>,\n> extends AbstractSentinel<TParams, TEventData> {\n  static override configSchemas = [SentinelConfigSchema]\n\n  private runner?: SentinelRunner\n\n  async reportHandler(inPayloads: Payload[] = []): Promise<Payload[]> {\n    await this.started('throw')\n    const job = await this.jobPromise\n\n    let index = 0\n    let previousResults: Record<Address, Payload[]> = {}\n    while (index < job.tasks.length) {\n      const generatedPayloads = await this.generateResults(job.tasks[index], previousResults, inPayloads)\n      previousResults = generatedPayloads\n      index++\n    }\n    return Object.values(previousResults).flat()\n  }\n\n  override async start(timeout?: number | undefined): Promise<boolean> {\n    if (await super.start(timeout)) {\n      if ((this.config.automations?.length ?? 0) > 0) {\n        this.runner = new SentinelRunner(this, this.config.automations)\n        await this.runner.start()\n      }\n      return true\n    }\n    return false\n  }\n\n  override async stop(timeout?: number | undefined): Promise<boolean> {\n    if (this.runner) {\n      this.runner.stop()\n      this.runner = undefined\n    }\n    return await super.stop(timeout)\n  }\n\n  private async generateResults(\n    tasks: ResolvedTask[],\n    previousResults: Record<Address, Payload[]>,\n    inPayloads?: Payload[],\n  ): Promise<Record<Address, Payload[]>> {\n    const results: PromiseSettledResult<[Address, Payload[]]>[] = await Promise.allSettled(\n      tasks?.map(async (task) => {\n        const witness = asWitnessInstance(task.module)\n        const input = task.input ?? false\n        const inPayloadsFound =\n          input === true ? inPayloads : input === false ? [] : this.processPreviousResults(previousResults, await this.inputAddresses(input))\n        if (witness) {\n          return [witness.address, await witness.observe(inPayloadsFound)]\n        }\n        const diviner = asDivinerInstance(task.module)\n        if (diviner) {\n          return [diviner.address, await diviner.divine(inPayloadsFound)]\n        }\n        throw new Error('Unsupported module type')\n      }),\n    )\n    const finalResult: Record<Address, Payload[]> = {}\n    for (const result of results.filter(fulfilled)) {\n      const [address, payloads] = result.value\n      finalResult[address] = finalResult[address] ?? []\n      finalResult[address].push(...payloads)\n    }\n    if (this.throwErrors) {\n      const errors = results.filter(rejected).map((result) => result.reason)\n      if (errors.length > 0) {\n        throw new Error('At least one module failed')\n      }\n    }\n    return finalResult\n  }\n\n  private async inputAddresses(input: string | string[]): Promise<string[]> {\n    if (Array.isArray(input)) {\n      return (await Promise.all(input.map(async (inputItem) => await this.inputAddresses(inputItem)))).flat()\n    } else {\n      const resolved = await this.resolve(input)\n      return resolved ? [resolved.address] : []\n    }\n  }\n\n  private processPreviousResults(payloads: Record<string, Payload[]>, inputs: string[]) {\n    return inputs.flatMap((input) => payloads[input] ?? [])\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\nimport {\n  isSentinelIntervalAutomation,\n  SentinelAutomationPayload,\n  SentinelInstance,\n  SentinelIntervalAutomationPayload,\n} from '@xyo-network/sentinel-model'\n\nimport { SentinelIntervalAutomationWrapper } from './SentinelIntervalAutomationWrapper'\n\nexport type OnSentinelRunnerTriggerResult = (result: Payload[]) => void\n\nexport class SentinelRunner {\n  protected _automations: Record<string, SentinelAutomationPayload> = {}\n  protected onTriggerResult: OnSentinelRunnerTriggerResult | undefined\n  protected sentinel: SentinelInstance\n  protected timeoutId?: NodeJS.Timeout | string | number\n\n  constructor(sentinel: SentinelInstance, automations?: SentinelAutomationPayload[], onTriggerResult?: OnSentinelRunnerTriggerResult) {\n    this.sentinel = sentinel\n    this.onTriggerResult = onTriggerResult\n    if (automations) for (const automation of automations) this.add(automation)\n  }\n\n  get automations() {\n    return this._automations\n  }\n\n  private get next() {\n    // eslint-disable-next-line unicorn/no-array-reduce\n    return Object.values(this._automations).reduce<SentinelAutomationPayload | undefined>((previous, current) => {\n      if (isSentinelIntervalAutomation(current) && isSentinelIntervalAutomation(previous)) {\n        return current.start < (previous?.start ?? Number.POSITIVE_INFINITY) ? current : previous\n      }\n      return current\n      // eslint-disable-next-line unicorn/no-useless-undefined\n    }, undefined)\n  }\n\n  async add(automation: SentinelAutomationPayload, restart = true) {\n    const hash = await PayloadWrapper.hashAsync(automation)\n    this._automations[hash] = automation\n    if (restart) await this.restart()\n    return hash\n  }\n\n  find(hash: string) {\n    Object.entries(this._automations).find(([key]) => key === hash)\n  }\n\n  async remove(hash: string, restart = true) {\n    delete this._automations[hash]\n    if (restart) await this.restart()\n  }\n\n  removeAll() {\n    this.stop()\n    this._automations = {}\n  }\n\n  async restart() {\n    this.stop()\n    await this.start()\n  }\n\n  async start() {\n    // NOTE: Keep async to match module start signature\n    await Promise.resolve()\n    assertEx(this.timeoutId === undefined, 'Already started')\n    const automation = this.next\n    if (isSentinelIntervalAutomation(automation)) {\n      const now = Date.now()\n      const start = Math.max(automation.start ?? now, now)\n      const delay = Math.max(start - now, 0)\n      if (delay < Number.POSITIVE_INFINITY) {\n        this.timeoutId = setTimeout(async () => {\n          try {\n            // Run the automation\n            await this.trigger(automation)\n            this.stop()\n          } finally {\n            // No matter what start the next automation\n            await this.start()\n          }\n        }, delay)\n      }\n    }\n  }\n\n  stop() {\n    if (this.timeoutId) {\n      clearTimeout(this.timeoutId)\n      this.timeoutId = undefined\n    }\n  }\n\n  async update(hash: string, automation: SentinelAutomationPayload, restart = true) {\n    await this.remove(hash, false)\n    await this.add(automation, false)\n    if (restart) await this.restart()\n  }\n\n  private async trigger(automation: SentinelIntervalAutomationPayload) {\n    const wrapper = new SentinelIntervalAutomationWrapper(automation)\n    await this.remove(await wrapper.hashAsync(), false)\n    wrapper.next()\n    await this.add(wrapper.jsonPayload(), false)\n    const triggerResult = await this.sentinel.report()\n    this.onTriggerResult?.(triggerResult)\n    // await this.start()\n  }\n}\n","import { PayloadWrapper } from '@xyo-network/payload-wrapper'\nimport { SentinelIntervalAutomationPayload } from '@xyo-network/sentinel-model'\n\nexport class SentinelIntervalAutomationWrapper<\n  T extends SentinelIntervalAutomationPayload = SentinelIntervalAutomationPayload,\n> extends PayloadWrapper<T> {\n  constructor(payload: T) {\n    super(payload)\n  }\n\n  protected get frequencyMillis() {\n    const frequency = this.jsonPayload().frequency\n    if (frequency === undefined) return Number.POSITIVE_INFINITY\n    const frequencyUnits = this.jsonPayload().frequencyUnits\n    switch (frequencyUnits ?? 'hour') {\n      case 'second': {\n        return frequency * 1000\n      }\n      case 'minute': {\n        return frequency * 60 * 1000\n      }\n      case 'hour': {\n        return frequency * 60 * 60 * 1000\n      }\n      case 'day': {\n        return frequency * 24 * 60 * 60 * 1000\n      }\n      default: {\n        return Number.POSITIVE_INFINITY\n      }\n    }\n  }\n\n  protected get remaining() {\n    return this.jsonPayload().remaining ?? Number.POSITIVE_INFINITY\n  }\n\n  next() {\n    const now = Date.now()\n    const previousStart = this.jsonPayload()?.start ?? now\n    const start = Math.max(previousStart, now)\n    const nextStart = start + this.frequencyMillis\n    this.setStart(nextStart)\n    this.consumeRemaining()\n    this.checkEnd()\n    return this\n  }\n\n  protected checkEnd() {\n    if (this.jsonPayload().start > (this.jsonPayload().end ?? Number.POSITIVE_INFINITY)) {\n      this.setStart(Number.POSITIVE_INFINITY)\n    }\n  }\n\n  protected consumeRemaining(count = 1) {\n    const remaining = Math.max(this.remaining - count, 0)\n    this.setRemaining(remaining)\n    if (remaining <= 0) this.setStart(Number.POSITIVE_INFINITY)\n  }\n\n  /**\n   * Sets the remaining of the wrapped automation\n   * @param remaining The remaining time in milliseconds\n   */\n  protected setRemaining(remaining: number) {\n    this.obj.remaining = remaining\n  }\n\n  /**\n   * Sets the start of the wrapped automation\n   * @param start The start time in milliseconds\n   */\n  protected setStart(start: number) {\n    this.obj.start = start\n  }\n}\n","import { ArchivistInstance } from '@xyo-network/archivist'\nimport { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module-wrapper'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  isSentinelInstance,\n  isSentinelModule,\n  SentinelInstance,\n  SentinelModule,\n  SentinelReportQuery,\n  SentinelReportQuerySchema,\n} from '@xyo-network/sentinel-model'\nimport { WitnessInstance } from '@xyo-network/witness-model'\n\nconstructableModuleWrapper()\nexport class SentinelWrapper<TModule extends SentinelModule = SentinelModule>\n  extends ModuleWrapper<TModule>\n  implements SentinelInstance<TModule['params']>\n{\n  static override instanceIdentityCheck = isSentinelInstance\n  static override moduleIdentityCheck = isSentinelModule\n  static override requiredQueries = [SentinelReportQuerySchema, ...super.requiredQueries]\n\n  archivists(): Promise<ArchivistInstance[]> {\n    throw new Error('Not supported')\n  }\n\n  async report(payloads?: Payload[]): Promise<Payload[]> {\n    const queryPayload: SentinelReportQuery = { schema: SentinelReportQuerySchema }\n    const result = await this.sendQuery(queryPayload, payloads)\n    return result\n  }\n\n  witnesses(): Promise<WitnessInstance[]> {\n    throw new Error('Not supported')\n  }\n}\n","export * from './MemorySentinel'\nexport * from './SentinelIntervalAutomationWrapper'\nexport * from './SentinelRunner'\nexport * from './Wrapper'\nexport * from '@xyo-network/sentinel-abstract'\nexport * from '@xyo-network/sentinel-model'\n"],"mappings":"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","names":["PayloadWrapper","PayloadWrapper"]}

package/package.json

@@ -13,28 +13,28 @@
     "@xylabs/assert": "^2.13.20",
     "@xylabs/hex": "^2.13.20",
     "@xylabs/promise": "^2.13.20",
-    "@xyo-network/archivist": "~2.84.7",
-    "@xyo-network/diviner-model": "~2.84.7",
-    "@xyo-network/module-model": "~2.84.7",
-    "@xyo-network/module-wrapper": "~2.84.7",
-    "@xyo-network/payload-model": "~2.84.7",
-    "@xyo-network/payload-wrapper": "~2.84.7",
-    "@xyo-network/sentinel-abstract": "~2.84.7",
-    "@xyo-network/sentinel-model": "~2.84.7",
-    "@xyo-network/witness-model": "~2.84.7"
+    "@xyo-network/archivist": "~2.84.9",
+    "@xyo-network/diviner-model": "~2.84.9",
+    "@xyo-network/module-model": "~2.84.9",
+    "@xyo-network/module-wrapper": "~2.84.9",
+    "@xyo-network/payload-model": "~2.84.9",
+    "@xyo-network/payload-wrapper": "~2.84.9",
+    "@xyo-network/sentinel-abstract": "~2.84.9",
+    "@xyo-network/sentinel-model": "~2.84.9",
+    "@xyo-network/witness-model": "~2.84.9"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "devDependencies": {
     "@xylabs/delay": "^2.13.20",
-    "@xylabs/ts-scripts-yarn3": "^3.2.24",
-    "@xylabs/tsconfig": "^3.2.24",
-    "@xyo-network/abstract-witness": "~2.84.7",
-    "@xyo-network/account": "~2.84.7",
-    "@xyo-network/boundwitness-model": "~2.84.7",
-    "@xyo-network/hash": "~2.84.7",
-    "@xyo-network/id-payload-plugin": "^2.84.2",
-    "@xyo-network/node-memory": "~2.84.7",
-    "@xyo-network/witness-adhoc": "~2.84.6",
+    "@xylabs/ts-scripts-yarn3": "^3.2.25",
+    "@xylabs/tsconfig": "^3.2.25",
+    "@xyo-network/abstract-witness": "~2.84.9",
+    "@xyo-network/account": "~2.84.9",
+    "@xyo-network/boundwitness-model": "~2.84.9",
+    "@xyo-network/hash": "~2.84.9",
+    "@xyo-network/id-payload-plugin": "^2.84.3",
+    "@xyo-network/node-memory": "~2.84.9",
+    "@xyo-network/witness-adhoc": "~2.84.9",
     "typescript": "^5.3.3"
   },
   "types": "dist/node/index.d.ts",
@@ -75,6 +75,6 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.84.7",
+  "version": "2.84.9",
   "type": "module"
 }

package/src/MemorySentinel.ts

@@ -14,6 +14,8 @@ import {
 } from '@xyo-network/sentinel-model'
 import { asWitnessInstance } from '@xyo-network/witness-model'
 
+import { SentinelRunner } from './SentinelRunner'
+
 export type MemorySentinelParams<TConfig extends AnyConfigSchema<SentinelConfig> = AnyConfigSchema<SentinelConfig>> = SentinelParams<TConfig>
 
 export class MemorySentinel<
@@ -22,6 +24,8 @@ export class MemorySentinel<
 > extends AbstractSentinel<TParams, TEventData> {
   static override configSchemas = [SentinelConfigSchema]
 
+  private runner?: SentinelRunner
+
   async reportHandler(inPayloads: Payload[] = []): Promise<Payload[]> {
     await this.started('throw')
     const job = await this.jobPromise
@@ -36,6 +40,25 @@ export class MemorySentinel<
     return Object.values(previousResults).flat()
   }
 
+  override async start(timeout?: number | undefined): Promise<boolean> {
+    if (await super.start(timeout)) {
+      if ((this.config.automations?.length ?? 0) > 0) {
+        this.runner = new SentinelRunner(this, this.config.automations)
+        await this.runner.start()
+      }
+      return true
+    }
+    return false
+  }
+
+  override async stop(timeout?: number | undefined): Promise<boolean> {
+    if (this.runner) {
+      this.runner.stop()
+      this.runner = undefined
+    }
+    return await super.stop(timeout)
+  }
+
   private async generateResults(
     tasks: ResolvedTask[],
     previousResults: Record<Address, Payload[]>,

package/src/SentinelIntervalAutomationWrapper.ts

@@ -1,6 +1,5 @@
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
-
-import { SentinelIntervalAutomationPayload } from './Automation'
+import { SentinelIntervalAutomationPayload } from '@xyo-network/sentinel-model'
 
 export class SentinelIntervalAutomationWrapper<
   T extends SentinelIntervalAutomationPayload = SentinelIntervalAutomationPayload,
@@ -12,7 +11,8 @@ export class SentinelIntervalAutomationWrapper<
   protected get frequencyMillis() {
     const frequency = this.jsonPayload().frequency
     if (frequency === undefined) return Number.POSITIVE_INFINITY
-    switch (this.jsonPayload().frequencyUnits ?? 'hour') {
+    const frequencyUnits = this.jsonPayload().frequencyUnits
+    switch (frequencyUnits ?? 'hour') {
       case 'second': {
         return frequency * 1000
       }
@@ -25,16 +25,22 @@ export class SentinelIntervalAutomationWrapper<
       case 'day': {
         return frequency * 24 * 60 * 60 * 1000
       }
+      default: {
+        return Number.POSITIVE_INFINITY
+      }
     }
   }
 
   protected get remaining() {
-    //if remaining is not defined, we assume Infinity
-    return this.payload().remaining ?? Number.POSITIVE_INFINITY
+    return this.jsonPayload().remaining ?? Number.POSITIVE_INFINITY
   }
 
   next() {
-    this.jsonPayload().start = this.jsonPayload().start + this.frequencyMillis
+    const now = Date.now()
+    const previousStart = this.jsonPayload()?.start ?? now
+    const start = Math.max(previousStart, now)
+    const nextStart = start + this.frequencyMillis
+    this.setStart(nextStart)
     this.consumeRemaining()
     this.checkEnd()
     return this
@@ -42,16 +48,29 @@ export class SentinelIntervalAutomationWrapper<
 
   protected checkEnd() {
     if (this.jsonPayload().start > (this.jsonPayload().end ?? Number.POSITIVE_INFINITY)) {
-      this.jsonPayload().start = Number.POSITIVE_INFINITY
+      this.setStart(Number.POSITIVE_INFINITY)
     }
   }
 
   protected consumeRemaining(count = 1) {
-    const remaining = this.remaining - count
-    this.jsonPayload().remaining = remaining
+    const remaining = Math.max(this.remaining - count, 0)
+    this.setRemaining(remaining)
+    if (remaining <= 0) this.setStart(Number.POSITIVE_INFINITY)
+  }
 
-    if (remaining <= 0) {
-      this.jsonPayload().start = Number.POSITIVE_INFINITY
-    }
+  /**
+   * Sets the remaining of the wrapped automation
+   * @param remaining The remaining time in milliseconds
+   */
+  protected setRemaining(remaining: number) {
+    this.obj.remaining = remaining
+  }
+
+  /**
+   * Sets the start of the wrapped automation
+   * @param start The start time in milliseconds
+   */
+  protected setStart(start: number) {
+    this.obj.start = start
   }
 }

package/src/SentinelRunner.ts

@@ -1,9 +1,13 @@
 import { assertEx } from '@xylabs/assert'
 import { Payload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
-import { SentinelInstance } from '@xyo-network/sentinel-model'
+import {
+  isSentinelIntervalAutomation,
+  SentinelAutomationPayload,
+  SentinelInstance,
+  SentinelIntervalAutomationPayload,
+} from '@xyo-network/sentinel-model'
 
-import { isSentinelIntervalAutomation, SentinelAutomationPayload, SentinelIntervalAutomationPayload } from './Automation'
 import { SentinelIntervalAutomationWrapper } from './SentinelIntervalAutomationWrapper'
 
 export type OnSentinelRunnerTriggerResult = (result: Payload[]) => void
@@ -62,21 +66,25 @@ export class SentinelRunner {
   }
 
   async start() {
+    // NOTE: Keep async to match module start signature
+    await Promise.resolve()
     assertEx(this.timeoutId === undefined, 'Already started')
     const automation = this.next
     if (isSentinelIntervalAutomation(automation)) {
-      const delay = automation.start - Date.now()
-      if (delay < 0) {
-        //automation is due, just do it
-        await this.trigger(automation)
-      } else {
-        this.timeoutId = setTimeout(
-          async () => {
-            this.timeoutId = undefined
+      const now = Date.now()
+      const start = Math.max(automation.start ?? now, now)
+      const delay = Math.max(start - now, 0)
+      if (delay < Number.POSITIVE_INFINITY) {
+        this.timeoutId = setTimeout(async () => {
+          try {
+            // Run the automation
+            await this.trigger(automation)
+            this.stop()
+          } finally {
+            // No matter what start the next automation
             await this.start()
-          },
-          delay > 0 ? delay : 0,
-        )
+          }
+        }, delay)
       }
     }
   }
@@ -101,6 +109,6 @@ export class SentinelRunner {
     await this.add(wrapper.jsonPayload(), false)
     const triggerResult = await this.sentinel.report()
     this.onTriggerResult?.(triggerResult)
-    await this.start()
+    // await this.start()
   }
 }

package/src/index.ts

@@ -1,4 +1,3 @@
-export * from './Automation'
 export * from './MemorySentinel'
 export * from './SentinelIntervalAutomationWrapper'
 export * from './SentinelRunner'