update expo.io links to expo.dev/exp.host

CHANGELOG.md

@@ -7,8 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-- Fix s3 logger stream close crash.
-
 # [0.22.4] - 2021-07-27
 
 - Update iOS and Android tarballs for SDK 42.

src/logger/index.ts

@@ -29,13 +29,13 @@ class Logger {
       jobID: job.id,
       experienceName: job.experienceName,
     });
-    const s3Url = await streams.s3?.stream.init(job);
+    const s3Url = await streams.s3.stream.init(job);
     return s3Url;
   }
 
   public async cleanup() {
     this.currentLogger = this.parentLogger;
-    await streams.s3?.stream.cleanup();
+    await streams.s3.stream.cleanup();
   }
 
   public trace(...all: any[]) {

src/logger/streams/index.ts

@@ -1,22 +1,20 @@
-import { pickBy } from 'lodash';
+import pickBy from 'lodash/pickBy';
+
 import createGCloudStream from 'turtle/logger/streams/gcloud';
 import createOfflineStream from 'turtle/logger/streams/offline';
-import createS3Stream, { S3Stream } from 'turtle/logger/streams/s3';
+import createS3Stream from 'turtle/logger/streams/s3';
 import createSentryStream from 'turtle/logger/streams/sentry';
 import { isOffline } from 'turtle/turtleContext';
 
-interface IStream<T> {
-  stream: T;
+interface IStream {
+  stream: any;
   type?: string;
   level?: string;
   reemitErrorEvents?: boolean;
 }
 
 interface IStreamMap {
-  stdout: IStream<any>;
-  gcloud?: IStream<any>;
-  s3?: IStream<S3Stream>;
-  sentry?: IStream<any>;
+  [key: string]: IStream;
 }
 
 function prepareStreams(): IStreamMap {
@@ -31,7 +29,7 @@ function prepareStreams(): IStreamMap {
       s3: createS3Stream(),
       sentry: createSentryStream(),
     };
-    return pickBy(allStreams) as any as IStreamMap;
+    return pickBy(allStreams) as IStreamMap;
   }
 }
 

src/logger/streams/s3.ts

@@ -18,7 +18,7 @@ export default function create() {
   };
 }
 
-export class S3Stream extends EventEmitter {
+class S3Stream extends EventEmitter {
   private s3Url: string | null = null;
   private lastFlush: number | null = null;
   private filePath: string | null = null;
@@ -44,11 +44,7 @@ export class S3Stream extends EventEmitter {
 
   public async cleanup() {
     await this.flush(true);
-
-    if (this.fileHandle) {
-      await fs.close(this.fileHandle);
-    }
-
+    await fs.close(this.fileHandle as number);
     this.fileHandle = null;
     this.waitingOnPromise = false;
   }
@@ -68,7 +64,7 @@ export class S3Stream extends EventEmitter {
       return;
     }
     fs
-      .write(this.fileHandle, `${JSON.stringify(rec)}\n`)
+      .write(this.fileHandle as number, `${JSON.stringify(rec)}\n`)
       .then(() => {
         this.flush();
       });