@mingzey/typedrpc 1.1.3 → 1.1.5
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/api.d.ts.map +1 -1
- package/dist/api.js.map +1 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +2 -0
- package/dist/client.js.map +1 -1
- package/dist/connections/basic.d.ts +1 -1
- package/dist/connections/basic.d.ts.map +1 -1
- package/dist/connections/basic.js.map +1 -1
- package/dist/connections/http.d.ts.map +1 -1
- package/dist/connections/http.js +3 -1
- package/dist/connections/http.js.map +1 -1
- package/dist/connections/socket.d.ts +1 -1
- package/dist/connections/socket.d.ts.map +1 -1
- package/dist/connections/socket.js +14 -3
- package/dist/connections/socket.js.map +1 -1
- package/dist/connections/socketio.d.ts +8 -2
- package/dist/connections/socketio.d.ts.map +1 -1
- package/dist/connections/socketio.js +35 -12
- package/dist/connections/socketio.js.map +1 -1
- package/dist/core.d.ts +1 -0
- package/dist/core.d.ts.map +1 -1
- package/dist/core.js +6 -2
- package/dist/core.js.map +1 -1
- package/dist/define.d.ts +19 -2
- package/dist/define.d.ts.map +1 -1
- package/dist/define.js +9 -0
- package/dist/define.js.map +1 -1
- package/dist/handler.d.ts +16 -3
- package/dist/handler.d.ts.map +1 -1
- package/dist/handler.js +41 -10
- package/dist/handler.js.map +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +2 -0
- package/dist/server.js.map +1 -1
- package/dist/utils.d.ts +11 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +82 -0
- package/dist/utils.js.map +1 -1
- package/package.json +1 -1
package/dist/api.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,KAAK,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACjF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC;AAG9D,cAAM,WAAW,CAAC,CAAC,SAAS,iBAAiB,CAAC,qBAAqB,CAAC;;IAKhE,SAAS,CAAC,QAAQ,EAAC,CAAC,OAAO,EAAC;QACxB,WAAW,EAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,KAAK,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACjF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC;AAG9D,cAAM,WAAW,CAAC,CAAC,SAAS,iBAAiB,CAAC,qBAAqB,CAAC;;IAKhE,SAAS,CAAC,QAAQ,EAAC,CAAC,OAAO,EAAC;QACxB,WAAW,EAAC,MAAM,CAAC;QACnB,UAAU,EAAC,MAAM,CAAC;QAClB,IAAI,EAAC,GAAG,EAAE,CAAA;KACb,KAAK,OAAO,CAAC;QACV,OAAO,EAAC,qBAAqB,CAAC;QAC9B,QAAQ,EAAC,sBAAsB,CAAC;KACnC,CAAC,GAAE,2BAA2B,CAAC,CAAC,CAAC;CAmDrC;AAGD,OAAO,EACH,WAAW,EACd,CAAA"}
|
package/dist/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW;IACb;IAEA,CAAC;IAED,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW;IACb;IAEA,CAAC;IAED,SAAS,CAAC,QAOR;QACE,OAAO,IAAI,KAAK,CAAC,EAAE,EAAE;YACjB,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ;gBAC7B,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;oBACjC,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;iBACrD;gBACD,OAAO,IAAI,KAAK,CAAC,EAAE,EAAE;oBACjB,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ;wBAC5B,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;4BAChC,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;yBACpD;wBAED,MAAM,IAAI,GAAG,GAAG,WAAW,IAAI,UAAU,EAAE,CAAC;wBAC5C,MAAM,EAAE,GAAG,GAAG,WAAW,IAAI,UAAU,EAAE,CAAC;wBAE1C,OAAO;4BACH,IAAI,EAAE,KAAK,EAAE,GAAG,IAAW,EAAE,EAAE;gCAC3B,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC;oCAC1B,WAAW,EAAC,WAAW;oCACvB,UAAU,EAAC,UAAU;oCACrB,IAAI,EAAC,IAAI;iCACZ,CAAC,CAAC;gCACH,IAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAC;oCACrB,MAAM,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;iCAC/B;gCACD,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;4BAClC,CAAC;4BACD,OAAO,EAAC,KAAK,EAAE,MAId,EAAE,EAAE;gCACD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC;oCAC1B,WAAW,EAAC,WAAW;oCACvB,UAAU,EAAC,UAAU;oCACrB,IAAI,EAAC,MAAM,CAAC,IAAI,IAAI,EAAE;iCACzB,CAAC,CAAC;gCACH,IAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAC;oCACrB,MAAM,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAC,MAAM,CAAC,OAAO,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;iCACxE;qCAAI;oCACD,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAC,MAAM,CAAC,OAAO,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;iCAC5E;4BACL,CAAC;4BACD,EAAE;4BACF,IAAI;yBACP,CAAC;oBACN,CAAC;iBACJ,CAAC,CAAC;YACP,CAAC;SACJ,CAAmC,CAAC;IACzC,CAAC;CACJ;AAGD,OAAO,EACH,WAAW,EACd,CAAA"}
|
package/dist/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAE7F,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAE,KAAK,wBAAwB,EAAE,KAAK,wBAAwB,EAAE,KAAK,6BAA6B,EAAE,KAAK,yBAAyB,EAAE,KAAK,2BAA2B,EAAE,MAAM,YAAY,CAAC;AAE9M,KAAK,oBAAoB,CAAC,CAAC,SAAS,iBAAiB,CAAC,GAAG,CAAC,EAAC,CAAC,SAAS,iBAAiB,CAAC,GAAG,CAAC,IAAI;IAC3F,KAAK,CAAC,EAAC,CAAC,CAAC;IACT,MAAM,CAAC,EAAC,CAAC,CAAC;IACV,UAAU,CAAC,EAAC;QACR,QAAQ,EAAC,0BAA0B,CAAC;KACvC,CAAA;CACJ,CAAA;AAED,KAAK,oBAAoB,GAAG,EAE3B,CAAA;AAED,cAAM,cAAc,CAAC,CAAC,SAAS,iBAAiB,CAAC,GAAG,CAAC,EAAC,CAAC,SAAS,iBAAiB,CAAC,GAAG,CAAC;IAE3E,OAAO,qCAA4C;IAC1D,OAAO,CAAC,MAAM,CAA2B;IAClC,IAAI,EAAC,YAAY,CAAC;gBAEb,MAAM,CAAC,EAAC,oBAAoB,CAAC,CAAC,EAAC,CAAC,CAAC;IAU7C,IAAI,CAAC,CAAC,SAAS,yBAAyB,CAAC,CAAC,CAAC,EAAC,CAAC,SAAS,wBAAwB,CAAC,CAAC,EAAC,CAAC,CAAC,EAAE,WAAW,EAAC,CAAC,EAAC,UAAU,EAAC,CAAC,EAAC,MAAM,EAAC;QACnH,OAAO,EAAC,wBAAwB,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC,CAAC;QACxC,IAAI,CAAC,EAAC,GAAG,CAAC;KACb;IAID,WAAW,CAAC,CAAC,SAAS,yBAAyB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAC,CAAC,EAAC,QAAQ,EAAC,6BAA6B,CAAC,CAAC,EAAC,CAAC,CAAC;IAU7G,IAAI,GAAG,oHAEN;IAED,IAAI,OAAO,oDAEV;IAED,MAAM,CAAC,UAAU,EAAC,kBAAkB,GAAE,2BAA2B,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAE7F,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAE,KAAK,wBAAwB,EAAE,KAAK,wBAAwB,EAAE,KAAK,6BAA6B,EAAE,KAAK,yBAAyB,EAAE,KAAK,2BAA2B,EAAE,MAAM,YAAY,CAAC;AAE9M,KAAK,oBAAoB,CAAC,CAAC,SAAS,iBAAiB,CAAC,GAAG,CAAC,EAAC,CAAC,SAAS,iBAAiB,CAAC,GAAG,CAAC,IAAI;IAC3F,KAAK,CAAC,EAAC,CAAC,CAAC;IACT,MAAM,CAAC,EAAC,CAAC,CAAC;IACV,UAAU,CAAC,EAAC;QACR,QAAQ,EAAC,0BAA0B,CAAC;KACvC,CAAA;CACJ,CAAA;AAED,KAAK,oBAAoB,GAAG,EAE3B,CAAA;AAED,cAAM,cAAc,CAAC,CAAC,SAAS,iBAAiB,CAAC,GAAG,CAAC,EAAC,CAAC,SAAS,iBAAiB,CAAC,GAAG,CAAC;IAE3E,OAAO,qCAA4C;IAC1D,OAAO,CAAC,MAAM,CAA2B;IAClC,IAAI,EAAC,YAAY,CAAC;gBAEb,MAAM,CAAC,EAAC,oBAAoB,CAAC,CAAC,EAAC,CAAC,CAAC;IAU7C,IAAI,CAAC,CAAC,SAAS,yBAAyB,CAAC,CAAC,CAAC,EAAC,CAAC,SAAS,wBAAwB,CAAC,CAAC,EAAC,CAAC,CAAC,EAAE,WAAW,EAAC,CAAC,EAAC,UAAU,EAAC,CAAC,EAAC,MAAM,EAAC;QACnH,OAAO,EAAC,wBAAwB,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC,CAAC;QACxC,IAAI,CAAC,EAAC,GAAG,CAAC;KACb;IAID,WAAW,CAAC,CAAC,SAAS,yBAAyB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAC,CAAC,EAAC,QAAQ,EAAC,6BAA6B,CAAC,CAAC,EAAC,CAAC,CAAC;IAU7G,IAAI,GAAG,oHAEN;IAED,IAAI,OAAO,oDAEV;IAED,MAAM,CAAC,UAAU,EAAC,kBAAkB,GAAE,2BAA2B,CAAC,CAAC,CAAC;CAavE;AAED,OAAO,EACH,cAAc,GACjB,CAAA"}
|
package/dist/client.js
CHANGED
|
@@ -37,11 +37,13 @@ class TypedRPCClient {
|
|
|
37
37
|
getAPI(connection) {
|
|
38
38
|
const api = new TypedRPCAPI();
|
|
39
39
|
return api.interface(async (context) => {
|
|
40
|
+
const methodConfig = this.config.remote?.resolveMethodConfig(context.serviceName, context.methodName);
|
|
40
41
|
return await this.core.request({
|
|
41
42
|
connection,
|
|
42
43
|
serviceName: context.serviceName,
|
|
43
44
|
methodName: context.methodName,
|
|
44
45
|
args: context.args,
|
|
46
|
+
timeout: methodConfig?.timeout,
|
|
45
47
|
});
|
|
46
48
|
});
|
|
47
49
|
}
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,EAAE,iCAAiC,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAsK,MAAM,YAAY,CAAC;AAc9M,MAAM,cAAc;IAET,OAAO,GAAG,IAAI,YAAY,EAAwB,CAAC;IAClD,MAAM,CAA2B;IAClC,IAAI,CAAc;IAEzB,YAAY,MAAiC;QACzC,MAAM,aAAa,GAA6B;YAC5C,UAAU,EAAC;gBACP,QAAQ,EAAC,IAAI,iCAAiC,EAAE;aACnD;SACJ,CAAA;QACD,IAAI,CAAC,MAAM,GAAG,EAAC,GAAG,aAAa,EAAC,GAAG,MAAM,EAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,CAAiF,WAAa,EAAC,UAAY,EAAC,MAG/G;QACG,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAC,UAAU,EAAC,MAAM,CAAC,CAAC;IACzD,CAAC;IAED,WAAW,CAAyC,WAAa,EAAC,QAA2C;QACzG,MAAM,UAAU,GAAG,iBAAiB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC7D,KAAI,IAAI,UAAU,IAAI,UAAU,EAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAC,UAA2C,EAAC;gBAC9D,OAAO,EAAC,QAAQ,CAAC,UAAU,CAAC;gBAC5B,IAAI,EAAC,QAAQ;aAChB,CAAC,CAAA;SACL;IACL,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,UAA6B;QAChC,MAAM,GAAG,GAAG,IAAI,WAAW,EAAK,CAAC;QACjC,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YACnC,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;gBAC3B,UAAU;gBACV,WAAW,EAAC,OAAO,CAAC,WAAW;gBAC/B,UAAU,EAAC,OAAO,CAAC,UAAU;gBAC7B,IAAI,EAAC,OAAO,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,EAAE,iCAAiC,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAsK,MAAM,YAAY,CAAC;AAc9M,MAAM,cAAc;IAET,OAAO,GAAG,IAAI,YAAY,EAAwB,CAAC;IAClD,MAAM,CAA2B;IAClC,IAAI,CAAc;IAEzB,YAAY,MAAiC;QACzC,MAAM,aAAa,GAA6B;YAC5C,UAAU,EAAC;gBACP,QAAQ,EAAC,IAAI,iCAAiC,EAAE;aACnD;SACJ,CAAA;QACD,IAAI,CAAC,MAAM,GAAG,EAAC,GAAG,aAAa,EAAC,GAAG,MAAM,EAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,CAAiF,WAAa,EAAC,UAAY,EAAC,MAG/G;QACG,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAC,UAAU,EAAC,MAAM,CAAC,CAAC;IACzD,CAAC;IAED,WAAW,CAAyC,WAAa,EAAC,QAA2C;QACzG,MAAM,UAAU,GAAG,iBAAiB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC7D,KAAI,IAAI,UAAU,IAAI,UAAU,EAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAC,UAA2C,EAAC;gBAC9D,OAAO,EAAC,QAAQ,CAAC,UAAU,CAAC;gBAC5B,IAAI,EAAC,QAAQ;aAChB,CAAC,CAAA;SACL;IACL,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,UAA6B;QAChC,MAAM,GAAG,GAAG,IAAI,WAAW,EAAK,CAAC;QACjC,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YACnC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,OAAO,CAAC,WAAW,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACrG,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;gBAC3B,UAAU;gBACV,WAAW,EAAC,OAAO,CAAC,WAAW;gBAC/B,UAAU,EAAC,OAAO,CAAC,UAAU;gBAC7B,IAAI,EAAC,OAAO,CAAC,IAAI;gBACjB,OAAO,EAAC,YAAY,EAAE,OAAO;aAChC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AAED,OAAO,EACH,cAAc,GACjB,CAAA"}
|
|
@@ -9,7 +9,7 @@ type TypedRPCConnectionEvents = {
|
|
|
9
9
|
declare abstract class TypedRPCConnection {
|
|
10
10
|
emitter: TypedEmitter<TypedRPCConnectionEvents>;
|
|
11
11
|
/** 发起一个请求并获得返回结果 */
|
|
12
|
-
abstract request(data: string): Promise<string>;
|
|
12
|
+
abstract request(data: string, timeout?: number): Promise<string>;
|
|
13
13
|
/** 获取连接的id */
|
|
14
14
|
abstract getId(): string;
|
|
15
15
|
/** 关闭连接 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basic.d.ts","sourceRoot":"","sources":["../../src/connections/basic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,KAAK,wBAAwB,GAAG;IAC5B,6BAA6B;IAC7B,OAAO,EAAC,CAAC,OAAO,EAAC;QACb,IAAI,EAAC,MAAM,CAAC;QACZ,QAAQ,EAAC,CAAC,IAAI,EAAC,MAAM,KAAK,IAAI,CAAC;KAClC,KAAK,IAAI,CAAC;CACd,CAAA;
|
|
1
|
+
{"version":3,"file":"basic.d.ts","sourceRoot":"","sources":["../../src/connections/basic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,KAAK,wBAAwB,GAAG;IAC5B,6BAA6B;IAC7B,OAAO,EAAC,CAAC,OAAO,EAAC;QACb,IAAI,EAAC,MAAM,CAAC;QACZ,QAAQ,EAAC,CAAC,IAAI,EAAC,MAAM,KAAK,IAAI,CAAC;KAClC,KAAK,IAAI,CAAC;CACd,CAAA;AAED,uBAAe,kBAAkB;IACtB,OAAO,yCAAgD;IAC9D,oBAAoB;IACpB,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAC,MAAM,EAAC,OAAO,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,MAAM,CAAC;IAC7D,cAAc;IACd,QAAQ,CAAC,KAAK,IAAG,MAAM;IACvB,WAAW;IACX,QAAQ,CAAC,KAAK,IAAG,OAAO;IACxB,WAAW;IACX,QAAQ,CAAC,QAAQ,IAAG,OAAO;CAC9B;AAED,KAAK,gCAAgC,GAAG;IACpC,cAAc;IACd,UAAU,EAAC,CAAC,UAAU,EAAC,kBAAkB,KAAK,IAAI,CAAC;CACtD,CAAA;AACD,uBAAe,0BAA0B;IAC9B,OAAO,iDAAwD;IACtE;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAC;QACnB,IAAI,EAAC,MAAM,CAAC;QACZ,QAAQ,CAAC,EAAC,MAAM,CAAC;KACpB,GAAE,OAAO,CAAC,OAAO,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,KAAK,IAAG,OAAO,CAAC,OAAO,CAAC;IAEjC;;OAEG;IACH,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAC,MAAM,GAAE,OAAO,CAAC,kBAAkB,CAAC;CAC9D;AAED,OAAO,EACH,kBAAkB,EAClB,0BAA0B,GAC7B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basic.js","sourceRoot":"","sources":["../../src/connections/basic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"basic.js","sourceRoot":"","sources":["../../src/connections/basic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAU3C,MAAe,kBAAkB;IACtB,OAAO,GAAG,IAAI,YAAY,EAA4B,CAAC;CASjE;AAMD,MAAe,0BAA0B;IAC9B,OAAO,GAAG,IAAI,YAAY,EAAoC,CAAC;CAkBzE;AAED,OAAO,EACH,kBAAkB,EAClB,0BAA0B,GAC7B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/connections/http.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAG5E,iCAAiC;AACjC,cAAM,sBAAuB,SAAQ,kBAAkB;IAKvC,OAAO,CAAC,MAAM;IAH1B,OAAO,CAAC,EAAE,CAAQ;IAClB,OAAO,CAAC,MAAM,CAAiB;gBAEX,MAAM,EAAC;QACvB,IAAI,EAAC,QAAQ,GAAC,QAAQ,CAAC;QACvB,MAAM,CAAC,EAAC,MAAM,CAAC;KAClB;IAKD,OAAO,CAAC,MAAM;IAIR,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAqB5C,KAAK,IAAI,MAAM;IAIf,KAAK,IAAI,OAAO;IAKhB,QAAQ,IAAI,OAAO;CAItB;AAED,KAAK,oCAAoC,GAAG,OAAO,MAAM,EAAE,MAAM,CAAC;AAElE,KAAK,oCAAoC,GAAG;IACxC,MAAM,CAAC,EAAC,oCAAoC,CAAC;CAChD,CAAA;AAED,KAAK,wCAAwC,GAAG,CAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,KAAK,IAAI,CAAC;AAE1E,cAAM,8BAA+B,SAAQ,0BAA0B;IAE5D,MAAM,EAAC,oCAAoC,CAAC;IAC5C,MAAM,EAAC,oCAAoC,GAAG,IAAI,CAAQ;IACjE,OAAO,CAAC,WAAW,CAAiD;gBAExD,MAAM,CAAC,EAAC,oCAAoC;IAYjD,GAAG,CAAC,UAAU,EAAC,wCAAwC;IAI9D,OAAO,CAAC,UAAU;YAmCJ,YAAY;IAQpB,MAAM,CAAC,MAAM,EAAC;QAChB,IAAI,EAAC,MAAM,CAAC;QACZ,IAAI,CAAC,EAAC,MAAM,CAAC;KAChB,GAAG,OAAO,CAAC,OAAO,CAAC;IAoBpB,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/connections/http.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAG5E,iCAAiC;AACjC,cAAM,sBAAuB,SAAQ,kBAAkB;IAKvC,OAAO,CAAC,MAAM;IAH1B,OAAO,CAAC,EAAE,CAAQ;IAClB,OAAO,CAAC,MAAM,CAAiB;gBAEX,MAAM,EAAC;QACvB,IAAI,EAAC,QAAQ,GAAC,QAAQ,CAAC;QACvB,MAAM,CAAC,EAAC,MAAM,CAAC;KAClB;IAKD,OAAO,CAAC,MAAM;IAIR,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAqB5C,KAAK,IAAI,MAAM;IAIf,KAAK,IAAI,OAAO;IAKhB,QAAQ,IAAI,OAAO;CAItB;AAED,KAAK,oCAAoC,GAAG,OAAO,MAAM,EAAE,MAAM,CAAC;AAElE,KAAK,oCAAoC,GAAG;IACxC,MAAM,CAAC,EAAC,oCAAoC,CAAC;CAChD,CAAA;AAED,KAAK,wCAAwC,GAAG,CAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,KAAK,IAAI,CAAC;AAE1E,cAAM,8BAA+B,SAAQ,0BAA0B;IAE5D,MAAM,EAAC,oCAAoC,CAAC;IAC5C,MAAM,EAAC,oCAAoC,GAAG,IAAI,CAAQ;IACjE,OAAO,CAAC,WAAW,CAAiD;gBAExD,MAAM,CAAC,EAAC,oCAAoC;IAYjD,GAAG,CAAC,UAAU,EAAC,wCAAwC;IAI9D,OAAO,CAAC,UAAU;YAmCJ,YAAY;IAQpB,MAAM,CAAC,MAAM,EAAC;QAChB,IAAI,EAAC,MAAM,CAAC;QACZ,IAAI,CAAC,EAAC,MAAM,CAAC;KAChB,GAAG,OAAO,CAAC,OAAO,CAAC;IAoBpB,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAiBnB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;CAQjE;AAED,OAAO,EACH,sBAAsB,EACtB,8BAA8B,GACjC,CAAA"}
|
package/dist/connections/http.js
CHANGED
|
@@ -119,11 +119,13 @@ class TypedRPCConnectionProviderHTTP extends TypedRPCConnectionProvider {
|
|
|
119
119
|
close() {
|
|
120
120
|
return new Promise((resolve, reject) => {
|
|
121
121
|
if (!this.server) {
|
|
122
|
-
|
|
122
|
+
resolve(true);
|
|
123
|
+
return;
|
|
123
124
|
}
|
|
124
125
|
this.server.close((err) => {
|
|
125
126
|
if (err) {
|
|
126
127
|
reject(err);
|
|
128
|
+
return;
|
|
127
129
|
}
|
|
128
130
|
resolve(true);
|
|
129
131
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/connections/http.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/connections/http.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ declare class TypedRPCConnectionSocket extends TypedRPCConnection {
|
|
|
14
14
|
close: () => boolean;
|
|
15
15
|
isClosed: () => boolean;
|
|
16
16
|
});
|
|
17
|
-
request(data: string): Promise<string>;
|
|
17
|
+
request(data: string, timeout?: number): Promise<string>;
|
|
18
18
|
getId(): string;
|
|
19
19
|
close(): boolean;
|
|
20
20
|
isClosed(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../src/connections/socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,YAAY,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAQ5E,KAAK,+BAA+B,GAAG;IACnC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC,CAAA;AACD,cAAM,wBAAyB,SAAQ,kBAAkB;IAOzC,OAAO,CAAC,MAAM;IANnB,UAAU,gDAAuD;IACxE,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,QAAQ,CAED;gBAEK,MAAM,EAAE;QACxB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAC7B,KAAK,EAAE,MAAM,OAAO,CAAC;QACrB,QAAQ,EAAE,MAAM,OAAO,CAAC;KAC3B;IA2BK,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../src/connections/socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,YAAY,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAQ5E,KAAK,+BAA+B,GAAG;IACnC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC,CAAA;AACD,cAAM,wBAAyB,SAAQ,kBAAkB;IAOzC,OAAO,CAAC,MAAM;IANnB,UAAU,gDAAuD;IACxE,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,QAAQ,CAED;gBAEK,MAAM,EAAE;QACxB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAC7B,KAAK,EAAE,MAAM,OAAO,CAAC;QACrB,QAAQ,EAAE,MAAM,OAAO,CAAC;KAC3B;IA2BK,OAAO,CAAC,IAAI,EAAE,MAAM,EAAC,OAAO,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgC5D,KAAK,IAAI,MAAM;IAGf,KAAK,IAAI,OAAO;IAGhB,QAAQ,IAAI,OAAO;CAItB;AAED,cAAM,gCAAiC,SAAQ,0BAA0B;IAErE,OAAO,CAAC,MAAM,CAAmC;IACjD,OAAO,CAAC,OAAO,CAAwC;IAEjD,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAkEtE,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAoB/B,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAmEvD;AAED,OAAO,EACH,wBAAwB,EACxB,gCAAgC,GACnC,CAAA"}
|
|
@@ -31,23 +31,34 @@ class TypedRPCConnectionSocket extends TypedRPCConnection {
|
|
|
31
31
|
}
|
|
32
32
|
});
|
|
33
33
|
}
|
|
34
|
-
async request(data) {
|
|
34
|
+
async request(data, timeout) {
|
|
35
35
|
const requestId = `${this.currentId++}`;
|
|
36
36
|
const payload = {
|
|
37
37
|
type: 'request',
|
|
38
38
|
id: requestId,
|
|
39
39
|
data: data,
|
|
40
40
|
};
|
|
41
|
-
|
|
41
|
+
// 超时处理
|
|
42
|
+
let cleanTimeout = () => { };
|
|
43
|
+
return new Promise((resolve, reject) => {
|
|
42
44
|
this.requests.set(requestId, {
|
|
43
45
|
resolve: resolve
|
|
44
46
|
});
|
|
45
47
|
// 发送数据
|
|
46
48
|
this.socket.send(JSON.stringify(payload));
|
|
49
|
+
// 超时处理
|
|
50
|
+
if (timeout) {
|
|
51
|
+
const timeoutHandle = setTimeout(() => {
|
|
52
|
+
reject(new Error(`request timeout after ${timeout}ms`));
|
|
53
|
+
}, timeout);
|
|
54
|
+
cleanTimeout = () => {
|
|
55
|
+
clearTimeout(timeoutHandle);
|
|
56
|
+
};
|
|
57
|
+
}
|
|
47
58
|
}).finally(() => {
|
|
48
59
|
this.requests.delete(requestId);
|
|
60
|
+
cleanTimeout();
|
|
49
61
|
});
|
|
50
|
-
return await requestPromise;
|
|
51
62
|
}
|
|
52
63
|
getId() {
|
|
53
64
|
return this.socket.id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../src/connections/socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAW5E,MAAM,wBAAyB,SAAQ,kBAAkB;IAOjC;IANb,UAAU,GAAG,IAAI,YAAY,EAAmC,CAAC;IAChE,SAAS,GAAG,CAAC,CAAC;IACd,QAAQ,GAEX,IAAI,GAAG,EAAE,CAAC;IAEf,YAAoB,MAKnB;QACG,KAAK,EAAE,CAAC;QANQ,WAAM,GAAN,MAAM,CAKzB;QAEG,SAAS;QACT,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YACnC,MAAM,aAAa,GAAoC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACxE,IAAI,aAAa,CAAC,IAAI,IAAI,SAAS;mBAC5B,aAAa,CAAC,EAAE,EACrB;gBACE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE;oBACzB,IAAI,EAAE,aAAa,CAAC,IAAI;oBACxB,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;wBACf,MAAM,WAAW,GAAoC;4BACjD,IAAI,EAAE,UAAU;4BAChB,EAAE,EAAE,aAAa,CAAC,EAAE;4BACpB,IAAI,EAAE,IAAI;yBACb,CAAA;wBACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;oBAClD,CAAC;iBACJ,CAAC,CAAA;aACL;iBAAM,IAAI,aAAa,CAAC,IAAI,IAAI,UAAU;mBACpC,aAAa,CAAC,EAAE,EACrB;gBACE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;aACpE;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAY;
|
|
1
|
+
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../src/connections/socket.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,19 +14,25 @@ declare class TypedRPCConnectionSocketIO extends TypedRPCConnection {
|
|
|
14
14
|
close: () => boolean;
|
|
15
15
|
isClosed: () => boolean;
|
|
16
16
|
});
|
|
17
|
-
request(data: string): Promise<string>;
|
|
17
|
+
request(data: string, timeout?: number): Promise<string>;
|
|
18
18
|
getId(): string;
|
|
19
19
|
close(): boolean;
|
|
20
20
|
isClosed(): boolean;
|
|
21
21
|
}
|
|
22
|
+
type TypedRPCConnectionProviderSocketIOConfig = {
|
|
23
|
+
server?: import('http').Server;
|
|
24
|
+
options?: Partial<import('socket.io').ServerOptions>;
|
|
25
|
+
};
|
|
22
26
|
declare class TypedRPCConnectionProviderSocketIO extends TypedRPCConnectionProvider {
|
|
23
27
|
private io;
|
|
28
|
+
private config;
|
|
29
|
+
constructor(config?: TypedRPCConnectionProviderSocketIOConfig);
|
|
24
30
|
listen(config: {
|
|
25
31
|
port: number;
|
|
26
32
|
hostname?: string;
|
|
27
33
|
}): Promise<boolean>;
|
|
28
34
|
close(): Promise<boolean>;
|
|
29
|
-
connect(target: string): Promise<TypedRPCConnection>;
|
|
35
|
+
connect(target: string, path?: string): Promise<TypedRPCConnection>;
|
|
30
36
|
}
|
|
31
37
|
export { TypedRPCConnectionSocketIO, TypedRPCConnectionProviderSocketIO, };
|
|
32
38
|
//# sourceMappingURL=socketio.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socketio.d.ts","sourceRoot":"","sources":["../../src/connections/socketio.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,YAAY,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAS5E,KAAK,+BAA+B,GAAG;IACnC,OAAO,EAAC,CAAC,IAAI,EAAC,MAAM,KAAK,IAAI,CAAC;CACjC,CAAA;AACD,cAAM,0BAA2B,SAAQ,kBAAkB;IAS3C,OAAO,CAAC,MAAM;IARnB,UAAU,gDAAuD;IAExE,OAAO,CAAC,SAAS,CAAK;IAEtB,OAAO,CAAC,QAAQ,CAED;gBAEK,MAAM,EAAC;QACvB,EAAE,EAAC,MAAM,CAAC;QACV,IAAI,EAAC,CAAC,IAAI,EAAC,MAAM,KAAK,IAAI,CAAC;QAC3B,KAAK,EAAC,MAAM,OAAO,CAAC;QACpB,QAAQ,EAAC,MAAM,OAAO,CAAC;KAC1B;IA6BK,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"socketio.d.ts","sourceRoot":"","sources":["../../src/connections/socketio.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,YAAY,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAS5E,KAAK,+BAA+B,GAAG;IACnC,OAAO,EAAC,CAAC,IAAI,EAAC,MAAM,KAAK,IAAI,CAAC;CACjC,CAAA;AACD,cAAM,0BAA2B,SAAQ,kBAAkB;IAS3C,OAAO,CAAC,MAAM;IARnB,UAAU,gDAAuD;IAExE,OAAO,CAAC,SAAS,CAAK;IAEtB,OAAO,CAAC,QAAQ,CAED;gBAEK,MAAM,EAAC;QACvB,EAAE,EAAC,MAAM,CAAC;QACV,IAAI,EAAC,CAAC,IAAI,EAAC,MAAM,KAAK,IAAI,CAAC;QAC3B,KAAK,EAAC,MAAM,OAAO,CAAC;QACpB,QAAQ,EAAC,MAAM,OAAO,CAAC;KAC1B;IA6BK,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAiC9D,KAAK,IAAI,MAAM;IAGf,KAAK,IAAI,OAAO;IAIhB,QAAQ,IAAI,OAAO;CAItB;AAGD,KAAK,wCAAwC,GAAG;IAC5C,MAAM,CAAC,EAAC,OAAO,MAAM,EAAE,MAAM,CAAC;IAC9B,OAAO,CAAC,EAAC,OAAO,CAAC,OAAO,WAAW,EAAE,aAAa,CAAC,CAAA;CACtD,CAAA;AAED,cAAM,kCAAmC,SAAQ,0BAA0B;IAEvE,OAAO,CAAC,EAAE,CAA0C;IACpD,OAAO,CAAC,MAAM,CAA0C;gBAE5C,MAAM,CAAC,EAAC,wCAAwC;IAKtD,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAwDtE,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAkBzB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAC,IAAI,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAiC1E;AAED,OAAO,EACH,0BAA0B,EAC1B,kCAAkC,GACrC,CAAA"}
|
|
@@ -32,22 +32,32 @@ class TypedRPCConnectionSocketIO extends TypedRPCConnection {
|
|
|
32
32
|
}
|
|
33
33
|
});
|
|
34
34
|
}
|
|
35
|
-
async request(data) {
|
|
35
|
+
async request(data, timeout) {
|
|
36
36
|
const requestId = `${this.currentId++}`;
|
|
37
37
|
const payload = {
|
|
38
38
|
type: 'request',
|
|
39
39
|
id: requestId,
|
|
40
40
|
data: data,
|
|
41
41
|
};
|
|
42
|
-
|
|
42
|
+
let cleanTimeout = () => { };
|
|
43
|
+
const requestPromise = new Promise((resolve, reject) => {
|
|
43
44
|
this.requests.set(requestId, {
|
|
44
45
|
resolve: resolve
|
|
45
46
|
});
|
|
46
47
|
// 发送数据
|
|
47
|
-
// console.log(`[${this.socket.id}][T]:${JSON.stringify(payload)}`);
|
|
48
48
|
this.socket.send(JSON.stringify(payload));
|
|
49
|
+
// 超时处理
|
|
50
|
+
if (timeout) {
|
|
51
|
+
const timeoutHandle = setTimeout(() => {
|
|
52
|
+
reject(new Error(`request timeout after ${timeout}ms`));
|
|
53
|
+
}, timeout);
|
|
54
|
+
cleanTimeout = () => {
|
|
55
|
+
clearTimeout(timeoutHandle);
|
|
56
|
+
};
|
|
57
|
+
}
|
|
49
58
|
}).finally(() => {
|
|
50
59
|
this.requests.delete(requestId);
|
|
60
|
+
cleanTimeout();
|
|
51
61
|
});
|
|
52
62
|
return await requestPromise;
|
|
53
63
|
}
|
|
@@ -63,16 +73,29 @@ class TypedRPCConnectionSocketIO extends TypedRPCConnection {
|
|
|
63
73
|
}
|
|
64
74
|
class TypedRPCConnectionProviderSocketIO extends TypedRPCConnectionProvider {
|
|
65
75
|
io = null;
|
|
76
|
+
config;
|
|
77
|
+
constructor(config) {
|
|
78
|
+
super();
|
|
79
|
+
this.config = config || {};
|
|
80
|
+
}
|
|
66
81
|
async listen(config) {
|
|
67
|
-
const httpModule = await import("http").catch(() => null);
|
|
68
|
-
if (!httpModule) {
|
|
69
|
-
throw new Error("http module not found");
|
|
70
|
-
}
|
|
71
82
|
const socketIOServerModule = await import("socket.io").catch(() => null);
|
|
72
83
|
if (!socketIOServerModule) {
|
|
73
|
-
throw new Error("socket.io module not found");
|
|
84
|
+
throw new Error("socket.io module not found, try to use npm install socket.io");
|
|
74
85
|
}
|
|
75
|
-
const server =
|
|
86
|
+
const server = await new Promise(async (resolve, reject) => {
|
|
87
|
+
if (this.config.server) {
|
|
88
|
+
resolve(this.config.server);
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
const httpModule = await import("http").catch(() => null);
|
|
92
|
+
if (!httpModule) {
|
|
93
|
+
reject(new Error("http module not found"));
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
resolve(httpModule.createServer());
|
|
97
|
+
}
|
|
98
|
+
});
|
|
76
99
|
const io = new socketIOServerModule.Server(server, {
|
|
77
100
|
cors: {
|
|
78
101
|
origin: "*",
|
|
@@ -125,13 +148,13 @@ class TypedRPCConnectionProviderSocketIO extends TypedRPCConnectionProvider {
|
|
|
125
148
|
this.io = null;
|
|
126
149
|
});
|
|
127
150
|
}
|
|
128
|
-
async connect(target) {
|
|
151
|
+
async connect(target, path) {
|
|
129
152
|
const SocketIOClientModule = await import("socket.io-client").catch(() => null);
|
|
130
153
|
if (!SocketIOClientModule) {
|
|
131
|
-
throw new Error("socket.io-client module not found");
|
|
154
|
+
throw new Error("socket.io-client module not found,try to use npm install socket.io-client");
|
|
132
155
|
}
|
|
133
156
|
return new Promise((resolve, reject) => {
|
|
134
|
-
const socket = SocketIOClientModule.io(`ws://${target}`);
|
|
157
|
+
const socket = SocketIOClientModule.io(`ws://${target}${path}`);
|
|
135
158
|
const connection = new TypedRPCConnectionSocketIO({
|
|
136
159
|
id: socket.id || IdMaker.makeId(),
|
|
137
160
|
send: (data) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socketio.js","sourceRoot":"","sources":["../../src/connections/socketio.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAY5E,MAAM,0BAA2B,SAAQ,kBAAkB;IASnC;IARb,UAAU,GAAG,IAAI,YAAY,EAAmC,CAAC;IAEhE,SAAS,GAAG,CAAC,CAAC;IAEd,QAAQ,GAEX,IAAI,GAAG,EAAE,CAAC;IAEf,YAAoB,MAKnB;QACG,KAAK,EAAE,CAAC;QANQ,WAAM,GAAN,MAAM,CAKzB;QAGG,SAAS;QACT,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAC,CAAC,IAAI,EAAE,EAAE;YAClC,iDAAiD;YACjD,MAAM,aAAa,GAAqC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzE,IAAG,aAAa,CAAC,IAAI,IAAI,SAAS;mBAC/B,aAAa,CAAC,EAAE,EAClB;gBACG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAC;oBACxB,IAAI,EAAC,aAAa,CAAC,IAAI;oBACvB,QAAQ,EAAC,CAAC,IAAI,EAAE,EAAE;wBACd,MAAM,WAAW,GAAqC;4BAClD,IAAI,EAAC,UAAU;4BACf,EAAE,EAAC,aAAa,CAAC,EAAE;4BACnB,IAAI,EAAC,IAAI;yBACZ,CAAA;wBACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;oBAClD,CAAC;iBACJ,CAAC,CAAA;aACL;iBAAK,IAAG,aAAa,CAAC,IAAI,IAAI,UAAU;mBACtC,aAAa,CAAC,EAAE,EAClB;gBACG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;aACpE;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAY;
|
|
1
|
+
{"version":3,"file":"socketio.js","sourceRoot":"","sources":["../../src/connections/socketio.ts"],"names":[],"mappings":"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"}
|
package/dist/core.d.ts
CHANGED
package/dist/core.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AAE5F,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAyB,KAAK,qBAAqB,EAAE,KAAK,sBAAsB,EAAE,MAAM,aAAa,CAAA;AAC5G,OAAO,
|
|
1
|
+
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AAE5F,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAyB,KAAK,qBAAqB,EAAE,KAAK,sBAAsB,EAAE,MAAM,aAAa,CAAA;AAC5G,OAAO,EAAkB,YAAY,EAAE,MAAM,YAAY,CAAA;AAEzD,KAAK,kBAAkB,GAAG;IACtB,UAAU,CAAC,EAAC;QACR,QAAQ,CAAC,EAAC,0BAA0B,CAAC;QACrC,cAAc,CAAC,EAAC,MAAM,0BAA0B,CAAC;KACpD,CAAA;CACJ,CAAA;AAED,KAAK,kBAAkB,GAAG;IACtB,UAAU,EAAC,CAAC,UAAU,EAAC,kBAAkB,KAAG,IAAI,CAAC;CACpD,CAAA;AAED,cAAM,YAAY;IAEP,OAAO,mCAA0C;IACxD,OAAO,CAAC,MAAM,CAAoB;IAC3B,OAAO,EAAC,eAAe,CAAC;gBAEnB,MAAM,EAAC,kBAAkB;IAerC,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,IAAI;IA6BZ,IAAI,IAAI;;;eAEP;IAEY,OAAO,CAAC,MAAM,EAAC;QACxB,UAAU,EAAC,kBAAkB,CAAC;QAC9B,WAAW,EAAC,MAAM,CAAC;QACnB,UAAU,EAAC,MAAM,CAAC;QAClB,IAAI,EAAC,GAAG,EAAE,CAAC;QACX,OAAO,CAAC,EAAC,MAAM,GAAG,SAAS,CAAC;KAC/B,GAAE,OAAO,CAAC;QACP,OAAO,EAAC,qBAAqB,CAAC;QAC9B,QAAQ,EAAC,sBAAsB,CAAC;KACnC,CAAC;IA6BW,MAAM,CAAC,MAAM,EAAC;QACvB,IAAI,EAAC,MAAM,CAAC;QACZ,QAAQ,CAAC,EAAC,MAAM,CAAC;KACpB,GAAE,OAAO,CAAC,OAAO,CAAC;IAQN,KAAK,IAAG,OAAO,CAAC,OAAO,CAAC;IAQxB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAE,OAAO,CAAC,kBAAkB,CAAC;CASnE;AAED,YAAY,EACR,kBAAkB,GACrB,CAAA;AAED,OAAO,EACH,YAAY,EACf,CAAA"}
|
package/dist/core.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { TypedRPCConnectionProviderDefault } from "./connection.js";
|
|
2
2
|
import { TypedRPCHandler } from "./handler.js";
|
|
3
3
|
import { TypedRPCPacketFactory } from "./packet.js";
|
|
4
|
-
import { TypedEmitter } from "./utils.js";
|
|
4
|
+
import { PromiseTimeout, TypedEmitter } from "./utils.js";
|
|
5
5
|
class TypedRPCCore {
|
|
6
6
|
emitter = new TypedEmitter();
|
|
7
7
|
config;
|
|
@@ -60,7 +60,11 @@ class TypedRPCCore {
|
|
|
60
60
|
methodName: config.methodName,
|
|
61
61
|
args: config.args,
|
|
62
62
|
});
|
|
63
|
-
const responsePacket = await
|
|
63
|
+
const responsePacket = await new PromiseTimeout(async (resolve, reject) => {
|
|
64
|
+
this.handler.request(config.connection, requestPacket, config.timeout).then(resolve).catch(reject);
|
|
65
|
+
})
|
|
66
|
+
.timeout(config.timeout || 0)
|
|
67
|
+
.catch((e) => {
|
|
64
68
|
return TypedRPCPacketFactory.createResponsePacket({
|
|
65
69
|
requestId: requestPacket.id,
|
|
66
70
|
error: e
|
package/dist/core.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,iBAAiB,CAAA;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,qBAAqB,EAA2D,MAAM,aAAa,CAAA;AAC5G,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":"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"}
|
package/dist/define.d.ts
CHANGED
|
@@ -1,14 +1,31 @@
|
|
|
1
1
|
type TypedRPCAPIDefineType = Record<string, Record<string, any>>;
|
|
2
|
+
type TypedRPCMethodConfig = {
|
|
3
|
+
timeout?: number | undefined;
|
|
4
|
+
};
|
|
5
|
+
type TypedRPCServiceConfig<T extends TypedRPCAPIDefineType, S extends keyof T> = {
|
|
6
|
+
methods?: {
|
|
7
|
+
[M in keyof T[S]]?: TypedRPCMethodConfig;
|
|
8
|
+
};
|
|
9
|
+
timeout?: number | undefined;
|
|
10
|
+
};
|
|
11
|
+
type TypedRPCDefineConfig<T extends TypedRPCAPIDefineType> = {
|
|
12
|
+
services?: {
|
|
13
|
+
[S in keyof T]?: TypedRPCServiceConfig<T, S>;
|
|
14
|
+
};
|
|
15
|
+
timeout?: number | undefined;
|
|
16
|
+
};
|
|
2
17
|
declare class TypedRPCAPIDefine<T extends TypedRPCAPIDefineType> {
|
|
3
18
|
static TypedRPCService: symbol;
|
|
4
19
|
static TypedRPCMethod: symbol;
|
|
5
20
|
static TypedRPCMethodList: symbol;
|
|
6
|
-
|
|
21
|
+
private config;
|
|
22
|
+
constructor(config?: TypedRPCDefineConfig<T>);
|
|
7
23
|
static method(): (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;
|
|
8
24
|
static isService(target: any): boolean;
|
|
9
25
|
static isMethod(method: any): boolean;
|
|
10
26
|
static getMethodList(service: any): string[];
|
|
27
|
+
resolveMethodConfig<S extends keyof T, M extends keyof T[S]>(service: S, methodName: M): TypedRPCMethodConfig | undefined;
|
|
11
28
|
}
|
|
12
|
-
export type { TypedRPCAPIDefineType, };
|
|
29
|
+
export type { TypedRPCAPIDefineType, TypedRPCDefineConfig, TypedRPCServiceConfig, TypedRPCMethodConfig, };
|
|
13
30
|
export { TypedRPCAPIDefine, };
|
|
14
31
|
//# sourceMappingURL=define.d.ts.map
|
package/dist/define.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"define.d.ts","sourceRoot":"","sources":["../src/define.ts"],"names":[],"mappings":"AACA,KAAK,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"define.d.ts","sourceRoot":"","sources":["../src/define.ts"],"names":[],"mappings":"AACA,KAAK,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAA;AAEhE,KAAK,oBAAoB,GAAG;IAExB,OAAO,CAAC,EAAC,MAAM,GAAG,SAAS,CAAC;CAC/B,CAAA;AAED,KAAK,qBAAqB,CAAC,CAAC,SAAS,qBAAqB,EAAC,CAAC,SAAS,MAAM,CAAC,IAAI;IAC5E,OAAO,CAAC,EAAC;SACJ,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAC,oBAAoB;KAC1C,CAAA;IAED,OAAO,CAAC,EAAC,MAAM,GAAG,SAAS,CAAC;CAC/B,CAAA;AAED,KAAK,oBAAoB,CAAC,CAAC,SAAS,qBAAqB,IAAI;IACzD,QAAQ,CAAC,EAAC;SACL,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAC,qBAAqB,CAAC,CAAC,EAAC,CAAC,CAAC;KAC7C,CAAC;IAEF,OAAO,CAAC,EAAC,MAAM,GAAG,SAAS,CAAC;CAC/B,CAAA;AAED,cAAM,iBAAiB,CAAC,CAAC,SAAS,qBAAqB;IAEnD,MAAM,CAAC,eAAe,SAA6B;IACnD,MAAM,CAAC,cAAc,SAA4B;IACjD,MAAM,CAAC,kBAAkB,SAAgC;IAEzD,OAAO,CAAC,MAAM,CAAyB;gBAE3B,MAAM,CAAC,EAAC,oBAAoB,CAAC,CAAC,CAAC;IAI3C,MAAM,CAAC,MAAM,aACe,GAAG,eAAc,MAAM,cAAa,kBAAkB;IAYlF,MAAM,CAAC,SAAS,CAAC,MAAM,EAAC,GAAG;IAI3B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAC,GAAG;IAW1B,MAAM,CAAC,aAAa,CAAC,OAAO,EAAC,GAAG,GAAE,MAAM,EAAE;IAO1C,mBAAmB,CAAC,CAAC,SAAS,MAAM,CAAC,EAAC,CAAC,SAAS,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAC,CAAC,EAAC,UAAU,EAAC,CAAC,GAAE,oBAAoB,GAAC,SAAS;CAQrH;AAGD,YAAY,EACR,qBAAqB,EACrB,oBAAoB,EACpB,qBAAqB,EACrB,oBAAoB,GACvB,CAAA;AAED,OAAO,EACH,iBAAiB,GACpB,CAAA"}
|
package/dist/define.js
CHANGED
|
@@ -2,7 +2,9 @@ class TypedRPCAPIDefine {
|
|
|
2
2
|
static TypedRPCService = Symbol('TypedRPCService');
|
|
3
3
|
static TypedRPCMethod = Symbol('TypedRPCMethod');
|
|
4
4
|
static TypedRPCMethodList = Symbol('TypedRPCMethodList');
|
|
5
|
+
config;
|
|
5
6
|
constructor(config) {
|
|
7
|
+
this.config = config || {};
|
|
6
8
|
}
|
|
7
9
|
static method() {
|
|
8
10
|
return function (target, propertyKey, descriptor) {
|
|
@@ -35,6 +37,13 @@ class TypedRPCAPIDefine {
|
|
|
35
37
|
}
|
|
36
38
|
return Array.from(service[TypedRPCAPIDefine.TypedRPCMethodList]);
|
|
37
39
|
}
|
|
40
|
+
resolveMethodConfig(service, methodName) {
|
|
41
|
+
const serviceConfig = this.config.services?.[service];
|
|
42
|
+
const methodConfig = serviceConfig?.methods?.[methodName];
|
|
43
|
+
return {
|
|
44
|
+
timeout: methodConfig?.timeout || serviceConfig?.timeout || this.config.timeout,
|
|
45
|
+
};
|
|
46
|
+
}
|
|
38
47
|
}
|
|
39
48
|
export { TypedRPCAPIDefine, };
|
|
40
49
|
//# sourceMappingURL=define.js.map
|
package/dist/define.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"define.js","sourceRoot":"","sources":["../src/define.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"define.js","sourceRoot":"","sources":["../src/define.ts"],"names":[],"mappings":"AAwBA,MAAM,iBAAiB;IAEnB,MAAM,CAAC,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;IACnD,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACjD,MAAM,CAAC,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAEjD,MAAM,CAAyB;IAEvC,YAAY,MAA+B;QACvC,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,MAAM;QACT,OAAQ,UAAS,MAAU,EAAE,WAAkB,EAAE,UAA6B;YAC1E,UAAU,CAAC,KAAK,CAAC,iBAAiB,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;YAC1D,IAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,eAAe,CAAC,EAAC;gBAC1C,MAAM,CAAC,iBAAiB,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC;aACpD;YACD,IAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAC;gBAC7C,MAAM,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,GAAG,IAAI,GAAG,EAAU,CAAC;aACpE;YACD,MAAM,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAClE,CAAC,CAAA;IACL,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,MAAU;QACvB,OAAO,MAAM,CAAC,iBAAiB,CAAC,eAAe,CAAC,KAAK,IAAI,CAAC;IAC9D,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,MAAU;QACtB,UAAU;QACV,IAAG,OAAO,MAAM,KAAK,UAAU,EAAC;YAC5B,OAAO,KAAK,CAAC;SAChB;QACD,IAAG,MAAM,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,IAAI,EAAC;YAChD,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,OAAW;QAC5B,IAAG,CAAC,iBAAiB,CAAC,SAAS,CAAC,OAAO,CAAC,EAAC;YACrC,OAAO,EAAE,CAAC;SACb;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,mBAAmB,CAAyC,OAAS,EAAC,UAAY;QAC9E,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC;QACtD,MAAM,YAAY,GAAG,aAAa,EAAE,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC;QAE1D,OAAO;YACH,OAAO,EAAE,YAAY,EAAE,OAAO,IAAI,aAAa,EAAE,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO;SAClF,CAAA;IACL,CAAC;;AAWL,OAAO,EACH,iBAAiB,GACpB,CAAA"}
|
package/dist/handler.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { type TypedRPCPacket, type TypedRPCRequestPacket, type TypedRPCResponseP
|
|
|
5
5
|
import { TypedEmitter } from "./utils.js";
|
|
6
6
|
type TypedRPCHandlerEvents = {};
|
|
7
7
|
/**
|
|
8
|
-
* 处理所有TypedRPC
|
|
8
|
+
* 处理所有TypedRPC数据包，管理入站出站，并调用hook的方法
|
|
9
9
|
*/
|
|
10
10
|
declare class TypedRPCHandler {
|
|
11
11
|
emitter: TypedEmitter<TypedRPCHandlerEvents>;
|
|
@@ -16,12 +16,25 @@ declare class TypedRPCHandler {
|
|
|
16
16
|
private middlewareProcesser;
|
|
17
17
|
outbound(context: TypedRPCContext): Promise<TypedRPCContext>;
|
|
18
18
|
inbound(context: TypedRPCContext): Promise<TypedRPCContext>;
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
/** send a request packet and return the response packet */
|
|
20
|
+
request(connection: TypedRPCConnection, request: TypedRPCRequestPacket, timeout?: number): Promise<TypedRPCPacket>;
|
|
21
|
+
handle(connection: TypedRPCConnection, request: TypedRPCRequestPacket, response: (packet: TypedRPCResponsePacket) => void): Promise<void>;
|
|
22
|
+
/**
|
|
23
|
+
* Add a hook function for the specified service method
|
|
24
|
+
* @param serviceName Service name
|
|
25
|
+
* @param methodName Method name
|
|
26
|
+
* @param config Hook function configuration
|
|
27
|
+
*/
|
|
21
28
|
hook(serviceName: string, methodName: string, config: {
|
|
22
29
|
handler: (...args: any[]) => any;
|
|
23
30
|
bind?: any;
|
|
24
31
|
}): void;
|
|
32
|
+
/**
|
|
33
|
+
* Remove the hook function for the specified service method
|
|
34
|
+
* @param serviceName Service name
|
|
35
|
+
* @param methodName Method name
|
|
36
|
+
*/
|
|
37
|
+
unhook(serviceName: string, methodName: string): void;
|
|
25
38
|
}
|
|
26
39
|
export { TypedRPCHandler, };
|
|
27
40
|
//# sourceMappingURL=handler.d.ts.map
|
package/dist/handler.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAyB,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAyB,KAAK,cAAc,EAAE,KAAK,qBAAqB,EAAE,KAAK,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAClI,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAI1C,KAAK,qBAAqB,GAAG,EAE5B,CAAA;AACD;;GAEG;AACH,cAAM,eAAe;IAEV,OAAO,sCAA6C;IAE3D,OAAO,CAAC,WAAW,CAA2B;IAE9C,OAAO,CAAC,KAAK,CAGJ;;
|
|
1
|
+
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAyB,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAyB,KAAK,cAAc,EAAE,KAAK,qBAAqB,EAAE,KAAK,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAClI,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAI1C,KAAK,qBAAqB,GAAG,EAE5B,CAAA;AACD;;GAEG;AACH,cAAM,eAAe;IAEV,OAAO,sCAA6C;IAE3D,OAAO,CAAC,WAAW,CAA2B;IAE9C,OAAO,CAAC,KAAK,CAGJ;;IAyDF,GAAG,CAAC,UAAU,EAAC,kBAAkB;YAK1B,mBAAmB;IAqBpB,QAAQ,CAAC,OAAO,EAAC,eAAe,GAAE,OAAO,CAAC,eAAe,CAAC;IAO1D,OAAO,CAAC,OAAO,EAAC,eAAe,GAAE,OAAO,CAAC,eAAe,CAAC;IAOtE,2DAA2D;IAC9C,OAAO,CAAC,UAAU,EAAC,kBAAkB,EAAC,OAAO,EAAC,qBAAqB,EAAC,OAAO,CAAC,EAAC,MAAM,GAAE,OAAO,CAAC,cAAc,CAAC;IA8C5G,MAAM,CAAC,UAAU,EAAC,kBAAkB,EAAC,OAAO,EAAC,qBAAqB,EAAC,QAAQ,EAAC,CAAC,MAAM,EAAC,sBAAsB,KAAK,IAAI;IAqBhI;;;;;OAKG;IACH,IAAI,CAAC,WAAW,EAAC,MAAM,EAAC,UAAU,EAAC,MAAM,EAAC,MAAM,EAAC;QAC7C,OAAO,EAAC,CAAC,GAAG,IAAI,EAAC,GAAG,EAAE,KAAG,GAAG,CAAC;QAC7B,IAAI,CAAC,EAAC,GAAG,CAAC;KACb;IAaD;;;;OAIG;IACH,MAAM,CAAC,WAAW,EAAC,MAAM,EAAC,UAAU,EAAC,MAAM;CAQ9C;AAED,OAAO,EACH,eAAe,GAClB,CAAA"}
|
package/dist/handler.js
CHANGED
|
@@ -2,16 +2,16 @@ import { TypedRPCContextSymbol } from "./context.js";
|
|
|
2
2
|
import { TypedRPCPacketFactory } from "./packet.js";
|
|
3
3
|
import { TypedEmitter } from "./utils.js";
|
|
4
4
|
/**
|
|
5
|
-
* 处理所有TypedRPC
|
|
5
|
+
* 处理所有TypedRPC数据包，管理入站出站，并调用hook的方法
|
|
6
6
|
*/
|
|
7
7
|
class TypedRPCHandler {
|
|
8
8
|
emitter = new TypedEmitter();
|
|
9
9
|
middlewares = [];
|
|
10
10
|
hooks = {};
|
|
11
11
|
constructor() {
|
|
12
|
+
// Fallback 托底返回错误
|
|
12
13
|
this.use({
|
|
13
14
|
inbound: async (context) => {
|
|
14
|
-
// Fallback 托底返回错误
|
|
15
15
|
if (context.inbound && !context.outbound) {
|
|
16
16
|
context.outbound = TypedRPCPacketFactory.createResponsePacket({
|
|
17
17
|
requestId: context.inbound.id,
|
|
@@ -24,13 +24,14 @@ class TypedRPCHandler {
|
|
|
24
24
|
return context;
|
|
25
25
|
},
|
|
26
26
|
});
|
|
27
|
+
// hook 调用
|
|
27
28
|
this.use({
|
|
28
29
|
inbound: async (context) => {
|
|
29
30
|
if (!context.inbound
|
|
30
31
|
|| !TypedRPCPacketFactory.isRequestPacket(context.inbound)) {
|
|
31
32
|
return context;
|
|
32
33
|
}
|
|
33
|
-
//
|
|
34
|
+
// 如果已经有出站包，直接返回，赋予其他中间件拦截的能力
|
|
34
35
|
if (context.outbound) {
|
|
35
36
|
return context;
|
|
36
37
|
}
|
|
@@ -97,16 +98,21 @@ class TypedRPCHandler {
|
|
|
97
98
|
}
|
|
98
99
|
return this.middlewareProcesser(context, this.middlewares.length - 1, 'inbound');
|
|
99
100
|
}
|
|
100
|
-
|
|
101
|
+
/** send a request packet and return the response packet */
|
|
102
|
+
async request(connection, request, timeout) {
|
|
103
|
+
// build context
|
|
101
104
|
let context = {
|
|
102
105
|
connection: connection,
|
|
103
106
|
outbound: request,
|
|
104
107
|
};
|
|
105
|
-
context = await this.outbound(context);
|
|
108
|
+
context = await this.outbound(context); // outbound middleware
|
|
106
109
|
if (!context.outbound) {
|
|
107
110
|
throw new Error("Request failed: outbound is empty");
|
|
108
111
|
}
|
|
109
|
-
|
|
112
|
+
// send request
|
|
113
|
+
const res = await connection.request(JSON.stringify(context.outbound), timeout).catch((e) => {
|
|
114
|
+
throw e;
|
|
115
|
+
});
|
|
110
116
|
if (!res) {
|
|
111
117
|
throw new Error("Response is empty");
|
|
112
118
|
}
|
|
@@ -123,38 +129,63 @@ class TypedRPCHandler {
|
|
|
123
129
|
if (!TypedRPCPacketFactory.isResponsePacket(responseObject)) {
|
|
124
130
|
throw new Error("Response is not a TypedRPCResponsePacket");
|
|
125
131
|
}
|
|
132
|
+
// set inbound packet
|
|
126
133
|
context.inbound = responseObject;
|
|
134
|
+
// inbound middleware
|
|
127
135
|
context = await this.inbound(context);
|
|
128
136
|
if (!context.inbound) {
|
|
129
|
-
throw new Error("Request failed: inbound is empty");
|
|
137
|
+
throw new Error("Request failed: received inbound is empty");
|
|
130
138
|
}
|
|
139
|
+
// return inbound packet
|
|
131
140
|
return context.inbound;
|
|
132
141
|
}
|
|
133
142
|
async handle(connection, request, response) {
|
|
143
|
+
// build context
|
|
134
144
|
let context = {
|
|
135
145
|
connection: connection,
|
|
136
146
|
inbound: request,
|
|
137
147
|
};
|
|
148
|
+
// inbound middleware
|
|
138
149
|
context = await this.inbound(context);
|
|
139
150
|
if (!context.outbound) {
|
|
140
|
-
return
|
|
151
|
+
return; // some middleware may not generate outbound or block the outbound
|
|
141
152
|
}
|
|
142
|
-
context = await this.outbound(context);
|
|
153
|
+
context = await this.outbound(context); // outbound middleware
|
|
143
154
|
if (!context.outbound
|
|
144
155
|
|| !TypedRPCPacketFactory.isResponsePacket(context.outbound)) {
|
|
145
|
-
return
|
|
156
|
+
return; // nothing need to response, skip response
|
|
146
157
|
}
|
|
147
158
|
response(context.outbound);
|
|
148
159
|
}
|
|
160
|
+
/**
|
|
161
|
+
* Add a hook function for the specified service method
|
|
162
|
+
* @param serviceName Service name
|
|
163
|
+
* @param methodName Method name
|
|
164
|
+
* @param config Hook function configuration
|
|
165
|
+
*/
|
|
149
166
|
hook(serviceName, methodName, config) {
|
|
150
167
|
if (!this.hooks[serviceName]) {
|
|
151
168
|
this.hooks[serviceName] = {};
|
|
152
169
|
}
|
|
170
|
+
if (this.hooks[serviceName][methodName]) {
|
|
171
|
+
throw new Error(`Hook function for ${serviceName}.${methodName} already exists.check if it is overwritten or use unhook to remove it first.`);
|
|
172
|
+
}
|
|
153
173
|
this.hooks[serviceName][methodName] = {
|
|
154
174
|
handler: config.handler,
|
|
155
175
|
bind: config.bind,
|
|
156
176
|
};
|
|
157
177
|
}
|
|
178
|
+
/**
|
|
179
|
+
* Remove the hook function for the specified service method
|
|
180
|
+
* @param serviceName Service name
|
|
181
|
+
* @param methodName Method name
|
|
182
|
+
*/
|
|
183
|
+
unhook(serviceName, methodName) {
|
|
184
|
+
if (!this.hooks[serviceName]) {
|
|
185
|
+
return;
|
|
186
|
+
}
|
|
187
|
+
delete this.hooks[serviceName][methodName];
|
|
188
|
+
}
|
|
158
189
|
}
|
|
159
190
|
export { TypedRPCHandler, };
|
|
160
191
|
//# sourceMappingURL=handler.js.map
|
package/dist/handler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAwB,MAAM,cAAc,CAAC;AAE3E,OAAO,EAAE,qBAAqB,EAAgF,MAAM,aAAa,CAAC;AAClI,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAO1C;;GAEG;AACH,MAAM,eAAe;IAEV,OAAO,GAAG,IAAI,YAAY,EAAyB,CAAC;IAEnD,WAAW,GAAwB,EAAE,CAAC;IAEtC,KAAK,GAGP,EAAE,CAAC;IAET;QACI,IAAI,CAAC,GAAG,CAAC;YACL,OAAO,EAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACtB,
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"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"}
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,KAAK,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,KAAK,wBAAwB,EAAE,KAAK,wBAAwB,EAAE,KAAK,6BAA6B,EAAE,KAAK,yBAAyB,EAAE,KAAK,2BAA2B,EAAE,MAAM,YAAY,CAAC;AAE9M,KAAK,oBAAoB,CAAC,CAAC,SAAS,iBAAiB,CAAC,qBAAqB,CAAC,EAAC,CAAC,SAAS,iBAAiB,CAAC,qBAAqB,CAAC,IAAI;IAC/H,KAAK,CAAC,EAAC,CAAC,CAAC;IACT,MAAM,CAAC,EAAC,CAAC,CAAC;IACV,UAAU,CAAC,EAAC,kBAAkB,CAAC,YAAY,CAAC,CAAA;CAC/C,CAAA;AAED,KAAK,oBAAoB,GAAG;IACxB,UAAU,EAAC,CAAC,UAAU,EAAC,kBAAkB,KAAG,IAAI,CAAC;CACpD,CAAA;AAED,cAAM,cAAc,CAAC,CAAC,SAAS,iBAAiB,CAAC,qBAAqB,CAAC,EAAC,CAAC,SAAS,iBAAiB,CAAC,qBAAqB,CAAC;IAE/G,OAAO,qCAA4C;IAC1D,OAAO,CAAC,MAAM,CAA2B;IAClC,IAAI,EAAC,YAAY,CAAC;gBAEb,MAAM,CAAC,EAAC,oBAAoB,CAAC,CAAC,EAAC,CAAC,CAAC;IAa7C,IAAI,CAAC,CAAC,SAAS,yBAAyB,CAAC,CAAC,CAAC,EAAC,CAAC,SAAS,wBAAwB,CAAC,CAAC,EAAC,CAAC,CAAC,EAAE,WAAW,EAAC,CAAC,EAAC,UAAU,EAAC,CAAC,EAAC,MAAM,EAAC;QACnH,OAAO,EAAC,wBAAwB,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC,CAAC;QACxC,IAAI,CAAC,EAAC,GAAG,CAAC;KACb;IAID,WAAW,CAAC,CAAC,SAAS,yBAAyB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAC,CAAC,EAAC,QAAQ,EAAC,6BAA6B,CAAC,CAAC,EAAC,CAAC,CAAC;IAU7G,IAAI,GAAG,oHAEN;IAED,IAAI,MAAM;;;2BAET;IAED,IAAI,KAAK,2BAER;IAED,MAAM,CAAC,UAAU,EAAC,kBAAkB,GAAE,2BAA2B,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,KAAK,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,KAAK,wBAAwB,EAAE,KAAK,wBAAwB,EAAE,KAAK,6BAA6B,EAAE,KAAK,yBAAyB,EAAE,KAAK,2BAA2B,EAAE,MAAM,YAAY,CAAC;AAE9M,KAAK,oBAAoB,CAAC,CAAC,SAAS,iBAAiB,CAAC,qBAAqB,CAAC,EAAC,CAAC,SAAS,iBAAiB,CAAC,qBAAqB,CAAC,IAAI;IAC/H,KAAK,CAAC,EAAC,CAAC,CAAC;IACT,MAAM,CAAC,EAAC,CAAC,CAAC;IACV,UAAU,CAAC,EAAC,kBAAkB,CAAC,YAAY,CAAC,CAAA;CAC/C,CAAA;AAED,KAAK,oBAAoB,GAAG;IACxB,UAAU,EAAC,CAAC,UAAU,EAAC,kBAAkB,KAAG,IAAI,CAAC;CACpD,CAAA;AAED,cAAM,cAAc,CAAC,CAAC,SAAS,iBAAiB,CAAC,qBAAqB,CAAC,EAAC,CAAC,SAAS,iBAAiB,CAAC,qBAAqB,CAAC;IAE/G,OAAO,qCAA4C;IAC1D,OAAO,CAAC,MAAM,CAA2B;IAClC,IAAI,EAAC,YAAY,CAAC;gBAEb,MAAM,CAAC,EAAC,oBAAoB,CAAC,CAAC,EAAC,CAAC,CAAC;IAa7C,IAAI,CAAC,CAAC,SAAS,yBAAyB,CAAC,CAAC,CAAC,EAAC,CAAC,SAAS,wBAAwB,CAAC,CAAC,EAAC,CAAC,CAAC,EAAE,WAAW,EAAC,CAAC,EAAC,UAAU,EAAC,CAAC,EAAC,MAAM,EAAC;QACnH,OAAO,EAAC,wBAAwB,CAAC,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC,CAAC;QACxC,IAAI,CAAC,EAAC,GAAG,CAAC;KACb;IAID,WAAW,CAAC,CAAC,SAAS,yBAAyB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAC,CAAC,EAAC,QAAQ,EAAC,6BAA6B,CAAC,CAAC,EAAC,CAAC,CAAC;IAU7G,IAAI,GAAG,oHAEN;IAED,IAAI,MAAM;;;2BAET;IAED,IAAI,KAAK,2BAER;IAED,MAAM,CAAC,UAAU,EAAC,kBAAkB,GAAE,2BAA2B,CAAC,CAAC,CAAC;CAcvE;AAED,OAAO,EACH,cAAc,GACjB,CAAA"}
|
package/dist/server.js
CHANGED
|
@@ -40,11 +40,13 @@ class TypedRPCServer {
|
|
|
40
40
|
getAPI(connection) {
|
|
41
41
|
const api = new TypedRPCAPI();
|
|
42
42
|
return api.interface(async (context) => {
|
|
43
|
+
const methodConfig = this.config.remote?.resolveMethodConfig(context.serviceName, context.methodName);
|
|
43
44
|
return await this.core.request({
|
|
44
45
|
connection,
|
|
45
46
|
serviceName: context.serviceName,
|
|
46
47
|
methodName: context.methodName,
|
|
47
48
|
args: context.args,
|
|
49
|
+
timeout: methodConfig?.timeout,
|
|
48
50
|
});
|
|
49
51
|
});
|
|
50
52
|
}
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,EAAE,YAAY,EAA2B,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAA8B,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAsK,MAAM,YAAY,CAAC;AAY9M,MAAM,cAAc;IAET,OAAO,GAAG,IAAI,YAAY,EAAwB,CAAC;IAClD,MAAM,CAA2B;IAClC,IAAI,CAAc;IAEzB,YAAY,MAAiC;QACzC,MAAM,aAAa,GAA6B,EAE/C,CAAA;QACD,IAAI,CAAC,MAAM,GAAG,EAAC,GAAG,aAAa,EAAC,GAAG,MAAM,EAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,GAAG,IAAI,YAAY,CAAC;YACzB,UAAU,EAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE;SAC1C,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,EAAC,CAAC,UAAU,EAAE,EAAE;YAC7C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAC,UAAU,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAA;IACN,CAAC;IAED,IAAI,CAAiF,WAAa,EAAC,UAAY,EAAC,MAG/G;QACG,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAC,UAAU,EAAC,MAAM,CAAC,CAAC;IACzD,CAAC;IAED,WAAW,CAAyC,WAAa,EAAC,QAA2C;QACzG,MAAM,UAAU,GAAG,iBAAiB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC7D,KAAI,IAAI,UAAU,IAAI,UAAU,EAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAC,UAA2C,EAAC;gBAC9D,OAAO,EAAC,QAAQ,CAAC,UAAU,CAAC;gBAC5B,IAAI,EAAC,QAAQ;aAChB,CAAC,CAAA;SACL;IACL,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,CAAC,UAA6B;QAChC,MAAM,GAAG,GAAG,IAAI,WAAW,EAAK,CAAC;QACjC,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YACnC,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;gBAC3B,UAAU;gBACV,WAAW,EAAC,OAAO,CAAC,WAAW;gBAC/B,UAAU,EAAC,OAAO,CAAC,UAAU;gBAC7B,IAAI,EAAC,OAAO,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,EAAE,YAAY,EAA2B,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAA8B,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAsK,MAAM,YAAY,CAAC;AAY9M,MAAM,cAAc;IAET,OAAO,GAAG,IAAI,YAAY,EAAwB,CAAC;IAClD,MAAM,CAA2B;IAClC,IAAI,CAAc;IAEzB,YAAY,MAAiC;QACzC,MAAM,aAAa,GAA6B,EAE/C,CAAA;QACD,IAAI,CAAC,MAAM,GAAG,EAAC,GAAG,aAAa,EAAC,GAAG,MAAM,EAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,GAAG,IAAI,YAAY,CAAC;YACzB,UAAU,EAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE;SAC1C,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,EAAC,CAAC,UAAU,EAAE,EAAE;YAC7C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAC,UAAU,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAA;IACN,CAAC;IAED,IAAI,CAAiF,WAAa,EAAC,UAAY,EAAC,MAG/G;QACG,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAC,UAAU,EAAC,MAAM,CAAC,CAAC;IACzD,CAAC;IAED,WAAW,CAAyC,WAAa,EAAC,QAA2C;QACzG,MAAM,UAAU,GAAG,iBAAiB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC7D,KAAI,IAAI,UAAU,IAAI,UAAU,EAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAC,UAA2C,EAAC;gBAC9D,OAAO,EAAC,QAAQ,CAAC,UAAU,CAAC;gBAC5B,IAAI,EAAC,QAAQ;aAChB,CAAC,CAAA;SACL;IACL,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,CAAC,UAA6B;QAChC,MAAM,GAAG,GAAG,IAAI,WAAW,EAAK,CAAC;QACjC,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YACnC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,OAAO,CAAC,WAAW,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACrG,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;gBAC3B,UAAU;gBACV,WAAW,EAAC,OAAO,CAAC,WAAW;gBAC/B,UAAU,EAAC,OAAO,CAAC,UAAU;gBAC7B,IAAI,EAAC,OAAO,CAAC,IAAI;gBACjB,OAAO,EAAC,YAAY,EAAE,OAAO;aAChC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;CAEJ;AAED,OAAO,EACH,cAAc,GACjB,CAAA"}
|
package/dist/utils.d.ts
CHANGED
|
@@ -9,6 +9,7 @@ export type TypedRPCDefineToTypedRPCAPI<T extends TypedRPCAPIDefine<any>> = T ex
|
|
|
9
9
|
/** 获取方法id */
|
|
10
10
|
request: (config: {
|
|
11
11
|
args: Parameters<U[S][M]>;
|
|
12
|
+
timeout?: number;
|
|
12
13
|
callback?: (result: ReturnType<U[S][M]>, req: TypedRPCRequestPacket, res: TypedRPCResponsePacket) => void;
|
|
13
14
|
error?: (error: any, req: TypedRPCRequestPacket, res: TypedRPCResponsePacket) => void;
|
|
14
15
|
}) => string;
|
|
@@ -37,4 +38,14 @@ export declare class IdMaker {
|
|
|
37
38
|
static makeId(): string;
|
|
38
39
|
makeId(): string;
|
|
39
40
|
}
|
|
41
|
+
export declare class PromiseTimeout<T> {
|
|
42
|
+
private promise;
|
|
43
|
+
private reject?;
|
|
44
|
+
private timer?;
|
|
45
|
+
constructor(executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void);
|
|
46
|
+
timeout(time: number): this;
|
|
47
|
+
get catch(): <TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null | undefined) => Promise<T | TResult>;
|
|
48
|
+
get finally(): (onfinally?: (() => void) | null | undefined) => Promise<T>;
|
|
49
|
+
get then(): <TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>;
|
|
50
|
+
}
|
|
40
51
|
//# sourceMappingURL=utils.d.ts.map
|
package/dist/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/utils.js
CHANGED
|
@@ -43,4 +43,86 @@ export class IdMaker {
|
|
|
43
43
|
return `${timestamp}${suffix}`;
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
|
+
export class PromiseTimeout {
|
|
47
|
+
promise;
|
|
48
|
+
reject;
|
|
49
|
+
timer;
|
|
50
|
+
constructor(executor) {
|
|
51
|
+
this.promise = new Promise((resolve, reject) => {
|
|
52
|
+
this.reject = reject;
|
|
53
|
+
executor(resolve, reject);
|
|
54
|
+
}).finally(() => {
|
|
55
|
+
if (this.timer) {
|
|
56
|
+
clearTimeout(this.timer);
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
timeout(time) {
|
|
61
|
+
if (time <= 0) {
|
|
62
|
+
clearTimeout(this.timer);
|
|
63
|
+
return this;
|
|
64
|
+
}
|
|
65
|
+
if (this.timer) {
|
|
66
|
+
clearTimeout(this.timer);
|
|
67
|
+
}
|
|
68
|
+
this.timer = setTimeout(() => {
|
|
69
|
+
this.reject?.(new Error(`Promise timed out after ${time}ms`));
|
|
70
|
+
}, time);
|
|
71
|
+
return this;
|
|
72
|
+
}
|
|
73
|
+
get catch() {
|
|
74
|
+
return this.promise.catch.bind(this.promise);
|
|
75
|
+
}
|
|
76
|
+
get finally() {
|
|
77
|
+
return this.promise.finally.bind(this.promise);
|
|
78
|
+
}
|
|
79
|
+
get then() {
|
|
80
|
+
return this.promise.then.bind(this.promise);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
// export class PromiseTimeout<T> extends Promise<T> {
|
|
84
|
+
// private timer: ReturnType<typeof setTimeout> | null = null;
|
|
85
|
+
// private rejectFn: ((reason?: any) => void) | null = null;
|
|
86
|
+
// constructor(
|
|
87
|
+
// executor: (
|
|
88
|
+
// resolve: (value: T | PromiseLike<T>) => void,
|
|
89
|
+
// reject: (reason?: any) => void
|
|
90
|
+
// ) => void
|
|
91
|
+
// ) {
|
|
92
|
+
// let internalReject: (reason?: any) => void;
|
|
93
|
+
// // 调用父类构造函数
|
|
94
|
+
// super((resolve, reject) => {
|
|
95
|
+
// internalReject = reject;
|
|
96
|
+
// executor(resolve, reject);
|
|
97
|
+
// });
|
|
98
|
+
// this.rejectFn = internalReject!;
|
|
99
|
+
// }
|
|
100
|
+
// /**
|
|
101
|
+
// * 设置超时时间
|
|
102
|
+
// * @param ms 毫秒数
|
|
103
|
+
// * @returns 返回实例支持链式调用
|
|
104
|
+
// */
|
|
105
|
+
// timeout(ms: number): this {
|
|
106
|
+
// if (this.timer) {
|
|
107
|
+
// clearTimeout(this.timer);
|
|
108
|
+
// }
|
|
109
|
+
// this.timer = setTimeout(() => {
|
|
110
|
+
// if (this.rejectFn) {
|
|
111
|
+
// this.rejectFn(new Error(`Promise timed out after ${ms}ms`));
|
|
112
|
+
// }
|
|
113
|
+
// }, ms);
|
|
114
|
+
// // 无论成功或失败，都要清除定时器，防止内存泄漏
|
|
115
|
+
// this.finally(() => {
|
|
116
|
+
// if (this.timer) {
|
|
117
|
+
// clearTimeout(this.timer);
|
|
118
|
+
// }
|
|
119
|
+
// });
|
|
120
|
+
// return this;
|
|
121
|
+
// }
|
|
122
|
+
// // 必须重写 Symbol.species 以确保 then/catch 返回的是原生 Promise
|
|
123
|
+
// // 否则链式调用可能会因为构造函数参数不匹配而报错
|
|
124
|
+
// static get [Symbol.species]() {
|
|
125
|
+
// return Promise;
|
|
126
|
+
// }
|
|
127
|
+
// }
|
|
46
128
|
//# sourceMappingURL=utils.js.map
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mingzey/typedrpc",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.5",
|
|
4
4
|
"description": "TypeScript-based RPC framework with support for multiple connection types including HTTP, Socket, and SocketIO or custom",
|
|
5
5
|
"author": "MingZeY <1552904342@qq.com>",
|
|
6
6
|
"repository": {
|