Added sails socket connection mutex

addon/adapters/sails-base.js

@@ -4,7 +4,6 @@ import WithLoggerMixin from '../mixins/with-logger';
 
 
 var EmberString = Ember.String;
-var fmt = EmberString.fmt;
 var pluralize = EmberString.pluralize;
 var camelize = EmberString.camelize;
 var run = Ember.run;
@@ -103,7 +102,7 @@ export default DS.RESTAdapter.extend(Ember.Evented, WithLoggerMixin, {
     processRequest = bind(this, function () {
       return this._request(out, url, method, options)
         .then(bind(this, function (response) {
-          this.info(fmt('%@ %@ request on %@: SUCCESS', out.protocol, method, url));
+          this.info(`${out.protocol} ${method} request on ${url}: SUCCESS`);
           this.debug('  → request:', options.data);
           this.debug('  ← response:', response);
           if (this.isErrorObject(response)) {
@@ -115,7 +114,7 @@ export default DS.RESTAdapter.extend(Ember.Evented, WithLoggerMixin, {
           return response;
         }))
         .catch(bind(this, function (error) {
-          this.warn(fmt('%@ %@ request on %@: ERROR', out.protocol, method, url));
+          this.warn(`${out.protocol} ${method} request on ${url}: ERROR`);
           this.info('  → request:', options.data);
           this.info('  ← error:', error);
           return RSVP.reject(error);

addon/adapters/sails-socket.js

@@ -2,7 +2,6 @@ import Ember from 'ember';
 import SailsBaseAdapter from './sails-base';
 
 var EmberString = Ember.String;
-var fmt = EmberString.fmt;
 var camelize = EmberString.camelize;
 var pluralize = EmberString.pluralize;
 var run = Ember.run;
@@ -18,6 +17,7 @@ var debounce = run.debounce;
  * @constructor
  */
 export default SailsBaseAdapter.extend({
+  store: Ember.inject.service(),
   /**
    * Holds the scheduled subscriptions
    * @since 0.0.11
@@ -124,7 +124,7 @@ export default SailsBaseAdapter.extend({
       record.id = message.id;
     }
     payload[pluralize(camelize(type.modelName))] = [record];
-    store.pushPayload(type, payload);
+    store.pushPayload(type.modelName, payload);
   },
 
   /**
@@ -169,8 +169,8 @@ export default SailsBaseAdapter.extend({
     var eventName = camelize(model).toLowerCase();
     var socket = this.sailsSocket;
     if (socket.listenFor(eventName, true)) {
-      this.notice(fmt('setting up adapter to listen for `%@` messages', model));
-      store = this.container.lookup('store:main');
+      this.notice(`setting up adapter to listen for ${model} messages`);
+      store = this.get('store');
       type = store.modelFor(model);
       socket.on(eventName + '.created', bind(this, '_handleSocketRecordCreated', store, type));
       socket.on(eventName + '.updated', bind(this, '_handleSocketRecordUpdated', store, type));
@@ -227,7 +227,7 @@ export default SailsBaseAdapter.extend({
         payload[k] = Object.keys(data[k]);
         this._listenToSocket(k);
       }
-      self.debug(fmt('asking the API to subscribe to some records of type %@', Ember.keys(data).join(', ')));
+      self.debug(`asking the API to subscribe to some records of type ${Object.keys(data).join(', ')}`);
       // ask the API to subscribe to those records
       this.fetchCSRFToken().then(function () {
         self.checkCSRF(payload);

addon/mixins/store.js

@@ -28,16 +28,22 @@ var StoreMixin = Ember.Mixin.create({
    * @method push
    * @inheritDoc
    */
-  push: function (typeName/*, data, _partial*/) {
-    var res = this._super.apply(this, arguments), id, type, adapter;
-    if (this._pushSubscribes && res && (id = res.get('id'))) {
-      type = this.modelFor(typeName);
-      adapter = this.adapterFor(type);
-      if(adapter instanceof SailsSocketAdapter)
-      {
-        adapter._scheduleSubscribe(type, id);
+  push: function (results/*, data, _partial*/) {
+	/* jshint unused:false */
+    var res = this._super.apply(this, arguments), id, type, adapter,
+      resArray = Array.isArray(res) ? res : [res],
+      self = this;
+
+    resArray.forEach(function (res) {
+      if (res && (id = res.get('id'))) {
+        type = self.modelFor(res.constructor.modelName);
+        adapter = self.adapterFor(res.constructor.modelName);
+        if (adapter instanceof SailsSocketAdapter) {
+          adapter._scheduleSubscribe(type, id);
+        }
       }
-    }
+    });
+
     return res;
   },
 

addon/serializers/sails.js

@@ -6,7 +6,6 @@ import SailsSocketAdapter from 'ember-data-sails/adapters/sails-socket';
 
 var $ = Ember.$;
 var EmberString = Ember.String;
-var fmt = EmberString.fmt;
 var pluralize = EmberString.pluralize;
 var computed = Ember.computed;
 
@@ -44,7 +43,7 @@ var SailsSerializer = DS.RESTSerializer.extend(WithLogger, {
    * @method extractArray
    * @inheritDoc
    */
-  extractArray: blueprintsWrapMethod(function (store, primaryType, payload) {
+  normalizeArrayResponse: blueprintsWrapMethod(function (store, primaryType, payload) {
     var newPayload = {};
     newPayload[pluralize(primaryType.modelName)] = payload;
     return this._super(store, primaryType, newPayload);
@@ -55,7 +54,7 @@ var SailsSerializer = DS.RESTSerializer.extend(WithLogger, {
    * @method extractSingle
    * @inheritDoc
    */
-  extractSingle: blueprintsWrapMethod(function (store, primaryType, payload, recordId) {
+  normalizeSingleResponse: blueprintsWrapMethod(function (store, primaryType, payload, recordId) {
     var newPayload;
     if (payload === null) {
       return this._super.apply(this, arguments);
@@ -70,7 +69,7 @@ var SailsSerializer = DS.RESTSerializer.extend(WithLogger, {
    * @method extractDeleteRecord
    * @inheritDoc
    */
-  extractDeleteRecord: blueprintsWrapMethod(function (store, type, payload, id, requestType) {
+  normalizeDeleteRecordResponse: blueprintsWrapMethod(function (store, type, payload, id, requestType) {
     return this._super(store, type, null, id, requestType);
   }),
 
@@ -81,9 +80,9 @@ var SailsSerializer = DS.RESTSerializer.extend(WithLogger, {
    */
   serializeIntoHash: blueprintsWrapMethod(function (data, type, record, options) {
     var json;
-    if (Ember.keys(data).length > 0) {
+    if (Object.keys(data).length > 0) {
       this.error(
-        fmt('trying to serialize multiple records in one hash for type %@', type.modelName),
+        `trying to serialize multiple records in one hash for type ${type.modelName}`,
         data
       );
       throw new Error('Sails does not accept putting multiple records in one hash');
@@ -108,7 +107,7 @@ var SailsSerializer = DS.RESTSerializer.extend(WithLogger, {
    * @method extract
    * @inheritDoc
    */
-  extract: function (store, type/*, payload, id, requestType*/) {
+  normalizeResponse: function (store, type/*, payload, id, requestType*/) {
     var adapter, modelName, isUsingSocketAdapter;
     // this is the only place we have access to the store, so that we can get the adapter and check
     // if it is an instance of sails socket adapter, and so register for events if necessary on that
@@ -146,7 +145,7 @@ var SailsSerializer = DS.RESTSerializer.extend(WithLogger, {
       if ((data = hash[key])) {
         if (rel.kind === 'belongsTo') {
           if (Ember.typeOf(hash[key]) === 'object') {
-            self.debug(fmt('found 1 embedded %@ record:', modelName), hash[key]);
+            self.debug(`found 1 embedded ${modelName} record:`, hash[key]);
             delete hash[key];
             serializer = store.serializerFor(modelName);
             self.store.push(rel.type, serializer.normalize(rel.type, data, null));
@@ -157,15 +156,15 @@ var SailsSerializer = DS.RESTSerializer.extend(WithLogger, {
           serializer = store.serializerFor(modelName);
           hash[key] = data.map(function (item) {
             if (Ember.typeOf(item) === 'object') {
-              self.debug(fmt('found 1 embedded %@ record:', modelName), item);
+              self.debug(`found 1 embedded ${modelName} record:`, item);
               self.store.push(rel.type, serializer.normalize(rel.type, item, null));
               return item.id;
             }
             return item;
           });
         }
         else {
-          self.warn(fmt('unknown relationship kind %@:', rel.kind), rel);
+          self.warn(`unknown relationship kind ${rel.kind}:`, rel);
           throw new Error('Unknown relationship kind ' + rel.kind);
         }
       }

addon/services/sails-socket.js

@@ -7,8 +7,6 @@ var run = Ember.run;
 var bind = run.bind;
 var next = run.next;
 var later = run.later;
-var EmberString = Ember.String;
-var fmt = EmberString.fmt;
 
 /**
  * Shortcut to know if an object is alive or not
@@ -202,7 +200,7 @@ var SailsSocketService = Ember.Object.extend(Ember.Evented, WithLoggerMixin, {
           reject(error ? error : new Ember.Error('Sails socket service destroyed'));
         }
       });
-    }, fmt('getting the connected Sails socket for `%@` request on %@', method, args[0]));
+    }, `getting the connected Sails socket for ${method} request on ${args[0]}`);
   },
 
   /**
@@ -211,7 +209,7 @@ var SailsSocketService = Ember.Object.extend(Ember.Evented, WithLoggerMixin, {
    * @inheritDoc
    */
   trigger: function (event/*, arg*/) {
-    this.debug(fmt('triggering event `%@`', event));
+    this.debug(`triggering event ${event}`);
     return this._super.apply(this, arguments);
   },
 
@@ -234,8 +232,19 @@ var SailsSocketService = Ember.Object.extend(Ember.Evented, WithLoggerMixin, {
     }
     else {
       this.info('socket not connected, listening for connect event before giving it');
+      if(!this._waitingForSockets) {
+        this._waitingForSockets = [];
+      }
+      this._waitingForSockets.push(callback);
+      if(this._waitingForSockets.length > 1) {
+        return;
+      }
       this.one('didConnect', bind(this, function () {
-        callback.call(this, null, this._sailsSocket);
+        var callbacks = this._waitingForSockets;
+        delete this._waitingForSockets;
+        for(var i = 0; i < callbacks.length; i++) {
+          callbacks[i].call(this, null, this._sailsSocket);
+        }
       }));
       if (this.get('isInitialized')) {
         this.info('looks like we are initialized but not connected, reconnecting socket');
@@ -273,7 +282,7 @@ var SailsSocketService = Ember.Object.extend(Ember.Evented, WithLoggerMixin, {
       if (!(meta = this._listeners[event]).isListening) {
         this._sailsSocket._raw.addEventListener(event, meta.method);
         meta.isListening = true;
-        this.info(fmt('attached event `%@` on socket', event));
+        this.info(`attached event ${event} on socket`);
       }
     }
     return this;
@@ -293,7 +302,7 @@ var SailsSocketService = Ember.Object.extend(Ember.Evented, WithLoggerMixin, {
       if ((meta = this._listeners[event]).isListening) {
         this._sailsSocket._raw.removeEventListener(event, meta.method);
         meta.isListening = false;
-        this.info(fmt('detached event `%@` from socket', event));
+        this.info(`detached event ${event} from socket`);
       }
     }
     return this;