@arcblock/did-connect-service 4.0.6 → 4.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/_generated/asset-bytes.d.ts +3 -0
- package/dist/_generated/asset-bytes.d.ts.map +1 -0
- package/dist/_generated/asset-bytes.js +2 -0
- package/dist/_generated/asset-bytes.js.map +1 -0
- package/dist/_generated/asset-manifest.d.ts +3 -0
- package/dist/_generated/asset-manifest.d.ts.map +1 -0
- package/dist/_generated/asset-manifest.js +12 -0
- package/dist/_generated/asset-manifest.js.map +1 -0
- package/dist/asset-registry.d.ts +38 -0
- package/dist/asset-registry.d.ts.map +1 -0
- package/dist/asset-registry.js +73 -0
- package/dist/asset-registry.js.map +1 -0
- package/dist/assets/admin-core.c0b5af61.js +1393 -0
- package/dist/assets/admin-extra.7ca9c16b.js +2529 -0
- package/dist/assets/admin.c26bb17a.css +2219 -0
- package/dist/assets/design.99dc4ddc.css +97 -0
- package/dist/assets/did-address.7df30f28.js +51 -0
- package/dist/assets/header.94d9e46b.js +136 -0
- package/dist/assets/login.7b12c6dc.css +662 -0
- package/dist/assets/login.d3f05790.js +720 -0
- package/dist/assets/qr.c0d203ca.js +3 -0
- package/dist/blocklet-service.d.ts +7 -32
- package/dist/blocklet-service.d.ts.map +1 -1
- package/dist/blocklet-service.js +43 -37
- package/dist/blocklet-service.js.map +1 -1
- package/dist/env-config.d.ts +86 -0
- package/dist/env-config.d.ts.map +1 -0
- package/dist/env-config.js +33 -0
- package/dist/env-config.js.map +1 -0
- package/dist/handlers/auth-handler.d.ts +1 -1
- package/dist/handlers/auth-handler.d.ts.map +1 -1
- package/dist/handlers/auth-handler.js +11 -11
- package/dist/handlers/auth-handler.js.map +1 -1
- package/dist/handlers/branding-handler.d.ts.map +1 -1
- package/dist/handlers/branding-handler.js +3 -2
- package/dist/handlers/branding-handler.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/og/generator.d.ts.map +1 -1
- package/dist/og/generator.js +8 -2
- package/dist/og/generator.js.map +1 -1
- package/dist/og/index.d.ts +2 -0
- package/dist/og/index.d.ts.map +1 -1
- package/dist/og/index.js +1 -0
- package/dist/og/index.js.map +1 -1
- package/dist/og/node-config.d.ts +23 -0
- package/dist/og/node-config.d.ts.map +1 -0
- package/dist/og/node-config.js +22 -0
- package/dist/og/node-config.js.map +1 -0
- package/dist/og/types.d.ts +10 -5
- package/dist/og/types.d.ts.map +1 -1
- package/dist/og/types.js.map +1 -1
- package/dist/pages/admin/index.d.ts.map +1 -1
- package/dist/pages/admin/index.js +25 -41
- package/dist/pages/admin/index.js.map +1 -1
- package/dist/pages/admin/tab-access.d.ts +1 -1
- package/dist/pages/admin/tab-access.d.ts.map +1 -1
- package/dist/pages/admin/tab-access.js +5 -2
- package/dist/pages/admin/tab-access.js.map +1 -1
- package/dist/pages/admin/tab-appearance.d.ts +1 -1
- package/dist/pages/admin/tab-appearance.d.ts.map +1 -1
- package/dist/pages/admin/tab-appearance.js +4 -2
- package/dist/pages/admin/tab-appearance.js.map +1 -1
- package/dist/pages/admin/tab-branding.d.ts.map +1 -1
- package/dist/pages/admin/tab-branding.js +4 -2
- package/dist/pages/admin/tab-branding.js.map +1 -1
- package/dist/pages/admin/tab-profile-accounts.d.ts.map +1 -1
- package/dist/pages/admin/tab-profile-accounts.js +4 -2
- package/dist/pages/admin/tab-profile-accounts.js.map +1 -1
- package/dist/pages/admin/tab-settings.d.ts.map +1 -1
- package/dist/pages/admin/tab-settings.js +4 -2
- package/dist/pages/admin/tab-settings.js.map +1 -1
- package/dist/pages/admin-instances-page.d.ts.map +1 -1
- package/dist/pages/admin-instances-page.js +4 -6
- package/dist/pages/admin-instances-page.js.map +1 -1
- package/dist/pages/error-page.d.ts.map +1 -1
- package/dist/pages/error-page.js +3 -2
- package/dist/pages/error-page.js.map +1 -1
- package/dist/pages/gen-access-key-page.d.ts.map +1 -1
- package/dist/pages/gen-access-key-page.js +3 -4
- package/dist/pages/gen-access-key-page.js.map +1 -1
- package/dist/pages/homepage.d.ts.map +1 -1
- package/dist/pages/homepage.js +4 -3
- package/dist/pages/homepage.js.map +1 -1
- package/dist/pages/invite-page.d.ts.map +1 -1
- package/dist/pages/invite-page.js +4 -4
- package/dist/pages/invite-page.js.map +1 -1
- package/dist/pages/login-page.d.ts.map +1 -1
- package/dist/pages/login-page.js +3 -4
- package/dist/pages/login-page.js.map +1 -1
- package/package.json +6 -4
- package/dist/identity/csrf.d.ts +0 -17
- package/dist/identity/csrf.d.ts.map +0 -1
- package/dist/identity/csrf.js +0 -56
- package/dist/identity/csrf.js.map +0 -1
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
"use strict";var __QRBundle=(()=>{var K=Object.defineProperty;var tt=Object.getOwnPropertyDescriptor;var et=Object.getOwnPropertyNames;var nt=Object.prototype.hasOwnProperty;var rt=(h,w)=>{for(var d in w)K(h,d,{get:w[d],enumerable:!0})},ot=(h,w,d,o)=>{if(w&&typeof w=="object"||typeof w=="function")for(let i of et(w))!nt.call(h,i)&&i!==d&&K(h,i,{get:()=>w[i],enumerable:!(o=tt(w,i))||o.enumerable});return h};var it=h=>ot(K({},"__esModule",{value:!0}),h);var dt={};rt(dt,{clearQR:()=>F,renderQR:()=>Z});var U=function(h,w){let i=h,l=Q[w],e=null,t=0,c=null,x=[],y={},a=function(r,u){t=i*4+17,e=(function(n){let f=new Array(n);for(let s=0;s<n;s+=1){f[s]=new Array(n);for(let p=0;p<n;p+=1)f[s][p]=null}return f})(t),g(0,0),g(t-7,0),g(0,t-7),k(),m(),R(r,u),i>=7&&E(r),c==null&&(c=q(i,l,x)),P(c,u)},g=function(r,u){for(let n=-1;n<=7;n+=1)if(!(r+n<=-1||t<=r+n))for(let f=-1;f<=7;f+=1)u+f<=-1||t<=u+f||(0<=n&&n<=6&&(f==0||f==6)||0<=f&&f<=6&&(n==0||n==6)||2<=n&&n<=4&&2<=f&&f<=4?e[r+n][u+f]=!0:e[r+n][u+f]=!1)},_=function(){let r=0,u=0;for(let n=0;n<8;n+=1){a(!0,n);let f=O.getLostPoint(y);(n==0||r>f)&&(r=f,u=n)}return u},m=function(){for(let r=8;r<t-8;r+=1)e[r][6]==null&&(e[r][6]=r%2==0);for(let r=8;r<t-8;r+=1)e[6][r]==null&&(e[6][r]=r%2==0)},k=function(){let r=O.getPatternPosition(i);for(let u=0;u<r.length;u+=1)for(let n=0;n<r.length;n+=1){let f=r[u],s=r[n];if(e[f][s]==null)for(let p=-2;p<=2;p+=1)for(let b=-2;b<=2;b+=1)p==-2||p==2||b==-2||b==2||p==0&&b==0?e[f+p][s+b]=!0:e[f+p][s+b]=!1}},E=function(r){let u=O.getBCHTypeNumber(i);for(let n=0;n<18;n+=1){let f=!r&&(u>>n&1)==1;e[Math.floor(n/3)][n%3+t-8-3]=f}for(let n=0;n<18;n+=1){let f=!r&&(u>>n&1)==1;e[n%3+t-8-3][Math.floor(n/3)]=f}},R=function(r,u){let n=l<<3|u,f=O.getBCHTypeInfo(n);for(let s=0;s<15;s+=1){let p=!r&&(f>>s&1)==1;s<6?e[s][8]=p:s<8?e[s+1][8]=p:e[t-15+s][8]=p}for(let s=0;s<15;s+=1){let p=!r&&(f>>s&1)==1;s<8?e[8][t-s-1]=p:s<9?e[8][15-s-1+1]=p:e[8][15-s-1]=p}e[t-8][8]=!r},P=function(r,u){let n=-1,f=t-1,s=7,p=0,b=O.getMaskFunction(u);for(let B=t-1;B>0;B-=2)for(B==6&&(B-=1);;){for(let M=0;M<2;M+=1)if(e[f][B-M]==null){let T=!1;p<r.length&&(T=(r[p]>>>s&1)==1),b(f,B-M)&&(T=!T),e[f][B-M]=T,s-=1,s==-1&&(p+=1,s=7)}if(f+=n,f<0||t<=f){f-=n,n=-n;break}}},V=function(r,u){let n=0,f=0,s=0,p=new Array(u.length),b=new Array(u.length);for(let A=0;A<u.length;A+=1){let C=u[A].dataCount,L=u[A].totalCount-C;f=Math.max(f,C),s=Math.max(s,L),p[A]=new Array(C);for(let I=0;I<p[A].length;I+=1)p[A][I]=255&r.getBuffer()[I+n];n+=C;let j=O.getErrorCorrectPolynomial(L),Y=S(p[A],j.getLength()-1).mod(j);b[A]=new Array(j.getLength()-1);for(let I=0;I<b[A].length;I+=1){let G=I+Y.getLength()-b[A].length;b[A][I]=G>=0?Y.getAt(G):0}}let B=0;for(let A=0;A<u.length;A+=1)B+=u[A].totalCount;let M=new Array(B),T=0;for(let A=0;A<f;A+=1)for(let C=0;C<u.length;C+=1)A<p[C].length&&(M[T]=p[C][A],T+=1);for(let A=0;A<s;A+=1)for(let C=0;C<u.length;C+=1)A<b[C].length&&(M[T]=b[C][A],T+=1);return M},q=function(r,u,n){let f=J.getRSBlocks(r,u),s=$();for(let b=0;b<n.length;b+=1){let B=n[b];s.put(B.getMode(),4),s.put(B.getLength(),O.getLengthInBits(B.getMode(),r)),B.write(s)}let p=0;for(let b=0;b<f.length;b+=1)p+=f[b].dataCount;if(s.getLengthInBits()>p*8)throw"code length overflow. ("+s.getLengthInBits()+">"+p*8+")";for(s.getLengthInBits()+4<=p*8&&s.put(0,4);s.getLengthInBits()%8!=0;)s.putBit(!1);for(;!(s.getLengthInBits()>=p*8||(s.put(236,8),s.getLengthInBits()>=p*8));)s.put(17,8);return V(s,f)};y.addData=function(r,u){u=u||"Byte";let n=null;switch(u){case"Numeric":n=st(r);break;case"Alphanumeric":n=ft(r);break;case"Byte":n=ct(r);break;case"Kanji":n=ut(r);break;default:throw"mode:"+u}x.push(n),c=null},y.isDark=function(r,u){if(r<0||t<=r||u<0||t<=u)throw r+","+u;return e[r][u]},y.getModuleCount=function(){return t},y.make=function(){if(i<1){let r=1;for(;r<40;r++){let u=J.getRSBlocks(r,l),n=$();for(let s=0;s<x.length;s++){let p=x[s];n.put(p.getMode(),4),n.put(p.getLength(),O.getLengthInBits(p.getMode(),r)),p.write(n)}let f=0;for(let s=0;s<u.length;s++)f+=u[s].dataCount;if(n.getLengthInBits()<=f*8)break}i=r}a(!1,_())},y.createTableTag=function(r,u){r=r||2,u=typeof u>"u"?r*4:u;let n="";n+='<table style="',n+=" border-width: 0px; border-style: none;",n+=" border-collapse: collapse;",n+=" padding: 0px; margin: "+u+"px;",n+='">',n+="<tbody>";for(let f=0;f<y.getModuleCount();f+=1){n+="<tr>";for(let s=0;s<y.getModuleCount();s+=1)n+='<td style="',n+=" border-width: 0px; border-style: none;",n+=" border-collapse: collapse;",n+=" padding: 0px; margin: 0px;",n+=" width: "+r+"px;",n+=" height: "+r+"px;",n+=" background-color: ",n+=y.isDark(f,s)?"#000000":"#ffffff",n+=";",n+='"/>';n+="</tr>"}return n+="</tbody>",n+="</table>",n},y.createSvgTag=function(r,u,n,f){let s={};typeof arguments[0]=="object"&&(s=arguments[0],r=s.cellSize,u=s.margin,n=s.alt,f=s.title),r=r||2,u=typeof u>"u"?r*4:u,n=typeof n=="string"?{text:n}:n||{},n.text=n.text||null,n.id=n.text?n.id||"qrcode-description":null,f=typeof f=="string"?{text:f}:f||{},f.text=f.text||null,f.id=f.text?f.id||"qrcode-title":null;let p=y.getModuleCount()*r+u*2,b,B,M,T,A="",C;for(C="l"+r+",0 0,"+r+" -"+r+",0 0,-"+r+"z ",A+='<svg version="1.1" xmlns="http://www.w3.org/2000/svg"',A+=s.scalable?"":' width="'+p+'px" height="'+p+'px"',A+=' viewBox="0 0 '+p+" "+p+'" ',A+=' preserveAspectRatio="xMinYMin meet"',A+=f.text||n.text?' role="img" aria-labelledby="'+H([f.id,n.id].join(" ").trim())+'"':"",A+=">",A+=f.text?'<title id="'+H(f.id)+'">'+H(f.text)+"</title>":"",A+=n.text?'<description id="'+H(n.id)+'">'+H(n.text)+"</description>":"",A+='<rect width="100%" height="100%" fill="white" cx="0" cy="0"/>',A+='<path d="',M=0;M<y.getModuleCount();M+=1)for(T=M*r+u,b=0;b<y.getModuleCount();b+=1)y.isDark(M,b)&&(B=b*r+u,A+="M"+B+","+T+C);return A+='" stroke="transparent" fill="black"/>',A+="</svg>",A},y.createDataURL=function(r,u){r=r||2,u=typeof u>"u"?r*4:u;let n=y.getModuleCount()*r+u*2,f=u,s=n-u;return gt(n,n,function(p,b){if(f<=p&&p<s&&f<=b&&b<s){let B=Math.floor((p-f)/r),M=Math.floor((b-f)/r);return y.isDark(M,B)?0:1}else return 1})},y.createImgTag=function(r,u,n){r=r||2,u=typeof u>"u"?r*4:u;let f=y.getModuleCount()*r+u*2,s="";return s+="<img",s+=' src="',s+=y.createDataURL(r,u),s+='"',s+=' width="',s+=f,s+='"',s+=' height="',s+=f,s+='"',n&&(s+=' alt="',s+=H(n),s+='"'),s+="/>",s};let H=function(r){let u="";for(let n=0;n<r.length;n+=1){let f=r.charAt(n);switch(f){case"<":u+="<";break;case">":u+=">";break;case"&":u+="&";break;case'"':u+=""";break;default:u+=f;break}}return u},z=function(r){r=typeof r>"u"?2:r;let n=y.getModuleCount()*1+r*2,f=r,s=n-r,p,b,B,M,T,A={"\u2588\u2588":"\u2588","\u2588 ":"\u2580"," \u2588":"\u2584"," ":" "},C={"\u2588\u2588":"\u2580","\u2588 ":"\u2580"," \u2588":" "," ":" "},L="";for(p=0;p<n;p+=2){for(B=Math.floor((p-f)/1),M=Math.floor((p+1-f)/1),b=0;b<n;b+=1)T="\u2588",f<=b&&b<s&&f<=p&&p<s&&y.isDark(B,Math.floor((b-f)/1))&&(T=" "),f<=b&&b<s&&f<=p+1&&p+1<s&&y.isDark(M,Math.floor((b-f)/1))?T+=" ":T+="\u2588",L+=r<1&&p+1>=s?C[T]:A[T];L+=`
|
|
2
|
+
`}return n%2&&r>0?L.substring(0,L.length-n-1)+Array(n+1).join("\u2580"):L.substring(0,L.length-1)};return y.createASCII=function(r,u){if(r=r||1,r<2)return z(u);r-=1,u=typeof u>"u"?r*2:u;let n=y.getModuleCount()*r+u*2,f=u,s=n-u,p,b,B,M,T=Array(r+1).join("\u2588\u2588"),A=Array(r+1).join(" "),C="",L="";for(p=0;p<n;p+=1){for(B=Math.floor((p-f)/r),L="",b=0;b<n;b+=1)M=1,f<=b&&b<s&&f<=p&&p<s&&y.isDark(B,Math.floor((b-f)/r))&&(M=0),L+=M?T:A;for(B=0;B<r;B+=1)C+=L+`
|
|
3
|
+
`}return C.substring(0,C.length-1)},y.renderTo2dContext=function(r,u){u=u||2;let n=y.getModuleCount();for(let f=0;f<n;f++)for(let s=0;s<n;s++)r.fillStyle=y.isDark(f,s)?"black":"white",r.fillRect(s*u,f*u,u,u)},y};U.stringToBytes=function(h){let w=[];for(let d=0;d<h.length;d+=1){let o=h.charCodeAt(d);w.push(o&255)}return w};U.createStringToBytes=function(h,w){let d=(function(){let i=at(h),l=function(){let c=i.read();if(c==-1)throw"eof";return c},e=0,t={};for(;;){let c=i.read();if(c==-1)break;let x=l(),y=l(),a=l(),g=String.fromCharCode(c<<8|x),_=y<<8|a;t[g]=_,e+=1}if(e!=w)throw e+" != "+w;return t})(),o=63;return function(i){let l=[];for(let e=0;e<i.length;e+=1){let t=i.charCodeAt(e);if(t<128)l.push(t);else{let c=d[i.charAt(e)];typeof c=="number"?(c&255)==c?l.push(c):(l.push(c>>>8),l.push(c&255)):l.push(o)}}return l}};var D={MODE_NUMBER:1,MODE_ALPHA_NUM:2,MODE_8BIT_BYTE:4,MODE_KANJI:8},Q={L:1,M:0,Q:3,H:2},N={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7},O=(function(){let h=[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],w=1335,d=7973,o=21522,i={},l=function(e){let t=0;for(;e!=0;)t+=1,e>>>=1;return t};return i.getBCHTypeInfo=function(e){let t=e<<10;for(;l(t)-l(w)>=0;)t^=w<<l(t)-l(w);return(e<<10|t)^o},i.getBCHTypeNumber=function(e){let t=e<<12;for(;l(t)-l(d)>=0;)t^=d<<l(t)-l(d);return e<<12|t},i.getPatternPosition=function(e){return h[e-1]},i.getMaskFunction=function(e){switch(e){case N.PATTERN000:return function(t,c){return(t+c)%2==0};case N.PATTERN001:return function(t,c){return t%2==0};case N.PATTERN010:return function(t,c){return c%3==0};case N.PATTERN011:return function(t,c){return(t+c)%3==0};case N.PATTERN100:return function(t,c){return(Math.floor(t/2)+Math.floor(c/3))%2==0};case N.PATTERN101:return function(t,c){return t*c%2+t*c%3==0};case N.PATTERN110:return function(t,c){return(t*c%2+t*c%3)%2==0};case N.PATTERN111:return function(t,c){return(t*c%3+(t+c)%2)%2==0};default:throw"bad maskPattern:"+e}},i.getErrorCorrectPolynomial=function(e){let t=S([1],0);for(let c=0;c<e;c+=1)t=t.multiply(S([1,v.gexp(c)],0));return t},i.getLengthInBits=function(e,t){if(1<=t&&t<10)switch(e){case D.MODE_NUMBER:return 10;case D.MODE_ALPHA_NUM:return 9;case D.MODE_8BIT_BYTE:return 8;case D.MODE_KANJI:return 8;default:throw"mode:"+e}else if(t<27)switch(e){case D.MODE_NUMBER:return 12;case D.MODE_ALPHA_NUM:return 11;case D.MODE_8BIT_BYTE:return 16;case D.MODE_KANJI:return 10;default:throw"mode:"+e}else if(t<41)switch(e){case D.MODE_NUMBER:return 14;case D.MODE_ALPHA_NUM:return 13;case D.MODE_8BIT_BYTE:return 16;case D.MODE_KANJI:return 12;default:throw"mode:"+e}else throw"type:"+t},i.getLostPoint=function(e){let t=e.getModuleCount(),c=0;for(let a=0;a<t;a+=1)for(let g=0;g<t;g+=1){let _=0,m=e.isDark(a,g);for(let k=-1;k<=1;k+=1)if(!(a+k<0||t<=a+k))for(let E=-1;E<=1;E+=1)g+E<0||t<=g+E||k==0&&E==0||m==e.isDark(a+k,g+E)&&(_+=1);_>5&&(c+=3+_-5)}for(let a=0;a<t-1;a+=1)for(let g=0;g<t-1;g+=1){let _=0;e.isDark(a,g)&&(_+=1),e.isDark(a+1,g)&&(_+=1),e.isDark(a,g+1)&&(_+=1),e.isDark(a+1,g+1)&&(_+=1),(_==0||_==4)&&(c+=3)}for(let a=0;a<t;a+=1)for(let g=0;g<t-6;g+=1)e.isDark(a,g)&&!e.isDark(a,g+1)&&e.isDark(a,g+2)&&e.isDark(a,g+3)&&e.isDark(a,g+4)&&!e.isDark(a,g+5)&&e.isDark(a,g+6)&&(c+=40);for(let a=0;a<t;a+=1)for(let g=0;g<t-6;g+=1)e.isDark(g,a)&&!e.isDark(g+1,a)&&e.isDark(g+2,a)&&e.isDark(g+3,a)&&e.isDark(g+4,a)&&!e.isDark(g+5,a)&&e.isDark(g+6,a)&&(c+=40);let x=0;for(let a=0;a<t;a+=1)for(let g=0;g<t;g+=1)e.isDark(g,a)&&(x+=1);let y=Math.abs(100*x/t/t-50)/5;return c+=y*10,c},i})(),v=(function(){let h=new Array(256),w=new Array(256);for(let o=0;o<8;o+=1)h[o]=1<<o;for(let o=8;o<256;o+=1)h[o]=h[o-4]^h[o-5]^h[o-6]^h[o-8];for(let o=0;o<255;o+=1)w[h[o]]=o;let d={};return d.glog=function(o){if(o<1)throw"glog("+o+")";return w[o]},d.gexp=function(o){for(;o<0;)o+=255;for(;o>=256;)o-=255;return h[o]},d})(),S=function(h,w){if(typeof h.length>"u")throw h.length+"/"+w;let d=(function(){let i=0;for(;i<h.length&&h[i]==0;)i+=1;let l=new Array(h.length-i+w);for(let e=0;e<h.length-i;e+=1)l[e]=h[e+i];return l})(),o={};return o.getAt=function(i){return d[i]},o.getLength=function(){return d.length},o.multiply=function(i){let l=new Array(o.getLength()+i.getLength()-1);for(let e=0;e<o.getLength();e+=1)for(let t=0;t<i.getLength();t+=1)l[e+t]^=v.gexp(v.glog(o.getAt(e))+v.glog(i.getAt(t)));return S(l,0)},o.mod=function(i){if(o.getLength()-i.getLength()<0)return o;let l=v.glog(o.getAt(0))-v.glog(i.getAt(0)),e=new Array(o.getLength());for(let t=0;t<o.getLength();t+=1)e[t]=o.getAt(t);for(let t=0;t<i.getLength();t+=1)e[t]^=v.gexp(v.glog(i.getAt(t))+l);return S(e,0).mod(i)},o},J=(function(){let h=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12,7,37,13],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]],w=function(i,l){let e={};return e.totalCount=i,e.dataCount=l,e},d={},o=function(i,l){switch(l){case Q.L:return h[(i-1)*4+0];case Q.M:return h[(i-1)*4+1];case Q.Q:return h[(i-1)*4+2];case Q.H:return h[(i-1)*4+3];default:return}};return d.getRSBlocks=function(i,l){let e=o(i,l);if(typeof e>"u")throw"bad rs block @ typeNumber:"+i+"/errorCorrectionLevel:"+l;let t=e.length/3,c=[];for(let x=0;x<t;x+=1){let y=e[x*3+0],a=e[x*3+1],g=e[x*3+2];for(let _=0;_<y;_+=1)c.push(w(a,g))}return c},d})(),$=function(){let h=[],w=0,d={};return d.getBuffer=function(){return h},d.getAt=function(o){let i=Math.floor(o/8);return(h[i]>>>7-o%8&1)==1},d.put=function(o,i){for(let l=0;l<i;l+=1)d.putBit((o>>>i-l-1&1)==1)},d.getLengthInBits=function(){return w},d.putBit=function(o){let i=Math.floor(w/8);h.length<=i&&h.push(0),o&&(h[i]|=128>>>w%8),w+=1},d},st=function(h){let w=D.MODE_NUMBER,d=h,o={};o.getMode=function(){return w},o.getLength=function(e){return d.length},o.write=function(e){let t=d,c=0;for(;c+2<t.length;)e.put(i(t.substring(c,c+3)),10),c+=3;c<t.length&&(t.length-c==1?e.put(i(t.substring(c,c+1)),4):t.length-c==2&&e.put(i(t.substring(c,c+2)),7))};let i=function(e){let t=0;for(let c=0;c<e.length;c+=1)t=t*10+l(e.charAt(c));return t},l=function(e){if("0"<=e&&e<="9")return e.charCodeAt(0)-48;throw"illegal char :"+e};return o},ft=function(h){let w=D.MODE_ALPHA_NUM,d=h,o={};o.getMode=function(){return w},o.getLength=function(l){return d.length},o.write=function(l){let e=d,t=0;for(;t+1<e.length;)l.put(i(e.charAt(t))*45+i(e.charAt(t+1)),11),t+=2;t<e.length&&l.put(i(e.charAt(t)),6)};let i=function(l){if("0"<=l&&l<="9")return l.charCodeAt(0)-48;if("A"<=l&&l<="Z")return l.charCodeAt(0)-65+10;switch(l){case" ":return 36;case"$":return 37;case"%":return 38;case"*":return 39;case"+":return 40;case"-":return 41;case".":return 42;case"/":return 43;case":":return 44;default:throw"illegal char :"+l}};return o},ct=function(h){let w=D.MODE_8BIT_BYTE,d=h,o=U.stringToBytes(h),i={};return i.getMode=function(){return w},i.getLength=function(l){return o.length},i.write=function(l){for(let e=0;e<o.length;e+=1)l.put(o[e],8)},i},ut=function(h){let w=D.MODE_KANJI,d=h,o=U.stringToBytes;(function(e,t){let c=o(e);if(c.length!=2||(c[0]<<8|c[1])!=t)throw"sjis not supported."})("\u53CB",38726);let i=o(h),l={};return l.getMode=function(){return w},l.getLength=function(e){return~~(i.length/2)},l.write=function(e){let t=i,c=0;for(;c+1<t.length;){let x=(255&t[c])<<8|255&t[c+1];if(33088<=x&&x<=40956)x-=33088;else if(57408<=x&&x<=60351)x-=49472;else throw"illegal char at "+(c+1)+"/"+x;x=(x>>>8&255)*192+(x&255),e.put(x,13),c+=2}if(c<t.length)throw"illegal char at "+(c+1)},l},W=function(){let h=[],w={};return w.writeByte=function(d){h.push(d&255)},w.writeShort=function(d){w.writeByte(d),w.writeByte(d>>>8)},w.writeBytes=function(d,o,i){o=o||0,i=i||d.length;for(let l=0;l<i;l+=1)w.writeByte(d[l+o])},w.writeString=function(d){for(let o=0;o<d.length;o+=1)w.writeByte(d.charCodeAt(o))},w.toByteArray=function(){return h},w.toString=function(){let d="";d+="[";for(let o=0;o<h.length;o+=1)o>0&&(d+=","),d+=h[o];return d+="]",d},w},lt=function(){let h=0,w=0,d=0,o="",i={},l=function(t){o+=String.fromCharCode(e(t&63))},e=function(t){if(t<0)throw"n:"+t;if(t<26)return 65+t;if(t<52)return 97+(t-26);if(t<62)return 48+(t-52);if(t==62)return 43;if(t==63)return 47;throw"n:"+t};return i.writeByte=function(t){for(h=h<<8|t&255,w+=8,d+=1;w>=6;)l(h>>>w-6),w-=6},i.flush=function(){if(w>0&&(l(h<<6-w),h=0,w=0),d%3!=0){let t=3-d%3;for(let c=0;c<t;c+=1)o+="="}},i.toString=function(){return o},i},at=function(h){let w=h,d=0,o=0,i=0,l={};l.read=function(){for(;i<8;){if(d>=w.length){if(i==0)return-1;throw"unexpected end of file./"+i}let c=w.charAt(d);if(d+=1,c=="=")return i=0,-1;if(c.match(/^\s$/))continue;o=o<<6|e(c.charCodeAt(0)),i+=6}let t=o>>>i-8&255;return i-=8,t};let e=function(t){if(65<=t&&t<=90)return t-65;if(97<=t&&t<=122)return t-97+26;if(48<=t&&t<=57)return t-48+52;if(t==43)return 62;if(t==47)return 63;throw"c:"+t};return l},ht=function(h,w){let d=h,o=w,i=new Array(h*w),l={};l.setPixel=function(x,y,a){i[y*d+x]=a},l.write=function(x){x.writeString("GIF87a"),x.writeShort(d),x.writeShort(o),x.writeByte(128),x.writeByte(0),x.writeByte(0),x.writeByte(0),x.writeByte(0),x.writeByte(0),x.writeByte(255),x.writeByte(255),x.writeByte(255),x.writeString(","),x.writeShort(0),x.writeShort(0),x.writeShort(d),x.writeShort(o),x.writeByte(0);let y=2,a=t(y);x.writeByte(y);let g=0;for(;a.length-g>255;)x.writeByte(255),x.writeBytes(a,g,255),g+=255;x.writeByte(a.length-g),x.writeBytes(a,g,a.length-g),x.writeByte(0),x.writeString(";")};let e=function(x){let y=x,a=0,g=0,_={};return _.write=function(m,k){if(m>>>k)throw"length over";for(;a+k>=8;)y.writeByte(255&(m<<a|g)),k-=8-a,m>>>=8-a,g=0,a=0;g=m<<a|g,a=a+k},_.flush=function(){a>0&&y.writeByte(g)},_},t=function(x){let y=1<<x,a=(1<<x)+1,g=x+1,_=c();for(let P=0;P<y;P+=1)_.add(String.fromCharCode(P));_.add(String.fromCharCode(y)),_.add(String.fromCharCode(a));let m=W(),k=e(m);k.write(y,g);let E=0,R=String.fromCharCode(i[E]);for(E+=1;E<i.length;){let P=String.fromCharCode(i[E]);E+=1,_.contains(R+P)?R=R+P:(k.write(_.indexOf(R),g),_.size()<4095&&(_.size()==1<<g&&(g+=1),_.add(R+P)),R=P)}return k.write(_.indexOf(R),g),k.write(a,g),k.flush(),m.toByteArray()},c=function(){let x={},y=0,a={};return a.add=function(g){if(a.contains(g))throw"dup key:"+g;x[g]=y,y+=1},a.size=function(){return y},a.indexOf=function(g){return x[g]},a.contains=function(g){return typeof x[g]<"u"},a};return l},gt=function(h,w,d){let o=ht(h,w);for(let t=0;t<w;t+=1)for(let c=0;c<h;c+=1)o.setPixel(c,t,d(c,t));let i=W();o.write(i);let l=lt(),e=i.toByteArray();for(let t=0;t<e.length;t+=1)l.writeByte(e[t]);return l.flush(),"data:image/gif;base64,"+l},X=U,xt=U.stringToBytes;function Z(h,w,d=200){F(h);let o=document.createElement("canvas"),i=o.getContext?.("2d")??null;if(!i){let a=document.createElement("a");a.href=w,a.textContent="Open in DID Wallet",a.target="_blank",a.rel="noopener",h.appendChild(a);return}let l=X(0,"M");l.addData(w),l.make();let e=l.getModuleCount(),t=Math.floor(d/e),c=t*e;o.width=c,o.height=c,o.style.display="block",o.style.width=`${d}px`,o.style.height=`${d}px`,o.style.imageRendering="pixelated";let x="#e8e8e8";i.fillStyle=x,i.fillRect(0,0,c,c),i.fillStyle="#000000";for(let a=0;a<e;a++)for(let g=0;g<e;g++)l.isDark(a,g)&&i.fillRect(g*t,a*t,t,t);let y=document.createElement("div");y.style.cssText="display:inline-block;padding:10px;background:#e8e8e8;border-radius:8px;line-height:0",y.appendChild(o),h.appendChild(y)}function F(h){h.innerHTML=""}return it(dt);})();
|
|
@@ -6,41 +6,16 @@
|
|
|
6
6
|
* 2. `BlockletServiceRPC` — Consumer calls RPC methods (verify, enforceAccess, etc.)
|
|
7
7
|
*
|
|
8
8
|
* Supports two modes:
|
|
9
|
-
* - Single-tenant:
|
|
9
|
+
* - Single-tenant: CONNECT_APP_SK set → used directly (playground/dev)
|
|
10
10
|
* - Multi-tenant: X-Instance-Did header → load appSk/appPsk from D1 settings
|
|
11
|
-
* - Arc/root fallback: X-Instance-Did +
|
|
11
|
+
* - Arc/root fallback: X-Instance-Did + CONNECT_APP_SK → instance appSk first, then env appSk
|
|
12
|
+
*
|
|
13
|
+
* All env vars are read via resolveServiceConfig() (canonical CONNECT_* names,
|
|
14
|
+
* legacy unprefixed names accepted as a deprecated fallback). See docs/env.md.
|
|
12
15
|
*/
|
|
16
|
+
import { type BlockletServiceEnv } from "./env-config.js";
|
|
13
17
|
import { type AuthHandler } from "./handlers/auth-handler.js";
|
|
14
|
-
|
|
15
|
-
export interface BlockletServiceEnv {
|
|
16
|
-
BLOCKLET_SERVICE_DB: D1Database;
|
|
17
|
-
JWT_SECRET: string;
|
|
18
|
-
/** Optional R2 binding for avatar/logo storage. */
|
|
19
|
-
BLOCKLET_SERVICE_BUCKET?: R2Bucket;
|
|
20
|
-
/** Single-tenant mode: app secret key from env. */
|
|
21
|
-
APP_SK?: string;
|
|
22
|
-
/** Single-tenant mode: permanent secret key from env. */
|
|
23
|
-
APP_PSK?: string;
|
|
24
|
-
/** Runtime/root app name used when instance branding is absent. */
|
|
25
|
-
APP_NAME?: string;
|
|
26
|
-
/** Relying Party name for WebAuthn. */
|
|
27
|
-
RP_NAME?: string;
|
|
28
|
-
/** Optional email login configuration. */
|
|
29
|
-
RESEND_API_KEY?: string;
|
|
30
|
-
EMAIL_FROM?: string;
|
|
31
|
-
/** Service Binding to master Worker for federation DID derivation. */
|
|
32
|
-
AUTH_MASTER?: AuthEntrypointInterface;
|
|
33
|
-
/**
|
|
34
|
-
* "true" → the package's bundled migrations (0001…0007) own the schema
|
|
35
|
-
* (`wrangler d1 migrations apply` ran at deploy time); the runtime
|
|
36
|
-
* `D1Store.migrate()` replay is skipped entirely. Saves several serial D1
|
|
37
|
-
* round-trips (CREATE batches + 8 always-failing ALTERs + seed INSERTs) on
|
|
38
|
-
* every fresh isolate's first auth-handler build. ONLY set on migrated
|
|
39
|
-
* databases — with the flag, a missing schema fails loudly at the first
|
|
40
|
-
* real query instead of being silently bootstrapped.
|
|
41
|
-
*/
|
|
42
|
-
SKIP_RUNTIME_MIGRATE?: string;
|
|
43
|
-
}
|
|
18
|
+
export type { BlockletServiceEnv } from "./env-config.js";
|
|
44
19
|
/** Clear cached config + handler for an instance (called after registerApp). */
|
|
45
20
|
export declare function invalidateConfigCache(instanceDid: string): void;
|
|
46
21
|
/** Clear cached federation config (called after federation admin mutations). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocklet-service.d.ts","sourceRoot":"","sources":["../src/blocklet-service.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"blocklet-service.d.ts","sourceRoot":"","sources":["../src/blocklet-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,KAAK,kBAAkB,EAAoD,MAAM,iBAAiB,CAAC;AAC5G,OAAO,EAAE,KAAK,WAAW,EAAqB,MAAM,4BAA4B,CAAC;AAOjF,YAAY,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AA+G1D,gFAAgF;AAChF,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAI/D;AAOD,gFAAgF;AAChF,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAIlE;AAED,2CAA2C;AAC3C,wBAAgB,2BAA2B,IAAI,IAAI,CAIlD;AAuKD;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,kBAAkB,EACvB,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GAClC,OAAO,CAAC,WAAW,CAAC,CAwEtB;AAkCD,mEAAmE;AACnE,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,kBAAkB,EACvB,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GAClC,OAAO,CAAC,WAAW,CAAC,CAmBtB;;mBAGsB,OAAO,OAAO,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC;;AAD3E,wBAkBE"}
|
package/dist/blocklet-service.js
CHANGED
|
@@ -6,28 +6,32 @@
|
|
|
6
6
|
* 2. `BlockletServiceRPC` — Consumer calls RPC methods (verify, enforceAccess, etc.)
|
|
7
7
|
*
|
|
8
8
|
* Supports two modes:
|
|
9
|
-
* - Single-tenant:
|
|
9
|
+
* - Single-tenant: CONNECT_APP_SK set → used directly (playground/dev)
|
|
10
10
|
* - Multi-tenant: X-Instance-Did header → load appSk/appPsk from D1 settings
|
|
11
|
-
* - Arc/root fallback: X-Instance-Did +
|
|
11
|
+
* - Arc/root fallback: X-Instance-Did + CONNECT_APP_SK → instance appSk first, then env appSk
|
|
12
|
+
*
|
|
13
|
+
* All env vars are read via resolveServiceConfig() (canonical CONNECT_* names,
|
|
14
|
+
* legacy unprefixed names accepted as a deprecated fallback). See docs/env.md.
|
|
12
15
|
*/
|
|
13
16
|
import { fromSecretKey } from "@ocap/wallet";
|
|
17
|
+
import { resolveServiceConfig } from "./env-config.js";
|
|
14
18
|
import { createAuthHandler } from "./handlers/auth-handler.js";
|
|
15
19
|
import { deriveDIDLocal, getWalletInfoLocal } from "./identity/auth-entrypoint.js";
|
|
16
20
|
import { APP_WALLET_TYPE, normalizeSecretKey } from "./identity/wallet-identity.js";
|
|
17
21
|
import { D1Store } from "./store/d1-store.js";
|
|
18
22
|
const _configCache = new Map();
|
|
19
23
|
const CONFIG_TTL = 5 * 60 * 1000; // 5 minutes
|
|
20
|
-
function buildFallbackAppInfo(
|
|
21
|
-
const name =
|
|
24
|
+
function buildFallbackAppInfo(cfg) {
|
|
25
|
+
const name = cfg.appName;
|
|
22
26
|
return name ? { name } : undefined;
|
|
23
27
|
}
|
|
24
|
-
function buildFallbackConfig(
|
|
25
|
-
if (!
|
|
28
|
+
function buildFallbackConfig(cfg) {
|
|
29
|
+
if (!cfg.appSk)
|
|
26
30
|
return undefined;
|
|
27
|
-
const appInfo = buildFallbackAppInfo(
|
|
31
|
+
const appInfo = buildFallbackAppInfo(cfg);
|
|
28
32
|
return {
|
|
29
|
-
appSk:
|
|
30
|
-
...(
|
|
33
|
+
appSk: cfg.appSk,
|
|
34
|
+
...(cfg.appPsk ? { appPsk: cfg.appPsk } : {}),
|
|
31
35
|
...(appInfo ? { appInfo } : {}),
|
|
32
36
|
};
|
|
33
37
|
}
|
|
@@ -211,7 +215,7 @@ async function migrateConnectedAccountProvider(db) {
|
|
|
211
215
|
// Table may not exist yet
|
|
212
216
|
}
|
|
213
217
|
}
|
|
214
|
-
async function resolveFederationConfig(effectiveDid, store,
|
|
218
|
+
async function resolveFederationConfig(effectiveDid, store, cfg) {
|
|
215
219
|
const cached = _fedConfigCache.get(effectiveDid);
|
|
216
220
|
if (cached && Date.now() - cached.at < FED_CONFIG_TTL)
|
|
217
221
|
return cached.config;
|
|
@@ -246,8 +250,8 @@ async function resolveFederationConfig(effectiveDid, store, env) {
|
|
|
246
250
|
// Read Master's SK for DID derivation and delegation signing
|
|
247
251
|
const masterSk = await store.getSetting(fedGroupId, "app:sk");
|
|
248
252
|
const masterPsk = (await store.getSetting(fedGroupId, "app:psk")) ?? undefined;
|
|
249
|
-
if (
|
|
250
|
-
result.authMaster =
|
|
253
|
+
if (cfg.authMaster) {
|
|
254
|
+
result.authMaster = cfg.authMaster;
|
|
251
255
|
}
|
|
252
256
|
else if (masterSk) {
|
|
253
257
|
result.authMaster = {
|
|
@@ -275,23 +279,25 @@ async function resolveFederationConfig(effectiveDid, store, env) {
|
|
|
275
279
|
* Passed via X-Arc-Domain header from arc-computer.
|
|
276
280
|
*/
|
|
277
281
|
export async function buildHandler(instanceDid, env, rpDomain, options) {
|
|
278
|
-
const
|
|
282
|
+
const cfg = resolveServiceConfig(env);
|
|
283
|
+
const rpName = cfg.appName ?? "DID Connect";
|
|
284
|
+
const store = new D1Store(cfg.db, {
|
|
279
285
|
...options,
|
|
280
286
|
// Migrated envs skip the runtime schema replay (see BlockletServiceEnv doc).
|
|
281
|
-
assumeMigrated:
|
|
287
|
+
assumeMigrated: cfg.skipRuntimeMigrate,
|
|
282
288
|
});
|
|
283
289
|
// Migrate connected_accounts provider (runs once per worker lifetime, all tenants)
|
|
284
|
-
await migrateConnectedAccountProvider(
|
|
285
|
-
// Single-tenant fast path:
|
|
290
|
+
await migrateConnectedAccountProvider(cfg.db);
|
|
291
|
+
// Single-tenant fast path: appSk in env, but only when no external instanceDid
|
|
286
292
|
// When a consumer passes X-Instance-Did via Service Binding, use multi-tenant path
|
|
287
|
-
// even if
|
|
288
|
-
if (
|
|
293
|
+
// even if appSk is set (service itself is single-tenant, consumers are multi-tenant)
|
|
294
|
+
if (cfg.appSk && !instanceDid) {
|
|
289
295
|
// Derive the correct instance DID using APP_WALLET_TYPE
|
|
290
|
-
const derivedDid = fromSecretKey(normalizeSecretKey(
|
|
296
|
+
const derivedDid = fromSecretKey(normalizeSecretKey(cfg.appSk), APP_WALLET_TYPE).address;
|
|
291
297
|
// Auto-migrate: if data exists under the old ROLE_ACCOUNT-derived DID,
|
|
292
298
|
// migrate it to the correct ROLE_APPLICATION-derived DID.
|
|
293
299
|
// This handles the service's own data after the wallet type fix.
|
|
294
|
-
await migrateSingleTenantDid(
|
|
300
|
+
await migrateSingleTenantDid(cfg.appSk, derivedDid, store, cfg.db);
|
|
295
301
|
const [brandingRaw, appName] = await Promise.all([
|
|
296
302
|
store.getSetting(derivedDid, "app:branding"),
|
|
297
303
|
store.getSetting(derivedDid, "app:name"),
|
|
@@ -299,18 +305,18 @@ export async function buildHandler(instanceDid, env, rpDomain, options) {
|
|
|
299
305
|
const appInfo = buildInstanceAppInfo({
|
|
300
306
|
brandingRaw,
|
|
301
307
|
appName,
|
|
302
|
-
}) ?? buildFallbackAppInfo(
|
|
303
|
-
const fed = await resolveFederationConfig(derivedDid, store,
|
|
308
|
+
}) ?? buildFallbackAppInfo(cfg);
|
|
309
|
+
const fed = await resolveFederationConfig(derivedDid, store, cfg);
|
|
304
310
|
return createAuthHandler({
|
|
305
|
-
db:
|
|
306
|
-
jwtSecret:
|
|
307
|
-
rpName
|
|
308
|
-
appSk:
|
|
309
|
-
appPsk:
|
|
311
|
+
db: cfg.db,
|
|
312
|
+
jwtSecret: cfg.jwtSecret,
|
|
313
|
+
rpName,
|
|
314
|
+
appSk: cfg.appSk,
|
|
315
|
+
appPsk: cfg.appPsk,
|
|
310
316
|
appInfo,
|
|
311
|
-
r2:
|
|
312
|
-
resendApiKey:
|
|
313
|
-
emailFrom:
|
|
317
|
+
r2: cfg.bucket,
|
|
318
|
+
resendApiKey: cfg.resendApiKey,
|
|
319
|
+
emailFrom: cfg.emailFrom,
|
|
314
320
|
rpID: rpDomain,
|
|
315
321
|
readSession: options?.readSession,
|
|
316
322
|
...fed,
|
|
@@ -319,17 +325,17 @@ export async function buildHandler(instanceDid, env, rpDomain, options) {
|
|
|
319
325
|
// Multi-tenant: instanceDid required
|
|
320
326
|
if (!instanceDid)
|
|
321
327
|
throw new Error("Missing X-Instance-Did header (multi-tenant mode)");
|
|
322
|
-
const { appSk, appPsk, appInfo } = await resolveConfig(instanceDid, store, buildFallbackConfig(
|
|
323
|
-
const fed = await resolveFederationConfig(instanceDid, store,
|
|
328
|
+
const { appSk, appPsk, appInfo } = await resolveConfig(instanceDid, store, buildFallbackConfig(cfg));
|
|
329
|
+
const fed = await resolveFederationConfig(instanceDid, store, cfg);
|
|
324
330
|
return createAuthHandler({
|
|
325
|
-
db:
|
|
326
|
-
jwtSecret:
|
|
327
|
-
rpName
|
|
331
|
+
db: cfg.db,
|
|
332
|
+
jwtSecret: cfg.jwtSecret,
|
|
333
|
+
rpName,
|
|
328
334
|
appSk,
|
|
329
335
|
appPsk,
|
|
330
336
|
appInfo,
|
|
331
337
|
instanceDid,
|
|
332
|
-
r2:
|
|
338
|
+
r2: cfg.bucket,
|
|
333
339
|
rpID: rpDomain,
|
|
334
340
|
readSession: options?.readSession,
|
|
335
341
|
...fed,
|
|
@@ -345,7 +351,7 @@ export async function buildHandler(instanceDid, env, rpDomain, options) {
|
|
|
345
351
|
// export class BlockletServiceRPC extends WorkerEntrypoint<BlockletServiceEnv> {
|
|
346
352
|
// private _impl?: BlockletServiceRPCImpl;
|
|
347
353
|
// private impl() {
|
|
348
|
-
// this._impl ??= new BlockletServiceRPCImpl(this.env.
|
|
354
|
+
// this._impl ??= new BlockletServiceRPCImpl(this.env.CONNECT_DB, this.env.CONNECT_JWT_SECRET);
|
|
349
355
|
// return this._impl;
|
|
350
356
|
// }
|
|
351
357
|
// verify(jwt: string) { return this.impl().verify(jwt); }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocklet-service.js","sourceRoot":"","sources":["../src/blocklet-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"blocklet-service.js","sourceRoot":"","sources":["../src/blocklet-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Worker runtime environment contract + resolver.
|
|
3
|
+
*
|
|
4
|
+
* Canonical variables use the `CONNECT_` prefix so they never collide with a
|
|
5
|
+
* host Worker's own `[vars]`/secrets/bindings. Legacy (unprefixed) names are
|
|
6
|
+
* still accepted for backward compatibility and marked `@deprecated`; they will
|
|
7
|
+
* be removed in the next major once all consumers (arc runtime) have migrated.
|
|
8
|
+
*
|
|
9
|
+
* All consumers should read config through {@link resolveServiceConfig} rather
|
|
10
|
+
* than touching `env.*` fields directly, so the dual-read lives in exactly one
|
|
11
|
+
* place. See `docs/env.md` for the full specification.
|
|
12
|
+
*/
|
|
13
|
+
import type { AuthEntrypointInterface } from "./identity/auth-entrypoint.js";
|
|
14
|
+
export interface BlockletServiceEnv {
|
|
15
|
+
/** D1 database binding. */
|
|
16
|
+
CONNECT_DB?: D1Database;
|
|
17
|
+
/** @deprecated use CONNECT_DB */
|
|
18
|
+
BLOCKLET_SERVICE_DB?: D1Database;
|
|
19
|
+
/** Optional R2 binding for avatar/logo storage. */
|
|
20
|
+
CONNECT_BUCKET?: R2Bucket;
|
|
21
|
+
/** @deprecated use CONNECT_BUCKET */
|
|
22
|
+
BLOCKLET_SERVICE_BUCKET?: R2Bucket;
|
|
23
|
+
/** Service Binding to master Worker for federation DID derivation. */
|
|
24
|
+
CONNECT_AUTH_MASTER?: AuthEntrypointInterface;
|
|
25
|
+
/** @deprecated use CONNECT_AUTH_MASTER */
|
|
26
|
+
AUTH_MASTER?: AuthEntrypointInterface;
|
|
27
|
+
/** Secret used to sign/verify session JWTs (HMAC-SHA256). Required. */
|
|
28
|
+
CONNECT_JWT_SECRET?: string;
|
|
29
|
+
/** @deprecated use CONNECT_JWT_SECRET */
|
|
30
|
+
JWT_SECRET?: string;
|
|
31
|
+
/** Single-tenant mode: app secret key. */
|
|
32
|
+
CONNECT_APP_SK?: string;
|
|
33
|
+
/** @deprecated use CONNECT_APP_SK */
|
|
34
|
+
APP_SK?: string;
|
|
35
|
+
/** Single-tenant mode: app permanent secret key (APP_PERMANENT_SK) for delegation. */
|
|
36
|
+
CONNECT_APP_PSK?: string;
|
|
37
|
+
/** @deprecated use CONNECT_APP_PSK */
|
|
38
|
+
APP_PSK?: string;
|
|
39
|
+
/** App display name — used for WebAuthn RP name and branding fallback. */
|
|
40
|
+
CONNECT_APP_NAME?: string;
|
|
41
|
+
/** @deprecated use CONNECT_APP_NAME */
|
|
42
|
+
APP_NAME?: string;
|
|
43
|
+
/** @deprecated use CONNECT_APP_NAME (RP name and app name are now unified) */
|
|
44
|
+
RP_NAME?: string;
|
|
45
|
+
/** Email login: Resend API key. */
|
|
46
|
+
CONNECT_RESEND_API_KEY?: string;
|
|
47
|
+
/** @deprecated use CONNECT_RESEND_API_KEY */
|
|
48
|
+
RESEND_API_KEY?: string;
|
|
49
|
+
/** Email login: from address. */
|
|
50
|
+
CONNECT_EMAIL_FROM?: string;
|
|
51
|
+
/** @deprecated use CONNECT_EMAIL_FROM */
|
|
52
|
+
EMAIL_FROM?: string;
|
|
53
|
+
/**
|
|
54
|
+
* "true" → the package's bundled migrations own the schema (`wrangler d1
|
|
55
|
+
* migrations apply` ran at deploy time); the runtime `D1Store.migrate()`
|
|
56
|
+
* replay is skipped entirely. Saves several serial D1 round-trips on every
|
|
57
|
+
* fresh isolate's first auth-handler build. ONLY set on migrated databases —
|
|
58
|
+
* with the flag, a missing schema fails loudly at the first real query
|
|
59
|
+
* instead of being silently bootstrapped.
|
|
60
|
+
*/
|
|
61
|
+
CONNECT_SKIP_RUNTIME_MIGRATE?: string;
|
|
62
|
+
/** @deprecated use CONNECT_SKIP_RUNTIME_MIGRATE */
|
|
63
|
+
SKIP_RUNTIME_MIGRATE?: string;
|
|
64
|
+
}
|
|
65
|
+
/** Normalized service config — canonical values resolved from `CONNECT_*` ?? legacy. */
|
|
66
|
+
export interface ResolvedServiceConfig {
|
|
67
|
+
db: D1Database;
|
|
68
|
+
bucket?: R2Bucket;
|
|
69
|
+
authMaster?: AuthEntrypointInterface;
|
|
70
|
+
jwtSecret: string;
|
|
71
|
+
appSk?: string;
|
|
72
|
+
appPsk?: string;
|
|
73
|
+
/** Unified app/RP display name (CONNECT_APP_NAME ?? APP_NAME ?? RP_NAME). */
|
|
74
|
+
appName?: string;
|
|
75
|
+
resendApiKey?: string;
|
|
76
|
+
emailFrom?: string;
|
|
77
|
+
skipRuntimeMigrate: boolean;
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Resolve the runtime config from a Worker `env`, preferring `CONNECT_*`
|
|
81
|
+
* canonical names and falling back to legacy names. `db`/`jwtSecret` are typed
|
|
82
|
+
* non-optional because the service cannot run without them — callers downstream
|
|
83
|
+
* still validate/throw if they are actually missing at runtime.
|
|
84
|
+
*/
|
|
85
|
+
export declare function resolveServiceConfig(env: BlockletServiceEnv): ResolvedServiceConfig;
|
|
86
|
+
//# sourceMappingURL=env-config.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-config.d.ts","sourceRoot":"","sources":["../src/env-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAE7E,MAAM,WAAW,kBAAkB;IAEjC,2BAA2B;IAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,iCAAiC;IACjC,mBAAmB,CAAC,EAAE,UAAU,CAAC;IAEjC,mDAAmD;IACnD,cAAc,CAAC,EAAE,QAAQ,CAAC;IAC1B,qCAAqC;IACrC,uBAAuB,CAAC,EAAE,QAAQ,CAAC;IAEnC,sEAAsE;IACtE,mBAAmB,CAAC,EAAE,uBAAuB,CAAC;IAC9C,0CAA0C;IAC1C,WAAW,CAAC,EAAE,uBAAuB,CAAC;IAGtC,uEAAuE;IACvE,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,yCAAyC;IACzC,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,0CAA0C;IAC1C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qCAAqC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,sFAAsF;IACtF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sCAAsC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,0EAA0E;IAC1E,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uCAAuC;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,mCAAmC;IACnC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,6CAA6C;IAC7C,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,iCAAiC;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,yCAAyC;IACzC,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;;;OAOG;IACH,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,mDAAmD;IACnD,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,wFAAwF;AACxF,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,kBAAkB,GAAG,qBAAqB,CAanF"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Worker runtime environment contract + resolver.
|
|
3
|
+
*
|
|
4
|
+
* Canonical variables use the `CONNECT_` prefix so they never collide with a
|
|
5
|
+
* host Worker's own `[vars]`/secrets/bindings. Legacy (unprefixed) names are
|
|
6
|
+
* still accepted for backward compatibility and marked `@deprecated`; they will
|
|
7
|
+
* be removed in the next major once all consumers (arc runtime) have migrated.
|
|
8
|
+
*
|
|
9
|
+
* All consumers should read config through {@link resolveServiceConfig} rather
|
|
10
|
+
* than touching `env.*` fields directly, so the dual-read lives in exactly one
|
|
11
|
+
* place. See `docs/env.md` for the full specification.
|
|
12
|
+
*/
|
|
13
|
+
/**
|
|
14
|
+
* Resolve the runtime config from a Worker `env`, preferring `CONNECT_*`
|
|
15
|
+
* canonical names and falling back to legacy names. `db`/`jwtSecret` are typed
|
|
16
|
+
* non-optional because the service cannot run without them — callers downstream
|
|
17
|
+
* still validate/throw if they are actually missing at runtime.
|
|
18
|
+
*/
|
|
19
|
+
export function resolveServiceConfig(env) {
|
|
20
|
+
return {
|
|
21
|
+
db: (env.CONNECT_DB ?? env.BLOCKLET_SERVICE_DB),
|
|
22
|
+
bucket: env.CONNECT_BUCKET ?? env.BLOCKLET_SERVICE_BUCKET,
|
|
23
|
+
authMaster: env.CONNECT_AUTH_MASTER ?? env.AUTH_MASTER,
|
|
24
|
+
jwtSecret: (env.CONNECT_JWT_SECRET ?? env.JWT_SECRET),
|
|
25
|
+
appSk: env.CONNECT_APP_SK ?? env.APP_SK,
|
|
26
|
+
appPsk: env.CONNECT_APP_PSK ?? env.APP_PSK,
|
|
27
|
+
appName: env.CONNECT_APP_NAME ?? env.APP_NAME ?? env.RP_NAME,
|
|
28
|
+
resendApiKey: env.CONNECT_RESEND_API_KEY ?? env.RESEND_API_KEY,
|
|
29
|
+
emailFrom: env.CONNECT_EMAIL_FROM ?? env.EMAIL_FROM,
|
|
30
|
+
skipRuntimeMigrate: (env.CONNECT_SKIP_RUNTIME_MIGRATE ?? env.SKIP_RUNTIME_MIGRATE) === "true",
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
//# sourceMappingURL=env-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-config.js","sourceRoot":"","sources":["../src/env-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAkFH;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAAC,GAAuB;IAC1D,OAAO;QACL,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,mBAAmB,CAAe;QAC7D,MAAM,EAAE,GAAG,CAAC,cAAc,IAAI,GAAG,CAAC,uBAAuB;QACzD,UAAU,EAAE,GAAG,CAAC,mBAAmB,IAAI,GAAG,CAAC,WAAW;QACtD,SAAS,EAAE,CAAC,GAAG,CAAC,kBAAkB,IAAI,GAAG,CAAC,UAAU,CAAW;QAC/D,KAAK,EAAE,GAAG,CAAC,cAAc,IAAI,GAAG,CAAC,MAAM;QACvC,MAAM,EAAE,GAAG,CAAC,eAAe,IAAI,GAAG,CAAC,OAAO;QAC1C,OAAO,EAAE,GAAG,CAAC,gBAAgB,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,OAAO;QAC5D,YAAY,EAAE,GAAG,CAAC,sBAAsB,IAAI,GAAG,CAAC,cAAc;QAC9D,SAAS,EAAE,GAAG,CAAC,kBAAkB,IAAI,GAAG,CAAC,UAAU;QACnD,kBAAkB,EAAE,CAAC,GAAG,CAAC,4BAA4B,IAAI,GAAG,CAAC,oBAAoB,CAAC,KAAK,MAAM;KAC9F,CAAC;AACJ,CAAC"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* Internally creates D1Store — callers never need to touch it.
|
|
6
6
|
*
|
|
7
7
|
* Usage:
|
|
8
|
-
* const auth = createAuthHandler({ db: env.
|
|
8
|
+
* const auth = createAuthHandler({ db: env.CONNECT_DB, jwtSecret: env.CONNECT_JWT_SECRET, rpName: "My App" });
|
|
9
9
|
* const r = await auth.route(req); // handles passkey/team/logout routes
|
|
10
10
|
* if (r) return r;
|
|
11
11
|
* const caller = await auth.verifyFull(req); // auth gate
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-handler.d.ts","sourceRoot":"","sources":["../../src/handlers/auth-handler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auth-handler.d.ts","sourceRoot":"","sources":["../../src/handlers/auth-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,15 +5,15 @@
|
|
|
5
5
|
* Internally creates D1Store — callers never need to touch it.
|
|
6
6
|
*
|
|
7
7
|
* Usage:
|
|
8
|
-
* const auth = createAuthHandler({ db: env.
|
|
8
|
+
* const auth = createAuthHandler({ db: env.CONNECT_DB, jwtSecret: env.CONNECT_JWT_SECRET, rpName: "My App" });
|
|
9
9
|
* const r = await auth.route(req); // handles passkey/team/logout routes
|
|
10
10
|
* if (r) return r;
|
|
11
11
|
* const caller = await auth.verifyFull(req); // auth gate
|
|
12
12
|
* if (!caller) return auth.unauthorized(req);
|
|
13
13
|
*/
|
|
14
14
|
import { fromSecretKey } from "@ocap/wallet";
|
|
15
|
-
import headerBundle from "../_generated/header-bundle-string.js";
|
|
16
15
|
import { evaluateAccess } from "../access/access-policy.js";
|
|
16
|
+
import { serveAsset } from "../asset-registry.js";
|
|
17
17
|
import { signJWT, verifyJWT } from "../identity/jwt.js";
|
|
18
18
|
import { getAppWallet, signResponse } from "../identity/sign-response.js";
|
|
19
19
|
import { APP_WALLET_TYPE, normalizeSecretKey } from "../identity/wallet-identity.js";
|
|
@@ -318,7 +318,8 @@ export function createAuthHandler(options) {
|
|
|
318
318
|
// off the passkey registration flow. The invite page and the two public
|
|
319
319
|
// team-handler endpoints it consumes perform their own authorization.
|
|
320
320
|
function isAuthInfrastructurePath(pathname) {
|
|
321
|
-
if (pathname
|
|
321
|
+
if (pathname.startsWith("/.well-known/service/assets/") ||
|
|
322
|
+
pathname === "/.well-known/service/login" ||
|
|
322
323
|
pathname === "/.well-known/service/invite" ||
|
|
323
324
|
pathname.startsWith("/.well-known/service/api/team/invitations/") ||
|
|
324
325
|
pathname.startsWith("/.well-known/service/api/did/") ||
|
|
@@ -420,14 +421,13 @@ export function createAuthHandler(options) {
|
|
|
420
421
|
if (r)
|
|
421
422
|
return r;
|
|
422
423
|
}
|
|
423
|
-
//
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
});
|
|
424
|
+
// Static browser assets (login/qr/did-address/header bundles) — public,
|
|
425
|
+
// content-hashed, immutable. In external mode the host's [assets] binding
|
|
426
|
+
// serves these and serveAsset() returns null (the bytes are DCE'd out).
|
|
427
|
+
{
|
|
428
|
+
const r = await serveAsset(request);
|
|
429
|
+
if (r)
|
|
430
|
+
return r;
|
|
431
431
|
}
|
|
432
432
|
// Avatar endpoint: public, deterministic (R2 → DB URL → DID SVG)
|
|
433
433
|
{
|