ncloudchat 0.0.19-beta → 0.0.20-beta

package/lib/CloudChat.js

@@ -351,9 +351,13 @@ function () {
               _this.dp.dispatch("onDisconnected", reason);
             });
             this.socket.on("message", function (payload) {
-              var message = JSON.parse(payload);
+              try {
+                var message = JSON.parse(payload);
 
-              _this.dp.dispatch("onMessageReceived", message.channel_id, message);
+                _this.dp.dispatch("onMessageReceived", message.channel_id, message);
+              } catch (e) {
+                console.error(e);
+              }
             });
             this.socket.on("event", function (payload) {
               var message = JSON.parse(payload);
@@ -403,6 +407,7 @@ function () {
 
           case 2:
             subscription = _a.sent();
+            if (subscription) subscription.id = this.ObjectId(subscription.id);
             return [2
             /*return*/
             , subscription];
@@ -542,7 +547,7 @@ function () {
     });
   };
 
-  NCloudChat.prototype.sendImage = function (channel, file) {
+  NCloudChat.prototype.sendImage = function (channelId, file) {
     return __awaiter(this, void 0, void 0, function () {
       var user, result;
       return __generator(this, function (_a) {
@@ -555,25 +560,14 @@ function () {
             user = _CoreManager["default"].get("USER");
             return [4
             /*yield*/
-            , (0, _mutations.upload)(channel, file)];
+            , (0, _mutations.upload)(channelId, file)];
 
           case 1:
             result = _a.sent();
             if (!result.status) throw Error(result.message);
-            return [4
-            /*yield*/
-            , this.sendMessage(channel, {
-              type: "file",
-              message: result.url,
-              file: result
-            })];
-
-          case 2:
-            _a.sent();
-
             return [2
             /*return*/
-            ];
+            , result];
         }
       });
     });
@@ -655,7 +649,7 @@ function () {
     return atob(id).split(":")[1];
   };
 
-  NCloudChat.prototype.getChannels = function (filter, sort, option) {
+  NCloudChat.prototype.getMembers = function (filter, sort, option) {
     if (sort === void 0) {
       sort = {};
     }
@@ -665,7 +659,7 @@ function () {
     }
 
     return __awaiter(this, void 0, void 0, function () {
-      var entries, channels, e_5;
+      var entries, members, e_5;
 
       var _this = this;
 
@@ -683,20 +677,20 @@ function () {
 
             return [4
             /*yield*/
-            , (0, _queries.getChannels)((0, _stringify["default"])(filter), (0, _stringify["default"])(sort), (0, _stringify["default"])(option))];
+            , (0, _queries.getMembers)((0, _stringify["default"])(filter), (0, _stringify["default"])(sort), (0, _stringify["default"])(option))];
 
           case 2:
             entries = _a.sent();
 
             if (entries) {
-              channels = entries.map(function (item) {
+              members = entries.map(function (item) {
                 return __assign(__assign({}, item.node), {
                   id: _this.ObjectId(item.node.id)
                 });
               });
               return [2
               /*return*/
-              , channels];
+              , members];
             }
 
             return [2
@@ -716,9 +710,20 @@ function () {
     });
   };
 
-  NCloudChat.prototype.getChannel = function (channelId) {
+  NCloudChat.prototype.getChannels = function (filter, sort, option) {
+    if (sort === void 0) {
+      sort = {};
+    }
+
+    if (option === void 0) {
+      option = {};
+    }
+
     return __awaiter(this, void 0, void 0, function () {
-      var entry, e_6;
+      var entries, channels, e_6;
+
+      var _this = this;
+
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -733,21 +738,25 @@ function () {
 
             return [4
             /*yield*/
-            , (0, _queries.getChannel)(channelId)];
+            , (0, _queries.getChannels)((0, _stringify["default"])(filter), (0, _stringify["default"])(sort), (0, _stringify["default"])(option))];
 
           case 2:
-            entry = _a.sent();
+            entries = _a.sent();
 
-            if (entry) {
-              entry.id = this.ObjectId(entry.id);
+            if (entries) {
+              channels = entries.map(function (item) {
+                return __assign(__assign({}, item.node), {
+                  id: _this.ObjectId(item.node.id)
+                });
+              });
               return [2
               /*return*/
-              , entry];
+              , channels];
             }
 
             return [2
             /*return*/
-            , null];
+            , entries];
 
           case 3:
             e_6 = _a.sent();
@@ -762,9 +771,120 @@ function () {
     });
   };
 
+  NCloudChat.prototype.countUnread = function (channelId) {
+    return __awaiter(this, void 0, void 0, function () {
+      var e_7;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            if (!this.isConnected()) {
+              throw Error("You are not connected.");
+            }
+
+            _a.label = 1;
+
+          case 1:
+            _a.trys.push([1, 3,, 4]);
+
+            return [4
+            /*yield*/
+            , (0, _queries.unreadCount)(channelId)];
+
+          case 2:
+            return [2
+            /*return*/
+            , _a.sent()];
+
+          case 3:
+            e_7 = _a.sent();
+            throw e_7;
+
+          case 4:
+            return [2
+            /*return*/
+            , null];
+        }
+      });
+    });
+  };
+
+  NCloudChat.prototype.getSubscription = function (channelId, id) {
+    return __awaiter(this, void 0, void 0, function () {
+      var e_8;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            if (!this.isConnected()) {
+              throw Error("You are not connected.");
+            }
+
+            _a.label = 1;
+
+          case 1:
+            _a.trys.push([1, 3,, 4]);
+
+            return [4
+            /*yield*/
+            , (0, _queries.getSubscription)(channelId, id)];
+
+          case 2:
+            return [2
+            /*return*/
+            , _a.sent()];
+
+          case 3:
+            e_8 = _a.sent();
+            throw e_8;
+
+          case 4:
+            return [2
+            /*return*/
+            , null];
+        }
+      });
+    });
+  };
+
+  NCloudChat.prototype.getChannel = function (channelId) {
+    return __awaiter(this, void 0, void 0, function () {
+      var e_9;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            if (!this.isConnected()) {
+              throw Error("You are not connected.");
+            }
+
+            _a.label = 1;
+
+          case 1:
+            _a.trys.push([1, 3,, 4]);
+
+            return [4
+            /*yield*/
+            , (0, _queries.getChannel)(channelId)];
+
+          case 2:
+            return [2
+            /*return*/
+            , _a.sent()];
+
+          case 3:
+            e_9 = _a.sent();
+            throw e_9;
+
+          case 4:
+            return [2
+            /*return*/
+            , null];
+        }
+      });
+    });
+  };
+
   NCloudChat.prototype.getMessage = function (channelId, messageId) {
     return __awaiter(this, void 0, void 0, function () {
-      var entry, e_7;
+      var entry, e_10;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -796,8 +916,8 @@ function () {
             , null];
 
           case 3:
-            e_7 = _a.sent();
-            throw e_7;
+            e_10 = _a.sent();
+            throw e_10;
 
           case 4:
             return [2
@@ -810,7 +930,7 @@ function () {
 
   NCloudChat.prototype.getMessages = function (filter, sort, option) {
     return __awaiter(this, void 0, void 0, function () {
-      var entries, messages, e_8;
+      var entries, messages, e_11;
 
       var _this = this;
 
@@ -849,8 +969,8 @@ function () {
             , entries];
 
           case 3:
-            e_8 = _a.sent();
-            throw e_8;
+            e_11 = _a.sent();
+            throw e_11;
 
           case 4:
             return [2
@@ -863,7 +983,7 @@ function () {
 
   NCloudChat.prototype.getSubscriptions = function (filter, sort, option) {
     return __awaiter(this, void 0, void 0, function () {
-      var entries, subscribes, e_9;
+      var entries, subscribes, e_12;
 
       var _this = this;
 
@@ -902,8 +1022,8 @@ function () {
             , entries];
 
           case 3:
-            e_9 = _a.sent();
-            throw e_9;
+            e_12 = _a.sent();
+            throw e_12;
 
           case 4:
             return [2
@@ -916,7 +1036,7 @@ function () {
 
   NCloudChat.prototype.createChannel = function (channel) {
     return __awaiter(this, void 0, void 0, function () {
-      var e_10;
+      var e_13;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -939,8 +1059,45 @@ function () {
             , _a.sent()];
 
           case 3:
-            e_10 = _a.sent();
-            throw e_10;
+            e_13 = _a.sent();
+            throw e_13;
+
+          case 4:
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
+  NCloudChat.prototype.updateChannel = function (channelId, channel) {
+    return __awaiter(this, void 0, void 0, function () {
+      var e_14;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            if (!this.isConnected()) {
+              throw Error("You are not connected.");
+            }
+
+            _a.label = 1;
+
+          case 1:
+            _a.trys.push([1, 3,, 4]);
+
+            return [4
+            /*yield*/
+            , (0, _mutations.updateChannel)(channelId, channel)];
+
+          case 2:
+            return [2
+            /*return*/
+            , _a.sent()];
+
+          case 3:
+            e_14 = _a.sent();
+            throw e_14;
 
           case 4:
             return [2
@@ -953,7 +1110,7 @@ function () {
 
   NCloudChat.prototype.deleteChannel = function (channelId) {
     return __awaiter(this, void 0, void 0, function () {
-      var e_11;
+      var e_15;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -976,8 +1133,8 @@ function () {
             , _a.sent()];
 
           case 3:
-            e_11 = _a.sent();
-            throw e_11;
+            e_15 = _a.sent();
+            throw e_15;
 
           case 4:
             return [2
@@ -990,7 +1147,7 @@ function () {
 
   NCloudChat.prototype.markRead = function (channelId, mark) {
     return __awaiter(this, void 0, void 0, function () {
-      var e_12;
+      var e_16;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -1013,8 +1170,8 @@ function () {
             , _a.sent()];
 
           case 3:
-            e_12 = _a.sent();
-            throw e_12;
+            e_16 = _a.sent();
+            throw e_16;
 
           case 4:
             return [2

package/lib/Util.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property");
+
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports.ObjectId = void 0;
+
+require("core-js/modules/es6.regexp.split");
+
+var ObjectId = function ObjectId(id) {
+  if (!id) return "";
+  return atob(id).split(":")[1];
+};
+
+exports.ObjectId = ObjectId;

package/lib/mutations/channel.js

@@ -231,7 +231,7 @@ var updateChannel = function updateChannel(channelId, channel) {
           endpoint = _CoreManager["default"].get('SERVER_URL') + '/graphql';
           if (!channel.members) channel.members = [];
           console.log(channel);
-          query = "\n    mutation (\n        $projectId: String!, \n        $name: String!, \n        $type: String!,\n        $uniqueId: String,\n        $translation: Boolean,\n        $push: Boolean,\n        $linkUrl: String,\n        $imageUrl: String,\n        $id: String,\n        $members: [String]\n        ) {\n         updateChannel(\n          input: { \n            projectId: $projectId, \n            name: $name, \n            type: $type,\n            id: $id,\n            members: $members,\n            uniqueId: $uniqueId,\n            translation:$translation,\n            push:$push,\n            linkUrl:$linkUrl,\n            imageUrl:$imageUrl\n            }\n        ) {\n          channel {\n            id\n            project_id\n            name\n            user_id\n            unique_id\n            is_private\n            translation\n            members\n            push\n            link_url\n            image_url      \n            created_at\n            updated_at\n            }\n        }\n    }  \n    ";
+          query = "\n    mutation (\n        $projectId: String!, \n        $name: String!, \n        $translation: Boolean,\n        $linkUrl: String,\n        $imageUrl: String,\n        $id: ID!,\n        ) {\n         updateChannel(\n          input: { \n            projectId: $projectId, \n            name: $name, \n            id: $id,\n            translation:$translation,\n            linkUrl:$linkUrl,\n            imageUrl:$imageUrl\n            }\n        ) {\n          channel {\n            id\n            project_id\n            name\n            user_id\n            unique_id\n            is_private\n            translation\n            members\n            push\n            link_url\n            image_url      \n            created_at\n            updated_at\n            }\n        }\n    }  \n    ";
           return [4
           /*yield*/
           , fetch(endpoint, {
@@ -246,13 +246,9 @@ var updateChannel = function updateChannel(channelId, channel) {
               variables: {
                 projectId: projectId,
                 id: channelId,
-                type: channel.type,
                 name: channel.name,
-                members: channel.members,
-                push: channel.push,
                 link_url: channel.linkUrl,
-                image_url: channel.imageUrl,
-                translation: channel.translation
+                image_url: channel.imageUrl
               }
             })
           }).then(function (res) {
@@ -262,7 +258,7 @@ var updateChannel = function updateChannel(channelId, channel) {
               throw data.errors[0];
             }
 
-            return data.data.createChannel.channel;
+            return data.data.updateChannel.channel;
           })];
 
         case 1:

package/lib/mutations/message.js

@@ -208,7 +208,7 @@ var translate = function translate(source, target, message) {
 
 exports.translate = translate;
 
-var upload = function upload(channel, file) {
+var upload = function upload(channelId, file) {
   return __awaiter(void 0, void 0, void 0, function () {
     var token, projectId, endpoint, form, result;
     return __generator(this, function (_a) {
@@ -219,6 +219,7 @@ var upload = function upload(channel, file) {
           endpoint = _CoreManager["default"].get('SERVER_URL') + '/upload';
           form = new FormData();
           form.append('file', file);
+          form.append('channelId', channelId);
           form.append('upload', '1');
           return [4
           /*yield*/

package/lib/queries/channel.js

@@ -8,7 +8,7 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 
-exports.getChannel = exports.getChannels = void 0;
+exports.getChannels = exports.getChannel = void 0;
 
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
 
@@ -20,6 +20,8 @@ var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/pr
 
 var _CoreManager = _interopRequireDefault(require("../CoreManager"));
 
+var _Util = require("../Util");
+
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -163,7 +165,7 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
-var getChannels = function getChannels(filter, sort, option) {
+var getChannel = function getChannel(id) {
   return __awaiter(void 0, void 0, void 0, function () {
     var token, projectId, endpoint, query;
     return __generator(this, function (_a) {
@@ -178,7 +180,7 @@ var getChannels = function getChannels(filter, sort, option) {
           /*return*/
           , null];
           endpoint = _CoreManager["default"].get('SERVER_URL') + '/graphql';
-          query = "\n        query channels ($projectId: String!, $filter: String!, $sort: String, $option:String) {\n            channels(projectId: $projectId, filter:$filter, sort:$sort, option:$option) {\n                totalCount\n                edges {\n                    node {\n                        id\n                        project_id\n                        name\n                        user_id\n                        unique_id\n                        is_private\n                        translation\n                        members\n                        push\n                        link_url\n                        image_url      \n                        created_at\n                        updated_at\n                    }\n                }\n            }\n        }\n    ";
+          query = "\n        query channel ($projectId: String!, $id: String!) {\n            channel(projectId: $projectId, id:$id) {\n                id\n                project_id\n                name\n                user_id\n                unique_id\n                is_private\n                translation\n                members\n                push\n                link_url\n                image_url      \n                created_at\n                updated_at\n            }\n        }\n    ";
           return [4
           /*yield*/
           , fetch(endpoint, {
@@ -192,19 +194,18 @@ var getChannels = function getChannels(filter, sort, option) {
               query: query,
               variables: {
                 projectId: projectId,
-                filter: filter,
-                sort: sort,
-                option: option
+                id: id
               }
             })
           }).then(function (res) {
             return res.json();
           }).then(function (data) {
-            if (data.data.channels) {
-              return data.data.channels.edges;
+            if (data.data.channel) {
+              data.data.channel.id = (0, _Util.ObjectId)(data.data.channel.id);
+              return data.data.channel;
             }
 
-            return [];
+            return false;
           })];
 
         case 1:
@@ -216,9 +217,9 @@ var getChannels = function getChannels(filter, sort, option) {
   });
 };
 
-exports.getChannels = getChannels;
+exports.getChannel = getChannel;
 
-var getChannel = function getChannel(id) {
+var getChannels = function getChannels(filter, sort, option) {
   return __awaiter(void 0, void 0, void 0, function () {
     var token, projectId, endpoint, query;
     return __generator(this, function (_a) {
@@ -233,7 +234,7 @@ var getChannel = function getChannel(id) {
           /*return*/
           , null];
           endpoint = _CoreManager["default"].get('SERVER_URL') + '/graphql';
-          query = "\n        query channel ($projectId: String!, $id: String!) {\n            channel(projectId: $projectId, id:$id) {\n                id\n                project_id\n                name\n                user_id\n                unique_id\n                is_private\n                translation\n                members\n                push\n                link_url\n                image_url      \n                created_at\n                updated_at\n            }\n        }\n    ";
+          query = "\n        query channels ($projectId: String!, $filter: String!, $sort: String, $option:String) {\n            channels(projectId: $projectId, filter:$filter, sort:$sort, option:$option) {\n                totalCount\n                edges {\n                    node {\n                        id\n                        project_id\n                        name\n                        user_id\n                        unique_id\n                        is_private\n                        translation\n                        members\n                        push\n                        link_url\n                        image_url      \n                        created_at\n                        updated_at\n                    }\n                }\n            }\n        }\n    ";
           return [4
           /*yield*/
           , fetch(endpoint, {
@@ -247,19 +248,19 @@ var getChannel = function getChannel(id) {
               query: query,
               variables: {
                 projectId: projectId,
-                id: id
+                filter: filter,
+                sort: sort,
+                option: option
               }
             })
           }).then(function (res) {
             return res.json();
           }).then(function (data) {
-            console.log(data.data);
-
-            if (data.data.channel) {
-              return data.data.channel;
+            if (data.data.channels) {
+              return data.data.channels.edges;
             }
 
-            return false;
+            return [];
           })];
 
         case 1:
@@ -271,4 +272,4 @@ var getChannel = function getChannel(id) {
   });
 };
 
-exports.getChannel = getChannel;
+exports.getChannels = getChannels;

package/lib/queries/index.js

@@ -75,6 +75,19 @@ _Object$keys(_friend).forEach(function (key) {
   });
 });
 
+var _member = require("./member");
+
+_Object$keys(_member).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+
+  _Object$defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _member[key];
+    }
+  });
+});
+
 var _messageread = require("./messageread");
 
 _Object$keys(_messageread).forEach(function (key) {