@nymphjs/client 1.0.0-beta.7 → 1.0.0-beta.71

package/src/Entity.types.ts

@@ -1,4 +1,5 @@
 import type Nymph from './Nymph';
+import type Entity from './Entity';
 
 export type ServerCallResponse = {
   return: any;
@@ -166,14 +167,14 @@ export interface EntityInterface extends DataObjectInterface {
    *
    * @returns The entity.
    */
-  $ready(): Promise<EntityInterface>;
+  $wake(): Promise<EntityInterface>;
   /**
    * Ready this entity's data, and the data of entity's within this one's.
    *
-   * @param level The number of levels deep to ready. If undefined, it will keep going until there are no more entities. (Careful of infinite loops.)
+   * @param level The number of levels deep to wake. If undefined, it will keep going until there are no more entities. (Careful of infinite loops.)
    * @returns The entity.
    */
-  $readyAll(level?: number): Promise<EntityInterface>;
+  $wakeAll(level?: number): Promise<EntityInterface>;
   /**
    * Remove one or more tags.
    *
@@ -195,7 +196,7 @@ export interface EntityInterface extends DataObjectInterface {
   $serverCall(
     method: string,
     params: Iterable<any>,
-    stateless: boolean
+    stateless: boolean,
   ): Promise<any>;
   /**
    * Return a Nymph Entity Reference for this entity.
@@ -208,46 +209,9 @@ export interface EntityInterface extends DataObjectInterface {
   $toReference(): EntityReference | EntityInterface;
 }
 
-export type EntityConstructor = (new () => EntityInterface) & {
-  /**
-   * The instance of Nymph to use for queries.
-   */
-  nymph: Nymph;
-  /**
-   * The lookup name for this entity.
-   *
-   * This is used for reference arrays (and sleeping references) and client
-   * requests.
-   */
-  class: string;
-  /**
-   * Create a new entity instance.
-   *
-   * @param guid An optional GUID to retrieve.
-   */
-  factory(guid?: string): Promise<EntityInterface>;
-  /**
-   * Create a new entity instance.
-   *
-   * @param guid An optional GUID to retrieve.
-   */
-  factorySync(guid?: string): EntityInterface;
-  /**
-   * Create a new sleeping reference instance.
-   *
-   * Sleeping references won't retrieve their data from the server until they
-   * are readied with `ready()` or a parent's `readyAll()`.
-   *
-   * @param reference The Nymph Entity Reference to use to wake.
-   * @returns The new instance.
-   */
-  factoryReference(reference: EntityReference): EntityInterface;
-  /**
-   * Call a static method on the server version of this entity.
-   *
-   * @param method The name of the method.
-   * @param params The parameters to call the method with.
-   * @returns The value that the method on the server returned.
-   */
-  serverCallStatic(method: string, params: Iterable<any>): Promise<any>;
+export type EntityConstructor<
+  D extends EntityData = EntityData,
+  E extends Entity<D> = Entity<D>,
+> = (new (...args: any[]) => E) & {
+  [k in keyof typeof Entity]: (typeof Entity)[k];
 };

package/src/EntityWeakCache.ts

@@ -1,15 +1,18 @@
 import { EntityConstructor, EntityInterface } from './Entity.types';
 
 export default class EntityWeakCache {
-  private references: WeakMap<EntityConstructor, { [k: string]: any }> =
-    new WeakMap();
+  private references: WeakMap<
+    EntityConstructor,
+    { [k: string]: WeakRef<EntityInterface> }
+  > = new WeakMap();
 
   get(EntityClass: EntityConstructor, guid: string): EntityInterface | null {
     const classMap = this.references.get(EntityClass);
     if (classMap && guid in classMap) {
       const weakRef = classMap[guid];
-      if (weakRef && weakRef.deref() != null) {
-        return weakRef.deref();
+      const deref = weakRef && weakRef.deref();
+      if (deref != null) {
+        return deref;
       } else {
         delete classMap[guid];
       }
@@ -22,7 +25,6 @@ export default class EntityWeakCache {
       return;
     }
 
-    // @ts-ignore TS doesn't know about WeakRef.
     const weakRef = new WeakRef(entity);
 
     const classMap = this.references.get(EntityClass) || {};

package/src/HttpRequester.ts

@@ -1,25 +1,41 @@
+import {
+  fetchEventSource,
+  EventStreamContentType,
+} from 'fetch-event-source-hperrin';
+
 export type HttpRequesterEventType = 'request' | 'response';
 export type HttpRequesterRequestCallback = (
   requester: HttpRequester,
   url: string,
-  options: RequestInit
+  options: RequestInit,
 ) => void;
 export type HttpRequesterResponseCallback = (
   requester: HttpRequester,
   response: Response,
-  text: string
+  text: string,
+) => void;
+export type HttpRequesterIteratorCallback = (
+  requester: HttpRequester,
+  url: string,
+  headers: Record<string, string>,
 ) => void;
 export type HttpRequesterRequestOptions = {
   url: string;
+  headers?: { [k: string]: any };
   data: { [k: string]: any };
   dataType: string;
 };
 
+export interface AbortableAsyncIterator<T extends any = any>
+  extends AsyncIterable<T> {
+  abortController: AbortController;
+}
+
 export default class HttpRequester {
   private fetch: WindowOrWorkerGlobalScope['fetch'];
-  private xsrfToken: string | null = null;
   private requestCallbacks: HttpRequesterRequestCallback[] = [];
   private responseCallbacks: HttpRequesterResponseCallback[] = [];
+  private iteratorCallbacks: HttpRequesterIteratorCallback[] = [];
 
   static makeUrl(url: string, data: { [k: string]: any }) {
     if (!data) {
@@ -46,12 +62,16 @@ export default class HttpRequester {
       ? HttpRequesterRequestCallback
       : T extends 'response'
       ? HttpRequesterResponseCallback
-      : never
+      : T extends 'iterator'
+      ? HttpRequesterIteratorCallback
+      : never,
   ) {
     const prop = (event + 'Callbacks') as T extends 'request'
       ? 'requestCallbacks'
       : T extends 'response'
       ? 'responseCallbacks'
+      : T extends 'iterator'
+      ? 'iteratorCallbacks'
       : never;
     if (!(prop in this)) {
       throw new Error('Invalid event type.');
@@ -67,12 +87,16 @@ export default class HttpRequester {
       ? HttpRequesterRequestCallback
       : T extends 'response'
       ? HttpRequesterResponseCallback
-      : never
+      : T extends 'iterator'
+      ? HttpRequesterIteratorCallback
+      : never,
   ) {
     const prop = (event + 'Callbacks') as T extends 'request'
       ? 'requestCallbacks'
       : T extends 'response'
       ? 'responseCallbacks'
+      : T extends 'iterator'
+      ? 'iteratorCallbacks'
       : never;
     if (!(prop in this)) {
       return false;
@@ -86,10 +110,6 @@ export default class HttpRequester {
     return true;
   }
 
-  setXsrfToken(xsrfToken: string | null) {
-    this.xsrfToken = xsrfToken;
-  }
-
   async GET(opt: HttpRequesterRequestOptions) {
     return await this._httpRequest('GET', opt);
   }
@@ -98,6 +118,10 @@ export default class HttpRequester {
     return await this._httpRequest('POST', opt);
   }
 
+  async POST_ITERATOR(opt: HttpRequesterRequestOptions) {
+    return await this._iteratorRequest('POST', opt);
+  }
+
   async PUT(opt: HttpRequesterRequestOptions) {
     return await this._httpRequest('PUT', opt);
   }
@@ -112,7 +136,7 @@ export default class HttpRequester {
 
   async _httpRequest(
     method: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE',
-    opt: HttpRequesterRequestOptions
+    opt: HttpRequesterRequestOptions,
   ) {
     const dataString = JSON.stringify(opt.data);
     let url = opt.url;
@@ -123,7 +147,7 @@ export default class HttpRequester {
     }
     const options: RequestInit = {
       method,
-      headers: {},
+      headers: opt.headers ?? {},
       credentials: 'include',
     };
 
@@ -137,18 +161,13 @@ export default class HttpRequester {
       this.requestCallbacks[i] && this.requestCallbacks[i](this, url, options);
     }
 
-    if (this.xsrfToken !== null) {
-      (options.headers as Record<string, string>)['X-Xsrf-Token'] =
-        this.xsrfToken;
-    }
-
     const response = await this.fetch(url, options);
     let text: string;
     try {
       text = await response.text();
     } catch (e: any) {
       throw new InvalidResponseError(
-        'Server response did not contain valid text body.'
+        'Server response did not contain valid text body.',
       );
     }
     if (!response.ok) {
@@ -167,9 +186,15 @@ export default class HttpRequester {
         };
       }
       errObj.status = response.status;
-      throw response.status < 500
-        ? new ClientError(errObj)
-        : new ServerError(errObj);
+      throw response.status < 200
+        ? new InformationalError(response, errObj)
+        : response.status < 300
+        ? new SuccessError(response, errObj)
+        : response.status < 400
+        ? new RedirectError(response, errObj)
+        : response.status < 500
+        ? new ClientError(response, errObj)
+        : new ServerError(response, errObj);
     }
     for (let i = 0; i < this.responseCallbacks.length; i++) {
       this.responseCallbacks[i] &&
@@ -186,13 +211,216 @@ export default class HttpRequester {
           throw e;
         }
         throw new InvalidResponseError(
-          'Server response was invalid: ' + JSON.stringify(text)
+          'Server response was invalid: ' + JSON.stringify(text),
         );
       }
     } else {
       return text;
     }
   }
+
+  async _iteratorRequest(
+    method: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE',
+    opt: HttpRequesterRequestOptions,
+  ): Promise<AbortableAsyncIterator> {
+    const dataString = JSON.stringify(opt.data);
+    let url = opt.url;
+    if (method === 'GET') {
+      // TODO: what should this size be?
+      // && dataString.length < 1) {
+      url = HttpRequester.makeUrl(opt.url, opt.data);
+    }
+    const hasBody = method !== 'GET' && opt.data;
+    const headers: Record<string, string> = opt.headers ?? {};
+
+    if (hasBody) {
+      headers['Content-Type'] = 'application/json';
+    }
+
+    for (let i = 0; i < this.iteratorCallbacks.length; i++) {
+      this.iteratorCallbacks[i] &&
+        this.iteratorCallbacks[i](this, url, headers);
+    }
+
+    const responses: any[] = [];
+    let nextResponseResolve: (value: void) => void;
+    let nextResponseReadyPromise = new Promise<void>((res) => {
+      nextResponseResolve = res;
+    });
+    let responsesDone = false;
+    let serverResponse: Response;
+
+    const ctrl = new AbortController();
+
+    fetchEventSource(url, {
+      openWhenHidden: true,
+      fetch: this.fetch,
+
+      method,
+      headers,
+      credentials: 'include',
+      body: hasBody ? dataString : undefined,
+      signal: ctrl.signal,
+
+      async onopen(response) {
+        serverResponse = response;
+        if (response.ok) {
+          if (response.headers.get('content-type') === EventStreamContentType) {
+            throw new InvalidResponseError(
+              'Server response is not an event stream.',
+            );
+          }
+
+          // Response is ok, wait for messages.
+          return;
+        }
+
+        let text: string = '';
+        try {
+          text = await response.text();
+        } catch (e: any) {
+          // Ignore error here.
+        }
+
+        let errObj;
+        try {
+          errObj = JSON.parse(text);
+        } catch (e: any) {
+          if (!(e instanceof SyntaxError)) {
+            throw e;
+          }
+        }
+
+        if (typeof errObj !== 'object') {
+          errObj = {
+            textStatus: response.statusText,
+          };
+        }
+        errObj.status = response.status;
+        throw response.status < 200
+          ? new InformationalError(response, errObj)
+          : response.status < 300
+          ? new SuccessError(response, errObj)
+          : response.status < 400
+          ? new RedirectError(response, errObj)
+          : response.status < 500
+          ? new ClientError(response, errObj)
+          : new ServerError(response, errObj);
+      },
+
+      onmessage(event) {
+        if (event.event === 'next') {
+          let text = event.data;
+
+          if (opt.dataType === 'json') {
+            if (!text.length) {
+              responses.push(
+                new InvalidResponseError('Server response was empty.'),
+              );
+            } else {
+              try {
+                responses.push(JSON.parse(text));
+              } catch (e: any) {
+                if (!(e instanceof SyntaxError)) {
+                  responses.push(e);
+                } else {
+                  responses.push(
+                    new InvalidResponseError(
+                      'Server response was invalid: ' + JSON.stringify(text),
+                    ),
+                  );
+                }
+              }
+            }
+          } else {
+            responses.push(text);
+          }
+        } else if (event.event === 'error') {
+          let text = event.data;
+
+          let errObj;
+          try {
+            errObj = JSON.parse(text);
+          } catch (e: any) {
+            if (!(e instanceof SyntaxError)) {
+              throw e;
+            }
+          }
+
+          if (typeof errObj !== 'object') {
+            errObj = {
+              status: 500,
+              textStatus: 'Iterator Error',
+            };
+          }
+          responses.push(
+            errObj.status < 200
+              ? new InformationalError(serverResponse, errObj)
+              : errObj.status < 300
+              ? new SuccessError(serverResponse, errObj)
+              : errObj.status < 400
+              ? new RedirectError(serverResponse, errObj)
+              : errObj.status < 500
+              ? new ClientError(serverResponse, errObj)
+              : new ServerError(serverResponse, errObj),
+          );
+        } else if (event.event === 'finished') {
+          responsesDone = true;
+        } else if (event.event === 'ping') {
+          // Ignore keep-alive pings.
+          return;
+        }
+
+        const resolve = nextResponseResolve;
+        if (!responsesDone) {
+          nextResponseReadyPromise = new Promise<void>((res) => {
+            nextResponseResolve = res;
+          });
+        }
+
+        // Resolve the promise to continue any waiting iterator.
+        resolve();
+      },
+
+      onclose() {
+        responses.push(
+          new ConnectionClosedUnexpectedlyError(
+            'The connection to the server was closed unexpectedly.',
+          ),
+        );
+
+        responsesDone = true;
+        nextResponseResolve();
+      },
+
+      onerror(err) {
+        // Rethrow to stop the operation.
+        throw err;
+      },
+    }).catch((err) => {
+      responses.push(
+        new ConnectionError('The connection could not be established: ' + err),
+      );
+
+      responsesDone = true;
+      nextResponseResolve();
+    });
+
+    const iterator: AbortableAsyncIterator = {
+      abortController: ctrl,
+      async *[Symbol.asyncIterator]() {
+        do {
+          await nextResponseReadyPromise;
+
+          while (responses.length) {
+            yield responses.shift();
+          }
+        } while (!responsesDone);
+      },
+    };
+
+    return iterator;
+  }
 }
 
 export class InvalidResponseError extends Error {
@@ -202,18 +430,63 @@ export class InvalidResponseError extends Error {
   }
 }
 
-export class ClientError extends Error {
-  constructor(errObj: { textStatus: string }) {
-    super(errObj.textStatus);
-    this.name = 'ClientError';
-    Object.assign(this, errObj);
+export class ConnectionClosedUnexpectedlyError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'ConnectionClosedUnexpectedlyError';
+  }
+}
+
+export class ConnectionError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'ConnectionError';
   }
 }
 
-export class ServerError extends Error {
-  constructor(errObj: { textStatus: string }) {
+export class HttpError extends Error {
+  status: number;
+  statusText: string;
+
+  constructor(
+    name: string,
+    response: Response,
+    errObj: { textStatus: string },
+  ) {
     super(errObj.textStatus);
-    this.name = 'ServerError';
+    this.name = name;
+    this.status = response.status;
+    this.statusText = response.statusText;
     Object.assign(this, errObj);
   }
 }
+
+export class InformationalError extends HttpError {
+  constructor(response: Response, errObj: { textStatus: string }) {
+    super('InformationalError', response, errObj);
+  }
+}
+
+export class SuccessError extends HttpError {
+  constructor(response: Response, errObj: { textStatus: string }) {
+    super('SuccessError', response, errObj);
+  }
+}
+
+export class RedirectError extends HttpError {
+  constructor(response: Response, errObj: { textStatus: string }) {
+    super('RedirectError', response, errObj);
+  }
+}
+
+export class ClientError extends HttpError {
+  constructor(response: Response, errObj: { textStatus: string }) {
+    super('ClientError', response, errObj);
+  }
+}
+
+export class ServerError extends HttpError {
+  constructor(response: Response, errObj: { textStatus: string }) {
+    super('ServerError', response, errObj);
+  }
+}