@dcl/ecs 1.0.0-20220511175240.commit-459bc31 → 1.0.0-20220525093820.commit-c20b8cd

package/dist/systems/crdt/index.js

@@ -11,111 +11,145 @@ const componentOperation_1 = require("../../serialization/crdt/componentOperatio
 const wireMessage_1 = __importDefault(require("../../serialization/wireMessage"));
 const transport_1 = require("./transport");
 const utils_1 = __importDefault(require("./utils"));
-/**
- * TODO:
- * What about when we remove the SyncComponent ? Should we notify all the clients? How ?
- * Where do we create the transport and process the received messages?
- */
 function crdtSceneSystem(engine) {
+    // CRDT Client
     const crdtClient = (0, crdt_1.crdtProtocol)();
-    const messages = [];
+    // Messages that we received at transport.onMessage waiting to be processed
+    const receivedMessages = [];
+    // Messages already processed by the engine but that we need to broadcast to other transports.
+    const transportMessages = [];
+    // Map of entities already processed at least once
     const crdtEntities = new Map();
-    const transport = (0, transport_1.createTransport)();
-    transport.onmessage = parseChunkMessage;
-    function parseChunkMessage(chunkMessage) {
-        if (!chunkMessage.data?.length)
-            return;
-        const buffer = (0, ByteBuffer_1.createByteBuffer)({
-            reading: { buffer: chunkMessage.data, currentOffset: 0 }
-        });
-        while (wireMessage_1.default.validate(buffer)) {
-            const message = componentOperation_1.PutComponentOperation.read(buffer);
-            const { entityId, componentId, data, timestamp } = message;
-            messages.push({
-                key: utils_1.default.getKey(entityId, componentId),
-                data,
-                timestamp
+    const transports = (0, transport_1.getTransports)();
+    transports.forEach((transport) => (transport.onmessage = parseChunkMessage(transport.type)));
+    /**
+     *
+     * @param transportType tranport id to identiy messages
+     * @returns a function to process received messages
+     */
+    function parseChunkMessage(transportType) {
+        /**
+         * Receives a chunk of binary messages and stores all the valid
+         * Component Operation Messages at messages queue
+         * @param chunkMessage A chunk of binary messages
+         */
+        return function parseChunkMessage(chunkMessage) {
+            if (!chunkMessage.data?.length)
+                return;
+            const buffer = (0, ByteBuffer_1.createByteBuffer)({
+                reading: { buffer: chunkMessage.data, currentOffset: 0 }
             });
-        }
+            while (wireMessage_1.default.validate(buffer)) {
+                const offset = buffer.currentReadOffset();
+                const message = componentOperation_1.PutComponentOperation.read(buffer);
+                const { entity, componentId, data, timestamp } = message;
+                receivedMessages.push({
+                    entity,
+                    componentId,
+                    data,
+                    timestamp,
+                    transportType,
+                    messageBuffer: buffer
+                        .buffer()
+                        .subarray(offset, buffer.currentReadOffset())
+                });
+            }
+        };
     }
-    function getMessages() {
-        const messagesToProcess = Array.from(messages);
-        messages.length = 0;
+    /**
+     * Return and clear the messaes queue
+     * @returns messages recieved by the transport to process on the next tick
+     */
+    function getMessages(value) {
+        const messagesToProcess = Array.from(value);
+        value.length = 0;
         return messagesToProcess;
     }
     /**
-     * This messages will be processed on every tick.
+     * This fn will be called on every tick.
+     * Process all the messages queue received by the transport
      */
-    function processMessages() {
-        const buffer = (0, ByteBuffer_1.createByteBuffer)();
-        const messagesToProcess = getMessages();
-        for (const message of messagesToProcess) {
-            const [entity, componentId] = utils_1.default.parseKey(message.key);
-            const msg = crdtClient.processMessage(message);
-            const component = engine.getComponent(componentId);
-            // CRDT outdated message. Resend this message through the wire
-            // TODO: perf transactor
-            if (msg !== message) {
-                componentOperation_1.PutComponentOperation.write(entity, msg.timestamp, component, buffer);
+    function receiveMessages() {
+        const messagesToProcess = getMessages(receivedMessages);
+        for (const transport of transports) {
+            const buffer = (0, ByteBuffer_1.createByteBuffer)();
+            for (const message of messagesToProcess) {
+                const { data, timestamp, componentId, entity } = message;
+                const crdtMessage = {
+                    key: utils_1.default.getKey(entity, componentId),
+                    data: data,
+                    timestamp: timestamp
+                };
+                const component = engine.getComponent(componentId);
+                const currentMessage = crdtClient.processMessage(crdtMessage);
+                // CRDT outdated message. Resend this message through the wire
+                // TODO: perf transactor
+                if (crdtMessage !== currentMessage) {
+                    // CRDT outdated message. Resend this message through the wire
+                    componentOperation_1.PutComponentOperation.write(entity, currentMessage.timestamp, component, buffer);
+                }
+                else {
+                    const opts = { reading: { buffer: message.data, currentOffset: 0 } };
+                    const bb = (0, ByteBuffer_1.createByteBuffer)(opts);
+                    // Update engine component
+                    component.upsertFromBinary(message.entity, bb);
+                    component.clearDirty();
+                    // Add message to transport queue to be processed by others transports
+                    transportMessages.push(message);
+                }
             }
-            else {
-                const bb = (0, ByteBuffer_1.createByteBuffer)({
-                    reading: {
-                        buffer: message.data,
-                        currentOffset: 0
-                    }
-                });
-                component.upsertFromBinary(entity, bb);
-                component.clearDirty();
+            if (buffer.size()) {
+                transport.send(buffer.toBinary());
             }
         }
-        if (buffer.size()) {
-            transport.send(buffer.toBinary());
-        }
     }
-    function send(dirtyMap) {
+    /**
+     * Iterates the dirty map and generates crdt messages to be send
+     * @param dirtyMap a map of { entities: [componentId] }
+     */
+    function createMessages(dirtyMap) {
+        // CRDT Messages will be the merge between the recieved transport messages and the new crdt messages
+        const crdtMessages = getMessages(transportMessages);
         const buffer = (0, ByteBuffer_1.createByteBuffer)();
         for (const [entity, componentsId] of dirtyMap) {
-            if (entity_utils_1.default.isStaticEntity(entity) && !crdtEntities.has(entity)) {
-                crdtEntities.set(entity, true);
-                continue;
-            }
-            crdtEntities.set(entity, true);
             for (const componentId of componentsId) {
                 const component = engine.getComponent(componentId);
-                const key = utils_1.default.getKey(entity, componentId);
-                const event = crdtClient.createEvent(key, component.toBinary(entity).toBinary());
-                componentOperation_1.PutComponentOperation.write(entity, event.timestamp, component, buffer);
+                const event = crdtClient.createEvent(utils_1.default.getKey(entity, componentId), component.toBinary(entity).toBinary());
+                const offset = buffer.currentWriteOffset();
+                // There is no need to create messages for the static entities the first time they are created
+                // They are part of the scene loading. Send only updates.
+                if (!entity_utils_1.default.isStaticEntity(entity) || crdtEntities.has(entity)) {
+                    componentOperation_1.PutComponentOperation.write(entity, event.timestamp, component, buffer);
+                    crdtMessages.push({
+                        componentId,
+                        entity,
+                        timestamp: event.timestamp,
+                        messageBuffer: buffer
+                            .buffer()
+                            .subarray(offset, buffer.currentWriteOffset())
+                    });
+                }
             }
+            crdtEntities.set(entity, true);
         }
-        if (buffer.size()) {
-            transport.send(buffer.toBinary());
+        // Send messages to transports
+        const transportBuffer = (0, ByteBuffer_1.createByteBuffer)();
+        for (const transport of transports) {
+            transportBuffer.resetBuffer();
+            for (const message of crdtMessages) {
+                if (transport.filter(message)) {
+                    transportBuffer.writeBuffer(message.messageBuffer, false);
+                }
+            }
+            if (transportBuffer.size()) {
+                transport.send(transportBuffer.toBinary());
+            }
         }
     }
     return {
-        send,
-        processMessages
+        createMessages,
+        receiveMessages
     };
 }
 exports.crdtSceneSystem = crdtSceneSystem;
-// const { Sync } = engine.baseComponents
-// for (const [entity] of engine.groupOf(Dirty)) {
-//   const components = engine.getEntityComponents(entity)
-//   for (const p of )
-// }
-// for (const [entity] of engine.mutableGroupOf(Sync)) {
-//   for (const component of engine.getEntityComponents(entity)) {
-//     // If its a new entity, we should send all the components.
-//     // Otherwise, we send only the updates (dirty)
-//     if (!crdtEntities.has(entity) || component.isDirty(entity)) {
-//       const event = crdtClient.createEvent(
-//         getKey(entity, component._id),
-//         component.toBinary(entity)
-//       )
-//       void crdtClient.sendMessage(event)
-//       return
-//     }
-//   }
-//   crdtEntities.add(entity)
-// }
 //# sourceMappingURL=index.js.map

package/dist/systems/crdt/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/systems/crdt/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/systems/crdt/index.ts"],"names":[],"mappings":"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"}

package/dist/systems/crdt/transport.d.ts

@@ -1,2 +1,9 @@
-export declare function createTransport(_type?: 'ws'): WebSocket;
+import { TransportMessage } from './types';
+export declare type Transport = {
+    type: string;
+    send(message: Uint8Array): void;
+    onmessage?(message: MessageEvent<Uint8Array>): void;
+    filter(message: TransportMessage): boolean;
+};
+export declare function getTransports(): Transport[];
 //# sourceMappingURL=transport.d.ts.map

package/dist/systems/crdt/transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/systems/crdt/transport.ts"],"names":[],"mappings":"AAAA,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,IAAI,aAE3C"}
+{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/systems/crdt/transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE1C,oBAAY,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CAAA;IAC/B,SAAS,CAAC,CAAC,OAAO,EAAE,YAAY,CAAC,UAAU,CAAC,GAAG,IAAI,CAAA;IACnD,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAA;CAC3C,CAAA;AAuBD,wBAAgB,aAAa,gBAE5B"}

package/dist/systems/crdt/transport.js

@@ -1,8 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTransport = void 0;
-function createTransport(_type) {
-    return new WebSocket('ws://localhost:8000');
+exports.getTransports = void 0;
+function networkTransport() {
+    // const rpc = new RpcTransport()
+    const rpc = {
+        send: () => { }
+    };
+    const type = 'network-transport';
+    return {
+        ...rpc,
+        type,
+        filter(message) {
+            // Echo message, ignore them
+            if (message.transportType === type) {
+                return false;
+            }
+            return !!message; // validComponents.includes(componentId)
+        }
+    };
 }
-exports.createTransport = createTransport;
+function getTransports() {
+    return [networkTransport()];
+}
+exports.getTransports = getTransports;
 //# sourceMappingURL=transport.js.map

package/dist/systems/crdt/transport.js.map

@@ -1 +1 @@
-{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/systems/crdt/transport.ts"],"names":[],"mappings":";;;AAAA,SAAgB,eAAe,CAAC,KAAY;IAC1C,OAAO,IAAI,SAAS,CAAC,qBAAqB,CAAC,CAAA;AAC7C,CAAC;AAFD,0CAEC"}
+{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/systems/crdt/transport.ts"],"names":[],"mappings":";;;AASA,SAAS,gBAAgB;IACvB,iCAAiC;IACjC,MAAM,GAAG,GAAG;QACV,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;KACf,CAAA;IAED,MAAM,IAAI,GAAG,mBAAmB,CAAA;IAChC,OAAO;QACL,GAAG,GAAG;QACN,IAAI;QACJ,MAAM,CAAC,OAAyB;YAC9B,4BAA4B;YAC5B,IAAI,OAAO,CAAC,aAAa,KAAK,IAAI,EAAE;gBAClC,OAAO,KAAK,CAAA;aACb;YAED,OAAO,CAAC,CAAC,OAAO,CAAA,CAAC,wCAAwC;QAC3D,CAAC;KACF,CAAA;AACH,CAAC;AAED,SAAgB,aAAa;IAC3B,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAA;AAC7B,CAAC;AAFD,sCAEC"}

package/dist/systems/crdt/types.d.ts

@@ -0,0 +1,11 @@
+import { Entity } from '../../engine/entity';
+export declare type ReceiveMessage = {
+    entity: Entity;
+    componentId: number;
+    timestamp: number;
+    transportType?: string;
+    data: Uint8Array;
+    messageBuffer: Uint8Array;
+};
+export declare type TransportMessage = Omit<ReceiveMessage, 'data'>;
+//# sourceMappingURL=types.d.ts.map

package/dist/systems/crdt/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/systems/crdt/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,oBAAY,cAAc,GAAG;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,IAAI,EAAE,UAAU,CAAA;IAChB,aAAa,EAAE,UAAU,CAAA;CAC1B,CAAA;AAED,oBAAY,gBAAgB,GAAG,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA"}

package/dist/systems/crdt/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/systems/crdt/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/systems/crdt/types.ts"],"names":[],"mappings":""}

package/dist/systems/crdt/utils.d.ts

@@ -2,12 +2,10 @@ import { ComponentDefinition } from '../../engine/component';
 import { Entity } from '../../engine/entity';
 export declare namespace CrdtUtils {
     type ComponentID = ComponentDefinition['_id'];
-    function parseKey(key: string): [Entity, ComponentID];
     function getKey(entity: Entity, componentId: ComponentID): string;
     enum SynchronizedEntityType {
-        ALL = 0,
-        NETWORKED = 1,
-        RENDERER = 2
+        NETWORKED = 0,
+        RENDERER = 1
     }
 }
 export default CrdtUtils;

package/dist/systems/crdt/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/systems/crdt/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,yBAAiB,SAAS,CAAC;IACzB,KAAY,WAAW,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAA;IAEpD,SAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAM3D;IAED,SAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,GAAG,MAAM,CAEvE;IAED,KAAY,sBAAsB;QAEhC,GAAG,IAAA;QAEH,SAAS,IAAA;QAET,QAAQ,IAAA;KACT;CACF;AACD,eAAe,SAAS,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/systems/crdt/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,yBAAiB,SAAS,CAAC;IACzB,KAAY,WAAW,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAA;IAWpD,SAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,GAAG,MAAM,CAEvE;IAED,KAAY,sBAAsB;QAEhC,SAAS,IAAA;QAET,QAAQ,IAAA;KACT;CACF;AAED,eAAe,SAAS,CAAA"}

package/dist/systems/crdt/utils.js

@@ -3,23 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrdtUtils = void 0;
 var CrdtUtils;
 (function (CrdtUtils) {
-    function parseKey(key) {
-        const [entity, componentId] = key.split('.').map(Number);
-        return [entity, componentId];
-    }
-    CrdtUtils.parseKey = parseKey;
+    // TODO: use this again
+    // export function parseKey(key: string): [Entity, ComponentID] {
+    //   const [entity, componentId] = key.split('.').map(Number) as [
+    //     Entity,
+    //     ComponentID
+    //   ]
+    //   return [entity, componentId]
+    // }
     function getKey(entity, componentId) {
         return `${entity}.${componentId}`;
     }
     CrdtUtils.getKey = getKey;
     let SynchronizedEntityType;
     (function (SynchronizedEntityType) {
-        // synchronizes all entities without filter. used for renderers
-        SynchronizedEntityType[SynchronizedEntityType["ALL"] = 0] = "ALL";
         // synchronizes entities with the NetworkSynchronized component only, used for networked games
-        SynchronizedEntityType[SynchronizedEntityType["NETWORKED"] = 1] = "NETWORKED";
+        SynchronizedEntityType[SynchronizedEntityType["NETWORKED"] = 0] = "NETWORKED";
         // synchronizes entities needed by the renderer
-        SynchronizedEntityType[SynchronizedEntityType["RENDERER"] = 2] = "RENDERER";
+        SynchronizedEntityType[SynchronizedEntityType["RENDERER"] = 1] = "RENDERER";
     })(SynchronizedEntityType = CrdtUtils.SynchronizedEntityType || (CrdtUtils.SynchronizedEntityType = {}));
 })(CrdtUtils = exports.CrdtUtils || (exports.CrdtUtils = {}));
 exports.default = CrdtUtils;

package/dist/systems/crdt/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/systems/crdt/utils.ts"],"names":[],"mappings":";;;AAIA,IAAiB,SAAS,CAuBzB;AAvBD,WAAiB,SAAS;IAGxB,SAAgB,QAAQ,CAAC,GAAW;QAClC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAGtD,CAAA;QACD,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;IAC9B,CAAC;IANe,kBAAQ,WAMvB,CAAA;IAED,SAAgB,MAAM,CAAC,MAAc,EAAE,WAAwB;QAC7D,OAAO,GAAG,MAAM,IAAI,WAAW,EAAE,CAAA;IACnC,CAAC;IAFe,gBAAM,SAErB,CAAA;IAED,IAAY,sBAOX;IAPD,WAAY,sBAAsB;QAChC,+DAA+D;QAC/D,iEAAG,CAAA;QACH,8FAA8F;QAC9F,6EAAS,CAAA;QACT,+CAA+C;QAC/C,2EAAQ,CAAA;IACV,CAAC,EAPW,sBAAsB,GAAtB,gCAAsB,KAAtB,gCAAsB,QAOjC;AACH,CAAC,EAvBgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAuBzB;AACD,kBAAe,SAAS,CAAA;AAExB,mEAAmE;AACnE,8CAA8C;AAC9C,iCAAiC;AACjC,4DAA4D;AAC5D,2FAA2F;AAC3F,2CAA2C;AAE3C,oCAAoC;AACpC,gDAAgD;AAChD,+HAA+H;AAC/H,uBAAuB;AACvB,MAAM;AACN,KAAK;AAEL,sDAAsD;AACtD,WAAW;AACX,IAAI;AAEJ,8BAA8B;AAC9B,2CAA2C;AAE3C,2CAA2C;AAC3C,gDAAgD;AAChD,MAAM;AAEN,sBAAsB;AACtB,0BAA0B;AAC1B,MAAM;AAEN,4BAA4B;AAC5B,IAAI;AAEJ,2BAA2B;AAC3B,4CAA4C;AAC5C,IAAI"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/systems/crdt/utils.ts"],"names":[],"mappings":";;;AAGA,IAAiB,SAAS,CAsBzB;AAtBD,WAAiB,SAAS;IAGxB,uBAAuB;IACvB,iEAAiE;IACjE,kEAAkE;IAClE,cAAc;IACd,kBAAkB;IAClB,MAAM;IACN,iCAAiC;IACjC,IAAI;IAEJ,SAAgB,MAAM,CAAC,MAAc,EAAE,WAAwB;QAC7D,OAAO,GAAG,MAAM,IAAI,WAAW,EAAE,CAAA;IACnC,CAAC;IAFe,gBAAM,SAErB,CAAA;IAED,IAAY,sBAKX;IALD,WAAY,sBAAsB;QAChC,8FAA8F;QAC9F,6EAAS,CAAA;QACT,+CAA+C;QAC/C,2EAAQ,CAAA;IACV,CAAC,EALW,sBAAsB,GAAtB,gCAAsB,KAAtB,gCAAsB,QAKjC;AACH,CAAC,EAtBgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAsBzB;AAED,kBAAe,SAAS,CAAA;AAExB,mEAAmE;AACnE,8CAA8C;AAC9C,iCAAiC;AACjC,4DAA4D;AAC5D,2FAA2F;AAC3F,2CAA2C;AAE3C,oCAAoC;AACpC,gDAAgD;AAChD,+HAA+H;AAC/H,uBAAuB;AACvB,MAAM;AACN,KAAK;AAEL,sDAAsD;AACtD,WAAW;AACX,IAAI;AAEJ,8BAA8B;AAC9B,2CAA2C;AAE3C,2CAA2C;AAC3C,gDAAgD;AAChD,MAAM;AAEN,sBAAsB;AACtB,0BAA0B;AAC1B,MAAM;AAEN,4BAA4B;AAC5B,IAAI;AAEJ,2BAA2B;AAC3B,4CAA4C;AAC5C,IAAI"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/ecs",
-  "version": "1.0.0-20220511175240.commit-459bc31",
+  "version": "1.0.0-20220525093820.commit-c20b8cd",
   "description": "Decentraland ECS",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -41,5 +41,5 @@
   "files": [
     "dist"
   ],
-  "commit": "459bc313d065cf48708becb60d5858d561e9b81d"
+  "commit": "c20b8cd2582224d6bc67d3b7ca86f3c00e2e9952"
 }