@dosgato/api 0.0.8 → 0.0.10

package/dist/access/access.resolver.d.ts

@@ -2,6 +2,7 @@ import { Context } from '@txstate-mws/graphql-server';
 import { UrlSafeString } from '../internal.js';
 export declare class AccessResolver {
     access(ctx: Context): Promise<{}>;
+    createUsers(ctx: Context): Promise<boolean>;
     createGroups(ctx: Context): Promise<boolean>;
     viewGroupManager(ctx: Context): Promise<boolean>;
     createRoles(ctx: Context): Promise<boolean>;

package/dist/access/access.resolver.js

@@ -12,11 +12,14 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 import { Context } from '@txstate-mws/graphql-server';
 import { Arg, Ctx, FieldResolver, Query, Resolver } from 'type-graphql';
-import { AssetService, DataService, GroupService, PageService, RoleService, UrlSafeString, SiteService, Access, TemplateService } from '../internal.js';
+import { Access, AssetService, DataService, GroupService, PageService, RoleService, SiteService, TemplateService, UrlSafeString, UserService } from '../internal.js';
 let AccessResolver = class AccessResolver {
     async access(ctx) {
         return {};
     }
+    async createUsers(ctx) {
+        return await ctx.svc(UserService).mayCreate();
+    }
     async createGroups(ctx) {
         return await ctx.svc(GroupService).mayCreate();
     }
@@ -61,6 +64,13 @@ __decorate([
     __metadata("design:paramtypes", [Context]),
     __metadata("design:returntype", Promise)
 ], AccessResolver.prototype, "access", null);
+__decorate([
+    FieldResolver(returns => Boolean, { description: 'Currently authenticated user is able to create new users.' }),
+    __param(0, Ctx()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Context]),
+    __metadata("design:returntype", Promise)
+], AccessResolver.prototype, "createUsers", null);
 __decorate([
     FieldResolver(returns => Boolean, { description: 'Currently authenticated user is able to create groups.' }),
     __param(0, Ctx()),

package/dist/access/access.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"access.resolver.js","sourceRoot":"","sources":["../../src/access/access.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AACvE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAGhJ,IAAM,cAAc,GAApB,MAAM,cAAc;IAEnB,AAAN,KAAK,CAAC,MAAM,CAAS,GAAY;QAC/B,OAAO,EAAE,CAAA;IACX,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY,CAAS,GAAY;QACrC,OAAO,MAAM,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,SAAS,EAAE,CAAA;IAChD,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB,CAAS,GAAY;QACzC,OAAO,MAAM,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,gBAAgB,EAAE,CAAA;IACvD,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CAAS,GAAY;QACpC,OAAO,MAAM,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,SAAS,EAAE,CAAA;IAC/C,CAAC;IAGK,AAAN,KAAK,CAAC,eAAe,CAAS,GAAY;QACxC,OAAO,MAAM,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,gBAAgB,EAAE,CAAA;IACtD,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CAAS,GAAY;QACpC,OAAO,MAAM,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,SAAS,EAAE,CAAA;IAC/C,CAAC;IAGK,AAAN,KAAK,CAAC,eAAe,CAAS,GAAY;QACxC,OAAO,MAAM,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,gBAAgB,EAAE,CAAA;IACtD,CAAC;IAGK,AAAN,KAAK,CAAC,eAAe,CAAS,GAAY;QACxC,OAAO,MAAM,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,gBAAgB,EAAE,CAAA;IACtD,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB,CAAS,GAAY;QACzC,OAAO,MAAM,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,gBAAgB,EAAE,CAAA;IACvD,CAAC;IAGK,AAAN,KAAK,CAAC,eAAe,CAAS,GAAY;QACxC,OAAO,MAAM,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,gBAAgB,EAAE,CAAA;IACtD,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB,CAAS,GAAY,EAAe,IAAmB;QAC3E,OAAO,MAAM,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,eAAe,EAAE,CAAA;IACrD,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY,CAAS,GAAY;QACrC,OAAO,MAAM,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,eAAe,EAAE,CAAA;IACrD,CAAC;IAGK,AAAN,KAAK,CAAC,eAAe,CAAS,GAAY;QACxC,OAAO,MAAM,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,SAAS,EAAE,CAAA;IACnD,CAAC;CACF,CAAA;AA/DO;IADL,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,8ZAA8Z,EAAE,CAAC;IAC3b,WAAA,GAAG,EAAE,CAAA;;qCAAM,OAAO;;4CAEhC;AAGK;IADL,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,wDAAwD,EAAE,CAAC;IACxF,WAAA,GAAG,EAAE,CAAA;;qCAAM,OAAO;;kDAEtC;AAGK;IADL,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,6HAA6H,EAAE,CAAC;IACzJ,WAAA,GAAG,EAAE,CAAA;;qCAAM,OAAO;;sDAE1C;AAGK;IADL,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,uDAAuD,EAAE,CAAC;IACxF,WAAA,GAAG,EAAE,CAAA;;qCAAM,OAAO;;iDAErC;AAGK;IADL,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,0IAA0I,EAAE,CAAC;IACvK,WAAA,GAAG,EAAE,CAAA;;qCAAM,OAAO;;qDAEzC;AAGK;IADL,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,uDAAuD,EAAE,CAAC;IACxF,WAAA,GAAG,EAAE,CAAA;;qCAAM,OAAO;;iDAErC;AAGK;IADL,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,0HAA0H,EAAE,CAAC;IACvJ,WAAA,GAAG,EAAE,CAAA;;qCAAM,OAAO;;qDAEzC;AAGK;IADL,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,8GAA8G,EAAE,CAAC;IAC3I,WAAA,GAAG,EAAE,CAAA;;qCAAM,OAAO;;qDAEzC;AAGK;IADL,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,4HAA4H,EAAE,CAAC;IACxJ,WAAA,GAAG,EAAE,CAAA;;qCAAM,OAAO;;sDAE1C;AAGK;IADL,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,yHAAyH,EAAE,CAAC;IACtJ,WAAA,GAAG,EAAE,CAAA;;qCAAM,OAAO;;qDAEzC;AAGK;IADL,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,2FAA2F,EAAE,CAAC;IACvH,WAAA,GAAG,EAAE,CAAA;IAAgB,WAAA,GAAG,CAAC,MAAM,CAAC,CAAA;;qCAArB,OAAO,EAAqB,aAAa;;sDAE5E;AAGK;IADL,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,8EAA8E,EAAE,CAAC;IAC9G,WAAA,GAAG,EAAE,CAAA;;qCAAM,OAAO;;kDAEtC;AAGK;IADL,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,uHAAuH,EAAE,CAAC;IACpJ,WAAA,GAAG,EAAE,CAAA;;qCAAM,OAAO;;qDAEzC;AAhEU,cAAc;IAD1B,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC;GACV,cAAc,CAiE1B;SAjEY,cAAc"}
+{"version":3,"file":"access.resolver.js","sourceRoot":"","sources":["../../src/access/access.resolver.ts"],"names":[],"mappings":"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"}

package/dist/asset/asset.database.d.ts

@@ -1,12 +1,14 @@
 import { Asset, AssetFilter, AssetResize, VersionedService, CreateAssetInput, AssetFolder } from '../internal.js';
 import { DateTime } from 'luxon';
 export declare function getAssets(filter?: AssetFilter): Promise<Asset[]>;
-export declare function getResizes(assetIds: string[]): Promise<{
-    key: string;
+export declare function getResizes(assetInternalIds: number[]): Promise<{
+    key: any;
     value: AssetResize;
 }[]>;
+export declare function getResizesById(resizeIds: string[]): Promise<AssetResize[]>;
 export declare function getLatestDownload(asset: Asset, resizeBinaryIds: number[]): Promise<DateTime>;
-export declare function createAsset(versionedService: VersionedService, userId: string, args: CreateAssetInput): Promise<Asset>;
+export declare function createAsset(versionedService: VersionedService, userId: string, args: CreateAssetInput): Promise<number>;
+export declare function registerResize(asset: Asset, width: number, shasum: string, mime: string, quality: number, size: number): Promise<number>;
 export declare function moveAsset(id: number, targetFolder: AssetFolder): Promise<number>;
 export declare function deleteAsset(id: number, userInternalId: number): Promise<number>;
 export declare function undeleteAsset(id: number): Promise<number>;

package/dist/asset/asset.database.js

@@ -1,5 +1,5 @@
 import db from 'mysql2-async/db';
-import { isNotNull, stringify } from 'txstate-utils';
+import { isNotNull, pick, stringify } from 'txstate-utils';
 import { Asset, AssetResize, AssetFolder } from '../internal.js';
 import { DateTime } from 'luxon';
 function processFilters(filter) {
@@ -48,21 +48,31 @@ function processFilters(filter) {
 export async function getAssets(filter) {
     const { binds, where, joins } = processFilters(filter);
     const assets = await db.getall(`
-    SELECT assets.id, assets.dataId, assets.name, assets.folderId, assets.deletedAt, assets.deletedBy, binaries.bytes AS filesize, binaries.mime, binaries.shasum FROM assets
+    SELECT assets.id, assets.dataId, assets.name, assets.folderId, assets.deletedAt, assets.deletedBy, binaries.bytes AS filesize, binaries.mime, binaries.shasum, binaries.meta FROM assets
     INNER JOIN binaries on assets.shasum = binaries.shasum
     ${joins.size ? Array.from(joins.values()).join('\n') : ''}
     WHERE (${where.join(') AND (')})`, binds);
     return assets.map(a => new Asset(a));
 }
-export async function getResizes(assetIds) {
+export async function getResizes(assetInternalIds) {
     const binds = [];
+    const where = [];
+    where.push(`a.id IN (${db.in(binds, assetInternalIds)})`);
     const resizes = await db.getall(`SELECT a.id as assetId, r.*, rb.shasum, rb.bytes, rb.mime
   FROM resizes r
   INNER JOIN binaries b ON r.originalBinaryId = b.id
   INNER JOIN binaries rb ON r.binaryId = rb.id
-  INNER JOIN assets a ON b.shasum = assets.shasum
-  WHERE assets.id IN (${db.in(binds, assetIds)})`, binds);
-    return resizes.map(row => ({ key: String(row.assetId), value: new AssetResize(row) }));
+  INNER JOIN assets a ON b.shasum = a.shasum
+  WHERE (${where.join(') AND (')})
+  ORDER BY rb.bytes`, binds);
+    return resizes.map(row => ({ key: row.assetId, value: new AssetResize(row) }));
+}
+export async function getResizesById(resizeIds) {
+    const rows = await db.getall(`SELECT r.*, rb.shasum, rb.bytes, rb.mime
+  FROM resizes r
+  INNER JOIN binaries rb ON r.binaryId = rb.id
+  WHERE rb.shasum IN (${db.in([], resizeIds)})`, [resizeIds]);
+    return rows.map(r => new AssetResize(r));
 }
 export async function getLatestDownload(asset, resizeBinaryIds) {
     const binds = [];
@@ -83,14 +93,26 @@ export async function createAsset(versionedService, userId, args) {
         // TODO: What else should go in the data for an asset? What indexes does it need?
         const dataId = await versionedService.create('asset', { shasum: args.checksum }, [{ name: 'type', values: [args.mime] }], userId, db);
         const folderInternalId = await db.getval('SELECT id FROM assetfolders WHERE guid = ?', [args.folderId]);
-        // TODO: What goes in the meta field?
         await db.insert(`
       INSERT IGNORE INTO binaries (shasum, mime, meta, bytes)
-      VALUES(?, ?, ?, ?)`, [args.checksum, args.mime, stringify({}), args.size]);
+      VALUES(?, ?, ?, ?)`, [args.checksum, args.mime, stringify(pick(args, 'width', 'height')), args.size]);
         const newInternalId = await db.insert(`
       INSERT INTO assets (name, folderId, dataId, shasum)
       VALUES(?, ?, ?, ?)`, [args.name, folderInternalId, dataId, args.checksum]);
-        return new Asset(await db.getrow('SELECT * FROM assets WHERE id=?', [newInternalId]));
+        return newInternalId;
+    });
+}
+export async function registerResize(asset, width, shasum, mime, quality, size) {
+    const height = asset.box.height * width / asset.box.width;
+    return await db.transaction(async (db) => {
+        const binaryId = await db.insert(`
+      INSERT IGNORE INTO binaries (shasum, mime, meta, bytes) VALUES (?, ?, ?, ?)
+    `, [shasum, mime, stringify({ width, height }), size]);
+        const origBinaryId = await db.getval('SELECT id FROM binaries WHERE shasum=?', [asset.checksum]);
+        await db.insert(`
+      INSERT INTO resizes (binaryId, originalBinaryId, width, height, quality, othersettings) VALUES (?, ?, ?, ?, ?, ?)
+    `, [binaryId, origBinaryId, width, height, quality, stringify({})]);
+        return binaryId;
     });
 }
 export async function moveAsset(id, targetFolder) {

package/dist/asset/asset.database.js.map

@@ -1 +1 @@
-{"version":3,"file":"asset.database.js","sourceRoot":"","sources":["../../src/asset/asset.database.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"asset.database.js","sourceRoot":"","sources":["../../src/asset/asset.database.ts"],"names":[],"mappings":"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"}

package/dist/asset/asset.model.d.ts

@@ -11,6 +11,7 @@ export declare class Asset {
     internalId: number;
     id: string;
     name: UrlSafeString;
+    filename: string;
     size: number;
     mime: string;
     extension: string;
@@ -45,6 +46,8 @@ export declare class CreateAssetInput {
     checksum: string;
     mime: string;
     size: number;
+    width?: number;
+    height?: number;
 }
 export declare class UpdateAssetInput {
     name: string;
@@ -66,6 +69,7 @@ export declare enum AssetPermission {
 }
 export declare class AssetResize {
     id: string;
+    checksum: string;
     mime: string;
     extension: string;
     width: number;

package/dist/asset/asset.model.js

@@ -8,7 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { DateTime } from 'luxon';
-import { isNotNull } from 'txstate-utils';
+import { isNotBlank, isNotNull } from 'txstate-utils';
 import { Field, ID, InputType, Int, ObjectType, registerEnumType } from 'type-graphql';
 import { ValidatedResponse } from '@txstate-mws/graphql-server';
 import { extension } from 'mime-types';
@@ -23,11 +23,11 @@ const resizeMimeToExt = {
 };
 let BoxAttributes = class BoxAttributes {
     constructor(row) {
-        this.width = row.width;
-        this.height = row.height;
+        this.width = row.meta.width;
+        this.height = row.meta.height;
     }
     static hasBox(row) {
-        return !!row.width;
+        return !!row.meta?.width;
     }
 };
 __decorate([
@@ -51,6 +51,7 @@ let Asset = class Asset {
         this.size = row.filesize;
         this.mime = row.mime; // should be detected upon upload
         this.extension = extension(this.mime) || ''; // TODO: extension can return false if mime is blank, not a string, or unrecognized. What should the extension be in that case?
+        this.filename = [this.name, this.extension].filter(isNotBlank).join('.');
         this.box = BoxAttributes.hasBox(row) ? new BoxAttributes(row) : undefined;
         this.folderInternalId = row.folderId;
         this.dataId = row.dataId;
@@ -66,9 +67,13 @@ __decorate([
     __metadata("design:type", String)
 ], Asset.prototype, "id", void 0);
 __decorate([
-    Field({ description: 'Filename that will be used when downloading the asset. Does not include an extension. May be different than the filename of the original upload.' }),
+    Field({ description: 'Name of the asset, not including extension. May be different than the filename of the original upload.' }),
     __metadata("design:type", UrlSafeString)
 ], Asset.prototype, "name", void 0);
+__decorate([
+    Field({ description: 'Filename that will be used when downloading the asset. Includes the extension.' }),
+    __metadata("design:type", String)
+], Asset.prototype, "filename", void 0);
 __decorate([
     Field(type => Int, { description: 'Filesize in bytes.' }),
     __metadata("design:type", Number)
@@ -82,7 +87,7 @@ __decorate([
     __metadata("design:type", String)
 ], Asset.prototype, "extension", void 0);
 __decorate([
-    Field(),
+    Field({ nullable: true }),
     __metadata("design:type", BoxAttributes)
 ], Asset.prototype, "box", void 0);
 __decorate([
@@ -172,6 +177,14 @@ __decorate([
     Field(type => Int),
     __metadata("design:type", Number)
 ], CreateAssetInput.prototype, "size", void 0);
+__decorate([
+    Field(type => Int, { nullable: true, description: 'Must provide if asset is an image.' }),
+    __metadata("design:type", Number)
+], CreateAssetInput.prototype, "width", void 0);
+__decorate([
+    Field(type => Int, { nullable: true, description: 'Must provide if asset is an image.' }),
+    __metadata("design:type", Number)
+], CreateAssetInput.prototype, "height", void 0);
 CreateAssetInput = __decorate([
     InputType()
 ], CreateAssetInput);
@@ -226,6 +239,7 @@ let AssetResize = class AssetResize {
     constructor(row) {
         this.id = row.shasum;
         this.size = row.bytes;
+        this.checksum = row.shasum;
         this.mime = row.mime;
         this.extension = resizeMimeToExt[this.mime] ?? 'jpg';
         this.width = row.width;
@@ -238,9 +252,13 @@ let AssetResize = class AssetResize {
     }
 };
 __decorate([
-    Field(type => ID, { description: 'The checksum for this resized version. Used for retrieval/display.' }),
+    Field(type => ID, { description: 'Used for retrieval/display.' }),
     __metadata("design:type", String)
 ], AssetResize.prototype, "id", void 0);
+__decorate([
+    Field(),
+    __metadata("design:type", String)
+], AssetResize.prototype, "checksum", void 0);
 __decorate([
     Field({ description: 'The mime type of this particular resized version. For instance, we may have resizes for each of the popular image formats like JPEG, AVIF, and WEBP.' }),
     __metadata("design:type", String)

package/dist/asset/asset.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"asset.model.js","sourceRoot":"","sources":["../../src/asset/asset.model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"asset.model.js","sourceRoot":"","sources":["../../src/asset/asset.model.ts"],"names":[],"mappings":"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"}

package/dist/asset/asset.routes.d.ts

@@ -0,0 +1,2 @@
+import type { FastifyInstance } from 'fastify';
+export declare function createAssetRoutes(app: FastifyInstance): Promise<void>;

package/dist/asset/asset.routes.js

@@ -0,0 +1,73 @@
+import multipart from '@fastify/multipart';
+import { AuthError, Context } from '@txstate-mws/graphql-server';
+import { HttpError } from 'fastify-txstate';
+import { createReadStream } from 'fs';
+import { mkdir } from 'fs/promises';
+import { DateTime } from 'luxon';
+import { omit } from 'txstate-utils';
+import { AssetService, AssetServiceInternal, handleUpload, FileSystemHandler, UserServiceInternal, VersionedService } from '../internal.js';
+async function getEnabledUser(ctx) {
+    await ctx.waitForAuth();
+    if (!ctx.auth?.sub)
+        throw new AuthError();
+    const user = await ctx.svc(UserServiceInternal).findById(ctx.auth.sub);
+    if (!user || user.disabled)
+        throw new AuthError();
+    return user;
+}
+export async function createAssetRoutes(app) {
+    await mkdir('/files/tmp', { recursive: true });
+    await app.register(multipart);
+    app.post('/assets', async (req, res) => {
+        const ctx = new Context(req);
+        await getEnabledUser(ctx); // throws if not authorized
+        const { files, data } = await handleUpload(req);
+        const assetService = ctx.svc(AssetService);
+        for (const file of files) {
+            await assetService.create({ folderId: data.folderId, checksum: file.shasum, ...omit(file, 'shasum') });
+        }
+        return files;
+    });
+    app.get('/resize/:resizeid/:filename', async (req, res) => {
+        const ctx = new Context(req);
+        const resize = await ctx.svc(AssetService).getResize(req.params.resizeid);
+        if (!resize)
+            throw new HttpError(404);
+        const etag = req.headers['if-none-match'];
+        const resizeEtag = `"${resize.checksum}"`;
+        if (etag && resizeEtag === etag)
+            return await res.status(304).send();
+        const filepath = FileSystemHandler.getFileLocation(resize.checksum);
+        void res.header('Content-Type', resize.mime);
+        void res.header('Content-Disposition', 'inline');
+        void res.header('Content-Length', resize.size);
+        void res.header('ETag', resizeEtag);
+        void res.header('Cache-Control', `public, max-age=${String(60 * 60 * 24 * 30)}`);
+        return await res.status(200).send(createReadStream(filepath));
+    });
+    app.get('/assets/:id/:filename', async (req, res) => {
+        const ctx = new Context(req);
+        const asset = await ctx.svc(AssetServiceInternal).findById(req.params.id);
+        if (!asset)
+            throw new HttpError(404);
+        const etag = req.headers['if-none-match'];
+        const assetEtag = `"${asset.checksum}"`;
+        if (etag && assetEtag === etag)
+            return await res.status(304).send();
+        const data = await ctx.svc(VersionedService).get(asset.dataId);
+        const modifiedAt = DateTime.fromJSDate(data.modified);
+        const ifsince = req.headers['if-modified-since'] ? DateTime.fromHTTP(req.headers['if-modified-since']) : undefined;
+        if (ifsince?.isValid && modifiedAt <= ifsince)
+            return await res.status(304).send();
+        const filepath = FileSystemHandler.getFileLocation(asset?.checksum);
+        const filename = req.params.filename;
+        void res.header('Last-Modified', modifiedAt.toHTTP());
+        void res.header('ETag', assetEtag);
+        void res.header('Cache-Control', 'no-cache');
+        void res.header('Content-Type', asset.mime);
+        void res.header('Content-Disposition', 'attachment;filename=' + filename);
+        void res.header('Content-Length', asset.size);
+        return await res.status(200).send(createReadStream(filepath));
+    });
+}
+//# sourceMappingURL=asset.routes.js.map

package/dist/asset/asset.routes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"asset.routes.js","sourceRoot":"","sources":["../../src/asset/asset.routes.ts"],"names":[],"mappings":"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"}

package/dist/asset/asset.service.d.ts

@@ -3,6 +3,7 @@ import { Asset, AssetFilter, AssetFolder, DosGatoService, CreateAssetInput, Asse
 export declare class AssetServiceInternal extends BaseService {
     find(filter: AssetFilter): Promise<Asset[]>;
     findById(id: string): Promise<Asset | undefined>;
+    findByInternalId(id: number): Promise<Asset | undefined>;
     findByIds(ids: string[]): Promise<Asset[]>;
     findByFolder(folder: AssetFolder, filter?: AssetFilter): Promise<Asset[]>;
     findByFolders(folders: AssetFolder[], filter?: AssetFilter): Promise<Asset[]>;
@@ -20,12 +21,14 @@ export declare class AssetService extends DosGatoService<Asset> {
     getSite(asset: Asset): Promise<import("../internal.js").Site | undefined>;
     getPath(asset: Asset): Promise<string>;
     getResizes(asset: Asset): Promise<import("./asset.model.js").AssetResize[]>;
+    getResize(resizeId: string): Promise<import("./asset.model.js").AssetResize | undefined>;
     getThumbnail(asset: Asset): Promise<import("./asset.model.js").AssetResize | undefined>;
     getLatestDownload(asset: Asset): Promise<import("luxon").DateTime>;
     create(args: CreateAssetInput): Promise<AssetResponse>;
     move(dataId: string, folderId: string): Promise<AssetResponse>;
     delete(dataId: string): Promise<AssetResponse>;
     undelete(dataId: string): Promise<AssetResponse>;
+    createResizes(asset: Asset): Promise<void>;
     mayViewManagerUI(): Promise<boolean>;
     mayView(asset: Asset): Promise<boolean>;
     mayViewForEdit(asset: Asset): Promise<boolean>;

package/dist/asset/asset.service.js

@@ -1,19 +1,35 @@
 import { BaseService } from '@txstate-mws/graphql-server';
 import { ManyJoinedLoader, OneToManyLoader, PrimaryKeyLoader } from 'dataloader-factory';
-import { intersect, isNotNull, keyby, sortby } from 'txstate-utils';
-import { getAssets, AssetFolderService, appendPath, getResizes, SiteService, DosGatoService, getLatestDownload, AssetFolderServiceInternal, createAsset, VersionedService, AssetResponse, FileSystemHandler, deleteAsset, undeleteAsset, moveAsset, popPath, basename } from '../internal.js';
+import { nanoid } from 'nanoid';
+import crypto from 'node:crypto';
+import sharp from 'sharp';
+import { pipeline } from 'node:stream/promises';
+import { intersect, isNotNull, keyby, roundTo, sortby } from 'txstate-utils';
+import { getAssets, AssetFolderService, appendPath, getResizes, SiteService, DosGatoService, getLatestDownload, AssetFolderServiceInternal, createAsset, VersionedService, AssetResponse, FileSystemHandler, deleteAsset, undeleteAsset, moveAsset, popPath, basename, registerResize, getResizesById } from '../internal.js';
+import { mkdir } from 'node:fs/promises';
+import { dirname } from 'node:path';
+import { lookup } from 'mime-types';
 const thumbnailMimes = new Set(['image/jpg', 'image/jpeg', 'image/gif', 'image/png']);
 const assetsByIdLoader = new PrimaryKeyLoader({
     fetch: async (dataIds) => await getAssets({ ids: dataIds })
 });
+const assetsByInternalIdLoader = new PrimaryKeyLoader({
+    fetch: async (internalIds) => await getAssets({ internalIds }),
+    extractId: asset => asset.internalId,
+    idLoader: assetsByIdLoader
+});
+assetsByIdLoader.addIdLoader(assetsByInternalIdLoader);
 const assetsByFolderInternalIdLoader = new OneToManyLoader({
     fetch: async (folderInternalIds, filter) => await getAssets({ ...filter, folderInternalIds }),
     keysFromFilter: (filter) => filter?.folderInternalIds ?? [],
     extractKey: asset => asset.folderInternalId,
-    idLoader: assetsByIdLoader
+    idLoader: [assetsByIdLoader, assetsByInternalIdLoader]
 });
 const resizesByAssetIdLoader = new ManyJoinedLoader({
-    fetch: async (assetIds) => await getResizes(assetIds)
+    fetch: async (assetInternalIds) => await getResizes(assetInternalIds)
+});
+const resizeLoader = new PrimaryKeyLoader({
+    fetch: async (ids) => await getResizesById(ids)
 });
 export class AssetServiceInternal extends BaseService {
     async find(filter) {
@@ -25,6 +41,9 @@ export class AssetServiceInternal extends BaseService {
     async findById(id) {
         return await this.loaders.get(assetsByIdLoader).load(id);
     }
+    async findByInternalId(id) {
+        return await this.loaders.get(assetsByInternalIdLoader).load(id);
+    }
     async findByIds(ids) {
         return await this.loaders.loadMany(assetsByIdLoader, ids);
     }
@@ -117,7 +136,10 @@ export class AssetService extends DosGatoService {
         return await this.raw.getPath(asset);
     }
     async getResizes(asset) {
-        return await this.loaders.get(resizesByAssetIdLoader).load(asset.id);
+        return await this.loaders.get(resizesByAssetIdLoader).load(asset.internalId);
+    }
+    async getResize(resizeId) {
+        return await this.loaders.get(resizeLoader).load(resizeId);
     }
     async getThumbnail(asset) {
         const resizes = sortby(await this.getResizes(asset), 'size');
@@ -136,8 +158,10 @@ export class AssetService extends DosGatoService {
         try {
             await FileSystemHandler.moveToPermLocation(args.checksum);
             const versionedService = this.svc(VersionedService);
-            const asset = await createAsset(versionedService, this.auth.sub, args);
+            const assetId = await createAsset(versionedService, this.auth.sub, args);
             this.loaders.clear();
+            const asset = (await this.raw.findByInternalId(assetId));
+            this.createResizes(asset).catch(console.error);
             return new AssetResponse({ asset, success: true });
         }
         catch (err) {
@@ -205,6 +229,55 @@ export class AssetService extends DosGatoService {
             throw new Error('Could not restore asset folder');
         }
     }
+    async createResizes(asset) {
+        if (!asset.box)
+            return;
+        const filepath = FileSystemHandler.getFileLocation(asset.checksum);
+        const info = await sharp(filepath).metadata();
+        console.log(info);
+        const colors = await new Promise((resolve, reject) => {
+            const colorSet = new Set();
+            sharp(filepath)
+                .raw()
+                .on('data', (b) => {
+                for (let offset = 0; offset < b.length && colorSet.size < 10000; offset += info.channels) {
+                    const colorString = Array.from({ length: info.channels }, (_, i) => b[offset + i]).join(',');
+                    if (colorString === '212,222,214')
+                        console.log(colorString);
+                    colorSet.add(colorString);
+                }
+            })
+                .on('error', () => reject(new Error('there was a problem counting colors in image ' + asset.filename)))
+                .on('end', () => resolve(colorSet.size));
+        });
+        console.log(colors);
+        const outputformat = colors >= 10000
+            ? 'jpg'
+            : (info.pages ?? 0) > 0 && info.format !== 'heif'
+                ? 'gif'
+                : 'png';
+        const img = sharp(filepath, { animated: outputformat === 'gif' }).rotate();
+        const resizePromises = [];
+        for (let w = asset.box.width; w > 100; w = roundTo(w / 2)) {
+            const id = nanoid();
+            resizePromises.push((async () => {
+                const resized = img.clone().resize(w);
+                const formatted = outputformat === 'jpg'
+                    ? resized.jpeg({ quality: 60 })
+                    : outputformat === 'png'
+                        ? resized.png({ palette: colors <= 256, compressionLevel: 9, progressive: true })
+                        : resized.gif({ effort: 10, reoptimize: true, loop: info.loop ?? 0 });
+                const hash = crypto.createHash('sha1', { encoding: 'hex' });
+                await pipeline(formatted.clone(), hash);
+                const shasum = hash.read();
+                const filepath = FileSystemHandler.getFileLocation(shasum);
+                await mkdir(dirname(filepath), { recursive: true });
+                const outputinfo = await formatted.toFile(FileSystemHandler.getFileLocation(shasum));
+                await registerResize(asset, w, shasum, lookup(outputformat), outputformat === 'jpg' ? 60 : 0, outputinfo.size);
+            })());
+        }
+        await Promise.all(resizePromises);
+    }
     async mayViewManagerUI() {
         return (await this.currentAssetRules()).some(r => r.grants.viewForEdit);
     }