feat: use utility for ns conversion

Author: neekolas

src/ApiClient.ts

@@ -1,6 +1,6 @@
 import { messageApi } from '@xmtp/proto'
 import { NotifyStreamEntityArrival } from '@xmtp/proto/ts/dist/types/fetch.pb'
-import { retry, sleep } from './utils'
+import { dateToNs, retry, sleep } from './utils'
 import Long from 'long'
 import AuthCache from './authn/AuthCache'
 import { Authenticator } from './authn'
@@ -48,7 +48,7 @@ export type SubscribeCallback = NotifyStreamEntityArrival<messageApi.Envelope>
 export type UnsubscribeFn = () => Promise<void>
 
 const toNanoString = (d: Date | undefined): undefined | string => {
-  return d && Long.fromNumber(d.valueOf()).multiply(1_000_000).toString()
+  return d && dateToNs(d).toString()
 }
 
 const isAbortError = (err?: Error): boolean => {

src/Invitation.ts

@@ -4,6 +4,7 @@ import { invitation } from '@xmtp/proto'
 import Ciphertext from './crypto/Ciphertext'
 import { decrypt, encrypt } from './crypto'
 import { PrivateKeyBundleV2 } from './crypto/PrivateKeyBundle'
+import { dateToNs } from './utils'
 
 /**
  * InvitationV1 is a protobuf message to be encrypted and used as the ciphertext in a SealedInvitationV1 message
@@ -184,7 +185,7 @@ export class SealedInvitation implements invitation.SealedInvitation {
     const headerBytes = new SealedInvitationHeaderV1({
       sender: sender.getPublicKeyBundle(),
       recipient,
-      createdNs: Long.fromNumber(created.valueOf()).multiply(1_000_000),
+      createdNs: dateToNs(created),
     }).toBytes()
 
     const secret = await sender.sharedSecret(

src/authn/AuthData.ts

@@ -1,5 +1,6 @@
 import { authn as authnProto } from '@xmtp/proto'
 import Long from 'long'
+import { dateToNs } from '../utils'
 
 export default class AuthData implements authnProto.AuthData {
   walletAddr: string
@@ -13,8 +14,8 @@ export default class AuthData implements authnProto.AuthData {
   static create(walletAddr: string, timestamp?: Date): AuthData {
     timestamp = timestamp || new Date()
     return new AuthData({
-      walletAddr: walletAddr,
-      createdNs: Long.fromNumber(timestamp.getTime()).multiply(1_000_000),
+      walletAddr,
+      createdNs: dateToNs(timestamp),
     })
   }
 

src/utils.ts

@@ -1,3 +1,5 @@
+import Long from 'long'
+
 export type IsRetryable = (err?: Error) => boolean
 
 export const buildContentTopic = (name: string): string =>
@@ -70,3 +72,7 @@ export async function retry<T extends (...arg0: any[]) => any>(
     return retry(fn, args, maxRetries, sleepTime, isRetryableFn, currRetry + 1)
   }
 }
+
+export function dateToNs(date: Date): Long {
+  return Long.fromNumber(date.valueOf()).multiply(1_000_000)
+}

test/ApiClient.test.ts

@@ -6,6 +6,7 @@ import { sleep } from './helpers'
 import { Authenticator } from '../src/authn'
 import { PrivateKey } from '../src'
 import { version } from '../package.json'
+import { dateToNs } from '../src/utils'
 const { MessageApi } = messageApi
 
 const PATH_PREFIX = 'http://fake:5050'
@@ -165,9 +166,7 @@ describe('Publish', () => {
         {
           message: msg.message,
           contentTopic: msg.contentTopic,
-          timestampNs: Long.fromNumber(now.valueOf())
-            .multiply(1_000_000)
-            .toString(),
+          timestampNs: dateToNs(now).toString(),
         },
       ],
     }