@xyo-network/sentinel-memory 2.89.0-rc.9 → 2.89.1

package/dist/node/index.js

@@ -134,12 +134,11 @@ var _SentinelRunner = class _SentinelRunner {
     this.stop();
     this._automations = {};
   }
-  async restart() {
+  restart() {
     this.stop();
-    await this.start();
+    this.start();
   }
-  async start() {
-    await Promise.resolve();
+  start() {
     assertEx(this.timeoutId === void 0, "Already started");
     const automation = this.next;
     if (isSentinelIntervalAutomation(automation)) {
@@ -152,7 +151,7 @@ var _SentinelRunner = class _SentinelRunner {
             await this.trigger(automation);
             this.stop();
           } finally {
-            await this.start();
+            this.start();
           }
         }, delay);
       }
@@ -194,7 +193,7 @@ var _MemorySentinel = class _MemorySentinel extends AbstractSentinel {
     let index = 0;
     let previousResults = {};
     while (index < job.tasks.length) {
-      const generatedPayloads = await this.generateResults(job.tasks[index], previousResults, inPayloads);
+      const generatedPayloads = await this.runJob(job.tasks[index], previousResults, inPayloads);
       previousResults = generatedPayloads;
       index++;
     }
@@ -207,7 +206,7 @@ var _MemorySentinel = class _MemorySentinel extends AbstractSentinel {
     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();
+        this.runner.start();
       }
       return true;
     }
@@ -220,19 +219,47 @@ var _MemorySentinel = class _MemorySentinel extends AbstractSentinel {
     }
     return await super.stop(timeout);
   }
-  async generateResults(tasks, previousResults, inPayloads) {
+  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] ?? []);
+  }
+  async runJob(tasks, previousResults, inPayloads) {
     var _a, _b, _c, _d;
-    (_a = this.logger) == null ? void 0 : _a.debug(`generateResults:tasks: ${JSON.stringify(tasks.length)}`);
-    (_b = this.logger) == null ? void 0 : _b.debug(`generateResults:previous: ${JSON.stringify(previousResults)}`);
-    (_c = this.logger) == null ? void 0 : _c.debug(`generateResults:in: ${JSON.stringify(inPayloads)}`);
+    await this.emit("jobStart", {
+      inPayloads,
+      module: this
+    });
+    (_a = this.logger) == null ? void 0 : _a.debug(`runJob:tasks: ${JSON.stringify(tasks.length)}`);
+    (_b = this.logger) == null ? void 0 : _b.debug(`runJob:previous: ${JSON.stringify(previousResults)}`);
+    (_c = this.logger) == null ? void 0 : _c.debug(`runJob:in: ${JSON.stringify(inPayloads)}`);
     const results = await Promise.allSettled(tasks == null ? void 0 : tasks.map(async (task) => {
       var _a2, _b2, _c2;
       const input = task.input ?? false;
       const inPayloadsFound = input === true ? inPayloads : input === false ? [] : this.processPreviousResults(previousResults, await this.inputAddresses(input));
       const witness = asWitnessInstance(task.module);
       if (witness) {
+        await this.emit("taskStart", {
+          address: witness.address,
+          inPayloads: inPayloadsFound,
+          module: this
+        });
         const observed = await witness.observe(inPayloadsFound);
         (_a2 = this.logger) == null ? void 0 : _a2.debug(`observed [${witness.id}]: ${JSON.stringify(observed)}`);
+        await this.emit("taskEnd", {
+          address: witness.address,
+          inPayloads: inPayloadsFound,
+          module: this,
+          outPayloads: observed
+        });
         return [
           witness.address,
           observed
@@ -240,8 +267,19 @@ var _MemorySentinel = class _MemorySentinel extends AbstractSentinel {
       }
       const diviner = asDivinerInstance(task.module);
       if (diviner) {
+        await this.emit("taskStart", {
+          address: diviner.address,
+          inPayloads: inPayloadsFound,
+          module: this
+        });
         const divined = await diviner.divine(inPayloadsFound);
         (_b2 = this.logger) == null ? void 0 : _b2.debug(`divined [${diviner.id}]: ${JSON.stringify(divined)}`);
+        await this.emit("taskEnd", {
+          address: diviner.address,
+          inPayloads: inPayloadsFound,
+          module: this,
+          outPayloads: divined
+        });
         return [
           diviner.address,
           divined
@@ -249,8 +287,19 @@ var _MemorySentinel = class _MemorySentinel extends AbstractSentinel {
       }
       const sentinel = asSentinelInstance(task.module);
       if (sentinel) {
+        await this.emit("taskStart", {
+          address: sentinel.address,
+          inPayloads: inPayloadsFound,
+          module: this
+        });
         const reported = await sentinel.report(inPayloadsFound);
         (_c2 = this.logger) == null ? void 0 : _c2.debug(`reported [${sentinel.id}]: ${JSON.stringify(reported)}`);
+        await this.emit("taskEnd", {
+          address: sentinel.address,
+          inPayloads: inPayloadsFound,
+          module: this,
+          outPayloads: reported
+        });
         return [
           sentinel.address,
           reported
@@ -271,21 +320,13 @@ var _MemorySentinel = class _MemorySentinel extends AbstractSentinel {
       }
     }
     (_d = this.logger) == null ? void 0 : _d.debug(`generateResults:out: ${JSON.stringify(finalResult)}`);
+    await this.emit("jobEnd", {
+      finalResult,
+      inPayloads,
+      module: this
+    });
     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] ?? []);
-  }
 };
 __name(_MemorySentinel, "MemorySentinel");
 __publicField(_MemorySentinel, "configSchemas", [

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/MemorySentinel.ts","../../src/SentinelRunner.ts","../../src/SentinelIntervalAutomationWrapper.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  asSentinelInstance,\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    this.logger?.debug(`reportHandler:in: ${JSON.stringify(inPayloads)}`)\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    const result = Object.values(previousResults).flat()\n    this.logger?.debug(`reportHandler:out: ${JSON.stringify(result)}`)\n    return result\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    this.logger?.debug(`generateResults:tasks: ${JSON.stringify(tasks.length)}`)\n    this.logger?.debug(`generateResults:previous: ${JSON.stringify(previousResults)}`)\n    this.logger?.debug(`generateResults:in: ${JSON.stringify(inPayloads)}`)\n    const results: PromiseSettledResult<[Address, Payload[]]>[] = await Promise.allSettled(\n      tasks?.map(async (task) => {\n        const input = task.input ?? false\n        const inPayloadsFound =\n          input === true ? inPayloads : input === false ? [] : this.processPreviousResults(previousResults, await this.inputAddresses(input))\n        const witness = asWitnessInstance(task.module)\n        if (witness) {\n          const observed = await witness.observe(inPayloadsFound)\n          this.logger?.debug(`observed [${witness.id}]: ${JSON.stringify(observed)}`)\n          return [witness.address, observed]\n        }\n        const diviner = asDivinerInstance(task.module)\n        if (diviner) {\n          const divined = await diviner.divine(inPayloadsFound)\n          this.logger?.debug(`divined [${diviner.id}]: ${JSON.stringify(divined)}`)\n          return [diviner.address, divined]\n        }\n        const sentinel = asSentinelInstance(task.module)\n        if (sentinel) {\n          const reported = await sentinel.report(inPayloadsFound)\n          this.logger?.debug(`reported [${sentinel.id}]: ${JSON.stringify(reported)}`)\n          return [sentinel.address, reported]\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    this.logger?.debug(`generateResults:out: ${JSON.stringify(finalResult)}`)\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 { forget } from '@xylabs/forget'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\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) forget(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 PayloadBuilder.dataHash(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        // eslint-disable-next-line @typescript-eslint/no-misused-promises\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.dataHash(), 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"],"mappings":"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","names":["fulfilled","rejected","asDivinerInstance","AbstractSentinel","asSentinelInstance","SentinelConfigSchema","asWitnessInstance","assertEx","forget","PayloadBuilder","isSentinelIntervalAutomation","PayloadWrapper","SentinelIntervalAutomationWrapper","PayloadWrapper","constructor","payload","frequencyMillis","frequency","jsonPayload","undefined","Number","POSITIVE_INFINITY","frequencyUnits","remaining","next","now","Date","previousStart","start","Math","max","nextStart","setStart","consumeRemaining","checkEnd","end","count","setRemaining","obj","SentinelRunner","_automations","onTriggerResult","sentinel","timeoutId","constructor","automations","automation","forget","add","next","Object","values","reduce","previous","current","isSentinelIntervalAutomation","start","Number","POSITIVE_INFINITY","undefined","restart","hash","PayloadBuilder","dataHash","find","entries","key","remove","removeAll","stop","Promise","resolve","assertEx","now","Date","Math","max","delay","setTimeout","trigger","clearTimeout","update","wrapper","SentinelIntervalAutomationWrapper","jsonPayload","triggerResult","report","MemorySentinel","AbstractSentinel","runner","reportHandler","inPayloads","started","logger","debug","JSON","stringify","job","jobPromise","index","previousResults","tasks","length","generatedPayloads","generateResults","result","Object","values","flat","start","timeout","config","automations","SentinelRunner","stop","undefined","results","Promise","allSettled","map","task","_a","_b","_c","input","inPayloadsFound","processPreviousResults","inputAddresses","witness","asWitnessInstance","module","observed","observe","id","address","diviner","asDivinerInstance","divined","divine","sentinel","asSentinelInstance","reported","report","Error","finalResult","filter","fulfilled","payloads","value","push","throwErrors","errors","rejected","reason","Array","isArray","all","inputItem","resolved","resolve","inputs","flatMap","configSchemas","SentinelConfigSchema"]}
+{"version":3,"sources":["../../src/MemorySentinel.ts","../../src/SentinelRunner.ts","../../src/SentinelIntervalAutomationWrapper.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  asSentinelInstance,\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    this.logger?.debug(`reportHandler:in: ${JSON.stringify(inPayloads)}`)\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.runJob(job.tasks[index], previousResults, inPayloads)\n      previousResults = generatedPayloads\n      index++\n    }\n    const result = Object.values(previousResults).flat()\n    this.logger?.debug(`reportHandler:out: ${JSON.stringify(result)}`)\n    return result\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        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 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  private async runJob(\n    tasks: ResolvedTask[],\n    previousResults: Record<Address, Payload[]>,\n    inPayloads?: Payload[],\n  ): Promise<Record<Address, Payload[]>> {\n    await this.emit('jobStart', { inPayloads, module: this })\n    this.logger?.debug(`runJob:tasks: ${JSON.stringify(tasks.length)}`)\n    this.logger?.debug(`runJob:previous: ${JSON.stringify(previousResults)}`)\n    this.logger?.debug(`runJob:in: ${JSON.stringify(inPayloads)}`)\n    const results: PromiseSettledResult<[Address, Payload[]]>[] = await Promise.allSettled(\n      tasks?.map(async (task) => {\n        const input = task.input ?? false\n        const inPayloadsFound =\n          input === true ? inPayloads : input === false ? [] : this.processPreviousResults(previousResults, await this.inputAddresses(input))\n        const witness = asWitnessInstance(task.module)\n        if (witness) {\n          await this.emit('taskStart', { address: witness.address, inPayloads: inPayloadsFound, module: this })\n          const observed = await witness.observe(inPayloadsFound)\n          this.logger?.debug(`observed [${witness.id}]: ${JSON.stringify(observed)}`)\n          await this.emit('taskEnd', { address: witness.address, inPayloads: inPayloadsFound, module: this, outPayloads: observed })\n          return [witness.address, observed]\n        }\n        const diviner = asDivinerInstance(task.module)\n        if (diviner) {\n          await this.emit('taskStart', { address: diviner.address, inPayloads: inPayloadsFound, module: this })\n          const divined = await diviner.divine(inPayloadsFound)\n          this.logger?.debug(`divined [${diviner.id}]: ${JSON.stringify(divined)}`)\n          await this.emit('taskEnd', { address: diviner.address, inPayloads: inPayloadsFound, module: this, outPayloads: divined })\n          return [diviner.address, divined]\n        }\n        const sentinel = asSentinelInstance(task.module)\n        if (sentinel) {\n          await this.emit('taskStart', { address: sentinel.address, inPayloads: inPayloadsFound, module: this })\n          const reported = await sentinel.report(inPayloadsFound)\n          this.logger?.debug(`reported [${sentinel.id}]: ${JSON.stringify(reported)}`)\n          await this.emit('taskEnd', { address: sentinel.address, inPayloads: inPayloadsFound, module: this, outPayloads: reported })\n          return [sentinel.address, reported]\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    this.logger?.debug(`generateResults:out: ${JSON.stringify(finalResult)}`)\n    await this.emit('jobEnd', { finalResult, inPayloads, module: this })\n    return finalResult\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { forget } from '@xylabs/forget'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\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) forget(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 PayloadBuilder.dataHash(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  restart() {\n    this.stop()\n    this.start()\n  }\n\n  start() {\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        // eslint-disable-next-line @typescript-eslint/no-misused-promises\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            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.dataHash(), 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"],"mappings":"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","names":["fulfilled","rejected","asDivinerInstance","AbstractSentinel","asSentinelInstance","SentinelConfigSchema","asWitnessInstance","assertEx","forget","PayloadBuilder","isSentinelIntervalAutomation","PayloadWrapper","SentinelIntervalAutomationWrapper","PayloadWrapper","constructor","payload","frequencyMillis","frequency","jsonPayload","undefined","Number","POSITIVE_INFINITY","frequencyUnits","remaining","next","now","Date","previousStart","start","Math","max","nextStart","setStart","consumeRemaining","checkEnd","end","count","setRemaining","obj","SentinelRunner","_automations","onTriggerResult","sentinel","timeoutId","constructor","automations","automation","forget","add","next","Object","values","reduce","previous","current","isSentinelIntervalAutomation","start","Number","POSITIVE_INFINITY","undefined","restart","hash","PayloadBuilder","dataHash","find","entries","key","remove","removeAll","stop","assertEx","now","Date","Math","max","delay","setTimeout","trigger","clearTimeout","update","wrapper","SentinelIntervalAutomationWrapper","jsonPayload","triggerResult","report","MemorySentinel","AbstractSentinel","runner","reportHandler","inPayloads","started","logger","debug","JSON","stringify","job","jobPromise","index","previousResults","tasks","length","generatedPayloads","runJob","result","Object","values","flat","start","timeout","config","automations","SentinelRunner","stop","undefined","inputAddresses","input","Array","isArray","Promise","all","map","inputItem","resolved","resolve","address","processPreviousResults","payloads","inputs","flatMap","emit","module","results","allSettled","task","_a","_b","_c","inPayloadsFound","witness","asWitnessInstance","observed","observe","id","outPayloads","diviner","asDivinerInstance","divined","divine","sentinel","asSentinelInstance","reported","report","Error","finalResult","filter","fulfilled","value","push","throwErrors","errors","rejected","reason","configSchemas","SentinelConfigSchema"]}

package/package.json

@@ -14,26 +14,26 @@
     "@xylabs/forget": "^2.14.0",
     "@xylabs/hex": "^2.14.0",
     "@xylabs/promise": "^2.14.0",
-    "@xyo-network/diviner-model": "~2.89.0-rc.9",
-    "@xyo-network/module-model": "~2.89.0-rc.9",
-    "@xyo-network/payload-builder": "~2.89.0-rc.9",
-    "@xyo-network/payload-model": "~2.89.0-rc.9",
-    "@xyo-network/payload-wrapper": "~2.89.0-rc.9",
-    "@xyo-network/sentinel-abstract": "~2.89.0-rc.9",
-    "@xyo-network/sentinel-model": "~2.89.0-rc.9",
-    "@xyo-network/witness-model": "~2.89.0-rc.9"
+    "@xyo-network/diviner-model": "~2.89.1",
+    "@xyo-network/module-model": "~2.89.1",
+    "@xyo-network/payload-builder": "~2.89.1",
+    "@xyo-network/payload-model": "~2.89.1",
+    "@xyo-network/payload-wrapper": "~2.89.1",
+    "@xyo-network/sentinel-abstract": "~2.89.1",
+    "@xyo-network/sentinel-model": "~2.89.1",
+    "@xyo-network/witness-model": "~2.89.1"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "devDependencies": {
     "@xylabs/delay": "^2.14.0",
     "@xylabs/ts-scripts-yarn3": "^3.2.42",
     "@xylabs/tsconfig": "^3.2.42",
-    "@xyo-network/abstract-witness": "~2.89.0-rc.9",
-    "@xyo-network/account": "~2.89.0-rc.9",
-    "@xyo-network/archivist-memory": "~2.89.0-rc.9",
-    "@xyo-network/id-payload-plugin": "~2.89.0-rc.9",
-    "@xyo-network/node-memory": "~2.89.0-rc.9",
-    "@xyo-network/witness-adhoc": "~2.89.0-rc.9",
+    "@xyo-network/abstract-witness": "~2.89.1",
+    "@xyo-network/account": "~2.89.1",
+    "@xyo-network/archivist-memory": "~2.89.1",
+    "@xyo-network/id-payload-plugin": "~2.89.1",
+    "@xyo-network/node-memory": "~2.89.1",
+    "@xyo-network/witness-adhoc": "~2.89.1",
     "typescript": "^5.3.3"
   },
   "types": "dist/node/index.d.ts",
@@ -74,7 +74,6 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.89.0-rc.9",
-  "type": "module",
-  "stableVersion": "2.88.3"
+  "version": "2.89.1",
+  "type": "module"
 }

package/src/MemorySentinel.ts

@@ -35,7 +35,7 @@ export class MemorySentinel<
     let index = 0
     let previousResults: Record<Address, Payload[]> = {}
     while (index < job.tasks.length) {
-      const generatedPayloads = await this.generateResults(job.tasks[index], previousResults, inPayloads)
+      const generatedPayloads = await this.runJob(job.tasks[index], previousResults, inPayloads)
       previousResults = generatedPayloads
       index++
     }
@@ -48,7 +48,7 @@ export class MemorySentinel<
     if (await super.start(timeout)) {
       if ((this.config.automations?.length ?? 0) > 0) {
         this.runner = new SentinelRunner(this, this.config.automations)
-        await this.runner.start()
+        this.runner.start()
       }
       return true
     }
@@ -63,14 +63,28 @@ export class MemorySentinel<
     return await super.stop(timeout)
   }
 
-  private async generateResults(
+  private async inputAddresses(input: string | string[]): Promise<string[]> {
+    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] : []
+    }
+  }
+
+  private processPreviousResults(payloads: Record<string, Payload[]>, inputs: string[]) {
+    return inputs.flatMap((input) => payloads[input] ?? [])
+  }
+
+  private async runJob(
     tasks: ResolvedTask[],
     previousResults: Record<Address, Payload[]>,
     inPayloads?: Payload[],
   ): Promise<Record<Address, Payload[]>> {
-    this.logger?.debug(`generateResults:tasks: ${JSON.stringify(tasks.length)}`)
-    this.logger?.debug(`generateResults:previous: ${JSON.stringify(previousResults)}`)
-    this.logger?.debug(`generateResults:in: ${JSON.stringify(inPayloads)}`)
+    await this.emit('jobStart', { inPayloads, module: this })
+    this.logger?.debug(`runJob:tasks: ${JSON.stringify(tasks.length)}`)
+    this.logger?.debug(`runJob:previous: ${JSON.stringify(previousResults)}`)
+    this.logger?.debug(`runJob:in: ${JSON.stringify(inPayloads)}`)
     const results: PromiseSettledResult<[Address, Payload[]]>[] = await Promise.allSettled(
       tasks?.map(async (task) => {
         const input = task.input ?? false
@@ -78,20 +92,26 @@ export class MemorySentinel<
           input === true ? inPayloads : input === false ? [] : this.processPreviousResults(previousResults, await this.inputAddresses(input))
         const witness = asWitnessInstance(task.module)
         if (witness) {
+          await this.emit('taskStart', { address: witness.address, inPayloads: inPayloadsFound, module: this })
           const observed = await witness.observe(inPayloadsFound)
           this.logger?.debug(`observed [${witness.id}]: ${JSON.stringify(observed)}`)
+          await this.emit('taskEnd', { address: witness.address, inPayloads: inPayloadsFound, module: this, outPayloads: observed })
           return [witness.address, observed]
         }
         const diviner = asDivinerInstance(task.module)
         if (diviner) {
+          await this.emit('taskStart', { address: diviner.address, inPayloads: inPayloadsFound, module: this })
           const divined = await diviner.divine(inPayloadsFound)
           this.logger?.debug(`divined [${diviner.id}]: ${JSON.stringify(divined)}`)
+          await this.emit('taskEnd', { address: diviner.address, inPayloads: inPayloadsFound, module: this, outPayloads: divined })
           return [diviner.address, divined]
         }
         const sentinel = asSentinelInstance(task.module)
         if (sentinel) {
+          await this.emit('taskStart', { address: sentinel.address, inPayloads: inPayloadsFound, module: this })
           const reported = await sentinel.report(inPayloadsFound)
           this.logger?.debug(`reported [${sentinel.id}]: ${JSON.stringify(reported)}`)
+          await this.emit('taskEnd', { address: sentinel.address, inPayloads: inPayloadsFound, module: this, outPayloads: reported })
           return [sentinel.address, reported]
         }
         throw new Error('Unsupported module type')
@@ -110,19 +130,7 @@ export class MemorySentinel<
       }
     }
     this.logger?.debug(`generateResults:out: ${JSON.stringify(finalResult)}`)
+    await this.emit('jobEnd', { finalResult, inPayloads, module: this })
     return finalResult
   }
-
-  private async inputAddresses(input: string | string[]): Promise<string[]> {
-    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] : []
-    }
-  }
-
-  private processPreviousResults(payloads: Record<string, Payload[]>, inputs: string[]) {
-    return inputs.flatMap((input) => payloads[input] ?? [])
-  }
 }

package/src/SentinelRunner.ts

@@ -61,14 +61,12 @@ export class SentinelRunner {
     this._automations = {}
   }
 
-  async restart() {
+  restart() {
     this.stop()
-    await this.start()
+    this.start()
   }
 
-  async start() {
-    // NOTE: Keep async to match module start signature
-    await Promise.resolve()
+  start() {
     assertEx(this.timeoutId === undefined, 'Already started')
     const automation = this.next
     if (isSentinelIntervalAutomation(automation)) {
@@ -84,7 +82,7 @@ export class SentinelRunner {
             this.stop()
           } finally {
             // No matter what start the next automation
-            await this.start()
+            this.start()
           }
         }, delay)
       }