Merge pull request #236 from xmtp/break-up-utils

src/Message.ts

@@ -18,7 +18,7 @@ import {
   ContentTypeId,
   EncodedContent,
 } from './MessageContent'
-import { nsToDate } from './utils'
+import { nsToDate } from './utils/date'
 
 const headerBytesAndCiphertext = (
   msg: proto.Message

src/authn/AuthData.ts

@@ -1,6 +1,6 @@
 import { authn as authnProto } from '@xmtp/proto'
 import Long from 'long'
-import { dateToNs } from '../utils'
+import { dateToNs } from '../utils/date'
 
 export default class AuthData implements authnProto.AuthData {
   walletAddr: string

src/conversations/Conversation.ts

@@ -1,4 +1,9 @@
-import { buildUserIntroTopic } from './../utils'
+import {
+  buildUserIntroTopic,
+  buildDirectMessageTopic,
+  dateToNs,
+  nsToDate,
+} from '../utils'
 import { DecodedMessage } from './../Message'
 import Stream from '../Stream'
 import Client, {
@@ -22,7 +27,6 @@ import {
 } from '../crypto'
 import Ciphertext from '../crypto/Ciphertext'
 import { sha256 } from '../crypto/encryption'
-import { buildDirectMessageTopic, dateToNs, nsToDate } from '../utils'
 import { ContentTypeText } from '../codecs/Text'
 const { b64Decode } = fetcher
 

src/store/PrivateTopicStore.ts

@@ -1,6 +1,6 @@
 import { messageApi, fetcher } from '@xmtp/proto'
 import { Store } from './Store'
-import { buildUserPrivateStoreTopic } from '../utils'
+import { buildUserPrivateStoreTopic } from '../utils/topic'
 import ApiClient from '../ApiClient'
 import { Authenticator } from '../authn'
 const b64Decode = fetcher.b64Decode

src/utils.ts → src/utils/async.ts

@@ -1,39 +1,7 @@
 import { messageApi } from '@xmtp/proto'
-import Long from 'long'
 
 export type IsRetryable = (err?: Error) => boolean
 
-export const buildContentTopic = (name: string): string =>
-  `/xmtp/0/${name}/proto`
-
-export const buildDirectMessageTopic = (
-  sender: string,
-  recipient: string
-): string => {
-  const members = [sender, recipient]
-  members.sort()
-  return buildContentTopic(`dm-${members.join('-')}`)
-}
-
-export const buildDirectMessageTopicV2 = (randomString: string): string => {
-  return buildContentTopic(`m-${randomString}`)
-}
-
-export const buildUserContactTopic = (walletAddr: string): string => {
-  return buildContentTopic(`contact-${walletAddr}`)
-}
-
-export const buildUserIntroTopic = (walletAddr: string): string => {
-  return buildContentTopic(`intro-${walletAddr}`)
-}
-
-export const buildUserInviteTopic = (walletAddr: string): string => {
-  return buildContentTopic(`invite-${walletAddr}`)
-}
-export const buildUserPrivateStoreTopic = (walletAddr: string): string => {
-  return buildContentTopic(`privatestore-${walletAddr}`)
-}
-
 export const sleep = (ms: number): Promise<void> =>
   new Promise((resolve) => setTimeout(resolve, ms))
 
@@ -106,22 +74,3 @@ export async function* mapPaginatedStream<Out>(
     yield out
   }
 }
-
-export function dateToNs(date: Date): Long {
-  return Long.fromNumber(date.valueOf()).multiply(1_000_000)
-}
-
-export function nsToDate(ns: Long): Date {
-  return new Date(ns.divide(1_000_000).toNumber())
-}
-
-export const toNanoString = (d: Date | undefined): undefined | string => {
-  return d && dateToNs(d).toString()
-}
-
-export const fromNanoString = (s: string | undefined): undefined | Date => {
-  if (!s) {
-    return undefined
-  }
-  return nsToDate(Long.fromString(s))
-}

src/utils/date.ts

@@ -0,0 +1,20 @@
+import Long from 'long'
+
+export function dateToNs(date: Date): Long {
+  return Long.fromNumber(date.valueOf()).multiply(1_000_000)
+}
+
+export function nsToDate(ns: Long): Date {
+  return new Date(ns.divide(1_000_000).toNumber())
+}
+
+export const toNanoString = (d: Date | undefined): undefined | string => {
+  return d && dateToNs(d).toString()
+}
+
+export const fromNanoString = (s: string | undefined): undefined | Date => {
+  if (!s) {
+    return undefined
+  }
+  return nsToDate(Long.fromString(s))
+}

src/utils/index.ts

@@ -0,0 +1,3 @@
+export * from './topic'
+export * from './async'
+export * from './date'

src/utils/topic.ts

@@ -0,0 +1,30 @@
+export const buildContentTopic = (name: string): string =>
+  `/xmtp/0/${name}/proto`
+
+export const buildDirectMessageTopic = (
+  sender: string,
+  recipient: string
+): string => {
+  const members = [sender, recipient]
+  members.sort()
+  return buildContentTopic(`dm-${members.join('-')}`)
+}
+
+export const buildDirectMessageTopicV2 = (randomString: string): string => {
+  return buildContentTopic(`m-${randomString}`)
+}
+
+export const buildUserContactTopic = (walletAddr: string): string => {
+  return buildContentTopic(`contact-${walletAddr}`)
+}
+
+export const buildUserIntroTopic = (walletAddr: string): string => {
+  return buildContentTopic(`intro-${walletAddr}`)
+}
+
+export const buildUserInviteTopic = (walletAddr: string): string => {
+  return buildContentTopic(`invite-${walletAddr}`)
+}
+export const buildUserPrivateStoreTopic = (walletAddr: string): string => {
+  return buildContentTopic(`privatestore-${walletAddr}`)
+}