squishjs 0.7.65 → 0.7.67

package/package.json

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

package/src/Asset.js

@@ -126,6 +126,8 @@ class Asset {
                     this.doDownload(this.info.id, HG_ASSET_PATH).then((fileLocation) => {
                         this.initialized = true;
                         resolve(fileLocation);
+                    }).catch(err => {
+                        reject(err);
                     });
                 }
             });
@@ -145,6 +147,8 @@ class Asset {
                             resolve(buf);
                         }
                     });
+                }).catch(err => {
+                    reject(err);
                 });
             }
         }); 

package/src/BaseNode.js

@@ -91,11 +91,14 @@ class BaseNode {
         this.node.clearChildren(excludedNodeIds);
     }
 
-
     clone() {
         throw new Error("Clone not implemented");
     }
+
+    free() {
+        this.node.free();
+    }
 }
 
 
-module.exports = {gameNode, BaseNode};
+module.exports = {gameNode, BaseNode};

package/src/Squisher.js

@@ -227,6 +227,9 @@ class Squisher {
                             this.assetBundle = newAssetBundle;
                             resolve(newAssetBundle);
                         }
+                    }).catch(err => {
+                        console.error('Unable to get asset data for key ' + key);
+                        console.error(err);
                     });
                 }
 
@@ -234,8 +237,10 @@ class Squisher {
     }
 
     handleStateChange(node, layerName) {
-        this.state = this.squish(this.game.getLayers());
-        this.broadcast();
+        if (this.listeners.size > 0) {
+            this.state = this.squish(this.game.getLayers());
+            this.broadcast();
+        }
     }
 
     broadcast() {

package/src/util/listenable.js

@@ -15,7 +15,13 @@ const listenable = function(obj, onChange) {
         }
     };
 
-    return new Proxy(obj, handler);
+    const revocable = Proxy.revocable(obj, handler);
+
+    obj.free = () => {
+        revocable.revoke();
+    }
+
+    return revocable.proxy;
 };
 
 module.exports = listenable;

package/test/main.test.js

@@ -4,8 +4,11 @@ const { COLORS } = require("../src/Colors");
 const Shapes = require('../src/Shapes');
 const ShapeUtils = require('../src/util/shapes');
 const { verifyArrayEquality } = require('./utils');
+const Squisher = require('../src/Squisher');
+const Game = require('../src/Game');
 
 const assert = require('assert');
+const process = require('process');
 
 const hypLength = (x, y) => Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
 
@@ -24,7 +27,7 @@ const compareSquished = (preSquish, unsquished) => {
                 } else {
                     verifyArrayEquality(preSquish.coordinates2d, unsquished.coordinates2d);
                 }
-            } else if (key === 'input' || key == 'text') {
+            } else if (key === 'input' || key == 'text' || key == 'free') {
                 // TODO: Handle all of this in a more generic way
             } else if (preSquish[key] === undefined || preSquish[key] === null) {
                 assert(unsquished[key] === undefined || unsquished[key] === null);
@@ -354,3 +357,57 @@ test("big big text", () => {
     assert(unsquishedNode.text.size.toFixed(2) === scaledTextSize.toFixed(2));
 });
 
+// create one hundred nodes and ensure the memory is freed
+test("allocate a bunch of nodes", () => {
+    const initialMemUsage = process.memoryUsage();
+
+    const nodeCount = Math.pow(10, 2);
+    
+    const root = new GameNode.Text({
+            textInfo: {
+                text: 'I am root',
+                x: 4,
+                y: 20,
+                size: 5,
+                align: 'center',
+                color: COLORS.RED
+            }
+        });
+
+    const sizeEstimate = squish(root).length;
+
+    const fakeGame = new Game();
+    fakeGame.getLayers = () => {
+            return [
+                {
+                    root
+                }
+            ]
+        };
+
+    const squisher = new Squisher({game: fakeGame});
+    squisher.addListener(() => {
+        // necessary to hold the reference to the proxy that we should be revoking when we call delete
+    });
+
+    for (let i = 0; i < nodeCount; i++) {
+        const gameNode = new GameNode.Text({
+            textInfo: {
+                text: 'I am going to write a whoooooole lot of text like more than 64 characters which is quite a bit. Not like a tweet long but still long, you know?',
+                x: 4,
+                y: 20,
+                size: 5,
+                align: 'center',
+                color: COLORS.RED
+            }
+        });
+
+        root.addChild(gameNode);
+        root.removeChild(gameNode.node.id);
+        gameNode.free();
+    }
+
+    const postMemUsage = process.memoryUsage();
+    assert(postMemUsage.heapTotal - initialMemUsage.heapTotal <= (.05 * initialMemUsage.heapTotal)); 
+});
+

package/metest.js

@@ -1,26 +0,0 @@
-const { GameNode, squish, unsquish } = require('./');
-
-const ting = new GameNode.Shape({
-    coordinates2d: [
-        [0, 0],
-        [0, 0],
-        [0, 0],
-        [0, 0]
-    ],
-    shapeType: 1
-});
-
-ting.node.id = 529025047768;
-ting.id = 529025047768;
-
-const squished = squish(ting);
-
-const unsquished = unsquish(squished);
-
-if (unsquished.node.id != Number(529025047768)) {
-    console.log('fuck man');
-    console.log(unsquished.node.id);
-    console.log(Number(ting.node.id));
-}  else {
-    console.log('um what');
-}