@roadmanjs/chat 0.0.57 → 0.0.58
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/chat/methods/ChatConvo.methods.d.ts +1 -1
- package/dist/chat/methods/ChatConvo.methods.js +14 -3
- package/dist/chat/methods/ChatConvo.methods.js.map +1 -1
- package/dist/chat/methods/ChatMessageResolver.methods.js +3 -3
- package/dist/chat/methods/ChatMessageResolver.methods.js.map +1 -1
- package/dist/shared/pubsub.utils.d.ts +7 -0
- package/dist/shared/pubsub.utils.js +26 -1
- package/dist/shared/pubsub.utils.js.map +1 -1
- package/package.json +4 -1
|
@@ -41,11 +41,11 @@ exports.removeUnreadCount = exports.updateConvoSubscriptions = exports.updateCon
|
|
|
41
41
|
const ChatConvo_model_1 = __importStar(require("../models/ChatConvo.model"));
|
|
42
42
|
const models_1 = require("../models");
|
|
43
43
|
const couchset_1 = require("@roadmanjs/couchset");
|
|
44
|
+
const pubsub_utils_1 = require("../../shared/pubsub.utils");
|
|
44
45
|
const client_graphql_1 = require("@stoqey/client-graphql");
|
|
45
46
|
const compact_1 = __importDefault(require("lodash/compact"));
|
|
46
47
|
const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
|
|
47
48
|
const logs_1 = require("@roadmanjs/logs");
|
|
48
|
-
const pubsub_utils_1 = require("../../shared/pubsub.utils");
|
|
49
49
|
const createAConvoAndReturnIt = async (newConvo) => {
|
|
50
50
|
const { members = [], group = false, owner } = newConvo, others = __rest(newConvo, ["members", "group", "owner"]);
|
|
51
51
|
const [errorCreatingConvo, createdChatConvo = []] = await (0, client_graphql_1.awaitTo)((0, exports.createChatConvoType)(Object.assign(Object.assign({}, others), { members,
|
|
@@ -175,8 +175,15 @@ exports.updateConvoLastMessage = updateConvoLastMessage;
|
|
|
175
175
|
*/
|
|
176
176
|
const updateConvoSubscriptions = async (args) => {
|
|
177
177
|
const { context, sender, convoId, data } = args;
|
|
178
|
+
const getSubscriptionData = () => {
|
|
179
|
+
if (data.id) {
|
|
180
|
+
// contains message payload
|
|
181
|
+
return { message: data.id };
|
|
182
|
+
}
|
|
183
|
+
return data;
|
|
184
|
+
};
|
|
178
185
|
const publishToMessageTopic = async () => {
|
|
179
|
-
return (0, pubsub_utils_1.publishMessageToTopic)(context, [models_1.ChatMessage.name], Object.assign({ convoId, owner: sender },
|
|
186
|
+
return (0, pubsub_utils_1.publishMessageToTopic)(context, [models_1.ChatMessage.name], Object.assign({ convoId, owner: sender }, getSubscriptionData()));
|
|
180
187
|
};
|
|
181
188
|
try {
|
|
182
189
|
// send to message topic
|
|
@@ -192,10 +199,14 @@ const updateConvoSubscriptions = async (args) => {
|
|
|
192
199
|
(0, logs_1.log)(`updated subscriptions isPublicChat`);
|
|
193
200
|
return;
|
|
194
201
|
}
|
|
202
|
+
// push notification here
|
|
195
203
|
// update sockets, no need for results
|
|
196
204
|
await (0, client_graphql_1.awaitTo)(Promise.all(membersConvos.map((convo) => {
|
|
205
|
+
const pushmessage = Object.assign(Object.assign({}, data), { convoId, owner: convo.owner });
|
|
206
|
+
// unhandled promises
|
|
207
|
+
(0, pubsub_utils_1.sendPushNotification)(sender, pushmessage);
|
|
197
208
|
// Send subscriptions to owners
|
|
198
|
-
return (0, pubsub_utils_1.publishMessageToTopic)(context, [ChatConvo_model_1.ChatConvo.name], Object.assign({ convoId, owner: convo.owner },
|
|
209
|
+
return (0, pubsub_utils_1.publishMessageToTopic)(context, [ChatConvo_model_1.ChatConvo.name], Object.assign({ convoId, owner: convo.owner }, getSubscriptionData())); // update sockets
|
|
199
210
|
})));
|
|
200
211
|
(0, logs_1.log)(`updated subscriptions from=${sender} with data=${data}`, membersConvos.map((uc) => uc.id));
|
|
201
212
|
// update sockets
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatConvo.methods.js","sourceRoot":"","sources":["../../../src/chat/methods/ChatConvo.methods.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6EAKmC;AACnC,sCAAwD;AACxD,kDAAoE;
|
|
1
|
+
{"version":3,"file":"ChatConvo.methods.js","sourceRoot":"","sources":["../../../src/chat/methods/ChatConvo.methods.ts"],"names":[],"mappings":"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"}
|
|
@@ -148,17 +148,17 @@ const createChatMessage = async (ctx, args) => {
|
|
|
148
148
|
// update conversation with new lastMessage
|
|
149
149
|
// update message
|
|
150
150
|
if (createdOrUpdate) {
|
|
151
|
-
const
|
|
151
|
+
const messageId = createdOrUpdate.id;
|
|
152
152
|
const convoId = createdOrUpdate.convoId;
|
|
153
153
|
await (0, __1.updateConvoLastMessage)({
|
|
154
154
|
sender: owner,
|
|
155
155
|
convoId,
|
|
156
|
-
lastMessageId:
|
|
156
|
+
lastMessageId: messageId,
|
|
157
157
|
}); // update all convos
|
|
158
158
|
await (0, _1.updateConvoSubscriptions)({
|
|
159
159
|
sender: owner,
|
|
160
160
|
convoId,
|
|
161
|
-
data: {
|
|
161
|
+
data: Object.assign({}, createdOrUpdate),
|
|
162
162
|
context: ctx,
|
|
163
163
|
});
|
|
164
164
|
return { success: true, data: createdOrUpdate };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatMessageResolver.methods.js","sourceRoot":"","sources":["../../../src/chat/methods/ChatMessageResolver.methods.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ChatMessageResolver.methods.js","sourceRoot":"","sources":["../../../src/chat/methods/ChatMessageResolver.methods.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,3 +7,10 @@ import { ContextType } from './ContextType';
|
|
|
7
7
|
* @returns
|
|
8
8
|
*/
|
|
9
9
|
export declare const publishMessageToTopic: (ctx: ContextType, topic: string | string[], data: any) => Promise<boolean>;
|
|
10
|
+
interface SendPushNotificationData extends Record<string, any> {
|
|
11
|
+
message: string;
|
|
12
|
+
owner: string;
|
|
13
|
+
convoId: string;
|
|
14
|
+
}
|
|
15
|
+
export declare const sendPushNotification: (senderId: string, data: SendPushNotificationData) => Promise<void>;
|
|
16
|
+
export {};
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.publishMessageToTopic = void 0;
|
|
3
|
+
exports.sendPushNotification = exports.publishMessageToTopic = void 0;
|
|
4
|
+
const auth_1 = require("@roadmanjs/auth");
|
|
5
|
+
const logs_1 = require("@roadmanjs/logs");
|
|
6
|
+
const push_1 = require("@roadmanjs/push");
|
|
4
7
|
/**
|
|
5
8
|
* Publish any message to a topic
|
|
6
9
|
* @param ctx
|
|
@@ -23,4 +26,26 @@ const publishMessageToTopic = async (ctx, topic, data) => {
|
|
|
23
26
|
return false;
|
|
24
27
|
};
|
|
25
28
|
exports.publishMessageToTopic = publishMessageToTopic;
|
|
29
|
+
const sendPushNotification = async (senderId, data) => {
|
|
30
|
+
try {
|
|
31
|
+
const { owner, message } = data;
|
|
32
|
+
const sender = await auth_1.UserModel.findById(senderId);
|
|
33
|
+
if (sender) {
|
|
34
|
+
const imageUrl = sender.avatar; // todo default
|
|
35
|
+
const fullnames = sender.fullname || sender.firstname + ' ' + sender.lastname;
|
|
36
|
+
await (0, push_1.sendMessageToUser)(owner, {
|
|
37
|
+
data: Object.assign({ type: 'chat' }, data),
|
|
38
|
+
notification: {
|
|
39
|
+
title: `Message from ${fullnames}`,
|
|
40
|
+
body: message.substring(0, 50),
|
|
41
|
+
imageUrl: imageUrl,
|
|
42
|
+
},
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
(0, logs_1.log)('error sending push notification', error);
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
exports.sendPushNotification = sendPushNotification;
|
|
26
51
|
//# sourceMappingURL=pubsub.utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pubsub.utils.js","sourceRoot":"","sources":["../../src/shared/pubsub.utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"pubsub.utils.js","sourceRoot":"","sources":["../../src/shared/pubsub.utils.ts"],"names":[],"mappings":";;;AAAA,0CAAoD;AAGpD,0CAAoC;AACpC,0CAAkD;AAElD;;;;;;GAMG;AACI,MAAM,qBAAqB,GAAG,KAAK,EACtC,GAAgB,EAChB,KAAwB,EACxB,IAAS,EACO,EAAE;IAClB,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE;QACnB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACtB,MAAM,OAAO,CAAC,GAAG,CACb,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBACd,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACzC,CAAC,CAAC,CACL,CAAC;SACL;aAAM;YACH,MAAM,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;SACzC;QAED,OAAO,IAAI,CAAC;KACf;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAnBW,QAAA,qBAAqB,yBAmBhC;AAQK,MAAM,oBAAoB,GAAG,KAAK,EACrC,QAAgB,EAChB,IAA8B,EACjB,EAAE;IACf,IAAI;QACA,MAAM,EAAC,KAAK,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC;QAE9B,MAAM,MAAM,GAAa,MAAM,gBAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAE5D,IAAI,MAAM,EAAE;YACR,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe;YAE/C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,SAAS,GAAG,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC;YAE9E,MAAM,IAAA,wBAAiB,EAAC,KAAK,EAAE;gBAC3B,IAAI,kBACA,IAAI,EAAE,MAAM,IACT,IAAI,CACV;gBACD,YAAY,EAAE;oBACV,KAAK,EAAE,gBAAgB,SAAS,EAAE;oBAClC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC;oBAC9B,QAAQ,EAAE,QAAQ;iBACrB;aACJ,CAAC,CAAC;SACN;KACJ;IAAC,OAAO,KAAK,EAAE;QACZ,IAAA,UAAG,EAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;KACjD;AACL,CAAC,CAAC;AA7BW,QAAA,oBAAoB,wBA6B/B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@roadmanjs/chat",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.58",
|
|
4
4
|
"description": " A roadman for chat and groups, using UserType from 'auth'",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -71,7 +71,9 @@
|
|
|
71
71
|
"typescript": "^4.4.3"
|
|
72
72
|
},
|
|
73
73
|
"peerDependencies": {
|
|
74
|
+
"@roadmanjs/auth": "^0.0.25",
|
|
74
75
|
"@roadmanjs/couchset": ">=0.0.8",
|
|
76
|
+
"@roadmanjs/firebase-admin": "^0.0.12",
|
|
75
77
|
"@roadmanjs/logs": ">=0.0.1",
|
|
76
78
|
"couchset": ">=0.0.16",
|
|
77
79
|
"typescript": ">=2.0"
|
|
@@ -81,6 +83,7 @@
|
|
|
81
83
|
"@roadmanjs/couchset": "^0.0.8",
|
|
82
84
|
"@roadmanjs/firebase-admin": "^0.0.12",
|
|
83
85
|
"@roadmanjs/logs": "^0.0.1",
|
|
86
|
+
"@roadmanjs/push": "^0.0.1",
|
|
84
87
|
"@stoqey/client-graphql": "^1.1.12",
|
|
85
88
|
"couchset": "^0.0.16",
|
|
86
89
|
"graphql-type-json": "^0.3.2",
|