gomtm 0.0.197 → 0.0.198

package/dist/esm/ly/UserAvatorMenus.js

@@ -5,7 +5,7 @@ import { MtLink } from "mtxuilib/common/mtlink";
 import { Avatar, AvatarFallback, AvatarImage } from "mtxuilib/ui/avatar";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuGroup, DropdownMenuItem, DropdownMenuLabel, DropdownMenuPortal, DropdownMenuSeparator, DropdownMenuShortcut, DropdownMenuSub, DropdownMenuSubContent, DropdownMenuSubTrigger, DropdownMenuTrigger } from "mtxuilib/ui/dropdown-menu";
 import { usePathname } from "next/navigation";
-import { useAuth } from "../hooks/useAuth";
+import { useAuth } from "../store/auth";
 function UserAvatorMenus() {
   const pathName = usePathname();
   const auth = useAuth();

package/dist/esm/mtmFetcher.d.ts

@@ -1 +1,9 @@
-export declare function getMtmApiUrl(backendUrl: string): string;
+import { ServiceType } from "@bufbuild/protobuf";
+export declare function createMtmServiceClient<T extends ServiceType>(service: T, url?: string): import("@connectrpc/connect").PromiseClient<T>;
+export declare function createMtmServiceClientByName<T extends ServiceType>(svcName: string, url?: string): import("@connectrpc/connect").PromiseClient<ServiceType>;
+type CustomRequestInit = RequestInit & {
+    enableCache?: boolean;
+    enableLog?: boolean;
+};
+export declare const gomtmFetcher: (initGlobal?: CustomRequestInit) => (input: string | URL | globalThis.Request, init?: CustomRequestInit) => Promise<Response>;
+export {};

package/dist/esm/mtmFetcher.js

@@ -1,6 +1,137 @@
-function getMtmApiUrl(backendUrl) {
-  return backendUrl + "/api";
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { createPromiseClient } from "@connectrpc/connect";
+import { createConnectTransport } from "@connectrpc/connect-web";
+import { merge } from "lodash";
+import { fetchMiddleWithCache } from "mtxlib/http/fetchMiddleWithCache";
+import { MtmService } from "./gomtmpb/mtm/sppb/mtm_connect";
+function createMtmServiceClient(service, url) {
+  const baseUrl = url || process.env.MTM_BACKEND;
+  if (!baseUrl) {
+    throw new Error("missing mtm api url,\xB7MTM_BACKEND\xB7");
+  }
+  console.info("gomtm baseUrl:", baseUrl);
+  return createPromiseClient(
+    service,
+    createConnectTransport({
+      baseUrl,
+      fetch: gomtmFetcher()
+    })
+  );
 }
+function createMtmServiceClientByName(svcName, url) {
+  const baseUrl = url || process.env.MTM_BACKEND;
+  if (!baseUrl) {
+    throw new Error("missing mtm api url,\xB7MTM_BACKEND\xB7");
+  }
+  console.info("gomtm baseUrl:", baseUrl);
+  let svcType = void 0;
+  for (const a of allServices) {
+    if (a.typeName == svcName) {
+      svcType = a;
+    }
+  }
+  if (!svcType) {
+    throw new Error(`unknown svcType ${svcName}`);
+  }
+  return createPromiseClient(
+    svcType,
+    createConnectTransport({
+      baseUrl,
+      fetch: gomtmFetcher()
+    })
+  );
+}
+const allServices = [MtmService];
+const gomtmFetcher = (initGlobal) => {
+  return (input, init) => __async(void 0, null, function* () {
+    if (init) {
+      delete init.mode;
+      delete init.credentials;
+    }
+    const req = merge(init, initGlobal, {
+      redirect: "follow"
+    }) || {};
+    let headerCookie = "";
+    if (typeof window == "undefined") {
+      const reqHeaders = require("next/headers").headers();
+      headerCookie = reqHeaders.get("Cookie");
+    }
+    if (!init) {
+      init = {};
+    }
+    init = __spreadValues(__spreadValues({}, init), {
+      headers: __spreadValues(__spreadProps(__spreadValues({}, init.headers), {
+        "Content-Type": "application/json"
+      }), headerCookie && { "Cookie": headerCookie })
+    });
+    let fetcher = fetch;
+    req.enableCache = false;
+    if (req.enableCache) {
+      fetcher = fetchMiddleWithCache(fetch);
+    }
+    try {
+      const responseData = yield fetcher(input, init);
+      return responseData;
+    } catch (e) {
+      console.error("[mtmfetch error]", {
+        input,
+        error: e,
+        init
+      });
+      const errorRsp = {
+        errCode: "-1",
+        errMessage: (e == null ? void 0 : e.toString()) || "unknow error"
+      };
+      const errorResponse = new Response(JSON.stringify(errorRsp), {
+        status: 200,
+        headers: {
+          "Content-Type": "application/json"
+        }
+      });
+      return errorResponse;
+    }
+  });
+};
 export {
-  getMtmApiUrl
+  createMtmServiceClient,
+  createMtmServiceClientByName,
+  gomtmFetcher
 };

package/dist/esm/providers/GomtmProvider.js

@@ -7,7 +7,7 @@ import { AtomsHydrator } from "mtxlib/jotai/jotai-helper";
 import { isDebugAtom } from "mtxuilib/store/app.atoms";
 import { useHotkeys } from "react-hotkeys-hook";
 import { TransportProvider } from "../connectquery";
-import { gomtmFetcher } from "../gomtm-clients-ss";
+import { gomtmFetcher } from "../mtmFetcher";
 import { MtReactQueryProvider } from "./ReactQueryProvider";
 const mtmAppStore = createStore();
 const gomtmBaseUrlAtom = atom("");

package/dist/esm/sscore.d.ts

@@ -1 +0,0 @@
-export declare const ssrGetBackendUrl: () => string;

package/dist/esm/sscore.js

@@ -1,19 +0,0 @@
-import { cookies } from "next/headers";
-import { MTM_SERVER_COOKIE_ACTIVATE_URL } from "./consts";
-const ssrGetBackendUrl = () => {
-  var _a, _b;
-  const activateServerUrl = (_a = cookies().get(MTM_SERVER_COOKIE_ACTIVATE_URL)) == null ? void 0 : _a.value;
-  if (activateServerUrl) {
-    return activateServerUrl;
-  }
-  if ((_b = process == null ? void 0 : process.env) == null ? void 0 : _b.MTM_BACKEND) {
-    return process.env.MTM_BACKEND;
-  }
-  if (process.env.VERCEL_URL) {
-    return `https://${process.env.VERCEL_URL}`;
-  }
-  return "https://localhost";
-};
-export {
-  ssrGetBackendUrl
-};

package/dist/esm/store/auth.d.ts

@@ -0,0 +1,11 @@
+export declare const isAdminAtom: import("jotai").PrimitiveAtom<boolean> & {
+    init: boolean;
+};
+export declare const useIsAdmin: () => boolean;
+export declare function isRoleMatch(currentRoles: string[], allowRoles?: string[]): boolean;
+import { MyJWTPayload } from "../lib/auth/jwt";
+export declare function useAuth(): {
+    auth: MyJWTPayload | null;
+    userId: string | undefined;
+    isAdmin: boolean;
+};

package/dist/esm/store/auth.js

@@ -0,0 +1,75 @@
+"use client";
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { atom, useAtom } from "jotai";
+const isAdminAtom = atom(false);
+const useIsAdmin = () => {
+  const [isAdmin, setisAdmin] = useAtom(isAdminAtom);
+  return isAdmin;
+};
+function isRoleMatch(currentRoles, allowRoles) {
+  if (!currentRoles) {
+    return true;
+  }
+  if (!(allowRoles == null ? void 0 : allowRoles.length)) {
+    return true;
+  }
+  for (const roleName of allowRoles) {
+    const ok = currentRoles.find((x) => x == roleName);
+    if (ok) {
+      return true;
+    }
+  }
+  return false;
+}
+import React, { useEffect, useMemo } from "react";
+import Cookies from "universal-cookie";
+import { useSuspenseQuery } from "../connectquery";
+import { userinfo } from "../gomtmpb/mtm/sppb/mtm-MtmService_connectquery";
+import { verifyJwtToken } from "../lib/auth/jwt";
+function useAuth() {
+  const [auth, setAuth] = React.useState(null);
+  const getVerifiedtoken = () => __async(this, null, function* () {
+    var _a;
+    const cookies = new Cookies();
+    const token = (_a = cookies.get("token")) != null ? _a : null;
+    const verifiedToken = yield verifyJwtToken(token);
+    setAuth(verifiedToken);
+  });
+  useEffect(() => {
+    getVerifiedtoken();
+  }, []);
+  const isAdmin = useMemo(() => {
+    return (auth == null ? void 0 : auth.role) == "admin";
+  }, [auth]);
+  const userInfoQuery = useSuspenseQuery(userinfo);
+  const userId = useMemo(() => {
+    var _a;
+    return (_a = userInfoQuery.data.userInfo) == null ? void 0 : _a.ID;
+  }, [userInfoQuery.data]);
+  return { auth, userId, isAdmin };
+}
+export {
+  isAdminAtom,
+  isRoleMatch,
+  useAuth,
+  useIsAdmin
+};