@juzi/wechaty 1.0.2 → 1.0.3
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/cjs/src/io-peer/io-peer.d.ts.map +1 -1
- package/dist/cjs/src/io-peer/io-peer.js +3 -6
- package/dist/cjs/src/io-peer/io-peer.js.map +1 -1
- package/dist/cjs/src/io-peer/io-peer.spec.js +4 -7
- package/dist/cjs/src/io-peer/io-peer.spec.js.map +1 -1
- package/dist/cjs/src/package-json.js +3 -3
- package/dist/esm/src/io-peer/io-peer.d.ts.map +1 -1
- package/dist/esm/src/io-peer/io-peer.js +3 -3
- package/dist/esm/src/io-peer/io-peer.js.map +1 -1
- package/dist/esm/src/io-peer/io-peer.spec.js +4 -4
- package/dist/esm/src/io-peer/io-peer.spec.js.map +1 -1
- package/dist/esm/src/package-json.js +3 -3
- package/package.json +2 -2
- package/src/io-peer/io-peer.spec.ts +4 -4
- package/src/io-peer/io-peer.ts +3 -3
- package/src/package-json.ts +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io-peer.d.ts","sourceRoot":"","sources":["../../../../src/io-peer/io-peer.ts"],"names":[],"mappings":";AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"io-peer.d.ts","sourceRoot":"","sources":["../../../../src/io-peer/io-peer.ts"],"names":[],"mappings":";AACA,OAAO,WAAqC,MAAM,eAAe,CAAA;AAQjE,QAAA,MAAM,gBAAgB,YAAkB,YAAY,cAAc,iDAA6E,CAAA;AAC/I,QAAA,MAAM,qBAAqB,YAAa,YAAY,cAAc,sDAAyG,CAAA;AAC3K,QAAA,MAAM,iBAAiB,YAAiB,YAAY,cAAc,kDAA6E,CAAA;AAC/I,QAAA,MAAM,cAAc,YAAoB,YAAY,cAAc,+CAA4E,CAAA;AAE9I,UAAU,aAAa;IACrB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,QAAA,MAAM,OAAO,YAAa,aAAa,qBAmDtC,CAAA;AAED,OAAO,EACL,OAAO,EAEP,cAAc,EACd,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,GAClB,CAAA"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.isJsonRpcResponse = exports.isJsonRpcRequest = exports.isJsonRpcNotification = exports.isJsonRpcError = exports.getPeer = void 0;
|
|
7
4
|
/// <reference path="json-rpc-peer.d.ts"/>
|
|
8
|
-
const json_rpc_peer_1 =
|
|
5
|
+
const json_rpc_peer_1 = require("json-rpc-peer");
|
|
9
6
|
// // https://stackoverflow.com/a/50375286/1123955
|
|
10
7
|
// type UnionToIntersection<U> =
|
|
11
8
|
// (U extends any ? (k: U)=>void : never) extends ((k: infer I)=>void) ? I : never
|
|
@@ -47,7 +44,7 @@ const getPeer = (options) => {
|
|
|
47
44
|
case 'getHostieGrpcPort':
|
|
48
45
|
return serviceImpl[serviceMethodName]();
|
|
49
46
|
default:
|
|
50
|
-
throw new json_rpc_peer_1.
|
|
47
|
+
throw new json_rpc_peer_1.MethodNotFound(serviceMethodName);
|
|
51
48
|
}
|
|
52
49
|
}
|
|
53
50
|
else if (isJsonRpcResponse(message)) {
|
|
@@ -64,7 +61,7 @@ const getPeer = (options) => {
|
|
|
64
61
|
}
|
|
65
62
|
console.info(JSON.stringify(message));
|
|
66
63
|
};
|
|
67
|
-
const ioPeer = new json_rpc_peer_1.
|
|
64
|
+
const ioPeer = new json_rpc_peer_1.Peer(onMessage);
|
|
68
65
|
return ioPeer;
|
|
69
66
|
};
|
|
70
67
|
exports.getPeer = getPeer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io-peer.js","sourceRoot":"","sources":["../../../../src/io-peer/io-peer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"io-peer.js","sourceRoot":"","sources":["../../../../src/io-peer/io-peer.ts"],"names":[],"mappings":";;;AAAA,0CAA0C;AAC1C,iDAAiE;AAEjE,kDAAkD;AAClD,gCAAgC;AAChC,oFAAoF;AAEpF,4EAA4E;AAE5E,MAAM,gBAAgB,GAAQ,CAAC,OAAmC,EAAqD,EAAE,CAAC,CAAC,QAAQ,IAAI,OAAO,CAAC,CAAA;AAmE7I,4CAAgB;AAlElB,MAAM,qBAAqB,GAAG,CAAC,OAAmC,EAAqD,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAA;AAiEzK,sDAAqB;AAhEvB,MAAM,iBAAiB,GAAO,CAAC,OAAmC,EAAqD,EAAE,CAAC,CAAC,QAAQ,IAAI,OAAO,CAAC,CAAA;AAkE7I,8CAAiB;AAjEnB,MAAM,cAAc,GAAU,CAAC,OAAmC,EAAqD,EAAE,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,CAAA;AA8D5I,wCAAc;AAxDhB,MAAM,OAAO,GAAG,CAAC,OAAsB,EAAE,EAAE;IACzC,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,eAAe,CAAA;IAExD,MAAM,WAAW,GAAG;QAClB;;;WAGG;QACH,iBAAiB,EAAE,kBAAkB;KACtC,CAAA;IAED,MAAM,SAAS,GAAG,KAAK,EAAE,OAAmC,EAAgB,EAAE;QAC5E,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE;YAC7B,MAAM;YACJ,MAAM;YACN,MAAM;YACN,UAAU;cACX,GAAG,OAAO,CAAA;YAEX,IAAI,CAAC,CAAC,MAAM,IAAI,WAAW,CAAC,EAAE;gBAC5B,OAAO,CAAC,KAAK,CAAC,uCAAuC,GAAG,MAAM,CAAC,CAAA;gBAC/D,OAAM;aACP;YAED,MAAM,iBAAiB,GAAG,MAAkC,CAAA;YAC5D,QAAQ,iBAAiB,EAAE;gBACzB;;;mBAGG;gBACH,KAAK,mBAAmB;oBACtB,OAAO,WAAW,CAAC,iBAAiB,CAAC,EAAE,CAAA;gBAEzC;oBACE,MAAM,IAAI,8BAAc,CAAC,iBAAiB,CAAC,CAAA;aAC9C;SACF;aAAM,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE;YACrC,sBAAsB;SACvB;aAAM,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE;YACzC,sBAAsB;SACvB;aAAM,IAAI,cAAc,CAAC,OAAO,CAAC,EAAE;YAClC,sBAAsB;SACvB;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;SACxE;QACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;IACvC,CAAC,CAAA;IAED,MAAM,MAAM,GAAG,IAAI,oBAAI,CAAC,SAAS,CAAC,CAAA;IAElC,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAGC,0BAAO"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
#!/usr/bin/env -S node --no-warnings --loader ts-node/esm
|
|
2
2
|
"use strict";
|
|
3
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
4
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
5
|
-
};
|
|
6
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
4
|
/**
|
|
8
5
|
* Wechaty Chatbot SDK - https://github.com/wechaty/wechaty
|
|
@@ -24,14 +21,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
24
21
|
*
|
|
25
22
|
*/
|
|
26
23
|
const tstest_1 = require("tstest");
|
|
27
|
-
const json_rpc_peer_1 =
|
|
24
|
+
const json_rpc_peer_1 = require("json-rpc-peer");
|
|
28
25
|
const io_peer_js_1 = require("./io-peer.js");
|
|
29
26
|
(0, tstest_1.test)('getPeer()', async (t) => {
|
|
30
27
|
const EXPECTED_PORT = 8788;
|
|
31
28
|
const server = (0, io_peer_js_1.getPeer)({
|
|
32
29
|
serviceGrpcPort: EXPECTED_PORT,
|
|
33
30
|
});
|
|
34
|
-
const client = new json_rpc_peer_1.
|
|
31
|
+
const client = new json_rpc_peer_1.Peer();
|
|
35
32
|
/**
|
|
36
33
|
* FIXME: Huan(202108): remove `any` to fix the typing
|
|
37
34
|
*/
|
|
@@ -52,10 +49,10 @@ const io_peer_js_1 = require("./io-peer.js");
|
|
|
52
49
|
* Huan(202101) Need to be fixed by new IO Bus system.
|
|
53
50
|
* See: https://github.com/wechaty/wechaty-puppet-service/issues/118
|
|
54
51
|
*/
|
|
55
|
-
const request = json_rpc_peer_1.
|
|
52
|
+
const request = json_rpc_peer_1.format.request(42, 'getHostieGrpcPort');
|
|
56
53
|
const response = await server.exec(request);
|
|
57
54
|
// console.info('response: ', response)
|
|
58
|
-
const obj = json_rpc_peer_1.
|
|
55
|
+
const obj = (0, json_rpc_peer_1.parse)(response);
|
|
59
56
|
t.equal(obj.result, EXPECTED_PORT, 'should get the right port from payload');
|
|
60
57
|
});
|
|
61
58
|
//# sourceMappingURL=io-peer.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io-peer.spec.js","sourceRoot":"","sources":["../../../../src/io-peer/io-peer.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"io-peer.spec.js","sourceRoot":"","sources":["../../../../src/io-peer/io-peer.spec.ts"],"names":[],"mappings":";;;AACA;;;;;;;;;;;;;;;;;;GAkBG;AACH,mCAA8B;AAE9B,iDAAgE;AAEhE,6CAEuC;AAEvC,IAAA,aAAI,EAAC,WAAW,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAC1B,MAAM,aAAa,GAAG,IAAI,CAAA;IAC1B,MAAM,MAAM,GAAG,IAAA,oBAAO,EAAC;QACrB,eAAe,EAAE,aAAa;KAC/B,CAAC,CAAA;IACF,MAAM,MAAM,GAAG,IAAI,oBAAI,EAAE,CAAA;IACzB;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,MAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEvC;;;OAGG;IACH,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;IACtD,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,2BAA2B,CAAC,CAAA;AAC3D,CAAC,CAAC,CAAA;AAEF,IAAA,aAAI,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IACvB,MAAM,aAAa,GAAG,IAAI,CAAA;IAC1B,MAAM,MAAM,GAAG,IAAA,oBAAO,EAAC;QACrB,eAAe,EAAE,aAAa;KAC/B,CAAC,CAAA;IAEF;;;OAGG;IACH,MAAM,OAAO,GAAG,sBAAM,CAAC,OAAO,CAAC,EAAE,EAAE,mBAAmB,CAAC,CAAA;IACvD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAW,CAAA;IACrD,uCAAuC;IAEvC,MAAM,GAAG,GAAG,IAAA,qBAAK,EAAC,QAAQ,CAAuC,CAAA;IACjE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,wCAAwC,CAAC,CAAA;AAC9E,CAAC,CAAC,CAAA"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.packageJson = exports.GIT_COMMIT_HASH = void 0;
|
|
4
|
-
exports.GIT_COMMIT_HASH = '
|
|
4
|
+
exports.GIT_COMMIT_HASH = 'd38cb69c3f9c7c2abf74bde57eacd6183f8e4170';
|
|
5
5
|
exports.packageJson = {
|
|
6
6
|
"name": "@juzi/wechaty",
|
|
7
|
-
"version": "1.0.
|
|
7
|
+
"version": "1.0.3",
|
|
8
8
|
"description": "Wechaty is a RPA SDK for Chatbot Makers.",
|
|
9
9
|
"type": "module",
|
|
10
10
|
"exports": {
|
|
@@ -129,7 +129,7 @@ exports.packageJson = {
|
|
|
129
129
|
"state-switch": "^1.6.3",
|
|
130
130
|
"uuid": "^8.3.2",
|
|
131
131
|
"@juzi/wechaty-puppet": "1.0.1",
|
|
132
|
-
"@juzi/wechaty-puppet-service": "1.0.
|
|
132
|
+
"@juzi/wechaty-puppet-service": "1.0.2",
|
|
133
133
|
"wechaty-puppet-wechat4u": "^1.11.1",
|
|
134
134
|
"wechaty-token": "^1.1.1",
|
|
135
135
|
"ws": "^8.5.0"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io-peer.d.ts","sourceRoot":"","sources":["../../../../src/io-peer/io-peer.ts"],"names":[],"mappings":";AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"io-peer.d.ts","sourceRoot":"","sources":["../../../../src/io-peer/io-peer.ts"],"names":[],"mappings":";AACA,OAAO,WAAqC,MAAM,eAAe,CAAA;AAQjE,QAAA,MAAM,gBAAgB,YAAkB,YAAY,cAAc,iDAA6E,CAAA;AAC/I,QAAA,MAAM,qBAAqB,YAAa,YAAY,cAAc,sDAAyG,CAAA;AAC3K,QAAA,MAAM,iBAAiB,YAAiB,YAAY,cAAc,kDAA6E,CAAA;AAC/I,QAAA,MAAM,cAAc,YAAoB,YAAY,cAAc,+CAA4E,CAAA;AAE9I,UAAU,aAAa;IACrB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,QAAA,MAAM,OAAO,YAAa,aAAa,qBAmDtC,CAAA;AAED,OAAO,EACL,OAAO,EAEP,cAAc,EACd,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,GAClB,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference path="json-rpc-peer.d.ts"/>
|
|
2
|
-
import
|
|
2
|
+
import { Peer, MethodNotFound } from 'json-rpc-peer';
|
|
3
3
|
// // https://stackoverflow.com/a/50375286/1123955
|
|
4
4
|
// type UnionToIntersection<U> =
|
|
5
5
|
// (U extends any ? (k: U)=>void : never) extends ((k: infer I)=>void) ? I : never
|
|
@@ -37,7 +37,7 @@ const getPeer = (options) => {
|
|
|
37
37
|
case 'getHostieGrpcPort':
|
|
38
38
|
return serviceImpl[serviceMethodName]();
|
|
39
39
|
default:
|
|
40
|
-
throw new
|
|
40
|
+
throw new MethodNotFound(serviceMethodName);
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
else if (isJsonRpcResponse(message)) {
|
|
@@ -54,7 +54,7 @@ const getPeer = (options) => {
|
|
|
54
54
|
}
|
|
55
55
|
console.info(JSON.stringify(message));
|
|
56
56
|
};
|
|
57
|
-
const ioPeer = new
|
|
57
|
+
const ioPeer = new Peer(onMessage);
|
|
58
58
|
return ioPeer;
|
|
59
59
|
};
|
|
60
60
|
export { getPeer, isJsonRpcError, isJsonRpcNotification, isJsonRpcRequest, isJsonRpcResponse, };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io-peer.js","sourceRoot":"","sources":["../../../../src/io-peer/io-peer.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"io-peer.js","sourceRoot":"","sources":["../../../../src/io-peer/io-peer.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,OAAoB,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAEjE,kDAAkD;AAClD,gCAAgC;AAChC,oFAAoF;AAEpF,4EAA4E;AAE5E,MAAM,gBAAgB,GAAQ,CAAC,OAAmC,EAAqD,EAAE,CAAC,CAAC,QAAQ,IAAI,OAAO,CAAC,CAAA;AAC/I,MAAM,qBAAqB,GAAG,CAAC,OAAmC,EAAqD,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAA;AAC3K,MAAM,iBAAiB,GAAO,CAAC,OAAmC,EAAqD,EAAE,CAAC,CAAC,QAAQ,IAAI,OAAO,CAAC,CAAA;AAC/I,MAAM,cAAc,GAAU,CAAC,OAAmC,EAAqD,EAAE,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,CAAA;AAM9I,MAAM,OAAO,GAAG,CAAC,OAAsB,EAAE,EAAE;IACzC,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,eAAe,CAAA;IAExD,MAAM,WAAW,GAAG;QAClB;;;WAGG;QACH,iBAAiB,EAAE,kBAAkB;KACtC,CAAA;IAED,MAAM,SAAS,GAAG,KAAK,EAAE,OAAmC,EAAgB,EAAE;QAC5E,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE;YAC7B,MAAM;YACJ,MAAM;YACN,MAAM;YACN,UAAU;cACX,GAAG,OAAO,CAAA;YAEX,IAAI,CAAC,CAAC,MAAM,IAAI,WAAW,CAAC,EAAE;gBAC5B,OAAO,CAAC,KAAK,CAAC,uCAAuC,GAAG,MAAM,CAAC,CAAA;gBAC/D,OAAM;aACP;YAED,MAAM,iBAAiB,GAAG,MAAkC,CAAA;YAC5D,QAAQ,iBAAiB,EAAE;gBACzB;;;mBAGG;gBACH,KAAK,mBAAmB;oBACtB,OAAO,WAAW,CAAC,iBAAiB,CAAC,EAAE,CAAA;gBAEzC;oBACE,MAAM,IAAI,cAAc,CAAC,iBAAiB,CAAC,CAAA;aAC9C;SACF;aAAM,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE;YACrC,sBAAsB;SACvB;aAAM,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE;YACzC,sBAAsB;SACvB;aAAM,IAAI,cAAc,CAAC,OAAO,CAAC,EAAE;YAClC,sBAAsB;SACvB;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;SACxE;QACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;IACvC,CAAC,CAAA;IAED,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAA;IAElC,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,OAAO,EACL,OAAO,EAEP,cAAc,EACd,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,GAClB,CAAA"}
|
|
@@ -19,14 +19,14 @@
|
|
|
19
19
|
*
|
|
20
20
|
*/
|
|
21
21
|
import { test } from 'tstest';
|
|
22
|
-
import
|
|
22
|
+
import { Peer, format, parse } from 'json-rpc-peer';
|
|
23
23
|
import { getPeer, } from './io-peer.js';
|
|
24
24
|
test('getPeer()', async (t) => {
|
|
25
25
|
const EXPECTED_PORT = 8788;
|
|
26
26
|
const server = getPeer({
|
|
27
27
|
serviceGrpcPort: EXPECTED_PORT,
|
|
28
28
|
});
|
|
29
|
-
const client = new
|
|
29
|
+
const client = new Peer();
|
|
30
30
|
/**
|
|
31
31
|
* FIXME: Huan(202108): remove `any` to fix the typing
|
|
32
32
|
*/
|
|
@@ -47,10 +47,10 @@ test('exec()', async (t) => {
|
|
|
47
47
|
* Huan(202101) Need to be fixed by new IO Bus system.
|
|
48
48
|
* See: https://github.com/wechaty/wechaty-puppet-service/issues/118
|
|
49
49
|
*/
|
|
50
|
-
const request =
|
|
50
|
+
const request = format.request(42, 'getHostieGrpcPort');
|
|
51
51
|
const response = await server.exec(request);
|
|
52
52
|
// console.info('response: ', response)
|
|
53
|
-
const obj =
|
|
53
|
+
const obj = parse(response);
|
|
54
54
|
t.equal(obj.result, EXPECTED_PORT, 'should get the right port from payload');
|
|
55
55
|
});
|
|
56
56
|
//# sourceMappingURL=io-peer.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io-peer.spec.js","sourceRoot":"","sources":["../../../../src/io-peer/io-peer.spec.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,EAAE,IAAI,EAAE,MAAO,QAAQ,CAAA;AAE9B,
|
|
1
|
+
{"version":3,"file":"io-peer.spec.js","sourceRoot":"","sources":["../../../../src/io-peer/io-peer.spec.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,EAAE,IAAI,EAAE,MAAO,QAAQ,CAAA;AAE9B,OAAoB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAEhE,OAAO,EACL,OAAO,GACR,MAAwB,cAAc,CAAA;AAEvC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAC1B,MAAM,aAAa,GAAG,IAAI,CAAA;IAC1B,MAAM,MAAM,GAAG,OAAO,CAAC;QACrB,eAAe,EAAE,aAAa;KAC/B,CAAC,CAAA;IACF,MAAM,MAAM,GAAG,IAAI,IAAI,EAAE,CAAA;IACzB;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,MAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEvC;;;OAGG;IACH,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;IACtD,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,2BAA2B,CAAC,CAAA;AAC3D,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IACvB,MAAM,aAAa,GAAG,IAAI,CAAA;IAC1B,MAAM,MAAM,GAAG,OAAO,CAAC;QACrB,eAAe,EAAE,aAAa;KAC/B,CAAC,CAAA;IAEF;;;OAGG;IACH,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,mBAAmB,CAAC,CAAA;IACvD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAW,CAAA;IACrD,uCAAuC;IAEvC,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAuC,CAAA;IACjE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,wCAAwC,CAAC,CAAA;AAC9E,CAAC,CAAC,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
export const GIT_COMMIT_HASH = '
|
|
1
|
+
export const GIT_COMMIT_HASH = 'd38cb69c3f9c7c2abf74bde57eacd6183f8e4170';
|
|
2
2
|
export const packageJson = {
|
|
3
3
|
"name": "@juzi/wechaty",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.3",
|
|
5
5
|
"description": "Wechaty is a RPA SDK for Chatbot Makers.",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"exports": {
|
|
@@ -126,7 +126,7 @@ export const packageJson = {
|
|
|
126
126
|
"state-switch": "^1.6.3",
|
|
127
127
|
"uuid": "^8.3.2",
|
|
128
128
|
"@juzi/wechaty-puppet": "1.0.1",
|
|
129
|
-
"@juzi/wechaty-puppet-service": "1.0.
|
|
129
|
+
"@juzi/wechaty-puppet-service": "1.0.2",
|
|
130
130
|
"wechaty-puppet-wechat4u": "^1.11.1",
|
|
131
131
|
"wechaty-token": "^1.1.1",
|
|
132
132
|
"ws": "^8.5.0"
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@juzi/wechaty",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.3",
|
|
4
4
|
"description": "Wechaty is a RPA SDK for Chatbot Makers.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -125,7 +125,7 @@
|
|
|
125
125
|
"state-switch": "^1.6.3",
|
|
126
126
|
"uuid": "^8.3.2",
|
|
127
127
|
"@juzi/wechaty-puppet": "1.0.1",
|
|
128
|
-
"@juzi/wechaty-puppet-service": "1.0.
|
|
128
|
+
"@juzi/wechaty-puppet-service": "1.0.2",
|
|
129
129
|
"wechaty-puppet-wechat4u": "^1.11.1",
|
|
130
130
|
"wechaty-token": "^1.1.1",
|
|
131
131
|
"ws": "^8.5.0"
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
*/
|
|
21
21
|
import { test } from 'tstest'
|
|
22
22
|
|
|
23
|
-
import jsonRpcPeer from 'json-rpc-peer'
|
|
23
|
+
import jsonRpcPeer, { Peer, format, parse } from 'json-rpc-peer'
|
|
24
24
|
|
|
25
25
|
import {
|
|
26
26
|
getPeer,
|
|
@@ -31,7 +31,7 @@ test('getPeer()', async t => {
|
|
|
31
31
|
const server = getPeer({
|
|
32
32
|
serviceGrpcPort: EXPECTED_PORT,
|
|
33
33
|
})
|
|
34
|
-
const client = new
|
|
34
|
+
const client = new Peer()
|
|
35
35
|
/**
|
|
36
36
|
* FIXME: Huan(202108): remove `any` to fix the typing
|
|
37
37
|
*/
|
|
@@ -55,10 +55,10 @@ test('exec()', async t => {
|
|
|
55
55
|
* Huan(202101) Need to be fixed by new IO Bus system.
|
|
56
56
|
* See: https://github.com/wechaty/wechaty-puppet-service/issues/118
|
|
57
57
|
*/
|
|
58
|
-
const request =
|
|
58
|
+
const request = format.request(42, 'getHostieGrpcPort')
|
|
59
59
|
const response = await server.exec(request) as string
|
|
60
60
|
// console.info('response: ', response)
|
|
61
61
|
|
|
62
|
-
const obj =
|
|
62
|
+
const obj = parse(response) as jsonRpcPeer.JsonRpcPayloadResponse
|
|
63
63
|
t.equal(obj.result, EXPECTED_PORT, 'should get the right port from payload')
|
|
64
64
|
})
|
package/src/io-peer/io-peer.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference path="json-rpc-peer.d.ts"/>
|
|
2
|
-
import jsonRpcPeer from 'json-rpc-peer'
|
|
2
|
+
import jsonRpcPeer, { Peer, MethodNotFound } from 'json-rpc-peer'
|
|
3
3
|
|
|
4
4
|
// // https://stackoverflow.com/a/50375286/1123955
|
|
5
5
|
// type UnionToIntersection<U> =
|
|
@@ -50,7 +50,7 @@ const getPeer = (options: IoPeerOptions) => {
|
|
|
50
50
|
return serviceImpl[serviceMethodName]()
|
|
51
51
|
|
|
52
52
|
default:
|
|
53
|
-
throw new
|
|
53
|
+
throw new MethodNotFound(serviceMethodName)
|
|
54
54
|
}
|
|
55
55
|
} else if (isJsonRpcResponse(message)) {
|
|
56
56
|
// NOOP: we are server
|
|
@@ -64,7 +64,7 @@ const getPeer = (options: IoPeerOptions) => {
|
|
|
64
64
|
console.info(JSON.stringify(message))
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
-
const ioPeer = new
|
|
67
|
+
const ioPeer = new Peer(onMessage)
|
|
68
68
|
|
|
69
69
|
return ioPeer
|
|
70
70
|
}
|
package/src/package-json.ts
CHANGED
|
@@ -4,10 +4,10 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import type { PackageJsonWechaty } from './config'
|
|
6
6
|
|
|
7
|
-
export const GIT_COMMIT_HASH: string = '
|
|
7
|
+
export const GIT_COMMIT_HASH: string = 'd38cb69c3f9c7c2abf74bde57eacd6183f8e4170'
|
|
8
8
|
export const packageJson: PackageJsonWechaty = {
|
|
9
9
|
"name": "@juzi/wechaty",
|
|
10
|
-
"version": "1.0.
|
|
10
|
+
"version": "1.0.3",
|
|
11
11
|
"description": "Wechaty is a RPA SDK for Chatbot Makers.",
|
|
12
12
|
"type": "module",
|
|
13
13
|
"exports": {
|
|
@@ -132,7 +132,7 @@ export const packageJson: PackageJsonWechaty = {
|
|
|
132
132
|
"state-switch": "^1.6.3",
|
|
133
133
|
"uuid": "^8.3.2",
|
|
134
134
|
"@juzi/wechaty-puppet": "1.0.1",
|
|
135
|
-
"@juzi/wechaty-puppet-service": "1.0.
|
|
135
|
+
"@juzi/wechaty-puppet-service": "1.0.2",
|
|
136
136
|
"wechaty-puppet-wechat4u": "^1.11.1",
|
|
137
137
|
"wechaty-token": "^1.1.1",
|
|
138
138
|
"ws": "^8.5.0"
|