@dcl/ecs 7.23.4-26770223094.commit-52b9415 → 7.23.4-26955626649.commit-5d040fd

package/dist/composite/index.d.ts

@@ -6,6 +6,7 @@ import { CompositeDefinition } from './proto/gen/composite.gen';
 export type { CompositeDefinition, ComponentData, CompositeComponent, CompositeComponent_DataEntry, InstanceCompositeOptions, CompositeProvider, CompositeRootType, CompositeResource };
 export { EntityMappingMode };
 export { getCompositeRootComponent };
+export { setCompositeProvider, getCompositeProvider } from './provider-registry';
 /**
  * @public
  * @deprecated composite is not being supported so far, please do not use this feature
@@ -31,14 +32,16 @@ export declare namespace Composite {
     /** @public */
     function toBinary(composite: Composite.Definition): Uint8Array;
     /**
-     * Instance a composite and returns its root entity
-     * @param compositeData - state serialized by the CRDT protocol
-     * @param getNextAvailableEntity - function that gives unused entities
-     * @param rootEntity - (optional) suggested mapped rootEntity for the composite
+     * Instance a composite and return its root entity.
+     * @param engine - the engine that will own the new entities
+     * @param compositeData - the composite resource to instance
+     * @param compositeProvider - provider used to resolve nested composite references
+     * @param options - instancing options (`rootEntity`, `entityMapping`, `alreadyRequestedSrc`)
+     * @returns the root entity of the instanced composite
      *
      * @public
      */
-    function instance(engine: IEngine, compositeData: Composite.Resource, compositeProvider: CompositeProvider, options?: InstanceCompositeOptions): void;
+    function instance(engine: IEngine, compositeData: Composite.Resource, compositeProvider: CompositeProvider, options?: InstanceCompositeOptions): import("../engine").Entity;
     /**
      * Resolve and normalize a composite path
      * @param src - the source path

package/dist/composite/index.js

@@ -4,6 +4,7 @@ import { resolveComposite } from './path';
 import { CompositeDefinition } from './proto/gen/composite.gen';
 export { EntityMappingMode };
 export { getCompositeRootComponent };
+export { setCompositeProvider, getCompositeProvider } from './provider-registry';
 /**
  * @public
  * @deprecated composite is not being supported so far, please do not use this feature
@@ -31,15 +32,17 @@ export var Composite;
     }
     Composite.toBinary = toBinary;
     /**
-     * Instance a composite and returns its root entity
-     * @param compositeData - state serialized by the CRDT protocol
-     * @param getNextAvailableEntity - function that gives unused entities
-     * @param rootEntity - (optional) suggested mapped rootEntity for the composite
+     * Instance a composite and return its root entity.
+     * @param engine - the engine that will own the new entities
+     * @param compositeData - the composite resource to instance
+     * @param compositeProvider - provider used to resolve nested composite references
+     * @param options - instancing options (`rootEntity`, `entityMapping`, `alreadyRequestedSrc`)
+     * @returns the root entity of the instanced composite
      *
      * @public
      */
     /*#__PURE__*/ function instance(engine, compositeData, compositeProvider, options = {}) {
-        instanceComposite(engine, compositeData, compositeProvider, options);
+        return instanceComposite(engine, compositeData, compositeProvider, options);
     }
     Composite.instance = instance;
     /**

package/dist/composite/instance.d.ts

@@ -13,6 +13,11 @@ export type CompositeResource = {
  */
 export type CompositeProvider = {
     getCompositeOrNull(src: string): CompositeResource | null;
+    loadComposite?: (src: string) => Promise<CompositeResource>;
+    schemas?: Iterable<{
+        name: string;
+        jsonSchema: any;
+    }>;
 };
 /** @public */
 export declare enum EntityMappingMode {

package/dist/composite/instance.js

@@ -43,7 +43,7 @@ export function getComponentDefinition(engine, component) {
             return engine.defineComponentFromSchema(component.name, Schemas.fromJson(component.jsonSchema));
         }
         else {
-            throw new Error(`${component.name} is not defined and there is no schema to define it.`);
+            throw new Error(`Composite references undefined component "${component.name}". Ensure provider.schemas was registered pre-seal via setCompositeProvider().`);
         }
     }
     else {
@@ -84,6 +84,7 @@ export function instanceComposite(engine, compositeResource, compositeProvider,
     const compositeDirectoryPath = path.dirname(path.resolve(compositeResource.src));
     const TransformComponentNumber = componentNumberFromName('core::Transform');
     const CompositeRootComponent = getCompositeRootComponent(engine);
+    let hadNestedComposite = false;
     // Key => EntityNumber from the composite
     // Value => EntityNumber in current engine
     const mappedEntities = new Map();
@@ -99,23 +100,29 @@ export function instanceComposite(engine, compositeResource, compositeProvider,
     // If there are more composite inside this one, we instance first.
     // => This is not only a copy, we need to instance. Otherwise, we'd be missing that branches
     // => TODO: in the future, the instanciation is first, then the overides (to parameterize Composite, e.g. house with different wall colors)
-    const childrenComposite = compositeResource.composite.components.find((item) => item.name === CompositeRootComponent.componentName);
-    if (childrenComposite) {
-        for (const [childCompositeEntity, compositeRawData] of childrenComposite.data) {
-            const childComposite = getComponentValue(CompositeRootComponent, compositeRawData);
-            const childCompositePath = path.resolveComposite(childComposite.src, compositeDirectoryPath);
-            const childCompositeResource = compositeProvider.getCompositeOrNull(childCompositePath);
-            const targetEntity = getCompositeEntity(childCompositeEntity);
-            if (childCompositeResource) {
-                if (alreadyRequestedSrc.has(childCompositeResource.src) ||
-                    childCompositeResource.src === compositeResource.src) {
-                    throw new Error(`Composite ${compositeResource.src} has a recursive instanciation while try to instance ${childCompositeResource.src}. Previous instances: ${alreadyRequestedSrc.toString()}`);
+    if (CompositeRootComponent) {
+        const childrenComposite = compositeResource.composite.components.find((item) => item.name === CompositeRootComponent.componentName);
+        if (childrenComposite) {
+            for (const [childCompositeEntity, compositeRawData] of childrenComposite.data) {
+                const childComposite = getComponentValue(CompositeRootComponent, compositeRawData);
+                const childCompositePath = path.resolveComposite(childComposite.src, compositeDirectoryPath);
+                const childCompositeResource = compositeProvider.getCompositeOrNull(childCompositePath);
+                const targetEntity = getCompositeEntity(childCompositeEntity);
+                if (childCompositeResource) {
+                    if (alreadyRequestedSrc.has(childCompositeResource.src) ||
+                        childCompositeResource.src === compositeResource.src) {
+                        throw new Error(`Composite ${compositeResource.src} has a recursive instanciation while try to instance ${childCompositeResource.src}. Previous instances: ${alreadyRequestedSrc.toString()}`);
+                    }
+                    hadNestedComposite = true;
+                    instanceComposite(engine, childCompositeResource, compositeProvider, {
+                        rootEntity: targetEntity,
+                        alreadyRequestedSrc: new Set(alreadyRequestedSrc).add(childCompositeResource.src),
+                        entityMapping: entityMapping?.type === EntityMappingMode.EMM_NEXT_AVAILABLE ? entityMapping : undefined
+                    });
+                }
+                else {
+                    console.warn(`Composite "${compositeResource.src}" references missing nested composite "${childCompositePath}". Skipping; the spawned subtree will be incomplete.`);
                 }
-                instanceComposite(engine, childCompositeResource, compositeProvider, {
-                    rootEntity: targetEntity,
-                    alreadyRequestedSrc: new Set(alreadyRequestedSrc).add(childCompositeResource.src),
-                    entityMapping: entityMapping?.type === EntityMappingMode.EMM_NEXT_AVAILABLE ? entityMapping : undefined
-                });
             }
         }
     }
@@ -123,7 +130,7 @@ export function instanceComposite(engine, compositeResource, compositeProvider,
     // Then, we copy the all rest of the components (skipping the Composite ones)
     for (const component of compositeResource.composite.components) {
         // We already instanced the composite
-        if (component.name === CompositeRootComponent.componentName)
+        if (CompositeRootComponent && component.name === CompositeRootComponent.componentName)
             continue;
         // ## 3a ##
         // We find the component definition
@@ -159,13 +166,15 @@ export function instanceComposite(engine, compositeResource, compositeProvider,
             }
         }
     }
-    const composite = CompositeRootComponent.getMutableOrNull(compositeRootEntity) || CompositeRootComponent.create(compositeRootEntity);
-    for (const [entitySource, targetEntity] of mappedEntities) {
-        composite.entities.push({
-            src: entitySource,
-            dest: targetEntity
-        });
+    if (hadNestedComposite) {
+        const composite = CompositeRootComponent.getMutableOrNull(compositeRootEntity) || CompositeRootComponent.create(compositeRootEntity);
+        for (const [entitySource, targetEntity] of mappedEntities) {
+            composite.entities.push({
+                src: entitySource,
+                dest: targetEntity
+            });
+        }
+        composite.src = compositeResource.src;
     }
-    composite.src = compositeResource.src;
     return compositeRootEntity;
 }

package/dist/composite/provider-registry.d.ts

@@ -0,0 +1,15 @@
+import type { IEngine } from '../engine';
+import type { CompositeProvider } from './instance';
+/**
+ * Register the composite provider used to resolve composite files. Also registers
+ * any `provider.schemas` on the engine pre-seal so composites that reference those
+ * components can be instanced without further setup.
+ * @public
+ */
+export declare function setCompositeProvider(engine: IEngine, provider: CompositeProvider): void;
+/**
+ * Get the composite provider registered via setCompositeProvider. Returns null if
+ * no provider has been set.
+ * @public
+ */
+export declare function getCompositeProvider(): CompositeProvider | null;

package/dist/composite/provider-registry.js

@@ -0,0 +1,32 @@
+import { Schemas } from '../schemas';
+import { getCompositeRootComponent } from './components';
+let currentProvider = null;
+/**
+ * Register the composite provider used to resolve composite files. Also registers
+ * any `provider.schemas` on the engine pre-seal so composites that reference those
+ * components can be instanced without further setup.
+ * @public
+ */
+export function setCompositeProvider(engine, provider) {
+    currentProvider = provider;
+    // Define composite::root pre-seal. setCompositeProvider runs at module-load,
+    // so this guarantees the component exists before the engine seals — composites
+    // instanced at runtime (post-seal) would otherwise trip the seal when
+    // instanceComposite looks it up via getCompositeRootComponent.
+    getCompositeRootComponent(engine);
+    if (!provider.schemas)
+        return;
+    for (const { name, jsonSchema } of provider.schemas) {
+        if (engine.getComponentOrNull(name))
+            continue;
+        engine.defineComponentFromSchema(name, Schemas.fromJson(jsonSchema));
+    }
+}
+/**
+ * Get the composite provider registered via setCompositeProvider. Returns null if
+ * no provider has been set.
+ * @public
+ */
+export function getCompositeProvider() {
+    return currentProvider;
+}

package/dist/engine/index.js

@@ -236,7 +236,7 @@ export function Engine(options) {
         const deletedEntites = partialEngine.entityContainer.releaseRemovedEntities();
         await crdtSystem.sendMessages(deletedEntites);
     }
-    return {
+    const engineInstance = {
         _id: Date.now(),
         addEntity: partialEngine.addEntity,
         removeEntity: partialEngine.removeEntity,
@@ -264,4 +264,5 @@ export function Engine(options) {
         addTransport: crdtSystem.addTransport,
         entityContainer: partialEngine.entityContainer
     };
+    return engineInstance;
 }

package/dist-cjs/composite/index.d.ts

@@ -6,6 +6,7 @@ import { CompositeDefinition } from './proto/gen/composite.gen';
 export type { CompositeDefinition, ComponentData, CompositeComponent, CompositeComponent_DataEntry, InstanceCompositeOptions, CompositeProvider, CompositeRootType, CompositeResource };
 export { EntityMappingMode };
 export { getCompositeRootComponent };
+export { setCompositeProvider, getCompositeProvider } from './provider-registry';
 /**
  * @public
  * @deprecated composite is not being supported so far, please do not use this feature
@@ -31,14 +32,16 @@ export declare namespace Composite {
     /** @public */
     function toBinary(composite: Composite.Definition): Uint8Array;
     /**
-     * Instance a composite and returns its root entity
-     * @param compositeData - state serialized by the CRDT protocol
-     * @param getNextAvailableEntity - function that gives unused entities
-     * @param rootEntity - (optional) suggested mapped rootEntity for the composite
+     * Instance a composite and return its root entity.
+     * @param engine - the engine that will own the new entities
+     * @param compositeData - the composite resource to instance
+     * @param compositeProvider - provider used to resolve nested composite references
+     * @param options - instancing options (`rootEntity`, `entityMapping`, `alreadyRequestedSrc`)
+     * @returns the root entity of the instanced composite
      *
      * @public
      */
-    function instance(engine: IEngine, compositeData: Composite.Resource, compositeProvider: CompositeProvider, options?: InstanceCompositeOptions): void;
+    function instance(engine: IEngine, compositeData: Composite.Resource, compositeProvider: CompositeProvider, options?: InstanceCompositeOptions): import("../engine").Entity;
     /**
      * Resolve and normalize a composite path
      * @param src - the source path

package/dist-cjs/composite/index.js

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Composite = exports.getCompositeRootComponent = exports.EntityMappingMode = void 0;
+exports.Composite = exports.getCompositeProvider = exports.setCompositeProvider = exports.getCompositeRootComponent = exports.EntityMappingMode = void 0;
 const components_1 = require("./components");
 Object.defineProperty(exports, "getCompositeRootComponent", { enumerable: true, get: function () { return components_1.getCompositeRootComponent; } });
 const instance_1 = require("./instance");
 Object.defineProperty(exports, "EntityMappingMode", { enumerable: true, get: function () { return instance_1.EntityMappingMode; } });
 const path_1 = require("./path");
 const composite_gen_1 = require("./proto/gen/composite.gen");
+var provider_registry_1 = require("./provider-registry");
+Object.defineProperty(exports, "setCompositeProvider", { enumerable: true, get: function () { return provider_registry_1.setCompositeProvider; } });
+Object.defineProperty(exports, "getCompositeProvider", { enumerable: true, get: function () { return provider_registry_1.getCompositeProvider; } });
 /**
  * @public
  * @deprecated composite is not being supported so far, please do not use this feature
@@ -34,15 +37,17 @@ var Composite;
     }
     Composite.toBinary = toBinary;
     /**
-     * Instance a composite and returns its root entity
-     * @param compositeData - state serialized by the CRDT protocol
-     * @param getNextAvailableEntity - function that gives unused entities
-     * @param rootEntity - (optional) suggested mapped rootEntity for the composite
+     * Instance a composite and return its root entity.
+     * @param engine - the engine that will own the new entities
+     * @param compositeData - the composite resource to instance
+     * @param compositeProvider - provider used to resolve nested composite references
+     * @param options - instancing options (`rootEntity`, `entityMapping`, `alreadyRequestedSrc`)
+     * @returns the root entity of the instanced composite
      *
      * @public
      */
     /*#__PURE__*/ function instance(engine, compositeData, compositeProvider, options = {}) {
-        (0, instance_1.instanceComposite)(engine, compositeData, compositeProvider, options);
+        return (0, instance_1.instanceComposite)(engine, compositeData, compositeProvider, options);
     }
     Composite.instance = instance;
     /**

package/dist-cjs/composite/instance.d.ts

@@ -13,6 +13,11 @@ export type CompositeResource = {
  */
 export type CompositeProvider = {
     getCompositeOrNull(src: string): CompositeResource | null;
+    loadComposite?: (src: string) => Promise<CompositeResource>;
+    schemas?: Iterable<{
+        name: string;
+        jsonSchema: any;
+    }>;
 };
 /** @public */
 export declare enum EntityMappingMode {

package/dist-cjs/composite/instance.js

@@ -70,7 +70,7 @@ function getComponentDefinition(engine, component) {
             return engine.defineComponentFromSchema(component.name, schemas_1.Schemas.fromJson(component.jsonSchema));
         }
         else {
-            throw new Error(`${component.name} is not defined and there is no schema to define it.`);
+            throw new Error(`Composite references undefined component "${component.name}". Ensure provider.schemas was registered pre-seal via setCompositeProvider().`);
         }
     }
     else {
@@ -113,6 +113,7 @@ function instanceComposite(engine, compositeResource, compositeProvider, options
     const compositeDirectoryPath = path.dirname(path.resolve(compositeResource.src));
     const TransformComponentNumber = (0, component_number_1.componentNumberFromName)('core::Transform');
     const CompositeRootComponent = (0, components_2.getCompositeRootComponent)(engine);
+    let hadNestedComposite = false;
     // Key => EntityNumber from the composite
     // Value => EntityNumber in current engine
     const mappedEntities = new Map();
@@ -128,23 +129,29 @@ function instanceComposite(engine, compositeResource, compositeProvider, options
     // If there are more composite inside this one, we instance first.
     // => This is not only a copy, we need to instance. Otherwise, we'd be missing that branches
     // => TODO: in the future, the instanciation is first, then the overides (to parameterize Composite, e.g. house with different wall colors)
-    const childrenComposite = compositeResource.composite.components.find((item) => item.name === CompositeRootComponent.componentName);
-    if (childrenComposite) {
-        for (const [childCompositeEntity, compositeRawData] of childrenComposite.data) {
-            const childComposite = getComponentValue(CompositeRootComponent, compositeRawData);
-            const childCompositePath = path.resolveComposite(childComposite.src, compositeDirectoryPath);
-            const childCompositeResource = compositeProvider.getCompositeOrNull(childCompositePath);
-            const targetEntity = getCompositeEntity(childCompositeEntity);
-            if (childCompositeResource) {
-                if (alreadyRequestedSrc.has(childCompositeResource.src) ||
-                    childCompositeResource.src === compositeResource.src) {
-                    throw new Error(`Composite ${compositeResource.src} has a recursive instanciation while try to instance ${childCompositeResource.src}. Previous instances: ${alreadyRequestedSrc.toString()}`);
+    if (CompositeRootComponent) {
+        const childrenComposite = compositeResource.composite.components.find((item) => item.name === CompositeRootComponent.componentName);
+        if (childrenComposite) {
+            for (const [childCompositeEntity, compositeRawData] of childrenComposite.data) {
+                const childComposite = getComponentValue(CompositeRootComponent, compositeRawData);
+                const childCompositePath = path.resolveComposite(childComposite.src, compositeDirectoryPath);
+                const childCompositeResource = compositeProvider.getCompositeOrNull(childCompositePath);
+                const targetEntity = getCompositeEntity(childCompositeEntity);
+                if (childCompositeResource) {
+                    if (alreadyRequestedSrc.has(childCompositeResource.src) ||
+                        childCompositeResource.src === compositeResource.src) {
+                        throw new Error(`Composite ${compositeResource.src} has a recursive instanciation while try to instance ${childCompositeResource.src}. Previous instances: ${alreadyRequestedSrc.toString()}`);
+                    }
+                    hadNestedComposite = true;
+                    instanceComposite(engine, childCompositeResource, compositeProvider, {
+                        rootEntity: targetEntity,
+                        alreadyRequestedSrc: new Set(alreadyRequestedSrc).add(childCompositeResource.src),
+                        entityMapping: entityMapping?.type === EntityMappingMode.EMM_NEXT_AVAILABLE ? entityMapping : undefined
+                    });
+                }
+                else {
+                    console.warn(`Composite "${compositeResource.src}" references missing nested composite "${childCompositePath}". Skipping; the spawned subtree will be incomplete.`);
                 }
-                instanceComposite(engine, childCompositeResource, compositeProvider, {
-                    rootEntity: targetEntity,
-                    alreadyRequestedSrc: new Set(alreadyRequestedSrc).add(childCompositeResource.src),
-                    entityMapping: entityMapping?.type === EntityMappingMode.EMM_NEXT_AVAILABLE ? entityMapping : undefined
-                });
             }
         }
     }
@@ -152,7 +159,7 @@ function instanceComposite(engine, compositeResource, compositeProvider, options
     // Then, we copy the all rest of the components (skipping the Composite ones)
     for (const component of compositeResource.composite.components) {
         // We already instanced the composite
-        if (component.name === CompositeRootComponent.componentName)
+        if (CompositeRootComponent && component.name === CompositeRootComponent.componentName)
             continue;
         // ## 3a ##
         // We find the component definition
@@ -188,14 +195,16 @@ function instanceComposite(engine, compositeResource, compositeProvider, options
             }
         }
     }
-    const composite = CompositeRootComponent.getMutableOrNull(compositeRootEntity) || CompositeRootComponent.create(compositeRootEntity);
-    for (const [entitySource, targetEntity] of mappedEntities) {
-        composite.entities.push({
-            src: entitySource,
-            dest: targetEntity
-        });
+    if (hadNestedComposite) {
+        const composite = CompositeRootComponent.getMutableOrNull(compositeRootEntity) || CompositeRootComponent.create(compositeRootEntity);
+        for (const [entitySource, targetEntity] of mappedEntities) {
+            composite.entities.push({
+                src: entitySource,
+                dest: targetEntity
+            });
+        }
+        composite.src = compositeResource.src;
     }
-    composite.src = compositeResource.src;
     return compositeRootEntity;
 }
 exports.instanceComposite = instanceComposite;

package/dist-cjs/composite/provider-registry.d.ts

@@ -0,0 +1,15 @@
+import type { IEngine } from '../engine';
+import type { CompositeProvider } from './instance';
+/**
+ * Register the composite provider used to resolve composite files. Also registers
+ * any `provider.schemas` on the engine pre-seal so composites that reference those
+ * components can be instanced without further setup.
+ * @public
+ */
+export declare function setCompositeProvider(engine: IEngine, provider: CompositeProvider): void;
+/**
+ * Get the composite provider registered via setCompositeProvider. Returns null if
+ * no provider has been set.
+ * @public
+ */
+export declare function getCompositeProvider(): CompositeProvider | null;

package/dist-cjs/composite/provider-registry.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCompositeProvider = exports.setCompositeProvider = void 0;
+const schemas_1 = require("../schemas");
+const components_1 = require("./components");
+let currentProvider = null;
+/**
+ * Register the composite provider used to resolve composite files. Also registers
+ * any `provider.schemas` on the engine pre-seal so composites that reference those
+ * components can be instanced without further setup.
+ * @public
+ */
+function setCompositeProvider(engine, provider) {
+    currentProvider = provider;
+    // Define composite::root pre-seal. setCompositeProvider runs at module-load,
+    // so this guarantees the component exists before the engine seals — composites
+    // instanced at runtime (post-seal) would otherwise trip the seal when
+    // instanceComposite looks it up via getCompositeRootComponent.
+    (0, components_1.getCompositeRootComponent)(engine);
+    if (!provider.schemas)
+        return;
+    for (const { name, jsonSchema } of provider.schemas) {
+        if (engine.getComponentOrNull(name))
+            continue;
+        engine.defineComponentFromSchema(name, schemas_1.Schemas.fromJson(jsonSchema));
+    }
+}
+exports.setCompositeProvider = setCompositeProvider;
+/**
+ * Get the composite provider registered via setCompositeProvider. Returns null if
+ * no provider has been set.
+ * @public
+ */
+function getCompositeProvider() {
+    return currentProvider;
+}
+exports.getCompositeProvider = getCompositeProvider;

package/dist-cjs/engine/index.js

@@ -265,7 +265,7 @@ function Engine(options) {
         const deletedEntites = partialEngine.entityContainer.releaseRemovedEntities();
         await crdtSystem.sendMessages(deletedEntites);
     }
-    return {
+    const engineInstance = {
         _id: Date.now(),
         addEntity: partialEngine.addEntity,
         removeEntity: partialEngine.removeEntity,
@@ -293,5 +293,6 @@ function Engine(options) {
         addTransport: crdtSystem.addTransport,
         entityContainer: partialEngine.entityContainer
     };
+    return engineInstance;
 }
 exports.Engine = Engine;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dcl/ecs",
   "description": "Decentraland ECS",
-  "version": "7.23.4-26770223094.commit-52b9415",
+  "version": "7.23.4-26955626649.commit-5d040fd",
   "author": "DCL",
   "bugs": "https://github.com/decentraland/ecs/issues",
   "files": [
@@ -34,5 +34,5 @@
   "dependencies": {},
   "types": "./dist/index.d.ts",
   "typings": "./dist/index.d.ts",
-  "commit": "52b9415ebab8c77313e9fbc0725fd2e5f916d3c3"
+  "commit": "5d040fd6fe9e018eb005a5c2a85e3419e1ea87a4"
 }