@milkio/stargate 1.0.0-alpha.0 → 1.0.0-alpha.1

package/README.md

@@ -1,4 +1,4 @@
-# milkio-world
+# milkio-starter
 
 To install dependencies:
 

package/index.ts

@@ -3,15 +3,8 @@ import { TSON } from "@southern-aurora/tson";
 export type MilkioStargateOptions = {
   baseUrl: string | (() => string) | (() => Promise<string>);
   timeout?: number;
-  // middlewares?: () => Array<MiddlewareOptions & { isMiddleware: true }>;
   fetch?: typeof fetch;
   abort?: typeof AbortController;
-  // storage?: {
-  //   getItem: (key: string) => string | null | Promise<string | null>;
-  //   setItem: (key: string, value: string) => void | Promise<void>;
-  //   removeItem: (key: string) => void | Promise<void>;
-  // };
-  // memoryStorage?: boolean;
 };
 
 export type Mixin<T, U> = U & Omit<T, keyof U>;
@@ -52,39 +45,6 @@ export async function createStargate<Generated extends { routeSchema: any; rejec
     if (typeof baseUrl === "function") baseUrl = await baseUrl();
     if (baseUrl.endsWith("/")) baseUrl = baseUrl.slice(0, -1);
 
-    // if (options.middlewares) {
-    //   const middlewares = [...builtinMiddlewares, ...options.middlewares()];
-
-    //   const push = (index: number, middlewares: Array<any>, middleware: any) => {
-    //     const id = ++guid;
-    //     middlewares.push({ id, index, middleware });
-    //     return () =>
-    //       middlewares.splice(
-    //         middlewares.findIndex((v) => v.id === id),
-    //         1,
-    //       );
-    //   };
-
-    //   const _middlewareHandler = (index: number, options: MiddlewareOptions) => {
-    //     if (options.bootstrap) push(index, _bootstrapMiddlewares, options.bootstrap);
-    //     if (options.beforeExecute) push(index, _beforeExecuteMiddlewares, options.beforeExecute);
-    //     if (options.afterExecute) push(index, _afterExecuteMiddlewares, options.afterExecute);
-    //   };
-
-    //   for (let index = 0; index < middlewares.length; index++) {
-    //     const middlewareOptions = middlewares[index];
-    //     _middlewareHandler(index, middlewareOptions);
-    //   }
-
-    //   _bootstrapMiddlewares.sort((a, b) => a.index - b.index);
-    //   _beforeExecuteMiddlewares.sort((a, b) => a.index - b.index);
-    //   _afterExecuteMiddlewares.sort((a, b) => b.index - a.index);
-
-    //   for (const m of _bootstrapMiddlewares) {
-    //     await m.middleware({ storage: options.storage as ClientStorage });
-    //   }
-    // }
-
     return baseUrl;
   };
 
@@ -126,10 +86,6 @@ export async function createStargate<Generated extends { routeSchema: any; rejec
         if (options.headers["Accept"] === undefined) options.headers["Accept"] = "application/json";
         if (options.headers["Content-Type"] === undefined) options.headers["Content-Type"] = "application/json";
 
-        // for (const m of _beforeExecuteMiddlewares) {
-        //   await m.middleware({ path: path as string, params: options.params, headers: options.headers, storage: options.storage as ClientStorage });
-        // }
-
         const body = TSON.stringify(options.params) ?? "";
 
         let result: { value: Record<any, any> };
@@ -159,10 +115,6 @@ export async function createStargate<Generated extends { routeSchema: any; rejec
           return [error, null, { executeId: "unknown" }];
         }
 
-        // for (const m of _afterExecuteMiddlewares) {
-        //   await m.middleware({ path: path as string, storage: options.storage as ClientStorage, result });
-        // }
-
         return [null, result.value.data, { executeId: result.value.executeId }] as any;
       } else {
         // stream
@@ -173,6 +125,7 @@ export async function createStargate<Generated extends { routeSchema: any; rejec
         const stacks: Map<
           number,
           {
+            done: boolean;
             promise: Promise<IteratorResult<any>>;
             resolve: (value: IteratorResult<any>) => void;
             reject: (reason: any) => void;
@@ -201,11 +154,14 @@ export async function createStargate<Generated extends { routeSchema: any; rejec
             return;
           } else {
             const index = ++stacksIndex;
-            if (stacks.has(index)) stacks.get(index)!.resolve({ done: false, value: TSON.parse(event.data) });
-            else {
+            if (stacks.has(index)) {
+              const stack = stacks.get(index);
+              stack!.done = true;
+              stack!.resolve({ done: false, value: TSON.parse(event.data) });
+            } else {
               const stack = withResolvers<IteratorResult<any>>();
               stack.resolve({ done: false, value: TSON.parse(event.data) });
-              stacks.set(index, stack);
+              stacks.set(index, { ...stack, done: false });
             }
           }
         };
@@ -214,12 +170,10 @@ export async function createStargate<Generated extends { routeSchema: any; rejec
 
         async function create() {
           curRequestController = new $abort();
-          curRequestController.signal.addEventListener("abort", () => iterator.return());
+          curRequestController.signal.addEventListener("abort", () => {
+            iterator.return();
+          });
           try {
-            // for (const m of _beforeExecuteMiddlewares) {
-            //   await m.middleware({ path: path as string, params: eventOptions.params, headers: eventOptions.headers!, storage: options.storage as ClientStorage });
-            // }
-
             const response = await $fetch(url, {
               method: "POST",
               headers: options!.headers,
@@ -253,13 +207,17 @@ export async function createStargate<Generated extends { routeSchema: any; rejec
             next(): Promise<IteratorResult<unknown>> {
               const index = ++iteratorIndex;
               if (stacks.has(index - 2)) stacks.delete(index - 2);
-              if (stacks.has(index)) {
-                return stacks.get(index)!.promise;
-              } else {
+              if (!stacks.has(index) && !curRequestController.signal.aborted) {
+                const stack = withResolvers<IteratorResult<any>>();
+                stacks.set(index, { ...stack, done: false });
+                return stack.promise;
+              }
+              if (!stacks.has(index) && curRequestController.signal.aborted) {
                 const stack = withResolvers<IteratorResult<any>>();
-                stacks.set(index, stack);
+                stack.resolve({ done: true, value: undefined });
                 return stack.promise;
               }
+              return stacks.get(index)!.promise;
             },
             async return(): Promise<IteratorResult<void>> {
               if (!curRequestController.signal.aborted) curRequestController.abort();
@@ -277,6 +235,11 @@ export async function createStargate<Generated extends { routeSchema: any; rejec
                   data: err,
                 },
               };
+              for (const [_index, stack] of stacks) {
+                if (stack.done) continue;
+                stack.done = true;
+                stack.resolve({ done: true, value: undefined });
+              }
               if (!curRequestController.signal.aborted) curRequestController.abort();
               for (const [_, iterator] of stacks) iterator.resolve({ done: true, value: undefined });
               return { done: true, value: undefined };
@@ -307,6 +270,7 @@ export async function createStargate<Generated extends { routeSchema: any; rejec
         const stacks: Map<
           number,
           {
+            done: boolean;
             promise: Promise<IteratorResult<any>>;
             resolve: (value: IteratorResult<any>) => void;
             reject: (reason: any) => void;
@@ -314,15 +278,16 @@ export async function createStargate<Generated extends { routeSchema: any; rejec
         > = new Map();
         let stacksIndex: number = 0;
         let iteratorIndex: number = 0;
-        let streamResult: any = undefined;
 
         const onmessage = (event: EventSourceMessage) => {
           const index = ++stacksIndex;
-          if (stacks.has(index)) stacks.get(index)!.resolve({ done: false, value: TSON.parse(event.data) });
-          else {
+          if (stacks.has(index)) {
+            const stack = stacks.get(index);
+            stack!.resolve({ done: false, value: TSON.parse(event.data) });
+          } else {
             const stack = withResolvers<IteratorResult<any>>();
             stack.resolve({ done: false, value: TSON.parse(event.data) });
-            stacks.set(index, stack);
+            stacks.set(index, { ...stack, done: false });
           }
         };
 
@@ -330,7 +295,9 @@ export async function createStargate<Generated extends { routeSchema: any; rejec
 
         async function create() {
           curRequestController = new $abort();
-          curRequestController.signal.addEventListener("abort", () => iterator.return());
+          curRequestController.signal.addEventListener("abort", () => {
+            iterator.return();
+          });
           try {
             const response = await $fetch(`${baseUrl}/$subscribe`, {
               method: "POST",
@@ -360,13 +327,17 @@ export async function createStargate<Generated extends { routeSchema: any; rejec
             next(): Promise<IteratorResult<unknown>> {
               const index = ++iteratorIndex;
               if (stacks.has(index - 2)) stacks.delete(index - 2);
-              if (stacks.has(index)) {
-                return stacks.get(index)!.promise;
-              } else {
+              if (!stacks.has(index) && !curRequestController.signal.aborted) {
                 const stack = withResolvers<IteratorResult<any>>();
-                stacks.set(index, stack);
+                stacks.set(index, { ...stack, done: false });
                 return stack.promise;
               }
+              if (!stacks.has(index) && curRequestController.signal.aborted) {
+                const stack = withResolvers<IteratorResult<any>>();
+                stack.resolve({ done: true, value: undefined });
+                return stack.promise;
+              }
+              return stacks.get(index)!.promise;
             },
             async return(): Promise<IteratorResult<void>> {
               if (!curRequestController.signal.aborted) curRequestController.abort();
@@ -374,15 +345,6 @@ export async function createStargate<Generated extends { routeSchema: any; rejec
               return { done: true, value: undefined };
             },
             async throw(err: any): Promise<IteratorResult<void>> {
-              streamResult = {
-                success: false,
-                fail: {
-                  code: "NETWORK_ERROR",
-                  message: "Network Error",
-                  fromClient: true,
-                  data: err,
-                },
-              };
               if (!curRequestController.signal.aborted) curRequestController.abort();
               for (const [_, iterator] of stacks) iterator.resolve({ done: true, value: undefined });
               return { done: true, value: undefined };
@@ -430,15 +392,6 @@ export async function createStargate<Generated extends { routeSchema: any; rejec
   return stargate;
 }
 
-// export function defineMiddleware(options: MiddlewareOptions): () => MiddlewareOptions & { isMiddleware: true } {
-//   return () => ({
-//     ...options,
-//     isMiddleware: true,
-//   });
-// }
-
-let guid = 0;
-
 export type ExecuteStreamOptions = {
   headers?: Record<string, string>;
   timeout?: number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@milkio/stargate",
   "module": "index.ts",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.0-alpha.1",
   "type": "module",
   "dependencies": {
     "@southern-aurora/tson": "^2.0.2"