@mblaney/holster 2.0.2 → 2.1.1

package/ts/src/user.ts

@@ -6,37 +6,57 @@
 import * as utils from "./utils.ts"
 import Wire from "./wire.ts"
 import SEA from "./sea.ts"
-import type { UserIdentity, HolsterOptions, LexFilter, WireOptions } from "./schemas.ts"
-import type { HolsterAPI } from "./holster.ts"
+import type {
+  UserIdentity,
+  HolsterOptions,
+  LexFilter,
+  WireOptions,
+} from "./schemas.ts"
+import type {HolsterAPI} from "./holster.ts"
 
 type WireInterface = ReturnType<typeof Wire>
 
 export interface UserInterface {
   is?: UserIdentity | null
-  create: (username: string, password: string, cb?: (err?: string | null) => void) => void
-  auth: (username: string, password: string, cb?: (err?: string | null) => void) => void
+  create: (
+    username: string,
+    password: string,
+    cb?: (err?: string | null) => void,
+  ) => void
+  auth: (
+    username: string,
+    password: string,
+    cb?: (err?: string | null) => void,
+  ) => void
   change: (
     username: string,
     password: string,
     newPassword: string,
-    cb?: (err?: string | null) => void
+    cb?: (err?: string | null) => void,
   ) => void
   store: (localStorage?: boolean) => void
   recall: () => void
   leave: () => void
-  delete: (username: string, password: string, cb?: (err?: string | null) => void) => void
+  delete: (
+    username: string,
+    password: string,
+    cb?: (err?: string | null) => void,
+  ) => void
   get?(
     keys: string | string[],
     lex?: LexFilter | ((data: unknown) => void),
     cb?: ((data: unknown) => void) | WireOptions,
-    _opt?: WireOptions
+    _opt?: WireOptions,
   ): HolsterAPI
 }
 
 /**
  * Create User management interface
  */
-const User = (opt: HolsterOptions | undefined, wire?: WireInterface): UserInterface => {
+const User = (
+  opt: HolsterOptions | undefined,
+  wire?: WireInterface,
+): UserInterface => {
   if (!wire) wire = Wire(opt as HolsterOptions)
   let pubs: string[] = []
   let creating = false
@@ -47,7 +67,7 @@ const User = (opt: HolsterOptions | undefined, wire?: WireInterface): UserInterf
     username: string,
     password: string,
     newPassword: string,
-    ack: (err?: string | null) => void
+    ack: (err?: string | null) => void,
   ): void => {
     const retry = (username: string): void => {
       retries++
@@ -66,57 +86,61 @@ const User = (opt: HolsterOptions | undefined, wire?: WireInterface): UserInterf
       }
 
       const pub = pubs.shift()!
-      wire.get(
-        { "#": pub, ".": ["auth", "pub", "epub"] },
-        async msg => {
-          if (msg.err) {
-            done(`error getting ${pub}: ${msg.err}`)
-            return
-          }
+      wire.get({"#": pub, ".": ["auth", "pub", "epub"]}, async msg => {
+        if (msg.err) {
+          done(`error getting ${pub}: ${msg.err}`)
+          return
+        }
 
-          const data = msg.put && msg.put[pub]
-          if (!data || !data.auth) return next()
+        const data = msg.put && msg.put[pub]
+        if (!data || !data.auth) return next()
 
-          const authData = JSON.parse(data.auth as string) as {
-            enc: { ct: string; iv: string; s: string }
-            salt: string
-          }
-          const work = await SEA.work(password, authData.salt)
-          const dec = (await SEA.decrypt(authData.enc, work)) as
-            | { priv: string; epriv: string }
-            | null
-          if (!dec) return next()
-
-          user.is = {
-            username: username,
-            pub: data.pub as string,
-            epub: data.epub as string,
-            priv: dec.priv,
-            epriv: dec.epriv,
+        const authData = JSON.parse(data.auth as string) as {
+          enc: {ct: string; iv: string; s: string}
+          salt: string
+        }
+        const work = await SEA.work(password, authData.salt)
+        const dec = (await SEA.decrypt(authData.enc, work)) as {
+          priv: string
+          epriv: string
+        } | null
+        if (!dec) return next()
+
+        user.is = {
+          username: username,
+          pub: data.pub as string,
+          epub: data.epub as string,
+          priv: dec.priv,
+          epriv: dec.epriv,
+        }
+        if (newPassword !== "") {
+          const salt = utils.text.random(64)
+          const newWork = await SEA.work(newPassword, salt)
+          const enc = await SEA.encrypt(dec, newWork)
+          const update = {
+            auth: JSON.stringify({enc: enc, salt: salt}),
           }
-          if (newPassword !== "") {
-            const salt = utils.text.random(64)
-            const newWork = await SEA.work(newPassword, salt)
-            const enc = await SEA.encrypt(dec, newWork)
-            const update = {
-              auth: JSON.stringify({ enc: enc, salt: salt }),
+          const timestamp = Date.now()
+          const sig = await SEA.signTimestamp(timestamp, user.is)
+          const graph = utils.graph(
+            pub,
+            update,
+            sig!,
+            data.pub as string,
+            timestamp,
+          )
+          wire.put(graph, err => {
+            if (err) {
+              done(`error putting ${JSON.stringify(update)} on ${pub}: ${err}`)
+            } else {
+              done(null)
             }
-            const timestamp = Date.now()
-            const sig = await SEA.signTimestamp(timestamp, user.is)
-            const graph = utils.graph(pub, update, sig!, data.pub as string, timestamp)
-            wire.put(graph, err => {
-              if (err) {
-                done(`error putting ${JSON.stringify(update)} on ${pub}: ${err}`)
-              } else {
-                done(null)
-              }
-            })
-            return
-          }
+          })
+          return
+        }
 
-          done(null)
-        },
-      )
+        done(null)
+      })
     }
 
     if (retries > 9) {
@@ -125,22 +149,19 @@ const User = (opt: HolsterOptions | undefined, wire?: WireInterface): UserInterf
     }
 
     const soul = "~@" + username
-    wire.get(
-      { "#": soul },
-      async msg => {
-        if (msg.err) {
-          done(`error getting ${soul}: ${msg.err}`)
-          return
-        }
+    wire.get({"#": soul}, async msg => {
+      if (msg.err) {
+        done(`error getting ${soul}: ${msg.err}`)
+        return
+      }
 
-        const data = msg.put && msg.put[soul]
-        if (!data) return retry(username)
+      const data = msg.put && msg.put[soul]
+      if (!data) return retry(username)
 
-        delete (data as { _?: unknown })._
-        pubs = Object.keys(data)
-        next()
-      },
-    )
+      delete (data as {_?: unknown})._
+      pubs = Object.keys(data)
+      next()
+    })
   }
 
   const user: UserInterface = {
@@ -169,56 +190,53 @@ const User = (opt: HolsterOptions | undefined, wire?: WireInterface): UserInterf
       creating = true
 
       const soul = "~@" + username
-      wire.get(
-        { "#": soul },
-        async msg => {
-          if (msg.err) {
-            creating = false
-            ack(`error getting ${soul}: ${msg.err}`)
-            return
-          }
+      wire.get({"#": soul}, async msg => {
+        if (msg.err) {
+          creating = false
+          ack(`error getting ${soul}: ${msg.err}`)
+          return
+        }
 
-          if (msg.put && msg.put[soul]) {
-            creating = false
-            ack("Username already exists")
-            return
-          }
+        if (msg.put && msg.put[soul]) {
+          creating = false
+          ack("Username already exists")
+          return
+        }
 
-          const salt = utils.text.random(64)
-          const work = await SEA.work(password, salt)
-          const pair = await SEA.pair()
-          const priv = { priv: pair.priv, epriv: pair.epriv }
-          const enc = await SEA.encrypt(priv, work)
-          const data = {
-            username: username,
-            pub: pair.pub,
-            epub: pair.epub,
-            auth: JSON.stringify({ enc: enc, salt: salt }),
+        const salt = utils.text.random(64)
+        const work = await SEA.work(password, salt)
+        const pair = await SEA.pair()
+        const priv = {priv: pair.priv, epriv: pair.epriv}
+        const enc = await SEA.encrypt(priv, work)
+        const data = {
+          username: username,
+          pub: pair.pub,
+          epub: pair.epub,
+          auth: JSON.stringify({enc: enc, salt: salt}),
+        }
+
+        const pub = "~" + pair.pub
+        const timestamp = Date.now()
+        const sig = await SEA.signTimestamp(timestamp, pair)
+        const graph = utils.graph(pub, data, sig!, pair.pub, timestamp)
+        wire.put(graph, err => {
+          creating = false
+          if (err) {
+            ack(`error putting ${JSON.stringify(data)} on ${pub}: ${err}`)
+            return
           }
 
-          const pub = "~" + pair.pub
-          const timestamp = Date.now()
-          const sig = await SEA.signTimestamp(timestamp, pair)
-          const graph = utils.graph(pub, data, sig!, pair.pub, timestamp)
-          wire.put(graph, err => {
-            creating = false
+          const rel = {[pub]: {"#": pub}}
+          wire.put(utils.graph(soul, rel as never), err => {
             if (err) {
-              ack(`error putting ${JSON.stringify(data)} on ${pub}: ${err}`)
+              ack(`error putting ${JSON.stringify(rel)} on ${soul}: ${err}`)
               return
             }
 
-            const rel = { [pub]: { "#": pub } }
-            wire.put(utils.graph(soul, rel as never), err => {
-              if (err) {
-                ack(`error putting ${JSON.stringify(rel)} on ${soul}: ${err}`)
-                return
-              }
-
-              if (cb) cb(null)
-            })
+            if (cb) cb(null)
           })
-        },
-      )
+        })
+      })
     },
     auth: (username, password, cb) => {
       const ack = (err?: string | null): void => {
@@ -353,11 +371,17 @@ const User = (opt: HolsterOptions | undefined, wire?: WireInterface): UserInterf
           return
         }
 
-        const data = { username: null, pub: null, epub: null, auth: null }
+        const data = {username: null, pub: null, epub: null, auth: null}
         const timestamp = Date.now()
         const sig = await SEA.signTimestamp(timestamp, user.is!)
         const pub = "~" + user.is!.pub
-        const graph = utils.graph(pub, data as never, sig!, user.is!.pub, timestamp)
+        const graph = utils.graph(
+          pub,
+          data as never,
+          sig!,
+          user.is!.pub,
+          timestamp,
+        )
         wire.put(graph, err => {
           if (err) {
             ack(`error putting null on ${pub}: ${err}`)
@@ -374,4 +398,3 @@ const User = (opt: HolsterOptions | undefined, wire?: WireInterface): UserInterf
 }
 
 export default User
-

package/ts/src/utils.ts

@@ -3,7 +3,14 @@
  * Provides helpers for type checking, graph manipulation, and pattern matching
  */
 
-import type { Soul, Relation, Graph, GraphNode, LexFilter, GraphValue } from "./schemas.ts"
+import type {
+  Soul,
+  Relation,
+  Graph,
+  GraphNode,
+  LexFilter,
+  GraphValue,
+} from "./schemas.ts"
 
 // ============================================================================
 // Number Utilities
@@ -50,7 +57,7 @@ export const obj = {
   map: <T, R>(
     list: Record<string, T>,
     cb: (value: T, key: string, o?: Record<string, unknown>) => R | undefined,
-    o?: Record<string, unknown>
+    o?: Record<string, unknown>,
   ): R | undefined => {
     const keys = Object.keys(list)
     for (let i = 0; i < keys.length; i++) {
@@ -64,7 +71,11 @@ export const obj = {
   /**
    * Set a property on an object
    */
-  put: (o: Record<string, unknown> | undefined, key: string, value: unknown): Record<string, unknown> => {
+  put: (
+    o: Record<string, unknown> | undefined,
+    key: string,
+    value: unknown,
+  ): Record<string, unknown> => {
     const target = o || {}
     target[key] = value
     return target
@@ -73,7 +84,10 @@ export const obj = {
   /**
    * Delete a property from an object
    */
-  del: <T>(o: Record<string, T> | undefined, key: string): Record<string, T> | undefined => {
+  del: <T>(
+    o: Record<string, T> | undefined,
+    key: string,
+  ): Record<string, T> | undefined => {
     if (!o) return undefined
     o[key] = null as T
     delete o[key]
@@ -85,7 +99,11 @@ export const obj = {
 // Relation Utilities
 // ============================================================================
 
-const map_soul = (soul: unknown, key: string, o: { id: string | false }): void => {
+const map_soul = (
+  soul: unknown,
+  key: string,
+  o: {id: string | false},
+): void => {
   // If id is already defined AND we're still looping through the object,
   // then it is considered invalid
   if (o.id) {
@@ -115,8 +133,16 @@ export const rel = {
       !("_" in value) &&
       obj.is(value)
     ) {
-      const o: { id: string | false } = { id: "" }
-      obj.map(value as Record<string, unknown>, map_soul as (value: unknown, key: string, o?: Record<string, unknown>) => void, o)
+      const o: {id: string | false} = {id: ""}
+      obj.map(
+        value as Record<string, unknown>,
+        map_soul as (
+          value: unknown,
+          key: string,
+          o?: Record<string, unknown>,
+        ) => void,
+        o,
+      )
       if (o.id) return o.id
     }
     return false
@@ -147,12 +173,12 @@ export const graph = (
   data: Record<string, GraphValue>,
   sig?: string,
   pub?: string,
-  timestamp?: number
+  timestamp?: number,
 ): Graph => {
   const ts = timestamp || Date.now()
   const stateVector: Record<string, number> = {}
   const node: GraphNode = {
-    _: { "#": soul, ">": stateVector },
+    _: {"#": soul, ">": stateVector},
   }
 
   for (const [key, value] of Object.entries(data)) {
@@ -171,7 +197,7 @@ export const graph = (
     stateVector[userPublicKey] = timestamp
   }
 
-  return { [soul]: node }
+  return {[soul]: node}
 }
 
 // ============================================================================
@@ -229,4 +255,3 @@ export const text = {
     return s
   },
 }
-