altcha 1.4.2 → 2.0.0-beta.2

package/dist_plugins/upload.js

@@ -1,33 +1,33 @@
-var V = Object.defineProperty;
-var K = (t) => {
+var J = Object.defineProperty;
+var v = (t) => {
   throw TypeError(t);
 };
-var J = (t, n, e) => n in t ? V(t, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : t[n] = e;
-var p = (t, n, e) => J(t, typeof n != "symbol" ? n + "" : n, e), v = (t, n, e) => n.has(t) || K("Cannot " + e);
-var h = (t, n, e) => (v(t, n, "read from private field"), e ? e.call(t) : n.get(t)), g = (t, n, e) => n.has(t) ? K("Cannot add the same private member more than once") : n instanceof WeakSet ? n.add(t) : n.set(t, e);
-var u = (t, n, e) => (v(t, n, "access private method"), e);
-const b = {
-  generateKey: X,
-  exportKey: Q,
-  importKey: W,
-  decrypt: ee,
-  encrypt: Z
+var X = (t, n, e) => n in t ? J(t, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : t[n] = e;
+var p = (t, n, e) => X(t, typeof n != "symbol" ? n + "" : n, e), S = (t, n, e) => n.has(t) || v("Cannot " + e);
+var f = (t, n, e) => (S(t, n, "read from private field"), e ? e.call(t) : n.get(t)), w = (t, n, e) => n.has(t) ? v("Cannot add the same private member more than once") : n instanceof WeakSet ? n.add(t) : n.set(t, e);
+var u = (t, n, e) => (S(t, n, "access private method"), e);
+const E = {
+  generateKey: Q,
+  exportKey: W,
+  importKey: Z,
+  decrypt: te,
+  encrypt: ee
 };
-async function X(t = 256) {
+async function Q(t = 256) {
   return crypto.subtle.generateKey({
     name: "AES-GCM",
     length: t
   }, !0, ["encrypt", "decrypt"]);
 }
-async function Q(t) {
+async function W(t) {
   return new Uint8Array(await crypto.subtle.exportKey("raw", t));
 }
-async function W(t) {
+async function Z(t) {
   return crypto.subtle.importKey("raw", t, {
     name: "AES-GCM"
   }, !0, ["encrypt", "decrypt"]);
 }
-async function Z(t, n, e = 16) {
+async function ee(t, n, e = 16) {
   const i = crypto.getRandomValues(new Uint8Array(e));
   return {
     encrypted: new Uint8Array(await crypto.subtle.encrypt({
@@ -37,115 +37,115 @@ async function Z(t, n, e = 16) {
     iv: i
   };
 }
-async function ee(t, n, e) {
+async function te(t, n, e) {
   return new Uint8Array(await crypto.subtle.decrypt({
     name: "AES-GCM",
     iv: e
   }, t, n));
 }
-function te(t, n = !1) {
+function ne(t, n = !1) {
   return n && (t = t.replace(/_/g, "/").replace(/-/g, "+") + "=".repeat(3 - (3 + t.length) % 4)), Uint8Array.from(atob(t), (e) => e.charCodeAt(0));
 }
-function S(t, n = !1) {
+function x(t, n = !1) {
   const e = btoa(String.fromCharCode(...t));
   return n ? e.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "") : e;
 }
-function x(t, n = 80) {
+function L(t, n = 80) {
   let e = "";
   for (; t.length > 0; )
     e += t.slice(0, n) + `
 `, t = t.slice(n);
   return e;
 }
-function L(t) {
-  return te(t.split(/\r?\n/).filter((n) => !n.startsWith("-----")).join(""));
+function C(t) {
+  return ne(t.split(/\r?\n/).filter((n) => !n.startsWith("-----")).join(""));
 }
-const d = "RSA-OAEP", w = "SHA-256", ne = 2048, re = new Uint8Array([1, 0, 1]), ie = {
-  generateKeyPair: se,
-  encrypt: oe,
-  decrypt: ae,
-  exportPrivateKey: C,
-  exportPrivateKeyPem: le,
-  exportPublicKey: U,
-  exportPublicKeyPem: ce,
-  exportPublicKeyFromPrivateKey: ue,
-  importPrivateKey: z,
-  importPrivateKeyPem: pe,
-  importPublicKey: I,
-  importPublicKeyPem: N
+const h = "RSA-OAEP", b = "SHA-256", re = 2048, ie = new Uint8Array([1, 0, 1]), se = {
+  generateKeyPair: oe,
+  encrypt: ae,
+  decrypt: ce,
+  exportPrivateKey: I,
+  exportPrivateKeyPem: pe,
+  exportPublicKey: F,
+  exportPublicKeyPem: le,
+  exportPublicKeyFromPrivateKey: de,
+  importPrivateKey: T,
+  importPrivateKeyPem: ue,
+  importPublicKey: N,
+  importPublicKeyPem: z
 };
-async function se() {
+async function oe() {
   return crypto.subtle.generateKey({
-    name: d,
-    modulusLength: ne,
-    publicExponent: re,
-    hash: w
+    name: h,
+    modulusLength: re,
+    publicExponent: ie,
+    hash: b
   }, !0, ["encrypt", "decrypt"]);
 }
-async function oe(t, n) {
+async function ae(t, n) {
   return new Uint8Array(await crypto.subtle.encrypt({
-    name: d
+    name: h
   }, t, n));
 }
-async function ae(t, n) {
+async function ce(t, n) {
   return new Uint8Array(await crypto.subtle.decrypt({
-    name: d
+    name: h
   }, t, n));
 }
-async function U(t) {
+async function F(t) {
   return new Uint8Array(await crypto.subtle.exportKey("spki", t));
 }
-async function C(t) {
+async function I(t) {
   return new Uint8Array(await crypto.subtle.exportKey("pkcs8", t));
 }
-async function ce(t) {
+async function le(t) {
   return `-----BEGIN PUBLIC KEY-----
-` + x(S(await U(t)), 64) + "-----END PUBLIC KEY-----";
+` + L(x(await F(t)), 64) + "-----END PUBLIC KEY-----";
 }
-async function le(t) {
+async function pe(t) {
   return `-----BEGIN PRIVATE KEY-----
-` + x(S(await C(t)), 64) + "-----END PRIVATE KEY-----";
+` + L(x(await I(t)), 64) + "-----END PRIVATE KEY-----";
 }
-async function I(t) {
+async function N(t) {
   return crypto.subtle.importKey("spki", t, {
-    name: d,
-    hash: w
+    name: h,
+    hash: b
   }, !0, ["encrypt"]);
 }
-async function N(t) {
-  return I(L(t));
-}
 async function z(t) {
+  return N(C(t));
+}
+async function T(t) {
   return crypto.subtle.importKey("pkcs8", t, {
-    name: d,
-    hash: w
+    name: h,
+    hash: b
   }, !0, ["decrypt"]);
 }
-async function pe(t) {
-  return z(L(t));
-}
 async function ue(t) {
+  return T(C(t));
+}
+async function de(t) {
   const n = await crypto.subtle.exportKey("jwk", t);
   delete n.d, delete n.dp, delete n.dq, delete n.q, delete n.qi, n.key_ops = ["encrypt"];
   const e = await crypto.subtle.importKey("jwk", n, {
-    name: d,
-    hash: w
+    name: h,
+    hash: b
   }, !0, ["encrypt"]);
-  return U(e);
+  return F(e);
 }
-const ye = new Uint8Array([1, 0, 1]), de = 256, he = 16;
-async function fe(t, n, e = {}) {
-  const { aesIVLength: i = he, aesKeyLength: r = de } = e, o = await b.generateKey(r), { encrypted: c, iv: s } = await b.encrypt(o, n, i), l = await ie.encrypt(t, await b.exportKey(o));
+const ye = new Uint8Array([1, 0, 1]), he = 256, fe = 16;
+async function me(t, n, e = {}) {
+  const { aesIVLength: i = fe, aesKeyLength: r = he } = e, o = await E.generateKey(r), { encrypted: a, iv: s } = await E.encrypt(o, n, i), l = await se.encrypt(t, await E.exportKey(o));
   return new Uint8Array([
     ...ye,
     ...new Uint8Array([l.length]),
     ...new Uint8Array([s.length]),
     ...l,
     ...s,
-    ...c
+    ...a
   ]);
 }
-class A {
+class P {
   /**
    * Constructs a new instance of the Plugin.
    * 
@@ -189,9 +189,9 @@ class A {
 /**
  * A distinct name of the plugin. Every plugin must have it's own name.
  */
-p(A, "pluginName");
-var f, m, a, _, j, k, E, H, R, q, P, O, B, G;
-class T extends A {
+p(P, "pluginName");
+var m, g, c, R, j, k, U, H, q, O, A, $, B, G;
+class _ extends P {
   /**
    * Constructor initializes the plugin, setting up event listeners on the form.
    *
@@ -199,13 +199,13 @@ class T extends A {
    */
   constructor(e) {
     super(e);
-    g(this, a);
+    w(this, c);
     p(this, "pendingFiles", []);
     p(this, "uploadHandles", []);
     p(this, "elForm");
-    g(this, f, u(this, a, R).bind(this));
-    g(this, m, u(this, a, q).bind(this));
-    this.elForm = this.context.el.closest("form"), this.elForm && (this.elForm.addEventListener("change", h(this, f)), this.elForm.addEventListener("submit", h(this, m), {
+    w(this, m, u(this, c, q).bind(this));
+    w(this, g, u(this, c, O).bind(this));
+    this.elForm = this.context.el.closest("form"), this.elForm && (this.elForm.addEventListener("change", f(this, m)), this.elForm.addEventListener("submit", f(this, g), {
       capture: !0
     }));
   }
@@ -222,7 +222,7 @@ class T extends A {
    * Cleans up event listeners and other resources when the plugin is destroyed.
    */
   destroy() {
-    this.elForm && (this.elForm.removeEventListener("change", h(this, f)), this.elForm.removeEventListener("submit", h(this, m)));
+    this.elForm && (this.elForm.removeEventListener("change", f(this, m)), this.elForm.removeEventListener("submit", f(this, g)));
   }
   /**
    * Uploads all pending files in the list.
@@ -231,24 +231,31 @@ class T extends A {
     var i;
     const e = async () => {
       const r = this.pendingFiles[0];
-      if (r && await u(this, a, P).call(this, u(this, a, j).call(this, r)), this.pendingFiles.length)
+      if (r && await u(this, c, A).call(this, u(this, c, j).call(this, r)), this.pendingFiles.length)
         return e();
     };
-    await e(), this.pendingFiles.length === 0 && (u(this, a, _).call(this), (i = this.elForm) == null || i.requestSubmit());
+    try {
+      await e();
+    } catch (r) {
+      return this.context.log("upload failed", r), this.context.dispatch("uploaderror", {
+        error: r
+      }), !1;
+    }
+    this.pendingFiles.length === 0 && (u(this, c, R).call(this), (i = this.elForm) == null || i.requestSubmit());
   }
 }
-f = new WeakMap(), m = new WeakMap(), a = new WeakSet(), /**
+m = new WeakMap(), g = new WeakMap(), c = new WeakSet(), /**
  * Adds hidden input fields to the form containing the file IDs of uploaded files.
  */
-_ = function() {
+R = function() {
   var i, r, o;
   const e = this.uploadHandles.reduce(
-    (c, s) => (c[s.fieldName] || (c[s.fieldName] = []), s.fileId && c[s.fieldName].push(s.fileId), c),
+    (a, s) => (a[s.fieldName] || (a[s.fieldName] = []), s.fileId && a[s.fieldName].push(s.fileId), a),
     {}
   );
-  for (const c in e) {
+  for (const a in e) {
     const s = document.createElement("input");
-    s.name = c, s.type = "hidden", s.value = e[c].join(","), (r = (i = this.elForm) == null ? void 0 : i.querySelector(`[name="${c}"]`)) == null || r.setAttribute("disabled", "disabled"), (o = this.elForm) == null || o.appendChild(s);
+    s.name = a, s.type = "hidden", s.value = e[a].join(","), (r = (i = this.elForm) == null ? void 0 : i.querySelector(`[name="${a}"]`)) == null || r.setAttribute("disabled", "disabled"), (o = this.elForm) == null || o.appendChild(s);
   }
 }, /**
  * Creates an upload handle for the specified pending file.
@@ -259,12 +266,12 @@ _ = function() {
  */
 j = function(e) {
   const i = this.pendingFiles.findIndex(
-    ([o, c]) => o === e[0] && c === e[1]
+    ([o, a]) => o === e[0] && a === e[1]
   );
   if (i < 0)
     throw new Error("Cannot create upload handle.");
-  const r = new me(e[0], e[1]);
-  return this.uploadHandles.push(r), this.pendingFiles.splice(i, 1), u(this, a, k).call(this, r), u(this, a, E).call(this), r;
+  const r = new ge(e[0], e[1]);
+  return this.uploadHandles.push(r), this.pendingFiles.splice(i, 1), u(this, c, k).call(this, r), u(this, c, U).call(this), r;
 }, /**
  * Dispatches a custom event when a file upload starts.
  *
@@ -275,8 +282,8 @@ k = function(e) {
 }, /**
  * Dispatches a custom event to track the progress of ongoing file uploads.
  */
-E = function() {
-  const e = this.pendingFiles.reduce((r, [o, c]) => r + c.size, 0) + this.uploadHandles.reduce((r, { uploadSize: o }) => r + o, 0), i = this.uploadHandles.reduce(
+U = function() {
+  const e = this.pendingFiles.reduce((r, [o, a]) => r + a.size, 0) + this.uploadHandles.reduce((r, { uploadSize: o }) => r + o, 0), i = this.uploadHandles.reduce(
     (r, { loaded: o }) => r + o,
     0
   );
@@ -293,8 +300,11 @@ E = function() {
  */
 H = function() {
   if (this.elForm) {
-    const e = this.elForm.getAttribute("action");
-    return this.elForm.getAttribute("data-upload-url") || e + "/file";
+    const e = this.elForm.getAttribute("action"), i = this.elForm.getAttribute("data-upload-url");
+    if (i)
+      return i;
+    const r = new URL(e || location.origin);
+    return r.pathname = r.pathname + "/file", r.toString();
   }
   return null;
 }, /**
@@ -302,7 +312,7 @@ H = function() {
  *
  * @param {Event} ev - The change event.
  */
-R = function(e) {
+q = function(e) {
   const i = e.target;
   if (i && i.type === "file") {
     const r = i.files;
@@ -315,17 +325,18 @@ R = function(e) {
  *
  * @param {SubmitEvent} ev - The submit event.
  */
-q = function(e) {
-  this.pendingFiles.length && (e.preventDefault(), e.stopPropagation(), this.uploadPendingFiles());
-}, P = async function(e, i) {
-  const r = u(this, a, H).call(this);
+O = function(e) {
+  const i = e.target;
+  i != null && i.hasAttribute("data-code-challenge-form") || this.pendingFiles.length && (e.preventDefault(), e.stopPropagation(), this.uploadPendingFiles());
+}, A = async function(e, i) {
+  const r = u(this, c, H).call(this);
   if (!r)
     throw new Error("Upload url not specified.");
   const o = {
     "content-type": "application/json"
   };
   i && (o.authorization = "Altcha payload=" + i);
-  const c = await fetch(r, {
+  const a = await fetch(r, {
     body: JSON.stringify({
       name: e.file.name || "file",
       size: e.file.size,
@@ -335,48 +346,48 @@ q = function(e) {
     headers: o,
     method: "POST"
   });
-  if (c.status === 401)
-    return u(this, a, O).call(this, c, e);
-  if (c.status !== 200)
-    throw new Error(`Unexpected server response ${c.status}.`);
-  const s = await c.json();
+  if (a.status === 401)
+    return u(this, c, $).call(this, a, e);
+  if (a.status !== 200)
+    throw new Error(`Unexpected server response ${a.status}.`);
+  const s = await a.json();
   let l = e.file;
   if (s.encrypted && s.encryptionPublicKey) {
-    const y = await N(s.encryptionPublicKey), M = await new Response(
+    const d = await z(s.encryptionPublicKey), M = await new Response(
       new ReadableStream({
-        async start(F) {
-          const $ = e.file.stream().getReader();
+        async start(K) {
+          const Y = e.file.stream().getReader();
           for (; ; ) {
-            const { done: Y, value: D } = await $.read();
-            if (Y)
+            const { done: D, value: V } = await Y.read();
+            if (D)
               break;
-            F.enqueue(D);
+            K.enqueue(V);
           }
-          F.close();
+          K.close();
         }
       })
     ).arrayBuffer();
-    l = await fe(y, new Uint8Array(M));
+    l = await me(d, new Uint8Array(M));
   }
-  return e.uploadSize = l instanceof Uint8Array ? l.byteLength : e.file.size, await u(this, a, G).call(this, s.uploadUrl, e, l, {
+  return e.uploadSize = l instanceof Uint8Array ? l.byteLength : e.file.size, await u(this, c, G).call(this, s.uploadUrl, e, l, {
     "content-type": e.file.type || "application/octet-stream"
-  }), s.finalizeUrl && await u(this, a, B).call(this, s.finalizeUrl, e.uploadSize), e.fileId = s.fileId, e.resolve({
+  }), s.finalizeUrl && await u(this, c, B).call(this, s.finalizeUrl, e.uploadSize), e.fileId = s.fileId, e.resolve({
     encrypted: s.encrypted,
     fileId: s.fileId
   }), e.promise;
-}, O = async function(e, i) {
+}, $ = async function(e, i) {
   var r;
   try {
-    const o = e.headers.get("www-authenticate"), c = (r = o == null ? void 0 : o.match(/challenge=(.*),/)) == null ? void 0 : r[1];
-    if (!c)
+    const o = e.headers.get("www-authenticate"), a = (r = o == null ? void 0 : o.match(/challenge=(.*),/)) == null ? void 0 : r[1];
+    if (!a)
       throw new Error(
         "Unable to retrieve altcha challenge from www-authenticate header."
       );
-    const s = JSON.parse(c);
+    const s = JSON.parse(a);
     if (s && "challenge" in s) {
       const { solution: l } = await this.context.solve(s);
       if (l && "number" in l)
-        return u(this, a, P).call(this, i, btoa(
+        return u(this, c, A).call(this, i, btoa(
           JSON.stringify({
             ...s,
             number: l.number
@@ -401,23 +412,24 @@ q = function(e) {
     throw new Error(`Unexpected server response ${r.status}.`);
   return !0;
 }, G = async function(e, i, r, o = {}) {
-  return new Promise((c, s) => {
-    const l = new XMLHttpRequest();
+  var a;
+  return e = new URL(e, ((a = this.elForm) == null ? void 0 : a.getAttribute("action")) || location.origin).toString(), new Promise((s, l) => {
+    const d = new XMLHttpRequest();
     i.controller.signal.addEventListener("abort", () => {
-      l.abort();
-    }), l.upload.addEventListener("progress", (y) => {
-      i.setProgress(y.loaded), u(this, a, E).call(this);
-    }), l.addEventListener("error", (y) => {
-      s(new Error("Upload failed."));
-    }), l.addEventListener("load", () => {
-      c(void 0);
-    }), l.open("PUT", e);
+      d.abort();
+    }), d.upload.addEventListener("progress", (y) => {
+      i.setProgress(y.loaded), u(this, c, U).call(this);
+    }), d.addEventListener("error", (y) => {
+      l(new Error("Upload failed."));
+    }), d.addEventListener("load", () => {
+      d.status >= 400 ? l(new Error(`Server responded with ${d.status}`)) : s(void 0);
+    }), d.open("PUT", e);
     for (const y in o)
-      l.setRequestHeader(y, o[y]);
-    l.send(r);
+      d.setRequestHeader(y, o[y]);
+    d.send(r);
   });
-}, p(T, "pluginName", "upload");
-class me {
+}, p(_, "pluginName", "upload");
+class ge {
   /**
    * Creates an instance of UploadHandle.
    *
@@ -452,7 +464,7 @@ class me {
     this.loaded = n, this.progress = this.file.size && n ? Math.min(1, n / this.file.size) : 0;
   }
 }
-A.register(T);
+P.register(_);
 export {
-  T as PluginUpload
+  _ as PluginUpload
 };

package/dist_plugins/upload.umd.cjs

@@ -1,4 +1,4 @@
-(function(c,a){typeof exports=="object"&&typeof module<"u"?a(exports):typeof define=="function"&&define.amd?define(["exports"],a):(c=typeof globalThis<"u"?globalThis:c||self,a(c["[name]"]={}))})(this,function(c){"use strict";var me=Object.defineProperty;var j=c=>{throw TypeError(c)};var ge=(c,a,d)=>a in c?me(c,a,{enumerable:!0,configurable:!0,writable:!0,value:d}):c[a]=d;var y=(c,a,d)=>ge(c,typeof a!="symbol"?a+"":a,d),_=(c,a,d)=>a.has(c)||j("Cannot "+d);var b=(c,a,d)=>(_(c,a,"read from private field"),d?d.call(c):a.get(c)),P=(c,a,d)=>a.has(c)?j("Cannot add the same private member more than once"):a instanceof WeakSet?a.add(c):a.set(c,d);var h=(c,a,d)=>(_(c,a,"access private method"),d);var g,w,l,k,H,R,K,O,q,M,v,B,G,$;const a={generateKey:d,exportKey:Y,importKey:D,decrypt:J,encrypt:V};async function d(t=256){return crypto.subtle.generateKey({name:"AES-GCM",length:t},!0,["encrypt","decrypt"])}async function Y(t){return new Uint8Array(await crypto.subtle.exportKey("raw",t))}async function D(t){return crypto.subtle.importKey("raw",t,{name:"AES-GCM"},!0,["encrypt","decrypt"])}async function V(t,n,e=16){const i=crypto.getRandomValues(new Uint8Array(e));return{encrypted:new Uint8Array(await crypto.subtle.encrypt({name:"AES-GCM",iv:i},t,n)),iv:i}}async function J(t,n,e){return new Uint8Array(await crypto.subtle.decrypt({name:"AES-GCM",iv:e},t,n))}function X(t,n=!1){return n&&(t=t.replace(/_/g,"/").replace(/-/g,"+")+"=".repeat(3-(3+t.length)%4)),Uint8Array.from(atob(t),e=>e.charCodeAt(0))}function S(t,n=!1){const e=btoa(String.fromCharCode(...t));return n?e.replace(/\+/g,"-").replace(/\//g,"_").replace(/=+$/,""):e}function x(t,n=80){let e="";for(;t.length>0;)e+=t.slice(0,n)+`
-`,t=t.slice(n);return e}function L(t){return X(t.split(/\r?\n/).filter(n=>!n.startsWith("-----")).join(""))}const m="RSA-OAEP",E="SHA-256",Q=2048,W=new Uint8Array([1,0,1]),Z={generateKeyPair:ee,encrypt:te,decrypt:ne,exportPrivateKey:C,exportPrivateKeyPem:ie,exportPublicKey:U,exportPublicKeyPem:re,exportPublicKeyFromPrivateKey:oe,importPrivateKey:N,importPrivateKeyPem:se,importPublicKey:I,importPublicKeyPem:T};async function ee(){return crypto.subtle.generateKey({name:m,modulusLength:Q,publicExponent:W,hash:E},!0,["encrypt","decrypt"])}async function te(t,n){return new Uint8Array(await crypto.subtle.encrypt({name:m},t,n))}async function ne(t,n){return new Uint8Array(await crypto.subtle.decrypt({name:m},t,n))}async function U(t){return new Uint8Array(await crypto.subtle.exportKey("spki",t))}async function C(t){return new Uint8Array(await crypto.subtle.exportKey("pkcs8",t))}async function re(t){return`-----BEGIN PUBLIC KEY-----
-`+x(S(await U(t)),64)+"-----END PUBLIC KEY-----"}async function ie(t){return`-----BEGIN PRIVATE KEY-----
-`+x(S(await C(t)),64)+"-----END PRIVATE KEY-----"}async function I(t){return crypto.subtle.importKey("spki",t,{name:m,hash:E},!0,["encrypt"])}async function T(t){return I(L(t))}async function N(t){return crypto.subtle.importKey("pkcs8",t,{name:m,hash:E},!0,["decrypt"])}async function se(t){return N(L(t))}async function oe(t){const n=await crypto.subtle.exportKey("jwk",t);delete n.d,delete n.dp,delete n.dq,delete n.q,delete n.qi,n.key_ops=["encrypt"];const e=await crypto.subtle.importKey("jwk",n,{name:m,hash:E},!0,["encrypt"]);return U(e)}const ae=new Uint8Array([1,0,1]),ce=256,le=16;async function pe(t,n,e={}){const{aesIVLength:i=le,aesKeyLength:r=ce}=e,o=await a.generateKey(r),{encrypted:p,iv:s}=await a.encrypt(o,n,i),u=await Z.encrypt(t,await a.exportKey(o));return new Uint8Array([...ae,...new Uint8Array([u.length]),...new Uint8Array([s.length]),...u,...s,...p])}class A{constructor(n){this.context=n}static register(n){typeof globalThis.altchaPlugins!="object"&&(globalThis.altchaPlugins=[]),globalThis.altchaPlugins.includes(n)||globalThis.altchaPlugins.push(n)}destroy(){}onErrorChange(n){}onStateChange(n){}}y(A,"pluginName");class F extends A{constructor(e){super(e);P(this,l);y(this,"pendingFiles",[]);y(this,"uploadHandles",[]);y(this,"elForm");P(this,g,h(this,l,q).bind(this));P(this,w,h(this,l,M).bind(this));this.elForm=this.context.el.closest("form"),this.elForm&&(this.elForm.addEventListener("change",b(this,g)),this.elForm.addEventListener("submit",b(this,w),{capture:!0}))}addFile(e,i){this.pendingFiles.find(([r,o])=>r===e&&o===i)||this.pendingFiles.push([e,i])}destroy(){this.elForm&&(this.elForm.removeEventListener("change",b(this,g)),this.elForm.removeEventListener("submit",b(this,w)))}async uploadPendingFiles(){var i;const e=async()=>{const r=this.pendingFiles[0];if(r&&await h(this,l,v).call(this,h(this,l,H).call(this,r)),this.pendingFiles.length)return e()};await e(),this.pendingFiles.length===0&&(h(this,l,k).call(this),(i=this.elForm)==null||i.requestSubmit())}}g=new WeakMap,w=new WeakMap,l=new WeakSet,k=function(){var i,r,o;const e=this.uploadHandles.reduce((p,s)=>(p[s.fieldName]||(p[s.fieldName]=[]),s.fileId&&p[s.fieldName].push(s.fileId),p),{});for(const p in e){const s=document.createElement("input");s.name=p,s.type="hidden",s.value=e[p].join(","),(r=(i=this.elForm)==null?void 0:i.querySelector(`[name="${p}"]`))==null||r.setAttribute("disabled","disabled"),(o=this.elForm)==null||o.appendChild(s)}},H=function(e){const i=this.pendingFiles.findIndex(([o,p])=>o===e[0]&&p===e[1]);if(i<0)throw new Error("Cannot create upload handle.");const r=new ue(e[0],e[1]);return this.uploadHandles.push(r),this.pendingFiles.splice(i,1),h(this,l,R).call(this,r),h(this,l,K).call(this),r},R=function(e){this.context.dispatch("upload",{handle:e})},K=function(){const e=this.pendingFiles.reduce((r,[o,p])=>r+p.size,0)+this.uploadHandles.reduce((r,{uploadSize:o})=>r+o,0),i=this.uploadHandles.reduce((r,{loaded:o})=>r+o,0);this.context.dispatch("uploadprogress",{bytesLoaded:i,bytesTotal:e,pendingFiles:this.pendingFiles,uploadHandles:this.uploadHandles})},O=function(){if(this.elForm){const e=this.elForm.getAttribute("action");return this.elForm.getAttribute("data-upload-url")||e+"/file"}return null},q=function(e){const i=e.target;if(i&&i.type==="file"){const r=i.files;if(r!=null&&r.length)for(const o of r)this.addFile(i.name,o)}},M=function(e){this.pendingFiles.length&&(e.preventDefault(),e.stopPropagation(),this.uploadPendingFiles())},v=async function(e,i){const r=h(this,l,O).call(this);if(!r)throw new Error("Upload url not specified.");const o={"content-type":"application/json"};i&&(o.authorization="Altcha payload="+i);const p=await fetch(r,{body:JSON.stringify({name:e.file.name||"file",size:e.file.size,type:e.file.type||"application/octet-stream"}),credentials:"include",headers:o,method:"POST"});if(p.status===401)return h(this,l,B).call(this,p,e);if(p.status!==200)throw new Error(`Unexpected server response ${p.status}.`);const s=await p.json();let u=e.file;if(s.encrypted&&s.encryptionPublicKey){const f=await T(s.encryptionPublicKey),de=await new Response(new ReadableStream({async start(z){const ye=e.file.stream().getReader();for(;;){const{done:he,value:fe}=await ye.read();if(he)break;z.enqueue(fe)}z.close()}})).arrayBuffer();u=await pe(f,new Uint8Array(de))}return e.uploadSize=u instanceof Uint8Array?u.byteLength:e.file.size,await h(this,l,$).call(this,s.uploadUrl,e,u,{"content-type":e.file.type||"application/octet-stream"}),s.finalizeUrl&&await h(this,l,G).call(this,s.finalizeUrl,e.uploadSize),e.fileId=s.fileId,e.resolve({encrypted:s.encrypted,fileId:s.fileId}),e.promise},B=async function(e,i){var r;try{const o=e.headers.get("www-authenticate"),p=(r=o==null?void 0:o.match(/challenge=(.*),/))==null?void 0:r[1];if(!p)throw new Error("Unable to retrieve altcha challenge from www-authenticate header.");const s=JSON.parse(p);if(s&&"challenge"in s){const{solution:u}=await this.context.solve(s);if(u&&"number"in u)return h(this,l,v).call(this,i,btoa(JSON.stringify({...s,number:u.number})));throw new Error("Invalid challenge solution.")}}catch(o){throw this.context.log(o),new Error("Unable to solve altcha challenge for upload.")}},G=async function(e,i){const r=await fetch(e,{body:JSON.stringify({uploadedBytes:i}),headers:{"content-type":"application/json"},method:"POST"});if(r.status>204)throw new Error(`Unexpected server response ${r.status}.`);return!0},$=async function(e,i,r,o={}){return new Promise((p,s)=>{const u=new XMLHttpRequest;i.controller.signal.addEventListener("abort",()=>{u.abort()}),u.upload.addEventListener("progress",f=>{i.setProgress(f.loaded),h(this,l,K).call(this)}),u.addEventListener("error",f=>{s(new Error("Upload failed."))}),u.addEventListener("load",()=>{p(void 0)}),u.open("PUT",e);for(const f in o)u.setRequestHeader(f,o[f]);u.send(r)})},y(F,"pluginName","upload");class ue{constructor(n,e){y(this,"controller",new AbortController);y(this,"promise");y(this,"fileId");y(this,"loaded",0);y(this,"progress",0);y(this,"uploadSize",0);y(this,"resolve");y(this,"reject");this.fieldName=n,this.file=e,this.uploadSize=this.file.size,this.promise=new Promise((i,r)=>{this.resolve=i,this.reject=r})}abort(){this.controller.abort()}setProgress(n){this.loaded=n,this.progress=this.file.size&&n?Math.min(1,n/this.file.size):0}}A.register(F),c.PluginUpload=F,Object.defineProperty(c,Symbol.toStringTag,{value:"Module"})});
+(function(c,a){typeof exports=="object"&&typeof module<"u"?a(exports):typeof define=="function"&&define.amd?define(["exports"],a):(c=typeof globalThis<"u"?globalThis:c||self,a(c["[name]"]={}))})(this,function(c){"use strict";var ge=Object.defineProperty;var _=c=>{throw TypeError(c)};var we=(c,a,u)=>a in c?ge(c,a,{enumerable:!0,configurable:!0,writable:!0,value:u}):c[a]=u;var y=(c,a,u)=>we(c,typeof a!="symbol"?a+"":a,u),R=(c,a,u)=>a.has(c)||_("Cannot "+u);var E=(c,a,u)=>(R(c,a,"read from private field"),u?u.call(c):a.get(c)),P=(c,a,u)=>a.has(c)?_("Cannot add the same private member more than once"):a instanceof WeakSet?a.add(c):a.set(c,u);var h=(c,a,u)=>(R(c,a,"access private method"),u);var w,b,l,k,H,O,v,q,M,$,S,B,G,Y;const a={generateKey:u,exportKey:D,importKey:V,decrypt:X,encrypt:J};async function u(t=256){return crypto.subtle.generateKey({name:"AES-GCM",length:t},!0,["encrypt","decrypt"])}async function D(t){return new Uint8Array(await crypto.subtle.exportKey("raw",t))}async function V(t){return crypto.subtle.importKey("raw",t,{name:"AES-GCM"},!0,["encrypt","decrypt"])}async function J(t,i,e=16){const r=crypto.getRandomValues(new Uint8Array(e));return{encrypted:new Uint8Array(await crypto.subtle.encrypt({name:"AES-GCM",iv:r},t,i)),iv:r}}async function X(t,i,e){return new Uint8Array(await crypto.subtle.decrypt({name:"AES-GCM",iv:e},t,i))}function Q(t,i=!1){return i&&(t=t.replace(/_/g,"/").replace(/-/g,"+")+"=".repeat(3-(3+t.length)%4)),Uint8Array.from(atob(t),e=>e.charCodeAt(0))}function x(t,i=!1){const e=btoa(String.fromCharCode(...t));return i?e.replace(/\+/g,"-").replace(/\//g,"_").replace(/=+$/,""):e}function L(t,i=80){let e="";for(;t.length>0;)e+=t.slice(0,i)+`
+`,t=t.slice(i);return e}function C(t){return Q(t.split(/\r?\n/).filter(i=>!i.startsWith("-----")).join(""))}const m="RSA-OAEP",U="SHA-256",W=2048,Z=new Uint8Array([1,0,1]),ee={generateKeyPair:te,encrypt:ne,decrypt:re,exportPrivateKey:I,exportPrivateKeyPem:se,exportPublicKey:A,exportPublicKeyPem:ie,exportPublicKeyFromPrivateKey:ae,importPrivateKey:z,importPrivateKeyPem:oe,importPublicKey:T,importPublicKeyPem:N};async function te(){return crypto.subtle.generateKey({name:m,modulusLength:W,publicExponent:Z,hash:U},!0,["encrypt","decrypt"])}async function ne(t,i){return new Uint8Array(await crypto.subtle.encrypt({name:m},t,i))}async function re(t,i){return new Uint8Array(await crypto.subtle.decrypt({name:m},t,i))}async function A(t){return new Uint8Array(await crypto.subtle.exportKey("spki",t))}async function I(t){return new Uint8Array(await crypto.subtle.exportKey("pkcs8",t))}async function ie(t){return`-----BEGIN PUBLIC KEY-----
+`+L(x(await A(t)),64)+"-----END PUBLIC KEY-----"}async function se(t){return`-----BEGIN PRIVATE KEY-----
+`+L(x(await I(t)),64)+"-----END PRIVATE KEY-----"}async function T(t){return crypto.subtle.importKey("spki",t,{name:m,hash:U},!0,["encrypt"])}async function N(t){return T(C(t))}async function z(t){return crypto.subtle.importKey("pkcs8",t,{name:m,hash:U},!0,["decrypt"])}async function oe(t){return z(C(t))}async function ae(t){const i=await crypto.subtle.exportKey("jwk",t);delete i.d,delete i.dp,delete i.dq,delete i.q,delete i.qi,i.key_ops=["encrypt"];const e=await crypto.subtle.importKey("jwk",i,{name:m,hash:U},!0,["encrypt"]);return A(e)}const ce=new Uint8Array([1,0,1]),le=256,pe=16;async function ue(t,i,e={}){const{aesIVLength:r=pe,aesKeyLength:n=le}=e,o=await a.generateKey(n),{encrypted:p,iv:s}=await a.encrypt(o,i,r),d=await ee.encrypt(t,await a.exportKey(o));return new Uint8Array([...ce,...new Uint8Array([d.length]),...new Uint8Array([s.length]),...d,...s,...p])}class F{constructor(i){this.context=i}static register(i){typeof globalThis.altchaPlugins!="object"&&(globalThis.altchaPlugins=[]),globalThis.altchaPlugins.includes(i)||globalThis.altchaPlugins.push(i)}destroy(){}onErrorChange(i){}onStateChange(i){}}y(F,"pluginName");class K extends F{constructor(e){super(e);P(this,l);y(this,"pendingFiles",[]);y(this,"uploadHandles",[]);y(this,"elForm");P(this,w,h(this,l,M).bind(this));P(this,b,h(this,l,$).bind(this));this.elForm=this.context.el.closest("form"),this.elForm&&(this.elForm.addEventListener("change",E(this,w)),this.elForm.addEventListener("submit",E(this,b),{capture:!0}))}addFile(e,r){this.pendingFiles.find(([n,o])=>n===e&&o===r)||this.pendingFiles.push([e,r])}destroy(){this.elForm&&(this.elForm.removeEventListener("change",E(this,w)),this.elForm.removeEventListener("submit",E(this,b)))}async uploadPendingFiles(){var r;const e=async()=>{const n=this.pendingFiles[0];if(n&&await h(this,l,S).call(this,h(this,l,H).call(this,n)),this.pendingFiles.length)return e()};try{await e()}catch(n){return this.context.log("upload failed",n),this.context.dispatch("uploaderror",{error:n}),!1}this.pendingFiles.length===0&&(h(this,l,k).call(this),(r=this.elForm)==null||r.requestSubmit())}}w=new WeakMap,b=new WeakMap,l=new WeakSet,k=function(){var r,n,o;const e=this.uploadHandles.reduce((p,s)=>(p[s.fieldName]||(p[s.fieldName]=[]),s.fileId&&p[s.fieldName].push(s.fileId),p),{});for(const p in e){const s=document.createElement("input");s.name=p,s.type="hidden",s.value=e[p].join(","),(n=(r=this.elForm)==null?void 0:r.querySelector(`[name="${p}"]`))==null||n.setAttribute("disabled","disabled"),(o=this.elForm)==null||o.appendChild(s)}},H=function(e){const r=this.pendingFiles.findIndex(([o,p])=>o===e[0]&&p===e[1]);if(r<0)throw new Error("Cannot create upload handle.");const n=new de(e[0],e[1]);return this.uploadHandles.push(n),this.pendingFiles.splice(r,1),h(this,l,O).call(this,n),h(this,l,v).call(this),n},O=function(e){this.context.dispatch("upload",{handle:e})},v=function(){const e=this.pendingFiles.reduce((n,[o,p])=>n+p.size,0)+this.uploadHandles.reduce((n,{uploadSize:o})=>n+o,0),r=this.uploadHandles.reduce((n,{loaded:o})=>n+o,0);this.context.dispatch("uploadprogress",{bytesLoaded:r,bytesTotal:e,pendingFiles:this.pendingFiles,uploadHandles:this.uploadHandles})},q=function(){if(this.elForm){const e=this.elForm.getAttribute("action"),r=this.elForm.getAttribute("data-upload-url");if(r)return r;const n=new URL(e||location.origin);return n.pathname=n.pathname+"/file",n.toString()}return null},M=function(e){const r=e.target;if(r&&r.type==="file"){const n=r.files;if(n!=null&&n.length)for(const o of n)this.addFile(r.name,o)}},$=function(e){const r=e.target;r!=null&&r.hasAttribute("data-code-challenge-form")||this.pendingFiles.length&&(e.preventDefault(),e.stopPropagation(),this.uploadPendingFiles())},S=async function(e,r){const n=h(this,l,q).call(this);if(!n)throw new Error("Upload url not specified.");const o={"content-type":"application/json"};r&&(o.authorization="Altcha payload="+r);const p=await fetch(n,{body:JSON.stringify({name:e.file.name||"file",size:e.file.size,type:e.file.type||"application/octet-stream"}),credentials:"include",headers:o,method:"POST"});if(p.status===401)return h(this,l,B).call(this,p,e);if(p.status!==200)throw new Error(`Unexpected server response ${p.status}.`);const s=await p.json();let d=e.file;if(s.encrypted&&s.encryptionPublicKey){const f=await N(s.encryptionPublicKey),ye=await new Response(new ReadableStream({async start(j){const he=e.file.stream().getReader();for(;;){const{done:fe,value:me}=await he.read();if(fe)break;j.enqueue(me)}j.close()}})).arrayBuffer();d=await ue(f,new Uint8Array(ye))}return e.uploadSize=d instanceof Uint8Array?d.byteLength:e.file.size,await h(this,l,Y).call(this,s.uploadUrl,e,d,{"content-type":e.file.type||"application/octet-stream"}),s.finalizeUrl&&await h(this,l,G).call(this,s.finalizeUrl,e.uploadSize),e.fileId=s.fileId,e.resolve({encrypted:s.encrypted,fileId:s.fileId}),e.promise},B=async function(e,r){var n;try{const o=e.headers.get("www-authenticate"),p=(n=o==null?void 0:o.match(/challenge=(.*),/))==null?void 0:n[1];if(!p)throw new Error("Unable to retrieve altcha challenge from www-authenticate header.");const s=JSON.parse(p);if(s&&"challenge"in s){const{solution:d}=await this.context.solve(s);if(d&&"number"in d)return h(this,l,S).call(this,r,btoa(JSON.stringify({...s,number:d.number})));throw new Error("Invalid challenge solution.")}}catch(o){throw this.context.log(o),new Error("Unable to solve altcha challenge for upload.")}},G=async function(e,r){const n=await fetch(e,{body:JSON.stringify({uploadedBytes:r}),headers:{"content-type":"application/json"},method:"POST"});if(n.status>204)throw new Error(`Unexpected server response ${n.status}.`);return!0},Y=async function(e,r,n,o={}){var p;return e=new URL(e,((p=this.elForm)==null?void 0:p.getAttribute("action"))||location.origin).toString(),new Promise((s,d)=>{const f=new XMLHttpRequest;r.controller.signal.addEventListener("abort",()=>{f.abort()}),f.upload.addEventListener("progress",g=>{r.setProgress(g.loaded),h(this,l,v).call(this)}),f.addEventListener("error",g=>{d(new Error("Upload failed."))}),f.addEventListener("load",()=>{f.status>=400?d(new Error(`Server responded with ${f.status}`)):s(void 0)}),f.open("PUT",e);for(const g in o)f.setRequestHeader(g,o[g]);f.send(n)})},y(K,"pluginName","upload");class de{constructor(i,e){y(this,"controller",new AbortController);y(this,"promise");y(this,"fileId");y(this,"loaded",0);y(this,"progress",0);y(this,"uploadSize",0);y(this,"resolve");y(this,"reject");this.fieldName=i,this.file=e,this.uploadSize=this.file.size,this.promise=new Promise((r,n)=>{this.resolve=r,this.reject=n})}abort(){this.controller.abort()}setProgress(i){this.loaded=i,this.progress=this.file.size&&i?Math.min(1,i/this.file.size):0}}F.register(K),c.PluginUpload=K,Object.defineProperty(c,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "altcha",
   "description": "GDPR compliant, self-hosted CAPTCHA alternative.",
-  "version": "1.4.2",
+  "version": "2.0.0-beta.2",
   "license": "MIT",
   "author": {
     "name": "Daniel Regeci",
@@ -10,7 +10,7 @@
   "homepage": "https://altcha.org",
   "repository": {
     "type": "git",
-    "url": "https://github.com/altcha-org/altcha"
+    "url": "git+https://github.com/altcha-org/altcha.git"
   },
   "type": "module",
   "keywords": [
@@ -30,7 +30,7 @@
     "dist",
     "dist_external",
     "dist_plugins",
-    "postinstall.js"
+    "dist_i18n"
   ],
   "main": "./dist/altcha.umd.cjs",
   "module": "./dist/altcha.js",
@@ -63,24 +63,27 @@
     "./worker": {
       "import": "./dist_external/worker.js",
       "require": "./dist_external/worker.js"
+    },
+    "./i18n/*": {
+      "import": "./dist_i18n/*.js",
+      "require": "./dist_i18n/*.umd.js"
     }
   },
   "scripts": {
     "dev": "vite",
-    "build": "npm run build:bundle && npm run build:external && npm run build:plugins",
+    "build": "npm run build:bundle && npm run build:external && npm run build:plugins && npm run build:i18n",
     "build:bundle": "rimraf dist && vite build && cp src/declarations.d.ts dist/altcha.d.ts",
     "build:external": "rimraf dist_external && vite build -c vite.external.config.ts && cp src/declarations.d.ts dist_external/altcha.d.ts",
     "build:plugins": "rimraf dist_plugins && find src/plugins -type f -name '*.ts' | xargs -I {} vite build -c vite.plugins.config.ts -- {}",
+    "build:i18n": "rimraf dist_i18n && find src/i18n -type f -name '*.ts' | xargs -I {} vite build -c vite.i18n.config.ts -- {}",
     "preview": "vite preview",
     "check": "svelte-check --tsconfig ./tsconfig.json",
     "format": "prettier --write ./src/**/*",
     "test": "vitest run tests/helpers.test.ts",
-    "test:e2e": "playwright test",
-    "prepare": "husky",
-    "postinstall": "node postinstall.js"
+    "test:e2e": "testcafe chrome,firefox e2e/altcha.fixture.ts --hostname localhost",
+    "prepare": "husky"
   },
   "devDependencies": {
-    "@playwright/test": "^1.49.1",
     "@sveltejs/vite-plugin-svelte": "^5.0.3",
     "@tsconfig/svelte": "^5.0.4",
     "@types/node": "^20.16.3",
@@ -93,6 +96,7 @@
     "sass": "^1.77.8",
     "svelte": "^5.22.6",
     "svelte-check": "^4.0.0",
+    "testcafe": "^3.7.2",
     "tslib": "^2.7.0",
     "typescript": "^5.5.4",
     "vite": "^6.2.1",

package/postinstall.js

@@ -1,10 +0,0 @@
-import fs from 'node:fs';
-import { execSync } from 'node:child_process';
-
-const srcDir = 'node_modules/@ovx/svelte';
-const destDir = 'node_modules/svelte';
-
-if (fs.existsSync(srcDir)) {
-  execSync(`rm -rf ${destDir}`);
-  execSync(`cp -R ${srcDir} ${destDir}`);
-}