fix get->all; add http testing in minfilare; remove unique

packages/analytics-engine/src/analytics.ts

@@ -47,8 +47,8 @@ CREATE TABLE IF NOT EXISTS {{BINDING}} (
  blob20 TEXT
 );
 
-CREATE UNIQUE INDEX IF NOT EXISTS {{BINDING}}_index ON {{BINDING}} (dataset, timestamp);
-CREATE UNIQUE INDEX IF NOT EXISTS {{BINDING}}_index ON {{BINDING}} (dataset, index1, timestamp);
+CREATE INDEX IF NOT EXISTS {{BINDING}}_index ON {{BINDING}} (dataset, timestamp);
+CREATE INDEX IF NOT EXISTS {{BINDING}}_index ON {{BINDING}} (dataset, index1, timestamp);
 
 COMMIT;
 `;

packages/http-server/src/index.ts

@@ -8,6 +8,7 @@ import { Transform, Writable } from "stream";
 import { ReadableStream } from "stream/web";
 import { URL } from "url";
 import zlib from "zlib";
+import { AnalyticsEnginePlugin } from "@miniflare/analytics-engine";
 import {
  CorePluginSignatures,
  IncomingRequestCfProperties,
@@ -276,6 +277,8 @@ export function createRequestListener<Plugins extends HTTPPluginSignatures>(
  // can't be handled by workers and are used for utility interfaces.
  const pathname = url.pathname.replace(/\/$/, "");
  if (pathname.startsWith("/cdn-cgi/")) {
+ const headStatus = { "Content-Type": "text/plain; charset=UTF-8" };
+ let body: undefined | string = undefined;
  // TODO (someday): consider adding other utility interfaces for KV, DO, etc
  // (maybe add another Plugin field/method/decorator for contributes)
  if (pathname === "/cdn-cgi/mf/scheduled") {
@@ -288,11 +291,19 @@ export function createRequestListener<Plugins extends HTTPPluginSignatures>(
  url
  );
  status = 200;
+ } else if (pathname === "/cdn-cgi/mf/analytics_engine/sql") {
+ const query = await request.text();
+ const plugin = (await mf.getPlugins())
+ .AnalyticsEnginePlugin as AnalyticsEnginePlugin;
+ const storage = mf.getPluginStorage("AnalyticsEnginePlugin");
+ const aeDB = await plugin.getStorage(storage);
+ body = JSON.stringify(aeDB.prepare(query).all() ?? []);
+ headStatus["Content-Type"] = "application/javascript";
  } else {
  status = 404;
  }
- res?.writeHead(status, { "Content-Type": "text/plain; charset=UTF-8" });
- res?.end();
+ res?.writeHead(status, headStatus);
+ res?.end(body);
  } else {
  try {
  response = await mf.dispatchFetch(request);

packages/jest-environment-miniflare/test/fixtures/analyticsEngine.worker.spec.js

@@ -1,8 +1,4 @@
 async function get() {
- // return fetch("http:https://localhost/cdn-cgi/mf/analytics_engine/sql", {
- // method: "POST",
- // body: "SELECT value FROM entries LIMIT 1;",
- // }).then(async (b) => await b.json());
  return queryMiniflareAnalyticsEngine(
  "SELECT dataset, blob1, blob2, blob3, double1, double2, double3 FROM AE_TEST_DB LIMIT 1;"
  );
@@ -13,13 +9,15 @@ test("AE test 1", async () => {
  blobs: ["a", "b", "c"],
  doubles: [0, 1, 2],
  });
- expect(await get()).toMatchObject({
- dataset: "AE_TEST_DB",
- blob1: "a",
- blob2: "b",
- blob3: "c",
- double1: 0,
- double2: 1,
- double3: 2,
- });
+ expect(await get()).toMatchObject([
+ {
+ dataset: "AE_TEST_DB",
+ blob1: "a",
+ blob2: "b",
+ blob3: "c",
+ double1: 0,
+ double2: 1,
+ double3: 2,
+ },
+ ]);
 });

packages/miniflare/test/api.spec.ts

@@ -66,10 +66,22 @@ test("Miniflare: getAnalyticsEngine: gets Analytics Engine from bindings", async
  TEST_DB: "TEST_DB",
  },
  });
- // await mf.dispatchFetch("http:https://localhost/");
+ const server = await mf.startServer();
+ const port = (server.address() as AddressInfo).port;
+ await mf.dispatchFetch("http:https://localhost/");
  const ae = await mf.getAnalyticsEngine("TEST_DB");
  await ae.writeDataPoint({ blobs: ["c", "d"], doubles: [3, 4] });
- t.pass();
+ const res = await fetch(
+ `http:https://localhost:${port}/cdn-cgi/mf/analytics_engine/sql`,
+ {
+ method: "POST",
+ body: "SELECT blob1, blob2, double1, double2 FROM TEST_DB LIMIT 2;",
+ }
+ ).then(async (b) => await b.json());
+ t.deepEqual(res, [
+ { blob1: "a", blob2: "b", double1: 1, double2: 2 },
+ { blob1: "c", blob2: "d", double1: 3, double2: 4 },
+ ]);
 });
 test("Miniflare: getKVNamespace: gets KV namespace", async (t) => {
  const mf = new Miniflare({

packages/shared-test-environment/src/globals.ts

@@ -112,7 +112,7 @@ export async function createMiniflareEnvironmentUtilities(
  const plugin = (await mf.getPlugins()).AnalyticsEnginePlugin;
  const storage = mf.getPluginStorage("AnalyticsEnginePlugin");
  const aeDB = await plugin.getStorage(storage);
- return aeDB.prepare(query).get();
+ return aeDB.prepare(query).all();
  },
  };
 }