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.

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

feat!: publish packages under the @rsocket org #274

Open
wants to merge 3 commits into
base: 1.0.x-alpha
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "rsocket-js",
"name": "@rsocket/js",
"description": "A JavaScript implementation of the RSocket protocol (https://github.com/rsocket/rsocket).",
"private": true,
"license": "Apache-2.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/rsocket-adapter-rxjs/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "rsocket-adapter-rxjs",
"name": "@rsocket/adapter-rxjs",
"version": "1.0.0-alpha.4",
"license": "Apache-2.0",
"main": "dist/index",
Expand All @@ -19,8 +19,8 @@
"test": "echo \"Error: no test specified\" && exit 0"
},
"dependencies": {
"rsocket-core": "^1.0.0-alpha.3",
"rsocket-messaging": "^1.0.0-alpha.3",
"@rsocket/core": "^1.0.0-alpha.3",
"@rsocket/messaging": "^1.0.0-alpha.3",
"rxjs": "^7.4.0"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import {
OnNextSubscriber,
OnTerminalSubscriber,
Requestable,
} from "rsocket-core";
import { Codec } from "rsocket-messaging";
} from "@rsocket/core";
import { Codec } from "@rsocket/messaging";
import {
asyncScheduler,
Observable,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import {
OnNextSubscriber,
OnTerminalSubscriber,
Requestable,
} from "rsocket-core";
import { Codec } from "rsocket-messaging";
} from "@rsocket/core";
import { Codec } from "@rsocket/messaging";
import { Observer, Subscription } from "rxjs";
import { applyMixins } from "./Utils";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import {
OnExtensionSubscriber,
OnNextSubscriber,
OnTerminalSubscriber,
} from "rsocket-core";
import { Codec } from "rsocket-messaging";
} from "@rsocket/core";
import { Codec } from "@rsocket/messaging";
import { Observer, Subscription } from "rxjs";

export default class ObserverToRSocketSubscriber<T>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import {
OnTerminalSubscriber,
Payload,
Requestable,
} from "rsocket-core";
import { Codec } from "rsocket-messaging";
} from "@rsocket/core";
import { Codec } from "@rsocket/messaging";
import { asyncScheduler, SchedulerLike, Subscriber, TeardownLogic } from "rxjs";
import ObserverToBufferingRSocketSubscriber from "./ObserverToBufferingRSocketSubscriber";
import RSocketPublisherToPrefetchingObservable from "./RSocketPublisherToPrefetchingObservable";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import {
OnNextSubscriber,
OnTerminalSubscriber,
Payload,
} from "rsocket-core";
import { Codec } from "rsocket-messaging";
} from "@rsocket/core";
import { Codec } from "@rsocket/messaging";
import { Observable, Subscriber, TeardownLogic, Unsubscribable } from "rxjs";

export default class RSocketPublisherToObservable<T>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import {
OnTerminalSubscriber,
Payload,
Requestable,
} from "rsocket-core";
import { Codec } from "rsocket-messaging";
} from "@rsocket/core";
import { Codec } from "@rsocket/messaging";
import {
asyncScheduler,
Observable,
Expand Down
6 changes: 3 additions & 3 deletions packages/rsocket-adapter-rxjs/src/Requesters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
import {
encodeCompositeMetadata,
WellKnownMimeType,
} from "rsocket-composite-metadata";
} from "@rsocket/composite-metadata";
import {
Cancellable,
OnExtensionSubscriber,
OnNextSubscriber,
OnTerminalSubscriber,
Requestable,
RSocket,
} from "rsocket-core";
import { Codec } from "rsocket-messaging";
} from "@rsocket/core";
import { Codec } from "@rsocket/messaging";
import {
asyncScheduler,
concatMap,
Expand Down
4 changes: 2 additions & 2 deletions packages/rsocket-adapter-rxjs/src/Responders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import {
OnTerminalSubscriber,
Payload,
Requestable,
} from "rsocket-core";
import { Codec } from "rsocket-messaging";
} from "@rsocket/core";
import { Codec } from "@rsocket/messaging";
import { asyncScheduler, Observable, SchedulerLike } from "rxjs";
import ObserverToBufferingRSocketSubscriber from "./ObserverToBufferingRSocketSubscriber";
import ObserverToRSocketSubscriber from "./ObserverToRSocketSubscriber";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { encodeAndAddCustomMetadata } from "rsocket-composite-metadata";
import { encodeAndAddCustomMetadata } from "@rsocket/composite-metadata";
import { hex } from "./test-utils/hex";

describe("encodeAndAddCustomMetadata", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {
encodeAndAddWellKnownMetadata,
WellKnownMimeType,
} from "rsocket-composite-metadata";
import { readUInt24BE } from "rsocket-core";
} from "@rsocket/composite-metadata";
import { readUInt24BE } from "@rsocket/core";

describe("encodeWellKnownMetadataHeader", () => {
it("encodes the header as per spec when WellKnownMimeType given", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {
encodeCompositeMetadata,
WellKnownMimeType,
} from "rsocket-composite-metadata";
import { readUInt24BE } from "rsocket-core";
} from "@rsocket/composite-metadata";
import { readUInt24BE } from "@rsocket/core";

describe("encodeCompositeMetadata encodes the metadata", () => {
describe("when given a map", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { encodeCustomMetadataHeader } from "rsocket-composite-metadata";
import { encodeCustomMetadataHeader } from "@rsocket/composite-metadata";
import { hex } from "./test-utils/hex";

describe("encodeCustomMetadataHeader", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
encodeWellKnownMetadataHeader,
WellKnownMimeType,
} from "rsocket-composite-metadata";
} from "@rsocket/composite-metadata";

describe("encodeWellKnownMetadataHeader", () => {
it("encodes the header as per spec", () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/rsocket-composite-metadata/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "rsocket-composite-metadata",
"name": "@rsocket/composite-metadata",
"version": "1.0.0-alpha.3",
"license": "Apache-2.0",
"main": "dist/index",
Expand All @@ -19,7 +19,7 @@
"test": "yarn jest"
},
"dependencies": {
"rsocket-core": "^1.0.0-alpha.3"
"@rsocket/core": "^1.0.0-alpha.3"
},
"devDependencies": {
"rimraf": "~3.0.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { readUInt24BE, writeUInt24BE } from "rsocket-core";
import { readUInt24BE, writeUInt24BE } from "@rsocket/core";
import { WellKnownMimeType } from "./WellKnownMimeType";

export class CompositeMetadata implements Iterable<Entry> {
Expand Down
2 changes: 1 addition & 1 deletion packages/rsocket-core/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "rsocket-core",
"name": "@rsocket/core",
"version": "1.0.0-alpha.3",
"license": "Apache-2.0",
"main": "dist/index",
Expand Down
16 changes: 8 additions & 8 deletions packages/rsocket-examples/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "rsocket-examples",
"name": "@rsocket/examples",
"version": "1.0.0-alpha.4",
"license": "Apache-2.0",
"private": true,
Expand Down Expand Up @@ -28,13 +28,13 @@
"graphql": "^16.0.0",
"graphql-tag": "^2.12.6",
"graphql-subscriptions": "^2.0.0",
"rsocket-adapter-rxjs": "^1.0.0-alpha.4",
"rsocket-composite-metadata": "^1.0.0-alpha.3",
"rsocket-core": "^1.0.0-alpha.3",
"rsocket-tcp-client": "^1.0.0-alpha.3",
"rsocket-tcp-server": "^1.0.0-alpha.3",
"rsocket-websocket-client": "^1.0.0-alpha.3",
"rsocket-websocket-server": "^1.0.0-alpha.3",
"@rsocket/adapter-rxjs": "^1.0.0-alpha.4",
"@rsocket/composite-metadata": "^1.0.0-alpha.3",
"@rsocket/core": "^1.0.0-alpha.3",
"@rsocket/tcp-client": "^1.0.0-alpha.3",
"@rsocket/tcp-server": "^1.0.0-alpha.3",
"@rsocket/websocket-client": "^1.0.0-alpha.3",
"@rsocket/websocket-server": "^1.0.0-alpha.3",
"ws": "~8.2.3"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/rsocket-examples/src/ClientRequestChannelExample.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*/

import { RSocketConnector } from "rsocket-core";
import { WebsocketClientTransport } from "rsocket-websocket-client";
import { RSocketConnector } from "@rsocket/core";
import { WebsocketClientTransport } from "@rsocket/websocket-client";
import { exit } from "process";
import WebSocket from "ws";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ import {
RSocketConnector,
RSocketError,
RSocketServer,
} from "rsocket-core";
import { TcpClientTransport } from "rsocket-tcp-client";
import { TcpServerTransport } from "rsocket-tcp-server";
} from "@rsocket/core";
import { TcpClientTransport } from "@rsocket/tcp-client";
import { TcpServerTransport } from "@rsocket/tcp-server";
import {
decodeCompositeMetadata,
decodeRoutes,
encodeCompositeMetadata,
encodeRoute,
WellKnownMimeType,
} from "rsocket-composite-metadata";
} from "@rsocket/composite-metadata";
import { exit } from "process";
import MESSAGE_RSOCKET_ROUTING = WellKnownMimeType.MESSAGE_RSOCKET_ROUTING;
import Logger from "./shared/logger";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import {
RSocket,
RSocketConnector,
RSocketServer,
} from "rsocket-core";
} from "@rsocket/core";
import { exit } from "process";
import { TcpClientTransport } from "rsocket-tcp-client";
import { TcpServerTransport } from "rsocket-tcp-server";
import { TcpClientTransport } from "@rsocket/tcp-client";
import { TcpServerTransport } from "@rsocket/tcp-server";

async function main() {
const server = new RSocketServer({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
* limitations under the License.
*/

import { RSocket, RSocketConnector, RSocketServer } from "rsocket-core";
import { TcpClientTransport } from "rsocket-tcp-client";
import { TcpServerTransport } from "rsocket-tcp-server";
import { RSocket, RSocketConnector, RSocketServer } from "@rsocket/core";
import { TcpClientTransport } from "@rsocket/tcp-client";
import { TcpServerTransport } from "@rsocket/tcp-server";
import { exit } from "process";
import { makeRSocketLink } from "rsocket-graphql-apollo-link";
import { RSocketApolloServer } from "rsocket-graphql-apollo-server";
import { makeRSocketLink } from "@rsocket/graphql-apollo-link";
import { RSocketApolloServer } from "@rsocket/graphql-apollo-server";
import {
ApolloClient,
InMemoryCache,
Expand All @@ -30,7 +30,7 @@ import { resolvers } from "./resolvers";
import { DocumentNode } from "@apollo/client";
import * as fs from "fs";
import path from "path";
import { RSocketApolloGraphlQLPlugin } from "rsocket-graphql-apollo-server/src/RSocketApolloGraphlQLPlugin";
import { RSocketApolloGraphlQLPlugin } from "@rsocket/graphql-apollo-server/src/RSocketApolloGraphlQLPlugin";

let apolloServer: RSocketApolloServer;
let rsocketClient: RSocket;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

import { RSocket, RSocketConnector } from "rsocket-core";
import { makeRSocketLink } from "rsocket-graphql-apollo-link";
import { WebsocketClientTransport } from "rsocket-websocket-client";
import { RSocket, RSocketConnector } from "@rsocket/core";
import { makeRSocketLink } from "@rsocket/graphql-apollo-link";
import { WebsocketClientTransport } from "@rsocket/websocket-client";
import {
ApolloClient,
InMemoryCache,
Expand All @@ -25,7 +25,7 @@ import {
import gql from "graphql-tag";
import WebSocket from "ws";
import { exit } from "process";
import { WellKnownMimeType } from "rsocket-composite-metadata";
import { WellKnownMimeType } from "@rsocket/composite-metadata";
import { DocumentNode } from "@apollo/client";

let rsocketClient: RSocket;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
* limitations under the License.
*/

import { RSocketConnector, RSocketServer } from "rsocket-core";
import { Codec, RSocketRequester, RSocketResponder } from "rsocket-messaging";
import { RxRequestersFactory, RxRespondersFactory } from "rsocket-adapter-rxjs";
import { TcpClientTransport } from "rsocket-tcp-client";
import { TcpServerTransport } from "rsocket-tcp-server";
import { RSocketConnector, RSocketServer } from "@rsocket/core";
import { Codec, RSocketRequester, RSocketResponder } from "@rsocket/messaging";
import {
RxRequestersFactory,
RxRespondersFactory,
} from "@rsocket/adapter-rxjs";
import { TcpClientTransport } from "@rsocket/tcp-client";
import { TcpServerTransport } from "@rsocket/tcp-server";
import { exit } from "process";
import {
firstValueFrom,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
* limitations under the License.
*/

import { RSocket, RSocketConnector, RSocketServer } from "rsocket-core";
import { Codec } from "rsocket-messaging";
import { RxRequestersFactory, RxRespondersFactory } from "rsocket-adapter-rxjs";
import { TcpClientTransport } from "rsocket-tcp-client";
import { TcpServerTransport } from "rsocket-tcp-server";
import { RSocket, RSocketConnector, RSocketServer } from "@rsocket/core";
import { Codec } from "@rsocket/messaging";
import {
RxRequestersFactory,
RxRespondersFactory,
} from "@rsocket/adapter-rxjs";
import { TcpClientTransport } from "@rsocket/tcp-client";
import { TcpServerTransport } from "@rsocket/tcp-server";
import { exit } from "process";
import {
firstValueFrom,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*/

import { RSocket, RSocketConnector } from "rsocket-core";
import { TcpClientTransport } from "rsocket-tcp-client";
import { RSocket, RSocketConnector } from "@rsocket/core";
import { TcpClientTransport } from "@rsocket/tcp-client";
import { exit } from "process";

let serverCloseable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import {
RSocket,
RSocketConnector,
RSocketServer,
} from "rsocket-core";
import { TcpClientTransport } from "rsocket-tcp-client";
import { TcpServerTransport } from "rsocket-tcp-server";
} from "@rsocket/core";
import { TcpClientTransport } from "@rsocket/tcp-client";
import { TcpServerTransport } from "@rsocket/tcp-server";
import { exit } from "process";

let serverCloseable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import {
Payload,
RSocketConnector,
RSocketServer,
} from "rsocket-core";
} from "@rsocket/core";
import { exit } from "process";
import Logger from "../shared/logger";
import { TcpServerTransport } from "rsocket-tcp-server";
import { TcpClientTransport } from "rsocket-tcp-client";
import { TcpServerTransport } from "@rsocket/tcp-server";
import { TcpClientTransport } from "@rsocket/tcp-client";

function makeServer() {
return new RSocketServer({
Expand Down