Add support for protocol v2 (#1091)

edgedb · Oct 16, 2024 · f6f44f1 · f6f44f1
1 parent 51eca53
commit f6f44f1
Show file tree

Hide file tree

Showing 15 changed files with 267 additions and 47 deletions.
diff --git a/packages/driver/buildDeno.ts b/packages/driver/buildDeno.ts
@@ -12,10 +12,11 @@ await run({
   destDir: "../deno",
   destEntriesToClean: ["_src", "mod.ts"],
   sourceFilter: (path) => {
-    return !/cli\.mts$/.test(path);
+    return !path.endsWith("cli.mts");
   },
   pathRewriteRules: [
     { match: /^src\/index.node.ts$/, replace: "mod.ts" },
+    { match: /^src\/deno.json$/, replace: "deno.json" },
     { match: /^src\//, replace: "_src/" },
   ],
   injectImports: [
@@ -28,7 +29,7 @@ await run({
       from: "src/globals.deno.ts",
     },
   ],
-}).then(async () =>
+}).then(() =>
   run({
     sourceDir: "./test",
     destDir: "../deno/test",

diff --git a/packages/driver/package.json b/packages/driver/package.json
@@ -46,7 +46,8 @@
     "build:cli": "tsc --project tsconfig.cli.json",
     "build:cjs": "tsc --project tsconfig.json",
     "build:deno": "deno run --unstable --allow-all ./buildDeno.ts",
-    "lint:fix": "tslint 'packages/*/src/**/*.ts'",
+    "lint": "eslint --quiet",
+    "lint:fix": "eslint --fix",
     "test": "NODE_OPTIONS='--experimental-global-webcrypto' npx jest --detectOpenHandles",
     "format": "prettier --write 'src/**/*.ts' 'test/**/*.ts'",
     "gen-errors": "edb gen-errors-json --client | node genErrors.mjs",

diff --git a/packages/driver/src/baseConn.ts b/packages/driver/src/baseConn.ts
@@ -45,7 +45,7 @@ import LRU from "./primitives/lru";
 import type { SerializedSessionState } from "./options";
 import { Session } from "./options";
 
-export const PROTO_VER: ProtocolVersion = [1, 0];
+export const PROTO_VER: ProtocolVersion = [2, 0];
 export const PROTO_VER_MIN: ProtocolVersion = [0, 9];
 
 enum TransactionStatus {

diff --git a/packages/driver/src/codecs/array.ts b/packages/driver/src/codecs/array.ts
@@ -27,11 +27,18 @@ import { NamedTupleCodec } from "./namedtuple";
 export class ArrayCodec extends Codec implements ICodec {
   private subCodec: ICodec;
   private len: number;
-
-  constructor(tid: uuid, subCodec: ICodec, len: number) {
+  public typeName: string | null;
+
+  constructor(
+    tid: uuid,
+    typeName: string | null,
+    subCodec: ICodec,
+    len: number,
+  ) {
     super(tid);
     this.subCodec = subCodec;
     this.len = len;
+    this.typeName = typeName;
   }
 
   encode(buf: WriteBuffer, obj: any): void {

diff --git a/packages/driver/src/codecs/codecs.ts b/packages/driver/src/codecs/codecs.ts
@@ -80,14 +80,14 @@ export const INVALID_CODEC = new NullCodec(INVALID_CODEC_ID);
 
 function registerScalarCodec(
   typename: string,
-  type: new (tid: uuid) => ICodec,
+  type: new (tid: uuid, typename: string | null) => ICodec,
 ): void {
   const id = KNOWN_TYPENAMES.get(typename);
   if (id == null) {
     throw new InternalClientError("unknown type name");
   }
 
-  SCALAR_CODECS.set(id, new type(id));
+  SCALAR_CODECS.set(id, new type(id, typename));
 }
 
 registerScalarCodec("std::int16", Int16Codec);

diff --git a/packages/driver/src/codecs/enum.ts b/packages/driver/src/codecs/enum.ts
@@ -22,8 +22,13 @@ import { StrCodec } from "./text";
 export class EnumCodec extends StrCodec implements ICodec {
   readonly values: string[];
 
-  constructor(tid: uuid, derivedFromTid: uuid | null = null, values: string[]) {
-    super(tid, derivedFromTid);
+  constructor(
+    tid: uuid,
+    typeName: string | null,
+    derivedFromTid: uuid | null = null,
+    values: string[],
+  ) {
+    super(tid, typeName, derivedFromTid);
     this.values = values;
   }
 }
diff --git a/packages/driver/src/codecs/ifaces.ts b/packages/driver/src/codecs/ifaces.ts
@@ -70,19 +70,24 @@ export abstract class ScalarCodec extends Codec {
   private derivedFromTid: uuid | null = null;
   private typeName: string | null = null;
 
-  constructor(tid: uuid, derivedFromTid: uuid | null = null) {
+  constructor(
+    tid: uuid,
+    typeName: string | null,
+    derivedFromTid: uuid | null = null,
+  ) {
     super(tid);
     this.derivedFromTid = derivedFromTid;
+    this.typeName = typeName;
   }
 
   /** @internal */
   setTypeName(typeName: string): void {
     this.typeName = typeName;
   }
 
-  derive(tid: uuid): Codec {
+  derive(tid: uuid, typeName: string | null): Codec {
     const self = this.constructor;
-    return new (self as any)(tid, this.tid) as Codec;
+    return new (self as any)(tid, this.tid, typeName) as Codec;
   }
 
   getSubcodecs(): ICodec[] {

diff --git a/packages/driver/src/codecs/namedtuple.ts b/packages/driver/src/codecs/namedtuple.ts
@@ -32,12 +32,19 @@ export class NamedTupleCodec extends Codec implements ICodec, IArgsCodec {
   private subCodecs: ICodec[];
   private names: string[];
   private namesSet: Set<string>;
-
-  constructor(tid: uuid, codecs: ICodec[], names: string[]) {
+  public typeName: string | null;
+
+  constructor(
+    tid: uuid,
+    typeName: string | null,
+    codecs: ICodec[],
+    names: string[],
+  ) {
     super(tid);
     this.subCodecs = codecs;
     this.names = names;
     this.namesSet = new Set(names);
+    this.typeName = typeName;
   }
 
   encode(buf: WriteBuffer, object: any): void {

diff --git a/packages/driver/src/codecs/range.ts b/packages/driver/src/codecs/range.ts
@@ -97,10 +97,12 @@ export class RangeCodec extends Codec implements ICodec {
   readonly tsModule = "edgedb";
 
   private subCodec: ICodec;
+  readonly typeName: string | null;
 
-  constructor(tid: uuid, subCodec: ICodec) {
+  constructor(tid: uuid, typeName: string | null, subCodec: ICodec) {
     super(tid);
     this.subCodec = subCodec;
+    this.typeName = typeName;
   }
 
   encode(buf: WriteBuffer, obj: any) {
@@ -125,10 +127,12 @@ export class MultiRangeCodec extends Codec implements ICodec {
   readonly tsModule = "edgedb";
 
   private subCodec: ICodec;
+  public typeName: string | null;
 
-  constructor(tid: uuid, subCodec: ICodec) {
+  constructor(tid: uuid, typeName: string | null, subCodec: ICodec) {
     super(tid);
     this.subCodec = subCodec;
+    this.typeName = typeName;
   }
 
   encode(buf: WriteBuffer, obj: any): void {