@shapediver/viewer.data-engine.geometry-engine 2.11.0 → 2.12.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/dist/gltfv2/loaders/MaterialLoader.d.ts.map +1 -1
  2. package/dist/gltfv2/loaders/MaterialLoader.js +24 -10
  3. package/dist/gltfv2/loaders/MaterialLoader.js.map +1 -1
  4. package/dist/gltfv2/loaders/TextureLoader.d.ts +4 -1
  5. package/dist/gltfv2/loaders/TextureLoader.d.ts.map +1 -1
  6. package/dist/gltfv2/loaders/TextureLoader.js +10 -5
  7. package/dist/gltfv2/loaders/TextureLoader.js.map +1 -1
  8. package/package.json +10 -10
  9. package/src/gltfv2/loaders/MaterialLoader.ts +39 -33
  10. package/src/gltfv2/loaders/TextureLoader.ts +22 -10
package/dist/gltfv2/loaders/MaterialLoader.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MaterialLoader.d.ts","sourceRoot":"","sources":["../../../src/gltfv2/loaders/MaterialLoader.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAIT,MAAM,6CAA6C,CAAA;AAEpD,OAAO,EAML,qBAAqB,EAOtB,MAAM,iCAAiC,CAAA;AAIxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,qBAAa,cAAc;IAYX,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAAY,OAAO,CAAC,QAAQ,CAAC,cAAc;IAThF,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;IAC5D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA2C;IAE3E,OAAO,CAAC,OAAO,CAAgD;gBAMlC,QAAQ,EAAE,QAAQ,EAAmB,cAAc,EAAE,aAAa;IAMxF,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,qBAAqB;IAOhD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAsSlC,OAAO,CAAC,OAAO;CAwBlB"}
1
+ {"version":3,"file":"MaterialLoader.d.ts","sourceRoot":"","sources":["../../../src/gltfv2/loaders/MaterialLoader.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAIT,MAAM,6CAA6C,CAAC;AAErD,OAAO,EAML,qBAAqB,EAStB,MAAM,iCAAiC,CAAC;AAIzC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,qBAAa,cAAc;IAYX,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAAY,OAAO,CAAC,QAAQ,CAAC,cAAc;IAThF,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;IAC5D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA2C;IAE3E,OAAO,CAAC,OAAO,CAAgD;gBAMlC,QAAQ,EAAE,QAAQ,EAAmB,cAAc,EAAE,aAAa;IAMxF,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,qBAAqB;IAOhD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAySlC,OAAO,CAAC,OAAO;CAyBlB"}
package/dist/gltfv2/loaders/MaterialLoader.js CHANGED
@@ -42,7 +42,7 @@ class MaterialLoader {
42
42
  this._loaded = {};
43
43
  if (!this._content.materials)
44
44
  return;
45
- let promises = [];
45
+ const promises = [];
46
46
  for (let i = 0; i < this._content.materials.length; i++) {
47
47
  const materialId = i;
48
48
  const material = this._content.materials[materialId];
@@ -52,18 +52,21 @@ class MaterialLoader {
52
52
  materialDataProperties.name = material.name;
53
53
  if (materialExtensions[GLTFLoader_1.GLTF_EXTENSIONS.SHAPEDIVER_MATERIALS_PRESET]) {
54
54
  const materialPreset = materialExtensions[GLTFLoader_1.GLTF_EXTENSIONS.SHAPEDIVER_MATERIALS_PRESET];
55
- promises.push(new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
55
+ promises.push(new Promise((resolve, reject) => {
56
56
  try {
57
- const materialData = yield this._materialEngine.loadPresetMaterial(materialPreset.materialpreset);
58
- materialData.name = material.name;
59
- materialData.color = materialPreset.color;
60
- this._loaded[materialId] = materialData;
61
- resolve();
57
+ this._materialEngine.loadPresetMaterial(materialPreset.materialpreset)
58
+ .then(materialData => {
59
+ materialData.name = material.name;
60
+ materialData.color = materialPreset.color;
61
+ this._loaded[materialId] = materialData;
62
+ resolve();
63
+ })
64
+ .catch(reject);
62
65
  }
63
66
  catch (e) {
64
67
  reject(e);
65
68
  }
66
- })));
69
+ }));
67
70
  continue;
68
71
  }
69
72
  if (materialExtensions[GLTFLoader_1.GLTF_EXTENSIONS.KHR_MATERIALS_PBRSPECULARGLOSSINESS]) {
@@ -319,8 +322,19 @@ class MaterialLoader {
319
322
  if (!this._content.images)
320
323
  throw new Error('Images not available.');
321
324
  const sampler = this._content.samplers && texture.sampler && this._content.samplers[texture.sampler] ? this._content.samplers[texture.sampler] : {};
322
- const htmlImage = this._textureLoader.getTexture(textureId);
323
- return new viewer_shared_types_1.MapData(htmlImage, sampler.wrapS, sampler.wrapT, sampler.minFilter, sampler.magFilter, undefined, undefined, properties && properties.offset ? gl_matrix_1.vec2.fromValues(properties.offset[0], properties.offset[1]) : undefined, properties && properties.scale ? gl_matrix_1.vec2.fromValues(properties.scale[0], properties.scale[1]) : undefined, properties && properties.rotation !== undefined ? properties.rotation : 0, properties === null || properties === void 0 ? void 0 : properties.texCoord, false);
325
+ const loadedTexture = this._textureLoader.getTexture(textureId);
326
+ return new viewer_shared_types_1.MapData(loadedTexture.image, {
327
+ blob: loadedTexture.blob,
328
+ wrapS: sampler.wrapS,
329
+ wrapT: sampler.wrapT,
330
+ minFilter: sampler.minFilter,
331
+ magFilter: sampler.magFilter,
332
+ offset: properties && properties.offset ? gl_matrix_1.vec2.fromValues(properties.offset[0], properties.offset[1]) : gl_matrix_1.vec2.create(),
333
+ repeat: properties && properties.scale ? gl_matrix_1.vec2.fromValues(properties.scale[0], properties.scale[1]) : gl_matrix_1.vec2.fromValues(1, 1),
334
+ rotation: properties && properties.rotation !== undefined ? properties.rotation : 0,
335
+ texCoord: properties === null || properties === void 0 ? void 0 : properties.texCoord,
336
+ flipY: false
337
+ });
324
338
  }
325
339
  }
326
340
  exports.MaterialLoader = MaterialLoader;
package/dist/gltfv2/loaders/MaterialLoader.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MaterialLoader.js","sourceRoot":"","sources":["../../../src/gltfv2/loaders/MaterialLoader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MaterialLoader.js","sourceRoot":"","sources":["../../../src/gltfv2/loaders/MaterialLoader.ts"],"names":[],"mappings":"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"}
package/dist/gltfv2/loaders/TextureLoader.d.ts CHANGED
@@ -8,7 +8,10 @@ export declare class TextureLoader {
8
8
  private readonly _httpClient;
9
9
  private _loaded;
10
10
  constructor(_content: IGLTF_v2, _bufferViewLoader: BufferViewLoader, _baseUri?: string | undefined);
11
- getTexture(textureId: number): HTMLImageElement;
11
+ getTexture(textureId: number): {
12
+ image: HTMLImageElement;
13
+ blob: Blob;
14
+ };
12
15
  load(): Promise<void>;
13
16
  }
14
17
  //# sourceMappingURL=TextureLoader.d.ts.map
package/dist/gltfv2/loaders/TextureLoader.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TextureLoader.d.ts","sourceRoot":"","sources":["../../../src/gltfv2/loaders/TextureLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6CAA6C,CAAC;AAGvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,qBAAa,aAAa;IAcV,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAAY,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAAoB,OAAO,CAAC,QAAQ,CAAC;IAXxH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;IAC5D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmC;IAE/D,OAAO,CAAC,OAAO,CAER;gBAMsB,QAAQ,EAAE,QAAQ,EAAmB,iBAAiB,EAAE,gBAAgB,EAAU,QAAQ,CAAC,oBAAQ;IAMzH,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB;IAOzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAsDrC"}
1
+ {"version":3,"file":"TextureLoader.d.ts","sourceRoot":"","sources":["../../../src/gltfv2/loaders/TextureLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6CAA6C,CAAC;AAGvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,qBAAa,aAAa;IAiBV,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAAY,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAAoB,OAAO,CAAC,QAAQ,CAAC;IAdxH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;IAC5D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmC;IAE/D,OAAO,CAAC,OAAO,CAKR;gBAMsB,QAAQ,EAAE,QAAQ,EAAmB,iBAAiB,EAAE,gBAAgB,EAAU,QAAQ,CAAC,oBAAQ;IAMzH,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG;QAClC,KAAK,EAAE,gBAAgB,CAAC;QACxB,IAAI,EAAE,IAAI,CAAA;KACb;IAOY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CA4DrC"}
package/dist/gltfv2/loaders/TextureLoader.js CHANGED
@@ -55,15 +55,20 @@ class TextureLoader {
55
55
  array[i] = dataView.getUint8(i);
56
56
  const blob = new Blob([new Uint8Array(array)], { type: image.mimeType });
57
57
  const dataUri = URL.createObjectURL(blob);
58
+ const img = new Image();
58
59
  promises.push(new Promise((resolve, reject) => {
59
- this._httpClient.loadTexture(dataUri)
60
- .then(response => {
61
- this._loaded[textureId] = response.data;
60
+ img.onload = () => {
61
+ this._loaded[textureId] = {
62
+ image: img,
63
+ blob
64
+ };
62
65
  URL.revokeObjectURL(dataUri);
63
66
  resolve();
64
- })
65
- .catch(e => reject(e));
67
+ };
68
+ img.onerror = reject;
66
69
  }));
70
+ img.crossOrigin = 'anonymous';
71
+ img.src = dataUri;
67
72
  }
68
73
  else {
69
74
  const url = DATA_URI_REGEX.test(image.uri) || HTTPS_URI_REGEX.test(image.uri) ? image.uri : `${this._baseUri}/${image.uri}`;
package/dist/gltfv2/loaders/TextureLoader.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TextureLoader.js","sourceRoot":"","sources":["../../../src/gltfv2/loaders/TextureLoader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TextureLoader.js","sourceRoot":"","sources":["../../../src/gltfv2/loaders/TextureLoader.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shapediver/viewer.data-engine.geometry-engine",
3
- "version": "2.11.0",
3
+ "version": "2.12.0",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "author": "Michael Oppitz <michael@shapediver.com>",
@@ -40,14 +40,14 @@
40
40
  },
41
41
  "dependencies": {
42
42
  "@shapediver/sdk.geometry-api-sdk-v2": "1.6.0",
43
- "@shapediver/viewer.data-engine.material-engine": "2.11.0",
44
- "@shapediver/viewer.data-engine.shared-types": "2.11.0",
45
- "@shapediver/viewer.rendering-engine.camera-engine": "2.11.0",
46
- "@shapediver/viewer.rendering-engine.light-engine": "2.11.0",
47
- "@shapediver/viewer.shared.build-data": "2.11.0",
48
- "@shapediver/viewer.shared.node-tree": "2.11.0",
49
- "@shapediver/viewer.shared.services": "2.11.0",
50
- "@shapediver/viewer.shared.types": "2.11.0",
43
+ "@shapediver/viewer.data-engine.material-engine": "2.12.0",
44
+ "@shapediver/viewer.data-engine.shared-types": "2.12.0",
45
+ "@shapediver/viewer.rendering-engine.camera-engine": "2.12.0",
46
+ "@shapediver/viewer.rendering-engine.light-engine": "2.12.0",
47
+ "@shapediver/viewer.shared.build-data": "2.12.0",
48
+ "@shapediver/viewer.shared.node-tree": "2.12.0",
49
+ "@shapediver/viewer.shared.services": "2.12.0",
50
+ "@shapediver/viewer.shared.types": "2.12.0",
51
51
  "axios": "^1.2.6",
52
52
  "gl-matrix": "3.3.0"
53
53
  },
@@ -56,5 +56,5 @@
56
56
  "path": false,
57
57
  "os": false
58
58
  },
59
- "gitHead": "abc828ee5f772bc79b737c994716b8ec372503ef"
59
+ "gitHead": "4453bb1d704facd5722ffd81518e54b5453d991f"
60
60
  }
package/src/gltfv2/loaders/MaterialLoader.ts CHANGED
@@ -1,11 +1,11 @@
1
- import { Converter, HttpClient } from '@shapediver/viewer.shared.services'
1
+ import { Converter, HttpClient } from '@shapediver/viewer.shared.services';
2
2
  import {
3
3
  IGLTF_v2,
4
4
  IGLTF_v2_Material,
5
5
  IGLTF_v2_Material_KHR_materials_pbrSpecularGlossiness,
6
6
  ISHAPEDIVER_materials_preset,
7
- } from '@shapediver/viewer.data-engine.shared-types'
8
- import { vec2 } from 'gl-matrix'
7
+ } from '@shapediver/viewer.data-engine.shared-types';
8
+ import { vec2 } from 'gl-matrix';
9
9
  import {
10
10
  MATERIAL_ALPHA,
11
11
  MATERIAL_SIDE,
@@ -19,11 +19,13 @@ import {
19
19
  IMaterialUnlitDataProperties,
20
20
  MapData,
21
21
  IMapData,
22
- } from '@shapediver/viewer.shared.types'
23
- import { MaterialEngine } from '@shapediver/viewer.data-engine.material-engine'
22
+ TEXTURE_WRAPPING,
23
+ TEXTURE_FILTERING,
24
+ } from '@shapediver/viewer.shared.types';
25
+ import { MaterialEngine } from '@shapediver/viewer.data-engine.material-engine';
24
26
 
25
- import { GLTF_EXTENSIONS } from '../GLTFLoader'
26
- import { TextureLoader } from './TextureLoader'
27
+ import { GLTF_EXTENSIONS } from '../GLTFLoader';
28
+ import { TextureLoader } from './TextureLoader';
27
29
 
28
30
  export class MaterialLoader {
29
31
  // #region Properties (4)
@@ -44,9 +46,9 @@ export class MaterialLoader {
44
46
  // #region Public Methods (2)
45
47
 
46
48
  public getMaterial(materialId: number): IMaterialAbstractData {
47
- if (!this._content.materials) throw new Error('MaterialLoader.getMaterial: Materials not available.')
48
- if (!this._content.materials[materialId]) throw new Error('MaterialLoader.getMaterial: Material not available.')
49
- if (!this._loaded[materialId]) throw new Error('MaterialLoader.getMaterial: Material not loaded.')
49
+ if (!this._content.materials) throw new Error('MaterialLoader.getMaterial: Materials not available.');
50
+ if (!this._content.materials[materialId]) throw new Error('MaterialLoader.getMaterial: Material not available.');
51
+ if (!this._loaded[materialId]) throw new Error('MaterialLoader.getMaterial: Material not loaded.');
50
52
  return this._loaded[materialId];
51
53
  }
52
54
 
@@ -54,7 +56,7 @@ export class MaterialLoader {
54
56
  this._loaded = {};
55
57
  if (!this._content.materials) return;
56
58
 
57
- let promises: Promise<void>[] = [];
59
+ const promises: Promise<void>[] = [];
58
60
  for (let i = 0; i < this._content.materials.length; i++) {
59
61
  const materialId = i;
60
62
  const material: IGLTF_v2_Material = this._content.materials[materialId];
@@ -66,18 +68,21 @@ export class MaterialLoader {
66
68
  if (materialExtensions[GLTF_EXTENSIONS.SHAPEDIVER_MATERIALS_PRESET]) {
67
69
  const materialPreset: ISHAPEDIVER_materials_preset = materialExtensions[GLTF_EXTENSIONS.SHAPEDIVER_MATERIALS_PRESET];
68
70
  promises.push(
69
- new Promise<void>(async (resolve, reject) => {
71
+ new Promise<void>((resolve, reject) => {
70
72
  try {
71
- const materialData = await this._materialEngine.loadPresetMaterial(materialPreset.materialpreset);
72
- materialData.name = material.name;
73
- materialData.color = materialPreset.color;
74
- this._loaded[materialId] = materialData;
75
- resolve();
73
+ this._materialEngine.loadPresetMaterial(materialPreset.materialpreset)
74
+ .then(materialData => {
75
+ materialData.name = material.name;
76
+ materialData.color = materialPreset.color;
77
+ this._loaded[materialId] = materialData;
78
+ resolve();
79
+ })
80
+ .catch(reject);
76
81
  } catch (e) {
77
82
  reject(e);
78
83
  }
79
84
  })
80
- )
85
+ );
81
86
  continue;
82
87
  }
83
88
 
@@ -345,25 +350,26 @@ export class MaterialLoader {
345
350
  // #region Private Methods (1)
346
351
 
347
352
  private loadMap(textureId: number, properties?: { offset?: number[], scale?: number[], rotation?: number, texCoord?: number }): IMapData {
348
- if (!this._content.textures) throw new Error('Textures not available.')
353
+ if (!this._content.textures) throw new Error('Textures not available.');
349
354
  const texture = this._content.textures[textureId];
350
- if (!this._content.images) throw new Error('Images not available.')
355
+ if (!this._content.images) throw new Error('Images not available.');
351
356
  const sampler = this._content.samplers && texture.sampler && this._content.samplers[texture.sampler] ? this._content.samplers[texture.sampler] : {};
352
- const htmlImage = this._textureLoader.getTexture(textureId);
357
+ const loadedTexture = this._textureLoader.getTexture(textureId);
353
358
 
354
359
  return new MapData(
355
- htmlImage,
356
- sampler.wrapS,
357
- sampler.wrapT,
358
- sampler.minFilter,
359
- sampler.magFilter,
360
- undefined,
361
- undefined,
362
- properties && properties.offset ? vec2.fromValues(properties.offset[0], properties.offset[1]) : undefined,
363
- properties && properties.scale ? vec2.fromValues(properties.scale[0], properties.scale[1]) : undefined,
364
- properties && properties.rotation !== undefined ? properties.rotation : 0,
365
- properties?.texCoord,
366
- false
360
+ loadedTexture.image,
361
+ {
362
+ blob: loadedTexture.blob,
363
+ wrapS: sampler.wrapS as TEXTURE_WRAPPING,
364
+ wrapT: sampler.wrapT as TEXTURE_WRAPPING,
365
+ minFilter: sampler.minFilter as TEXTURE_FILTERING,
366
+ magFilter: sampler.magFilter as TEXTURE_FILTERING,
367
+ offset: properties && properties.offset ? vec2.fromValues(properties.offset[0], properties.offset[1]) : vec2.create(),
368
+ repeat: properties && properties.scale ? vec2.fromValues(properties.scale[0], properties.scale[1]) : vec2.fromValues(1, 1),
369
+ rotation: properties && properties.rotation !== undefined ? properties.rotation : 0,
370
+ texCoord: properties?.texCoord,
371
+ flipY: false
372
+ }
367
373
  );
368
374
  }
369
375
 
package/src/gltfv2/loaders/TextureLoader.ts CHANGED
@@ -10,7 +10,10 @@ export class TextureLoader {
10
10
  private readonly _httpClient: HttpClient = HttpClient.instance;
11
11
 
12
12
  private _loaded: {
13
- [key: string]: HTMLImageElement
13
+ [key: string]: {
14
+ image: HTMLImageElement,
15
+ blob: Blob
16
+ }
14
17
  } = {};
15
18
 
16
19
  // #endregion Properties (3)
@@ -23,7 +26,10 @@ export class TextureLoader {
23
26
 
24
27
  // #region Public Methods (2)
25
28
 
26
- public getTexture(textureId: number): HTMLImageElement {
29
+ public getTexture(textureId: number): {
30
+ image: HTMLImageElement,
31
+ blob: Blob
32
+ } {
27
33
  if (!this._content.textures) throw new Error('TextureLoader.getTexture: Textures not available.');
28
34
  if (!this._content.textures[textureId]) throw new Error('TextureLoader.getTexture: Texture not available.');
29
35
  if (!this._loaded[textureId]) throw new Error('TextureLoader.getTexture: Texture not loaded.');
@@ -53,18 +59,24 @@ export class TextureLoader {
53
59
  const blob = new Blob([new Uint8Array(array)], { type: image.mimeType });
54
60
  const dataUri = URL.createObjectURL(blob);
55
61
 
62
+ const img = new Image();
63
+
56
64
  promises.push(
57
65
  new Promise<void>((resolve, reject) => {
58
- this._httpClient.loadTexture(dataUri)
59
- .then(response => {
60
- this._loaded[textureId] = response.data;
61
- URL.revokeObjectURL(dataUri);
62
- resolve();
63
-
64
- })
65
- .catch(e => reject(e));
66
+ img.onload = () => {
67
+ this._loaded[textureId] = {
68
+ image: img,
69
+ blob
70
+ };
71
+ URL.revokeObjectURL(dataUri);
72
+ resolve();
73
+ };
74
+ img.onerror = reject;
66
75
  })
67
76
  );
77
+
78
+ img.crossOrigin = 'anonymous';
79
+ img.src = dataUri;
68
80
  } else {
69
81
  const url = DATA_URI_REGEX.test(image.uri!) || HTTPS_URI_REGEX.test(image.uri!) ? image.uri : `${this._baseUri}/${image.uri}`;
70
82
  promises.push(