@spytecgps/nova-orm 1.4.226 → 1.4.228

package/README.md

@@ -38,6 +38,28 @@ Delete the @spytecgps/nova-orm folder from the node_modules folder to make sure
 
 After that run `npm i @spytecgps/nova-orm` if you removed the dependency completely and this will bring the latest package, or run `npm i` if you just updated the version
 
+### Tagging queries with `queryTags()`
+
+Use `queryTags()` to attach sqlcommenter-formatted metadata to a QueryBuilder so
+PlanetScale Vitess Query Insights can group queries by controller/action, and so
+the mysql2 OTel auto-instrumentation span gets a useful name (via the
+`installMysqlSpanRenamer()` processor).
+
+```ts
+import { queryTags } from '@spytecgps/nova-orm'
+
+repo
+  .createQueryBuilder('alertType')
+  .comment(queryTags({ controller: 'AlertTypesRepository', action: 'getAlertTypes' }))
+  .select()
+  .getMany()
+```
+
+`queryTags()` auto-injects `application` from `process.env.OTEL_SERVICE_NAME`
+and `traceparent` from the active OTel span (if any). Caller-supplied keys
+override the auto-injected values. Output keys are alphabetically sorted for
+deterministic grouping in PlanetScale Insights.
+
 ### Copy Distribution folder to local project ((local testing))
 
 when making changes and would like to avoid commiting and publishing changes.

package/dist/entities/assetProfile.d.ts

@@ -23,5 +23,6 @@ export declare class AssetProfile {
     medias?: Relation<AssetProfileMedia>[];
     notes?: Relation<AssetProfileNote>[];
     customFields?: Relation<AssetProfileCustomField>[];
+    metadata?: Record<string, unknown> | null;
     customStatus?: Relation<AssetProfileCustomStatus> | null;
 }

package/dist/entities/assetProfile.js

@@ -1 +1 @@
-"use strict";var e=require("../node_modules/tslib/tslib.es6.js"),t=require("typeorm"),o=require("./assetProfileCustomField.js"),a=require("./assetProfileMedia.js"),r=require("./assetProfileNote.js"),s=require("./assetProfileType.js"),i=require("./device.js");exports.AssetProfile=class AssetProfile{id;deviceId;name;clientId;device;assetProfileTypeId;assetProfileType;make;model;serialNumber;year;status;createdAt;modifiedAt;medias;notes;customFields;customStatus},e.__decorate([t.PrimaryGeneratedColumn({type:"int",name:"id"}),e.__metadata("design:type",Number)],exports.AssetProfile.prototype,"id",void 0),e.__decorate([t.Column("int",{name:"deviceId",nullable:!0}),e.__metadata("design:type",Number)],exports.AssetProfile.prototype,"deviceId",void 0),e.__decorate([t.Column("varchar",{name:"name",length:100,nullable:!0}),e.__metadata("design:type",String)],exports.AssetProfile.prototype,"name",void 0),e.__decorate([t.Column("int",{name:"clientId"}),e.__metadata("design:type",Number)],exports.AssetProfile.prototype,"clientId",void 0),e.__decorate([t.OneToOne((()=>i.Device),{createForeignKeyConstraints:!1,nullable:!0}),t.JoinColumn(),e.__metadata("design:type",Object)],exports.AssetProfile.prototype,"device",void 0),e.__decorate([t.Column("smallint",{name:"assetProfileTypeId",nullable:!0}),e.__metadata("design:type",Number)],exports.AssetProfile.prototype,"assetProfileTypeId",void 0),e.__decorate([t.OneToOne((()=>s.AssetProfileType),{createForeignKeyConstraints:!1,nullable:!1}),t.JoinColumn(),e.__metadata("design:type",Object)],exports.AssetProfile.prototype,"assetProfileType",void 0),e.__decorate([t.Column("varchar",{name:"make",nullable:!0,length:50}),e.__metadata("design:type",String)],exports.AssetProfile.prototype,"make",void 0),e.__decorate([t.Column("varchar",{name:"model",nullable:!0,length:50}),e.__metadata("design:type",String)],exports.AssetProfile.prototype,"model",void 0),e.__decorate([t.Column("varchar",{name:"serialNumber",nullable:!0,length:512}),e.__metadata("design:type",String)],exports.AssetProfile.prototype,"serialNumber",void 0),e.__decorate([t.Column("smallint",{name:"year",nullable:!0}),e.__metadata("design:type",Number)],exports.AssetProfile.prototype,"year",void 0),e.__decorate([t.Column("varchar",{name:"status",length:50,default:()=>"'Active'"}),e.__metadata("design:type",String)],exports.AssetProfile.prototype,"status",void 0),e.__decorate([t.Column("datetime",{name:"createdAt",nullable:!0,default:()=>"CURRENT_TIMESTAMP"}),e.__metadata("design:type",Date)],exports.AssetProfile.prototype,"createdAt",void 0),e.__decorate([t.Column("datetime",{name:"modifiedAt",nullable:!0}),e.__metadata("design:type",Date)],exports.AssetProfile.prototype,"modifiedAt",void 0),e.__decorate([t.OneToMany((()=>a.AssetProfileMedia),(e=>e.assetProfile)),e.__metadata("design:type",Array)],exports.AssetProfile.prototype,"medias",void 0),e.__decorate([t.OneToMany((()=>r.AssetProfileNote),(e=>e.assetProfile)),e.__metadata("design:type",Array)],exports.AssetProfile.prototype,"notes",void 0),e.__decorate([t.OneToMany((()=>o.AssetProfileCustomField),(e=>e.assetProfile)),e.__metadata("design:type",Array)],exports.AssetProfile.prototype,"customFields",void 0),exports.AssetProfile=e.__decorate([t.Index("ix_clientId",["clientId"],{}),t.Index("ix_deviceId",["deviceId"],{unique:!0}),t.Entity("assetProfile",{schema:"nova"})],exports.AssetProfile);
+"use strict";var e=require("../node_modules/tslib/tslib.es6.js"),t=require("typeorm"),o=require("./assetProfileCustomField.js"),a=require("./assetProfileMedia.js"),r=require("./assetProfileNote.js"),s=require("./assetProfileType.js"),i=require("./device.js");exports.AssetProfile=class AssetProfile{id;deviceId;name;clientId;device;assetProfileTypeId;assetProfileType;make;model;serialNumber;year;status;createdAt;modifiedAt;medias;notes;customFields;metadata;customStatus},e.__decorate([t.PrimaryGeneratedColumn({type:"int",name:"id"}),e.__metadata("design:type",Number)],exports.AssetProfile.prototype,"id",void 0),e.__decorate([t.Column("int",{name:"deviceId",nullable:!0}),e.__metadata("design:type",Number)],exports.AssetProfile.prototype,"deviceId",void 0),e.__decorate([t.Column("varchar",{name:"name",length:100,nullable:!0}),e.__metadata("design:type",String)],exports.AssetProfile.prototype,"name",void 0),e.__decorate([t.Column("int",{name:"clientId"}),e.__metadata("design:type",Number)],exports.AssetProfile.prototype,"clientId",void 0),e.__decorate([t.OneToOne((()=>i.Device),{createForeignKeyConstraints:!1,nullable:!0}),t.JoinColumn(),e.__metadata("design:type",Object)],exports.AssetProfile.prototype,"device",void 0),e.__decorate([t.Column("smallint",{name:"assetProfileTypeId",nullable:!0}),e.__metadata("design:type",Number)],exports.AssetProfile.prototype,"assetProfileTypeId",void 0),e.__decorate([t.OneToOne((()=>s.AssetProfileType),{createForeignKeyConstraints:!1,nullable:!1}),t.JoinColumn(),e.__metadata("design:type",Object)],exports.AssetProfile.prototype,"assetProfileType",void 0),e.__decorate([t.Column("varchar",{name:"make",nullable:!0,length:50}),e.__metadata("design:type",String)],exports.AssetProfile.prototype,"make",void 0),e.__decorate([t.Column("varchar",{name:"model",nullable:!0,length:50}),e.__metadata("design:type",String)],exports.AssetProfile.prototype,"model",void 0),e.__decorate([t.Column("varchar",{name:"serialNumber",nullable:!0,length:512}),e.__metadata("design:type",String)],exports.AssetProfile.prototype,"serialNumber",void 0),e.__decorate([t.Column("smallint",{name:"year",nullable:!0}),e.__metadata("design:type",Number)],exports.AssetProfile.prototype,"year",void 0),e.__decorate([t.Column("varchar",{name:"status",length:50,default:()=>"'Active'"}),e.__metadata("design:type",String)],exports.AssetProfile.prototype,"status",void 0),e.__decorate([t.Column("datetime",{name:"createdAt",nullable:!0,default:()=>"CURRENT_TIMESTAMP"}),e.__metadata("design:type",Date)],exports.AssetProfile.prototype,"createdAt",void 0),e.__decorate([t.Column("datetime",{name:"modifiedAt",nullable:!0}),e.__metadata("design:type",Date)],exports.AssetProfile.prototype,"modifiedAt",void 0),e.__decorate([t.OneToMany((()=>a.AssetProfileMedia),(e=>e.assetProfile)),e.__metadata("design:type",Array)],exports.AssetProfile.prototype,"medias",void 0),e.__decorate([t.OneToMany((()=>r.AssetProfileNote),(e=>e.assetProfile)),e.__metadata("design:type",Array)],exports.AssetProfile.prototype,"notes",void 0),e.__decorate([t.OneToMany((()=>o.AssetProfileCustomField),(e=>e.assetProfile)),e.__metadata("design:type",Array)],exports.AssetProfile.prototype,"customFields",void 0),e.__decorate([t.Column("json",{name:"metadata",nullable:!0}),e.__metadata("design:type",Object)],exports.AssetProfile.prototype,"metadata",void 0),exports.AssetProfile=e.__decorate([t.Index("ix_clientId",["clientId"],{}),t.Index("ix_deviceId",["deviceId"],{unique:!0}),t.Entity("assetProfile",{schema:"nova"})],exports.AssetProfile);

package/dist/entities/position.js

@@ -1 +1 @@
-"use strict";var e=require("../node_modules/tslib/tslib.es6.js"),t=require("typeorm"),o=require("../utils/boolToNumberTransformer.js");exports.Position=class Position{id;imei;lat;lon;actualDate;speed;odometer;createdAt;messageId;batteryPercentage;clientId;address;sendTime;gpsUtcTime;externalBatteryPercentage;externalPowerVoltage;azimuth;motionDetected;deleted},e.__decorate([t.PrimaryGeneratedColumn({type:"bigint",name:"id"}),e.__metadata("design:type",Number)],exports.Position.prototype,"id",void 0),e.__decorate([t.Column("varchar",{name:"imei",length:15}),e.__metadata("design:type",String)],exports.Position.prototype,"imei",void 0),e.__decorate([t.Column("decimal",{name:"lat",nullable:!0,precision:8,scale:6}),e.__metadata("design:type",Number)],exports.Position.prototype,"lat",void 0),e.__decorate([t.Column("decimal",{name:"lon",nullable:!0,precision:9,scale:6}),e.__metadata("design:type",Number)],exports.Position.prototype,"lon",void 0),e.__decorate([t.Column("datetime",{name:"actualDate",precision:3}),e.__metadata("design:type",Date)],exports.Position.prototype,"actualDate",void 0),e.__decorate([t.Column("float",{name:"speed",nullable:!0}),e.__metadata("design:type",Number)],exports.Position.prototype,"speed",void 0),e.__decorate([t.Column("double",{name:"odometer",nullable:!0}),e.__metadata("design:type",Number)],exports.Position.prototype,"odometer",void 0),e.__decorate([t.Column("datetime",{name:"createdAt",precision:3}),e.__metadata("design:type",Date)],exports.Position.prototype,"createdAt",void 0),e.__decorate([t.Column("binary",{name:"messageId",length:16}),e.__metadata("design:type",Buffer)],exports.Position.prototype,"messageId",void 0),e.__decorate([t.Column("smallint",{name:"batteryPercentage",nullable:!0}),e.__metadata("design:type",Number)],exports.Position.prototype,"batteryPercentage",void 0),e.__decorate([t.Column("int",{name:"clientId"}),e.__metadata("design:type",Number)],exports.Position.prototype,"clientId",void 0),e.__decorate([t.Column("varchar",{name:"address",nullable:!0,length:255}),e.__metadata("design:type",String)],exports.Position.prototype,"address",void 0),e.__decorate([t.Column("datetime",{name:"sendTime",nullable:!0,precision:3}),e.__metadata("design:type",Date)],exports.Position.prototype,"sendTime",void 0),e.__decorate([t.Column("datetime",{name:"gpsUtcTime",nullable:!0,precision:3}),e.__metadata("design:type",Date)],exports.Position.prototype,"gpsUtcTime",void 0),e.__decorate([t.Column("smallint",{name:"externalBatteryPercentage",nullable:!0}),e.__metadata("design:type",Number)],exports.Position.prototype,"externalBatteryPercentage",void 0),e.__decorate([t.Column("float",{name:"externalPowerVoltage",nullable:!0}),e.__metadata("design:type",Number)],exports.Position.prototype,"externalPowerVoltage",void 0),e.__decorate([t.Column("smallint",{name:"azimuth",nullable:!0}),e.__metadata("design:type",Number)],exports.Position.prototype,"azimuth",void 0),e.__decorate([t.Column("tinyint",{name:"motionDetected",width:1,nullable:!0,transformer:new o.BoolToNumberTransformer}),e.__metadata("design:type",Boolean)],exports.Position.prototype,"motionDetected",void 0),e.__decorate([t.Column("tinyint",{name:"deleted",nullable:!0,width:1,transformer:new o.BoolToNumberTransformer,default:()=>"'0'"}),e.__metadata("design:type",Boolean)],exports.Position.prototype,"deleted",void 0),exports.Position=e.__decorate([t.Index("ixuPositionMessageId",["messageId"],{unique:!0}),t.Index("ixPositionImei",["imei"],{}),t.Index("ixPositionClientId_ActualDate",["clientId","actualDate"],{}),t.Index("ixPositionClientId_Imei_ActualDate",["clientId","imei","actualDate"],{}),t.Entity("position",{schema:"nova"})],exports.Position);
+"use strict";var e=require("../node_modules/tslib/tslib.es6.js"),t=require("typeorm"),o=require("../utils/boolToNumberTransformer.js");exports.Position=class Position{id;imei;lat;lon;actualDate;speed;odometer;createdAt;messageId;batteryPercentage;clientId;address;sendTime;gpsUtcTime;externalBatteryPercentage;externalPowerVoltage;azimuth;motionDetected;deleted},e.__decorate([t.PrimaryGeneratedColumn({type:"bigint",name:"id"}),e.__metadata("design:type",Number)],exports.Position.prototype,"id",void 0),e.__decorate([t.Column("varchar",{name:"imei",length:15}),e.__metadata("design:type",String)],exports.Position.prototype,"imei",void 0),e.__decorate([t.Column("decimal",{name:"lat",nullable:!0,precision:8,scale:6}),e.__metadata("design:type",Number)],exports.Position.prototype,"lat",void 0),e.__decorate([t.Column("decimal",{name:"lon",nullable:!0,precision:9,scale:6}),e.__metadata("design:type",Number)],exports.Position.prototype,"lon",void 0),e.__decorate([t.Column("datetime",{name:"actualDate",precision:3}),e.__metadata("design:type",Date)],exports.Position.prototype,"actualDate",void 0),e.__decorate([t.Column("float",{name:"speed",nullable:!0}),e.__metadata("design:type",Number)],exports.Position.prototype,"speed",void 0),e.__decorate([t.Column("double",{name:"odometer",nullable:!0}),e.__metadata("design:type",Number)],exports.Position.prototype,"odometer",void 0),e.__decorate([t.Column("datetime",{name:"createdAt",precision:3}),e.__metadata("design:type",Date)],exports.Position.prototype,"createdAt",void 0),e.__decorate([t.Column("binary",{name:"messageId",length:16}),e.__metadata("design:type",Buffer)],exports.Position.prototype,"messageId",void 0),e.__decorate([t.Column("smallint",{name:"batteryPercentage",nullable:!0}),e.__metadata("design:type",Number)],exports.Position.prototype,"batteryPercentage",void 0),e.__decorate([t.Column("int",{name:"clientId"}),e.__metadata("design:type",Number)],exports.Position.prototype,"clientId",void 0),e.__decorate([t.Column("varchar",{name:"address",nullable:!0,length:255}),e.__metadata("design:type",String)],exports.Position.prototype,"address",void 0),e.__decorate([t.Column("datetime",{name:"sendTime",nullable:!0,precision:3}),e.__metadata("design:type",Date)],exports.Position.prototype,"sendTime",void 0),e.__decorate([t.Column("datetime",{name:"gpsUtcTime",nullable:!0,precision:3}),e.__metadata("design:type",Date)],exports.Position.prototype,"gpsUtcTime",void 0),e.__decorate([t.Column("smallint",{name:"externalBatteryPercentage",nullable:!0}),e.__metadata("design:type",Number)],exports.Position.prototype,"externalBatteryPercentage",void 0),e.__decorate([t.Column("float",{name:"externalPowerVoltage",nullable:!0}),e.__metadata("design:type",Number)],exports.Position.prototype,"externalPowerVoltage",void 0),e.__decorate([t.Column("smallint",{name:"azimuth",nullable:!0}),e.__metadata("design:type",Number)],exports.Position.prototype,"azimuth",void 0),e.__decorate([t.Column("tinyint",{name:"motionDetected",width:1,nullable:!0,transformer:new o.BoolToNumberTransformer}),e.__metadata("design:type",Boolean)],exports.Position.prototype,"motionDetected",void 0),e.__decorate([t.Column("tinyint",{name:"deleted",nullable:!0,width:1,transformer:new o.BoolToNumberTransformer,default:()=>"'0'"}),e.__metadata("design:type",Boolean)],exports.Position.prototype,"deleted",void 0),exports.Position=e.__decorate([t.Index("ixuPositionMessageId",["messageId"],{unique:!0}),t.Index("ixPositionClientId_Imei_ActualDate",["clientId","imei","actualDate"],{}),t.Entity("position",{schema:"nova"})],exports.Position);

package/dist/index.d.ts

@@ -6,6 +6,7 @@ import { syncSchemaFromDump, SyncSchemaFromDumpConfig } from './syncSchemaFromDu
 import * as Types from './types';
 import * as Enums from './types/enums';
 import { ConsoleLogger } from './utils/consoleLogger';
+import { queryTags } from './utils/queryTags';
 declare const Utils: {
     uuidStringToBinaryBuffer: (uuidString: string) => Buffer;
     binaryBufferToUuidString: (buffer: Buffer | null) => string;
@@ -24,4 +25,4 @@ declare const Utils: {
     addMonthsToNow: (months: number) => Date;
     mapRawEntityToEntity: <T>(rawEntity: any, columnsPrefix?: string) => T;
 };
-export { Cache, ConsoleLogger, Entities, Enums, NovaDataSource, NovaDataSourceConfig, Repository, syncSchemaFromDump, SyncSchemaFromDumpConfig, Types, Utils, };
+export { Cache, ConsoleLogger, Entities, Enums, NovaDataSource, NovaDataSourceConfig, queryTags, Repository, syncSchemaFromDump, SyncSchemaFromDumpConfig, Types, Utils, };

package/dist/index.js

@@ -1 +1 @@
-"use strict";var e=require("typeorm"),r=require("./cache/index.js"),t=require("./entities/index.js"),o=require("./novaDataSource.js"),a=require("./syncSchemaFromDump.js"),n=require("./types/index.js"),s=require("./types/enums.js"),i=require("./utils/consoleLogger.js"),u=require("./utils/dateTool.js"),l=require("./utils/mapRawEntityToEntity.js"),y=require("./utils/paramsValidators.js"),m=require("./utils/parsingTools.js"),g=require("./utils/randomizer.js"),d=require("./utils/uuidHelpers.js");const p={uuidStringToBinaryBuffer:d.uuidStringToBinaryBuffer,binaryBufferToUuidString:d.binaryBufferToUuidString,getRandomBoolean:g.getRandomBoolean,getRandomImei:g.getRandomImei,getRandomDateInRange:g.getRandomDateInRange,getRandomInteger:g.getRandomInteger,getRandomString:g.getRandomString,tryParseBoolean:m.tryParseBoolean,tryParseDate:m.tryParseDate,tryParseFloat:m.tryParseFloat,allAttributesAreNull:y.allAttributesAreNull,anyAttributeInArrayIsNull:y.anyAttributeInArrayIsNull,anyAttributeIsNull:y.anyAttributeIsNull,now:u.now,addMonthsToNow:u.addMonthsToNow,mapRawEntityToEntity:l.mapRawEntityToEntity};Object.defineProperty(exports,"Repository",{enumerable:!0,get:function(){return e.Repository}}),exports.Cache=r,exports.Entities=t,exports.NovaDataSource=o.NovaDataSource,exports.syncSchemaFromDump=a.syncSchemaFromDump,exports.Types=n,exports.Enums=s,exports.ConsoleLogger=i.ConsoleLogger,exports.Utils=p;
+"use strict";var e=require("typeorm"),r=require("./cache/index.js"),t=require("./entities/index.js"),o=require("./novaDataSource.js"),a=require("./syncSchemaFromDump.js"),s=require("./types/index.js"),i=require("./types/enums.js"),n=require("./utils/consoleLogger.js"),u=require("./utils/dateTool.js"),l=require("./utils/mapRawEntityToEntity.js"),y=require("./utils/paramsValidators.js"),g=require("./utils/parsingTools.js"),m=require("./utils/queryTags.js"),d=require("./utils/randomizer.js"),p=require("./utils/uuidHelpers.js");const q={uuidStringToBinaryBuffer:p.uuidStringToBinaryBuffer,binaryBufferToUuidString:p.binaryBufferToUuidString,getRandomBoolean:d.getRandomBoolean,getRandomImei:d.getRandomImei,getRandomDateInRange:d.getRandomDateInRange,getRandomInteger:d.getRandomInteger,getRandomString:d.getRandomString,tryParseBoolean:g.tryParseBoolean,tryParseDate:g.tryParseDate,tryParseFloat:g.tryParseFloat,allAttributesAreNull:y.allAttributesAreNull,anyAttributeInArrayIsNull:y.anyAttributeInArrayIsNull,anyAttributeIsNull:y.anyAttributeIsNull,now:u.now,addMonthsToNow:u.addMonthsToNow,mapRawEntityToEntity:l.mapRawEntityToEntity};Object.defineProperty(exports,"Repository",{enumerable:!0,get:function(){return e.Repository}}),exports.Cache=r,exports.Entities=t,exports.NovaDataSource=o.NovaDataSource,exports.syncSchemaFromDump=a.syncSchemaFromDump,exports.Types=s,exports.Enums=i,exports.ConsoleLogger=n.ConsoleLogger,exports.queryTags=m.queryTags,exports.Utils=q;

package/dist/novaDataSource.js

@@ -1 +1 @@
-"use strict";var e=require("typeorm");require("lru-cache");var r=require("./entities/index.js"),t=require("./subscribers/index.js"),a=require("./utils/queryLogger.js"),i=require("./utils/spanSubscriber.js");require("fs"),require("mysql2/promise"),require("path"),require("./types/enums.js"),require("./types/logger.js"),require("./entities/retailAlertExternalRecipient.js"),require("./utils/dateTool.js");exports.NovaDataSource=class NovaDataSource{dataSource;logger;constructor(i,s,o){this.logger=s;const c=[];for(const e in r){const t=r[e];c.push(t)}const n=[];for(const e in t){const r=t[e];n.push(r)}const u={host:"aws.connect.psdb.cloud",port:3306,database:"nova",ssl:{rejectUnauthorized:!0}};this.dataSource=new e.DataSource({type:"mysql",connectorPackage:"mysql2",synchronize:!1,logging:!0,logger:new a.QueryLogger(this.logger,i.logging),entities:c,subscribers:n,migrations:["node_modules/@spytecgps/nova-orm/dist/migration/*.js"],supportBigNumbers:!0,bigNumberStrings:!1,extra:{decimalNumbers:!0},...u,...i,replication:{master:{...u,...i},slaves:o?[{...u,...o}]:[{...u,...i}],defaultMode:i.replicationMode??"master"}})}async connect(){if(this.dataSource.isInitialized||await this.dataSource.initialize(),!this.dataSource.subscribers.some((e=>e._spanSubscriber))){const e=i.createSpanSubscriber(this.logger);e._spanSubscriber=!0,this.dataSource.subscribers.push(e)}}async disconnect(){try{this.dataSource.isInitialized&&await this.dataSource.destroy()}catch(e){this.logger.error({error:e},"Failed to close connection to database")}}getRepository(e){return this.dataSource.getRepository(e)}async query(e,r){return this.dataSource.query(e,r,null)}async createQueryBuilder(e,r){return this.dataSource.createQueryBuilder(e,r,null)}createQueryRunner(e){return this.dataSource.createQueryRunner(e)}createQueryRunnerFromParams(e){const r=e?.queryOptions?.forceUseReplica?"slave":"master";return this.logger.trace({replicationMode:r},"Creating query runner with replication mode"),this.dataSource.createQueryRunner(r)}async safeQuery(e,r,t){try{await this.connect();return await e(this,t)}catch(e){throw this.logger.error({error:e},r?r+" ":"Error while executing query"),e}finally{t&&await t.release(),await this.disconnect()}}async safeQuery2(e,r,t){try{this.dataSource.isInitialized||(this.logger.info("nova-orm new connection"),await this.connect());return await e(this,t)}catch(e){throw this.logger.error({error:e},r?r+" ":"Error while executing query"),e}finally{t&&await t.release()}}async safeQuery3(e,r,t,{replicationMode:a,tag:i}={}){return(async()=>{let s;try{await this.connect(),a?(this.logger.trace({replicationMode:a},"Creating query runner with replication mode"),s=this.dataSource.createQueryRunner(a)):this.logger.trace({replicationMode:this.dataSource.defaultReplicationModeForReads},"Creating query builder with default replication mode for reads");const o=this.dataSource.createQueryBuilder(e,r,s);i&&o.comment(i);return await t(o)}catch(e){throw this.logger.error({error:e},i?i+" ":"Error while executing query"),e}finally{s&&await s.release()}})()}async syncSchema(e=!0){this.logger.warn("Initiating schema sync"),await this.connect(),await this.dataSource.synchronize(e),await this.dataSource.runMigrations()}async clearCache(){this.dataSource.queryResultCache?(this.logger.info("Clearing query result cache"),await this.dataSource.queryResultCache.clear()):this.logger.info("No query result cache to clear")}async invalidateCacheKey(e){this.dataSource.queryResultCache&&(this.logger.info("Invalidating cache key",{key:e}),await this.dataSource.queryResultCache.remove([e]))}};
+"use strict";var e=require("typeorm");require("lru-cache");var r=require("./entities/index.js"),t=require("./subscribers/index.js"),a=require("./utils/mysqlSpanProcessor.js"),i=require("./utils/queryLogger.js"),s=require("./utils/spanSubscriber.js");require("fs"),require("mysql2/promise"),require("path"),require("./types/enums.js"),require("./types/logger.js"),require("./entities/retailAlertExternalRecipient.js"),require("./utils/dateTool.js"),require("@opentelemetry/api");exports.NovaDataSource=class NovaDataSource{dataSource;logger;constructor(a,s,o){this.logger=s;const n=[];for(const e in r){const t=r[e];n.push(t)}const c=[];for(const e in t){const r=t[e];c.push(r)}const u={host:"aws.connect.psdb.cloud",port:3306,database:"nova",ssl:{rejectUnauthorized:!0}};this.dataSource=new e.DataSource({type:"mysql",connectorPackage:"mysql2",synchronize:!1,logging:!0,logger:new i.QueryLogger(this.logger,a.logging),entities:n,subscribers:c,migrations:["node_modules/@spytecgps/nova-orm/dist/migration/*.js"],supportBigNumbers:!0,bigNumberStrings:!1,extra:{decimalNumbers:!0},...u,...a,replication:{master:{...u,...a},slaves:o?[{...u,...o}]:[{...u,...a}],defaultMode:a.replicationMode??"master"}})}async connect(){if(this.dataSource.isInitialized||await this.dataSource.initialize(),a.isOtelAutoInstrumented())a.installMysqlSpanRenamer();else if(!this.dataSource.subscribers.some((e=>e._spanSubscriber))){const e=s.createSpanSubscriber(this.logger);e._spanSubscriber=!0,this.dataSource.subscribers.push(e)}}async disconnect(){try{this.dataSource.isInitialized&&await this.dataSource.destroy()}catch(e){this.logger.error({error:e},"Failed to close connection to database")}}getRepository(e){return this.dataSource.getRepository(e)}async query(e,r){return this.dataSource.query(e,r,null)}async createQueryBuilder(e,r){return this.dataSource.createQueryBuilder(e,r,null)}createQueryRunner(e){return this.dataSource.createQueryRunner(e)}createQueryRunnerFromParams(e){const r=e?.queryOptions?.forceUseReplica?"slave":"master";return this.logger.trace({replicationMode:r},"Creating query runner with replication mode"),this.dataSource.createQueryRunner(r)}async safeQuery(e,r,t){try{await this.connect();return await e(this,t)}catch(e){throw this.logger.error({error:e},r?r+" ":"Error while executing query"),e}finally{t&&await t.release(),await this.disconnect()}}async safeQuery2(e,r,t){try{this.dataSource.isInitialized||(this.logger.info("nova-orm new connection"),await this.connect());return await e(this,t)}catch(e){throw this.logger.error({error:e},r?r+" ":"Error while executing query"),e}finally{t&&await t.release()}}async safeQuery3(e,r,t,{replicationMode:a,tag:i}={}){return(async()=>{let s;try{await this.connect(),a?(this.logger.trace({replicationMode:a},"Creating query runner with replication mode"),s=this.dataSource.createQueryRunner(a)):this.logger.trace({replicationMode:this.dataSource.defaultReplicationModeForReads},"Creating query builder with default replication mode for reads");const o=this.dataSource.createQueryBuilder(e,r,s);i&&o.comment(i);return await t(o)}catch(e){throw this.logger.error({error:e},i?i+" ":"Error while executing query"),e}finally{s&&await s.release()}})()}async syncSchema(e=!0){this.logger.warn("Initiating schema sync"),await this.connect(),await this.dataSource.synchronize(e),await this.dataSource.runMigrations()}async clearCache(){this.dataSource.queryResultCache?(this.logger.info("Clearing query result cache"),await this.dataSource.queryResultCache.clear()):this.logger.info("No query result cache to clear")}async invalidateCacheKey(e){this.dataSource.queryResultCache&&(this.logger.info("Invalidating cache key",{key:e}),await this.dataSource.queryResultCache.remove([e]))}};

package/dist/utils/mysqlSpanProcessor.d.ts

@@ -0,0 +1,3 @@
+export declare function installMysqlSpanRenamer(): boolean;
+export declare function _resetForTests(): void;
+export declare function isOtelAutoInstrumented(): boolean;

package/dist/utils/mysqlSpanProcessor.js

@@ -0,0 +1 @@
+"use strict";var e=require("@opentelemetry/api");const t=/^\/\*\s*(.+?)\s*\*\//,n=/([A-Za-z_][A-Za-z0-9_]*)='([^']*)'/g;const r={onStart(e){if("mysql"!==e.attributes?.["db.system"])return;const r=e.attributes["db.statement"];if("string"!=typeof r)return;const s=r.match(t);if(!s)return;const o=s[1],c=function(e){const t={};let r,s=!1,o=0;for(n.lastIndex=0;null!==(r=n.exec(e));){s=!0;const n=e.slice(o,r.index);if(n&&!/^\s*,?\s*$/.test(n))return null;try{t[r[1]]=decodeURIComponent(r[2])}catch{t[r[1]]=r[2]}o=r.index+r[0].length}if(!s)return null;const c=e.slice(o);return c&&!/^\s*,?\s*$/.test(c)?null:t}(o);if(c){const t=function(e){if(e.controller&&e.action)return`${e.controller}::${e.action}`;if(e.action)return e.action;if(e.controller)return e.controller;const t=Object.keys(e)[0];return t?e[t]:null}(c);if(t)return void e.updateName(t)}e.updateName(o)},onEnd(){},shutdown:()=>Promise.resolve(),forceFlush:()=>Promise.resolve()};let s=!1;exports.installMysqlSpanRenamer=function(){if(s)return!0;const t=e.trace.getTracerProvider(),n=t._delegate??t.getDelegate?.()??t,o=n._activeSpanProcessor?._spanProcessors;return!!Array.isArray(o)&&(o.includes(r)||o.push(r),s=!0,!0)},exports.isOtelAutoInstrumented=function(){return Boolean(process.env.AWS_LAMBDA_EXEC_WRAPPER?.includes("otel-handler")||process.env.OPENTELEMETRY_COLLECTOR_CONFIG_FILE)};

package/dist/utils/queryTags.d.ts

@@ -0,0 +1 @@
+export declare function queryTags(tags: Record<string, string>): string;

package/dist/utils/queryTags.js

@@ -0,0 +1 @@
+"use strict";var t=require("@opentelemetry/api");exports.queryTags=function(e){const n={},r=process.env.OTEL_SERVICE_NAME;r&&(n.application=r);const a=t.trace.getActiveSpan()?.spanContext();if(a?.traceId&&a.spanId){const t=(a.traceFlags??0).toString(16).padStart(2,"0");n.traceparent=`00-${a.traceId}-${a.spanId}-${t}`}for(const[t,r]of Object.entries(e))n[t]=r;const c=Object.keys(n).sort();return 0===c.length?"":c.map((t=>`${t}='${encodeURIComponent(n[t]).replace(/'/g,"%27")}'`)).join(",")};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spytecgps/nova-orm",
-  "version": "1.4.226",
+  "version": "1.4.228",
   "description": "ORM with PlanetScale",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -34,6 +34,7 @@
     "ioredis": "^5.6.1"
   },
   "dependencies": {
+    "@opentelemetry/api": "^1.9.0",
     "dayjs": "^1.11.11",
     "dotenv": "^16.4.7",
     "lru-cache": "^11.0.0",

package/schema.sql

@@ -1,6 +1,6 @@
--- nova-orm-schema-checksum: 870b1526424e878cfd2d1ebc29426112
+-- nova-orm-schema-checksum: 7adf261a86308f3a0d0f30ca485a5db2
 -- Nova ORM Schema Dump
--- Generated at: 2026-05-07T15:16:00.096Z
+-- Generated at: 2026-05-11T10:42:22.480Z
 
 SET FOREIGN_KEY_CHECKS = 0;
 
@@ -281,6 +281,7 @@ CREATE TABLE `assetProfile` (
   `status` varchar(50) NOT NULL DEFAULT 'Active',
   `createdAt` datetime DEFAULT CURRENT_TIMESTAMP,
   `modifiedAt` datetime DEFAULT NULL,
+  `metadata` json DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `ix_deviceId` (`deviceId`),
   KEY `ix_clientId` (`clientId`)
@@ -2435,9 +2436,7 @@ CREATE TABLE `position` (
   `deleted` tinyint(1) DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `ixuPositionMessageId` (`messageId`),
-  KEY `ixPositionClientId_Imei_ActualDate` (`clientId`,`imei`,`actualDate`),
-  KEY `ixPositionClientId_ActualDate` (`clientId`,`actualDate`),
-  KEY `ixPositionImei` (`imei`)
+  KEY `ixPositionClientId_Imei_ActualDate` (`clientId`,`imei`,`actualDate`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 DROP TABLE IF EXISTS `promotion`;