Merge pull request #6985 from QwikDev/v2-merge-main-fix-build

chore: merge main and fix build
QwikDev · Oct 16, 2024 · 75fd3bc · 75fd3bc
2 parents d271212 + f2acbcc
commit 75fd3bc
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 5 deletions.
diff --git a/packages/insights/src/db/query.ts b/packages/insights/src/db/query.ts
@@ -47,7 +47,7 @@ export async function getEdges(
       .from(edgeTable)
       .where(where)
       .groupBy(edgeTable.from, edgeTable.to)
-      .limit(limit || 10_000); // TODO: The 10_000 limit is due to Turso serialization format not being efficient, upgrade this once Turso is fixed.
+      .limit(limit || 5_000); // TODO: The 5_000 limit is due to Turso serialization format not being efficient, upgrade this once Turso is fixed.
     const rows = await query.all();
     return rows.map((e) => ({
       from: e.from,

diff --git a/packages/insights/src/db/sql-manifest.ts b/packages/insights/src/db/sql-manifest.ts
@@ -12,6 +12,7 @@ export async function dbGetManifests(
     .from(manifestTable)
     .where(and(eq(manifestTable.publicApiKey, publicApiKey)))
     .orderBy(sql`${manifestTable.timestamp} DESC`)
+    .limit(1000)
     .all();
   return manifests;
 }
@@ -37,6 +38,7 @@ export async function dbGetManifestStats(
     .where(and(eq(manifestTable.publicApiKey, publicApiKey)))
     .groupBy(manifestTable.hash)
     .orderBy(sql`${manifestTable.timestamp} DESC`)
+    .limit(1000)
     .all();
   return manifests.map((manifest) => {
     return {
@@ -94,6 +96,7 @@ export async function dbGetManifestHashes(
     .where(and(eq(manifestTable.publicApiKey, publicApiKey)))
     .groupBy(manifestTable.hash)
     .orderBy(sql`${manifestTable.timestamp} DESC`)
+    .limit(1000)
     .all();
   const hashes: string[] = [];
   let sum = 0;

diff --git a/packages/insights/src/db/sql-routes.ts b/packages/insights/src/db/sql-routes.ts
@@ -30,6 +30,7 @@ export async function getRoutes(
       .where(where)
       .groupBy(routesTable.route, routesTable.symbol)
       .orderBy(sql`${routesTable.route}`, desc(sumTimelineCount))
+      .limit(1000)
       .all();
     return query.map((row) => ({
       route: row.route,
@@ -63,6 +64,7 @@ export async function getRouteNames(
       .where(where)
       .groupBy(routesTable.route)
       .orderBy(sql`${routesTable.route}`)
+      .limit(1000)
       .all();
     return query.map((row) => ({
       route: row.route,
@@ -99,6 +101,7 @@ export async function getRouteTimeline(
       .where(where)
       .groupBy(routesTable.route, routesTable.symbol)
       .orderBy(sql`${routesTable.route}`, desc(sumTimelineCount))
+      .limit(1000)
       .all();
     return query.map((row) => ({
       route: row.route,

diff --git a/packages/insights/src/db/sql-user.ts b/packages/insights/src/db/sql-user.ts
@@ -40,6 +40,7 @@ export const dbGetInsightUser = async (email: string): Promise<InsightsUser> =>
     .leftJoin(userApplicationMap, eq(usersTable.id, userApplicationMap.userId))
     .leftJoin(applicationTable, eq(applicationTable.id, userApplicationMap.applicationId))
     .where(eq(usersTable.email, email))
+    .limit(1000)
     .all();
   if (users.length === 0) {
     const insert = await db
@@ -72,6 +73,7 @@ export const dbGetUsersForApplication = async (publicApiKey: string) => {
     .leftJoin(applicationTable, eq(applicationTable.id, userApplicationMap.applicationId))
     .where(eq(applicationTable.publicApiKey, publicApiKey))
     .orderBy(usersTable.email)
+    .limit(1000)
     .all();
   return users.map((user) => user.email);
 };

diff --git a/packages/insights/src/routes/api/v1/[publicApiKey]/post/index.tsx b/packages/insights/src/routes/api/v1/[publicApiKey]/post/index.tsx
@@ -9,7 +9,9 @@ export const onPost: RequestHandler = async ({ exit, json, request, params }) =>
   const payloadJson = await request.json();
   migrate1(payloadJson);
   // publicApiKey is always part of the URL as route parameter.
-  payloadJson.publicApiKey = params.publicApiKey;
+  if (!payloadJson.publicApiKey) {
+    payloadJson.publicApiKey = params.publicApiKey;
+  }
   const payload = InsightsPayload.parse(payloadJson);
   // console.log('API: POST: symbol', payload);
   exit();

diff --git a/packages/insights/src/routes/api/v1/[publicApiKey]/post/manifest/index.tsx b/packages/insights/src/routes/api/v1/[publicApiKey]/post/manifest/index.tsx
@@ -22,6 +22,7 @@ export const onPost: RequestHandler = async ({ exit, json, request, params }) =>
           eq(symbolDetailTable.manifestHash, manifestHash)
         )
       )
+      .limit(1000)
       .all();
     const existingMap = new Map<string, (typeof existing)[0]>();
     existing.forEach((row) => existingMap.set(row.hash, row));

diff --git a/packages/insights/src/routes/app/[publicApiKey]/errors/index.tsx b/packages/insights/src/routes/app/[publicApiKey]/errors/index.tsx
@@ -13,6 +13,7 @@ export const useErrors = routeLoader$(async ({ params }) => {
     .where(eq(errorTable.publicApiKey, params.publicApiKey))
     .limit(1000)
     .orderBy(sql`${errorTable.timestamp} DESC`)
+    .limit(1000)
     .all();
   return errors;
 });

diff --git a/packages/insights/src/routes/app/index.tsx b/packages/insights/src/routes/app/index.tsx
@@ -21,7 +21,7 @@ export const useApps = routeLoader$<ApplicationRow[]>(async ({ sharedMap }) => {
     // The user has nothing attached to it.
     return [];
   }
-  return query.all();
+  return query.limit(1000).all();
 });
 
 export default component$(() => {

diff --git a/packages/qwik-worker/src/worker.js b/packages/qwik-worker/src/worker.js
@@ -1,4 +1,4 @@
-import { _deserializeData } from '@builder.io/qwik';
+import { _deserialize } from '@builder.io/qwik';
 
 globalThis.document = {
   nodeType: 9,
@@ -30,7 +30,7 @@ globalThis.onmessage = async ({ data }) => {
     },
   };
   try {
-    const [qrl, ...args] = _deserializeData(data[3], containerEl);
+    const [qrl, ...args] = _deserialize(data[3], containerEl);
     const output = await qrl.apply(undefined, args);
     self.postMessage([requestId, true, output]);
   } catch (err) {