@mathrunet/masamune 1.10.2 → 1.10.3

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/CHANGELOG.md CHANGED
@@ -1,3 +1,12 @@
1
+ ## [1.10.3](https://github.com/mathrunet/node_masamune/compare/v1.10.2...v1.10.3) (2023-12-22)
2
+
3
+
4
+ ### fix
5
+
6
+ * Push notifications do not generate errors. ([1cf06f4](https://github.com/mathrunet/node_masamune/commit/1cf06f42197b59fb9edaf9938bcf796cbb335e0c))
7
+
8
+
9
+
1
10
  ## [1.10.2](https://github.com/mathrunet/node_masamune/compare/v1.10.1...v1.10.2) (2023-12-22)
2
11
 
3
12
 
@@ -82,7 +82,55 @@ function sendNotification({ title, body, data, channelId, token, topic, }) {
82
82
  token = [token];
83
83
  }
84
84
  for (let t of token) {
85
- console.log({
85
+ try {
86
+ const messageId = yield admin.messaging().send({
87
+ notification: {
88
+ title: title,
89
+ body: body,
90
+ },
91
+ android: {
92
+ priority: "high",
93
+ notification: {
94
+ title: title,
95
+ body: body,
96
+ clickAction: "FLUTTER_NOTIFICATION_CLICK",
97
+ channelId: channelId !== null && channelId !== void 0 ? channelId : undefined,
98
+ },
99
+ },
100
+ data: data,
101
+ token: t,
102
+ });
103
+ res[t] = messageId;
104
+ }
105
+ catch (e) {
106
+ console.log(e);
107
+ console.log({
108
+ notification: {
109
+ title: title,
110
+ body: body,
111
+ },
112
+ android: {
113
+ priority: "high",
114
+ notification: {
115
+ title: title,
116
+ body: body,
117
+ clickAction: "FLUTTER_NOTIFICATION_CLICK",
118
+ channelId: channelId !== null && channelId !== void 0 ? channelId : undefined,
119
+ },
120
+ },
121
+ data: data,
122
+ token: t,
123
+ });
124
+ }
125
+ }
126
+ return {
127
+ success: true,
128
+ results: res,
129
+ };
130
+ }
131
+ else if (topic !== undefined && topic !== null) {
132
+ try {
133
+ const messageId = yield admin.messaging().send({
86
134
  notification: {
87
135
  title: title,
88
136
  body: body,
@@ -97,9 +145,13 @@ function sendNotification({ title, body, data, channelId, token, topic, }) {
97
145
  },
98
146
  },
99
147
  data: data,
100
- token: t,
148
+ topic: topic,
101
149
  });
102
- const messageId = yield admin.messaging().send({
150
+ res[topic] = messageId;
151
+ }
152
+ catch (e) {
153
+ console.log(e);
154
+ console.log({
103
155
  notification: {
104
156
  title: title,
105
157
  body: body,
@@ -114,56 +166,14 @@ function sendNotification({ title, body, data, channelId, token, topic, }) {
114
166
  },
115
167
  },
116
168
  data: data,
117
- token: t,
169
+ topic: topic,
118
170
  });
119
- res[t] = messageId;
120
171
  }
121
172
  return {
122
173
  success: true,
123
174
  results: res,
124
175
  };
125
176
  }
126
- else if (topic !== undefined && topic !== null) {
127
- console.log({
128
- notification: {
129
- title: title,
130
- body: body,
131
- },
132
- android: {
133
- priority: "high",
134
- notification: {
135
- title: title,
136
- body: body,
137
- clickAction: "FLUTTER_NOTIFICATION_CLICK",
138
- channelId: channelId !== null && channelId !== void 0 ? channelId : undefined,
139
- },
140
- },
141
- data: data,
142
- topic: topic,
143
- });
144
- const messageId = yield admin.messaging().send({
145
- notification: {
146
- title: title,
147
- body: body,
148
- },
149
- android: {
150
- priority: "high",
151
- notification: {
152
- title: title,
153
- body: body,
154
- clickAction: "FLUTTER_NOTIFICATION_CLICK",
155
- channelId: channelId !== null && channelId !== void 0 ? channelId : undefined,
156
- },
157
- },
158
- data: data,
159
- topic: topic,
160
- });
161
- res[topic] = messageId;
162
- return {
163
- success: true,
164
- results: res,
165
- };
166
- }
167
177
  }
168
178
  catch (err) {
169
179
  throw err;
@@ -1 +1 @@
1
- {"version":3,"file":"send_notification.js","sourceRoot":"","sources":["../../src/lib/send_notification.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"send_notification.js","sourceRoot":"","sources":["../../src/lib/send_notification.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mathrunet/masamune",
3
- "version": "1.10.2",
3
+ "version": "1.10.3",
4
4
  "description": "Manages packages for the server portion (NodeJS) of the Masamune framework.",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",