@innspel/core 0.6.0 → 0.6.1

package/dist/index.cjs

@@ -954,6 +954,8 @@ var InnspelApiError = class extends Error {
     this.retryAfter = retryAfter;
   }
 };
+var NettverksFeil = class extends Error {
+};
 var InnspelQueueFullError = class extends Error {
   name = "InnspelQueueFullError";
   code = "queue_full";
@@ -1272,7 +1274,7 @@ async function lastOppTilLagring(fetchImpl, presign, body, signal) {
 }
 
 // src/versjon.ts
-var VERSJON = "0.6.0";
+var VERSJON = "0.6.1";
 
 // src/klient.ts
 var STANDARD_TIMEOUT_MS = 1e4;
@@ -1365,12 +1367,10 @@ function init(options) {
   const telemetri = options.telemetry ?? noopTelemetri;
   const k\u00F8 = new Ko(options.storage);
   const anonym = options.identityProvider === null;
-  const klient = createClient(
-    createConfig({
-      baseUrl: options.baseUrl,
-      ...options.fetch ? { fetch: options.fetch } : {}
-    })
-  );
+  const nett = ((input) => (options.fetch ?? fetch)(input).catch((e) => {
+    throw new NettverksFeil(String(e));
+  }));
+  const klient = createClient(createConfig({ baseUrl: options.baseUrl, fetch: nett }));
   let presenter = null;
   async function headere() {
     const h = { "X-Innspel-Tenant-Key": options.tenantKey };
@@ -1378,15 +1378,29 @@ function init(options) {
     if (token) h["Authorization"] = `Bearer ${token}`;
     return h;
   }
-  function signal() {
-    return AbortSignal.timeout(options.timeoutMs ?? STANDARD_TIMEOUT_MS);
+  async function medTidsgrense(kall) {
+    const ms = options.timeoutMs ?? STANDARD_TIMEOUT_MS;
+    if (typeof AbortSignal.timeout == "function") return kall(AbortSignal.timeout(ms));
+    const kontroll = new AbortController();
+    const timer = setTimeout(() => kontroll.abort(), ms);
+    try {
+      return await kall(kontroll.signal);
+    } finally {
+      clearTimeout(timer);
+    }
   }
   async function medToken(kall) {
-    let res = await kall(await headere());
+    const fors\u00F8k = async () => {
+      const h = await headere();
+      const r = await medTidsgrense((s) => kall(h, s));
+      if (!r.response) throw r.error;
+      return r;
+    };
+    let res = await fors\u00F8k();
     if (res.response.status === 401) {
       const feil = tilApiFeil(401, res.error, res.response);
       if (feil.code === "feedback_token_expired" && !anonym) {
-        res = await kall(await headere());
+        res = await fors\u00F8k();
       }
     }
     if (!res.response.ok) throw tilApiFeil(res.response.status, res.error, res.response);
@@ -1425,20 +1439,20 @@ function init(options) {
       }
     }
     return medToken(
-      (h) => submissionsCreate({
+      (h, s) => submissionsCreate({
         client: klient,
         headers: h,
-        signal: signal(),
+        signal: s,
         body
       })
     );
   }
   async function lastOppVedlegg(submissionId, vedlegg) {
     const presign = await medToken(
-      (h) => attachmentsPresign({
+      (h, s) => attachmentsPresign({
         client: klient,
         headers: h,
-        signal: signal(),
+        signal: s,
         body: {
           submissionId,
           mime: vedlegg.mime,
@@ -1448,12 +1462,12 @@ function init(options) {
         }
       })
     );
-    await lastOppTilLagring(options.fetch ?? fetch, presign, vedlegg.body, signal());
+    await medTidsgrense((s) => lastOppTilLagring(nett, presign, vedlegg.body, s));
     return medToken(
-      (h) => attachmentsComplete({
+      (h, s) => attachmentsComplete({
         client: klient,
         headers: h,
-        signal: signal(),
+        signal: s,
         path: { id: presign.attachmentId }
       })
     );
@@ -1471,7 +1485,7 @@ function init(options) {
     async loadSettings() {
       try {
         const cfg = await medToken(
-          (h) => configGet({ client: klient, headers: h, signal: signal() })
+          (h, s) => configGet({ client: klient, headers: h, signal: s })
         );
         if (cfg?.textMaxLength === 140 || cfg?.textMaxLength === 280) settings.textMaxLength = cfg.textMaxLength;
         if (typeof cfg?.minTextLength === "number" && cfg.minTextLength >= 1) settings.minTextLength = cfg.minTextLength;
@@ -1507,6 +1521,7 @@ function init(options) {
           telemetri.emit({ name: "submission_failed", reason: e.code });
           throw e;
         }
+        if (!(e instanceof NettverksFeil)) throw e;
         await k\u00F8.leggTil({
           clientRef,
           type: input.type,
@@ -1541,10 +1556,10 @@ function init(options) {
       async for(query = {}) {
         try {
           const kort = await medToken(
-            (h) => knownIssuesList2({
+            (h, s) => knownIssuesList2({
               client: klient,
               headers: h,
-              signal: signal(),
+              signal: s,
               query: {
                 ...query.screen !== void 0 ? { screen: query.screen } : {},
                 ...query.version !== void 0 ? { version: query.version } : {},
@@ -1561,10 +1576,10 @@ function init(options) {
       },
       async confirm(knownIssueId) {
         const res = await medToken(
-          (h) => knownIssuesConfirm({
+          (h, s) => knownIssuesConfirm({
             client: klient,
             headers: h,
-            signal: signal(),
+            signal: s,
             path: { id: knownIssueId },
             body: { context: kontekst }
           })
@@ -1586,10 +1601,10 @@ function init(options) {
         let sendte;
         try {
           sendte = await medToken(
-            (h) => submissionsListMine({ client: klient, headers: h, signal: signal() })
+            (h, s) => submissionsListMine({ client: klient, headers: h, signal: s })
           );
         } catch (e) {
-          if (e instanceof InnspelApiError) throw e;
+          if (!(e instanceof NettverksFeil)) throw e;
           return ventende;
         }
         telemetri.emit({ name: "status_viewed" });
@@ -1598,10 +1613,10 @@ function init(options) {
       async status(submissionId) {
         krevToken();
         return medToken(
-          (h) => submissionsStatus({
+          (h, s) => submissionsStatus({
             client: klient,
             headers: h,
-            signal: signal(),
+            signal: s,
             path: { id: submissionId }
           })
         );
@@ -1611,17 +1626,17 @@ function init(options) {
       async list() {
         krevToken();
         return medToken(
-          (h) => programsListMine({ client: klient, headers: h, signal: signal() })
+          (h, s) => programsListMine({ client: klient, headers: h, signal: s })
         );
       },
       async accept(invitationToken) {
         krevInvitasjonstoken(invitationToken);
         krevToken();
         const svar = await medToken(
-          (h) => programsAccept({
+          (h, s) => programsAccept({
             client: klient,
             headers: h,
-            signal: signal(),
+            signal: s,
             path: { token: invitationToken }
           })
         );
@@ -1632,10 +1647,10 @@ function init(options) {
         krevInvitasjonstoken(invitationToken);
         krevToken();
         await medToken(
-          (h) => programsDecline({
+          (h, s) => programsDecline({
             client: klient,
             headers: h,
-            signal: signal(),
+            signal: s,
             path: { token: invitationToken }
           })
         );
@@ -1647,10 +1662,10 @@ function init(options) {
         }
         krevToken();
         return medToken(
-          (h) => programsWithdraw({
+          (h, s) => programsWithdraw({
             client: klient,
             headers: h,
-            signal: signal(),
+            signal: s,
             path: { id: participationId }
           })
         );
@@ -1662,10 +1677,10 @@ function init(options) {
         validerUtfall(completion);
         krevToken();
         const svar = await medToken(
-          (h) => programsCompleteTask({
+          (h, s) => programsCompleteTask({
             client: klient,
             headers: h,
-            signal: signal(),
+            signal: s,
             path: { id: taskId },
             body: completion
           })
@@ -1680,10 +1695,10 @@ function init(options) {
         validerUtfall(response);
         krevToken();
         await medToken(
-          (h) => programsRespond({
+          (h, s) => programsRespond({
             client: klient,
             headers: h,
-            signal: signal(),
+            signal: s,
             path: { id: followUpId },
             body: response
           })