@delight-rpc/extra-websocket 0.4.0 → 0.6.0

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.
Files changed (8) hide show
  1. package/lib/client.js +23 -50
  2. package/lib/client.js.map +1 -1
  3. package/lib/index.d.ts +2 -2
  4. package/lib/index.js +2 -18
  5. package/lib/index.js.map +1 -1
  6. package/lib/server.js +11 -39
  7. package/lib/server.js.map +1 -1
  8. package/package.json +28 -28
package/lib/client.js CHANGED
@@ -1,48 +1,22 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
- Object.defineProperty(exports, "__esModule", { value: true });
26
- exports.ClientClosed = exports.createBatchClient = exports.createClient = void 0;
27
- const DelightRPC = __importStar(require("delight-rpc"));
28
- const extra_promise_1 = require("extra-promise");
29
- const errors_1 = require("@blackglory/errors");
30
- const return_style_1 = require("return-style");
31
- const prelude_1 = require("@blackglory/prelude");
32
- const extra_abort_1 = require("extra-abort");
33
- function createClient(socket, { parameterValidators, expectedVersion, channel, timeout } = {}) {
1
+ import * as DelightRPC from 'delight-rpc';
2
+ import { Deferred } from 'extra-promise';
3
+ import { CustomError } from '@blackglory/errors';
4
+ import { getResult } from 'return-style';
5
+ import { isString, isUndefined } from '@blackglory/prelude';
6
+ import { withAbortSignal, timeoutSignal } from 'extra-abort';
7
+ export function createClient(socket, { parameterValidators, expectedVersion, channel, timeout } = {}) {
34
8
  const pendings = {};
35
9
  const removeMessageListener = socket.on('message', listener);
36
10
  const client = DelightRPC.createClient(async function send(request) {
37
- const res = new extra_promise_1.Deferred();
11
+ const res = new Deferred();
38
12
  pendings[request.id] = res;
39
13
  try {
40
14
  socket.send(JSON.stringify(request));
41
- if ((0, prelude_1.isUndefined)(timeout)) {
15
+ if (isUndefined(timeout)) {
42
16
  return await res;
43
17
  }
44
18
  else {
45
- return await (0, extra_abort_1.withAbortSignal)((0, extra_abort_1.timeoutSignal)(timeout), () => res);
19
+ return await withAbortSignal(timeoutSignal(timeout), () => res);
46
20
  }
47
21
  }
48
22
  finally {
@@ -62,29 +36,29 @@ function createClient(socket, { parameterValidators, expectedVersion, channel, t
62
36
  }
63
37
  }
64
38
  function listener(event) {
39
+ var _a;
65
40
  const data = event.data;
66
- if ((0, prelude_1.isString)(data)) {
67
- const res = (0, return_style_1.getResult)(() => JSON.parse(data));
41
+ if (isString(data)) {
42
+ const res = getResult(() => JSON.parse(data));
68
43
  if (DelightRPC.isResult(res) || DelightRPC.isError(res)) {
69
- pendings[res.id].resolve(res);
44
+ (_a = pendings[res.id]) === null || _a === void 0 ? void 0 : _a.resolve(res);
70
45
  }
71
46
  }
72
47
  }
73
48
  }
74
- exports.createClient = createClient;
75
- function createBatchClient(socket, { expectedVersion, channel, timeout } = {}) {
49
+ export function createBatchClient(socket, { expectedVersion, channel, timeout } = {}) {
76
50
  const pendings = {};
77
51
  const removeMessageListener = socket.on('message', listener);
78
52
  const client = new DelightRPC.BatchClient(async function send(request) {
79
- const res = new extra_promise_1.Deferred();
53
+ const res = new Deferred();
80
54
  pendings[request.id] = res;
81
55
  try {
82
56
  socket.send(JSON.stringify(request));
83
- if ((0, prelude_1.isUndefined)(timeout)) {
57
+ if (isUndefined(timeout)) {
84
58
  return await res;
85
59
  }
86
60
  else {
87
- return await (0, extra_abort_1.withAbortSignal)((0, extra_abort_1.timeoutSignal)(timeout), () => res);
61
+ return await withAbortSignal(timeoutSignal(timeout), () => res);
88
62
  }
89
63
  }
90
64
  finally {
@@ -103,17 +77,16 @@ function createBatchClient(socket, { expectedVersion, channel, timeout } = {}) {
103
77
  }
104
78
  }
105
79
  function listener(event) {
80
+ var _a;
106
81
  const data = event.data;
107
- if ((0, prelude_1.isString)(data)) {
108
- const res = (0, return_style_1.getResult)(() => JSON.parse(data));
82
+ if (isString(data)) {
83
+ const res = getResult(() => JSON.parse(data));
109
84
  if (DelightRPC.isError(res) || DelightRPC.isBatchResponse(res)) {
110
- pendings[res.id].resolve(res);
85
+ (_a = pendings[res.id]) === null || _a === void 0 ? void 0 : _a.resolve(res);
111
86
  }
112
87
  }
113
88
  }
114
89
  }
115
- exports.createBatchClient = createBatchClient;
116
- class ClientClosed extends errors_1.CustomError {
90
+ export class ClientClosed extends CustomError {
117
91
  }
118
- exports.ClientClosed = ClientClosed;
119
92
  //# sourceMappingURL=client.js.map
package/lib/client.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
package/lib/index.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- export * from './client';
2
- export * from './server';
1
+ export * from './client.js';
2
+ export * from './server.js';
package/lib/index.js CHANGED
@@ -1,19 +1,3 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
- for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
- };
16
- Object.defineProperty(exports, "__esModule", { value: true });
17
- __exportStar(require("./client"), exports);
18
- __exportStar(require("./server"), exports);
1
+ export * from './client.js';
2
+ export * from './server.js';
19
3
  //# sourceMappingURL=index.js.map
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAwB;AACxB,2CAAwB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA"}
package/lib/server.js CHANGED
@@ -1,46 +1,19 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
- Object.defineProperty(exports, "__esModule", { value: true });
26
- exports.createServer = exports.Level = void 0;
27
- const DelightRPC = __importStar(require("delight-rpc"));
28
- const return_style_1 = require("return-style");
29
- const extra_logger_1 = require("extra-logger");
30
- const prelude_1 = require("@blackglory/prelude");
31
- var extra_logger_2 = require("extra-logger");
32
- Object.defineProperty(exports, "Level", { enumerable: true, get: function () { return extra_logger_2.Level; } });
33
- function createServer(api, socket, { loggerLevel = extra_logger_1.Level.None, parameterValidators, version, channel, ownPropsOnly } = {}) {
34
- const logger = new extra_logger_1.Logger({
1
+ import * as DelightRPC from 'delight-rpc';
2
+ import { getResult } from 'return-style';
3
+ import { Logger, TerminalTransport, Level } from 'extra-logger';
4
+ import { isntNull, isString } from '@blackglory/prelude';
5
+ export { Level } from 'extra-logger';
6
+ export function createServer(api, socket, { loggerLevel = Level.None, parameterValidators, version, channel, ownPropsOnly } = {}) {
7
+ const logger = new Logger({
35
8
  level: loggerLevel,
36
- transport: new extra_logger_1.TerminalTransport()
9
+ transport: new TerminalTransport()
37
10
  });
38
11
  const removeMessageListener = socket.on('message', listener);
39
12
  return () => removeMessageListener();
40
13
  async function listener(event) {
41
14
  const data = event.data;
42
- if ((0, prelude_1.isString)(data)) {
43
- const request = (0, return_style_1.getResult)(() => JSON.parse(data));
15
+ if (isString(data)) {
16
+ const request = getResult(() => JSON.parse(data));
44
17
  if (DelightRPC.isRequest(request) || DelightRPC.isBatchRequest(request)) {
45
18
  const response = await logger.infoTime(() => {
46
19
  if (DelightRPC.isRequest(request)) {
@@ -55,12 +28,11 @@ function createServer(api, socket, { loggerLevel = extra_logger_1.Level.None, pa
55
28
  channel,
56
29
  ownPropsOnly
57
30
  }));
58
- if ((0, prelude_1.isntNull)(response)) {
31
+ if (isntNull(response)) {
59
32
  socket.send(JSON.stringify(response));
60
33
  }
61
34
  }
62
35
  }
63
36
  }
64
37
  }
65
- exports.createServer = createServer;
66
38
  //# sourceMappingURL=server.js.map
package/lib/server.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAyC;AAGzC,+CAAwC;AACxC,+CAA+D;AAC/D,iDAAwD;AAExD,6CAAoC;AAA3B,qGAAA,KAAK,OAAA;AAEd,SAAgB,YAAY,CAC1B,GAAsC,EACtC,MAAsB,EACtB,EAAE,WAAW,GAAG,oBAAK,CAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,KAM3E,EAAE;IAEN,MAAM,MAAM,GAAG,IAAI,qBAAM,CAAC;QACxB,KAAK,EAAE,WAAW;QAClB,SAAS,EAAE,IAAI,gCAAiB,EAAE;KACnC,CAAC,CAAA;IAEF,MAAM,qBAAqB,GAAG,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAC5D,OAAO,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAAA;IAEpC,KAAK,UAAU,QAAQ,CAAC,KAAmB;QACzC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAA;QACvB,IAAI,IAAA,kBAAQ,EAAC,IAAI,CAAC,EAAE;YAClB,MAAM,OAAO,GAAG,IAAA,wBAAS,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;YACjD,IAAI,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;gBACvE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CACpC,GAAG,EAAE;oBACH,IAAI,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;wBACjC,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;qBAChC;yBAAM;wBACL,OAAO,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;qBAChE;gBACH,CAAC,EACD,GAAG,EAAE,CAAC,UAAU,CAAC,cAAc,CAC7B,GAAG,EACH,OAAO,EACP;oBACE,mBAAmB;oBACnB,OAAO;oBACP,OAAO;oBACP,YAAY;iBACb,CACF,CACF,CAAA;gBAED,IAAI,IAAA,kBAAQ,EAAC,QAAQ,CAAC,EAAE;oBACtB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;iBACtC;aACF;SACF;IACH,CAAC;AACH,CAAC;AAlDD,oCAkDC"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,aAAa,CAAA;AAGzC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAC/D,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAExD,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAEpC,MAAM,UAAU,YAAY,CAC1B,GAAsC,EACtC,MAAsB,EACtB,EAAE,WAAW,GAAG,KAAK,CAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,KAM3E,EAAE;IAEN,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;QACxB,KAAK,EAAE,WAAW;QAClB,SAAS,EAAE,IAAI,iBAAiB,EAAE;KACnC,CAAC,CAAA;IAEF,MAAM,qBAAqB,GAAG,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAC5D,OAAO,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAAA;IAEpC,KAAK,UAAU,QAAQ,CAAC,KAAmB;QACzC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAA;QACvB,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE;YAClB,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;YACjD,IAAI,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;gBACvE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CACpC,GAAG,EAAE;oBACH,IAAI,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;wBACjC,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;qBAChC;yBAAM;wBACL,OAAO,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;qBAChE;gBACH,CAAC,EACD,GAAG,EAAE,CAAC,UAAU,CAAC,cAAc,CAC7B,GAAG,EACH,OAAO,EACP;oBACE,mBAAmB;oBACnB,OAAO;oBACP,OAAO;oBACP,YAAY;iBACb,CACF,CACF,CAAA;gBAED,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE;oBACtB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;iBACtC;aACF;SACF;IACH,CAAC;AACH,CAAC"}
package/package.json CHANGED
@@ -1,29 +1,28 @@
1
1
  {
2
2
  "name": "@delight-rpc/extra-websocket",
3
- "version": "0.4.0",
3
+ "version": "0.6.0",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "files": [
7
7
  "lib"
8
8
  ],
9
+ "type": "module",
9
10
  "main": "lib/index.js",
10
11
  "types": "lib/index.d.ts",
11
- "repository": "git@github.com:delight-rpc/extra-websocket.git",
12
- "author": "BlackGlory <woshenmedoubuzhidao@blackglory.me>",
13
- "license": "MIT",
14
12
  "sideEffects": false,
15
13
  "engines": {
16
14
  "node": ">=16"
17
15
  },
16
+ "repository": "git@github.com:delight-rpc/extra-websocket.git",
17
+ "author": "BlackGlory <woshenmedoubuzhidao@blackglory.me>",
18
+ "license": "MIT",
18
19
  "scripts": {
19
20
  "prepare": "ts-patch install -s",
20
- "lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src",
21
- "test": "jest --no-cache --runInBand --config jest.config.js",
22
- "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
23
- "test:coverage": "jest --coverage --config jest.config.js",
24
- "prepublishOnly": "run-s clean build",
21
+ "lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src __tests__",
22
+ "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --runInBand --config jest.config.cjs",
23
+ "prepublishOnly": "run-s prepare clean build",
25
24
  "clean": "rimraf lib",
26
- "build": "cross-env NODE_ENV=production tsc --project tsconfig.build.json",
25
+ "build": "tsc --project tsconfig.build.json",
27
26
  "release": "standard-version"
28
27
  },
29
28
  "husky": {
@@ -33,42 +32,43 @@
33
32
  }
34
33
  },
35
34
  "devDependencies": {
36
- "@blackglory/jest-matchers": "^0.5.0",
37
- "@commitlint/cli": "^17.3.0",
38
- "@commitlint/config-conventional": "^17.3.0",
39
- "@delight-rpc/websocket": "^0.6.0",
40
- "@types/jest": "^29.2.4",
35
+ "@blackglory/jest-resolver": "^0.3.0",
36
+ "@commitlint/cli": "^17.4.4",
37
+ "@commitlint/config-conventional": "^17.4.4",
38
+ "@delight-rpc/websocket": "^0.7.0",
39
+ "@types/jest": "^29.5.0",
41
40
  "@types/node": "16",
42
41
  "@types/ws": "^8.5.3",
43
- "@typescript-eslint/eslint-plugin": "^5.46.1",
44
- "@typescript-eslint/parser": "^5.46.1",
42
+ "@typescript-eslint/eslint-plugin": "^5.55.0",
43
+ "@typescript-eslint/parser": "^5.55.0",
45
44
  "cross-env": "^7.0.3",
46
- "delight-rpc": "^5.0.0",
47
- "eslint": "8.29.0",
45
+ "delight-rpc": "^6.0.0",
46
+ "eslint": "8.36.0",
48
47
  "extra-websocket": "^0.3.1",
49
48
  "husky": "4",
50
- "jest": "^29.3.1",
49
+ "jest": "^29.5.0",
50
+ "jest-resolve": "^29.5.0",
51
51
  "npm-run-all": "^4.1.5",
52
52
  "rimraf": "^3.0.2",
53
53
  "standard-version": "^9.5.0",
54
54
  "ts-jest": "^29.0.3",
55
55
  "ts-node": "^10.9.1",
56
56
  "ts-patch": "^2.1.0",
57
- "typescript": "^4.7.4",
57
+ "typescript": "4.8",
58
58
  "typescript-transform-paths": "^3.4.4",
59
- "ws": "^8.11.0"
59
+ "ws": "^8.13.0"
60
60
  },
61
61
  "dependencies": {
62
- "@blackglory/errors": "^2.3.0",
63
- "@blackglory/prelude": "^0.1.8",
62
+ "@blackglory/errors": "^3.0.0",
63
+ "@blackglory/prelude": "^0.3.1",
64
64
  "@delight-rpc/protocol": "^3.0.0",
65
- "extra-abort": "^0.2.0",
65
+ "extra-abort": "^0.3.2",
66
66
  "extra-logger": "^0.6.9",
67
- "extra-promise": "^4.4.0",
68
- "return-style": "^1.0.0"
67
+ "extra-promise": "^6.0.5",
68
+ "return-style": "^3.0.0"
69
69
  },
70
70
  "peerDependencies": {
71
- "delight-rpc": "^5.0.0",
71
+ "delight-rpc": "^5.0.0 || ^6.0.0",
72
72
  "extra-websocket": "^0.3.0"
73
73
  }
74
74
  }