@spider-mesh/core 2.0.16 → 2.0.18
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/build/const.js +1 -1
- package/build/const.js.map +1 -1
- package/build/src/SpiderMesh.d.ts +1 -1
- package/build/src/SpiderMesh.js +5 -5
- package/build/src/SpiderMesh.js.map +1 -1
- package/build/src/abstracts/RemoteService.d.ts +1 -1
- package/build/src/abstracts/RemoteService.js +3 -3
- package/build/src/abstracts/RemoteService.js.map +1 -1
- package/package.json +1 -1
package/build/const.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export const SPIDERMESH_NAMESPACE = process.env.SPIDERMESH_NAMESPACE || 'default';
|
|
2
|
-
export const SPIDERMESH_NODE_HOSTNAME = process.env.SPIDERMESH_NODE_HOSTNAME || '
|
|
2
|
+
export const SPIDERMESH_NODE_HOSTNAME = process.env.SPIDERMESH_NODE_HOSTNAME || '';
|
|
3
3
|
//# sourceMappingURL=const.js.map
|
package/build/const.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"const.js","sourceRoot":"","sources":["../const.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,SAAS,CAAA;AACjF,MAAM,CAAC,MAAM,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,
|
|
1
|
+
{"version":3,"file":"const.js","sourceRoot":"","sources":["../const.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,SAAS,CAAA;AACjF,MAAM,CAAC,MAAM,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE,CAAA"}
|
|
@@ -32,7 +32,7 @@ export declare class SpiderMesh {
|
|
|
32
32
|
constructor();
|
|
33
33
|
callRemoteService<R, T>(options: RpcOptions<T>): Observable<R | T>;
|
|
34
34
|
linkTransporter(transporter: RpcTransporter | PubsubTransporter | DiscoveryTransporter): import("rxjs").Subscription | undefined;
|
|
35
|
-
waitServiceOnline(service: string, check
|
|
35
|
+
waitServiceOnline(service: string, check: ServiceChecker | undefined, stop$: Observable<any>): Promise<boolean>;
|
|
36
36
|
linkEvent<T>(factory: {
|
|
37
37
|
new (...args: any[]): T;
|
|
38
38
|
}): {
|
package/build/src/SpiderMesh.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BehaviorSubject, catchError, EMPTY, filter, finalize, firstValueFrom, from, lastValueFrom, map, mergeAll, mergeMap, of, ReplaySubject, retry, tap, throwError, timeout, timer } from "rxjs";
|
|
1
|
+
import { BehaviorSubject, catchError, EMPTY, filter, finalize, firstValueFrom, from, lastValueFrom, map, merge, mergeAll, mergeMap, of, ReplaySubject, retry, tap, throwError, timeout, timer } from "rxjs";
|
|
2
2
|
import { listBeforeMicroserviceOnlineMethods } from "./decorators/BeforeMicroserviceOnline.js";
|
|
3
3
|
import { PubsubTransporter } from "./abstracts/PubsubTransporter.js";
|
|
4
4
|
import { RpcTransporter } from "./abstracts/RpcTransporter.js";
|
|
@@ -96,7 +96,7 @@ export class SpiderMesh {
|
|
|
96
96
|
}
|
|
97
97
|
callRemoteService(options) {
|
|
98
98
|
return of(0).pipe(mergeMap(async () => {
|
|
99
|
-
await this.waitServiceOnline(options.service);
|
|
99
|
+
await this.waitServiceOnline(options.service, undefined, options.timeout ? timer(options.timeout) : EMPTY);
|
|
100
100
|
const target = this.#selectRpcTarget(options);
|
|
101
101
|
if (!target)
|
|
102
102
|
throw new MicroserviceOfflineException();
|
|
@@ -237,12 +237,12 @@ export class SpiderMesh {
|
|
|
237
237
|
}), finalize(() => this.#discovers.delete(transporter_name))).subscribe();
|
|
238
238
|
}
|
|
239
239
|
}
|
|
240
|
-
waitServiceOnline(service, check = (nodes => nodes.length > 0)) {
|
|
241
|
-
return firstValueFrom(this.services$.pipe(map(() => {
|
|
240
|
+
waitServiceOnline(service, check = (nodes => nodes.length > 0), stop$) {
|
|
241
|
+
return firstValueFrom(merge(stop$.pipe(map(() => false)), this.services$.pipe(map(() => {
|
|
242
242
|
const targets = this.services$.value.services.get(service)?.nodes || [];
|
|
243
243
|
const nodes = targets.map(id => this.nodes$.value.nodes.get(id)).filter(Boolean);
|
|
244
244
|
return nodes;
|
|
245
|
-
}), mergeMap(async (targets) => check(targets)), filter(Boolean)));
|
|
245
|
+
}), mergeMap(async (targets) => check(targets)), filter(Boolean))));
|
|
246
246
|
}
|
|
247
247
|
linkEvent(factory) {
|
|
248
248
|
const topic = factory.name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpiderMesh.js","sourceRoot":"","sources":["../../src/SpiderMesh.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SpiderMesh.js","sourceRoot":"","sources":["../../src/SpiderMesh.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ export declare class RemoteServiceLinker<Service> {
|
|
|
21
21
|
rpc?: string;
|
|
22
22
|
})[];
|
|
23
23
|
set<Fallback>(options: Omit<Partial<RpcOptions<Fallback>>, 'service' | 'method' | 'args'>): Mapper<Service, Fallback>;
|
|
24
|
-
wait(check?: ServiceChecker): Promise<
|
|
24
|
+
wait(check?: ServiceChecker, stop$?: Observable<void>): Promise<boolean>;
|
|
25
25
|
static link<Service, Fallback = never>(sm: SpiderMesh, options: RemoteServiceOptions): Mapper<Service, Fallback>;
|
|
26
26
|
}
|
|
27
27
|
export type Mapper<Service, Fallback = unknown> = RemoteServiceLinker<Service> & ({
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { catchError, filter, firstValueFrom, from, map, mergeMap, of } from "rxjs";
|
|
1
|
+
import { catchError, EMPTY, filter, firstValueFrom, from, map, mergeMap, of } from "rxjs";
|
|
2
2
|
const InvaildMethodList = new Set([
|
|
3
3
|
'caller',
|
|
4
4
|
'callee',
|
|
@@ -56,8 +56,8 @@ export class RemoteServiceLinker {
|
|
|
56
56
|
...options
|
|
57
57
|
});
|
|
58
58
|
}
|
|
59
|
-
wait(check = (nodes => nodes.length > 0)) {
|
|
60
|
-
return this.sm.waitServiceOnline(this.options.service, check);
|
|
59
|
+
wait(check = (nodes => nodes.length > 0), stop$ = EMPTY) {
|
|
60
|
+
return this.sm.waitServiceOnline(this.options.service, check, stop$);
|
|
61
61
|
}
|
|
62
62
|
static link(sm, options) {
|
|
63
63
|
const target = new this(sm, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RemoteService.js","sourceRoot":"","sources":["../../../src/abstracts/RemoteService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAc,EAAE,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"RemoteService.js","sourceRoot":"","sources":["../../../src/abstracts/RemoteService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@spider-mesh/core",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "2.0.
|
|
4
|
+
"version": "2.0.18",
|
|
5
5
|
"description": "Lightweight microservice framework for typescript, auto discovery, load-balancing, fault-torrent, multiple transporters",
|
|
6
6
|
"main": "./build/src/index.js",
|
|
7
7
|
"types": "./build/src/index.d.ts",
|