@earbug/db-models 0.0.60 → 0.0.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@earbug/db-models",
-  "version": "0.0.60",
+  "version": "0.0.63",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/scripts/generate-and-upload.mjs

@@ -0,0 +1,123 @@
+import { spawnSync } from "node:child_process";
+import { existsSync, readFileSync, readdirSync, rmSync } from "node:fs";
+import { createRequire } from "node:module";
+
+const require = createRequire(import.meta.url);
+const { SequelizeAuto } = require("sequelize-auto");
+
+const requiredEnvironment = [
+  "PGHOST",
+  "PGPORT",
+  "PGUSER",
+  "PGPASSWORD",
+  "PGDATABASE",
+  "ARTIFACT_BUCKET",
+  "ARTIFACT_KEY",
+];
+
+for (const name of requiredEnvironment) {
+  if (!process.env[name]) {
+    throw new Error(`${name} is required`);
+  }
+}
+
+if (process.env.PG_SSL !== "true") {
+  throw new Error("PG_SSL must be true; refusing a plaintext database connection");
+}
+
+const caSource = readFileSync("models/rdsCaBundle.ts", "utf8");
+const caMatch = caSource.match(/RDS_GLOBAL_CA_BUNDLE: string = (.*);\s*$/s);
+if (!caMatch) {
+  throw new Error("Unable to read the bundled RDS CA certificate");
+}
+
+const dialectOptions = {
+  ssl: {
+    require: true,
+    rejectUnauthorized: true,
+    ca: JSON.parse(caMatch[1]),
+  },
+};
+
+const maintainedFiles = new Set(["index.ts", "initDb.ts", "rdsCaBundle.ts"]);
+for (const entry of readdirSync("models")) {
+  if (!maintainedFiles.has(entry)) {
+    rmSync(`models/${entry}`, { recursive: true, force: true });
+  }
+}
+
+const auto = new SequelizeAuto(
+  process.env.PGDATABASE,
+  process.env.PGUSER,
+  process.env.PGPASSWORD,
+  {
+    host: process.env.PGHOST,
+    port: Number(process.env.PGPORT),
+    dialect: "postgres",
+    dialectOptions,
+    logging: false,
+    directory: "models",
+    lang: "ts",
+    caseModel: "p",
+    caseFile: "p",
+    caseProp: "c",
+    additional: JSON.parse(readFileSync("model_options.json", "utf8")),
+    skipTables: ["harvested_article", "article_to_artist_relation"],
+  },
+);
+
+console.log("Generating database models with verified TLS");
+try {
+  await auto.run();
+} catch (error) {
+  const errorName = error instanceof Error ? error.name : "UnknownError";
+  throw new Error(`Model generation failed (${errorName})`);
+}
+
+const initModels = readFileSync("models/init-models.ts", "utf8");
+const modelCount = (initModels.match(/^import \{ .* as _.* \} from "\.\//gm) ?? []).length;
+console.log(`init-models.ts imports ${modelCount} models`);
+
+if (modelCount < 25) {
+  throw new Error(`Only ${modelCount} models generated; expected at least 25`);
+}
+
+for (const model of ["AppUser", "CanonArtist", "JukeboxSession", "PlatformTrack", "RadioShow"]) {
+  if (!existsSync(`models/${model}.ts`)) {
+    throw new Error(`Required model ${model} was not generated`);
+  }
+}
+
+for (const excludedModel of ["HarvestedArticle", "ArticleToArtistRelation"]) {
+  if (existsSync(`models/${excludedModel}.ts`)) {
+    throw new Error(`Excluded model ${excludedModel} was generated`);
+  }
+}
+
+function run(command, args) {
+  const result = spawnSync(command, args, { stdio: "inherit" });
+  if (result.status !== 0) {
+    throw new Error(`${command} exited with status ${result.status}`);
+  }
+}
+
+const archive = "/tmp/models.tgz";
+run("tar", [
+  "-czf",
+  archive,
+  "--exclude=models/index.ts",
+  "--exclude=models/initDb.ts",
+  "--exclude=models/rdsCaBundle.ts",
+  "models",
+]);
+run("aws", [
+  "s3",
+  "cp",
+  archive,
+  `s3://${process.env.ARTIFACT_BUCKET}/${process.env.ARTIFACT_KEY}`,
+  "--checksum-algorithm",
+  "SHA256",
+  "--only-show-errors",
+]);
+
+console.log(`Uploaded generated models to s3://${process.env.ARTIFACT_BUCKET}/${process.env.ARTIFACT_KEY}`);

package/dist/CanonAlbumImageHarvested.d.ts

@@ -1,30 +0,0 @@
-import * as Sequelize from 'sequelize';
-import { Model, Optional } from 'sequelize';
-import type { CanonAlbum, CanonAlbumId } from './CanonAlbum';
-export interface CanonAlbumImageHarvestedAttributes {
-    dateHarvested: Date;
-    storageKey: string;
-    harvestMethod?: string;
-    priority?: number;
-    id: string;
-    url?: string;
-    canonAlbumId: string;
-}
-export type CanonAlbumImageHarvestedPk = "id";
-export type CanonAlbumImageHarvestedId = CanonAlbumImageHarvested[CanonAlbumImageHarvestedPk];
-export type CanonAlbumImageHarvestedOptionalAttributes = "harvestMethod" | "priority" | "id" | "url";
-export type CanonAlbumImageHarvestedCreationAttributes = Optional<CanonAlbumImageHarvestedAttributes, CanonAlbumImageHarvestedOptionalAttributes>;
-export declare class CanonAlbumImageHarvested extends Model<CanonAlbumImageHarvestedAttributes, CanonAlbumImageHarvestedCreationAttributes> implements CanonAlbumImageHarvestedAttributes {
-    dateHarvested: Date;
-    storageKey: string;
-    harvestMethod?: string;
-    priority?: number;
-    id: string;
-    url?: string;
-    canonAlbumId: string;
-    canonAlbum: CanonAlbum;
-    getCanonAlbum: Sequelize.BelongsToGetAssociationMixin<CanonAlbum>;
-    setCanonAlbum: Sequelize.BelongsToSetAssociationMixin<CanonAlbum, CanonAlbumId>;
-    createCanonAlbum: Sequelize.BelongsToCreateAssociationMixin<CanonAlbum>;
-    static initModel(sequelize: Sequelize.Sequelize): typeof CanonAlbumImageHarvested;
-}

package/dist/CanonAlbumImageHarvested.js

@@ -1,70 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CanonAlbumImageHarvested = void 0;
-const sequelize_1 = require("sequelize");
-class CanonAlbumImageHarvested extends sequelize_1.Model {
-    static initModel(sequelize) {
-        return CanonAlbumImageHarvested.init({
-            dateHarvested: {
-                type: sequelize_1.DataTypes.DATE,
-                allowNull: false,
-                field: 'date_harvested'
-            },
-            storageKey: {
-                type: sequelize_1.DataTypes.STRING(255),
-                allowNull: false,
-                field: 'storage_key'
-            },
-            harvestMethod: {
-                type: sequelize_1.DataTypes.STRING(255),
-                allowNull: true,
-                field: 'harvest_method'
-            },
-            priority: {
-                type: sequelize_1.DataTypes.DECIMAL,
-                allowNull: true,
-                defaultValue: 0
-            },
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: sequelize_1.DataTypes.UUIDV4,
-                primaryKey: true
-            },
-            url: {
-                type: sequelize_1.DataTypes.TEXT,
-                allowNull: true
-            },
-            canonAlbumId: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                references: {
-                    model: 'canon_album',
-                    key: 'id'
-                },
-                field: 'canon_album_id'
-            }
-        }, {
-            sequelize,
-            tableName: 'canon_album_image_harvested',
-            schema: 'eb',
-            timestamps: false,
-            indexes: [
-                {
-                    name: "canon_album_image_harvested_canon_album_id_index",
-                    fields: [
-                        { name: "canon_album_id" },
-                    ]
-                },
-                {
-                    name: "canon_album_image_harvested_pkey",
-                    unique: true,
-                    fields: [
-                        { name: "id" },
-                    ]
-                },
-            ]
-        });
-    }
-}
-exports.CanonAlbumImageHarvested = CanonAlbumImageHarvested;

package/dist/CanonArtistImageHarvested.d.ts

@@ -1,30 +0,0 @@
-import * as Sequelize from 'sequelize';
-import { Model, Optional } from 'sequelize';
-import type { CanonArtist, CanonArtistId } from './CanonArtist';
-export interface CanonArtistImageHarvestedAttributes {
-    dateHarvested: Date;
-    storageKey: string;
-    harvestMethod?: string;
-    url?: string;
-    priority?: number;
-    canonArtistId: string;
-    id: string;
-}
-export type CanonArtistImageHarvestedPk = "id";
-export type CanonArtistImageHarvestedId = CanonArtistImageHarvested[CanonArtistImageHarvestedPk];
-export type CanonArtistImageHarvestedOptionalAttributes = "harvestMethod" | "url" | "priority" | "id";
-export type CanonArtistImageHarvestedCreationAttributes = Optional<CanonArtistImageHarvestedAttributes, CanonArtistImageHarvestedOptionalAttributes>;
-export declare class CanonArtistImageHarvested extends Model<CanonArtistImageHarvestedAttributes, CanonArtistImageHarvestedCreationAttributes> implements CanonArtistImageHarvestedAttributes {
-    dateHarvested: Date;
-    storageKey: string;
-    harvestMethod?: string;
-    url?: string;
-    priority?: number;
-    canonArtistId: string;
-    id: string;
-    canonArtist: CanonArtist;
-    getCanonArtist: Sequelize.BelongsToGetAssociationMixin<CanonArtist>;
-    setCanonArtist: Sequelize.BelongsToSetAssociationMixin<CanonArtist, CanonArtistId>;
-    createCanonArtist: Sequelize.BelongsToCreateAssociationMixin<CanonArtist>;
-    static initModel(sequelize: Sequelize.Sequelize): typeof CanonArtistImageHarvested;
-}

package/dist/CanonArtistImageHarvested.js

@@ -1,70 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CanonArtistImageHarvested = void 0;
-const sequelize_1 = require("sequelize");
-class CanonArtistImageHarvested extends sequelize_1.Model {
-    static initModel(sequelize) {
-        return CanonArtistImageHarvested.init({
-            dateHarvested: {
-                type: sequelize_1.DataTypes.DATE,
-                allowNull: false,
-                field: 'date_harvested'
-            },
-            storageKey: {
-                type: sequelize_1.DataTypes.STRING(255),
-                allowNull: false,
-                field: 'storage_key'
-            },
-            harvestMethod: {
-                type: sequelize_1.DataTypes.STRING(255),
-                allowNull: true,
-                field: 'harvest_method'
-            },
-            url: {
-                type: sequelize_1.DataTypes.TEXT,
-                allowNull: true
-            },
-            priority: {
-                type: sequelize_1.DataTypes.DECIMAL,
-                allowNull: true,
-                defaultValue: 0
-            },
-            canonArtistId: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                references: {
-                    model: 'canon_artist',
-                    key: 'id'
-                },
-                field: 'canon_artist_id'
-            },
-            id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                defaultValue: sequelize_1.DataTypes.UUIDV4,
-                primaryKey: true
-            }
-        }, {
-            sequelize,
-            tableName: 'canon_artist_image_harvested',
-            schema: 'eb',
-            timestamps: false,
-            indexes: [
-                {
-                    name: "canon_artist_image_harvested_canon_artist_id_index",
-                    fields: [
-                        { name: "canon_artist_id" },
-                    ]
-                },
-                {
-                    name: "canon_artist_image_harvested_pkey",
-                    unique: true,
-                    fields: [
-                        { name: "id" },
-                    ]
-                },
-            ]
-        });
-    }
-}
-exports.CanonArtistImageHarvested = CanonArtistImageHarvested;

package/models/CanonAlbumImageHarvested.ts

@@ -1,98 +0,0 @@
-import * as Sequelize from 'sequelize';
-import { DataTypes, Model, Optional } from 'sequelize';
-import type { CanonAlbum, CanonAlbumId } from './CanonAlbum';
-
-export interface CanonAlbumImageHarvestedAttributes {
-  dateHarvested: Date;
-  storageKey: string;
-  harvestMethod?: string;
-  priority?: number;
-  id: string;
-  url?: string;
-  canonAlbumId: string;
-}
-
-export type CanonAlbumImageHarvestedPk = "id";
-export type CanonAlbumImageHarvestedId = CanonAlbumImageHarvested[CanonAlbumImageHarvestedPk];
-export type CanonAlbumImageHarvestedOptionalAttributes = "harvestMethod" | "priority" | "id" | "url";
-export type CanonAlbumImageHarvestedCreationAttributes = Optional<CanonAlbumImageHarvestedAttributes, CanonAlbumImageHarvestedOptionalAttributes>;
-
-export class CanonAlbumImageHarvested extends Model<CanonAlbumImageHarvestedAttributes, CanonAlbumImageHarvestedCreationAttributes> implements CanonAlbumImageHarvestedAttributes {
-  dateHarvested!: Date;
-  storageKey!: string;
-  harvestMethod?: string;
-  priority?: number;
-  id!: string;
-  url?: string;
-  canonAlbumId!: string;
-
-  // CanonAlbumImageHarvested belongsTo CanonAlbum via canonAlbumId
-  canonAlbum!: CanonAlbum;
-  getCanonAlbum!: Sequelize.BelongsToGetAssociationMixin<CanonAlbum>;
-  setCanonAlbum!: Sequelize.BelongsToSetAssociationMixin<CanonAlbum, CanonAlbumId>;
-  createCanonAlbum!: Sequelize.BelongsToCreateAssociationMixin<CanonAlbum>;
-
-  static initModel(sequelize: Sequelize.Sequelize): typeof CanonAlbumImageHarvested {
-    return CanonAlbumImageHarvested.init({
-    dateHarvested: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      field: 'date_harvested'
-    },
-    storageKey: {
-      type: DataTypes.STRING(255),
-      allowNull: false,
-      field: 'storage_key'
-    },
-    harvestMethod: {
-      type: DataTypes.STRING(255),
-      allowNull: true,
-      field: 'harvest_method'
-    },
-    priority: {
-      type: DataTypes.DECIMAL,
-      allowNull: true,
-      defaultValue: 0
-    },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    url: {
-      type: DataTypes.TEXT,
-      allowNull: true
-    },
-    canonAlbumId: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      references: {
-        model: 'canon_album',
-        key: 'id'
-      },
-      field: 'canon_album_id'
-    }
-  }, {
-    sequelize,
-    tableName: 'canon_album_image_harvested',
-    schema: 'eb',
-    timestamps: false,
-    indexes: [
-      {
-        name: "canon_album_image_harvested_canon_album_id_index",
-        fields: [
-          { name: "canon_album_id" },
-        ]
-      },
-      {
-        name: "canon_album_image_harvested_pkey",
-        unique: true,
-        fields: [
-          { name: "id" },
-        ]
-      },
-    ]
-  });
-  }
-}

package/models/CanonArtistImageHarvested.ts

@@ -1,98 +0,0 @@
-import * as Sequelize from 'sequelize';
-import { DataTypes, Model, Optional } from 'sequelize';
-import type { CanonArtist, CanonArtistId } from './CanonArtist';
-
-export interface CanonArtistImageHarvestedAttributes {
-  dateHarvested: Date;
-  storageKey: string;
-  harvestMethod?: string;
-  url?: string;
-  priority?: number;
-  canonArtistId: string;
-  id: string;
-}
-
-export type CanonArtistImageHarvestedPk = "id";
-export type CanonArtistImageHarvestedId = CanonArtistImageHarvested[CanonArtistImageHarvestedPk];
-export type CanonArtistImageHarvestedOptionalAttributes = "harvestMethod" | "url" | "priority" | "id";
-export type CanonArtistImageHarvestedCreationAttributes = Optional<CanonArtistImageHarvestedAttributes, CanonArtistImageHarvestedOptionalAttributes>;
-
-export class CanonArtistImageHarvested extends Model<CanonArtistImageHarvestedAttributes, CanonArtistImageHarvestedCreationAttributes> implements CanonArtistImageHarvestedAttributes {
-  dateHarvested!: Date;
-  storageKey!: string;
-  harvestMethod?: string;
-  url?: string;
-  priority?: number;
-  canonArtistId!: string;
-  id!: string;
-
-  // CanonArtistImageHarvested belongsTo CanonArtist via canonArtistId
-  canonArtist!: CanonArtist;
-  getCanonArtist!: Sequelize.BelongsToGetAssociationMixin<CanonArtist>;
-  setCanonArtist!: Sequelize.BelongsToSetAssociationMixin<CanonArtist, CanonArtistId>;
-  createCanonArtist!: Sequelize.BelongsToCreateAssociationMixin<CanonArtist>;
-
-  static initModel(sequelize: Sequelize.Sequelize): typeof CanonArtistImageHarvested {
-    return CanonArtistImageHarvested.init({
-    dateHarvested: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      field: 'date_harvested'
-    },
-    storageKey: {
-      type: DataTypes.STRING(255),
-      allowNull: false,
-      field: 'storage_key'
-    },
-    harvestMethod: {
-      type: DataTypes.STRING(255),
-      allowNull: true,
-      field: 'harvest_method'
-    },
-    url: {
-      type: DataTypes.TEXT,
-      allowNull: true
-    },
-    priority: {
-      type: DataTypes.DECIMAL,
-      allowNull: true,
-      defaultValue: 0
-    },
-    canonArtistId: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      references: {
-        model: 'canon_artist',
-        key: 'id'
-      },
-      field: 'canon_artist_id'
-    },
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    }
-  }, {
-    sequelize,
-    tableName: 'canon_artist_image_harvested',
-    schema: 'eb',
-    timestamps: false,
-    indexes: [
-      {
-        name: "canon_artist_image_harvested_canon_artist_id_index",
-        fields: [
-          { name: "canon_artist_id" },
-        ]
-      },
-      {
-        name: "canon_artist_image_harvested_pkey",
-        unique: true,
-        fields: [
-          { name: "id" },
-        ]
-      },
-    ]
-  });
-  }
-}