Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optional metadata for rxjs requesters #241

Merged
merged 4 commits into from
Aug 9, 2022
Merged

Optional metadata for rxjs requesters #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a4cb4c
feat: support optional metadata in rxjs adapter requesters
viglucci Aug 9, 2022
2a5a9c3
chore: allow versioning from feature branch
viglucci Aug 9, 2022
cf9dc5d
chore(release): release
viglucci Aug 9, 2022
862ae2e
chore: remove change to lerna.json
viglucci Aug 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/rsocket-adapter-rxjs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rsocket-adapter-rxjs",
"version": "1.0.0-alpha.2",
"version": "1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"license": "Apache-2.0",
"main": "dist/index",
"types": "dist/index",
Expand All @@ -19,8 +19,8 @@
"test": "echo \"Error: no test specified\" && exit 0"
},
"dependencies": {
"rsocket-core": "^1.0.0-alpha.1",
"rsocket-messaging": "^1.0.0-alpha.2",
"rsocket-core": "^1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"rsocket-messaging": "^1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"rxjs": "^7.4.0"
},
"devDependencies": {
Expand Down
100 changes: 54 additions & 46 deletions packages/rsocket-adapter-rxjs/src/Requesters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,23 @@ export function fireAndForget<TData>(
inputCodec: Codec<TData>
): (
rsocket: RSocket,
metadata: Map<string | number | WellKnownMimeType, Buffer>
metadata?: Map<string | number | WellKnownMimeType, Buffer>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All requesters updated to consider metadata optional.

) => Observable<void> {
return (
rsocket: RSocket,
metadata: Map<string | number | WellKnownMimeType, Buffer>
) =>
new RSocketPublisherToObservable((s) =>
metadata?: Map<string | number | WellKnownMimeType, Buffer>
) => {
const encodedMetadata = metadata ? encodeCompositeMetadata(metadata) : null;
return new RSocketPublisherToObservable((s) =>
rsocket.fireAndForget(
{
data: data ? inputCodec.encode(data) : Buffer.allocUnsafe(0),
metadata: encodeCompositeMetadata(metadata),
metadata: encodedMetadata,
},
s
)
);
};
}

export function requestResponse<TData, RData>(
Expand All @@ -71,23 +73,25 @@ export function requestResponse<TData, RData>(
outputCodec: Codec<RData>
): (
rsocket: RSocket,
metadata: Map<string | number | WellKnownMimeType, Buffer>
metadata?: Map<string | number | WellKnownMimeType, Buffer>
) => Observable<RData> {
return (
rsocket: RSocket,
metadata: Map<string | number | WellKnownMimeType, Buffer>
) =>
new RSocketPublisherToObservable(
metadata?: Map<string | number | WellKnownMimeType, Buffer>
) => {
const encodedMetadata = metadata ? encodeCompositeMetadata(metadata) : null;
return new RSocketPublisherToObservable(
(s) =>
rsocket.requestResponse(
{
data: data ? inputCodec.encode(data) : Buffer.allocUnsafe(0),
metadata: encodeCompositeMetadata(metadata),
metadata: encodedMetadata,
},
s
),
outputCodec
);
};
}

export function requestStream<TData, RData>(
Expand All @@ -98,18 +102,19 @@ export function requestStream<TData, RData>(
scheduler: SchedulerLike = asyncScheduler
): (
rsocket: RSocket,
metadata: Map<string | number | WellKnownMimeType, Buffer>
metadata?: Map<string | number | WellKnownMimeType, Buffer>
) => Observable<RData> {
return (
rsocket: RSocket,
metadata: Map<string | number | WellKnownMimeType, Buffer>
) =>
new RSocketPublisherToPrefetchingObservable(
metadata?: Map<string | number | WellKnownMimeType, Buffer>
) => {
const encodedMetadata = metadata ? encodeCompositeMetadata(metadata) : null;
return new RSocketPublisherToPrefetchingObservable(
(s, n) =>
rsocket.requestStream(
{
data: data ? inputCodec.encode(data) : Buffer.allocUnsafe(0),
metadata: encodeCompositeMetadata(metadata),
metadata: encodedMetadata,
},
n,
s
Expand All @@ -118,6 +123,7 @@ export function requestStream<TData, RData>(
outputCodec,
scheduler
);
};
}

export function requestChannel<TData, RData>(
Expand All @@ -128,9 +134,9 @@ export function requestChannel<TData, RData>(
scheduler: SchedulerLike = asyncScheduler
): (
rsocket: RSocket,
metadata: Map<string | number | WellKnownMimeType, Buffer>
metadata?: Map<string | number | WellKnownMimeType, Buffer>
) => Observable<RData> {
const [firstValueObservable, restValuestObservable] = partition(
const [firstValueObservable, restValuesObservable] = partition(
datas.pipe(
share({
connector: () => new Subject(),
Expand All @@ -142,35 +148,37 @@ export function requestChannel<TData, RData>(

return (
rsocket: RSocket,
metadata: Map<string | number | WellKnownMimeType, Buffer>
) =>
firstValueObservable.pipe(
metadata?: Map<string | number | WellKnownMimeType, Buffer>
) => {
const encodedMetadata = metadata ? encodeCompositeMetadata(metadata) : null;
return firstValueObservable.pipe(
take(1),
concatMap(
(firstValue) =>
new Observer2BufferingSubscriberToPublisher2PrefetchingObservable(
(
s: OnTerminalSubscriber &
OnNextSubscriber &
OnExtensionSubscriber &
Requestable &
Cancellable
) =>
rsocket.requestChannel(
{
data: inputCodec.encode(firstValue),
metadata: encodeCompositeMetadata(metadata),
},
prefetch,
false,
s
),
prefetch,
restValuestObservable,
inputCodec,
outputCodec,
scheduler
) as Observable<RData>
)
concatMap((firstValue) => {
return new Observer2BufferingSubscriberToPublisher2PrefetchingObservable(
(
s: OnTerminalSubscriber &
OnNextSubscriber &
OnExtensionSubscriber &
Requestable &
Cancellable
) => {
return rsocket.requestChannel(
{
data: inputCodec.encode(firstValue),
metadata: encodedMetadata,
},
prefetch,
false,
s
);
},
prefetch,
restValuesObservable,
inputCodec,
outputCodec,
scheduler
) as Observable<RData>;
})
);
};
}
4 changes: 2 additions & 2 deletions packages/rsocket-composite-metadata/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rsocket-composite-metadata",
"version": "1.0.0-alpha.2",
"version": "1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"license": "Apache-2.0",
"main": "dist/index",
"types": "dist/index",
Expand All @@ -19,7 +19,7 @@
"test": "yarn jest"
},
"dependencies": {
"rsocket-core": "^1.0.0-alpha.1"
"rsocket-core": "^1.0.0-alpha-rxjs-adapter-optional-metadata.0"
},
"devDependencies": {
"rimraf": "~3.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/rsocket-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rsocket-core",
"version": "1.0.0-alpha.1",
"version": "1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"license": "Apache-2.0",
"main": "dist/index",
"types": "dist/index",
Expand Down
16 changes: 8 additions & 8 deletions packages/rsocket-examples/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rsocket-examples",
"version": "1.0.0-alpha.2",
"version": "1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"license": "Apache-2.0",
"private": true,
"files": [
Expand All @@ -19,13 +19,13 @@
"start-client-server-rx-composite-metadata-route": "ts-node -r tsconfig-paths/register src/rxjs/ClientServerCompositeMetadataRouteExample.ts"
},
"dependencies": {
"rsocket-adapter-rxjs": "^1.0.0-alpha.2",
"rsocket-composite-metadata": "^1.0.0-alpha.2",
"rsocket-core": "^1.0.0-alpha.1",
"rsocket-tcp-client": "^1.0.0-alpha.1",
"rsocket-tcp-server": "^1.0.0-alpha.1",
"rsocket-websocket-client": "^1.0.0-alpha.1",
"rsocket-websocket-server": "^1.0.0-alpha.1",
"rsocket-adapter-rxjs": "^1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"rsocket-composite-metadata": "^1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"rsocket-core": "^1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"rsocket-tcp-client": "^1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"rsocket-tcp-server": "^1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"rsocket-websocket-client": "^1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"rsocket-websocket-server": "^1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"ws": "~8.2.3"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/rsocket-messaging/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rsocket-messaging",
"version": "1.0.0-alpha.2",
"version": "1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"license": "Apache-2.0",
"main": "dist/index",
"types": "dist/index",
Expand All @@ -19,8 +19,8 @@
"test": "echo \"Error: no test specified\" && exit 0"
},
"dependencies": {
"rsocket-composite-metadata": "^1.0.0-alpha.2",
"rsocket-core": "^1.0.0-alpha.1"
"rsocket-composite-metadata": "^1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"rsocket-core": "^1.0.0-alpha-rxjs-adapter-optional-metadata.0"
},
"devDependencies": {
"rimraf": "~3.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/rsocket-tcp-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rsocket-tcp-client",
"version": "1.0.0-alpha.1",
"version": "1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"license": "Apache-2.0",
"main": "dist/index",
"types": "dist/index",
Expand All @@ -20,7 +20,7 @@
"test": "jest"
},
"dependencies": {
"rsocket-core": "^1.0.0-alpha.1"
"rsocket-core": "^1.0.0-alpha-rxjs-adapter-optional-metadata.0"
},
"devDependencies": {
"rimraf": "~3.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/rsocket-tcp-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rsocket-tcp-server",
"version": "1.0.0-alpha.1",
"version": "1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"license": "Apache-2.0",
"main": "dist/index",
"types": "dist/index",
Expand All @@ -20,7 +20,7 @@
"test": "jest"
},
"dependencies": {
"rsocket-core": "^1.0.0-alpha.1"
"rsocket-core": "^1.0.0-alpha-rxjs-adapter-optional-metadata.0"
},
"devDependencies": {
"rimraf": "~3.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/rsocket-websocket-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rsocket-websocket-client",
"version": "1.0.0-alpha.1",
"version": "1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"license": "Apache-2.0",
"main": "dist/index",
"types": "dist/index",
Expand All @@ -20,7 +20,7 @@
"test": "jest"
},
"dependencies": {
"rsocket-core": "^1.0.0-alpha.1"
"rsocket-core": "^1.0.0-alpha-rxjs-adapter-optional-metadata.0"
},
"devDependencies": {
"rimraf": "~3.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/rsocket-websocket-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rsocket-websocket-server",
"version": "1.0.0-alpha.1",
"version": "1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"license": "Apache-2.0",
"main": "dist/index",
"types": "dist/index",
Expand All @@ -20,7 +20,7 @@
"test": "echo \"Error: no test specified\" && exit 0"
},
"dependencies": {
"rsocket-core": "^1.0.0-alpha.1",
"rsocket-core": "^1.0.0-alpha-rxjs-adapter-optional-metadata.0",
"ws": "~8.2.3"
},
"devDependencies": {
Expand Down