@fy-/fws-vue 0.3.73 → 0.3.75

package/composables/rest.ts

@@ -1,5 +1,5 @@
 import { RestMethod, RestParams, getMode, rest, stringHash } from "@fy-/fws-js";
-import { useRestStore } from "../stores/rest";
+import { useServerRouter } from "../stores/serverRouter";
 import { isServerRendered } from "./ssr";
 import { useEventBus } from "./event-bus";
 
@@ -31,7 +31,7 @@ export function useRest(): <ResultType extends APIResult>(
   method: RestMethod,
   params?: RestParams,
 ) => Promise<ResultType> {
-  const restStore = useRestStore();
+  const serverRouter = useServerRouter();
   const eventBus = useEventBus();
 
   return async <ResultType extends APIResult>(
@@ -39,15 +39,22 @@ export function useRest(): <ResultType extends APIResult>(
     method: RestMethod,
     params?: RestParams,
   ): Promise<ResultType> => {
-    const urlParse = new URL(url);
-    const pathOnly = urlParse.pathname + urlParse.search;
+    let urlForHash: string = url;
+    try {
+      const urlParse = new URL(url);
+      urlForHash = urlParse.pathname + urlParse.search;
+    } catch (error) {
+      urlForHash = url;
+    }
 
-    const requestHash = stringHash(pathOnly + method + JSON.stringify(params));
+    const requestHash = stringHash(
+      urlForHash + method + JSON.stringify(params),
+    );
     if (isServerRendered()) {
-      const hasResult = restStore.getResult(requestHash);
+      const hasResult = serverRouter.getResult(requestHash);
       if (hasResult !== undefined) {
         const result = hasResult as ResultType;
-        restStore.removeResult(requestHash);
+        serverRouter.removeResult(requestHash);
         if (result.result === "error") {
           eventBus.emit("main-loading", false);
           eventBus.emit("rest-error", result);
@@ -60,7 +67,7 @@ export function useRest(): <ResultType extends APIResult>(
     try {
       const restResult: ResultType = await rest(url, method, params);
       if (getMode() === "ssr") {
-        restStore.addResult(
+        serverRouter.addResult(
           requestHash,
           JSON.parse(JSON.stringify(restResult)),
         );
@@ -74,7 +81,7 @@ export function useRest(): <ResultType extends APIResult>(
     } catch (error) {
       const restError: ResultType = error as ResultType;
       if (getMode() === "ssr") {
-        restStore.addResult(requestHash, restError);
+        serverRouter.addResult(requestHash, restError);
       }
       eventBus.emit("main-loading", false);
       eventBus.emit("rest-error", restError);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fy-/fws-vue",
-  "version": "0.3.73",
+  "version": "0.3.75",
   "author": "Florian 'Fy' Gasquez <m@fy.to>",
   "license": "MIT",
   "repository": {

package/stores/serverRouter.ts

@@ -5,6 +5,7 @@ export interface ServerRouterState {
   _router: any | null;
   status: number;
   redirect?: string;
+  results: Record<number, any | undefined>;
 }
 
 export const useServerRouter = defineStore({
@@ -14,6 +15,7 @@ export const useServerRouter = defineStore({
       _router: null,
       status: 200,
       redirect: undefined,
+      results: {},
     }) as ServerRouterState,
   getters: {
     currentRoute: (state) => state._router!.currentRoute,
@@ -45,5 +47,17 @@ export const useServerRouter = defineStore({
     forward() {
       this._router?.go(1);
     },
+    addResult(id: number, result: any) {
+      this.results[id] = result;
+    },
+    hasResult(id: number) {
+      return this.results[id] !== undefined;
+    },
+    getResult(id: number) {
+      return this.results[id];
+    },
+    removeResult(id: number) {
+      delete this.results[id];
+    },
   },
 });

package/stores/rest.ts

@@ -1,27 +0,0 @@
-import { defineStore } from "pinia";
-import { APIResult } from "../composables/rest";
-
-type SharedState = {
-  results: Record<number, any | undefined>;
-};
-
-export const useRestStore = defineStore({
-  id: "restStore",
-  state: (): SharedState => ({
-    results: {},
-  }),
-  actions: {
-    addResult(id: number, result: any) {
-      this.results[id] = result;
-    },
-    hasResult(id: number) {
-      return this.results[id] !== undefined;
-    },
-    getResult(id: number) {
-      return this.results[id];
-    },
-    removeResult(id: number) {
-      delete this.results[id];
-    },
-  },
-});