@starak/sim800c 0.0.9 → 0.0.11
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/index.d.ts +26 -8
- package/dist/index.js +33 -27
- package/package.json +1 -1
package/dist/index.d.ts
CHANGED
|
@@ -2,26 +2,42 @@
|
|
|
2
2
|
import EventEmitter from "events";
|
|
3
3
|
import { SerialPort } from "serialport";
|
|
4
4
|
import { pduMessage } from "pdu.ts";
|
|
5
|
-
|
|
5
|
+
interface UDH {
|
|
6
6
|
parts: number;
|
|
7
7
|
current_part: number;
|
|
8
8
|
reference_number: string;
|
|
9
9
|
length: string;
|
|
10
10
|
iei: string;
|
|
11
11
|
}
|
|
12
|
-
|
|
12
|
+
interface EpduMessage extends pduMessage {
|
|
13
13
|
udh?: UDH;
|
|
14
14
|
multipart: boolean;
|
|
15
15
|
parts: number;
|
|
16
16
|
parts_raw?: GsmMessage[];
|
|
17
17
|
sender?: string;
|
|
18
18
|
senderType?: number;
|
|
19
|
+
time: Date;
|
|
19
20
|
}
|
|
20
|
-
|
|
21
|
+
interface GsmMessage {
|
|
21
22
|
index: number;
|
|
22
23
|
message: EpduMessage;
|
|
23
24
|
raw: string;
|
|
24
|
-
|
|
25
|
+
}
|
|
26
|
+
export interface Message {
|
|
27
|
+
index: number;
|
|
28
|
+
parts: number;
|
|
29
|
+
indexes: number[];
|
|
30
|
+
text: string;
|
|
31
|
+
sender: string;
|
|
32
|
+
time: Date;
|
|
33
|
+
}
|
|
34
|
+
interface ParsedPDUMessage {
|
|
35
|
+
index: number;
|
|
36
|
+
message: EpduMessage;
|
|
37
|
+
}
|
|
38
|
+
interface PDUMessage {
|
|
39
|
+
index: number;
|
|
40
|
+
raw: string;
|
|
25
41
|
}
|
|
26
42
|
export * from "serialport";
|
|
27
43
|
export declare class GSM extends EventEmitter {
|
|
@@ -38,9 +54,11 @@ export declare class GSM extends EventEmitter {
|
|
|
38
54
|
private setMessage;
|
|
39
55
|
rejectCalls(): Promise<void>;
|
|
40
56
|
sendMessage(number: string, message: string): Promise<void>;
|
|
41
|
-
deleteMessage(msg:
|
|
57
|
+
deleteMessage(msg: Message): Promise<void>;
|
|
42
58
|
deleteAllMessages(): Promise<void>;
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
59
|
+
getAllPDUMessages(): Promise<PDUMessage[]>;
|
|
60
|
+
parsePDUMessage(msg: PDUMessage): ParsedPDUMessage;
|
|
61
|
+
getMessages(): Promise<Message[]>;
|
|
62
|
+
getMessage(index: number): Promise<Message>;
|
|
63
|
+
static convertToCleanMessage(message: ParsedPDUMessage): Message;
|
|
46
64
|
}
|
package/dist/index.js
CHANGED
|
@@ -27,17 +27,13 @@ class GSM extends events_1.default {
|
|
|
27
27
|
constructor(path) {
|
|
28
28
|
super();
|
|
29
29
|
this.onDataHandler = async (data) => {
|
|
30
|
-
var _a;
|
|
31
30
|
if (data.includes('+CMTI:')) { // Incoming Message
|
|
32
31
|
const index = data.toString().split(',')[1];
|
|
33
32
|
const message = await this.getMessage(+index);
|
|
34
33
|
if (message) {
|
|
35
|
-
if (
|
|
34
|
+
if (message.parts === message.indexes.length) {
|
|
36
35
|
this.emit('newMessage', message);
|
|
37
36
|
}
|
|
38
|
-
else {
|
|
39
|
-
this.emit('multipartMessage', message.message.udh);
|
|
40
|
-
}
|
|
41
37
|
}
|
|
42
38
|
else {
|
|
43
39
|
console.log('Error getting incoming message.', data.toString());
|
|
@@ -109,22 +105,16 @@ class GSM extends events_1.default {
|
|
|
109
105
|
await this.setMessage(message);
|
|
110
106
|
}
|
|
111
107
|
async deleteMessage(msg) {
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
indexes = ((_a = msg.message.parts_raw) === null || _a === void 0 ? void 0 : _a.map(m => m.index)) || [];
|
|
116
|
-
}
|
|
117
|
-
else if (msg) {
|
|
118
|
-
indexes = [msg.index];
|
|
119
|
-
}
|
|
120
|
-
for (const i of indexes) {
|
|
108
|
+
if (!msg)
|
|
109
|
+
return;
|
|
110
|
+
for (const i of msg.indexes) {
|
|
121
111
|
await this.sendCommand(`AT+CMGD=${i}`);
|
|
122
112
|
}
|
|
123
113
|
}
|
|
124
114
|
async deleteAllMessages() {
|
|
125
115
|
return this.sendCommand('AT+CMGD=1,4');
|
|
126
116
|
}
|
|
127
|
-
async
|
|
117
|
+
async getAllPDUMessages() {
|
|
128
118
|
await this.reset();
|
|
129
119
|
await this.setPDUMode();
|
|
130
120
|
const { port } = this;
|
|
@@ -138,17 +128,17 @@ class GSM extends events_1.default {
|
|
|
138
128
|
for (const line of lines) {
|
|
139
129
|
if (line.includes('OK')) {
|
|
140
130
|
port.removeListener('data', listener);
|
|
141
|
-
resolve(msgs
|
|
131
|
+
resolve(msgs);
|
|
142
132
|
}
|
|
143
133
|
else if (line.includes('ERROR')) {
|
|
144
134
|
port.removeListener('data', listener);
|
|
145
135
|
reject();
|
|
146
136
|
}
|
|
147
137
|
else if (line.startsWith('+CMGL: ')) {
|
|
148
|
-
const [index,
|
|
138
|
+
const [index, , raw] = line.replace(/^\+CMGL:\s/, '')
|
|
149
139
|
.split(',')
|
|
150
140
|
.map(s => s.replace(/"/g, ''));
|
|
151
|
-
current = { index: +index,
|
|
141
|
+
current = { index: +index, raw };
|
|
152
142
|
msgs.push(current);
|
|
153
143
|
}
|
|
154
144
|
else {
|
|
@@ -157,13 +147,19 @@ class GSM extends events_1.default {
|
|
|
157
147
|
}
|
|
158
148
|
};
|
|
159
149
|
port.on('data', listener);
|
|
160
|
-
debug_1.logger_out.debug(command);
|
|
161
150
|
port.write(command);
|
|
162
151
|
});
|
|
163
152
|
}
|
|
153
|
+
parsePDUMessage(msg) {
|
|
154
|
+
return {
|
|
155
|
+
index: msg.index,
|
|
156
|
+
message: pdu_ts_1.PDUParser.Parse(msg.raw)
|
|
157
|
+
};
|
|
158
|
+
}
|
|
164
159
|
async getMessages() {
|
|
165
|
-
|
|
166
|
-
|
|
160
|
+
let messages = (await this.getAllPDUMessages().then(msgs => msgs.map(m => this.parsePDUMessage(m))));
|
|
161
|
+
console.log('msg count', messages.length);
|
|
162
|
+
messages = messages.map(m => {
|
|
167
163
|
if (m.message.udh) {
|
|
168
164
|
if (m.message.udh.current_part === 1) {
|
|
169
165
|
const parts = messages
|
|
@@ -182,17 +178,27 @@ class GSM extends events_1.default {
|
|
|
182
178
|
}
|
|
183
179
|
return undefined;
|
|
184
180
|
}
|
|
185
|
-
return { ...m, multipart: false, parts: 1 };
|
|
181
|
+
return { ...m, multipart: false, message: { ...m.message, parts: 1 } };
|
|
186
182
|
}).filter(m => m !== undefined);
|
|
183
|
+
return messages.map(m => GSM.convertToCleanMessage(m));
|
|
187
184
|
}
|
|
188
185
|
async getMessage(index) {
|
|
189
186
|
const messages = await this.getMessages();
|
|
190
|
-
let message = messages.find(m => m.index === index);
|
|
191
|
-
if (!message) {
|
|
192
|
-
message = messages.find(m => { var _a; return (_a = m.message.parts_raw) === null || _a === void 0 ? void 0 : _a.find(m2 => m2.index === index); });
|
|
193
|
-
}
|
|
187
|
+
let message = messages.find(m => m.index === index) || messages.find(m => m.indexes.find(m2 => m2 === index));
|
|
194
188
|
return message || undefined;
|
|
195
189
|
}
|
|
190
|
+
static convertToCleanMessage(message) {
|
|
191
|
+
var _a;
|
|
192
|
+
const senderPrefix = message.message.senderType === 91 ? '' : '+';
|
|
193
|
+
return {
|
|
194
|
+
index: message.index,
|
|
195
|
+
parts: message.message.parts,
|
|
196
|
+
indexes: ((_a = message.message.parts_raw) === null || _a === void 0 ? void 0 : _a.map(m => m.index)) || [message.index],
|
|
197
|
+
text: message.message.text,
|
|
198
|
+
sender: senderPrefix + message.message.sender,
|
|
199
|
+
time: message.message.time,
|
|
200
|
+
};
|
|
201
|
+
}
|
|
196
202
|
}
|
|
197
203
|
exports.GSM = GSM;
|
|
198
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
204
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|