@omujs/omu 0.8.14 → 0.8.15
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 +11 -0
- package/dist/dts/errors.d.ts +3 -0
- package/dist/dts/errors.d.ts.map +1 -1
- package/dist/dts/network/network.d.ts +4 -2
- package/dist/dts/network/network.d.ts.map +1 -1
- package/dist/dts/network/packet/packet-types.d.ts +1 -0
- package/dist/dts/network/packet/packet-types.d.ts.map +1 -1
- package/dist/dts/version.d.ts +1 -1
- package/dist/esm/errors.js +5 -0
- package/dist/esm/errors.js.map +1 -1
- package/dist/esm/network/network.js +8 -10
- package/dist/esm/network/network.js.map +1 -1
- package/dist/esm/network/packet/packet-types.js +1 -0
- package/dist/esm/network/packet/packet-types.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +1 -1
- package/src/errors.ts +6 -0
- package/src/network/network.ts +12 -11
- package/src/network/packet/packet-types.ts +1 -0
- package/src/version.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## 0.8.15 (2025-01-30)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **omu, site:** 内部エラー時のエラー表示を追加 ([a37c800](https://github.com/OMUAPPS/omuapps/commit/a37c80061b1ae828b310a2b34923d4ce68e03345))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## 0.8.14 (2025-01-30)
|
|
7
18
|
|
|
8
19
|
**Note:** Version bump only for package @omujs/omu
|
package/dist/dts/errors.d.ts
CHANGED
|
@@ -25,4 +25,7 @@ export declare class InvalidVersion extends DisconnectReason {
|
|
|
25
25
|
export declare class InvalidPacket extends DisconnectReason {
|
|
26
26
|
constructor(message: string);
|
|
27
27
|
}
|
|
28
|
+
export declare class InternalError extends DisconnectReason {
|
|
29
|
+
constructor(message: string);
|
|
30
|
+
}
|
|
28
31
|
//# sourceMappingURL=errors.d.ts.map
|
package/dist/dts/errors.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,qBAAa,QAAS,SAAQ,KAAK;gBACnB,OAAO,EAAE,MAAM,GAAG,IAAI;CAIrC;AAED,qBAAa,gBAAiB,SAAQ,QAAQ;IAE/B,IAAI,EAAE,cAAc;IACpB,OAAO;gBADP,IAAI,EAAE,cAAc,EACpB,OAAO,SAAK;CAI1B;AAED,qBAAa,iBAAkB,SAAQ,gBAAgB;gBACvC,OAAO,EAAE,MAAM;CAG9B;AAED,qBAAa,gBAAiB,SAAQ,gBAAgB;gBACtC,OAAO,EAAE,MAAM;CAG9B;AAED,qBAAa,YAAa,SAAQ,gBAAgB;gBAClC,OAAO,EAAE,MAAM;CAG9B;AAED,qBAAa,aAAc,SAAQ,gBAAgB;gBACnC,OAAO,EAAE,MAAM;CAG9B;AAED,qBAAa,cAAe,SAAQ,gBAAgB;gBACpC,OAAO,EAAE,MAAM;CAG9B;AAED,qBAAa,aAAc,SAAQ,gBAAgB;gBACnC,OAAO,EAAE,MAAM;CAG9B"}
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,qBAAa,QAAS,SAAQ,KAAK;gBACnB,OAAO,EAAE,MAAM,GAAG,IAAI;CAIrC;AAED,qBAAa,gBAAiB,SAAQ,QAAQ;IAE/B,IAAI,EAAE,cAAc;IACpB,OAAO;gBADP,IAAI,EAAE,cAAc,EACpB,OAAO,SAAK;CAI1B;AAED,qBAAa,iBAAkB,SAAQ,gBAAgB;gBACvC,OAAO,EAAE,MAAM;CAG9B;AAED,qBAAa,gBAAiB,SAAQ,gBAAgB;gBACtC,OAAO,EAAE,MAAM;CAG9B;AAED,qBAAa,YAAa,SAAQ,gBAAgB;gBAClC,OAAO,EAAE,MAAM;CAG9B;AAED,qBAAa,aAAc,SAAQ,gBAAgB;gBACnC,OAAO,EAAE,MAAM;CAG9B;AAED,qBAAa,cAAe,SAAQ,gBAAgB;gBACpC,OAAO,EAAE,MAAM;CAG9B;AAED,qBAAa,aAAc,SAAQ,gBAAgB;gBACnC,OAAO,EAAE,MAAM;CAG9B;AAED,qBAAa,aAAc,SAAQ,gBAAgB;gBACnC,OAAO,EAAE,MAAM;CAG9B"}
|
|
@@ -9,7 +9,10 @@ import type { Packet, PacketType } from './packet/packet.js';
|
|
|
9
9
|
type StatusType<T> = {
|
|
10
10
|
type: T;
|
|
11
11
|
};
|
|
12
|
-
export type NetworkStatus = StatusType<'
|
|
12
|
+
export type NetworkStatus = StatusType<'connecting'> | StatusType<'connected'> | StatusType<'ready'> | {
|
|
13
|
+
type: 'disconnected';
|
|
14
|
+
attempt?: number;
|
|
15
|
+
} | {
|
|
13
16
|
type: 'error';
|
|
14
17
|
error: OmuError;
|
|
15
18
|
} | {
|
|
@@ -41,7 +44,6 @@ export declare class Network {
|
|
|
41
44
|
private scheduleReconnect;
|
|
42
45
|
connect(recconect?: boolean): Promise<void>;
|
|
43
46
|
private isState;
|
|
44
|
-
disconnect(): void;
|
|
45
47
|
send(packet: Packet): void;
|
|
46
48
|
private listen;
|
|
47
49
|
private dispatchPacket;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../../src/network/network.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../../src/network/network.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAU7C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAO7D,KAAK,UAAU,CAAC,CAAC,IAAI;IACjB,IAAI,EAAE,CAAC,CAAC;CACX,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG;IACnG,IAAI,EAAE,cAAc,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG;IACA,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,QAAQ,CAAC;CACnB,GAAG;IACA,IAAI,EAAE,cAAc,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,IAAI,CAAC;IACX,MAAM,EAAE,MAAM,IAAI,CAAC;CACtB,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;AAEzB,qBAAa,OAAO;IAaZ,OAAO,CAAC,QAAQ,CAAC,MAAM;aACP,OAAO,EAAE,OAAO;IAChC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,UAAU;IAff,MAAM,EAAE,aAAa,CAA0B;IACtD,SAAgB,KAAK;;;;;MAKnB;IACF,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyC;IAC/D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IACnD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA+C;gBAGzD,MAAM,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EACf,aAAa,EAAE,aAAa,EACrC,UAAU,EAAE,UAAU;IAgD3B,aAAa,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAO3C,cAAc,CAAC,GAAG,WAAW,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI;IAU3D,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,GAAG,IAAI;YAQrE,iBAAiB;IAmBlB,OAAO,CAAC,SAAS,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA4DrD,OAAO,CAAC,OAAO;IAIR,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;YAOnB,MAAM;YAUN,cAAc;IASrB,OAAO,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI;IAO/C,UAAU,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI;YAI3C,aAAa;YAMb,SAAS;CAO1B"}
|
|
@@ -32,6 +32,7 @@ export declare enum DisconnectType {
|
|
|
32
32
|
INVALID_PACKET_TYPE = "invalid_packet_type",
|
|
33
33
|
INVALID_PACKET_DATA = "invalid_packet_data",
|
|
34
34
|
INVALID_PACKET = "invalid_packet",
|
|
35
|
+
INTERNAL_ERROR = "internal_error",
|
|
35
36
|
ANOTHER_CONNECTION = "another_connection",
|
|
36
37
|
PERMISSION_DENIED = "permission_denied",
|
|
37
38
|
SERVER_RESTART = "server_restart",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packet-types.d.ts","sourceRoot":"","sources":["../../../../src/network/packet/packet-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAG5C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,KAAK,YAAY,GAAG;IAChB,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACrB,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,qBAAa,aAAc,YAAW,KAAK,CAAC,iBAAiB,CAAC;IAC1D,SAAgB,GAAG,EAAE,GAAG,CAAC;IACzB,SAAgB,QAAQ,EAAE,YAAY,CAAC;IACvC,SAAgB,KAAK,CAAC,EAAE,MAAM,CAAC;IAC/B,SAAgB,WAAW,CAAC,EAAE,OAAO,CAAC;gBAE1B,OAAO,EAAE;QACjB,GAAG,EAAE,GAAG,CAAC;QACT,QAAQ,EAAE,YAAY,CAAC;QACvB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,YAAY,CAAC,EAAE,OAAO,CAAC;KAC1B;WAOa,QAAQ,CAAC,IAAI,EAAE,iBAAiB,GAAG,aAAa;IASvD,MAAM,IAAI,iBAAiB;CAQrC;AAED,oBAAY,cAAc;IACtB,aAAa,kBAAkB;IAC/B,cAAc,mBAAmB;IACjC,eAAe,oBAAoB;IACnC,mBAAmB,wBAAwB;IAC3C,mBAAmB,wBAAwB;IAC3C,cAAc,mBAAmB;IACjC,kBAAkB,uBAAuB;IACzC,iBAAiB,sBAAsB;IACvC,cAAc,mBAAmB;IACjC,QAAQ,aAAa;IACrB,KAAK,UAAU;CAClB;AAED,KAAK,oBAAoB,GAAG;IACxB,IAAI,EAAE,cAAc,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B,CAAC;AAEF,qBAAa,gBAAiB,YAAW,KAAK,CAAC,oBAAoB,CAAC;IAChE,SAAgB,IAAI,EAAE,cAAc,CAAC;IACrC,SAAgB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;gBAE3B,OAAO,EAAE;QACjB,IAAI,EAAE,cAAc,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAC3B;IAKD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,oBAAoB,GAAG,gBAAgB;IAO7D,MAAM,IAAI,oBAAoB;CAMjC;AAED,eAAO,MAAM,YAAY;;;;;CAexB,CAAC"}
|
|
1
|
+
{"version":3,"file":"packet-types.d.ts","sourceRoot":"","sources":["../../../../src/network/packet/packet-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAG5C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,KAAK,YAAY,GAAG;IAChB,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACrB,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,qBAAa,aAAc,YAAW,KAAK,CAAC,iBAAiB,CAAC;IAC1D,SAAgB,GAAG,EAAE,GAAG,CAAC;IACzB,SAAgB,QAAQ,EAAE,YAAY,CAAC;IACvC,SAAgB,KAAK,CAAC,EAAE,MAAM,CAAC;IAC/B,SAAgB,WAAW,CAAC,EAAE,OAAO,CAAC;gBAE1B,OAAO,EAAE;QACjB,GAAG,EAAE,GAAG,CAAC;QACT,QAAQ,EAAE,YAAY,CAAC;QACvB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,YAAY,CAAC,EAAE,OAAO,CAAC;KAC1B;WAOa,QAAQ,CAAC,IAAI,EAAE,iBAAiB,GAAG,aAAa;IASvD,MAAM,IAAI,iBAAiB;CAQrC;AAED,oBAAY,cAAc;IACtB,aAAa,kBAAkB;IAC/B,cAAc,mBAAmB;IACjC,eAAe,oBAAoB;IACnC,mBAAmB,wBAAwB;IAC3C,mBAAmB,wBAAwB;IAC3C,cAAc,mBAAmB;IACjC,cAAc,mBAAmB;IACjC,kBAAkB,uBAAuB;IACzC,iBAAiB,sBAAsB;IACvC,cAAc,mBAAmB;IACjC,QAAQ,aAAa;IACrB,KAAK,UAAU;CAClB;AAED,KAAK,oBAAoB,GAAG;IACxB,IAAI,EAAE,cAAc,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B,CAAC;AAEF,qBAAa,gBAAiB,YAAW,KAAK,CAAC,oBAAoB,CAAC;IAChE,SAAgB,IAAI,EAAE,cAAc,CAAC;IACrC,SAAgB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;gBAE3B,OAAO,EAAE;QACjB,IAAI,EAAE,cAAc,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAC3B;IAKD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,oBAAoB,GAAG,gBAAgB;IAO7D,MAAM,IAAI,oBAAoB;CAMjC;AAED,eAAO,MAAM,YAAY;;;;;CAexB,CAAC"}
|
package/dist/dts/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "0.8.
|
|
1
|
+
export declare const VERSION = "0.8.14";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/esm/errors.js
CHANGED
|
@@ -44,4 +44,9 @@ export class InvalidPacket extends DisconnectReason {
|
|
|
44
44
|
super(DisconnectType.INVALID_PACKET, message);
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
|
+
export class InternalError extends DisconnectReason {
|
|
48
|
+
constructor(message) {
|
|
49
|
+
super(DisconnectType.INTERNAL_ERROR, message);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
47
52
|
//# sourceMappingURL=errors.js.map
|
package/dist/esm/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,MAAM,OAAO,QAAS,SAAQ,KAAK;IAC/B,YAAY,OAAsB;QAC9B,KAAK,CAAC,OAAO,IAAI,SAAS,CAAC,CAAC;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IACtC,CAAC;CACJ;AAED,MAAM,OAAO,gBAAiB,SAAQ,QAAQ;IAE/B;IACA;IAFX,YACW,IAAoB,EACpB,UAAU,EAAE;QAEnB,KAAK,CAAC,OAAO,CAAC,CAAC;QAHR,SAAI,GAAJ,IAAI,CAAgB;QACpB,YAAO,GAAP,OAAO,CAAK;IAGvB,CAAC;CACJ;AAED,MAAM,OAAO,iBAAkB,SAAQ,gBAAgB;IACnD,YAAY,OAAe;QACvB,KAAK,CAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IACtD,CAAC;CACJ;AAED,MAAM,OAAO,gBAAiB,SAAQ,gBAAgB;IAClD,YAAY,OAAe;QACvB,KAAK,CAAC,cAAc,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;CACJ;AAED,MAAM,OAAO,YAAa,SAAQ,gBAAgB;IAC9C,YAAY,OAAe;QACvB,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;CACJ;AAED,MAAM,OAAO,aAAc,SAAQ,gBAAgB;IAC/C,YAAY,OAAe;QACvB,KAAK,CAAC,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;CACJ;AAED,MAAM,OAAO,cAAe,SAAQ,gBAAgB;IAChD,YAAY,OAAe;QACvB,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;CACJ;AAED,MAAM,OAAO,aAAc,SAAQ,gBAAgB;IAC/C,YAAY,OAAe;QACvB,KAAK,CAAC,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;CACJ"}
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,MAAM,OAAO,QAAS,SAAQ,KAAK;IAC/B,YAAY,OAAsB;QAC9B,KAAK,CAAC,OAAO,IAAI,SAAS,CAAC,CAAC;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IACtC,CAAC;CACJ;AAED,MAAM,OAAO,gBAAiB,SAAQ,QAAQ;IAE/B;IACA;IAFX,YACW,IAAoB,EACpB,UAAU,EAAE;QAEnB,KAAK,CAAC,OAAO,CAAC,CAAC;QAHR,SAAI,GAAJ,IAAI,CAAgB;QACpB,YAAO,GAAP,OAAO,CAAK;IAGvB,CAAC;CACJ;AAED,MAAM,OAAO,iBAAkB,SAAQ,gBAAgB;IACnD,YAAY,OAAe;QACvB,KAAK,CAAC,cAAc,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IACtD,CAAC;CACJ;AAED,MAAM,OAAO,gBAAiB,SAAQ,gBAAgB;IAClD,YAAY,OAAe;QACvB,KAAK,CAAC,cAAc,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;CACJ;AAED,MAAM,OAAO,YAAa,SAAQ,gBAAgB;IAC9C,YAAY,OAAe;QACvB,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;CACJ;AAED,MAAM,OAAO,aAAc,SAAQ,gBAAgB;IAC/C,YAAY,OAAe;QACvB,KAAK,CAAC,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;CACJ;AAED,MAAM,OAAO,cAAe,SAAQ,gBAAgB;IAChD,YAAY,OAAe;QACvB,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;CACJ;AAED,MAAM,OAAO,aAAc,SAAQ,gBAAgB;IAC/C,YAAY,OAAe;QACvB,KAAK,CAAC,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;CACJ;AAED,MAAM,OAAO,aAAc,SAAQ,gBAAgB;IAC/C,YAAY,OAAe;QACvB,KAAK,CAAC,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;CACJ"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AnotherConnection, InvalidOrigin, InvalidPacket, InvalidToken, InvalidVersion, PermissionDenied, } from '../errors.js';
|
|
1
|
+
import { AnotherConnection, InternalError, InvalidOrigin, InvalidPacket, InvalidToken, InvalidVersion, PermissionDenied, } from '../errors.js';
|
|
2
2
|
import { EventEmitter } from '../event-emitter.js';
|
|
3
3
|
import { IdentifierMap } from '../identifier.js';
|
|
4
4
|
import { VERSION } from '../version.js';
|
|
@@ -33,6 +33,7 @@ export class Network {
|
|
|
33
33
|
if (reason.type === DisconnectType.SHUTDOWN
|
|
34
34
|
|| reason.type === DisconnectType.CLOSE
|
|
35
35
|
|| reason.type === DisconnectType.SERVER_RESTART) {
|
|
36
|
+
this.setStatus({ type: 'disconnected' });
|
|
36
37
|
return;
|
|
37
38
|
}
|
|
38
39
|
const ERROR_MAP = {
|
|
@@ -41,6 +42,7 @@ export class Network {
|
|
|
41
42
|
[DisconnectType.INVALID_TOKEN]: InvalidToken,
|
|
42
43
|
[DisconnectType.INVALID_ORIGIN]: InvalidOrigin,
|
|
43
44
|
[DisconnectType.INVALID_VERSION]: InvalidVersion,
|
|
45
|
+
[DisconnectType.INTERNAL_ERROR]: InternalError,
|
|
44
46
|
[DisconnectType.INVALID_PACKET]: InvalidPacket,
|
|
45
47
|
[DisconnectType.INVALID_PACKET_TYPE]: InvalidPacket,
|
|
46
48
|
[DisconnectType.INVALID_PACKET_DATA]: InvalidPacket,
|
|
@@ -147,7 +149,11 @@ export class Network {
|
|
|
147
149
|
}
|
|
148
150
|
}
|
|
149
151
|
finally {
|
|
150
|
-
this.
|
|
152
|
+
if (this.status.type !== 'disconnected' && this.status.type !== 'reconnecting' && this.status.type !== 'error') {
|
|
153
|
+
this.setStatus({ type: 'disconnected', attempt });
|
|
154
|
+
this.event.disconnected.emit(null);
|
|
155
|
+
}
|
|
156
|
+
this.connection.close();
|
|
151
157
|
}
|
|
152
158
|
if (!recconect) {
|
|
153
159
|
break;
|
|
@@ -160,14 +166,6 @@ export class Network {
|
|
|
160
166
|
isState(state) {
|
|
161
167
|
return this.status.type === state;
|
|
162
168
|
}
|
|
163
|
-
disconnect() {
|
|
164
|
-
if (this.status.type === 'disconnected') {
|
|
165
|
-
return;
|
|
166
|
-
}
|
|
167
|
-
this.setStatus({ type: 'disconnected' });
|
|
168
|
-
this.connection.close();
|
|
169
|
-
this.event.disconnected.emit(null);
|
|
170
|
-
}
|
|
171
169
|
send(packet) {
|
|
172
170
|
if (this.connection.closed) {
|
|
173
171
|
throw new Error('Cannot send packet while connection is closed');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../src/network/network.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,YAAY,EACZ,cAAc,EACd,gBAAgB,GACnB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../src/network/network.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,6 +39,7 @@ export var DisconnectType;
|
|
|
39
39
|
DisconnectType["INVALID_PACKET_TYPE"] = "invalid_packet_type";
|
|
40
40
|
DisconnectType["INVALID_PACKET_DATA"] = "invalid_packet_data";
|
|
41
41
|
DisconnectType["INVALID_PACKET"] = "invalid_packet";
|
|
42
|
+
DisconnectType["INTERNAL_ERROR"] = "internal_error";
|
|
42
43
|
DisconnectType["ANOTHER_CONNECTION"] = "another_connection";
|
|
43
44
|
DisconnectType["PERMISSION_DENIED"] = "permission_denied";
|
|
44
45
|
DisconnectType["SERVER_RESTART"] = "server_restart";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packet-types.js","sourceRoot":"","sources":["../../../../src/network/packet/packet-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAapD,MAAM,OAAO,aAAa;IACN,GAAG,CAAM;IACT,QAAQ,CAAe;IACvB,KAAK,CAAU;IACf,WAAW,CAAW;IAEtC,YAAY,OAKX;QACG,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAC5C,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,IAAuB;QAC1C,OAAO,IAAI,aAAa,CAAC;YACrB,GAAG,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC;YAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,YAAY,EAAE,IAAI,CAAC,YAAY;SAClC,CAAC,CAAC;IACP,CAAC;IAEM,MAAM;QACT,OAAO;YACH,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE;YACtB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,YAAY,EAAE,IAAI,CAAC,WAAW;SACjC,CAAC;IACN,CAAC;CACJ;AAED,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"packet-types.js","sourceRoot":"","sources":["../../../../src/network/packet/packet-types.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = '0.8.
|
|
1
|
+
export const VERSION = '0.8.14';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
package/package.json
CHANGED
package/src/errors.ts
CHANGED
|
@@ -50,3 +50,9 @@ export class InvalidPacket extends DisconnectReason {
|
|
|
50
50
|
super(DisconnectType.INVALID_PACKET, message);
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
|
+
|
|
54
|
+
export class InternalError extends DisconnectReason {
|
|
55
|
+
constructor(message: string) {
|
|
56
|
+
super(DisconnectType.INTERNAL_ERROR, message);
|
|
57
|
+
}
|
|
58
|
+
}
|
package/src/network/network.ts
CHANGED
|
@@ -3,6 +3,7 @@ import type { Client } from '../client.js';
|
|
|
3
3
|
import type { OmuError } from '../errors.js';
|
|
4
4
|
import {
|
|
5
5
|
AnotherConnection,
|
|
6
|
+
InternalError,
|
|
6
7
|
InvalidOrigin,
|
|
7
8
|
InvalidPacket,
|
|
8
9
|
InvalidToken,
|
|
@@ -29,7 +30,10 @@ type StatusType<T> = {
|
|
|
29
30
|
type: T,
|
|
30
31
|
};
|
|
31
32
|
|
|
32
|
-
export type NetworkStatus = StatusType<'
|
|
33
|
+
export type NetworkStatus = StatusType<'connecting'> | StatusType<'connected'> | StatusType<'ready'> | {
|
|
34
|
+
type: 'disconnected',
|
|
35
|
+
attempt?: number,
|
|
36
|
+
} | {
|
|
33
37
|
type: 'error',
|
|
34
38
|
error: OmuError,
|
|
35
39
|
} | {
|
|
@@ -72,6 +76,7 @@ export class Network {
|
|
|
72
76
|
if (reason.type === DisconnectType.SHUTDOWN
|
|
73
77
|
||reason.type === DisconnectType.CLOSE
|
|
74
78
|
||reason.type === DisconnectType.SERVER_RESTART) {
|
|
79
|
+
this.setStatus({type: 'disconnected'});
|
|
75
80
|
return;
|
|
76
81
|
}
|
|
77
82
|
const ERROR_MAP: Record<DisconnectType, typeof OmuError | undefined> = {
|
|
@@ -80,6 +85,7 @@ export class Network {
|
|
|
80
85
|
[DisconnectType.INVALID_TOKEN]: InvalidToken,
|
|
81
86
|
[DisconnectType.INVALID_ORIGIN]: InvalidOrigin,
|
|
82
87
|
[DisconnectType.INVALID_VERSION]: InvalidVersion,
|
|
88
|
+
[DisconnectType.INTERNAL_ERROR]: InternalError,
|
|
83
89
|
[DisconnectType.INVALID_PACKET]: InvalidPacket,
|
|
84
90
|
[DisconnectType.INVALID_PACKET_TYPE]: InvalidPacket,
|
|
85
91
|
[DisconnectType.INVALID_PACKET_DATA]: InvalidPacket,
|
|
@@ -191,7 +197,11 @@ export class Network {
|
|
|
191
197
|
throw this.status.error;
|
|
192
198
|
}
|
|
193
199
|
} finally {
|
|
194
|
-
this.
|
|
200
|
+
if (this.status.type !== 'disconnected' && this.status.type !== 'reconnecting' && this.status.type !== 'error') {
|
|
201
|
+
this.setStatus({type: 'disconnected', attempt});
|
|
202
|
+
this.event.disconnected.emit(null);
|
|
203
|
+
}
|
|
204
|
+
this.connection.close();
|
|
195
205
|
}
|
|
196
206
|
if (!recconect) {
|
|
197
207
|
break;
|
|
@@ -206,15 +216,6 @@ export class Network {
|
|
|
206
216
|
return this.status.type === state;
|
|
207
217
|
}
|
|
208
218
|
|
|
209
|
-
public disconnect(): void {
|
|
210
|
-
if (this.status.type === 'disconnected') {
|
|
211
|
-
return;
|
|
212
|
-
}
|
|
213
|
-
this.setStatus({type: 'disconnected'});
|
|
214
|
-
this.connection.close();
|
|
215
|
-
this.event.disconnected.emit(null);
|
|
216
|
-
}
|
|
217
|
-
|
|
218
219
|
public send(packet: Packet): void {
|
|
219
220
|
if (this.connection.closed) {
|
|
220
221
|
throw new Error('Cannot send packet while connection is closed');
|
|
@@ -63,6 +63,7 @@ export enum DisconnectType {
|
|
|
63
63
|
INVALID_PACKET_TYPE = 'invalid_packet_type',
|
|
64
64
|
INVALID_PACKET_DATA = 'invalid_packet_data',
|
|
65
65
|
INVALID_PACKET = 'invalid_packet',
|
|
66
|
+
INTERNAL_ERROR = 'internal_error',
|
|
66
67
|
ANOTHER_CONNECTION = 'another_connection',
|
|
67
68
|
PERMISSION_DENIED = 'permission_denied',
|
|
68
69
|
SERVER_RESTART = 'server_restart',
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const VERSION = '0.8.
|
|
1
|
+
export const VERSION = '0.8.14';
|