@effect/cluster 0.56.0 → 0.56.1
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/HttpRunner.js
CHANGED
|
@@ -22,6 +22,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
|
|
|
22
22
|
* @since 1.0.0
|
|
23
23
|
*/
|
|
24
24
|
|
|
25
|
+
const normalizePath = path => path.startsWith("/") ? path : `/${path}`;
|
|
25
26
|
/**
|
|
26
27
|
* @since 1.0.0
|
|
27
28
|
* @category Layers
|
|
@@ -31,7 +32,7 @@ const layerClientProtocolHttp = options => Layer.effect(_Runners.RpcClientProtoc
|
|
|
31
32
|
const client = yield* HttpClient.HttpClient;
|
|
32
33
|
const https = options.https ?? false;
|
|
33
34
|
return address => {
|
|
34
|
-
const clientWithUrl = HttpClient.mapRequest(client, HttpClientRequest.prependUrl(`http${https ? "s" : ""}://${address.host}:${address.port}
|
|
35
|
+
const clientWithUrl = HttpClient.mapRequest(client, HttpClientRequest.prependUrl(`http${https ? "s" : ""}://${address.host}:${address.port}${normalizePath(options.path)}`));
|
|
35
36
|
return RpcClient.makeProtocolHttp(clientWithUrl).pipe(Effect.provideService(RpcSerialization.RpcSerialization, serialization));
|
|
36
37
|
};
|
|
37
38
|
}));
|
|
@@ -52,7 +53,7 @@ const layerClientProtocolWebsocket = options => Layer.effect(_Runners.RpcClientP
|
|
|
52
53
|
const https = options.https ?? false;
|
|
53
54
|
const constructor = yield* Socket.WebSocketConstructor;
|
|
54
55
|
return Effect.fnUntraced(function* (address) {
|
|
55
|
-
const socket = yield* Socket.makeWebSocket(`ws${https ? "s" : ""}://${address.host}:${address.port}
|
|
56
|
+
const socket = yield* Socket.makeWebSocket(`ws${https ? "s" : ""}://${address.host}:${address.port}${normalizePath(options.path)}`).pipe(Effect.provideService(Socket.WebSocketConstructor, constructor));
|
|
56
57
|
return yield* RpcClient.makeProtocolSocket().pipe(Effect.provideService(Socket.Socket, socket), Effect.provideService(RpcSerialization.RpcSerialization, serialization));
|
|
57
58
|
});
|
|
58
59
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpRunner.js","names":["HttpClient","_interopRequireWildcard","require","HttpClientRequest","HttpRouter","Socket","RpcClient","RpcSerialization","RpcServer","Effect","Layer","_Runners","Runners","RunnerServer","Sharding","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","layerClientProtocolHttp","options","effect","RpcClientProtocol","gen","serialization","client","https","address","clientWithUrl","mapRequest","prependUrl","host","port","
|
|
1
|
+
{"version":3,"file":"HttpRunner.js","names":["HttpClient","_interopRequireWildcard","require","HttpClientRequest","HttpRouter","Socket","RpcClient","RpcSerialization","RpcServer","Effect","Layer","_Runners","Runners","RunnerServer","Sharding","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","normalizePath","path","startsWith","layerClientProtocolHttp","options","effect","RpcClientProtocol","gen","serialization","client","https","address","clientWithUrl","mapRequest","prependUrl","host","port","makeProtocolHttp","pipe","provideService","exports","layerClientProtocolHttpDefault","layerClientProtocolWebsocket","constructor","WebSocketConstructor","fnUntraced","socket","makeWebSocket","makeProtocolSocket","layerClientProtocolWebsocketDefault","toHttpEffect","handlers","build","layerHandlers","toHttpApp","Rpcs","spanPrefix","disableTracing","provide","toHttpEffectWebsocket","toHttpAppWebsocket","layerClient","layer","provideMerge","layerRpc","layerHttpOptions","layerWithClients","layerProtocolHttp","layerWebsocketOptions","layerProtocolWebsocket","layerHttp","serve","layerHttpClientOnly","layerClientOnly","layerWebsocket","layerWebsocketClientOnly"],"sources":["../../src/HttpRunner.ts"],"sourcesContent":[null],"mappings":";;;;;;AAGA,IAAAA,UAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,iBAAA,GAAAF,uBAAA,CAAAC,OAAA;AACA,IAAAE,UAAA,GAAAH,uBAAA,CAAAC,OAAA;AAIA,IAAAG,MAAA,GAAAJ,uBAAA,CAAAC,OAAA;AACA,IAAAI,SAAA,GAAAL,uBAAA,CAAAC,OAAA;AACA,IAAAK,gBAAA,GAAAN,uBAAA,CAAAC,OAAA;AACA,IAAAM,SAAA,GAAAP,uBAAA,CAAAC,OAAA;AACA,IAAAO,MAAA,GAAAR,uBAAA,CAAAC,OAAA;AACA,IAAAQ,KAAA,GAAAT,uBAAA,CAAAC,OAAA;AAIA,IAAAS,QAAA,GAAAV,uBAAA,CAAAC,OAAA;AAAuC,IAAAU,OAAA,GAAAD,QAAA;AAEvC,IAAAE,YAAA,GAAAZ,uBAAA,CAAAC,OAAA;AAEA,IAAAY,QAAA,GAAAb,uBAAA,CAAAC,OAAA;AAAyC,SAAAD,wBAAAc,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAhB,uBAAA,YAAAA,CAAAc,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAtBzC;;;;AAyBA,MAAMkB,aAAa,GAAIC,IAAY,IAAaA,IAAI,CAACC,UAAU,CAAC,GAAG,CAAC,GAAGD,IAAI,GAAG,IAAIA,IAAI,EAAE;AAExF;;;;AAIO,MAAME,uBAAuB,GAAIC,OAGvC,IAKC5B,KAAK,CAAC6B,MAAM,CAACC,0BAAiB,CAAC,CAC7B/B,MAAM,CAACgC,GAAG,CAAC,aAAS;EAClB,MAAMC,aAAa,GAAG,OAAOnC,gBAAgB,CAACA,gBAAgB;EAC9D,MAAMoC,MAAM,GAAG,OAAO3C,UAAU,CAACA,UAAU;EAC3C,MAAM4C,KAAK,GAAGN,OAAO,CAACM,KAAK,IAAI,KAAK;EACpC,OAAQC,OAAO,IAAI;IACjB,MAAMC,aAAa,GAAG9C,UAAU,CAAC+C,UAAU,CACzCJ,MAAM,EACNxC,iBAAiB,CAAC6C,UAAU,CAC1B,OAAOJ,KAAK,GAAG,GAAG,GAAG,EAAE,MAAMC,OAAO,CAACI,IAAI,IAAIJ,OAAO,CAACK,IAAI,GAAGhB,aAAa,CAACI,OAAO,CAACH,IAAI,CAAC,EAAE,CAC1F,CACF;IACD,OAAO7B,SAAS,CAAC6C,gBAAgB,CAACL,aAAa,CAAC,CAACM,IAAI,CACnD3C,MAAM,CAAC4C,cAAc,CAAC9C,gBAAgB,CAACA,gBAAgB,EAAEmC,aAAa,CAAC,CACxE;EACH,CAAC;AACH,CAAC,CAAC,CACH;AAEH;;;;AAAAY,OAAA,CAAAjB,uBAAA,GAAAA,uBAAA;AAIO,MAAMkB,8BAA8B,GAAAD,OAAA,CAAAC,8BAAA,gBAIvClB,uBAAuB,CAAC;EAAEF,IAAI,EAAE;AAAG,CAAE,CAAC;AAE1C;;;;AAIO,MAAMqB,4BAA4B,GAAIlB,OAG5C,IAKC5B,KAAK,CAAC6B,MAAM,CAACC,0BAAiB,CAAC,CAC7B/B,MAAM,CAACgC,GAAG,CAAC,aAAS;EAClB,MAAMC,aAAa,GAAG,OAAOnC,gBAAgB,CAACA,gBAAgB;EAC9D,MAAMqC,KAAK,GAAGN,OAAO,CAACM,KAAK,IAAI,KAAK;EACpC,MAAMa,WAAW,GAAG,OAAOpD,MAAM,CAACqD,oBAAoB;EACtD,OAAOjD,MAAM,CAACkD,UAAU,CAAC,WAAUd,OAAO;IACxC,MAAMe,MAAM,GAAG,OAAOvD,MAAM,CAACwD,aAAa,CACxC,KAAKjB,KAAK,GAAG,GAAG,GAAG,EAAE,MAAMC,OAAO,CAACI,IAAI,IAAIJ,OAAO,CAACK,IAAI,GAAGhB,aAAa,CAACI,OAAO,CAACH,IAAI,CAAC,EAAE,CACxF,CAACiB,IAAI,CACJ3C,MAAM,CAAC4C,cAAc,CAAChD,MAAM,CAACqD,oBAAoB,EAAED,WAAW,CAAC,CAChE;IACD,OAAO,OAAOnD,SAAS,CAACwD,kBAAkB,EAAE,CAACV,IAAI,CAC/C3C,MAAM,CAAC4C,cAAc,CAAChD,MAAM,CAACA,MAAM,EAAEuD,MAAM,CAAC,EAC5CnD,MAAM,CAAC4C,cAAc,CAAC9C,gBAAgB,CAACA,gBAAgB,EAAEmC,aAAa,CAAC,CACxE;EACH,CAAC,CAAC;AACJ,CAAC,CAAC,CACH;AAEH;;;;AAAAY,OAAA,CAAAE,4BAAA,GAAAA,4BAAA;AAIO,MAAMO,mCAAmC,GAAAT,OAAA,CAAAS,mCAAA,gBAI5CP,4BAA4B,CAAC;EAAErB,IAAI,EAAE;AAAG,CAAE,CAAC;AAE/C;;;;AAIO,MAAM6B,YAAY,GAAAV,OAAA,CAAAU,YAAA,gBAIrBvD,MAAM,CAACgC,GAAG,CAAC,aAAS;EACtB,MAAMwB,QAAQ,GAAG,OAAOvD,KAAK,CAACwD,KAAK,CAACrD,YAAY,CAACsD,aAAa,CAAC;EAC/D,OAAO,OAAO3D,SAAS,CAAC4D,SAAS,CAACxD,OAAO,CAACyD,IAAI,EAAE;IAC9CC,UAAU,EAAE,cAAc;IAC1BC,cAAc,EAAE;GACjB,CAAC,CAACnB,IAAI,CAAC3C,MAAM,CAAC+D,OAAO,CAACP,QAAQ,CAAC,CAAC;AACnC,CAAC,CAAC;AAEF;;;;AAIO,MAAMQ,qBAAqB,GAAAnB,OAAA,CAAAmB,qBAAA,gBAI9BhE,MAAM,CAACgC,GAAG,CAAC,aAAS;EACtB,MAAMwB,QAAQ,GAAG,OAAOvD,KAAK,CAACwD,KAAK,CAACrD,YAAY,CAACsD,aAAa,CAAC;EAC/D,OAAO,OAAO3D,SAAS,CAACkE,kBAAkB,CAAC9D,OAAO,CAACyD,IAAI,EAAE;IACvDC,UAAU,EAAE,cAAc;IAC1BC,cAAc,EAAE;GACjB,CAAC,CAACnB,IAAI,CAAC3C,MAAM,CAAC+D,OAAO,CAACP,QAAQ,CAAC,CAAC;AACnC,CAAC,CAAC;AAEF;;;;AAIO,MAAMU,WAAW,GAAArB,OAAA,CAAAqB,WAAA,gBAIpB7D,QAAQ,CAAC8D,KAAK,CAACxB,IAAI,cACrB1C,KAAK,CAACmE,YAAY,CAACjE,OAAO,CAACkE,QAAQ,CAAC,CACrC;AAED;;;;;;;AAOO,MAAMC,gBAAgB,GAAIzC,OAEhC,IAWCzB,YAAY,CAACmE,gBAAgB,CAAC5B,IAAI,CAChC1C,KAAK,CAAC8D,OAAO,CAAChE,SAAS,CAACyE,iBAAiB,CAAC3C,OAAO,CAAC,CAAC,CACpD;AAEH;;;;AAAAgB,OAAA,CAAAyB,gBAAA,GAAAA,gBAAA;AAIO,MAAMG,qBAAqB,GAAI5C,OAErC,IAWCzB,YAAY,CAACmE,gBAAgB,CAAC5B,IAAI,CAChC1C,KAAK,CAAC8D,OAAO,CAAChE,SAAS,CAAC2E,sBAAsB,CAAC7C,OAAO,CAAC,CAAC,CACzD;AAEH;;;;AAAAgB,OAAA,CAAA4B,qBAAA,GAAAA,qBAAA;AAIO,MAAME,SAAS,GAAA9B,OAAA,CAAA8B,SAAA,gBAUlBhF,UAAU,CAACiF,KAAK,CAACN,gBAAgB,CAAC;EAAE5C,IAAI,EAAE;AAAG,CAAE,CAAC,CAAC,CAACiB,IAAI,cACxD1C,KAAK,CAAC8D,OAAO,CAACjB,8BAA8B,CAAC,CAC9C;AAED;;;;AAIO,MAAM+B,mBAAmB,GAAAhC,OAAA,CAAAgC,mBAAA,gBAQ5BzE,YAAY,CAAC0E,eAAe,CAACnC,IAAI,cACnC1C,KAAK,CAAC8D,OAAO,CAACjB,8BAA8B,CAAC,CAC9C;AAED;;;;AAIO,MAAMiC,cAAc,GAAAlC,OAAA,CAAAkC,cAAA,gBAUvBpF,UAAU,CAACiF,KAAK,CAACH,qBAAqB,CAAC;EAAE/C,IAAI,EAAE;AAAG,CAAE,CAAC,CAAC,CAACiB,IAAI,cAC7D1C,KAAK,CAAC8D,OAAO,CAACT,mCAAmC,CAAC,CACnD;AAED;;;;AAIO,MAAM0B,wBAAwB,GAAAnC,OAAA,CAAAmC,wBAAA,gBAQjC5E,YAAY,CAAC0E,eAAe,CAACnC,IAAI,cACnC1C,KAAK,CAAC8D,OAAO,CAACT,mCAAmC,CAAC,CACnD","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpRunner.d.ts","sourceRoot":"","sources":["../../src/HttpRunner.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,6BAA6B,CAAA;AAEzD,OAAO,KAAK,UAAU,MAAM,kCAAkC,CAAA;AAC9D,OAAO,KAAK,KAAK,UAAU,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAA;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AAC7E,OAAO,KAAK,MAAM,MAAM,yBAAyB,CAAA;AAEjD,OAAO,KAAK,gBAAgB,MAAM,8BAA8B,CAAA;AAEhE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAEhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AACzC,OAAO,KAAK,KAAK,cAAc,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"HttpRunner.d.ts","sourceRoot":"","sources":["../../src/HttpRunner.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/HttpRunner.js
CHANGED
|
@@ -14,6 +14,7 @@ import * as Runners from "./Runners.js";
|
|
|
14
14
|
import { RpcClientProtocol } from "./Runners.js";
|
|
15
15
|
import * as RunnerServer from "./RunnerServer.js";
|
|
16
16
|
import * as Sharding from "./Sharding.js";
|
|
17
|
+
const normalizePath = path => path.startsWith("/") ? path : `/${path}`;
|
|
17
18
|
/**
|
|
18
19
|
* @since 1.0.0
|
|
19
20
|
* @category Layers
|
|
@@ -23,7 +24,7 @@ export const layerClientProtocolHttp = options => Layer.effect(RpcClientProtocol
|
|
|
23
24
|
const client = yield* HttpClient.HttpClient;
|
|
24
25
|
const https = options.https ?? false;
|
|
25
26
|
return address => {
|
|
26
|
-
const clientWithUrl = HttpClient.mapRequest(client, HttpClientRequest.prependUrl(`http${https ? "s" : ""}://${address.host}:${address.port}
|
|
27
|
+
const clientWithUrl = HttpClient.mapRequest(client, HttpClientRequest.prependUrl(`http${https ? "s" : ""}://${address.host}:${address.port}${normalizePath(options.path)}`));
|
|
27
28
|
return RpcClient.makeProtocolHttp(clientWithUrl).pipe(Effect.provideService(RpcSerialization.RpcSerialization, serialization));
|
|
28
29
|
};
|
|
29
30
|
}));
|
|
@@ -43,7 +44,7 @@ export const layerClientProtocolWebsocket = options => Layer.effect(RpcClientPro
|
|
|
43
44
|
const https = options.https ?? false;
|
|
44
45
|
const constructor = yield* Socket.WebSocketConstructor;
|
|
45
46
|
return Effect.fnUntraced(function* (address) {
|
|
46
|
-
const socket = yield* Socket.makeWebSocket(`ws${https ? "s" : ""}://${address.host}:${address.port}
|
|
47
|
+
const socket = yield* Socket.makeWebSocket(`ws${https ? "s" : ""}://${address.host}:${address.port}${normalizePath(options.path)}`).pipe(Effect.provideService(Socket.WebSocketConstructor, constructor));
|
|
47
48
|
return yield* RpcClient.makeProtocolSocket().pipe(Effect.provideService(Socket.Socket, socket), Effect.provideService(RpcSerialization.RpcSerialization, serialization));
|
|
48
49
|
});
|
|
49
50
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpRunner.js","names":["HttpClient","HttpClientRequest","HttpRouter","Socket","RpcClient","RpcSerialization","RpcServer","Effect","Layer","Runners","RpcClientProtocol","RunnerServer","Sharding","layerClientProtocolHttp","options","effect","gen","serialization","client","https","address","clientWithUrl","mapRequest","prependUrl","host","port","
|
|
1
|
+
{"version":3,"file":"HttpRunner.js","names":["HttpClient","HttpClientRequest","HttpRouter","Socket","RpcClient","RpcSerialization","RpcServer","Effect","Layer","Runners","RpcClientProtocol","RunnerServer","Sharding","normalizePath","path","startsWith","layerClientProtocolHttp","options","effect","gen","serialization","client","https","address","clientWithUrl","mapRequest","prependUrl","host","port","makeProtocolHttp","pipe","provideService","layerClientProtocolHttpDefault","layerClientProtocolWebsocket","constructor","WebSocketConstructor","fnUntraced","socket","makeWebSocket","makeProtocolSocket","layerClientProtocolWebsocketDefault","toHttpEffect","handlers","build","layerHandlers","toHttpApp","Rpcs","spanPrefix","disableTracing","provide","toHttpEffectWebsocket","toHttpAppWebsocket","layerClient","layer","provideMerge","layerRpc","layerHttpOptions","layerWithClients","layerProtocolHttp","layerWebsocketOptions","layerProtocolWebsocket","layerHttp","serve","layerHttpClientOnly","layerClientOnly","layerWebsocket","layerWebsocketClientOnly"],"sources":["../../src/HttpRunner.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect/cluster",
|
|
3
|
-
"version": "0.56.
|
|
3
|
+
"version": "0.56.1",
|
|
4
4
|
"description": "Unified interfaces for common cluster-specific services",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -14,11 +14,11 @@
|
|
|
14
14
|
"kubernetes-types": "^1.30.0"
|
|
15
15
|
},
|
|
16
16
|
"peerDependencies": {
|
|
17
|
-
"@effect/platform": "^0.94.
|
|
18
|
-
"@effect/rpc": "^0.73.0",
|
|
17
|
+
"@effect/platform": "^0.94.1",
|
|
19
18
|
"@effect/sql": "^0.49.0",
|
|
20
19
|
"@effect/workflow": "^0.16.0",
|
|
21
|
-
"effect": "^
|
|
20
|
+
"@effect/rpc": "^0.73.0",
|
|
21
|
+
"effect": "^3.19.14"
|
|
22
22
|
},
|
|
23
23
|
"publishConfig": {
|
|
24
24
|
"provenance": true
|
package/src/HttpRunner.ts
CHANGED
|
@@ -23,6 +23,8 @@ import type { RunnerStorage } from "./RunnerStorage.js"
|
|
|
23
23
|
import * as Sharding from "./Sharding.js"
|
|
24
24
|
import type * as ShardingConfig from "./ShardingConfig.js"
|
|
25
25
|
|
|
26
|
+
const normalizePath = (path: string): string => path.startsWith("/") ? path : `/${path}`
|
|
27
|
+
|
|
26
28
|
/**
|
|
27
29
|
* @since 1.0.0
|
|
28
30
|
* @category Layers
|
|
@@ -43,7 +45,9 @@ export const layerClientProtocolHttp = (options: {
|
|
|
43
45
|
return (address) => {
|
|
44
46
|
const clientWithUrl = HttpClient.mapRequest(
|
|
45
47
|
client,
|
|
46
|
-
HttpClientRequest.prependUrl(
|
|
48
|
+
HttpClientRequest.prependUrl(
|
|
49
|
+
`http${https ? "s" : ""}://${address.host}:${address.port}${normalizePath(options.path)}`
|
|
50
|
+
)
|
|
47
51
|
)
|
|
48
52
|
return RpcClient.makeProtocolHttp(clientWithUrl).pipe(
|
|
49
53
|
Effect.provideService(RpcSerialization.RpcSerialization, serialization)
|
|
@@ -81,7 +85,7 @@ export const layerClientProtocolWebsocket = (options: {
|
|
|
81
85
|
const constructor = yield* Socket.WebSocketConstructor
|
|
82
86
|
return Effect.fnUntraced(function*(address) {
|
|
83
87
|
const socket = yield* Socket.makeWebSocket(
|
|
84
|
-
`ws${https ? "s" : ""}://${address.host}:${address.port}
|
|
88
|
+
`ws${https ? "s" : ""}://${address.host}:${address.port}${normalizePath(options.path)}`
|
|
85
89
|
).pipe(
|
|
86
90
|
Effect.provideService(Socket.WebSocketConstructor, constructor)
|
|
87
91
|
)
|