@sentio/sdk 2.1.2 → 2.1.3-rc.1

package/lib/aptos/tests/souffl3.js

@@ -1,9 +1,8 @@
 import { AptosAccountProcessor, defaultMoveCoder } from '@sentio/sdk/aptos';
-import { AccountEventTracker } from '@sentio/sdk';
 import { SouffleChefCampaign, CandyMachine } from './types/souffle.js';
 import { token } from '../builtin/0x3.js';
 import { aptos_account, voting } from '../builtin/0x1.js';
-const accountTracker = AccountEventTracker.register('pull');
+// const accountTracker = AccountEventTracker.register('pull')
 SouffleChefCampaign.bind({ startVersion: 3212312n })
     .onEntryPullTokenV2((call, ctx) => {
     ctx.meter.Counter('call_num').add(1);
@@ -11,7 +10,7 @@ SouffleChefCampaign.bind({ startVersion: 3212312n })
 })
     .onEventPullTokenEvent((evt, ctx) => {
     ctx.meter.Counter('burned').add(1);
-    accountTracker.trackEvent(ctx, { distinctId: ctx.transaction.sender });
+    ctx.eventLogger.emit('pull', { distinctId: ctx.transaction.sender });
 })
     .onEvent((event, ctx) => {
     ctx.meter.Counter('evt_num').add(1);

package/lib/aptos/tests/souffl3.js.map

@@ -1 +1 @@
-{"version":3,"file":"souffl3.js","sourceRoot":"","sources":["../../../src/aptos/tests/souffl3.ts"],"names":[],"mappings":"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","sourcesContent":["import { AptosAccountProcessor, defaultMoveCoder } from '@sentio/sdk/aptos'\nimport { AccountEventTracker } from '@sentio/sdk'\nimport { SouffleChefCampaign, CandyMachine } from './types/souffle.js'\nimport { token } from '../builtin/0x3.js'\nimport { aptos_account, voting } from '../builtin/0x1.js'\n\nconst accountTracker = AccountEventTracker.register('pull')\n\nSouffleChefCampaign.bind({ startVersion: 3212312n })\n  .onEntryPullTokenV2((call: SouffleChefCampaign.PullTokenV2Payload, ctx) => {\n    ctx.meter.Counter('call_num').add(1)\n    ctx.meter.Counter('pulled').add(call.arguments_decoded[3])\n  })\n  .onEventPullTokenEvent((evt, ctx) => {\n    ctx.meter.Counter('burned').add(1)\n    accountTracker.trackEvent(ctx, { distinctId: ctx.transaction.sender })\n  })\n  .onEvent(\n    (event, ctx) => {\n      ctx.meter.Counter('evt_num').add(1)\n    },\n    {\n      type: '0x1::coin::DepositEvent',\n    }\n  )\n  .onTransaction((txn, ctx) => {\n    const events = defaultMoveCoder().filterAndDecodeEvents<token.DepositEvent>('0x3::token::DepositEvent', txn.events)\n    for (const event of events) {\n      // const depositEventInstance = DEFAULT_TYPE_REGISTRY.decodeEvent(event) as DepositEventInstance\n      ctx.meter.Counter('deposit_token_count').add(event.data_decoded.amount)\n    }\n  })\n\nCandyMachine.bind().onEntryPullToken((call: CandyMachine.PullTokenPayload, ctx) => {\n  ctx.meter.Counter('pulled').add(call.arguments[2])\n})\n\ntoken.bind().onEventDepositEvent((evt: token.DepositEventInstance, ctx) => {\n  ctx.meter.Gauge('version').record(evt.data_decoded.id.property_version)\n  ctx.meter.Counter('deposit').add(evt.data_decoded.amount, { token: evt.data_decoded.id.token_data_id.name })\n})\n\nvoting.bind().onEventCreateProposalEvent((evt, ctx) => {\n  ctx.meter.Gauge('size').record(evt.data_decoded.metadata.data.length)\n})\n\nAptosAccountProcessor.bind({ address: '0x1' }).onTimeInterval((resources, ctx) => {\n  ctx.meter.Counter('onTimer').add(1)\n}, 10000)\n\naptos_account.bind().onEntryCreateAccount(\n  (call, ctx) => {\n    ctx.meter.Counter('xx').add(1)\n  },\n  undefined,\n  { resourceChanges: true }\n)\n"]}
+{"version":3,"file":"souffl3.js","sourceRoot":"","sources":["../../../src/aptos/tests/souffl3.ts"],"names":[],"mappings":"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","sourcesContent":["import { AptosAccountProcessor, defaultMoveCoder } from '@sentio/sdk/aptos'\nimport { SouffleChefCampaign, CandyMachine } from './types/souffle.js'\nimport { token } from '../builtin/0x3.js'\nimport { aptos_account, voting } from '../builtin/0x1.js'\n\n// const accountTracker = AccountEventTracker.register('pull')\n\nSouffleChefCampaign.bind({ startVersion: 3212312n })\n  .onEntryPullTokenV2((call: SouffleChefCampaign.PullTokenV2Payload, ctx) => {\n    ctx.meter.Counter('call_num').add(1)\n    ctx.meter.Counter('pulled').add(call.arguments_decoded[3])\n  })\n  .onEventPullTokenEvent((evt, ctx) => {\n    ctx.meter.Counter('burned').add(1)\n    ctx.eventLogger.emit('pull', { distinctId: ctx.transaction.sender })\n  })\n  .onEvent(\n    (event, ctx) => {\n      ctx.meter.Counter('evt_num').add(1)\n    },\n    {\n      type: '0x1::coin::DepositEvent',\n    }\n  )\n  .onTransaction((txn, ctx) => {\n    const events = defaultMoveCoder().filterAndDecodeEvents<token.DepositEvent>('0x3::token::DepositEvent', txn.events)\n    for (const event of events) {\n      // const depositEventInstance = DEFAULT_TYPE_REGISTRY.decodeEvent(event) as DepositEventInstance\n      ctx.meter.Counter('deposit_token_count').add(event.data_decoded.amount)\n    }\n  })\n\nCandyMachine.bind().onEntryPullToken((call: CandyMachine.PullTokenPayload, ctx) => {\n  ctx.meter.Counter('pulled').add(call.arguments[2])\n})\n\ntoken.bind().onEventDepositEvent((evt: token.DepositEventInstance, ctx) => {\n  ctx.meter.Gauge('version').record(evt.data_decoded.id.property_version)\n  ctx.meter.Counter('deposit').add(evt.data_decoded.amount, { token: evt.data_decoded.id.token_data_id.name })\n})\n\nvoting.bind().onEventCreateProposalEvent((evt, ctx) => {\n  ctx.meter.Gauge('size').record(evt.data_decoded.metadata.data.length)\n})\n\nAptosAccountProcessor.bind({ address: '0x1' }).onTimeInterval((resources, ctx) => {\n  ctx.meter.Counter('onTimer').add(1)\n}, 10000)\n\naptos_account.bind().onEntryCreateAccount(\n  (call, ctx) => {\n    ctx.meter.Counter('xx').add(1)\n  },\n  undefined,\n  { resourceChanges: true }\n)\n"]}

package/lib/core/base-context.d.ts

@@ -1,10 +1,12 @@
 import { ProcessResult, RecordMetaData } from '@sentio/protos';
-import { Logger } from './logger.js';
+import { EventLogger } from './event-logger.js';
 import { Meter, Labels } from './meter.js';
 import { BoundedEventTracker } from './event-tracker.js';
 export declare abstract class BaseContext {
     meter: Meter;
-    logger: Logger;
+    eventLogger: EventLogger;
+    logger: EventLogger;
+    /** @deprecated use {@link this.eventLogger} instead */
     eventTracker: BoundedEventTracker;
     _res: ProcessResult;
     protected constructor();

package/lib/core/base-context.js

@@ -1,9 +1,11 @@
-import { Logger } from './logger.js';
+import { EventLogger } from './event-logger.js';
 import { Meter } from './meter.js';
 import { BoundedEventTracker } from './event-tracker.js';
 export class BaseContext {
     meter;
+    eventLogger;
     logger;
+    /** @deprecated use {@link this.eventLogger} instead */
     eventTracker;
     _res = {
         counters: [],
@@ -14,7 +16,10 @@ export class BaseContext {
     };
     constructor() {
         this.meter = new Meter(this);
-        this.logger = new Logger(this);
+        this.eventLogger = new EventLogger(this);
+        // eslint-disable-next-line deprecation/deprecation
+        this.logger = this.eventLogger;
+        // eslint-disable-next-line deprecation/deprecation
         this.eventTracker = new BoundedEventTracker(this);
     }
     getProcessResult() {

package/lib/core/base-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-context.js","sourceRoot":"","sources":["../../src/core/base-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,KAAK,EAAU,MAAM,YAAY,CAAA;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAExD,MAAM,OAAgB,WAAW;IAC/B,KAAK,CAAO;IACZ,MAAM,CAAQ;IACd,YAAY,CAAqB;IAEjC,IAAI,GAAkB;QACpB,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,EAAE;KACT,CAAA;IAED;QACE,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,CAAA;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAA;QAC9B,IAAI,CAAC,YAAY,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAA;IACnD,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,IAAI,CAAA;IAClB,CAAC;CAGF","sourcesContent":["import { ProcessResult, RecordMetaData } from '@sentio/protos'\nimport { Logger } from './logger.js'\nimport { Meter, Labels } from './meter.js'\nimport { BoundedEventTracker } from './event-tracker.js'\n\nexport abstract class BaseContext {\n  meter: Meter\n  logger: Logger\n  eventTracker: BoundedEventTracker\n\n  _res: ProcessResult = {\n    counters: [],\n    events: [],\n    exports: [],\n    gauges: [],\n    logs: [],\n  }\n\n  protected constructor() {\n    this.meter = new Meter(this)\n    this.logger = new Logger(this)\n    this.eventTracker = new BoundedEventTracker(this)\n  }\n\n  getProcessResult(): ProcessResult {\n    return this._res\n  }\n\n  abstract getMetaData(name: string, labels: Labels): RecordMetaData\n}\n"]}
+{"version":3,"file":"base-context.js","sourceRoot":"","sources":["../../src/core/base-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAU,MAAM,YAAY,CAAA;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAExD,MAAM,OAAgB,WAAW;IAC/B,KAAK,CAAO;IACZ,WAAW,CAAa;IAExB,MAAM,CAAa;IACnB,uDAAuD;IACvD,YAAY,CAAqB;IAEjC,IAAI,GAAkB;QACpB,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,EAAE;KACT,CAAA;IAED;QACE,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,CAAA;QAC5B,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,CAAA;QACxC,mDAAmD;QACnD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAA;QAC9B,mDAAmD;QACnD,IAAI,CAAC,YAAY,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAA;IACnD,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,IAAI,CAAA;IAClB,CAAC;CAGF","sourcesContent":["import { ProcessResult, RecordMetaData } from '@sentio/protos'\nimport { EventLogger } from './event-logger.js'\nimport { Meter, Labels } from './meter.js'\nimport { BoundedEventTracker } from './event-tracker.js'\n\nexport abstract class BaseContext {\n  meter: Meter\n  eventLogger: EventLogger\n\n  logger: EventLogger\n  /** @deprecated use {@link this.eventLogger} instead */\n  eventTracker: BoundedEventTracker\n\n  _res: ProcessResult = {\n    counters: [],\n    events: [],\n    exports: [],\n    gauges: [],\n    logs: [],\n  }\n\n  protected constructor() {\n    this.meter = new Meter(this)\n    this.eventLogger = new EventLogger(this)\n    // eslint-disable-next-line deprecation/deprecation\n    this.logger = this.eventLogger\n    // eslint-disable-next-line deprecation/deprecation\n    this.eventTracker = new BoundedEventTracker(this)\n  }\n\n  getProcessResult(): ProcessResult {\n    return this._res\n  }\n\n  abstract getMetaData(name: string, labels: Labels): RecordMetaData\n}\n"]}

package/lib/core/core-plugin.js

@@ -1,6 +1,5 @@
 import { Plugin, PluginManager } from '@sentio/runtime';
 import { MetricState } from './meter.js';
-import { EventTrackerState } from './event-tracker.js';
 import { ExporterState } from './exporter.js';
 export class CorePlugin extends Plugin {
     name = 'CorePlugin';
@@ -11,16 +10,6 @@ export class CorePlugin extends Plugin {
                 ...metric.config,
             });
         }
-        for (const eventTracker of EventTrackerState.INSTANCE.getValues()) {
-            config.eventTrackingConfigs.push({
-                distinctAggregationByDays: eventTracker.options.distinctByDays || [],
-                eventName: eventTracker.name,
-                retentionConfig: undefined,
-                totalByDay: eventTracker.options.totalByDay || false,
-                totalPerEntity: undefined,
-                unique: eventTracker.options.unique || false,
-            });
-        }
         for (const exporter of ExporterState.INSTANCE.getValues()) {
             config.exportConfigs.push({
                 name: exporter.name,

package/lib/core/core-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"core-plugin.js","sourceRoot":"","sources":["../../src/core/core-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAGvD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAE7C,MAAM,OAAO,UAAW,SAAQ,MAAM;IACpC,IAAI,GAAW,YAAY,CAAA;IAE3B,KAAK,CAAC,SAAS,CAAC,MAA6B;QAC3C,qDAAqD;QACrD,KAAK,MAAM,MAAM,IAAI,WAAW,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;YACrD,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC;gBACxB,GAAG,MAAM,CAAC,MAAM;aACjB,CAAC,CAAA;SACH;QAED,KAAK,MAAM,YAAY,IAAI,iBAAiB,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;YACjE,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC;gBAC/B,yBAAyB,EAAE,YAAY,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE;gBACpE,SAAS,EAAE,YAAY,CAAC,IAAI;gBAC5B,eAAe,EAAE,SAAS;gBAC1B,UAAU,EAAE,YAAY,CAAC,OAAO,CAAC,UAAU,IAAI,KAAK;gBACpD,cAAc,EAAE,SAAS;gBACzB,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,MAAM,IAAI,KAAK;aAC7C,CAAC,CAAA;SACH;QAED,KAAK,MAAM,QAAQ,IAAI,aAAa,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;YACzD,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC;gBACxB,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;aAC1B,CAAC,CAAA;SACH;IACH,CAAC;CACF;AAED,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,UAAU,EAAE,CAAC,CAAA","sourcesContent":["import { Plugin, PluginManager } from '@sentio/runtime'\nimport { ProcessConfigResponse } from '@sentio/protos'\n\nimport { MetricState } from './meter.js'\nimport { EventTrackerState } from './event-tracker.js'\nimport { ExporterState } from './exporter.js'\n\nexport class CorePlugin extends Plugin {\n  name: string = 'CorePlugin'\n\n  async configure(config: ProcessConfigResponse): Promise<void> {\n    // part 0, prepare metrics and event tracking configs\n    for (const metric of MetricState.INSTANCE.getValues()) {\n      config.metricConfigs.push({\n        ...metric.config,\n      })\n    }\n\n    for (const eventTracker of EventTrackerState.INSTANCE.getValues()) {\n      config.eventTrackingConfigs.push({\n        distinctAggregationByDays: eventTracker.options.distinctByDays || [],\n        eventName: eventTracker.name,\n        retentionConfig: undefined,\n        totalByDay: eventTracker.options.totalByDay || false,\n        totalPerEntity: undefined,\n        unique: eventTracker.options.unique || false,\n      })\n    }\n\n    for (const exporter of ExporterState.INSTANCE.getValues()) {\n      config.exportConfigs.push({\n        name: exporter.name,\n        channel: exporter.channel,\n      })\n    }\n  }\n}\n\nPluginManager.INSTANCE.register(new CorePlugin())\n"]}
+{"version":3,"file":"core-plugin.js","sourceRoot":"","sources":["../../src/core/core-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAGvD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAE7C,MAAM,OAAO,UAAW,SAAQ,MAAM;IACpC,IAAI,GAAW,YAAY,CAAA;IAE3B,KAAK,CAAC,SAAS,CAAC,MAA6B;QAC3C,qDAAqD;QACrD,KAAK,MAAM,MAAM,IAAI,WAAW,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;YACrD,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC;gBACxB,GAAG,MAAM,CAAC,MAAM;aACjB,CAAC,CAAA;SACH;QAED,KAAK,MAAM,QAAQ,IAAI,aAAa,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;YACzD,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC;gBACxB,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;aAC1B,CAAC,CAAA;SACH;IACH,CAAC;CACF;AAED,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,UAAU,EAAE,CAAC,CAAA","sourcesContent":["import { Plugin, PluginManager } from '@sentio/runtime'\nimport { ProcessConfigResponse } from '@sentio/protos'\n\nimport { MetricState } from './meter.js'\nimport { ExporterState } from './exporter.js'\n\nexport class CorePlugin extends Plugin {\n  name: string = 'CorePlugin'\n\n  async configure(config: ProcessConfigResponse): Promise<void> {\n    // part 0, prepare metrics and event tracking configs\n    for (const metric of MetricState.INSTANCE.getValues()) {\n      config.metricConfigs.push({\n        ...metric.config,\n      })\n    }\n\n    for (const exporter of ExporterState.INSTANCE.getValues()) {\n      config.exportConfigs.push({\n        name: exporter.name,\n        channel: exporter.channel,\n      })\n    }\n  }\n}\n\nPluginManager.INSTANCE.register(new CorePlugin())\n"]}

package/lib/core/{logger.d.ts → event-logger.d.ts}

@@ -1,14 +1,16 @@
 import { BaseContext } from './base-context.js';
 import { LogLevel } from '@sentio/protos';
 import { NamedResultDescriptor } from './metadata.js';
+import { Event } from './event-tracker.js';
 export type Attributes = Record<string, any>;
-export declare class Logger extends NamedResultDescriptor {
+export declare class EventLogger extends NamedResultDescriptor {
     private readonly ctx;
     constructor(ctx: BaseContext, name?: string);
-    withName(name: string): Logger;
+    withName(name: string): EventLogger;
     protected log(level: LogLevel, message: any, attributes?: Attributes): void;
     info(msg: any, attributes?: Attributes): void;
     warn(msg: any, attributes?: Attributes): void;
     error(msg: any, attributes?: Attributes): void;
     critical(msg: any, attributes?: Attributes): void;
+    emit(eventName: string, event: Event): void;
 }

package/lib/core/{logger.js → event-logger.js}

@@ -1,14 +1,14 @@
 import { LogLevel } from '@sentio/protos';
 import { NamedResultDescriptor } from './metadata.js';
 import { normalizeAttribute } from './normalization.js';
-export class Logger extends NamedResultDescriptor {
+export class EventLogger extends NamedResultDescriptor {
     ctx;
     constructor(ctx, name = '') {
         super(name);
         this.ctx = ctx;
     }
     withName(name) {
-        return new Logger(this.ctx, name);
+        return new EventLogger(this.ctx, name);
     }
     log(level, message, attributes = {}) {
         if (typeof message !== 'string' && !(message instanceof String)) {
@@ -36,5 +36,18 @@ export class Logger extends NamedResultDescriptor {
     critical(msg, attributes = {}) {
         this.log(LogLevel.CRITICAL, msg, attributes);
     }
+    emit(eventName, event) {
+        const { distinctId, severity, message, ...payload } = event;
+        const res = {
+            metadata: this.ctx.getMetaData(eventName, {}),
+            severity: severity || LogLevel.INFO,
+            message: message || '',
+            distinctEntityId: distinctId || '',
+            attributes: payload,
+            runtimeInfo: undefined,
+            noMetric: true,
+        };
+        this.ctx._res.events.push(res);
+    }
 }
-//# sourceMappingURL=logger.js.map
+//# sourceMappingURL=event-logger.js.map

package/lib/core/event-logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"event-logger.js","sourceRoot":"","sources":["../../src/core/event-logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAKvD,MAAM,OAAO,WAAY,SAAQ,qBAAqB;IACnC,GAAG,CAAa;IAEjC,YAAY,GAAgB,EAAE,IAAI,GAAG,EAAE;QACrC,KAAK,CAAC,IAAI,CAAC,CAAA;QACX,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IAED,QAAQ,CAAC,IAAY;QACnB,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IACxC,CAAC;IAES,GAAG,CAAC,KAAe,EAAE,OAAY,EAAE,aAAyB,EAAE;QACtE,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO,YAAY,MAAM,CAAC,EAAE;YAC/D,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;SAClC;QAED,MAAM,IAAI,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAA;QAE3C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YACtB,mBAAmB;YACnB,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7C,KAAK;YACL,OAAO;YACP,WAAW,EAAE,IAAI;YACjB,WAAW,EAAE,SAAS;SACvB,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,CAAC,GAAQ,EAAE,aAAyB,EAAE;QACxC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,CAAC,CAAA;IAC1C,CAAC;IAED,IAAI,CAAC,GAAQ,EAAE,aAAyB,EAAE;QACxC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE,UAAU,CAAC,CAAA;IAC7C,CAAC;IAED,KAAK,CAAC,GAAQ,EAAE,aAAyB,EAAE;QACzC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,CAAC,CAAA;IAC3C,CAAC;IAED,QAAQ,CAAC,GAAQ,EAAE,aAAyB,EAAE;QAC5C,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE,UAAU,CAAC,CAAA;IAC9C,CAAC;IAED,IAAI,CAAC,SAAiB,EAAE,KAAY;QAClC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,GAAG,KAAK,CAAA;QAE3D,MAAM,GAAG,GAAwB;YAC/B,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC;YAC7C,QAAQ,EAAE,QAAQ,IAAI,QAAQ,CAAC,IAAI;YACnC,OAAO,EAAE,OAAO,IAAI,EAAE;YACtB,gBAAgB,EAAE,UAAU,IAAI,EAAE;YAClC,UAAU,EAAE,OAAO;YACnB,WAAW,EAAE,SAAS;YACtB,QAAQ,EAAE,IAAI;SACf,CAAA;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAChC,CAAC;CACF","sourcesContent":["import { BaseContext } from './base-context.js'\nimport { EventTrackingResult, LogLevel } from '@sentio/protos'\nimport { NamedResultDescriptor } from './metadata.js'\nimport { normalizeAttribute } from './normalization.js'\nimport { Event } from './event-tracker.js'\n\nexport type Attributes = Record<string, any>\n\nexport class EventLogger extends NamedResultDescriptor {\n  private readonly ctx: BaseContext\n\n  constructor(ctx: BaseContext, name = '') {\n    super(name)\n    this.ctx = ctx\n  }\n\n  withName(name: string) {\n    return new EventLogger(this.ctx, name)\n  }\n\n  protected log(level: LogLevel, message: any, attributes: Attributes = {}) {\n    if (typeof message !== 'string' && !(message instanceof String)) {\n      message = JSON.stringify(message)\n    }\n\n    const norm = normalizeAttribute(attributes)\n\n    this.ctx._res.logs.push({\n      // name: this.name,\n      metadata: this.ctx.getMetaData(this.name, {}), // GetRecordMetaData(this.ctx, this, {}),\n      level,\n      message,\n      attributes2: norm,\n      runtimeInfo: undefined,\n    })\n  }\n\n  info(msg: any, attributes: Attributes = {}) {\n    this.log(LogLevel.INFO, msg, attributes)\n  }\n\n  warn(msg: any, attributes: Attributes = {}) {\n    this.log(LogLevel.WARNING, msg, attributes)\n  }\n\n  error(msg: any, attributes: Attributes = {}) {\n    this.log(LogLevel.ERROR, msg, attributes)\n  }\n\n  critical(msg: any, attributes: Attributes = {}) {\n    this.log(LogLevel.CRITICAL, msg, attributes)\n  }\n\n  emit(eventName: string, event: Event) {\n    const { distinctId, severity, message, ...payload } = event\n\n    const res: EventTrackingResult = {\n      metadata: this.ctx.getMetaData(eventName, {}),\n      severity: severity || LogLevel.INFO,\n      message: message || '',\n      distinctEntityId: distinctId || '',\n      attributes: payload,\n      runtimeInfo: undefined,\n      noMetric: true,\n    }\n    this.ctx._res.events.push(res)\n  }\n}\n"]}

package/lib/core/event-tracker.d.ts

@@ -1,29 +1,11 @@
 import { BaseContext } from './base-context.js';
-import { NamedResultDescriptor } from './metadata.js';
-import { MapStateStorage } from '@sentio/runtime';
+import { LogLevel } from '@sentio/protos';
 export interface Event {
-    distinctId: string;
+    distinctId?: string;
+    severity?: LogLevel;
+    message?: string;
     [key: string]: any;
 }
-export interface TrackerOptions {
-    totalByDay?: boolean;
-    unique?: boolean;
-    distinctByDays?: number[];
-}
-export declare class EventTrackerState extends MapStateStorage<EventTracker> {
-    static INSTANCE: EventTrackerState;
-}
-export declare class EventTracker extends NamedResultDescriptor {
-    static DEFAULT_OPTIONS: TrackerOptions;
-    static register(eventName: string, options?: TrackerOptions): EventTracker;
-    options: TrackerOptions;
-    protected constructor(eventName: string, options: TrackerOptions);
-    trackEvent(ctx: BaseContext, event: Event): void;
-}
-export declare class AccountEventTracker extends EventTracker {
-    static DEFAULT_OPTIONS: TrackerOptions;
-    static register(eventName?: string, options?: TrackerOptions): EventTracker;
-}
 export declare class BoundedEventTracker {
     private readonly ctx;
     constructor(ctx: BaseContext);

package/lib/core/event-tracker.js

@@ -1,63 +1,16 @@
-import { NamedResultDescriptor } from './metadata.js';
-import { MapStateStorage } from '@sentio/runtime';
-import { normalizeAttribute } from './normalization.js';
-export class EventTrackerState extends MapStateStorage {
-    static INSTANCE = new EventTrackerState();
-}
-// Track Event with an identity associate with it
-export class EventTracker extends NamedResultDescriptor {
-    static DEFAULT_OPTIONS = {
-        totalByDay: true,
-        unique: true,
-    };
-    static register(eventName, options) {
-        const tracker = new EventTracker(eventName, { ...EventTracker.DEFAULT_OPTIONS, ...options });
-        return EventTrackerState.INSTANCE.getOrSetValue(eventName, tracker);
-    }
-    options;
-    constructor(eventName, options) {
-        super(eventName);
-        this.options = options;
-    }
-    trackEvent(ctx, event) {
-        const { distinctId, ...payload } = event;
-        const res = {
-            metadata: ctx.getMetaData(this.name, {}),
-            distinctEntityId: distinctId,
-            attributes: normalizeAttribute(payload),
-            runtimeInfo: undefined,
-            noMetric: false,
-        };
-        ctx._res.events.push(res);
-    }
-}
-export class AccountEventTracker extends EventTracker {
-    static DEFAULT_OPTIONS = {
-        totalByDay: true,
-        unique: true,
-        distinctByDays: [1, 7, 30],
-    };
-    static register(eventName, options) {
-        if (eventName) {
-            eventName = ['user', eventName].join('_');
-        }
-        else {
-            eventName = 'user';
-        }
-        const tracker = new AccountEventTracker(eventName, { ...AccountEventTracker.DEFAULT_OPTIONS, ...options });
-        return EventTrackerState.INSTANCE.getOrSetValue(eventName, tracker);
-    }
-}
+import { LogLevel } from '@sentio/protos';
 export class BoundedEventTracker {
     ctx;
     constructor(ctx) {
         this.ctx = ctx;
     }
     track(eventName, event) {
-        const { distinctId, ...payload } = event;
+        const { distinctId, severity, message, ...payload } = event;
         const res = {
             metadata: this.ctx.getMetaData(eventName, {}),
-            distinctEntityId: distinctId,
+            severity: severity || LogLevel.INFO,
+            message: message || '',
+            distinctEntityId: distinctId || '',
             attributes: payload,
             runtimeInfo: undefined,
             noMetric: true,

package/lib/core/event-tracker.js.map

@@ -1 +1 @@
-{"version":3,"file":"event-tracker.js","sourceRoot":"","sources":["../../src/core/event-tracker.ts"],"names":[],"mappings":"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","sourcesContent":["import { BaseContext } from './base-context.js'\nimport { EventTrackingResult } from '@sentio/protos'\nimport { NamedResultDescriptor } from './metadata.js'\nimport { MapStateStorage } from '@sentio/runtime'\nimport { normalizeAttribute } from './normalization.js'\n\nexport interface Event {\n  // The unique identifier of main identity associate with an event\n  // .e.g user id / toekn address / account address / contract address id\n  //\n  distinctId: string\n  [key: string]: any\n}\n\nexport interface TrackerOptions {\n  totalByDay?: boolean\n  unique?: boolean\n  distinctByDays?: number[]\n}\n\nexport class EventTrackerState extends MapStateStorage<EventTracker> {\n  static INSTANCE = new EventTrackerState()\n}\n\n// Track Event with an identity associate with it\nexport class EventTracker extends NamedResultDescriptor {\n  static DEFAULT_OPTIONS: TrackerOptions = {\n    totalByDay: true,\n    unique: true,\n  }\n\n  static register(eventName: string, options?: TrackerOptions) {\n    const tracker = new EventTracker(eventName, { ...EventTracker.DEFAULT_OPTIONS, ...options })\n    return EventTrackerState.INSTANCE.getOrSetValue(eventName, tracker)\n  }\n\n  options: TrackerOptions\n  protected constructor(eventName: string, options: TrackerOptions) {\n    super(eventName)\n    this.options = options\n  }\n\n  trackEvent(ctx: BaseContext, event: Event) {\n    const { distinctId, ...payload } = event\n\n    const res: EventTrackingResult = {\n      metadata: ctx.getMetaData(this.name, {}),\n      distinctEntityId: distinctId,\n      attributes: normalizeAttribute(payload),\n      runtimeInfo: undefined,\n      noMetric: false,\n    }\n    ctx._res.events.push(res)\n  }\n}\n\nexport class AccountEventTracker extends EventTracker {\n  static DEFAULT_OPTIONS: TrackerOptions = {\n    totalByDay: true,\n    unique: true,\n    distinctByDays: [1, 7, 30],\n  }\n\n  static register(eventName?: string, options?: TrackerOptions) {\n    if (eventName) {\n      eventName = ['user', eventName].join('_')\n    } else {\n      eventName = 'user'\n    }\n    const tracker = new AccountEventTracker(eventName, { ...AccountEventTracker.DEFAULT_OPTIONS, ...options })\n    return EventTrackerState.INSTANCE.getOrSetValue(eventName, tracker)\n  }\n}\n\nexport class BoundedEventTracker {\n  private readonly ctx: BaseContext\n\n  constructor(ctx: BaseContext) {\n    this.ctx = ctx\n  }\n\n  track(eventName: string, event: Event) {\n    const { distinctId, ...payload } = event\n    const res: EventTrackingResult = {\n      metadata: this.ctx.getMetaData(eventName, {}),\n      distinctEntityId: distinctId,\n      attributes: payload,\n      runtimeInfo: undefined,\n      noMetric: true,\n    }\n    this.ctx._res.events.push(res)\n  }\n}\n"]}
+{"version":3,"file":"event-tracker.js","sourceRoot":"","sources":["../../src/core/event-tracker.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAa9D,MAAM,OAAO,mBAAmB;IACb,GAAG,CAAa;IAEjC,YAAY,GAAgB;QAC1B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,SAAiB,EAAE,KAAY;QACnC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,GAAG,KAAK,CAAA;QAE3D,MAAM,GAAG,GAAwB;YAC/B,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC;YAC7C,QAAQ,EAAE,QAAQ,IAAI,QAAQ,CAAC,IAAI;YACnC,OAAO,EAAE,OAAO,IAAI,EAAE;YACtB,gBAAgB,EAAE,UAAU,IAAI,EAAE;YAClC,UAAU,EAAE,OAAO;YACnB,WAAW,EAAE,SAAS;YACtB,QAAQ,EAAE,IAAI;SACf,CAAA;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAChC,CAAC;CACF","sourcesContent":["import { BaseContext } from './base-context.js'\nimport { EventTrackingResult, LogLevel } from '@sentio/protos'\n\nexport interface Event {\n  // The unique identifier of main identity associate with an event\n  // .e.g user id / token address / account address / contract address id\n  //\n  distinctId?: string\n  severity?: LogLevel\n  message?: string\n\n  [key: string]: any\n}\n\nexport class BoundedEventTracker {\n  private readonly ctx: BaseContext\n\n  constructor(ctx: BaseContext) {\n    this.ctx = ctx\n  }\n\n  track(eventName: string, event: Event) {\n    const { distinctId, severity, message, ...payload } = event\n\n    const res: EventTrackingResult = {\n      metadata: this.ctx.getMetaData(eventName, {}),\n      severity: severity || LogLevel.INFO,\n      message: message || '',\n      distinctEntityId: distinctId || '',\n      attributes: payload,\n      runtimeInfo: undefined,\n      noMetric: true,\n    }\n    this.ctx._res.events.push(res)\n  }\n}\n"]}

package/lib/core/index.d.ts

@@ -2,7 +2,6 @@ export { BigDecimal, scaleDown } from './big-decimal.js';
 export { BaseContext } from './base-context.js';
 export { normalizeLabels } from './normalization.js';
 export { CounterBinding, Meter, type Labels, GaugeBinding, Counter, Gauge, MetricOptions } from './meter.js';
-export { EventTracker, AccountEventTracker } from './event-tracker.js';
 export { Exporter } from './exporter.js';
 export { type Numberish, toBigInteger, toMetricValue } from './numberish.js';
 export { SuiBaseProcessor, SuiBindOptions } from './sui-processor.js';

package/lib/core/index.js

@@ -2,7 +2,6 @@ export { BigDecimal, scaleDown } from './big-decimal.js';
 export { BaseContext } from './base-context.js';
 export { normalizeLabels } from './normalization.js';
 export { CounterBinding, Meter, GaugeBinding, Counter, Gauge, MetricOptions } from './meter.js';
-export { EventTracker, AccountEventTracker } from './event-tracker.js';
 export { Exporter } from './exporter.js';
 export { toBigInteger, toMetricValue } from './numberish.js';
 export { SuiBaseProcessor, SuiBindOptions } from './sui-processor.js';

package/lib/core/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,KAAK,EAAe,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC5G,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAkB,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAE5E,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAErE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA","sourcesContent":["export { BigDecimal, scaleDown } from './big-decimal.js'\nexport { BaseContext } from './base-context.js'\nexport { normalizeLabels } from './normalization.js'\nexport { CounterBinding, Meter, type Labels, GaugeBinding, Counter, Gauge, MetricOptions } from './meter.js'\nexport { EventTracker, AccountEventTracker } from './event-tracker.js'\nexport { Exporter } from './exporter.js'\nexport { type Numberish, toBigInteger, toMetricValue } from './numberish.js'\n\nexport { SuiBaseProcessor, SuiBindOptions } from './sui-processor.js'\n\nexport { SuiPlugin } from './sui-plugin.js'\nexport { CorePlugin } from './core-plugin.js'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,KAAK,EAAe,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC5G,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAkB,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAE5E,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAErE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA","sourcesContent":["export { BigDecimal, scaleDown } from './big-decimal.js'\nexport { BaseContext } from './base-context.js'\nexport { normalizeLabels } from './normalization.js'\nexport { CounterBinding, Meter, type Labels, GaugeBinding, Counter, Gauge, MetricOptions } from './meter.js'\nexport { Exporter } from './exporter.js'\nexport { type Numberish, toBigInteger, toMetricValue } from './numberish.js'\n\nexport { SuiBaseProcessor, SuiBindOptions } from './sui-processor.js'\n\nexport { SuiPlugin } from './sui-plugin.js'\nexport { CorePlugin } from './core-plugin.js'\n"]}

package/lib/core/normalization.js

@@ -49,7 +49,7 @@ function normalizeObject(obj, length) {
         ret = {};
         for (const [key, value] of Object.entries(obj)) {
             const normValue = normalizeObject(value, length);
-            if (normValue) {
+            if (normValue != null) {
                 ret[key] = normValue;
             }
         }

package/lib/core/normalization.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalization.js","sourceRoot":"","sources":["../../src/core/normalization.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,SAAS,aAAa,CAAC,IAAY;IACjC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAA;AAC5D,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,IAAI,IAAI,KAAK,QAAQ,EAAE;QACrB,OAAO,SAAS,CAAA;KACjB;IACD,OAAO,aAAa,CAAC,IAAI,CAAC,CAAA;AAC5B,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAClC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;AAC3B,CAAC;AAED,MAAM,UAAU,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;AAED,SAAS,eAAe,CAAC,GAAQ,EAAE,MAAc;IAC/C,IAAI,GAAQ,CAAA;IAEZ,MAAM,UAAU,GAAG,OAAO,GAAG,CAAA;IAC7B,QAAQ,UAAU,EAAE;QAClB,KAAK,QAAQ;YACX,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;QAC7B,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,GAAG,CAAC,CAAA;QACpB,KAAK,QAAQ;YACX,OAAO,GAAG,CAAA;QACZ,KAAK,UAAU;YACb,OAAO,IAAI,CAAA;QACb,KAAK,QAAQ;YACX,OAAO,IAAI,CAAA;KACd;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACtB,GAAG,GAAG,EAAE,CAAA;QACR,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;YACrB,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;SACvC;KACF;SAAM,IAAI,GAAG,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE;QAC9B,IAAI,GAAG,YAAY,IAAI,EAAE;YACvB,OAAO,GAAG,CAAC,WAAW,EAAE,CAAA;SACzB;QACD,IAAI,GAAG,YAAY,UAAU,EAAE;YAC7B,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAA;SACtB;QACD,GAAG,GAAG,EAAE,CAAA;QACR,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC9C,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;YAChD,IAAI,SAAS,EAAE;gBACb,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAA;aACrB;SACF;KACF;SAAM;QACL,GAAG,GAAG,GAAG,CAAA;KACV;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAA2B;IAC5D,OAAO,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AACtC,CAAC","sourcesContent":["import { Labels } from './meter.js'\nimport { BigDecimal } from './big-decimal.js'\n\nfunction normalizeName(name: string): string {\n  return name.slice(0, 100).replace(/[^_\\-a-zA-Z0-9]/g, '_')\n}\n\nexport function normalizeKey(name: string): string {\n  if (name === 'labels') {\n    return 'labels_'\n  }\n  return normalizeName(name)\n}\n\nfunction 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\nfunction normalizeObject(obj: any, length: number): any {\n  let ret: any\n\n  const typeString = typeof obj\n  switch (typeString) {\n    case 'string':\n      return obj.slice(0, length)\n    case 'bigint':\n      return Number(obj)\n    case 'number':\n      return obj\n    case 'function':\n      return null\n    case 'symbol':\n      return null\n  }\n  if (Array.isArray(obj)) {\n    ret = []\n    for (const val of obj) {\n      ret.push(normalizeObject(val, length))\n    }\n  } else if (obj === Object(obj)) {\n    if (obj instanceof Date) {\n      return obj.toISOString()\n    }\n    if (obj instanceof BigDecimal) {\n      return obj.toNumber()\n    }\n    ret = {}\n    for (const [key, value] of Object.entries(obj)) {\n      const normValue = normalizeObject(value, length)\n      if (normValue) {\n        ret[key] = normValue\n      }\n    }\n  } else {\n    ret = obj\n  }\n  return ret\n}\n\nexport function normalizeAttribute(record: Record<string, any>): any {\n  return normalizeObject(record, 1000)\n}\n"]}
+{"version":3,"file":"normalization.js","sourceRoot":"","sources":["../../src/core/normalization.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,SAAS,aAAa,CAAC,IAAY;IACjC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAA;AAC5D,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,IAAI,IAAI,KAAK,QAAQ,EAAE;QACrB,OAAO,SAAS,CAAA;KACjB;IACD,OAAO,aAAa,CAAC,IAAI,CAAC,CAAA;AAC5B,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAClC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;AAC3B,CAAC;AAED,MAAM,UAAU,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;AAED,SAAS,eAAe,CAAC,GAAQ,EAAE,MAAc;IAC/C,IAAI,GAAQ,CAAA;IAEZ,MAAM,UAAU,GAAG,OAAO,GAAG,CAAA;IAC7B,QAAQ,UAAU,EAAE;QAClB,KAAK,QAAQ;YACX,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;QAC7B,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,GAAG,CAAC,CAAA;QACpB,KAAK,QAAQ;YACX,OAAO,GAAG,CAAA;QACZ,KAAK,UAAU;YACb,OAAO,IAAI,CAAA;QACb,KAAK,QAAQ;YACX,OAAO,IAAI,CAAA;KACd;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACtB,GAAG,GAAG,EAAE,CAAA;QACR,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;YACrB,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;SACvC;KACF;SAAM,IAAI,GAAG,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE;QAC9B,IAAI,GAAG,YAAY,IAAI,EAAE;YACvB,OAAO,GAAG,CAAC,WAAW,EAAE,CAAA;SACzB;QACD,IAAI,GAAG,YAAY,UAAU,EAAE;YAC7B,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAA;SACtB;QACD,GAAG,GAAG,EAAE,CAAA;QACR,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC9C,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;YAChD,IAAI,SAAS,IAAI,IAAI,EAAE;gBACrB,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAA;aACrB;SACF;KACF;SAAM;QACL,GAAG,GAAG,GAAG,CAAA;KACV;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAA2B;IAC5D,OAAO,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AACtC,CAAC","sourcesContent":["import { Labels } from './meter.js'\nimport { BigDecimal } from './big-decimal.js'\n\nfunction normalizeName(name: string): string {\n  return name.slice(0, 100).replace(/[^_\\-a-zA-Z0-9]/g, '_')\n}\n\nexport function normalizeKey(name: string): string {\n  if (name === 'labels') {\n    return 'labels_'\n  }\n  return normalizeName(name)\n}\n\nfunction 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\nfunction normalizeObject(obj: any, length: number): any {\n  let ret: any\n\n  const typeString = typeof obj\n  switch (typeString) {\n    case 'string':\n      return obj.slice(0, length)\n    case 'bigint':\n      return Number(obj)\n    case 'number':\n      return obj\n    case 'function':\n      return null\n    case 'symbol':\n      return null\n  }\n  if (Array.isArray(obj)) {\n    ret = []\n    for (const val of obj) {\n      ret.push(normalizeObject(val, length))\n    }\n  } else if (obj === Object(obj)) {\n    if (obj instanceof Date) {\n      return obj.toISOString()\n    }\n    if (obj instanceof BigDecimal) {\n      return obj.toNumber()\n    }\n    ret = {}\n    for (const [key, value] of Object.entries(obj)) {\n      const normValue = normalizeObject(value, length)\n      if (normValue != null) {\n        ret[key] = normValue\n      }\n    }\n  } else {\n    ret = obj\n  }\n  return ret\n}\n\nexport function normalizeAttribute(record: Record<string, any>): any {\n  return normalizeObject(record, 1000)\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "2.1.2",
+  "version": "2.1.3-rc.1",
   "type": "module",
   "scripts": {
     "compile": "tsc -p . && cp src/utils/*.csv lib/utils && cp src/tsup.config.ts lib",
@@ -18,9 +18,9 @@
     "@project-serum/anchor": "^0.26.0",
     "@sentio/bigdecimal": "^9.1.1-patch.3",
     "@sentio/ethers-v6": "^1.0.25",
-    "@sentio/protos": "^2.1.2",
-    "@sentio/runtime": "^2.1.2",
-    "@sentio/sdk": "^2.1.2",
+    "@sentio/protos": "^2.1.3-rc.1",
+    "@sentio/runtime": "^2.1.3-rc.1",
+    "@sentio/sdk": "^2.1.3-rc.1",
     "@solana/web3.js": "^1.47.3",
     "@types/prettier": "^2.7.2",
     "aptos-sdk": "npm:@sentio/aptos@^1.6.0",
@@ -71,5 +71,5 @@
   "typedoc": {
     "entryPoint": "./src/index.ts"
   },
-  "gitHead": "f00dfbe0fa3056472ce6691ff2cea94262680875"
+  "gitHead": "7abc8209ebf49b692f138aa1377f3da15e736be7"
 }

package/src/aptos/tests/souffl3.ts

@@ -1,10 +1,9 @@
 import { AptosAccountProcessor, defaultMoveCoder } from '@sentio/sdk/aptos'
-import { AccountEventTracker } from '@sentio/sdk'
 import { SouffleChefCampaign, CandyMachine } from './types/souffle.js'
 import { token } from '../builtin/0x3.js'
 import { aptos_account, voting } from '../builtin/0x1.js'
 
-const accountTracker = AccountEventTracker.register('pull')
+// const accountTracker = AccountEventTracker.register('pull')
 
 SouffleChefCampaign.bind({ startVersion: 3212312n })
   .onEntryPullTokenV2((call: SouffleChefCampaign.PullTokenV2Payload, ctx) => {
@@ -13,7 +12,7 @@ SouffleChefCampaign.bind({ startVersion: 3212312n })
   })
   .onEventPullTokenEvent((evt, ctx) => {
     ctx.meter.Counter('burned').add(1)
-    accountTracker.trackEvent(ctx, { distinctId: ctx.transaction.sender })
+    ctx.eventLogger.emit('pull', { distinctId: ctx.transaction.sender })
   })
   .onEvent(
     (event, ctx) => {

package/src/core/base-context.ts

@@ -1,11 +1,14 @@
 import { ProcessResult, RecordMetaData } from '@sentio/protos'
-import { Logger } from './logger.js'
+import { EventLogger } from './event-logger.js'
 import { Meter, Labels } from './meter.js'
 import { BoundedEventTracker } from './event-tracker.js'
 
 export abstract class BaseContext {
   meter: Meter
-  logger: Logger
+  eventLogger: EventLogger
+
+  logger: EventLogger
+  /** @deprecated use {@link this.eventLogger} instead */
   eventTracker: BoundedEventTracker
 
   _res: ProcessResult = {
@@ -18,7 +21,10 @@ export abstract class BaseContext {
 
   protected constructor() {
     this.meter = new Meter(this)
-    this.logger = new Logger(this)
+    this.eventLogger = new EventLogger(this)
+    // eslint-disable-next-line deprecation/deprecation
+    this.logger = this.eventLogger
+    // eslint-disable-next-line deprecation/deprecation
     this.eventTracker = new BoundedEventTracker(this)
   }
 

package/src/core/core-plugin.ts

@@ -2,7 +2,6 @@ import { Plugin, PluginManager } from '@sentio/runtime'
 import { ProcessConfigResponse } from '@sentio/protos'
 
 import { MetricState } from './meter.js'
-import { EventTrackerState } from './event-tracker.js'
 import { ExporterState } from './exporter.js'
 
 export class CorePlugin extends Plugin {
@@ -16,17 +15,6 @@ export class CorePlugin extends Plugin {
       })
     }
 
-    for (const eventTracker of EventTrackerState.INSTANCE.getValues()) {
-      config.eventTrackingConfigs.push({
-        distinctAggregationByDays: eventTracker.options.distinctByDays || [],
-        eventName: eventTracker.name,
-        retentionConfig: undefined,
-        totalByDay: eventTracker.options.totalByDay || false,
-        totalPerEntity: undefined,
-        unique: eventTracker.options.unique || false,
-      })
-    }
-
     for (const exporter of ExporterState.INSTANCE.getValues()) {
       config.exportConfigs.push({
         name: exporter.name,

package/src/core/{logger.ts → event-logger.ts}

@@ -1,11 +1,12 @@
 import { BaseContext } from './base-context.js'
-import { LogLevel } from '@sentio/protos'
+import { EventTrackingResult, LogLevel } from '@sentio/protos'
 import { NamedResultDescriptor } from './metadata.js'
 import { normalizeAttribute } from './normalization.js'
+import { Event } from './event-tracker.js'
 
 export type Attributes = Record<string, any>
 
-export class Logger extends NamedResultDescriptor {
+export class EventLogger extends NamedResultDescriptor {
   private readonly ctx: BaseContext
 
   constructor(ctx: BaseContext, name = '') {
@@ -14,7 +15,7 @@ export class Logger extends NamedResultDescriptor {
   }
 
   withName(name: string) {
-    return new Logger(this.ctx, name)
+    return new EventLogger(this.ctx, name)
   }
 
   protected log(level: LogLevel, message: any, attributes: Attributes = {}) {
@@ -49,4 +50,19 @@ export class Logger extends NamedResultDescriptor {
   critical(msg: any, attributes: Attributes = {}) {
     this.log(LogLevel.CRITICAL, msg, attributes)
   }
+
+  emit(eventName: string, event: Event) {
+    const { distinctId, severity, message, ...payload } = event
+
+    const res: EventTrackingResult = {
+      metadata: this.ctx.getMetaData(eventName, {}),
+      severity: severity || LogLevel.INFO,
+      message: message || '',
+      distinctEntityId: distinctId || '',
+      attributes: payload,
+      runtimeInfo: undefined,
+      noMetric: true,
+    }
+    this.ctx._res.events.push(res)
+  }
 }

package/src/core/event-tracker.ts

@@ -1,75 +1,15 @@
 import { BaseContext } from './base-context.js'
-import { EventTrackingResult } from '@sentio/protos'
-import { NamedResultDescriptor } from './metadata.js'
-import { MapStateStorage } from '@sentio/runtime'
-import { normalizeAttribute } from './normalization.js'
+import { EventTrackingResult, LogLevel } from '@sentio/protos'
 
 export interface Event {
   // The unique identifier of main identity associate with an event
-  // .e.g user id / toekn address / account address / contract address id
+  // .e.g user id / token address / account address / contract address id
   //
-  distinctId: string
-  [key: string]: any
-}
-
-export interface TrackerOptions {
-  totalByDay?: boolean
-  unique?: boolean
-  distinctByDays?: number[]
-}
-
-export class EventTrackerState extends MapStateStorage<EventTracker> {
-  static INSTANCE = new EventTrackerState()
-}
-
-// Track Event with an identity associate with it
-export class EventTracker extends NamedResultDescriptor {
-  static DEFAULT_OPTIONS: TrackerOptions = {
-    totalByDay: true,
-    unique: true,
-  }
-
-  static register(eventName: string, options?: TrackerOptions) {
-    const tracker = new EventTracker(eventName, { ...EventTracker.DEFAULT_OPTIONS, ...options })
-    return EventTrackerState.INSTANCE.getOrSetValue(eventName, tracker)
-  }
-
-  options: TrackerOptions
-  protected constructor(eventName: string, options: TrackerOptions) {
-    super(eventName)
-    this.options = options
-  }
-
-  trackEvent(ctx: BaseContext, event: Event) {
-    const { distinctId, ...payload } = event
+  distinctId?: string
+  severity?: LogLevel
+  message?: string
 
-    const res: EventTrackingResult = {
-      metadata: ctx.getMetaData(this.name, {}),
-      distinctEntityId: distinctId,
-      attributes: normalizeAttribute(payload),
-      runtimeInfo: undefined,
-      noMetric: false,
-    }
-    ctx._res.events.push(res)
-  }
-}
-
-export class AccountEventTracker extends EventTracker {
-  static DEFAULT_OPTIONS: TrackerOptions = {
-    totalByDay: true,
-    unique: true,
-    distinctByDays: [1, 7, 30],
-  }
-
-  static register(eventName?: string, options?: TrackerOptions) {
-    if (eventName) {
-      eventName = ['user', eventName].join('_')
-    } else {
-      eventName = 'user'
-    }
-    const tracker = new AccountEventTracker(eventName, { ...AccountEventTracker.DEFAULT_OPTIONS, ...options })
-    return EventTrackerState.INSTANCE.getOrSetValue(eventName, tracker)
-  }
+  [key: string]: any
 }
 
 export class BoundedEventTracker {
@@ -80,10 +20,13 @@ export class BoundedEventTracker {
   }
 
   track(eventName: string, event: Event) {
-    const { distinctId, ...payload } = event
+    const { distinctId, severity, message, ...payload } = event
+
     const res: EventTrackingResult = {
       metadata: this.ctx.getMetaData(eventName, {}),
-      distinctEntityId: distinctId,
+      severity: severity || LogLevel.INFO,
+      message: message || '',
+      distinctEntityId: distinctId || '',
       attributes: payload,
       runtimeInfo: undefined,
       noMetric: true,

package/src/core/index.ts

@@ -2,7 +2,6 @@ export { BigDecimal, scaleDown } from './big-decimal.js'
 export { BaseContext } from './base-context.js'
 export { normalizeLabels } from './normalization.js'
 export { CounterBinding, Meter, type Labels, GaugeBinding, Counter, Gauge, MetricOptions } from './meter.js'
-export { EventTracker, AccountEventTracker } from './event-tracker.js'
 export { Exporter } from './exporter.js'
 export { type Numberish, toBigInteger, toMetricValue } from './numberish.js'
 

package/src/core/normalization.ts

@@ -55,7 +55,7 @@ function normalizeObject(obj: any, length: number): any {
     ret = {}
     for (const [key, value] of Object.entries(obj)) {
       const normValue = normalizeObject(value, length)
-      if (normValue) {
+      if (normValue != null) {
         ret[key] = normValue
       }
     }

package/lib/core/logger.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/core/logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAIvD,MAAM,OAAO,MAAO,SAAQ,qBAAqB;IAC9B,GAAG,CAAa;IAEjC,YAAY,GAAgB,EAAE,IAAI,GAAG,EAAE;QACrC,KAAK,CAAC,IAAI,CAAC,CAAA;QACX,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IAED,QAAQ,CAAC,IAAY;QACnB,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IACnC,CAAC;IAES,GAAG,CAAC,KAAe,EAAE,OAAY,EAAE,aAAyB,EAAE;QACtE,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO,YAAY,MAAM,CAAC,EAAE;YAC/D,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;SAClC;QAED,MAAM,IAAI,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAA;QAE3C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YACtB,mBAAmB;YACnB,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7C,KAAK;YACL,OAAO;YACP,WAAW,EAAE,IAAI;YACjB,WAAW,EAAE,SAAS;SACvB,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,CAAC,GAAQ,EAAE,aAAyB,EAAE;QACxC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,CAAC,CAAA;IAC1C,CAAC;IAED,IAAI,CAAC,GAAQ,EAAE,aAAyB,EAAE;QACxC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE,UAAU,CAAC,CAAA;IAC7C,CAAC;IAED,KAAK,CAAC,GAAQ,EAAE,aAAyB,EAAE;QACzC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,CAAC,CAAA;IAC3C,CAAC;IAED,QAAQ,CAAC,GAAQ,EAAE,aAAyB,EAAE;QAC5C,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE,UAAU,CAAC,CAAA;IAC9C,CAAC;CACF","sourcesContent":["import { BaseContext } from './base-context.js'\nimport { LogLevel } from '@sentio/protos'\nimport { NamedResultDescriptor } from './metadata.js'\nimport { normalizeAttribute } from './normalization.js'\n\nexport type Attributes = Record<string, any>\n\nexport class Logger extends NamedResultDescriptor {\n  private readonly ctx: BaseContext\n\n  constructor(ctx: BaseContext, name = '') {\n    super(name)\n    this.ctx = ctx\n  }\n\n  withName(name: string) {\n    return new Logger(this.ctx, name)\n  }\n\n  protected log(level: LogLevel, message: any, attributes: Attributes = {}) {\n    if (typeof message !== 'string' && !(message instanceof String)) {\n      message = JSON.stringify(message)\n    }\n\n    const norm = normalizeAttribute(attributes)\n\n    this.ctx._res.logs.push({\n      // name: this.name,\n      metadata: this.ctx.getMetaData(this.name, {}), // GetRecordMetaData(this.ctx, this, {}),\n      level,\n      message,\n      attributes2: norm,\n      runtimeInfo: undefined,\n    })\n  }\n\n  info(msg: any, attributes: Attributes = {}) {\n    this.log(LogLevel.INFO, msg, attributes)\n  }\n\n  warn(msg: any, attributes: Attributes = {}) {\n    this.log(LogLevel.WARNING, msg, attributes)\n  }\n\n  error(msg: any, attributes: Attributes = {}) {\n    this.log(LogLevel.ERROR, msg, attributes)\n  }\n\n  critical(msg: any, attributes: Attributes = {}) {\n    this.log(LogLevel.CRITICAL, msg, attributes)\n  }\n}\n"]}