validation: allow digits in NSID name (last segment)

bluesky-social/atproto-website#402
https://bsky.app/profile/bnewbold.net/post/3lk5euaqmic2o

Author: snarfed

README.md

@@ -228,7 +228,8 @@ Here's how to package, test, and ship a new release.
 * Schema validation:
   * Validate subscription (event stream websocket) parameters and output message payloads in both `Client` and `Server`.
   * When `truncate` is set, recurse into refs and arrays to truncate their string properties as necessary too.
-  * `Server`: raise `ValidationError` on unknown parameters.
+  * Allow digits in NSID name (last segment) ([background](https://github.com/bluesky-social/atproto-website/pull/402)).
+* `Server`: raise `ValidationError` on unknown parameters.
   * ~~Don't allow `#main` in `$type` ([bluesky-social/atproto#1968](https://github.com/bluesky-social/atproto/discussions/1968)).~~
   * Bug fix for open unions, allow types that aren't in `refs`.
 * `Client`:

lexrpc/base.py

@@ -75,7 +75,7 @@
 # https://atproto.com/specs/nsid
 NSID_SEGMENT = '[a-zA-Z0-9-]+'
 NSID_SEGMENT_RE = re.compile(f'^{NSID_SEGMENT}$')
-NSID_PATTERN = r'(?![0-9])((?!-)[a-z0-9-]{1,63}(?<!-)\.){2,}[a-zA-Z]{1,63}'
+NSID_PATTERN = r'(?![0-9])((?!-)[a-z0-9-]{1,63}(?<!-)\.){2,}[a-zA-Z][a-zA-Z0-9]{0,62}'
 NSID_RE = re.compile(f'^{NSID_PATTERN}$')
 
 # https://atproto.com/specs/lexicon#string-formats

lexrpc/tests/testdata/at-uri_syntax_valid.txt

@@ -32,3 +32,4 @@ at://did:abc:123/io.nsid.someFunc/-
 at://did:abc:123/io.nsid.someFunc/_
 at://did:abc:123/io.nsid.someFunc/~
 at://did:abc:123/io.nsid.someFunc/...
+at://did:plc:asdf123/com.atproto.feed.postV2

lexrpc/tests/testdata/nsid_syntax_invalid.txt

@@ -3,15 +3,13 @@ com.oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo.foo
 com.example.oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
 com.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.foo
 
-# invliad examples
+# invalid examples
 com.example.foo.*
 com.example.foo.blah*
 com.example.foo.*blah
-com.example.f00
 com.exa💩ple.thing
 a-0.b-1.c-3
 a-0.b-1.c-o
-a0.b1.c3
 1.0.0.127.record
 0two.example.foo
 example.com
@@ -29,4 +27,4 @@ com.atproto.feed.p*st
 com.atproto.feed.po#t
 com.atproto.feed.p!ot
 com.example-.foo
-
+com.example.fooBar.2

lexrpc/tests/testdata/nsid_syntax_valid.txt

@@ -5,6 +5,7 @@ com.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle.middle
 
 # valid examples
 com.example.fooBar
+com.example.fooBarV2
 net.users.bob.ping
 a.b.c
 m.xn--masekowski-d0b.pl
@@ -18,6 +19,8 @@ test.12345.record
 a01.thing.record
 a.0.c
 xn--fiqs8s.xn--fiqa61au8b7zsevnm8ak20mc4a87e.record.two
+a0.b1.c3
+com.example.f00
 
 # allows onion (Tor) NSIDs
 onion.expyuzz4wqqyqhjn.spec.getThing