@sentio/sdk 1.33.1 → 1.33.2

package/lib/core/meter.d.ts

@@ -1,7 +1,7 @@
 import { BaseContext } from './base-context';
 import { Numberish } from './numberish';
 import { Labels, NamedResultDescriptor } from './metadata';
-import { AggregationConfig, MetricConfig } from '../gen';
+import { AggregationConfig, MetricConfig, MetricType } from '../gen';
 import { MapStateStorage } from '../state/state-storage';
 export declare function normalizeName(name: string): string;
 export declare function normalizeKey(name: string): string;
@@ -18,13 +18,8 @@ export declare class CounterOptions {
     description?: string;
     sparse?: boolean;
 }
-declare enum MetricType {
-    Counter = 0,
-    Gauge = 1
-}
 export declare class Metric extends NamedResultDescriptor {
-    type: MetricType;
-    descriptor: MetricConfig;
+    config: MetricConfig;
     constructor(type: MetricType, name: string, option?: MetricOptions);
 }
 export declare class MetricState extends MapStateStorage<Metric> {
@@ -62,4 +57,3 @@ export declare class Meter {
     Counter(name: string): CounterBinding;
     Gauge(name: string): GaugeBinding;
 }
-export {};

package/lib/core/meter.js

@@ -42,19 +42,16 @@ class CounterOptions {
     sparse;
 }
 exports.CounterOptions = CounterOptions;
-var MetricType;
-(function (MetricType) {
-    MetricType[MetricType["Counter"] = 0] = "Counter";
-    MetricType[MetricType["Gauge"] = 1] = "Gauge";
-})(MetricType || (MetricType = {}));
+// enum MetricType {
+//   Counter = 0,
+//   Gauge = 1,
+// }
 class Metric extends metadata_1.NamedResultDescriptor {
-    type;
-    descriptor;
+    config;
     constructor(type, name, option) {
         super(name);
-        this.type = type;
-        this.descriptor = gen_1.MetricConfig.fromPartial({ name: this.name, ...option });
-        const aggregationConfig = this.descriptor.aggregationConfig;
+        this.config = gen_1.MetricConfig.fromPartial({ name: this.name, type: type, ...option });
+        const aggregationConfig = this.config.aggregationConfig;
         if (aggregationConfig && aggregationConfig.intervalInMinutes.length) {
             if (aggregationConfig.intervalInMinutes.length > 1) {
                 console.error('current only support one intervalInMinutes, only first interval will be used for', name);
@@ -71,11 +68,11 @@ class MetricState extends state_storage_1.MapStateStorage {
     getOrRegisterMetric(type, name, option) {
         const metricMap = this.getOrRegister();
         let metric = metricMap.get(name);
-        if (metric && metric.type !== type) {
-            throw Error(`redefine ${name} of metric type ${type} that is previously ${metric.type}`);
+        if (metric && metric.config.type !== type) {
+            throw Error(`redefine ${name} of metric type ${type} that is previously ${metric.config.type}`);
         }
         if (!metric) {
-            if (type === MetricType.Counter) {
+            if (type === gen_1.MetricType.COUNTER) {
                 metric = new Counter(name, option);
             }
             else {
@@ -89,10 +86,10 @@ class MetricState extends state_storage_1.MapStateStorage {
 exports.MetricState = MetricState;
 class Counter extends Metric {
     static register(name, option) {
-        return MetricState.INSTANCE.getOrRegisterMetric(MetricType.Counter, name, option);
+        return MetricState.INSTANCE.getOrRegisterMetric(gen_1.MetricType.COUNTER, name, option);
     }
     constructor(name, option) {
-        super(MetricType.Counter, name, option);
+        super(gen_1.MetricType.COUNTER, name, option);
     }
     add(ctx, value, labels = {}) {
         this.record(ctx, value, labels, true);
@@ -127,14 +124,14 @@ class CounterBinding {
 exports.CounterBinding = CounterBinding;
 class Gauge extends Metric {
     static register(name, option) {
-        return MetricState.INSTANCE.getOrRegisterMetric(MetricType.Gauge, name, option);
+        return MetricState.INSTANCE.getOrRegisterMetric(gen_1.MetricType.GAUGE, name, option);
     }
     constructor(name, option) {
-        super(MetricType.Counter, name, option);
+        super(gen_1.MetricType.GAUGE, name, option);
     }
     record(ctx, value, labels = {}) {
         ctx.res.gauges.push({
-            metadata: ctx.getMetaData(this.descriptor.name, labels),
+            metadata: ctx.getMetaData(this.config.name, labels),
             metricValue: (0, numberish_1.toMetricValue)(value),
             runtimeInfo: undefined,
         });

package/lib/core/meter.js.map

@@ -1 +1 @@
-{"version":3,"file":"meter.js","sourceRoot":"","sources":["../../src/core/meter.ts"],"names":[],"mappings":";;;AACA,2CAAsD;AACtD,yCAA0D;AAC1D,gCAAyE;AACzE,0DAAwD;AAExD,SAAgB,aAAa,CAAC,IAAY;IACxC,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAA;IAC1C,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AAC/C,CAAC;AAHD,sCAGC;AAED,SAAgB,YAAY,CAAC,IAAY;IACvC,IAAI,IAAI,KAAK,QAAQ,EAAE;QACrB,OAAO,SAAS,CAAA;KACjB;IACD,OAAO,aAAa,CAAC,IAAI,CAAC,CAAA;AAC5B,CAAC;AALD,oCAKC;AAED,SAAgB,cAAc,CAAC,IAAY;IACzC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;AAC3B,CAAC;AAFD,wCAEC;AAED,SAAgB,eAAe,CAAC,MAAc;IAC5C,MAAM,UAAU,GAAW,EAAE,CAAA;IAC7B,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;QACxB,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;KAC5D;IACD,OAAO,UAAU,CAAA;AACnB,CAAC;AAND,0CAMC;AAED,MAAa,aAAa;IACxB,IAAI,CAAS;IACb,WAAW,CAAS;IACpB,MAAM,CAAU;IAChB,iBAAiB,CAA6B;CAC/C;AALD,sCAKC;AAED,MAAa,cAAc;IACzB,IAAI,CAAS;IACb,WAAW,CAAS;IACpB,MAAM,CAAU;CACjB;AAJD,wCAIC;AAED,IAAK,UAGJ;AAHD,WAAK,UAAU;IACb,iDAAW,CAAA;IACX,6CAAS,CAAA;AACX,CAAC,EAHI,UAAU,KAAV,UAAU,QAGd;AAED,MAAa,MAAO,SAAQ,gCAAqB;IAC/C,IAAI,CAAY;IAChB,UAAU,CAAc;IACxB,YAAY,IAAgB,EAAE,IAAY,EAAE,MAAsB;QAChE,KAAK,CAAC,IAAI,CAAC,CAAA;QACX,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,UAAU,GAAG,kBAAY,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,CAAA;QAC1E,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAA;QAC3D,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,EAAE;YACnE,IAAI,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClD,OAAO,CAAC,KAAK,CAAC,kFAAkF,EAAE,IAAI,CAAC,CAAA;aACxG;YACD,IAAI,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtF,iBAAiB,CAAC,KAAK,GAAG,CAAC,qBAAe,CAAC,GAAG,EAAE,qBAAe,CAAC,KAAK,CAAC,CAAA;aACvE;SACF;IACH,CAAC;CACF;AAjBD,wBAiBC;AAED,MAAa,WAAY,SAAQ,+BAAuB;IACtD,MAAM,CAAC,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAA;IAEnC,mBAAmB,CAAC,IAAgB,EAAE,IAAY,EAAE,MAAuC;QACzF,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;QACtC,IAAI,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAChC,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;YAClC,MAAM,KAAK,CAAC,YAAY,IAAI,mBAAmB,IAAI,uBAAuB,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;SACzF;QAED,IAAI,CAAC,MAAM,EAAE;YACX,IAAI,IAAI,KAAK,UAAU,CAAC,OAAO,EAAE;gBAC/B,MAAM,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;aACnC;iBAAM;gBACL,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;aACjC;SACF;QACD,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAC3B,OAAO,MAAM,CAAA;IACf,CAAC;;AAnBH,kCAoBC;AAED,MAAa,OAAQ,SAAQ,MAAM;IACjC,MAAM,CAAC,QAAQ,CAAC,IAAY,EAAE,MAAuB;QACnD,OAAO,WAAW,CAAC,QAAQ,CAAC,mBAAmB,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAY,CAAA;IAC9F,CAAC;IAED,YAAY,IAAY,EAAE,MAAsB;QAC9C,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IACzC,CAAC;IAED,GAAG,CAAC,GAAgB,EAAE,KAAgB,EAAE,SAAiB,EAAE;QACzD,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACvC,CAAC;IAED,GAAG,CAAC,GAAgB,EAAE,KAAgB,EAAE,SAAiB,EAAE;QACzD,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;IACxC,CAAC;IAEO,MAAM,CAAC,GAAgB,EAAE,KAAgB,EAAE,MAAc,EAAE,GAAY;QAC7E,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;YACpB,QAAQ,EAAE,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC;YAC5C,WAAW,EAAE,IAAA,yBAAa,EAAC,KAAK,CAAC;YACjC,GAAG,EAAE,GAAG;YACR,WAAW,EAAE,SAAS;SACvB,CAAC,CAAA;IACJ,CAAC;CACF;AAzBD,0BAyBC;AAED,MAAa,cAAc;IACR,GAAG,CAAa;IAChB,OAAO,CAAS;IAEjC,YAAY,IAAY,EAAE,GAAgB;QACxC,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;QAChC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IAED,GAAG,CAAC,KAAgB,EAAE,SAAiB,EAAE;QACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;IAC3C,CAAC;IAED,GAAG,CAAC,KAAgB,EAAE,SAAiB,EAAE;QACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;IAC3C,CAAC;CACF;AAhBD,wCAgBC;AAED,MAAa,KAAM,SAAQ,MAAM;IAC/B,MAAM,CAAC,QAAQ,CAAC,IAAY,EAAE,MAAsB;QAClD,OAAO,WAAW,CAAC,QAAQ,CAAC,mBAAmB,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAU,CAAA;IAC1F,CAAC;IAED,YAAY,IAAY,EAAE,MAAsB;QAC9C,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IACzC,CAAC;IAED,MAAM,CAAC,GAAgB,EAAE,KAAgB,EAAE,SAAiB,EAAE;QAC5D,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;YAClB,QAAQ,EAAE,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;YACvD,WAAW,EAAE,IAAA,yBAAa,EAAC,KAAK,CAAC;YACjC,WAAW,EAAE,SAAS;SACvB,CAAC,CAAA;IACJ,CAAC;CACF;AAhBD,sBAgBC;AAED,MAAa,YAAY;IACN,KAAK,CAAO;IACZ,GAAG,CAAa;IAEjC,YAAY,IAAY,EAAE,GAAgB;QACxC,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,CAAA;QAC5B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IAED,MAAM,CAAC,KAAgB,EAAE,SAAiB,EAAE;QAC1C,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;IAC5C,CAAC;CACF;AAZD,oCAYC;AAED,MAAa,KAAK;IACC,GAAG,CAAa;IAEjC,YAAY,GAAgB;QAC1B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IAED,OAAO,CAAC,IAAY;QAClB,OAAO,IAAI,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;IAC3C,CAAC;IAED,KAAK,CAAC,IAAY;QAChB,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;IACzC,CAAC;CACF;AAdD,sBAcC","sourcesContent":["import { BaseContext } from './base-context'\nimport { Numberish, toMetricValue } from './numberish'\nimport { Labels, NamedResultDescriptor } from './metadata'\nimport { AggregationConfig, AggregationType, MetricConfig } from '../gen'\nimport { MapStateStorage } from '../state/state-storage'\n\nexport function normalizeName(name: string): string {\n  const regex = new RegExp('![_.a-zA-Z0-9]')\n  return name.slice(0, 100).replace(regex, '_')\n}\n\nexport function normalizeKey(name: string): string {\n  if (name === 'labels') {\n    return 'labels_'\n  }\n  return normalizeName(name)\n}\n\nexport function normalizeValue(name: string): string {\n  return name.slice(0, 100)\n}\n\nexport function normalizeLabels(labels: Labels): Labels {\n  const normLabels: Labels = {}\n  for (const key in labels) {\n    normLabels[normalizeKey(key)] = normalizeValue(labels[key])\n  }\n  return normLabels\n}\n\nexport class MetricOptions {\n  unit?: string\n  description?: string\n  sparse?: boolean\n  aggregationConfig?: Partial<AggregationConfig>\n}\n\nexport class CounterOptions {\n  unit?: string\n  description?: string\n  sparse?: boolean\n}\n\nenum MetricType {\n  Counter = 0,\n  Gauge = 1,\n}\n\nexport class Metric extends NamedResultDescriptor {\n  type: MetricType\n  descriptor: MetricConfig\n  constructor(type: MetricType, name: string, option?: MetricOptions) {\n    super(name)\n    this.type = type\n    this.descriptor = MetricConfig.fromPartial({ name: this.name, ...option })\n    const aggregationConfig = this.descriptor.aggregationConfig\n    if (aggregationConfig && aggregationConfig.intervalInMinutes.length) {\n      if (aggregationConfig.intervalInMinutes.length > 1) {\n        console.error('current only support one intervalInMinutes, only first interval will be used for', name)\n      }\n      if (aggregationConfig.intervalInMinutes[0] > 0 && aggregationConfig.types.length === 0) {\n        aggregationConfig.types = [AggregationType.SUM, AggregationType.COUNT]\n      }\n    }\n  }\n}\n\nexport class MetricState extends MapStateStorage<Metric> {\n  static INSTANCE = new MetricState()\n\n  getOrRegisterMetric(type: MetricType, name: string, option?: CounterOptions | MetricOptions): Metric {\n    const metricMap = this.getOrRegister()\n    let metric = metricMap.get(name)\n    if (metric && metric.type !== type) {\n      throw Error(`redefine ${name} of metric type ${type} that is previously ${metric.type}`)\n    }\n\n    if (!metric) {\n      if (type === MetricType.Counter) {\n        metric = new Counter(name, option)\n      } else {\n        metric = new Gauge(name, option)\n      }\n    }\n    metricMap.set(name, metric)\n    return metric\n  }\n}\n\nexport class Counter extends Metric {\n  static register(name: string, option?: CounterOptions): Counter {\n    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.Counter, name, option) as Counter\n  }\n\n  constructor(name: string, option?: MetricOptions) {\n    super(MetricType.Counter, name, option)\n  }\n\n  add(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    this.record(ctx, value, labels, true)\n  }\n\n  sub(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    this.record(ctx, value, labels, false)\n  }\n\n  private record(ctx: BaseContext, value: Numberish, labels: Labels, add: boolean) {\n    ctx.res.counters.push({\n      metadata: ctx.getMetaData(this.name, labels),\n      metricValue: toMetricValue(value),\n      add: add,\n      runtimeInfo: undefined,\n    })\n  }\n}\n\nexport class CounterBinding {\n  private readonly ctx: BaseContext\n  private readonly counter: Counter\n\n  constructor(name: string, ctx: BaseContext) {\n    this.counter = new Counter(name)\n    this.ctx = ctx\n  }\n\n  add(value: Numberish, labels: Labels = {}) {\n    this.counter.add(this.ctx, value, labels)\n  }\n\n  sub(value: Numberish, labels: Labels = {}) {\n    this.counter.sub(this.ctx, value, labels)\n  }\n}\n\nexport class Gauge extends Metric {\n  static register(name: string, option?: MetricOptions): Gauge {\n    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.Gauge, name, option) as Gauge\n  }\n\n  constructor(name: string, option?: MetricOptions) {\n    super(MetricType.Counter, name, option)\n  }\n\n  record(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    ctx.res.gauges.push({\n      metadata: ctx.getMetaData(this.descriptor.name, labels),\n      metricValue: toMetricValue(value),\n      runtimeInfo: undefined,\n    })\n  }\n}\n\nexport class GaugeBinding {\n  private readonly gauge: Gauge\n  private readonly ctx: BaseContext\n\n  constructor(name: string, ctx: BaseContext) {\n    this.gauge = new Gauge(name)\n    this.ctx = ctx\n  }\n\n  record(value: Numberish, labels: Labels = {}) {\n    this.gauge.record(this.ctx, value, labels)\n  }\n}\n\nexport class Meter {\n  private readonly ctx: BaseContext\n\n  constructor(ctx: BaseContext) {\n    this.ctx = ctx\n  }\n\n  Counter(name: string): CounterBinding {\n    return new CounterBinding(name, this.ctx)\n  }\n\n  Gauge(name: string): GaugeBinding {\n    return new GaugeBinding(name, this.ctx)\n  }\n}\n"]}
+{"version":3,"file":"meter.js","sourceRoot":"","sources":["../../src/core/meter.ts"],"names":[],"mappings":"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","sourcesContent":["import { BaseContext } from './base-context'\nimport { Numberish, toMetricValue } from './numberish'\nimport { Labels, NamedResultDescriptor } from './metadata'\nimport { AggregationConfig, AggregationType, MetricConfig, MetricType } from '../gen'\nimport { MapStateStorage } from '../state/state-storage'\n\nexport function normalizeName(name: string): string {\n  const regex = new RegExp('![_.a-zA-Z0-9]')\n  return name.slice(0, 100).replace(regex, '_')\n}\n\nexport function normalizeKey(name: string): string {\n  if (name === 'labels') {\n    return 'labels_'\n  }\n  return normalizeName(name)\n}\n\nexport function normalizeValue(name: string): string {\n  return name.slice(0, 100)\n}\n\nexport function normalizeLabels(labels: Labels): Labels {\n  const normLabels: Labels = {}\n  for (const key in labels) {\n    normLabels[normalizeKey(key)] = normalizeValue(labels[key])\n  }\n  return normLabels\n}\n\nexport class MetricOptions {\n  unit?: string\n  description?: string\n  sparse?: boolean\n  aggregationConfig?: Partial<AggregationConfig>\n}\n\nexport class CounterOptions {\n  unit?: string\n  description?: string\n  sparse?: boolean\n}\n\n// enum MetricType {\n//   Counter = 0,\n//   Gauge = 1,\n// }\n\nexport class Metric extends NamedResultDescriptor {\n  config: MetricConfig\n  constructor(type: MetricType, name: string, option?: MetricOptions) {\n    super(name)\n    this.config = MetricConfig.fromPartial({ name: this.name, type: type, ...option })\n    const aggregationConfig = this.config.aggregationConfig\n    if (aggregationConfig && aggregationConfig.intervalInMinutes.length) {\n      if (aggregationConfig.intervalInMinutes.length > 1) {\n        console.error('current only support one intervalInMinutes, only first interval will be used for', name)\n      }\n      if (aggregationConfig.intervalInMinutes[0] > 0 && aggregationConfig.types.length === 0) {\n        aggregationConfig.types = [AggregationType.SUM, AggregationType.COUNT]\n      }\n    }\n  }\n}\n\nexport class MetricState extends MapStateStorage<Metric> {\n  static INSTANCE = new MetricState()\n\n  getOrRegisterMetric(type: MetricType, name: string, option?: CounterOptions | MetricOptions): Metric {\n    const metricMap = this.getOrRegister()\n    let metric = metricMap.get(name)\n    if (metric && metric.config.type !== type) {\n      throw Error(`redefine ${name} of metric type ${type} that is previously ${metric.config.type}`)\n    }\n\n    if (!metric) {\n      if (type === MetricType.COUNTER) {\n        metric = new Counter(name, option)\n      } else {\n        metric = new Gauge(name, option)\n      }\n    }\n    metricMap.set(name, metric)\n    return metric\n  }\n}\n\nexport class Counter extends Metric {\n  static register(name: string, option?: CounterOptions): Counter {\n    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.COUNTER, name, option) as Counter\n  }\n\n  constructor(name: string, option?: MetricOptions) {\n    super(MetricType.COUNTER, name, option)\n  }\n\n  add(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    this.record(ctx, value, labels, true)\n  }\n\n  sub(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    this.record(ctx, value, labels, false)\n  }\n\n  private record(ctx: BaseContext, value: Numberish, labels: Labels, add: boolean) {\n    ctx.res.counters.push({\n      metadata: ctx.getMetaData(this.name, labels),\n      metricValue: toMetricValue(value),\n      add: add,\n      runtimeInfo: undefined,\n    })\n  }\n}\n\nexport class CounterBinding {\n  private readonly ctx: BaseContext\n  private readonly counter: Counter\n\n  constructor(name: string, ctx: BaseContext) {\n    this.counter = new Counter(name)\n    this.ctx = ctx\n  }\n\n  add(value: Numberish, labels: Labels = {}) {\n    this.counter.add(this.ctx, value, labels)\n  }\n\n  sub(value: Numberish, labels: Labels = {}) {\n    this.counter.sub(this.ctx, value, labels)\n  }\n}\n\nexport class Gauge extends Metric {\n  static register(name: string, option?: MetricOptions): Gauge {\n    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.GAUGE, name, option) as Gauge\n  }\n\n  constructor(name: string, option?: MetricOptions) {\n    super(MetricType.GAUGE, name, option)\n  }\n\n  record(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    ctx.res.gauges.push({\n      metadata: ctx.getMetaData(this.config.name, labels),\n      metricValue: toMetricValue(value),\n      runtimeInfo: undefined,\n    })\n  }\n}\n\nexport class GaugeBinding {\n  private readonly gauge: Gauge\n  private readonly ctx: BaseContext\n\n  constructor(name: string, ctx: BaseContext) {\n    this.gauge = new Gauge(name)\n    this.ctx = ctx\n  }\n\n  record(value: Numberish, labels: Labels = {}) {\n    this.gauge.record(this.ctx, value, labels)\n  }\n}\n\nexport class Meter {\n  private readonly ctx: BaseContext\n\n  constructor(ctx: BaseContext) {\n    this.ctx = ctx\n  }\n\n  Counter(name: string): CounterBinding {\n    return new CounterBinding(name, this.ctx)\n  }\n\n  Gauge(name: string): GaugeBinding {\n    return new GaugeBinding(name, this.ctx)\n  }\n}\n"]}

package/lib/core/numberish.js

@@ -20,11 +20,11 @@ function toMetricValue(value) {
         }
         else {
             if (value.isNaN()) {
-                throw new Error('Record NaN value');
+                throw new Error('Cannot record NaN value');
             }
             if (!value.isFinite()) {
                 // NaN also not finite
-                throw new Error('Record infinite value');
+                throw new Error('Cannot record infinite value');
             }
             return gen_1.MetricValue.fromPartial({
                 bigDecimal: value.toString(), // e.g. -7.350918e-428
@@ -41,6 +41,14 @@ function toMetricValue(value) {
             bigInteger: toBigInteger(value),
         });
     }
+    if (typeof value === 'number') {
+        if (Number.isNaN(value)) {
+            throw new Error('Cannot record NaN value');
+        }
+        if (!Number.isFinite(value)) {
+            throw new Error('Cannot record infinite value');
+        }
+    }
     return gen_1.MetricValue.fromPartial({
         doubleValue: Number(value),
     });

package/lib/core/numberish.js.map

@@ -1 +1 @@
-{"version":3,"file":"numberish.js","sourceRoot":"","sources":["../../src/core/numberish.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAClC,gCAAgD;AAChD,wBAA8B;AAC9B,kDAA0C;AAI1C,SAAgB,aAAa,CAAC,KAAgB;IAC5C,IAAI,KAAK,YAAY,kBAAS,EAAE;QAC9B,OAAO,iBAAW,CAAC,WAAW,CAAC;YAC7B,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;SAC3C,CAAC,CAAA;KACH;IACD,IAAI,KAAK,YAAY,aAAU,EAAE;QAC/B,uCAAuC;QACvC,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE;YACrB,OAAO,iBAAW,CAAC,WAAW,CAAC;gBAC7B,UAAU,EAAE,sBAAsB,CAAC,KAAK,CAAC;aAC1C,CAAC,CAAA;SACH;aAAM;YACL,IAAI,KAAK,CAAC,KAAK,EAAE,EAAE;gBACjB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;aACpC;YACD,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE;gBACrB,sBAAsB;gBACtB,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;aACzC;YACD,OAAO,iBAAW,CAAC,WAAW,CAAC;gBAC7B,UAAU,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,sBAAsB;aACrD,CAAC,CAAA;SACH;KACF;IACD,IAAI,WAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QAClB,OAAO,iBAAW,CAAC,WAAW,CAAC;YAC7B,UAAU,EAAE,cAAc,CAAC,KAAK,CAAC;SAClC,CAAC,CAAA;KACH;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;QACxD,OAAO,iBAAW,CAAC,WAAW,CAAC;YAC7B,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC;SAChC,CAAC,CAAA;KACH;IAED,OAAO,iBAAW,CAAC,WAAW,CAAC;QAC7B,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC;KAC3B,CAAC,CAAA;AACJ,CAAC;AAvCD,sCAuCC;AAED,SAAS,sBAAsB,CAAC,CAAa;IAC3C,MAAM,QAAQ,GAAG,CAAC,CAAC,UAAU,EAAE,CAAA;IAC/B,IAAI,QAAQ,EAAE;QACZ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;KACZ;IACD,OAAO,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAA;AAClD,CAAC;AAED,SAAS,cAAc,CAAC,CAAK;IAC3B,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;IAC1B,IAAI,QAAQ,EAAE;QACZ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;KACZ;IACD,OAAO,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAA;AAClD,CAAC;AAED,SAAS,eAAe,CAAC,CAAkB;IACzC,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,CAAA;IACtB,IAAI,QAAQ,EAAE;QACZ,CAAC,GAAG,CAAC,CAAC,CAAA;KACP;IACD,OAAO,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAA;AAClD,CAAC;AAED,SAAgB,YAAY,CAAC,CAAY;IACvC,IAAI,CAAC,YAAY,aAAU,EAAE;QAC3B,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAA;KACjC;IACD,IAAI,CAAC,YAAY,WAAE,EAAE;QACnB,OAAO,cAAc,CAAC,CAAC,CAAC,CAAA;KACzB;IACD,IAAI,CAAC,YAAY,kBAAS,EAAE;QAC1B,OAAO,eAAe,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;KACrC;IACD,OAAO,eAAe,CAAC,CAAC,CAAC,CAAA;IAEzB,uCAAuC;IACvC,kBAAkB;IAClB,wBAAwB;IACxB,aAAa;IACb,0BAA0B;IAC1B,IAAI;IACJ,EAAE;IACF,WAAW;IACX,sDAAsD;IACtD,IAAI;AACN,CAAC;AAtBD,oCAsBC;AAED,SAAS,eAAe,CAAC,GAAW,EAAE,QAAiB;IACrD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;QACxB,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;KAChB;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAEtC,OAAO;QACL,QAAQ,EAAE,QAAQ;QAClB,IAAI,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;KAC7B,CAAA;AACH,CAAC","sourcesContent":["import { BigNumber } from 'ethers'\nimport { BigInteger, MetricValue } from '../gen'\nimport { BigDecimal } from '.'\nimport { BN } from '@project-serum/anchor'\n\nexport type Numberish = number | BigNumber | bigint | BigDecimal\n\nexport function toMetricValue(value: Numberish): MetricValue {\n  if (value instanceof BigNumber) {\n    return MetricValue.fromPartial({\n      bigInteger: toBigInteger(value.toBigInt()),\n    })\n  }\n  if (value instanceof BigDecimal) {\n    // Carefully consider the use case here\n    if (value.isInteger()) {\n      return MetricValue.fromPartial({\n        bigInteger: bigDecimalToBigInteger(value),\n      })\n    } else {\n      if (value.isNaN()) {\n        throw new Error('Record NaN value')\n      }\n      if (!value.isFinite()) {\n        // NaN also not finite\n        throw new Error('Record infinite value')\n      }\n      return MetricValue.fromPartial({\n        bigDecimal: value.toString(), // e.g. -7.350918e-428\n      })\n    }\n  }\n  if (BN.isBN(value)) {\n    return MetricValue.fromPartial({\n      bigInteger: bnToBigInteger(value),\n    })\n  }\n  if (typeof value === 'bigint' || Number.isInteger(value)) {\n    return MetricValue.fromPartial({\n      bigInteger: toBigInteger(value),\n    })\n  }\n\n  return MetricValue.fromPartial({\n    doubleValue: Number(value),\n  })\n}\n\nfunction bigDecimalToBigInteger(a: BigDecimal): BigInteger {\n  const negative = a.isNegative()\n  if (negative) {\n    a = a.abs()\n  }\n  return hexToBigInteger(a.toString(16), negative)\n}\n\nfunction bnToBigInteger(a: BN): BigInteger {\n  const negative = a.isNeg()\n  if (negative) {\n    a = a.abs()\n  }\n  return hexToBigInteger(a.toString(16), negative)\n}\n\nfunction intToBigInteger(a: bigint | number): BigInteger {\n  const negative = a < 0\n  if (negative) {\n    a = -a\n  }\n  return hexToBigInteger(a.toString(16), negative)\n}\n\nexport function toBigInteger(a: Numberish): BigInteger {\n  if (a instanceof BigDecimal) {\n    return bigDecimalToBigInteger(a)\n  }\n  if (a instanceof BN) {\n    return bnToBigInteger(a)\n  }\n  if (a instanceof BigNumber) {\n    return intToBigInteger(a.toBigInt())\n  }\n  return intToBigInteger(a)\n\n  // Following code is actually very slow\n  // while (a > 0) {\n  //   const d = a & 0xffn\n  //   a >>= 8n\n  //   value.push(Number(d))\n  // }\n  //\n  // return {\n  //   negative, value: new Uint8Array(value.reverse()),\n  // }\n}\n\nfunction hexToBigInteger(hex: string, negative: boolean): BigInteger {\n  if (hex.length % 2 === 1) {\n    hex = '0' + hex\n  }\n  const buffer = Buffer.from(hex, 'hex')\n\n  return {\n    negative: negative,\n    data: new Uint8Array(buffer),\n  }\n}\n"]}
+{"version":3,"file":"numberish.js","sourceRoot":"","sources":["../../src/core/numberish.ts"],"names":[],"mappings":"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","sourcesContent":["import { BigNumber } from 'ethers'\nimport { BigInteger, MetricValue } from '../gen'\nimport { BigDecimal } from '.'\nimport { BN } from '@project-serum/anchor'\n\nexport type Numberish = number | BigNumber | bigint | BigDecimal\n\nexport function toMetricValue(value: Numberish): MetricValue {\n  if (value instanceof BigNumber) {\n    return MetricValue.fromPartial({\n      bigInteger: toBigInteger(value.toBigInt()),\n    })\n  }\n  if (value instanceof BigDecimal) {\n    // Carefully consider the use case here\n    if (value.isInteger()) {\n      return MetricValue.fromPartial({\n        bigInteger: bigDecimalToBigInteger(value),\n      })\n    } else {\n      if (value.isNaN()) {\n        throw new Error('Cannot record NaN value')\n      }\n      if (!value.isFinite()) {\n        // NaN also not finite\n        throw new Error('Cannot record infinite value')\n      }\n      return MetricValue.fromPartial({\n        bigDecimal: value.toString(), // e.g. -7.350918e-428\n      })\n    }\n  }\n  if (BN.isBN(value)) {\n    return MetricValue.fromPartial({\n      bigInteger: bnToBigInteger(value),\n    })\n  }\n  if (typeof value === 'bigint' || Number.isInteger(value)) {\n    return MetricValue.fromPartial({\n      bigInteger: toBigInteger(value),\n    })\n  }\n\n  if (typeof value === 'number') {\n    if (Number.isNaN(value)) {\n      throw new Error('Cannot record NaN value')\n    }\n    if (!Number.isFinite(value)) {\n      throw new Error('Cannot record infinite value')\n    }\n  }\n\n  return MetricValue.fromPartial({\n    doubleValue: Number(value),\n  })\n}\n\nfunction bigDecimalToBigInteger(a: BigDecimal): BigInteger {\n  const negative = a.isNegative()\n  if (negative) {\n    a = a.abs()\n  }\n  return hexToBigInteger(a.toString(16), negative)\n}\n\nfunction bnToBigInteger(a: BN): BigInteger {\n  const negative = a.isNeg()\n  if (negative) {\n    a = a.abs()\n  }\n  return hexToBigInteger(a.toString(16), negative)\n}\n\nfunction intToBigInteger(a: bigint | number): BigInteger {\n  const negative = a < 0\n  if (negative) {\n    a = -a\n  }\n  return hexToBigInteger(a.toString(16), negative)\n}\n\nexport function toBigInteger(a: Numberish): BigInteger {\n  if (a instanceof BigDecimal) {\n    return bigDecimalToBigInteger(a)\n  }\n  if (a instanceof BN) {\n    return bnToBigInteger(a)\n  }\n  if (a instanceof BigNumber) {\n    return intToBigInteger(a.toBigInt())\n  }\n  return intToBigInteger(a)\n\n  // Following code is actually very slow\n  // while (a > 0) {\n  //   const d = a & 0xffn\n  //   a >>= 8n\n  //   value.push(Number(d))\n  // }\n  //\n  // return {\n  //   negative, value: new Uint8Array(value.reverse()),\n  // }\n}\n\nfunction hexToBigInteger(hex: string, negative: boolean): BigInteger {\n  if (hex.length % 2 === 1) {\n    hex = '0' + hex\n  }\n  const buffer = Buffer.from(hex, 'hex')\n\n  return {\n    negative: negative,\n    data: new Uint8Array(buffer),\n  }\n}\n"]}

package/lib/gen/chainquery/protos/chainquery.d.ts

@@ -56,8 +56,9 @@ export interface EvmSQLQueryRequest {
 }
 export interface EvmGetHeaderRequest {
     network: string;
-    fromBlock: Long;
-    toBlock: Long;
+    fromBlock?: Long | undefined;
+    toBlock?: Long | undefined;
+    blockNumbers: Long[];
 }
 export interface EvmQueryResponse {
     rows: string[];
@@ -357,15 +358,37 @@ export declare const EvmQueryDefinition: {
             readonly responseStream: false;
             readonly options: {};
         };
+        readonly evmHintHeaderCache: {
+            readonly name: "EvmHintHeaderCache";
+            readonly requestType: {
+                encode(message: EvmGetHeaderRequest, writer?: _m0.Writer): _m0.Writer;
+                decode(input: _m0.Reader | Uint8Array, length?: number): EvmGetHeaderRequest;
+                fromJSON(object: any): EvmGetHeaderRequest;
+                toJSON(message: EvmGetHeaderRequest): unknown;
+                fromPartial(object: DeepPartial<EvmGetHeaderRequest>): EvmGetHeaderRequest;
+            };
+            readonly requestStream: false;
+            readonly responseType: {
+                encode(_: VoidResponse, writer?: _m0.Writer): _m0.Writer;
+                decode(input: _m0.Reader | Uint8Array, length?: number): VoidResponse;
+                fromJSON(_: any): VoidResponse;
+                toJSON(_: VoidResponse): unknown;
+                fromPartial(_: DeepPartial<VoidResponse>): VoidResponse;
+            };
+            readonly responseStream: false;
+            readonly options: {};
+        };
     };
 };
 export interface EvmQueryServiceImplementation<CallContextExt = {}> {
     evmSQLQuery(request: EvmSQLQueryRequest, context: CallContext & CallContextExt): ServerStreamingMethodResult<DeepPartial<EvmQueryResponse>>;
     evmGetHeader(request: EvmGetHeaderRequest, context: CallContext & CallContextExt): Promise<DeepPartial<EvmQueryResponse>>;
+    evmHintHeaderCache(request: EvmGetHeaderRequest, context: CallContext & CallContextExt): Promise<DeepPartial<VoidResponse>>;
 }
 export interface EvmQueryClient<CallOptionsExt = {}> {
     evmSQLQuery(request: DeepPartial<EvmSQLQueryRequest>, options?: CallOptions & CallOptionsExt): AsyncIterable<EvmQueryResponse>;
     evmGetHeader(request: DeepPartial<EvmGetHeaderRequest>, options?: CallOptions & CallOptionsExt): Promise<EvmQueryResponse>;
+    evmHintHeaderCache(request: DeepPartial<EvmGetHeaderRequest>, options?: CallOptions & CallOptionsExt): Promise<VoidResponse>;
 }
 declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {

package/lib/gen/chainquery/protos/chainquery.js

@@ -802,19 +802,29 @@ exports.EvmSQLQueryRequest = {
     },
 };
 function createBaseEvmGetHeaderRequest() {
-    return { network: "", fromBlock: long_1.default.UZERO, toBlock: long_1.default.UZERO };
+    return {
+        network: "",
+        fromBlock: undefined,
+        toBlock: undefined,
+        blockNumbers: [],
+    };
 }
 exports.EvmGetHeaderRequest = {
     encode(message, writer = minimal_1.default.Writer.create()) {
         if (message.network !== "") {
             writer.uint32(10).string(message.network);
         }
-        if (!message.fromBlock.isZero()) {
+        if (message.fromBlock !== undefined) {
             writer.uint32(16).uint64(message.fromBlock);
         }
-        if (!message.toBlock.isZero()) {
+        if (message.toBlock !== undefined) {
             writer.uint32(24).uint64(message.toBlock);
         }
+        writer.uint32(34).fork();
+        for (const v of message.blockNumbers) {
+            writer.uint64(v);
+        }
+        writer.ldelim();
         return writer;
     },
     decode(input, length) {
@@ -833,6 +843,17 @@ exports.EvmGetHeaderRequest = {
                 case 3:
                     message.toBlock = reader.uint64();
                     break;
+                case 4:
+                    if ((tag & 7) === 2) {
+                        const end2 = reader.uint32() + reader.pos;
+                        while (reader.pos < end2) {
+                            message.blockNumbers.push(reader.uint64());
+                        }
+                    }
+                    else {
+                        message.blockNumbers.push(reader.uint64());
+                    }
+                    break;
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -845,19 +866,28 @@ exports.EvmGetHeaderRequest = {
             network: isSet(object.network) ? String(object.network) : "",
             fromBlock: isSet(object.fromBlock)
                 ? long_1.default.fromValue(object.fromBlock)
-                : long_1.default.UZERO,
+                : undefined,
             toBlock: isSet(object.toBlock)
                 ? long_1.default.fromValue(object.toBlock)
-                : long_1.default.UZERO,
+                : undefined,
+            blockNumbers: Array.isArray(object?.blockNumbers)
+                ? object.blockNumbers.map((e) => long_1.default.fromValue(e))
+                : [],
         };
     },
     toJSON(message) {
         const obj = {};
         message.network !== undefined && (obj.network = message.network);
         message.fromBlock !== undefined &&
-            (obj.fromBlock = (message.fromBlock || long_1.default.UZERO).toString());
+            (obj.fromBlock = (message.fromBlock || undefined).toString());
         message.toBlock !== undefined &&
-            (obj.toBlock = (message.toBlock || long_1.default.UZERO).toString());
+            (obj.toBlock = (message.toBlock || undefined).toString());
+        if (message.blockNumbers) {
+            obj.blockNumbers = message.blockNumbers.map((e) => (e || long_1.default.UZERO).toString());
+        }
+        else {
+            obj.blockNumbers = [];
+        }
         return obj;
     },
     fromPartial(object) {
@@ -866,11 +896,13 @@ exports.EvmGetHeaderRequest = {
         message.fromBlock =
             object.fromBlock !== undefined && object.fromBlock !== null
                 ? long_1.default.fromValue(object.fromBlock)
-                : long_1.default.UZERO;
+                : undefined;
         message.toBlock =
             object.toBlock !== undefined && object.toBlock !== null
                 ? long_1.default.fromValue(object.toBlock)
-                : long_1.default.UZERO;
+                : undefined;
+        message.blockNumbers =
+            object.blockNumbers?.map((e) => long_1.default.fromValue(e)) || [];
         return message;
     },
 };
@@ -1023,6 +1055,14 @@ exports.EvmQueryDefinition = {
             responseStream: false,
             options: {},
         },
+        evmHintHeaderCache: {
+            name: "EvmHintHeaderCache",
+            requestType: exports.EvmGetHeaderRequest,
+            requestStream: false,
+            responseType: exports.VoidResponse,
+            responseStream: false,
+            options: {},
+        },
     },
 };
 if (minimal_1.default.util.Long !== long_1.default) {