(angular-server): digest cycle in server

Author: netanelgilad

.versions

@@ -14,7 +14,7 @@ [email protected]
 [email protected]_2
 [email protected]
 lai:[email protected]
-local-test:urigo:[email protected].4
+local-test:urigo:[email protected].5-alpha.1
 [email protected]
 [email protected]
 [email protected]
@@ -27,4 +27,4 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-urigo:[email protected].4
+urigo:[email protected].5-alpha.1

angular-meteor-client.js

@@ -132,7 +132,7 @@ Meteor.subscribe('serverInstances', function () {
         }]);
       }
       else {
-        $provide.factory(instance.name, ['$q', function ($q) {
+        $provide.factory(instance.name, ['$q', '$rootScope', function ($q, $rootScope) {
           var serviceInstance = {};
           angular.forEach(instance.funcDefs, function (funcDef) {
             serviceInstance[funcDef] = function () {
@@ -157,6 +157,17 @@ Meteor.subscribe('serverInstances', function () {
             };
           });
 
+          angular.extend(serviceInstance, instance.properties);
+
+          serverInstances.find({}).observe({
+            changed : function (newDpc) {
+              angular.extend(serviceInstance, newDpc.properties);
+              if (!$rootScope.$$phase) {
+                $rootScope.$apply();
+              }
+            }
+          });
+
           return serviceInstance;
         }]);
       }

angular-meteor-common.js

@@ -24,10 +24,10 @@ angular.module('angular-meteor')
 
         // XXX - think if better to apply with meteor's this or the service
         if (Meteor.isClient && angular.isDefined(service.$$originalInstance)) {
-          return service.$$originalInstance[prop].apply(this, args);
+          return service.$$originalInstance[prop].apply(service, args);
         }
         else {
-          return service[prop].apply(this, args);
+          return service[prop].apply(service, args);
         }
       }
     });

angular-meteor-server.js

@@ -3,8 +3,8 @@
  */
 var serverInstances = new Meteor.Collection(null);
 
-angular.module('angular-meteor', [])
-  .run(['ServerAPI', '$injector', function(ServerAPI, $injector) {
+angular.module('angular-meteor', ['angular-meteor.meteor-collection'])
+  .run(['ServerAPI', '$injector', '$rootScope', function(ServerAPI, $injector, $rootScope) {
     angular.forEach(ServerAPI.getServerAPIS(), function(api) {
       var instance = $injector.get(api);
       var funcDefs = [];
@@ -13,7 +13,15 @@ angular.module('angular-meteor', [])
           funcDefs.push(key);
         }
       }
-      serverInstances.insert({ name : api, funcDefs : funcDefs });
+      var instanceId = serverInstances.insert({ name : api, funcDefs : funcDefs, properties : [] });
+
+      $rootScope.$watch(function() {
+        return instance;
+      }, function() {
+        console.log('updating', instanceId, instance);
+        serverInstances.update({ _id : instanceId }, { $set : { properties : instance } });
+      }, true);
+
     });
   }])
   .run(function() {
@@ -24,6 +32,7 @@ angular.module('angular-meteor', [])
           self.added('serverInstances', id, fields);
         },
         changed: function (id, fields) {
+          console.log('changed', id, fields);
           self.changed('serverInstances', id, fields);
         },
         removed: function (id) {
@@ -37,11 +46,36 @@ angular.module('angular-meteor', [])
         handle.stop();
       })
     });
+  })
+  .run(function($rootScope, ServerAPI) {
+    //var origRun = Meteor._SynchronousQueue.prototype._run;
+    //
+    //console.log('replacing run');
+    //Meteor._SynchronousQueue.prototype._run = function() {
+    //  console.log('running from queue');
+    //  var result = origRun.apply(this, arguments);
+    //  $rootScope.$apply();
+    //  return result;
+    //};
+    var Fibers = Npm.require('fibers');
+    var origRun = Fibers.prototype.run;
+
+    Fibers.prototype.run = function() {
+        var result = origRun.apply(this, arguments);
+        if (!$rootScope.$$phase) {
+          var startTime = new Date();
+          $rootScope.$apply();
+          console.log ('digest time:', new Date() - startTime);
+        }
+        return result;
+    };
   });
 
 var origBootstrap = angular.bootstrap;
 angular.bootstrap = function(modules, config) {
-  return origBootstrap(document, modules, config);
+  Meteor.startup(function() {
+    origBootstrap(document, modules, config);
+  });
 };
 
 

modules/angular-meteor-meteorCollection.js

@@ -277,18 +277,23 @@ angularMeteorCollections.factory('$meteorCollection', ['AngularMeteorCollection'
         }
       }
 
-      /**
-       * Fetches the latest data from Meteor and update the data variable.
-       */
-      Tracker.autorun(function () {
-        // When the reactive func gets recomputated we need to stop any previous
-        // observeChanges
-        Tracker.onInvalidate(function () {
-          ngCollection.stop();
+      if (Meteor.isClient) {
+        /**
+         * Fetches the latest data from Meteor and update the data variable.
+         */
+        Tracker.autorun(function () {
+          // When the reactive func gets recomputated we need to stop any previous
+          // observeChanges
+          Tracker.onInvalidate(function () {
+            ngCollection.stop();
+          });
+          ngCollection.updateCursor(reactiveFunc());
+          setAutoBind();
         });
+      }
+      else {
         ngCollection.updateCursor(reactiveFunc());
-        setAutoBind();
-      });
+      }
 
       return ngCollection;
     }

package.js

@@ -57,7 +57,11 @@ Package.on_use(function (api) {
     'angular-meteor-client.js'
   ], 'client');
 
-  api.add_files('angular-meteor-server.js', 'server');
+  api.add_files(['modules/angular-meteor-meteorCollection.js',
+                  'modules/angular-meteor-subscribe.js',
+                  'modules/angular-meteor-utils.js',
+                  'lib/diff-array.js',
+                  'angular-meteor-server.js'], 'server');
 
   api.add_files('angular-meteor-common.js');
 });

versions.json

@@ -22,7 +22,7 @@
     ],
     [
       "dburles:mongo-collection-instances",
-      "0.3.1"
+      "0.3.3"
     ],
     [
       "ddp",
@@ -48,6 +48,10 @@
       "json",
       "1.0.1"
     ],
+    [
+      "lai:collection-extensions",
+      "0.1.3"
+    ],
     [
       "logging",
       "1.0.5"
@@ -92,6 +96,17 @@
   "pluginDependencies": [
     [
       "compileAngularTemplates",
+      {
+        "deps": "1.0.5",
+        "tracker": "1.0.3",
+        "html-tools": "1.0.2",
+        "underscore": "1.0.1",
+        "meteor": "1.1.3",
+        "htmljs": "1.0.2"
+      }
+    ],
+    [
+      "ngAnnotate",
       {}
     ]
   ],