refactor: move reponse utils to common

CodyTseng · Sep 9, 2024 · 3778e90 · 3778e90
1 parent 69063b6
commit 3778e90
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/packages/common/src/utils/index.ts b/packages/common/src/utils/index.ts
@@ -2,6 +2,7 @@ export * from './crypto.util';
 export * from './event.util';
 export * from './filter.util';
 export * from './proof-of-work.util';
+export * from './response.util';
 export * from './rxjs.util';
 export * from './shared.util';
 export * from './time.util';
diff --git a/packages/core/src/utils/response.ts → packages/common/src/utils/response.util.ts b/packages/core/src/utils/response.ts → packages/common/src/utils/response.util.ts
@@ -1,14 +1,14 @@
+import { MessageType } from '../constants';
 import {
   Event,
-  MessageType,
   OutgoingAuthMessage,
   OutgoingClosedMessage,
   OutgoingEoseMessage,
   OutgoingEventMessage,
   OutgoingNoticeMessage,
   OutgoingOkMessage,
   SubscriptionId,
-} from '@nostr-relay/common';
+} from '../interfaces';
 
 /**
  * Create an outgoing OK message.

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -1,2 +1 @@
 export * from './nostr-relay';
-export * from './utils/response';
diff --git a/packages/core/src/nostr-relay.ts b/packages/core/src/nostr-relay.ts
@@ -21,19 +21,17 @@ import {
   NostrRelayPlugin,
   SubscriptionId,
   UnauthenticatedError,
-} from '@nostr-relay/common';
-import { EventService } from './services/event.service';
-import { PluginManagerService } from './services/plugin-manager.service';
-import { SubscriptionService } from './services/subscription.service';
-import {
-  LazyCache,
   createOutgoingAuthMessage,
   createOutgoingClosedMessage,
   createOutgoingEoseMessage,
   createOutgoingEventMessage,
   createOutgoingNoticeMessage,
   createOutgoingOkMessage,
-} from './utils';
+} from '@nostr-relay/common';
+import { EventService } from './services/event.service';
+import { PluginManagerService } from './services/plugin-manager.service';
+import { SubscriptionService } from './services/subscription.service';
+import { LazyCache } from './utils';
 
 export class NostrRelay {
   private readonly options: NostrRelayOptions;

diff --git a/packages/core/src/services/subscription.service.ts b/packages/core/src/services/subscription.service.ts
@@ -5,8 +5,8 @@ import {
   EventUtils,
   Filter,
   Logger,
+  createOutgoingEventMessage,
 } from '@nostr-relay/common';
-import { createOutgoingEventMessage } from '../utils';
 
 export class SubscriptionService {
   constructor(

diff --git a/packages/core/src/utils/index.ts b/packages/core/src/utils/index.ts
@@ -1,2 +1 @@
 export * from './lazy-cache';
-export * from './response';
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		export * from './nostr-relay';
		export * from './utils/response';
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		export * from './lazy-cache';
		export * from './response';