@starak/sim800c 0.0.8 → 0.0.10
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/debug.d.ts +2 -0
- package/dist/debug.js +29 -0
- package/dist/index.d.ts +26 -8
- package/dist/index.js +39 -48
- package/package.json +1 -1
package/dist/debug.d.ts
ADDED
package/dist/debug.js
ADDED
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.logger_in = exports.logger_out = void 0;
|
|
7
|
+
const console_stamp_1 = __importDefault(require("console-stamp"));
|
|
8
|
+
exports.logger_out = new console.Console(process.stdout, process.stderr);
|
|
9
|
+
exports.logger_in = new console.Console(process.stdout, process.stderr);
|
|
10
|
+
(0, console_stamp_1.default)(exports.logger_out, {
|
|
11
|
+
format: '([<-]).white :debug.cyan',
|
|
12
|
+
level: process.env.DEBUG_SIM ? 'debug' : 'error',
|
|
13
|
+
tokens: {
|
|
14
|
+
debug: ({ msg }) => msg.replace(/\r\n/g, '\n')
|
|
15
|
+
.replace(/\r/g, '')
|
|
16
|
+
},
|
|
17
|
+
preventDefaultMessage: true
|
|
18
|
+
});
|
|
19
|
+
(0, console_stamp_1.default)(exports.logger_in, {
|
|
20
|
+
format: '([->]).white :debug.green',
|
|
21
|
+
level: process.env.DEBUG_SIM ? 'debug' : 'error',
|
|
22
|
+
tokens: {
|
|
23
|
+
debug: ({ msg }) => msg.replace(/\r\n/g, '\n')
|
|
24
|
+
.replace(/\r/g, '')
|
|
25
|
+
},
|
|
26
|
+
preventDefaultMessage: true
|
|
27
|
+
});
|
|
28
|
+
exports.logger_in.debug('Debugging is enabled');
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVidWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZGVidWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsa0VBQTBDO0FBRTdCLFFBQUEsVUFBVSxHQUFHLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUNqRSxRQUFBLFNBQVMsR0FBRyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7QUFFN0UsSUFBQSx1QkFBYSxFQUFDLGtCQUFVLEVBQUU7SUFDdEIsTUFBTSxFQUFFLDBCQUEwQjtJQUNsQyxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsT0FBTztJQUNoRCxNQUFNLEVBQUU7UUFDSixLQUFLLEVBQUUsQ0FBQyxFQUFDLEdBQUcsRUFBQyxFQUFFLEVBQUUsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUM7YUFDdkMsT0FBTyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUM7S0FDMUI7SUFDRCxxQkFBcUIsRUFBRSxJQUFJO0NBQzlCLENBQUMsQ0FBQztBQUVILElBQUEsdUJBQWEsRUFBQyxpQkFBUyxFQUFFO0lBQ3JCLE1BQU0sRUFBRSwyQkFBMkI7SUFDbkMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU87SUFDaEQsTUFBTSxFQUFFO1FBQ0osS0FBSyxFQUFFLENBQUMsRUFBQyxHQUFHLEVBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDO2FBQ3ZDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDO0tBQzFCO0lBQ0QscUJBQXFCLEVBQUUsSUFBSTtDQUM5QixDQUFDLENBQUM7QUFFSCxpQkFBUyxDQUFDLEtBQUssQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDIn0=
|
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
|
@@ -21,42 +21,23 @@ exports.GSM = void 0;
|
|
|
21
21
|
const events_1 = __importDefault(require("events"));
|
|
22
22
|
const serialport_1 = require("serialport");
|
|
23
23
|
const pdu_ts_1 = require("pdu.ts");
|
|
24
|
-
const
|
|
25
|
-
const logger_out = new console.Console(process.stdout, process.stderr);
|
|
26
|
-
const logger_in = new console.Console(process.stdout, process.stderr);
|
|
27
|
-
(0, console_stamp_1.default)(logger_out, {
|
|
28
|
-
format: '([<-]).white :debug.red',
|
|
29
|
-
level: process.env.DEBUG_SIM ? 'debug' : 'error',
|
|
30
|
-
tokens: {
|
|
31
|
-
debug: ({ msg }) => msg.replace(/\r\n/g, '\n')
|
|
32
|
-
.replace(/\r/g, '')
|
|
33
|
-
},
|
|
34
|
-
preventDefaultMessage: true
|
|
35
|
-
});
|
|
36
|
-
(0, console_stamp_1.default)(logger_in, {
|
|
37
|
-
format: '([->]).white :debug.green',
|
|
38
|
-
level: process.env.DEBUG_SIM ? 'debug' : 'error',
|
|
39
|
-
tokens: {
|
|
40
|
-
debug: ({ msg }) => msg.replace(/\r\n/g, '\n')
|
|
41
|
-
.replace(/\r/g, '')
|
|
42
|
-
},
|
|
43
|
-
preventDefaultMessage: true
|
|
44
|
-
});
|
|
45
|
-
logger_in.debug('Debugging is enabled');
|
|
24
|
+
const debug_1 = require("./debug");
|
|
46
25
|
__exportStar(require("serialport"), exports);
|
|
47
26
|
class GSM extends events_1.default {
|
|
48
27
|
constructor(path) {
|
|
49
28
|
super();
|
|
50
29
|
this.onDataHandler = async (data) => {
|
|
51
|
-
var _a;
|
|
52
30
|
if (data.includes('+CMTI:')) { // Incoming Message
|
|
53
31
|
const index = data.toString().split(',')[1];
|
|
54
32
|
const message = await this.getMessage(+index);
|
|
55
33
|
if (message) {
|
|
56
|
-
if (
|
|
34
|
+
if (message.parts === message.indexes.length) {
|
|
57
35
|
this.emit('newMessage', message);
|
|
58
36
|
}
|
|
59
37
|
}
|
|
38
|
+
else {
|
|
39
|
+
console.log('Error getting incoming message.', data.toString());
|
|
40
|
+
}
|
|
60
41
|
}
|
|
61
42
|
};
|
|
62
43
|
this.port = new serialport_1.SerialPort({ path: path, baudRate: 115200 });
|
|
@@ -65,7 +46,7 @@ class GSM extends events_1.default {
|
|
|
65
46
|
this.emit('ready');
|
|
66
47
|
});
|
|
67
48
|
this.port.on('data', (data) => {
|
|
68
|
-
logger_in.debug(data.toString());
|
|
49
|
+
debug_1.logger_in.debug(data.toString());
|
|
69
50
|
this.emit('data', data);
|
|
70
51
|
setImmediate(() => this.onDataHandler(data));
|
|
71
52
|
});
|
|
@@ -95,7 +76,7 @@ class GSM extends events_1.default {
|
|
|
95
76
|
};
|
|
96
77
|
let data = '';
|
|
97
78
|
port.on('data', listener);
|
|
98
|
-
logger_out.debug(command + terminator);
|
|
79
|
+
debug_1.logger_out.debug(command + terminator);
|
|
99
80
|
port.write(`${command}${terminator}`);
|
|
100
81
|
});
|
|
101
82
|
}
|
|
@@ -124,22 +105,16 @@ class GSM extends events_1.default {
|
|
|
124
105
|
await this.setMessage(message);
|
|
125
106
|
}
|
|
126
107
|
async deleteMessage(msg) {
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
indexes = ((_a = msg.message.parts_raw) === null || _a === void 0 ? void 0 : _a.map(m => m.index)) || [];
|
|
131
|
-
}
|
|
132
|
-
else if (msg) {
|
|
133
|
-
indexes = [msg.index];
|
|
134
|
-
}
|
|
135
|
-
for (const i of indexes) {
|
|
108
|
+
if (!msg)
|
|
109
|
+
return;
|
|
110
|
+
for (const i of msg.indexes) {
|
|
136
111
|
await this.sendCommand(`AT+CMGD=${i}`);
|
|
137
112
|
}
|
|
138
113
|
}
|
|
139
114
|
async deleteAllMessages() {
|
|
140
115
|
return this.sendCommand('AT+CMGD=1,4');
|
|
141
116
|
}
|
|
142
|
-
async
|
|
117
|
+
async getAllPDUMessages() {
|
|
143
118
|
await this.reset();
|
|
144
119
|
await this.setPDUMode();
|
|
145
120
|
const { port } = this;
|
|
@@ -153,17 +128,17 @@ class GSM extends events_1.default {
|
|
|
153
128
|
for (const line of lines) {
|
|
154
129
|
if (line.includes('OK')) {
|
|
155
130
|
port.removeListener('data', listener);
|
|
156
|
-
resolve(msgs
|
|
131
|
+
resolve(msgs);
|
|
157
132
|
}
|
|
158
133
|
else if (line.includes('ERROR')) {
|
|
159
134
|
port.removeListener('data', listener);
|
|
160
135
|
reject();
|
|
161
136
|
}
|
|
162
137
|
else if (line.startsWith('+CMGL: ')) {
|
|
163
|
-
const [index,
|
|
138
|
+
const [index, , raw] = line.replace(/^\+CMGL:\s/, '')
|
|
164
139
|
.split(',')
|
|
165
140
|
.map(s => s.replace(/"/g, ''));
|
|
166
|
-
current = { index: +index,
|
|
141
|
+
current = { index: +index, raw };
|
|
167
142
|
msgs.push(current);
|
|
168
143
|
}
|
|
169
144
|
else {
|
|
@@ -172,13 +147,19 @@ class GSM extends events_1.default {
|
|
|
172
147
|
}
|
|
173
148
|
};
|
|
174
149
|
port.on('data', listener);
|
|
175
|
-
logger_out.debug(command);
|
|
176
150
|
port.write(command);
|
|
177
151
|
});
|
|
178
152
|
}
|
|
153
|
+
parsePDUMessage(msg) {
|
|
154
|
+
return {
|
|
155
|
+
index: msg.index,
|
|
156
|
+
message: pdu_ts_1.PDUParser.Parse(msg.raw)
|
|
157
|
+
};
|
|
158
|
+
}
|
|
179
159
|
async getMessages() {
|
|
180
|
-
|
|
181
|
-
|
|
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 => {
|
|
182
163
|
if (m.message.udh) {
|
|
183
164
|
if (m.message.udh.current_part === 1) {
|
|
184
165
|
const parts = messages
|
|
@@ -197,17 +178,27 @@ class GSM extends events_1.default {
|
|
|
197
178
|
}
|
|
198
179
|
return undefined;
|
|
199
180
|
}
|
|
200
|
-
return { ...m, multipart: false, parts: 1 };
|
|
181
|
+
return { ...m, multipart: false, message: { ...m.message, parts: 1 } };
|
|
201
182
|
}).filter(m => m !== undefined);
|
|
183
|
+
return messages.map(m => GSM.convertToCleanMessage(m));
|
|
202
184
|
}
|
|
203
185
|
async getMessage(index) {
|
|
204
186
|
const messages = await this.getMessages();
|
|
205
|
-
let message = messages.find(m => m.index === index);
|
|
206
|
-
if (!message) {
|
|
207
|
-
message = messages.find(m => { var _a; return (_a = m.message.parts_raw) === null || _a === void 0 ? void 0 : _a.find(m2 => m2.index === index); });
|
|
208
|
-
}
|
|
187
|
+
let message = messages.find(m => m.index === index) || messages.find(m => m.indexes.find(m2 => m2 === index));
|
|
209
188
|
return message || undefined;
|
|
210
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
|
+
}
|
|
211
202
|
}
|
|
212
203
|
exports.GSM = GSM;
|
|
213
|
-
//# 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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"}
|