egg 3.8.0 → 3.9.0-beta.1

package/index.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="node" />
 import accepts = require('accepts');
-import KoaApplication = require('koa');
-import KoaRouter = require('koa-router');
 import { AsyncLocalStorage } from 'async_hooks';
 import { EventEmitter } from 'events'
 import { Readable } from 'stream';
 import { Socket } from 'net';
 import { IncomingMessage, ServerResponse } from 'http';
+import KoaApplication = require('koa');
+import KoaRouter = require('koa-router');
 import {
   EggLogger as Logger,
   EggLoggers,
@@ -15,7 +15,9 @@ import {
   EggLoggerOptions,
   EggContextLogger
 } from 'egg-logger';
-import { HttpClient, RequestOptions2 as RequestOptions } from 'urllib';
+import { RequestOptions2 as RequestOptions, HttpClientResponse } from 'urllib';
+import { RequestURL, RequestOptions as RequestOptionsNext } from 'urllib-next/src/Request';
+import { HttpClientResponse as HttpClientResponseNext } from 'urllib-next/src/Response';
 import {
   EggCoreBase,
   FileLoaderOption,
@@ -46,12 +48,18 @@ declare module 'egg' {
   // Remove specific property from the specific class
   type RemoveSpecProp<T, P> = Pick<T, Exclude<keyof T, P>>;
 
-  export interface EggHttpClient extends HttpClient<RequestOptions> { }
+  // Compatible with both urllib@2 and urllib@3 RequestOptions to request
+  export interface EggHttpClient extends EventEmitter {
+    reques<T = any>(url: RequestURL): Promise<HttpClientResponse<T> | HttpClientResponseNext>;
+    request<T = any>(url: RequestURL, options: RequestOptions | RequestOptionsNext): Promise<HttpClientResponse<T> | HttpClientResponseNext>;
+    curl<T = any>(url: RequestURL): Promise<HttpClientResponse<T> | HttpClientResponseNext>;
+    curl<T = any>(url: RequestURL, options: RequestOptions | RequestOptionsNext): Promise<HttpClientResponse<T> | HttpClientResponseNext>;
+  }
   interface EggHttpConstructor {
     new(app: Application): EggHttpClient;
   }
 
-  export interface EggContextHttpClient extends HttpClient<RequestOptions> { }
+  export interface EggContextHttpClient extends EggHttpClient { }
   interface EggContextHttpClientConstructor {
     new(ctx: Context): EggContextHttpClient;
   }
@@ -695,6 +703,13 @@ declare module 'egg' {
      */
     runInBackground(scope: (ctx: Context) => void): void;
 
+    /**
+     * Run async function in the anonymous context scope
+     * @see Context#runInAnonymousContextScope
+     * @param {Function} scope - the first args is an anonymous ctx, scope should be async function
+     */
+    runInAnonymousContextScope(scope: (ctx: Context) => Promise<void>): Promise<void>;
+
     /**
      * Get current execute ctx async local storage
      * @returns {AsyncLocalStorage} localStorage - store current execute Context

package/lib/application.js

@@ -251,7 +251,22 @@ class Application extends EggApplication {
   runInBackground(scope) {
     const ctx = this.createAnonymousContext();
     if (!scope.name) scope._name = eggUtils.getCalleeFromStack(true);
-    ctx.runInBackground(scope);
+    this.ctxStorage.run(ctx, () => {
+      ctx.runInBackground(scope);
+    });
+  }
+
+  /**
+   * Run async function in the anonymous context scope
+   * @see Context#runInAnonymousContextScope
+   * @param {Function} scope - the first args is an anonymous ctx, scope should be async function
+   */
+  async runInAnonymousContextScope(scope) {
+    const ctx = this.createAnonymousContext();
+    if (!scope.name) scope._name = eggUtils.getCalleeFromStack(true);
+    await this.ctxStorage.run(ctx, async () => {
+      await scope(ctx);
+    });
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egg",
-  "version": "3.8.0",
+  "version": "3.9.0-beta.1",
   "publishConfig": {
     "tag": "next"
   },
@@ -54,7 +54,7 @@
     "on-finished": "^2.4.1",
     "sendmessage": "^1.1.0",
     "urllib": "^2.33.0",
-    "urllib-next": "^3.1.3",
+    "urllib-next": "^3.8.0",
     "utility": "^1.17.0",
     "ylru": "^1.3.2"
   },