@openlv/signaling 0.0.1-beta.6 → 0.0.1-beta.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.test.js +4 -4
- package/dist/index.test.js.map +1 -1
- package/dist/mqtt/index.js +22 -14
- package/dist/mqtt/index.js.map +1 -1
- package/package.json +3 -3
package/dist/index.test.js
CHANGED
|
@@ -6,10 +6,10 @@ import { ntfy } from "./ntfy/index.js";
|
|
|
6
6
|
import { log } from "./utils/log.js";
|
|
7
7
|
const hKey = "test";
|
|
8
8
|
const layers = [
|
|
9
|
-
[
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
],
|
|
9
|
+
// [
|
|
10
|
+
// mqtt,
|
|
11
|
+
// { topic: "mytesttopic1111", url: "wss://test.mosquitto.org:8081/mqtt" },
|
|
12
|
+
// ],
|
|
13
13
|
[
|
|
14
14
|
mqtt,
|
|
15
15
|
{ topic: "mytesttopic1111", url: "wss://mqtt-dashboard.com:8884/mqtt" },
|
package/dist/index.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAG9C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAErC,MAAM,IAAI,GAAG,MAAM,CAAC;AAEpB,MAAM,MAAM,GAAkD;IAC5D
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":"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"}
|
package/dist/mqtt/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SignalNoConnectionError } from "@openlv/core/errors";
|
|
2
|
-
import
|
|
2
|
+
import { createMqtt } from "websocket-mqtt";
|
|
3
3
|
import { createSignalingLayer } from "../index.js";
|
|
4
4
|
import { log } from "../utils/log.js";
|
|
5
5
|
/**
|
|
@@ -11,13 +11,29 @@ export const mqtt = ({ url = "wss://test.mosquitto.org:8081/mqtt", topic, }) =>
|
|
|
11
11
|
let connection;
|
|
12
12
|
return createSignalingLayer({
|
|
13
13
|
type: "mqtt",
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
setup() {
|
|
15
|
+
return new Promise((resolve, reject) => {
|
|
16
|
+
connection = createMqtt({
|
|
17
|
+
url,
|
|
18
|
+
// reconnectOnConnackError: false,
|
|
19
|
+
// reconnectPeriod: 5000,
|
|
20
|
+
// connectTimeout: 5000,
|
|
21
|
+
});
|
|
22
|
+
connection.on("connect", () => {
|
|
23
|
+
resolve();
|
|
24
|
+
});
|
|
25
|
+
connection.on("error", (error) => {
|
|
26
|
+
console.error("MQTT: Error connecting to URL", error);
|
|
27
|
+
reject(error);
|
|
28
|
+
});
|
|
29
|
+
connection.on("close", () => {
|
|
30
|
+
reject(new Error("MQTT: Closed connection to URL"));
|
|
31
|
+
});
|
|
32
|
+
connection.connect();
|
|
17
33
|
});
|
|
18
34
|
},
|
|
19
35
|
teardown() {
|
|
20
|
-
connection?.
|
|
36
|
+
connection?.close();
|
|
21
37
|
connection = undefined;
|
|
22
38
|
},
|
|
23
39
|
async publish(payload) {
|
|
@@ -37,15 +53,7 @@ export const mqtt = ({ url = "wss://test.mosquitto.org:8081/mqtt", topic, }) =>
|
|
|
37
53
|
const decoded = new TextDecoder().decode(message);
|
|
38
54
|
handler(decoded);
|
|
39
55
|
});
|
|
40
|
-
|
|
41
|
-
connection?.subscribe(topic, (err) => {
|
|
42
|
-
if (err) {
|
|
43
|
-
log("MQTT: Error subscribing to topic", err);
|
|
44
|
-
reject(err);
|
|
45
|
-
}
|
|
46
|
-
resolve();
|
|
47
|
-
});
|
|
48
|
-
});
|
|
56
|
+
await connection?.subscribe(topic);
|
|
49
57
|
},
|
|
50
58
|
});
|
|
51
59
|
};
|
package/dist/mqtt/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mqtt/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mqtt/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAmB,MAAM,gBAAgB,CAAC;AAG7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC;;;;GAIG;AACH,MAAM,CAAC,MAAM,IAAI,GAAwB,CAAC,EACxC,GAAG,GAAG,oCAAoC,EAC1C,KAAK,GACgB,EAAE,EAAE;IACzB,IAAI,UAAkC,CAAC;IAEvC,OAAO,oBAAoB,CAAC;QAC1B,IAAI,EAAE,MAAM;QACZ,KAAK;YACH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,UAAU,GAAG,UAAU,CAAC;oBACtB,GAAG;oBACH,kCAAkC;oBAClC,yBAAyB;oBACzB,wBAAwB;iBACzB,CAAC,CAAC;gBAEH,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;oBAC5B,OAAO,EAAE,CAAC;gBACZ,CAAC,CAAC,CAAC;gBACH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;oBAC/B,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;oBACtD,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChB,CAAC,CAAC,CAAC;gBAEH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;oBAC1B,MAAM,CAAC,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAC;gBACtD,CAAC,CAAC,CAAC;gBAEH,UAAU,CAAC,OAAO,EAAE,CAAC;YACvB,CAAC,CAAC,CAAC;QACL,CAAC;QACD,QAAQ;YACN,UAAU,EAAE,KAAK,EAAE,CAAC;YACpB,UAAU,GAAG,SAAS,CAAC;QACzB,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,OAAO;YACnB,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACvD,CAAC;YAED,UAAU,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QACzD,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,OAAO;YACrB,IAAI,CAAC,UAAU;gBAAE,MAAM,IAAI,uBAAuB,EAAE,CAAC;YAErD,GAAG,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;YAEzC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,aAAa,EAAE,OAAO,EAAE,EAAE;gBAClD,GAAG,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;gBAE9C,IAAI,aAAa,KAAK,KAAK;oBAAE,OAAO;gBAEpC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAElD,OAAO,CAAC,OAAO,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;YAEH,MAAM,UAAU,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openlv/signaling",
|
|
3
|
-
"version": "0.0.1-beta.
|
|
3
|
+
"version": "0.0.1-beta.7",
|
|
4
4
|
"keywords": [
|
|
5
5
|
"open-lavatory"
|
|
6
6
|
],
|
|
@@ -57,9 +57,9 @@
|
|
|
57
57
|
"eventemitter3": "^5",
|
|
58
58
|
"globals": "^16",
|
|
59
59
|
"gun": "^0.2020.1241",
|
|
60
|
-
"mqtt": "
|
|
60
|
+
"websocket-mqtt": "0.0.6",
|
|
61
61
|
"ts-pattern": "^5",
|
|
62
|
-
"@openlv/core": "0.0.1-beta.
|
|
62
|
+
"@openlv/core": "0.0.1-beta.8"
|
|
63
63
|
},
|
|
64
64
|
"devDependencies": {
|
|
65
65
|
"typescript": "^5",
|