nappup 1.0.8 → 1.0.9

package/package.json

@@ -6,7 +6,7 @@
     "url": "git+https://github.com/44billion/nappup.git"
   },
   "license": "GPL-3.0-or-later",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Nostr App Uploader",
   "type": "module",
   "scripts": {

package/src/helpers/nip19.js

@@ -3,41 +3,50 @@ import { bytesToBase62, base62ToBytes, ALPHABET as base62Alphabet } from '#helpe
 import { isNostrAppDTagSafe } from '#helpers/app.js'
 
 const MAX_SIZE = 5000
-export const BASE62_ENTITY_REGEX = new RegExp(`^app-[${base62Alphabet}]{,${MAX_SIZE}}$`)
-export const kindByChannel = {
+export const BASE62_ENTITY_REGEX = new RegExp(`^\\+{1,3}[${base62Alphabet}]{,${MAX_SIZE}}$`)
+const textEncoder = new TextEncoder()
+const textDecoder = new TextDecoder()
+
+const kindByChannel = {
   main: 37448,
   next: 37449,
   draft: 37450
 }
-const channelEnum = Object.keys(kindByChannel)
-const textEncoder = new TextEncoder()
-const textDecoder = new TextDecoder()
-
+const channelByKind = Object.fromEntries(
+  Object.entries(kindByChannel).map(([k, v]) => [v, k])
+)
+const prefixByChannel = {
+  main: '+',
+  next: '++',
+  draft: '+++'
+}
+const channelByPrefix = Object.fromEntries(
+  Object.entries(prefixByChannel).map(([k, v]) => [v, k])
+)
 export function appEncode (ref) {
   if (!isNostrAppDTagSafe(ref.dTag)) { throw new Error('Invalid deduplication tag') }
-  const channelIndex = Object.entries(kindByChannel)
-    .findIndex(([k, v]) => ref.channel ? k === ref.channel : v === ref.kind)
-  if (channelIndex === -1) throw new Error('Wrong channel')
+  const channel = ref.channel ? (prefixByChannel[ref.channel] && ref.channel) : channelByKind[ref.kind]
+  if (!channel) throw new Error('Wrong channel')
   const tlv = toTlv([
     [textEncoder.encode(ref.dTag)], // type 0 (the array index)
     (ref.relays || []).map(url => textEncoder.encode(url)), // type 1
-    [base16ToBytes(ref.pubkey)], // type 2
-    [uintToBytes(channelIndex)] // type 3
+    [base16ToBytes(ref.pubkey)] // type 2
   ])
   const base62 = bytesToBase62(tlv)
-  return `app-${base62}`
+  const prefix = prefixByChannel[channel]
+  return `${prefix}${base62}`
 }
 
 export function appDecode (entity) {
-  const [, base62] = entity.split('-')
+  const prefix = entity.match(/^\+*/)[0]
+  const channel = channelByPrefix[prefix]
+  if (!channel) throw new Error('Invalid channel')
+  const base62 = entity.slice(prefix.length)
   const tlv = tlvToObj(base62ToBytes(base62))
   if (!tlv[0]?.[0]) throw new Error('Missing deduplication tag')
   if (!tlv[2]?.[0]) throw new Error('Missing author pubkey')
   if (tlv[2][0].length !== 32) throw new Error('Author pubkey should be 32 bytes')
-  if (!tlv[3]?.[0]) throw new Error('Missing channel enum')
-  if (tlv[3][0].length !== 1) throw new Error('Channel enum should be 1 byte')
 
-  const channel = channelEnum[parseInt(tlv[3][0])]
   return {
     dTag: textDecoder.decode(tlv[0][0]),
     pubkey: bytesToBase16(tlv[2][0]),
@@ -47,12 +56,6 @@ export function appDecode (entity) {
   }
 }
 
-// Return shortest uint8Array size (not fixed size)
-function uintToBytes (n, bytes = []) {
-  do { bytes.unshift(n & 255) } while ((n >>= 8) > 0)
-  return new Uint8Array(bytes)
-}
-
 function toTlv (tlvConfig) {
   const arrays = []
   tlvConfig

package/src/services/nostr-relays.js

@@ -44,7 +44,7 @@ export class NostrRelays {
   async disconnect (url) {
     if (this.#relays.has(url)) {
       const relay = this.#relays.get(url)
-      if (relay.ws.readyState < 2) await relay.close().catch(console.log)
+      if (relay.ws.readyState < 2) await relay.close()?.catch(console.log)
       this.#relays.delete(url)
       clearTimeout(this.#relayTimeouts.get(url))
       this.#relayTimeouts.delete(url)