@starak/sim800c 0.0.6 → 0.0.7
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 +9 -2
- package/dist/index.js +14 -16
- package/package.json +1 -1
package/dist/index.d.ts
CHANGED
|
@@ -2,10 +2,17 @@
|
|
|
2
2
|
import EventEmitter from "events";
|
|
3
3
|
import { SerialPort } from "serialport";
|
|
4
4
|
import { pduMessage } from "pdu.ts";
|
|
5
|
+
export interface UDH {
|
|
6
|
+
parts: number;
|
|
7
|
+
current_part: number;
|
|
8
|
+
reference_number: string;
|
|
9
|
+
length: string;
|
|
10
|
+
iei: string;
|
|
11
|
+
}
|
|
5
12
|
export interface EpduMessage extends pduMessage {
|
|
6
|
-
udh
|
|
13
|
+
udh?: UDH;
|
|
7
14
|
multipart: boolean;
|
|
8
|
-
parts
|
|
15
|
+
parts: number;
|
|
9
16
|
parts_raw?: GsmMessage[];
|
|
10
17
|
sender?: string;
|
|
11
18
|
senderType?: number;
|
package/dist/index.js
CHANGED
|
@@ -44,22 +44,16 @@ const logger_in = new console.Console(process.stdout, process.stderr);
|
|
|
44
44
|
});
|
|
45
45
|
logger_in.debug('Debugging is enabled');
|
|
46
46
|
__exportStar(require("serialport"), exports);
|
|
47
|
-
const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
|
|
48
47
|
class GSM extends events_1.default {
|
|
49
48
|
constructor(path) {
|
|
50
49
|
super();
|
|
51
50
|
this.onDataHandler = async (data) => {
|
|
52
|
-
var _a;
|
|
51
|
+
var _a, _b;
|
|
53
52
|
if (data.includes('+CMTI:')) { // Incoming Message
|
|
54
53
|
const index = data.toString().split(',')[1];
|
|
55
54
|
const message = await this.getMessage(+index);
|
|
56
55
|
if (message) {
|
|
57
|
-
if (message.message.multipart
|
|
58
|
-
// We need to wait for the rest of the message
|
|
59
|
-
await sleep(500);
|
|
60
|
-
setImmediate(() => this.onDataHandler(data));
|
|
61
|
-
}
|
|
62
|
-
else {
|
|
56
|
+
if (!message.message.multipart || ((_a = message.message.udh) === null || _a === void 0 ? void 0 : _a.parts) === ((_b = message.message.udh) === null || _b === void 0 ? void 0 : _b.current_part)) {
|
|
63
57
|
this.emit('newMessage', message);
|
|
64
58
|
}
|
|
65
59
|
}
|
|
@@ -149,7 +143,9 @@ class GSM extends events_1.default {
|
|
|
149
143
|
await this.reset();
|
|
150
144
|
await this.setPDUMode();
|
|
151
145
|
const { port } = this;
|
|
146
|
+
let data = '', msgs = [], current = {};
|
|
152
147
|
return new Promise((resolve, reject) => {
|
|
148
|
+
const command = 'AT+CMGL=4\r';
|
|
153
149
|
const listener = async (d) => {
|
|
154
150
|
data += d.toString();
|
|
155
151
|
const lines = data.split('\r\n');
|
|
@@ -175,10 +171,9 @@ class GSM extends events_1.default {
|
|
|
175
171
|
}
|
|
176
172
|
}
|
|
177
173
|
};
|
|
178
|
-
let data = '', msgs = [], current = {};
|
|
179
174
|
port.on('data', listener);
|
|
180
|
-
logger_out.debug(
|
|
181
|
-
port.write(
|
|
175
|
+
logger_out.debug(command);
|
|
176
|
+
port.write(command);
|
|
182
177
|
});
|
|
183
178
|
}
|
|
184
179
|
async getMessages() {
|
|
@@ -188,7 +183,7 @@ class GSM extends events_1.default {
|
|
|
188
183
|
if (m.message.udh.current_part === 1) {
|
|
189
184
|
const parts = messages
|
|
190
185
|
.filter(m2 => m2.message.udh)
|
|
191
|
-
.filter(m2 => m2.message.udh.reference_number === m.message.udh.reference_number);
|
|
186
|
+
.filter(m2 => { var _a, _b; return ((_a = m2.message.udh) === null || _a === void 0 ? void 0 : _a.reference_number) === ((_b = m.message.udh) === null || _b === void 0 ? void 0 : _b.reference_number); });
|
|
192
187
|
return {
|
|
193
188
|
...m,
|
|
194
189
|
message: {
|
|
@@ -202,14 +197,17 @@ class GSM extends events_1.default {
|
|
|
202
197
|
}
|
|
203
198
|
return undefined;
|
|
204
199
|
}
|
|
205
|
-
return { ...m, multipart: false };
|
|
200
|
+
return { ...m, multipart: false, parts: 1 };
|
|
206
201
|
}).filter(m => m !== undefined);
|
|
207
202
|
}
|
|
208
203
|
async getMessage(index) {
|
|
209
|
-
// TODO: implement AT+CMGR - Read Message
|
|
210
204
|
const messages = await this.getMessages();
|
|
211
|
-
|
|
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
|
+
}
|
|
209
|
+
return message || undefined;
|
|
212
210
|
}
|
|
213
211
|
}
|
|
214
212
|
exports.GSM = GSM;
|
|
215
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
213
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,2CAAsC;AACtC,mCAA6C;AAC7C,kEAA0C;AAG1C,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;AACvE,MAAM,SAAS,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;AAEtE,IAAA,uBAAa,EAAC,UAAU,EAAE;IACtB,MAAM,EAAE,yBAAyB;IACjC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO;IAChD,MAAM,EAAE;QACJ,KAAK,EAAE,CAAC,EAAC,GAAG,EAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;aACvC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;KAC1B;IACD,qBAAqB,EAAE,IAAI;CAC9B,CAAC,CAAC;AAEH,IAAA,uBAAa,EAAC,SAAS,EAAE;IACrB,MAAM,EAAE,2BAA2B;IACnC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO;IAChD,MAAM,EAAE;QACJ,KAAK,EAAE,CAAC,EAAC,GAAG,EAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;aACvC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;KAC1B;IACD,qBAAqB,EAAE,IAAI;CAC9B,CAAC,CAAC;AAEH,SAAS,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;AA0BxC,6CAA2B;AAE3B,MAAa,GAAI,SAAQ,gBAAY;IAIjC,YAAY,IAAY;QACpB,KAAK,EAAE,CAAC;QAoBJ,kBAAa,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;;YAC3C,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,mBAAmB;gBAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC;gBAC9C,IAAI,OAAO,EAAE;oBACT,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,IAAI,CAAA,MAAA,OAAO,CAAC,OAAO,CAAC,GAAG,0CAAE,KAAK,OAAK,MAAA,OAAO,CAAC,OAAO,CAAC,GAAG,0CAAE,YAAY,CAAA,EAAE;wBAChG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;qBACpC;iBACJ;aACJ;QACL,CAAC,CAAA;QA7BG,IAAI,CAAC,IAAI,GAAG,IAAI,uBAAU,CAAC,EAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAC,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;YAC5B,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACnB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC1B,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACxB,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,MAAM,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAClC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAcO,KAAK,CAAC,WAAW,CAAC,OAAe,EAAE,UAAU,GAAG,IAAI;QACxD,MAAM,EAAC,IAAI,EAAC,GAAG,IAAI,CAAC;QACpB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,MAAM,QAAQ,GAAG,KAAK,EAAE,CAAS,EAAE,EAAE;gBACjC,IAAI,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACrB,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBAC3C,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;oBACtC,OAAO,EAAE,CAAC;iBACb;qBAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;oBAC/B,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;oBACtC,MAAM,CAAC,OAAO,CAAC,CAAC;iBACnB;qBAAM;oBACH,qCAAqC;iBACxC;YACL,CAAC,CAAA;YACD,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC1B,UAAU,CAAC,KAAK,CAAC,OAAO,GAAG,UAAU,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,GAAG,UAAU,EAAE,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,KAAK;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAEO,KAAK,CAAC,WAAW;QACrB,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IACzC,CAAC;IAEO,KAAK,CAAC,UAAU;QACpB,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IACzC,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,MAAc;QACrC,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,MAAM,GAAG,CAAC,CAAC;IACnD,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,OAAe;QACpC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,WAAW;QACpB,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IAC5C,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,MAAc,EAAE,OAAe;QACpD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,GAAe;;QACtC,IAAI,OAAO,GAAa,EAAE,CAAC;QAC3B,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE;YAC9B,OAAO,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,CAAC,SAAS,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAI,EAAE,CAAC;SAC5D;aAAM,IAAI,GAAG,EAAE;YACZ,OAAO,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACzB;QACD,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;YACrB,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;SAC1C;IACL,CAAC;IAEM,KAAK,CAAC,iBAAiB;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IAC3C,CAAC;IAEO,KAAK,CAAC,QAAQ;QAClB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,EAAC,IAAI,EAAC,GAAG,IAAI,CAAC;QACpB,IAAI,IAAI,GAAG,EAAE,EAAE,IAAI,GAAiB,EAAE,EAAE,OAAO,GAAG,EAAgB,CAAC;QAEnE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAuB,EAAE;YACxD,MAAM,OAAO,GAAG,aAAa,CAAC;YAC9B,MAAM,QAAQ,GAAG,KAAK,EAAE,CAAS,EAAE,EAAE;gBACjC,IAAI,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACrB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACjC,IAAI,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;gBACzB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;oBACtB,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;wBACrB,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;wBACtC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAC,GAAG,CAAC,EAAE,OAAO,EAAE,kBAAS,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,EAAC,CAAC,CAAiB,CAAC,CAAC;qBACrF;yBAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;wBAC/B,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;wBACtC,MAAM,EAAE,CAAC;qBACZ;yBAAM,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;wBACnC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;6BACrD,KAAK,CAAC,GAAG,CAAC;6BACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;wBACnC,OAAO,GAAG,EAAC,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,EAAiB,EAAC,CAAC;wBAClE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;qBACtB;yBAAM;wBACH,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC;qBACvB;iBACJ;YACL,CAAC,CAAA;YAED,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC1B,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC1B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,WAAW;QACpB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACvC,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACpB,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;gBACf,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,CAAC,EAAE;oBAClC,MAAM,KAAK,GAAG,QAAQ;yBACjB,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC;yBAC5B,MAAM,CAAC,EAAE,CAAC,EAAE,eAAC,OAAA,CAAA,MAAA,EAAE,CAAC,OAAO,CAAC,GAAG,0CAAE,gBAAgB,OAAK,MAAA,CAAC,CAAC,OAAO,CAAC,GAAG,0CAAE,gBAAgB,CAAA,CAAA,EAAA,CAAC,CAAC;oBACxF,OAAO;wBACH,GAAG,CAAC;wBACJ,OAAO,EAAE;4BACL,GAAG,CAAC,CAAC,OAAO;4BACZ,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;4BAC/C,SAAS,EAAE,IAAI;4BACf,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK;4BAC1B,SAAS,EAAE,KAAK;yBACnB;qBACJ,CAAA;iBACJ;gBACD,OAAO,SAAS,CAAC;aACpB;YACD,OAAO,EAAC,GAAG,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAC,CAAC;QAC9C,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,SAAS,CAAiB,CAAC;IACpD,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,KAAa;QACjC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;QACpD,IAAG,CAAC,OAAO,EAAE;YACT,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,MAAA,CAAC,CAAC,OAAO,CAAC,SAAS,0CAAE,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,KAAK,KAAK,CAAC,CAAA,EAAA,CAAC,CAAC;SACrF;QACD,OAAO,OAAqB,IAAI,SAAS,CAAC;IAC9C,CAAC;CACJ;AAhLD,kBAgLC"}
|