heliumts 0.9.5 → 0.9.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +7 -3
- package/dist/bin/helium.js +61 -53
- package/dist/bin/helium.js.map +1 -1
- package/dist/client/Router.d.ts +2 -2
- package/dist/client/Router.d.ts.map +1 -1
- package/dist/client/Router.js +32 -29
- package/dist/client/Router.js.map +1 -1
- package/dist/client/cache.d.ts.map +1 -1
- package/dist/client/cache.js +13 -13
- package/dist/client/cache.js.map +1 -1
- package/dist/client/callMethod.d.ts +13 -0
- package/dist/client/callMethod.d.ts.map +1 -0
- package/dist/client/callMethod.js +10 -0
- package/dist/client/callMethod.js.map +1 -0
- package/dist/client/env.js.map +1 -1
- package/dist/client/index.d.ts +2 -1
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/index.js +1 -0
- package/dist/client/index.js.map +1 -1
- package/dist/client/routerManifest.d.ts.map +1 -1
- package/dist/client/routerManifest.js +18 -29
- package/dist/client/routerManifest.js.map +1 -1
- package/dist/client/rpcClient.d.ts +7 -3
- package/dist/client/rpcClient.d.ts.map +1 -1
- package/dist/client/rpcClient.js +80 -78
- package/dist/client/rpcClient.js.map +1 -1
- package/dist/client/transitions.d.ts +1 -1
- package/dist/client/transitions.d.ts.map +1 -1
- package/dist/client/useCall.d.ts.map +1 -1
- package/dist/client/useCall.js +4 -1
- package/dist/client/useCall.js.map +1 -1
- package/dist/client/useFetch.d.ts.map +1 -1
- package/dist/client/useFetch.js +48 -92
- package/dist/client/useFetch.js.map +1 -1
- package/dist/runtime/routeOrder.d.ts +3 -0
- package/dist/runtime/routeOrder.d.ts.map +1 -0
- package/dist/runtime/routeOrder.js +15 -0
- package/dist/runtime/routeOrder.js.map +1 -0
- package/dist/server/config.d.ts.map +1 -1
- package/dist/server/config.js +51 -26
- package/dist/server/config.js.map +1 -1
- package/dist/server/defineHTTPRequest.d.ts +1 -1
- package/dist/server/defineHTTPRequest.d.ts.map +1 -1
- package/dist/server/defineHTTPRequest.js.map +1 -1
- package/dist/server/defineWorker.d.ts.map +1 -1
- package/dist/server/defineWorker.js +68 -37
- package/dist/server/defineWorker.js.map +1 -1
- package/dist/server/devServer.d.ts.map +1 -1
- package/dist/server/devServer.js +70 -40
- package/dist/server/devServer.js.map +1 -1
- package/dist/server/httpCompression.d.ts +8 -0
- package/dist/server/httpCompression.d.ts.map +1 -0
- package/dist/server/httpCompression.js +58 -0
- package/dist/server/httpCompression.js.map +1 -0
- package/dist/server/httpRouter.d.ts.map +1 -1
- package/dist/server/httpRouter.js +138 -43
- package/dist/server/httpRouter.js.map +1 -1
- package/dist/server/meta.d.ts.map +1 -1
- package/dist/server/meta.js +23 -15
- package/dist/server/meta.js.map +1 -1
- package/dist/server/prodServer.d.ts.map +1 -1
- package/dist/server/prodServer.js +87 -46
- package/dist/server/prodServer.js.map +1 -1
- package/dist/server/rateLimiter.d.ts +9 -0
- package/dist/server/rateLimiter.d.ts.map +1 -1
- package/dist/server/rateLimiter.js +46 -0
- package/dist/server/rateLimiter.js.map +1 -1
- package/dist/server/requestHandler.d.ts +4 -0
- package/dist/server/requestHandler.d.ts.map +1 -0
- package/dist/server/requestHandler.js +20 -0
- package/dist/server/requestHandler.js.map +1 -0
- package/dist/server/rpcRegistry.d.ts +4 -0
- package/dist/server/rpcRegistry.d.ts.map +1 -1
- package/dist/server/rpcRegistry.js +60 -15
- package/dist/server/rpcRegistry.js.map +1 -1
- package/dist/server/security.d.ts.map +1 -1
- package/dist/server/security.js +3 -2
- package/dist/server/security.js.map +1 -1
- package/dist/server/serializer.js +17 -6
- package/dist/server/serializer.js.map +1 -1
- package/dist/server/ssr.d.ts +2 -1
- package/dist/server/ssr.d.ts.map +1 -1
- package/dist/server/ssr.js +29 -32
- package/dist/server/ssr.js.map +1 -1
- package/dist/utils/envLoader.js +1 -1
- package/dist/utils/envLoader.js.map +1 -1
- package/dist/utils/html.d.ts +7 -0
- package/dist/utils/html.d.ts.map +1 -0
- package/dist/utils/html.js +197 -0
- package/dist/utils/html.js.map +1 -0
- package/dist/utils/ipExtractor.d.ts +6 -52
- package/dist/utils/ipExtractor.d.ts.map +1 -1
- package/dist/utils/ipExtractor.js +21 -118
- package/dist/utils/ipExtractor.js.map +1 -1
- package/dist/vite/heliumPlugin.d.ts.map +1 -1
- package/dist/vite/heliumPlugin.js +75 -83
- package/dist/vite/heliumPlugin.js.map +1 -1
- package/dist/vite/scanner.d.ts +3 -0
- package/dist/vite/scanner.d.ts.map +1 -1
- package/dist/vite/scanner.js +89 -18
- package/dist/vite/scanner.js.map +1 -1
- package/dist/vite/ssg.d.ts +4 -0
- package/dist/vite/ssg.d.ts.map +1 -1
- package/dist/vite/ssg.js +66 -39
- package/dist/vite/ssg.js.map +1 -1
- package/dist/vite/virtualServerModule.d.ts +1 -1
- package/dist/vite/virtualServerModule.d.ts.map +1 -1
- package/dist/vite/virtualServerModule.js +28 -16
- package/dist/vite/virtualServerModule.js.map +1 -1
- package/package.json +12 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routerManifest.js","sourceRoot":"","sources":["../../src/client/routerManifest.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ComponentType, LazyExoticComponent } from \"react\";\nimport React from \"react\";\n\nimport { log } from \"../utils/logger.js\";\n\nexport type LayoutProps = {\n children: React.ReactNode;\n};\n\nexport type RouteEntry = {\n pathPattern: string; // \"/tasks/:id\"\n matcher: (path: string) => { params: Record<string, string | string[]> } | null;\n Component: ComponentType<unknown>;\n LazyComponent: LazyExoticComponent<ComponentType<unknown>>;\n layouts: ComponentType<LayoutProps>[]; // Array of layouts from root to leaf\n preload: () => Promise<{ default: ComponentType<unknown> }>; // Preload function for prefetching\n};\n\n/**\n * Convert a file path to a route pattern\n * Examples:\n * - /src/pages/index.tsx → /\n * - /src/pages/tasks/index.tsx → /tasks\n * - /src/pages/tasks/[id].tsx → /tasks/:id\n * - /src/pages/settings/profile.tsx → /settings/profile\n * - /src/pages/blog/[...slug].tsx → /blog/*slug\n * - /src/pages/404.tsx → __404__\n * - /src/pages/(website)/contact.tsx → /contact\n * - /src/pages/(portal)/dashboard.tsx → /dashboard\n * @internal Exported for testing\n */\nexport function pathFromFile(file: string): string {\n // Remove /src/pages prefix and file extension\n const withoutPrefix = file.replace(\"/src/pages\", \"\").replace(/\\.(tsx|jsx|ts|js)$/, \"\");\n\n // Handle special files\n if (withoutPrefix === \"/404\") {\n return \"__404__\";\n }\n\n // Remove route groups (folders in parentheses)\n // E.g., /(website)/contact → /contact\n let pattern = withoutPrefix.replace(/\\/\\([^)]+\\)/g, \"\");\n\n // Convert /index to /\n pattern = pattern.replace(/\\/index$/, \"\") || \"/\";\n // Convert [...param] to *param (catch-all)\n pattern = pattern.replace(/\\[\\.\\.\\.(.+?)\\]/g, \"*$1\");\n // Convert [param] to :param (single dynamic segment)\n pattern = pattern.replace(/\\[(.+?)\\]/g, \":$1\");\n\n return pattern;\n}\n\n/**\n * Create a matcher function for a route pattern\n * Supports dynamic segments like :id, :slug, etc.\n * Supports catch-all segments like *slug for [...slug]\n * @internal Exported for testing\n */\nexport function createMatcher(pattern: string) {\n const segments = pattern.split(\"/\").filter(Boolean);\n\n return (path: string) => {\n // Remove query string and hash\n const cleanPath = path.split(\"?\")[0].split(\"#\")[0];\n const pathSegments = cleanPath.split(\"/\").filter(Boolean);\n\n // For root path, handle specially\n if (pattern === \"/\" && cleanPath === \"/\") {\n return { params: {} };\n }\n\n const params: Record<string, string | string[]> = {};\n\n // Check for catch-all segment (must be last)\n const hasCatchAll = segments.some((seg) => seg.startsWith(\"*\"));\n if (hasCatchAll) {\n const catchAllIndex = segments.findIndex((seg) => seg.startsWith(\"*\"));\n\n // Catch-all must be the last segment\n if (catchAllIndex !== segments.length - 1) {\n log(\"warn\", `Catch-all segment must be last: ${pattern}`);\n return null;\n }\n\n const catchAllParam = segments[catchAllIndex].slice(1); // Remove *\n\n // Match segments before catch-all\n for (let i = 0; i < catchAllIndex; i++) {\n const seg = segments[i];\n const value = pathSegments[i];\n\n if (!value) {\n return null;\n } // Not enough path segments\n\n if (seg.startsWith(\":\")) {\n params[seg.slice(1)] = decodeURIComponent(value);\n } else if (seg !== value) {\n return null; // Static segment must match\n }\n }\n\n // Collect remaining path segments into catch-all param as an array\n const remainingSegments = pathSegments.slice(catchAllIndex);\n params[catchAllParam] = remainingSegments.map((s) => decodeURIComponent(s));\n\n return { params };\n }\n\n // Regular matching (no catch-all)\n // If segment counts don't match, no match\n if (segments.length !== pathSegments.length) {\n return null;\n }\n\n for (let i = 0; i < segments.length; i++) {\n const seg = segments[i];\n const value = pathSegments[i];\n\n if (seg.startsWith(\":\")) {\n // Dynamic segment\n params[seg.slice(1)] = decodeURIComponent(value);\n } else if (seg !== value) {\n // Static segment must match exactly\n return null;\n }\n }\n\n return { params };\n };\n}\n\n/**\n * Get directory path from file path\n * /src/pages/tasks/[id].tsx → /tasks\n * /src/pages/(website)/contact.tsx → /(website)\n */\nfunction getDirectoryPath(file: string): string {\n const withoutPrefix = file.replace(\"/src/pages\", \"\").replace(/\\.(tsx|jsx|ts|js)$/, \"\");\n const parts = withoutPrefix.split(\"/\");\n parts.pop(); // Remove filename\n return parts.join(\"/\") || \"/\";\n}\n\n/**\n * Build route manifest from pages directory\n * Uses import.meta.glob to discover all page files\n * Supports both eager and lazy loading for Suspense compatibility\n */\nexport function buildRoutes(): {\n routes: RouteEntry[];\n NotFound?: ComponentType<unknown>;\n AppShell?: ComponentType<unknown>;\n} {\n // SSR check - return empty routes if running server-side\n if (typeof window === \"undefined\") {\n return { routes: [], NotFound: undefined, AppShell: undefined };\n }\n\n // Eagerly load all page components (for initial render and layouts)\n // Exclude .server.* sidecar files — they contain server-only code (e.g. DB access)\n // and must never be bundled into the client.\n const eagerPages = import.meta.glob([\"/src/pages/**/*.{tsx,jsx,ts,js}\", \"!**/*.server.*\"], {\n eager: true,\n }) as Record<string, { default: ComponentType<unknown> }>;\n\n // Lazy load all page components (for Suspense support)\n const lazyPages = import.meta.glob([\"/src/pages/**/*.{tsx,jsx,ts,js}\", \"!**/*.server.*\"]) as Record<string, () => Promise<{ default: ComponentType<unknown> }>>;\n\n // Debug mode: set localStorage.setItem('helium_debug_routes', 'true') to enable\n const debugRoutes = typeof localStorage !== \"undefined\" && localStorage.getItem(\"helium_debug_routes\") === \"true\";\n\n if (debugRoutes) {\n console.group(\"[Helium Router] Discovered pages:\");\n for (const file of Object.keys(eagerPages)) {\n console.log(` ${file} → ${pathFromFile(file)}`);\n }\n console.groupEnd();\n }\n\n const routes: RouteEntry[] = [];\n let NotFound: ComponentType<unknown> | undefined;\n let AppShell: ComponentType<unknown> | undefined;\n\n // Build layout map: directory path -> layout component\n const layoutMap = new Map<string, ComponentType<LayoutProps>>();\n\n // Track route patterns to detect collisions: pattern -> file path\n const routePatternMap = new Map<string, string>();\n\n // First pass: collect all layouts\n for (const [file, mod] of Object.entries(eagerPages)) {\n if (file.includes(\"/_layout.\")) {\n const Component = mod.default;\n if (Component) {\n const dirPath = getDirectoryPath(file);\n layoutMap.set(dirPath, Component as ComponentType<LayoutProps>);\n }\n }\n }\n\n // Second pass: build routes with their layouts\n for (const [file, mod] of Object.entries(eagerPages)) {\n // Skip layout files\n if (file.includes(\"/_layout.\")) {\n continue;\n }\n\n const Component = mod.default;\n if (!Component) {\n log(\"warn\", `No default export found in ${file}`);\n continue;\n }\n\n const pathPattern = pathFromFile(file);\n\n // Handle special pages\n if (pathPattern === \"__404__\") {\n NotFound = Component;\n continue;\n }\n\n // Detect route collisions\n const existingFile = routePatternMap.get(pathPattern);\n if (existingFile) {\n log(\"error\", `Route collision detected! Multiple files resolve to the same path \"${pathPattern}\":`);\n log(\"error\", ` - ${existingFile}`);\n log(\"error\", ` - ${file}`);\n log(\"error\", `Only the first file will be used. Consider using different file names or paths.`);\n } else {\n routePatternMap.set(pathPattern, file);\n }\n\n // Find all layouts for this route (from root to leaf)\n const layouts: ComponentType<LayoutProps>[] = [];\n const dirPath = getDirectoryPath(file);\n const pathParts = dirPath.split(\"/\").filter(Boolean);\n\n // Always check for root layout first (applies to all pages)\n const rootLayout = layoutMap.get(\"/\");\n if (rootLayout) {\n layouts.push(rootLayout);\n }\n\n // Then check for layouts at each nested level\n // This will include route group layouts and any nested folder layouts\n for (let i = 1; i <= pathParts.length; i++) {\n const checkPath = \"/\" + pathParts.slice(0, i).join(\"/\");\n const layout = layoutMap.get(checkPath);\n if (layout) {\n layouts.push(layout);\n }\n }\n\n // Get the lazy loader for this page\n const lazyLoader = lazyPages[file];\n const LazyComponent = React.lazy(lazyLoader);\n\n // Create route entry with both eager and lazy components\n routes.push({\n pathPattern,\n matcher: createMatcher(pathPattern),\n Component,\n LazyComponent,\n layouts,\n preload: lazyLoader,\n });\n }\n\n // Sort routes by specificity (static > dynamic > catch-all)\n routes.sort((a, b) => {\n const aHasCatchAll = a.pathPattern.includes(\"*\");\n const bHasCatchAll = b.pathPattern.includes(\"*\");\n const aHasDynamic = a.pathPattern.includes(\":\");\n const bHasDynamic = b.pathPattern.includes(\":\");\n\n // Catch-all routes should be last (least specific)\n if (aHasCatchAll && !bHasCatchAll) {\n return 1;\n }\n if (!aHasCatchAll && bHasCatchAll) {\n return -1;\n }\n\n // Dynamic routes come after static routes\n if (aHasDynamic && !bHasDynamic) {\n return 1;\n }\n if (!aHasDynamic && bHasDynamic) {\n return -1;\n }\n\n // Longer paths first (more specific)\n return b.pathPattern.length - a.pathPattern.length;\n });\n\n if (debugRoutes) {\n console.group(\"[Helium Router] Final route order:\");\n for (const route of routes) {\n console.log(` ${route.pathPattern}`);\n }\n console.groupEnd();\n }\n\n return { routes, NotFound, AppShell };\n}\n"]}
|
|
1
|
+
{"version":3,"file":"routerManifest.js","sourceRoot":"","sources":["../../src/client/routerManifest.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ComponentType, LazyExoticComponent } from \"react\";\nimport React from \"react\";\n\nimport { compareRoutePatterns } from \"../runtime/routeOrder.js\";\nimport { log } from \"../utils/logger.js\";\n\nexport type LayoutProps = {\n children: React.ReactNode;\n};\n\nexport type RouteEntry = {\n pathPattern: string; // \"/tasks/:id\"\n matcher: (path: string) => { params: Record<string, string | string[]> } | null;\n Component: ComponentType<unknown>;\n LazyComponent: LazyExoticComponent<ComponentType<unknown>>;\n layouts: ComponentType<LayoutProps>[]; // Array of layouts from root to leaf\n preload: () => Promise<{ default: ComponentType<unknown> }>; // Preload function for prefetching\n};\n\n/**\n * Convert a file path to a route pattern\n * Examples:\n * - /src/pages/index.tsx → /\n * - /src/pages/tasks/index.tsx → /tasks\n * - /src/pages/tasks/[id].tsx → /tasks/:id\n * - /src/pages/settings/profile.tsx → /settings/profile\n * - /src/pages/blog/[...slug].tsx → /blog/*slug\n * - /src/pages/404.tsx → __404__\n * - /src/pages/(website)/contact.tsx → /contact\n * - /src/pages/(portal)/dashboard.tsx → /dashboard\n * @internal Exported for testing\n */\nexport function pathFromFile(file: string): string {\n // Remove /src/pages prefix and file extension\n const withoutPrefix = file.replace(\"/src/pages\", \"\").replace(/\\.(tsx|jsx|ts|js)$/, \"\");\n\n // Handle special files\n if (withoutPrefix === \"/404\") {\n return \"__404__\";\n }\n\n // Remove route groups (folders in parentheses)\n // E.g., /(website)/contact → /contact\n let pattern = withoutPrefix.replace(/\\/\\([^)]+\\)/g, \"\");\n\n // Convert /index to /\n pattern = pattern.replace(/\\/index$/, \"\") || \"/\";\n // Convert [...param] to *param (catch-all)\n pattern = pattern.replace(/\\[\\.\\.\\.(.+?)\\]/g, \"*$1\");\n // Convert [param] to :param (single dynamic segment)\n pattern = pattern.replace(/\\[(.+?)\\]/g, \":$1\");\n\n return pattern;\n}\n\n/**\n * Create a matcher function for a route pattern\n * Supports dynamic segments like :id, :slug, etc.\n * Supports catch-all segments like *slug for [...slug]\n * @internal Exported for testing\n */\nexport function createMatcher(pattern: string) {\n const decodeSegment = (value: string) => {\n try {\n return decodeURIComponent(value);\n } catch {\n return value;\n }\n };\n const segments = pattern.split(\"/\").filter(Boolean);\n\n return (path: string) => {\n // Remove query string and hash\n const cleanPath = path.split(\"?\")[0].split(\"#\")[0];\n const pathSegments = cleanPath.split(\"/\").filter(Boolean);\n\n // For root path, handle specially\n if (pattern === \"/\" && cleanPath === \"/\") {\n return { params: {} };\n }\n\n const params: Record<string, string | string[]> = {};\n\n // Check for catch-all segment (must be last)\n const hasCatchAll = segments.some((seg) => seg.startsWith(\"*\"));\n if (hasCatchAll) {\n const catchAllIndex = segments.findIndex((seg) => seg.startsWith(\"*\"));\n\n // Catch-all must be the last segment\n if (catchAllIndex !== segments.length - 1) {\n log(\"warn\", `Catch-all segment must be last: ${pattern}`);\n return null;\n }\n\n const catchAllParam = segments[catchAllIndex].slice(1); // Remove *\n\n // Match segments before catch-all\n for (let i = 0; i < catchAllIndex; i++) {\n const seg = segments[i];\n const value = pathSegments[i];\n\n if (!value) {\n return null;\n } // Not enough path segments\n\n if (seg.startsWith(\":\")) {\n params[seg.slice(1)] = decodeSegment(value);\n } else if (seg !== value) {\n return null; // Static segment must match\n }\n }\n\n // Collect remaining path segments into catch-all param as an array\n const remainingSegments = pathSegments.slice(catchAllIndex);\n params[catchAllParam] = remainingSegments.map(decodeSegment);\n\n return { params };\n }\n\n // Regular matching (no catch-all)\n // If segment counts don't match, no match\n if (segments.length !== pathSegments.length) {\n return null;\n }\n\n for (let i = 0; i < segments.length; i++) {\n const seg = segments[i];\n const value = pathSegments[i];\n\n if (seg.startsWith(\":\")) {\n // Dynamic segment\n params[seg.slice(1)] = decodeSegment(value);\n } else if (seg !== value) {\n // Static segment must match exactly\n return null;\n }\n }\n\n return { params };\n };\n}\n\n/**\n * Get directory path from file path\n * /src/pages/tasks/[id].tsx → /tasks\n * /src/pages/(website)/contact.tsx → /(website)\n */\nfunction getDirectoryPath(file: string): string {\n const withoutPrefix = file.replace(\"/src/pages\", \"\").replace(/\\.(tsx|jsx|ts|js)$/, \"\");\n const parts = withoutPrefix.split(\"/\");\n parts.pop(); // Remove filename\n return parts.join(\"/\") || \"/\";\n}\n\n/**\n * Build route manifest from pages directory\n * Uses import.meta.glob to discover all page files\n * Supports both eager and lazy loading for Suspense compatibility\n */\nexport function buildRoutes(): {\n routes: RouteEntry[];\n NotFound?: ComponentType<unknown>;\n AppShell?: ComponentType<unknown>;\n} {\n // SSR check - return empty routes if running server-side\n if (typeof window === \"undefined\") {\n return { routes: [], NotFound: undefined, AppShell: undefined };\n }\n\n // Eagerly load all page components (for initial render and layouts)\n // Exclude .server.* sidecar files — they contain server-only code (e.g. DB access)\n // and must never be bundled into the client. App shells are loaded by the\n // generated entry and are not routable pages; declarations have no runtime.\n const eagerPages = import.meta.glob([\"/src/pages/**/*.{tsx,jsx,ts,js}\", \"!**/*.server.*\", \"!**/*.d.ts\", \"!**/_app.*\"], {\n eager: true,\n }) as Record<string, { default: ComponentType<unknown> }>;\n\n // Lazy load all page components (for Suspense support)\n const lazyPages = import.meta.glob([\"/src/pages/**/*.{tsx,jsx,ts,js}\", \"!**/*.server.*\", \"!**/*.d.ts\", \"!**/_app.*\"]) as Record<\n string,\n () => Promise<{ default: ComponentType<unknown> }>\n >;\n\n // Debug mode: set localStorage.setItem('helium_debug_routes', 'true') to enable\n const debugRoutes = typeof localStorage !== \"undefined\" && localStorage.getItem(\"helium_debug_routes\") === \"true\";\n\n if (debugRoutes) {\n console.group(\"[Helium Router] Discovered pages:\");\n for (const file of Object.keys(eagerPages)) {\n console.log(` ${file} → ${pathFromFile(file)}`);\n }\n console.groupEnd();\n }\n\n const routes: RouteEntry[] = [];\n let NotFound: ComponentType<unknown> | undefined;\n let AppShell: ComponentType<unknown> | undefined;\n\n // Build layout map: directory path -> layout component\n const layoutMap = new Map<string, ComponentType<LayoutProps>>();\n\n // Track route patterns to detect collisions: pattern -> file path\n const routePatternMap = new Map<string, string>();\n\n // First pass: collect all layouts\n for (const [file, mod] of Object.entries(eagerPages)) {\n if (file.includes(\"/_layout.\")) {\n const Component = mod.default;\n if (Component) {\n const dirPath = getDirectoryPath(file);\n layoutMap.set(dirPath, Component as ComponentType<LayoutProps>);\n }\n }\n }\n\n // Second pass: build routes with their layouts\n for (const [file, mod] of Object.entries(eagerPages)) {\n // Skip layout files\n if (file.includes(\"/_layout.\")) {\n continue;\n }\n\n const Component = mod.default;\n if (!Component) {\n log(\"warn\", `No default export found in ${file}`);\n continue;\n }\n\n const pathPattern = pathFromFile(file);\n\n // Handle special pages\n if (pathPattern === \"__404__\") {\n NotFound = Component;\n continue;\n }\n\n // Detect route collisions\n const existingFile = routePatternMap.get(pathPattern);\n if (existingFile) {\n log(\"error\", `Route collision detected! Multiple files resolve to the same path \"${pathPattern}\":`);\n log(\"error\", ` - ${existingFile}`);\n log(\"error\", ` - ${file}`);\n log(\"error\", `Only the first file will be used. Consider using different file names or paths.`);\n } else {\n routePatternMap.set(pathPattern, file);\n }\n\n // Find all layouts for this route (from root to leaf)\n const layouts: ComponentType<LayoutProps>[] = [];\n const dirPath = getDirectoryPath(file);\n const pathParts = dirPath.split(\"/\").filter(Boolean);\n\n // Always check for root layout first (applies to all pages)\n const rootLayout = layoutMap.get(\"/\");\n if (rootLayout) {\n layouts.push(rootLayout);\n }\n\n // Then check for layouts at each nested level\n // This will include route group layouts and any nested folder layouts\n for (let i = 1; i <= pathParts.length; i++) {\n const checkPath = \"/\" + pathParts.slice(0, i).join(\"/\");\n const layout = layoutMap.get(checkPath);\n if (layout) {\n layouts.push(layout);\n }\n }\n\n // Get the lazy loader for this page\n const lazyLoader = lazyPages[file];\n const LazyComponent = React.lazy(lazyLoader);\n\n // Create route entry with both eager and lazy components\n routes.push({\n pathPattern,\n matcher: createMatcher(pathPattern),\n Component,\n LazyComponent,\n layouts,\n preload: lazyLoader,\n });\n }\n\n // Compare specificity segment by segment so /users/:id beats /:section/edit.\n routes.sort((a, b) => compareRoutePatterns(a.pathPattern, b.pathPattern));\n\n if (debugRoutes) {\n console.group(\"[Helium Router] Final route order:\");\n for (const route of routes) {\n console.log(` ${route.pathPattern}`);\n }\n console.groupEnd();\n }\n\n return { routes, NotFound, AppShell };\n}\n"]}
|
|
@@ -2,14 +2,18 @@ import type { RpcStats } from "../runtime/protocol.js";
|
|
|
2
2
|
export type RpcResult<T> = {
|
|
3
3
|
data: T;
|
|
4
4
|
stats: RpcStats;
|
|
5
|
+
/** The transport that actually delivered this response, including automatic fallback. */
|
|
6
|
+
transport: "http" | "websocket";
|
|
5
7
|
};
|
|
6
8
|
export type RpcCallOptions = {
|
|
7
9
|
forceHttp?: boolean;
|
|
10
|
+
/** Explicit selection disables automatic transport switching. */
|
|
11
|
+
transport?: "http" | "websocket";
|
|
8
12
|
};
|
|
9
13
|
/**
|
|
10
14
|
* Transport mode for RPC calls.
|
|
11
|
-
* - "http": Uses HTTP POST requests
|
|
12
|
-
* - "websocket": Uses persistent WebSocket connection
|
|
15
|
+
* - "http": Uses HTTP POST requests, with connection reuse provided by the browser
|
|
16
|
+
* - "websocket": Uses a persistent WebSocket connection
|
|
13
17
|
* - "auto": Automatically selects based on connection type
|
|
14
18
|
*/
|
|
15
19
|
export type RpcTransport = "http" | "websocket" | "auto";
|
|
@@ -28,7 +32,7 @@ export declare function isMobileRpcDevice(): boolean;
|
|
|
28
32
|
*
|
|
29
33
|
* Includes automatic retry logic: if a call fails due to a connection error
|
|
30
34
|
* (e.g. stale WebSocket after mobile browser was backgrounded), the client
|
|
31
|
-
* forces a fresh connection
|
|
35
|
+
* forces a fresh connection and retries with bounded exponential backoff.
|
|
32
36
|
*/
|
|
33
37
|
export declare function rpcCall<TResult = unknown, TArgs = unknown>(methodId: string, args?: TArgs): Promise<RpcResult<TResult>>;
|
|
34
38
|
export declare function rpcCallWithOptions<TResult = unknown, TArgs = unknown>(methodId: string, args: TArgs | undefined, options: RpcCallOptions): Promise<RpcResult<TResult>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpcClient.d.ts","sourceRoot":"","sources":["../../src/client/rpcClient.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAA2B,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAGhF,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACvB,IAAI,EAAE,CAAC,CAAC;IACR,KAAK,EAAE,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"rpcClient.d.ts","sourceRoot":"","sources":["../../src/client/rpcClient.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAA2B,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAGhF,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACvB,IAAI,EAAE,CAAC,CAAC;IACR,KAAK,EAAE,QAAQ,CAAC;IAChB,yFAAyF;IACzF,SAAS,EAAE,MAAM,GAAG,WAAW,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iEAAiE;IACjE,SAAS,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;CACpC,CAAC;AAWF;;;;;GAKG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC;AAqBzD;;GAEG;AACH,wBAAgB,eAAe,IAAI,YAAY,CAE9C;AAED;;GAEG;AACH,wBAAgB,yBAAyB,IAAI,OAAO,CAEnD;AA4CD,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAqtBD;;;;;;;GAOG;AACH,wBAAsB,OAAO,CAAC,OAAO,GAAG,OAAO,EAAE,KAAK,GAAG,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAE7H;AAED,wBAAsB,kBAAkB,CAAC,OAAO,GAAG,OAAO,EAAE,KAAK,GAAG,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,SAAS,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAE5K;AA0CD;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,IAAI,CAYjC"}
|
package/dist/client/rpcClient.js
CHANGED
|
@@ -14,6 +14,9 @@ const configuredAutoHttpOnMobile = typeof __HELIUM_RPC_AUTO_HTTP_ON_MOBILE__ !==
|
|
|
14
14
|
const configuredTokenValidityMs = typeof __HELIUM_RPC_TOKEN_VALIDITY_MS__ !== "undefined" && Number.isFinite(__HELIUM_RPC_TOKEN_VALIDITY_MS__) && __HELIUM_RPC_TOKEN_VALIDITY_MS__ > 0
|
|
15
15
|
? __HELIUM_RPC_TOKEN_VALIDITY_MS__
|
|
16
16
|
: 30000;
|
|
17
|
+
const configuredMaxBatchSize = typeof __HELIUM_RPC_MAX_BATCH_SIZE__ !== "undefined" && Number.isInteger(__HELIUM_RPC_MAX_BATCH_SIZE__) && __HELIUM_RPC_MAX_BATCH_SIZE__ > 0
|
|
18
|
+
? __HELIUM_RPC_MAX_BATCH_SIZE__
|
|
19
|
+
: 20;
|
|
17
20
|
/**
|
|
18
21
|
* Get the configured RPC transport mode (from helium.config.js).
|
|
19
22
|
*/
|
|
@@ -96,91 +99,79 @@ function scheduleBatch() {
|
|
|
96
99
|
flushBatch();
|
|
97
100
|
});
|
|
98
101
|
}
|
|
99
|
-
|
|
102
|
+
function flushBatch() {
|
|
100
103
|
const batch = pendingBatch;
|
|
101
104
|
pendingBatch = [];
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
catch (err) {
|
|
114
|
-
// Transport error, fail all
|
|
115
|
-
for (const item of batch) {
|
|
116
|
-
item.reject(err);
|
|
117
|
-
}
|
|
105
|
+
// Keep each HTTP envelope within the same cap enforced by the server.
|
|
106
|
+
// Groups run concurrently and a transport failure rejects only its own calls.
|
|
107
|
+
for (let offset = 0; offset < batch.length; offset += configuredMaxBatchSize) {
|
|
108
|
+
const group = batch.slice(offset, offset + configuredMaxBatchSize);
|
|
109
|
+
void sendBatchHttp(group).catch((error) => {
|
|
110
|
+
for (const item of group) {
|
|
111
|
+
item.reject(error);
|
|
112
|
+
}
|
|
113
|
+
});
|
|
118
114
|
}
|
|
119
115
|
}
|
|
120
116
|
async function sendBatchHttp(batch) {
|
|
121
|
-
const
|
|
122
|
-
const
|
|
123
|
-
|
|
124
|
-
const
|
|
125
|
-
|
|
126
|
-
|
|
117
|
+
const controller = new AbortController();
|
|
118
|
+
const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
|
|
119
|
+
try {
|
|
120
|
+
const requests = batch.map((b) => b.req);
|
|
121
|
+
const encoded = msgpackEncode(requests);
|
|
122
|
+
const sendWithToken = async (token) => {
|
|
123
|
+
const headers = {
|
|
124
|
+
"Content-Type": "application/msgpack",
|
|
125
|
+
Accept: "application/msgpack",
|
|
126
|
+
};
|
|
127
|
+
if (token) {
|
|
128
|
+
headers["X-Helium-Token"] = token;
|
|
129
|
+
}
|
|
130
|
+
return fetch("/__helium__/rpc", {
|
|
131
|
+
method: "POST",
|
|
132
|
+
headers,
|
|
133
|
+
body: encoded,
|
|
134
|
+
signal: controller.signal,
|
|
135
|
+
});
|
|
127
136
|
};
|
|
128
|
-
|
|
129
|
-
|
|
137
|
+
let response = await sendWithToken(await fetchFreshToken(false, controller.signal));
|
|
138
|
+
if (response.status === 401) {
|
|
139
|
+
const refreshedToken = await fetchFreshToken(true, controller.signal);
|
|
140
|
+
if (refreshedToken) {
|
|
141
|
+
response = await sendWithToken(refreshedToken);
|
|
142
|
+
}
|
|
130
143
|
}
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
body: encoded,
|
|
135
|
-
});
|
|
136
|
-
};
|
|
137
|
-
let response = await sendWithToken(await fetchFreshToken());
|
|
138
|
-
if (response.status === 401) {
|
|
139
|
-
const refreshedToken = await fetchFreshToken(true);
|
|
140
|
-
if (refreshedToken) {
|
|
141
|
-
response = await sendWithToken(refreshedToken);
|
|
144
|
+
handleBlockedResponse(response.status, "rpc-http");
|
|
145
|
+
if (!response.ok) {
|
|
146
|
+
throw new Error(`HTTP RPC failed: ${response.status}`);
|
|
142
147
|
}
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
item.resolve({ data: res.result, stats: res.stats });
|
|
148
|
+
const responseBuffer = await response.arrayBuffer();
|
|
149
|
+
const msg = msgpackDecode(new Uint8Array(responseBuffer));
|
|
150
|
+
const responses = Array.isArray(msg) ? msg : [msg];
|
|
151
|
+
const responseMap = new Map(responses.map((r) => [r.id, r]));
|
|
152
|
+
for (const item of batch) {
|
|
153
|
+
const res = responseMap.get(item.req.id);
|
|
154
|
+
if (res) {
|
|
155
|
+
if (res.ok) {
|
|
156
|
+
item.resolve({ data: res.result, stats: res.stats, transport: "http" });
|
|
157
|
+
}
|
|
158
|
+
else {
|
|
159
|
+
item.reject(new RpcError(res.error, res.stats));
|
|
160
|
+
}
|
|
157
161
|
}
|
|
158
162
|
else {
|
|
159
|
-
item.reject(new RpcError(
|
|
163
|
+
item.reject(new RpcError("No response for request"));
|
|
160
164
|
}
|
|
161
165
|
}
|
|
162
|
-
else {
|
|
163
|
-
item.reject(new RpcError("No response for request"));
|
|
164
|
-
}
|
|
165
166
|
}
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
batch.forEach((item) => {
|
|
172
|
-
trackPending(item.req.id, (v) => item.resolve(v), item.reject);
|
|
173
|
-
});
|
|
174
|
-
try {
|
|
175
|
-
// Always use msgpack encoding
|
|
176
|
-
const encoded = msgpackEncode(requests);
|
|
177
|
-
ws.send(toArrayBuffer(encoded));
|
|
167
|
+
catch (error) {
|
|
168
|
+
if (controller.signal.aborted) {
|
|
169
|
+
throw new RpcError("Request timed out");
|
|
170
|
+
}
|
|
171
|
+
throw error;
|
|
178
172
|
}
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
removePending(item.req.id);
|
|
182
|
-
item.reject(err);
|
|
183
|
-
});
|
|
173
|
+
finally {
|
|
174
|
+
clearTimeout(timeout);
|
|
184
175
|
}
|
|
185
176
|
}
|
|
186
177
|
// ============================================================================
|
|
@@ -459,16 +450,19 @@ function setCachedToken(token) {
|
|
|
459
450
|
cachedAuthToken = token;
|
|
460
451
|
scheduleTokenRefreshFromToken(token);
|
|
461
452
|
}
|
|
462
|
-
async function fetchFreshToken(forceRefresh = false) {
|
|
453
|
+
async function fetchFreshToken(forceRefresh = false, signal) {
|
|
463
454
|
if (!forceRefresh && hasCachedToken()) {
|
|
464
455
|
return cachedAuthToken;
|
|
465
456
|
}
|
|
457
|
+
const controller = signal ? undefined : new AbortController();
|
|
458
|
+
const timeout = controller ? setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS) : undefined;
|
|
466
459
|
try {
|
|
467
460
|
const response = await fetch("/__helium__/refresh-token", {
|
|
468
461
|
method: "POST",
|
|
469
462
|
headers: {
|
|
470
463
|
"X-Requested-With": "HeliumRPC",
|
|
471
464
|
},
|
|
465
|
+
signal: signal ?? controller?.signal,
|
|
472
466
|
});
|
|
473
467
|
handleBlockedResponse(response.status, "refresh-token");
|
|
474
468
|
if (!response.ok) {
|
|
@@ -486,6 +480,11 @@ async function fetchFreshToken(forceRefresh = false) {
|
|
|
486
480
|
setCachedToken(undefined);
|
|
487
481
|
return undefined;
|
|
488
482
|
}
|
|
483
|
+
finally {
|
|
484
|
+
if (timeout !== undefined) {
|
|
485
|
+
clearTimeout(timeout);
|
|
486
|
+
}
|
|
487
|
+
}
|
|
489
488
|
}
|
|
490
489
|
async function createSocket() {
|
|
491
490
|
// Fetch a token before creating the WebSocket connection
|
|
@@ -548,7 +547,7 @@ async function createSocket() {
|
|
|
548
547
|
return;
|
|
549
548
|
}
|
|
550
549
|
if (res.ok) {
|
|
551
|
-
entry.resolve({ data: res.result, stats: res.stats });
|
|
550
|
+
entry.resolve({ data: res.result, stats: res.stats, transport: "websocket" });
|
|
552
551
|
}
|
|
553
552
|
else {
|
|
554
553
|
entry.reject(new RpcError(res.error, res.stats));
|
|
@@ -684,7 +683,7 @@ async function rpcCallWebSocket(methodId, args) {
|
|
|
684
683
|
*
|
|
685
684
|
* Includes automatic retry logic: if a call fails due to a connection error
|
|
686
685
|
* (e.g. stale WebSocket after mobile browser was backgrounded), the client
|
|
687
|
-
* forces a fresh connection
|
|
686
|
+
* forces a fresh connection and retries with bounded exponential backoff.
|
|
688
687
|
*/
|
|
689
688
|
export async function rpcCall(methodId, args) {
|
|
690
689
|
return rpcCallWithRetry(methodId, args, 0, {});
|
|
@@ -701,23 +700,26 @@ async function rpcCallViaHttpBatch(methodId, args) {
|
|
|
701
700
|
});
|
|
702
701
|
}
|
|
703
702
|
async function rpcCallWithRetry(methodId, args, attempt = 0, options = {}) {
|
|
703
|
+
const useHttp = options.transport === "http" || (options.transport === undefined && (options.forceHttp || shouldUseHttpTransport()));
|
|
704
704
|
try {
|
|
705
|
-
if (
|
|
705
|
+
if (useHttp) {
|
|
706
706
|
return await rpcCallViaHttpBatch(methodId, args);
|
|
707
707
|
}
|
|
708
708
|
return await rpcCallWebSocket(methodId, args);
|
|
709
709
|
}
|
|
710
710
|
catch (err) {
|
|
711
711
|
if (attempt < MAX_RETRIES && isRetriableError(err)) {
|
|
712
|
-
//
|
|
713
|
-
|
|
712
|
+
// An HTTP failure must not close unrelated in-flight WebSocket calls.
|
|
713
|
+
if (!useHttp) {
|
|
714
|
+
forceReconnect();
|
|
715
|
+
}
|
|
714
716
|
// Exponential backoff with jitter: 500ms, 1000ms, 2000ms (capped at 5s)
|
|
715
717
|
const baseDelay = Math.min(RETRY_BASE_DELAY_MS * 2 ** attempt, RETRY_MAX_DELAY_MS);
|
|
716
718
|
const jitter = Math.random() * baseDelay * 0.3;
|
|
717
719
|
await new Promise((r) => setTimeout(r, baseDelay + jitter));
|
|
718
720
|
return rpcCallWithRetry(methodId, args, attempt + 1, options);
|
|
719
721
|
}
|
|
720
|
-
if (isRetriableError(err) && configuredTransport !== "http" && !options.forceHttp) {
|
|
722
|
+
if (isRetriableError(err) && !useHttp && options.transport === undefined && configuredTransport !== "http" && !options.forceHttp) {
|
|
721
723
|
activateTemporaryHttpFallback();
|
|
722
724
|
return rpcCallViaHttpBatch(methodId, args);
|
|
723
725
|
}
|