incyclist-services 1.3.52 → 1.3.54

package/lib/activities/base/repo/db.js

@@ -134,7 +134,7 @@ let ActivitiesRepository = (() => {
                 return details;
             }
             catch (err) {
-                this.logError(err, 'migrate');
+                this.logError(err, 'migrate', { activity });
             }
         }
         migrateDB() {

package/lib/activities/base/repo/migration/v1.js

@@ -8,7 +8,7 @@ class MigrationV1 extends types_1.ActivitiesDBMigrator {
         let detailsChanged = false;
         if (details.routeType === 'Video' && details.route) {
             const route = this.getRouteList().getRouteDescription(details.route.id);
-            if (route.originalName) {
+            if (route === null || route === void 0 ? void 0 : route.originalName) {
                 details.route.name = route.originalName;
                 detailsChanged = true;
             }

package/lib/activities/base/repo/migration/v3.js

@@ -9,7 +9,7 @@ class MigrationV3 extends types_1.ActivitiesDBMigrator {
         let detailsChanged = false;
         if (details.routeType === 'Video' && details.route) {
             const route = this.getRouteList().getRouteDescription(details.route.id);
-            if (route.title) {
+            if (route === null || route === void 0 ? void 0 : route.title) {
                 details.route.title = route.title;
                 detailsChanged = true;
             }

package/lib/activities/upload/types.d.ts

@@ -6,6 +6,7 @@ export interface Credentials {
 export interface VeloHeroAuth extends Credentials {
     id?: string;
     authKey?: string;
+    version?: string;
 }
 export type UploaderInfo = {
     service: string;

package/lib/activities/upload/velohero.d.ts

@@ -14,14 +14,16 @@ export declare class VeloHeroUpload extends IncyclistService implements IActivit
     isConnecting(): boolean;
     login(username: string, password: string): Promise<boolean>;
     disconnect(): void;
-    protected ensureInitialized(): any;
     upload(activity: ActivityDetails, format?: string): Promise<boolean>;
     getUrl(id: string): string;
+    protected ensureInitialized(): any;
     protected getUuid(): any;
     protected getCredentials(): any;
     protected saveCredentials(): any;
-    protected encrypt(): VeloHeroAuth;
-    protected decrypt(auth: VeloHeroAuth): any;
-    protected getUserSettings(): import("../../settings").UserSettingsService;
-    protected getApi(): VeloHeroApi;
+    protected encrypt(algo: string): VeloHeroAuth;
+    protected decrypt(algo: string, auth: VeloHeroAuth): any;
+    protected setupEventListeners(): void;
+    protected getUserSettings(): any;
+    protected getApi(): any;
+    protected getCrypto(): any;
 }

package/lib/activities/upload/velohero.js

@@ -57,6 +57,7 @@ const settings_1 = require("../../settings");
 const crypto_1 = __importDefault(require("crypto"));
 const valid_1 = require("../../utils/valid");
 const api_1 = require("../../apps/base/api");
+const CRYPT_ALGO = 'aes256';
 let VeloHeroUpload = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -83,21 +84,19 @@ let VeloHeroUpload = (() => {
                         this.password = auth.password;
                     }
                     else {
-                        const user = this.decrypt(auth);
+                        const user = this.decrypt(CRYPT_ALGO, auth);
                         this.username = user.username;
                         this.password = user.password;
                     }
-                    this.logger.logEvent({ message: 'VeloHero init done', hasCredentials: true });
                 }
+                this.logEvent({ message: 'VeloHero init done', hasCredentials: ((0, valid_1.valid)(this.username) && (0, valid_1.valid)(this.password)) });
                 this.isInitialized = true;
             }
             catch (err) {
-                this.logger.logEvent({ message: 'error', error: err.message, fn: 'init', stack: err.stack });
+                this.logEvent({ message: 'error', error: err.message, fn: 'init', stack: err.stack });
                 this.isInitialized = false;
             }
-            this.on('login-start', () => { this._isConnecting = true; });
-            this.on('login-success', () => { this._isConnecting = false; });
-            this.on('login-failure', () => { this._isConnecting = false; });
+            this.setupEventListeners();
             return this.isInitialized;
         }
         isConnected() {
@@ -110,11 +109,11 @@ let VeloHeroUpload = (() => {
         login(username, password) {
             return __awaiter(this, void 0, void 0, function* () {
                 this.ensureInitialized();
-                this.logger.logEvent({ message: 'VeloHero Login' });
+                this.logEvent({ message: 'VeloHero Login' });
                 this.emit('login-start');
                 try {
                     yield this.getApi().login(username, password);
-                    this.logger.logEvent({ message: 'VeloHero Login success' });
+                    this.logEvent({ message: 'VeloHero Login success' });
                     this.username = username;
                     this.password = password;
                     this.isInitialized = true;
@@ -123,8 +122,8 @@ let VeloHeroUpload = (() => {
                     return true;
                 }
                 catch (err) {
-                    this.logger.logEvent({ message: 'VeloHero Login failed', error: err.message });
-                    this.emit('login-failure');
+                    this.logEvent({ message: 'VeloHero Login failed', error: err.message });
+                    this.emit('login-failure', err.message);
                     throw err;
                 }
             });
@@ -134,29 +133,28 @@ let VeloHeroUpload = (() => {
             this.password = undefined;
             this.getUserSettings().set('user.auth.velohero', null);
         }
-        ensureInitialized() {
-            if (!this.isInitialized)
-                this.init();
-            return this.isInitialized;
-        }
         upload(activity_1) {
             return __awaiter(this, arguments, void 0, function* (activity, format = 'TCX') {
                 var _a;
                 try {
                     const ok = this.ensureInitialized();
                     if (!ok) {
-                        this.logger.logEvent({ message: 'VeloHero Upload skipped', reason: 'not initialized' });
+                        this.logEvent({ message: 'VeloHero Upload skipped', reason: 'not initialized' });
+                        return false;
+                    }
+                    if (!this.isConnected()) {
                         return false;
                     }
-                    this.logger.logEvent({ message: 'VeloHero Upload', format });
+                    const lcFormat = format.toLowerCase();
+                    const ucFormat = format.toUpperCase();
+                    this.logEvent({ message: 'VeloHero Upload', format: ucFormat });
                     if (!activity.links)
                         activity.links = {};
                     const username = this.username;
                     const password = this.password;
-                    const fileName = activity[`${format}FileName`];
+                    const fileName = activity[`${lcFormat}FileName`];
                     const res = yield this.getApi().upload(fileName, { username, password });
-                    this.logger.logEvent(Object.assign({ message: 'VeloHero Upload success' }, res));
-                    console.log(new Date().toISOString(), 'VeloHero Upload success', res);
+                    this.logEvent(Object.assign({ message: 'VeloHero Upload success' }, res));
                     activity.links.velohero = {
                         activity_id: res.id,
                         url: (_a = res['url-show']) !== null && _a !== void 0 ? _a : this.getUrl(res.id)
@@ -164,7 +162,7 @@ let VeloHeroUpload = (() => {
                     return true;
                 }
                 catch (err) {
-                    this.logger.logEvent({ message: 'VeloHero Upload failure', error: err.message });
+                    this.logEvent({ message: 'VeloHero Upload failure', error: err.message });
                     activity.links.velohero = {
                         error: err.message
                     };
@@ -175,6 +173,11 @@ let VeloHeroUpload = (() => {
         getUrl(id) {
             return `https://app.velohero.com/workouts/show/${id}`;
         }
+        ensureInitialized() {
+            if (!this.isInitialized)
+                this.init();
+            return this.isInitialized;
+        }
         getUuid() {
             const userSettings = this.getUserSettings();
             try {
@@ -198,60 +201,79 @@ let VeloHeroUpload = (() => {
             this.logger.logEvent({ message: 'VeloHero Save Credentials' });
             let auth;
             try {
-                auth = this.encrypt();
+                auth = this.encrypt(CRYPT_ALGO);
                 this.getUserSettings().set('user.auth.velohero', auth);
             }
             catch (err) {
-                this.logger.logEvent({ message: 'error', fn: 'saveCredentials', error: err.message, stack: err.stack });
+                this.logEvent({ message: 'error', fn: 'saveCredentials', error: err.message, stack: err.stack });
             }
-            this.logger.logEvent({ message: 'VeloHero Save Credentials done' });
+            this.logEvent({ message: 'VeloHero Save Credentials done' });
             return auth;
         }
-        encrypt() {
+        encrypt(algo) {
             const iv = crypto_1.default.randomBytes(16);
             const uuid = this.getUuid();
             const key = `${uuid.substring(0, 32)}`;
-            const cipher = crypto_1.default.createCipheriv('AES-256-CCM', key, iv);
+            const cipher = crypto_1.default.createCipheriv(algo, key, iv);
             const text = JSON.stringify({ username: this.username, password: this.password });
-            let ciphered = cipher.update(text, 'utf8', 'hex');
+            let ciphered;
+            ciphered = cipher.update(text, 'utf8', 'hex');
             ciphered += cipher.final('hex');
             const auth = {
                 id: iv.toString('hex'),
-                authKey: ciphered
+                authKey: ciphered,
             };
             return auth;
         }
-        decrypt(auth) {
-            const { id, authKey } = auth;
+        decrypt(algo, auth) {
+            const { id, authKey, version } = auth;
             const iv = Buffer.from(id, 'hex');
             const uuid = this.getUuid();
             const key = `${uuid.substring(0, 32)}`;
-            const decipher = (em) => {
-                try {
-                    const cipher = crypto_1.default.createDecipheriv(em, key, iv);
-                    let text = cipher.update(authKey, 'hex', 'utf8');
+            try {
+                let text;
+                if (algo === 'aes-256-gcm') {
+                    const cipher = crypto_1.default.createDecipheriv(algo, key, iv);
+                    const raw = Buffer.from(authKey, "hex");
+                    const authTagBuff = raw.subarray(raw.length - 16);
+                    const encTextBuff = raw.subarray(0, raw.length - 16);
+                    cipher.setAuthTag(authTagBuff);
+                    text = cipher.update(encTextBuff);
                     text += cipher.final('utf8');
-                    const user = JSON.parse(text);
-                    return user;
                 }
-                catch (err) {
+                else {
+                    const cipher = crypto_1.default.createDecipheriv(algo, key, iv);
+                    text = cipher.update(authKey, 'hex', 'utf8');
+                    text += cipher.final('utf8');
                 }
-            };
-            let user;
-            user = decipher('AES-256-CCM');
-            if (!user) {
-                user = decipher('aes256');
+                const user = JSON.parse(text);
+                return user;
+            }
+            catch (err) {
+                this.logError(err, 'decrypt', { algo, id, authKey });
+                return null;
             }
-            return user;
+        }
+        setupEventListeners() {
+            this.on('login-start', () => { this._isConnecting = true; });
+            this.on('login-success', () => { this._isConnecting = false; });
+            this.on('login-failure', () => { this._isConnecting = false; });
         }
         getUserSettings() {
-            return (0, settings_1.useUserSettings)();
+            var _a;
+            return (_a = this.injected['UserSettings']) !== null && _a !== void 0 ? _a : (0, settings_1.useUserSettings)();
         }
         getApi() {
+            if (this.injected['Api'])
+                return this.injected['Api'];
             if (!this.api)
                 this.api = new api_1.VeloHeroApi();
             return this.api;
         }
+        getCrypto() {
+            var _a;
+            return (_a = this.injected['Crypto']) !== null && _a !== void 0 ? _a : crypto_1.default;
+        }
     };
     __setFunctionName(_classThis, "VeloHeroUpload");
     (() => {

package/lib/base/service.d.ts

@@ -9,4 +9,5 @@ export declare class IncyclistService extends EventEmitter {
     logEvent(event: any): void;
     setDebug(enabled: boolean): void;
     logError(err: Error, fn: string, args?: any): void;
+    reset(): void;
 }

package/lib/base/service.js

@@ -18,7 +18,9 @@ class IncyclistService extends events_1.default {
     }
     logEvent(event) {
         this.logger.logEvent(event);
-        this.emit('log', event);
+        const emitPayload = Object.assign({}, event);
+        delete emitPayload.ts;
+        this.emit('log', emitPayload);
         const w = global.window;
         if (this.debug || (w === null || w === void 0 ? void 0 : w.SERVICE_DEBUG) || process.env.DEBUG)
             console.log(`~~~ ${this.logger.getName().toUpperCase()}-SVC`, event);
@@ -30,5 +32,8 @@ class IncyclistService extends events_1.default {
         const logInfo = args || {};
         this.logEvent(Object.assign(Object.assign({ message: 'Error', fn }, logInfo), { error: err.message, stack: err.stack }));
     }
+    reset() {
+        this.removeAllListeners();
+    }
 }
 exports.IncyclistService = IncyclistService;

package/lib/base/types/singleton.js

@@ -5,11 +5,19 @@ function Singleton(originalConstructor, _context) {
     let instance;
     return class {
         constructor(...args) {
+            var _a;
             if (instance) {
                 return instance;
             }
             instance = new originalConstructor(...args);
-            instance.reset = () => { instance = null; };
+            const resetFn = (_a = instance['reset']) === null || _a === void 0 ? void 0 : _a.bind(instance);
+            if (resetFn === undefined || typeof resetFn === 'function') {
+                instance['reset'] = () => {
+                    instance = null;
+                    if (resetFn)
+                        resetFn();
+                };
+            }
             return instance;
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.3.52",
+  "version": "1.3.54",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },