ugly-app 0.1.782 → 0.1.783
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/cli/auth/cloudflareOauth.d.ts +17 -9
- package/dist/cli/auth/cloudflareOauth.d.ts.map +1 -1
- package/dist/cli/auth/cloudflareOauth.js +66 -36
- package/dist/cli/auth/cloudflareOauth.js.map +1 -1
- package/dist/cli/auth/credentials.d.ts +16 -0
- package/dist/cli/auth/credentials.d.ts.map +1 -1
- package/dist/cli/auth/credentials.js +63 -0
- package/dist/cli/auth/credentials.js.map +1 -1
- package/dist/cli/index.js +29 -1
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/serverLogQueryApi.d.ts +5 -0
- package/dist/cli/serverLogQueryApi.d.ts.map +1 -1
- package/dist/cli/serverLogQueryApi.js +41 -5
- package/dist/cli/serverLogQueryApi.js.map +1 -1
- package/dist/cli/telemetryAuth.d.ts.map +1 -1
- package/dist/cli/telemetryAuth.js +11 -4
- package/dist/cli/telemetryAuth.js.map +1 -1
- package/dist/cli/version.d.ts +1 -1
- package/dist/cli/version.js +1 -1
- package/dist/native/server/binaries/installer.js +29 -3
- package/dist/native/server/binaries/installer.js.map +1 -1
- package/package.json +1 -1
- package/src/cli/auth/cloudflareOauth.ts +62 -34
- package/src/cli/auth/credentials.ts +59 -0
- package/src/cli/index.ts +53 -14
- package/src/cli/serverLogQueryApi.ts +54 -8
- package/src/cli/telemetryAuth.ts +13 -4
- package/src/cli/version.ts +1 -1
- package/src/native/server/binaries/installer.ts +30 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverLogQueryApi.js","sourceRoot":"","sources":["../../src/cli/serverLogQueryApi.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"serverLogQueryApi.js","sourceRoot":"","sources":["../../src/cli/serverLogQueryApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EACL,+BAA+B,EAC/B,sBAAsB,GAEvB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AASvD,MAAM,mBAAmB,GAAG,sCAAsC,CAAC;AAEnE;;;;;GAKG;AACH,KAAK,UAAU,gBAAgB,CAC7B,UAAoE,EACpE,OAOC;IAED,MAAM,EAAE,GAAoB,sBAAsB,EAAE,CAAC;IAErD,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,IAAI,GAAW,CAAC;IAChB,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACxB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACzB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;aAAM,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YAC/B,0EAA0E;YAC1E,wEAAwE;YACxE,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC1B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAClC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC1B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC3B,GAAG,GAAG,2BAA2B,KAAK,gCAAgC,CAAC;IACzE,CAAC;SAAM,IAAI,UAAU,KAAK,WAAW,EAAE,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC3B,GAAG,GAAG,wDAAwD,CAAC;IACjE,CAAC;SAAM,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QACrC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC3B,GAAG,GAAG,uDAAuD,CAAC;IAChE,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC3B,GAAG,GAAG,6DAA6D,CAAC;IACtE,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,iBAAiB,CACjC,EAAE,CAAC,SAAS,EACZ,GAAG,mBAAmB,aAAa,EAAE,CAAC,SAAS,gBAAgB,EAAE,CAAC,UAAU,QAAQ,EACpF,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,CAC1D,CAAC;IACF,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACZ,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QAC9C,2EAA2E;QAC3E,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,CAAC,MAAM,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IAC5E,CAAC;IACD,MAAM,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAEhC,CAAC;IACF,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,EAAE,CAAC;IAChD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,SAAS,GAAG,CAAC,CAAU,EAAW,EAAE;IACxC,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,CAAC,IAAI,IAAI,CAAC;IAC5C,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,CAAC;IACX,CAAC;AACH,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,GAAG,GAAG,CAAC,CAAU,EAAE,QAAQ,GAAG,EAAE,EAAU,EAAE;IAChD,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,QAAQ,CAAC;IAC/B,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,CAAC,CAAC;IACpC,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;IAChE,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,SAAS,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC7E,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF;4DAC4D;AAC5D,SAAS,QAAQ,CACf,UAAoE,EACpE,GAA4B;IAE5B,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QAC9B,OAAO;YACL,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC;YACd,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC;YACvB,IAAI,EAAE;gBACJ,SAAS,EAAE,GAAG,CAAC,YAAY,CAAC;gBAC5B,MAAM,EAAE,GAAG,CAAC,SAAS,CAAC;gBACtB,SAAS,EAAE,GAAG,CAAC,YAAY,CAAC;gBAC5B,UAAU,EAAE,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;aACzC;SACF,CAAC;IACJ,CAAC;IACD,IAAI,UAAU,KAAK,WAAW,EAAE,CAAC;QAC/B,OAAO;YACL,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC;YACd,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC;YACvB,IAAI,EAAE;gBACJ,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC;gBACjB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC;gBACrB,QAAQ,EAAE,GAAG,CAAC,UAAU,CAAC;gBACzB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC;gBACrB,UAAU,EAAE,GAAG,CAAC,aAAa,CAAC;gBAC9B,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC;aACpB;SACF,CAAC;IACJ,CAAC;IACD,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QAC9B,OAAO;YACL,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC;YACd,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC;YACvB,IAAI,EAAE;gBACJ,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC;gBACnB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC;gBACrB,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC;gBACjB,MAAM,EAAE,GAAG,CAAC,SAAS,CAAC;gBACtB,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC;gBACf,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC;gBACvB,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC;gBACnB,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;aACnC;SACF,CAAC;IACJ,CAAC;IACD,OAAO;QACL,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC;QACd,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC;QACvB,IAAI,EAAE;YACJ,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC;YACjB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC;YACrB,MAAM,EAAE,GAAG,CAAC,SAAS,CAAC;YACtB,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC;YACf,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC;YACjB,WAAW,EAAE,GAAG,CAAC,SAAS,CAAC;YAC3B,aAAa,EAAE,GAAG,CAAC,gBAAgB,CAAC;YACpC,UAAU,EAAE,GAAG,CAAC,YAAY,CAAC;YAC7B,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAClC,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SAC7B;KACF,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,OAAgB;IACvC,IAAI,OAAO,YAAY,IAAI,EAAE,CAAC;QAC5B,OAAO,OAAO,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAClE,CAAC;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC5E,CAAC;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,cAAc,CAAC,GAA4B;IAClD,MAAM,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IAC3C,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAA4B,CAAC;IAC5D,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAChE,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACrC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACpE,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC;QACzB,CAAC,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QAClE,CAAC,CAAC,EAAE,CAAC;IACP,OAAO,GAAG,EAAE,IAAI,KAAK,IAAI,MAAM,IAAI,OAAO,GAAG,MAAM,GAAG,KAAK,EAAE,CAAC;AAChE,CAAC;AAED,SAAS,aAAa,CAAC,GAA4B;IACjD,MAAM,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IAC3C,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAA4B,CAAC;IAC5D,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAClC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5E,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACpE,OAAO,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC;AACtC,CAAC;AAED,SAAS,iBAAiB,CAAC,GAA4B;IACrD,MAAM,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IAC3C,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAA4B,CAAC;IAC5D,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,KAAK,IAAI,KAAK,OAAO,EAAE,CAAC,CAAC;IAE7C,IAAI,IAAI,CAAC,QAAQ,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;IACnE,IAAI,IAAI,CAAC,QAAQ,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;IACjE,IAAI,IAAI,CAAC,KAAK,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;IAC1D,IAAI,IAAI,CAAC,eAAe,CAAC;QACvB,KAAK,CAAC,IAAI,CAAC,iBAAiB,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC;IAE5D,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5B,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,MAAM,KAAK,IAAI;YAAE,KAAK,CAAC,IAAI,CAAC,cAAc,MAAM,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,IAAI,CAAC,YAAY,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,iBAAiB,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC;IAE/E,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC;IAC1D,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3D,KAAK,CAAC,IAAI,CAAC,mBAAmB,YAAY,CAAC,MAAM,IAAI,CAAC,CAAC;QACvD,KAAK,MAAM,KAAK,IAAI,YAAyC,EAAE,CAAC;YAC9D,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;YAClD,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACxD,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;YAClC,KAAK,CAAC,IAAI,CAAC,OAAO,KAAK,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,kBAAkB,CAAC,GAA4B;IACtD,MAAM,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IAC3C,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAA4B,CAAC;IAC5D,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnC,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC3D,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5E,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACpE,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC;QACvB,CAAC,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QAClE,CAAC,CAAC,EAAE,CAAC;IACP,OAAO,GAAG,EAAE,IAAI,MAAM,IAAI,IAAI,KAAK,MAAM,IAAI,KAAK,IAAI,EAAE,GAAG,GAAG,EAAE,CAAC;AACnE,CAAC;AAED,SAAS,cAAc,CAAC,GAA4B;IAClD,MAAM,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IAC3C,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAA4B,CAAC;IAC5D,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACpE,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;IACjC,MAAM,OAAO,GACX,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC;QACjE,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;QAC7B,CAAC,CAAC,EAAE,CAAC;IACT,OAAO,GAAG,EAAE,IAAI,IAAI,GAAG,MAAM,GAAG,OAAO,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,GAA6D;IAC3E,QAAQ,EAAE,cAAc;IACxB,OAAO,EAAE,aAAa;IACtB,cAAc,EAAE,iBAAiB;IACjC,SAAS,EAAE,kBAAkB;IAC7B,QAAQ,EAAE,cAAc;CACzB,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,UAA2B,EAC3B,OAWC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;IAElC,4EAA4E;IAC5E,uEAAuE;IACvE,IACE,UAAU,KAAK,UAAU;QACzB,UAAU,KAAK,gBAAgB;QAC/B,UAAU,KAAK,WAAW;QAC1B,UAAU,KAAK,UAAU,EACzB,CAAC;QACD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACxE,6EAA6E;QAC7E,6EAA6E;QAC7E,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAC9E,IAAI,KAAK,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE;YAC7C,KAAK,EAAE,UAAU;YACjB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC,CAAC;QACH,IAAI,MAAM,EAAE,CAAC;YACX,KAAK,GAAG,KAAK;iBACV,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;gBACd,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAA4B,CAAC;gBAC5D,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAC3C,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACrB,CAAC;QACD,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC;QAChC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,uBAAuB,UAAU,GAAG,CAAC,CAAC;YAClD,OAAO;QACT,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,IAAI,OAAO,CAAC,IAAI;gBAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;;gBAC9C,OAAO,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACpE,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,gBAAgB,GACpB,OAAO,CAAC,gBAAgB,IAAI,+BAA+B,EAAE,CAAC;IAChE,WAAW,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAClC,MAAM,MAAM,EAAE,CAAC;IACf,IAAI,CAAC;QACH,2EAA2E;QAC3E,2CAA2C;QAC3C,MAAM,MAAM,GAAc,CAAC,KAAK,CAAC,CAAC;QAClC,MAAM,GAAG,GAAG,MAAM,OAAO,CACvB,mCAAmC,UAAU,kCAAkC,EAC/E,MAAM,CACP,CAAC;QACF,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC;QAEzC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,uBAAuB,UAAU,GAAG,CAAC,CAAC;YAClD,OAAO;QACT,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACjB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,cAAc,CAAC;gBACrD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YACxB,CAAC;QACH,CAAC;IACH,CAAC;YAAS,CAAC;QACT,MAAM,SAAS,EAAE,CAAC;IACpB,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetryAuth.d.ts","sourceRoot":"","sources":["../../src/cli/telemetryAuth.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACrC,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"telemetryAuth.d.ts","sourceRoot":"","sources":["../../src/cli/telemetryAuth.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACrC,OAAO,CAAC,QAAQ,CAAC,CAyCnB"}
|
|
@@ -31,13 +31,20 @@ export async function cloudflareD1Fetch(projectId, url, init) {
|
|
|
31
31
|
});
|
|
32
32
|
let res = await send(token);
|
|
33
33
|
// The cached token's local expiry can't be trusted — force a refresh on a REAL
|
|
34
|
-
// auth failure and retry once. forceRefresh
|
|
35
|
-
//
|
|
36
|
-
// the
|
|
34
|
+
// auth failure and retry once. forceRefresh runs under the credentials lock and
|
|
35
|
+
// dedupes on `token` (the value that just 401'd): if another process already
|
|
36
|
+
// rotated the single-use refresh token, it reuses the fresh one instead of
|
|
37
|
+
// burning the chain. This fixes the "works right after login, 401s later" flaw.
|
|
37
38
|
if (res.status === 401 || res.status === 403) {
|
|
38
|
-
const refreshed = await forceRefreshCloudflareCredentials();
|
|
39
|
+
const refreshed = await forceRefreshCloudflareCredentials(token);
|
|
39
40
|
if (refreshed?.accessToken)
|
|
40
41
|
res = await send(refreshed.accessToken);
|
|
42
|
+
// Still unauthorized after a refresh → the OAuth session is genuinely dead
|
|
43
|
+
// (revoked, or the refresh token expired). Surface ONE actionable error
|
|
44
|
+
// instead of an opaque `401 Authentication error` bubbling up from the caller.
|
|
45
|
+
if (res.status === 401 || res.status === 403) {
|
|
46
|
+
throw new Error('Cloudflare session expired or was revoked. Run `ugly-app login cloudflare` and retry.');
|
|
47
|
+
}
|
|
41
48
|
}
|
|
42
49
|
return res;
|
|
43
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetryAuth.js","sourceRoot":"","sources":["../../src/cli/telemetryAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,EAC7B,iCAAiC,GAClC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,SAAiB,EACjB,GAAW,EACX,IAAsC;IAEtC,MAAM,KAAK,GAAG,MAAM,6BAA6B,EAAE,CAAC;IACpD,MAAM,KAAK,GACT,KAAK,EAAE,WAAW;QAClB,CAAC,MAAM,SAAS,CAAC,oBAAoB,SAAS,EAAE,CAAC,CAAC;QAClD,CAAC,MAAM,SAAS,CAAC,2BAA2B,SAAS,EAAE,CAAC,CAAC,CAAC;IAC5D,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CACb,oCAAoC,SAAS,8EAA8E,CAC5H,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,CAAS,EAAqB,EAAE,CAC5C,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE;QACpB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,CAAC,EAAE;YAC5B,cAAc,EAAE,kBAAkB;YAClC,MAAM,EAAE,kBAAkB;SAC3B;QACD,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,CAAC,CAAC;IAEL,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5B,+EAA+E;IAC/E
|
|
1
|
+
{"version":3,"file":"telemetryAuth.js","sourceRoot":"","sources":["../../src/cli/telemetryAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,EAC7B,iCAAiC,GAClC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,SAAiB,EACjB,GAAW,EACX,IAAsC;IAEtC,MAAM,KAAK,GAAG,MAAM,6BAA6B,EAAE,CAAC;IACpD,MAAM,KAAK,GACT,KAAK,EAAE,WAAW;QAClB,CAAC,MAAM,SAAS,CAAC,oBAAoB,SAAS,EAAE,CAAC,CAAC;QAClD,CAAC,MAAM,SAAS,CAAC,2BAA2B,SAAS,EAAE,CAAC,CAAC,CAAC;IAC5D,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CACb,oCAAoC,SAAS,8EAA8E,CAC5H,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,CAAS,EAAqB,EAAE,CAC5C,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE;QACpB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,CAAC,EAAE;YAC5B,cAAc,EAAE,kBAAkB;YAClC,MAAM,EAAE,kBAAkB;SAC3B;QACD,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,CAAC,CAAC;IAEL,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5B,+EAA+E;IAC/E,gFAAgF;IAChF,6EAA6E;IAC7E,2EAA2E;IAC3E,gFAAgF;IAChF,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,iCAAiC,CAAC,KAAK,CAAC,CAAC;QACjE,IAAI,SAAS,EAAE,WAAW;YAAE,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACpE,2EAA2E;QAC3E,wEAAwE;QACxE,+EAA+E;QAC/E,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CACb,uFAAuF,CACxF,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/dist/cli/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const CLI_VERSION = "0.1.
|
|
1
|
+
export declare const CLI_VERSION = "0.1.783";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/cli/version.js
CHANGED
|
@@ -31,7 +31,7 @@ async function doInstall(root, d, onProgress) {
|
|
|
31
31
|
const destDir = join(root, d.name, d.version, PA);
|
|
32
32
|
const exe = exeName(d.exe);
|
|
33
33
|
onProgress?.({ name: d.name, phase: 'download', pct: 0 });
|
|
34
|
-
const buf = await download(d);
|
|
34
|
+
const buf = await download(d, onProgress);
|
|
35
35
|
const got = createHash('sha256').update(buf).digest('hex');
|
|
36
36
|
if (d.sha256 && got !== d.sha256) {
|
|
37
37
|
throw new Error(`[binaries] ${d.name}: sha256 mismatch (expected ${d.sha256}, got ${got})`);
|
|
@@ -94,8 +94,14 @@ async function doInstall(root, d, onProgress) {
|
|
|
94
94
|
* timeout a stalled connection hangs forever — the single-flight install promise
|
|
95
95
|
* never settles. Fail fast + retry instead, and throw a descriptive error on final
|
|
96
96
|
* failure.
|
|
97
|
+
*
|
|
98
|
+
* Streams the response body so `onProgress` can report real byte-level progress
|
|
99
|
+
* during the download — the slow part on a fresh install. Download occupies the
|
|
100
|
+
* first half of the bar (0–50); `doInstall` then emits extract (50) and done (100).
|
|
101
|
+
* When the server sends no Content-Length (or exposes no stream) we fall back to a
|
|
102
|
+
* single buffered read with no mid-download progress.
|
|
97
103
|
*/
|
|
98
|
-
async function download(d) {
|
|
104
|
+
async function download(d, onProgress) {
|
|
99
105
|
const ATTEMPTS = 3;
|
|
100
106
|
const TIMEOUT_MS = 120_000;
|
|
101
107
|
let lastErr;
|
|
@@ -104,7 +110,27 @@ async function download(d) {
|
|
|
104
110
|
const res = await fetch(d.url, { signal: AbortSignal.timeout(TIMEOUT_MS) });
|
|
105
111
|
if (!res.ok)
|
|
106
112
|
throw new Error(`[binaries] ${d.name}: download HTTP ${res.status} from ${d.url}`);
|
|
107
|
-
|
|
113
|
+
const total = Number(res.headers.get('content-length')) || 0;
|
|
114
|
+
if (!res.body || total <= 0)
|
|
115
|
+
return Buffer.from(await res.arrayBuffer());
|
|
116
|
+
const reader = res.body.getReader();
|
|
117
|
+
const chunks = [];
|
|
118
|
+
let received = 0;
|
|
119
|
+
let lastPct = -1;
|
|
120
|
+
for (;;) {
|
|
121
|
+
const { done, value } = await reader.read();
|
|
122
|
+
if (done)
|
|
123
|
+
break;
|
|
124
|
+
const chunk = Buffer.from(value);
|
|
125
|
+
chunks.push(chunk);
|
|
126
|
+
received += chunk.length;
|
|
127
|
+
const pct = Math.min(50, Math.round((received / total) * 50));
|
|
128
|
+
if (pct !== lastPct) {
|
|
129
|
+
lastPct = pct;
|
|
130
|
+
onProgress?.({ name: d.name, phase: 'download', pct });
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
return Buffer.concat(chunks);
|
|
108
134
|
}
|
|
109
135
|
catch (e) {
|
|
110
136
|
lastErr = e;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installer.js","sourceRoot":"","sources":["../../../../src/native/server/binaries/installer.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,kFAAkF;AAClF,uEAAuE;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EACL,SAAS,EACT,aAAa,EACb,MAAM,EACN,SAAS,EACT,UAAU,EACV,WAAW,EACX,QAAQ,GACT,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/C,MAAM,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAQtC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA2B,CAAC;AACpD,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;AACjD,MAAM,OAAO,GAAG,CAAC,GAAW,EAAU,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAE7F,gFAAgF;AAChF,MAAM,UAAU,OAAO,CACrB,IAAY,EACZ,CAAiB,EACjB,UAAkC;IAElC,MAAM,GAAG,GAAG,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;IAC7C,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC;SACrC,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE;QACpB,2EAA2E;QAC3E,6EAA6E;QAC7E,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACxD,MAAM,CAAC,CAAC;IACV,CAAC,CAAC;SACD,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACvC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACrB,OAAO,CAAC,CAAC;AACX,CAAC;AAED,KAAK,UAAU,SAAS,CACtB,IAAY,EACZ,CAAiB,EACjB,UAAkC;IAElC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAClD,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAE3B,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"installer.js","sourceRoot":"","sources":["../../../../src/native/server/binaries/installer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ugly-app",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.783",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"comment:files": "Allowlist what ships to npm. dist = runtime; src = sourcemap targets (dist/*.js.map reference ../../src/); templates = CLI scaffold. Everything else at repo root (.pgdata local Postgres, coverage, assets/icons sources, test/, test-results/) is excluded by omission. The !negations strip the scaffold's installed deps + cruft (templates/node_modules is 200MB+ and must never ship). package.json/README/LICENSE ship automatically.",
|
|
6
6
|
"files": [
|
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
type CloudflareCredentials,
|
|
7
7
|
getCloudflareCredentials,
|
|
8
8
|
setCloudflareCredentials,
|
|
9
|
+
withCredentialsLock,
|
|
9
10
|
} from './credentials.js';
|
|
10
11
|
import { parseOrLog, parseOrThrow } from '../../shared/parseWithZod.js';
|
|
11
12
|
|
|
@@ -221,51 +222,78 @@ export async function refreshCloudflareToken(
|
|
|
221
222
|
}
|
|
222
223
|
|
|
223
224
|
/**
|
|
224
|
-
*
|
|
225
|
-
*
|
|
226
|
-
*
|
|
225
|
+
* How far before local `expiresAt` we proactively refresh. Bumped from 60s to
|
|
226
|
+
* 5 min so a token doesn't expire mid-operation (a multi-step publish can outlive
|
|
227
|
+
* a 60s window). The real durability comes from the single-flight lock below.
|
|
228
|
+
*/
|
|
229
|
+
const REFRESH_SKEW_MS = 300_000;
|
|
230
|
+
|
|
231
|
+
/**
|
|
232
|
+
* Return a fresh Cloudflare access token, refreshing when within REFRESH_SKEW_MS
|
|
233
|
+
* of expiry. The refresh runs inside the cross-process credentials lock and
|
|
234
|
+
* re-reads inside it, so concurrent callers don't double-consume the single-use
|
|
235
|
+
* refresh token. Returns `undefined` when not signed in or the refresh failed.
|
|
227
236
|
*/
|
|
228
237
|
export async function getFreshCloudflareCredentials(): Promise<CloudflareCredentials | undefined> {
|
|
229
238
|
const creds = await getCloudflareCredentials();
|
|
230
239
|
if (!creds) return undefined;
|
|
231
|
-
if (creds.expiresAt > Date.now() +
|
|
240
|
+
if (creds.expiresAt > Date.now() + REFRESH_SKEW_MS) return creds;
|
|
232
241
|
if (!creds.refreshToken) return undefined;
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
242
|
+
return withCredentialsLock(async () => {
|
|
243
|
+
// Re-read INSIDE the lock — another process/waiter may have just refreshed,
|
|
244
|
+
// in which case we reuse its token instead of consuming the rotated one.
|
|
245
|
+
const cur = await getCloudflareCredentials();
|
|
246
|
+
if (!cur) return undefined;
|
|
247
|
+
if (cur.expiresAt > Date.now() + REFRESH_SKEW_MS) return cur;
|
|
248
|
+
if (!cur.refreshToken) return undefined;
|
|
249
|
+
const refreshed = await refreshCloudflareToken(cur.refreshToken);
|
|
250
|
+
if (!refreshed) return undefined;
|
|
251
|
+
const next: CloudflareCredentials = {
|
|
252
|
+
...cur,
|
|
253
|
+
accessToken: refreshed.accessToken,
|
|
254
|
+
refreshToken: refreshed.refreshToken,
|
|
255
|
+
expiresAt: refreshed.expiresAt,
|
|
256
|
+
};
|
|
257
|
+
await setCloudflareCredentials(next);
|
|
258
|
+
return next;
|
|
259
|
+
});
|
|
243
260
|
}
|
|
244
261
|
|
|
245
262
|
/**
|
|
246
263
|
* FORCE a token refresh (ignoring the local `expiresAt`) and persist the result.
|
|
247
264
|
* For callers that hit a real 401 despite a locally-"valid" token — the cached
|
|
248
|
-
* `expiresAt` can lie (revoked token, or a mis-computed expiry).
|
|
249
|
-
*
|
|
250
|
-
*
|
|
251
|
-
*
|
|
252
|
-
* (
|
|
265
|
+
* `expiresAt` can lie (revoked token, or a mis-computed expiry).
|
|
266
|
+
*
|
|
267
|
+
* Runs inside the cross-process credentials lock. Pass `staleToken` — the access
|
|
268
|
+
* token that just 401'd — so that if another process already rotated the token
|
|
269
|
+
* out from under us (the on-disk access token no longer matches), we return the
|
|
270
|
+
* fresh token WITHOUT consuming the single-use refresh token a second time. This
|
|
271
|
+
* is the dedupe that collapses concurrent 401 storms into a single refresh and
|
|
272
|
+
* stops the refresh chain from being breach-invalidated.
|
|
273
|
+
*
|
|
274
|
+
* Persisting the rotated refresh token is mandatory (Cloudflare rotates them
|
|
275
|
+
* single-use). Returns `undefined` if there's no session or the refresh token is
|
|
276
|
+
* dead (caller must prompt re-login).
|
|
253
277
|
*/
|
|
254
|
-
export async function forceRefreshCloudflareCredentials(
|
|
255
|
-
|
|
256
|
-
> {
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
278
|
+
export async function forceRefreshCloudflareCredentials(
|
|
279
|
+
staleToken?: string,
|
|
280
|
+
): Promise<CloudflareCredentials | undefined> {
|
|
281
|
+
return withCredentialsLock(async () => {
|
|
282
|
+
const creds = await getCloudflareCredentials();
|
|
283
|
+
if (!creds?.refreshToken) return undefined;
|
|
284
|
+
// Someone else already rotated it — reuse instead of double-consuming.
|
|
285
|
+
if (staleToken && creds.accessToken !== staleToken) return creds;
|
|
286
|
+
const refreshed = await refreshCloudflareToken(creds.refreshToken);
|
|
287
|
+
if (!refreshed) return undefined;
|
|
288
|
+
const next: CloudflareCredentials = {
|
|
289
|
+
...creds,
|
|
290
|
+
accessToken: refreshed.accessToken,
|
|
291
|
+
refreshToken: refreshed.refreshToken,
|
|
292
|
+
expiresAt: refreshed.expiresAt,
|
|
293
|
+
};
|
|
294
|
+
await setCloudflareCredentials(next);
|
|
295
|
+
return next;
|
|
296
|
+
});
|
|
269
297
|
}
|
|
270
298
|
|
|
271
299
|
const cfUserResponseSchema = z
|
|
@@ -75,6 +75,65 @@ export async function writeCredentials(creds: Credentials): Promise<void> {
|
|
|
75
75
|
await fs.rename(tmp, file);
|
|
76
76
|
}
|
|
77
77
|
|
|
78
|
+
/**
|
|
79
|
+
* Serialize a read→(refresh)→write critical section on the credentials file
|
|
80
|
+
* across processes. Cloudflare rotates the OAuth refresh token single-use, so two
|
|
81
|
+
* processes (e.g. `ugly-app errors` + the ugly-studio publish sidecar, or two
|
|
82
|
+
* concurrent CLIs) that both refresh with the same refresh token cause Cloudflare
|
|
83
|
+
* to breach-invalidate the whole chain — leaving a dead access token with a
|
|
84
|
+
* still-future `expiresAt`. Holding this lock across the whole refresh lets the
|
|
85
|
+
* second waiter re-read the freshly-rotated token instead of double-consuming it.
|
|
86
|
+
*
|
|
87
|
+
* Implementation: an atomic `O_CREAT|O_EXCL` create of a sibling `.lock` file
|
|
88
|
+
* (works cross-process on local filesystems — this is a single-machine dev tool).
|
|
89
|
+
* A crashed holder can't wedge login forever: a lock older than STALE_MS is broken.
|
|
90
|
+
* The callback MUST use the lock-free `readCredentials`/`writeCredentials` (never
|
|
91
|
+
* re-enter this lock).
|
|
92
|
+
*/
|
|
93
|
+
export async function withCredentialsLock<T>(fn: () => Promise<T>): Promise<T> {
|
|
94
|
+
const lock = `${credentialsPath()}.lock`;
|
|
95
|
+
const dir = path.dirname(lock);
|
|
96
|
+
await fs.mkdir(dir, { recursive: true, mode: 0o700 });
|
|
97
|
+
const STALE_MS = 15_000;
|
|
98
|
+
const MAX_WAIT_MS = 10_000;
|
|
99
|
+
const started = Date.now();
|
|
100
|
+
// eslint-disable-next-line no-constant-condition
|
|
101
|
+
while (true) {
|
|
102
|
+
try {
|
|
103
|
+
const fh = await fs.open(lock, 'wx', 0o600);
|
|
104
|
+
try {
|
|
105
|
+
await fh.writeFile(`${process.pid} ${Date.now()}`);
|
|
106
|
+
} finally {
|
|
107
|
+
await fh.close();
|
|
108
|
+
}
|
|
109
|
+
break; // acquired
|
|
110
|
+
} catch (err) {
|
|
111
|
+
if ((err as NodeJS.ErrnoException).code !== 'EEXIST') throw err;
|
|
112
|
+
// Break a stale lock left by a crashed holder.
|
|
113
|
+
try {
|
|
114
|
+
const st = await fs.stat(lock);
|
|
115
|
+
if (Date.now() - st.mtimeMs > STALE_MS) {
|
|
116
|
+
await fs.rm(lock, { force: true });
|
|
117
|
+
continue;
|
|
118
|
+
}
|
|
119
|
+
} catch {
|
|
120
|
+
// lock vanished between open and stat — retry immediately
|
|
121
|
+
continue;
|
|
122
|
+
}
|
|
123
|
+
if (Date.now() - started > MAX_WAIT_MS) {
|
|
124
|
+
// Give up waiting rather than hang login forever; proceed best-effort.
|
|
125
|
+
break;
|
|
126
|
+
}
|
|
127
|
+
await new Promise((r) => setTimeout(r, 50 + Math.floor((Date.now() - started) / 20)));
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
try {
|
|
131
|
+
return await fn();
|
|
132
|
+
} finally {
|
|
133
|
+
await fs.rm(lock, { force: true }).catch(() => {});
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
|
|
78
137
|
export async function getCloudflareCredentials(): Promise<CloudflareCredentials | undefined> {
|
|
79
138
|
const creds = await readCredentials();
|
|
80
139
|
return creds.cloudflare;
|
package/src/cli/index.ts
CHANGED
|
@@ -289,25 +289,64 @@ program
|
|
|
289
289
|
}
|
|
290
290
|
});
|
|
291
291
|
|
|
292
|
+
/** Parse a `--since` duration (e.g. `30m`, `24h`, `7d`, `90s`) into a cutoff epoch
|
|
293
|
+
* (ms). Returns undefined for an unparseable value so the caller can warn. */
|
|
294
|
+
function parseSinceToMs(since: string): number | undefined {
|
|
295
|
+
const m = /^(\d+)\s*(s|m|h|d)$/.exec(since.trim());
|
|
296
|
+
if (!m) return undefined;
|
|
297
|
+
const n = parseInt(m[1]!, 10);
|
|
298
|
+
const unit = { s: 1_000, m: 60_000, h: 3_600_000, d: 86_400_000 }[m[2]!]!;
|
|
299
|
+
return Date.now() - n * unit;
|
|
300
|
+
}
|
|
301
|
+
|
|
292
302
|
program
|
|
293
303
|
.command('errors')
|
|
294
|
-
.description("Query error logs from this project's PROD
|
|
304
|
+
.description("Query error logs from this project's PROD Cloudflare D1 (errorLog)")
|
|
295
305
|
.option('--limit <n>', 'Max entries to show', '50')
|
|
296
306
|
.option('--level <lvl>', 'Filter by level (log/info/warn/error/debug)')
|
|
307
|
+
.option('--source <src>', "Filter by source (e.g. browser, server, coding-task)")
|
|
308
|
+
.option('--all-sources', "Include coding-task rows (excluded by default — they flood the log)")
|
|
309
|
+
.option('--user <id>', 'Filter by user_id')
|
|
310
|
+
.option('--since <dur>', 'Only errors newer than this (e.g. 30m, 24h, 7d)')
|
|
311
|
+
.option('--grep <re>', 'Only show entries whose message matches this regex (client-side)')
|
|
297
312
|
.option('--json', 'Output as JSON')
|
|
298
|
-
.action(
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
313
|
+
.action(
|
|
314
|
+
async (opts: {
|
|
315
|
+
limit?: string;
|
|
316
|
+
level?: string;
|
|
317
|
+
source?: string;
|
|
318
|
+
allSources?: boolean;
|
|
319
|
+
user?: string;
|
|
320
|
+
since?: string;
|
|
321
|
+
grep?: string;
|
|
322
|
+
json?: boolean;
|
|
323
|
+
}) => {
|
|
324
|
+
try {
|
|
325
|
+
let sinceMs: number | undefined;
|
|
326
|
+
if (opts.since) {
|
|
327
|
+
sinceMs = parseSinceToMs(opts.since);
|
|
328
|
+
if (sinceMs === undefined) {
|
|
329
|
+
console.error(`Invalid --since "${opts.since}". Use e.g. 30m, 24h, 7d.`);
|
|
330
|
+
process.exit(1);
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
const { queryServerLogsApi } = await import('./serverLogQueryApi.js');
|
|
334
|
+
await queryServerLogsApi('errorLog', {
|
|
335
|
+
limit: opts.limit ? parseInt(opts.limit, 10) : 50,
|
|
336
|
+
level: opts.level,
|
|
337
|
+
json: opts.json,
|
|
338
|
+
source: opts.source,
|
|
339
|
+
allSources: opts.allSources,
|
|
340
|
+
userId: opts.user,
|
|
341
|
+
sinceMs,
|
|
342
|
+
grep: opts.grep,
|
|
343
|
+
});
|
|
344
|
+
} catch (e) {
|
|
345
|
+
console.error((e as Error).message);
|
|
346
|
+
process.exit(1);
|
|
347
|
+
}
|
|
348
|
+
},
|
|
349
|
+
);
|
|
311
350
|
|
|
312
351
|
program
|
|
313
352
|
.command('log <emailOrUserId>')
|
|
@@ -24,18 +24,42 @@ const CLOUDFLARE_API_BASE = 'https://api.cloudflare.com/client/v4';
|
|
|
24
24
|
*/
|
|
25
25
|
async function queryTelemetryD1(
|
|
26
26
|
collection: 'errorLog' | 'feedbackReport' | 'workerRun' | 'eventLog',
|
|
27
|
-
options: {
|
|
27
|
+
options: {
|
|
28
|
+
limit: number;
|
|
29
|
+
level?: string | undefined;
|
|
30
|
+
source?: string | undefined;
|
|
31
|
+
allSources?: boolean | undefined;
|
|
32
|
+
userId?: string | undefined;
|
|
33
|
+
sinceMs?: number | undefined;
|
|
34
|
+
},
|
|
28
35
|
): Promise<Record<string, unknown>[]> {
|
|
29
36
|
const d1: ProdTelemetryD1 = resolveProdTelemetryD1();
|
|
30
37
|
|
|
31
38
|
const params: unknown[] = [];
|
|
32
39
|
let sql: string;
|
|
33
40
|
if (collection === 'errorLog') {
|
|
34
|
-
|
|
41
|
+
const conds: string[] = [];
|
|
35
42
|
if (options.level) {
|
|
36
|
-
|
|
43
|
+
conds.push('level = ?');
|
|
37
44
|
params.push(options.level);
|
|
38
45
|
}
|
|
46
|
+
if (options.source) {
|
|
47
|
+
conds.push('source = ?');
|
|
48
|
+
params.push(options.source);
|
|
49
|
+
} else if (!options.allSources) {
|
|
50
|
+
// The `coding-task` source is a 74:1 flood (background-task console noise
|
|
51
|
+
// with user_id=null) that buries real errors — exclude it unless asked.
|
|
52
|
+
conds.push("source != 'coding-task'");
|
|
53
|
+
}
|
|
54
|
+
if (options.userId) {
|
|
55
|
+
conds.push('user_id = ?');
|
|
56
|
+
params.push(options.userId);
|
|
57
|
+
}
|
|
58
|
+
if (options.sinceMs !== undefined) {
|
|
59
|
+
conds.push('created > ?');
|
|
60
|
+
params.push(options.sinceMs);
|
|
61
|
+
}
|
|
62
|
+
const where = conds.length ? `WHERE ${conds.join(' AND ')}` : '';
|
|
39
63
|
params.push(options.limit);
|
|
40
64
|
sql = `SELECT * FROM error_log ${where} ORDER BY created DESC LIMIT ?`;
|
|
41
65
|
} else if (collection === 'workerRun') {
|
|
@@ -281,6 +305,12 @@ export async function queryServerLogsApi(
|
|
|
281
305
|
level?: string | undefined;
|
|
282
306
|
json?: boolean | undefined;
|
|
283
307
|
connectionString?: string | undefined;
|
|
308
|
+
// errorLog-only filters (ignored by the Neon perfLog path below).
|
|
309
|
+
source?: string | undefined;
|
|
310
|
+
allSources?: boolean | undefined;
|
|
311
|
+
userId?: string | undefined;
|
|
312
|
+
sinceMs?: number | undefined;
|
|
313
|
+
grep?: string | undefined;
|
|
284
314
|
},
|
|
285
315
|
): Promise<void> {
|
|
286
316
|
const limit = options.limit ?? 50;
|
|
@@ -293,11 +323,27 @@ export async function queryServerLogsApi(
|
|
|
293
323
|
collection === 'workerRun' ||
|
|
294
324
|
collection === 'eventLog'
|
|
295
325
|
) {
|
|
296
|
-
const
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
326
|
+
const grepRe = options.grep ? new RegExp(options.grep, 'i') : undefined;
|
|
327
|
+
// `--grep` filters the message client-side; fetch a larger pool first so the
|
|
328
|
+
// regex isn't applied only to the newest `limit` rows, then trim to `limit`.
|
|
329
|
+
const fetchLimit = grepRe ? Math.min(Math.max(limit * 20, 500), 5000) : limit;
|
|
330
|
+
let items = await queryTelemetryD1(collection, {
|
|
331
|
+
limit: fetchLimit,
|
|
332
|
+
level: options.level,
|
|
333
|
+
source: options.source,
|
|
334
|
+
allSources: options.allSources,
|
|
335
|
+
userId: options.userId,
|
|
336
|
+
sinceMs: options.sinceMs,
|
|
337
|
+
});
|
|
338
|
+
if (grepRe) {
|
|
339
|
+
items = items
|
|
340
|
+
.filter((doc) => {
|
|
341
|
+
const data = (doc['data'] ?? {}) as Record<string, unknown>;
|
|
342
|
+
return grepRe.test(str(data['message']));
|
|
343
|
+
})
|
|
344
|
+
.slice(0, limit);
|
|
345
|
+
}
|
|
346
|
+
items = items.slice().reverse();
|
|
301
347
|
if (items.length === 0) {
|
|
302
348
|
console.log(`No entries found in ${collection}.`);
|
|
303
349
|
return;
|
package/src/cli/telemetryAuth.ts
CHANGED
|
@@ -44,12 +44,21 @@ export async function cloudflareD1Fetch(
|
|
|
44
44
|
|
|
45
45
|
let res = await send(token);
|
|
46
46
|
// The cached token's local expiry can't be trusted — force a refresh on a REAL
|
|
47
|
-
// auth failure and retry once. forceRefresh
|
|
48
|
-
//
|
|
49
|
-
// the
|
|
47
|
+
// auth failure and retry once. forceRefresh runs under the credentials lock and
|
|
48
|
+
// dedupes on `token` (the value that just 401'd): if another process already
|
|
49
|
+
// rotated the single-use refresh token, it reuses the fresh one instead of
|
|
50
|
+
// burning the chain. This fixes the "works right after login, 401s later" flaw.
|
|
50
51
|
if (res.status === 401 || res.status === 403) {
|
|
51
|
-
const refreshed = await forceRefreshCloudflareCredentials();
|
|
52
|
+
const refreshed = await forceRefreshCloudflareCredentials(token);
|
|
52
53
|
if (refreshed?.accessToken) res = await send(refreshed.accessToken);
|
|
54
|
+
// Still unauthorized after a refresh → the OAuth session is genuinely dead
|
|
55
|
+
// (revoked, or the refresh token expired). Surface ONE actionable error
|
|
56
|
+
// instead of an opaque `401 Authentication error` bubbling up from the caller.
|
|
57
|
+
if (res.status === 401 || res.status === 403) {
|
|
58
|
+
throw new Error(
|
|
59
|
+
'Cloudflare session expired or was revoked. Run `ugly-app login cloudflare` and retry.',
|
|
60
|
+
);
|
|
61
|
+
}
|
|
53
62
|
}
|
|
54
63
|
return res;
|
|
55
64
|
}
|
package/src/cli/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// Auto-generated by prebuild — do not edit manually
|
|
2
|
-
export const CLI_VERSION = "0.1.
|
|
2
|
+
export const CLI_VERSION = "0.1.783";
|