squishjs 1.3.6 → 1.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squishjs",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "description": "squish & unsquish stuff",
   "scripts": {
     "test": "node testRunner.js"

package/src/Asset.js

@@ -95,7 +95,7 @@ class Asset {
     existsLocally() {
         return new Promise((resolve, reject) => {
             if (this.data) {
-                resolve(true);
+                return resolve(true);
             }
             const fileLocation = this.getFileLocation(this.info.id);
             this.fs.exists(fileLocation, (exists) => {
@@ -118,7 +118,7 @@ class Asset {
         } else {
             const fileLocation2 = await downloadFileSync(this.info.id, HG_ASSET_PATH);
             this.initialized = true;
-            return fileLocation;
+            return fileLocation2;
         }
     }
     
@@ -170,7 +170,7 @@ class Asset {
             const filePath = `${path}/${fileHash}`;
 
             const writeStream = this.fs.createWriteStream(filePath);
-            const getModule = this.https;
+            const getModule = ASSET_URL.startsWith('https') ? this.https : this.http;
 
             writeStream.on('close', () => {
                 resolve(filePath);

package/src/BaseNode.js

@@ -104,7 +104,7 @@ class BaseNode {
                 this.node.fill = params.fill;
             }
             if (params.coordinates2d) {
-                this.node.coordinates2d = coordinates2d;
+                this.node.coordinates2d = params.coordinates2d;
             }
         }
         this.node.onStateChange();

package/src/Game.js

@@ -11,7 +11,7 @@ class Game {
     }
 
     removeStateListener(listener) {
-        this.listeners.remove(listener);
+        this.listeners.delete(listener);
     }
 
     findNode(id) {

package/src/Squisher.js

@@ -42,7 +42,7 @@ class Squisher {
     }
 
     removeListener(listener) {
-        this.listeners.remove(listener);
+        this.listeners.delete(listener);
     }
 
     unsquish(node) {
@@ -97,9 +97,7 @@ class Squisher {
     }
 
     handleNewAsset(key, asset) {
-        return new Promise((resolve, reject) => {
-            this.initialize().then(resolve);
-        });
+        return this.initialize();
     }
 
     squishHelper(node, squishedNodes, scale = {x: 1, y: 1}, playerMap = {}, playerIdFilter = new Set()) {
@@ -197,6 +195,12 @@ class Squisher {
                 let assetBundleSize = 0;
                 let finishedCount = 0;
                 const totalCount = Object.keys(allAssets).length;
+
+                if (totalCount === 0) {
+                    this.assetBundle = [];
+                    resolve([]);
+                    return;
+                }
     
                 for (const key in allAssets) {
                     allAssets[key].getData().then(buf => {
@@ -237,11 +241,10 @@ class Squisher {
 
                         if (finishedCount == totalCount) {
                             const newAssetBundle = new Array(assetBundleSize);
-                            for (let index = 0; index < assetBundleSize; index++) {
-                                for (const key in this.assets) {
-                                    for (let y = 0; y < this.assets[key].length; y++) {
-                                        newAssetBundle[index++] = this.assets[key][y];
-                                    }
+                            let index = 0;
+                            for (const key in this.assets) {
+                                for (let y = 0; y < this.assets[key].length; y++) {
+                                    newAssetBundle[index++] = this.assets[key][y];
                                 }
                             }
                             this.assetBundle = newAssetBundle;
@@ -250,6 +253,7 @@ class Squisher {
                     }).catch(err => {
                         console.error('Unable to get asset data for key ' + key);
                         console.error(err);
+                        reject(err);
                     });
                 }