@data-fair/lib-vue 1.11.0 → 1.13.0

package/async-action.d.ts

@@ -0,0 +1,14 @@
+import { type Ref } from 'vue';
+import { type PartialUiNotif, type UiNotif } from './ui-notif.js';
+type AsyncActionOptions = {
+    error?: string;
+    success?: PartialUiNotif;
+    catch?: 'error' | 'success' | 'all';
+};
+export declare function asyncAction<F extends (...args: any[]) => Promise<any>>(fn: F, options?: AsyncActionOptions): {
+    execute: F;
+    notif: Ref<UiNotif | null>;
+    loading: Ref<boolean>;
+    error: Ref<string | null>;
+};
+export {};

package/async-action.js

@@ -0,0 +1,35 @@
+// similar to withUiNotif but more powerful
+import { ref } from 'vue'
+import { useUiNotif, getFullNotif, getErrorMsg } from './ui-notif.js'
+export function asyncAction (fn, options) {
+  const { sendUiNotif } = useUiNotif()
+  const notif = ref(null)
+  const loading = ref(false)
+  const error = ref(null)
+  const execute = async function (...args) {
+    loading.value = true
+    notif.value = null
+    error.value = null
+    try {
+      const result = await fn(...args)
+      if (options?.success) {
+        const successNotif = getFullNotif(options?.success, 'success')
+        notif.value = successNotif
+        if (options?.catch !== 'success' && options?.catch !== 'all') {
+          sendUiNotif(successNotif)
+        }
+      }
+      return result
+    } catch (err) {
+      const errorMsg = getErrorMsg(err)
+      error.value = errorMsg
+      const errorNotif = getFullNotif({ msg: options?.error ?? '', error: errorMsg })
+      notif.value = errorNotif
+      if (options?.catch !== 'error' && options?.catch !== 'all') {
+        sendUiNotif(errorNotif)
+      }
+    }
+    loading.value = false
+  }
+  return { execute, notif, loading, error }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-vue",
-  "version": "1.11.0",
+  "version": "1.13.0",
   "description": "Composables and other utilities for Vue applications in the data-fair stack.",
   "main": "index.js",
   "files": [

package/session.js

@@ -14,13 +14,12 @@ function jwtDecodeAlive (jwt) {
   if (!decoded) { return }
   const now = Math.ceil(Date.now().valueOf() / 1000)
   if (typeof decoded.exp !== 'undefined' && decoded.exp < now) {
-    console.error(`token expired: ${decoded.exp}<${now},  ${JSON.stringify(decoded)}`)
+    // token expired
     return
   }
   if (typeof decoded.nbf !== 'undefined' && decoded.nbf > now) {
     console.warn(`token not yet valid: ${decoded.nbf}>${now}, ${JSON.stringify(decoded)}`)
-    // do not return null here, this is probably a false flag due to a slightly mismatched clock
-    // return null
+    // do not return here, this is probably a false flag due to a slightly mismatched clock
   }
   return decoded
 }
@@ -216,7 +215,7 @@ export async function getSession (initOptions) {
       await customFetch(`${options.directoryUrl}/api/auth/keepalive`, { method: 'POST' })
     } catch (err) {
       if (err instanceof FetchError && err.statusCode === 401) {
-        // this is expected if the session was deleted server side
+        console.warn('session was expired or deleted server side')
       } else {
         throw err
       }
@@ -233,7 +232,8 @@ export async function getSession (initOptions) {
   // also run an auto-refresh loop
   if (!ssr && !inIframe) {
     const lastKeepalive = window.localStorage.getItem('sd-keepalive' + options.sitePath)
-    if (state.user && (!lastKeepalive || (new Date().getTime() - Number(lastKeepalive)) > 10000)) {
+    // check cookies.get('id_token') not state.user so that we do a keepalive on expired id tokens
+    if (cookies.get('id_token') && (!lastKeepalive || (new Date().getTime() - Number(lastKeepalive)) > 10000)) {
       await keepalive()
     }
     const refreshLoopDelay = 10 * 60 * 1000 // 10 minutes

package/ui-notif.d.ts

@@ -17,6 +17,8 @@ interface UiNotifError {
     error: any;
     errorMsg: string;
 }
+export declare function getErrorMsg(error: any): string;
+export declare function getFullNotif(notif: PartialUiNotif, defaultType?: UiNotifBase['type']): UiNotif;
 export declare const getUiNotif: () => {
     notification: import("vue").Ref<{
         type?: ("default" | "info" | "success" | "warning") | undefined;

package/ui-notif.js

@@ -3,16 +3,16 @@
 // or can be displayed locally by @data-fair/lib-vuetify/ui-notif.vue
 import { ref, inject } from 'vue'
 import inIframe from '@data-fair/lib-utils/in-iframe.js'
-function getErrorMsg (error) {
+export function getErrorMsg (error) {
   if (typeof error === 'string') { return error }
   if (error.data && typeof error.data === 'string') { return error.data }
   if (error.response?.data && typeof error.response.data === 'string') { return error.response.data }
   if (typeof error.statusText === 'string') { return error.statusText }
   if (typeof error.response?.statusText === 'string') { return error.response?.statusText }
   if (error.message) { return error.message }
-  return 'erreur inconnu'
+  return 'erreur inconnue'
 }
-function getFullNotif (notif, defaultType = 'default') {
+export function getFullNotif (notif, defaultType = 'default') {
   if (typeof notif === 'string') { return { msg: notif, type: defaultType } }
   if (notif.error) {
     return {