Clean up backend dev story

Author: danopia

.github/workflows/deno-ci.yml

@@ -127,7 +127,7 @@ jobs:
 
     - name: Check generation/deploy/mod.ts
       if: always()
-      run: time deno check --allow-import=cdn.skypack.dev,deno.land generation/deploy/mod.ts
+      run: time deno check generation/deploy/mod.ts
 
   validate-codegen:
     runs-on: ubuntu-latest

deno.json

@@ -1,9 +1,12 @@
 {
+  "tasks": {
+    "deploy:dev": "deno run --watch --allow-env --allow-sys --allow-read --allow-net='[::]:8000,otel.devmode.cloud,api.github.com,raw.githubusercontent.com' generation/deploy/mod.ts"
+  },
   "workspace": [
     "./generation",
     "./lib"
   ],
   "imports": {
-    "@std/assert": "jsr:@std/assert@^1.0.14"
+    "@std/assert": "jsr:@std/assert@^1"
   }
 }

deno.lock

@@ -1 +1,10 @@
-{}
+{
+  "imports": {
+    "@cloudydeno/jmespath": "jsr:@cloudydeno/jmespath@^1.0.1",
+    "@cloudydeno/opentelemetry": "jsr:@cloudydeno/opentelemetry@^0.10",
+    "@std/cache": "jsr:@std/cache@^0.2.0",
+    "@std/csv": "jsr:@std/csv@^1.0.6",
+    "@std/html": "jsr:@std/html@^1.0.4",
+    "@std/path": "jsr:@std/path@^1.1.2"
+  }
+}

generation/deno.json

@@ -1,33 +1,28 @@
-// import { S3 } from "./s3-api.ts";
-// import { ApiFactory } from "../../lib/client/mod.ts";
-import { AsyncTracer, Span } from "./tracer.ts";
+import { LogicTracer, Span } from "./tracer.ts";
 
-// can maybe replace this whole dep with deno edge cache once it's out of beta
 import type { Cache } from "./httpcache/mod.ts";
 import { inMemoryCache } from "./httpcache/in_memory.ts";
-// import { s3Cache } from "./cache-s3.ts";
-import { platformCache } from "./cache-platform.ts";
-
-// const s3Api = new ApiFactory({
-//   region: Deno.env.get('HTTPCACHE_S3_REGION') || 'us-east-2',
-// }).makeNew(S3);
+import { platformCache } from "./httpcache/platform.ts";
 
 const caches: Array<Cache> = [
   inMemoryCache(40),
   await platformCache(),
-  // s3Cache(s3Api, Deno.env.get('HTTPCACHE_S3_BUCKET') || 'deno-httpcache'),
 ];
 const cacheLabels = ['in-memory', 'platform', 's3'];
 
-const tracer = new AsyncTracer('cached-fetch');
+const tracer = new LogicTracer({
+  name: 'cached-fetch',
+});
 
 export async function cachedFetch(mode: 'immutable' | 'mutable', label: string, url: string) {
-  return await tracer.runAsyncSpan(`fetch ${label}`, {
-    'cache.label': label,
-    'cache.mode': mode,
-  }, span => cachedFetchInner(mode, label, url, span));
+  return await tracer.asyncSpan(`fetch ${label}`, {
+    attributes: {
+      'cache.label': label,
+      'cache.mode': mode,
+    },
+  }, span => cachedFetchInner(mode, url, span!));
 }
-async function cachedFetchInner(mode: 'immutable' | 'mutable', label: string, url: string, span: Span) {
+async function cachedFetchInner(mode: 'immutable' | 'mutable', url: string, span: Span) {
 
   for (const [cacheIdx, cache] of caches.entries()) {
     const cached = await cache.match(url).catch(err => {

generation/deploy/cache-s3.ts

@@ -5,7 +5,7 @@ export type RouteHandler = (context: {
   headers: Headers,
 }) => Response | Promise<Response>;
 
-import { escape } from "https://deno.land/x/html_escape@v1.1.5/escape.ts";
+import { escape } from "@std/html/entities";
 export { escape };
 export function escapeTemplate(strings: TemplateStringsArray, ...inputs: string[]) {
   return String.raw(strings, ...inputs.map(escape));

generation/deploy/cache.ts

@@ -1,11 +1,11 @@
 // Downloaded from https://deno.land/x/httpcache@0.1.2/in_memory.ts
 
-import { LRU } from "https://deno.land/x/lru@1.0.2/mod.ts";
+import { LruCache } from "@std/cache/lru-cache";
 import { Cache, CachedResponse } from "./mod.ts";
 export { Cache };
 
 export function inMemoryCache(capacity: number): Cache {
-  const lru = new LRU<CachedResponse>(capacity);
+  const lru = new LruCache<string,CachedResponse>(capacity);
   return new Cache({
     get(url) {
       return Promise.resolve(lru.get(url));
@@ -15,7 +15,7 @@ export function inMemoryCache(capacity: number): Cache {
       return Promise.resolve();
     },
     delete(url) {
-      lru.remove(url);
+      lru.delete(url);
       return Promise.resolve();
     },
     close() {

generation/deploy/helpers.ts

@@ -1,5 +1,5 @@
-import { Cache } from "./httpcache/mod.ts";
-import { trace } from "./tracer.ts";
+import { trace } from "@cloudydeno/opentelemetry/pkg/api";
+import { Cache } from "./mod.ts";
 
 // https://docs.deno.com/deploy/manual/edge-cache
 

generation/deploy/httpcache/in_memory.ts

@@ -226,18 +226,23 @@ function generateApiModule(opts: {
       `No ${opts.apiId} actions matched the given filter ${opts.options.get('actions')}`);
   }
 
+  headerChunks.push('//');
+  headerChunks.push(`// Originally served at ${opts.selfUrl}`);
+
+  const moduleText = opts.generation.buildApi({
+    className: opts.module.name,
+    options: opts.options,
+    apiSpecs: {
+      api: opts.spec.normal,
+      pagers: opts.spec.paginators,
+      waiters: opts.spec.waiters2,
+    },
+  });
+
+  headerChunks.unshift(moduleText.slice(0, moduleText.indexOf('\n')));
   return [
     headerChunks.join('\n'),
-    `// Originally served at ${opts.selfUrl}`,
-    opts.generation.buildApi({
-      className: opts.module.name,
-      options: opts.options,
-      apiSpecs: {
-        api: opts.spec.normal,
-        pagers: opts.spec.paginators,
-        waiters: opts.spec.waiters2,
-      },
-    }),
+    moduleText.slice(moduleText.indexOf('\n')+1),
   ].join('\n\n');
 }