npm - @wemap/providers - Versions diffs - 3.1.23 → 3.2.2 - Mend

@wemap/providers 3.1.23 → 3.2.2

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 (74) hide show

package/dist/logger.html ADDED Viewed

@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, user-scalable=no">
+  <title>Debug Pose</title>
+  <script src="js/providers-components.js"></script>
+  <style>
+    #logger {
+      background: #ffffffaa;
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      z-index: 2;
+      margin: 5px;
+      padding-left: 10px;
+      padding-right: 10px;
+      min-width: 100px;
+    }
+  </style>
+</head>
+<body>
+  <div id="app"></div>
+  <div id="logger">
+    <div class="title">Logger</div>
+    <button id="start">Start</button>
+    <button id="stop" disabled>Stop</button>
+  </div>
+  <script>
+    const app = createReactElement(MainComponent, document.getElementById('app'));
+    const SERVER_URL = 'https://localhost:9002'
+    const startButton = document.getElementById('start');
+    const stopButton = document.getElementById('stop');
+    startButton.addEventListener('click', () => {
+      document.dispatchEvent(new CustomEvent('providers.logger.start', { detail : {
+        serverUrl: SERVER_URL,
+        logsSize: 300
+      }}));
+      startButton.disabled = true;
+      stopButton.disabled = false;
+    });
+    stopButton.addEventListener('click', () => {
+      document.dispatchEvent(new Event('providers.logger.stop'));
+      startButton.disabled = false;
+      stopButton.disabled = true;
+    });
+  </script>
+</body>
+</html>

package/index.js CHANGED Viewed

@@ -1,8 +1,10 @@
-import EventType from './src/events/EventType';
-import PositionSmoother from './src/smoothers/PositionSmoother';
-import ProvidersInterface from './src/ProvidersInterface';
-import ProvidersOptions from './src/ProvidersOptions';
+import EventType from './src/events/EventType.js';
+import PositionSmoother from './src/smoothers/PositionSmoother.js';
+import ProvidersInterface from './src/ProvidersInterface.js';
+import ProvidersOptions from './src/ProvidersOptions.js';
+import NavigationLogger from './src/logger/NavigationLogger.js';
+import NavigationLoggerConverter from './src/logger/NavigationLoggerConverter.js';
 export {
-    EventType, PositionSmoother, ProvidersInterface, ProvidersOptions
+    EventType, PositionSmoother, ProvidersInterface, ProvidersOptions, NavigationLogger, NavigationLoggerConverter
 };

package/package.json CHANGED Viewed

@@ -8,26 +8,30 @@
     "Guillaume Pannetier <guillaume.pannetier@getwemap.com>"
   ],
   "dependencies": {
-    "@wemap/geo": "^3.1.21",
-    "@wemap/graph": "^3.1.21",
-    "@wemap/logger": "^3.0.0",
-    "@wemap/maths": "^3.1.15",
-    "@wemap/osm": "^3.1.21",
-    "@wemap/utils": "^3.1.23",
+    "@wemap/geo": "^3.2.2",
+    "@wemap/graph": "^3.2.2",
+    "@wemap/logger": "^3.2.1",
+    "@wemap/maths": "^3.2.1",
+    "@wemap/osm": "^3.2.2",
+    "@wemap/utils": "^3.2.2",
+    "browser-cookies": "^1.2.0",
     "geomagnetism": "^0.1.0",
     "lodash.isempty": "^4.4.0",
-    "lodash.noop": "^3.0.1"
+    "lodash.noop": "^3.0.1",
+    "uuid": "^8.2.0"
   },
   "description": "A package using different geoloc systems",
   "devDependencies": {
-    "@babel/core": "^7.5.5",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
-    "@babel/preset-react": "^7.0.0",
-    "@thibaudm/mapbox-gl-js-indoor": "^1.7.0-6",
+    "@babel/core": "^7.11.1",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/preset-env": "^7.11.0",
+    "@babel/preset-react": "^7.10.4",
+    "@wemap/map": "^3.2.2",
     "babel-loader": "^8.0.6",
     "css-loader": "^3.2.0",
     "file-loader": "^5.0.2",
+    "mapbox-gl": "^1.11.1",
+    "mapbox-gl-indoor": "0.0.4",
     "prop-types": "^15.7.2",
     "react": "^16.11.0",
     "react-dom": "^16.11.0",
@@ -56,14 +60,14 @@
     "url": "git+https://github.com/wemap/wemap-modules-js.git"
   },
   "scripts": {
-    "build": "webpack --display-modules --config webpack/webpack.prod.js",
-    "build-debug": "webpack --display-modules --config webpack/webpack.dev.js",
-    "stats": "webpack --config webpack/webpack.prod.js --profile --json > stats.json",
-    "start": "webpack-dev-server --config webpack/webpack.dev.js --progress --inline --hot --https",
-    "start-secure": "webpack-dev-server --config webpack/webpack.dev.js --progress --inline --hot --https --cert $(grep PEM .env | cut -d '=' -f2) --key $(grep KEY .env | cut -d '=' -f2)",
-    "lint": "eslint --ext .js,.jsx --quiet src",
-    "test": "mocha -r esm \"src/**/*.spec.js\""
+    "build": "webpack --display-modules --config webpack/webpack.prod.cjs",
+    "build-debug": "webpack --display-modules --config webpack/webpack.dev.cjs",
+    "stats": "webpack --config webpack/webpack.prod.cjs --profile --json > stats.json",
+    "start": "webpack-dev-server --config webpack/webpack.dev.cjs --progress --inline --hot --https",
+    "start-secure": "webpack-dev-server --config webpack/webpack.dev.cjs --progress --inline --hot --https --cert $(grep PEM ../../.env | cut -d '=' -f2) --key $(grep KEY ../../.env | cut -d '=' -f2)",
+    "lint": "eslint --ext .js,.jsx --quiet src"
   },
-  "version": "3.1.23",
-  "gitHead": "bc4842c87e22d3edd6a1c85088c20a40324698ed"
+  "type": "module",
+  "version": "3.2.2",
+  "gitHead": "6ff8c054aed5ccbf0f456aad752c43f46fe6b278"
 }

package/src/Providers.js CHANGED Viewed

@@ -24,37 +24,37 @@ const AbsoluteAttitudeFromBrowser = AbsoluteAttitudeFromBrowserProvider.instance
 const AbsoluteAttitudeFromRelAtt = AbsoluteAttitudeFromRelAttProvider.instance;
 const AbsoluteAttitude = AbsoluteAttitudeProvider.instance;
-import InclinationFromAccProvider from './providers/inclination/InclinationFromAccProvider';
-import InclinationFromRelativeAttitudeProvider from './providers/inclination/InclinationFromRelativeAttitudeProvider';
-import InclinationProvider from './providers/inclination/InclinationProvider';
+import InclinationFromAccProvider from './providers/inclination/InclinationFromAccProvider.js';
+import InclinationFromRelativeAttitudeProvider from './providers/inclination/InclinationFromRelativeAttitudeProvider.js';
+import InclinationProvider from './providers/inclination/InclinationProvider.js';
 const InclinationFromAcc = InclinationFromAccProvider.instance;
 const InclinationFromRelativeAttitude = InclinationFromRelativeAttitudeProvider.instance;
 const Inclination = InclinationProvider.instance;
-import StepDetectionProvider from './providers/steps/StepDetectionProvider';
+import StepDetectionProvider from './providers/steps/StepDetectionProvider.js';
 const StepDetection = StepDetectionProvider.instance;
-import ArCoreProvider from './providers/position/relative/ArCoreProvider';
-import PdrProvider from './providers/position/relative/PdrProvider';
-import GeoRelativePositionFromArCoreProvider from './providers/position/relative/GeoRelativePositionFromArCoreProvider';
-import GeoRelativePositionProvider from './providers/position/relative/GeoRelativePositionProvider';
+import ArCoreProvider from './providers/position/relative/ArCoreProvider.js';
+import PdrProvider from './providers/position/relative/PdrProvider.js';
+import GeoRelativePositionFromArCoreProvider from './providers/position/relative/GeoRelativePositionFromArCoreProvider.js';
+import GeoRelativePositionProvider from './providers/position/relative/GeoRelativePositionProvider.js';
 const ArCore = ArCoreProvider.instance;
 const Pdr = PdrProvider.instance;
 const GeoRelativePositionFromArCore = GeoRelativePositionFromArCoreProvider.instance;
 const GeoRelativePosition = GeoRelativePositionProvider.instance;
-import AbsolutePositionFromRelProvider from './providers/position/absolute/AbsolutePositionFromRelProvider';
-import GnssWifiProvider from './providers/position/absolute/GnssWifiProvider';
-import IpProvider from './providers/position/absolute/IpProvider';
-import AbsolutePositionProvider from './providers/position/absolute/AbsolutePositionProvider';
+import AbsolutePositionFromRelProvider from './providers/position/absolute/AbsolutePositionFromRelProvider.js';
+import GnssWifiProvider from './providers/position/absolute/GnssWifiProvider.js';
+import IpProvider from './providers/position/absolute/IpProvider.js';
+import AbsolutePositionProvider from './providers/position/absolute/AbsolutePositionProvider.js';
 const AbsolutePositionFromRel = AbsolutePositionFromRelProvider.instance;
 const GnssWifi = GnssWifiProvider.instance;
 const Ip = IpProvider.instance;
 const AbsolutePosition = AbsolutePositionProvider.instance;
-import BarcodeProvider from './providers/others/BarcodeProvider';
-import CameraNativeProvider from './providers/others/CameraNativeProvider';
-import CameraProjectionMatrixProvider from './providers/others/CameraProjectionMatrixProvider';
+import BarcodeProvider from './providers/others/BarcodeProvider.js';
+import CameraNativeProvider from './providers/others/CameraNativeProvider.js';
+import CameraProjectionMatrixProvider from './providers/others/CameraProjectionMatrixProvider.js';
 const Barcode = BarcodeProvider.instance;
 const CameraNative = CameraNativeProvider.instance;
 const CameraProjectionMatrix = CameraProjectionMatrixProvider.instance;

package/src/ProvidersInterface.js CHANGED Viewed

@@ -4,12 +4,13 @@ import {
 } from '@wemap/geo';
 import { Network } from '@wemap/graph';
-import EventType from './events/EventType';
-import MetaProvider from './providers/MetaProvider';
+import EventType from './events/EventType.js';
+import MetaProvider from './providers/MetaProvider.js';
 import {
     AbsoluteAttitude, AbsolutePosition, Barcode, CameraNative, CameraProjectionMatrix, Inclination
-} from './Providers';
-import ProvidersLogger from './events/ProvidersLogger';
+} from './Providers.js';
+import NavigationLogger from './logger/NavigationLogger.js';
+import ProvidersLoggerOld from './events/ProvidersLoggerOld.js';
 class ProvidersInterface {
@@ -47,6 +48,7 @@ class ProvidersInterface {
      * @param {Object} data
      */
     static feed(eventType, data) {
+        NavigationLogger.feedExternalData(eventType, data, true);
         this._checkEventTypeDataConsistency(eventType, data);
         this._getMetaProviderFromEventType(eventType).feed(data, eventType);
     }
@@ -125,7 +127,7 @@ class ProvidersInterface {
      * @param {Boolean} enabled
      */
     static set logger(enabled) {
-        ProvidersLogger.enabled = enabled;
+        ProvidersLoggerOld.enabled = enabled;
     }
     static get mapMatchingMaxDistance() {

package/src/errors/MissingAccelerometerError.js CHANGED Viewed

@@ -1,6 +1,6 @@
-const DEFAULT_MESSAGE = 'Impossible to retrieve Acceleration data';
+import MissingSensorError from './MissingSensorError.js';
-import MissingSensorError from './MissingSensorError';
+const DEFAULT_MESSAGE = 'Impossible to retrieve Acceleration data';
 class MissingAccelerometerError extends MissingSensorError {
     constructor(message) {

package/src/errors/MissingGyroscopeError.js CHANGED Viewed

@@ -1,6 +1,6 @@
-const DEFAULT_MESSAGE = 'Impossible to retrieve Angular Rate data';
+import MissingSensorError from './MissingSensorError.js';
-import MissingSensorError from './MissingSensorError';
+const DEFAULT_MESSAGE = 'Impossible to retrieve Angular Rate data';
 class MissingGyroscopeError extends MissingSensorError {
     constructor(message) {

package/src/errors/MissingMagnetometerError.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import MissingSensorError from './MissingSensorError';
+import MissingSensorError from './MissingSensorError.js';
 class MissingMagnetometerError extends MissingSensorError {
     constructor(message) {

package/src/events/ProviderEvent.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import EventType from './EventType';
+import EventType from './EventType.js';
 /**
  * A provider event is an event which can be triggered by device sensors

package/src/events/{ProvidersLogger.js → ProvidersLoggerOld.js} RENAMED Viewed

@@ -9,7 +9,7 @@ let pushEventsRef = {};
 let interval;
 let initDate;
-class ProvidersLogger {
+class ProvidersLoggerOld {
     static _enabled = false;
@@ -47,7 +47,7 @@ class ProvidersLogger {
     static addEvent(object, method) {
-        if (!ProvidersLogger.enabled) {
+        if (!ProvidersLoggerOld.enabled) {
             return;
         }
@@ -55,9 +55,9 @@ class ProvidersLogger {
             initDate = Date.now();
         }
-        ProvidersLogger.initializeInterval();
+        ProvidersLoggerOld.initializeInterval();
-        const objectId = ProvidersLogger.getObjectId(object);
+        const objectId = ProvidersLoggerOld.getObjectId(object);
         const objectClassName = object.pname;
         Logger.debug(objectClassName + '[' + objectId + '].' + method);
@@ -65,11 +65,11 @@ class ProvidersLogger {
     static incrementNotifications(object) {
-        if (!ProvidersLogger.enabled) {
+        if (!ProvidersLoggerOld.enabled) {
             return;
         }
-        const objectId = ProvidersLogger.getObjectId(object);
+        const objectId = ProvidersLoggerOld.getObjectId(object);
         let counter = pushEvents[objectId];
         if (!counter) {
@@ -80,4 +80,4 @@ class ProvidersLogger {
     }
 }
-export default ProvidersLogger;
+export default ProvidersLoggerOld;

package/src/logger/NavigationLogger.js ADDED Viewed

@@ -0,0 +1,138 @@
+import { v4 as uuidv4 } from 'uuid';
+import cookies from 'browser-cookies';
+import { TimeUtils } from '@wemap/utils';
+import ProvidersOptions from '../ProvidersOptions.js';
+import NavigationLoggerConverter from './NavigationLoggerConverter.js';
+class NavigationLogger {
+    static serverUrl;
+    static logsSize;
+    static logs;
+    static sessionsId;
+    static isRecording = false;
+    static start(serverUrl, logsSize = 200) {
+        if (this.isRecording) {
+            return;
+        }
+        this.isRecording = true;
+        this.serverUrl = serverUrl;
+        this.logsSize = logsSize;
+        // Initialize
+        this.logs = new Array(this.logsSize);
+        this.currentLogIndex = 0;
+        // Fill and send the config object
+        const config = {};
+        config.startTime = TimeUtils.preciseTime;
+        config.options = ProvidersOptions;
+        config.sessionId = this.sessionId = uuidv4();
+        config.userAgent = typeof navigator !== 'undefined' ? navigator.userAgent : '';
+        if (typeof document !== 'undefined') {
+            config.cookieId = cookies.get('providers.logger.uuid');
+            if (!config.cookieId) {
+                config.cookieId = uuidv4();
+                cookies.set('providers.logger.uuid', config.cookieId);
+            }
+        }
+        this._sendConfig(config);
+        this._feed(NavigationLoggerConverter.configToLog(config));
+        // Dispatch started event
+        if (typeof document !== 'undefined') {
+            document.dispatchEvent(new CustomEvent('providers.logger.started', { detail: { config: this.config } }));
+        }
+    }
+    static stop() {
+        if (!this.isRecording) {
+            return;
+        }
+        this._sendLogs(this.logs.filter(el => el !== null));
+        // this.config.endTime = TimeUtils.preciseTime;
+        if (typeof document !== 'undefined') {
+            document.dispatchEvent(new CustomEvent('providers.logger.stopped', { detail: { logs: this.logs } }));
+        }
+        this.isRecording = false;
+    }
+    static feedImuData(event) {
+        if (!this.isRecording) {
+            return;
+        }
+        this._feed(NavigationLoggerConverter.imuDataToLog(TimeUtils.preciseTime, event));
+    }
+    static feedGeolocation(geolocationEvent) {
+        if (!this.isRecording) {
+            return;
+        }
+        this._feed(NavigationLoggerConverter.geolocationToLog(TimeUtils.preciseTime, geolocationEvent));
+    }
+    static feedExternalData(eventType, data) {
+        if (!this.isRecording) {
+            return;
+        }
+        this._feed(NavigationLoggerConverter.externalDataToLog(TimeUtils.preciseTime, eventType, data));
+    }
+    static _feed(line) {
+        this.logs[this.currentLogIndex++] = line;
+        if (this.logsSize && this.logs[this.logsSize - 1]) {
+            this._flush();
+        }
+    }
+    static _flush() {
+        this._sendLogs(this.logs);
+        if (typeof document !== 'undefined') {
+            document.dispatchEvent(new CustomEvent('providers.logger.flush', { detail: { logs: this.logs } }));
+        }
+        this.currentLogIndex = 0;
+        this.logs = new Array(this.logsSize);
+    }
+    static _sendConfig(config) {
+        const xmlhttp = new XMLHttpRequest();
+        xmlhttp.open('POST', this.serverUrl + '/config');
+        xmlhttp.setRequestHeader('Content-Type', 'application/json;charset=UTF-8');
+        xmlhttp.send(JSON.stringify(config));
+    }
+    static _sendLogs(logs) {
+        const xmlhttp = new XMLHttpRequest();
+        xmlhttp.open('POST', this.serverUrl + '/logs/' + this.sessionId, true);
+        xmlhttp.setRequestHeader('Content-Type', 'text/plain');
+        xmlhttp.send(logs.join('\n'));
+    }
+}
+if (typeof document !== 'undefined') {
+    document.addEventListener('providers.logger.start', event => {
+        if (!('detail' in event)) {
+            throw new Error('[providers.logger.start] did not find event detail');
+        }
+        if (!('serverUrl' in event.detail)) {
+            throw new Error('[providers.logger.start] did not find serverUrl');
+        }
+        NavigationLogger.start(event.detail.serverUrl, event.detail.logsSize);
+    });
+    document.addEventListener('providers.logger.stop', () => NavigationLogger.stop());
+}
+export default NavigationLogger;