UNPKG

@iotize/tap

Version:

IoTize Device client for Javascript

297 lines 20.6 kB
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; import { combineLatest, Observable, Subject } from 'rxjs'; import { map, startWith } from 'rxjs/operators'; import { createMonitoringTicker, MonitoringController, } from '../monitor/monitor-engine'; import { TapDataError } from '../tap-data-error'; import { ModbusAccessVariable } from '../target-variable/modbus/modbus-access-variable'; import { createTapBundleFromConfig, } from '../target-variable/tap-bundle/tap-bundle'; import { createTapVariableFromConfig, } from '../target-variable/tap-variable/tap-variable'; import { TargetMemoryVariable } from '../target-variable/target-memory/target-memory-variable'; import { createDataManagerConfigFromTapDataConfig } from './create-data-manager-config-from-tap-data-config'; import { createTapBundlesFromConfig, readDataManagerTapConfigFromTap, } from './create-data-manager-from-tap-config'; const TAG = 'DataManager'; /** * Typed data manager is usually build from Tap configuration * * It allow you to have compile time check for bundle/variable types. * However, you cannot add/remove/edit variables (as it would change types) * Use `DataManager` if you want this features */ export class TypedDataManager { constructor(tap, bundles, // variables: Record<VariableKey, EditableDataStream<VariableByType[VariableKey]>> monitoring = new MonitoringController()) { // const variablesCache: Record<string, EditableDataStream<VariableByType[VariableKey], unknown>> = {}; // for (const bundleKey in this.bundles) { // const bundle = this.bundles[bundleKey]; // for (const variableKey in bundle.variables) { // const variable = bundle.variables[variableKey]; // variablesCache[variable.config.name] = variable; // } // } // this.variablesCache = variablesCache as Record<VariableKey, EditableDataStream<VariableByType[VariableKey], unknown>>; // this.setupStreams(); this.tap = tap; this.bundles = bundles; this.monitoring = monitoring; // switchableStream!: SwitchableStream; // dataStream: Observable<Record<string, any>>; // tlvConverter: TlvBundleConverter<Record<string, Uint8Array>>; // sourceControllers: Record<string, DataSourceController> = {}; // protected variablesCache: Record<VariableKey, EditableDataStream<VariableByType[VariableKey], unknown>>; // private tickers: Record<string, { // controller: MonitoringControllerSubject, // ticker: Observable<MonitoringTickerState> // }> = {}; // private ticker = createMonitoringTicker(this.monitoring); this._events = new Subject(); // this.variablesCache = {} as any; const ticker = createMonitoringTicker(this.monitoring); ticker.subscribe((newTick) => __awaiter(this, void 0, void 0, function* () { // console.log('New tick', newTick); yield this.refreshValues(); })); } get values() { const bundles = this.listBundles(); return combineLatest(bundles.map((v) => v.values.pipe(startWith(undefined)))).pipe(map((values) => { return values.reduce((accumulator, v, index) => { const bundleStreamId = bundles[index].id; accumulator[bundleStreamId] = v; return accumulator; }, {}); })); } get events() { return this._events.asObservable(); } listVariables() { return this.listBundles().reduce((acc, bundle) => { acc.push(...bundle.variables); return acc; }, []); } bundle(key) { if (!(key in this.bundles)) { throw TapDataError.bundleNotFound(key); } return this.bundles[key]; } // TODO fix typing variable(key) { const variable = this.listVariables().find((v) => v.id === key); if (!variable) { throw TapDataError.variableNotFound(key); } return variable; } // public addBundleFromConfig(key: BundleKey, bundleConfig: BundleConfig) { // // const key = bundleConfig.name || bundleConfig.id.toString(); // // this.bundles[key] = createTapBundleDataFromConfig(bundleConfig); // throw new Error(`Not implemented yet`); // return this; // } destroy() { this.monitoring.stop(); } refreshValues() { return __awaiter(this, void 0, void 0, function* () { const values = {}; for (const bundle of this.listBundles()) { values[bundle.id] = yield bundle .read() .catch((error) => { this._events.next({ error, type: DataManager.EventType.error, }); return error; }); } return values; }); } listBundles() { return Object.values(this.bundles); } // public setupStreams() { // // this.bundle('x').monitor.start(); // // this.variable('y').monitor. // const variableStream = this.ticker // .pipe( // switchMap(() => { // return merge( // this.listVariables().map(v => defer(() => v.read())) // ); // }) // ); // const bundleStream = this.ticker // .pipe( // switchMap(() => { // return merge( // this.listBundles().map(v => defer(() => v.read())) // ); // }) // ); // // const profileStream = this.ticker // // .pipe( // // switchMap(async () => { // // // debug(TAG, `New call ${time} to read profile`); // // const profileData = (await this.tap.service.variable.readProfile()).body(); // // const decoded = this.tlvConverter.decode(profileData); // // this.rawDataStream.next(decoded); // // }) // // ); // this.switchableStream // .addStream( // 'variable', // variableStream // ) // .addStream( // 'bundle', // bundleStream // ) // // .addStream( // // 'profile', // // profileStream // // ); // } hasBundle(bundleKey) { return bundleKey in this.bundles; } createConfiguredBundle(key, config) { return createTapBundleFromConfig(this.tap, key, config); } createConfiguredVariable(key, config) { return createTapVariableFromConfig(this.tap.service.variable, key, config); } /** * Create a variable with direct modbus access * May/May not be available according to the configured target protocol on your device * * @param id * @param options */ createModbusAccessVariable(id, options) { return new ModbusAccessVariable(id, { config: options.config, targetService: this.tap.service.target, converter: options.converter, }); } /** * Create direct target access to variable * May/May not be available according to configured target protocol on your device * @param id * @param options */ createTargetMemoryVariable(id, options) { return new TargetMemoryVariable(id, { config: options.config, targetService: this.tap.service.target, converter: options.converter, }); } } export class DataManager extends TypedDataManager { constructor(tap, bundles = {}, // variables: Record<VariableKey, EditableDataStream<VariableByType[VariableKey]>> monitoring = new MonitoringController()) { super(tap, bundles, monitoring); } // registerConfiguredBundle(config: BundleConfig) { // throw new Error('Not implemented yet'); // } // registerConfiguredVariable(config: VariableConfig) { // // this.variables.push(); // throw new Error('Not implemented yet'); // } // createTapBundle<T>(name: string, bundleId: number, variables: T): BundleDataStreamInterface<T> { // return createTapBundleFromConfig( // this.tap, // name, // { // id: bundleId, // variables // } // ); // } setBundles(bundles) { this.bundles = bundles; } addBundle(bundle) { this.bundles[bundle.id] = bundle; } removeBundle(bundleKey) { delete this.bundles[bundleKey]; } addVariable(bundleKey, variable) { const bundle = this.bundle(bundleKey); bundle.variables.push(variable); // TODO fix typing } /** * Register bundles configured in the Tap */ registerBundles(bundlesConfig) { const tapBundles = createTapBundlesFromConfig(this.tap, bundlesConfig); this.setBundles(tapBundles); return tapBundles; } registerBundle(key, config) { const tapBundle = createTapBundleFromConfig(this.tap, key, config); this.addBundle(tapBundle); } clear() { this.bundles = {}; } /** * Synchronize DataManager bundles and variables with the connected Tap device * It will the current profile accessible variables/bundles */ synchronizeTapConfig() { return new Observable((observer) => { try { readDataManagerTapConfigFromTap(this.tap, { observer, }) .then((config) => { const newBundles = this.registerBundles(config); observer.next({ step: 'done', bundles: newBundles, }); observer.complete(); }) .catch((err) => { observer.error(err); }); } catch (err) { observer.error(err); } }); } /** * Configure DataManager bundles and variables from a DataConfig object (found in Tap configuration files) * Data decoder will be dedecuced from dataType/length field. */ configureWithDataConfig(config) { this.clear(); this.registerBundles(createDataManagerConfigFromTapDataConfig(config).bundles); } } (function (DataManager) { let EventType; (function (EventType) { EventType["error"] = "error"; })(EventType = DataManager.EventType || (DataManager.EventType = {})); })(DataManager || (DataManager = {})); //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"data-manager.js","sourceRoot":"","sources":["../../../../../../../data/src/lib/data-manager/data-manager.ts"],"names":[],"mappings":"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"}