From 8a3ce8c0a3391132a53530e5a7c02b1344a25ce0 Mon Sep 17 00:00:00 2001 From: Xiaoji Chen Date: Tue, 21 May 2019 18:00:22 -0700 Subject: [PATCH 1/2] renaming --- docs/api-reference/parse-xviz.md | 16 +- modules/parser/src/constants.js | 2 +- modules/parser/src/index.js | 20 +- .../src/parsers/parse-timeslice-data-v1.js | 6 +- .../src/parsers/parse-timeslice-data-v2.js | 12 +- ...o-message.js => parse-video-message-v1.js} | 12 +- ...-message.js => parse-xviz-message-sync.js} | 20 +- ...rm.js => parse-xviz-message-workerfarm.js} | 0 ...tream-message.js => parse-xviz-message.js} | 8 +- modules/parser/src/parsers/serialize.js | 4 +- .../parser/src/workers/stream-data-worker.js | 10 +- test/modules/conformance/renderer/utils.js | 4 +- test/modules/parser/index.js | 4 +- ...pec.js => parse-xviz-message-sync.spec.js} | 191 +++++++++--------- ...age.spec.js => parse-xviz-message.spec.js} | 18 +- test/modules/parser/parsers/serialize.spec.js | 4 +- 16 files changed, 168 insertions(+), 163 deletions(-) rename modules/parser/src/parsers/{parse-stream-video-message.js => parse-video-message-v1.js} (88%) rename modules/parser/src/parsers/{parse-stream-data-message.js => parse-xviz-message-sync.js} (93%) rename modules/parser/src/parsers/{parse-stream-workerfarm.js => parse-xviz-message-workerfarm.js} (100%) rename modules/parser/src/parsers/{parse-stream-message.js => parse-xviz-message.js} (84%) rename test/modules/parser/parsers/{parse-stream-data-message.spec.js => parse-xviz-message-sync.spec.js} (79%) rename test/modules/parser/parsers/{parse-stream-message.spec.js => parse-xviz-message.spec.js} (88%) diff --git a/docs/api-reference/parse-xviz.md b/docs/api-reference/parse-xviz.md index 366bffc54..a63b57a0f 100644 --- a/docs/api-reference/parse-xviz.md +++ b/docs/api-reference/parse-xviz.md @@ -1,15 +1,15 @@ -# parseStreamMessage +# parseXVIZMessage ```js -import {parseStreamMessage, LOG_STREAM_MESSAGE} from '@xviz/parser'; +import {parseXVIZMessage, XVIZ_MESSAGE} from '@xviz/parser'; -parseStreamMessage({ +parseXVIZMessage({ message, onResult: data => { switch (data.type) { - case LOG_STREAM_MESSAGE.METADATA: // do something - case LOG_STREAM_MESSAGE.TIMESLICE: // do something - case LOG_STREAM_MESSAGE.INCOMPLETE: // do something + case XVIZ_MESSAGE.METADATA: // do something + case XVIZ_MESSAGE.TIMESLICE: // do something + case XVIZ_MESSAGE.INCOMPLETE: // do something } }, onError: console.error, @@ -23,7 +23,7 @@ Parameters: - `opts` (Object) - `message` (Object|String|ArrayBuffer) - XVIZ message to decode. - `onResult` (Function) - callback if the message is parsed successfully. Receives a single - argument `data`. `data.type` is one of `LOG_STREAM_MESSAGE`. + argument `data`. `data.type` is one of `XVIZ_MESSAGE`. - `onError` (Function) - callback if the parser encouters an error. - `debug` (Function) - callback to log debug info. - `worker` (Boolean|String) - use Web Wroker to parse the message. Enabling worker is recommended @@ -37,7 +37,7 @@ Parameters: - `capacity` (Number) - the limit on the number of messages to queue for the workers to process, has no effect if set ot `null`. Default `null`. -##### LOG_STREAM_MESSAGE +##### XVIZ_MESSAGE Enum of stream message types. diff --git a/modules/parser/src/constants.js b/modules/parser/src/constants.js index d46e3e46d..13c7f0435 100644 --- a/modules/parser/src/constants.js +++ b/modules/parser/src/constants.js @@ -13,7 +13,7 @@ // limitations under the License. /* eslint-disable camelcase */ -export const LOG_STREAM_MESSAGE = { +export const XVIZ_MESSAGE = { METADATA: 'METADATA', TIMESLICE: 'TIMESLICE', DONE: 'DONE', diff --git a/modules/parser/src/index.js b/modules/parser/src/index.js index 9de7c4359..94744687f 100644 --- a/modules/parser/src/index.js +++ b/modules/parser/src/index.js @@ -18,7 +18,7 @@ export {default as xvizStats} from './utils/stats'; // GENERIC XVIZ EXPORTS // Common constants -export {LOG_STREAM_MESSAGE} from './constants'; +export {XVIZ_MESSAGE} from './constants'; // Configuration export {setXVIZConfig, getXVIZConfig} from './config/xviz-config'; @@ -42,20 +42,28 @@ export {default as XVIZObjectCollection} from './objects/xviz-object-collection' export {parseLogMetadata} from './parsers/parse-log-metadata'; export {parseVehiclePose} from './parsers/parse-vehicle-pose'; export {parseEtlStream} from './parsers/parse-etl-stream'; -export {parseStreamMessage, initializeWorkers} from './parsers/parse-stream-message'; +export {parseXVIZMessage, initializeWorkers} from './parsers/parse-xviz-message'; export { - parseStreamDataMessage, - parseStreamLogData, + parseXVIZMessageSync, + parseXVIZData, isXVIZMessage, getXVIZMessageType, getDataFormat, isEnvelope, unpackEnvelope -} from './parsers/parse-stream-data-message'; -export {parseStreamVideoMessage} from './parsers/parse-stream-video-message'; +} from './parsers/parse-xviz-message-sync'; export {default as lidarPointCloudWorker} from './workers/lidar-point-cloud-worker'; export {default as streamDataWorker} from './workers/stream-data-worker'; // Loaders export {parseBinaryXVIZ, isBinaryXVIZ} from './loaders/xviz-loader/xviz-binary-loader'; + +// Deprecated +export {parseXVIZMessage as parseStreamMessage} from './parsers/parse-xviz-message'; +export { + parseXVIZMessageSync as parseStreamDataMessage, + parseXVIZData as parseStreamLogData +} from './parsers/parse-xviz-message-sync'; +export {parseVideoMessageV1 as parseStreamVideoMessage} from './parsers/parse-video-message-v1'; +export {XVIZ_MESSAGE as LOG_STREAM_MESSAGE} from './constants'; diff --git a/modules/parser/src/parsers/parse-timeslice-data-v1.js b/modules/parser/src/parsers/parse-timeslice-data-v1.js index 4c5b476c2..cd5f63cb0 100644 --- a/modules/parser/src/parsers/parse-timeslice-data-v1.js +++ b/modules/parser/src/parsers/parse-timeslice-data-v1.js @@ -14,7 +14,7 @@ // Extracts a TIMESLICE message v1 import {getXVIZConfig} from '../config/xviz-config'; -import {LOG_STREAM_MESSAGE} from '../constants'; +import {XVIZ_MESSAGE} from '../constants'; import {parseStreamFutures, parseStreamPrimitive, parseStreamVariable} from './parse-xviz-stream'; export default function parseTimesliceData(data, convertPrimitive) { @@ -32,13 +32,13 @@ export default function parseTimesliceData(data, convertPrimitive) { if (!timestamp) { // Incomplete stream message, just tag it accordingly so client can ignore it - return {type: LOG_STREAM_MESSAGE.INCOMPLETE}; + return {type: XVIZ_MESSAGE.INCOMPLETE}; } const newStreams = {}; const result = { ...otherInfo, - type: LOG_STREAM_MESSAGE.TIMESLICE, + type: XVIZ_MESSAGE.TIMESLICE, streams: newStreams, timestamp }; diff --git a/modules/parser/src/parsers/parse-timeslice-data-v2.js b/modules/parser/src/parsers/parse-timeslice-data-v2.js index 906f02c88..c0423b0d5 100644 --- a/modules/parser/src/parsers/parse-timeslice-data-v2.js +++ b/modules/parser/src/parsers/parse-timeslice-data-v2.js @@ -13,7 +13,7 @@ // limitations under the License. // Extracts a TIMESLICE message v2 -import {LOG_STREAM_MESSAGE, STATE_UPDATE_TYPE} from '../constants'; +import {XVIZ_MESSAGE, STATE_UPDATE_TYPE} from '../constants'; import {getXVIZConfig} from '../config/xviz-config'; import {parseXVIZPose} from './parse-xviz-pose'; import { @@ -33,16 +33,16 @@ export default function parseStreamSet(data, convertPrimitive) { if (!updateType) { log.error(`update_type of "${update_type}" is not supported.`)(); - return {type: LOG_STREAM_MESSAGE.INCOMPLETE, message: 'Unsupported update type'}; + return {type: XVIZ_MESSAGE.INCOMPLETE, message: 'Unsupported update type'}; } if (!updates) { - return {type: LOG_STREAM_MESSAGE.INCOMPLETE, message: 'Missing required "updates" property'}; + return {type: XVIZ_MESSAGE.INCOMPLETE, message: 'Missing required "updates" property'}; } if (updates && updates.length === 0) { return { - type: LOG_STREAM_MESSAGE.INCOMPLETE, + type: XVIZ_MESSAGE.INCOMPLETE, message: 'Property "updates" has length of 0, no data?' }; } @@ -66,12 +66,12 @@ export default function parseStreamSet(data, convertPrimitive) { if (!timestamp) { // Incomplete stream message, just tag it accordingly so client can ignore it - return {type: LOG_STREAM_MESSAGE.INCOMPLETE, message: 'Missing timestamp in "updates"'}; + return {type: XVIZ_MESSAGE.INCOMPLETE, message: 'Missing timestamp in "updates"'}; } const newStreams = {}; const result = { - type: LOG_STREAM_MESSAGE.TIMESLICE, + type: XVIZ_MESSAGE.TIMESLICE, updateType, streams: newStreams, timestamp diff --git a/modules/parser/src/parsers/parse-stream-video-message.js b/modules/parser/src/parsers/parse-video-message-v1.js similarity index 88% rename from modules/parser/src/parsers/parse-stream-video-message.js rename to modules/parser/src/parsers/parse-video-message-v1.js index a0b2442e8..b967cc867 100644 --- a/modules/parser/src/parsers/parse-stream-video-message.js +++ b/modules/parser/src/parsers/parse-video-message-v1.js @@ -19,18 +19,18 @@ * `data` refers to pre-processed data objects (blob, arraybuffer, JSON object) */ /* global Blob */ -import {LOG_STREAM_MESSAGE} from '../constants'; +import {XVIZ_MESSAGE} from '../constants'; import {TextDecoder} from '../utils/text-encoding'; import {blobToArrayBuffer} from '../utils/binary'; import {parseLogMetadata} from './parse-log-metadata'; // Handle messages from the stand alone video server -export function parseStreamVideoMessage(message, onResult, onError) { +export function parseVideoMessageV1(message, onResult, onError) { if (message instanceof Blob) { blobToArrayBuffer(message) .then(arrayBuffer => { - parseStreamVideoMessage(arrayBuffer, onResult, onError); + parseVideoMessageV1(arrayBuffer, onResult, onError); }) .catch(onError); return; @@ -57,13 +57,13 @@ export function parseStreamVideoData(data) { return parseVideoMetadata(data); } // Unknown message - return {type: LOG_STREAM_MESSAGE.ERROR, message: 'Unknown stream data type', data}; + return {type: XVIZ_MESSAGE.ERROR, message: 'Unknown stream data type', data}; } // Extract metadata from stream message function parseVideoMetadata(data) { const result = parseLogMetadata(data); - result.type = LOG_STREAM_MESSAGE.VIDEO_METADATA; + result.type = XVIZ_MESSAGE.VIDEO_METADATA; return result; } @@ -74,7 +74,7 @@ export function parseVideoFrame(arrayBuffer) { const view = new DataView(arrayBuffer); // Read off version - const result = {type: LOG_STREAM_MESSAGE.VIDEO_FRAME}; + const result = {type: XVIZ_MESSAGE.VIDEO_FRAME}; const littleEndian = true; const utf8Decoder = new TextDecoder('utf-8'); diff --git a/modules/parser/src/parsers/parse-stream-data-message.js b/modules/parser/src/parsers/parse-xviz-message-sync.js similarity index 93% rename from modules/parser/src/parsers/parse-stream-data-message.js rename to modules/parser/src/parsers/parse-xviz-message-sync.js index 66c636705..e97adfeca 100644 --- a/modules/parser/src/parsers/parse-stream-data-message.js +++ b/modules/parser/src/parsers/parse-xviz-message-sync.js @@ -19,14 +19,14 @@ * `data` refers to pre-processed data objects (blob, arraybuffer, JSON object) */ /* global Blob, Uint8Array */ -import {LOG_STREAM_MESSAGE} from '../constants'; +import {XVIZ_MESSAGE} from '../constants'; import { parseBinaryXVIZ, isBinaryXVIZ, getBinaryXVIZJSONBuffer } from '../loaders/xviz-loader/xviz-binary-loader'; import {parseLogMetadata} from './parse-log-metadata'; -import {parseStreamVideoMessage} from './parse-stream-video-message'; +import {parseVideoMessageV1} from './parse-video-message-v1'; import {TextDecoder} from '../utils/text-encoding'; import parseTimesliceDataV1 from './parse-timeslice-data-v1'; import parseTimesliceDataV2 from './parse-timeslice-data-v2'; @@ -238,12 +238,12 @@ export function isEnvelope(data) { } // Post processes a stream message to make it easy to use for JavaScript applications -export function parseStreamDataMessage(message, onResult, onError, opts) { +export function parseXVIZMessageSync(message, onResult, onError, opts) { // TODO(twojtasz): better message dispatching // here, not all arraybuffer may be image (packed point cloud) // TODO(jlisee): Node.js support for blobs for better unit testing if (typeof Blob !== 'undefined' && message instanceof Blob) { - parseStreamVideoMessage(message, onResult, onError); + parseVideoMessageV1(message, onResult, onError); return; } @@ -262,7 +262,7 @@ export function parseStreamDataMessage(message, onResult, onError, opts) { } if (parseData) { - const result = parseStreamLogData(data, {...opts, v2Type}); + const result = parseXVIZData(data, {...opts, v2Type}); onResult(result); } } catch (error) { @@ -270,7 +270,7 @@ export function parseStreamDataMessage(message, onResult, onError, opts) { } } -export function parseStreamLogData(data, opts = {}) { +export function parseXVIZData(data, opts = {}) { // TODO(twojtasz): this data.message is due an // uncoordinated change on the XVIZ server, temporary. const typeKey = opts.v2Type || data.type || data.message || data.update_type; @@ -282,16 +282,16 @@ export function parseStreamLogData(data, opts = {}) { return { ...parseLogMetadata(data), // ensure application sees the metadata type set to the uppercase version - type: LOG_STREAM_MESSAGE.METADATA + type: XVIZ_MESSAGE.METADATA }; case 'transform_log_done': - return {...data, type: LOG_STREAM_MESSAGE.DONE}; + return {...data, type: XVIZ_MESSAGE.DONE}; case 'error': - return {...data, message: 'Stream server error', type: LOG_STREAM_MESSAGE.ERROR}; + return {...data, message: 'Stream server error', type: XVIZ_MESSAGE.ERROR}; // v1 types case 'done': - return {...data, type: LOG_STREAM_MESSAGE.DONE}; + return {...data, type: XVIZ_MESSAGE.DONE}; default: // TODO(twojtasz): XVIZ should be tagging this with a type return parseTimesliceData(data, opts.convertPrimitive); diff --git a/modules/parser/src/parsers/parse-stream-workerfarm.js b/modules/parser/src/parsers/parse-xviz-message-workerfarm.js similarity index 100% rename from modules/parser/src/parsers/parse-stream-workerfarm.js rename to modules/parser/src/parsers/parse-xviz-message-workerfarm.js diff --git a/modules/parser/src/parsers/parse-stream-message.js b/modules/parser/src/parsers/parse-xviz-message.js similarity index 84% rename from modules/parser/src/parsers/parse-stream-message.js rename to modules/parser/src/parsers/parse-xviz-message.js index 5fd9591fb..92f3b608e 100644 --- a/modules/parser/src/parsers/parse-stream-message.js +++ b/modules/parser/src/parsers/parse-xviz-message.js @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -import {parseStreamDataMessage} from './parse-stream-data-message'; +import {parseXVIZMessageSync} from './parse-xviz-message-sync'; import {postDeserialize} from './serialize'; -import {getWorkerFarm, initializeWorkerFarm} from './parse-stream-workerfarm'; +import {getWorkerFarm, initializeWorkerFarm} from './parse-xviz-message-workerfarm'; // Public function for initializing workers export function initializeWorkers({worker, maxConcurrency = 4, capacity = null}) { initializeWorkerFarm({worker, maxConcurrency, capacity}); } -export function parseStreamMessage({ +export function parseXVIZMessage({ message, // callbacks onResult, @@ -46,6 +46,6 @@ export function parseStreamMessage({ const onMessage = data => onResult(postDeserialize(data)); workerFarm.process(message, onMessage, onError); } else { - parseStreamDataMessage(message, onResult, onError); + parseXVIZMessageSync(message, onResult, onError); } } diff --git a/modules/parser/src/parsers/serialize.js b/modules/parser/src/parsers/serialize.js index b34938462..c1330e239 100644 --- a/modules/parser/src/parsers/serialize.js +++ b/modules/parser/src/parsers/serialize.js @@ -15,7 +15,7 @@ /** * Convert stream messages for safe transfer between threads */ -import {LOG_STREAM_MESSAGE} from '../constants'; +import {XVIZ_MESSAGE} from '../constants'; import {getXVIZConfig} from '../config/xviz-config'; import XVIZObject from '../objects/xviz-object'; @@ -41,7 +41,7 @@ function observeObjects(objects, timestamp) { * @params message {object} - received dehydrated message from other threads */ export function postDeserialize(message) { - if (message.type !== LOG_STREAM_MESSAGE.TIMESLICE) { + if (message.type !== XVIZ_MESSAGE.TIMESLICE) { return message; } diff --git a/modules/parser/src/workers/stream-data-worker.js b/modules/parser/src/workers/stream-data-worker.js index cc7fb7c54..c7177c203 100644 --- a/modules/parser/src/workers/stream-data-worker.js +++ b/modules/parser/src/workers/stream-data-worker.js @@ -13,10 +13,10 @@ // limitations under the License. import {setXVIZConfig} from '../config/xviz-config'; -import {parseStreamDataMessage} from '../parsers/parse-stream-data-message'; +import {parseXVIZMessageSync} from '../parsers/parse-xviz-message-sync'; import {preSerialize} from '../parsers/serialize'; import {getTransferList} from '../utils/worker-utils'; -import {LOG_STREAM_MESSAGE} from '../constants'; +import {XVIZ_MESSAGE} from '../constants'; export default config => self => { setXVIZConfig(config); @@ -25,7 +25,7 @@ export default config => self => { const transfers = new Set(); switch (message.type) { - case LOG_STREAM_MESSAGE.TIMESLICE: + case XVIZ_MESSAGE.TIMESLICE: for (const streamName in message.streams) { const stream = message.streams[streamName]; getTransferList(stream.pointCloud, true, transfers); @@ -36,7 +36,7 @@ export default config => self => { } break; - case LOG_STREAM_MESSAGE.VIDEO_FRAME: + case XVIZ_MESSAGE.VIDEO_FRAME: // v1 video stream getTransferList(message.imageData, false, transfers); break; @@ -67,7 +67,7 @@ export default config => self => { if (e.data && e.data.xvizConfig) { setXVIZConfig(e.data.xvizConfig); } else if (e.data) { - parseStreamDataMessage(e.data, onResult, onError); + parseXVIZMessageSync(e.data, onResult, onError); } }; }; diff --git a/test/modules/conformance/renderer/utils.js b/test/modules/conformance/renderer/utils.js index a06ee6d57..976b9ca01 100644 --- a/test/modules/conformance/renderer/utils.js +++ b/test/modules/conformance/renderer/utils.js @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import {parseStreamMessage} from '@xviz/parser'; +import {parseXVIZMessage} from '@xviz/parser'; export function parseFrame(frame) { let result; @@ -21,7 +21,7 @@ export function parseFrame(frame) { throw error; }; - parseStreamMessage({ + parseXVIZMessage({ message: frame, onResult: message => { result = message; diff --git a/test/modules/parser/index.js b/test/modules/parser/index.js index 0c97f2675..15bd1cd0f 100644 --- a/test/modules/parser/index.js +++ b/test/modules/parser/index.js @@ -21,8 +21,8 @@ import './synchronizers/xviz-stream-buffer.spec'; import './parsers/filter-vertices.spec'; import './parsers/parse-log-metadata.spec'; -import './parsers/parse-stream-data-message.spec'; -import './parsers/parse-stream-message.spec'; +import './parsers/parse-xviz-message-sync.spec'; +import './parsers/parse-xviz-message.spec'; import './parsers/parse-vehicle-pose.spec'; import './parsers/parse-xviz-pose.spec'; import './parsers/parse-xviz-stream.spec'; diff --git a/test/modules/parser/parsers/parse-stream-data-message.spec.js b/test/modules/parser/parsers/parse-xviz-message-sync.spec.js similarity index 79% rename from test/modules/parser/parsers/parse-stream-data-message.spec.js rename to test/modules/parser/parsers/parse-xviz-message-sync.spec.js index a25afd8e6..b7545d41a 100644 --- a/test/modules/parser/parsers/parse-stream-data-message.spec.js +++ b/test/modules/parser/parsers/parse-xviz-message-sync.spec.js @@ -15,14 +15,14 @@ import { setXVIZConfig, getXVIZConfig, - parseStreamDataMessage, + parseXVIZMessageSync, isEnvelope, isXVIZMessage, getXVIZMessageType, getDataFormat, unpackEnvelope, - parseStreamLogData, - LOG_STREAM_MESSAGE + parseXVIZData, + XVIZ_MESSAGE } from '@xviz/parser'; import {XVIZValidator} from '@xviz/schema'; @@ -169,12 +169,12 @@ tape('unpackEnvelope xviz', t => { }); // TODO: blacklisted streams in xviz common -tape('parseStreamLogData metadata', t => { +tape('parseXVIZData metadata', t => { resetXVIZConfigAndSettings(); - const metaMessage = parseStreamLogData(TestMetadataMessageV2, {v2Type: 'metadata'}); + const metaMessage = parseXVIZData(TestMetadataMessageV2, {v2Type: 'metadata'}); - t.equals(metaMessage.type, LOG_STREAM_MESSAGE.METADATA, 'Metadata type set'); + t.equals(metaMessage.type, XVIZ_MESSAGE.METADATA, 'Metadata type set'); t.equals( getXVIZConfig().currentMajorVersion, 2, @@ -195,13 +195,13 @@ tape('parseStreamLogData metadata', t => { t.end(); }); -tape('parseStreamLogData metadata v1', t => { +tape('parseXVIZData metadata v1', t => { resetXVIZConfigAndSettings(); setXVIZConfig({supportedVersions: [1]}); - const metaMessage = parseStreamLogData(TestMetadataMessageV1); + const metaMessage = parseXVIZData(TestMetadataMessageV1); - t.equals(metaMessage.type, LOG_STREAM_MESSAGE.METADATA, 'Metadata type set'); + t.equals(metaMessage.type, XVIZ_MESSAGE.METADATA, 'Metadata type set'); t.equals( getXVIZConfig().currentMajorVersion, 1, @@ -222,48 +222,48 @@ tape('parseStreamLogData metadata v1', t => { t.end(); }); -tape('parseStreamLogData unsupported version v1', t => { +tape('parseXVIZData unsupported version v1', t => { resetXVIZConfigAndSettings(); setXVIZConfig({supportedVersions: [2]}); t.throws( - () => parseStreamLogData(TestMetadataMessageV1), + () => parseXVIZData(TestMetadataMessageV1), /XVIZ version 1 is not supported/, 'Throws if supportedVersions does not match currentMajorVersion' ); t.end(); }); -tape('parseStreamLogData unsupported version v2', t => { +tape('parseXVIZData unsupported version v2', t => { resetXVIZConfigAndSettings(); setXVIZConfig({supportedVersions: [1]}); t.throws( - () => parseStreamLogData(TestMetadataMessageV2, {v2Type: 'metadata'}), + () => parseXVIZData(TestMetadataMessageV2, {v2Type: 'metadata'}), /XVIZ version 2 is not supported/, 'Throws if supportedVersions does not match currentMajorVersion' ); t.end(); }); -tape('parseStreamLogData undetectable version', t => { +tape('parseXVIZData undetectable version', t => { resetXVIZConfigAndSettings(); setXVIZConfig({supportedVersions: [2]}); t.throws( - () => parseStreamLogData({...TestMetadataMessageV2, version: 'abc'}, {v2Type: 'metadata'}), + () => parseXVIZData({...TestMetadataMessageV2, version: 'abc'}, {v2Type: 'metadata'}), /Unable to detect the XVIZ version/, 'Throws if version exists but cannot parse major version' ); t.end(); }); -tape('parseStreamLogData metadata with full log time only', t => { +tape('parseXVIZData metadata with full log time only', t => { resetXVIZConfigAndSettings(); - const metaMessage = parseStreamLogData(metadataWithLogStartEnd, {v2Type: 'metadata'}); + const metaMessage = parseXVIZData(metadataWithLogStartEnd, {v2Type: 'metadata'}); - t.equals(metaMessage.type, LOG_STREAM_MESSAGE.METADATA, 'Metadata type set'); + t.equals(metaMessage.type, XVIZ_MESSAGE.METADATA, 'Metadata type set'); t.equals( getXVIZConfig().currentMajorVersion, 2, @@ -284,33 +284,33 @@ tape('parseStreamLogData metadata with full log time only', t => { t.end(); }); -tape('parseStreamLogData validate test data', t => { +tape('parseXVIZData validate test data', t => { schemaValidator.validate('session/state_update', TestTimesliceMessageV2); t.end(); }); -tape('parseStreamLogData validate result when missing updates', t => { +tape('parseXVIZData validate result when missing updates', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); - const metaMessage = parseStreamLogData( + const metaMessage = parseXVIZData( { update_type: 'complete_state' }, {v2Type: 'state_update'} ); - t.equals(metaMessage.type, LOG_STREAM_MESSAGE.INCOMPLETE, 'Type after parse set to error'); + t.equals(metaMessage.type, XVIZ_MESSAGE.INCOMPLETE, 'Type after parse set to error'); t.ok(/Missing required/.test(metaMessage.message), 'Message details on what is missing'); t.end(); }); -tape('parseStreamLogData validate result when updates is empty', t => { +tape('parseXVIZData validate result when updates is empty', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); - const metaMessage = parseStreamLogData( + const metaMessage = parseXVIZData( { update_type: 'complete_state', updates: [] @@ -318,17 +318,17 @@ tape('parseStreamLogData validate result when updates is empty', t => { {v2Type: 'state_update'} ); - t.equals(metaMessage.type, LOG_STREAM_MESSAGE.INCOMPLETE, 'Type after parse set to error'); + t.equals(metaMessage.type, XVIZ_MESSAGE.INCOMPLETE, 'Type after parse set to error'); t.ok(/"updates" has length of 0/.test(metaMessage.message), 'Message details length is 0'); t.end(); }); -tape('parseStreamLogData validate result when missing timestamp in updates', t => { +tape('parseXVIZData validate result when missing timestamp in updates', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); - const metaMessage = parseStreamLogData( + const metaMessage = parseXVIZData( { update_type: 'complete_state', updates: [{}] @@ -336,7 +336,7 @@ tape('parseStreamLogData validate result when missing timestamp in updates', t = {v2Type: 'state_update'} ); - t.equals(metaMessage.type, LOG_STREAM_MESSAGE.INCOMPLETE, 'Type after parse set to error'); + t.equals(metaMessage.type, XVIZ_MESSAGE.INCOMPLETE, 'Type after parse set to error'); t.ok( /Missing timestamp in "updates"/.test(metaMessage.message), 'Message details missing timestamp' @@ -345,40 +345,40 @@ tape('parseStreamLogData validate result when missing timestamp in updates', t = t.end(); }); -tape('parseStreamLogData error', t => { +tape('parseXVIZData error', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); - const metaMessage = parseStreamLogData({message: 'my message'}, {v2Type: 'error'}); - t.equals(metaMessage.type, LOG_STREAM_MESSAGE.ERROR, 'Metadata type set to error'); + const metaMessage = parseXVIZData({message: 'my message'}, {v2Type: 'error'}); + t.equals(metaMessage.type, XVIZ_MESSAGE.ERROR, 'Metadata type set to error'); t.end(); }); -tape('parseStreamLogData timeslice INCOMPLETE', t => { +tape('parseXVIZData timeslice INCOMPLETE', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); // NOTE: no explicit type for this message yet. - let metaMessage = parseStreamLogData( + let metaMessage = parseXVIZData( { ...TestTimesliceMessageV2, timestamp: null }, {v2Type: 'state_update'} ); - t.equals(metaMessage.type, LOG_STREAM_MESSAGE.TIMESLICE, 'Missing timestamp is ok'); + t.equals(metaMessage.type, XVIZ_MESSAGE.TIMESLICE, 'Missing timestamp is ok'); - metaMessage = parseStreamLogData( + metaMessage = parseXVIZData( { ...TestTimesliceMessageV2, updates: [{updates: null}] }, {v2Type: 'state_update'} ); - t.equals(metaMessage.type, LOG_STREAM_MESSAGE.INCOMPLETE, 'Missing updates incomplete'); + t.equals(metaMessage.type, XVIZ_MESSAGE.INCOMPLETE, 'Missing updates incomplete'); - metaMessage = parseStreamLogData( + metaMessage = parseXVIZData( { ...TestTimesliceMessageV2, updates: [ @@ -393,9 +393,9 @@ tape('parseStreamLogData timeslice INCOMPLETE', t => { }, {v2Type: 'state_update'} ); - t.equals(metaMessage.type, LOG_STREAM_MESSAGE.INCOMPLETE, 'Missing updates is incomplete'); + t.equals(metaMessage.type, XVIZ_MESSAGE.INCOMPLETE, 'Missing updates is incomplete'); - metaMessage = parseStreamLogData( + metaMessage = parseXVIZData( { ...TestTimesliceMessageV2, updates: [ @@ -406,18 +406,18 @@ tape('parseStreamLogData timeslice INCOMPLETE', t => { }, {v2Type: 'state_update'} ); - t.equals(metaMessage.type, LOG_STREAM_MESSAGE.INCOMPLETE, 'Missing timestamp is incomplete'); + t.equals(metaMessage.type, XVIZ_MESSAGE.INCOMPLETE, 'Missing timestamp is incomplete'); t.end(); }); -tape('parseStreamLogData timeslice', t => { +tape('parseXVIZData timeslice', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); // NOTE: no explicit type for this message yet. - let result = parseStreamLogData({...TestTimesliceMessageV2}, {v2Type: 'state_update'}); - t.equals(result.type, LOG_STREAM_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + let result = parseXVIZData({...TestTimesliceMessageV2}, {v2Type: 'state_update'}); + t.equals(result.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); t.equal(result.updateType, 'COMPLETE', 'XVIZ update type is parsed'); t.equals( result.timestamp, @@ -426,36 +426,33 @@ tape('parseStreamLogData timeslice', t => { ); // Incremental update - result = parseStreamLogData( + result = parseXVIZData( {...TestTimesliceMessageV2, update_type: 'incremental'}, {v2Type: 'state_update'} ); - t.equals(result.type, LOG_STREAM_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + t.equals(result.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); t.equal(result.updateType, 'INCREMENTAL', 'XVIZ update type is parsed'); // Deprecated 'snapshot' update type - result = parseStreamLogData( + result = parseXVIZData( {...TestTimesliceMessageV2, update_type: 'snapshot'}, {v2Type: 'state_update'} ); - t.equals(result.type, LOG_STREAM_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + t.equals(result.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); t.equal(result.updateType, 'INCREMENTAL', 'XVIZ update type is parsed'); // Unknown update type - result = parseStreamLogData( - {...TestTimesliceMessageV2, update_type: ''}, - {v2Type: 'state_update'} - ); + result = parseXVIZData({...TestTimesliceMessageV2, update_type: ''}, {v2Type: 'state_update'}); t.equals( result.type, - LOG_STREAM_MESSAGE.INCOMPLETE, + XVIZ_MESSAGE.INCOMPLETE, 'Should not parse timeslice of unsupported update type' ); t.end(); }); -tape('parseStreamLogData timeslice without parsing metadata (v1)', t => { +tape('parseXVIZData timeslice without parsing metadata (v1)', t => { // NOTE: this is the the teleassist case where they don't have metadata // before they start sending log data resetXVIZConfigAndSettings(); @@ -463,8 +460,8 @@ tape('parseStreamLogData timeslice without parsing metadata (v1)', t => { setXVIZConfig({currentMajorVersion: 1}); // NOTE: no explicit type for this message yet. - const metaMessage = parseStreamLogData({...TestTimesliceMessageV1}); - t.equals(metaMessage.type, LOG_STREAM_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + const metaMessage = parseXVIZData({...TestTimesliceMessageV1}); + t.equals(metaMessage.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); t.equals( metaMessage.timestamp, TestTimesliceMessageV1.vehicle_pose.time, @@ -483,7 +480,7 @@ tape('parseStreamLogData timeslice without parsing metadata (v1)', t => { t.end(); }); -tape('parseStreamLogData preProcessPrimitive type change', t => { +tape('parseXVIZData preProcessPrimitive type change', t => { let calledPreProcess = false; resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 1}); @@ -496,7 +493,7 @@ tape('parseStreamLogData preProcessPrimitive type change', t => { }); // NOTE: no explicit type for this message yet. - const metaMessage = parseStreamLogData({...TestTimesliceMessageV1}); + const metaMessage = parseXVIZData({...TestTimesliceMessageV1}); t.ok(calledPreProcess, 'Called preProcessPrimitive callback'); t.equals( @@ -508,14 +505,14 @@ tape('parseStreamLogData preProcessPrimitive type change', t => { t.end(); }); -tape('parseStreamLogData pointCloud timeslice', t => { +tape('parseXVIZData pointCloud timeslice', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); const PointCloudTestTimesliceMessage = TestTimesliceMessageV2; // NOTE: no explicit type for this message yet. - const slice = parseStreamLogData({...PointCloudTestTimesliceMessage}); - t.equals(slice.type, LOG_STREAM_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + const slice = parseXVIZData({...PointCloudTestTimesliceMessage}); + t.equals(slice.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); const pointCloud = slice.streams['/test/stream'].pointCloud; const feature = slice.streams['/test/stream'].features[0]; @@ -530,7 +527,7 @@ tape('parseStreamLogData pointCloud timeslice', t => { t.end(); }); -tape('parseStreamLogData polyline flat', t => { +tape('parseXVIZData polyline flat', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); const TestTimeslice = clone(TestTimesliceMessageV2); @@ -549,8 +546,8 @@ tape('parseStreamLogData polyline flat', t => { }; // NOTE: no explicit type for this message yet. - const slice = parseStreamLogData({...TestTimeslice}); - t.equals(slice.type, LOG_STREAM_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + const slice = parseXVIZData({...TestTimeslice}); + t.equals(slice.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); const features = slice.streams['/test/stream'].features; t.equals(features.length, 1, 'has has object'); @@ -564,7 +561,7 @@ tape('parseStreamLogData polyline flat', t => { t.end(); }); -tape('parseStreamLogData polygon flat', t => { +tape('parseXVIZData polygon flat', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); const TestTimeslice = clone(TestTimesliceMessageV2); @@ -583,8 +580,8 @@ tape('parseStreamLogData polygon flat', t => { }; // NOTE: no explicit type for this message yet. - const slice = parseStreamLogData({...TestTimeslice}); - t.equals(slice.type, LOG_STREAM_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + const slice = parseXVIZData({...TestTimeslice}); + t.equals(slice.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); const features = slice.streams['/test/stream'].features; t.equals(features.length, 1, 'has has object'); @@ -599,15 +596,15 @@ tape('parseStreamLogData polygon flat', t => { t.end(); }); -tape('parseStreamLogData flat JSON pointCloud', t => { +tape('parseXVIZData flat JSON pointCloud', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); const PointCloudTestTimesliceMessage = clone(TestTimesliceMessageV2); const stream = PointCloudTestTimesliceMessage.updates[0].primitives['/test/stream']; // NOTE: no explicit type for this message yet. - let slice = parseStreamLogData({...PointCloudTestTimesliceMessage}); - t.equals(slice.type, LOG_STREAM_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + let slice = parseXVIZData({...PointCloudTestTimesliceMessage}); + t.equals(slice.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); let pointCloud = slice.streams['/test/stream'].pointCloud; const feature = slice.streams['/test/stream'].features[0]; @@ -621,26 +618,26 @@ tape('parseStreamLogData flat JSON pointCloud', t => { // v1 inline color stream.points[0].color = [0, 0, 255]; - slice = parseStreamLogData({...PointCloudTestTimesliceMessage}); + slice = parseXVIZData({...PointCloudTestTimesliceMessage}); pointCloud = slice.streams['/test/stream'].pointCloud; t.deepEquals(pointCloud.colors, [0, 0, 255], 'Has correct values in colors'); // flattened colors stride = 3 stream.points[0].colors = [[0, 0, 255]]; - slice = parseStreamLogData({...PointCloudTestTimesliceMessage}); + slice = parseXVIZData({...PointCloudTestTimesliceMessage}); pointCloud = slice.streams['/test/stream'].pointCloud; t.deepEquals(pointCloud.colors, [0, 0, 255], 'Has correct values in colors'); // flattened colors stride = 4 stream.points[0].colors = [[0, 0, 255, 255]]; - slice = parseStreamLogData({...PointCloudTestTimesliceMessage}); + slice = parseXVIZData({...PointCloudTestTimesliceMessage}); pointCloud = slice.streams['/test/stream'].pointCloud; t.deepEquals(pointCloud.colors, [0, 0, 255, 255], 'Has correct values in colors'); t.end(); }); -tape('parseStreamLogData pointCloud timeslice TypedArray', t => { +tape('parseXVIZData pointCloud timeslice TypedArray', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); @@ -649,8 +646,8 @@ tape('parseStreamLogData pointCloud timeslice TypedArray', t => { stream.points[0].points = new Float32Array([500, 500, 200]); // NOTE: no explicit type for this message yet. - let slice = parseStreamLogData({...PointCloudTestTimesliceMessage}); - t.equals(slice.type, LOG_STREAM_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + let slice = parseXVIZData({...PointCloudTestTimesliceMessage}); + t.equals(slice.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); t.ok(slice.streams['/test/stream'].pointCloud, 'has a point cloud'); let pointCloud = slice.streams['/test/stream'].pointCloud; @@ -660,20 +657,20 @@ tape('parseStreamLogData pointCloud timeslice TypedArray', t => { // flattened colors stride = 3 stream.points[0].colors = new Uint8Array([0, 0, 255]); - slice = parseStreamLogData({...PointCloudTestTimesliceMessage}); + slice = parseXVIZData({...PointCloudTestTimesliceMessage}); pointCloud = slice.streams['/test/stream'].pointCloud; t.deepEquals(pointCloud.colors, [0, 0, 255], 'Has correct values in colors'); // flattened colors stride = 4 stream.points[0].colors = new Uint8Array([0, 0, 255, 255]); - slice = parseStreamLogData({...PointCloudTestTimesliceMessage}); + slice = parseXVIZData({...PointCloudTestTimesliceMessage}); pointCloud = slice.streams['/test/stream'].pointCloud; t.deepEquals(pointCloud.colors, [0, 0, 255, 255], 'Has correct values in colors'); t.end(); }); -tape('parseStreamLogData pointCloud timeslice', t => { +tape('parseXVIZData pointCloud timeslice', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); @@ -689,8 +686,8 @@ tape('parseStreamLogData pointCloud timeslice', t => { }); // NOTE: no explicit type for this message yet. - const slice = parseStreamLogData({...PointCloudTestTimesliceMessage}); - t.equals(slice.type, LOG_STREAM_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + const slice = parseXVIZData({...PointCloudTestTimesliceMessage}); + t.equals(slice.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); const pointCloud = slice.streams['/test/stream'].pointCloud; const feature = slice.streams['/test/stream'].features[0]; @@ -706,7 +703,7 @@ tape('parseStreamLogData pointCloud timeslice', t => { t.end(); }); -tape('parseStreamLogData variable timeslice', t => { +tape('parseXVIZData variable timeslice', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); const VariableTestTimesliceMessage = { @@ -742,8 +739,8 @@ tape('parseStreamLogData variable timeslice', t => { }; // NOTE: no explicit type for this message yet. - const slice = parseStreamLogData({...VariableTestTimesliceMessage}); - t.equals(slice.type, LOG_STREAM_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + const slice = parseXVIZData({...VariableTestTimesliceMessage}); + t.equals(slice.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); t.ok(slice.streams['/foo'].variable, 'has variable'); const variable = slice.streams['/foo'].variable; @@ -754,12 +751,12 @@ tape('parseStreamLogData variable timeslice', t => { t.end(); }); -tape('parseStreamLogData futures timeslice v1', t => { +tape('parseXVIZData futures timeslice v1', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 1}); - const slice = parseStreamLogData({...TestFuturesMessageV1}); - t.equals(slice.type, LOG_STREAM_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + const slice = parseXVIZData({...TestFuturesMessageV1}); + t.equals(slice.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); t.ok(slice.streams['/test/polygon'].lookAheads, 'has lookAheads field'); const lookAheads = slice.streams['/test/polygon'].lookAheads; @@ -768,7 +765,7 @@ tape('parseStreamLogData futures timeslice v1', t => { t.end(); }); -tape('parseStreamDataMessage', t => { +tape('parseXVIZMessageSync', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); @@ -817,7 +814,7 @@ tape('parseStreamDataMessage', t => { let result; let error; const opts = {}; - parseStreamDataMessage( + parseXVIZMessageSync( testCase.message, newResult => { result = newResult; @@ -829,7 +826,7 @@ tape('parseStreamDataMessage', t => { ); t.equals(undefined, error, 'No errors received while parsing'); - t.equals(result.type, LOG_STREAM_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + t.equals(result.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); t.equals( result.timestamp, TestTimesliceMessageV2.updates[0].poses['/vehicle_pose'].timestamp, @@ -840,7 +837,7 @@ tape('parseStreamDataMessage', t => { t.end(); }); -tape('parseStreamDataMessage#enveloped#metadata', t => { +tape('parseXVIZMessageSync#enveloped#metadata', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); @@ -852,7 +849,7 @@ tape('parseStreamDataMessage#enveloped#metadata', t => { let result; let error; const opts = {}; - parseStreamDataMessage( + parseXVIZMessageSync( enveloped, newResult => { result = newResult; @@ -865,13 +862,13 @@ tape('parseStreamDataMessage#enveloped#metadata', t => { t.equals(undefined, error, 'No errors received while parsing'); t.notEquals(undefined, result, 'Update units'); - t.equals(result.type, LOG_STREAM_MESSAGE.METADATA, 'Message type set for metadata'); + t.equals(result.type, XVIZ_MESSAGE.METADATA, 'Message type set for metadata'); t.equals(result.version, enveloped.data.version); t.end(); }); -tape('parseStreamDataMessage#enveloped#transform_log_done', t => { +tape('parseXVIZMessageSync#enveloped#transform_log_done', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); @@ -883,7 +880,7 @@ tape('parseStreamDataMessage#enveloped#transform_log_done', t => { let result; let error; const opts = {}; - parseStreamDataMessage( + parseXVIZMessageSync( enveloped, newResult => { result = newResult; @@ -896,13 +893,13 @@ tape('parseStreamDataMessage#enveloped#transform_log_done', t => { t.equals(undefined, error, 'No errors received while parsing'); t.notEquals(undefined, result, 'Update units'); - t.equals(result.type, LOG_STREAM_MESSAGE.DONE, 'Message type set to done'); + t.equals(result.type, XVIZ_MESSAGE.DONE, 'Message type set to done'); t.equals(result.id, enveloped.data.id); t.end(); }); -tape('parseStreamDataMessage enveloped not xviz', t => { +tape('parseXVIZMessageSync enveloped not xviz', t => { resetXVIZConfigAndSettings(); setXVIZConfig({currentMajorVersion: 2}); @@ -914,7 +911,7 @@ tape('parseStreamDataMessage enveloped not xviz', t => { let result; let error; const opts = {}; - parseStreamDataMessage( + parseXVIZMessageSync( enveloped, newResult => { result = newResult; diff --git a/test/modules/parser/parsers/parse-stream-message.spec.js b/test/modules/parser/parsers/parse-xviz-message.spec.js similarity index 88% rename from test/modules/parser/parsers/parse-stream-message.spec.js rename to test/modules/parser/parsers/parse-xviz-message.spec.js index 5f0507677..5191ad339 100644 --- a/test/modules/parser/parsers/parse-stream-message.spec.js +++ b/test/modules/parser/parsers/parse-xviz-message.spec.js @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -import {initializeWorkers, getXVIZConfig, setXVIZConfig, parseStreamMessage} from '@xviz/parser'; -import {destroyWorkerFarm} from '@xviz/parser/parsers/parse-stream-workerfarm'; +import {initializeWorkers, getXVIZConfig, setXVIZConfig, parseXVIZMessage} from '@xviz/parser'; +import {destroyWorkerFarm} from '@xviz/parser/parsers/parse-xviz-message-workerfarm'; import tape from 'tape-catch'; import TestMetadataMessageV2 from 'test-data/sample-metadata-message'; @@ -51,8 +51,8 @@ const xvizUpdateV2 = { } }; -tape('parseStreamMessage#parseMetadata', t => { - parseStreamMessage({ +tape('parseXVIZMessage#parseMetadata', t => { + parseXVIZMessage({ message: metadataMessageV2, onResult: result => { t.equal(result.type, 'METADATA', 'Message type detected as metadata'); @@ -67,7 +67,7 @@ tape('parseStreamMessage#parseMetadata', t => { }); /* global window */ -tape('parseStreamMessage#parseMetadata worker wrong version', t => { +tape('parseXVIZMessage#parseMetadata worker wrong version', t => { if (isBrowser) { // Ensure the version is 1 setXVIZConfig({currentMajorVersion: 1}); @@ -76,7 +76,7 @@ tape('parseStreamMessage#parseMetadata worker wrong version', t => { initializeWorkers({worker: true, maxConcurrency: 4}); // Verify the XVIZ v2 message is properly parsed - parseStreamMessage({ + parseXVIZMessage({ message: xvizUpdateV2, onResult: result => { t.equal( @@ -98,14 +98,14 @@ tape('parseStreamMessage#parseMetadata worker wrong version', t => { } }); -tape('parseStreamMessage#parseMetadata worker', t => { +tape('parseXVIZMessage#parseMetadata worker', t => { if (isBrowser) { // XVIZ Version of workers would be set to 1 by default initializeWorkers({worker: true, maxConcurrency: 4}); // After parsing on main thread, this will call setXVIZConfig, which // should trigger workers to have their XVIZ version updated - parseStreamMessage({ + parseXVIZMessage({ message: metadataMessageV2, onResult: result => { t.equal(result.type, 'METADATA', 'Message type detected as metadata'); @@ -117,7 +117,7 @@ tape('parseStreamMessage#parseMetadata worker', t => { }); // Verify the XVIZ v2 message is properly parsed - parseStreamMessage({ + parseXVIZMessage({ message: xvizUpdateV2, onResult: result => { t.equal(result.type, 'TIMESLICE', 'XVIZ message properly parsed on worker'); diff --git a/test/modules/parser/parsers/serialize.spec.js b/test/modules/parser/parsers/serialize.spec.js index 7a0d2db06..2866800c9 100644 --- a/test/modules/parser/parsers/serialize.spec.js +++ b/test/modules/parser/parsers/serialize.spec.js @@ -14,10 +14,10 @@ import tape from 'tape-catch'; import {preSerialize, postDeserialize} from '@xviz/parser/parsers/serialize'; -import {LOG_STREAM_MESSAGE} from '@xviz/parser'; +import {XVIZ_MESSAGE} from '@xviz/parser'; const MESSAGE = { - type: LOG_STREAM_MESSAGE.TIMESLICE, + type: XVIZ_MESSAGE.TIMESLICE, // TODO - need to add object stream streams: {} }; From b605a107c0fb3383de30fa478cbe8d5c01585369 Mon Sep 17 00:00:00 2001 From: Xiaoji Chen Date: Tue, 21 May 2019 18:09:50 -0700 Subject: [PATCH 2/2] more renaming --- modules/parser/src/constants.js | 2 +- modules/parser/src/index.js | 4 +- .../src/parsers/parse-timeslice-data-v1.js | 6 +- .../src/parsers/parse-timeslice-data-v2.js | 12 ++-- .../src/parsers/parse-video-message-v1.js | 8 +-- .../src/parsers/parse-xviz-message-sync.js | 10 ++-- modules/parser/src/parsers/serialize.js | 4 +- .../parser/src/workers/stream-data-worker.js | 6 +- .../parsers/parse-xviz-message-sync.spec.js | 56 +++++++++---------- test/modules/parser/parsers/serialize.spec.js | 4 +- 10 files changed, 56 insertions(+), 56 deletions(-) diff --git a/modules/parser/src/constants.js b/modules/parser/src/constants.js index 13c7f0435..d968c74c7 100644 --- a/modules/parser/src/constants.js +++ b/modules/parser/src/constants.js @@ -13,7 +13,7 @@ // limitations under the License. /* eslint-disable camelcase */ -export const XVIZ_MESSAGE = { +export const XVIZ_MESSAGE_TYPE = { METADATA: 'METADATA', TIMESLICE: 'TIMESLICE', DONE: 'DONE', diff --git a/modules/parser/src/index.js b/modules/parser/src/index.js index 94744687f..c942e507c 100644 --- a/modules/parser/src/index.js +++ b/modules/parser/src/index.js @@ -18,7 +18,7 @@ export {default as xvizStats} from './utils/stats'; // GENERIC XVIZ EXPORTS // Common constants -export {XVIZ_MESSAGE} from './constants'; +export {XVIZ_MESSAGE_TYPE} from './constants'; // Configuration export {setXVIZConfig, getXVIZConfig} from './config/xviz-config'; @@ -66,4 +66,4 @@ export { parseXVIZData as parseStreamLogData } from './parsers/parse-xviz-message-sync'; export {parseVideoMessageV1 as parseStreamVideoMessage} from './parsers/parse-video-message-v1'; -export {XVIZ_MESSAGE as LOG_STREAM_MESSAGE} from './constants'; +export {XVIZ_MESSAGE_TYPE as LOG_STREAM_MESSAGE} from './constants'; diff --git a/modules/parser/src/parsers/parse-timeslice-data-v1.js b/modules/parser/src/parsers/parse-timeslice-data-v1.js index cd5f63cb0..413bf330e 100644 --- a/modules/parser/src/parsers/parse-timeslice-data-v1.js +++ b/modules/parser/src/parsers/parse-timeslice-data-v1.js @@ -14,7 +14,7 @@ // Extracts a TIMESLICE message v1 import {getXVIZConfig} from '../config/xviz-config'; -import {XVIZ_MESSAGE} from '../constants'; +import {XVIZ_MESSAGE_TYPE} from '../constants'; import {parseStreamFutures, parseStreamPrimitive, parseStreamVariable} from './parse-xviz-stream'; export default function parseTimesliceData(data, convertPrimitive) { @@ -32,13 +32,13 @@ export default function parseTimesliceData(data, convertPrimitive) { if (!timestamp) { // Incomplete stream message, just tag it accordingly so client can ignore it - return {type: XVIZ_MESSAGE.INCOMPLETE}; + return {type: XVIZ_MESSAGE_TYPE.INCOMPLETE}; } const newStreams = {}; const result = { ...otherInfo, - type: XVIZ_MESSAGE.TIMESLICE, + type: XVIZ_MESSAGE_TYPE.TIMESLICE, streams: newStreams, timestamp }; diff --git a/modules/parser/src/parsers/parse-timeslice-data-v2.js b/modules/parser/src/parsers/parse-timeslice-data-v2.js index c0423b0d5..79b5f8b06 100644 --- a/modules/parser/src/parsers/parse-timeslice-data-v2.js +++ b/modules/parser/src/parsers/parse-timeslice-data-v2.js @@ -13,7 +13,7 @@ // limitations under the License. // Extracts a TIMESLICE message v2 -import {XVIZ_MESSAGE, STATE_UPDATE_TYPE} from '../constants'; +import {XVIZ_MESSAGE_TYPE, STATE_UPDATE_TYPE} from '../constants'; import {getXVIZConfig} from '../config/xviz-config'; import {parseXVIZPose} from './parse-xviz-pose'; import { @@ -33,16 +33,16 @@ export default function parseStreamSet(data, convertPrimitive) { if (!updateType) { log.error(`update_type of "${update_type}" is not supported.`)(); - return {type: XVIZ_MESSAGE.INCOMPLETE, message: 'Unsupported update type'}; + return {type: XVIZ_MESSAGE_TYPE.INCOMPLETE, message: 'Unsupported update type'}; } if (!updates) { - return {type: XVIZ_MESSAGE.INCOMPLETE, message: 'Missing required "updates" property'}; + return {type: XVIZ_MESSAGE_TYPE.INCOMPLETE, message: 'Missing required "updates" property'}; } if (updates && updates.length === 0) { return { - type: XVIZ_MESSAGE.INCOMPLETE, + type: XVIZ_MESSAGE_TYPE.INCOMPLETE, message: 'Property "updates" has length of 0, no data?' }; } @@ -66,12 +66,12 @@ export default function parseStreamSet(data, convertPrimitive) { if (!timestamp) { // Incomplete stream message, just tag it accordingly so client can ignore it - return {type: XVIZ_MESSAGE.INCOMPLETE, message: 'Missing timestamp in "updates"'}; + return {type: XVIZ_MESSAGE_TYPE.INCOMPLETE, message: 'Missing timestamp in "updates"'}; } const newStreams = {}; const result = { - type: XVIZ_MESSAGE.TIMESLICE, + type: XVIZ_MESSAGE_TYPE.TIMESLICE, updateType, streams: newStreams, timestamp diff --git a/modules/parser/src/parsers/parse-video-message-v1.js b/modules/parser/src/parsers/parse-video-message-v1.js index b967cc867..4da65ec3f 100644 --- a/modules/parser/src/parsers/parse-video-message-v1.js +++ b/modules/parser/src/parsers/parse-video-message-v1.js @@ -19,7 +19,7 @@ * `data` refers to pre-processed data objects (blob, arraybuffer, JSON object) */ /* global Blob */ -import {XVIZ_MESSAGE} from '../constants'; +import {XVIZ_MESSAGE_TYPE} from '../constants'; import {TextDecoder} from '../utils/text-encoding'; import {blobToArrayBuffer} from '../utils/binary'; @@ -57,13 +57,13 @@ export function parseStreamVideoData(data) { return parseVideoMetadata(data); } // Unknown message - return {type: XVIZ_MESSAGE.ERROR, message: 'Unknown stream data type', data}; + return {type: XVIZ_MESSAGE_TYPE.ERROR, message: 'Unknown stream data type', data}; } // Extract metadata from stream message function parseVideoMetadata(data) { const result = parseLogMetadata(data); - result.type = XVIZ_MESSAGE.VIDEO_METADATA; + result.type = XVIZ_MESSAGE_TYPE.VIDEO_METADATA; return result; } @@ -74,7 +74,7 @@ export function parseVideoFrame(arrayBuffer) { const view = new DataView(arrayBuffer); // Read off version - const result = {type: XVIZ_MESSAGE.VIDEO_FRAME}; + const result = {type: XVIZ_MESSAGE_TYPE.VIDEO_FRAME}; const littleEndian = true; const utf8Decoder = new TextDecoder('utf-8'); diff --git a/modules/parser/src/parsers/parse-xviz-message-sync.js b/modules/parser/src/parsers/parse-xviz-message-sync.js index e97adfeca..04e413c80 100644 --- a/modules/parser/src/parsers/parse-xviz-message-sync.js +++ b/modules/parser/src/parsers/parse-xviz-message-sync.js @@ -19,7 +19,7 @@ * `data` refers to pre-processed data objects (blob, arraybuffer, JSON object) */ /* global Blob, Uint8Array */ -import {XVIZ_MESSAGE} from '../constants'; +import {XVIZ_MESSAGE_TYPE} from '../constants'; import { parseBinaryXVIZ, isBinaryXVIZ, @@ -282,16 +282,16 @@ export function parseXVIZData(data, opts = {}) { return { ...parseLogMetadata(data), // ensure application sees the metadata type set to the uppercase version - type: XVIZ_MESSAGE.METADATA + type: XVIZ_MESSAGE_TYPE.METADATA }; case 'transform_log_done': - return {...data, type: XVIZ_MESSAGE.DONE}; + return {...data, type: XVIZ_MESSAGE_TYPE.DONE}; case 'error': - return {...data, message: 'Stream server error', type: XVIZ_MESSAGE.ERROR}; + return {...data, message: 'Stream server error', type: XVIZ_MESSAGE_TYPE.ERROR}; // v1 types case 'done': - return {...data, type: XVIZ_MESSAGE.DONE}; + return {...data, type: XVIZ_MESSAGE_TYPE.DONE}; default: // TODO(twojtasz): XVIZ should be tagging this with a type return parseTimesliceData(data, opts.convertPrimitive); diff --git a/modules/parser/src/parsers/serialize.js b/modules/parser/src/parsers/serialize.js index c1330e239..961c1e2c6 100644 --- a/modules/parser/src/parsers/serialize.js +++ b/modules/parser/src/parsers/serialize.js @@ -15,7 +15,7 @@ /** * Convert stream messages for safe transfer between threads */ -import {XVIZ_MESSAGE} from '../constants'; +import {XVIZ_MESSAGE_TYPE} from '../constants'; import {getXVIZConfig} from '../config/xviz-config'; import XVIZObject from '../objects/xviz-object'; @@ -41,7 +41,7 @@ function observeObjects(objects, timestamp) { * @params message {object} - received dehydrated message from other threads */ export function postDeserialize(message) { - if (message.type !== XVIZ_MESSAGE.TIMESLICE) { + if (message.type !== XVIZ_MESSAGE_TYPE.TIMESLICE) { return message; } diff --git a/modules/parser/src/workers/stream-data-worker.js b/modules/parser/src/workers/stream-data-worker.js index c7177c203..07bc4744e 100644 --- a/modules/parser/src/workers/stream-data-worker.js +++ b/modules/parser/src/workers/stream-data-worker.js @@ -16,7 +16,7 @@ import {setXVIZConfig} from '../config/xviz-config'; import {parseXVIZMessageSync} from '../parsers/parse-xviz-message-sync'; import {preSerialize} from '../parsers/serialize'; import {getTransferList} from '../utils/worker-utils'; -import {XVIZ_MESSAGE} from '../constants'; +import {XVIZ_MESSAGE_TYPE} from '../constants'; export default config => self => { setXVIZConfig(config); @@ -25,7 +25,7 @@ export default config => self => { const transfers = new Set(); switch (message.type) { - case XVIZ_MESSAGE.TIMESLICE: + case XVIZ_MESSAGE_TYPE.TIMESLICE: for (const streamName in message.streams) { const stream = message.streams[streamName]; getTransferList(stream.pointCloud, true, transfers); @@ -36,7 +36,7 @@ export default config => self => { } break; - case XVIZ_MESSAGE.VIDEO_FRAME: + case XVIZ_MESSAGE_TYPE.VIDEO_FRAME: // v1 video stream getTransferList(message.imageData, false, transfers); break; diff --git a/test/modules/parser/parsers/parse-xviz-message-sync.spec.js b/test/modules/parser/parsers/parse-xviz-message-sync.spec.js index b7545d41a..5eccf1dc7 100644 --- a/test/modules/parser/parsers/parse-xviz-message-sync.spec.js +++ b/test/modules/parser/parsers/parse-xviz-message-sync.spec.js @@ -22,7 +22,7 @@ import { getDataFormat, unpackEnvelope, parseXVIZData, - XVIZ_MESSAGE + XVIZ_MESSAGE_TYPE } from '@xviz/parser'; import {XVIZValidator} from '@xviz/schema'; @@ -174,7 +174,7 @@ tape('parseXVIZData metadata', t => { const metaMessage = parseXVIZData(TestMetadataMessageV2, {v2Type: 'metadata'}); - t.equals(metaMessage.type, XVIZ_MESSAGE.METADATA, 'Metadata type set'); + t.equals(metaMessage.type, XVIZ_MESSAGE_TYPE.METADATA, 'Metadata type set'); t.equals( getXVIZConfig().currentMajorVersion, 2, @@ -201,7 +201,7 @@ tape('parseXVIZData metadata v1', t => { const metaMessage = parseXVIZData(TestMetadataMessageV1); - t.equals(metaMessage.type, XVIZ_MESSAGE.METADATA, 'Metadata type set'); + t.equals(metaMessage.type, XVIZ_MESSAGE_TYPE.METADATA, 'Metadata type set'); t.equals( getXVIZConfig().currentMajorVersion, 1, @@ -263,7 +263,7 @@ tape('parseXVIZData metadata with full log time only', t => { const metaMessage = parseXVIZData(metadataWithLogStartEnd, {v2Type: 'metadata'}); - t.equals(metaMessage.type, XVIZ_MESSAGE.METADATA, 'Metadata type set'); + t.equals(metaMessage.type, XVIZ_MESSAGE_TYPE.METADATA, 'Metadata type set'); t.equals( getXVIZConfig().currentMajorVersion, 2, @@ -300,7 +300,7 @@ tape('parseXVIZData validate result when missing updates', t => { {v2Type: 'state_update'} ); - t.equals(metaMessage.type, XVIZ_MESSAGE.INCOMPLETE, 'Type after parse set to error'); + t.equals(metaMessage.type, XVIZ_MESSAGE_TYPE.INCOMPLETE, 'Type after parse set to error'); t.ok(/Missing required/.test(metaMessage.message), 'Message details on what is missing'); t.end(); @@ -318,7 +318,7 @@ tape('parseXVIZData validate result when updates is empty', t => { {v2Type: 'state_update'} ); - t.equals(metaMessage.type, XVIZ_MESSAGE.INCOMPLETE, 'Type after parse set to error'); + t.equals(metaMessage.type, XVIZ_MESSAGE_TYPE.INCOMPLETE, 'Type after parse set to error'); t.ok(/"updates" has length of 0/.test(metaMessage.message), 'Message details length is 0'); t.end(); @@ -336,7 +336,7 @@ tape('parseXVIZData validate result when missing timestamp in updates', t => { {v2Type: 'state_update'} ); - t.equals(metaMessage.type, XVIZ_MESSAGE.INCOMPLETE, 'Type after parse set to error'); + t.equals(metaMessage.type, XVIZ_MESSAGE_TYPE.INCOMPLETE, 'Type after parse set to error'); t.ok( /Missing timestamp in "updates"/.test(metaMessage.message), 'Message details missing timestamp' @@ -350,7 +350,7 @@ tape('parseXVIZData error', t => { setXVIZConfig({currentMajorVersion: 2}); const metaMessage = parseXVIZData({message: 'my message'}, {v2Type: 'error'}); - t.equals(metaMessage.type, XVIZ_MESSAGE.ERROR, 'Metadata type set to error'); + t.equals(metaMessage.type, XVIZ_MESSAGE_TYPE.ERROR, 'Metadata type set to error'); t.end(); }); @@ -367,7 +367,7 @@ tape('parseXVIZData timeslice INCOMPLETE', t => { }, {v2Type: 'state_update'} ); - t.equals(metaMessage.type, XVIZ_MESSAGE.TIMESLICE, 'Missing timestamp is ok'); + t.equals(metaMessage.type, XVIZ_MESSAGE_TYPE.TIMESLICE, 'Missing timestamp is ok'); metaMessage = parseXVIZData( { @@ -376,7 +376,7 @@ tape('parseXVIZData timeslice INCOMPLETE', t => { }, {v2Type: 'state_update'} ); - t.equals(metaMessage.type, XVIZ_MESSAGE.INCOMPLETE, 'Missing updates incomplete'); + t.equals(metaMessage.type, XVIZ_MESSAGE_TYPE.INCOMPLETE, 'Missing updates incomplete'); metaMessage = parseXVIZData( { @@ -393,7 +393,7 @@ tape('parseXVIZData timeslice INCOMPLETE', t => { }, {v2Type: 'state_update'} ); - t.equals(metaMessage.type, XVIZ_MESSAGE.INCOMPLETE, 'Missing updates is incomplete'); + t.equals(metaMessage.type, XVIZ_MESSAGE_TYPE.INCOMPLETE, 'Missing updates is incomplete'); metaMessage = parseXVIZData( { @@ -406,7 +406,7 @@ tape('parseXVIZData timeslice INCOMPLETE', t => { }, {v2Type: 'state_update'} ); - t.equals(metaMessage.type, XVIZ_MESSAGE.INCOMPLETE, 'Missing timestamp is incomplete'); + t.equals(metaMessage.type, XVIZ_MESSAGE_TYPE.INCOMPLETE, 'Missing timestamp is incomplete'); t.end(); }); @@ -417,7 +417,7 @@ tape('parseXVIZData timeslice', t => { // NOTE: no explicit type for this message yet. let result = parseXVIZData({...TestTimesliceMessageV2}, {v2Type: 'state_update'}); - t.equals(result.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + t.equals(result.type, XVIZ_MESSAGE_TYPE.TIMESLICE, 'Message type set for timeslice'); t.equal(result.updateType, 'COMPLETE', 'XVIZ update type is parsed'); t.equals( result.timestamp, @@ -430,7 +430,7 @@ tape('parseXVIZData timeslice', t => { {...TestTimesliceMessageV2, update_type: 'incremental'}, {v2Type: 'state_update'} ); - t.equals(result.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + t.equals(result.type, XVIZ_MESSAGE_TYPE.TIMESLICE, 'Message type set for timeslice'); t.equal(result.updateType, 'INCREMENTAL', 'XVIZ update type is parsed'); // Deprecated 'snapshot' update type @@ -438,14 +438,14 @@ tape('parseXVIZData timeslice', t => { {...TestTimesliceMessageV2, update_type: 'snapshot'}, {v2Type: 'state_update'} ); - t.equals(result.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + t.equals(result.type, XVIZ_MESSAGE_TYPE.TIMESLICE, 'Message type set for timeslice'); t.equal(result.updateType, 'INCREMENTAL', 'XVIZ update type is parsed'); // Unknown update type result = parseXVIZData({...TestTimesliceMessageV2, update_type: ''}, {v2Type: 'state_update'}); t.equals( result.type, - XVIZ_MESSAGE.INCOMPLETE, + XVIZ_MESSAGE_TYPE.INCOMPLETE, 'Should not parse timeslice of unsupported update type' ); @@ -461,7 +461,7 @@ tape('parseXVIZData timeslice without parsing metadata (v1)', t => { // NOTE: no explicit type for this message yet. const metaMessage = parseXVIZData({...TestTimesliceMessageV1}); - t.equals(metaMessage.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + t.equals(metaMessage.type, XVIZ_MESSAGE_TYPE.TIMESLICE, 'Message type set for timeslice'); t.equals( metaMessage.timestamp, TestTimesliceMessageV1.vehicle_pose.time, @@ -512,7 +512,7 @@ tape('parseXVIZData pointCloud timeslice', t => { // NOTE: no explicit type for this message yet. const slice = parseXVIZData({...PointCloudTestTimesliceMessage}); - t.equals(slice.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + t.equals(slice.type, XVIZ_MESSAGE_TYPE.TIMESLICE, 'Message type set for timeslice'); const pointCloud = slice.streams['/test/stream'].pointCloud; const feature = slice.streams['/test/stream'].features[0]; @@ -547,7 +547,7 @@ tape('parseXVIZData polyline flat', t => { // NOTE: no explicit type for this message yet. const slice = parseXVIZData({...TestTimeslice}); - t.equals(slice.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + t.equals(slice.type, XVIZ_MESSAGE_TYPE.TIMESLICE, 'Message type set for timeslice'); const features = slice.streams['/test/stream'].features; t.equals(features.length, 1, 'has has object'); @@ -581,7 +581,7 @@ tape('parseXVIZData polygon flat', t => { // NOTE: no explicit type for this message yet. const slice = parseXVIZData({...TestTimeslice}); - t.equals(slice.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + t.equals(slice.type, XVIZ_MESSAGE_TYPE.TIMESLICE, 'Message type set for timeslice'); const features = slice.streams['/test/stream'].features; t.equals(features.length, 1, 'has has object'); @@ -604,7 +604,7 @@ tape('parseXVIZData flat JSON pointCloud', t => { // NOTE: no explicit type for this message yet. let slice = parseXVIZData({...PointCloudTestTimesliceMessage}); - t.equals(slice.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + t.equals(slice.type, XVIZ_MESSAGE_TYPE.TIMESLICE, 'Message type set for timeslice'); let pointCloud = slice.streams['/test/stream'].pointCloud; const feature = slice.streams['/test/stream'].features[0]; @@ -647,7 +647,7 @@ tape('parseXVIZData pointCloud timeslice TypedArray', t => { // NOTE: no explicit type for this message yet. let slice = parseXVIZData({...PointCloudTestTimesliceMessage}); - t.equals(slice.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + t.equals(slice.type, XVIZ_MESSAGE_TYPE.TIMESLICE, 'Message type set for timeslice'); t.ok(slice.streams['/test/stream'].pointCloud, 'has a point cloud'); let pointCloud = slice.streams['/test/stream'].pointCloud; @@ -687,7 +687,7 @@ tape('parseXVIZData pointCloud timeslice', t => { // NOTE: no explicit type for this message yet. const slice = parseXVIZData({...PointCloudTestTimesliceMessage}); - t.equals(slice.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + t.equals(slice.type, XVIZ_MESSAGE_TYPE.TIMESLICE, 'Message type set for timeslice'); const pointCloud = slice.streams['/test/stream'].pointCloud; const feature = slice.streams['/test/stream'].features[0]; @@ -740,7 +740,7 @@ tape('parseXVIZData variable timeslice', t => { // NOTE: no explicit type for this message yet. const slice = parseXVIZData({...VariableTestTimesliceMessage}); - t.equals(slice.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + t.equals(slice.type, XVIZ_MESSAGE_TYPE.TIMESLICE, 'Message type set for timeslice'); t.ok(slice.streams['/foo'].variable, 'has variable'); const variable = slice.streams['/foo'].variable; @@ -756,7 +756,7 @@ tape('parseXVIZData futures timeslice v1', t => { setXVIZConfig({currentMajorVersion: 1}); const slice = parseXVIZData({...TestFuturesMessageV1}); - t.equals(slice.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + t.equals(slice.type, XVIZ_MESSAGE_TYPE.TIMESLICE, 'Message type set for timeslice'); t.ok(slice.streams['/test/polygon'].lookAheads, 'has lookAheads field'); const lookAheads = slice.streams['/test/polygon'].lookAheads; @@ -826,7 +826,7 @@ tape('parseXVIZMessageSync', t => { ); t.equals(undefined, error, 'No errors received while parsing'); - t.equals(result.type, XVIZ_MESSAGE.TIMESLICE, 'Message type set for timeslice'); + t.equals(result.type, XVIZ_MESSAGE_TYPE.TIMESLICE, 'Message type set for timeslice'); t.equals( result.timestamp, TestTimesliceMessageV2.updates[0].poses['/vehicle_pose'].timestamp, @@ -862,7 +862,7 @@ tape('parseXVIZMessageSync#enveloped#metadata', t => { t.equals(undefined, error, 'No errors received while parsing'); t.notEquals(undefined, result, 'Update units'); - t.equals(result.type, XVIZ_MESSAGE.METADATA, 'Message type set for metadata'); + t.equals(result.type, XVIZ_MESSAGE_TYPE.METADATA, 'Message type set for metadata'); t.equals(result.version, enveloped.data.version); t.end(); @@ -893,7 +893,7 @@ tape('parseXVIZMessageSync#enveloped#transform_log_done', t => { t.equals(undefined, error, 'No errors received while parsing'); t.notEquals(undefined, result, 'Update units'); - t.equals(result.type, XVIZ_MESSAGE.DONE, 'Message type set to done'); + t.equals(result.type, XVIZ_MESSAGE_TYPE.DONE, 'Message type set to done'); t.equals(result.id, enveloped.data.id); t.end(); diff --git a/test/modules/parser/parsers/serialize.spec.js b/test/modules/parser/parsers/serialize.spec.js index 2866800c9..a28878f9b 100644 --- a/test/modules/parser/parsers/serialize.spec.js +++ b/test/modules/parser/parsers/serialize.spec.js @@ -14,10 +14,10 @@ import tape from 'tape-catch'; import {preSerialize, postDeserialize} from '@xviz/parser/parsers/serialize'; -import {XVIZ_MESSAGE} from '@xviz/parser'; +import {XVIZ_MESSAGE_TYPE} from '@xviz/parser'; const MESSAGE = { - type: XVIZ_MESSAGE.TIMESLICE, + type: XVIZ_MESSAGE_TYPE.TIMESLICE, // TODO - need to add object stream streams: {} };