skyeye-svc-common-utils 2.0.0-dev0.16 → 2.0.0-dev0.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/dist/utils/baseClass/dataSourceManager.d.ts +2 -2
  2. package/dist/utils/baseClass/dataSourceManager.js +6 -6
  3. package/dist/utils/baseClass/dataSourceManager.js.map +1 -1
  4. package/dist/utils/middleware/startdbConnection.js +2 -2
  5. package/dist/utils/middleware/startdbConnection.js.map +1 -1
  6. package/package.json +1 -1
  7. package/src/utils/baseClass/dataSourceManager.ts +6 -6
  8. package/src/utils/middleware/startdbConnection.ts +2 -2
package/dist/utils/baseClass/dataSourceManager.d.ts CHANGED
@@ -4,8 +4,8 @@ export declare class DataSourceManager {
4
4
  private dataSources;
5
5
  private constructor();
6
6
  static getInstance(): DataSourceManager;
7
- createDataSource(name: string, options?: DataSourceOptions): Promise<DataSource>;
8
- getDataSource(dataSourceName: string): DataSource;
7
+ createDataSource(name?: string, options?: DataSourceOptions): Promise<DataSource>;
8
+ getDataSource(dataSourceName?: string): DataSource;
9
9
  }
10
10
  export declare function getDataSource(dataSourceName?: string): DataSource;
11
11
  export declare function createDataSource(options?: DataSourceOptions, name?: string): Promise<DataSource>;
package/dist/utils/baseClass/dataSourceManager.js CHANGED
@@ -24,13 +24,13 @@ class DataSourceManager {
24
24
  }
25
25
  return DataSourceManager.instance;
26
26
  }
27
- createDataSource(name, options) {
27
+ createDataSource(name = 'default', options) {
28
28
  return __awaiter(this, void 0, void 0, function* () {
29
29
  const _options = options;
30
30
  return new Promise((resolve, reject) => {
31
31
  new typeorm_1.DataSource(_options).initialize()
32
32
  .then((dataSource) => {
33
- logger_1.logger.info("Data Source Initialized", name);
33
+ logger_1.logger.info(`Data Source Initialize ${name}`);
34
34
  this.dataSources.set(name, dataSource);
35
35
  const retrievedData = this.dataSources.get(name);
36
36
  resolve(retrievedData);
@@ -41,19 +41,19 @@ class DataSourceManager {
41
41
  });
42
42
  });
43
43
  }
44
- getDataSource(dataSourceName) {
44
+ getDataSource(dataSourceName = 'default') {
45
45
  logger_1.logger.info(`Retrieve data source with name ${dataSourceName}`);
46
- return this.dataSources.get(dataSourceName || 'default');
46
+ return this.dataSources.get(dataSourceName);
47
47
  }
48
48
  }
49
49
  exports.DataSourceManager = DataSourceManager;
50
50
  // to be used instead of getConnection()
51
51
  function getDataSource(dataSourceName) {
52
- return DataSourceManager.getInstance().getDataSource(dataSourceName || 'default');
52
+ return DataSourceManager.getInstance().getDataSource(dataSourceName);
53
53
  }
54
54
  exports.getDataSource = getDataSource;
55
55
  function createDataSource(options, name) {
56
- return DataSourceManager.getInstance().createDataSource(name || 'default', options);
56
+ return DataSourceManager.getInstance().createDataSource(name, options);
57
57
  }
58
58
  exports.createDataSource = createDataSource;
59
59
  //# sourceMappingURL=dataSourceManager.js.map
package/dist/utils/baseClass/dataSourceManager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dataSourceManager.js","sourceRoot":"","sources":["../../../src/utils/baseClass/dataSourceManager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiG;AACjG,6CAA0C;AAE1C,+CAA+C;AAC/C,MAAa,iBAAiB;IAI1B;QAFQ,gBAAW,GAA4B,IAAI,GAAG,EAAE,CAAC;IAElC,CAAC;IAEjB,MAAM,CAAC,WAAW;QACrB,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;YAC9B,eAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YACpD,iBAAiB,CAAC,QAAQ,GAAG,IAAI,iBAAiB,EAAE,CAAC;QACzD,CAAC;QACD,OAAO,iBAAiB,CAAC,QAAQ,CAAC;IACtC,CAAC;IAEY,gBAAgB,CAAC,IAAY,EAAE,OAA2B;;YACnE,MAAM,QAAQ,GAAG,OAAO,CAAC;YACzB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnC,IAAI,oBAAU,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE;qBACpC,IAAI,CAAC,CAAC,UAAsB,EAAE,EAAE;oBAC7B,eAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,IAAI,CAAC,CAAC;oBAC7C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;oBACvC,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACjD,OAAO,CAAC,aAAa,CAAC,CAAC;gBAC3B,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,CAAM,EAAE,EAAE;oBACd,MAAM,CAAC,CAAC,CAAC,CAAC;gBACd,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAC;QACP,CAAC;KAAA;IAEM,aAAa,CAAC,cAAsB;QACvC,eAAM,CAAC,IAAI,CAAC,kCAAkC,cAAc,EAAE,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,cAAc,IAAI,SAAS,CAAC,CAAC;IAC7D,CAAC;CAEJ;AAnCD,8CAmCC;AAED,wCAAwC;AACxC,SAAgB,aAAa,CAAC,cAAuB;IACjD,OAAO,iBAAiB,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC,cAAc,IAAI,SAAS,CAAC,CAAC;AACtF,CAAC;AAFD,sCAEC;AAED,SAAgB,gBAAgB,CAAC,OAA2B,EAAE,IAAa;IACvE,OAAO,iBAAiB,CAAC,WAAW,EAAE,CAAC,gBAAgB,CAAC,IAAI,IAAI,SAAS,EAAE,OAAO,CAAC,CAAC;AACxF,CAAC;AAFD,4CAEC"}
1
+ {"version":3,"file":"dataSourceManager.js","sourceRoot":"","sources":["../../../src/utils/baseClass/dataSourceManager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiG;AACjG,6CAA0C;AAE1C,+CAA+C;AAC/C,MAAa,iBAAiB;IAI1B;QAFQ,gBAAW,GAA4B,IAAI,GAAG,EAAE,CAAC;IAElC,CAAC;IAEjB,MAAM,CAAC,WAAW;QACrB,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;YAC9B,eAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YACpD,iBAAiB,CAAC,QAAQ,GAAG,IAAI,iBAAiB,EAAE,CAAC;QACzD,CAAC;QACD,OAAO,iBAAiB,CAAC,QAAQ,CAAC;IACtC,CAAC;IAEY,gBAAgB,CAAC,OAAe,SAAS,EAAE,OAA2B;;YAC/E,MAAM,QAAQ,GAAG,OAAO,CAAC;YACzB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnC,IAAI,oBAAU,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE;qBACpC,IAAI,CAAC,CAAC,UAAsB,EAAE,EAAE;oBAC7B,eAAM,CAAC,IAAI,CAAC,0BAA0B,IAAI,EAAE,CAAC,CAAC;oBAC9C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;oBACvC,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACjD,OAAO,CAAC,aAAa,CAAC,CAAC;gBAC3B,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,CAAM,EAAE,EAAE;oBACd,MAAM,CAAC,CAAC,CAAC,CAAC;gBACd,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAC;QACP,CAAC;KAAA;IAEM,aAAa,CAAC,iBAAyB,SAAS;QACnD,eAAM,CAAC,IAAI,CAAC,kCAAkC,cAAc,EAAE,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChD,CAAC;CAEJ;AAnCD,8CAmCC;AAED,wCAAwC;AACxC,SAAgB,aAAa,CAAC,cAAuB;IACjD,OAAO,iBAAiB,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;AACzE,CAAC;AAFD,sCAEC;AAED,SAAgB,gBAAgB,CAAC,OAA2B,EAAE,IAAa;IACvE,OAAO,iBAAiB,CAAC,WAAW,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC3E,CAAC;AAFD,4CAEC"}
package/dist/utils/middleware/startdbConnection.js CHANGED
@@ -20,8 +20,8 @@ function startConnection(entities) {
20
20
  const options = Object.assign(Object.assign({}, JSON.parse(yield (0, azureKeyVault_1.getKey)(appConfig_1.commonAppConfig.SqlConnectionConfigKey))), { synchronize: false, entities: entities });
21
21
  const myDataSource = new typeorm_1.DataSource(options);
22
22
  if (appConfig_1.commonAppConfig.SqlEnable) {
23
- (0, dataSourceManager_1.createDataSource)(options).then((data) => {
24
- logger_1.logger.info("TypeORM connected", JSON.stringify(data));
23
+ (0, dataSourceManager_1.createDataSource)(options).then(() => {
24
+ logger_1.logger.info("TypeORM connected");
25
25
  }).catch(error => logger_1.logger.info("TypeORM connection error: ", error));
26
26
  }
27
27
  });
package/dist/utils/middleware/startdbConnection.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"startdbConnection.js","sourceRoot":"","sources":["../../../src/utils/middleware/startdbConnection.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAwD;AACxD,sEAAkE;AAClE,4CAA+C;AAC/C,iEAAuD;AACvD,6CAA0C;AAE1C,SAAsB,eAAe,CAAC,QAAe;;QACjD,MAAM,OAAO,mCAEN,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,sBAAM,EAAC,2BAAe,CAAC,sBAAsB,CAAC,CAAC,KACnE,WAAW,EAAE,KAAK,EAClB,QAAQ,EAAE,QAAQ,GACrB,CAAC;QACF,MAAM,YAAY,GAAG,IAAI,oBAAU,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,2BAAe,CAAC,SAAS,EAAE,CAAC;YAC5B,IAAA,oCAAgB,EAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACpC,eAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,eAAM,CAAC,IAAI,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC,CAAC;QACxE,CAAC;IACL,CAAC;CAAA;AAbD,0CAaC"}
1
+ {"version":3,"file":"startdbConnection.js","sourceRoot":"","sources":["../../../src/utils/middleware/startdbConnection.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAwD;AACxD,sEAAkE;AAClE,4CAA+C;AAC/C,iEAAuD;AACvD,6CAA0C;AAE1C,SAAsB,eAAe,CAAC,QAAe;;QACjD,MAAM,OAAO,mCAEN,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,sBAAM,EAAC,2BAAe,CAAC,sBAAsB,CAAC,CAAC,KACnE,WAAW,EAAE,KAAK,EAClB,QAAQ,EAAE,QAAQ,GACrB,CAAC;QACF,MAAM,YAAY,GAAG,IAAI,oBAAU,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,2BAAe,CAAC,SAAS,EAAE,CAAC;YAC5B,IAAA,oCAAgB,EAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBAChC,eAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,eAAM,CAAC,IAAI,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC,CAAC;QACxE,CAAC;IACL,CAAC;CAAA;AAbD,0CAaC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "skyeye-svc-common-utils",
3
- "version": "2.0.0-dev0.16",
3
+ "version": "2.0.0-dev0.18",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/utils/baseClass/dataSourceManager.ts CHANGED
@@ -16,12 +16,12 @@ export class DataSourceManager {
16
16
  return DataSourceManager.instance;
17
17
  }
18
18
 
19
- public async createDataSource(name: string, options?: DataSourceOptions): Promise<DataSource> {
19
+ public async createDataSource(name: string = 'default', options?: DataSourceOptions): Promise<DataSource> {
20
20
  const _options = options;
21
21
  return new Promise((resolve, reject) => {
22
22
  new DataSource(_options).initialize()
23
23
  .then((dataSource: DataSource) => {
24
- logger.info("Data Source Initialized", name);
24
+ logger.info(`Data Source Initialize ${name}`);
25
25
  this.dataSources.set(name, dataSource);
26
26
  const retrievedData = this.dataSources.get(name);
27
27
  resolve(retrievedData);
@@ -32,18 +32,18 @@ export class DataSourceManager {
32
32
  });
33
33
  }
34
34
 
35
- public getDataSource(dataSourceName: string): DataSource {
35
+ public getDataSource(dataSourceName: string = 'default'): DataSource {
36
36
  logger.info(`Retrieve data source with name ${dataSourceName}`);
37
- return this.dataSources.get(dataSourceName || 'default');
37
+ return this.dataSources.get(dataSourceName);
38
38
  }
39
39
 
40
40
  }
41
41
 
42
42
  // to be used instead of getConnection()
43
43
  export function getDataSource(dataSourceName?: string): DataSource {
44
- return DataSourceManager.getInstance().getDataSource(dataSourceName || 'default');
44
+ return DataSourceManager.getInstance().getDataSource(dataSourceName);
45
45
  }
46
46
 
47
47
  export function createDataSource(options?: DataSourceOptions, name?: string) {
48
- return DataSourceManager.getInstance().createDataSource(name || 'default', options);
48
+ return DataSourceManager.getInstance().createDataSource(name, options);
49
49
  }
package/src/utils/middleware/startdbConnection.ts CHANGED
@@ -13,8 +13,8 @@ export async function startConnection(entities: any[]) {
13
13
  };
14
14
  const myDataSource = new DataSource(options);
15
15
  if (commonAppConfig.SqlEnable) {
16
- createDataSource(options).then((data) => {
17
- logger.info("TypeORM connected", JSON.stringify(data));
16
+ createDataSource(options).then(() => {
17
+ logger.info("TypeORM connected");
18
18
  }).catch(error => logger.info("TypeORM connection error: ", error));
19
19
  }
20
20
  }