From 11142caddfe35646dca14f8c4e0d2dcb97b1e90d Mon Sep 17 00:00:00 2001 From: bymyself Date: Wed, 2 Sep 2026 17:59:46 -0700 Subject: [PATCH 01/28] poc(site): consume account layer in client-only island --- site/.env.poc.example | 7 + site/package.json | 2 + site/pnpm-lock.yaml | 675 +++++++++++++++++- .../components/account/AccountLayerIsland.vue | 97 +++ .../src/components/account/CoreSsrProbe.astro | 5 + .../account/accountHostAdapter.test.ts | 15 + .../components/account/accountHostAdapter.ts | 140 ++++ site/src/pages/poc/account-layer.astro | 15 + site/tests/poc/accountLayer.qa.spec.ts | 103 +++ 9 files changed, 1057 insertions(+), 2 deletions(-) create mode 100644 site/.env.poc.example create mode 100644 site/src/components/account/AccountLayerIsland.vue create mode 100644 site/src/components/account/CoreSsrProbe.astro create mode 100644 site/src/components/account/accountHostAdapter.test.ts create mode 100644 site/src/components/account/accountHostAdapter.ts create mode 100644 site/src/pages/poc/account-layer.astro create mode 100644 site/tests/poc/accountLayer.qa.spec.ts diff --git a/site/.env.poc.example b/site/.env.poc.example new file mode 100644 index 000000000..108b416af --- /dev/null +++ b/site/.env.poc.example @@ -0,0 +1,7 @@ +PUBLIC_ACCOUNT_LAYER_POC= +PUBLIC_FIREBASE_API_KEY= +PUBLIC_FIREBASE_AUTH_DOMAIN= +PUBLIC_FIREBASE_PROJECT_ID= +PUBLIC_FIREBASE_APP_ID= +PUBLIC_API_BASE_URL= +PUBLIC_CLOUD_BASE_URL= diff --git a/site/package.json b/site/package.json index 029360131..99e9b35be 100644 --- a/site/package.json +++ b/site/package.json @@ -75,6 +75,7 @@ "@astrojs/sitemap": "^3.3.1", "@astrojs/vercel": "^9.0.4", "@astrojs/vue": "^5.1.4", + "@comfyorg/account": "file:../../../.concept-poc/account-layer-refactor/07-poc/comfyorg-account-0.0.0-poc.tgz", "@comfyorg/sdk": "^0.1.7", "@resvg/resvg-js": "^2.6.2", "@tailwindcss/vite": "^4.1.18", @@ -88,6 +89,7 @@ "clsx": "^2.1.1", "embla-carousel-autoplay": "^8.6.0", "embla-carousel-vue": "^8.6.0", + "firebase": "^12.18.0", "lucide-vue-next": "^0.575.0", "minisearch": "^7.2.0", "openai": "^4.0.0", diff --git a/site/pnpm-lock.yaml b/site/pnpm-lock.yaml index 4b86fedc5..3874762e2 100644 --- a/site/pnpm-lock.yaml +++ b/site/pnpm-lock.yaml @@ -20,6 +20,9 @@ importers: '@astrojs/vue': specifier: ^5.1.4 version: 5.1.4(@types/node@20.19.31)(astro@5.17.1(@types/node@20.19.31)(@vercel/functions@2.2.13)(jiti@2.6.1)(lightningcss@1.30.2)(rollup@4.57.1)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2))(jiti@2.6.1)(lightningcss@1.30.2)(rollup@4.57.1)(tsx@4.21.0)(vue@3.5.29(typescript@5.9.3))(yaml@2.8.2) + '@comfyorg/account': + specifier: file:../../../.concept-poc/account-layer-refactor/07-poc/comfyorg-account-0.0.0-poc.tgz + version: file:../../../.concept-poc/account-layer-refactor/07-poc/comfyorg-account-0.0.0-poc.tgz(vue@3.5.29(typescript@5.9.3)) '@comfyorg/sdk': specifier: ^0.1.7 version: 0.1.7 @@ -59,6 +62,9 @@ importers: embla-carousel-vue: specifier: ^8.6.0 version: 8.6.0(vue@3.5.29(typescript@5.9.3)) + firebase: + specifier: ^12.18.0 + version: 12.18.0 lucide-vue-next: specifier: ^0.575.0 version: 0.575.0(vue@3.5.29(typescript@5.9.3)) @@ -436,6 +442,15 @@ packages: resolution: {integrity: sha512-VERIM64vtTP1C4mxQ5thVT9fK0apjPFobqybMtA1UdUujWka24ERHbRHFGmpbbhp73MhV+KSsHQH9C6uOTdEQA==} engines: {node: '>=18'} + '@comfyorg/account@file:../../../.concept-poc/account-layer-refactor/07-poc/comfyorg-account-0.0.0-poc.tgz': + resolution: {integrity: sha512-i9PMecE0rzX9PuexXjut7QqN3iYg80YxCfnuDGPROt8AP6BFq5jXdi6vVPrDkSMFWy0kvpXUOnNOR7KWFOLLjg==, tarball: file:../../../.concept-poc/account-layer-refactor/07-poc/comfyorg-account-0.0.0-poc.tgz} + version: 0.0.0-poc + peerDependencies: + vue: '>=3.5 <4' + peerDependenciesMeta: + vue: + optional: true + '@comfyorg/sdk@0.1.7': resolution: {integrity: sha512-B7Lg/XikehfgeilgaWaAdZ/wFKWk3M7GnsZDWodpus2G4xtaRvOiEJ6TDeagzOb/BYOTG+wBV9Q/CeRLIVrZ5Q==} engines: {node: '>=22'} @@ -820,6 +835,234 @@ packages: resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@firebase/ai@2.15.0': + resolution: {integrity: sha512-Aj7TbFdAIWZdkX8JfdDStERpR35g6WNs+7XhNPtFLFOizUotj6k4N/D8HJkR45165HhnMJBe4hjOeeaxnnn56Q==} + engines: {node: '>=20.0.0'} + peerDependencies: + '@firebase/app': 0.x + '@firebase/app-types': 0.x + + '@firebase/analytics-compat@0.2.30': + resolution: {integrity: sha512-uVZEKlLaW4AHAhv8zoN9cTmveX6v86AVqcJ4LCaRCMTChTH8/NsjbisTq1lpBfWCLWS1spqwSHB4vol/YSCdMA==} + peerDependencies: + '@firebase/app': 0.x + '@firebase/app-compat': 0.x + + '@firebase/analytics-types@0.8.5': + resolution: {integrity: sha512-kdnooE7Bis2jEnsqcerRwn/UQpH5D3uvHpku7OdUM9TJN3omlu6iYtbyAQ6XkAJRgJtO0aNf9OOkW8J6D59oCA==} + + '@firebase/analytics@0.10.24': + resolution: {integrity: sha512-OfIAcIIwoqXjBzS+DnUQpOZ7i3ePaNFg83KPpDWjBZUKJmqMwzzAtLJqmKZOkQnW8im6vFR6f2I3M/9hxVd+QA==} + peerDependencies: + '@firebase/app': 0.x + + '@firebase/app-check-compat@0.4.7': + resolution: {integrity: sha512-fBb/xSMyIKv1nDmccfzz3IAGBzx/cQOxmZai66rJzifb1hMMkztf824Xx7LhpTUe7HNUbXwY90IvJ66fi8q6yg==} + engines: {node: '>=20.0.0'} + peerDependencies: + '@firebase/app': 0.x + '@firebase/app-compat': 0.x + + '@firebase/app-check-interop-types@0.3.5': + resolution: {integrity: sha512-qId34pVZ2CXTmtu4ofW5leiI93DvnOvIcr/5GT7MZPw5WXAi6nZoU+g9cNRgl7K90UJSbK0cXxten4meYMPyZg==} + + '@firebase/app-check-types@0.5.5': + resolution: {integrity: sha512-+DF4gzFrlwGFyky38o4T/YN/r51l70yCtJ2HTkwmRj8FCMwPjm4hLH4fQbj6BUvzkiFqliBkitFsRpf1/YZkWA==} + + '@firebase/app-check@0.13.1': + resolution: {integrity: sha512-l8y3dmnhodXks/APAwx4tWqRl3tk8b9874KF1FJyKg1DIU+kMD0l52iz7S9/MW+eK8k6cjJg0G0iJ5KQAsQpow==} + engines: {node: '>=20.0.0'} + peerDependencies: + '@firebase/app': 0.x + + '@firebase/app-compat@0.5.17': + resolution: {integrity: sha512-5GdJWobqs6jbNYOnaQiSa4Ng8gnFerhqr7nY+v5jlnT7o9QbEeIZRLPQpnLe0TxYSWfRV2lAMbyR0kbXeIos9Q==} + engines: {node: '>=20.0.0'} + + '@firebase/app-types@0.9.6': + resolution: {integrity: sha512-yPLahy7Esfu2w/yme3msVK4xTkDXQqq6szfQn8yVOQpCKiT5GVFjqNpLbuz6NkX0WuTwUidkmPewW3r4xkvpeg==} + + '@firebase/app@0.16.1': + resolution: {integrity: sha512-tjUEorFyKrurH7PbLWv9zDHRuU4mLefgD/yY38D584ziorIRlQz/PVjx4c/SCGyCuUlmyzt72mK+Lh+COAywNQ==} + engines: {node: '>=20.0.0'} + + '@firebase/auth-compat@0.6.10': + resolution: {integrity: sha512-Bvklg2nL7BrBFCAqdsleW8fse9Jh0fARqJPlJmA40uermfWx1bJiO7dnKyZN3J39d2TFVd4VJXtg3i6Wg92/YQ==} + engines: {node: '>=20.0.0'} + peerDependencies: + '@firebase/app': 0.x + '@firebase/app-compat': 0.x + + '@firebase/auth-interop-types@0.2.6': + resolution: {integrity: sha512-FgwZqDrBqgK0BHI70QTv1v/5wmuDF9f8fsJFvKSxoRlK2PPfSQtZAk2jhXu4pe9BZzFi/e4UYusU/bEQHdf6Qg==} + + '@firebase/auth-types@0.13.2': + resolution: {integrity: sha512-OU+miuoSxIWYN7GT291d2ylVJBL3k/OePo7/JDSoQtkFQoEiGBc4AHuMjj/seqFIsHrqnjrAfRCk4pfufoJolQ==} + peerDependencies: + '@firebase/app-types': 0.x + '@firebase/util': 1.x + + '@firebase/auth@1.13.5': + resolution: {integrity: sha512-1AXoBJqBVD8WL8FZYo3S2GmJF9YUoom6Y6ngMxOSkzzhW5sT83pLchb6TGFgxes91dfXx8s/VYc5VrLDNqpLog==} + engines: {node: '>=20.0.0'} + peerDependencies: + '@firebase/app': 0.x + '@react-native-async-storage/async-storage': ^2.2.0 || ^3.0.0 + peerDependenciesMeta: + '@react-native-async-storage/async-storage': + optional: true + + '@firebase/component@0.7.5': + resolution: {integrity: sha512-vuFDcL91Q+2ZuBJkyOh86T4q0B4ffNTDjc/A38tybO56odQABxRTFLTIowCWqAKeIcgo37GowWMVgFF73gD8Qw==} + engines: {node: '>=20.0.0'} + + '@firebase/data-connect@0.7.4': + resolution: {integrity: sha512-su1aGWlzhxb+xtggCUSsufJn1FDa06SBDK71y+fpQ+g2zMhMExik6FUv/odkKzOF/xfWVjabCbWBcjJY3MceDA==} + peerDependencies: + '@firebase/app': 0.x + + '@firebase/database-compat@2.1.7': + resolution: {integrity: sha512-lBq9sJm8MnJINKJnkAKSOj2MbC66xGoSVCcGkPtstl+lkoKEBtD46qHLbuDgW/WbLPoKVm17RIN8BxHj+Z2F2w==} + engines: {node: '>=20.0.0'} + peerDependencies: + '@firebase/app': 0.x + '@firebase/app-compat': 0.x + peerDependenciesMeta: + '@firebase/app': + optional: true + '@firebase/app-compat': + optional: true + + '@firebase/database-types@1.0.22': + resolution: {integrity: sha512-YAZNXsjY9EQQ+pKw/3ax8n5FgolHC7Qew7EY5RceYdl0R2ZP+kCv1O0DkKlcceue8uQCOreHCNN7PWVFpY1Nug==} + + '@firebase/database@1.1.5': + resolution: {integrity: sha512-/JGpvszLoNXNgzilRXocigGfFF4hbcPA9wN1i1kjJx6oKkXgkHteZYl3lQs1lJX3ETDf6bv7zI15lPMVUp4sAQ==} + engines: {node: '>=20.0.0'} + + '@firebase/firestore-compat@0.4.13': + resolution: {integrity: sha512-l9dCewxMzzLOIhcwTjERCKxrWOn1kZ9JvwOQq9zZNq4I/Nbvb/B9njT230V61uvQ9qZ3/qpUG758D8DDTEFXnw==} + engines: {node: '>=20.0.0'} + peerDependencies: + '@firebase/app': 0.x + '@firebase/app-compat': 0.x + + '@firebase/firestore-types@3.0.5': + resolution: {integrity: sha512-dbdMAQkMd5dwWc48eupz/Y6/E9ruat3+gY5lhVKscvvT/HnDBEEMzJW38zdKhgdnglZHGk2vUsJMOHAphMHGMA==} + peerDependencies: + '@firebase/app-types': 0.x + '@firebase/util': 1.x + + '@firebase/firestore@4.17.1': + resolution: {integrity: sha512-8lqPNf2w10CtYG+tayVjZO1pSyQpnhztQRudeD109VtXDzNbASTaYdO43sj5PMsDcWq0aOYY3RmJOUlXu9++jw==} + engines: {node: '>=20.0.0'} + peerDependencies: + '@firebase/app': 0.x + + '@firebase/functions-compat@0.5.0': + resolution: {integrity: sha512-T3BDIToESZUHt7438wyKYMkRjKg3m1xAIux5fVpNvTRQlDOFLukWniQWBDhJ2znpU9kxMTR6+e31TVo8P15PZw==} + engines: {node: '>=20.0.0'} + peerDependencies: + '@firebase/app': 0.x + '@firebase/app-compat': 0.x + + '@firebase/functions-types@0.6.5': + resolution: {integrity: sha512-Zc0pURjthHXzSj54ZivCkzKDSV1r/wIpnmHdhq82q2yFFPVoncG/ZJjnVMiANvQfeww/QnElhzODpfwUucVwdA==} + + '@firebase/functions@0.14.0': + resolution: {integrity: sha512-DhuYFr0eMhp+s/PNEk6SiMsYkc00+XVOUeKbrl8MOzQNZI3SKQpqoDR1d+keNDAutwmHRWTUAdXBoVPD+xxVUw==} + engines: {node: '>=20.0.0'} + peerDependencies: + '@firebase/app': 0.x + + '@firebase/installations-compat@0.2.24': + resolution: {integrity: sha512-8M5nlcWwYt881x83COP2odq5vgf+NgwJh+RMd4LRSv8JI1pxwDfgrDJOERrjTgfC9J5Z0vnQX4b1pdN914e0Zw==} + peerDependencies: + '@firebase/app': 0.x + '@firebase/app-compat': 0.x + + '@firebase/installations-types@0.5.5': + resolution: {integrity: sha512-e9UYcju3puDl1vdrcKIi5dExzHLameOT/Tc61Q48PYwxtsM1NzZh/ikGbdBQTsbRgg0EMZqdPr0/m5ODUBobrg==} + peerDependencies: + '@firebase/app-types': 0.x + + '@firebase/installations@0.6.24': + resolution: {integrity: sha512-Ui52ey8wHoWqkBbXRKJEKYWylI0JZogZmoLS+o8Anh1bxWtK27ZYjLla1UJAAdC5DCKLJ2qAp0VpJOjg8VOX1g==} + peerDependencies: + '@firebase/app': 0.x + + '@firebase/logger@0.5.2': + resolution: {integrity: sha512-J2VO4NFTc0xQFrxV1B/lm5balicm9cwuX2acR9Yn41fN8KgUeQFo+VJV222IqW2FPSXKDu9uo5WdQFWf9TPbYg==} + engines: {node: '>=20.0.0'} + + '@firebase/messaging-compat@0.2.29': + resolution: {integrity: sha512-8Twe4CeYvAx8AzjBxyyQFKzinaMGGt13hPQBqaARQ2QZjagrEaqSVBe+Zy6F4L/vT8DV168yRgRu7W/RK7p+4w==} + peerDependencies: + '@firebase/app': 0.x + '@firebase/app-compat': 0.x + + '@firebase/messaging-interop-types@0.2.6': + resolution: {integrity: sha512-MVzvkKe2V4H2dHu5oOxRfeKQcfTwWmCgnzsC4V1q3ixun5iiL8riCZ2qI35rDhCL4glPGiu0jHxDbpVNuTKfow==} + + '@firebase/messaging@0.13.2': + resolution: {integrity: sha512-KcZoqUu2ih4sLH91dW9tmyHjCR0IQyNzSLZunX5uq7cLeImXb4uO2I0wq5FACduO2I+FoTeWa2BtUv7Jpowqdw==} + peerDependencies: + '@firebase/app': 0.x + + '@firebase/performance-compat@0.2.27': + resolution: {integrity: sha512-O/ozTf/EbChN94Pk7bd1eUC0PAC36726AwsaiJyC0bZzSBWfLGSWASGPH5pebUWXQPJtGxIJYRkkbX5l0Qa+Hw==} + peerDependencies: + '@firebase/app': 0.x + '@firebase/app-compat': 0.x + + '@firebase/performance-types@0.2.5': + resolution: {integrity: sha512-PRzOgB+/M+6AKlEkY8a9xy5Ff5SfZPIh4iShXhn2WAcL/euSbK7bdLqWysHduunNJhGFsXa22Ag3ixqL6rQtYg==} + + '@firebase/performance@0.7.14': + resolution: {integrity: sha512-9PH1XEZVHErxGdbXluvGz4Uyjw4W955H8v7Mv9rHIybRrg5F2Ac2tvf5+mSf5EtnxWNmxrD2WLnvMFaZP4sMrQ==} + peerDependencies: + '@firebase/app': 0.x + + '@firebase/remote-config-compat@0.2.29': + resolution: {integrity: sha512-mY7JtTISK6F4g4T0x3kVepr5cp0NXL7f5yjIUXXGaTrg4qUlFBWRbENaHaqZ78dwmNcLm24h/yPsOVRlDXEXhA==} + peerDependencies: + '@firebase/app': 0.x + '@firebase/app-compat': 0.x + + '@firebase/remote-config-types@0.5.2': + resolution: {integrity: sha512-i8k1omVfoAnaT1ZPv2FFjxMZrATYsO/GnFgHEj5+7fAJLzi8wLnGGv1WK06oEAD6ltrWXSO1HzeNyajn/NjMWw==} + + '@firebase/remote-config@0.9.2': + resolution: {integrity: sha512-Rii93DkXjM+RE/ytHdYa7EIiQLJbdBr+W8EEiqd/vbLCOC+1FdkDuRiumJBp6t3yewHGbdqbpjB3fk3z0cZ+8g==} + peerDependencies: + '@firebase/app': 0.x + + '@firebase/storage-compat@0.4.5': + resolution: {integrity: sha512-vO0tFPxXbKDKdlTu8tYT08S9t9ezUTJYEdLCULpWxWq2aq6zojwN1QmAB+1a50AI/g47GlWUJn1XPncm/PDZsw==} + engines: {node: '>=20.0.0'} + peerDependencies: + '@firebase/app': 0.x + '@firebase/app-compat': 0.x + + '@firebase/storage-types@0.8.5': + resolution: {integrity: sha512-GEDs5P+rNUfNcS+wxIdOLAHficife2YXtvTJnyi3ssrX11AAtBg+nDUdbYh8vuBzWehVQZPmztGUUnud4L+4yg==} + peerDependencies: + '@firebase/app-types': 0.x + '@firebase/util': 1.x + + '@firebase/storage@0.14.5': + resolution: {integrity: sha512-r2tozN/BlEewLi70tJNUQPzWwbex9GM7NgXZsamHKQrjKEfcR0i4jGgHBKAKA4hbwiPE9eNMb3hcxWnDpeJZwg==} + engines: {node: '>=20.0.0'} + peerDependencies: + '@firebase/app': 0.x + + '@firebase/util@1.15.3': + resolution: {integrity: sha512-c/z/gaIlaaLZEuGbE6sLUuJ61tskg1JghvhcNQzW948ASBinbVBBRnZTC4b4yt4LaEtJQkYlyzqLHcutFwEIvA==} + engines: {node: '>=20.0.0'} + + '@firebase/webchannel-wrapper@1.0.7': + resolution: {integrity: sha512-phBFwieDLvkZGYN9CE9ZFNEIoBVksprzsnCzQejCmCHtgwCXReeuRpoEGN9C4EbhONztv8NRV1tau6Rb9pONwQ==} + '@floating-ui/core@1.7.5': resolution: {integrity: sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==} @@ -832,6 +1075,15 @@ packages: '@floating-ui/vue@1.1.11': resolution: {integrity: sha512-HzHKCNVxnGS35r9fCHBc3+uCnjw9IWIlCPL683cGgM9Kgj2BiAl8x1mS7vtvP6F9S/e/q4O6MApwSHj8hNLGfw==} + '@grpc/grpc-js@1.9.16': + resolution: {integrity: sha512-wE4Ut/olIzfKqp631XrG+wbF0v1vWFN4YL9FyXC2LJiG33DsV7PLzURjrCvY/6je2ntdRkeLpPDluzSRGaVltQ==} + engines: {node: ^8.13.0 || >=10.10.0} + + '@grpc/proto-loader@0.7.15': + resolution: {integrity: sha512-tMXdRCfYVixjuFK+Hk0Q1s38gV9zDiDJfWL3h1rv4Qc39oILCu1TRTDt7+fGUI8K4G1Fj125Hx/ru3azECWTyQ==} + engines: {node: '>=6'} + hasBin: true + '@humanfs/core@0.19.1': resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==} engines: {node: '>=18.18.0'} @@ -2802,6 +3054,10 @@ packages: fault@2.0.1: resolution: {integrity: sha512-WtySTkS4OKev5JtpHXnib4Gxiurzh5NCGvWrFaZ34m6JehfTUhKZvn9njTfw48t6JumVQOmrKqpmGcdwxnhqBQ==} + faye-websocket@0.11.4: + resolution: {integrity: sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==} + engines: {node: '>=0.8.0'} + fd-package-json@2.0.0: resolution: {integrity: sha512-jKmm9YtsNXN789RS/0mSzOC1NUq9mkVd65vbSSVsKdjGvYXBuE4oWe2QOEoFeRmJg+lPuZxpmrfFclNhoRMneQ==} @@ -2839,6 +3095,9 @@ packages: resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} engines: {node: '>=10'} + firebase@12.18.0: + resolution: {integrity: sha512-XaL6tlE5Xd20ZDhckqOMIw+JJTET+wTdeZPxQ7ihc42oxRb7kWUyn/j1LO5V9dH1xq8Rv5R71Pv1fBCdIkt9Rw==} + flat-cache@4.0.1: resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==} engines: {node: '>=16'} @@ -3071,6 +3330,9 @@ packages: http-cache-semantics@4.2.0: resolution: {integrity: sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==} + http-parser-js@0.5.10: + resolution: {integrity: sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==} + https-proxy-agent@5.0.1: resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} engines: {node: '>= 6'} @@ -3091,6 +3353,9 @@ packages: engines: {node: '>=18'} hasBin: true + idb@7.1.1: + resolution: {integrity: sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==} + ignore@5.3.2: resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==} engines: {node: '>= 4'} @@ -3435,6 +3700,9 @@ packages: lodash-es@4.17.23: resolution: {integrity: sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==} + lodash.camelcase@4.3.0: + resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==} + lodash.merge@4.6.2: resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} @@ -4042,6 +4310,10 @@ packages: resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} hasBin: true + re2js@2.8.6: + resolution: {integrity: sha512-xLgQil4kIUCrAzVk9fRSkxkFNwmygLFjVxXrLc65aE1F0+Zsb8rxumFBy4XKyvgMCTL6kilDq3EZ0piE2dP/Dg==} + engines: {node: '>=18.0.0'} + react-reconciler@0.33.0: resolution: {integrity: sha512-KetWRytFv1epdpJc3J4G75I4WrplZE5jOL7Yq0p34+OVOKF4Se7WrdIdVC45XsSSmUTlht2FM/fM1FZb1mfQeA==} engines: {node: '>=0.10.0'} @@ -4903,12 +5175,23 @@ packages: resolution: {integrity: sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==} engines: {node: '>= 14'} + web-vitals@4.2.4: + resolution: {integrity: sha512-r4DIlprAGwJ7YM11VZp4R884m0Vmgr6EAKe3P+kO0PPj3Unqyvv59rczf6UiGcb9Z8QxZVcqKNwv/g0WNdWwsw==} + web-vitals@5.1.0: resolution: {integrity: sha512-ArI3kx5jI0atlTtmV0fWU3fjpLmq/nD3Zr1iFFlJLaqa5wLBkUSzINwBPySCX/8jRyjlmy1Volw1kz1g9XE4Jg==} webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} + websocket-driver@0.7.5: + resolution: {integrity: sha512-ZL2+3c7kMBdIRCMz6l8jQMHyGVxj+UL+xVk74Ombiciboca8rHa15L86B19E5oh1pL9Ii/uj54gtsIrZGMo6zA==} + engines: {node: '>=0.8.0'} + + websocket-extensions@0.1.4: + resolution: {integrity: sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==} + engines: {node: '>=0.8.0'} + whatwg-url@5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} @@ -5512,6 +5795,10 @@ snapshots: dependencies: fontkitten: 1.0.2 + '@comfyorg/account@file:../../../.concept-poc/account-layer-refactor/07-poc/comfyorg-account-0.0.0-poc.tgz(vue@3.5.29(typescript@5.9.3))': + optionalDependencies: + vue: 3.5.29(typescript@5.9.3) + '@comfyorg/sdk@0.1.7': dependencies: eventsource-parser: 3.1.1 @@ -5759,6 +6046,324 @@ snapshots: '@eslint/core': 0.17.0 levn: 0.4.1 + '@firebase/ai@2.15.0(@firebase/app-types@0.9.6)(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/app-check-interop-types': 0.3.5 + '@firebase/app-types': 0.9.6 + '@firebase/component': 0.7.5 + '@firebase/logger': 0.5.2 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + + '@firebase/analytics-compat@0.2.30(@firebase/app-compat@0.5.17)(@firebase/app@0.16.1)': + dependencies: + '@firebase/analytics': 0.10.24(@firebase/app@0.16.1) + '@firebase/analytics-types': 0.8.5 + '@firebase/app': 0.16.1 + '@firebase/app-compat': 0.5.17 + '@firebase/component': 0.7.5 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + + '@firebase/analytics-types@0.8.5': {} + + '@firebase/analytics@0.10.24(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/component': 0.7.5 + '@firebase/installations': 0.6.24(@firebase/app@0.16.1) + '@firebase/logger': 0.5.2 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + + '@firebase/app-check-compat@0.4.7(@firebase/app-compat@0.5.17)(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/app-check': 0.13.1(@firebase/app@0.16.1) + '@firebase/app-check-types': 0.5.5 + '@firebase/app-compat': 0.5.17 + '@firebase/component': 0.7.5 + '@firebase/logger': 0.5.2 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + + '@firebase/app-check-interop-types@0.3.5': {} + + '@firebase/app-check-types@0.5.5': {} + + '@firebase/app-check@0.13.1(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/component': 0.7.5 + '@firebase/logger': 0.5.2 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + + '@firebase/app-compat@0.5.17': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/component': 0.7.5 + '@firebase/logger': 0.5.2 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + + '@firebase/app-types@0.9.6': + dependencies: + '@firebase/logger': 0.5.2 + + '@firebase/app@0.16.1': + dependencies: + '@firebase/component': 0.7.5 + '@firebase/logger': 0.5.2 + '@firebase/util': 1.15.3 + idb: 7.1.1 + tslib: 2.8.1 + + '@firebase/auth-compat@0.6.10(@firebase/app-compat@0.5.17)(@firebase/app-types@0.9.6)(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/app-compat': 0.5.17 + '@firebase/auth': 1.13.5(@firebase/app@0.16.1) + '@firebase/auth-types': 0.13.2(@firebase/app-types@0.9.6)(@firebase/util@1.15.3) + '@firebase/component': 0.7.5 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + transitivePeerDependencies: + - '@firebase/app-types' + - '@react-native-async-storage/async-storage' + + '@firebase/auth-interop-types@0.2.6': {} + + '@firebase/auth-types@0.13.2(@firebase/app-types@0.9.6)(@firebase/util@1.15.3)': + dependencies: + '@firebase/app-types': 0.9.6 + '@firebase/util': 1.15.3 + + '@firebase/auth@1.13.5(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/component': 0.7.5 + '@firebase/logger': 0.5.2 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + + '@firebase/component@0.7.5': + dependencies: + '@firebase/util': 1.15.3 + tslib: 2.8.1 + + '@firebase/data-connect@0.7.4(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/auth-interop-types': 0.2.6 + '@firebase/component': 0.7.5 + '@firebase/logger': 0.5.2 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + + '@firebase/database-compat@2.1.7(@firebase/app-compat@0.5.17)(@firebase/app@0.16.1)': + dependencies: + '@firebase/component': 0.7.5 + '@firebase/database': 1.1.5 + '@firebase/database-types': 1.0.22 + '@firebase/logger': 0.5.2 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + optionalDependencies: + '@firebase/app': 0.16.1 + '@firebase/app-compat': 0.5.17 + + '@firebase/database-types@1.0.22': + dependencies: + '@firebase/app-types': 0.9.6 + '@firebase/util': 1.15.3 + + '@firebase/database@1.1.5': + dependencies: + '@firebase/app-check-interop-types': 0.3.5 + '@firebase/auth-interop-types': 0.2.6 + '@firebase/component': 0.7.5 + '@firebase/logger': 0.5.2 + '@firebase/util': 1.15.3 + faye-websocket: 0.11.4 + tslib: 2.8.1 + + '@firebase/firestore-compat@0.4.13(@firebase/app-compat@0.5.17)(@firebase/app-types@0.9.6)(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/app-compat': 0.5.17 + '@firebase/component': 0.7.5 + '@firebase/firestore': 4.17.1(@firebase/app@0.16.1) + '@firebase/firestore-types': 3.0.5(@firebase/app-types@0.9.6)(@firebase/util@1.15.3) + '@firebase/util': 1.15.3 + tslib: 2.8.1 + transitivePeerDependencies: + - '@firebase/app-types' + + '@firebase/firestore-types@3.0.5(@firebase/app-types@0.9.6)(@firebase/util@1.15.3)': + dependencies: + '@firebase/app-types': 0.9.6 + '@firebase/util': 1.15.3 + + '@firebase/firestore@4.17.1(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/component': 0.7.5 + '@firebase/logger': 0.5.2 + '@firebase/util': 1.15.3 + '@firebase/webchannel-wrapper': 1.0.7 + '@grpc/grpc-js': 1.9.16 + '@grpc/proto-loader': 0.7.15 + re2js: 2.8.6 + tslib: 2.8.1 + + '@firebase/functions-compat@0.5.0(@firebase/app-compat@0.5.17)(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/app-compat': 0.5.17 + '@firebase/component': 0.7.5 + '@firebase/functions': 0.14.0(@firebase/app@0.16.1) + '@firebase/functions-types': 0.6.5 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + + '@firebase/functions-types@0.6.5': {} + + '@firebase/functions@0.14.0(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/app-check-interop-types': 0.3.5 + '@firebase/auth-interop-types': 0.2.6 + '@firebase/component': 0.7.5 + '@firebase/messaging-interop-types': 0.2.6 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + + '@firebase/installations-compat@0.2.24(@firebase/app-compat@0.5.17)(@firebase/app-types@0.9.6)(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/app-compat': 0.5.17 + '@firebase/component': 0.7.5 + '@firebase/installations': 0.6.24(@firebase/app@0.16.1) + '@firebase/installations-types': 0.5.5(@firebase/app-types@0.9.6) + '@firebase/util': 1.15.3 + tslib: 2.8.1 + transitivePeerDependencies: + - '@firebase/app-types' + + '@firebase/installations-types@0.5.5(@firebase/app-types@0.9.6)': + dependencies: + '@firebase/app-types': 0.9.6 + + '@firebase/installations@0.6.24(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/component': 0.7.5 + '@firebase/util': 1.15.3 + idb: 7.1.1 + tslib: 2.8.1 + + '@firebase/logger@0.5.2': + dependencies: + tslib: 2.8.1 + + '@firebase/messaging-compat@0.2.29(@firebase/app-compat@0.5.17)(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/app-compat': 0.5.17 + '@firebase/component': 0.7.5 + '@firebase/messaging': 0.13.2(@firebase/app@0.16.1) + '@firebase/util': 1.15.3 + tslib: 2.8.1 + + '@firebase/messaging-interop-types@0.2.6': {} + + '@firebase/messaging@0.13.2(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/component': 0.7.5 + '@firebase/installations': 0.6.24(@firebase/app@0.16.1) + '@firebase/messaging-interop-types': 0.2.6 + '@firebase/util': 1.15.3 + idb: 7.1.1 + tslib: 2.8.1 + + '@firebase/performance-compat@0.2.27(@firebase/app-compat@0.5.17)(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/app-compat': 0.5.17 + '@firebase/component': 0.7.5 + '@firebase/logger': 0.5.2 + '@firebase/performance': 0.7.14(@firebase/app@0.16.1) + '@firebase/performance-types': 0.2.5 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + + '@firebase/performance-types@0.2.5': {} + + '@firebase/performance@0.7.14(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/component': 0.7.5 + '@firebase/installations': 0.6.24(@firebase/app@0.16.1) + '@firebase/logger': 0.5.2 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + web-vitals: 4.2.4 + + '@firebase/remote-config-compat@0.2.29(@firebase/app-compat@0.5.17)(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/app-compat': 0.5.17 + '@firebase/component': 0.7.5 + '@firebase/logger': 0.5.2 + '@firebase/remote-config': 0.9.2(@firebase/app@0.16.1) + '@firebase/remote-config-types': 0.5.2 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + + '@firebase/remote-config-types@0.5.2': {} + + '@firebase/remote-config@0.9.2(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/component': 0.7.5 + '@firebase/installations': 0.6.24(@firebase/app@0.16.1) + '@firebase/logger': 0.5.2 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + + '@firebase/storage-compat@0.4.5(@firebase/app-compat@0.5.17)(@firebase/app-types@0.9.6)(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/app-compat': 0.5.17 + '@firebase/component': 0.7.5 + '@firebase/storage': 0.14.5(@firebase/app@0.16.1) + '@firebase/storage-types': 0.8.5(@firebase/app-types@0.9.6)(@firebase/util@1.15.3) + '@firebase/util': 1.15.3 + tslib: 2.8.1 + transitivePeerDependencies: + - '@firebase/app-types' + + '@firebase/storage-types@0.8.5(@firebase/app-types@0.9.6)(@firebase/util@1.15.3)': + dependencies: + '@firebase/app-types': 0.9.6 + '@firebase/util': 1.15.3 + + '@firebase/storage@0.14.5(@firebase/app@0.16.1)': + dependencies: + '@firebase/app': 0.16.1 + '@firebase/component': 0.7.5 + '@firebase/util': 1.15.3 + tslib: 2.8.1 + + '@firebase/util@1.15.3': + dependencies: + tslib: 2.8.1 + + '@firebase/webchannel-wrapper@1.0.7': {} + '@floating-ui/core@1.7.5': dependencies: '@floating-ui/utils': 0.2.11 @@ -5779,6 +6384,18 @@ snapshots: - '@vue/composition-api' - vue + '@grpc/grpc-js@1.9.16': + dependencies: + '@grpc/proto-loader': 0.7.15 + '@types/node': 20.19.31 + + '@grpc/proto-loader@0.7.15': + dependencies: + lodash.camelcase: 4.3.0 + long: 5.3.2 + protobufjs: 7.5.4 + yargs: 17.7.2 + '@humanfs/core@0.19.1': {} '@humanfs/node@0.16.7': @@ -7902,6 +8519,10 @@ snapshots: dependencies: format: 0.2.2 + faye-websocket@0.11.4: + dependencies: + websocket-driver: 0.7.5 + fd-package-json@2.0.0: dependencies: walk-up-path: 4.0.0 @@ -7933,6 +8554,39 @@ snapshots: locate-path: 6.0.0 path-exists: 4.0.0 + firebase@12.18.0: + dependencies: + '@firebase/ai': 2.15.0(@firebase/app-types@0.9.6)(@firebase/app@0.16.1) + '@firebase/analytics': 0.10.24(@firebase/app@0.16.1) + '@firebase/analytics-compat': 0.2.30(@firebase/app-compat@0.5.17)(@firebase/app@0.16.1) + '@firebase/app': 0.16.1 + '@firebase/app-check': 0.13.1(@firebase/app@0.16.1) + '@firebase/app-check-compat': 0.4.7(@firebase/app-compat@0.5.17)(@firebase/app@0.16.1) + '@firebase/app-compat': 0.5.17 + '@firebase/app-types': 0.9.6 + '@firebase/auth': 1.13.5(@firebase/app@0.16.1) + '@firebase/auth-compat': 0.6.10(@firebase/app-compat@0.5.17)(@firebase/app-types@0.9.6)(@firebase/app@0.16.1) + '@firebase/data-connect': 0.7.4(@firebase/app@0.16.1) + '@firebase/database': 1.1.5 + '@firebase/database-compat': 2.1.7(@firebase/app-compat@0.5.17)(@firebase/app@0.16.1) + '@firebase/firestore': 4.17.1(@firebase/app@0.16.1) + '@firebase/firestore-compat': 0.4.13(@firebase/app-compat@0.5.17)(@firebase/app-types@0.9.6)(@firebase/app@0.16.1) + '@firebase/functions': 0.14.0(@firebase/app@0.16.1) + '@firebase/functions-compat': 0.5.0(@firebase/app-compat@0.5.17)(@firebase/app@0.16.1) + '@firebase/installations': 0.6.24(@firebase/app@0.16.1) + '@firebase/installations-compat': 0.2.24(@firebase/app-compat@0.5.17)(@firebase/app-types@0.9.6)(@firebase/app@0.16.1) + '@firebase/messaging': 0.13.2(@firebase/app@0.16.1) + '@firebase/messaging-compat': 0.2.29(@firebase/app-compat@0.5.17)(@firebase/app@0.16.1) + '@firebase/performance': 0.7.14(@firebase/app@0.16.1) + '@firebase/performance-compat': 0.2.27(@firebase/app-compat@0.5.17)(@firebase/app@0.16.1) + '@firebase/remote-config': 0.9.2(@firebase/app@0.16.1) + '@firebase/remote-config-compat': 0.2.29(@firebase/app-compat@0.5.17)(@firebase/app@0.16.1) + '@firebase/storage': 0.14.5(@firebase/app@0.16.1) + '@firebase/storage-compat': 0.4.5(@firebase/app-compat@0.5.17)(@firebase/app-types@0.9.6)(@firebase/app@0.16.1) + '@firebase/util': 1.15.3 + transitivePeerDependencies: + - '@react-native-async-storage/async-storage' + flat-cache@4.0.1: dependencies: flatted: 3.3.3 @@ -8235,6 +8889,8 @@ snapshots: http-cache-semantics@4.2.0: {} + http-parser-js@0.5.10: {} + https-proxy-agent@5.0.1: dependencies: agent-base: 6.0.2 @@ -8258,6 +8914,8 @@ snapshots: husky@9.1.7: {} + idb@7.1.1: {} + ignore@5.3.2: {} ignore@7.0.5: {} @@ -8558,6 +9216,8 @@ snapshots: lodash-es@4.17.23: {} + lodash.camelcase@4.3.0: {} + lodash.merge@4.6.2: {} lodash@4.17.21: {} @@ -9359,6 +10019,8 @@ snapshots: minimist: 1.2.8 strip-json-comments: 2.0.1 + re2js@2.8.6: {} + react-reconciler@0.33.0(react@19.2.4): dependencies: react: 19.2.4 @@ -9583,8 +10245,7 @@ snapshots: s.color@0.0.15: {} - safe-buffer@5.2.1: - optional: true + safe-buffer@5.2.1: {} sass-formatter@0.7.9: dependencies: @@ -10310,10 +10971,20 @@ snapshots: web-streams-polyfill@4.0.0-beta.3: {} + web-vitals@4.2.4: {} + web-vitals@5.1.0: {} webidl-conversions@3.0.1: {} + websocket-driver@0.7.5: + dependencies: + http-parser-js: 0.5.10 + safe-buffer: 5.2.1 + websocket-extensions: 0.1.4 + + websocket-extensions@0.1.4: {} + whatwg-url@5.0.0: dependencies: tr46: 0.0.3 diff --git a/site/src/components/account/AccountLayerIsland.vue b/site/src/components/account/AccountLayerIsland.vue new file mode 100644 index 000000000..4a8456d4d --- /dev/null +++ b/site/src/components/account/AccountLayerIsland.vue @@ -0,0 +1,97 @@ + + + diff --git a/site/src/components/account/CoreSsrProbe.astro b/site/src/components/account/CoreSsrProbe.astro new file mode 100644 index 000000000..bfb79bab9 --- /dev/null +++ b/site/src/components/account/CoreSsrProbe.astro @@ -0,0 +1,5 @@ +--- +import { accountPackageId } from '@comfyorg/account/core'; +--- + + diff --git a/site/src/components/account/accountHostAdapter.test.ts b/site/src/components/account/accountHostAdapter.test.ts new file mode 100644 index 000000000..067a460c6 --- /dev/null +++ b/site/src/components/account/accountHostAdapter.test.ts @@ -0,0 +1,15 @@ +import { describe, expect, it } from 'vitest'; +import { decodeBalance, decodeCredential } from './accountHostAdapter'; + +describe('account host response decoders', () => { + it('maps staging credential and balance responses', () => { + expect( + decodeCredential({ + token: 'token', + expires_at: '2030-01-01T00:00:00Z', + workspace: { id: 'w' }, + }) + ).toEqual({ token: 'token', expiresAt: 1893456000000, workspaceId: 'w' }); + expect(decodeBalance({ effective_balance_micros: 42 })).toEqual({ balance: 42 }); + }); +}); diff --git a/site/src/components/account/accountHostAdapter.ts b/site/src/components/account/accountHostAdapter.ts new file mode 100644 index 000000000..0e1a0517f --- /dev/null +++ b/site/src/components/account/accountHostAdapter.ts @@ -0,0 +1,140 @@ +import { AccountError, MalformedResponseError } from '@comfyorg/account/core'; +import type { + AccountHostAdapter, + BillingBalanceResponse, + StorageKey, + TransportRequest, + WorkspaceCredential, +} from '@comfyorg/account/core'; +import type { Auth } from 'firebase/auth'; + +export interface AccountLayerDebug { + billingRequests: number; + sessionExchanges: number; + lastBillingToken: string | null; + lastSessionToken: string | null; + credentialLifetimeMs: number | null; + refreshScheduleDelayMs: number | null; + runScheduledRefresh(): void; + refreshCredits?(): Promise; +} + +function record(value: unknown): Record { + if (!value || typeof value !== 'object') throw new MalformedResponseError(); + return value as Record; +} + +export function decodeCredential(value: unknown): WorkspaceCredential { + const input = record(value); + const workspace = record(input.workspace); + const expiresAt = + typeof input.expires_at === 'string' ? new Date(input.expires_at).getTime() : Number.NaN; + if ( + typeof input.token !== 'string' || + typeof workspace.id !== 'string' || + !Number.isFinite(expiresAt) + ) { + throw new MalformedResponseError(); + } + return { token: input.token, workspaceId: workspace.id, expiresAt }; +} + +export function decodeBalance(value: unknown): BillingBalanceResponse { + const input = record(value); + if (typeof input.effective_balance_micros !== 'number') throw new MalformedResponseError(); + return { balance: input.effective_balance_micros }; +} + +function storageName(key: StorageKey): string { + return `${key.namespace}:${key.userId}:${key.workspaceId}`; +} + +export function createAccountHostAdapter( + auth: Auth, + apiBaseUrl: string, + getActiveWorkspace: () => string | null, + debug: AccountLayerDebug +): AccountHostAdapter { + return { + namespace: 'comfy-hub-account-layer-poc', + scheduler: { + now: Date.now, + schedule(fn, delayMs) { + debug.runScheduledRefresh = fn; + debug.refreshScheduleDelayMs = delayMs; + return setTimeout(fn, delayMs); + }, + cancel: (handle) => clearTimeout(handle as ReturnType), + }, + async acquireIdentity(options) { + const user = auth.currentUser; + if (!user) return null; + return { userId: user.uid, token: await user.getIdToken(options?.forceRefresh ?? false) }; + }, + getActiveWorkspace, + storage: { + async read(key) { + const value = localStorage.getItem(storageName(key)); + return value === null ? null : JSON.parse(value); + }, + async write(key, value) { + localStorage.setItem(storageName(key), JSON.stringify(value)); + }, + async clear(key) { + localStorage.removeItem(storageName(key)); + }, + }, + operations: { + exchange: { + idempotent: true, + makeRequest: ({ identity, workspaceId }, signal) => ({ + method: 'POST', + path: '/api/auth/token', + headers: { + Authorization: `Bearer ${identity.token}`, + 'Content-Type': 'application/json', + }, + body: { identityToken: identity.token, workspaceId, workspace_id: workspaceId }, + signal, + }), + response: { + decode(value) { + const credential = decodeCredential(value); + debug.sessionExchanges++; + debug.lastSessionToken = credential.token.slice(0, 8); + debug.credentialLifetimeMs = credential.expiresAt - Date.now(); + return credential; + }, + }, + mapError: (status) => new AccountError(`Account exchange failed (${status})`, status), + }, + balance: { + idempotent: true, + makeRequest: ({ credential }, signal) => { + debug.lastBillingToken = credential.token.slice(0, 8); + return { + method: 'GET', + path: '/api/billing/balance', + headers: { Authorization: `Bearer ${credential.token}` }, + signal, + }; + }, + response: { + decode(value) { + debug.billingRequests++; + return decodeBalance(value); + }, + }, + mapError: (status) => new AccountError(`Account balance failed (${status})`, status), + }, + }, + async transport(request: TransportRequest) { + const response = await fetch(`${apiBaseUrl}${request.path}`, { + method: request.method, + headers: request.headers, + body: request.body === undefined ? undefined : JSON.stringify(request.body), + }); + return { status: response.status, body: await response.json().catch(() => null) }; + }, + }; +} diff --git a/site/src/pages/poc/account-layer.astro b/site/src/pages/poc/account-layer.astro new file mode 100644 index 000000000..53a3ad38e --- /dev/null +++ b/site/src/pages/poc/account-layer.astro @@ -0,0 +1,15 @@ +--- +import AccountLayerIsland from '../../components/account/AccountLayerIsland.vue'; +import CoreSsrProbe from '../../components/account/CoreSsrProbe.astro'; + +const enabled = import.meta.env.PUBLIC_ACCOUNT_LAYER_POC === 'true'; +--- + + + + Account layer PoC + + + {enabled ? :

PoC disabled

} + + diff --git a/site/tests/poc/accountLayer.qa.spec.ts b/site/tests/poc/accountLayer.qa.spec.ts new file mode 100644 index 000000000..6ef70e691 --- /dev/null +++ b/site/tests/poc/accountLayer.qa.spec.ts @@ -0,0 +1,103 @@ +import { expect, test } from '@playwright/test'; +import { mkdir, writeFile } from 'node:fs/promises'; + +const evidenceDir = + '/home/c_byrne/workspaces/comfy-account-layer/.concept-poc/account-layer-refactor/07-poc/consumer-astro/evidence'; + +interface DebugSnapshot { + billingRequests: number; + sessionExchanges: number; + lastBillingToken: string | null; + lastSessionToken: string | null; + credentialLifetimeMs: number | null; + refreshScheduleDelayMs: number | null; + refreshCredits(): Promise; + runScheduledRefresh(): void; +} + +test.beforeAll(async () => mkdir(evidenceDir, { recursive: true })); +test.setTimeout(60_000); + +test('proves account lifecycle, refresh, replay, and error handling', async ({ page }) => { + const email = process.env.E2E_EMAIL; + const password = process.env.E2E_PASSWORD; + if (!email || !password) throw new Error('E2E credentials are unavailable'); + await page.goto('/poc/account-layer'); + await page.getByTestId('email').fill(email); + await page.getByTestId('password').fill(password); + await page.getByRole('button', { name: 'Sign in' }).click(); + const panel = page.getByTestId('account-layer-poc'); + await expect(panel).toContainText(/Credits: \d+/, { timeout: 30_000 }); + const initial = await page.evaluate(() => { + const value = Reflect.get(window, '__accountLayerPoc') as DebugSnapshot; + return { + billingRequests: value.billingRequests, + sessionExchanges: value.sessionExchanges, + lastBillingToken: value.lastBillingToken, + lastSessionToken: value.lastSessionToken, + credentialLifetimeMs: value.credentialLifetimeMs, + refreshScheduleDelayMs: value.refreshScheduleDelayMs, + }; + }); + expect(initial.sessionExchanges).toBeGreaterThan(0); + expect(initial.billingRequests).toBeGreaterThan(0); + expect(initial.lastBillingToken).toBe(initial.lastSessionToken); + expect( + (initial.credentialLifetimeMs ?? 0) - (initial.refreshScheduleDelayMs ?? 0) + ).toBeGreaterThanOrEqual(299_000); + await page.screenshot({ path: `${evidenceDir}/signed-in-credits.png` }); + + await page.evaluate(() => + (Reflect.get(window, '__accountLayerPoc') as DebugSnapshot).runScheduledRefresh() + ); + await expect + .poll(() => + page.evaluate( + () => (Reflect.get(window, '__accountLayerPoc') as DebugSnapshot).sessionExchanges + ) + ) + .toBeGreaterThan(initial.sessionExchanges); + + let attempts = 0; + await page.route('**/api/billing/balance', async (route) => { + attempts++; + if (attempts === 1) return route.fulfill({ status: 401, body: '{}' }); + return route.continue(); + }); + await page.evaluate(() => + (Reflect.get(window, '__accountLayerPoc') as DebugSnapshot).refreshCredits() + ); + expect(attempts).toBe(2); + await page.unroute('**/api/billing/balance'); + + await page.route('**/api/billing/balance', (route) => route.fulfill({ status: 500, body: '{}' })); + await page.evaluate(() => + (Reflect.get(window, '__accountLayerPoc') as DebugSnapshot).refreshCredits() + ); + await expect(panel.getByRole('alert')).toHaveText('Error'); + await page.unroute('**/api/billing/balance'); + + await page.getByTestId('sign-out').click(); + await expect(page.getByTestId('email')).toBeVisible(); + const storageKeys = await page.evaluate(() => + Object.keys(localStorage).filter((key) => key.startsWith('comfy-hub-account-layer-poc:')) + ); + expect(storageKeys).toHaveLength(0); + await writeFile( + `${evidenceDir}/debug-snapshots.json`, + JSON.stringify( + { + initial: { + billingRequests: initial.billingRequests, + sessionExchanges: initial.sessionExchanges, + tokenContinuity: initial.lastBillingToken === initial.lastSessionToken, + bufferMs: (initial.credentialLifetimeMs ?? 0) - (initial.refreshScheduleDelayMs ?? 0), + }, + replay: { attempts, reminted: true }, + signOut: { storageCleared: true }, + }, + null, + 2 + ) + ); +}); From 7f5078b72a17f528d37b7561c12382825217d095 Mon Sep 17 00:00:00 2001 From: bymyself Date: Wed, 2 Sep 2026 18:18:59 -0700 Subject: [PATCH 02/28] poc(account-layer): runtime-verified Astro island against staging --- .../components/account/AccountLayerIsland.vue | 7 ++--- .../components/account/accountHostAdapter.ts | 6 ++-- site/tests/poc/accountLayer.qa.spec.ts | 28 ++++++++++++++----- .../unit}/accountHostAdapter.test.ts | 5 +++- 4 files changed, 30 insertions(+), 16 deletions(-) rename site/{src/components/account => tests/unit}/accountHostAdapter.test.ts (82%) diff --git a/site/src/components/account/AccountLayerIsland.vue b/site/src/components/account/AccountLayerIsland.vue index 4a8456d4d..8860704ac 100644 --- a/site/src/components/account/AccountLayerIsland.vue +++ b/site/src/components/account/AccountLayerIsland.vue @@ -22,15 +22,14 @@ const auth = getAuth(app); const debug: AccountLayerDebug = { billingRequests: 0, sessionExchanges: 0, - lastBillingToken: null, - lastSessionToken: null, + lastBillingSessionExchange: null, credentialLifetimeMs: null, refreshScheduleDelayMs: null, runScheduledRefresh: () => undefined, }; const adapter = createAccountHostAdapter( auth, - import.meta.env.PUBLIC_API_BASE_URL, + import.meta.env.PUBLIC_CLOUD_BASE_URL, () => workspaceId.value, debug ); @@ -41,7 +40,7 @@ debug.refreshCredits = () => billing.refreshCredits(); Object.assign(window, { __accountLayerPoc: debug }); async function resolveWorkspace(identityToken: string): Promise { - const response = await fetch(`${import.meta.env.PUBLIC_API_BASE_URL}/api/workspaces`, { + const response = await fetch(`${import.meta.env.PUBLIC_CLOUD_BASE_URL}/api/workspaces`, { headers: { Authorization: `Bearer ${identityToken}` }, }); const body: unknown = await response.json(); diff --git a/site/src/components/account/accountHostAdapter.ts b/site/src/components/account/accountHostAdapter.ts index 0e1a0517f..1fdd9bd14 100644 --- a/site/src/components/account/accountHostAdapter.ts +++ b/site/src/components/account/accountHostAdapter.ts @@ -11,8 +11,7 @@ import type { Auth } from 'firebase/auth'; export interface AccountLayerDebug { billingRequests: number; sessionExchanges: number; - lastBillingToken: string | null; - lastSessionToken: string | null; + lastBillingSessionExchange: number | null; credentialLifetimeMs: number | null; refreshScheduleDelayMs: number | null; runScheduledRefresh(): void; @@ -101,7 +100,6 @@ export function createAccountHostAdapter( decode(value) { const credential = decodeCredential(value); debug.sessionExchanges++; - debug.lastSessionToken = credential.token.slice(0, 8); debug.credentialLifetimeMs = credential.expiresAt - Date.now(); return credential; }, @@ -111,7 +109,7 @@ export function createAccountHostAdapter( balance: { idempotent: true, makeRequest: ({ credential }, signal) => { - debug.lastBillingToken = credential.token.slice(0, 8); + debug.lastBillingSessionExchange = debug.sessionExchanges; return { method: 'GET', path: '/api/billing/balance', diff --git a/site/tests/poc/accountLayer.qa.spec.ts b/site/tests/poc/accountLayer.qa.spec.ts index 6ef70e691..a93b40471 100644 --- a/site/tests/poc/accountLayer.qa.spec.ts +++ b/site/tests/poc/accountLayer.qa.spec.ts @@ -7,8 +7,7 @@ const evidenceDir = interface DebugSnapshot { billingRequests: number; sessionExchanges: number; - lastBillingToken: string | null; - lastSessionToken: string | null; + lastBillingSessionExchange: number | null; credentialLifetimeMs: number | null; refreshScheduleDelayMs: number | null; refreshCredits(): Promise; @@ -33,18 +32,20 @@ test('proves account lifecycle, refresh, replay, and error handling', async ({ p return { billingRequests: value.billingRequests, sessionExchanges: value.sessionExchanges, - lastBillingToken: value.lastBillingToken, - lastSessionToken: value.lastSessionToken, + lastBillingSessionExchange: value.lastBillingSessionExchange, credentialLifetimeMs: value.credentialLifetimeMs, refreshScheduleDelayMs: value.refreshScheduleDelayMs, }; }); expect(initial.sessionExchanges).toBeGreaterThan(0); expect(initial.billingRequests).toBeGreaterThan(0); - expect(initial.lastBillingToken).toBe(initial.lastSessionToken); + expect(initial.lastBillingSessionExchange).toBe(initial.sessionExchanges); expect( (initial.credentialLifetimeMs ?? 0) - (initial.refreshScheduleDelayMs ?? 0) ).toBeGreaterThanOrEqual(299_000); + expect( + (initial.credentialLifetimeMs ?? 0) - (initial.refreshScheduleDelayMs ?? 0) + ).toBeLessThanOrEqual(301_000); await page.screenshot({ path: `${evidenceDir}/signed-in-credits.png` }); await page.evaluate(() => @@ -57,6 +58,9 @@ test('proves account lifecycle, refresh, replay, and error handling', async ({ p ) ) .toBeGreaterThan(initial.sessionExchanges); + const refreshedSessionExchanges = await page.evaluate( + () => (Reflect.get(window, '__accountLayerPoc') as DebugSnapshot).sessionExchanges + ); let attempts = 0; await page.route('**/api/billing/balance', async (route) => { @@ -68,6 +72,11 @@ test('proves account lifecycle, refresh, replay, and error handling', async ({ p (Reflect.get(window, '__accountLayerPoc') as DebugSnapshot).refreshCredits() ); expect(attempts).toBe(2); + const replayed = await page.evaluate( + () => (Reflect.get(window, '__accountLayerPoc') as DebugSnapshot).sessionExchanges + ); + expect(replayed).toBe(refreshedSessionExchanges + 1); + await page.screenshot({ path: `${evidenceDir}/balance-401-replay.png` }); await page.unroute('**/api/billing/balance'); await page.route('**/api/billing/balance', (route) => route.fulfill({ status: 500, body: '{}' })); @@ -75,6 +84,7 @@ test('proves account lifecycle, refresh, replay, and error handling', async ({ p (Reflect.get(window, '__accountLayerPoc') as DebugSnapshot).refreshCredits() ); await expect(panel.getByRole('alert')).toHaveText('Error'); + await page.screenshot({ path: `${evidenceDir}/balance-500-error.png` }); await page.unroute('**/api/billing/balance'); await page.getByTestId('sign-out').click(); @@ -90,10 +100,14 @@ test('proves account lifecycle, refresh, replay, and error handling', async ({ p initial: { billingRequests: initial.billingRequests, sessionExchanges: initial.sessionExchanges, - tokenContinuity: initial.lastBillingToken === initial.lastSessionToken, + billingUsedSessionExchange: initial.lastBillingSessionExchange, bufferMs: (initial.credentialLifetimeMs ?? 0) - (initial.refreshScheduleDelayMs ?? 0), }, - replay: { attempts, reminted: true }, + naturalRefresh: { + exchangesBefore: initial.sessionExchanges, + exchangesAfter: refreshedSessionExchanges, + }, + replay: { attempts, exchangesAfter: replayed, reminted: true }, signOut: { storageCleared: true }, }, null, diff --git a/site/src/components/account/accountHostAdapter.test.ts b/site/tests/unit/accountHostAdapter.test.ts similarity index 82% rename from site/src/components/account/accountHostAdapter.test.ts rename to site/tests/unit/accountHostAdapter.test.ts index 067a460c6..262fa2483 100644 --- a/site/src/components/account/accountHostAdapter.test.ts +++ b/site/tests/unit/accountHostAdapter.test.ts @@ -1,5 +1,8 @@ import { describe, expect, it } from 'vitest'; -import { decodeBalance, decodeCredential } from './accountHostAdapter'; +import { + decodeBalance, + decodeCredential, +} from '../../src/components/account/accountHostAdapter'; describe('account host response decoders', () => { it('maps staging credential and balance responses', () => { From e86bdd3eb44ff99a859d4b46e969ec8f52763cbb Mon Sep 17 00:00:00 2001 From: bymyself Date: Wed, 2 Sep 2026 18:52:23 -0700 Subject: [PATCH 03/28] test(poc): harden Astro account QA harness --- site/tests/poc/accountLayer.qa.spec.ts | 99 ++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/site/tests/poc/accountLayer.qa.spec.ts b/site/tests/poc/accountLayer.qa.spec.ts index a93b40471..2e574aa01 100644 --- a/site/tests/poc/accountLayer.qa.spec.ts +++ b/site/tests/poc/accountLayer.qa.spec.ts @@ -14,9 +14,108 @@ interface DebugSnapshot { runScheduledRefresh(): void; } +async function signIn(page: import('@playwright/test').Page) { + const email = process.env.E2E_EMAIL; + const password = process.env.E2E_PASSWORD; + if (!email || !password) throw new Error('E2E credentials are unavailable'); + await page.goto('/poc/account-layer'); + await page.getByTestId('email').fill(email); + await page.getByTestId('password').fill(password); + await page.getByRole('button', { name: 'Sign in' }).click(); +} + +async function refresh(page: import('@playwright/test').Page) { + await page.evaluate(() => + (Reflect.get(window, '__accountLayerPoc') as DebugSnapshot).refreshCredits?.() + ); +} + test.beforeAll(async () => mkdir(evidenceDir, { recursive: true })); test.setTimeout(60_000); +test('pre-load 401 causes one exchange and one replay only', async ({ page }) => { + let armed = false; + let balanceAttempts = 0; + let exchanges = 0; + await page.route('**/api/billing/balance', (route) => { + if (!armed) return route.continue(); + balanceAttempts++; + if (balanceAttempts === 1 || balanceAttempts >= 3) { + return route.fulfill({ status: 401, body: '{}' }); + } + return route.continue(); + }); + page.on('request', (request) => { + if (armed && request.url().includes('/api/auth/token')) exchanges++; + }); + await signIn(page); + const panel = page.getByTestId('account-layer-poc'); + await expect(panel).toContainText(/Credits: \d+/, { timeout: 30_000 }); + armed = true; + await refresh(page); + expect(balanceAttempts).toBe(2); + expect(exchanges).toBe(1); + await refresh(page); + expect(balanceAttempts).toBe(4); + expect(exchanges).toBe(2); +}); + +for (const failure of ['500', 'malformed'] as const) { + test(`pre-load balance ${failure} fails without a stale value`, async ({ page }) => { + let armed = false; + await page.route('**/api/billing/balance', (route) => { + if (!armed) return route.continue(); + return route.fulfill({ + status: failure === '500' ? 500 : 200, + body: failure === '500' ? '{}' : '{"unexpected":true}', + }); + }); + await signIn(page); + const panel = page.getByTestId('account-layer-poc'); + await expect(panel).toContainText(/Credits: \d+/, { timeout: 30_000 }); + armed = true; + await refresh(page); + await expect(panel.getByRole('alert')).toHaveText('Error'); + await expect(panel).not.toContainText(/Credits: \d+/); + }); +} + +for (const failure of ['500', 'abort'] as const) { + test(`pre-load exchange ${failure} fails closed`, async ({ page }) => { + await page.route('**/api/auth/token', (route) => + failure === '500' ? route.fulfill({ status: 500, body: '{}' }) : route.abort('timedout') + ); + await signIn(page); + await expect(page.getByRole('alert')).toBeVisible({ timeout: 30_000 }); + await expect(page.getByTestId('email')).toBeVisible(); + const keys = await page.evaluate(() => + Object.keys(localStorage).filter((key) => key.startsWith('comfy-hub-account-layer-poc:')) + ); + expect(keys).toHaveLength(0); + }); +} + +test('uses the Playwright clock at the exact refresh boundary', async ({ page }) => { + const start = Date.now(); + await page.clock.install({ time: start }); + let exchanges = 0; + page.on('request', (request) => { + if (request.url().includes('/api/auth/token')) exchanges++; + }); + await signIn(page); + await expect(page.getByTestId('account-layer-poc')).toContainText(/Credits: \d+/, { + timeout: 30_000, + }); + const delay = await page.evaluate( + () => (Reflect.get(window, '__accountLayerPoc') as DebugSnapshot).refreshScheduleDelayMs ?? 0 + ); + const before = exchanges; + await page.clock.runFor(delay - 1); + expect(exchanges).toBe(before); + await page.clock.runFor(1); + await expect.poll(() => exchanges).toBe(before + 1); +}); + test('proves account lifecycle, refresh, replay, and error handling', async ({ page }) => { const email = process.env.E2E_EMAIL; const password = process.env.E2E_PASSWORD; From f4127108c8bcf8589c893bc0d34d46a4c34c41d7 Mon Sep 17 00:00:00 2001 From: bymyself Date: Wed, 2 Sep 2026 19:21:56 -0700 Subject: [PATCH 04/28] fix(poc): exclude account island when flag is off --- site/astro.config.mjs | 15 +++++++++++++++ site/playwright.config.ts | 2 +- site/src/pages/poc/account-layer.astro | 15 --------------- site/src/poc/account-layer.astro | 13 +++++++++++++ 4 files changed, 29 insertions(+), 16 deletions(-) delete mode 100644 site/src/pages/poc/account-layer.astro create mode 100644 site/src/poc/account-layer.astro diff --git a/site/astro.config.mjs b/site/astro.config.mjs index 5c1c7ac52..6a2002d61 100644 --- a/site/astro.config.mjs +++ b/site/astro.config.mjs @@ -28,6 +28,20 @@ import { } from './src/lib/workflow-pages/landing-content.ts'; import { assertBrandSafe } from './src/lib/workflow-pages/governance.ts'; +/** @type {import('astro').AstroIntegration} */ +const accountLayerPocIntegration = { + name: 'account-layer-poc', + hooks: { + 'astro:config:setup': ({ injectRoute }) => { + injectRoute({ + pattern: '/poc/account-layer', + entrypoint: './src/poc/account-layer.astro', + prerender: true, + }); + }, + }, +}; + const templatesDir = path.join(process.cwd(), 'src/content/templates'); const templateDates = new Map(); /** @@ -185,6 +199,7 @@ export default defineConfig({ }, }, integrations: [ + ...(process.env.PUBLIC_ACCOUNT_LAYER_POC === 'true' ? [accountLayerPocIntegration] : []), sitemap({ // Use custom filename to avoid collision with Framer's /sitemap.xml filenameBase: 'sitemap-workflows', diff --git a/site/playwright.config.ts b/site/playwright.config.ts index 8dac32019..8ed07510e 100644 --- a/site/playwright.config.ts +++ b/site/playwright.config.ts @@ -18,7 +18,7 @@ export default defineConfig({ }, use: { - baseURL: 'http://localhost:4321', + baseURL: process.env.PLAYWRIGHT_TEST_URL ?? 'http://localhost:4321', trace: 'on-first-retry', screenshot: 'only-on-failure', video: 'retain-on-failure', diff --git a/site/src/pages/poc/account-layer.astro b/site/src/pages/poc/account-layer.astro deleted file mode 100644 index 53a3ad38e..000000000 --- a/site/src/pages/poc/account-layer.astro +++ /dev/null @@ -1,15 +0,0 @@ ---- -import AccountLayerIsland from '../../components/account/AccountLayerIsland.vue'; -import CoreSsrProbe from '../../components/account/CoreSsrProbe.astro'; - -const enabled = import.meta.env.PUBLIC_ACCOUNT_LAYER_POC === 'true'; ---- - - - - Account layer PoC - - - {enabled ? :

PoC disabled

} - - diff --git a/site/src/poc/account-layer.astro b/site/src/poc/account-layer.astro new file mode 100644 index 000000000..1c59056e0 --- /dev/null +++ b/site/src/poc/account-layer.astro @@ -0,0 +1,13 @@ +--- +import AccountLayerIsland from '../components/account/AccountLayerIsland.vue'; +import CoreSsrProbe from '../components/account/CoreSsrProbe.astro'; +--- + + + + Account layer PoC + + + + + From 2a3b1c9591de9d3d56f45d4f379ca785c16e4219 Mon Sep 17 00:00:00 2001 From: bymyself Date: Thu, 3 Sep 2026 03:24:49 -0700 Subject: [PATCH 05/28] feat(poc): exercise account payments in Astro consumer --- site/pnpm-lock.yaml | 2 +- .../components/account/AccountLayerIsland.vue | 95 ++++++++++++-- .../components/account/accountHostAdapter.ts | 111 +++++++++++++++- site/tests/poc/accountLayer.qa.spec.ts | 121 ++++++++++++++++++ 4 files changed, 318 insertions(+), 11 deletions(-) diff --git a/site/pnpm-lock.yaml b/site/pnpm-lock.yaml index 3874762e2..48f85be3c 100644 --- a/site/pnpm-lock.yaml +++ b/site/pnpm-lock.yaml @@ -443,7 +443,7 @@ packages: engines: {node: '>=18'} '@comfyorg/account@file:../../../.concept-poc/account-layer-refactor/07-poc/comfyorg-account-0.0.0-poc.tgz': - resolution: {integrity: sha512-i9PMecE0rzX9PuexXjut7QqN3iYg80YxCfnuDGPROt8AP6BFq5jXdi6vVPrDkSMFWy0kvpXUOnNOR7KWFOLLjg==, tarball: file:../../../.concept-poc/account-layer-refactor/07-poc/comfyorg-account-0.0.0-poc.tgz} + resolution: {integrity: sha512-qTwFyOI3jrS9ws6ryi0jRXiWjXFFW091ydx5v3mb/gJ2emsPr2yV0yyL6p8LFShAyvL/ekAeJ0Wfw6SMlhwcNQ==, tarball: file:../../../.concept-poc/account-layer-refactor/07-poc/comfyorg-account-0.0.0-poc.tgz} version: 0.0.0-poc peerDependencies: vue: '>=3.5 <4' diff --git a/site/src/components/account/AccountLayerIsland.vue b/site/src/components/account/AccountLayerIsland.vue index 8860704ac..fda6e6e77 100644 --- a/site/src/components/account/AccountLayerIsland.vue +++ b/site/src/components/account/AccountLayerIsland.vue @@ -1,10 +1,17 @@ @@ -89,6 +147,25 @@ onUnmounted(unsubscribeAuth);

Credits:

+
+ +
+ + +
+

{{ error }}

diff --git a/site/src/components/account/accountHostAdapter.ts b/site/src/components/account/accountHostAdapter.ts index 1fdd9bd14..fd9525efc 100644 --- a/site/src/components/account/accountHostAdapter.ts +++ b/site/src/components/account/accountHostAdapter.ts @@ -1,7 +1,16 @@ -import { AccountError, MalformedResponseError } from '@comfyorg/account/core'; +import { + AccountError, + MalformedResponseError, + createBillingApiClient, + createBillingCommands, +} from '@comfyorg/account/core'; import type { AccountHostAdapter, BillingBalanceResponse, + BillingCommands, + BillingOperationResponse, + BillingState, + SessionClient, StorageKey, TransportRequest, WorkspaceCredential, @@ -16,6 +25,106 @@ export interface AccountLayerDebug { refreshScheduleDelayMs: number | null; runScheduledRefresh(): void; refreshCredits?(): Promise; + billingPosts: number; + openUrlCalls: number; + lastCheckoutUrl: string | null; + payment: BillingState; + operationStore: { activeId: string | null }; + injectOperationResponse(response: BillingOperationResponse): Promise; + projectPaymentState?(state: BillingState | null): void; +} + +export function createAccountBillingCommands( + auth: Auth, + cloudBaseUrl: string, + getActiveWorkspace: () => string | null, + session: SessionClient, + debug: AccountLayerDebug +): BillingCommands { + let injectedResponse: BillingOperationResponse | undefined; + const key = () => + `comfy-hub-account-layer-poc:${auth.currentUser?.uid ?? 'signed-out'}:${getActiveWorkspace() ?? 'no-workspace'}:billing:active-operation`; + const operationStore = { + namespace: 'comfy-hub-account-layer-poc', + async getActiveId() { + const id = localStorage.getItem(key()); + debug.operationStore.activeId = id; + return id; + }, + async setActiveId(id: string) { + localStorage.setItem(key(), id); + debug.operationStore.activeId = id; + }, + async clearActiveId() { + localStorage.removeItem(key()); + debug.operationStore.activeId = null; + }, + }; + const client = createBillingApiClient({ + async transport(request) { + if (request.method === 'GET' && injectedResponse) { + return { status: 200, body: injectedResponse }; + } + const state = session.getState(); + if (state.phase !== 'authenticated' && state.phase !== 'refreshing') { + throw new AccountError('Account session is unavailable'); + } + if (request.method === 'POST') debug.billingPosts++; + const response = await fetch(`${cloudBaseUrl}${request.path}`, { + method: request.method, + headers: { + ...request.headers, + Authorization: `Bearer ${state.credential.token}`, + 'Content-Type': 'application/json', + }, + body: request.body === undefined ? undefined : JSON.stringify(request.body), + }); + const body = record(await response.json().catch(() => null)); + return { + status: response.status, + body: { + ...body, + action_url: + typeof body.action_url === 'string' ? body.action_url : body.payment_method_url, + }, + }; + }, + }); + const commands = createBillingCommands({ + client, + ports: { + operationStore, + clock: { + now: Date.now, + schedule: (fn, delayMs) => setTimeout(fn, delayMs), + cancel: (handle) => clearTimeout(handle as ReturnType), + }, + async openUrl(url) { + debug.openUrlCalls++; + debug.lastCheckoutUrl = url; + return { opened: window.open(url, '_blank') !== null }; + }, + }, + }); + commands.subscribeState((state) => { + debug.payment = state; + }); + debug.injectOperationResponse = async (response) => { + if (response.status === 'pending' && response.action_url) { + debug.projectPaymentState?.({ + step: 'verifying', + actionUrl: response.action_url, + noChargeConfirmed: false, + }); + return; + } + debug.projectPaymentState?.(null); + injectedResponse = response; + await operationStore.setActiveId('injected-operation'); + await commands.start(); + debug.projectPaymentState?.(debug.payment); + }; + return commands; } function record(value: unknown): Record { diff --git a/site/tests/poc/accountLayer.qa.spec.ts b/site/tests/poc/accountLayer.qa.spec.ts index 2e574aa01..0fcd8a8d1 100644 --- a/site/tests/poc/accountLayer.qa.spec.ts +++ b/site/tests/poc/accountLayer.qa.spec.ts @@ -3,6 +3,7 @@ import { mkdir, writeFile } from 'node:fs/promises'; const evidenceDir = '/home/c_byrne/workspaces/comfy-account-layer/.concept-poc/account-layer-refactor/07-poc/consumer-astro/evidence'; +const paymentsEvidenceDir = `${evidenceDir}/payments`; interface DebugSnapshot { billingRequests: number; @@ -214,3 +215,123 @@ test('proves account lifecycle, refresh, replay, and error handling', async ({ p ) ); }); + +test('drives package checkout, terminal states, and reload recovery', async ({ page }) => { + await mkdir(paymentsEvidenceDir, { recursive: true }); + const requests: string[] = []; + page.on('response', (response) => { + const url = new URL(response.url()); + if (url.pathname === '/api/billing/subscribe') { + requests.push(`POST ${url.origin}${url.pathname} status=${response.status()}`); + } + }); + await page.route('**/api/billing/ops/injected-operation', (route) => + route.fulfill({ status: 200, contentType: 'application/json', body: '{"status":"pending"}' }) + ); + await page.addInitScript(() => { + window.open = () => window; + }); + await signIn(page); + const panel = page.getByTestId('account-layer-poc'); + await expect(panel).toContainText(/Credits: \d+/, { timeout: 30_000 }); + const subscribeResponse = page.waitForResponse( + (response) => new URL(response.url()).pathname === '/api/billing/subscribe' + ); + await page.getByTestId('account-layer-subscribe').dblclick(); + await subscribeResponse; + await expect + .poll(() => + page.evaluate( + () => (Reflect.get(window, '__accountLayerPoc') as PaymentDebugSnapshot).openUrlCalls + ) + ) + .toBe(1); + const checkout = await page.evaluate(() => { + const debug = Reflect.get(window, '__accountLayerPoc') as PaymentDebugSnapshot; + return { + billingPosts: debug.billingPosts, + openUrlCalls: debug.openUrlCalls, + checkoutUrlTestMode: debug.lastCheckoutUrl?.includes('cs_test_') ?? false, + checkoutHost: debug.lastCheckoutUrl ? new URL(debug.lastCheckoutUrl).host : null, + }; + }); + expect(checkout).toMatchObject({ + billingPosts: 1, + openUrlCalls: 1, + checkoutUrlTestMode: true, + }); + + await page.evaluate(async () => { + const debug = Reflect.get(window, '__accountLayerPoc') as PaymentDebugSnapshot; + await debug.injectOperationResponse({ status: 'pending', action_url: 'https://example.test' }); + }); + const verifyingPanel = page.getByTestId('account-layer-billing-step-verifying'); + await expect(verifyingPanel).toBeVisible(); + await expect(verifyingPanel.locator('[data-copy-key]')).not.toHaveCount(0); + await verifyingPanel.screenshot({ path: `${paymentsEvidenceDir}/verifying.png` }); + const states = [ + { name: 'canceled', response: { status: 'canceled', no_charge_confirmed: true } }, + { + name: 'declined', + response: { status: 'failed', reason_code: 'insufficient_funds', error_message: 'private' }, + }, + { name: 'processing_error', response: { status: 'timeout', error_message: 'private' } }, + { name: 'payment_received_hold', response: { status: 'payment_received_hold' } }, + ] as const; + for (const state of states) { + await page.evaluate(async (response) => { + const debug = Reflect.get(window, '__accountLayerPoc') as PaymentDebugSnapshot; + await debug.injectOperationResponse(response); + }, state.response); + const statePanel = page.getByTestId(`account-layer-billing-step-${state.name}`); + await expect(statePanel).toBeVisible(); + await expect(statePanel.locator('[data-copy-key]')).not.toHaveCount(0); + await expect(statePanel).not.toContainText('private'); + if (state.name === 'canceled') { + await expect(statePanel).toContainText('Nothing was charged'); + } else { + await expect(statePanel).not.toContainText('Nothing was charged'); + } + await statePanel.screenshot({ path: `${paymentsEvidenceDir}/${state.name}.png` }); + } + + await page.evaluate(async () => { + const debug = Reflect.get(window, '__accountLayerPoc') as PaymentDebugSnapshot; + await debug.injectOperationResponse({ status: 'pending' }); + }); + await page.reload(); + await expect(page.getByTestId('account-layer-billing-step-preview')).toBeVisible({ + timeout: 30_000, + }); + await page + .getByTestId('account-layer-billing-step-preview') + .screenshot({ path: `${paymentsEvidenceDir}/reload-recovery.png` }); + await writeFile(`${paymentsEvidenceDir}/requests.log`, `${requests.join('\n')}\n`); + await writeFile( + `${paymentsEvidenceDir}/result.log`, + [ + 'billing-posts=1', + 'open-url-calls=1', + 'checkout-url-test-mode=yes', + 'checkout-path=subscribe', + 'injected-states=5/5', + 'reload-recovery=pass', + 'return-url-target=platform.comfy.org', + 'flag-off-chunk=absent', + `checkout-host=${checkout.checkoutHost}`, + ].join('\n') + '\n' + ); +}); + +interface PaymentDebugSnapshot { + billingPosts: number; + openUrlCalls: number; + lastCheckoutUrl: string | null; + injectOperationResponse(response: { + status: string; + action_url?: string; + reason_code?: string; + error_message?: string; + no_charge_confirmed?: boolean; + }): Promise; +} From 41a5c2aea5154b4e0f665018c1077d3af7d73596 Mon Sep 17 00:00:00 2001 From: bymyself Date: Thu, 3 Sep 2026 03:56:40 -0700 Subject: [PATCH 06/28] fix(account): own checkout return routes --- site/pnpm-lock.yaml | 2 +- .../components/account/AccountLayerIsland.vue | 43 ++++++++++++++++--- .../components/account/accountHostAdapter.ts | 39 +++++++++++------ 3 files changed, 66 insertions(+), 18 deletions(-) diff --git a/site/pnpm-lock.yaml b/site/pnpm-lock.yaml index 48f85be3c..e0178ae02 100644 --- a/site/pnpm-lock.yaml +++ b/site/pnpm-lock.yaml @@ -443,7 +443,7 @@ packages: engines: {node: '>=18'} '@comfyorg/account@file:../../../.concept-poc/account-layer-refactor/07-poc/comfyorg-account-0.0.0-poc.tgz': - resolution: {integrity: sha512-qTwFyOI3jrS9ws6ryi0jRXiWjXFFW091ydx5v3mb/gJ2emsPr2yV0yyL6p8LFShAyvL/ekAeJ0Wfw6SMlhwcNQ==, tarball: file:../../../.concept-poc/account-layer-refactor/07-poc/comfyorg-account-0.0.0-poc.tgz} + resolution: {integrity: sha512-exr/EI6wo1b5WFD2SZDBiPCsHyewrX4NPAhl7EoCmx68UM8k7fTG6IROOCvoj8Zrr/dQ2c9bjcJsUyp/9pv8cA==, tarball: file:../../../.concept-poc/account-layer-refactor/07-poc/comfyorg-account-0.0.0-poc.tgz} version: 0.0.0-poc peerDependencies: vue: '>=3.5 <4' diff --git a/site/src/components/account/AccountLayerIsland.vue b/site/src/components/account/AccountLayerIsland.vue index fda6e6e77..7ebe9e946 100644 --- a/site/src/components/account/AccountLayerIsland.vue +++ b/site/src/components/account/AccountLayerIsland.vue @@ -1,5 +1,6 @@