@nxgt/janus-drizzle 0.3.2 → 0.4.0

package/dist/tables/users.d.ts

@@ -0,0 +1,276 @@
+import { type TableFactory } from './columns';
+/**
+ * Users and their passwords: one row each. `logins` is the port's array,
+ * verbatim and in order; its uniqueness is `logins`' primary key.
+ */
+export declare function usersTable(table: TableFactory): import("drizzle-orm/pg-core").PgTableWithColumns<{
+    name: "users";
+    schema: undefined;
+    columns: {
+        id: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").SetIsPrimaryKey<import("drizzle-orm/pg-core").PgCustomColumnBuilder<{
+            dataType: "custom";
+            data: string;
+            driverParam: string;
+        }>>, {
+            name: string;
+            tableName: "users";
+            dataType: "custom";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
+        type: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").SetNotNull<import("drizzle-orm/pg-core").PgCustomColumnBuilder<{
+            dataType: "custom";
+            data: string;
+            driverParam: string;
+        }>>, {
+            name: string;
+            tableName: "users";
+            dataType: "custom";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
+        schemaVersion: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").SetNotNull<import("drizzle-orm/pg-core").PgTextBuilder<[string, ...string[]]>>, {
+            name: string;
+            tableName: "users";
+            dataType: "string";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
+        active: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").SetNotNull<import("drizzle-orm/pg-core").PgBooleanBuilder>, {
+            name: string;
+            tableName: "users";
+            dataType: "boolean";
+            data: boolean;
+            driverParam: boolean;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
+        fields: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").SetNotNull<import("drizzle-orm/pg-core").PgJsonbBuilder>, {
+            name: string;
+            tableName: "users";
+            dataType: "object json";
+            data: unknown;
+            driverParam: unknown;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
+        logins: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").SetNotNull<import("drizzle-orm/pg-core").SetDimensions<import("drizzle-orm/pg-core").PgTextBuilder<[string, ...string[]]>, 1>>, {
+            name: string;
+            tableName: "users";
+            dataType: "string";
+            data: string[];
+            driverParam: string | string[];
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
+        passwordHash: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").PgTextBuilder<[string, ...string[]]>, {
+            name: string;
+            tableName: "users";
+            dataType: "string";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
+        passwordUpdatedAt: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").PgTimestampBuilder, {
+            name: string;
+            tableName: "users";
+            dataType: "object date";
+            data: Date;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
+        secondFactorMethod: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").PgTextBuilder<["totp"]>, {
+            name: string;
+            tableName: "users";
+            dataType: "string enum";
+            data: "totp";
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: ["totp"];
+            identity: undefined;
+            generated: undefined;
+        }>;
+        secondFactorSecret: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").PgTextBuilder<[string, ...string[]]>, {
+            name: string;
+            tableName: "users";
+            dataType: "string";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
+        secondFactorConfirmedAt: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").PgTimestampBuilder, {
+            name: string;
+            tableName: "users";
+            dataType: "object date";
+            data: Date;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
+        secondFactorLastStep: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").PgIntegerBuilder, {
+            name: string;
+            tableName: "users";
+            dataType: "number int32";
+            data: number;
+            driverParam: string | number;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
+        secondFactorRecoveryCodes: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").SetDimensions<import("drizzle-orm/pg-core").PgTextBuilder<[string, ...string[]]>, 1>, {
+            name: string;
+            tableName: "users";
+            dataType: "string";
+            data: string[];
+            driverParam: string | string[];
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
+        emailVerifiedAt: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").PgTimestampBuilder, {
+            name: string;
+            tableName: "users";
+            dataType: "object date";
+            data: Date;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
+        version: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").SetNotNull<import("drizzle-orm/pg-core").PgIntegerBuilder>, {
+            name: string;
+            tableName: "users";
+            dataType: "number int32";
+            data: number;
+            driverParam: string | number;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
+        createdAt: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").SetNotNull<import("drizzle-orm/pg-core").PgTimestampBuilder>, {
+            name: string;
+            tableName: "users";
+            dataType: "object date";
+            data: Date;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
+        updatedAt: import("drizzle-orm/pg-core").PgBuildColumn<"users", import("drizzle-orm/pg-core").SetNotNull<import("drizzle-orm/pg-core").PgTimestampBuilder>, {
+            name: string;
+            tableName: "users";
+            dataType: "object date";
+            data: Date;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            identity: undefined;
+            generated: undefined;
+        }>;
+    };
+    dialect: "pg";
+}>;
+//# sourceMappingURL=users.d.ts.map

package/dist/tables/users.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/tables/users.ts"],"names":[],"mappings":"AAUA,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,WAAW,CAAC;AAEvD;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwD7C"}

package/docs/guide/migrations.md

@@ -69,13 +69,14 @@ CREATE TABLE "users" (
 	"second_factor_secret" text,
 	"second_factor_confirmed_at" timestamp(3) with time zone,
 	"second_factor_last_step" integer,
+	"second_factor_recovery_codes" text[],
 	"email_verified_at" timestamp(3) with time zone,
 	"version" integer NOT NULL,
 	"created_at" timestamp(3) with time zone NOT NULL,
 	"updated_at" timestamp(3) with time zone NOT NULL,
 	CONSTRAINT "users_id_type_unique" UNIQUE("id","type"),
 	CONSTRAINT "users_password_whole" CHECK (("password_hash" is null) = ("password_updated_at" is null)),
-	CONSTRAINT "users_second_factor_whole" CHECK (("second_factor_method" is null) = ("second_factor_secret" is null) and ("second_factor_method" is not null or ("second_factor_confirmed_at" is null and "second_factor_last_step" is null))),
+	CONSTRAINT "users_second_factor_whole" CHECK (("second_factor_method" is null) = ("second_factor_secret" is null) and ("second_factor_method" is not null or ("second_factor_confirmed_at" is null and "second_factor_last_step" is null and "second_factor_recovery_codes" is null))),
 	CONSTRAINT "users_second_factor_values" CHECK ("second_factor_method" in ('totp') and "second_factor_last_step" >= 0)
 );
 CREATE TABLE "logins" (
@@ -131,14 +132,19 @@ migration creates is what the conformance suites ran on.
   returned verbatim and in order, and as rows in `logins`, whose primary
   key is the per-type uniqueness. PostgreSQL has no unique index over the
   elements of an array.
-- **A second factor in four columns, checked whole.** A method and a secret,
-  or neither; a confirmation date and a last step only beside them; `totp`
-  the only method, and a last step never negative. The
+- **A second factor in five columns, checked whole.** A method and a secret,
+  or neither; a confirmation date, a last step and recovery codes only beside
+  them; `totp` the only method, and a last step never negative. The
   secret is opaque to the store and kept byte for byte: `@nxgt/janus` seals
   it before the store sees it, so a dump of `users` cannot produce a code.
   Its key id is the second part of the value, so
   `where second_factor_secret like 'v1.<id>.%'` finds the secrets still sealed
   with a key being [rotated out](https://github.com/softistx/nxgt-janus/blob/develop/packages/janus/docs/guide/second-factor.md#rotating-the-keys).
+- **Recovery codes as a `text[]`, `null` read as `[]`.** Each element is a
+  keyed hash the core wrote, never a code, kept in order. No codes — a
+  factor with none left, or no factor at all — is `null`, never `{}`. A row
+  from before the column existed reads as a factor with no codes, so an
+  upgrade rewrites nothing.
 - **`attempts` is `not null default 0`**, checked `>= 0`, so the rows an upgrade finds read
   as tokens with no attempt counted yet.
 - **No foreign key from sessions and tokens to users.** Deleting a user
@@ -182,6 +188,31 @@ Those are the statements drizzle-kit writes from the 0.1 tables to the 0.2
 ones, in its own order and separated by `--> statement-breakpoint`; with a
 PostgreSQL schema of its own, every name is qualified.
 
+### To 0.4: recovery codes
+
+**A migration is required.** One nullable column, and the whole-factor check
+extended to it, so the migration rewrites no row and every existing factor
+reads as having no recovery codes until its user is given some:
+
+```sql
+ALTER TABLE "users" ADD COLUMN "second_factor_recovery_codes" text[];
+ALTER TABLE "users" DROP CONSTRAINT "users_second_factor_whole", ADD CONSTRAINT "users_second_factor_whole" CHECK (("second_factor_method" is null) = ("second_factor_secret" is null) and ("second_factor_method" is not null or ("second_factor_confirmed_at" is null and "second_factor_last_step" is null and "second_factor_recovery_codes" is null)));
+```
+
+Those are the statements drizzle-kit writes from the 0.3 tables to the 0.4
+ones. Re-adding the check validates every row, under a lock on `users` for
+the length of one scan; the rows already satisfy it, since the column is new.
+Deployed before the migration, every query on `users` fails with
+`STORE_FAILED`, caused by `column "second_factor_recovery_codes" does not
+exist`.
+
+**Finish the rollout before users hold codes.** An instance still on 0.3
+knows four columns: once a user holds recovery codes, its `disable` leaves
+them beside a factor removed, and the check refuses the write with
+`STORE_FAILED`. Nothing is lost — the call fails, and succeeds on an instance
+of 0.4 — but run 0.3 and 0.4 side by side only while no user has been given
+codes, which `@nxgt/janus` does from `secondFactor.activate` on.
+
 ## Collecting lapsed sessions
 
 PostgreSQL has no TTL. A lapsed session is refused on every read, but it stays

package/docs/roadmap.md

@@ -36,6 +36,12 @@ Nothing yet.
 
 ## Shipped
 
+- **Recovery codes on a second factor, v0.4.0** — for `@nxgt/janus` 0.10:
+  `users` gains `second_factor_recovery_codes`, a nullable `text[]` of the
+  codes' keyed hashes, read in order and `null` as `[]`, and the
+  `users_second_factor_whole` check keeps them to a row with a factor. A
+  migration, generated by drizzle-kit, adds the column without rewriting a
+  row.
 - **A user's tokens spent in one statement, v0.3.0** — for `@nxgt/janus`
   0.7: `spendUserTokens(userId, kind, at, except?)` spends the unspent
   tokens of one user and kind — but `except` — in one `update`, and passes

package/docs/troubleshooting.md

@@ -33,6 +33,7 @@ How PostgreSQL's errors become the port's:
 **Setup**
 - [`STORE_FAILED` caused by `relation "users" does not exist`](#store_failed-caused-by-relation-users-does-not-exist)
 - [`STORE_FAILED` caused by `column "second_factor_method" does not exist`](#store_failed-caused-by-column-second_factor_method-does-not-exist)
+- [`STORE_FAILED` caused by `column "second_factor_recovery_codes" does not exist`](#store_failed-caused-by-column-second_factor_recovery_codes-does-not-exist)
 - [`STORE_FAILED` caused by `column "type" does not exist`](#store_failed-caused-by-column-type-does-not-exist)
 - [`schema "janus" does not exist` while migrating](#schema-janus-does-not-exist-while-migrating)
 - [`syntax error at or near "NULLS"` while migrating](#syntax-error-at-or-near-nulls-while-migrating)
@@ -204,6 +205,26 @@ bunx drizzle-kit generate --config drizzle.janus.config.ts
 bunx drizzle-kit migrate --config drizzle.janus.config.ts
 ```
 
+### `STORE_FAILED` caused by `column "second_factor_recovery_codes" does not exist`
+
+The code is `42703`.
+
+**When:** after upgrading to 0.4, on the first query that reads or writes a
+user — a sign-up, a sign-in, `authenticate`.
+
+**Why:** `users` gained the `second_factor_recovery_codes` column, which holds
+the recovery codes' hashes, and the migration that adds it was not generated,
+or not applied.
+
+**Fix:** generate and apply it before the new version serves requests. It adds
+one nullable column and re-creates the `users_second_factor_whole` check; see
+[To 0.4](guide/migrations.md#to-04-recovery-codes).
+
+```sh
+bunx drizzle-kit generate --config drizzle.janus.config.ts
+bunx drizzle-kit migrate --config drizzle.janus.config.ts
+```
+
 ### `STORE_FAILED` caused by `column "type" does not exist`
 
 Also `column "type" of relation "users" does not exist`, or another column of

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nxgt/janus-drizzle",
-	"version": "0.3.2",
+	"version": "0.4.0",
 	"description": "The PostgreSQL adapter for @nxgt/janus on Drizzle and @nxgt/drizzle: users, sessions, one-time tokens and permission tuples",
 	"license": "MIT",
 	"type": "module",
@@ -51,7 +51,7 @@
 	"devDependencies": {
 		"@electric-sql/pglite": "0.5.8",
 		"@nxgt/drizzle": "0.6.1",
-		"@nxgt/janus": "^0.8.6",
+		"@nxgt/janus": "^0.10.0",
 		"@types/bun": "^1.4.2",
 		"@types/pg": "^8.23.1",
 		"drizzle-kit": "1.0.0-rc.4",
@@ -62,7 +62,7 @@
 	},
 	"peerDependencies": {
 		"@nxgt/drizzle": ">=0.6.1 <1",
-		"@nxgt/janus": "^0.8.6",
+		"@nxgt/janus": "^0.10.0",
 		"drizzle-orm": ">=1.0.0-rc.4 <2",
 		"typescript": "^6.0.3"
 	}

package/dist/relations.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"relations.d.ts","sourceRoot":"","sources":["../src/relations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,kBAAkB,CAAC;AAQpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EACN,KAAK,qBAAqB,EAG1B,MAAM,UAAU,CAAC;AAGlB;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CACrC,EAAE,EAAE,UAAU,EACd,OAAO,GAAE,qBAAqB,CAAC,WAAW,CAAM,GAC9C,aAAa,CA2Hf"}

package/dist/stores.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"stores.d.ts","sourceRoot":"","sources":["../src/stores.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,kBAAkB,CAAC;AACpE,OAAO,KAAK,EAEX,WAAW,EAOX,MAAM,aAAa,CAAC;AAGrB,OAAO,EACN,KAAK,qBAAqB,EAG1B,MAAM,UAAU,CAAC;AAOlB,iDAAiD;AACjD,KAAK,aAAa,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;AAGhE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,mBAAmB,CAClC,EAAE,EAAE,UAAU,EACd,OAAO,GAAE,qBAAqB,CAAC,aAAa,CAAM,GAChD,WAAW,CAOb"}

package/dist/tables.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tables.d.ts","sourceRoot":"","sources":["../src/tables.ts"],"names":[],"mappings":"AACA,OAAO,EAQN,KAAK,QAAQ,EAMb,MAAM,qBAAqB,CAAC;AAE7B;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,6BAA6B;AAC7B,MAAM,WAAW,kBAAkB;IAClC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC;CAC3B;AAiBD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,GAAE,kBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+KjE;AAED,mDAAmD;AACnD,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE/D;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,qBAAqB,CACrC,CAAC,SAAS,MAAM,WAAW,GAAG,MAAM,WAAW;IAE/C,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;CACvC"}