Release

.docker/docker-compose.yml

@@ -54,7 +54,8 @@ services:
   minio-setup:
     image: minio/mc
     depends_on:
-      - minio
+      minio:
+        condition: service_healthy
     environment:
       MINIO_ROOT_USER: minioadmin
       MINIO_ROOT_PASSWORD: minioadmin
@@ -77,8 +78,11 @@ services:
 
   account:
     image: ghcr.io/pretendonetwork/account:sha-99aec60
+    restart: unless-stopped
     ports:
       - "8123:8123" # grpc
+    links:
+      - mongo
     environment:
       PN_ACT_CONFIG_REDIS_URL: redis://redis:6379
       PN_ACT_CONFIG_HTTP_PORT: 8000
@@ -96,6 +100,7 @@ services:
 
   friends:
     image: ghcr.io/pretendonetwork/friends:sha-5560c1d
+    restart: unless-stopped
     ports:
       - "8124:8124" # grpc
     environment:

.docker/hybrid-account.py

@@ -0,0 +1,53 @@
+from urllib.parse import parse_qsl
+from base64 import b64decode, b64encode
+from hashlib import sha256
+import bcrypt
+import json
+
+request = input("NASC request blob:")
+
+parts = parse_qsl(request)
+
+def decode_base64(enc: str):
+    enc = enc.replace('.', '+').replace('-', '/').replace('*', '=')
+    return b64decode(enc)
+parts = dict(((key, decode_base64(val)) for key, val in parts))
+
+pid = int(parts['userid'].decode('ascii'))
+fcdcert_hash = sha256(parts['fcdcert']).digest()
+
+print("OK.")
+password = input(f"NEX Password for {pid}:")
+fc = input("FC (XXXX-XXXX-XXXX):")
+pnidpid = int(input("PNID PID:"))
+pnidpassword = input("PNID password:")
+
+def nintendo_password(password: str, pid: int):
+    buf = pid.to_bytes(4, 'little')
+    buf += b'\x02\x65\x43\x46'
+    buf += password.encode('ascii')
+    return sha256(buf).digest().hex()
+
+print(json.dumps({
+    'device_type': '3ds',
+    'access_level': 0,
+    'server_access_level': "prod",
+    'pid': pid,
+    'password': password,
+    'friend_code': fc,
+}))
+
+print(json.dumps({
+    'model': "ctr",
+    'serial': parts['csnum'].decode('ascii'),
+    'access_level': 0,
+    'server_access_level': 'prod',
+    'certificate_hash': b64encode(fcdcert_hash).decode('ascii'),
+    'fcdcert_hash': b64encode(fcdcert_hash).decode('ascii'),
+    'device_attributes': [],
+}))
+
+pwhash = nintendo_password(pnidpassword, pnidpid)
+bpwsalt = bcrypt.gensalt(10)
+bpwhash = bcrypt.hashpw(pwhash.encode('ascii'), bpwsalt)
+print(f"{pnidpid}: {bpwhash.decode('ascii')}")

.docker/hyrbid-accounts.md

@@ -0,0 +1,24 @@
+For 3DS testing, "hybrid accounts" are often needed. This is where the same account information is accepted on both
+prod and local servers. If you see 002-0102 on the proxy, this is likely the issue.
+
+You need:
+- Any NASC request blob (copy this from mitmproxy). Starts with "gameid="...
+- Your NEX password (https://9net.org/~stary/get_3ds_pid_password.3dsx)
+- Your 3DS friend code (you can click past the ban message to see this)
+- The PID for your linked PNID (https://pnidlt.gab.net.eu.org/)
+- The password for your linked PNID
+
+First, register a PNID with the same username as your linked PNID. The password will be overwritten later.
+```shell
+# REGISTER
+https_proxy=http://localhost:8888 curl -k -v -X POST -H "Content-Type: application/json" --data '{"email":"ash@heyquark.com", "username":"PN_quarky", "mii_name":"Luca", "password":"letm3in", "password_confirm":"letm3in"}'  https://api.pretendo.cc/v1/register/
+```
+
+Then, run `hybrid-account.py` and provide the information it asks for. It will give:
+- A `nexaccounts` record (JSON, `device_type`, `access_level`...)
+- A `devices` record (JSON, `model`, `serial`...)
+- The PNID PID and hashed password
+
+Your best bet is to insert these into the database using MongoDB Compass. Connect to `localhost` then in `account/nexaccounts`, Add Data->Insert Document, paste the output from the script. Same for `account/devices`.
+
+Locate your newly-registered PNID in `account/pnids` and overwrite the `pid` and `password` fields with the values provided by the script.

.docker/mitmproxy-local.py

@@ -26,6 +26,7 @@
 
 s3_domains = [
     "cdn.pretendo.cc",
+    "r2-cdn.pretendo.cc"
 ]
 
 def request(flow: http.HTTPFlow):

apps/juxtaposition-ui/.dockerignore → .dockerignore

@@ -1,5 +1,4 @@
-.git
 node_modules
+.git
 config.json
-certs
-src/logs
+logs/

.github/workflows/docker.yml

@@ -57,7 +57,8 @@ jobs:
         id: build-and-push
         uses: docker/build-push-action@v6
         with:
-          context: ./apps/${{ matrix.repo }}/
+          context: ./
+          file: ${{ matrix.repo }}.Dockerfile
           platforms: linux/amd64
           push: ${{ env.SHOULD_PUSH_IMAGE }}
           tags: ${{ steps.meta.outputs.tags }}
@@ -108,7 +109,8 @@ jobs:
         id: build-and-push
         uses: docker/build-push-action@v6
         with:
-          context: ./apps/${{ matrix.repo }}/
+          context: ./
+          file: ${{ matrix.repo }}.Dockerfile
           platforms: linux/arm64
           push: ${{ env.SHOULD_PUSH_IMAGE }}
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/lint.yml

@@ -21,7 +21,6 @@ jobs:
 
       - name: Install dependencies
         run: npm ci
-        working-directory: ./apps/${{ matrix.repo }}
 
       - name: Lint
         run: npm run lint

.gitignore

@@ -1,8 +1,7 @@
-node_modules
+node_modules/
 .env
-certs
-logs
-dist
+logs/
+dist/
 newman
 config.json
-uploads
+uploads/

.vscode/settings.json

@@ -12,6 +12,16 @@
     "[typescript]": {
         "editor.defaultFormatter": "dbaeumer.vscode-eslint"
     },
+    "[xml]": {
+        "editor.defaultFormatter": "redhat.vscode-xml"
+    },
+    "[html]": {
+        "editor.defaultFormatter": "vscode.html-language-features"
+    },
+    "html.format.unformatted": "%,%_,%=,%-,%#,%%,-%,_%,a,abbr,area,audio,b,bdi,bdo,br,button,canvas,cite,code,data,datalist,del,dfn,em,embed,i,iframe,img,input,ins,kbd,label,link,map,mark,math,meta,meter,noscript,object,output,picture,progress,q,ruby,s,samp,script,select,slot,small,span,strong,sub,sup,svg,template,textarea,time,u,var,video,wbr",
+    "emmet.includeLanguages": {
+        "ejs": "html",
+    },
     "javascript.preferences.importModuleSpecifier": "non-relative",
     "typescript.preferences.importModuleSpecifier": "non-relative",
 }

apps/juxtaposition-ui/nodemon.json

@@ -0,0 +1,9 @@
+{
+  "watch": [
+    "src/"
+  ],
+  "ext": "js,ts,ejs,json,css",
+  "env": {
+    "NODE_ENV": "development"
+  }
+}