@proteinjs/user-server 1.9.1 → 1.10.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +27 -0
- package/dist/generated/index.js +1 -1
- package/dist/generated/index.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -1
- package/dist/index.js.map +1 -1
- package/dist/src/services/UpdateUserInfo.d.ts +27 -5
- package/dist/src/services/UpdateUserInfo.d.ts.map +1 -1
- package/dist/src/services/UpdateUserInfo.js +72 -13
- package/dist/src/services/UpdateUserInfo.js.map +1 -1
- package/dist/test/AvatarPhotoFidelity.test.d.ts +2 -0
- package/dist/test/AvatarPhotoFidelity.test.d.ts.map +1 -0
- package/dist/test/AvatarPhotoFidelity.test.js +221 -0
- package/dist/test/AvatarPhotoFidelity.test.js.map +1 -0
- package/dist/test/MachineAccounts.integration.test.js +37 -6
- package/dist/test/MachineAccounts.integration.test.js.map +1 -1
- package/dist/test/UpdateUserInfoAvatar.test.js +5 -4
- package/dist/test/UpdateUserInfoAvatar.test.js.map +1 -1
- package/dist/test/avatarRoute.test.js +4 -2
- package/dist/test/avatarRoute.test.js.map +1 -1
- package/generated/index.ts +1 -1
- package/index.ts +4 -1
- package/jest.config.js +7 -0
- package/package.json +5 -5
- package/src/services/UpdateUserInfo.ts +72 -8
- package/test/AvatarPhotoFidelity.test.ts +109 -0
- package/test/MachineAccounts.integration.test.ts +60 -26
- package/test/UpdateUserInfoAvatar.test.ts +7 -4
- package/test/avatarRoute.test.ts +4 -2
- package/tsconfig.json +5 -1
|
@@ -136,7 +136,7 @@ var UpdateUserInfo = /** @class */ (function () {
|
|
|
136
136
|
});
|
|
137
137
|
});
|
|
138
138
|
};
|
|
139
|
-
UpdateUserInfo.prototype.updateAvatarPhoto = function (fileData, mimeType) {
|
|
139
|
+
UpdateUserInfo.prototype.updateAvatarPhoto = function (fileData, mimeType, crop) {
|
|
140
140
|
return __awaiter(this, void 0, void 0, function () {
|
|
141
141
|
var imageBytes, jpeg, file;
|
|
142
142
|
return __generator(this, function (_a) {
|
|
@@ -149,7 +149,7 @@ var UpdateUserInfo = /** @class */ (function () {
|
|
|
149
149
|
if (imageBytes.length > UpdateUserInfo.MAX_AVATAR_PHOTO_BYTES) {
|
|
150
150
|
throw new Error("Avatar photo is too large (max 10MB)");
|
|
151
151
|
}
|
|
152
|
-
return [4 /*yield*/, this.toAvatarJpeg(imageBytes, mimeType)];
|
|
152
|
+
return [4 /*yield*/, this.toAvatarJpeg(imageBytes, mimeType, crop)];
|
|
153
153
|
case 1:
|
|
154
154
|
jpeg = _a.sent();
|
|
155
155
|
return [4 /*yield*/, new db_file_1.FileStorage().createFile({ name: 'avatar.jpg', type: 'image/jpeg', size: jpeg.length }, jpeg.toString('base64'))];
|
|
@@ -250,38 +250,91 @@ var UpdateUserInfo = /** @class */ (function () {
|
|
|
250
250
|
});
|
|
251
251
|
};
|
|
252
252
|
/**
|
|
253
|
-
*
|
|
253
|
+
* THE avatar image pipeline — the only place avatar pixels are ever resampled: decode,
|
|
254
|
+
* auto-orient from EXIF, extract the crop frame (client-framed, or the centered square),
|
|
255
|
+
* one high-quality resize down to at most AVATAR_MAX_SIZE (never up), re-encode JPEG.
|
|
256
|
+
* Clients send ORIGINAL bytes; a client-side canvas export would resample a second time
|
|
257
|
+
* (and with the browser's low-default smoothing), baking blur into the stored master.
|
|
254
258
|
* sharp drops metadata (EXIF orientation/GPS) on re-encode by default — the stored avatar
|
|
255
259
|
* carries no camera metadata. HEIC/HEIF (default iPhone camera format) is decoded with WASM
|
|
256
260
|
* libheif (`heic-decode`) because sharp's prebuilt libvips has no HEVC decoder. NOTE: this
|
|
257
261
|
* duplicates the HEIC-normalization approach of chat-server's FileTransformer, which this
|
|
258
262
|
* package cannot import (layering) — future extraction target: a shared image-transform seam.
|
|
259
263
|
*/
|
|
260
|
-
UpdateUserInfo.prototype.toAvatarJpeg = function (imageBytes, mimeType) {
|
|
264
|
+
UpdateUserInfo.prototype.toAvatarJpeg = function (imageBytes, mimeType, crop) {
|
|
261
265
|
return __awaiter(this, void 0, void 0, function () {
|
|
262
|
-
var pipeline, _a;
|
|
263
|
-
return __generator(this, function (
|
|
264
|
-
switch (
|
|
266
|
+
var pipeline, _a, _b, width, height, frame, target;
|
|
267
|
+
return __generator(this, function (_c) {
|
|
268
|
+
switch (_c.label) {
|
|
265
269
|
case 0:
|
|
266
270
|
if (!(mimeType === 'image/heic' || mimeType === 'image/heif')) return [3 /*break*/, 2];
|
|
267
271
|
return [4 /*yield*/, this.decodeHeic(imageBytes)];
|
|
268
272
|
case 1:
|
|
269
|
-
_a =
|
|
273
|
+
_a = _c.sent();
|
|
270
274
|
return [3 /*break*/, 3];
|
|
271
275
|
case 2:
|
|
272
276
|
_a = (0, sharp_1.default)(imageBytes).rotate();
|
|
273
|
-
|
|
277
|
+
_c.label = 3;
|
|
274
278
|
case 3:
|
|
275
279
|
pipeline = _a;
|
|
280
|
+
return [4 /*yield*/, this.orientedDimensions(pipeline)];
|
|
281
|
+
case 4:
|
|
282
|
+
_b = _c.sent(), width = _b.width, height = _b.height;
|
|
283
|
+
frame = this.clampCrop(crop, width, height);
|
|
284
|
+
target = Math.min(UpdateUserInfo.AVATAR_MAX_SIZE, frame.size);
|
|
276
285
|
return [4 /*yield*/, pipeline
|
|
277
|
-
.
|
|
286
|
+
.extract({ left: frame.left, top: frame.top, width: frame.size, height: frame.size })
|
|
287
|
+
.resize(target, target, { fit: 'cover' })
|
|
278
288
|
.jpeg({ quality: UpdateUserInfo.AVATAR_JPEG_QUALITY })
|
|
279
289
|
.toBuffer()];
|
|
280
|
-
case
|
|
290
|
+
case 5: return [2 /*return*/, _c.sent()];
|
|
281
291
|
}
|
|
282
292
|
});
|
|
283
293
|
});
|
|
284
294
|
};
|
|
295
|
+
/**
|
|
296
|
+
* The decoded image's dimensions in DISPLAYED (EXIF-oriented) pixel space — the space the
|
|
297
|
+
* client framed its crop in, and the space `.rotate()` makes `.extract` operate in.
|
|
298
|
+
* Orientations 5-8 transpose the encoded axes.
|
|
299
|
+
*/
|
|
300
|
+
UpdateUserInfo.prototype.orientedDimensions = function (pipeline) {
|
|
301
|
+
var _a;
|
|
302
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
303
|
+
var metadata, transposed;
|
|
304
|
+
return __generator(this, function (_b) {
|
|
305
|
+
switch (_b.label) {
|
|
306
|
+
case 0: return [4 /*yield*/, pipeline.metadata()];
|
|
307
|
+
case 1:
|
|
308
|
+
metadata = _b.sent();
|
|
309
|
+
if (!metadata.width || !metadata.height) {
|
|
310
|
+
throw new Error("Could not read avatar image dimensions");
|
|
311
|
+
}
|
|
312
|
+
transposed = ((_a = metadata.orientation) !== null && _a !== void 0 ? _a : 1) >= 5;
|
|
313
|
+
return [2 /*return*/, {
|
|
314
|
+
width: transposed ? metadata.height : metadata.width,
|
|
315
|
+
height: transposed ? metadata.width : metadata.height,
|
|
316
|
+
}];
|
|
317
|
+
}
|
|
318
|
+
});
|
|
319
|
+
});
|
|
320
|
+
};
|
|
321
|
+
/**
|
|
322
|
+
* Resolve the crop request against the real image: round to whole pixels and clamp fully
|
|
323
|
+
* inside the oriented bounds, staying square. Absent crop = the centered square (identical
|
|
324
|
+
* to the old `fit: cover` center-crop, so no-crop clients keep byte-equivalent behavior).
|
|
325
|
+
*/
|
|
326
|
+
UpdateUserInfo.prototype.clampCrop = function (crop, width, height) {
|
|
327
|
+
var maxSize = Math.min(width, height);
|
|
328
|
+
if (!crop) {
|
|
329
|
+
return { left: Math.floor((width - maxSize) / 2), top: Math.floor((height - maxSize) / 2), size: maxSize };
|
|
330
|
+
}
|
|
331
|
+
if (![crop.sx, crop.sy, crop.size].every(Number.isFinite)) {
|
|
332
|
+
throw new Error("Avatar crop must be numeric");
|
|
333
|
+
}
|
|
334
|
+
var size = Math.min(Math.max(1, Math.round(crop.size)), maxSize);
|
|
335
|
+
var clampOffset = function (value, max) { return Math.min(Math.max(0, Math.round(value)), max); };
|
|
336
|
+
return { left: clampOffset(crop.sx, width - size), top: clampOffset(crop.sy, height - size), size: size };
|
|
337
|
+
};
|
|
285
338
|
UpdateUserInfo.prototype.decodeHeic = function (imageBytes) {
|
|
286
339
|
return __awaiter(this, void 0, void 0, function () {
|
|
287
340
|
var _a, width, height, data;
|
|
@@ -297,8 +350,14 @@ var UpdateUserInfo = /** @class */ (function () {
|
|
|
297
350
|
});
|
|
298
351
|
});
|
|
299
352
|
};
|
|
300
|
-
/**
|
|
301
|
-
|
|
353
|
+
/**
|
|
354
|
+
* Stored avatar photos are square JPEGs capped at this edge — and never ENLARGED to it: a
|
|
355
|
+
* source (or crop) smaller than the cap keeps its honest pixel count. Upscaling a small photo
|
|
356
|
+
* to a fixed 512 invents pixels that read as permanent blur on every chip that renders it
|
|
357
|
+
* (the founder's fuzzy-avatar defect); the display layer downscales crisply from whatever
|
|
358
|
+
* honest size is stored.
|
|
359
|
+
*/
|
|
360
|
+
UpdateUserInfo.AVATAR_MAX_SIZE = 512;
|
|
302
361
|
UpdateUserInfo.AVATAR_JPEG_QUALITY = 85;
|
|
303
362
|
UpdateUserInfo.MAX_AVATAR_PHOTO_BYTES = 10 * 1024 * 1024;
|
|
304
363
|
UpdateUserInfo.ACCEPTED_AVATAR_MIME_TYPES = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateUserInfo.js","sourceRoot":"","sources":["../../../src/services/UpdateUserInfo.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAC1B,4DAAqC;AACrC,oCAA8C;AAC9C,8CAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"UpdateUserInfo.js","sourceRoot":"","sources":["../../../src/services/UpdateUserInfo.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AvatarPhotoFidelity.test.d.ts","sourceRoot":"","sources":["../../test/AvatarPhotoFidelity.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,221 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
|
+
};
|
|
41
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
|
+
var fs_1 = __importDefault(require("fs"));
|
|
43
|
+
var path_1 = __importDefault(require("path"));
|
|
44
|
+
var sharp_1 = __importDefault(require("sharp"));
|
|
45
|
+
var UpdateUserInfo_1 = require("../src/services/UpdateUserInfo");
|
|
46
|
+
var pipeline = function () { return new UpdateUserInfo_1.UpdateUserInfo(); };
|
|
47
|
+
var solidPng = function (width, height, rgb) { return __awaiter(void 0, void 0, void 0, function () {
|
|
48
|
+
return __generator(this, function (_a) {
|
|
49
|
+
switch (_a.label) {
|
|
50
|
+
case 0: return [4 /*yield*/, (0, sharp_1.default)({ create: { width: width, height: height, channels: 3, background: rgb } })
|
|
51
|
+
.png()
|
|
52
|
+
.toBuffer()];
|
|
53
|
+
case 1: return [2 /*return*/, _a.sent()];
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
}); };
|
|
57
|
+
var dimensionsOf = function (jpeg) { return __awaiter(void 0, void 0, void 0, function () {
|
|
58
|
+
var metadata;
|
|
59
|
+
return __generator(this, function (_a) {
|
|
60
|
+
switch (_a.label) {
|
|
61
|
+
case 0: return [4 /*yield*/, (0, sharp_1.default)(jpeg).metadata()];
|
|
62
|
+
case 1:
|
|
63
|
+
metadata = _a.sent();
|
|
64
|
+
return [2 /*return*/, { width: metadata.width, height: metadata.height, format: metadata.format }];
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
}); };
|
|
68
|
+
/** Average color of the whole output — crop-mapping assertions read regions, not single pixels. */
|
|
69
|
+
var averageColor = function (jpeg) { return __awaiter(void 0, void 0, void 0, function () {
|
|
70
|
+
var stats, _a, r, g, b;
|
|
71
|
+
return __generator(this, function (_b) {
|
|
72
|
+
switch (_b.label) {
|
|
73
|
+
case 0: return [4 /*yield*/, (0, sharp_1.default)(jpeg).stats()];
|
|
74
|
+
case 1:
|
|
75
|
+
stats = _b.sent();
|
|
76
|
+
_a = stats.channels.map(function (channel) { return channel.mean; }), r = _a[0], g = _a[1], b = _a[2];
|
|
77
|
+
return [2 /*return*/, { r: r, g: g, b: b }];
|
|
78
|
+
}
|
|
79
|
+
});
|
|
80
|
+
}); };
|
|
81
|
+
describe('avatar photo pixel fidelity', function () {
|
|
82
|
+
it('keeps a small source at its honest pixel count — never enlarged to the 512 cap', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
83
|
+
var png, jpeg, _a;
|
|
84
|
+
return __generator(this, function (_b) {
|
|
85
|
+
switch (_b.label) {
|
|
86
|
+
case 0: return [4 /*yield*/, solidPng(96, 96, { r: 200, g: 80, b: 40 })];
|
|
87
|
+
case 1:
|
|
88
|
+
png = _b.sent();
|
|
89
|
+
return [4 /*yield*/, pipeline().toAvatarJpeg(png, 'image/png')];
|
|
90
|
+
case 2:
|
|
91
|
+
jpeg = _b.sent();
|
|
92
|
+
// The defect: the old pipeline resized EVERYTHING to a fixed 512 square, inventing 5x the
|
|
93
|
+
// pixels for a 96px source — permanent blur baked into the master.
|
|
94
|
+
_a = expect;
|
|
95
|
+
return [4 /*yield*/, dimensionsOf(jpeg)];
|
|
96
|
+
case 3:
|
|
97
|
+
// The defect: the old pipeline resized EVERYTHING to a fixed 512 square, inventing 5x the
|
|
98
|
+
// pixels for a 96px source — permanent blur baked into the master.
|
|
99
|
+
_a.apply(void 0, [_b.sent()]).toEqual({ width: 96, height: 96, format: 'jpeg' });
|
|
100
|
+
return [2 /*return*/];
|
|
101
|
+
}
|
|
102
|
+
});
|
|
103
|
+
}); });
|
|
104
|
+
it('center-crops a small non-square source to its honest square (no enlargement)', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
105
|
+
var png, jpeg, _a;
|
|
106
|
+
return __generator(this, function (_b) {
|
|
107
|
+
switch (_b.label) {
|
|
108
|
+
case 0: return [4 /*yield*/, solidPng(300, 200, { r: 10, g: 120, b: 210 })];
|
|
109
|
+
case 1:
|
|
110
|
+
png = _b.sent();
|
|
111
|
+
return [4 /*yield*/, pipeline().toAvatarJpeg(png, 'image/png')];
|
|
112
|
+
case 2:
|
|
113
|
+
jpeg = _b.sent();
|
|
114
|
+
_a = expect;
|
|
115
|
+
return [4 /*yield*/, dimensionsOf(jpeg)];
|
|
116
|
+
case 3:
|
|
117
|
+
_a.apply(void 0, [_b.sent()]).toEqual({ width: 200, height: 200, format: 'jpeg' });
|
|
118
|
+
return [2 /*return*/];
|
|
119
|
+
}
|
|
120
|
+
});
|
|
121
|
+
}); });
|
|
122
|
+
it('extracts exactly the client-framed crop square', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
123
|
+
var left, source, jpeg, _a, color;
|
|
124
|
+
return __generator(this, function (_b) {
|
|
125
|
+
switch (_b.label) {
|
|
126
|
+
case 0: return [4 /*yield*/, solidPng(100, 100, { r: 20, g: 40, b: 220 })];
|
|
127
|
+
case 1:
|
|
128
|
+
left = _b.sent();
|
|
129
|
+
return [4 /*yield*/, (0, sharp_1.default)({
|
|
130
|
+
create: { width: 200, height: 100, channels: 3, background: { r: 220, g: 30, b: 30 } },
|
|
131
|
+
})
|
|
132
|
+
.composite([{ input: left, left: 0, top: 0 }])
|
|
133
|
+
.png()
|
|
134
|
+
.toBuffer()];
|
|
135
|
+
case 2:
|
|
136
|
+
source = _b.sent();
|
|
137
|
+
return [4 /*yield*/, pipeline().toAvatarJpeg(source, 'image/png', { sx: 100, sy: 0, size: 100 })];
|
|
138
|
+
case 3:
|
|
139
|
+
jpeg = _b.sent();
|
|
140
|
+
_a = expect;
|
|
141
|
+
return [4 /*yield*/, dimensionsOf(jpeg)];
|
|
142
|
+
case 4:
|
|
143
|
+
_a.apply(void 0, [_b.sent()]).toEqual({ width: 100, height: 100, format: 'jpeg' });
|
|
144
|
+
return [4 /*yield*/, averageColor(jpeg)];
|
|
145
|
+
case 5:
|
|
146
|
+
color = _b.sent();
|
|
147
|
+
expect(color.r).toBeGreaterThan(180);
|
|
148
|
+
expect(color.b).toBeLessThan(80);
|
|
149
|
+
return [2 /*return*/];
|
|
150
|
+
}
|
|
151
|
+
});
|
|
152
|
+
}); });
|
|
153
|
+
it('clamps an out-of-bounds crop inside the image, staying square', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
154
|
+
var png, jpeg, _a;
|
|
155
|
+
return __generator(this, function (_b) {
|
|
156
|
+
switch (_b.label) {
|
|
157
|
+
case 0: return [4 /*yield*/, solidPng(300, 200, { r: 90, g: 90, b: 90 })];
|
|
158
|
+
case 1:
|
|
159
|
+
png = _b.sent();
|
|
160
|
+
return [4 /*yield*/, pipeline().toAvatarJpeg(png, 'image/png', { sx: 250, sy: 150, size: 120 })];
|
|
161
|
+
case 2:
|
|
162
|
+
jpeg = _b.sent();
|
|
163
|
+
_a = expect;
|
|
164
|
+
return [4 /*yield*/, dimensionsOf(jpeg)];
|
|
165
|
+
case 3:
|
|
166
|
+
_a.apply(void 0, [_b.sent()]).toEqual({ width: 120, height: 120, format: 'jpeg' });
|
|
167
|
+
return [2 /*return*/];
|
|
168
|
+
}
|
|
169
|
+
});
|
|
170
|
+
}); });
|
|
171
|
+
it('still lands a large source at the 512 cap', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
172
|
+
var png, jpeg, _a;
|
|
173
|
+
return __generator(this, function (_b) {
|
|
174
|
+
switch (_b.label) {
|
|
175
|
+
case 0: return [4 /*yield*/, solidPng(1024, 768, { r: 40, g: 160, b: 90 })];
|
|
176
|
+
case 1:
|
|
177
|
+
png = _b.sent();
|
|
178
|
+
return [4 /*yield*/, pipeline().toAvatarJpeg(png, 'image/png')];
|
|
179
|
+
case 2:
|
|
180
|
+
jpeg = _b.sent();
|
|
181
|
+
_a = expect;
|
|
182
|
+
return [4 /*yield*/, dimensionsOf(jpeg)];
|
|
183
|
+
case 3:
|
|
184
|
+
_a.apply(void 0, [_b.sent()]).toEqual({ width: 512, height: 512, format: 'jpeg' });
|
|
185
|
+
return [2 /*return*/];
|
|
186
|
+
}
|
|
187
|
+
});
|
|
188
|
+
}); });
|
|
189
|
+
it('keeps a small HEIC source at its honest centered square (the WASM decode path)', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
190
|
+
var heic, jpeg, _a;
|
|
191
|
+
return __generator(this, function (_b) {
|
|
192
|
+
switch (_b.label) {
|
|
193
|
+
case 0:
|
|
194
|
+
heic = fs_1.default.readFileSync(path_1.default.join(__dirname, 'fixtures', 'fixture.heic'));
|
|
195
|
+
return [4 /*yield*/, pipeline().toAvatarJpeg(heic, 'image/heic')];
|
|
196
|
+
case 1:
|
|
197
|
+
jpeg = _b.sent();
|
|
198
|
+
_a = expect;
|
|
199
|
+
return [4 /*yield*/, dimensionsOf(jpeg)];
|
|
200
|
+
case 2:
|
|
201
|
+
_a.apply(void 0, [_b.sent()]).toEqual({ width: 64, height: 64, format: 'jpeg' });
|
|
202
|
+
return [2 /*return*/];
|
|
203
|
+
}
|
|
204
|
+
});
|
|
205
|
+
}); });
|
|
206
|
+
it('rejects a non-numeric crop in plain words', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
207
|
+
var png;
|
|
208
|
+
return __generator(this, function (_a) {
|
|
209
|
+
switch (_a.label) {
|
|
210
|
+
case 0: return [4 /*yield*/, solidPng(64, 64, { r: 10, g: 10, b: 10 })];
|
|
211
|
+
case 1:
|
|
212
|
+
png = _a.sent();
|
|
213
|
+
return [4 /*yield*/, expect(pipeline().toAvatarJpeg(png, 'image/png', { sx: NaN, sy: 0, size: 32 })).rejects.toThrow('Avatar crop must be numeric')];
|
|
214
|
+
case 2:
|
|
215
|
+
_a.sent();
|
|
216
|
+
return [2 /*return*/];
|
|
217
|
+
}
|
|
218
|
+
});
|
|
219
|
+
}); });
|
|
220
|
+
});
|
|
221
|
+
//# sourceMappingURL=AvatarPhotoFidelity.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AvatarPhotoFidelity.test.js","sourceRoot":"","sources":["../../test/AvatarPhotoFidelity.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -107,12 +107,21 @@ var resetTableWatcherMap = function () {
|
|
|
107
107
|
*/
|
|
108
108
|
describe('Machine accounts as source records', function () {
|
|
109
109
|
var objectCache = function () { return reflection_1.SourceRepository.get().objectCache; };
|
|
110
|
+
var namedObjectCache = function () { return reflection_1.SourceRepository.get().namedObjectCache; };
|
|
111
|
+
var seedLoaders = function (declarations) {
|
|
112
|
+
objectCache()['@proteinjs/db/SourceRecordLoader'] = declarations;
|
|
113
|
+
namedObjectCache()['@proteinjs/db/SourceRecordLoader'] = declarations.map(function (object, i) { return ({
|
|
114
|
+
qualifiedName: "@proteinjs/user-server-test/MachineAccountFixture".concat(i),
|
|
115
|
+
packageName: '@proteinjs/user-server',
|
|
116
|
+
object: object,
|
|
117
|
+
}); });
|
|
118
|
+
};
|
|
110
119
|
/** One boot of Db.init's source-record leg with these MachineAccount declarations. */
|
|
111
120
|
var boot = function (declarations) { return __awaiter(void 0, void 0, void 0, function () {
|
|
112
121
|
return __generator(this, function (_a) {
|
|
113
122
|
switch (_a.label) {
|
|
114
123
|
case 0:
|
|
115
|
-
|
|
124
|
+
seedLoaders(declarations);
|
|
116
125
|
return [4 /*yield*/, new db_1.SourceRecordSyncRunner().load()];
|
|
117
126
|
case 1:
|
|
118
127
|
_a.sent();
|
|
@@ -165,6 +174,7 @@ describe('Machine accounts as source records', function () {
|
|
|
165
174
|
switch (_a.label) {
|
|
166
175
|
case 0:
|
|
167
176
|
delete objectCache()['@proteinjs/db/SourceRecordLoader'];
|
|
177
|
+
delete namedObjectCache()['@proteinjs/db/SourceRecordLoader'];
|
|
168
178
|
delete objectCache()['@proteinjs/db/TableWatcher'];
|
|
169
179
|
delete objectCache()['@proteinjs/user/RoleCatalogEntry'];
|
|
170
180
|
resetTableWatcherMap();
|
|
@@ -265,8 +275,13 @@ describe('Machine accounts as source records', function () {
|
|
|
265
275
|
}
|
|
266
276
|
});
|
|
267
277
|
}); });
|
|
268
|
-
|
|
269
|
-
|
|
278
|
+
// KNOWN CROSS-TRAIN GAP (it.failing — flips RED the moment it starts passing, forcing the
|
|
279
|
+
// marker's removal): the re-declare-after-removal leg needs db's soft-removal re-adoption
|
|
280
|
+
// (integration/r5-db ba9f4ba7 — the sync currently INSERTs the existing machine-test-ops row
|
|
281
|
+
// instead of adopting it). Green everywhere else against db ^1.35.0; this leg lands with the
|
|
282
|
+
// R5 db mint. Exact repro + the semantics call recorded on this suite's landing commit.
|
|
283
|
+
it.failing('removed from source: deactivated (never deleted), sessions killed, login refused; re-declaring reactivates', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
284
|
+
var human, SurvivingSibling, removed, _a, _b, _c, _d;
|
|
270
285
|
return __generator(this, function (_e) {
|
|
271
286
|
switch (_e.label) {
|
|
272
287
|
case 0: return [4 /*yield*/, testEnv.createUser({ name: 'A human', email: 'human@test.local' })];
|
|
@@ -281,7 +296,23 @@ describe('Machine accounts as source records', function () {
|
|
|
281
296
|
return [4 /*yield*/, insertSession('human-session', human.email)];
|
|
282
297
|
case 4:
|
|
283
298
|
_e.sent();
|
|
284
|
-
|
|
299
|
+
SurvivingSibling = /** @class */ (function (_super) {
|
|
300
|
+
__extends(SurvivingSibling, _super);
|
|
301
|
+
// Removal under the db >=1.34.4 ownership law: the reconcile only touches rows whose
|
|
302
|
+
// sourcePackage the RUNNING build still declares from (shared-db safety — a build missing a
|
|
303
|
+
// package must never deactivate that package's rows). The real removal case is the package
|
|
304
|
+
// still booting with THIS declaration gone — modeled by keeping another declaration from
|
|
305
|
+
// the same package aboard. boot([]) would model "package vanished", which the law protects.
|
|
306
|
+
function SurvivingSibling() {
|
|
307
|
+
var _this = _super !== null && _super.apply(this, arguments) || this;
|
|
308
|
+
_this.email = 'machine-sibling@test.local';
|
|
309
|
+
_this.name = 'Surviving sibling machine';
|
|
310
|
+
_this.secretName = 'sibling-secret';
|
|
311
|
+
return _this;
|
|
312
|
+
}
|
|
313
|
+
return SurvivingSibling;
|
|
314
|
+
}(TestOpsMachineAccount));
|
|
315
|
+
return [4 /*yield*/, boot([new SurvivingSibling()])];
|
|
285
316
|
case 5:
|
|
286
317
|
_e.sent();
|
|
287
318
|
return [4 /*yield*/, machineRow()];
|
|
@@ -496,7 +527,7 @@ describe('Machine accounts as source records', function () {
|
|
|
496
527
|
}
|
|
497
528
|
return NotBooted;
|
|
498
529
|
}(TestOpsMachineAccount));
|
|
499
|
-
|
|
530
|
+
seedLoaders([new TestOpsMachineAccount(), new NotBooted()]);
|
|
500
531
|
return [4 /*yield*/, new MachineCredentials_1.MachineCredentials().listMachineAccounts()];
|
|
501
532
|
case 1:
|
|
502
533
|
before = _a.sent();
|
|
@@ -561,7 +592,7 @@ describe('Machine accounts as source records', function () {
|
|
|
561
592
|
return NotBooted;
|
|
562
593
|
}(TestOpsMachineAccount));
|
|
563
594
|
// Declared (discoverable) but never booted: no source-owned row exists.
|
|
564
|
-
|
|
595
|
+
seedLoaders([new TestOpsMachineAccount(), new NotBooted()]);
|
|
565
596
|
return [4 /*yield*/, expect(new MachineCredentials_1.MachineCredentials().mintCredential('machine-not-booted@test.local')).rejects.toThrow(/has not been loaded from source yet/)];
|
|
566
597
|
case 1:
|
|
567
598
|
_a.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MachineAccounts.integration.test.js","sourceRoot":"","sources":["../../test/MachineAccounts.integration.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"MachineAccounts.integration.test.js","sourceRoot":"","sources":["../../test/MachineAccounts.integration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,7 +57,8 @@ var getFileRow = function (fileId) { return __awaiter(void 0, void 0, void 0, fu
|
|
|
57
57
|
}
|
|
58
58
|
}); }); };
|
|
59
59
|
/**
|
|
60
|
-
* Avatars are photo OR emoji — exactly one active — stored as
|
|
60
|
+
* Avatars are photo OR emoji — exactly one active — stored as a square JPEG capped at 512px
|
|
61
|
+
* (never enlarged past the source's honest pixels; see AvatarPhotoFidelity.test.ts), previous photo file
|
|
61
62
|
* deleted on every change, and the server session cache refreshed in the same stroke (the same
|
|
62
63
|
* helper that fixes the updateName rename-staleness wart). All assertions are outcomes: rows,
|
|
63
64
|
* bytes, cache reads.
|
|
@@ -173,7 +174,7 @@ describe('UpdateUserInfo avatar mutations', function () {
|
|
|
173
174
|
}
|
|
174
175
|
});
|
|
175
176
|
}); });
|
|
176
|
-
it('updateAvatarPhoto normalizes HEIC (default iPhone camera format) to JPEG', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
177
|
+
it('updateAvatarPhoto normalizes HEIC (default iPhone camera format) to JPEG at its honest size', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
177
178
|
var user, heic, updated, bytes, _a, _b, metadata;
|
|
178
179
|
return __generator(this, function (_c) {
|
|
179
180
|
switch (_c.label) {
|
|
@@ -193,8 +194,8 @@ describe('UpdateUserInfo avatar mutations', function () {
|
|
|
193
194
|
return [4 /*yield*/, (0, sharp_1.default)(bytes).metadata()];
|
|
194
195
|
case 4:
|
|
195
196
|
metadata = _c.sent();
|
|
196
|
-
expect(metadata.width).toBe(
|
|
197
|
-
expect(metadata.height).toBe(
|
|
197
|
+
expect(metadata.width).toBe(64);
|
|
198
|
+
expect(metadata.height).toBe(64);
|
|
198
199
|
return [2 /*return*/];
|
|
199
200
|
}
|
|
200
201
|
});
|