ncloudchat 0.0.19-beta → 0.0.22-beta

package/lib/CloudChat.js

@@ -250,6 +250,10 @@ function () {
     return _CoreManager["default"].set("PROJECT_ID", projectId);
   };
 
+  NCloudChat.prototype.setToken = function (token) {
+    return _CoreManager["default"].set("TOKEN", token);
+  };
+
   NCloudChat.prototype.setUser = function (user) {
     _CoreManager["default"].set("USER", user);
   };
@@ -351,9 +355,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 +411,7 @@ function () {
 
           case 2:
             subscription = _a.sent();
+            if (subscription) subscription.id = this.ObjectId(subscription.id);
             return [2
             /*return*/
             , subscription];
@@ -460,9 +469,49 @@ function () {
     });
   };
 
+  NCloudChat.prototype.inviteMembers = function (channelId, memberIds) {
+    return __awaiter(this, void 0, void 0, function () {
+      var user, channel, e_4;
+      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]);
+
+            user = _CoreManager["default"].get("USER");
+            if (!user.id) throw Error("unauthorized");
+            return [4
+            /*yield*/
+            , (0, _mutations.createInviteMember)(channelId, memberIds)];
+
+          case 2:
+            channel = _a.sent();
+            return [2
+            /*return*/
+            , channel];
+
+          case 3:
+            e_4 = _a.sent();
+            throw e_4;
+
+          case 4:
+            return [2
+            /*return*/
+            , null];
+        }
+      });
+    });
+  };
+
   NCloudChat.prototype.translateMessage = function (source, target, message) {
     return __awaiter(this, void 0, void 0, function () {
-      var user, result, e_4;
+      var user, result, e_5;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -487,8 +536,8 @@ function () {
             , result];
 
           case 3:
-            e_4 = _a.sent();
-            throw e_4;
+            e_5 = _a.sent();
+            throw e_5;
 
           case 4:
             return [2
@@ -542,7 +591,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 +604,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,6 +693,67 @@ function () {
     return atob(id).split(":")[1];
   };
 
+  NCloudChat.prototype.getMembers = function (filter, sort, option) {
+    if (sort === void 0) {
+      sort = {};
+    }
+
+    if (option === void 0) {
+      option = {};
+    }
+
+    return __awaiter(this, void 0, void 0, function () {
+      var entries, members, e_6;
+
+      var _this = this;
+
+      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.getMembers)((0, _stringify["default"])(filter), (0, _stringify["default"])(sort), (0, _stringify["default"])(option))];
+
+          case 2:
+            entries = _a.sent();
+
+            if (entries) {
+              members = entries.map(function (item) {
+                return __assign(__assign({}, item.node), {
+                  id: _this.ObjectId(item.node.id)
+                });
+              });
+              return [2
+              /*return*/
+              , members];
+            }
+
+            return [2
+            /*return*/
+            , entries];
+
+          case 3:
+            e_6 = _a.sent();
+            throw e_6;
+
+          case 4:
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
   NCloudChat.prototype.getChannels = function (filter, sort, option) {
     if (sort === void 0) {
       sort = {};
@@ -665,7 +764,7 @@ function () {
     }
 
     return __awaiter(this, void 0, void 0, function () {
-      var entries, channels, e_5;
+      var entries, channels, e_7;
 
       var _this = this;
 
@@ -704,8 +803,8 @@ function () {
             , entries];
 
           case 3:
-            e_5 = _a.sent();
-            throw e_5;
+            e_7 = _a.sent();
+            throw e_7;
 
           case 4:
             return [2
@@ -716,9 +815,9 @@ function () {
     });
   };
 
-  NCloudChat.prototype.getChannel = function (channelId) {
+  NCloudChat.prototype.countUnread = function (channelId) {
     return __awaiter(this, void 0, void 0, function () {
-      var entry, e_6;
+      var e_8;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -733,30 +832,95 @@ function () {
 
             return [4
             /*yield*/
-            , (0, _queries.getChannel)(channelId)];
+            , (0, _queries.unreadCount)(channelId)];
 
           case 2:
-            entry = _a.sent();
+            return [2
+            /*return*/
+            , _a.sent()];
 
-            if (entry) {
-              entry.id = this.ObjectId(entry.id);
-              return [2
-              /*return*/
-              , entry];
+          case 3:
+            e_8 = _a.sent();
+            throw e_8;
+
+          case 4:
+            return [2
+            /*return*/
+            , null];
+        }
+      });
+    });
+  };
+
+  NCloudChat.prototype.getSubscription = function (channelId, id) {
+    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.getSubscription)(channelId, id)];
+
+          case 2:
+            return [2
+            /*return*/
+            , _a.sent()];
+
+          case 3:
+            e_9 = _a.sent();
+            throw e_9;
+
+          case 4:
             return [2
             /*return*/
             , null];
+        }
+      });
+    });
+  };
+
+  NCloudChat.prototype.getChannel = function (channelId) {
+    return __awaiter(this, void 0, void 0, function () {
+      var e_10;
+      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_6 = _a.sent();
-            throw e_6;
+            e_10 = _a.sent();
+            throw e_10;
 
           case 4:
             return [2
             /*return*/
-            ];
+            , null];
         }
       });
     });
@@ -764,7 +928,7 @@ function () {
 
   NCloudChat.prototype.getMessage = function (channelId, messageId) {
     return __awaiter(this, void 0, void 0, function () {
-      var entry, e_7;
+      var entry, e_11;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -796,8 +960,8 @@ function () {
             , null];
 
           case 3:
-            e_7 = _a.sent();
-            throw e_7;
+            e_11 = _a.sent();
+            throw e_11;
 
           case 4:
             return [2
@@ -810,7 +974,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_12;
 
       var _this = this;
 
@@ -849,8 +1013,8 @@ function () {
             , entries];
 
           case 3:
-            e_8 = _a.sent();
-            throw e_8;
+            e_12 = _a.sent();
+            throw e_12;
 
           case 4:
             return [2
@@ -863,7 +1027,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_13;
 
       var _this = this;
 
@@ -902,8 +1066,8 @@ function () {
             , entries];
 
           case 3:
-            e_9 = _a.sent();
-            throw e_9;
+            e_13 = _a.sent();
+            throw e_13;
 
           case 4:
             return [2
@@ -916,7 +1080,7 @@ function () {
 
   NCloudChat.prototype.createChannel = function (channel) {
     return __awaiter(this, void 0, void 0, function () {
-      var e_10;
+      var e_14;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -939,8 +1103,45 @@ function () {
             , _a.sent()];
 
           case 3:
-            e_10 = _a.sent();
-            throw e_10;
+            e_14 = _a.sent();
+            throw e_14;
+
+          case 4:
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
+  NCloudChat.prototype.updateChannel = function (channelId, channel) {
+    return __awaiter(this, void 0, void 0, function () {
+      var e_15;
+      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_15 = _a.sent();
+            throw e_15;
 
           case 4:
             return [2
@@ -953,7 +1154,7 @@ function () {
 
   NCloudChat.prototype.deleteChannel = function (channelId) {
     return __awaiter(this, void 0, void 0, function () {
-      var e_11;
+      var e_16;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -976,8 +1177,8 @@ function () {
             , _a.sent()];
 
           case 3:
-            e_11 = _a.sent();
-            throw e_11;
+            e_16 = _a.sent();
+            throw e_16;
 
           case 4:
             return [2
@@ -990,7 +1191,7 @@ function () {
 
   NCloudChat.prototype.markRead = function (channelId, mark) {
     return __awaiter(this, void 0, void 0, function () {
-      var e_12;
+      var e_17;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -1013,8 +1214,8 @@ function () {
             , _a.sent()];
 
           case 3:
-            e_12 = _a.sent();
-            throw e_12;
+            e_17 = _a.sent();
+            throw e_17;
 
           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

@@ -8,7 +8,7 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 
-exports.deleteChannel = exports.updateChannel = exports.createChannel = void 0;
+exports.createInviteMember = exports.deleteChannel = exports.updateChannel = exports.createChannel = void 0;
 
 require("core-js/modules/es6.function.name");
 
@@ -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:
@@ -321,4 +317,52 @@ var deleteChannel = function deleteChannel(channelId) {
   });
 };
 
-exports.deleteChannel = deleteChannel;
+exports.deleteChannel = deleteChannel;
+
+var createInviteMember = function createInviteMember(channelId, memberIds) {
+  return __awaiter(void 0, void 0, void 0, function () {
+    var token, projectId, endpoint, query;
+    return __generator(this, function (_a) {
+      switch (_a.label) {
+        case 0:
+          token = _CoreManager["default"].get("TOKEN");
+          projectId = _CoreManager["default"].get("PROJECT_ID");
+          endpoint = _CoreManager["default"].get('SERVER_URL') + '/graphql';
+          query = "\n    mutation ($projectId: String!, $channelId: String!, $memberIds: [String]!) {\n        createInviteMember(input: {projectId: $projectId, channelId: $channelId, memberIds:$memberIds }) {\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, {
+            method: 'POST',
+            headers: {
+              'Authorization': 'Bearer ' + token,
+              'Content-Type': 'application/json',
+              'Accept': 'application/json'
+            },
+            body: (0, _stringify["default"])({
+              query: query,
+              variables: {
+                projectId: projectId,
+                channelId: channelId,
+                memberIds: memberIds
+              }
+            })
+          }).then(function (res) {
+            return res.json();
+          }).then(function (data) {
+            if (data.errors) {
+              throw data.errors[0];
+            }
+
+            return data.data.createInviteMember.channel;
+          })];
+
+        case 1:
+          return [2
+          /*return*/
+          , _a.sent()];
+      }
+    });
+  });
+};
+
+exports.createInviteMember = createInviteMember;

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*/