@nymphjs/client 1.0.0-beta.45 → 1.0.0-beta.47
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/README.md +2 -2
- package/lib/PubSub.js.map +1 -1
- package/package.json +10 -10
- package/src/Entity.ts +20 -20
- package/src/Entity.types.ts +1 -1
- package/src/HttpRequester.ts +18 -18
- package/src/Nymph.ts +27 -27
- package/src/PubSub.ts +28 -25
- package/src/PubSub.types.ts +2 -2
- package/src/entityRefresh.ts +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [1.0.0-beta.47](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.46...v1.0.0-beta.47) (2023-11-10)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @nymphjs/client
|
|
9
|
+
|
|
10
|
+
# [1.0.0-beta.46](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.45...v1.0.0-beta.46) (2023-08-29)
|
|
11
|
+
|
|
12
|
+
**Note:** Version bump only for package @nymphjs/client
|
|
13
|
+
|
|
6
14
|
# [1.0.0-beta.45](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.44...v1.0.0-beta.45) (2023-07-17)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @nymphjs/client
|
package/README.md
CHANGED
|
@@ -59,7 +59,7 @@ let subscription = pubsub.subscribeEntities(
|
|
|
59
59
|
{
|
|
60
60
|
type: '&',
|
|
61
61
|
'!tag': 'archived',
|
|
62
|
-
}
|
|
62
|
+
},
|
|
63
63
|
)(
|
|
64
64
|
(update) => {
|
|
65
65
|
// The first time this is called, `update` will be an array of Todo
|
|
@@ -77,7 +77,7 @@ let subscription = pubsub.subscribeEntities(
|
|
|
77
77
|
// If you provide this callback, the server will send updates of how many
|
|
78
78
|
// clients are subscribed to this query.
|
|
79
79
|
userCount = count;
|
|
80
|
-
}
|
|
80
|
+
},
|
|
81
81
|
);
|
|
82
82
|
|
|
83
83
|
// ...
|
package/lib/PubSub.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PubSub.js","sourceRoot":"","sources":["../src/PubSub.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"PubSub.js","sourceRoot":"","sources":["../src/PubSub.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nymphjs/client",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
3
|
+
"version": "1.0.0-beta.47",
|
|
4
4
|
"description": "Nymph.js - Client",
|
|
5
5
|
"browser": "dist/index.js",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -36,19 +36,19 @@
|
|
|
36
36
|
},
|
|
37
37
|
"license": "Apache-2.0",
|
|
38
38
|
"devDependencies": {
|
|
39
|
-
"@tsconfig/recommended": "^1.0.
|
|
40
|
-
"@types/jest": "^29.5.
|
|
41
|
-
"@types/lodash": "^4.14.
|
|
42
|
-
"jest": "^29.
|
|
43
|
-
"ts-jest": "^29.1.
|
|
44
|
-
"ts-loader": "^9.
|
|
45
|
-
"typescript": "^5.
|
|
46
|
-
"webpack": "^5.
|
|
39
|
+
"@tsconfig/recommended": "^1.0.3",
|
|
40
|
+
"@types/jest": "^29.5.8",
|
|
41
|
+
"@types/lodash": "^4.14.201",
|
|
42
|
+
"jest": "^29.7.0",
|
|
43
|
+
"ts-jest": "^29.1.1",
|
|
44
|
+
"ts-loader": "^9.5.0",
|
|
45
|
+
"typescript": "^5.2.2",
|
|
46
|
+
"webpack": "^5.89.0",
|
|
47
47
|
"webpack-cli": "^5.1.4"
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
50
|
"fetch-event-source-hperrin": "^3.0.0",
|
|
51
51
|
"lodash": "^4.17.21"
|
|
52
52
|
},
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "228f0d25911d1b98859f2acf8ace3d3f251c4882"
|
|
54
54
|
}
|
package/src/Entity.ts
CHANGED
|
@@ -124,7 +124,7 @@ export default class Entity<T extends EntityData = EntityData>
|
|
|
124
124
|
deleteProperty: (data: EntityData, name: string) => {
|
|
125
125
|
if (typeof name !== 'symbol' && this.$isASleepingReference) {
|
|
126
126
|
console.error(
|
|
127
|
-
`Tried to delete data on a sleeping reference: ${name}
|
|
127
|
+
`Tried to delete data on a sleeping reference: ${name}`,
|
|
128
128
|
);
|
|
129
129
|
return false;
|
|
130
130
|
}
|
|
@@ -138,11 +138,11 @@ export default class Entity<T extends EntityData = EntityData>
|
|
|
138
138
|
defineProperty: (
|
|
139
139
|
data: EntityData,
|
|
140
140
|
name: string,
|
|
141
|
-
descriptor: PropertyDescriptor
|
|
141
|
+
descriptor: PropertyDescriptor,
|
|
142
142
|
) => {
|
|
143
143
|
if (typeof name !== 'symbol' && this.$isASleepingReference) {
|
|
144
144
|
console.error(
|
|
145
|
-
`Tried to define data on a sleeping reference: ${name}
|
|
145
|
+
`Tried to define data on a sleeping reference: ${name}`,
|
|
146
146
|
);
|
|
147
147
|
return false;
|
|
148
148
|
}
|
|
@@ -156,7 +156,7 @@ export default class Entity<T extends EntityData = EntityData>
|
|
|
156
156
|
getOwnPropertyDescriptor: (data: EntityData, name: string) => {
|
|
157
157
|
if (typeof name !== 'symbol' && this.$isASleepingReference) {
|
|
158
158
|
console.error(
|
|
159
|
-
`Tried to get property descriptor on a sleeping reference: ${name}
|
|
159
|
+
`Tried to get property descriptor on a sleeping reference: ${name}`,
|
|
160
160
|
);
|
|
161
161
|
return undefined;
|
|
162
162
|
}
|
|
@@ -229,7 +229,7 @@ export default class Entity<T extends EntityData = EntityData>
|
|
|
229
229
|
defineProperty(
|
|
230
230
|
entity: Entity,
|
|
231
231
|
name: string,
|
|
232
|
-
descriptor: PropertyDescriptor
|
|
232
|
+
descriptor: PropertyDescriptor,
|
|
233
233
|
) {
|
|
234
234
|
if (
|
|
235
235
|
typeof name !== 'string' ||
|
|
@@ -257,7 +257,7 @@ export default class Entity<T extends EntityData = EntityData>
|
|
|
257
257
|
|
|
258
258
|
ownKeys(entity: Entity) {
|
|
259
259
|
return Object.getOwnPropertyNames(entity).concat(
|
|
260
|
-
Object.getOwnPropertyNames(entity.$data)
|
|
260
|
+
Object.getOwnPropertyNames(entity.$data),
|
|
261
261
|
);
|
|
262
262
|
},
|
|
263
263
|
}) as Entity<T>;
|
|
@@ -302,21 +302,21 @@ export default class Entity<T extends EntityData = EntityData>
|
|
|
302
302
|
method,
|
|
303
303
|
// Turn the params into a real array, in case an arguments object was
|
|
304
304
|
// passed.
|
|
305
|
-
Array.prototype.slice.call(params)
|
|
305
|
+
Array.prototype.slice.call(params),
|
|
306
306
|
);
|
|
307
307
|
return data.return;
|
|
308
308
|
}
|
|
309
309
|
|
|
310
310
|
public static async serverCallStaticIterator(
|
|
311
311
|
method: string,
|
|
312
|
-
params: Iterable<any
|
|
312
|
+
params: Iterable<any>,
|
|
313
313
|
) {
|
|
314
314
|
return await this.nymph.serverCallStaticIterator(
|
|
315
315
|
this.class,
|
|
316
316
|
method,
|
|
317
317
|
// Turn the params into a real array, in case an arguments object was
|
|
318
318
|
// passed.
|
|
319
|
-
Array.prototype.slice.call(params)
|
|
319
|
+
Array.prototype.slice.call(params),
|
|
320
320
|
);
|
|
321
321
|
}
|
|
322
322
|
|
|
@@ -357,7 +357,7 @@ export default class Entity<T extends EntityData = EntityData>
|
|
|
357
357
|
})
|
|
358
358
|
.reduce(
|
|
359
359
|
(obj, { key, value }) => Object.assign(obj, { [key]: value }),
|
|
360
|
-
{}
|
|
360
|
+
{},
|
|
361
361
|
) as T;
|
|
362
362
|
this.$data = new Proxy(this.$dataStore, this.$dataHandler);
|
|
363
363
|
|
|
@@ -428,7 +428,7 @@ export default class Entity<T extends EntityData = EntityData>
|
|
|
428
428
|
this.$check();
|
|
429
429
|
if (this.guid == null) {
|
|
430
430
|
throw new InvalidStateError(
|
|
431
|
-
"You can't make a patch from an unsaved entity."
|
|
431
|
+
"You can't make a patch from an unsaved entity.",
|
|
432
432
|
);
|
|
433
433
|
}
|
|
434
434
|
const patch: EntityPatch = {
|
|
@@ -436,10 +436,10 @@ export default class Entity<T extends EntityData = EntityData>
|
|
|
436
436
|
mdate: this.mdate,
|
|
437
437
|
class: (this.constructor as EntityConstructor).class,
|
|
438
438
|
addTags: this.tags.filter(
|
|
439
|
-
(tag) => this.$originalTags.indexOf(tag) === -1
|
|
439
|
+
(tag) => this.$originalTags.indexOf(tag) === -1,
|
|
440
440
|
),
|
|
441
441
|
removeTags: this.$originalTags.filter(
|
|
442
|
-
(tag) => this.tags.indexOf(tag) === -1
|
|
442
|
+
(tag) => this.tags.indexOf(tag) === -1,
|
|
443
443
|
),
|
|
444
444
|
unset: [],
|
|
445
445
|
set: {},
|
|
@@ -512,7 +512,7 @@ export default class Entity<T extends EntityData = EntityData>
|
|
|
512
512
|
protected $check() {
|
|
513
513
|
if (this.$isASleepingReference || this.$sleepingReference != null) {
|
|
514
514
|
throw new EntityIsSleepingReferenceError(
|
|
515
|
-
'This entity is in a sleeping reference state. You must use .$wake() to wake it.'
|
|
515
|
+
'This entity is in a sleeping reference state. You must use .$wake() to wake it.',
|
|
516
516
|
);
|
|
517
517
|
}
|
|
518
518
|
}
|
|
@@ -534,14 +534,14 @@ export default class Entity<T extends EntityData = EntityData>
|
|
|
534
534
|
}
|
|
535
535
|
if (this.$sleepingReference?.[1] == null) {
|
|
536
536
|
throw new InvalidStateError(
|
|
537
|
-
'Tried to wake a sleeping reference with no GUID.'
|
|
537
|
+
'Tried to wake a sleeping reference with no GUID.',
|
|
538
538
|
);
|
|
539
539
|
}
|
|
540
540
|
if (!this.$wakePromise) {
|
|
541
541
|
this.$wakePromise = this.$nymph
|
|
542
542
|
.getEntityData(
|
|
543
543
|
{ class: this.constructor as EntityConstructor },
|
|
544
|
-
{ type: '&', guid: this.$sleepingReference[1] }
|
|
544
|
+
{ type: '&', guid: this.$sleepingReference[1] },
|
|
545
545
|
)
|
|
546
546
|
.then((data) => {
|
|
547
547
|
if (data == null) {
|
|
@@ -590,7 +590,7 @@ export default class Entity<T extends EntityData = EntityData>
|
|
|
590
590
|
if (promises.length) {
|
|
591
591
|
Promise.all(promises).then(
|
|
592
592
|
() => resolve(this),
|
|
593
|
-
(errObj) => reject(errObj)
|
|
593
|
+
(errObj) => reject(errObj),
|
|
594
594
|
);
|
|
595
595
|
} else {
|
|
596
596
|
resolve(this);
|
|
@@ -627,7 +627,7 @@ export default class Entity<T extends EntityData = EntityData>
|
|
|
627
627
|
{
|
|
628
628
|
type: '&',
|
|
629
629
|
guid: this.guid,
|
|
630
|
-
}
|
|
630
|
+
},
|
|
631
631
|
);
|
|
632
632
|
this.$init(data);
|
|
633
633
|
return this.guid == null ? 0 : true;
|
|
@@ -649,7 +649,7 @@ export default class Entity<T extends EntityData = EntityData>
|
|
|
649
649
|
public async $serverCall(
|
|
650
650
|
method: string,
|
|
651
651
|
params: Iterable<any>,
|
|
652
|
-
stateless = false
|
|
652
|
+
stateless = false,
|
|
653
653
|
) {
|
|
654
654
|
this.$check();
|
|
655
655
|
// Turn the params into a real array, in case an arguments object was
|
|
@@ -659,7 +659,7 @@ export default class Entity<T extends EntityData = EntityData>
|
|
|
659
659
|
this,
|
|
660
660
|
method,
|
|
661
661
|
paramArray,
|
|
662
|
-
stateless
|
|
662
|
+
stateless,
|
|
663
663
|
);
|
|
664
664
|
if (!stateless && data.entity) {
|
|
665
665
|
this.$init(data.entity);
|
package/src/Entity.types.ts
CHANGED
|
@@ -195,7 +195,7 @@ export interface EntityInterface extends DataObjectInterface {
|
|
|
195
195
|
$serverCall(
|
|
196
196
|
method: string,
|
|
197
197
|
params: Iterable<any>,
|
|
198
|
-
stateless: boolean
|
|
198
|
+
stateless: boolean,
|
|
199
199
|
): Promise<any>;
|
|
200
200
|
/**
|
|
201
201
|
* Return a Nymph Entity Reference for this entity.
|
package/src/HttpRequester.ts
CHANGED
|
@@ -7,17 +7,17 @@ export type HttpRequesterEventType = 'request' | 'response';
|
|
|
7
7
|
export type HttpRequesterRequestCallback = (
|
|
8
8
|
requester: HttpRequester,
|
|
9
9
|
url: string,
|
|
10
|
-
options: RequestInit
|
|
10
|
+
options: RequestInit,
|
|
11
11
|
) => void;
|
|
12
12
|
export type HttpRequesterResponseCallback = (
|
|
13
13
|
requester: HttpRequester,
|
|
14
14
|
response: Response,
|
|
15
|
-
text: string
|
|
15
|
+
text: string,
|
|
16
16
|
) => void;
|
|
17
17
|
export type HttpRequesterIteratorCallback = (
|
|
18
18
|
requester: HttpRequester,
|
|
19
19
|
url: string,
|
|
20
|
-
headers: Record<string, string
|
|
20
|
+
headers: Record<string, string>,
|
|
21
21
|
) => void;
|
|
22
22
|
export type HttpRequesterRequestOptions = {
|
|
23
23
|
url: string;
|
|
@@ -64,7 +64,7 @@ export default class HttpRequester {
|
|
|
64
64
|
? HttpRequesterResponseCallback
|
|
65
65
|
: T extends 'iterator'
|
|
66
66
|
? HttpRequesterIteratorCallback
|
|
67
|
-
: never
|
|
67
|
+
: never,
|
|
68
68
|
) {
|
|
69
69
|
const prop = (event + 'Callbacks') as T extends 'request'
|
|
70
70
|
? 'requestCallbacks'
|
|
@@ -89,7 +89,7 @@ export default class HttpRequester {
|
|
|
89
89
|
? HttpRequesterResponseCallback
|
|
90
90
|
: T extends 'iterator'
|
|
91
91
|
? HttpRequesterIteratorCallback
|
|
92
|
-
: never
|
|
92
|
+
: never,
|
|
93
93
|
) {
|
|
94
94
|
const prop = (event + 'Callbacks') as T extends 'request'
|
|
95
95
|
? 'requestCallbacks'
|
|
@@ -140,7 +140,7 @@ export default class HttpRequester {
|
|
|
140
140
|
|
|
141
141
|
async _httpRequest(
|
|
142
142
|
method: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE',
|
|
143
|
-
opt: HttpRequesterRequestOptions
|
|
143
|
+
opt: HttpRequesterRequestOptions,
|
|
144
144
|
) {
|
|
145
145
|
const dataString = JSON.stringify(opt.data);
|
|
146
146
|
let url = opt.url;
|
|
@@ -176,7 +176,7 @@ export default class HttpRequester {
|
|
|
176
176
|
text = await response.text();
|
|
177
177
|
} catch (e: any) {
|
|
178
178
|
throw new InvalidResponseError(
|
|
179
|
-
'Server response did not contain valid text body.'
|
|
179
|
+
'Server response did not contain valid text body.',
|
|
180
180
|
);
|
|
181
181
|
}
|
|
182
182
|
if (!response.ok) {
|
|
@@ -220,7 +220,7 @@ export default class HttpRequester {
|
|
|
220
220
|
throw e;
|
|
221
221
|
}
|
|
222
222
|
throw new InvalidResponseError(
|
|
223
|
-
'Server response was invalid: ' + JSON.stringify(text)
|
|
223
|
+
'Server response was invalid: ' + JSON.stringify(text),
|
|
224
224
|
);
|
|
225
225
|
}
|
|
226
226
|
} else {
|
|
@@ -230,7 +230,7 @@ export default class HttpRequester {
|
|
|
230
230
|
|
|
231
231
|
async _iteratorRequest(
|
|
232
232
|
method: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE',
|
|
233
|
-
opt: HttpRequesterRequestOptions
|
|
233
|
+
opt: HttpRequesterRequestOptions,
|
|
234
234
|
): Promise<AbortableAsyncIterator> {
|
|
235
235
|
const dataString = JSON.stringify(opt.data);
|
|
236
236
|
let url = opt.url;
|
|
@@ -280,7 +280,7 @@ export default class HttpRequester {
|
|
|
280
280
|
if (response.ok) {
|
|
281
281
|
if (response.headers.get('content-type') === EventStreamContentType) {
|
|
282
282
|
throw new InvalidResponseError(
|
|
283
|
-
'Server response is not an event stream.'
|
|
283
|
+
'Server response is not an event stream.',
|
|
284
284
|
);
|
|
285
285
|
}
|
|
286
286
|
|
|
@@ -328,7 +328,7 @@ export default class HttpRequester {
|
|
|
328
328
|
if (opt.dataType === 'json') {
|
|
329
329
|
if (!text.length) {
|
|
330
330
|
responses.push(
|
|
331
|
-
new InvalidResponseError('Server response was empty.')
|
|
331
|
+
new InvalidResponseError('Server response was empty.'),
|
|
332
332
|
);
|
|
333
333
|
} else {
|
|
334
334
|
try {
|
|
@@ -339,8 +339,8 @@ export default class HttpRequester {
|
|
|
339
339
|
} else {
|
|
340
340
|
responses.push(
|
|
341
341
|
new InvalidResponseError(
|
|
342
|
-
'Server response was invalid: ' + JSON.stringify(text)
|
|
343
|
-
)
|
|
342
|
+
'Server response was invalid: ' + JSON.stringify(text),
|
|
343
|
+
),
|
|
344
344
|
);
|
|
345
345
|
}
|
|
346
346
|
}
|
|
@@ -375,7 +375,7 @@ export default class HttpRequester {
|
|
|
375
375
|
? new RedirectError(serverResponse, errObj)
|
|
376
376
|
: errObj.status < 500
|
|
377
377
|
? new ClientError(serverResponse, errObj)
|
|
378
|
-
: new ServerError(serverResponse, errObj)
|
|
378
|
+
: new ServerError(serverResponse, errObj),
|
|
379
379
|
);
|
|
380
380
|
} else if (event.event === 'finished') {
|
|
381
381
|
responsesDone = true;
|
|
@@ -398,8 +398,8 @@ export default class HttpRequester {
|
|
|
398
398
|
onclose() {
|
|
399
399
|
responses.push(
|
|
400
400
|
new ConnectionClosedUnexpectedlyError(
|
|
401
|
-
'The connection to the server was closed unexpectedly.'
|
|
402
|
-
)
|
|
401
|
+
'The connection to the server was closed unexpectedly.',
|
|
402
|
+
),
|
|
403
403
|
);
|
|
404
404
|
|
|
405
405
|
responsesDone = true;
|
|
@@ -412,7 +412,7 @@ export default class HttpRequester {
|
|
|
412
412
|
},
|
|
413
413
|
}).catch((err) => {
|
|
414
414
|
responses.push(
|
|
415
|
-
new ConnectionError('The connection could not be established: ' + err)
|
|
415
|
+
new ConnectionError('The connection could not be established: ' + err),
|
|
416
416
|
);
|
|
417
417
|
|
|
418
418
|
responsesDone = true;
|
|
@@ -464,7 +464,7 @@ export class HttpError extends Error {
|
|
|
464
464
|
constructor(
|
|
465
465
|
name: string,
|
|
466
466
|
response: Response,
|
|
467
|
-
errObj: { textStatus: string }
|
|
467
|
+
errObj: { textStatus: string },
|
|
468
468
|
) {
|
|
469
469
|
super(errObj.textStatus);
|
|
470
470
|
this.name = name;
|
package/src/Nymph.ts
CHANGED
|
@@ -52,7 +52,7 @@ export default class Nymph {
|
|
|
52
52
|
this.Entity = this.addEntityClass(Entity);
|
|
53
53
|
|
|
54
54
|
requester = new HttpRequester(
|
|
55
|
-
'fetch' in NymphOptions ? NymphOptions.fetch : undefined
|
|
55
|
+
'fetch' in NymphOptions ? NymphOptions.fetch : undefined,
|
|
56
56
|
);
|
|
57
57
|
|
|
58
58
|
requester.on('request', (_requester, url, options) => {
|
|
@@ -94,7 +94,7 @@ export default class Nymph {
|
|
|
94
94
|
public getEntityClass<T extends EntityConstructor>(className: T): T;
|
|
95
95
|
public getEntityClass(className: string): EntityConstructor;
|
|
96
96
|
public getEntityClass<T extends EntityConstructor = EntityConstructor>(
|
|
97
|
-
className: T | string
|
|
97
|
+
className: T | string,
|
|
98
98
|
): T | EntityConstructor {
|
|
99
99
|
let key: string | null = null;
|
|
100
100
|
if (typeof className === 'string') {
|
|
@@ -160,7 +160,7 @@ export default class Nymph {
|
|
|
160
160
|
) {
|
|
161
161
|
throw new InvalidRequestError(
|
|
162
162
|
'Due to REST restriction, you can only create new entities or ' +
|
|
163
|
-
'update existing entities, not both at the same time.'
|
|
163
|
+
'update existing entities, not both at the same time.',
|
|
164
164
|
);
|
|
165
165
|
}
|
|
166
166
|
});
|
|
@@ -170,7 +170,7 @@ export default class Nymph {
|
|
|
170
170
|
public async patchEntity(entity: EntityInterface) {
|
|
171
171
|
if (entity.guid == null) {
|
|
172
172
|
throw new InvalidRequestError(
|
|
173
|
-
"You can't patch an entity that hasn't yet been saved."
|
|
173
|
+
"You can't patch an entity that hasn't yet been saved.",
|
|
174
174
|
);
|
|
175
175
|
}
|
|
176
176
|
|
|
@@ -187,7 +187,7 @@ export default class Nymph {
|
|
|
187
187
|
if (cur.guid == null) {
|
|
188
188
|
throw new InvalidRequestError(
|
|
189
189
|
'Due to REST restriction, you can only create new entities or ' +
|
|
190
|
-
'update existing entities, not both at the same time.'
|
|
190
|
+
'update existing entities, not both at the same time.',
|
|
191
191
|
);
|
|
192
192
|
}
|
|
193
193
|
});
|
|
@@ -199,19 +199,19 @@ export default class Nymph {
|
|
|
199
199
|
entity: T,
|
|
200
200
|
method: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE',
|
|
201
201
|
data: { [k: string]: any },
|
|
202
|
-
plural: false
|
|
202
|
+
plural: false,
|
|
203
203
|
): Promise<T>;
|
|
204
204
|
private async requestWithMethod<T extends EntityInterface>(
|
|
205
205
|
entity: T[],
|
|
206
206
|
method: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE',
|
|
207
207
|
data: { [k: string]: any },
|
|
208
|
-
plural: true
|
|
208
|
+
plural: true,
|
|
209
209
|
): Promise<T[]>;
|
|
210
210
|
private async requestWithMethod<T extends EntityInterface>(
|
|
211
211
|
entity: T | T[],
|
|
212
212
|
method: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE',
|
|
213
213
|
data: { [k: string]: any },
|
|
214
|
-
plural: boolean
|
|
214
|
+
plural: boolean,
|
|
215
215
|
): Promise<T | T[]> {
|
|
216
216
|
const response = await requester[method]({
|
|
217
217
|
url: this.restUrl,
|
|
@@ -227,7 +227,7 @@ export default class Nymph {
|
|
|
227
227
|
typeof response[i].guid !== 'undefined' &&
|
|
228
228
|
(e.guid == null || e.guid === response[i].guid)
|
|
229
229
|
? e.$init(response[i])
|
|
230
|
-
: e
|
|
230
|
+
: e,
|
|
231
231
|
) as T[];
|
|
232
232
|
} else if (!Array.isArray(entity) && typeof response.guid !== 'undefined') {
|
|
233
233
|
return entity.$init(response) as T;
|
|
@@ -249,15 +249,15 @@ export default class Nymph {
|
|
|
249
249
|
): Promise<ReturnType<T['factorySync']> | null>;
|
|
250
250
|
public async getEntity<T extends EntityConstructor = EntityConstructor>(
|
|
251
251
|
options: Options<T> & { return: 'count' },
|
|
252
|
-
guid: string
|
|
252
|
+
guid: string,
|
|
253
253
|
): Promise<number>;
|
|
254
254
|
public async getEntity<T extends EntityConstructor = EntityConstructor>(
|
|
255
255
|
options: Options<T> & { return: 'guid' },
|
|
256
|
-
guid: string
|
|
256
|
+
guid: string,
|
|
257
257
|
): Promise<string | null>;
|
|
258
258
|
public async getEntity<T extends EntityConstructor = EntityConstructor>(
|
|
259
259
|
options: Options<T>,
|
|
260
|
-
guid: string
|
|
260
|
+
guid: string,
|
|
261
261
|
): Promise<ReturnType<T['factorySync']> | null>;
|
|
262
262
|
public async getEntity<T extends EntityConstructor = EntityConstructor>(
|
|
263
263
|
options: Options<T>,
|
|
@@ -298,15 +298,15 @@ export default class Nymph {
|
|
|
298
298
|
): Promise<EntityJson<T> | null>;
|
|
299
299
|
public async getEntityData<T extends EntityConstructor = EntityConstructor>(
|
|
300
300
|
options: Options<T> & { return: 'count' },
|
|
301
|
-
guid: string
|
|
301
|
+
guid: string,
|
|
302
302
|
): Promise<number>;
|
|
303
303
|
public async getEntityData<T extends EntityConstructor = EntityConstructor>(
|
|
304
304
|
options: Options<T> & { return: 'guid' },
|
|
305
|
-
guid: string
|
|
305
|
+
guid: string,
|
|
306
306
|
): Promise<string | null>;
|
|
307
307
|
public async getEntityData<T extends EntityConstructor = EntityConstructor>(
|
|
308
308
|
options: Options<T>,
|
|
309
|
-
guid: string
|
|
309
|
+
guid: string,
|
|
310
310
|
): Promise<EntityJson<T> | null>;
|
|
311
311
|
public async getEntityData<T extends EntityConstructor = EntityConstructor>(
|
|
312
312
|
options: Options<T>,
|
|
@@ -314,7 +314,7 @@ export default class Nymph {
|
|
|
314
314
|
): Promise<EntityJson<T> | string | number | null> {
|
|
315
315
|
if (options.class instanceof Entity) {
|
|
316
316
|
throw new InvalidRequestError(
|
|
317
|
-
"You can't make REST requests with the base Entity class."
|
|
317
|
+
"You can't make REST requests with the base Entity class.",
|
|
318
318
|
);
|
|
319
319
|
}
|
|
320
320
|
// Set up options and selectors.
|
|
@@ -377,12 +377,12 @@ export default class Nymph {
|
|
|
377
377
|
}
|
|
378
378
|
|
|
379
379
|
public initEntity<T extends EntityConstructor = EntityConstructor>(
|
|
380
|
-
entityJSON: EntityJson<T
|
|
380
|
+
entityJSON: EntityJson<T>,
|
|
381
381
|
): ReturnType<T['factorySync']> {
|
|
382
382
|
const EntityClass = this.getEntityClass(entityJSON.class);
|
|
383
383
|
if (!EntityClass) {
|
|
384
384
|
throw new ClassNotAvailableError(
|
|
385
|
-
entityJSON.class + ' class cannot be found.'
|
|
385
|
+
entityJSON.class + ' class cannot be found.',
|
|
386
386
|
);
|
|
387
387
|
}
|
|
388
388
|
let entity = EntityClass.factorySync();
|
|
@@ -390,7 +390,7 @@ export default class Nymph {
|
|
|
390
390
|
// Try to get it from cache.
|
|
391
391
|
const entityFromCache = this.cache.get(
|
|
392
392
|
EntityClass,
|
|
393
|
-
entityJSON.guid || ''
|
|
393
|
+
entityJSON.guid || '',
|
|
394
394
|
);
|
|
395
395
|
if (entityFromCache != null) {
|
|
396
396
|
entity = entityFromCache;
|
|
@@ -401,7 +401,7 @@ export default class Nymph {
|
|
|
401
401
|
|
|
402
402
|
public getEntityFromCache<T extends EntityConstructor = EntityConstructor>(
|
|
403
403
|
EntityClass: EntityConstructor,
|
|
404
|
-
guid: string
|
|
404
|
+
guid: string,
|
|
405
405
|
): ReturnType<T['factorySync']> | null {
|
|
406
406
|
if (!this.weakCache) {
|
|
407
407
|
return null;
|
|
@@ -413,7 +413,7 @@ export default class Nymph {
|
|
|
413
413
|
|
|
414
414
|
public setEntityToCache(
|
|
415
415
|
EntityClass: EntityConstructor,
|
|
416
|
-
entity: EntityInterface
|
|
416
|
+
entity: EntityInterface,
|
|
417
417
|
) {
|
|
418
418
|
if (!this.weakCache) {
|
|
419
419
|
return;
|
|
@@ -449,7 +449,7 @@ export default class Nymph {
|
|
|
449
449
|
|
|
450
450
|
public async deleteEntity(
|
|
451
451
|
entity: EntityInterface | EntityInterface[],
|
|
452
|
-
_plural = false
|
|
452
|
+
_plural = false,
|
|
453
453
|
) {
|
|
454
454
|
return await requester.DELETE({
|
|
455
455
|
url: this.restUrl,
|
|
@@ -478,7 +478,7 @@ export default class Nymph {
|
|
|
478
478
|
entity: EntityInterface,
|
|
479
479
|
method: string,
|
|
480
480
|
params: any[],
|
|
481
|
-
stateless = false
|
|
481
|
+
stateless = false,
|
|
482
482
|
): Promise<ServerCallResponse> {
|
|
483
483
|
const data = await requester.POST({
|
|
484
484
|
url: this.restUrl,
|
|
@@ -503,7 +503,7 @@ export default class Nymph {
|
|
|
503
503
|
public async serverCallStatic(
|
|
504
504
|
className: string,
|
|
505
505
|
method: string,
|
|
506
|
-
params: any[]
|
|
506
|
+
params: any[],
|
|
507
507
|
): Promise<ServerCallStaticResponse> {
|
|
508
508
|
const data = await requester.POST({
|
|
509
509
|
url: this.restUrl,
|
|
@@ -525,7 +525,7 @@ export default class Nymph {
|
|
|
525
525
|
public async serverCallStaticIterator(
|
|
526
526
|
className: string,
|
|
527
527
|
method: string,
|
|
528
|
-
params: any[]
|
|
528
|
+
params: any[],
|
|
529
529
|
): Promise<AbortableAsyncIterator<ServerCallStaticResponse>> {
|
|
530
530
|
const iterable = await requester.POST_ITERATOR({
|
|
531
531
|
url: this.restUrl,
|
|
@@ -565,7 +565,7 @@ export default class Nymph {
|
|
|
565
565
|
? RequestCallback
|
|
566
566
|
: T extends 'response'
|
|
567
567
|
? ResponseCallback
|
|
568
|
-
: never
|
|
568
|
+
: never,
|
|
569
569
|
) {
|
|
570
570
|
const prop = (event + 'Callbacks') as T extends 'request'
|
|
571
571
|
? 'requestCallbacks'
|
|
@@ -586,7 +586,7 @@ export default class Nymph {
|
|
|
586
586
|
? RequestCallback
|
|
587
587
|
: T extends 'response'
|
|
588
588
|
? ResponseCallback
|
|
589
|
-
: never
|
|
589
|
+
: never,
|
|
590
590
|
) {
|
|
591
591
|
const prop = (event + 'Callbacks') as T extends 'request'
|
|
592
592
|
? 'requestCallbacks'
|
package/src/PubSub.ts
CHANGED
|
@@ -95,7 +95,7 @@ export default class PubSub {
|
|
|
95
95
|
>
|
|
96
96
|
| undefined,
|
|
97
97
|
reject?: PubSubRejectCallback | undefined,
|
|
98
|
-
count?: PubSubCountCallback | undefined
|
|
98
|
+
count?: PubSubCountCallback | undefined,
|
|
99
99
|
) => {
|
|
100
100
|
const callbacks: PubSubCallbacks<
|
|
101
101
|
PubSubUpdate<ReturnType<T['factorySync']>[]> | PubSubUpdate<string[]>
|
|
@@ -144,7 +144,7 @@ export default class PubSub {
|
|
|
144
144
|
>
|
|
145
145
|
| undefined,
|
|
146
146
|
reject?: PubSubRejectCallback | undefined,
|
|
147
|
-
count?: PubSubCountCallback | undefined
|
|
147
|
+
count?: PubSubCountCallback | undefined,
|
|
148
148
|
) => {
|
|
149
149
|
const newResolve = (args: any) => {
|
|
150
150
|
if (!args.length) {
|
|
@@ -179,7 +179,7 @@ export default class PubSub {
|
|
|
179
179
|
const subscribe = (
|
|
180
180
|
resolve?: PubSubResolveCallback<number> | undefined,
|
|
181
181
|
reject?: PubSubRejectCallback | undefined,
|
|
182
|
-
count?: PubSubCountCallback | undefined
|
|
182
|
+
count?: PubSubCountCallback | undefined,
|
|
183
183
|
) => {
|
|
184
184
|
const callbacks: PubSubCallbacks<number> = [resolve, reject, count];
|
|
185
185
|
|
|
@@ -202,11 +202,11 @@ export default class PubSub {
|
|
|
202
202
|
entity: T,
|
|
203
203
|
resolve?: PubSubResolveCallback<T> | undefined,
|
|
204
204
|
reject?: PubSubRejectCallback | undefined,
|
|
205
|
-
count?: PubSubCountCallback | undefined
|
|
205
|
+
count?: PubSubCountCallback | undefined,
|
|
206
206
|
) {
|
|
207
207
|
if (!entity.guid) {
|
|
208
208
|
throw new InvalidRequestError(
|
|
209
|
-
"You can't subscribe to an entity with no GUID."
|
|
209
|
+
"You can't subscribe to an entity with no GUID.",
|
|
210
210
|
);
|
|
211
211
|
}
|
|
212
212
|
const query = [
|
|
@@ -269,21 +269,24 @@ export default class PubSub {
|
|
|
269
269
|
// Wait 5 seconds, then check and attempt connection again if unsuccessful.
|
|
270
270
|
// Keep repeating, adding attempts^2*5 seconds each time to a max of ten
|
|
271
271
|
// minutes, until successful.
|
|
272
|
-
this.waitForConnectionTimeout = setTimeout(
|
|
273
|
-
|
|
274
|
-
if (this.connection
|
|
275
|
-
if (this.connection.readyState !== this.WebSocket.
|
|
276
|
-
this.connection.
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
272
|
+
this.waitForConnectionTimeout = setTimeout(
|
|
273
|
+
() => {
|
|
274
|
+
if (this.connection) {
|
|
275
|
+
if (this.connection.readyState !== this.WebSocket.OPEN) {
|
|
276
|
+
if (this.connection.readyState !== this.WebSocket.CONNECTING) {
|
|
277
|
+
this.connection.close();
|
|
278
|
+
this._waitForConnection(attempts + 1);
|
|
279
|
+
this._attemptConnect();
|
|
280
|
+
} else {
|
|
281
|
+
this._waitForConnection(attempts + 1);
|
|
282
|
+
}
|
|
281
283
|
}
|
|
284
|
+
} else {
|
|
285
|
+
this._attemptConnect();
|
|
282
286
|
}
|
|
283
|
-
}
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
}, Math.max(Math.pow(attempts, 2) * 5000, 1000 * 60 * 10));
|
|
287
|
+
},
|
|
288
|
+
Math.max(Math.pow(attempts, 2) * 5000, 1000 * 60 * 10),
|
|
289
|
+
);
|
|
287
290
|
}
|
|
288
291
|
|
|
289
292
|
private _attemptConnect() {
|
|
@@ -378,7 +381,7 @@ export default class PubSub {
|
|
|
378
381
|
callback(
|
|
379
382
|
set
|
|
380
383
|
? data.data.map((e: EntityJson) => this.nymph.initEntity(e))
|
|
381
|
-
: data
|
|
384
|
+
: data,
|
|
382
385
|
);
|
|
383
386
|
}
|
|
384
387
|
}
|
|
@@ -397,8 +400,8 @@ export default class PubSub {
|
|
|
397
400
|
errCallback(
|
|
398
401
|
new ClientError(
|
|
399
402
|
{ status: 404, statusText: 'Not Found' } as Response,
|
|
400
|
-
{ textStatus: 'Not Found' }
|
|
401
|
-
)
|
|
403
|
+
{ textStatus: 'Not Found' },
|
|
404
|
+
),
|
|
402
405
|
);
|
|
403
406
|
}
|
|
404
407
|
} else if (typeof callback === 'function') {
|
|
@@ -620,7 +623,7 @@ export default class PubSub {
|
|
|
620
623
|
|
|
621
624
|
public updateArray(
|
|
622
625
|
current: EntityInterface[],
|
|
623
|
-
update: PubSubUpdate<EntityInterface[]
|
|
626
|
+
update: PubSubUpdate<EntityInterface[]>,
|
|
624
627
|
) {
|
|
625
628
|
if (Array.isArray(update)) {
|
|
626
629
|
const newArr = [...update];
|
|
@@ -738,7 +741,7 @@ export default class PubSub {
|
|
|
738
741
|
? PubSubDisconnectCallback
|
|
739
742
|
: T extends 'error'
|
|
740
743
|
? PubSubErrorCallback
|
|
741
|
-
: never
|
|
744
|
+
: never,
|
|
742
745
|
) {
|
|
743
746
|
const prop = (event + 'Callbacks') as T extends 'connect'
|
|
744
747
|
? 'connectCallbacks'
|
|
@@ -763,7 +766,7 @@ export default class PubSub {
|
|
|
763
766
|
? PubSubDisconnectCallback
|
|
764
767
|
: T extends 'error'
|
|
765
768
|
? PubSubErrorCallback
|
|
766
|
-
: never
|
|
769
|
+
: never,
|
|
767
770
|
) {
|
|
768
771
|
const prop = (event + 'Callbacks') as T extends 'connect'
|
|
769
772
|
? 'connectCallbacks'
|
|
@@ -804,7 +807,7 @@ export class PubSubSubscription<T> {
|
|
|
804
807
|
constructor(
|
|
805
808
|
query: string,
|
|
806
809
|
callbacks: PubSubCallbacks<T>,
|
|
807
|
-
unsubscribe: () => void
|
|
810
|
+
unsubscribe: () => void,
|
|
808
811
|
) {
|
|
809
812
|
this.query = query;
|
|
810
813
|
this.callbacks = callbacks;
|
package/src/PubSub.types.ts
CHANGED
|
@@ -7,7 +7,7 @@ export type PubSubCountCallback = (count: number) => void;
|
|
|
7
7
|
export type PubSubCallbacks<T> = [
|
|
8
8
|
PubSubResolveCallback<T> | undefined,
|
|
9
9
|
PubSubRejectCallback | undefined,
|
|
10
|
-
PubSubCountCallback | undefined
|
|
10
|
+
PubSubCountCallback | undefined,
|
|
11
11
|
];
|
|
12
12
|
export type PubSubEventType = 'connect' | 'disconnect' | 'error';
|
|
13
13
|
export type PubSubConnectCallback = () => void;
|
|
@@ -36,5 +36,5 @@ export type PubSubUpdate<T> =
|
|
|
36
36
|
export type PubSubSubscribable<T> = (
|
|
37
37
|
resolve?: PubSubResolveCallback<T> | undefined,
|
|
38
38
|
reject?: PubSubRejectCallback | undefined,
|
|
39
|
-
count?: PubSubCountCallback | undefined
|
|
39
|
+
count?: PubSubCountCallback | undefined,
|
|
40
40
|
) => PubSubSubscription<T>;
|
package/src/entityRefresh.ts
CHANGED
|
@@ -14,7 +14,7 @@ export function saveEntities(entity: Entity) {
|
|
|
14
14
|
|
|
15
15
|
const addEntitiesToObject = (
|
|
16
16
|
item: any,
|
|
17
|
-
entitiesObject: { [k: string]: Entity }
|
|
17
|
+
entitiesObject: { [k: string]: Entity },
|
|
18
18
|
) => {
|
|
19
19
|
// @ts-ignore: Accessing a private property.
|
|
20
20
|
if (item instanceof Entity && !item.$isASleepingReference) {
|
|
@@ -37,7 +37,7 @@ const addEntitiesToObject = (
|
|
|
37
37
|
// after the restore.
|
|
38
38
|
export function restoreEntities(
|
|
39
39
|
entity: Entity,
|
|
40
|
-
savedEntities: { [k: string]: Entity }
|
|
40
|
+
savedEntities: { [k: string]: Entity },
|
|
41
41
|
) {
|
|
42
42
|
let data: { containsSleepingReference: boolean } = {
|
|
43
43
|
containsSleepingReference: false,
|
|
@@ -49,7 +49,7 @@ export function restoreEntities(
|
|
|
49
49
|
entity.$dataStore[key] = retoreEntitiesFromObject(
|
|
50
50
|
value,
|
|
51
51
|
savedEntities,
|
|
52
|
-
data
|
|
52
|
+
data,
|
|
53
53
|
);
|
|
54
54
|
}
|
|
55
55
|
|
|
@@ -59,7 +59,7 @@ export function restoreEntities(
|
|
|
59
59
|
const retoreEntitiesFromObject = <T extends any>(
|
|
60
60
|
item: T,
|
|
61
61
|
entitiesObject: { [k: string]: Entity },
|
|
62
|
-
data: { containsSleepingReference: boolean }
|
|
62
|
+
data: { containsSleepingReference: boolean },
|
|
63
63
|
): T => {
|
|
64
64
|
if (item instanceof Entity) {
|
|
65
65
|
// @ts-ignore: Accessing a private property.
|
|
@@ -78,7 +78,7 @@ const retoreEntitiesFromObject = <T extends any>(
|
|
|
78
78
|
} else if (Array.isArray(item)) {
|
|
79
79
|
// Recurse into lower arrays.
|
|
80
80
|
return item.map((item) =>
|
|
81
|
-
retoreEntitiesFromObject(item, entitiesObject, data)
|
|
81
|
+
retoreEntitiesFromObject(item, entitiesObject, data),
|
|
82
82
|
) as T;
|
|
83
83
|
} else if (item instanceof Object) {
|
|
84
84
|
for (let [key, value] of Object.entries(item)) {
|