@etsoo/appscript 1.1.63 → 1.1.64

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 (6) hide show
  1. package/lib/cjs/app/CoreApp.d.ts +1 -1
  2. package/lib/cjs/app/CoreApp.js +5 -5
  3. package/lib/mjs/app/CoreApp.d.ts +1 -1
  4. package/lib/mjs/app/CoreApp.js +6 -6
  5. package/package.json +3 -3
  6. package/src/app/CoreApp.ts +8 -7
package/lib/cjs/app/CoreApp.d.ts CHANGED
@@ -412,7 +412,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
412
412
  * @param miliseconds Miliseconds
413
413
  * @returns Enhanced passphrase
414
414
  */
415
- protected encryptionEnhance(passphrase: string, miliseconds: number): string;
415
+ protected encryptionEnhance(passphrase: string, miliseconds: string): string;
416
416
  /**
417
417
  * Format date to string
418
418
  * @param input Input date
package/lib/cjs/app/CoreApp.js CHANGED
@@ -203,8 +203,8 @@ class CoreApp {
203
203
  * @returns Pure text
204
204
  */
205
205
  decrypt(messageEncrypted, passphrase) {
206
- const pos = messageEncrypted.indexOf('M');
207
- const miliseconds = parseInt(messageEncrypted.substring(0, pos));
206
+ const pos = messageEncrypted.indexOf('+');
207
+ const miliseconds = messageEncrypted.substring(0, pos);
208
208
  const message = messageEncrypted.substring(pos + 1);
209
209
  return crypto_js_1.AES.decrypt(message, this.encryptionEnhance(passphrase, miliseconds)).toString();
210
210
  }
@@ -248,9 +248,9 @@ class CoreApp {
248
248
  * @returns Result
249
249
  */
250
250
  encrypt(message, passphrase) {
251
- const miliseconds = new Date().getUTCMilliseconds();
251
+ const miliseconds = shared_1.Utils.numberToChars(new Date().getTime());
252
252
  return (miliseconds +
253
- 'M' +
253
+ '+' +
254
254
  crypto_js_1.AES.encrypt(message, this.encryptionEnhance(passphrase, miliseconds)).toString());
255
255
  }
256
256
  /**
@@ -261,7 +261,7 @@ class CoreApp {
261
261
  */
262
262
  encryptionEnhance(passphrase, miliseconds) {
263
263
  var _a;
264
- passphrase += miliseconds.toString();
264
+ passphrase += miliseconds;
265
265
  passphrase += passphrase.length.toString();
266
266
  return passphrase + ((_a = this.passphrase) !== null && _a !== void 0 ? _a : '');
267
267
  }
package/lib/mjs/app/CoreApp.d.ts CHANGED
@@ -412,7 +412,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
412
412
  * @param miliseconds Miliseconds
413
413
  * @returns Enhanced passphrase
414
414
  */
415
- protected encryptionEnhance(passphrase: string, miliseconds: number): string;
415
+ protected encryptionEnhance(passphrase: string, miliseconds: string): string;
416
416
  /**
417
417
  * Format date to string
418
418
  * @param input Input date
package/lib/mjs/app/CoreApp.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { NotificationAlign, NotificationMessageType } from '@etsoo/notificationbase';
2
2
  import { ApiDataError } from '@etsoo/restclient';
3
- import { DateUtils, DomUtils, NumberUtils, StorageUtils } from '@etsoo/shared';
3
+ import { DateUtils, DomUtils, NumberUtils, StorageUtils, Utils } from '@etsoo/shared';
4
4
  import { AES } from 'crypto-js';
5
5
  import { AddressRegion } from '../address/AddressRegion';
6
6
  import { AddressUtils } from '../address/AddressUtils';
@@ -200,8 +200,8 @@ export class CoreApp {
200
200
  * @returns Pure text
201
201
  */
202
202
  decrypt(messageEncrypted, passphrase) {
203
- const pos = messageEncrypted.indexOf('M');
204
- const miliseconds = parseInt(messageEncrypted.substring(0, pos));
203
+ const pos = messageEncrypted.indexOf('+');
204
+ const miliseconds = messageEncrypted.substring(0, pos);
205
205
  const message = messageEncrypted.substring(pos + 1);
206
206
  return AES.decrypt(message, this.encryptionEnhance(passphrase, miliseconds)).toString();
207
207
  }
@@ -245,9 +245,9 @@ export class CoreApp {
245
245
  * @returns Result
246
246
  */
247
247
  encrypt(message, passphrase) {
248
- const miliseconds = new Date().getUTCMilliseconds();
248
+ const miliseconds = Utils.numberToChars(new Date().getTime());
249
249
  return (miliseconds +
250
- 'M' +
250
+ '+' +
251
251
  AES.encrypt(message, this.encryptionEnhance(passphrase, miliseconds)).toString());
252
252
  }
253
253
  /**
@@ -258,7 +258,7 @@ export class CoreApp {
258
258
  */
259
259
  encryptionEnhance(passphrase, miliseconds) {
260
260
  var _a;
261
- passphrase += miliseconds.toString();
261
+ passphrase += miliseconds;
262
262
  passphrase += passphrase.length.toString();
263
263
  return passphrase + ((_a = this.passphrase) !== null && _a !== void 0 ? _a : '');
264
264
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/appscript",
3
- "version": "1.1.63",
3
+ "version": "1.1.64",
4
4
  "description": "Applications shared TypeScript framework",
5
5
  "main": "lib/cjs/index.js",
6
6
  "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
54
54
  "dependencies": {
55
55
  "@etsoo/notificationbase": "^1.0.94",
56
56
  "@etsoo/restclient": "^1.0.62",
57
- "@etsoo/shared": "^1.0.75",
57
+ "@etsoo/shared": "^1.0.76",
58
58
  "@types/crypto-js": "^4.0.2",
59
59
  "crypto-js": "^4.1.1"
60
60
  },
@@ -71,7 +71,7 @@
71
71
  "eslint-config-airbnb-base": "^15.0.0",
72
72
  "eslint-plugin-import": "^2.25.3",
73
73
  "jest": "^27.4.3",
74
- "ts-jest": "^27.0.7",
74
+ "ts-jest": "^27.1.0",
75
75
  "typescript": "^4.5.2"
76
76
  }
77
77
  }
package/src/app/CoreApp.ts CHANGED
@@ -12,7 +12,8 @@ import {
12
12
  DateUtils,
13
13
  DomUtils,
14
14
  NumberUtils,
15
- StorageUtils
15
+ StorageUtils,
16
+ Utils
16
17
  } from '@etsoo/shared';
17
18
  import { AES } from 'crypto-js';
18
19
  import { AddressRegion } from '../address/AddressRegion';
@@ -659,8 +660,8 @@ export abstract class CoreApp<
659
660
  * @returns Pure text
660
661
  */
661
662
  decrypt(messageEncrypted: string, passphrase: string) {
662
- const pos = messageEncrypted.indexOf('M');
663
- const miliseconds = parseInt(messageEncrypted.substring(0, pos));
663
+ const pos = messageEncrypted.indexOf('+');
664
+ const miliseconds = messageEncrypted.substring(0, pos);
664
665
  const message = messageEncrypted.substring(pos + 1);
665
666
  return AES.decrypt(
666
667
  message,
@@ -715,10 +716,10 @@ export abstract class CoreApp<
715
716
  * @returns Result
716
717
  */
717
718
  encrypt(message: string, passphrase: string) {
718
- const miliseconds = new Date().getUTCMilliseconds();
719
+ const miliseconds = Utils.numberToChars(new Date().getTime());
719
720
  return (
720
721
  miliseconds +
721
- 'M' +
722
+ '+' +
722
723
  AES.encrypt(
723
724
  message,
724
725
  this.encryptionEnhance(passphrase, miliseconds)
@@ -732,8 +733,8 @@ export abstract class CoreApp<
732
733
  * @param miliseconds Miliseconds
733
734
  * @returns Enhanced passphrase
734
735
  */
735
- protected encryptionEnhance(passphrase: string, miliseconds: number) {
736
- passphrase += miliseconds.toString();
736
+ protected encryptionEnhance(passphrase: string, miliseconds: string) {
737
+ passphrase += miliseconds;
737
738
  passphrase += passphrase.length.toString();
738
739
  return passphrase + (this.passphrase ?? '');
739
740
  }