0.69.2

* Refactor attachment downloads during export to use promises instead of streams
Date attachments in zip file correctly

* tsc

app/utils/routeHelpers.ts

@@ -136,7 +136,7 @@ export function sharedDocumentPath(shareId: string, docPath?: string) {
 }
 
 export function urlify(path: string): string {
-  return `${window.location.host}${path}`;
+  return `${window.location.origin}${path}`;
 }
 
 export const matchDocumentSlug =

package.json

@@ -348,5 +348,5 @@
     "qs": "6.9.7",
     "rollup": "^3.14.0"
   },
-  "version": "0.69.1"
+  "version": "0.69.2"
 }

server/middlewares/passport.ts

@@ -1,5 +1,6 @@
 import passport from "@outlinewiki/koa-passport";
 import { Context } from "koa";
+import { InternalOAuthError } from "passport-oauth2";
 import env from "@server/env";
 import Logger from "@server/logging/Logger";
 import { AuthenticationResult } from "@server/types";
@@ -15,7 +16,10 @@ export default function createMiddleware(providerName: string) {
       },
       async (err, user, result: AuthenticationResult) => {
         if (err) {
-          Logger.error("Error during authentication", err);
+          Logger.error(
+            "Error during authentication",
+            err instanceof InternalOAuthError ? err.oauthError : err
+          );
 
           if (err.id) {
             const notice = err.id.replace(/_/g, "-");

server/models/Attachment.ts

@@ -13,8 +13,9 @@ import {
 import {
   publicS3Endpoint,
   deleteFromS3,
-  getFileByKey,
+  getFileStream,
   getSignedUrl,
+  getFileBuffer,
 } from "@server/utils/s3";
 import Document from "./Document";
 import Team from "./Team";
@@ -75,7 +76,14 @@ class Attachment extends IdModel {
    * Get the contents of this attachment as a readable stream.
    */
   get stream() {
-    return getFileByKey(this.key);
+    return getFileStream(this.key);
+  }
+
+  /**
+   * Get the contents of this attachment as a buffer.
+   */
+  get buffer() {
+    return getFileBuffer(this.key);
   }
 
   /**

server/models/FileOperation.ts

@@ -13,7 +13,7 @@ import {
   FileOperationState,
   FileOperationType,
 } from "@shared/types";
-import { deleteFromS3, getFileByKey } from "@server/utils/s3";
+import { deleteFromS3, getFileStream } from "@server/utils/s3";
 import Collection from "./Collection";
 import Team from "./Team";
 import User from "./User";
@@ -77,7 +77,7 @@ class FileOperation extends IdModel {
    * The file operation contents as a readable stream.
    */
   get stream() {
-    return getFileByKey(this.key);
+    return getFileStream(this.key);
   }
 
   // hooks

server/queues/tasks/ExportDocumentTreeTask.ts

@@ -9,7 +9,6 @@ import DocumentHelper from "@server/models/helpers/DocumentHelper";
 import ZipHelper from "@server/utils/ZipHelper";
 import { serializeFilename } from "@server/utils/fs";
 import parseAttachmentIds from "@server/utils/parseAttachmentIds";
-import { getFileByKey } from "@server/utils/s3";
 import ExportTask from "./ExportTask";
 
 export default abstract class ExportDocumentTreeTask extends ExportTask {
@@ -65,13 +64,11 @@ export default abstract class ExportDocumentTreeTask extends ExportTask {
             key: attachment.key,
           });
 
-          const stream = getFileByKey(attachment.key);
           const dir = path.dirname(pathInZip);
-          if (stream) {
-            zip.file(path.join(dir, attachment.key), stream, {
-              createFolders: true,
-            });
-          }
+          zip.file(path.join(dir, attachment.key), attachment.buffer, {
+            date: attachment.updatedAt,
+            createFolders: true,
+          });
         } catch (err) {
           Logger.error(
             `Failed to add attachment to archive: ${attachment.key}`,

server/queues/tasks/ExportJSONTask.ts

@@ -16,7 +16,6 @@ import { CollectionJSONExport, JSONExportMetadata } from "@server/types";
 import ZipHelper from "@server/utils/ZipHelper";
 import { serializeFilename } from "@server/utils/fs";
 import parseAttachmentIds from "@server/utils/parseAttachmentIds";
-import { getFileByKey } from "@server/utils/s3";
 import packageJson from "../../../package.json";
 import ExportTask from "./ExportTask";
 
@@ -86,12 +85,10 @@ export default class ExportJSONTask extends ExportTask {
         await Promise.all(
           attachments.map(async (attachment) => {
             try {
-              const stream = getFileByKey(attachment.key);
-              if (stream) {
-                zip.file(attachment.key, stream, {
-                  createFolders: true,
-                });
-              }
+              zip.file(attachment.key, attachment.buffer, {
+                date: attachment.updatedAt,
+                createFolders: true,
+              });
 
               output.attachments[attachment.id] = {
                 ...omit(presentAttachment(attachment), "url"),

server/routes/api/teams/schema.ts

@@ -9,7 +9,7 @@ export const TeamsUpdateSchema = BaseSchema.extend({
     /** Avatar URL */
     avatarUrl: z.string().optional(),
     /** The subdomain to access the team */
-    subdomain: z.string().optional(),
+    subdomain: z.string().nullish(),
     /** Whether public sharing is enabled */
     sharing: z.boolean().optional(),
     /** Whether siginin with email is enabled */

server/routes/api/teams/teams.test.ts

@@ -50,6 +50,17 @@ describe("#team.update", () => {
     expect(body.data.name).toEqual("New name");
   });
 
+  it("should not invalidate request if subdomain is sent as null", async () => {
+    const admin = await buildAdmin();
+    const res = await server.post("/api/team.update", {
+      body: {
+        token: admin.getJwtToken(),
+        subdomain: null,
+      },
+    });
+    expect(res.status).not.toBe(400);
+  });
+
   it("should add new allowed Domains, removing empty string values", async () => {
     const { admin, team } = await seed();
     const res = await server.post("/api/team.update", {

server/utils/ZipHelper.ts

@@ -3,6 +3,7 @@ import path from "path";
 import JSZip from "jszip";
 import { find } from "lodash";
 import tmp from "tmp";
+import { bytesToHumanReadable } from "@shared/utils/files";
 import { ValidationError } from "@server/errors";
 import Logger from "@server/logging/Logger";
 import { trace } from "@server/logging/tracing";
@@ -114,10 +115,14 @@ export default class ZipHelper {
                     currentFile: metadata.currentFile,
                     percent,
                   };
+                  const memory = process.memoryUsage();
                   Logger.debug(
                     "utils",
-                    `Writing zip file progress… %${percent}`,
-                    { currentFile: metadata.currentFile }
+                    `Writing zip file progress… ${percent}%`,
+                    {
+                      currentFile: metadata.currentFile,
+                      memory: bytesToHumanReadable(memory.rss),
+                    }
                   );
                 }
               }

server/utils/s3.ts

@@ -184,19 +184,34 @@ export const getAWSKeyForFileOp = (teamId: string, name: string) => {
   return `${bucket}/${teamId}/${uuidv4()}/${name}-export.zip`;
 };
 
-export const getFileByKey = (key: string) => {
-  const params = {
-    Bucket: AWS_S3_UPLOAD_BUCKET_NAME,
-    Key: key,
-  };
-
+export const getFileStream = (key: string) => {
   try {
-    return s3.getObject(params).createReadStream();
+    return s3
+      .getObject({
+        Bucket: AWS_S3_UPLOAD_BUCKET_NAME,
+        Key: key,
+      })
+      .createReadStream();
   } catch (err) {
-    Logger.error("Error getting file from S3 by key", err, {
+    Logger.error("Error getting file stream from S3 ", err, {
       key,
     });
   }
 
   return null;
 };
+
+export const getFileBuffer = async (key: string) => {
+  const response = await s3
+    .getObject({
+      Bucket: AWS_S3_UPLOAD_BUCKET_NAME,
+      Key: key,
+    })
+    .promise();
+
+  if (response.Body) {
+    return response.Body as Blob;
+  }
+
+  throw new Error("Error getting file buffer from S3");
+};

shared/editor/components/Styles.ts

@@ -1027,8 +1027,7 @@ mark {
     top: calc(1px + 0.75em);
     width: calc(var(--line-number-gutter-width,0) * 1em + .25em);
     word-break: break-all;
-    text-align: right;
-
+    white-space: break-spaces;
     font-family: ${props.theme.fontFamilyMono};
     font-size: 13px;
     line-height: 1.4em;