@qlover/create-app 1.0.1 → 1.0.2

package/dist/templates/next-app/src/base/services/appApi/AppApiPlugin.ts

@@ -1,11 +1,11 @@
-import {
+import { ExecutorError, isRequestAdapterResponse } from '@qlover/fe-corekit';
+import type { AppApiErrorInterface } from '@/base/port/AppApiInterface';
+import type { AppApiConfig } from '../AppApiRequester';
+import type {
   ExecutorContextInterface,
-  ExecutorError,
-  isRequestAdapterResponse,
+  HookRuntimes,
   LifecyclePluginInterface
 } from '@qlover/fe-corekit';
-import type { AppApiErrorInterface } from '@/base/port/AppApiInterface';
-import type { AppApiConfig } from './AppApiRequester';
 import type { LoggerInterface } from '@qlover/logger';
 
 export class AppApiPlugin implements LifecyclePluginInterface<
@@ -15,9 +15,6 @@ export class AppApiPlugin implements LifecyclePluginInterface<
 
   constructor(protected logger: LoggerInterface) {}
 
-  /**
-   * @override
-   */
   public isAppApiErrorInterface(value: unknown): value is AppApiErrorInterface {
     return (
       typeof value === 'object' &&
@@ -29,6 +26,19 @@ export class AppApiPlugin implements LifecyclePluginInterface<
     );
   }
 
+  /**
+   * @override
+   * @param ctx
+   */
+  public onBefore(
+    ctx: ExecutorContextInterface<AppApiConfig<unknown>, unknown, HookRuntimes>
+  ): void {
+    ctx.setParameters({
+      ...ctx.parameters,
+      // TODO: ReqeustPlugin 在处理路径后会保留baseUrl，然后拼接 url，但是 fetchAdapter 会再次组合两个参数导致重复
+      baseURL: ''
+    });
+  }
   /**
    * @override
    */
@@ -39,7 +49,10 @@ export class AppApiPlugin implements LifecyclePluginInterface<
     // Important: 当响应数据失败则抛出错误
     if (isRequestAdapterResponse(response)) {
       if (this.isAppApiErrorInterface(response.data)) {
-        throw new ExecutorError(response.data.message || response.data.id, response);
+        throw new ExecutorError(
+          response.data.message || response.data.id,
+          response
+        );
       }
     }
 
@@ -77,9 +90,6 @@ export class AppApiPlugin implements LifecyclePluginInterface<
     }
   }
 
-  /**
-   * @override
-   */
   protected async getResponseJson(response: Response): Promise<unknown> {
     try {
       return await response.json();
@@ -88,15 +98,13 @@ export class AppApiPlugin implements LifecyclePluginInterface<
     }
   }
 
-  /**
-   * @override
-   */
   protected loggerError(config: AppApiConfig, error: unknown): void {
     this.logger.error(
       `%c[AppApi ${config.method} ${config.url}]%c - ${new Date().toLocaleString()}`,
       'color: #f00;',
       'color: inherit;',
-      error
+      error,
+      config
     );
   }
 }

package/dist/templates/next-app/src/base/services/appApi/AppUserApiBootstrap.ts

@@ -4,8 +4,8 @@ import { RequestEncryptPlugin } from '@/base/cases/RequestEncryptPlugin';
 import { StringEncryptor } from '@/base/cases/StringEncryptor';
 import { I } from '@config/IOCIdentifier';
 import { AppApiPlugin } from './AppApiPlugin';
-import { AppApiRequester } from './AppApiRequester';
-import type { AppApiConfig } from './AppApiRequester';
+import { AppApiRequester } from '../AppApiRequester';
+import type { AppApiConfig } from '../AppApiRequester';
 import type {
   BootstrapContext,
   BootstrapExecutorPlugin
@@ -35,9 +35,6 @@ export class AppUserApiBootstrap implements BootstrapExecutorPlugin {
     appUserApi.use(ioc.get(DialogErrorPlugin));
   }
 
-  /**
-   * @override
-   */
   protected requestDataSerializer(
     data: unknown,
     config: AppApiConfig

package/dist/templates/next-app/src/core/bootstraps/BootstrapServer.ts

@@ -1,31 +1,29 @@
 import 'reflect-metadata';
-import {
-  type ServiceIdentifier,
-  type IOCContainerInterface,
-  type IOCFunctionInterface,
+import { LifecycleExecutor } from '@qlover/fe-corekit';
+import type { ServerInterface } from '@/server/port/ServerInterface';
+import { I, type IOCIdentifierMapServer } from '@config/IOCIdentifier';
+import { ServerIOC } from '../serverIoc/ServerIOC';
+import type {
+  ServiceIdentifier,
+  IOCContainerInterface,
+  IOCFunctionInterface,
   BootstrapPluginOptions
 } from '@qlover/corekit-bridge';
-import {
+import type {
+  ExecutorError,
   ExecutorAsyncTask,
   ExecutorContextInterface,
-  LifecycleExecutor,
-  LifecyclePluginInterface,
-  type ExecutorError
+  LifecyclePluginInterface
 } from '@qlover/fe-corekit';
-import type { ServerInterface } from '@/server/port/ServerInterface';
-import { I, type IOCIdentifierMapServer } from '@config/IOCIdentifier';
-import { ServerIOC } from '../serverIoc/ServerIOC';
 import type { LoggerInterface } from '@qlover/logger';
 
 export interface BootstrapServerContextOptions extends BootstrapPluginOptions {
   IOC: IOCFunctionInterface<IOCIdentifierMapServer, IOCContainerInterface>;
 }
 
-export interface BootstrapServerPlugin
-  extends LifecyclePluginInterface<BootstrapServerContext> {}
+export interface BootstrapServerPlugin extends LifecyclePluginInterface<BootstrapServerContext> {}
 
-export interface BootstrapServerContext
-  extends ExecutorContextInterface<BootstrapServerContextOptions> {}
+export interface BootstrapServerContext extends ExecutorContextInterface<BootstrapServerContextOptions> {}
 
 export class BootstrapServer implements ServerInterface {
   protected executor: LifecycleExecutor<
@@ -80,9 +78,6 @@ export class BootstrapServer implements ServerInterface {
     return this.IOC(identifier);
   }
 
-  /**
-   * @override
-   */
   public use(
     plugin:
       | BootstrapServerPlugin
@@ -126,3 +121,5 @@ export class BootstrapServer implements ServerInterface {
     );
   }
 }
+
+export const bootstrapServer = new BootstrapServer();

package/dist/templates/next-app/src/core/clientIoc/ClientIOCRegister.ts

@@ -23,7 +23,6 @@ export class ClientIOCRegister implements IOCRegisterInterface<
    *
    * 一般用于注册全局
    *
-   * @override
    * @param ioc - IOC container
    */
   protected registerGlobals(ioc: IOCContainerInterface): void {
@@ -48,7 +47,6 @@ export class ClientIOCRegister implements IOCRegisterInterface<
    * - 国际化服务
    * - 主题服务
    *
-   * @override
    * @param ioc
    */
   protected registerImplement(ioc: IOCContainerInterface): void {
@@ -70,9 +68,6 @@ export class ClientIOCRegister implements IOCRegisterInterface<
     // ioc.bind(I.RequestPageBridgeInterface, ioc.get(RequestPageBridge));
   }
 
-  /**
-   * @override
-   */
   protected registerCommon(_ioc: IOCContainerInterface): void {
     // const { appConfig } = this.options;
     // const logger = ioc.get(I.Logger);

package/dist/templates/next-app/src/core/globals.ts

@@ -16,6 +16,7 @@ export const dialogHandler = new DialogHandler();
  * Global logger
  */
 export const logger = new Logger({
+  name: 'next-app',
   handlers: new ConsoleHandler(new ColorFormatter(loggerStyles)),
   silent: false,
   level: 'debug'

package/dist/templates/next-app/src/core/serverIoc/ServerIOCRegister.ts

@@ -19,7 +19,6 @@ export class ServerIOCRegister implements IOCRegisterInterface<
    *
    * 一般用于注册全局
    *
-   * @override
    * @param ioc - IOC container
    */
   protected registerGlobals(ioc: IOCContainerInterface): void {
@@ -28,6 +27,7 @@ export class ServerIOCRegister implements IOCRegisterInterface<
     ioc.bind(
       I.Logger,
       new Logger({
+        name: 'next-app-server',
         handlers: new ConsoleHandler(
           new TimestampFormatter({
             localeOptions: {
@@ -41,21 +41,15 @@ export class ServerIOCRegister implements IOCRegisterInterface<
           })
         ),
         silent: false,
-        level: appConfig.env === 'development' ? 'debug' : 'info'
+        level: appConfig.isProduction ? 'warn' : 'debug'
       })
     );
   }
 
-  /**
-   * @override
-   */
   protected registerImplement(ioc: IOCContainerInterface): void {
     ioc.bind(I.DBBridgeInterface, ioc.get(SupabaseBridge));
   }
 
-  /**
-   * @override
-   */
   protected registerCommon(_ioc: IOCContainerInterface): void {}
 
   /**

package/dist/templates/next-app/src/i18n/routing.ts

@@ -2,6 +2,7 @@ import { createNavigation } from 'next-intl/navigation';
 import { defineRouting } from 'next-intl/routing';
 import { useLocaleRoutes } from '@config/common';
 import { i18nConfig } from '@config/i18n';
+import { ROUTE_LOGIN, ROUTE_REGISTER } from '@config/route';
 
 const locales = i18nConfig.supportedLngs;
 
@@ -19,9 +20,13 @@ export const routing = defineRouting({
       en: '/',
       zh: '/'
     },
-    '/login': {
-      en: '/login',
-      zh: '/login'
+    [ROUTE_LOGIN]: {
+      en: '/auth/login',
+      zh: '/auth/login'
+    },
+    [ROUTE_REGISTER]: {
+      en: '/auth/register',
+      zh: '/auth/register'
     }
   }
 });

package/dist/templates/next-app/src/lib/supabase/client.ts

@@ -0,0 +1,8 @@
+import { createBrowserClient } from '@supabase/ssr';
+
+export function createClient() {
+  return createBrowserClient(
+    process.env.NEXT_PUBLIC_SUPABASE_URL!,
+    process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY!
+  );
+}

package/dist/templates/next-app/src/lib/supabase/conts.ts

@@ -0,0 +1,2 @@
+export const SUPABASE_URL = process.env.SUPABASE_URL;
+export const SUPABASE_KEY = process.env.SUPABASE_ANON_KEY;

package/dist/templates/next-app/src/lib/supabase/proxy.ts

@@ -0,0 +1,84 @@
+import { createServerClient } from '@supabase/ssr';
+import { NextResponse, type NextRequest } from 'next/server';
+import { ROUTE_LOGIN, ROUTE_REGISTER } from '@config/route';
+import { SUPABASE_KEY, SUPABASE_URL } from './conts';
+
+export async function updateSession(request: NextRequest) {
+  let supabaseResponse = NextResponse.next({
+    request
+  });
+
+  // If the env vars are not set, skip proxy check. You can remove this
+  // once you setup the project.
+  if (!SUPABASE_URL && SUPABASE_KEY) {
+    return supabaseResponse;
+  }
+
+  // With Fluid compute, don't put this client in a global environment
+  // variable. Always create a new one on each request.
+  const supabase = createServerClient(SUPABASE_URL!, SUPABASE_KEY!, {
+    // global: {
+    //   fetch: (input, init) => {
+    //     console.log('proxy supabase globals fetch', input, init);
+
+    //     return fetch(input, init);
+    //   }
+    // },
+    cookies: {
+      getAll() {
+        return request.cookies.getAll();
+      },
+      setAll(cookiesToSet) {
+        cookiesToSet.forEach(({ name, value }) =>
+          request.cookies.set(name, value)
+        );
+        supabaseResponse = NextResponse.next({
+          request
+        });
+        cookiesToSet.forEach(({ name, value, options }) =>
+          supabaseResponse.cookies.set(name, value, options)
+        );
+      }
+    }
+  });
+
+  // Do not run code between createServerClient and
+  // supabase.auth.getClaims(). A simple mistake could make it very hard to debug
+  // issues with users being randomly logged out.
+
+  // IMPORTANT: If you remove getClaims() and you use server-side rendering
+  // with the Supabase client, your users may be randomly logged out.
+  const { data } = await supabase.auth.getClaims();
+  const user = data?.claims;
+
+  console.log('Proxy(supabase) logged?:', !!user);
+
+  if (
+    request.nextUrl.pathname !== '/' &&
+    !user &&
+    !request.nextUrl.pathname.includes(ROUTE_LOGIN) &&
+    !request.nextUrl.pathname.includes(ROUTE_REGISTER)
+  ) {
+    console.log('proxy supabase no user to login');
+
+    // no user, potentially respond by redirecting the user to the login page
+    const url = request.nextUrl.clone();
+    url.pathname = ROUTE_LOGIN;
+    return NextResponse.redirect(url);
+  }
+
+  // IMPORTANT: You *must* return the supabaseResponse object as it is.
+  // If you're creating a new response object with NextResponse.next() make sure to:
+  // 1. Pass the request in it, like so:
+  //    const myNewResponse = NextResponse.next({ request })
+  // 2. Copy over the cookies, like so:
+  //    myNewResponse.cookies.setAll(supabaseResponse.cookies.getAll())
+  // 3. Change the myNewResponse object to fit your needs, but avoid changing
+  //    the cookies!
+  // 4. Finally:
+  //    return myNewResponse
+  // If this is not done, you may be causing the browser and server to go out
+  // of sync and terminate the user's session prematurely!
+
+  return supabaseResponse;
+}

package/dist/templates/next-app/src/lib/supabase/server.ts

@@ -0,0 +1,38 @@
+import { createServerClient } from '@supabase/ssr';
+import { cookies } from 'next/headers';
+import { SUPABASE_KEY, SUPABASE_URL } from './conts';
+
+/**
+ * Especially important if using Fluid compute: Don't put this client in a
+ * global variable. Always create a new client within each function when using
+ * it.
+ */
+export async function createClient() {
+  const cookieStore = await cookies();
+
+  return createServerClient(SUPABASE_URL!, SUPABASE_KEY!, {
+    // global: {
+    //   fetch: (input, init) => {
+    //     console.log('supabase globals fetch', input, init);
+
+    //     return fetch(input, init);
+    //   }
+    // },
+    cookies: {
+      getAll() {
+        return cookieStore.getAll();
+      },
+      setAll(cookiesToSet) {
+        try {
+          cookiesToSet.forEach(({ name, value, options }) =>
+            cookieStore.set(name, value, options)
+          );
+        } catch {
+          // The `setAll` method was called from a Server Component.
+          // This can be ignored if you have proxy refreshing
+          // user sessions.
+        }
+      }
+    }
+  });
+}

package/dist/templates/next-app/src/proxy.ts

@@ -5,10 +5,17 @@ import createMiddleware from 'next-intl/middleware';
 
 // Import your routing configuration which contains all locales, defaultLocale, and pathnames
 import { routing } from './i18n/routing';
+import { updateSession } from './lib/supabase/proxy';
+import type { NextRequest } from 'next/server';
 
 // Export the middleware created by next-intl
 // This middleware will handle locale detection, redirects, and internationalized routing automatically
-export default createMiddleware(routing);
+// export default createMiddleware(routing);
+
+export default async function proxy(request: NextRequest) {
+  await updateSession(request);
+  return createMiddleware(routing)(request);
+}
 
 // Next.js middleware configuration object
 export const config = {

package/dist/templates/next-app/src/server/AppPageRouteParams.ts

@@ -1,7 +1,7 @@
 import { cookies } from 'next/headers';
 import { notFound } from 'next/navigation';
 import { getMessages, getTranslations } from 'next-intl/server';
-import { TranslateI18nInterface } from '@/base/cases/TranslateI18nInterface';
+import { TranslateI18nUtil } from '@/base/cases/TranslateI18nUtil';
 import { filterMessagesByNamespace } from '@/i18n/loadMessages';
 import { i18nConfig } from '@config/i18n';
 import type { LocaleType, PageI18nInterface } from '@config/i18n';
@@ -91,7 +91,10 @@ export class AppPageRouteParams<
       // namespace: namespace
     });
 
-    return TranslateI18nInterface.translate<T>(i18nInterface, t);
+    return TranslateI18nUtil.translate<T>(
+      i18nInterface,
+      TranslateI18nUtil.overrideTranslateT(t)
+    );
   }
 
   /**

package/dist/templates/next-app/src/server/NextApiServer.ts

@@ -12,16 +12,10 @@ import { AppSuccessApi } from './AppSuccessApi';
 import type { ExecutorAsyncTask } from '@qlover/fe-corekit';
 
 export class NextApiServer extends BootstrapServer {
-  /**
-   * @override
-   */
   protected isAppApiResult(result: unknown): result is AppApiResult {
     return isAppApiSuccessInterface(result) || isAppApiErrorInterface(result);
   }
 
-  /**
-   * @override
-   */
   public async run<Result>(
     task?: ExecutorAsyncTask<
       Result | AppApiResult,
@@ -37,20 +31,19 @@ export class NextApiServer extends BootstrapServer {
 
     // If result is ExecutorError, return AppErrorApi
     if (result instanceof ExecutorError) {
+      this.logger.debug('NextApiServer run error:', result);
       return new AppErrorApi(result.id, result.message);
     }
 
     // If result is Error, return AppErrorApi
     if (result instanceof Error) {
+      this.logger.debug('NextApiServer run error:', result);
       return new AppErrorApi('SERVER_ERROR', result.message);
     }
 
     return new AppSuccessApi(result);
   }
 
-  /**
-   * @override
-   */
   public async runWithJson<Result>(
     task?: ExecutorAsyncTask<
       Result | AppApiResult,

package/dist/templates/next-app/src/server/PagesRouteParams.ts

@@ -1,4 +1,4 @@
-import { TranslateI18nInterface } from '@/base/cases/TranslateI18nInterface';
+import { TranslateI18nUtil } from '@/base/cases/TranslateI18nUtil';
 import { loadMessages } from '@/i18n/loadMessages';
 import { i18nConfig } from '@config/i18n';
 import type { LocaleType, PageI18nInterface } from '@config/i18n';
@@ -100,9 +100,8 @@ export class PagesRouteParams implements RouteParamsnHandlerInterface {
   /**
    * 获取翻译后的 i18n 接口
    * 创建一个简单的翻译函数，基于加载的 messages
-
    * @override
-      */
+   */
   public async getI18nInterface<T extends PageI18nInterface>(
     i18nInterface: T,
     namespace?: string
@@ -131,7 +130,7 @@ export class PagesRouteParams implements RouteParamsnHandlerInterface {
       return message;
     };
 
-    return TranslateI18nInterface.translate<T>(
+    return TranslateI18nUtil.translate<T>(
       i18nInterface,
       t as ReturnType<typeof useTranslations>
     );

package/dist/templates/next-app/src/server/ServerAuth.ts

@@ -2,8 +2,10 @@ import { ExecutorError } from '@qlover/fe-corekit';
 import { inject, injectable } from 'inversify';
 import { cookies } from 'next/headers';
 import type { AppConfig } from '@/base/cases/AppConfig';
+import { UserSchema } from '@migrations/schema/UserSchema';
 import { API_NOT_AUTHORIZED } from '@config/Identifier';
 import { I } from '@config/IOCIdentifier';
+import { SupabaseBridge } from './SupabaseBridge';
 import { UserCredentialToken } from './UserCredentialToken';
 import type { ServerAuthInterface } from './port/ServerAuthInterface';
 
@@ -13,7 +15,8 @@ export class ServerAuth implements ServerAuthInterface {
   constructor(
     @inject(I.AppConfig) protected server: AppConfig,
     @inject(UserCredentialToken)
-    protected userCredentialToken: UserCredentialToken
+    protected userCredentialToken: UserCredentialToken,
+    @inject(SupabaseBridge) protected supabase: SupabaseBridge
   ) {
     this.userTokenKey = server.userTokenKey;
   }
@@ -31,19 +34,11 @@ export class ServerAuth implements ServerAuthInterface {
    * @override
    */
   public async hasAuth(): Promise<boolean> {
-    const token = await this.getAuth();
+    const supabase = await this.supabase.getSupabase();
 
-    if (!token) {
-      return false;
-    }
-
-    try {
-      const user = await this.userCredentialToken.parseToken(token);
+    const { data } = await supabase.auth.getClaims();
 
-      return !!user;
-    } catch {
-      return false;
-    }
+    return !!data?.claims;
   }
 
   /**
@@ -72,4 +67,15 @@ export class ServerAuth implements ServerAuthInterface {
       throw new ExecutorError(API_NOT_AUTHORIZED, 'Not authorized');
     }
   }
+
+  /**
+   * @override
+   */
+  public async getUser(): Promise<UserSchema | null> {
+    const supabase = await this.supabase.getSupabase();
+
+    const { data } = await supabase.auth.getUser();
+
+    return data.user ? this.supabase.toUserSchema(data.user) : null;
+  }
 }