Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@ import { OpenSearchQueryBuilderOperatorFeature } from "@webiny/api-opensearch/fe
import { OpenSearchFieldFeature } from "@webiny/api-opensearch/features/OpenSearchField/feature.js";
import { OpenSearchIndexFeature } from "@webiny/api-opensearch/features/OpenSearchIndex/feature.js";

export type CreateAwsDdbOsApiHandlerConfig = Pick<
BaseConfig,
"extensions" | "documentClient" | "dbTable"
> & {
export type CreateAwsDdbOsApiHandlerConfig = Pick<BaseConfig, "extensions" | "documentClient"> & {
/**
* OpenSearch client. Defaults to one built from `OPENSEARCH_*` env vars. Injectable so
* integration tests can point the handler at a local OpenSearch.
Expand Down Expand Up @@ -59,7 +56,6 @@ export function createAwsDdbOsApiHandler(config: CreateAwsDdbOsApiHandlerConfig)
return createBaseHandler({
extensions: config.extensions,
documentClient: config.documentClient,
dbTable: config.dbTable,
registerRootStorage: (container, { documentClient }) => {
// ── OpenSearch core (client + query-builder operators + fields + index registries) ──
// The DDB+ES CMS storage factory resolves all of these.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ import { AuditLogsDdbFeature } from "@webiny/api-audit-logs-ddb";
import { AcoDdbFeature } from "@webiny/api-aco-ddb";
import { WebsocketsDdbFeature } from "@webiny/api-websockets-ddb";

export type CreateAwsDdbApiHandlerConfig = Pick<
BaseConfig,
"extensions" | "documentClient" | "dbTable"
>;
export type CreateAwsDdbApiHandlerConfig = Pick<BaseConfig, "extensions" | "documentClient">;

export function createAwsDdbApiHandler(config: CreateAwsDdbApiHandlerConfig) {
return createBaseHandler({
Expand Down
4 changes: 0 additions & 4 deletions packages/api-event-handler-aws/src/createWebinyApiHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ export interface CreateWebinyApiHandlerConfig {
* Injectable so integration tests can point the handler at a local (dynalite) DynamoDB.
*/
documentClient?: ReturnType<typeof getDocumentClient>;
/**
* DynamoDB table name. Defaults to `process.env.DB_TABLE`. Injectable for tests.
*/
dbTable?: string;
/**
* Register the storage-variant features in the ROOT container: the CMS storage operations, the
* DDB storage registries, and (for the OpenSearch variant) the OpenSearch core. Supplied by the
Expand Down
1 change: 0 additions & 1 deletion packages/api-websockets-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"@webiny/api": "0.0.0",
"@webiny/api-websockets": "0.0.0",
"@webiny/feature": "0.0.0",
"@webiny/handler": "0.0.0",
"@webiny/plugins": "0.0.0",
"@webiny/utils": "0.0.0",
"ws": "^8.21.0",
Expand Down
17 changes: 0 additions & 17 deletions packages/api-websockets-server/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
import { createRegisterExtensionPlugin } from "@webiny/handler";
import { ServerWebsocketsTransport } from "~/transport/ServerWebsocketsTransport.js";
import { NodeWsAdapter } from "~/adapter/NodeWsAdapter.js";
import { DefaultUpgradeHandler } from "~/upgradeHandler/DefaultUpgradeHandler.js";
import { ServerConnectionManager } from "~/connectionManager/ServerConnectionManager.js";

export { createWebsocketsServer, attachWebsocketsServer } from "~/server/WebsocketsServer.js";
export type { IWebsocketsServer } from "~/server/types.js";
export * from "~/adapter/abstractions.js";
Expand All @@ -15,14 +9,3 @@ export * from "~/connectionManager/abstractions.js";
export { ServerConnectionManager } from "~/connectionManager/ServerConnectionManager.js";
export { NodeWsAdapter } from "~/adapter/NodeWsAdapter.js";
export { ServerWebsocketsTransport } from "~/transport/ServerWebsocketsTransport.js";

export const createServerWebsockets = () => {
const plugin = createRegisterExtensionPlugin(context => {
context.container.register(ServerWebsocketsTransport).inSingletonScope();
context.container.register(NodeWsAdapter).inSingletonScope();
context.container.register(DefaultUpgradeHandler).inSingletonScope();
context.container.register(ServerConnectionManager).inSingletonScope();
});
plugin.name = "websockets.server.transport";
return [plugin];
};
3 changes: 0 additions & 3 deletions packages/api-websockets-server/tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
{ "path": "../api/tsconfig.build.json" },
{ "path": "../api-websockets/tsconfig.build.json" },
{ "path": "../feature/tsconfig.build.json" },
{ "path": "../handler/tsconfig.build.json" },
{ "path": "../plugins/tsconfig.build.json" },
{ "path": "../utils/tsconfig.build.json" }
],
Expand All @@ -22,8 +21,6 @@
"@webiny/api-websockets": ["../api-websockets/src"],
"@webiny/feature/*": ["../feature/src/*"],
"@webiny/feature": ["../feature/src"],
"@webiny/handler/*": ["../handler/src/*"],
"@webiny/handler": ["../handler/src"],
"@webiny/plugins/*": ["../plugins/src/*"],
"@webiny/plugins": ["../plugins/src"],
"@webiny/utils/*": ["../utils/src/*"],
Expand Down
3 changes: 0 additions & 3 deletions packages/api-websockets-server/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
{ "path": "../api" },
{ "path": "../api-websockets" },
{ "path": "../feature" },
{ "path": "../handler" },
{ "path": "../plugins" },
{ "path": "../utils" }
],
Expand All @@ -22,8 +21,6 @@
"@webiny/api-websockets": ["../api-websockets/src"],
"@webiny/feature/*": ["../feature/src/*"],
"@webiny/feature": ["../feature/src"],
"@webiny/handler/*": ["../handler/src/*"],
"@webiny/handler": ["../handler/src"],
"@webiny/plugins/*": ["../plugins/src/*"],
"@webiny/plugins": ["../plugins/src"],
"@webiny/utils/*": ["../utils/src/*"],
Expand Down
1 change: 0 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11603,7 +11603,6 @@ __metadata:
"@webiny/api-websockets": "npm:0.0.0"
"@webiny/build-tools": "npm:0.0.0"
"@webiny/feature": "npm:0.0.0"
"@webiny/handler": "npm:0.0.0"
"@webiny/plugins": "npm:0.0.0"
"@webiny/project-utils": "npm:0.0.0"
"@webiny/utils": "npm:0.0.0"
Expand Down
Loading